Przeglądaj źródła

供电系统和安全监控系统

seamew 3 lat temu
rodzic
commit
7aac2fb3c3

+ 4 - 5
src/components/monitor/detailedView.vue

@@ -37,9 +37,8 @@
     <!-- <div id="transactionFlowView" style="height:180px;width: 100%;margin-bottom: 10px;"></div> -->
     <div
       ref="testLine"
-      style="width: 780px; height: 250px; margin: 0px auto;margin-top: -30px; "
+      style="width: 780px; height: 250px; margin: 0px auto; margin-top: -30px"
     ></div>
-
   </div>
 </template>
 
@@ -210,7 +209,6 @@ export default {
     // 选择数据的时间
     chooseDate(value) {
       this.chooseDatetime = value;
-      console.log("chooseDatetime" + this.chooseDatetime);
       this.count = 0;
       this.xData = new Array(30).fill("-");
       this.yData = new Array(30).fill("-");
@@ -254,7 +252,6 @@ export default {
           },
         ],
       });
-
     },
     initWebSocket() {
       // 连接错误
@@ -314,5 +311,7 @@ export default {
   color: #fff;
   background-color: #2d8cf0;
   width: 60px;
+  z-index:999;
+  position: relative;
 }
-</style>
+</style>

+ 4 - 2
src/views/monitor/configImg/configImg.vue

@@ -99,11 +99,11 @@ import headline from "@/common/headline";
 export default {
   data() {
     return {
-      area: "原煤仓二次分站",
+      area: this.title,
       areaOptions: [
         {
           id: 0,
-          label: "原煤仓二分站",
+          label: "原煤仓二分站",
         },
         {
           id: 1,
@@ -128,6 +128,7 @@ export default {
       score: [80, 90, 70, 88, 96, 76],
     };
   },
+  props: ["title"],
   components: {
     detailedView,
     detailedTable,
@@ -188,6 +189,7 @@ export default {
     },
   },
   mounted() {
+    this.selectArea(this.totalArea.findIndex(item => item == this.title));
     let interval = setInterval(() => {
       let temp = [];
       for (let i = 0; i < 6; i++) {

+ 12 - 3
src/views/monitor/monitor.vue

@@ -2,8 +2,17 @@
   <div>
     <!--标签-->
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="系统图" name="zutai">
-        <configImg></configImg>
+      <el-tab-pane label="原煤仓二层分站" name="0">
+        <configImg title="原煤仓二层分站" v-if="activeName == '0'"></configImg>
+      </el-tab-pane>
+      <el-tab-pane label="碟子沟通风机房" name="1">
+        <configImg title="碟子沟通风机房" v-if="activeName == '1'"></configImg>
+      </el-tab-pane>
+      <el-tab-pane label="地面主平硐井口" name="2">
+        <configImg title="地面主平硐井口" v-if="activeName == '2'"></configImg>
+      </el-tab-pane>
+      <el-tab-pane label="12302回风巷" name="3">
+        <configImg title="12302回风巷" v-if="activeName == '3'"></configImg>
       </el-tab-pane>
       <el-tab-pane label="系统数据" name="first">
         <systemData v-if="activeName == 'first'"></systemData>
@@ -26,7 +35,7 @@ export default {
   name: "monitor",
   data() {
     return {
-      activeName: "zutai",
+      activeName: "0",
       checkVisible: "false",
     };
   },

+ 2 - 2
src/views/power_supply/dataBoard/dataBoard.vue

@@ -33,7 +33,7 @@
         <!-- 电机电流曲线 -->
         <div class="bottom_right">
           <rightChart
-            ref="current"
+            ref="rightChart"
             :id="92"
             title="电机电流"
             unit="A"
@@ -102,7 +102,7 @@ export default {
 </script>
 <style scoped>
 .select-veido .el-select {
-  width: 200px;
+  width: 240px;
   margin-left: 10px;
 }
 .select-veido >>> .el-input--small .el-input__inner {

+ 4 - 1
src/views/power_supply/dataBoard/leftChart.vue

@@ -206,6 +206,7 @@ export default {
       // 数据清空
       this.yData = new Array(30).fill("-");
       this.xData = new Array(30).fill("-");
+      this.count = 0;
       // 关闭以前的websocket
       this.websocket.close();
       // 开启一个新的
@@ -323,8 +324,10 @@ export default {
 </script>
 <style scoped>
 .select-veido .el-select {
-    width: 80px;
+    width: 110px;
     margin-left: 279px;
+    position: relative;
+    z-index: 999;
 }
 
 .select-veido >>> .el-input__inner {

+ 1 - 0
src/views/power_supply/dataBoard/rightChart.vue

@@ -190,6 +190,7 @@ export default {
       // 数据清空
       this.xData = new Array(30).fill("-");
       this.yData = new Array(30).fill("-");
+      this.count = 0;
       // 关闭以前的websocket
       this.websocket.close();
       // 开启一个新的