可视化首页bug修复

src/views/demo/parameManagement/timingTask/index.vue

@@ -451,6 +451,13 @@
       >
         <el-table-column type="selection" align="center" width="55">
         </el-table-column>
+        <el-table-column
+                  align="center"
+                  label="序号"
+                  type="index"
+                  width="100px"
+                  :index="indexMethod1"
+                ></el-table-column>
         <el-table-column prop="id" align="center" label="设备ID">
         </el-table-column>
         <el-table-column prop="eqName" label="设备名称" align="center">
@@ -1227,6 +1234,13 @@ export default {
         (this.pagination.curPage - 1) * this.pagination.pageSize + index + 1
       );
     },
+
+    //表格序号
+    indexMethod1(index) {
+      return (
+        (this.pagination1.curPage - 1) * this.pagination1.pageSize + index + 1
+      );
+    },
     //弹框确定按钮
     determine() {},
   },

src/views/demo/productManage/productInfo/realTime/index.vue

@@ -354,6 +354,9 @@ export default {
           console.log(err);
         });
   },
+  destroyed() {
+    this.unconnect();
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/system/visualized/index.vue

@@ -48,21 +48,23 @@
     
         "
       >
-                <div class="cf-left" v-if="tableData.length>0">
+                <div class="cf-left">
+                  <!-- <div style="color:#fff"> {{tableData}}</div> -->
                             
                   <div
                   v-for="(e, index) in tableData"
                             :key="index"
                     :class="{
-                      normalTemp: e.wetTempStatus == 1,
+                      normalTemp: e.wetTempStatus ===1||e.wetTempStatus===undefined,
                       normalTemp1:e.wetTempStatus == 0,
                     }"
                   >
+                  <!-- <div style="color:red">{{e}}</div> -->
                     <div class="temp-title">
                       {{ index + 1 }}号点位温湿度
                     </div>
                     <div class="temp-list">
-                      <div class="list-left" v-if="e.wetTempStatus == 1">
+                      <div class="list-left" v-show="e.wetTempStatus == 1||e.wetTempStatus===undefined">
                         <div class="hxBig">
                           <img
                             class="sxxz"
@@ -71,7 +73,7 @@
                           />
                         </div>
                       </div>
-                      <div class="list-left" v-if="e.wetTempStatus == 0">
+                      <div class="list-left" v-show="e.wetTempStatus === 0">
                         <img
                           src="../../../assets/images/bigScreen/fault.png"
                           alt=""
@@ -95,9 +97,10 @@
                             :key="index"
                             
                           >
+                          <!-- <div>{{item}}</div> -->
                             <li class="DataList_left">
                               <span
-                                v-if="item.status == 1"
+                                v-if="item.tempStatus == 1 ||item.wetStatus==1"
                                 style="
                                   width: 5px;
                                   height: 5px;
@@ -109,7 +112,7 @@
                                 "
                               ></span>
                               <span
-                                v-if="item.status == 0"
+                                v-if="item.tempStatus == 0 ||item.wetStatus==0"
                                 style="
                                   width: 5px;
                                   height: 5px;
@@ -215,12 +218,12 @@
               <div class="title">湿度统计</div>
               <div class="sdDataShow">
                 <div class="left sdtjLeft">
-                  <!-- <div id="sdtjEcarts" style="width:100%;height:100%"></div> -->
-                  <img
+                  <div id="sdtjEcarts" style="width:100%;height:100%"></div>
+                  <!-- <img
                     src="../../../assets/images/bigScreen/shidu.png"
                     alt=""
                     style="width: 100%; height: 100%"
-                  />
+                  /> -->
                 </div>
                 <div class="right">
                   <div class="top">
@@ -317,6 +320,7 @@ export default {
   },
   data() {
     return {
+      sdtjInterval:null,
       top: 32,
       left: 25,
       //初始化列表的长度
@@ -354,7 +358,7 @@ export default {
       wetParams: {},
       //温湿度状态
       // wetTempStatus: null,
-      wetTempStatus: 1,
+      // wetTempStatus: 1,
       tableData: [],
       //湿度统计角度
       sdtjAngle: 0,
@@ -400,7 +404,7 @@ export default {
   computed: {
     classOption() {
       return {
-        step: 0.2, // 数值越大速度滚动越快
+        step: 0.5, // 数值越大速度滚动越快
         limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
@@ -412,7 +416,7 @@ export default {
     },
     seamlessScrollOption(){
       return {
-        step: 0, // 数值越大速度滚动越快
+        step: 1.2, // 数值越大速度滚动越快
         limitMoveNum:6, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
@@ -518,7 +522,7 @@ export default {
          
               this.calcAve(this.tableData);
             } else if (this.tableDataLength < 1) {
-              this.tableData=[]
+              // this.tableData=[]
               res.data.forEach((ele, index) => {
                 ele.time = res.time;
                 this.tableData.push([ele]);
@@ -585,7 +589,7 @@ export default {
       let option = {
         backgroundColor: "#022C2B",
         title: {
-          text: "{a|" + value + "}{c|%}" + "\n" + "{b|资料管理}",
+          text: "{a|" + value + "}{c|%}" + "\n" + "{b|湿度统计}",
           x: "center",
           y: "center",
           textStyle: {
@@ -611,37 +615,7 @@ export default {
           },
         },
        
-        // legend: {
-        //   type: "plain",
-        //   orient: "vertical",
-        //   right: 0,
-        //   top: "10%",
-        //   align: "auto",
-        //   data: [
-        //     {
-        //       name: "涨价后没吃过",
-        //       icon: "circle",
-        //     },
-        //     {
-        //       name: "天天吃",
-        //       icon: "circle",
-        //     },
-        //     {
-        //       name: "三五天吃一次",
-        //       icon: "circle",
-        //     },
-        //     {
-        //       name: "半个月吃一次",
-        //       icon: "circle",
-        //     },
-        //   ],
-        //   textStyle: {
-        //     color: "white",
-        //     fontSize: 16,
-        //     padding: [10, 1, 10, 0],
-        //   },
-        //   selectedMode: false,
-        // },
+   
         series: [
           //外面的线带球球
           {
@@ -654,7 +628,7 @@ export default {
                 shape: {
                   cx: api.getWidth() / 2,
                   cy: api.getHeight() / 2,
-                  r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.65, //线的位置
+                  r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.85, //线的位置
                   startAngle: ((270 + -that.sdtjAngle) * Math.PI) / 180,
                   endAngle: ((40 + -that.sdtjAngle) * Math.PI) / 180,
                 },
@@ -678,7 +652,7 @@ export default {
                 shape: {
                   cx: api.getWidth() / 2,
                   cy: api.getHeight() / 2,
-                  r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.65, //线的位置
+                  r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.85, //线的位置
                   startAngle: ((90 + -that.sdtjAngle) * Math.PI) / 180,
                   endAngle: ((220 + -that.sdtjAngle) * Math.PI) / 180,
                 },
@@ -703,7 +677,7 @@ export default {
                 shape: {
                   cx: api.getWidth() / 2,
                   cy: api.getHeight() / 2,
-                  r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.6,
+                  r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8,
                   startAngle: ((0 + that.sdtjAngle) * Math.PI) / 180,
                   endAngle: ((90 + that.sdtjAngle) * Math.PI) / 180,
                 },
@@ -727,7 +701,7 @@ export default {
                 shape: {
                   cx: api.getWidth() / 2,
                   cy: api.getHeight() / 2,
-                  r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.6,
+                  r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.8,
                   startAngle: ((180 + that.sdtjAngle) * Math.PI) / 180,
                   endAngle: ((270 + that.sdtjAngle) * Math.PI) / 180,
                 },
@@ -752,7 +726,7 @@ export default {
                 shape: {
                   cx: api.getWidth() / 2,
                   cy: api.getHeight() / 2,
-                  r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.43, //线的位置
+                  r: (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.65, //线的位置
                   startAngle: 0, //开始的地方
                   endAngle: 180, //结束的地方
                 },
@@ -773,7 +747,7 @@ export default {
             renderItem: function (params, api) {
               let x0 = api.getWidth() / 2;
               let y0 = api.getHeight() / 2;
-              let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.65;
+              let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.85;
               let point = that.getCirlPoint(x0, y0, r, 90 + -that.sdtjAngle);
               return {
                 type: "circle",
@@ -798,7 +772,7 @@ export default {
             renderItem: function (params, api) {
               let x0 = api.getWidth() / 2;
               let y0 = api.getHeight() / 2;
-              let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.65;
+              let r = (Math.min(api.getWidth(), api.getHeight()) / 2) * 0.85;
               let point = that.getCirlPoint(x0, y0, r, 270 + -that.sdtjAngle);
               return {
                 type: "circle",
@@ -821,7 +795,7 @@ export default {
             name: "吃猪肉频率",
             type: "pie",
             //背景色的半圆
-            radius: ["58%", "45%"],
+            radius: ["65%", "52%"],
             silent: true,
             clockwise: true,
             startAngle: 90,
@@ -874,17 +848,17 @@ export default {
           {
             name: "",
             type: "gauge",
-            radius: "58%",
+            radius: "18%",
             center: ["50%", "50%"],
             startAngle: 0,
             endAngle: 359.9,
-            splitNumber: 28, //改变小格子宽度
+            splitNumber: 38, //改变小格子宽度
             hoverAnimation: true,
             axisTick: {
               show: false,
             },
             splitLine: {
-              length: 67,
+              length: 49,
               lineStyle: {
                 width: 2,
                 color: "#0e352e", //改变小格子的线颜色
@@ -931,7 +905,8 @@ export default {
         pageSize: 5,
       };
       api.pointList(params).then((res) => {
-        console.log(res, "点位列表");
+        if(res.code==200){
+          console.log(res, "点位列表");
 
         this.tableData = Object.values(res.data);
 
@@ -941,22 +916,30 @@ export default {
           this.rightDewValue = 0;
           this.rightTempValue = 0;
           this.rightWetValue = 0;
-        }
+        }else{
+ 
           this.getWsdAlarmParams();
+      
           this.calcAve(this.tableData);
+        }
+         
+        }
+        
       
         //如果温湿度大于或小于正常值则添加字段status,0位不正常，1为正常
       });
     },
     // 温湿度最高最低参数
     getWsdAlarmParams() {
+      
       let params = {
         labelCode: this.cfCode,
         orgCode: localStorage.getItem("orgCode"),
       };
       api.wsdAlarmParams(params).then((res) => {
-        console.log(res, "参数。。");
-        //温度参数
+        if(res.code==200){
+          console.log(res, "参数。。");
+          //温度参数
         if (res.data[110001]) {
           this.tempParams = res.data[110001][0];
         }
@@ -966,9 +949,15 @@ export default {
 
         console.log(this.tempParams, "tempParams");
         console.log(this.wetParams, "wetParams");
-        if (this.tableData) {
+
+     
+     
+          
           this.wetTempPublic(this.tableData);
         }
+       
+        
+     
       });
     },
 
@@ -995,67 +984,71 @@ export default {
       console.log(arr,"arrr..")
       arr.forEach((ele) => {
         ele.forEach((item) => {
-          if (this.tempParams) {
+          if (this.tempParams.alarmValueMin) {
            
             if (
               item.tempValue < this.tempParams.alarmValueMin ||
               item.tempValue > this.tempParams.alarmValueMax
             ) {
+              console.log("温度异常")
           
-              item.status = 0;
+              // item.status = 0;
               // this.wetTempStatus = 0;
-              item.tempStatus = 0;
+              // item.tempStatus = 0;
+              this.$set(item,"tempStatus",0)
             }
              else {
-             
-              item.tempStatus = 1;
-              item.status = 1;
+              console.log("温度正常")
+              // item.tempStatus = 1;
+              this.$set(item,"tempStatus",1)
+              // item.status = 1;
               // this.wetTempStatus = 1;
             }
           }
 
-          if (this.wetParams) {
+          if (this.wetParams.alarmValueMin) {
           
             if (
               item.wetValue < this.wetParams.alarmValueMin ||
               item.wetValue > this.wetParams.alarmValueMax
             ) {
-           
-              item.status = 0;
-              item.wetStatus = 0;
+              console.log("湿度异常")
+              // item.status = 0;
+              // item.wetStatus = 0;
+              this.$set(item,"wetStatus",0)
               // this.wetTempStatus = 0;
             } else {
-          
-              item.wetStatus = 1;
-              item.status = 1;
+              console.log("湿度正常")
+              // item.wetStatus = 1;
+              this.$set(item,"wetStatus",1)
+              // item.status = 1;
               // this.wetTempStatus = 1;
             }
           }
         });
       });
 
-      // //取整
-      // this.rightDewValue=parseInt(this.rightDewValue/arr.length)
+  
       console.log(arr, "添加状态");
       this.isNormalImg(arr)
     },
     //添加判断是否显示正常图片的字段
     isNormalImg(arr){
-     arr.forEach(e=>{
-      let a= e.some(item=>{
-      return item.tempStatus==1
-     })
-     if(a==true){
+     for (let i = 0; i < arr.length; i++) {
+      arr[i].wetTempStatus=1
+      for (let j = 0; j < arr[i].length; j++) {
+        
+        if(arr[i][j].tempStatus==0||arr[i][j].wetStatus==0){
+          arr[i].wetTempStatus=0
+         break
+       
+        }
+      }
+
+  
       
      }
-     console.log(a,"isNormal")
-     })
-    arr.forEach(e=>{
-      let b=e.some(item=>{
-      return item.wetStatus==1
-     })
-     console.log(b,"isNormal")
-     })
+     console.log(arr,"isNormal")
    
     },
 
@@ -1080,11 +1073,7 @@ export default {
           this.rightTempValue += item.tempValue;
           //湿度均温
           this.rightWetValue += item.wetValue;
-          console.log(
-            this.rightDewValue,
-            this.rightTempValue,
-            this.rightWetValue
-          );
+        
         });
       });
       //取整
@@ -1231,7 +1220,7 @@ export default {
     // },
   },
   created() {
-    this.connect();
+   this.connect() ;
   
     api
       .equipmentTagList({ curPage: 1, pageSize: 99999 })
@@ -1258,20 +1247,21 @@ export default {
   },
   destroyed() {
     this.unconnect();
+    clearInterval(this.sdtjInterval)
   },
   mounted() {
-    //   setInterval(() =>{
-    //   //用setInterval做动画感觉有问题
-    //   this.drawSdtj();
-    // }, 100);
+ this.sdtjInterval=setInterval(() =>{
+      //用setInterval做动画感觉有问题
+      this.drawSdtj();
+    }, 100);
    
     // this.getWsdAlarmParams();
     this.getTempWetStatus();
-    this.addArea();
-    this.scale();
-    window.onresize = () => {
-      this.scale();
-    };
+    // this.addArea();
+    // this.scale();
+    // window.onresize = () => {
+    //   this.scale();
+    // };
   },
 };
 </script>

src/views/system/visualized/yjxx/index.vue

@@ -24,7 +24,7 @@
                         width: 5px;
                         height: 5px;
                         border-radius: 50%;
-                        background: rgb(38, 222, 197);
+                        background: red;
                         display: inline-block;
 
                         margin-right: 5px;