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/api/commonChannel.js

@@ -2,32 +2,6 @@ import request from '@/utils/request'
 
 // 通用通道API
 
-export function update(data) {
-  return request({
-    method: 'post',
-    url: '/api/common/channel/update',
-    data: data
-  })
-}
-
-export function add(data) {
-  return request({
-    method: 'post',
-    url: '/api/common/channel/add',
-    data: data
-  })
-}
-
-export function reset(id) {
-  return request({
-    method: 'post',
-    url: '/api/common/channel/reset',
-    params: {
-      id: id
-    }
-  })
-}
-
 export function queryOne(id) {
   return request({
     method: 'get',
@@ -38,180 +12,6 @@ export function queryOne(id) {
   })
 }
 
-export function addDeviceToGroup(params) {
-  const { parentId, businessGroup, deviceIds } = params
-  return request({
-    method: 'post',
-    url: `/api/common/channel/group/device/add`,
-    data: {
-      parentId: parentId,
-      businessGroup: businessGroup,
-      deviceIds: deviceIds
-    }
-  })
-}
-
-export function addToGroup(params) {
-  const { parentId, businessGroup, channelIds } = params
-  return request({
-    method: 'post',
-    url: `/api/common/channel/group/add`,
-    data: {
-      parentId: parentId,
-      businessGroup: businessGroup,
-      channelIds: channelIds
-    }
-  })
-}
-
-export function deleteDeviceFromGroup(deviceIds) {
-  return request({
-    method: 'post',
-    url: `/api/common/channel/group/device/delete`,
-    data: {
-      deviceIds: deviceIds
-    }
-  })
-}
-
-export function deleteFromGroup(channels) {
-  return request({
-    method: 'post',
-    url: `/api/common/channel/group/delete`,
-    data: {
-      channelIds: channels
-    }
-  })
-}
-
-export function addDeviceToRegion(params) {
-  const { civilCode, deviceIds } = params
-  return request({
-    method: 'post',
-    url: `/api/common/channel/region/device/add`,
-    data: {
-      civilCode: civilCode,
-      deviceIds: deviceIds
-    }
-  })
-}
-export function addToRegion(params) {
-  const { civilCode, channelIds } = params
-  return request({
-    method: 'post',
-    url: `/api/common/channel/region/add`,
-    data: {
-      civilCode: civilCode,
-      channelIds: channelIds
-    }
-  })
-}
-
-export function deleteDeviceFromRegion(deviceIds) {
-  return request({
-    method: 'post',
-    url: `/api/common/channel/region/device/delete`,
-    data: {
-      deviceIds: deviceIds
-    }
-  })
-}
-export function deleteFromRegion(channels) {
-  return request({
-    method: 'post',
-    url: `/api/common/channel/region/delete`,
-    data: {
-      channelIds: channels
-    }
-  })
-}
-
-export function getCivilCodeList(params) {
-  const { page, count, channelType, query, online, civilCode } = params
-  return request({
-    method: 'get',
-    url: `/api/common/channel/civilcode/list`,
-    params: {
-      page: page,
-      count: count,
-      channelType: channelType,
-      query: query,
-      online: online,
-      civilCode: civilCode
-    }
-  })
-}
-
-export function getParentList(params) {
-  const { page, count, channelType, query, online, groupDeviceId } = params
-  return request({
-    method: 'get',
-    url: `/api/common/channel/parent/list`,
-    params: {
-      page: page,
-      count: count,
-      channelType: channelType,
-      query: query,
-      online: online,
-      groupDeviceId: groupDeviceId
-    }
-  })
-}
-
-export function getUnusualParentList(params) {
-  const { page, count, channelType, query, online } = params
-  return request({
-    method: 'get',
-    url: `/api/common/channel/parent/unusual/list`,
-    params: {
-      page: page,
-      count: count,
-      channelType: channelType,
-      query: query,
-      online: online
-    }
-  })
-}
-
-export function clearUnusualParentList(params) {
-  const { all, channelIds } = params
-  return request({
-    method: 'post',
-    url: `/api/common/channel/parent/unusual/clear`,
-    data: {
-      all: all,
-      channelIds: channelIds
-    }
-  })
-}
-
-export function getUnusualCivilCodeList(params) {
-  const { page, count, channelType, query, online } = params
-  return request({
-    method: 'get',
-    url: `/api/common/channel/civilCode/unusual/list`,
-    params: {
-      page: page,
-      count: count,
-      channelType: channelType,
-      query: query,
-      online: online
-    }
-  })
-}
-
-export function clearUnusualCivilCodeList(params) {
-  const { all, channelIds } = params
-  return request({
-    method: 'post',
-    url: `/api/common/channel/civilCode/unusual/clear`,
-    data: {
-      all: all,
-      channelIds: channelIds
-    }
-  })
-}
-
 export function getIndustryList() {
   return request({
     method: 'get',
@@ -233,6 +33,224 @@ export function getNetworkIdentificationList() {
   })
 }
 
+export function update(data) {
+  return request({
+    method: 'post',
+    url: '/api/common/channel/update',
+    data: data
+  })
+}
+
+export function reset(id) {
+  return request({
+    method: 'post',
+    url: '/api/common/channel/reset',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function add(data) {
+  return request({
+    method: 'post',
+    url: '/api/common/channel/add',
+    data: data
+  })
+}
+
+export function getList(params) {
+  const { page, count, query, online, hasRecordPlan, channelType } = params
+  return request({
+    method: 'get',
+    url: `/api/common/channel/list`,
+    params: {
+      page: page,
+      count: count,
+      channelType: channelType,
+      query: query,
+      online: online,
+      hasRecordPlan: hasRecordPlan
+    }
+  })
+}
+
+export function getCivilCodeList(params) {
+  const { page, count, channelType, query, online, civilCode } = params
+  return request({
+    method: 'get',
+    url: `/api/common/channel/civilcode/list`,
+    params: {
+      page: page,
+      count: count,
+      channelType: channelType,
+      query: query,
+      online: online,
+      civilCode: civilCode
+    }
+  })
+}
+
+export function getUnusualCivilCodeList(params) {
+  const { page, count, channelType, query, online } = params
+  return request({
+    method: 'get',
+    url: `/api/common/channel/civilCode/unusual/list`,
+    params: {
+      page: page,
+      count: count,
+      channelType: channelType,
+      query: query,
+      online: online
+    }
+  })
+}
+
+export function getUnusualParentList(params) {
+  const { page, count, channelType, query, online } = params
+  return request({
+    method: 'get',
+    url: `/api/common/channel/parent/unusual/list`,
+    params: {
+      page: page,
+      count: count,
+      channelType: channelType,
+      query: query,
+      online: online
+    }
+  })
+}
+
+export function clearUnusualCivilCodeList(params) {
+  const { all, channelIds } = params
+  return request({
+    method: 'post',
+    url: `/api/common/channel/civilCode/unusual/clear`,
+    data: {
+      all: all,
+      channelIds: channelIds
+    }
+  })
+}
+
+export function clearUnusualParentList(params) {
+  const { all, channelIds } = params
+  return request({
+    method: 'post',
+    url: `/api/common/channel/parent/unusual/clear`,
+    data: {
+      all: all,
+      channelIds: channelIds
+    }
+  })
+}
+
+export function getParentList(params) {
+  const { page, count, channelType, query, online, groupDeviceId } = params
+  return request({
+    method: 'get',
+    url: `/api/common/channel/parent/list`,
+    params: {
+      page: page,
+      count: count,
+      channelType: channelType,
+      query: query,
+      online: online,
+      groupDeviceId: groupDeviceId
+    }
+  })
+}
+
+export function addToRegion(params) {
+  const { civilCode, channelIds } = params
+  return request({
+    method: 'post',
+    url: `/api/common/channel/region/add`,
+    data: {
+      civilCode: civilCode,
+      channelIds: channelIds
+    }
+  })
+}
+
+export function deleteFromRegion(channels) {
+  return request({
+    method: 'post',
+    url: `/api/common/channel/region/delete`,
+    data: {
+      channelIds: channels
+    }
+  })
+}
+
+export function addDeviceToRegion(params) {
+  const { civilCode, deviceIds } = params
+  return request({
+    method: 'post',
+    url: `/api/common/channel/region/device/add`,
+    data: {
+      civilCode: civilCode,
+      deviceIds: deviceIds
+    }
+  })
+}
+
+export function deleteDeviceFromRegion(deviceIds) {
+  return request({
+    method: 'post',
+    url: `/api/common/channel/region/device/delete`,
+    data: {
+      deviceIds: deviceIds
+    }
+  })
+}
+
+export function addToGroup(params) {
+  const { parentId, businessGroup, channelIds } = params
+  return request({
+    method: 'post',
+    url: `/api/common/channel/group/add`,
+    data: {
+      parentId: parentId,
+      businessGroup: businessGroup,
+      channelIds: channelIds
+    }
+  })
+}
+
+export function deleteFromGroup(channels) {
+  return request({
+    method: 'post',
+    url: `/api/common/channel/group/delete`,
+    data: {
+      channelIds: channels
+    }
+  })
+}
+
+export function addDeviceToGroup(params) {
+  const { parentId, businessGroup, deviceIds } = params
+  return request({
+    method: 'post',
+    url: `/api/common/channel/group/device/add`,
+    data: {
+      parentId: parentId,
+      businessGroup: businessGroup,
+      deviceIds: deviceIds
+    }
+  })
+}
+
+export function deleteDeviceFromGroup(deviceIds) {
+  return request({
+    method: 'post',
+    url: `/api/common/channel/group/device/delete`,
+    data: {
+      deviceIds: deviceIds
+    }
+  })
+}
+
 export function playChannel(channelId) {
   return request({
     method: 'get',

web/src/api/device.js

@@ -118,6 +118,19 @@ export function queryChannels(deviceId, params) {
   })
 }
 
+export function queryHasStreamChannels(params) {
+  const {page, count, query} = params
+  return request({
+    method: 'get',
+    url: `/api/device/query/streams`,
+    params: {
+      page: page,
+      count: count,
+      query: query
+    }
+  })
+}
+
 export function deviceRecord(params) {
   const { deviceId, channelId, recordCmdStr } = params
   return request({

web/src/api/group.js

@@ -48,3 +48,15 @@ export function getPath(params) {
     }
   })
 }
+export function queryTree(params) {
+  const { page, count, query } = params
+  return request({
+    method: 'get',
+    url: `/api/group/tree/query`,
+    params: {
+      query: query,
+      page: page,
+      count: count
+    }
+  })
+}

web/src/api/region.js

@@ -81,4 +81,16 @@ export function queryPath(deviceId) {
     }
   })
 }
+export function queryTree(params) {
+  const { page, count, query } = params
+  return request({
+    method: 'get',
+    url: `/api/region/tree/query`,
+    params: {
+      query: query,
+      page: page,
+      count: count
+    }
+  })
+}