Просмотр исходного кода

fix: 增加报警问题查询字段change事件中clear后deleteProperty操作

bxy 1 год назад
Родитель
Сommit
e17faac5ba

+ 27 - 16
src/views/datamanager/alertformdata/components/common/QueryForm.vue

@@ -146,6 +146,7 @@
     Reflect.deleteProperty(queryForm, 'startTime');
     Reflect.deleteProperty(queryForm, 'startTime');
     Reflect.deleteProperty(queryForm, 'endTime');
     Reflect.deleteProperty(queryForm, 'endTime');
     Reflect.deleteProperty(queryForm, 'issueMainTypeList');
     Reflect.deleteProperty(queryForm, 'issueMainTypeList');
+    Reflect.deleteProperty(queryForm, 'issueTypeList');
     formRef.value?.resetFields();
     formRef.value?.resetFields();
     emits('onReset', queryForm);
     emits('onReset', queryForm);
   };
   };
@@ -170,29 +171,39 @@
   };
   };
 
 
   const handleIssueMainTypeChange = () => {
   const handleIssueMainTypeChange = () => {
-    const arrMain = [];
-    const arrSub = [];
-    issueTypeValue.value.forEach((item) => {
-      arrMain.push(item[0]);
-      arrSub.push(item[1]);
-    });
-    queryForm.issueMainTypeList = [...new Set(arrMain)];
-    queryForm.issueTypeList = arrSub;
+    if (issueTypeValue.value.length !== 0) {
+      const arrMain = [];
+      const arrSub = [];
+      issueTypeValue.value.forEach((item) => {
+        arrMain.push(item[0]);
+        arrSub.push(item[1]);
+      });
+      queryForm.issueMainTypeList = [...new Set(arrMain)];
+      queryForm.issueTypeList = arrSub;
+    } else {
+      Reflect.deleteProperty(queryForm, 'issueMainTypeList');
+      Reflect.deleteProperty(queryForm, 'issueTypeList');
+    }
   };
   };
 
 
   const handleCascaderChange = () => {
   const handleCascaderChange = () => {
-    const arr = [];
-    workShopIds.value = [];
-    workLocation.value.forEach((item) => {
-      arr.push(item[1]);
-      workShopIds.value.push(item[0]);
-    });
-    queryForm.workspaceId = arr;
-    workShopIds.value = [...new Set(workShopIds.value)];
+    if (workLocation.value.length !== 0) {
+      const arr = [];
+      workShopIds.value = [];
+      workLocation.value.forEach((item) => {
+        arr.push(item[1]);
+        workShopIds.value.push(item[0]);
+      });
+      queryForm.workspaceId = arr;
+      workShopIds.value = [...new Set(workShopIds.value)];
+    } else {
+      Reflect.deleteProperty(queryForm, 'workspaceId');
+    }
   };
   };
 
 
   const handleIssueStateChange = () => {
   const handleIssueStateChange = () => {
     if (tempState.value) queryForm.issueState = JSON.parse(tempState.value);
     if (tempState.value) queryForm.issueState = JSON.parse(tempState.value);
+    else Reflect.deleteProperty(queryForm, 'issueState');
   };
   };
 
 
   const handleDateChange = () => {
   const handleDateChange = () => {

+ 1 - 1
utils/devProxy/local/app.config.js

@@ -12,7 +12,7 @@ window.__PRODUCTION__SKYEYEADMIN__CONF__ = {
   // 平台跳转地址
   // 平台跳转地址
   "VITE_GLOB_APP_PC": "/skyeyev3pc/",
   "VITE_GLOB_APP_PC": "/skyeyev3pc/",
   /** 问题闭环处理,简单处理 */
   /** 问题闭环处理,简单处理 */
-  "VITE_GLOB_QUESTION_LIST_VERSION": 'simple',
+  "VITE_GLOB_QUESTION_LIST_VERSION": 'v2',
 
 
 };
 };
 
 

+ 1 - 1
utils/devProxy/local/proxy.ts

@@ -3,7 +3,7 @@ import path from 'path';
 
 
 // 连后端本机时的代理staff环境
 // 连后端本机时的代理staff环境
 const proxyStaff: PROXY_TYPE = {
 const proxyStaff: PROXY_TYPE = {
-  serverHost: 'http://192.168.20.165:8800',
+  serverHost: 'http://192.168.13.68/eye_api_bak/',
   loginHost: 'http://192.168.13.68/skyeye-login/',
   loginHost: 'http://192.168.13.68/skyeye-login/',
   skyeyeFileUploadHost: 'http://192.168.13.68/skyeye-file-upload',
   skyeyeFileUploadHost: 'http://192.168.13.68/skyeye-file-upload',
   nvrDownload: 'http://192.168.13.68/nvr_download',
   nvrDownload: 'http://192.168.13.68/nvr_download',