合流区参数过滤

ruoyi-ui/src/views/JiHeExpressway/components/Descriptions.vue

@@ -76,6 +76,26 @@ export default {
       return (item) => getContent(this.data, item);
     },
     getResolveList() {
+      // 要过滤掉的 property 类型列表
+      const disallowedProperties = ['cellVoltage', 'chargeCurrent','solarVoltage','time','averageData'];
+
+      return this.list.reduce((prev, data) => {
+
+          if (disallowedProperties.includes(data.key)) {
+            return prev; // 如果在列表中，则跳过该数据项
+          }
+          // 原有的 visible 函数或属性判断
+          if (typeof data.visible === "function") {
+            if (!data.visible(data)) return prev;
+          } else if (data.visible === false) {
+            return prev;
+          }
+          prev.push(data);
+
+        return prev;
+      }, []);
+    }
+    /*    getResolveList() {
       return this.list.reduce((prev, data) => {
         if (typeof data.visible === "function") {
           if (!data.visible(data)) return prev;
@@ -84,7 +104,7 @@ export default {
         prev.push(data);
         return prev;
       }, []);
-    },
+    },*/
   },
   methods: {
     getStyle() {

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue

@@ -275,9 +275,13 @@ export default {
       //   this.activeName = "second";
       //   this.tabClick();
       // } else {
-      this.formData.controlType = result.data + "" || "1";
+      console.log("工作模式")
+      console.log(result.data)
+      this.formData.controlType = result.data + "" || "0";
       //查询时间
       let resultTime = await this.requestURL("ASKTM");
+      console.log("工作时长")
+      console.log(resultTime.data)
       this.formData.onWorkStatus = resultTime.data || 0;
       this.activeName = "first";
       // }