Sfoglia il codice sorgente

预制曲线段号

yuhan 1 anno fa
parent
commit
09f000cbdb

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

@@ -16,7 +16,7 @@
       <div class="left-container">
         <div class="left-top-con">
           <!-- 左上 -->
-          <yuzhi-curve :data="yuzhiData" :markData="yuzhiMarkData" ref="yuzhiCurve"></yuzhi-curve>
+          <yuzhi-curve :data="yuzhiData" :marks="yuzhiMarkData" ref="yuzhiCurve"></yuzhi-curve>
         </div>
         <div class="left-center-con">
           <!-- 左中 -->
@@ -197,6 +197,7 @@ export default {
       this.newAlarmData = redata['最新一条报警信息']
       this.yuzhiData = redata['预制曲线']
       this.yuzhiMarkData = redata['预制曲线线段']
+      // this.$refs.yuzhiCurve.markData = this.yuzhiMarkData
       var titleObj = redata['设备实时值'].find(item => item.Name === '试验名称')
       console.log(titleObj)
       this.titleName = titleObj ? titleObj.Value : '高温高湿试验项目'

+ 12 - 6
src/views/modules_guAn/visualization/modules/YuzhiCurve.vue

@@ -43,6 +43,12 @@ export default {
         return [] // 使用工厂函数返回默认值
       }
     },
+    marks: {
+      type: Array,
+      default: function(){
+        return [] // 使用工厂函数返回默认值
+      }
+    },
   },
   data () {
     return {
@@ -63,12 +69,12 @@ export default {
       shiduData: [],
       timeData: [],
       markData: [],
-      // fusheData: [150, 230, 224, 218, 135, 147, 260],
-      // wenduData: [50, 60, 60, 70, 50, 50, 60],
-      // shiduData: [40, 70, 70, 40, 40, 50, 50],
-      // timeData: ['08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00'],
       colors: ['#0102c8', '#cfa809', '#49e4e9'],
-      // markData: ['1', '2', '3', '0', '1'],
+      fusheData: [150, 230, 224, 218, 135, 147, 260],
+      wenduData: [50, 60, 60, 70, 50, 50, 60],
+      shiduData: [40, 70, 70, 40, 40, 50, 50],
+      timeData: ['08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00'],
+      markData: ['1', '2', '3', '0', '1'],
     }
   },
   watch: {
@@ -80,7 +86,7 @@ export default {
       // immediate: true,
       deep: true
     },
-    markData: {
+    marks: {
       handler(newValue, oldValue){
         console.log('预制曲线线段', newValue, oldValue)
         // this.refreshData(newValue)