添加数据看板

src/common/dataDetail/dataDetail_chart.vue

@@ -147,8 +147,6 @@ export default {
   methods: {
     // 点击表头查看测点信息
     mpQuality(column,event){
-      // console.log(column);
-      // console.log(event);
       if(column.level == 1 && column.property == "properties"){
         var columnData = this.tableHeader.filter(item=>{
           return item.name == column.label;

src/common/dataDetail/dataDetail_graph.vue

@@ -66,21 +66,12 @@
    
     },
     mounted() {
-      console.log("#####");
-      console.log(pinyin('功率', {
-              toneType: 'none'
-            }).replace(/\s*/g, ''));
+
       this.currentEquipId = this.$route.query.equipmentId
       // this.currentEquipId = window.sessionStorage.getItem("dataList_currentEquipId");
       // 获取子设备选项
 
       this.getSubEquipOption();
-      // console.log("here1")
-      // this.initData();
-      // console.log("here2")
-      // this.timer = setInterval(() => {
-      // 	this.initData1();
-      // }, 5000)
     },
     beforeDestroy() {
       clearInterval(this.timer)

src/common/oneline.vue

@@ -186,7 +186,6 @@ export default {
   },
   methods: {
     idChange(id) {
-      // console.log("sep", id);
       // 数据清空
       this.xData = new Array(30).fill("-");
       this.yData = new Array(30).fill("-");
@@ -230,9 +229,6 @@ export default {
           },
         ],
       });
-      // console.log("this.paiqidata", this.paiqidata);
-      // console.log("this.chouqidata", this.chouqidata);
-      // console.log("this.xData", this.xData);
     },
     initWebSocket() {
       // 连接错误

src/common/pieChart.vue

@@ -327,7 +327,6 @@ export default {
     },
   },
   mounted() {
-    // console.log("angle", this.angle);
     this.chart = this.$echarts.init(this.$refs.pieChart);
     this.chart.setOption(this.option);
     // 动画效果

src/common/threeline.vue

@@ -363,7 +363,6 @@ export default {
   },
   methods: {
     idChange(id) {
-      // console.log("sep", id);
       // 数据清空
       this.xData = new Array(30).fill("-");
       this.y1Data = new Array(30).fill("-");
@@ -381,7 +380,7 @@ export default {
     addData(data) {
       // this.websocket;
       // 先扩展数组，然后删除多余元素
-      // console.log("datathree", data);
+
       if (this.count < 30) {
         for (let i = 0; i < data.length; i++) {
           this.y1Data[this.count] = data[i][this.type[0]];
@@ -424,9 +423,7 @@ export default {
           },
         ],
       });
-      // console.log("this.y1Data", this.y1Data);
-      // console.log("this.chouqidata", this.chouqidata);
-      // console.log("this.xData", this.xData);
+
     },
     initWebSocket() {
       // 连接错误
@@ -443,7 +440,6 @@ export default {
       };
       // 收到消息的回调
       this.websocket.onmessage = (event) => {
-        // console.log("onmessage", event);
         if (JSON.parse(event.data).length) {
           this.addData(JSON.parse(event.data));
         }

src/common/twoline.vue

@@ -312,8 +312,6 @@ export default {
   },
   methods: {
     idChange(id) {
-      //  console.log('this.legend',this.legend[0]);
-      // console.log("sep", id);
       // 数据清空
       this.xData = new Array(30).fill("-");
       this.y1Data = new Array(30).fill("-");
@@ -366,9 +364,7 @@ export default {
           },
         ],
       });
-      // console.log("this.paiqidata", this.paiqidata);
-      // console.log("this.chouqidata", this.chouqidata);
-      // console.log("this.xData", this.xData);
+
     },
     initWebSocket() {
       // 连接错误
@@ -385,8 +381,6 @@ export default {
       };
       // 收到消息的回调
       this.websocket.onmessage = (event) => {
-        console.log("@@@@", event);
-
         if (JSON.parse(event.data).length) {
           this.addData(JSON.parse(event.data));
         }
@@ -410,7 +404,7 @@ export default {
     },
   },
   mounted() {
-    console.log("@@@@", this.id);
+
     // 先画图
     this.myChart = this.$echarts.init(this.$refs.testLine);
     this.myChart.setOption(this.option);

src/components/beam_tube/dingbanChart.vue

@@ -196,13 +196,9 @@ export default {
       }
       return arr;
     },
-    // test(){
-    //     console.log(this.getSymbolData(this.chartData));
 
-    // },
     // 更新图表
     updateChart() {
-      // console.log(getSymbolData(data));
       this.myChart.setOption({
         yAxis: [
           {

src/components/beam_tube/dingbanLine.vue

@@ -217,13 +217,10 @@ export default {
       now = new Date(+now - 2000);
     }
 
-    console.log(this.yData1);
-    console.log(this.xData);
+
   },
   mounted() {
     // 先画图
-
-    console.log("this.dingbanData", this.chartData);
     this.myChart = this.$echarts.init(this.$refs.testLine);
     this.updateChart();
 
@@ -238,7 +235,6 @@ export default {
       this.xData.push(now);
       this.yData1.shift();
       this.yData1.push(parseInt(Math.random() * (30 - 25 + 1) + 25, 25));
-      console.log(this.yData1);
       this.myChart.setOption({
         xAxis: [
           {
@@ -257,7 +253,6 @@ export default {
     var threeValue = [];
     this.$bus.$on("dingbanPoint", (data) => {
       this.clickname = data;
-      console.log(this.clickname);
     });
   },
   methods: {

src/components/beam_tube/maosuoChart.vue

@@ -158,8 +158,7 @@ export default {
     };
   },
   mounted() {
-    //   console.log("111");
-    //   this.test();
+
     this.initCharts();
     this.updateChart();
     // 对柱状图添加点击事件
@@ -202,7 +201,6 @@ export default {
     // },
     // 更新图表
     updateChart() {
-      // console.log(getSymbolData(data));
       this.myChart.setOption({
         yAxis: [
           {

src/components/beam_tube/maosuoLine.vue

@@ -1,210 +1,71 @@
 <template>
-	<!-- 实时数据曲线 最多叠加三条 -->
-	<div>
-		<div ref="testLine" style="width: 450px; height: 200px; margin:-5px 0px 0px -40px"></div>
-	</div>
+  <!-- 实时数据曲线 最多叠加三条 -->
+  <div>
+    <div
+      ref="testLine"
+      style="width: 450px; height: 200px; margin:-5px 0px 0px -40px"
+    ></div>
+  </div>
 </template>
 
 <script>
-	import {
-		mapState
-	} from "vuex";
-	export default {
-		props: {
-			chartData: {
-				type: Array,
-				required: true,
-			},
-		},
-		data() {
-			return {
-				myChart:null,
-				xData:[],
-				yData1: [],
-				clickname:'回风巷3#监测点100m',
-				dingbanData: [{
-						name: "1#监测点0m",
-						value: [
-							9,
-							7,
-							8,
-							7,
-							6,
-							8,
-							0,
-							2,
-							2,
-							4,
-							4,
-							6,
-							4,
-							0,
-							3,
-							0,
-							8,
-							8,
-							6,
-							2,
-							5,
-							4,
-							6,
-							4,
-							11,
-							1,
-							4,
-							0,
-							8,
-							8,
-						],
-					},
-					{
-						name: "2#监测点50m",
-						value: [
-							0,
-							3,
-							0,
-							6,
-							4,
-							3,
-							9,
-							0,
-							4,
-							3,
-							11,
-							7,
-							1,
-							11,
-							11,
-							5,
-							7,
-							11,
-							10,
-							5,
-							7,
-							10,
-							6,
-							6,
-							7,
-							0,
-							0,
-							0,
-							6,
-							3,
-						],
-					},
-					{
-						name: "3#监测点100m",
-						value: [
-							2,
-							2,
-							8,
-							5,
-							0,
-							5,
-							11,
-							11,
-							2,
-							8,
-							11,
-							11,
-							2,
-							8,
-							1,
-							3,
-							8,
-							2,
-							8,
-							6,
-							11,
-							8,
-							10,
-							9,
-							8,
-							0,
-							1,
-							11,
-							4,
-							6,
-						],
-					},
-					{
-						name: "4#监测点150m",
-						value: [
-							2,
-							6,
-							1,
-							5,
-							0,
-							1,
-							1,
-							1,
-							9,
-							5,
-							11,
-							3,
-							6,
-							4,
-							6,
-							6,
-							4,
-							2,
-							8,
-							9,
-							5,
-							7,
-							1,
-							1,
-							2,
-							9,
-							5,
-							2,
-							5,
-							1,
-						],
-					},
-					{
-						name: "5#监测点200m",
-						value: [
-							10,
-							4,
-							5,
-							10,
-							2,
-							8,
-							10,
-							4,
-							9,
-							1,
-							10,
-							9,
-							0,
-							6,
-							6,
-							6,
-							11,
-							4,
-							1,
-							3,
-							0,
-							7,
-							11,
-							11,
-							0,
-							4,
-							7,
-							3,
-							2,
-							8,
-						],
-					},
-				],
-
-			};
-		},
-		computed: {
-			...mapState(["websocketIP"]),
-		},
-		 created() {
+import { mapState } from "vuex";
+export default {
+  props: {
+    chartData: {
+      type: Array,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      myChart: null,
+      xData: [],
+      yData1: [],
+      clickname: "回风巷3#监测点100m",
+      dingbanData: [
+        {
+          name: "1#监测点0m",
+          value: [
+            9, 7, 8, 7, 6, 8, 0, 2, 2, 4, 4, 6, 4, 0, 3, 0, 8, 8, 6, 2, 5, 4, 6,
+            4, 11, 1, 4, 0, 8, 8,
+          ],
+        },
+        {
+          name: "2#监测点50m",
+          value: [
+            0, 3, 0, 6, 4, 3, 9, 0, 4, 3, 11, 7, 1, 11, 11, 5, 7, 11, 10, 5, 7,
+            10, 6, 6, 7, 0, 0, 0, 6, 3,
+          ],
+        },
+        {
+          name: "3#监测点100m",
+          value: [
+            2, 2, 8, 5, 0, 5, 11, 11, 2, 8, 11, 11, 2, 8, 1, 3, 8, 2, 8, 6, 11,
+            8, 10, 9, 8, 0, 1, 11, 4, 6,
+          ],
+        },
+        {
+          name: "4#监测点150m",
+          value: [
+            2, 6, 1, 5, 0, 1, 1, 1, 9, 5, 11, 3, 6, 4, 6, 6, 4, 2, 8, 9, 5, 7,
+            1, 1, 2, 9, 5, 2, 5, 1,
+          ],
+        },
+        {
+          name: "5#监测点200m",
+          value: [
+            10, 4, 5, 10, 2, 8, 10, 4, 9, 1, 10, 9, 0, 6, 6, 6, 11, 4, 1, 3, 0,
+            7, 11, 11, 0, 4, 7, 3, 2, 8,
+          ],
+        },
+      ],
+    };
+  },
+  computed: {
+    ...mapState(["websocketIP"]),
+  },
+  created() {
     // this.getData();
     // var index = 190;
     let now = new Date();
@@ -219,18 +80,18 @@
     console.log(this.yData1);
     console.log(this.xData);
   },
-		mounted() {
-			// 先画图
+  mounted() {
+    // 先画图
+
+    console.log("this.dingbanData", this.chartData);
+    this.myChart = this.$echarts.init(this.$refs.testLine);
+    this.updateChart();
 
-			console.log('this.dingbanData', this.chartData);
-			this.myChart = this.$echarts.init(this.$refs.testLine);
-			this.updateChart();
-				
-			// this.websocket = new WebSocket(
-			//   `ws://${this.websocketIP}/hbase/ws/belt/${this.id}`
-			// );
-			// this.initWebSocket();
-			this.timer1 = setInterval(() => {
+    // this.websocket = new WebSocket(
+    //   `ws://${this.websocketIP}/hbase/ws/belt/${this.id}`
+    // );
+    // this.initWebSocket();
+    this.timer1 = setInterval(() => {
       let now = new Date();
       now = now.toLocaleTimeString().replace(/^\D*/, "");
       this.xData.shift();
@@ -253,48 +114,45 @@
       });
     }, 3000);
     var index = -1;
-			var threeValue = [];
-			this.$bus.$on("maosuoPoint", (data) => {
-				this.clickname=data;
-				console.log(this.clickname);
-			
-
-				})
-				
-		},
-		methods: {
-			updateChart() {
-				const option = {
-					tooltip: {
-						trigger: "axis",
-						backgroundColor: "transparent",
-						axisPointer: {
-							lineStyle: {
-								color: {
-									type: "linear",
-									x: 0,
-									y: 0,
-									x2: 0,
-									y2: 1,
-									colorStops: [{
-											offset: 0,
-											color: "rgba(126,199,255,0)", // 0% 处的颜色
-										},
-										{
-											offset: 0.5,
-											color: "rgba(126,199,255,1)", // 100% 处的颜色
-										},
-										{
-											offset: 1,
-											color: "rgba(126,199,255,0)", // 100% 处的颜色
-										},
-									],
-									global: false, // 缺省为 false
-								},
-							},
-						},
-						formatter: (p) => {
-							let dom = `<div style="width: 79px;
+    var threeValue = [];
+    this.$bus.$on("maosuoPoint", (data) => {
+      this.clickname = data;
+    });
+  },
+  methods: {
+    updateChart() {
+      const option = {
+        tooltip: {
+          trigger: "axis",
+          backgroundColor: "transparent",
+          axisPointer: {
+            lineStyle: {
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "rgba(126,199,255,0)", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.5,
+                    color: "rgba(126,199,255,1)", // 100% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "rgba(126,199,255,0)", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+          },
+          formatter: (p) => {
+            let dom = `<div style="width: 79px;
 	height: 110px;;color:#fff;position: relative;">
 	<svg style="position: absolute;top: 50%;
     left: 50%;
@@ -332,161 +190,166 @@
 		
 	</div>
 </div>`;
-							return dom;
-						},
-					},
-					legend: {
-						align: "left",
-						right: "10%",
-						top: "10%",
-						type: "plain",
-						textStyle: {
-							color: "#7ec7ff",
-							fontSize: 11,
-						},
-						// icon:'rect',
-						itemGap: 25,
-						itemWidth: 18,
-						icon: "path://M0 2a2 2 0 0 1 2 -2h14a2 2 0 0 1 2 2v0a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2 -2z",
+            return dom;
+          },
+        },
+        legend: {
+          align: "left",
+          right: "10%",
+          top: "10%",
+          type: "plain",
+          textStyle: {
+            color: "#7ec7ff",
+            fontSize: 11,
+          },
+          // icon:'rect',
+          itemGap: 25,
+          itemWidth: 18,
+          icon: "path://M0 2a2 2 0 0 1 2 -2h14a2 2 0 0 1 2 2v0a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2 -2z",
 
-						data: this.legend,
-					},
-					grid: {
-						top: "15%",
-						left: "10%",
-						right: "10%",
-						bottom: "1%",
-						containLabel: true,
-					},
-					yAxis: [{
-						boundaryGap: [0, "100%"],
-						name: "mm",
-						splitLine: {
-							show: true,
-							lineStyle: {
-								type: "dotted",
-								color: "rgba(155, 155, 155, 0.5)",
-							},
-						},
-						axisLine: {
-							show: false,
-						},
-						axisLabel: {
-							color: "#fff",
-							fontSize: 11,
-						},
-						axisTick: {
-							show: false
-						},
-						type: "value",
-					}],
-					xAxis: [{
-						// type: "time", // x轴为 时间轴
-						interval: 0,
-						splitLine: {
-							show: false
-						},
-						axisLine: {
-							lineStyle: {
-								width: 0
-							},
-						},
-						axisLabel: {
-							color: "#fff",
-							fontSize: 11,
-							rotate: 30,
-						},
-						axisTick: {
-							show: false
-						},
-						boundaryGap: false,
-						data: [],
-					}],
-					title: {
-						text: '锚索应力曲线图',
-						padding: [5, 170],
-						textStyle: {
-							fontWeight: "normal", //标题颜色
-							color: "#4ADEFE",
-							fontSize: 15
-						},
-					},
+          data: this.legend,
+        },
+        grid: {
+          top: "15%",
+          left: "10%",
+          right: "10%",
+          bottom: "1%",
+          containLabel: true,
+        },
+        yAxis: [
+          {
+            boundaryGap: [0, "100%"],
+            name: "mm",
+            splitLine: {
+              show: true,
+              lineStyle: {
+                type: "dotted",
+                color: "rgba(155, 155, 155, 0.5)",
+              },
+            },
+            axisLine: {
+              show: false,
+            },
+            axisLabel: {
+              color: "#fff",
+              fontSize: 11,
+            },
+            axisTick: {
+              show: false,
+            },
+            type: "value",
+          },
+        ],
+        xAxis: [
+          {
+            // type: "time", // x轴为 时间轴
+            interval: 0,
+            splitLine: {
+              show: false,
+            },
+            axisLine: {
+              lineStyle: {
+                width: 0,
+              },
+            },
+            axisLabel: {
+              color: "#fff",
+              fontSize: 11,
+              rotate: 30,
+            },
+            axisTick: {
+              show: false,
+            },
+            boundaryGap: false,
+            data: [],
+          },
+        ],
+        title: {
+          text: "锚索应力曲线图",
+          padding: [5, 170],
+          textStyle: {
+            fontWeight: "normal", //标题颜色
+            color: "#4ADEFE",
+            fontSize: 15,
+          },
+        },
 
-					series: [
-            {
-							name: '主运巷4#监测点150m',
-							type: "line",
-							symbol: "circle", // 默认是空心圆（中间是白色的），改成实心圆
-							showAllSymbol: true,
-							symbolSize: 0,
-							smooth: true,
-							lineStyle: {
-								normal: {
-									width: 2,
-									color: "rgba(255, 102, 102,1)", // 线条颜色
-								},
-								borderColor: "rgba(0,0,0,.4)",
-							},
-							itemStyle: {
-								color: "rgba(255, 102, 102,1)",
-								borderColor: "#646ace",
-								borderWidth: 2,
-							},
-							tooltip: {
-								show: true,
-							},
-							areaStyle: {
-								//区域填充样式
-								normal: {
-									//线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
-									color: new echarts.graphic.LinearGradient(
-										0,
-										0,
-										0,
-										1,
-										[{
-												offset: 0,
-												color: "rgba(255, 102, 102,.3)",
-											},
-											{
-												offset: 1,
-												color: "rgba(255, 102, 102, 0)",
-											},
-										],
-										false
-									),
-									shadowColor: "rgba(255, 102, 102, 0.5)", //阴影颜色
-									shadowBlur: 20, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
-								},
-							},
-							data: this.yData1
-						}],
-				}
-			 this.myChart.setOption(option);
-			}
-	
-		},
+        series: [
+          {
+            name: "主运巷4#监测点150m",
+            type: "line",
+            symbol: "circle", // 默认是空心圆（中间是白色的），改成实心圆
+            showAllSymbol: true,
+            symbolSize: 0,
+            smooth: true,
+            lineStyle: {
+              normal: {
+                width: 2,
+                color: "rgba(255, 102, 102,1)", // 线条颜色
+              },
+              borderColor: "rgba(0,0,0,.4)",
+            },
+            itemStyle: {
+              color: "rgba(255, 102, 102,1)",
+              borderColor: "#646ace",
+              borderWidth: 2,
+            },
+            tooltip: {
+              show: true,
+            },
+            areaStyle: {
+              //区域填充样式
+              normal: {
+                //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+                color: new echarts.graphic.LinearGradient(
+                  0,
+                  0,
+                  0,
+                  1,
+                  [
+                    {
+                      offset: 0,
+                      color: "rgba(255, 102, 102,.3)",
+                    },
+                    {
+                      offset: 1,
+                      color: "rgba(255, 102, 102, 0)",
+                    },
+                  ],
+                  false
+                ),
+                shadowColor: "rgba(255, 102, 102, 0.5)", //阴影颜色
+                shadowBlur: 20, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+              },
+            },
+            data: this.yData1,
+          },
+        ],
+      };
+      this.myChart.setOption(option);
+    },
+  },
 
-		beforeDestroy() {
-			this.$bus.$off("maosuoPoint", (data) => {
-				console.log(data);
-			});
-			clearInterval(this.timer1);
-			clearInterval(this.timer2);
-		},
-	};
+  beforeDestroy() {
+    this.$bus.$off("maosuoPoint", (data) => {
+      console.log(data);
+    });
+    clearInterval(this.timer1);
+    clearInterval(this.timer2);
+  },
+};
 </script>
 <style scoped>
-	.select-veido .el-select {
-		width: 100px;
-		margin-left: 10px;
-	}
+.select-veido .el-select {
+  width: 100px;
+  margin-left: 10px;
+}
 
-	.select-veido>>>.el-input--small .el-input__inner {
-		background: none;
-	}
+.select-veido >>> .el-input--small .el-input__inner {
+  background: none;
+}
 
-	.select-veido>>>.el-input__inner {
-		border: 0;
-	}
+.select-veido >>> .el-input__inner {
+  border: 0;
+}
 </style>

src/components/beam_tube/scatterChart.vue

@@ -102,7 +102,7 @@ export default {
     this.interval = setInterval(() => {
       this.data.top = this.generateArr();
       this.data.bottom = this.generateArr();
-      // console.log(" _that.data1", this.data.top);
+
       var arr = [];
       var newArr = [];
       var newArr2 = [];

src/components/monitor/detailedView.vue

@@ -196,7 +196,6 @@ export default {
   },
   methods: {
     idChange(id) {
-      console.log("left", id);
       // 数据清空
       this.yData = new Array(30).fill("-");
       this.xData = new Array(30).fill("-");
@@ -220,14 +219,13 @@ export default {
       this.websocket = new WebSocket(
         `ws://${this.websocketIP}/hbase/ws/safetyMonitor/62/${this.chooseDatetime}`
       );
-      console.log(this.websocket);
+
       this.initWebSocket();
     },
 
     addData(data) {
       this.websocket;
       // 先扩展数组，然后删除多余元素
-      console.log("data", data);
       if (this.count < 30) {
         for (let i = 0; i < data.length; i++) {
           this.yData[this.count] = data[i][this.type];
@@ -256,9 +254,7 @@ export default {
           },
         ],
       });
-      console.log("this.paiqidata", this.paiqidata);
-      console.log("this.chouqidata", this.chouqidata);
-      console.log("this.xData", this.xData);
+
     },
     initWebSocket() {
       // 连接错误

src/components/mpGraph/mpGraph.vue

@@ -19,7 +19,6 @@
 		watch: {
 			beforeData: {
 				handler(val) {
-					console.log(val);
 					this.updateChart();
 
 				},
@@ -28,7 +27,6 @@
 			},
 			afterData: {
 				handler(val) {
-					console.log(val);
 					this.updateChart();
 
 				},
@@ -37,7 +35,6 @@
 			},
 			xTime: {
 				handler(val) {
-					console.log(val);
 					this.updateChart();
 
 				},
@@ -54,8 +51,6 @@
 			//   }, 2000)
 		},
 		destroyed() {
-		        // clearInterval(this.timer)
-				console.log("子组件里的destroyed");
 
 		    },
 		methods: {

src/components/transportation/configImg/chart/myLine.vue

@@ -374,7 +374,6 @@ export default {
         first = 0;
       }
       let interval = setInterval(() => {
-        // console.log(xData);
         xData.shift();
         xData.push(new Date().toLocaleTimeString().replace(/^\D*/, ''))
         data1.shift();

src/views/gas/configImg/Chart.vue

@@ -362,6 +362,12 @@ export default {
         this.websocket.close();
       });
     },
+    clearData() {
+      this.count = 0;
+      this.xData = new Array(30).fill("-");
+      this.chouqidata = new Array(30).fill("-");
+      this.paiqidata = new Array(30).fill("-");
+    },
   },
   mounted() {
     // 先画图

src/views/gas/configImg/dianliuChart.vue

@@ -229,6 +229,11 @@ export default {
         this.websocket.close();
       });
     },
+    clearData() {
+      this.count = 0;
+      this.xData = new Array(30).fill("-");
+      this.dianliudata = new Array(30).fill("-");
+    },
   },
   mounted() {
     // 先画图

src/views/gas/configImg/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main1">
     <div class="header">
-      <h1 class="header-title">1#瓦斯泵</h1>
+      <h1 class="header-title">{{$route.params.id}}#瓦斯泵</h1>
     </div>
     <div class="top">
       <!-- <div class="center_left"> -->
@@ -17,12 +17,17 @@
       <div class="bottom">
         <!-- 浓度或流量曲线 -->
         <div class="bottom_left">
-          <chart></chart>
+          <chart ref="nongdu"></chart>
         </div>
 
         <!-- 电机电流曲线 -->
         <div class="bottom_right">
-          <dianliuChart :id="8" title="瓦斯泵电流" unit="A"></dianliuChart>
+          <dianliuChart
+            ref="dianliu"
+            :id="8"
+            title="瓦斯泵电流"
+            unit="A"
+          ></dianliuChart>
         </div>
       </div>
     </el-row>
@@ -44,8 +49,15 @@ export default {
   data() {
     return {};
   },
+  computed: {},
   methods: {},
-    /**
+  mounted() {
+    let chartRefs = ["nongdu", "dianliu"];
+    for (let i = 0; i < chartRefs.length; i++) {
+      this.$refs[chartRefs[i]].clearData();
+    }
+  },
+  /**
    * Components 包含子组件
    * @prop {Component} centerLeft1 瓦斯泵故障记录
    * @prop {Component} Chart 浓度或流量曲线

src/views/gas/gas.vue

@@ -1,20 +1,39 @@
 <template>
   <div>
     <!--标签-->
-    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="系统图" name="third">
+    <el-tabs
+      v-model="activeName"
+      type="card"
+      @tab-click="handleClick"
+    >
+      <el-tab-pane
+        label="系统图"
+        name="third"
+      >
         <router-view></router-view>
       </el-tab-pane>
-       <el-tab-pane label="1#瓦斯泵" name="dataBoard1">
-    
+      <el-tab-pane
+        label="1#瓦斯泵"
+        name="dataBoard1"
+      >
+        <router-view></router-view>
       </el-tab-pane>
-       <el-tab-pane label="2#瓦斯泵" name="dataBoard2">
-  
+      <el-tab-pane
+        label="2#瓦斯泵"
+        name="dataBoard2"
+      >
+        <router-view></router-view>
       </el-tab-pane>
-      <el-tab-pane label="系统数据" name="first">
+      <el-tab-pane
+        label="系统数据"
+        name="first"
+      >
         <systemData v-if="activeName == 'first'"></systemData>
       </el-tab-pane>
-      <el-tab-pane label="数据标准" name="second">
+      <el-tab-pane
+        label="数据标准"
+        name="second"
+      >
         <dataStandard
           v-if="activeName == 'second'"
           :dataQualitySystemId="6"
@@ -164,18 +183,23 @@ export default {
       });
     },
     handleClick(tab, event) {
-      console.log(tab, event);
-      if (tab.name == "third") {
-        this.$router.push({
-          path: "/gas/mainpage",
-        });
-        // this.$nextTick(() => {
-        //   this.activeName = "first";
-        // });
-        // let routeData = this.$router.resolve({
-        //   path: "/gas-mainpage",
-        // });
-        // window.open(routeData.href, "_blank");
+      console.log(tab.name);
+      switch (tab.name) {
+        case "dataBoard1":
+          this.$router.push({
+            path: `/gas/dataview/1`,
+          });
+          break;
+        case "dataBoard2":
+          this.$router.push({
+            path: `/gas/dataview/2`,
+          });
+          break;
+        case "third":
+          this.$router.push({
+            path: "/gas/mainpage",
+          });
+          break;
       }
     },
   },

src/views/ventilate/dataBoard/dataBoard.vue

@@ -122,7 +122,7 @@ import runningMsg from "./runningMsg";
 export default {
   data() {
     return {
-      currentVenId: "1号风机",
+      currentVenId: this.title,
       venOptions: [
         {
           id: "1",
@@ -145,6 +145,7 @@ export default {
       vibrateLegand: ["水平振动", "垂直振动"],
     };
   },
+  props:["title"],
   methods: {
     selectChart(val) {
       console.log("val", val);
@@ -158,6 +159,7 @@ export default {
       //   this.$refs.runningMsg.idChange(val);
     },
   },
+ 
   components: {
     volAndCurrent,
     wind,

src/views/ventilate/dataBoard/volAndCurrent.vue

@@ -510,6 +510,13 @@ export default {
         this.websocket.close();
       });
     },
+    clearData() {
+      this.count = 0;
+      this.xData = new Array(30).fill("-");
+      this.y1Data = new Array(30).fill("-");
+      this.y2Data = new Array(30).fill("-");
+      this.y3Data = new Array(30).fill("-");
+    },
   },
   mounted() {
     // 先画图

src/views/ventilate/dataBoard/wind.vue

@@ -302,6 +302,11 @@ export default {
         this.websocket.close();
       });
     },
+     clearData() {
+      this.count = 0;
+      this.xData = new Array(30).fill("-");
+      this.yData = new Array(30).fill("-");
+    },
   },
   mounted() {
     // 先画图

src/views/ventilate/ventilate.vue

@@ -5,8 +5,11 @@
       <el-tab-pane label="系统图" name="third">
         <config-img v-if="activeName == 'third'"></config-img>
       </el-tab-pane>
-      <el-tab-pane label="数据看板" name="fourth">
-        <data-board v-if="activeName == 'fourth'"></data-board>
+      <el-tab-pane label="1号风机" name="dataBoard1">
+        <data-board v-if="activeName == 'dataBoard1'" title="1号风机"></data-board>
+      </el-tab-pane>
+      <el-tab-pane label="2号风机" name="dataBoard2">
+        <data-board v-if="activeName == 'dataBoard2'" title="2号风机"></data-board>
       </el-tab-pane>
       <el-tab-pane label="系统数据" name="first">
         <systemData v-if="activeName == 'first'"></systemData>