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

src/common/dataDetail/dataDetail_chart.vue

@@ -294,7 +294,7 @@ export default {
 
           }
           // console.log(arr);
-          // this.tableData=arr;
+          this.tableData=arr;
         }
         // console.log('this.tableData');
         // console.log(this.tableData);

src/common/dataDetail/dataDetail_graph.vue

@@ -10,7 +10,7 @@
 
     </div>
 		
-		<el-card class="box-card" v-for="(item,index) in mpArray">
+		<el-card class="box-card" v-for="(item,index) in mpArray" v-if="showReject">
 			<mpGraph2  :beforeData='item.before' :afterData='item.after'
 			:xTime='item.time' :title='item.name'></mpGraph2>
 		</el-card>
@@ -65,7 +65,7 @@
       mpGraph2,
    
     },
-    mounted() {
+    created() {
 
       this.currentEquipId = this.$route.query.equipmentId
       // this.currentEquipId = window.sessionStorage.getItem("dataList_currentEquipId");
@@ -239,6 +239,7 @@
 
       },
       startGetData() {
+        this.handleHbaseSearch();
         this.timer = setInterval(() => {
 
           this.handleHbaseSearch()

src/components/mpGraph/mpGraph.vue

@@ -1,5 +1,6 @@
 <template>
-	<div class="com-chart2" ref="mpGraph"></div>
+	<div class="com-chart2" ref="mpGraph" style="height: 145px;
+		width: 1500px;"></div>
 </template>
 <script>
 	export default {
@@ -19,6 +20,7 @@
 		watch: {
 			beforeData: {
 				handler(val) {
+					console.log(val);
 					this.updateChart();
 
 				},
@@ -27,6 +29,7 @@
 			},
 			afterData: {
 				handler(val) {
+					console.log(val);
 					this.updateChart();
 
 				},
@@ -35,6 +38,7 @@
 			},
 			xTime: {
 				handler(val) {
+					console.log(val);
 					this.updateChart();
 
 				},
@@ -51,6 +55,8 @@
 			//   }, 2000)
 		},
 		destroyed() {
+		        // clearInterval(this.timer)
+				console.log("子组件里的destroyed");
 
 		    },
 		methods: {
@@ -223,8 +229,5 @@
 	}
 </script>
 <style scoped>
-	.com-chart {
-		height: 145px;
-		width: 500px;
-	}
+	
 </style>

src/components/tunneling/mbl2.vue

@@ -96,17 +96,15 @@ li {
   color: #4adefe;
   list-style-type: none;
   /* display: flex; */
-  font-size: 1.1rem;
+  font-size: 18px;
   /* text-align: center; */
 }
 span {
   display: inline-block;
   text-indent: 3px;
-  border-radius: 0.7rem;
-  width: 2.5rem;
-  height: 2.25rem;
+  border-radius: 4px;
+  width: 64.5px;
+  height: 38.25px;
   color: #f3db5c;
-  /* background-color: rgb(13s3, 158, 231); */
-  margin: 0 0.325rem 0.25rem;
 }
 </style>

src/components/tunneling/rtone.vue

@@ -2,22 +2,28 @@
   <div id="rtone">
     <div class="daystatics">
       <div class="item">
-        <span>累计完成进尺 :</span><span>{{ data.leijijinchi }}</span>m
+        <span>累计完成进尺 :</span><span>{{ data.leijijinchi }}</span
+        >m
       </div>
       <div class="item">
-        <span>月 完 成 进尺 :</span><span>{{ data.yuejinchi }}</span>m
+        <span>月 完 成 进尺 :</span><span>{{ data.yuejinchi }}</span
+        >m
       </div>
       <div class="item">
-        <span>日 平 均 进尺 :</span><span>{{ data.rizuigaojinchi }}</span>m
+        <span>日 平 均 进尺 :</span><span>{{ data.rizuigaojinchi }}</span
+        >m
       </div>
       <div class="item">
-        <span>班 最 高 进尺 :</span> <span>{{ data.banzuigaojinchi }}</span>m
+        <span>班 最 高 进尺 :</span> <span>{{ data.banzuigaojinchi }}</span
+        >m
       </div>
       <div class="item">
-        <span>日 最 高 进尺 :</span><span>{{data.rizuigaojinchi}}</span>m
+        <span>日 最 高 进尺 :</span><span>{{ data.rizuigaojinchi }}</span
+        >m
       </div>
       <div class="item">
-        <span>当 前___人 员 :</span><span id="six">{{ data.dangqianrenyuan }}</span>
+        <span>当 前___人 员 :</span
+        ><span id="six">{{ data.dangqianrenyuan }}</span>
       </div>
     </div>
   </div>
@@ -89,26 +95,25 @@ export default {
 };
 </script>
 
-<style  lang="less" scoped>
+<style lang="less" scoped>
 .daystatics {
   display: grid;
   grid-template-columns: repeat(1, 500px);
-  grid-gap: 6px;
   margin-top: -40px;
   .item {
     color: #4adefe;
-    font-size: 1.25rem;
+    font-size: 18px;
     margin-left: 30px;
   }
   .item span:nth-of-type(1) {
     display: inline-block;
     color: #4adefe;
-    font-size: 1.25rem;
+    font-size: 18px;
     width: 140px;
   }
   .item span:nth-of-type(2) {
     display: inline-block;
-    text-indent: -66px;
+    text-indent: -47px;
     color: #f3db5c;
     font-size: 25px;
   }
@@ -120,17 +125,17 @@ li {
   color: #4adefe;
   display: flex;
   /* flex-direction: column; */
-  font-size: 1.25rem;
+  font-size: 18px;
   position: relative;
 }
 span {
-  border-radius: 0.7rem;
-  width: 7.5rem;
-  height: 1.625rem;
+  border-radius: 0.7px;
+  width: 116.5px;
+  height: 38.625px;
   color: #f3db5c;
   font-size: 25px;
   /* background-color: rgb(133, 158, 231); */
-  margin: 0 0.325rem 0.25rem;
+  margin: 0 -0.675px 0.25px;
   text-align: center;
 }
 </style>

src/components/tunneling/rtop.vue

@@ -2,18 +2,20 @@
   <div id="rtop">
     <ul style="margin-top: -19px">
       <li>
-        瓦斯涌出量:<span style="width:100px">{{data.wasi_after}}</span>m^3/min
+        瓦斯涌出量:<span style="width:100px">{{ data.wasi_after }}</span
+        >m^3/min
         <span
           style="width:30px; height:30px; border:1px solid 4ADEFE; border-radius:50%;margin-left:30px; "
-          v-bind:class="{red1:data.danger, green1:data.safety}"
+          v-bind:class="{ red1: data.danger, green1: data.safety }"
         >
         </span>
       </li>
       <li>
-        粉 尘 浓 度 :<span style="width:100px">{{data.fenchen_after}}</span>g/m^3
+        粉 尘 浓 度 :<span style="width:100px">{{ data.fenchen_after }}</span
+        >g/m^3
         <span
           style="width:30px; height:30px; border:1px solid 4ADEFE; border-radius:50%; margin-left:50px;"
-          v-bind:class="{red1:data.danger1, green1:data.safety1}"
+          v-bind:class="{ red1: data.danger1, green1: data.safety1 }"
         >
         </span>
       </li>
@@ -114,9 +116,8 @@ li {
   color: #4adefe;
   display: flex;
   flex-wrap: wrap;
-  margin-top: 1rem;
-  margin-right: 0.75rem;
-  font-size: 1.25rem;
+  margin-top: 10px;
+  font-size: 18px;
   text-align: end;
 }
 span {
@@ -145,4 +146,4 @@ span {
   background: linear-gradient(145deg, #63ac7d, #76cc95);
   box-shadow: 17px 17px 34px #61a87a;
 }
-</style>
+</style>

src/views/compressed/compressed.vue

@@ -12,21 +12,21 @@
     </el-tab-pane>
     <el-tab-pane
       label="1号压风机"
-      name="dataBoard1"
+      name="1"
     >
-      <data-board title="1号压风机" v-if="activeName == 'dataBoard1'"></data-board>
+      <data-board title="1号压风机" v-if="activeName == '1'"></data-board>
     </el-tab-pane>
     <el-tab-pane
       label="2号压风机"
-      name="dataBoard2"
+      name="2"
     >
-      <data-board title="2号压风机" v-if="activeName == 'dataBoard2'"></data-board>
+      <data-board title="2号压风机" v-if="activeName == '2'"></data-board>
     </el-tab-pane>
     <el-tab-pane
       label="3号压风机"
-      name="dataBoard3"
+      name="3"
     >
-      <data-board title="3号压风机" v-if="activeName == 'dataBoard3'"></data-board>
+      <data-board title="3号压风机" v-if="activeName == '3'"></data-board>
     </el-tab-pane>
     <el-tab-pane
       label="系统数据"
@@ -58,6 +58,15 @@ export default {
   },
   methods: {
     handleClick(tab, event) {},
+  },
+   mounted() {
+    this.$bus.$on("changeCompressedId", (val) => {
+      console.log(val);
+      this.activeName = val;
+    });
+    this.$once("hook:beforeDestroy", () => {
+      this.$bus.$off("changeCompressedId");
+    });
   },
   components: {
     dataStandard,

src/views/compressed/dataBoard/dataBoard.vue

@@ -171,6 +171,7 @@ export default {
   methods: {
     selectChart(val) {
       console.log("val", val);
+      this.$bus.$emit("changeCompressedId", String(val));
       this.$refs.current.idChange(val);
       this.$refs.winding.idChange(val);
       this.$refs.vibrate.idChange(val);

src/views/drain/dataBoard/dataBoard.vue

@@ -157,6 +157,7 @@ export default {
   props: ["title"],
   methods: {
     selectChart(val) {
+      this.$bus.$emit("changeDrainId", String(val));
       let chartRefs = [
         "voltage",
         "current",

src/views/drain/drain.vue

@@ -12,21 +12,21 @@
       </el-tab-pane>
       <el-tab-pane
         label="1号水泵"
-        name="dataBoard1"
+        name="1"
       >
-        <data-board title="1号水泵" v-if="activeName == 'dataBoard1'"></data-board>
+        <data-board title="1号水泵" v-if="activeName == '1'"></data-board>
       </el-tab-pane>
       <el-tab-pane
         label="2号水泵"
-        name="dataBoard2"
+        name="2"
       >
-        <data-board title="2号水泵" v-if="activeName == 'dataBoard2'"></data-board>
+        <data-board title="2号水泵" v-if="activeName == '2'"></data-board>
       </el-tab-pane>
       <el-tab-pane
         label="3号水泵"
-        name="dataBoard3"
+        name="3"
       >
-        <data-board title="3号水泵" v-if="activeName == 'dataBoard3'"></data-board>
+        <data-board title="3号水泵" v-if="activeName == '3'"></data-board>
       </el-tab-pane>
       <el-tab-pane
         label="系统数据"
@@ -62,6 +62,14 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event);
     },
+  },
+   mounted() {
+    this.$bus.$on("changeDrainId", (val) => {
+      this.activeName = val;
+    });
+    this.$once("hook:beforeDestroy", () => {
+      this.$bus.$off("changeDrainId");
+    });
   },
   components: {
     dataStandard,

src/views/monitor/configImg/configImg.vue

@@ -141,6 +141,7 @@ export default {
   methods: {
     selectArea(val) {
       // 下拉选框可以选择的区域
+      this.$bus.$emit("changeAreaId", String(val));
       let leftData = [
         {
           name: "名称",

src/views/monitor/monitor.vue

@@ -40,9 +40,16 @@ export default {
     };
   },
   methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
+    handleClick(tab, event) {},
+  },
+  mounted() {
+    this.$bus.$on("changeAreaId", (val) => {
+      console.log(val);
+      this.activeName = val;
+    });
+    this.$once("hook:beforeDestroy", () => {
+      this.$bus.$off("changeAreaId");
+    });
   },
   components: {
     systemData,

src/views/power_supply/systemData/dataDetail.vue

@@ -2,7 +2,7 @@
   <!-- 查看数据质量信息 -->
   <div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="采煤工作面" name="main">
+      <el-tab-pane label="供电系统" name="main">
         <router-view></router-view>
       </el-tab-pane>
       <el-tab-pane label="表格信息" name="chart">
@@ -30,7 +30,7 @@ export default {
   data() {
     return {
       moreVisible: false,
-      activeName: "graph",
+      activeName: "chart",
       pointnumVisible: false,
       systemId: undefined,
     };

src/views/transportation/systemData.vue

@@ -19,7 +19,7 @@
 
 </template> 
 <script>
-import checkData from "@/views/monitor/systemData/checkData.vue";
+import checkData from "@/views/transportation/systemData/checkData.vue";
 import coal_quantity from "@/components/transportation/systemData/coal_quantity.vue";
 import energy_consume from "@/components/transportation/systemData/energy_consume.vue";
 import coaloutput from "@/components/transportation/systemData/output.vue";

src/views/transportation/systemData/checkData.vue

@@ -1,18 +1,6 @@
 <template>
   <!-- 查看系统的对话框 -->
   <div>
-    <el-breadcrumb separator-class="el-icon-arrow-right" v-if="this.$router.currentRoute.path!='/home'">
-      <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>数据管理</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataManage-dataList/dataList' }">系统数据列表</el-breadcrumb-item>
-      <el-breadcrumb-item>设备数据列表</el-breadcrumb-item>
-    </el-breadcrumb>
-    <!-- <over-view-of-sub-system  :table-data="tableData" :total="total" v-if="overViewFlag"></over-view-of-sub-system> -->
-    <span style="font-size: 10px;">搜索：</span>
-    <el-select v-model="currentSubSystemId" placeholder="请选择子系统" @change="selectSubsystem()" style="width: 400px">
-      <el-option v-for="item in options" :key="item.id" :label="item.subSystem" :value="item.id">
-      </el-option>
-    </el-select>
 
     <el-table
         :data="tableData"

src/views/transportation/systemData/dataDetail.vue

@@ -30,7 +30,7 @@ export default {
   data() {
     return {
       moreVisible: false,
-      activeName: "graph",
+      activeName: "chart",
       pointnumVisible: false,
       systemId: undefined,
     };

src/views/tunnelling/systemData/dataDetail.vue

@@ -30,7 +30,7 @@ export default {
   data() {
     return {
       moreVisible: false,
-      activeName: "graph",
+      activeName: "chart",
       pointnumVisible: false,
       systemId: undefined,
     };

src/views/tunnelling/zutai.vue

@@ -1,35 +1,26 @@
 <template>
   <div class="main1">
-
     <div class="datas">
       <div class="data_left">
         <div class="left_top">
           <div class="left_top_main">
             <div class="ruler">
               <ruler></ruler>
-              <div
-                class="text1"
-                style="margin-top: 20px;"
-              >行走轨迹</div>
+              <div class="text1" style="margin-top: 20px;">行走轨迹</div>
             </div>
             <div class="hard">
               <!-- <hard></hard> -->
               <div class="jiege">
                 <div class="circle"></div>
               </div>
-              <div
-                class="text2"
-                style="margin-top: 20px;"
-              >割截轨迹</div>
+              <div class="text2" style="margin-top: 20px;">割截轨迹</div>
             </div>
-
           </div>
         </div>
         <div class="left_bottom">
           <lmid></lmid>
           <lbottom></lbottom>
         </div>
-
       </div>
       <div class="data_middle">
         <!-- 六个仪表盘 -->
@@ -76,36 +67,26 @@
           </el-row>
         </div>
         <div class="middle_bootom">
-          <el-row style="padding-top:40px">
+          <el-row>
             <el-col :span="14">
               <div class="grid-content bg-purple">
                 <!-- 掘进机工作状态 -->
-                <div style="margin-top:3px">
+                <div>
                   <mbl2></mbl2>
                 </div>
-
               </div>
             </el-col>
             <el-col :span="10">
-              <div
-                class="grid-content temperature"
-                style="margin-top:0px"
-              >
+              <div class="grid-content temperature">
                 <!-- 油缸温度 -->
-                <div style="margin-right:50px">
-                  <span
-                    class="text"
-                    style="margin-left:23px"
-                  >油缸温度</span>
-                  <tempChart style="margin-top:-20px"></tempChart>
+                <div style="padding-left:20px">
+                  <span class="text" style="margin-left:10px">油缸温度</span>
+                  <tempChart></tempChart>
                 </div>
                 <!-- 油位 -->
                 <div>
-                  <span
-                    class="text"
-                    style="margin-left:12px"
-                  >油位</span>
-                  <tempChart2 style="margin-top:-20px;margin-left: -20px"></tempChart2>
+                  <span class="text" style="margin-left:25px">油位</span>
+                  <tempChart2></tempChart2>
                 </div>
               </div>
             </el-col>
@@ -120,9 +101,7 @@
         <div class="right_bootom">
           <worklog></worklog>
         </div>
-
       </div>
-
     </div>
   </div>
 </template>
@@ -300,9 +279,11 @@ export default {
   /* background: white; */
 }
 .middle_bootom {
-  margin-top: 30px;
-  width: 100%;
-  height: 300px;
+  position: absolute;
+  padding-top: 2%;
+  margin-top: 1.6%;
+  width: 40%;
+  height: 37%;
   background: url(../../assets/img/tunneling/dataBg.png) no-repeat;
   background-size: 100%;
 }
@@ -423,6 +404,6 @@ export default {
   background-color: #f9fafc;
 }
 .el-row {
-  margin-bottom: 20px;
+  margin-bottom: -1%;
 }
 </style>

src/views/ventilate/dataBoard/dataBoard.vue

@@ -149,6 +149,7 @@ export default {
   methods: {
     selectChart(val) {
       console.log("val", val);
+      this.$bus.$emit("changeVenId", String(val));
       this.$refs.volAndCurrent.idChange(val);
       this.$refs.separate.idChange(val);
       this.$refs.bearing.idChange(val);

src/views/ventilate/systemData.vue

@@ -18,7 +18,7 @@
 
 
 <script>
-import checkData from "@/views/monitor/systemData/checkData.vue";
+import checkData from "@/views/ventilate/systemData/checkData.vue";
 import power from "@/components/ventilate/systemData/power.vue";
 import wind_pressure from "@/components/ventilate/systemData/wind_pressure.vue";
 import wind_speed from "@/components/ventilate/systemData/wind_speed.vue";

src/views/ventilate/systemData/checkData.vue

@@ -1,19 +1,6 @@
 <template>
   <!-- 查看系统的对话框 -->
   <div>
-    <el-breadcrumb separator-class="el-icon-arrow-right" v-if="this.$router.currentRoute.path!='/home'">
-      <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>数据管理</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataManage-dataList/dataList' }">系统数据列表</el-breadcrumb-item>
-      <el-breadcrumb-item>设备数据列表</el-breadcrumb-item>
-    </el-breadcrumb>
-    <!-- <over-view-of-sub-system  :table-data="tableData" :total="total" v-if="overViewFlag"></over-view-of-sub-system> -->
-    <span style="font-size: 10px;">搜索：</span>
-    <el-select v-model="currentSubSystemId" placeholder="请选择子系统" @change="selectSubsystem()" style="width: 400px">
-      <el-option v-for="item in options" :key="item.id" :label="item.subSystem" :value="item.id">
-      </el-option>
-    </el-select>
-
     <el-table
         :data="tableData"
         style="min-width: 100%"

src/views/ventilate/ventilate.vue

@@ -5,11 +5,11 @@
       <el-tab-pane label="系统图" name="third">
         <config-img v-if="activeName == 'third'"></config-img>
       </el-tab-pane>
-      <el-tab-pane label="1号风机" name="dataBoard1">
-        <data-board v-if="activeName == 'dataBoard1'" title="1号风机"></data-board>
+      <el-tab-pane label="1号风机" name="1">
+        <data-board v-if="activeName == '1'" 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 label="2号风机" name="2">
+        <data-board v-if="activeName == '2'" title="2号风机"></data-board>
       </el-tab-pane>
       <el-tab-pane label="系统数据" name="first">
         <systemData v-if="activeName == 'first'"></systemData>
@@ -37,6 +37,14 @@ export default {
   methods: {
     handleClick(tab, event) {},
   },
+  mounted() {
+    this.$bus.$on("changeVenId", (val) => {
+      this.activeName = val;
+    });
+    this.$once("hook:beforeDestroy", () => {
+      this.$bus.$off("changeVenId");
+    });
+  },
   components: {
     dataStandard,
     systemData,