src/components/common/data.js

@@ -630,6 +630,12 @@ export const BUS_TYPE_3 = [
   { value: '1', label: '仓外'},
 ]
 
+export const CAMERA_LOCATION = [
+  { value: '1', label: '仓内'},
+  { value: '2', label: '业务'},
+  { value: '3', label: '安防'},
+]
+
 export const WORK_STATUS = [
   { value: '01', label: '在岗'},
   { value: '02', label: '已离职'},

src/components/common/player/live_v2.vue

@@ -29,6 +29,7 @@ export default {
       videoMap: {}, // window index - {ws url, camera index code}
       currentWindowIndex: 0,
       viewUrl: null,
+      isActive: false,
     }
   },
   mounted() {
@@ -175,7 +176,7 @@ export default {
           },
         ]
         list.forEach(d => {
-          const type = d.cameraType
+          const type = d.live
           const temp = {
             label: d.cameraName,
             ... d
@@ -255,6 +256,7 @@ export default {
       }
     },
     doControl(command, action = 0, speed = 20, presetIndex = 10) {
+
       if(this.videoMap[this.currentWindowIndex]) {
         const data = this.videoMap[this.currentWindowIndex]
         const cameraId = data.cameraId
@@ -274,6 +276,14 @@ export default {
         return this.$message.warning('请选择播放中的窗口')
       }
     },
+    circle() {
+      if(this.isActive) {
+        this.doControl('LEFT', 1)
+      }else {
+        this.doControl('LEFT', 0)
+      }
+      this.isActive = !this.isActive
+    },
     doControl1(command) {
       this.doControl(command, 0)
       setTimeout(() => {
@@ -308,7 +318,7 @@ export default {
         }
         manualCapture(q).then(resp => {
           if(resp) {
-            this.$systemUtils.download(resp)
+            this.$systemUtils.download2(resp)
           }
         })
       }
@@ -384,25 +394,25 @@ export default {
                   [{label: '←', code: 'LEFT'}, {label: 'center', code: 'GOTO_PRESET'}, {label: '→', code: 'RIGHT'}],
                   [{label: '↙', code: 'LEFT_DOWN'}, {label: '↓', code: 'DOWN'}, {label: '↘', code: 'RIGHT_DOWN'}]]">
             <el-row class="row">
-              <el-button v-if="item.code !== 'GOTO_PRESET'" v-for="item in list" :key="item.code" class="small-btn" @click="doControl1(item.code)">{{item.label}}</el-button>
-              <el-button v-else class="small-btn" icon="el-icon-refresh" @click="doControl(item.code)"></el-button>
+              <el-button v-if="item.code !== 'GOTO_PRESET'" v-for="item in list" :key="item.code" class="small-btn" @mousedown="doControl(item.code, 0)" @mouseup="doControl(item.code, 1)">{{item.label}}</el-button>
+              <el-button v-else class="small-btn" :class="{ 'is-active': isActive }" icon="el-icon-refresh" @click="circle()"></el-button>
             </el-row>
           </template>
         </el-row>
         <el-row class="row">
           <el-col :span="12">
-            <el-button type="primary" class="btn" icon="el-icon-plus" @click="doControl1('FOCUS_NEAR')">聚焦</el-button>
+            <el-button type="primary" class="btn" icon="el-icon-plus" @mousedown="doControl('FOCUS_NEAR', 0)" @mouseup="doControl('FOCUS_NEAR', 1)">聚焦</el-button>
           </el-col>
           <el-col :span="12">
-            <el-button type="primary" class="btn" icon="el-icon-remove" @click="doControl1('FOCUS_FAR')">聚焦</el-button>
+            <el-button type="primary" class="btn" icon="el-icon-remove" @mousedown="doControl('FOCUS_FAR', 0)" @mouseup="doControl('FOCUS_FAR', 1)">聚焦</el-button>
           </el-col>
         </el-row>
         <el-row class="row">
           <el-col :span="12">
-            <el-button type="primary" class="btn" icon="el-icon-plus"  @click="doControl1('ZOOM_IN')">调焦</el-button>
+            <el-button type="primary" class="btn" icon="el-icon-plus"  @mousedown="doControl('ZOOM_IN', 0)" @mouseup="doControl('ZOOM_IN', 1)">调焦</el-button>
           </el-col>
           <el-col :span="12">
-            <el-button type="primary" class="btn" icon="el-icon-remove"  @click="doControl1('ZOOM_OUT')">调焦</el-button>
+            <el-button type="primary" class="btn" icon="el-icon-remove"  @mousedown="doControl('ZOOM_OUT', 0)" @mouseup="doControl('ZOOM_OUT', 1)">调焦</el-button>
           </el-col>
         </el-row>
 <!--        <el-row class="row">-->
@@ -473,4 +483,9 @@ export default {
     width: calc(50vw - 8px);
   }
 }
+
+.el-button.is-active {
+  background-color: #409EFF;
+  color: white;
+}
 </style>

src/components/common/player/playback_v2.vue

@@ -175,7 +175,7 @@ export default {
           },
         ]
         list.forEach(d => {
-          const type = d.cameraType
+          const type = d.live
           const temp = {
             label: d.cameraName,
             ... d

src/page/basicData/components/cameraListEdit.vue

@@ -67,7 +67,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="业务类型" prop="live">
-              <common-select  v-model="form.live" type="BUS_TYPE" :readonly="readonly" />
+              <common-select v-model="form.live" type="CAMERA_LOCATION" :readonly="readonly" />
             </el-form-item>
           </el-col>
         </el-row>

src/utils/systemUtils.js

@@ -295,6 +295,7 @@ export const download2 = (url, fileName) => {
   const a = document.createElement('a');
   a.href = url;
   a.download = fileName || 'download';
+  a.target = '_blank'
   document.body.appendChild(a);
   a.click();
   document.body.removeChild(a);