From eda71f56112930af7ce71b648d7267af4326f246 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Thu, 11 May 2023 09:24:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemManagement/companyList/index.vue | 2 +- .../components/addPerceptionDialog.vue | 383 +++++++++++++----- .../components/addVideoDialog.vue | 77 ++-- .../components/equipmentTable.vue | 2 +- .../correlationEquipment/index.vue | 8 +- 5 files changed, 336 insertions(+), 136 deletions(-) diff --git a/src/views/systemManagement/companyList/index.vue b/src/views/systemManagement/companyList/index.vue index 91a3c5b..0c054e4 100644 --- a/src/views/systemManagement/companyList/index.vue +++ b/src/views/systemManagement/companyList/index.vue @@ -392,7 +392,7 @@ export default { /* 图片鼠标经过按钮 */ .btn { - margin-left: 25%; + margin-left: 20%; margin-top: 25%; button { diff --git a/src/views/systemManagement/correlationEquipment/components/addPerceptionDialog.vue b/src/views/systemManagement/correlationEquipment/components/addPerceptionDialog.vue index 6b0ee52..a425cba 100644 --- a/src/views/systemManagement/correlationEquipment/components/addPerceptionDialog.vue +++ b/src/views/systemManagement/correlationEquipment/components/addPerceptionDialog.vue @@ -11,196 +11,368 @@

设备基础信息

- - + + - - + - - + + - - + + - - + + - - + + - - + + + + + - - + + + + +

视频通道信息

- - - + + + - - + + - - + + - - + +

设备位置信息

- - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +

设备其他信息

- - - + + + - - + + - - + + - - + + - - + + - - + +
- - \ No newline at end of file diff --git a/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue b/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue index a62c97d..b16d9fb 100644 --- a/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue +++ b/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue @@ -4,6 +4,7 @@ class="dialog" :title="dialogTitle" :visible.sync="visible" + @close="close()" :close-on-click-modal="false" width="970px" > @@ -32,6 +33,8 @@ + + diff --git a/src/views/systemManagement/correlationEquipment/components/deriveDialog.vue b/src/views/systemManagement/correlationEquipment/components/deriveDialog.vue index 2c40e90..4396340 100644 --- a/src/views/systemManagement/correlationEquipment/components/deriveDialog.vue +++ b/src/views/systemManagement/correlationEquipment/components/deriveDialog.vue @@ -18,8 +18,15 @@ + \ No newline at end of file From ef7ee79f7d8e31d179b61a1fb3e5a5332a0dc8fb Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Mon, 15 May 2023 09:09:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B9=B3=E5=AE=89=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/systemManagement/safeIndex/index.js | 19 +- .../safeIndex/components/indexTable.vue | 565 ++++++++++++++++++ .../safeIndex/components/indexmassageOne.vue | 180 ++++++ .../components/indexmassageThree.vue | 14 + .../safeIndex/components/indexmassageTwo.vue | 14 + .../systemManagement/safeIndex/index.vue | 413 ++++++++++++- 6 files changed, 1192 insertions(+), 13 deletions(-) create mode 100644 src/views/systemManagement/safeIndex/components/indexTable.vue create mode 100644 src/views/systemManagement/safeIndex/components/indexmassageOne.vue create mode 100644 src/views/systemManagement/safeIndex/components/indexmassageThree.vue create mode 100644 src/views/systemManagement/safeIndex/components/indexmassageTwo.vue diff --git a/src/api/systemManagement/safeIndex/index.js b/src/api/systemManagement/safeIndex/index.js index ad8ffbd..5a43e7d 100644 --- a/src/api/systemManagement/safeIndex/index.js +++ b/src/api/systemManagement/safeIndex/index.js @@ -1,9 +1,26 @@ -// 平安指数模块接口 +// 平安指数模块接口 import request from '@/utils/request' +// 请求综合指数 export function safeCalculation(params) { return request({ url: '/safety/system/tbSafeCalculationRule/getCalculationRule', method: 'post', params }) +} +// 修改综合指数 +export function saveSafeCalculation(data) { + return request({ + url: '/safety/system/tbSafeCalculationRule', + method: 'put', + data + }) +} +// 指标表格数据 +export function getIndexTable(params) { + return request({ + url: '/safety/system/tbSafeRule/getRuleTree', + method: 'post', + params + }) } \ No newline at end of file diff --git a/src/views/systemManagement/safeIndex/components/indexTable.vue b/src/views/systemManagement/safeIndex/components/indexTable.vue new file mode 100644 index 0000000..5598e3e --- /dev/null +++ b/src/views/systemManagement/safeIndex/components/indexTable.vue @@ -0,0 +1,565 @@ + + + + \ No newline at end of file diff --git a/src/views/systemManagement/safeIndex/components/indexmassageOne.vue b/src/views/systemManagement/safeIndex/components/indexmassageOne.vue new file mode 100644 index 0000000..affd47c --- /dev/null +++ b/src/views/systemManagement/safeIndex/components/indexmassageOne.vue @@ -0,0 +1,180 @@ + + + + \ No newline at end of file diff --git a/src/views/systemManagement/safeIndex/components/indexmassageThree.vue b/src/views/systemManagement/safeIndex/components/indexmassageThree.vue new file mode 100644 index 0000000..f3e3d77 --- /dev/null +++ b/src/views/systemManagement/safeIndex/components/indexmassageThree.vue @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue b/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue new file mode 100644 index 0000000..0765e73 --- /dev/null +++ b/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue @@ -0,0 +1,14 @@ + + + + \ No newline at end of file diff --git a/src/views/systemManagement/safeIndex/index.vue b/src/views/systemManagement/safeIndex/index.vue index 8eafc36..cf13ef4 100644 --- a/src/views/systemManagement/safeIndex/index.vue +++ b/src/views/systemManagement/safeIndex/index.vue @@ -8,28 +8,305 @@
- 综合指数算法 -
+ 企业综合指数 +
+
综合指数算法 =
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ 修 改 +
+
+ 保 存 + 取 消 +
+
+
+
+
+
+
指标分值配置
+ +
+
+
+ + + +
\ No newline at end of file