bug

src/views/health/components/malfunction/bingTwo.vue

@@ -65,8 +65,8 @@ export default {
             radius: ["40%", "60%"], // 设置内外半径来形成圆环
             data: [
               { value: 0, name: "正常", itemStyle: { color: "#8AE359" } },
-              { value: 0, name: "危险", itemStyle: { color: "#EECB5F" } },
-              { value: 0, name: "报警", itemStyle: { color: "#f7715f" } },
+              { value: 0, name: "报警", itemStyle: { color: "#EECB5F" } },
+              { value: 0, name: "危险", itemStyle: { color: "#f7715f " } },
             ],
             emphasis: {
               itemStyle: {
@@ -117,13 +117,15 @@ export default {
               },
               {
                 value: this.statistics.count_1 || 0,
-                name: "危险",
-                itemStyle: { color: "#EECB5F" },
+                name: "报警",
+                itemStyle: { color: " #EECB5F" },
               },
               {
+          
+
                 value: this.statistics.count_2 || 0,
                 name: "危险",
-                itemStyle: { color: "#f7715f" },
+                itemStyle: { color: " #f7715f " },
               },
             ],
             emphasis: {

src/views/health/components/malfunction/gear.vue

@@ -70,10 +70,10 @@
           </div>
 
           <div class="minp">
-            <p class="PText">
+          <p class="PText">
               <span><i class="color1"></i>正常</span
-              ><span><i class="color2"></i>报警</span
-              ><span><i class="color3"></i>危险</span>
+              ><span><i class="color2"></i>危险</span
+              ><span><i class="color3"></i>报警</span>
             </p>
 
             <h4>诊断步骤：</h4>

src/views/health/components/malfunction/temperature.vue

@@ -19,7 +19,7 @@
         </el-table>
 
         <div class="fenye">
-                    <p><span>状态码说明:</span>0正常，1报警，2危险，-1未定义</p>
+          <p><span>状态码说明:</span>0正常，1报警</p>
           <el-pagination
             @current-change="handleCurrentChange"
             :current-page="currentPage"
@@ -134,37 +134,42 @@ export default {
     };
   },
   computed: {
-    chartList() {
-      const list = [
-        {
-          title: "主轴承温度趋势图",
-          data: this.echartsdata.main_bearing,
-          lineType: "line",
-          lineColor: "#02aae9",
-        },
-        {
-          title: "驱动侧发电机轴承温度趋势图",
-          data: this.echartsdata.generator_drive_end,
-        },
-        {
-          title: "齿轮箱油温趋势图",
-          data: this.echartsdata.gearbox_oil,
-          lineType: "line",
-          lineColor: "#02aae9",
-        },
-        {
-          title: "驱动侧非发电机轴承温度趋势图",
-          data: this.echartsdata.generator_nondrive_end,
-        },
-      ];
-      return list.slice().sort((a, b) => {
-        const hasData = (d) =>
-          Array.isArray(d)
-            ? d.length
-            : typeof d === "object" && Object.keys(d).length;
-        return hasData(b.data) - hasData(a.data);
-      });
+ chartList() {
+  const list = [
+    {
+      title: '主轴承温度趋势图',
+      data: this.echartsdata.main_bearing,
+      lineType: 'line',
+      lineColor: '#02aae9',
+    },
+    {
+      title: '发电机驱动端轴承温度趋势图',
+      data: this.echartsdata.generator_drive_end,
+    },
+    {
+      title: '齿轮箱油温趋势图',
+      data: this.echartsdata.gearbox_oil,
+      lineType: 'line',
+      lineColor: '#02aae9',
     },
+    {
+      title: '发电机非驱动端轴承温度趋势图',
+      data: this.echartsdata.generator_nondrive_end,
+    },
+  ]
+
+  const sortedList = list.slice().sort((a, b) => {
+    return this.hasData(b.data) - this.hasData(a.data)
+  })
+
+  console.log('排序后的图表列表:', sortedList.map(i => ({
+    title: i.title,
+    hasData: this.hasData(i.data),
+  })))
+
+  return sortedList
+}
+
   },
   watch: {
     codedata: {
@@ -253,16 +258,14 @@ export default {
     hasData(data) {
       if (!data) return false;
 
-      // 检查是否是特定结构 { timestamps: [], values: [] }
-      if (Array.isArray(data.timestamps) && Array.isArray(data.values)) {
+      if (
+        typeof data === "object" &&
+        Array.isArray(data.timestamps) &&
+        Array.isArray(data.values)
+      ) {
         return data.timestamps.length > 0 || data.values.length > 0;
-        // 或者如果要求两个都不为空：
-        // return data.timestamps.length > 0 && data.values.length > 0;
       }
 
-      // 原有的检查逻辑
-      if (Array.isArray(data)) return data.length > 0;
-      if (typeof data === "object") return Object.keys(data).length > 0;
       return false;
     },
 
@@ -353,7 +356,7 @@ h4 {
     .fenye {
       display: flex;
       //justify-content: center;
-           justify-content: space-between;
+      justify-content: space-between;
       margin: 5px 0;
       font-size: 12px;
       line-height: 30px;

src/views/health/index.vue

@@ -173,27 +173,31 @@ export default {
       };
     },
 
-    monthPickerOptions() {
-      return {
-        disabledDate: (time) => {
-          const code = this.companyCode;
-          const date = time;
-
-          if (code === "WOF046400029") {
-            const start = new Date("2023-10-01");
-            const end = new Date("2024-10-30");
-            return date < start || date > end;
-          } else if (code === "WOF091200030") {
-            const start = new Date("2023-01-01");
-            const end = new Date("2024-11-30");
-            return date < start || date > end;
-          } else {
-            // 其他公司不限制时间选择
-            return false;
-          }
-        },
-      };
+  monthPickerOptions() {
+  return {
+    disabledDate: (time) => {
+      const code = this.companyCode;
+      const date = time;
+
+      if (code === "WOF046400029") {
+        const start = new Date("2023-10-01");
+        const end = new Date("2024-10-30");
+        return date < start || date > end;
+      } else if (code === "WOF091200030") {
+        const start = new Date("2023-01-01");
+        const end = new Date("2024-11-30");
+        return date < start || date > end;
+      } else if (code === "WOF093400005") {
+        const start = new Date("2023-12-01");
+        const end = new Date("2024-05-30");
+        return date < start || date > end;
+      } else {
+        // 其他公司不限制时间选择
+        return false;
+      }
     },
+  };
+},
   },
   created() {
     this.GETtree();