Parcourir la source

数据列表对应问题+细节修改

秦娜敏 il y a 3 ans
Parent
commit
7f8fa11103

+ 8 - 6
src/common/dataDetail/dataDetail_chart.vue

@@ -259,10 +259,10 @@ export default {
          
           var arr = [];
           for(let i in resp.data){
-            var o={
-              before: [],
-              after: [],
-              Isproblem:[]
+            var o = {
+              before: new Array(this.tableHeader.length).fill(""),
+              after: new Array(this.tableHeader.length).fill(""),
+              Isproblem:new Array(this.tableHeader.length).fill(""),
             };
 
             o["rowKey"] = resp.data[i].date;
@@ -286,8 +286,10 @@ export default {
                 }
               }
             }
-            for(var k = 0;k<this.tableHeader.length;k++){
-              o.Isproblem.push(o.before[k]==o.after[k]?"否":"是")
+             for (var k = 0; k < this.tableHeader.length; k++) {
+              if(o.before[k] !== "" ){
+                o.Isproblem.splice(k,1,o.before[k] == o.after[k] ? "否" : "是")
+              }
             }
             arr.push(o);
 

+ 13 - 13
src/views/mining/machines/index.vue

@@ -38,7 +38,7 @@
             </div>
             <div>
               冷却水水压:
-              <span> {{ data[0].transporter_pressure }}Pa </span>
+              <span> {{ data[0].transporter_pressure }}MPa </span>
             </div>
             <div>
               电机电压:
@@ -87,7 +87,7 @@
             </div>
             <div>
               冷却水水压:
-              <span> {{ data[1].transporter_pressure }}Pa </span>
+              <span> {{ data[1].transporter_pressure }}MPa </span>
             </div>
             <div>
               电机电压:
@@ -136,7 +136,7 @@
             </div>
             <div>
               冷却水水压:
-              <span> {{ data[2].transporter_pressure }}Pa </span>
+              <span> {{ data[2].transporter_pressure }}MPa </span>
             </div>
             <div>
               电机电压:
@@ -164,34 +164,34 @@ export default {
     return {
       data: [
         {
-          transporter_speed: 0,
+          transporter_speed:1,
           transporter_power: 10,
           transporter_reducerOilTemperature: 30,
           transporter_current: 20,
           transporter_motorTemperature: 60,
-          transporter_pressure: 20,
+          transporter_pressure: 0.3,
           transporter_voltage: 232,
           transporter_reducerShaftTemperature: 10,
           transporter_waterTemperature: 50,
         },
         {
-          transporter_speed: 0.5,
+          transporter_speed: 1,
           transporter_power: 10,
           transporter_reducerOilTemperature: 30,
           transporter_current: 20,
           transporter_motorTemperature: 60,
-          transporter_pressure: 20,
+          transporter_pressure: 0.3,
           transporter_voltage: 232,
           transporter_reducerShaftTemperature: 10,
           transporter_waterTemperature: 50,
         },
         {
-          transporter_speed: 0.7,
+          transporter_speed: 1,
           transporter_power: 10,
           transporter_reducerOilTemperature: 30,
           transporter_current: 20,
           transporter_motorTemperature: 60,
-          transporter_pressure: 20,
+          transporter_pressure: 0.3,
           transporter_voltage: 232,
           transporter_reducerShaftTemperature: 10,
           transporter_waterTemperature: 50,
@@ -213,15 +213,15 @@ export default {
     //     this.initWebSocket(data2, "data2");
     let interval = setInterval(() => {
       for (let i = 0; i < 3; i++) {
-        this.data[i].transporter_speed = this.getRandomNumWithDecimals(0, 1);
+        // this.data[i].transporter_speed = this.getRandomNumWithDecimals(0, 1);
         this.data[i].transporter_power = this.getRandomNum(90, 150);
         this.data[i].transporter_reducerOilTemperature = this.getRandomNum(
-          300,
-          350
+          0,
+          60
         );
         this.data[i].transporter_current = this.getRandomNum(300, 350);
         this.data[i].transporter_motorTemperature = this.getRandomNum(2, 60);
-        this.data[i].transporter_pressure = this.getRandomNum(0, 60);
+        this.data[i].transporter_pressure = this.getRandomNumWithDecimals(0, 0.4);
         this.data[i].transporter_voltage = this.getRandomNum(1100, 1200);
         this.data[i].transporter_reducerShaftTemperature = this.getRandomNum(
           2,

+ 6 - 6
src/views/ventilate/configImg/configImg.vue

@@ -57,7 +57,7 @@
                   </td>
                   <td>
                     <span>全压:</span>
-                    <span>{{ fan1.pipeline[2] }}</span> Pa
+                    <span>{{ fan1.pipeline[2] }}</span> MPa
                   </td>
                 </tr>
                 <tr>
@@ -71,7 +71,7 @@
                   </td>
                   <td>
                     <span>静压:</span>
-                    <span>{{ fan1.pipeline[4] }}</span> Pa
+                    <span>{{ fan1.pipeline[4] }}</span> MPa
                   </td>
                 </tr>
                 <tr>
@@ -85,7 +85,7 @@
                   </td>
                   <td>
                     <span>动压:</span>
-                    <span>{{ fan1.pipeline[4] }}</span> Pa
+                    <span>{{ fan1.pipeline[4] }}</span> MPa
                   </td>
                 </tr>
                 <tr>
@@ -196,7 +196,7 @@
                   </td>
                   <td>
                     <span>全压:</span>
-                    <span>{{ fan2.pipeline[2] }}</span> Pa
+                    <span>{{ fan2.pipeline[2] }}</span> MPa
                   </td>
                 </tr>
                 <tr>
@@ -210,7 +210,7 @@
                   </td>
                   <td>
                     <span>静压:</span>
-                    <span>{{ fan2.pipeline[4] }}</span> Pa
+                    <span>{{ fan2.pipeline[4] }}</span> MPa
                   </td>
                 </tr>
                 <tr>
@@ -224,7 +224,7 @@
                   </td>
                   <td>
                     <span>动压:</span>
-                    <span>{{ fan2.pipeline[4] }}</span> Pa
+                    <span>{{ fan2.pipeline[4] }}</span> MPa
                   </td>
                 </tr>
                 <tr>