diff --git a/src/api/correlationEquipment/index.js b/src/api/correlationEquipment/index.js
index 00a86a1..6898d4b 100644
--- a/src/api/correlationEquipment/index.js
+++ b/src/api/correlationEquipment/index.js
@@ -47,4 +47,36 @@ export function addVideoList(params) {
method: 'get',
params
})
+}
+// 新增智能感应
+export function addPerceptionList(params) {
+ return request({
+ url: '/safety/tbDevicePerceptionInfo/insert',
+ method: 'get',
+ params
+ })
+}
+// 修改智能感应
+export function changePerceptionList(params) {
+ return request({
+ url: '/safety/tbDevicePerceptionInfo/update',
+ method: 'post',
+ params
+ })
+}
+// 导出视频监控
+export function exportVideo(params) {
+ return request({
+ url: '/safety/tbDeviceVideoInfo/export',
+ method: 'post',
+ params
+ })
+}
+// 导出智能感应
+export function exportPerception(params) {
+ return request({
+ url: '/safety/tbDevicePerceptionInfo/export',
+ method: 'post',
+ params
+ })
}
\ No newline at end of file
diff --git a/src/api/systemManagement/safeIndex/index.js b/src/api/systemManagement/safeIndex/index.js
new file mode 100644
index 0000000..5a43e7d
--- /dev/null
+++ b/src/api/systemManagement/safeIndex/index.js
@@ -0,0 +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/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..60efde6 100644
--- a/src/views/systemManagement/correlationEquipment/components/addPerceptionDialog.vue
+++ b/src/views/systemManagement/correlationEquipment/components/addPerceptionDialog.vue
@@ -4,6 +4,7 @@
class="dialog"
:title="dialogTitle"
:visible.sync="visible"
+ @close="close()"
:close-on-click-modal="false"
width="970px"
>
@@ -11,196 +12,460 @@
-
-
\ 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 7c860b4..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"
>
@@ -18,7 +19,11 @@
:disabled="disabled"
>
-
+
+
+
@@ -62,10 +69,10 @@
-
+
-
+
@@ -85,10 +92,10 @@
-
+
-
+
@@ -103,24 +110,24 @@
:disabled="disabled"
>
-
+
-
+
-
+
-
+
-
+
-
+
设备其他信息
-
+
-
+
-
+
-
+
-
+
-
+
@@ -168,7 +175,7 @@
"
>保 存
- 取 消
+ 取 消
@@ -260,6 +267,7 @@ export default {
};
},
created() {
+ // 请求设备小类下拉
const params = {
dictType: "device_video_sub_type",
};
@@ -269,15 +277,18 @@ export default {
const val = {
dictType: "device_perception_sub_type",
};
+ // 请求设备大类下拉
commonDict(val).then((res) => {
this.form.perception_type = res.data;
});
+ // 请求设备方位下拉
const param_op = {
dictType: "orientation",
};
commonDict(param_op).then((res) => {
this.form.orientation_types = res.data;
});
+ // 请求企业名称下拉
getCompanyList().then((res) => {
this.form.company = res.data;
});
@@ -296,6 +307,7 @@ export default {
this.disabled = true;
}
},
+ // 表单验证必填
saveFormData: debounce(function (formName1, formName2, formName3) {
this.$refs[formName1].validate((valid1) => {
if (valid1) {
@@ -307,17 +319,17 @@ export default {
delete this.form.video_type;
delete this.form.perception_type;
delete this.form.orientation_types;
- this.form.companyId = this.$refs.companySelect.selected.value // 企业对应id
+ this.form.companyId = this.$refs.companySelect.selected.value; // 企业对应id
const params = this.form;
console.log("this.form", this.form);
if (this.dialogTitle === "新建") {
addVideoList(params)
.then((res) => {
- this.visible = false;
- this.$message({
- message: res.msg,
- type: "success",
- });
+ this.visible = false;
+ this.$message({
+ message: res.msg,
+ type: "success",
+ });
})
.catch((err) => {
console.log(err); //代码错误、请求失败捕获
@@ -336,6 +348,19 @@ export default {
}
}); // 设备基础必填验证
}, 300),
+ // 关闭弹窗
+ close() {
+ this.visible = false;
+ // 重置表单
+ // 设备基础信息表单重置
+ this.$refs['equipmentForm'].resetFields()
+ // 视频通道信息表单重置
+ this.$refs['videoForm'].resetFields()
+ // 设备位置信息表单重置
+ this.$refs['addressForm'].resetFields()
+ // 设备其他信息表单重置
+ this.$refs['otherForm'].resetFields()
+ },
},
};
@@ -348,7 +373,7 @@ export default {
background-image: url("~@/assets/companyFile/dialogBack.png");
background-size: 100% 100%;
background-repeat: no-repeat;
- height: 720px;
+ height: 750px;
/* 关闭弹窗叉号 */
.el-dialog__headerbtn {
@@ -385,6 +410,7 @@ export default {
}
.form_body {
+ margin-top: 3%;
height: 600px;
overflow-y: scroll;
p {
@@ -402,7 +428,9 @@ export default {
background: url("~@/assets/companyFile/242112.png") no-repeat !important;
background-size: 100% 100% !important;
}
-
+ .equipment_form {
+ margin-top: -2%;
+ }
.form_body::-webkit-scrollbar {
width: 6px;
background-color: #5e666a;
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
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 @@
+
+
+ 789
+
+
+
\ 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 @@
+
+
+ 456
+
+
+
\ No newline at end of file
diff --git a/src/views/systemManagement/safeIndex/index.vue b/src/views/systemManagement/safeIndex/index.vue
index e69de29..cf13ef4 100644
--- a/src/views/systemManagement/safeIndex/index.vue
+++ b/src/views/systemManagement/safeIndex/index.vue
@@ -0,0 +1,463 @@
+
+
+
+
+
+
+ 平安指数
+
+
+
+
企业综合指数
+
+
综合指数算法 =
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修 改
+
+
+ 保 存
+ 取 消
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file