Merge branch 'master' into dev/通用通道云台控制

web/src/api/device.js

@@ -47,14 +47,22 @@ export function updateDeviceTransport(deviceId, streamMode) {
 export function setGuard(deviceId) {
   return request({
     method: 'get',
-    url: `/api/device/control/guard/${deviceId}/SetGuard`
+    url: `/api/device/control/guard`,
+    params: {
+      deviceId: deviceId,
+      guardCmd: 'SetGuard'
+    }
   })
 }
 
 export function resetGuard(deviceId) {
   return request({
     method: 'get',
-    url: `/api/device/control/guard/${deviceId}/ResetGuard`
+    url: `/api/device/control/guard`,
+    params: {
+      deviceId: deviceId,
+      guardCmd: 'ResetGuard'
+    }
   })
 }
 
@@ -185,12 +193,13 @@ export function changeChannelAudio(params) {
 }
 
 export function updateChannelStreamIdentification(params) {
-  const { deviceDbId, streamIdentification } = params
+  const { deviceDbId, streamIdentification, id } = params
   return request({
     method: 'post',
     url: `/api/device/query/channel/stream/identification/update/`,
     params: {
       deviceDbId: deviceDbId,
+      id: id,
       streamIdentification: streamIdentification
     }
   })

web/src/views/device/channel/index.vue

@@ -55,8 +55,8 @@
             <el-option label="streamnumber:1(子码流-2022)" value="streamnumber:1" />
             <el-option label="streamprofile:0(主码流-大华)" value="streamprofile:0" />
             <el-option label="streamprofile:1(子码流-大华)" value="streamprofile:1" />
-            <el-option label="streamMode:main(主码流-水星+TP-LINK)" value="streamMode:main" />
-            <el-option label="streamMode:sub(子码流-水星+TP-LINK)" value="streamMode:sub" />
+            <el-option label="streamMode:MAIN(主码流-水星+TP-LINK)" value="streamMode:MAIN" />
+            <el-option label="streamMode:SUB(子码流-水星+TP-LINK)" value="streamMode:SUB" />
           </el-select>
         </el-form-item>
         <el-form-item style="float: right;">
@@ -123,8 +123,8 @@
               <el-option label="streamnumber:1(子码流-2022)" value="streamnumber:1" />
               <el-option label="streamprofile:0(主码流-大华)" value="streamprofile:0" />
               <el-option label="streamprofile:1(子码流-大华)" value="streamprofile:1" />
-              <el-option label="streamMode:main(主码流-水星+TP-LINK)" value="streamMode:main" />
-              <el-option label="streamMode:sub(子码流-水星+TP-LINK)" value="streamMode:sub" />
+              <el-option label="streamMode:MAIN(主码流-水星+TP-LINK)" value="streamMode:MAIN" />
+              <el-option label="streamMode:SUB(子码流-水星+TP-LINK)" value="streamMode:SUB" />
             </el-select>
           </template>
         </el-table-column>

web/src/views/device/list.vue

@@ -362,7 +362,7 @@ export default {
         })
     },
     resetGuard: function(itemData) {
-      this.$store.dispatch('device/ResetGuard', itemData.deviceId)
+      this.$store.dispatch('device/resetGuard', itemData.deviceId)
         .then((data) => {
           this.$message.success({
             showClose: true,