Merge branch 'dev' of http://8.136.197.230:3000/sheyang/sheyangCoastalSystem into dev

Reviewed-on: #4

.env

@@ -0,0 +1 @@
+VUE_APP_OSS = http://50.146.63.224:8118

package-lock.json

@@ -16,7 +16,6 @@
         "element-ui": "^2.15.14",
         "js-cookie": "^3.0.5",
         "json-loader": "^0.5.7",
-        "postcss": "^8.4.38",
         "vue": "^2.6.14",
         "vue-router": "^3.5.1",
         "vuex": "^3.6.2"
@@ -8869,13 +8868,13 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dependencies": {
-        "nanoid": "^3.3.7",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.2.0"
+        "source-map-js": "^1.0.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -10318,9 +10317,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18981,13 +18980,13 @@
       }
     },
     "postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "requires": {
-        "nanoid": "^3.3.7",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.2.0"
+        "source-map-js": "^1.0.2"
       }
     },
     "postcss-calc": {
@@ -20064,9 +20063,9 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
     },
     "source-map-support": {
       "version": "0.5.21",

package.json

@@ -16,7 +16,6 @@
     "element-ui": "^2.15.14",
     "js-cookie": "^3.0.5",
     "json-loader": "^0.5.7",
-    "postcss": "^8.4.38",
     "vue": "^2.6.14",
     "vue-router": "^3.5.1",
     "vuex": "^3.6.2"

public/index.html

@@ -9,7 +9,7 @@
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
-  <!-- <script type="text/javascript" src="<%= BASE_URL %>js/liveplayer-lib.min.js"></script> -->
+  <script type="text/javascript" src="./liveplayer-lib.min.js"></script>
   <!-- 引入MineMap API插件 -->
   <link rel="stylesheet" href="http://50.144.11.244:21009/support/static/api/demo/js-api/zh/css/demo.css">
   <link rel="stylesheet" href="http://50.144.11.244:21009/minemapapi/v2.1.0/minemap.css">

src/api/coastalMap/police/index.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+import axios from 'axios'
+
+// * 警力分布 - 派出所信息
+export const getPoliceHouseAPI = (params) => {
+  return request({
+    url: '/base/metaPoliceStationInfo',
+    method: 'get',
+    params
+  })
+}
+// * 警力分布 - 警务室信息
+export const getPoliceOfficeAPI = (params) => {
+  return request({
+    url: '/base/metaPoliceOfficeInfo',
+    method: 'get',
+    params
+  })
+}
+// * 警力分布 - 执法记录仪信息
+export const getDeviceStatusAPI = (params) => {
+  return request({
+    url: '/base/devopsVideoInfo',
+    method: 'get',
+    params
+  })
+}
+
+// * 350M 数据，第三方接口
+export const get350mDataAPI = (params) => {
+  return axios({
+    url: 'http://50.144.13.130:30000/pgis2/pgis-deploy/pdt/v2/list?serviceToken=0ceec8c6-dfbb-462e-876d-15fa90fae54b&device_id=51533549',
+    method: 'get',
+    params
+  })
+}
+
+// * 实时警情
+export const postRealPoliceAPI = (data) => {
+  return request({
+    url: '/base/bigscreen/realTimeAlarmSituation',
+    method: 'post',
+    data
+  })
+}
+
+// * 警车数据
+export const postPoliceCarAPI = (data) => {
+  return request({
+    url: '/base/bigscreen/policeVehicleList',
+    method: 'post',
+    data
+  })
+}

src/api/coastalMap/realhouse/index.js

@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+// TODO 楼栋信息模块
+
+// * 获取楼栋信息
+export const postBuildInformationAPI = (params) => {
+  return request({
+    url: '/base/bigscreen/buildingInformation',
+    method: 'post',
+    params
+  })
+}
+
+// * 获取房屋结构
+export const postBuildStructureAPI = (params) => {
+  return request({
+    url: '/base/bigscreen/buildStructure',
+    method: 'post',
+    params
+  })
+}
+
+// * 获取实有房屋统计
+export const postBuildRealEstateAPI = (params) => {
+  return request({
+    url: '/base/bigscreen/buildRealEstate',
+    method: 'post',
+    params
+  })
+}
+
+// * 获取实有人口统计
+export const postBuildRealActualAPI = (params) => {
+  return request({
+    url: '/base/bigscreen/buildRealActual',
+    method: 'post',
+    params
+  })
+}
+
+// * 楼栋信息 - 户室信息
+export const postBuildHouseAPI = (params) => {
+  return request({
+    url: '/base/bigscreen/buildInformation',
+    method: 'post',
+    params
+  })
+}
+
+// * 楼栋信息 - 楼栋点位统计
+export const postBuildLocationAPI = (params) => {
+  return request({
+    url: '/base/bigscreen/buildLocationStatistics',
+    method: 'post',
+    params
+  })
+}

src/api/coastalMap/resource/index.js

@@ -8,7 +8,6 @@ export function get_person_num(params) {
     params
   })
 }
-
 // * 资源概况
 export function getResourceAPI(data) {
   return request({
@@ -17,8 +16,7 @@ export function getResourceAPI(data) {
     data
   })
 }
-
-// * 重点人员
+// * 重点人员(图表)
 export const keyPersonnelAPI = (data) => {
   return request({
     url: '/base/bigscreen/keyPersonnel',
@@ -26,7 +24,14 @@ export const keyPersonnelAPI = (data) => {
     data
   })
 }
-
+// * 重点人员信息(轮播)
+export const MetaImpUserInfoAPI = (params) => {
+  return request({
+    url: '/base/metaImpUserInfo',
+    method: 'get',
+    params
+  })
+}
 // * 警力分布
 export const PoliceForceDistributionAPI = (data) => {
   return request({
@@ -35,7 +40,22 @@ export const PoliceForceDistributionAPI = (data) => {
     data
   })
 }
-
+// * 警情统计
+export const PoliceStatisticsAPI = (data) => {
+  return request({
+    url: '/base/bigscreen/policeSituationStatistics',
+    method: 'post',
+    data
+  })
+}
+// * 警情信息表
+export const MetaAlarmInfo = (params) => {
+  return request({
+    url: '/base/metaAlarmInfo',
+    method: 'get',
+    params
+  })
+}
 // * 涉海要素
 export const seaRelatedElementsAPI = (data) => {
   return request({
@@ -44,3 +64,67 @@ export const seaRelatedElementsAPI = (data) => {
     data
   })
 }
+// * 获取实有人口
+export const getMetaActualUserAPI = (params) => {
+  return request({
+    url: '/base/metaActualUserInfo',
+    method: 'get',
+    params
+  })
+}
+// * 获取实有单位
+export const getMetaActualUnitAPI = (params) => {
+  return request({
+    url: '/base/metaActualUnitInfo',
+    method: 'get',
+    params
+  })
+}
+// * 获取实有房屋
+export const getMetaActualEstateAPI = (params) => {
+  return request({
+    url: '/base/metaRealEstateInfo',
+    method: 'get',
+    params
+  })
+}
+// * 获取重点警情
+export const postPoliceSituationAPI = (params) => {
+  return request({
+    url: '/base/bigscreen/policeSituationStatisticsList',
+    method: 'post',
+    params
+  })
+}
+// * 获取港口信息
+export const getMetaPortInfoAPI = (params) => {
+  return request({
+    url: '/base/metaPortInfo',
+    method: 'get',
+    params
+  })
+}
+// * 获取码头信息
+export const getMetaWharfInfoAPI = (params) => {
+  return request({
+    url: '/base/metaWharfInfo',
+    method: 'get',
+    params
+  })
+}
+// * 单位从业人员信息
+export const getWorkerInfoAPI = (params) => {
+  return request({
+    url: '/base/metaActualUnitUserInfo',
+    method: 'get',
+    params
+  })
+}
+// * 重点人员轨迹
+export const get_key_line = (params) => {
+  return request({
+    url: '/base/transitImpUserRecord',
+    method: 'get',
+    params
+  })
+}

src/api/control/index.js

@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 // 查询在控人员数据
 export function get_list(params) {
-    return request({
-        url:'/sheyang/gambler',
-        method:'get',
-        params
-    })
-}
+  return request({
+    url: '/sheyang/gambler',
+    method: 'get',
+    params
+  })
+}

src/api/dict/realhouse/index.js

@@ -0,0 +1,6 @@
+import request from '@/utils/request'
+
+// * 字典
+export const getDictData = (dictType) => {
+  return request.get(`/system/dict/data/type/${dictType}`)
+}

src/api/facility.js

@@ -1,4 +1,4 @@
-import request from '../utils/request'
+import http from '@/utils/http'
 import { getToken } from '@/utils/token'
 import axios from 'axios'
 
@@ -6,38 +6,52 @@ const token = getToken()
 
 // * 登录接口获取 token
 export const login = () => {
-  return request.get('/api/v1/login', {
+  return http.get('/api/v1/login', {
     params: {
       username: 'admin',
-      password: 'AF7548EEDFF8e737C0E4B2A669497290',
-      url_token_only: true
+      password: 'AF7548EEDFF8e737C0E4B2A669497290'
     }
   })
 }
 
 // * 获取设备信息列表
 export const getDeviceListAPI = (params) => {
-  return request.get(
+  return http.get(
     `/api/v1/device/channellist?start=${params.start}&limit=${params.limit}&online=${params.online}&token=${token}`
   )
 }
 
 // * 获取视频列表
 export const getVideoListAPI = (channel) => {
-  return request.get(
-    `/api/v1/stream/start?serial=${'32092400002005063063'}&channel=${channel}&timeout=${500}&check_channel_status=${true}&token=${token}`
+  return http.get(
+    `/api/v1/stream/start?serial=${'32092400002005063063'}&code=${channel}&token=${token}`
+    // `/api/v1/stream/start?serial=${'32092400002005063063'}&code=${channel}&timeout=${500}&check_channel_status=${true}&token=${token}`
+  )
+}
+// * 查询录像回放
+export const check_video = (channel,starttime,endtime) => {
+  return http.get(
+    `/api/v1/playback/start?serial=${'32092400002005063063'}&code=${channel}&starttime=${starttime}&endtime=${endtime}&token=${token}`
+    // `/api/v1/stream/start?serial=${'32092400002005063063'}&code=${channel}&timeout=${500}&check_channel_status=${true}&token=${token}`
+  )
+}
+
+// * 获取直播流列表
+export const getLiveVideoList = () => {
+  return http.get(
+    `/api/v1/stream/list?start=0&limit=10000&serial=32092400002005063063&token=${token}`
   )
 }
 
 // * 退出登录
 export const logoutAPI = () => {
-  return request.get('/api/v1/logout')
+  return http.get('/api/v1/logout')
 }
 
 // * 关闭视频流
 export const getCloseVideoAPI = (channel) => {
-  return request.get(
-    `/api/v1/stream/stop?serial=${'32092400002005063063'}&channel=${channel}&token=${token}`
+  return http.get(
+    `/api/v1/stream/stop?serial=${'32092400002005063063'}&code=${channel}&token=${token}`
   )
 }
 

src/api/hunting/home.js

@@ -0,0 +1,4 @@
+import request from '@/utils/request'
+
+export const getResources = () => request.post('/base/poaching/overviewResources')
+export const getStatistics = () => request.post('/base/poaching/personnelStatistics')

src/api/hunting/hunter.js

@@ -0,0 +1,3 @@
+import request from '@/utils/request'
+
+export const listHunter = (params) => request.get('/base/transitHuntersUserModelRecord', { params })

src/api/hunting/user.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request'
+
+export const listUser = (params) =>
+  request.get('/base/metaHuntersInfo', { params })
+export const addUser = (data) => request.post('/base/metaHuntersInfo', data)
+export const editUser = (data) => request.put('/base/metaHuntersInfo', data)
+export const delUser = (idList) =>
+  request.delete('/base/metaHuntersInfo', {
+    params: { idList: idList.join(',') }
+  })
+export const getUserType = () =>
+  request.get('/system/dict/data/list', {
+    params: { dictType: 'hunters_user_type' }
+  })

src/api/hunting/vehicle.js

@@ -0,0 +1,6 @@
+import request from '@/utils/request'
+
+export const listVehicle = (params) => request.get('/base/transitHuntersVehicleRecord', { params })
+export const addVehicle = (data) => request.post('/base/transitHuntersVehicleRecord', data)
+export const editVehicle = (data) => request.put('/base/transitHuntersVehicleRecord', data)
+export const delVehicle = (idList) => request.delete('/base/transitHuntersVehicleRecord', { params: { idList: idList.join(',') } })

src/api/policeWorkbench/index.js

@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 // 查询所有菜单内容
 export function get_menu(params) {
-    return request({
-        url:'/system/menu/list',
-        method:'get',
-        params
-    })
-}
+  return request({
+    url: '/system/menu/list',
+    method: 'get',
+    params
+  })
+}

src/api/sensingDevice/resource/index.js

@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+// 人脸抓拍
+export function getTransitUserAPI(params) {
+  return request({
+    url: '/base/transitImpUserRecord',
+    method: 'get',
+    params
+  })
+}
+//车辆抓拍
+export function transitVehicleRecord(params) {
+  return request({
+    url: '/base/transitVehicleRecord',
+    method: 'get',
+    params
+  })
+}
+//人车数量
+export function humanVehicleStatistics(params) {
+  return request({
+    url: '/base/perceptionDevice/humanVehicleStatistics',
+    method: 'post',
+    params
+  })
+}
+//人流量
+export function humanTrafficStatistics(params) {
+  return request({
+    url: '/base/perceptionDevice/humanTrafficStatistics',
+    method: 'post',
+    params
+  })
+}
+//车流量
+export function vehicleTrafficStatistics(params) {
+  return request({
+    url: '/base/perceptionDevice/vehicleTrafficStatistics',
+    method: 'post',
+    params
+  })
+}
+// 感知设备点位
+export function get_device(params) {
+  return request({
+    url: '/base/devopsDeviceInfo',
+    method: 'get',
+    params
+  })
+}

src/api/videoMonitor/index.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+// * 查询监控设备列表
+export const getDeviceListAPI = (params) => {
+  return request({
+    url: '/base/devopsVideoInfo',
+    method: 'get',
+    params
+  })
+}
+export function get_channel_data(params) {
+  return request({
+    url: '/base/devopsVideoInfo',
+    method: 'get',
+    params
+  })
+}