From c4bcc6e78ecaec6e9ea68802be7c1d3a7b063512 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 13:08:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-dataproduct-v1112' into lsf-dataproduct-1024
---
/dev/null | 81 ----------------------------------------
src/views/fysp/check/ProCheck.vue | 1
src/views/fysp/check/components/CompProblemAddOrUpd.vue | 1
src/views/fysp/check/components/ComChangeEdit.vue | 1
src/views/fysp/check/components/CompProblemCard.vue | 1
5 files changed, 2 insertions(+), 83 deletions(-)
diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue
index f4d78a2..0e1c719 100644
--- a/src/views/fysp/check/ProCheck.vue
+++ b/src/views/fysp/check/ProCheck.vue
@@ -301,7 +301,6 @@
});
},
onAddProCanceled() {
- this.proAddOrUpdDialogVisible = false;
},
// 闂鍗＄墖缁勪欢涓诲姩鍙戣捣鍒锋柊鐖剁粍浠舵暟鎹�
updateSubtask(refresh = false) {
diff --git a/src/views/fysp/check/components/ComChangeEdit.vue b/src/views/fysp/check/components/ComChangeEdit.vue
index 64703dd..6660d76 100644
--- a/src/views/fysp/check/components/ComChangeEdit.vue
+++ b/src/views/fysp/check/components/ComChangeEdit.vue
@@ -162,6 +162,7 @@
},
onCancel() {
this.$emit("cancel")
+ this.$emit('update:visible', false)
},
onSubmit() {
if (!this.pictureValidate()) {
diff --git a/src/views/fysp/check/components/CompProblemAddOrUpd.vue b/src/views/fysp/check/components/CompProblemAddOrUpd.vue
index 1200e69..2cf3bc9 100644
--- a/src/views/fysp/check/components/CompProblemAddOrUpd.vue
+++ b/src/views/fysp/check/components/CompProblemAddOrUpd.vue
@@ -587,6 +587,7 @@
},
onCancel() {
this.$emit("cancel")
+ this.$emit('update:visible', false)
},
onSubmit() {
this.$refs.formRef.validate((valid) => {
diff --git a/src/views/fysp/check/components/CompProblemCard.vue b/src/views/fysp/check/components/CompProblemCard.vue
index 224c591..35697a3 100644
--- a/src/views/fysp/check/components/CompProblemCard.vue
+++ b/src/views/fysp/check/components/CompProblemCard.vue
@@ -291,7 +291,6 @@
this.proAddOrUpdDialogVisible = false;
},
onChangeCanceled() {
- this.changeDialogVisible = false;
},
onChangeSubmited(isOk) {
this.$emit('submit', isOk);
diff --git a/src/views/fysp/check/components/js/dataMonitorDeviceType.js b/src/views/fysp/check/components/js/dataMonitorDeviceType.js
deleted file mode 100644
index 78db0a9..0000000
--- a/src/views/fysp/check/components/js/dataMonitorDeviceType.js
+++ /dev/null
@@ -1,77 +0,0 @@
-const dustDeviceType = [
- {
- label: '鎵皹鐩戞祴',
- value: '1',
- children: [
- {
- label: '鎵皹鐩戞祴',
- value: '1',
- },
- ],
- },
-];
-
-const fumeDeviceType = [
- {
- label: '娌圭儫鐩戞祴',
- value: '1',
- children: [
- {
- label: '娌圭儫鐩戞祴',
- value: '1',
- },
- ],
- },
-];
-
-const vocDeviceType = [
- {
- label: 'VOC鐩戞祴',
- value: '1',
- children: [
- {
- label: 'VOC鐩戞祴',
- value: '1',
- },
- ],
- },
-];
-
-// 鐩戞祴璁惧绫诲瀷
-function monitorDevices(sceneType) {
- switch (parseInt(sceneType)) {
- // 宸ュ湴,鐮佸ご,鎼呮媽绔�,鍫嗗満
- case 1:
- case 2:
- case 3:
- case 14:
- return dustDeviceType;
- // 椁愰ギ
- case 5:
- return fumeDeviceType;
- // 宸ヤ笟浼佷笟,姹戒慨
- case 4:
- case 6:
- return vocDeviceType;
- default:
- return dustDeviceType;
- }
-}
-
-function toLabel(sceneType, valueArr) {
- const labelArr = [];
- let options = monitorDevices(sceneType);
- valueArr.forEach(v => {
- if (options) {
- const op = options.find(o => {
- return (o.value + '') == (v + '');
- });
- labelArr.push(op.label);
- options = options[0].children;
- }
- });
-
- return labelArr;
-}
-
-export default { monitorDevices, toLabel };
diff --git a/src/views/fysp/check/components/js/dataProductionDeviceType.js b/src/views/fysp/check/components/js/dataProductionDeviceType.js
deleted file mode 100644
index 633146b..0000000
--- a/src/views/fysp/check/components/js/dataProductionDeviceType.js
+++ /dev/null
@@ -1,67 +0,0 @@
-const dustDeviceType = [
- {
- label: '闈為亾',
- value: '1',
- children: [
- { label: '鎸栨帢鏈�', value: '1' },
- { label: '鍙夎溅', value: '2' },
- { label: '灞ュ甫鍚�', value: '3' },
- { label: '閾茶溅', value: '4' },
- { label: '鍙戝姩鏈�', value: '5' },
- ],
- },
-];
-
-const fumeDeviceType = [
- {
- label: '鍘ㄥ叿',
- value: '1',
- children: [{ label: '鍘ㄥ叿', value: '1' }],
- },
-];
-
-const vocDeviceType = [
- {
- label: 'VOC',
- value: '1',
- children: [{ label: 'VOC', value: '1' }],
- },
-];
-
-// 鐢熶骇璁惧绫诲瀷
-function productionDevices(sceneType) {
- switch (parseInt(sceneType)) {
- // 宸ュ湴,鐮佸ご,鎼呮媽绔�,鍫嗗満
- case 1:
- case 2:
- case 3:
- case 14:
- return dustDeviceType;
- // 椁愰ギ
- case 5:
- return fumeDeviceType;
- // 宸ヤ笟浼佷笟,姹戒慨
- case 4:
- case 6:
- return vocDeviceType;
- default:
- return dustDeviceType;
- }
-}
-
-function toLabel(sceneType, valueArr) {
- const labelArr = [];
- let options = productionDevices(sceneType);
- valueArr.forEach(v => {
- if (options) {
- const op = options.find(o => {
- return (o.value + '') == (v + '');
- });
- labelArr.push(op.label);
- options = options.children;
- }
- });
- return labelArr;
-}
-
-export default { productionDevices, toLabel };
diff --git a/src/views/fysp/check/components/js/dataTreatmentDeviceType.js b/src/views/fysp/check/components/js/dataTreatmentDeviceType.js
deleted file mode 100644
index 945be3d..0000000
--- a/src/views/fysp/check/components/js/dataTreatmentDeviceType.js
+++ /dev/null
@@ -1,81 +0,0 @@
-const dustDeviceType = [
- {
- label: '鎶�闃�',
- value: '1',
- children: [
- { label: '鐜繚娲掓按杞︼紙澶у瀷闈炵數鍔級', value: '1' },
- { label: '鐢靛姩闆剧偖杞�', value: '2' },
- { label: '鐢靛姩娲掓按杞︼紙灏忓瀷锛�', value: '3' },
- { label: '闆剧偖杞︼紙鍥哄畾鎴栬疆寮忥級', value: '4' },
- { label: '鑷姩鍐叉礂瑁呯疆锛堝皝闂紡锛�', value: '5' },
- { label: '楂樻晥娲楄疆鏈�', value: '6' },
- { label: '楂樺帇姘存灙', value: '7' },
- { label: '鏅�氭按绠℃垨娑堥槻鏍�', value: '8' },
- { label: '濉斿悐鍠锋穻', value: '9' },
- { label: '鍥村鍠锋穻', value: '10' },
- { label: '鎵皹鐩戞祴涓庡柗娣嬭仈鍔�', value: '11' },
- { label: '鍫嗗満鍠锋穻', value: '12' },
- { label: '鐢熶骇鍖哄柗娣�', value: '13' },
- ],
- },
-];
-
-const fumeDeviceType = [
- {
- label: '鍑�鍖�',
- value: '1',
- children: [{ label: '娌圭儫鍑�鍖�', value: '1' }],
- },
-];
-
-const vocDeviceType = [
- {
- label: '鍑�鍖�',
- value: '1',
- children: [{ label: '鍥哄簾鍑�鍖�', value: '1' }],
- },
-];
-
-// 娌荤悊璁惧绫诲瀷
-function treatmentDevices(sceneType) {
- switch (parseInt(sceneType)) {
- // 宸ュ湴,鐮佸ご,鎼呮媽绔�,鍫嗗満
- case 1:
- case 2:
- case 3:
- case 14:
- return dustDeviceType;
- // 椁愰ギ
- case 5:
- return fumeDeviceType;
- // 宸ヤ笟浼佷笟,姹戒慨
- case 4:
- case 6:
- return vocDeviceType;
- default:
- return dustDeviceType;
- }
-}
-
-function toLabel(sceneType, valueArr) {
- console.log("valueArr", valueArr)
- const labelArr = [];
- let options = treatmentDevices(sceneType);
- options = options[0].children
- console.log("options", options)
- valueArr.forEach(v => {
- if (options) {
- const op = options.find(o => {
- return (o.value + '') == (v + '');
- });
- console.log("op", op)
- labelArr.push(op.label);
- // options = options.children;
- }
- });
-
- console.log("labelArr", labelArr)
- return labelArr;
-}
-
-export default { treatmentDevices, toLabel };
--
Gitblit v1.9.3