From 3758ae8c24ef2aeddd8c6451a49ff6d2b85c8122 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Thu, 1 Jun 2023 18:26:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/correlationEquipment/index.js | 22 +- src/api/download/index.js | 4 +- src/utils/auth.js | 8 +- .../components/deletePerception.vue | 106 ++++ .../components/equipmentTable.vue | 90 ++- .../components/exportPerception.vue | 110 ++++ .../components/exportVideo.vue | 110 ++++ .../components/importPerception.vue | 226 +++++++ .../components/importVideo.vue | 218 ++++++- .../components/perceptionForm.vue | 583 ++++++++++++++++++ .../components/videoForm.vue | 1 - 11 files changed, 1462 insertions(+), 16 deletions(-) create mode 100644 src/views/systemManagement/correlationEquipment2/components/deletePerception.vue create mode 100644 src/views/systemManagement/correlationEquipment2/components/exportPerception.vue create mode 100644 src/views/systemManagement/correlationEquipment2/components/exportVideo.vue create mode 100644 src/views/systemManagement/correlationEquipment2/components/importPerception.vue create mode 100644 src/views/systemManagement/correlationEquipment2/components/perceptionForm.vue diff --git a/src/api/correlationEquipment/index.js b/src/api/correlationEquipment/index.js index 535f5e8..479881d 100644 --- a/src/api/correlationEquipment/index.js +++ b/src/api/correlationEquipment/index.js @@ -1,5 +1,6 @@ // 系统管理模块接口 import request from '@/utils/request' +import { getToken } from '@/utils/auth' // 字典表查询 export function commonDict(params) { return request({ @@ -71,11 +72,21 @@ export function importVideoList(params) { params }) } +// 下载视频监控模板 +export function importTemplateVideo(params) { + return request({ + url: '/safety/tbDeviceVideoInfo/importTemplate', + method: 'post', + params, + responseType: 'blob', + headers: { 'Access-Control-Allow-origin': '*', 'Content-Type': 'application/json; charset=UTF-8', 'Authorization': 'Bearer ' + getToken() } + }) +} // 新增智能感应 export function addPerceptionList(params) { return request({ url: '/safety/tbDevicePerceptionInfo/insert', - method: 'get', + method: 'post', params }) } @@ -87,7 +98,14 @@ export function changePerceptionList(params) { params }) } -// 导出视频监控 +// 删除智能感应 +export function deletePerception(params) { + return request({ + url: '/safety/tbDevicePerceptionInfo?' + params, + method: 'delete', + }) +} +// 导出视频监控 export function exportVideo(params) { return request({ url: '/safety/tbDeviceVideoInfo/export', diff --git a/src/api/download/index.js b/src/api/download/index.js index 9b012a7..2710be3 100644 --- a/src/api/download/index.js +++ b/src/api/download/index.js @@ -3,8 +3,8 @@ import { getToken } from '@/utils/auth' //通用下载接口 export function download(params) { return axios({ - url: `http://${window.location.host}/download`, - //url: 'http://218.92.196.102:8118/hjapi/common/download', + url: `http://${window.location.host}/hjapi/common/download`, + //url: 'http://218.92.196.102:8888/zhapi/common/download', //url: 'http://192.168.0.188:8118/hjapi/common/download', method: 'get', params, diff --git a/src/utils/auth.js b/src/utils/auth.js index 08a43d6..cdc1815 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -1,15 +1,15 @@ import Cookies from 'js-cookie' -const TokenKey = 'Admin-Token' +const zhToken = 'Admin-Token' export function getToken() { - return Cookies.get(TokenKey) + return Cookies.get(zhToken) } export function setToken(token) { - return Cookies.set(TokenKey, token) + return Cookies.set(zhToken, token) } export function removeToken() { - return Cookies.remove(TokenKey) + return Cookies.remove(zhToken) } diff --git a/src/views/systemManagement/correlationEquipment2/components/deletePerception.vue b/src/views/systemManagement/correlationEquipment2/components/deletePerception.vue new file mode 100644 index 0000000..411d18b --- /dev/null +++ b/src/views/systemManagement/correlationEquipment2/components/deletePerception.vue @@ -0,0 +1,106 @@ + + + \ No newline at end of file diff --git a/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue b/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue index c59ccd8..cc5fbce 100644 --- a/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue +++ b/src/views/systemManagement/correlationEquipment2/components/equipmentTable.vue @@ -113,7 +113,11 @@
- + {{ item.label }} @@ -124,6 +128,7 @@ :header-cell-style="table_header" :data="table_data" :highlight-current-row="true" + @selection-change="handle_perception_change" height="336" > @@ -139,13 +144,13 @@ 编辑 详情 @@ -169,16 +174,47 @@ + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/src/views/systemManagement/correlationEquipment2/components/exportVideo.vue b/src/views/systemManagement/correlationEquipment2/components/exportVideo.vue new file mode 100644 index 0000000..7deb6b6 --- /dev/null +++ b/src/views/systemManagement/correlationEquipment2/components/exportVideo.vue @@ -0,0 +1,110 @@ + + + \ No newline at end of file diff --git a/src/views/systemManagement/correlationEquipment2/components/importPerception.vue b/src/views/systemManagement/correlationEquipment2/components/importPerception.vue new file mode 100644 index 0000000..b835a4d --- /dev/null +++ b/src/views/systemManagement/correlationEquipment2/components/importPerception.vue @@ -0,0 +1,226 @@ + + + \ No newline at end of file diff --git a/src/views/systemManagement/correlationEquipment2/components/importVideo.vue b/src/views/systemManagement/correlationEquipment2/components/importVideo.vue index cdbe8ac..576ce50 100644 --- a/src/views/systemManagement/correlationEquipment2/components/importVideo.vue +++ b/src/views/systemManagement/correlationEquipment2/components/importVideo.vue @@ -1,12 +1,226 @@ \ No newline at end of file diff --git a/src/views/systemManagement/correlationEquipment2/components/perceptionForm.vue b/src/views/systemManagement/correlationEquipment2/components/perceptionForm.vue new file mode 100644 index 0000000..3d1d015 --- /dev/null +++ b/src/views/systemManagement/correlationEquipment2/components/perceptionForm.vue @@ -0,0 +1,583 @@ + + + \ No newline at end of file diff --git a/src/views/systemManagement/correlationEquipment2/components/videoForm.vue b/src/views/systemManagement/correlationEquipment2/components/videoForm.vue index 90cad14..4ecfc2b 100644 --- a/src/views/systemManagement/correlationEquipment2/components/videoForm.vue +++ b/src/views/systemManagement/correlationEquipment2/components/videoForm.vue @@ -158,7 +158,6 @@ import { changeVideoList, } from "@/api/correlationEquipment"; // import { validateIP } from "@/utils/publicMethod_lxy/validator"; - export default { name: "VideoForm", data() {