Merge branch 'master' into 重构/1078

# Conflicts:
#	web/src/router/index.js
#	web/src/views/common/channelPlayer/chooseChannelForJt.vue
#	web/src/views/common/channelPlayer/jtDeviceEdit.vue
#	web/src/views/common/channelPlayer/jtDevicePlayer.vue
#	web_src/src/layout/UiHeader.vue
#	web_src/src/main.js
#	web_src/src/router/index.js

web/src/store/modules/commonChanel.js

@@ -15,7 +15,22 @@ import {
   clearUnusualCivilCodeList,
   getIndustryList,
   getTypeList,
-  getNetworkIdentificationList, playChannel, addToRegion, deleteFromRegion, addToGroup, deleteFromGroup
+  getNetworkIdentificationList, playChannel, addToRegion, deleteFromRegion, addToGroup, deleteFromGroup, getList,
+  addPointForCruise,
+  addPreset, auxiliary,
+  callPreset,
+  deletePointForCruise,
+  deletePreset, focus, iris, ptz,
+  queryPreset,
+  setCruiseSpeed,
+  setCruiseTime,
+  setLeftForScan,
+  setRightForScan,
+  setSpeedForScan,
+  startCruise,
+  startScan,
+  stopCruise,
+  stopScan, wiper, getAllForMap
 } from '@/api/commonChannel'
 
 const actions = {
@@ -238,6 +253,226 @@ const actions = {
         reject(error)
       })
     })
+  },
+  getList({ commit }, param) {
+    return new Promise((resolve, reject) => {
+      getList(param).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  setSpeedForScan({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      setSpeedForScan(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  setLeftForScan({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      setLeftForScan(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  setRightForScan({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      setRightForScan(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  startScan({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      startScan(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  stopScan({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      stopScan(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  addPointForCruise({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      addPointForCruise(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  deletePointForCruise({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      deletePointForCruise(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  setCruiseSpeed({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      setCruiseSpeed(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  setCruiseTime({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      setCruiseTime(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  startCruise({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      startCruise(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  stopCruise({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      stopCruise(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  addPreset({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      addPreset(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  queryPreset({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      queryPreset(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  callPreset({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      callPreset(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  deletePreset({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      deletePreset(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  auxiliary({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      auxiliary(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  wiper({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      wiper(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  ptz({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      ptz(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  iris({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      iris(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  focus({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      focus(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+  getAllForMap({ commit }, params) {
+    return new Promise((resolve, reject) => {
+      getAllForMap(params).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
   }
 }
 

web/src/store/modules/device.js

@@ -1,17 +1,24 @@
 import {
-  add, changeChannelAudio,
+  add,
+  changeChannelAudio,
   deleteDevice,
   deviceRecord,
   queryBasicParam,
   queryChannelOne,
-  queryChannels, queryChannelTree, queryDeviceOne,
+  queryChannels,
+  queryChannelTree,
+  queryDeviceOne,
   queryDevices,
-  queryDeviceSyncStatus, queryDeviceTree,
+  queryDeviceSyncStatus,
+  queryDeviceTree,
+  queryHasStreamChannels,
   resetGuard,
   setGuard,
   subscribeCatalog,
   subscribeMobilePosition,
-  sync, update, updateChannelStreamIdentification,
+  sync,
+  update,
+  updateChannelStreamIdentification,
   updateDeviceTransport
 } from '@/api/device'
 
@@ -126,6 +133,16 @@ const actions = {
       })
     })
   },
+  queryHasStreamChannels({commit}, params) {
+    return new Promise((resolve, reject) => {
+      queryHasStreamChannels(params).then(response => {
+        const {data} = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
   deviceRecord({ commit }, params) {
     return new Promise((resolve, reject) => {
       deviceRecord(params).then(response => {

web/src/store/modules/group.js

@@ -1,7 +1,7 @@
 import {
   getTreeList,
   update,
-  add, deleteGroup, getPath
+  add, deleteGroup, getPath, queryTree
 } from '@/api/group'
 
 const actions = {
@@ -54,6 +54,16 @@ const actions = {
         reject(error)
       })
     })
+  },
+  queryTree({ commit }, param) {
+    return new Promise((resolve, reject) => {
+      queryTree(param).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
   }
 }
 

web/src/store/modules/region.js

@@ -6,7 +6,7 @@ import {
   queryChildListInBase,
   update,
   add,
-  queryPath
+  queryPath, queryTree
 } from '@/api/region'
 
 const actions = {
@@ -89,6 +89,16 @@ const actions = {
         reject(error)
       })
     })
+  },
+  queryTree({ commit }, param) {
+    return new Promise((resolve, reject) => {
+      queryTree(param).then(response => {
+        const { data } = response
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
   }
 }