大屏主界面

src/assets/css/global.css

@@ -136,3 +136,6 @@ body,
   font-weight: 500;
   color: #4adefe;
 }
+.tableStyle{
+  margin-top: 26px;
+}

src/common/dataDetail/dataDetail_chart.vue

@@ -1,11 +1,13 @@
 <template>
   <div>
-    <span style="font-size: 10px;">搜索：</span>
+    <div style="margin-top:8px">
+      <span style="font-size: 10px;">搜索：</span>
     <el-select style="width: 200px" v-model="currentSubEquipnameId" placeholder="请选择"
                @change="selectCurrentpoint()">
       <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
       </el-option>
     </el-select>
+    </div>
       <template>
 
         <el-table :data="tableData" style="width: 100%" @header-click="mpQuality" v-loading="dataListLoading">

src/common/dataDetail/dataDetail_graph.vue

@@ -1,12 +1,15 @@
 <template>
 	<div>
-		<span style="font-size: 10px;">搜索：</span>
+    <div style="margin-top:8px">
+      <span style="font-size: 10px;">搜索：</span>
 		<el-select style="width: 200px" v-model="currentSubEquipnameId" placeholder="请选择"
 			@change="selectCurrentpoint()">
 			<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
 			</el-option>
 		</el-select>
 
+    </div>
+		
 		<el-card class="box-card" v-for="(item,index) in mpArray">
 			<mpGraph2  :beforeData='item.before' :afterData='item.after'
 			:xTime='item.time' :title='item.name'></mpGraph2>
@@ -63,6 +66,10 @@
    
     },
     mounted() {
+      console.log("#####");
+      console.log(pinyin('功率', {
+              toneType: 'none'
+            }).replace(/\s*/g, ''));
       this.currentEquipId = this.$route.query.equipmentId
       // this.currentEquipId = window.sessionStorage.getItem("dataList_currentEquipId");
       // 获取子设备选项

src/common/dataStandard/dataQualityDevice.vue

@@ -1,30 +1,5 @@
 <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>煤矿</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataQuality-dataQualitySystem'}">系统</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataQualitySubsystem'}">子系统</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>
-    <br>
-    <!-- 页面主体区域 -->
-
-      <span class="demonstration" style="font-size: 10px;">搜索：</span>
-      <el-cascader
-          :options="options"
-          separator=" | "
-          style="width: 400px"
-          :props="props"
-          placeholder="请选择子系统"
-          clearable
-          ref="cascade"
-          @change="handleChange">
-        </el-cascader>
     <br>
     <el-table
         :data="tableData"

src/common/dataStandard/dataQualityMeasurePoint.vue

@@ -1,51 +1,11 @@
 <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>煤矿</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataQuality-dataQualitySystem'}">系统</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataQualitySubsystem'}">子系统</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataQualityDevice'}">设备</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataQualitySubdevice'}">子设备</el-breadcrumb-item>
-      <el-breadcrumb-item>测点</el-breadcrumb-item>
-    </el-breadcrumb>
-    <over-view-of-sub-equipment :table-data="tableData" :total="total" v-if="overViewFlag"></over-view-of-sub-equipment>
-      <span class="demonstration" style="font-size: 10px;">搜索：</span>
-      <el-cascader
-          :options="options"
-          separator=" | "
-          style="width: 400px;"
-          :props="props"
-          placeholder="请选择子设备"
-          clearable
-          ref="cascade"
-          @change="handleChange()"
-      ></el-cascader>
-
-      <!--搜索框后面的取消选择和修改按钮-->
-      <el-button
-          @click="toggleSelection()"
-          style="margin: 20px 10px"
-          type="primary"
-          size="medium"
-      >取消选择</el-button>
-      <el-button
-          @click="updateMany()"
-          :disabled="multipleSelection.length==0"
-          style="margin: 20px 10px "
-          type="primary"
-          icon="el-icon-edit"
-          size="medium"
-      >批量修改</el-button>
-      <!--测试-新增测点的Test-->
-      <!--<el-button @click="addMeasurePoint()" style="margin: 20px 10px " type="primary" icon="el-icon-edit" size="medium">新增测点的Test</el-button>-->
+    </br>
     <el-table
         ref="multipleTable"
         :data="tableData"
-        tooltip-effect="dark"
-        style="min-width: 100%"
+        style="min-width: 100%;"
         @selection-change="handleSelectionChange"
         v-loading="dataListLoading">
       <el-table-column

src/common/dataStandard/dataQualitySubdevice.vue

@@ -1,31 +1,5 @@
 <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>煤矿</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataQuality-dataQualitySystem'}">系统</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataQualitySubsystem'}">子系统</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/dataQualityDevice'}">设备</el-breadcrumb-item>
-      <el-breadcrumb-item>子设备</el-breadcrumb-item>
-    </el-breadcrumb>
-    <over-view-of-equipment  :table-data="tableData" :total="total" v-if="overViewFlag"></over-view-of-equipment>
-    <br>
-    <!-- 页面主体区域 -->
-    <div class="block">
-      <span class="demonstration" style="font-size: 10px;">搜索：</span>
-      <el-cascader
-          :options="options"
-          separator=" | "
-          style="width: 400px;"
-          :props="props"
-          placeholder="请选择设备"
-          clearable
-          ref="cascade"
-          @change="handleChange()"
-      ></el-cascader>
-    </div>
     <br/>
     <el-table
         :data="tableData"

src/common/oneline.vue

@@ -2,7 +2,7 @@
   <div>
     <div
       ref="testLine"
-      style="width: 450px; height: 200px; margin: 0px auto;padding-top:8px"
+      style="width: 500px; height: 200px; margin: 0px auto;padding-top:8px"
     ></div>
   </div>
 </template>
@@ -65,7 +65,7 @@ export default {
         	top: '15%',
         	left: '10%',
         	right: '10%',
-        	bottom: '1%',
+        	bottom: '-4%',
         	containLabel: true
         },
         legend: {
@@ -120,7 +120,7 @@ export default {
         ],
         title: {
           text: this.title,
-          padding: [5, 170],
+          padding: [5, 228],
           textStyle: {
             fontWeight: "normal", //标题颜色
             color: "#4ADEFE",

src/common/threeline.vue

@@ -3,7 +3,7 @@
   <div>
     <div
       ref="testLine"
-      style="width: 550px; height: 200px; margin: 0px auto;padding-top:8px"
+      style="width: 500px; height: 200px; margin: 0px auto;padding-top:8px"
     ></div>
   </div>
 </template>

src/common/twoline.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 两条曲线封装 且需要两个websocket连接 -->
 	<div>
-		<div ref="testLine" style="width: 470px; height: 200px; padding-top:8px"></div>
+		<div ref="testLine" style="width: 500px; height: 200px;  margin: 0px auto;padding-top:8px"></div>
 	</div>
 </template>
 
@@ -148,11 +148,11 @@
           data: this.legend,
         },
         grid: {
-          top: "15%",
+          top: "25%",
           left: "10%",
           right: "10%",
-          bottom: "15%",
-          // containLabel: true
+          bottom: "1%",
+          containLabel: true
         },
         yAxis: [
           {

src/components/monitor/detailedView.vue

@@ -37,8 +37,9 @@
     <!-- <div id="transactionFlowView" style="height:180px;width: 100%;margin-bottom: 10px;"></div> -->
     <div
       ref="testLine"
-      style="width: 780px; height: 250px; margin-top: -30px; margin: 0px auto"
+      style="width: 780px; height: 250px; margin: 0px auto;margin-top: -30px; "
     ></div>
+
   </div>
 </template>
 

src/components/newmain/CaiMeiJi.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="container">
+      <div class="fankui">{{info_number}}采煤机运行反馈&nbsp;<i id="green" v-show="true" class="fa fa-circle"></i> <i id="red" v-show="false" class="fa fa-circle"></i></div>
+      <div class="bgi"></div> 
+      <!-- @click="change" -->
+      <div class="info">{{info_number}}采煤区</div>
+      <ul class="msg" :style="{height:h}">
+          <li v-for="(value,key) in msg" :key="key">{{key}}:{{value}}</li>
+      </ul>
+  </div>
+</template>
+
+<script>
+export default {
+    name:'CaiMeiJi',
+    data() {
+        return {
+            h:"0px",
+            show:false,
+            msg:{
+                '割煤刀数':2,
+                '回采米数':1300,
+                '出煤量':2
+            }
+        }
+    },
+    props:['info_number'],
+    methods:{
+        change(){
+            if(this.h==="0px"){
+                this.h = "200px"
+            }else if(this.h = "200px"){
+                this.h = "0px"
+            }
+        },
+        getData(msg){
+            this.msg = msg
+        }
+    }
+}
+</script>
+
+<style lang='less' scoped>
+.container{
+    width: 100%;
+    height: 100%;
+    position: relative;
+    color: #fff;
+    left:60px;
+    .fankui{
+        text-align: center;
+        font-size: 12px;
+        padding-bottom: 2px;
+    }
+    .bgi{
+        height: 60px;
+        background-size:cover;
+        background-image: url(采煤机.png);
+    }
+    .info{
+        box-sizing: border-box;
+        height: 50px;
+        font-size: 14px;
+        border: 2px solid rgb(219,208,10);
+        padding-top: 12%;
+        text-align: center;
+        color: rgb(219,208,10);
+    }
+    .msg{
+        padding: 0;
+        list-style: none;
+        position: absolute;
+        overflow: hidden;
+        width: 200px;
+        height: 0;
+        top:-10px;
+        right: -220px;
+        border-radius: 20%;
+        background-color: rgba(88, 240, 227, 1);
+        box-shadow: 0 0 10px rgba(255, 255, 255, 1);
+        transition: 0.5s;
+        li{
+            color: rgb(236, 74, 74);
+            font-size: 20px;
+            text-align: center;
+            padding: 20px 0;
+        }
+    }
+}
+#green{
+        color: green;
+    }
+#red{
+    color: red;
+}
+</style>

src/components/newmain/Main.vue

@@ -0,0 +1,569 @@
+<template>
+  <div id="outer">
+    <!-- 9个警告盒子 -->
+    <div class="warning_box">
+      <div class="warning_container warning1">
+        <WarningInfo :ref="0" :id="0"></WarningInfo>
+      </div>
+      <div class="warning_container warning2">
+        <WarningInfo :ref="1" :id="1"></WarningInfo>
+      </div>
+
+      <div class="warning_container warning3">
+        <WarningInfo :ref="2" :id="2"></WarningInfo>
+      </div>
+      <div class="warning_container warning4">
+        <WarningInfo :ref="3" :id="3"></WarningInfo>
+      </div>
+      <div class="warning_container warning5">
+        <WarningInfo :ref="4" :id="4"></WarningInfo>
+      </div>
+      <div class="warning_container warning6">
+        <WarningInfo :ref="5" :id="5"></WarningInfo>
+      </div>
+      <div class="warning_container warning7">
+        <WarningInfo :ref="6" :id="6"></WarningInfo>
+      </div>
+      <div class="warning_container warning8">
+        <WarningInfo :ref="7" :id="7"></WarningInfo>
+      </div>
+      <div class="warning_container warning9">
+        <WarningInfo :ref="8" :id="8"></WarningInfo>
+      </div>
+      <!-- <div class="warning_container warning10">
+        <WarningInfo :ref="9" :id="9"></WarningInfo>
+      </div>  -->
+    </div>
+    <!-- 9个转动的皮带 -->
+    <div class="pidai_box">
+      <div
+        v-for="(item, index) in 9"
+        :key="index"
+        :class="`pidai_container pidai${index + 1}`"
+      >
+        <Pidai :isStart="isStart"></Pidai>
+      </div>
+    </div>
+    <div class="caimeiji1">
+      <CaiMeiJi :ref="10" info_number="1#"></CaiMeiJi>
+    </div>
+    <!-- 采煤机2 -->
+    <div class="caimeiji2">
+      <CaiMeiJi :ref="11" info_number="9+10"></CaiMeiJi>
+    </div>
+
+    <div class="bottom_left">
+      煤 <br /><br />
+      仓
+    </div>
+
+    <div class="buttons">
+      <button class="btn1" @click="start">模拟皮带启动</button>
+      <button class="btn2" @click="close">模拟皮带停止</button>
+    </div>
+
+    <div class="xcspwt-box">
+      <div class="tipName">采煤机状态</div>
+      <ul class="msg1">
+        <li>
+          <span>割煤刀数</span>
+          <span> &nbsp;&nbsp;&nbsp; {{ shearerState[0].coalCutters }}</span>
+        </li>
+        <li>
+          <span>回采米数</span>
+          <span> &nbsp;&nbsp;&nbsp; {{ shearerState[0].miningMeters }}</span>
+        </li>
+        <li>
+          <span>出煤量</span>
+          <span
+            >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            {{ shearerState[0].coalOutput }}</span
+          >
+        </li>
+      </ul>
+    </div>
+
+    <div class="xcspwt-box2">
+      <div class="tipName">采煤机状态</div>
+      <ul class="msg1">
+        <li>
+          <span>割煤刀数</span>
+          <span> &nbsp;&nbsp;&nbsp; {{ shearerState[1].coalCutters }}</span>
+        </li>
+        <li>
+          <span>回采米数</span>
+          <span> &nbsp;&nbsp;&nbsp; {{ shearerState[1].miningMeters }}</span>
+        </li>
+        <li>
+          <span>出煤量</span>
+          <span
+            >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            {{ shearerState[1].coalOutput }}</span
+          >
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+import WarningInfo from "./WarningInfo.vue";
+import CaiMeiJi from "./CaiMeiJi.vue";
+import Pidai from "./Pidai.vue";
+export default {
+  name: "Main",
+  components: { WarningInfo, Pidai, CaiMeiJi },
+  data() {
+    return {
+      isStart: true,
+      shearerState: [
+        {
+          coalCutters: 2,
+          miningMeters: 1300,
+          coalOutput: 2,
+        },
+        {
+          coalCutters: 2,
+          miningMeters: 1300,
+          coalOutput: 2,
+        },
+      ],
+    };
+  },
+  methods: {
+    start() {
+      if (this.isStart) {
+        this.$message.warning("不能重复启动");
+      } else {
+        this.isStart = !this.isStart;
+        for (let i = 0; i < 9; i++) {
+          this.$refs[i].init();
+        }
+      }
+    },
+    close() {
+      if (this.isStart) {
+        this.isStart = !this.isStart;
+        for (let i = 0; i < 9; i++) {
+          this.$refs[i].close();
+        }
+      }
+    },
+  },
+  mounted() {
+    let interval = setInterval(() => {
+      let temp = [];
+      for (let i = 0; i < 2; i++) {
+        let state = {};
+        state.coalCutters = this.getRandomNum(0, 10);
+        state.miningMeters = this.getRandomNum(800, 1500);
+        state.coalOutput = this.getRandomNum(0, 10);
+        temp.push(state);
+      }
+      this.shearerState = temp;
+    }, 3000);
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(interval);
+    });
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#outer {
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(to bottom, #323232 0%, #3f3f3f 40%, #1c1c1c 150%),
+    linear-gradient(
+      to top,
+      rgba(255, 255, 255, 0.4) 0%,
+      rgba(0, 0, 0, 0.25) 200%
+    );
+  position: relative;
+
+  .warning_box {
+    position: relative;
+    margin-left: -52px;
+  }
+  .pidai_box {
+    position: relative;
+    margin-left: 160px;
+  }
+  .shexiangtou_box {
+    position: relative;
+  }
+
+  .xcspwt-box {
+    // padding-top: 15px;
+    position: absolute;
+    width: 148px;
+    height: 84px;
+    left: 20px;
+    font-size: 12px;
+    top: 32px;
+    color: #4adefd;
+    .tipName {
+      padding: 5px;
+      outline: 1px rgba(255, 255, 255, 0.3) solid;
+      text-align: center;
+    }
+    .msg1 {
+      padding: 5px;
+      outline: 1px rgba(255, 255, 255, 0.3) solid;
+    }
+    .msg1 li {
+      width: 100%;
+      height: 20px;
+      line-height: 20px;
+      color: #4adefe;
+      font-size: 12px;
+      margin-top: -1px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      cursor: default;
+    }
+    .msg1 li span {
+      color: #4adefe;
+      display: block;
+      float: left;
+    }
+    .msg1 li span:nth-of-type(1) {
+      padding: 0 5px;
+      line-height: 20px;
+      text-align: center;
+      background-size: 100% 100%;
+    }
+
+    .msg1 li span:nth-of-type(2) {
+      color: #f3db5c;
+      width: 47px;
+    }
+  }
+
+  .xcspwt-box2 {
+    // margin-left:10px;
+    // padding-top: 15px;
+    position: absolute;
+    width: 148px;
+    height: 84px;
+    left: 298px;
+    font-size: 12px;
+    top: 425px;
+    color: #4adefe;
+    .tipName {
+      padding: 5px;
+      outline: 1px rgba(255, 255, 255, 0.3) solid;
+      text-align: center;
+    }
+    .msg1 {
+      padding: 5px;
+      outline: 1px rgba(255, 255, 255, 0.3) solid;
+    }
+    .msg1 li {
+      width: 100%;
+      height: 20px;
+      line-height: 20px;
+      color: #4adefe;
+      font-size: 12px;
+      margin-top: -1px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      cursor: default;
+    }
+    .msg1 li span {
+      color: #4adefe;
+      display: block;
+      float: left;
+    }
+    .msg1 li span:nth-of-type(1) {
+      padding: 0 5px;
+      line-height: 20px;
+      text-align: center;
+      background-size: 100% 100%;
+    }
+
+    .msg1 li span:nth-of-type(2) {
+      color: #f3db5c;
+      width: 47px;
+    }
+  }
+
+  // .xcspwt-box{
+  //   height: 100px;
+  //   width: 200px;
+  //   top: 900px;
+  //   left: 20px;
+  //   color: #4adefe;
+  //   border: 1px solid #4adefe;
+  //   border-radius: 5px;
+
+  // }
+  //   .xcspwt-box li {
+  //   width: 100%;
+  //   height: 20px;
+  //   line-height: 20px;
+  //   color: #4adefe;
+  //   font-size: 18px;
+  //   margin-top: 14px;
+  //   overflow: hidden;
+  //   text-overflow: ellipsis;
+  //   white-space: nowrap;
+  //   cursor: default;
+  // }
+  //   .xcspwt-box li span {
+  //   color: #f3db5c;
+  //   display: block;
+  //   float: left;
+  // }
+}
+.warning_container {
+  width: 55px;
+  height: 154px;
+  position: absolute;
+}
+.warning1 {
+  top: 22px;
+  left: 252px;
+}
+.warning2 {
+  top: 22px;
+  left: 319px;
+}
+.warning3 {
+  top: 22px;
+  left: 385px;
+}
+.warning4 {
+  top: 22px;
+  left: 451px;
+}
+.warning5 {
+  top: 299px;
+  left: 576px;
+}
+.warning6 {
+  top: 22px;
+  left: 518px;
+}
+.warning7 {
+  top: 22px;
+  left: 585px;
+}
+.warning8 {
+  top: 190px;
+  left: 700px;
+}
+.warning9 {
+  top: 165px;
+  left: 757px;
+}
+// .warning10 {
+//   top: 490px;
+//   left: 1030px;
+// }
+.pidai_container {
+  width: 200px;
+  height: 25px;
+  position: absolute;
+}
+.pidai1 {
+  left: 22px;
+  top: 277px;
+  width: 80px;
+  height: 17px;
+}
+.pidai2 {
+  left: 121px;
+  top: 278px;
+  width: 80px;
+  height: 20px;
+}
+.pidai3 {
+  left: 180px;
+  top: 328px;
+  transform: rotate(90deg);
+  width: 80px;
+  height: 17px;
+}
+
+.pidai4 {
+  left: 234px;
+  top: 277px;
+  width: 80px;
+  height: 17px;
+}
+.bottom_left {
+  position: absolute;
+  left: 416px;
+  top: 339px;
+  color: #fff;
+  font-size: 15px;
+  padding: 3px;
+  outline: 1px rgba(255, 255, 255, 0.3) solid;
+  text-align: center;
+}
+.pidai5 {
+  left: 301px;
+  top: 314px;
+  transform: rotate(-60deg);
+  width: 80px;
+  height: 17px;
+}
+
+.pidai6 {
+  left: 379px;
+  top: 277px;
+  // transform: rotate(-45deg);
+  width: 80px;
+  height: 17px;
+}
+.pidai7 {
+  left: 421px;
+  top: 210px;
+  transform: rotate(-90deg);
+  width: 80px;
+  height: 17px;
+}
+.pidai8 {
+  left: 448px;
+  top: 118px;
+  transform: rotate(-60deg);
+  width: 80px;
+  height: 17px;
+}
+.pidai9 {
+  left: 521px;
+  top: 61px;
+  width: 80px;
+  height: 17px;
+  transform: rotate(-10deg);
+}
+.pidai10 {
+  left: 1200px;
+  top: 410px;
+  width: 80px;
+  height: 17px;
+}
+.shexiangtou_container {
+  width: 50px;
+  height: 50px;
+  border-radius: 50%;
+  background-image: url(摄像头.png);
+  background-size: cover;
+  position: absolute;
+}
+.shexiangtou1 {
+  top: 200px;
+  left: 470px;
+}
+.shexiangtou2 {
+  top: 240px;
+  left: 1270px;
+}
+.shexiangtou3 {
+  top: 450px;
+  left: 860px;
+}
+.caimeiji1 {
+  width: 133px;
+  height: 200px;
+  position: absolute;
+  top: 149px;
+  left: -31px;
+}
+.caimeiji2 {
+  width: 127px;
+  height: 197px;
+  position: absolute;
+  top: 393px;
+  left: 100px;
+}
+.tongcang {
+  width: 200px;
+  height: 220px;
+  position: absolute;
+  right: 50px;
+  bottom: 20px;
+  .tong {
+    width: 200px;
+    height: 200px;
+    background-image: url(筒仓.jpg);
+    background-size: cover;
+  }
+  .tong_info {
+    text-align: center;
+    color: #fff;
+  }
+}
+
+.bottom_msg {
+  margin: 0;
+  padding: 5px;
+  outline: 1px rgba(255, 255, 255, 0.3) solid;
+  list-style: none;
+  li {
+    text-align: center;
+  }
+}
+
+.bottom_right {
+  width: 180px;
+  height: 100px;
+  position: absolute;
+  right: 540px;
+  bottom: 20px;
+  color: #fff;
+  .bottom_info {
+    padding: 5px;
+    outline: 1px rgba(255, 255, 255, 0.3) solid;
+    text-align: center;
+  }
+  .bottom_msg {
+    margin: 0;
+    padding: 5px;
+    outline: 1px rgba(255, 255, 255, 0.3) solid;
+    list-style: none;
+    .bottom_msg li {
+      text-align: center;
+      .bottom_msg li span {
+        color: #4adefe;
+      }
+    }
+  }
+}
+.buttons {
+  width: 95px;
+  height: 88px;
+  position: absolute;
+  top: 393px;
+  left: -13px;
+  button {
+    display: block;
+    background-color: rgb(226, 226, 218);
+    background-image: linear-gradient(
+      to bottom,
+      rgb(255, 255, 255) 0%,
+      rgb(38, 120, 228) 50%,
+      rgb(255, 255, 255) 100%
+    );
+    border-radius: 10px;
+    font-size: 13px;
+    font-family: "'微软雅黑','Helvetica Neue',Helvetica,Arial,sans-serif";
+    font-weight: bold;
+  }
+  .btn1 {
+    margin-left: 40px;
+    margin-top: 10%;
+    width: 100%;
+    height: 45%;
+  }
+  .btn2 {
+    margin-left: 40px;
+    margin-top: 10%;
+    width: 100%;
+    height: 45%;
+  }
+}
+</style>

src/components/newmain/Pidai.vue

@@ -0,0 +1,55 @@
+<template>
+    <div class="outer">
+        <div v-if="isStart" class="left_chilun"><i class="fa fa-cog fa-spin"></i></div>
+        <div v-else class="left_chilun"><i class="fa fa-cog"></i></div>
+        <div class="pidai"></div>
+        <div v-if="isStart" class="right_chilun"><i class="fa fa-cog fa-spin"></i></div>
+        <div v-else class="right_chilun"><i class="fa fa-cog"></i></div>
+    </div>
+</template>
+
+<script>
+export default {
+    name:'Pidai',
+    props:["isStart"]
+}
+</script>
+
+<style lang="less" scoped>
+    .outer{
+        width: 100%;
+        height: 100%;
+        position: relative;
+        color: #fff;
+        .pidai{
+            width: 80%;
+            height: 100%;
+            position: absolute;
+            left: 50%;
+            transform: translate(-50%,0);
+            border-top: 3px solid rgb(255, 255, 255);
+            border-bottom: 3px solid rgb(255, 255, 255);
+            border-radius: 20%;
+        }
+        .left_chilun{
+            width: 10%;
+            position: absolute;
+                left: 0;
+            font-size: 20px;
+            i{
+                position: absolute;
+                right: 0;
+            }
+        }
+        .right_chilun{
+            width: 10%;
+            position: absolute;
+            right: 0;
+            font-size: 20px;
+            i{
+                position: absolute;
+                left: 0;
+            }
+        }
+    }
+</style>

src/components/newmain/WarningInfo.vue

@@ -0,0 +1,179 @@
+<template>
+  <div ref="outer" class="outer">
+    <div class="number_Info">{{ id }}#皮带</div>
+    <ul class="msg">
+      <li v-for="(item, index) in infoList" :key="index">
+        {{ item.info_msg }}
+        <i id="green" v-if="item.info == '0'" class="fa fa-circle"></i>
+        <i id="red" v-else class="fa fa-circle"></i>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "WarningInfo",
+  data() {
+    return {
+      infoList: [
+        {
+          info: "0",
+          info_msg: "撕裂",
+        },
+        {
+          info: "0",
+          info_msg: "闭锁",
+        },
+        {
+          info: "0",
+          info_msg: "跑偏",
+        },
+        {
+          info: "0",
+          info_msg: "烟雾",
+        },
+        {
+          info: "0",
+          info_msg: "堆煤",
+        },
+        {
+          info: "0",
+          info_msg: "速度",
+        },
+        {
+          info: "0",
+          info_msg: "温度",
+        },
+        {
+          info: "0",
+          info_msg: "打滑",
+        },
+        {
+          info: "0",
+          info_msg: "纵撕",
+        },
+        {
+          info: "0",
+          info_msg: "断带",
+        },
+      ],
+    };
+  },
+  mounted() {
+    // this.init();
+    this.interval = setInterval(() => {
+      this.infoList.forEach((item) => {
+        // item.info = Math.round(Math.random()) ? "1" : "0";
+        item.info = Math.random()>0.97? "1" : "0";
+      });
+    }, 1000);
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(this.interval);
+    });
+  },
+  methods: {
+    initWebSocket() {
+      // 连接错误
+      this.websocket.onerror = () => {
+        console.log(
+          "WebSocket连接发生错误   状态码：" + this.websocket.readyState
+        );
+      };
+      // 连接成功
+      this.websocket.onopen = () => {
+        console.log(
+          "WebSocket连接成功    状态码：" + this.websocket.readyState
+        );
+      };
+      // 收到消息的回调
+      this.websocket.onmessage = (event) => {
+        if (JSON.parse(event.data).length) {
+          this.changeState(JSON.parse(event.data));
+        }
+      };
+      // 连接关闭的回调
+      this.websocket.onclose = () => {
+        console.log(
+          "WebSocket连接关闭    状态码：" + this.websocket.readyState
+        );
+      };
+      // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
+      this.$once("hook:beforeDestroy", () => {
+        this.websocket.close();
+      });
+    },
+    changeState(data) {
+      let state = data[0]["baojing_after"];
+      this.$nextTick(() => {
+        this.infoList.forEach((item, index) => {
+          item.info = state[index];
+        });
+      });
+    },
+    close() {
+      // this.websocket.close();
+      console.log(123);
+      clearInterval(this.interval);
+    },
+    init() {
+      // if (this.id < 10) return;
+      // this.websocket = new WebSocket(
+      //   `ws://${this.websocketIP}/hbase/ws/belt/${this.id}`
+      // );
+      // this.initWebSocket();
+      this.interval = setInterval(() => {
+        this.infoList.forEach((item) => {
+          item.info = Math.round(Math.random()) ? "1" : "0";
+        });
+      }, 1000);
+      this.$once("hook:beforeDestroy", () => {
+        clearInterval(this.interval);
+      });
+    },
+  },
+  computed: {
+    ...mapState(["websocketIP"]),
+  },
+  props: ["id"],
+};
+</script>
+
+<style lang="less" scoped>
+#green {
+  color: green;
+}
+#red {
+  color: red;
+}
+.outer {
+  width: 100%;
+  height: 100%;
+  color: #ddd;
+  font-size: 12px;
+  .number_Info {
+    width: 100%;
+    height: 15%;
+    padding: 5px 0;
+    text-align: center;
+    outline: 1px rgba(255, 255, 255, 0.3) solid;
+  }
+  ul {
+    padding: 0;
+    margin: 0;
+    width: 100%;
+    height: 208px;
+    list-style: none;
+    outline: 1px rgba(255, 255, 255, 0.3) solid;
+    overflow: auto;
+    li {
+      text-align: center;
+      margin: 2px 0px;
+    }
+  }
+  ul::-webkit-scrollbar {
+    display: none;
+  }
+}
+</style>

src/components/tunneling/dashBoard.vue

@@ -87,7 +87,7 @@ export default {
               textStyle: {
                 fontSize: "18",
                 fontWeight: "bolder",
-                color: "#000",
+                color: "#F3DB5C",
               },
             },
             pointer: {

src/components/tunneling/rtop.vue

@@ -1,50 +1,48 @@
 <template>
-<div id="rtop">
+  <div id="rtop">
     <ul style="margin-top: -19px">
-        <li>
-            瓦斯涌出量:<span style="width:100px">{{data.wasi_after}}</span>m^3/min
-            <span 
-            style="width:30px; height:30px; border:1px solid red; border-radius:50%;margin-left:30px; "
-             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:30px; height:30px; border:1px solid red; border-radius:50%; margin-left:50px;"
-             v-bind:class="{red1:data.danger1, green1:data.safety1}">
-             </span>
-        </li>
+      <li>
+        瓦斯涌出量:<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}"
+        >
+        </span>
+      </li>
+      <li>
+        粉 尘 浓 度 :<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}"
+        >
+        </span>
+      </li>
     </ul>
-</div>
+  </div>
 </template>
 
 <script>
 import { mapState } from "vuex";
 export default {
-  data(){
+  data() {
     return {
-
-        data: {
+      data: {
         fenchen_after: "0",
-        wasi_after:"0",
-        danger:true,
-        danger1:false,
-        safety:false,
-        safety1:true
+        wasi_after: "0",
+        danger: true,
+        danger1: false,
+        safety: false,
+        safety1: true,
       },
-          
-   }
+    };
   },
 
   mounted() {
-        this.websocket = new WebSocket(
-        `ws://${this.websocketIP}/hbase/ws/belt/51`
-      );
-      this.initWebSocket();
+    this.websocket = new WebSocket(`ws://${this.websocketIP}/hbase/ws/belt/51`);
+    this.initWebSocket();
   },
-  methods:{
-       initWebSocket() {
+  methods: {
+    initWebSocket() {
       // 连接错误
       this.websocket.onerror = () => {
         console.log(
@@ -75,24 +73,23 @@ export default {
       });
     },
     changeState(data) {
-      this.data = data[0]
+      this.data = data[0];
       //判断粉尘
-      if(this.data.fenchen_after>15){
-          this.data.danger1=true;
-         this.data.safety1=false;
-     
-      }else{
-             this.data.danger1=false;
-         this.data.safety1=true;
+      if (this.data.fenchen_after > 15) {
+        this.data.danger1 = true;
+        this.data.safety1 = false;
+      } else {
+        this.data.danger1 = false;
+        this.data.safety1 = true;
       }
-      if(this.data.wasi_after>3){
-         this.data.danger=true;
-          this.data.safety=false;
-      }else{
-             this.data.danger=false;
-         this.data.safety=true;
+      if (this.data.wasi_after > 3) {
+        this.data.danger = true;
+        this.data.safety = false;
+      } else {
+        this.data.danger = false;
+        this.data.safety = true;
       }
-    console.log("数据展示为：",this.data)
+      console.log("数据展示为：", this.data);
     },
     close() {
       this.websocket.close();
@@ -102,49 +99,50 @@ export default {
   computed: {
     ...mapState(["websocketIP"]),
   },
-
-}
+};
 </script>
 
 <style scoped>
-#rtop{
-    text-align: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
+#rtop {
+  text-align: center;
+  padding-top: 40px;
+  padding-bottom: 40px;
 }
-li{
-    width: 100%;
-    height: 100%;
-    color: #4ADEFE;
-    display: flex;
-    flex-wrap: wrap;
-    margin-top: 1rem;
-    margin-right:.75rem;
-    font-size: 1.25rem;
-    text-align:end
-
-
+li {
+  width: 100%;
+  height: 100%;
+  color: #4adefe;
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 1rem;
+  margin-right: 0.75rem;
+  font-size: 1.25rem;
+  text-align: end;
 }
-span{
-    border-radius:0.7rem;
-    width: 1.875rem;
-    height: 1.625rem;
-    /* background-color: rgb(133, 158, 231); */
-    margin: 0 .325rem .25rem 1rem; 
-    text-align: center;
-      color: #F3DB5C;
-      font-size: 25px;
+span {
+  border-radius: 0.7rem;
+  width: 1.875rem;
+  height: 1.625rem;
+  /* background-color: rgb(133, 158, 231); */
+  margin: 0 0.325rem 0.25rem 1rem;
+  text-align: center;
+  color: #f3db5c;
+  font-size: 25px;
 }
-.red1{
-    background-color: #CF0000;
+.red1 {
+  background: linear-gradient(145deg, #c21e41, #e7234d);
+  box-shadow: 17px 17px 34px #be1d3f;
 }
-.red2{
-    background-color: #CF0000;
+.red2 {
+  background: linear-gradient(145deg, #c21e41, #e7234d);
+  box-shadow: 17px 17px 34px #be1d3f;
 }
-.green1{
-    background-color: #01A400;
+.green1 {
+  background: linear-gradient(145deg, #63ac7d, #76cc95);
+  box-shadow: 17px 17px 34px #61a87a;
 }
-.green2{
-    background-color: #01A400;
+.green2 {
+  background: linear-gradient(145deg, #63ac7d, #76cc95);
+  box-shadow: 17px 17px 34px #61a87a;
 }
 </style>

src/components/tunneling/six/five.vue

@@ -89,7 +89,7 @@ export default {
               textStyle: {
                 fontSize: "18",
                 fontWeight: "bolder",
-                color: "#000",
+                color: "#F3DB5C",
               },
             },
             pointer: {

src/components/tunneling/six/four.vue

@@ -89,7 +89,7 @@ export default {
               textStyle: {
                 fontSize: "18",
                 fontWeight: "bolder",
-                color: "#000",
+                color: "#F3DB5C",
               },
             },
             pointer: {

src/components/tunneling/six/one.vue

@@ -90,7 +90,7 @@ export default {
               textStyle: {
                 fontSize: "18",
                 fontWeight: "bolder",
-                color: "#000",
+                color: "#F3DB5C",
               },
             },
             pointer: {

src/components/tunneling/six/three.vue

@@ -89,7 +89,7 @@ export default {
               textStyle: {
                 fontSize: "18",
                 fontWeight: "bolder",
-                color: "#000",
+                color: "#F3DB5C",
               },
             },
             pointer: {

src/components/tunneling/six/two.vue

@@ -90,7 +90,7 @@ export default {
               textStyle: {
                 fontSize: "18",
                 fontWeight: "bolder",
-                color: "#000",
+                color: "#F3DB5C",
               },
             },
             pointer: {

src/router/index.js

@@ -531,7 +531,7 @@ const router = new Router({
           path: "/main",
           name: "主界面",
           id: 111,
-          component: () => import("../views/main.vue"),
+          component: () => import("../views/newmain.vue"),
           hidden: false,
         },
         {
@@ -658,7 +658,7 @@ const router = new Router({
     {
       path: "/gas-mainpage",
       hidden: true,
-      component: () => import("@/views/gas/configImg/index.vue"),
+      component: () => import("../views/gas/configImg/index.vue"),
     },
   ],
 });
@@ -667,7 +667,7 @@ const router = new Router({
 //     if (!token || !/\S/.test(token)) {
 //     //   clearLoginInfo()
 //       // next({ name: 'login' })
-//         window.location.href = "http://112.126.68.148/#/"
+//         window.location.href = "http://49.235.67.21/#/"
 //     }else{
 //         next()
 //     }

src/store/index.js

@@ -5,8 +5,8 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
   state: {
-    websocketIP: "182.92.79.148:8081",
-    ip:"http://112.126.68.148/",
+    websocketIP: "150.158.138.99:8081",
+    ip:"http://49.235.67.21/",
     name: "",
     title: "主界面",
 

src/views/Home.vue

@@ -195,6 +195,7 @@ export default {
       });
       this.$store.commit("updateTitle", this.findTitleName(key).name);
     },
+    // 在左右两侧中寻找即将进入的路由所对应的菜单
     findTitleName(key) {
       return this.menu_left.find((item) => item.path == key)
         ? this.menu_left.find((item) => item.path == key)
@@ -202,12 +203,13 @@ export default {
     },
   },
   computed: {
+    // 所有显示在左侧的菜单
     menu_left() {
       return this.$router.options.routes[0].children.filter(
         (item) => !item.hidden
       );
     },
-
+    // 所有显示在右侧的菜单
     menu_right() {
       return this.$router.options.routes[1].children.filter(
         (item) => !item.hidden

src/views/beam_tube/dataStandard/dataStandard.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 面包屑导航 -->
-    <el-breadcrumb
+    <!-- <el-breadcrumb
       separator-class="el-icon-arrow-right"
       v-if="this.$router.currentRoute.path != '/home'"
     >
@@ -9,7 +9,7 @@
       <el-breadcrumb-item>矿压监测系统</el-breadcrumb-item>
       <el-breadcrumb-item>数据标准</el-breadcrumb-item>
    
-    </el-breadcrumb>
+    </el-breadcrumb> -->
     <!-- <over-view-of-system
       :table-data="tableData"
       :total="total"
@@ -31,6 +31,7 @@
     <!--      <el-button @click="searchDataByPid()" style="margin: 20px 10px"  type="primary" size="medium">查询</el-button>-->
 
     <el-table
+    class="tableStyle"
       :data="tableData"
       style="min-width: 100%"
       border

src/views/beam_tube/systemData/dataDetail.vue

@@ -1,15 +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 :to="{ path: '/dataList-checkData?systemId=' + systemId}">设备数据列表</el-breadcrumb-item>
-      <!--            <el-breadcrumb-item >查看</el-breadcrumb-item>-->
-      <el-breadcrumb-item >详细数据</el-breadcrumb-item>
-    </el-breadcrumb>
-
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="表格信息" name="chart">
         <chart v-if="activeName == 'chart'"></chart>

src/views/compressed/configImg/configImg.vue

@@ -309,9 +309,12 @@ li {
   }
 }
 .red {
-  background: #f90005;
+   background: linear-gradient(145deg, #c21e41, #e7234d);
+  box-shadow: 17px 17px 34px #be1d3f;
 }
 .green {
-  background: #009966;
+   background: linear-gradient(145deg, #63ac7d, #76cc95);
+  box-shadow: 17px 17px 34px #61a87a;
 }
+
 </style>

src/views/compressed/dataBoard/twoline2.vue

@@ -3,7 +3,7 @@
   <div>
     <div
       ref="testLine"
-      style="width: 450px; height: 200px;margin: 0px auto;padding-top:8px"
+      style="width: 500px; height: 200px;margin: 0px auto;padding-top:8px"
     ></div>
   </div>
 </template>

src/views/compressed/dataStandard/dataStandard.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 面包屑导航 -->
-    <el-breadcrumb
+    <!-- <el-breadcrumb
       separator-class="el-icon-arrow-right"
       v-if="this.$router.currentRoute.path != '/home'"
     >
@@ -9,7 +9,7 @@
       <el-breadcrumb-item>压风系统</el-breadcrumb-item>
       <el-breadcrumb-item>数据标准</el-breadcrumb-item>
 
-    </el-breadcrumb>
+    </el-breadcrumb> -->
     <!-- <over-view-of-system
       :table-data="tableData"
       :total="total"
@@ -32,6 +32,7 @@
     <!--      <el-button @click="searchDataByPid()" style="margin: 20px 10px"  type="primary" size="medium">查询</el-button>-->
 
     <el-table
+    class="tableStyle"
       :data="tableData"
       style="min-width: 100%"
       border

src/views/compressed/systemData.vue

@@ -1,6 +1,9 @@
 <template>
     <!-- 系统数据 -->
-    <checkData :systemId="17"></checkData>
+    <div class="tableStyle">
+        <checkData :systemId="17"></checkData>
+    </div>
+    
 </template>
 
 <script>

src/views/compressed/systemData/checkData.vue

@@ -1,11 +1,7 @@
 <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 >系统数据</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">

src/views/compressed/systemData/dataDetail.vue

@@ -1,14 +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 :to="{ path: '/dataList-checkData?systemId=' + systemId}">设备数据列表</el-breadcrumb-item>
-      <!--            <el-breadcrumb-item >查看</el-breadcrumb-item>-->
-      <el-breadcrumb-item >详细数据</el-breadcrumb-item>
-    </el-breadcrumb>
 
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="表格信息" name="chart">

src/views/drain/dataStandard/dataStandard.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <!-- 面包屑导航 -->
-    <el-breadcrumb
+    <!-- <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>数据标准</el-breadcrumb-item>
-    </el-breadcrumb>
+    </el-breadcrumb> -->
     <!-- <over-view-of-system
       :table-data="tableData"
       :total="total"
@@ -29,6 +29,7 @@
     ></el-cascader> -->
 
     <el-table
+    class="tableStyle"
       :data="tableData"
       style="min-width: 100%"
       border

src/views/drain/systemData.vue

@@ -1,17 +1,19 @@
 <template>
   <!-- 系统数据 -->
+  <div class="tableStyle">
     <checkData :systemId=19></checkData>
+  </div>
+
 </template>
 
 <script>
 import checkData from "@/views/drain/systemData/checkData.vue";
 export default {
-components: {
-    checkData
+  components: {
+    checkData,
   },
-}
+};
 </script>
 
 <style>
-
 </style>

src/views/drain/systemData/checkData.vue

@@ -1,11 +1,7 @@
 <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 >系统数据</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">

src/views/drain/systemData/dataDetail.vue

@@ -1,14 +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 :to="{ path: '/dataList-checkData?systemId=' + systemId}">设备数据列表</el-breadcrumb-item>
-      <!--            <el-breadcrumb-item >查看</el-breadcrumb-item>-->
-      <el-breadcrumb-item >详细数据</el-breadcrumb-item>
-    </el-breadcrumb>
 
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="表格信息" name="chart">

src/views/gas/configImg/Chart.vue

@@ -18,7 +18,7 @@
     </div>
     <div
       ref="testLine"
-      style="width: 450px; height: 400px; margin:0px auto"
+      style="width: 550px; height: 400px; margin:0px auto;margin-top:-10px;"
     ></div>
   </div>
 </template>
@@ -40,11 +40,11 @@ export default {
       chartoptions: [
         {
           id: 1,
-          label: "流量",
+          label: "管道流量",
         },
         {
           id: 2,
-          label: "浓度",
+          label: "管道浓度",
         },
       ],
       type: {
@@ -52,10 +52,10 @@ export default {
         name2: "paiqiliuliang_after",
       },
       gasId: "35",
-      title: "流量",
+      title: "管道流量",
       gasUnit: "%",
-      currentChartId: "流量",
-      currentChartTitle: "流量",
+      currentChartId: "管道流量",
+      currentChartTitle: "管道流量",
       paiqidata: new Array(30).fill("-"),
       chouqidata: new Array(30).fill("-"),
       xData: new Array(30).fill("-"),
@@ -136,14 +136,14 @@ export default {
             data: [],
           },
         ],
-        title: {
-          text: "管道流量/浓度",
-          padding: [5, 230],
-          textStyle: {
-            fontWeight: "normal", //标题颜色
-            color: "#4ADEFE",
-          },
-        },
+        // title: {
+        //   text: "管道流量/浓度",
+        //   padding: [5, 230],
+        //   textStyle: {
+        //     fontWeight: "normal", //标题颜色
+        //     color: "#4ADEFE",
+        //   },
+        // },
 
         series: [
           {
@@ -374,13 +374,16 @@ export default {
 </script>
 <style scoped>
 .select-veido .el-select {
-  width: 100px;
-  margin-left: 10px;
-}
-.select-veido >>> .el-input--small .el-input__inner {
-  background: none;
+  width: 123px;
+  margin-left: 248px;
 }
+
 .select-veido >>> .el-input__inner {
   border: 0;
 }
+.select-veido >>> .el-input--small .el-input__inner {
+  background: none;
+  color: #47c1dc;
+  font-size: 17px;
+}
 </style>

src/views/gas/configImg/dianliuChart.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     ref="testLine"
-    style="width: 450px; height: 400px; margin:40px auto"
+    style="width: 550px; height: 400px; margin:40px auto"
   ></div>
 </template>
 

src/views/gas/configImg/index.vue

@@ -102,6 +102,7 @@ export default {
   justify-content: space-around;
 }
 .bottom_left {
+  padding-top: 24px;
   width: 40%;
   height: 440px;
   background: url(../../../assets/img/tunneling/dataBg.png) no-repeat;

src/views/gas/dataStandard.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <!-- 面包屑导航 -->
-    <el-breadcrumb
+    <!-- <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>数据标准</el-breadcrumb-item>
-    </el-breadcrumb>
+    </el-breadcrumb> -->
     <!-- <over-view-of-system
       :table-data="tableData"
       :total="total"
@@ -30,6 +30,7 @@
     <!--      <el-button @click="searchDataByPid()" style="margin: 20px 10px"  type="primary" size="medium">查询</el-button>-->
 
     <el-table
+    class="tableStyle"
       :data="tableData"
       style="min-width: 100%"
       border

src/views/gas/systemData.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 系统数据 -->
-    <checkData :systemId=6></checkData>
+  <div class="tableStyle" ><checkData :systemId=6></checkData></div>
+    
 </template>
 
 <script>

src/views/gas/systemData/checkData.vue

@@ -1,11 +1,11 @@
 <template>
   <!-- 查看系统的对话框 -->
   <div>
-    <el-breadcrumb separator-class="el-icon-arrow-right" v-if="this.$router.currentRoute.path!='/home'">
+    <!-- <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 >系统数据</el-breadcrumb-item>
-    </el-breadcrumb>
+    </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">

src/views/gas/systemData/dataDetail.vue

@@ -1,14 +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 :to="{ path: '/dataList-checkData?systemId=' + systemId}">设备数据列表</el-breadcrumb-item>
-      <!--            <el-breadcrumb-item >查看</el-breadcrumb-item>-->
-      <el-breadcrumb-item >详细数据</el-breadcrumb-item>
-    </el-breadcrumb>
 
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="表格信息" name="chart">

src/views/main.vue

@@ -14,7 +14,7 @@ export default {
   data() {
     return {
       getDashBoardId: false,
-      url: "http://112.126.68.148:50401/analysis/dashboard/show/",
+      url: "http://49.235.67.21:50401/analysis/dashboard/show/",
     };
   },
   created() {

src/views/mining/dataStandard/dataStandard.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 面包屑导航 -->
-    <el-breadcrumb
+    <!-- <el-breadcrumb
       separator-class="el-icon-arrow-right"
       v-if="this.$router.currentRoute.path != '/home'"
     >
@@ -13,7 +13,7 @@
       :table-data="tableData"
       :total="total"
       v-if="overViewFlag"
-    ></over-view-of-system>
+    ></over-view-of-system> -->
 
     <!-- 页面主体区域 -->
 
@@ -31,7 +31,8 @@
 
     <!--      <el-button @click="searchDataByPid()" style="margin: 20px 10px"  type="primary" size="medium">查询</el-button>-->
 
-    <el-table
+    <el-table 
+    class="tableStyle"
       :data="tableData"
       style="min-width: 100%"
       border

src/views/mining/systemData.vue

@@ -1,21 +1,20 @@
 <template>
 
-<div>
-    <div v-if="this.$router.currentRoute.path=='/coal_mining'">
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>采煤工作面</el-breadcrumb-item>
-      <el-breadcrumb-item>系统数据</el-breadcrumb-item>
-    </el-breadcrumb>
-  </div>
+  <div>
+    <!-- <div v-if="this.$router.currentRoute.path=='/coal_mining'">
+      <el-breadcrumb separator-class="el-icon-arrow-right">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>采煤工作面</el-breadcrumb-item>
+        <el-breadcrumb-item>系统数据</el-breadcrumb-item>
+      </el-breadcrumb>
+    </div> -->
 
+    <!-- 系统数据 -->
+    <div class="tableStyle">
+      <checkData :systemId=16></checkData>
+    </div>
 
-  <!-- 系统数据 -->
-  <div>
-    <checkData :systemId=16></checkData>
   </div>
-
-</div>
 </template>
 
 

src/views/mining/systemData/dataDetail.vue

@@ -1,15 +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 :to="{ path: '/dataList-checkData?systemId=' + systemId}">设备数据列表</el-breadcrumb-item>
-      <!--            <el-breadcrumb-item >查看</el-breadcrumb-item>-->
-      <el-breadcrumb-item >详细数据</el-breadcrumb-item>
-    </el-breadcrumb>
-
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="表格信息" name="chart">
         <chart v-if="activeName == 'chart'"></chart>

src/views/monitor/dataStandard.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 面包屑导航 -->
-    <el-breadcrumb
+    <!-- <el-breadcrumb
       separator-class="el-icon-arrow-right"
       v-if="this.$router.currentRoute.path != '/home'"
     >
@@ -14,7 +14,7 @@
       :table-data="tableData"
       :total="total"
       v-if="overViewFlag"
-    ></over-view-of-system>
+    ></over-view-of-system> -->
   
     <!-- 页面主体区域 -->
 
@@ -32,6 +32,7 @@
     <!--      <el-button @click="searchDataByPid()" style="margin: 20px 10px"  type="primary" size="medium">查询</el-button>-->
 
     <el-table
+    class="tableStyle"
       :data="tableData"
       style="min-width: 100%"
       border

src/views/monitor/systemData.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-header style="height: 20px;">
+    <!-- <el-header style="height: 20px;">
       <div v-if="this.$router.currentRoute.path=='/monitor'">
         <el-breadcrumb separator-class="el-icon-arrow-right">
           <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
@@ -8,11 +8,13 @@
           <el-breadcrumb-item>系统数据</el-breadcrumb-item>
         </el-breadcrumb>
       </div>
-    </el-header>
-    <el-main>
+    </el-header> -->
+
       <!-- 系统数据 -->
-      <checkData :systemId=8></checkData>
-    </el-main>
+    <div class="tableStyle">
+        <checkData :systemId=8></checkData>
+
+    </div>
   </el-container>
 
 </template>

src/views/monitor/systemData/checkData.vue

@@ -11,7 +11,7 @@
 
     <el-table
         :data="tableData"
-        style="min-width: 100%"
+        style="min-width: 1581px"
         border
         v-loading="dataListLoading"
     >
@@ -87,7 +87,7 @@ export default {
       options: [],
       tableData: [],
       page:1,  //当前第几页
-      size:10, //当前每页页数
+      size:20, //当前每页页数
       total:100, //全部数据量
       currentSystemId: 0,
       currentSubSystemId:'',

src/views/monitor/systemData/dataDetail.vue

@@ -1,14 +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 :to="{ path: '/dataList-checkData?systemId=' + systemId}">设备数据列表</el-breadcrumb-item>
-      <!--            <el-breadcrumb-item >查看</el-breadcrumb-item>-->
-      <el-breadcrumb-item >详细数据</el-breadcrumb-item>
-    </el-breadcrumb>
 
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="表格信息" name="chart">

src/views/newmain.vue

@@ -0,0 +1,67 @@
+<template>
+  <div class="grid">
+    <div class="item1">Item 1</div>
+    <div class="span-col-2 span-row-3 item2"><Main></Main></div>
+    <div class="item3">Item 3</div>
+    <div class="item4">Item 4</div>
+    <div class="item5">Item 5</div>
+    <div class="item6">Item 6</div>
+    <div class="item7">Item 7</div>
+    <div class="item8">Item 8</div>
+    <div class="span-col-2 span-row-2 item9">
+      <div class="watch watch1"></div>
+      <div class="watch watch2"></div>
+      <div class="watch watch3"></div>
+      <div class="watch watch4"></div>
+      <div class="watch watch5"></div>
+      <div class="watch watch6"></div>
+    </div>
+    <div class="item10">Item 10</div>
+    <div class="item11">Item 11</div>
+    <div class="item12">Item 12</div>
+  </div>
+</template>
+
+<script>
+import Main from "../components/newmain/Main";
+export default {
+  name: "newmain",
+  components: {
+    Main,
+  },
+};
+</script>
+
+<style lang="less">
+.grid {
+  width: 100%;
+  height: 900px;
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  grid-template-rows: repeat(5, 1fr);
+  grid-gap: 10px;
+}
+.span-col-2 {
+  grid-column: span 2 / auto;
+}
+
+.span-row-3 {
+  grid-row: span 3 / auto;
+}
+
+.span-row-2 {
+  grid-row: span 2 / auto;
+}
+.item2 {
+  background-color: antiquewhite;
+}
+.item9 {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  grid-template-rows: repeat(5, 148px);
+  grid-gap: 10px;
+  .watch {
+    background-color: aqua;
+  }
+}
+</style>

src/views/power_supply/dataBoard/leftChart.vue

@@ -18,7 +18,7 @@
     </div>
     <div
       ref="testLine"
-      style="width: 450px; height: 400px; margin: 0px auto"
+      style="width: 550px; height: 400px; margin: 0px auto;margin-top:-39px"
     ></div>
   </div>
 </template>
@@ -80,6 +80,13 @@ export default {
             var result = `${this.title}：${params[0].data}${this.unit} <br/>`;
             return result;
           },
+        },
+         grid: {
+        	top: '10%',
+        	left: '10%',
+        	right: '10%',
+        	bottom: '1%',
+        	containLabel: true
         },
         legend: {
           orient: "vertical",
@@ -316,13 +323,16 @@ export default {
 </script>
 <style scoped>
 .select-veido .el-select {
-  width: 100px;
-  margin-left: 10px;
-}
-.select-veido >>> .el-input--small .el-input__inner {
-  background: none;
+    width: 80px;
+    margin-left: 279px;
 }
+
 .select-veido >>> .el-input__inner {
   border: 0;
 }
+.select-veido >>> .el-input--small .el-input__inner {
+  background: none;
+  color: #47C1DC;
+  font-size: 14px;
+}
 </style>

src/views/power_supply/dataBoard/rightChart.vue

@@ -2,7 +2,7 @@
   <div>
     <div
       ref="testLine"
-      style="width: 450px; height: 400px; margin: 20px auto"
+      style="width: 550px; height: 402px; margin: 10px auto"
     ></div>
   </div>
 </template>

src/views/power_supply/dataStandard/dataStandard.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <!-- 面包屑导航 -->
-    <el-breadcrumb
+    <!-- <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>数据标准</el-breadcrumb-item>
-    </el-breadcrumb>
+    </el-breadcrumb> -->
     <!-- <over-view-of-system
       :table-data="tableData"
       :total="total"
@@ -30,6 +30,7 @@
     <!--      <el-button @click="searchDataByPid()" style="margin: 20px 10px"  type="primary" size="medium">查询</el-button>-->
 
     <el-table
+    class="tableStyle"
       :data="tableData"
       style="min-width: 100%"
       border

src/views/power_supply/systemData.vue

@@ -1,6 +1,7 @@
 <template>
   <!-- 系统数据 -->
-    <checkData :systemId=15></checkData>
+  <div class="tableStyle">  <checkData :systemId=15></checkData></div>
+  
 </template>
 
 <script>

src/views/power_supply/systemData/checkData.vue

@@ -1,11 +1,11 @@
 <template>
   <!-- 查看系统的对话框 -->
   <div>
-    <el-breadcrumb separator-class="el-icon-arrow-right" v-if="this.$router.currentRoute.path!='/home'">
+    <!-- <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 >系统数据</el-breadcrumb-item>
-    </el-breadcrumb>
+    </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">

src/views/power_supply/systemData/dataDetail.vue

@@ -1,14 +1,7 @@
 <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 :to="{ path: '/dataList-checkData?systemId=' + systemId}">设备数据列表</el-breadcrumb-item>
-      <!--            <el-breadcrumb-item >查看</el-breadcrumb-item>-->
-      <el-breadcrumb-item >详细数据</el-breadcrumb-item>
-    </el-breadcrumb>
+
 
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="表格信息" name="chart">

src/views/transportation/configImg/analysis/AlarmMsg.vue

@@ -37,7 +37,7 @@ export default {
   data() {
     return {
       data: [],
-      alarmStatisticWebsocketUrl: "ws://106.12.123.152:8080/ws/alarmstati",
+      alarmStatisticWebsocketUrl: "ws://150.158.138.99:8081/ws/alarmstati",
       getHistroyUrl: "https://service-j79v4brc-1301774019.gz.apigw.tencentcs.com/release/helloworld-1640223752",
       columns,
     };

src/views/transportation/configImg/analysis/WorkFace.vue

@@ -56,7 +56,7 @@ export default {
   name: "WorkFace",
   data() {
     return {
-      websocketUrl: "ws://106.12.123.152:8080/ws/workface",
+      websocketUrl: "ws://150.158.138.99:8081/ws/workface",
       states,
     };
   },

src/views/transportation/configImg/belt/Analysis.vue

@@ -78,7 +78,7 @@
       <!-- 减速器油压图 -->
       <a-col :sm="24" :md="12" :xl="6"><chart :id="25" title="减速器油压" unit="Mpa" type="youya_after"/></a-col>
       <!-- 变频器功率图 -->
-      <a-col :sm="24" :md="12" :xl="5"><chart :id="26" title="变频器功率" unit="KW" type="gonglv_after"/></a-col>
+      <a-col :sm="24" :md="12" :xl="5"><chart :id="26" title="变频器功率" unit="KW" type="gonglü_after"/></a-col>
     </a-row>
   </div>
 </template>
@@ -117,7 +117,7 @@ export default {
           info_msg: "速度",
         },
         {
-          info: "0",
+          info: "1",
           info_msg: "温度",
         },
         {
@@ -125,11 +125,11 @@ export default {
           info_msg: "打滑",
         },
         {
-          info: "0",
+          info: "1",
           info_msg: "纵撕",
         },
         {
-          info: "0",
+          info: "1",
           info_msg: "断带",
         },
       ],
@@ -227,7 +227,6 @@ img {
   background-color: #009966;
   border-radius: 50%;
   float: left;
-  margin-top: 5px;
 }
 
 .waring1 {

src/views/transportation/dataStandard/dataStandard.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 面包屑导航 -->
-    <el-breadcrumb
+    <!-- <el-breadcrumb
       separator-class="el-icon-arrow-right"
       v-if="this.$router.currentRoute.path != '/home'"
     >
@@ -9,7 +9,7 @@
       <el-breadcrumb-item>主运输系统</el-breadcrumb-item>
       <el-breadcrumb-item>数据标准</el-breadcrumb-item>
     
-    </el-breadcrumb>
+    </el-breadcrumb> -->
     <!-- <over-view-of-system
       :table-data="tableData"
       :total="total"
@@ -33,6 +33,7 @@
     <!--      <el-button @click="searchDataByPid()" style="margin: 20px 10px"  type="primary" size="medium">查询</el-button>-->
 
     <el-table
+    class="tableStyle"
       :data="tableData"
       style="min-width: 100%"
       border

src/views/transportation/systemData.vue

@@ -1,18 +1,19 @@
 <!-- 主运输系统 系统数据页面 -->
 <template>
   <div>
-    <div>
+    <!-- <div>
       <el-breadcrumb separator-class="el-icon-arrow-right">
         <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
         <el-breadcrumb-item >主运输系统</el-breadcrumb-item>
         <el-breadcrumb-item>系统数据</el-breadcrumb-item>
       </el-breadcrumb>
-    </div>
+    </div> -->
 
 
 
     <!-- 系统数据 -->
-    <checkData :systemId=10></checkData>
+    <div class="tableStyle"><checkData :systemId=10></checkData></div>
+    
 
   </div>
 

src/views/transportation/systemData/dataDetail.vue

@@ -1,14 +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 :to="{ path: '/dataList-checkData?systemId=' + systemId}">设备数据列表</el-breadcrumb-item>
-      <!--            <el-breadcrumb-item >查看</el-breadcrumb-item>-->
-      <el-breadcrumb-item >详细数据</el-breadcrumb-item>
-    </el-breadcrumb>
 
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="表格信息" name="chart">

src/views/tunnelling/dataStandard/dataStandard.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 面包屑导航 -->
-    <el-breadcrumb
+    <!-- <el-breadcrumb
       separator-class="el-icon-arrow-right"
       v-if="this.$router.currentRoute.path != '/home'"
     >
@@ -13,7 +13,7 @@
       :table-data="tableData"
       :total="total"
       v-if="overViewFlag"
-    ></over-view-of-system>
+    ></over-view-of-system> -->
 
     <!-- 页面主体区域 -->
 
@@ -32,6 +32,7 @@
     <!--      <el-button @click="searchDataByPid()" style="margin: 20px 10px"  type="primary" size="medium">查询</el-button>-->
 
     <el-table
+    class="tableStyle"
       :data="tableData"
       style="min-width: 100%"
       border

src/views/tunnelling/systemData.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-container>
-    <el-header style="height: 20px;">
+
+    <!-- <el-header style="height: 20px;">
       <div v-if="this.$router.currentRoute.path=='/tunnelling'">
         <el-breadcrumb separator-class="el-icon-arrow-right">
           <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
@@ -8,13 +8,13 @@
           <el-breadcrumb-item>系统数据</el-breadcrumb-item>
         </el-breadcrumb>
       </div>
-    </el-header>
+    </el-header> -->
 
       <!-- 系统数据 -->
-      <checkData :systemId=12></checkData>
+      <div  > <checkData :systemId=12></checkData></div>
+     
 
 
-  </el-container>
 </template>
 
 <script>

src/views/tunnelling/systemData/dataDetail.vue

@@ -1,15 +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 :to="{ path: '/dataList-checkData?systemId=' + systemId}">设备数据列表</el-breadcrumb-item>
-      <!--            <el-breadcrumb-item >查看</el-breadcrumb-item>-->
-      <el-breadcrumb-item >详细数据</el-breadcrumb-item>
-    </el-breadcrumb>
-
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="表格信息" name="chart">
         <chart v-if="activeName == 'chart'"></chart>

src/views/tunnelling/zutai.vue

@@ -251,7 +251,7 @@ export default {
 }
 .jiege {
   position: relative;
-  background: url(/img/割截轨迹3.167e8877.png) no-repeat;
+  background: url(../../assets/img/tunneling/gejie.png) no-repeat;
   background-size: 100%;
   width: 216px;
   height: 237px;

src/views/ventilate/dataBoard/dataBoard.vue

@@ -251,6 +251,7 @@ export default {
   background-size: 100%;
 }
 .center_right {
+  /* margin-left: -25px; */
   width: 100%;
   height: 210px;
   background: url(../../../assets/img/tunneling/dataBg.png) no-repeat;

src/views/ventilate/dataBoard/volAndCurrent.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="select-veido">
       <el-select
-        style="margin-top:10px"
+        style="margin-left: 189px;width:120px"
         v-model="currentChartId"
         placeholder="请选择"
         @change="selectParm"
@@ -18,7 +18,7 @@
     </div>
     <div
       ref="testLine"
-      style="width: 450px; height: 200px; margin: 0px auto"
+      style="width: 500px; height: 200px; margin: 0px auto;margin-top:-15px"
     ></div>
   </div>
 </template>
@@ -148,7 +148,7 @@ export default {
         },
         grid: {
           top: "5%",
-          left: "10%",
+          left: "4%",
           right: "10%",
           bottom: "7%",
           containLabel: true,
@@ -165,8 +165,7 @@ export default {
           // icon:'rect',
           itemGap: 21,
           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",
+          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,
         },
@@ -431,7 +430,7 @@ export default {
     addData(data) {
       this.websocket;
       // 先扩展数组，然后删除多余元素
-      
+
       // console.log("data", data);
       // console.log('this.legend',this.legend);
       if (this.count < 30) {
@@ -528,10 +527,13 @@ export default {
   width: 120px;
   margin-left: 10px;
 }
-.select-veido >>> .el-input--small .el-input__inner {
-  background: none;
-}
+
 .select-veido >>> .el-input__inner {
   border: 0;
 }
+.select-veido >>> .el-input--small .el-input__inner {
+  background: none;
+  color: #47c8e4;
+  font-size: 14px;
+}
 </style>

src/views/ventilate/dataBoard/wind.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="select-veido">
       <el-select
-        style="margin-top:10px"
+        style="margin-top:5px"
         v-model="currentChartId"
         placeholder="请选择"
         @change="selectParm"
@@ -18,7 +18,7 @@
     </div>
     <div
       ref="testLine"
-      style="width: 450px; height: 200px; margin: 0px auto"
+      style="width: 500px; height: 200px; margin: 0px auto;margin-top:-15px"
     ></div>
   </div>
 </template>
@@ -48,7 +48,7 @@ export default {
       yData: new Array(30).fill("-"),
       count: 0,
       myChart: null,
-       option: {
+      option: {
         color: ["#41D6C3", "#FA8072"],
         tooltip: {
           trigger: "axis",
@@ -74,11 +74,11 @@ export default {
           },
         },
         grid: {
-        	top: '3%',
-        	left: '10%',
-        	right: '10%',
-        	bottom: '10%',
-        	containLabel: true
+          top: "3%",
+          left: "10%",
+          right: "10%",
+          bottom: "10%",
+          containLabel: true,
         },
         legend: {
           orient: "vertical",
@@ -136,12 +136,12 @@ export default {
           textStyle: {
             fontWeight: "normal", //标题颜色
             color: "#4ADEFE",
-            fontSize:15
+            fontSize: 15,
           },
         },
 
         series: [
-         {
+          {
             type: "line",
             symbol: "circle", // 默认是空心圆（中间是白色的），改成实心圆
             showAllSymbol: true,
@@ -316,13 +316,18 @@ export default {
 </script>
 <style scoped>
 .select-veido .el-select {
-  width: 100px;
-  margin-left: 10px;
-}
-.select-veido >>> .el-input--small .el-input__inner {
-  background: none;
+  width: 77px;
+  margin-left: 207px; 
 }
+
 .select-veido >>> .el-input__inner {
   border: 0;
 }
+.select-veido >>> .el-input--small .el-input__inner {
+  background: none;
+
+  color: #47c8e4;
+
+  font-size: 14px;
+}
 </style>

src/views/ventilate/dataStandard.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 面包屑导航 -->
-    <el-breadcrumb
+    <!-- <el-breadcrumb
       separator-class="el-icon-arrow-right"
       v-if="this.$router.currentRoute.path != '/home'"
     >
@@ -9,7 +9,7 @@
       <el-breadcrumb-item>通风系统</el-breadcrumb-item>
       <el-breadcrumb-item>数据标准</el-breadcrumb-item>
 
-    </el-breadcrumb>
+    </el-breadcrumb> -->
     <!-- <over-view-of-system
       :table-data="tableData"
       :total="total"
@@ -32,6 +32,7 @@
     <!--      <el-button @click="searchDataByPid()" style="margin: 20px 10px"  type="primary" size="medium">查询</el-button>-->
 
     <el-table
+    class="tableStyle"
       :data="tableData"
       style="min-width: 100%"
       border

src/views/ventilate/systemData.vue

@@ -1,16 +1,17 @@
 <template>
   <div>
-    <div>
+    <!-- <div>
       <el-breadcrumb separator-class="el-icon-arrow-right">
         <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
         <el-breadcrumb-item >主通风系统</el-breadcrumb-item>
         <el-breadcrumb-item>系统数据</el-breadcrumb-item>
       </el-breadcrumb>
-    </div>
+    </div> -->
 
    
 <!-- 系统数据 -->
-    <checkData :systemId=10></checkData>
+<div class="tableStyle"><checkData :systemId=10></checkData></div>
+    
   </div>
 
 </template>

src/views/ventilate/systemData/dataDetail.vue

@@ -1,14 +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 :to="{ path: '/dataList-checkData?systemId=' + systemId}">设备数据列表</el-breadcrumb-item>
-      <!--            <el-breadcrumb-item >查看</el-breadcrumb-item>-->
-      <el-breadcrumb-item >详细数据</el-breadcrumb-item>
-    </el-breadcrumb>
 
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="表格信息" name="chart">

vue.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-    // publicPath:"./",
+    publicPath:"./",
     lintOnSave: false,
     devServer: {
         host: 'localhost',