成润项目/中建四局-无人机视频播放功能

src/assets/js/http.js

@@ -42,7 +42,6 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
   // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址
-  // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
@@ -87,8 +86,10 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
   // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
   // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
-  // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上
+  // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
-  axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上
+  axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上(2)
+    // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
+
 
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'

src/components/GlobalUploader.vue

@@ -51,7 +51,7 @@
         data() {
             return {
                 options: {
-                    target: this.$http.defaults.baseURL+'filetransfer/uploadfile?projectSn='+this.$store.state.projectSn, // 目标上传 URL
+                    target: this.$http.defaults.baseURL+'filetransfer/uploadfile', // 目标上传 URL
                     chunkSize: 1024 * 1024,
                     fileParameterName: 'file',
                     maxChunkRetries: 3,
@@ -90,7 +90,7 @@
         mounted() {
 
             this.$EventBus.$on('openUploader', query => {
-                console.log('openUploader')
+                console.log('openUploader',query)
                 this.params = query || {};
                 // this.$refs.uploadBtn.click()
                 var e = document.createEvent('MouseEvent');

src/store/index.js

@@ -94,11 +94,9 @@ export default new Vuex.Store({
     // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
     // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
     // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
-    // FILEURL: 'http://42.194.144.62:8088/image/',//中建四
+    // FILEURL: 'http://42.194.144.62:8088/image/',//中建四   
-    // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
+    UPLOADURL: 'http://182.90.224.147:30262/upload/image',//四川成润
-    // FILEURL: 'http://42.194.144.62:8088/image/',//中建四
+    FILEURL: 'http://182.90.224.147:30262/image/',//四川成润
-    // UPLOADURL: 'http://182.90.224.147:15551/upload/image',//中建四
-    // FILEURL: 'http://182.90.224.147:15551/image/',//中建四
 
     ACCOUNTTYPE: [
       "系统管理员",

src/views/projectAdmin/fourEngin/command/rightFour.vue

@@ -21,8 +21,7 @@
       <div class="titleText" >
         <p><i class="el-icon-circle-close" @click="closeDialog"></i></p>
         <p>  <span style="float:left;font-size:20px;margin: 35px 0 0 32px;">{{ itemVar.title }}</span> <span style="float:right;margin: 39px -12px 0px 0;">{{itemVar.updateTime }}</span></p>
-        <div class="content" v-html="itemVar.content">
+        <div class="content ql-editor" style="white-space: pre-line" v-html="itemVar.content">
-         <!-- {{  itemVar.content}} -->
       </div>
       </div>
       

src/views/projectFront/electricityManage/alarmValueSet.vue

@@ -460,7 +460,7 @@ export default {
       if (typeof obj.alarmPushWorkerId === "string"&& obj.alarmPushWorkerId != '') {
         this.addEditForm.alarmPushWorkerId = obj.alarmPushWorkerId
           .split(",")
-          .map(Number);
+         
       }
       this.handle("edit", true);
     },

src/views/projectFront/fileManage/components/FileList/components/OperationMenu.vue

@@ -127,14 +127,17 @@ export default {
       get() {
         let res = {
           filePath: this.filePath,
-          isDir: 0
+          isDir: 0,
+          projectSn:this.$store.state.projectSn
+
         }
         return res
       },
       set() {
         return {
           filePath: '/',
-          isDir: 0
+          isDir: 0,
+          projectSn:this.$store.state.projectSn
         }
       }
     },

src/views/projectFront/informatioBroadcast/broadcast.vue

@@ -176,7 +176,7 @@ export default {
             [{ align: [] }], //对齐方式
 
             ['clean'], //清除字体样式
-            ['image', 'video'] //上传图片、上传视频
+            ['image'] //上传图片、上传视频
           ]
         },
         theme: 'snow'

src/views/projectFront/projectSummary/panoramaPlan.vue

@@ -32,7 +32,8 @@
           <vue-scroll style="height: 668px">
               <el-table :data="tableData">
                 <!-- 标段名称 -->
-                  <el-table-column align="center" prop="projectfName" :label="$t('message.projectInfo.sectionName')"></el-table-column>
+                  <el-table-column v-if="COMPANY=='sccr'" align="center" prop="crSectionName" :label="$t('message.projectInfo.sectionName')"></el-table-column>
+                  <el-table-column v-else align="center" prop="projectfName" :label="$t('message.projectInfo.sectionName')"></el-table-column>
                  <!-- 节点编号 -->
                   <el-table-column align="center" prop="nodeCode" :label="$t('message.projectInfo.nodeNumber')"></el-table-column>
                   <!-- 节点名称 -->

src/views/projectFront/uavLnspection/uavview.vue

@@ -26,11 +26,15 @@
             prop="updateTime"
             label="更新时间"
           ></el-table-column>
-          <el-table-column
+          <el-table-column align="center" prop="videoUrl" label="无人机视频">
-            align="center"
+            <template slot-scope="scope">
-            prop="videoUrl"
+              <i
-            label="视频URL"
+                @click.stop="playerVideo(scope.row.videoUrl)"
-          ></el-table-column>
+                class="el-icon-video-play"
+                style="font-size: 25px; cursor: pointer"
+              ></i>
+            </template>
+          </el-table-column>
           <el-table-column width="200">
             <template slot-scope="scope">
               <div class="tableBtns">
@@ -73,6 +77,7 @@
       :title="type"
       :visible.sync="dialogVisible"
       width="667px"
+      @close="close"
     >
       <div class="dialog_content">
         <el-form
@@ -86,7 +91,7 @@
             label="巡检名称"
             prop="name"
             :rules="[
-              { required: true, message: '请输入巡检名称', trigger: 'blur' }
+              { required: true, message: '请输入巡检名称', trigger: 'blur' },
             ]"
           >
             <el-input placeholder="请输入" v-model="workerInfo.name"></el-input>
@@ -95,7 +100,7 @@
             label="拍摄时间"
             prop="shootingTime"
             :rules="[
-              { required: true, message: '请选择拍摄时间', trigger: 'blur' }
+              { required: true, message: '请选择拍摄时间', trigger: 'blur' },
             ]"
           >
             <el-date-picker
@@ -110,7 +115,7 @@
             label="巡检视频"
             prop="videoUrl"
             :rules="[
-              { required: true, message: '请上传巡检视频', trigger: 'blur' }
+              { required: true, message: '请上传巡检视频', trigger: 'blur' },
             ]"
           >
             <div class="videoUpload">
@@ -128,7 +133,7 @@
               <template>
                 <div class="videos">
                   <video
-                    v-if="workerInfo.videoUrl"
+                    v-if="addPlayer||workerInfo.videoUrl"
                     width="120"
                     height="80"
                     controls
@@ -172,6 +177,34 @@
         </el-form>
       </div>
     </el-dialog>
+    <!-- 视频播放 -->
+    <div class="video" style="position: absolute; top: 12%; left: 17%">
+      <video
+        v-if="isShow || player"
+        width="100%"
+        height="600"
+        controls
+        autoplay
+        style="margin-left: 10px"
+      >
+        <source :src="player" type="video/mp4" />
+        <source :src="player" type="video/mp4" />
+        <source :src="player" type="video/mp4" />
+        您的浏览器不支持 video 标签。
+      </video>
+      <i
+        style="
+          position: absolute;
+          top: 1%;
+          left: 97%;
+          color: #fff;
+          font-size: 30px;
+          cursor: pointer;
+        "
+        class="el-icon-circle-close"
+        @click.stop="closeBtn"
+      ></i>
+    </div>
   </div>
 </template>
 <script>
@@ -198,7 +231,10 @@ export default {
         videoUrl: '', //视频
         projectSn: '' //项目sn
       }, //表单
-      fileList: []
+      fileList: [],
+      player: '',
+      isShow: false,
+      addPlayer:false
     }
   },
   created() {
@@ -206,6 +242,21 @@ export default {
     this.getWorkerList()
   },
   methods: {
+    //关闭视频
+    closeBtn(){
+      this.isShow =false
+      this.player=''
+    },
+    //视频播放
+    playerVideo(item) {
+      console.log('点击', this.$store.state.FILEURL + item);
+      this.isShow = false
+      this.$nextTick(() => {
+        this.player = this.$store.state.FILEURL + item
+        this.isShow = true
+
+      })
+    },
     // 获取所有无人机列表
     // getWorkerList() {
     //   getUavVideoListApi({ projectSn: this.$store.state.projectSn }).then(
@@ -241,10 +292,12 @@ export default {
     },
     //编辑
     editBtn(val) {
-      console.log('编辑的数据', val)
+      console.log('val------',val);
       this.type = '编辑巡检视频'
       this.dialogVisible = true
-      this.workerInfo = JSON.parse(JSON.stringify(val))
+    
+        this.workerInfo = JSON.parse(JSON.stringify(val))
+       
     },
     //删除楼栋
     deleteBtn(val) {
@@ -305,7 +358,7 @@ export default {
     },
     handleSuccess(file, fileList) {
       console.log('成功的file', file)
-      this.workerInfo.videoUrl = file.data[0].filename
+        this.workerInfo.videoUrl = file.data[0].filename
       if (file.status == 'SUCCESS') {
         this.$message({ message: '视频上传成功', type: 'success' })
       } else {
@@ -327,7 +380,15 @@ export default {
         this.$message({ message: '只能上传视频', type: 'error' })
       }
       return flag
-    }
+    },
+    close(){
+      this.workerInfo = {
+        name: '', //巡检名称
+        shootingTime: '', //拍摄时间
+        videoUrl: '', //视频
+        projectSn: '' //项目sn
+      }
+    },
   }
 }
 </script>