Merge branch 'master' of https://gitee.com/qinnamin/large_screen

src/common/m3u8.vue

@@ -16,7 +16,7 @@ export default {
   props: {
     src: {
       type: String,
-      default: "http://stream.snrtv.com/sxbc-star-noquyZ.m3u8",
+      default: "123",
     },
   },
   data() {

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>

src/views/compressed/configImg/configImg.vue

@@ -4,112 +4,52 @@
       <el-header>
         <div>
           <img
-            style="margin-top:10px"
+            style="margin-top: 10px"
             src="@/assets/img/compressed/back.png"
             id="imgSwitch"
           />
         </div>
         <div id="fan">
           <div class="fan1">
-            <ul :class="{
+            <ul
+              :class="{
                 blades: tableData[0].isStart,
                 bld: !tableData[0].isStart,
-              }">
-              <li :class="[
-                  'b1',
-                  !tableData[0].isAlarm
-                    ? !tableData[0].isWarning
-                      ? 'green'
-                      : 'red'
-                    : 'red',
-                ]"></li>
-              <li :class="[
-                  'b2',
-                  !tableData[0].isAlarm
-                    ? !tableData[0].isWarning
-                      ? 'green'
-                      : 'red'
-                    : 'red',
-                ]"></li>
-              <li :class="[
-                  'b3',
-                  !tableData[0].isAlarm
-                    ? !tableData[0].isWarning
-                      ? 'green'
-                      : 'red'
-                    : 'red',
-                ]"></li>
+              }"
+            >
+              <li :class="['b1', tableData[0].isStart ? 'green' : 'red']"></li>
+              <li :class="['b2', tableData[0].isStart ? 'green' : 'red']"></li>
+              <li :class="['b3', tableData[0].isStart ? 'green' : 'red']"></li>
             </ul>
           </div>
           <div class="fan2">
-            <ul :class="{
+            <ul
+              :class="{
                 blades: tableData[1].isStart,
                 bld: !tableData[1].isStart,
-              }">
-              <li :class="[
-                  'b1',
-                  !tableData[1].isAlarm
-                    ? !tableData[1].isWarning
-                      ? 'green'
-                      : 'red'
-                    : 'red',
-                ]"></li>
-              <li :class="[
-                  'b2',
-                  !tableData[1].isAlarm
-                    ? !tableData[1].isWarning
-                      ? 'green'
-                      : 'red'
-                    : 'red',
-                ]"></li>
-              <li :class="[
-                  'b3',
-                  !tableData[1].isAlarm
-                    ? !tableData[1].isWarning
-                      ? 'green'
-                      : 'red'
-                    : 'red',
-                ]"></li>
+              }"
+            >
+              <li :class="['b1', tableData[1].isStart ? 'green' : 'red']"></li>
+              <li :class="['b2', tableData[1].isStart ? 'green' : 'red']"></li>
+              <li :class="['b3', tableData[1].isStart ? 'green' : 'red']"></li>
             </ul>
           </div>
           <div class="fan3">
-            <ul :class="{
+            <ul
+              :class="{
                 blades: tableData[2].isStart,
                 bld: !tableData[2].isStart,
-              }">
-              <li :class="[
-                  'b1',
-                  !tableData[2].isAlarm
-                    ? !tableData[2].isWarning
-                      ? 'green'
-                      : 'red'
-                    : 'red',
-                ]"></li>
-              <li :class="[
-                  'b2',
-                  !tableData[2].isAlarm
-                    ? !tableData[2].isWarning
-                      ? 'green'
-                      : 'red'
-                    : 'red',
-                ]"></li>
-              <li :class="[
-                  'b3',
-                  !tableData[2].isAlarm
-                    ? !tableData[2].isWarning
-                      ? 'green'
-                      : 'red'
-                    : 'red',
-                ]"></li>
+              }"
+            >
+              <li :class="['b1', tableData[2].isStart ? 'green' : 'red']"></li>
+              <li :class="['b2', tableData[2].isStart ? 'green' : 'red']"></li>
+              <li :class="['b3', tableData[2].isStart ? 'green' : 'red']"></li>
             </ul>
           </div>
         </div>
       </el-header>
       <el-main>
-        <el-row
-          style="margin-top: 80px"
-          :gutter="20"
-        >
+        <el-row style="margin-top: 80px" :gutter="20">
           <el-col :span="8">
             <div class="center">
               <data-table
@@ -190,7 +130,6 @@ export default {
           this.tableData[i].runningTime + this.getRandomNum(0, 3);
         temp.loadingTime =
           this.tableData[i].loadingTime + this.getRandomNum(0, 3);
-
         this.tableData.splice(i, 1, temp);
       }
     }, 3000);
@@ -239,16 +178,16 @@ li {
 .fan1 {
   margin-left: 15px;
   position: absolute;
-  margin-top:-25px;
+  margin-top: -30px;
 }
 .fan2 {
-  margin-left: 520px;
-  margin-top: -25px;
+  margin-left: 460px;
+  margin-top: -30px;
   position: absolute;
 }
 .fan3 {
-  margin-left: 1040px;
-  margin-top: -25px;
+  margin-left: 950px;
+  margin-top: -30px;
   position: absolute;
 }
 #fan {
@@ -309,12 +248,11 @@ li {
   }
 }
 .red {
-   background: linear-gradient(145deg, #c21e41, #e7234d);
+  background: linear-gradient(145deg, #c21e41, #e7234d);
   box-shadow: 17px 17px 34px #be1d3f;
 }
 .green {
-   background: linear-gradient(145deg, #63ac7d, #76cc95);
+  background: linear-gradient(145deg, #63ac7d, #76cc95);
   box-shadow: 17px 17px 34px #61a87a;
 }
-
 </style>

src/views/drain/configImg/index.vue

@@ -156,90 +156,90 @@ export default {
   /* margin-left: 30px; */
 }
 .botton0 {
-  width: 10px;
+  width: 15px;
   height: 30px;
   position: absolute;
   top: 68px;
   left: 63px;
 }
 .botton1 {
-  width: 10px;
+  width: 15px;
   height: 30px;
   position: absolute;
   top: 374px;
   left: 146px;
 }
 .botton2 {
-  width: 15px;
-  height: 15px;
+  width: 20px;
+  height: 20px;
   border-radius: 50%;
   position: absolute;
-  top: 380px;
-  left: 376px;
+  top: 375px;
+  left: 378px;
 }
 .botton3 {
-  width: 15px;
-  height: 15px;
+  width: 20px;
+  height: 20px;
   border-radius: 50%;
   position: absolute;
-  top: 307px;
-  left: 427px;
+  top: 305px;
+  left: 430px;
 }
 .botton4 {
-  width: 10px;
+  width: 15px;
   height: 30px;
   position: absolute;
   top: 140px;
-  left: 537px;
+  left: 542px;
 }
 .botton5 {
-  width: 10px;
+  width: 15px;
   height: 30px;
   position: absolute;
   top: 375px;
-  left: 620px;
+  left: 624px;
 }
 .botton6 {
-  width: 15px;
-  height: 15px;
+  width: 20px;
+  height: 20px;
   border-radius: 50%;
   position: absolute;
-  top: 380px;
-  left: 850px;
+  top: 375px;
+  left: 855px;
 }
 .botton7 {
-  width: 15px;
-  height: 15px;
+  width: 20px;
+  height: 20px;
   border-radius: 50%;
   position: absolute;
-  top: 307px;
-  left: 900px;
+  top: 305px;
+  left: 907px;
 }
 .botton8 {
-  width: 10px;
+  width: 15px;
   height: 30px;
   position: absolute;
-  top: 140px;
-  left: 1011px;
+  top: 137px;
+  left: 1021px;
 }
 .botton9 {
-  width: 10px;
+  width: 15px;
   height: 30px;
   position: absolute;
-  top: 376px;
-  left: 1093px;
+  top: 372px;
+  left: 1103px;
 }
 .botton10 {
-  width: 15px;
-  height: 15px;
+  width: 20px;
+  height: 20px;
   border-radius: 50%;
   position: absolute;
   top: 380px;
   right: 245px;
 }
 .botton11 {
-  width: 15px;
-  height: 15px;
+  width: 20px;
+  height: 20px;
   border-radius: 50%;
   position: absolute;
   top: 306px;

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++) {

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",
     };
   },

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 {

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 {

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();
       // 开启一个新的