yuhan 1 rok temu
rodzic
commit
aacd1d24f6

+ 4 - 2
src/views/modules_guAn/visualization/index.vue

@@ -249,7 +249,8 @@ export default {
       box-sizing: border-box;
       .left-container{
         width: 25%;
-        padding-left: 20px;
+        padding-left: 10px;
+        padding-right: 10px;
         height: 100%;
         .left-top-con{
           height: 33.3%;
@@ -290,7 +291,8 @@ export default {
       }
       .right-container{
         width: 25%;
-        padding-right: 20px;
+        padding-left: 10px;
+        padding-right: 10px;
         .right-top-con{
           height: 33.3%;
           padding-top: 60px;

+ 2 - 2
src/views/modules_guAn/visualization/modules/FullCurve.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="data-curve-module">
-    <!-- <common-title title="数据查看和提取"></common-title>     -->
-    <div style="height: 22.5px;"></div>
+    <common-title title="全程曲线"></common-title>    
+    <!-- <div style="height: 22.5px;"></div> -->
     <div class="visualization-common-border">
       <div ref="dataCurve" class="h100"></div>
     </div>

+ 1 - 1
src/views/modules_guAn/visualization/modules/RealTimeCurve.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="data-curve-module">
-    <common-title title="数据查看和提取"></common-title>
+    <common-title title="实时曲线"></common-title>
     <div class="visualization-common-border">
       <div ref="dataCurve" class="h100"></div>
     </div>

+ 19 - 108
src/views/modules_guAn/visualization/modules/TestStatusInfo.vue

@@ -11,98 +11,6 @@
             </div>
           </div>
         </div>
-
-        <!-- <div class="item">
-          <div class="itemHead">C机组</div>
-          <div class="itemCenter">
-            <div>C1压机吸气:() bar</div>
-            <div>C2压机吸气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>C1压机排气:() bar</div>
-            <div>C2压机排气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>D1压机吸气:() bar</div>
-            <div>D2压机吸气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>D1压机排气:() bar</div>
-            <div>D2压机排气:() bar</div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="itemHead">E机组</div>
-          <div class="itemCenter">
-            <div>E1压机吸气:(1.05) bar</div>
-            <div>E2压机吸气:(12) bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>E1压机排气:() bar</div>
-            <div>E2压机排气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>F1压机吸气:() bar</div>
-            <div>F2压机吸气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>F1压机排气:() bar</div>
-            <div>F2压机排气:() bar</div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="itemHead">G机组</div>
-          <div class="itemCenter">
-            <div>G1压机吸气:() bar</div>
-            <div>G2压机吸气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>G1压机排气:() bar</div>
-            <div>G2压机排气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>H1压机吸气:() bar</div>
-            <div>H2压机吸气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>H1压机排气:() bar</div>
-            <div>H2压机排气:() bar</div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="itemHead">I机组</div>
-          <div class="itemCenter">
-            <div>I1压机吸气:() bar</div>
-            <div>I2压机吸气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>I1压机排气:() bar</div>
-            <div>I2压机排气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>J1压机吸气:() bar</div>
-            <div>J2压机吸气:() bar</div>
-          </div>
-          <div class="itemCenter">
-            <div>J1压机排气:() bar</div>
-            <div>J2压机排气:() bar</div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="itemHead"> </div>
-          <div class="itemCenter">
-            <div>氧浓度1:() mg/L</div>
-            <div>氧浓度2:() mg/L</div>
-          </div>
-          <div class="itemCenter">
-            <div>变频器1:() Hz</div>
-            <div>变频器2:() Hz</div>
-          </div>
-          <div class="itemCenter">
-            <div>变频器3:() Hz</div>
-            <div>变频器4:() Hz</div>
-          </div>
-        </div> -->
       </div>
     </div>
   </div>
@@ -196,22 +104,7 @@ export default {
     data: {
       handler(newValue, oldValue){
         console.log(newValue, oldValue)
-        var newArr = this.staticData.map(res=>{
-          var childrenArr = res.children.map(item=>{
-            var findObj = newValue.find(val=>val.Name === item.name+'压力采集值')
-            return {
-              name: item.name,
-              value: findObj.Value
-            }
-          })
-          return {
-            title: res.title,
-            children: childrenArr
-          }
-        })
-        // this.raelDate = newArr
-        this.raelDate = this.staticData
-        // console.log(this.raelDate)
+        this.changeData(newValue)
       },
       immediate: true,
       deep: true
@@ -222,6 +115,24 @@ export default {
   mounted () {
   },
   methods: {
+    changeData(newValue){
+      var newArr = this.staticData.map(res=>{
+        var childrenArr = res.children.map(item=>{
+          var findObj = newValue.find(val=>val.Name === item.name+'压力采集值')
+          return {
+            name: item.name,
+            value: findObj.Value
+          }
+        })
+        return {
+          title: res.title,
+          children: childrenArr
+        }
+      })
+      // this.raelDate = newArr
+      this.raelDate = this.staticData
+      // console.log(this.raelDate)
+    }
   }
 }
 </script>