seamew 3 年之前
父節點
當前提交
e0816a1c9a

+ 1 - 0
src/components/tunneling/rtop.vue

@@ -109,6 +109,7 @@ export default {
 <style scoped>
 #rtop{
     text-align: center;
+    padding-top: 10px;
 }
 li{
     width: 100%;

+ 1 - 1
src/components/tunneling/temporature-two.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     id="tempChart2"
-    style="width: 100%;height: 150px;"
+    style="width: 100%;height: 250px;"
   ></div>
 </template>
 

+ 1 - 1
src/components/tunneling/temporature.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     id="tempChart"
-    style="width: 100%;height: 150px;"
+    style="width: 100%;height: 250px;"
   ></div>
 </template>
 

+ 1 - 1
src/store/index.js

@@ -5,7 +5,7 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
   state: {
-    websocketIP: "10.170.16.208:8081",
+    websocketIP: "10.170.22.99:8081",
   },
   mutations: {
 

+ 1 - 1
src/views/Home.vue

@@ -133,7 +133,7 @@
               <el-menu-item :index="item.path" >
                 <div
                   style="
-                    background-color: #B3B0DC;
+                    background-color: #C0C0C0;
                     width: 120px;
                     height: 53px;
                     position: relative;

+ 2 - 1
src/views/gas/configImg/main.vue

@@ -21,7 +21,8 @@
             </div>
             <div>
               减速机轴温
-              <p>{{ motor1.reducertem }}℃</p>
+              <!-- <p>{{ motor1.reducertem }}℃</p> -->
+              <p>50℃</p>
             </div>
             <div>
               油泵压力

+ 1 - 3
src/views/transportation/configImg/belt/Analysis.vue

@@ -2,7 +2,7 @@
   <div class="analysis">
     <a-row>
       <a-col :sm="24" :md="12" :xl="11">
-        <h2 style="text-align: center">{{ this.$route.params.title }}</h2>
+        <div style="font-size: 20px;font-weight:bold;text-align:center;">{{ this.$route.params.title }}</div>
         <img src="@/assets/img/20211209164229.png" />
       </a-col>
       <a-col :sm="24" :md="12" :xl="6"><chart :id="23" title="皮带速度" unit="m/s" /></a-col>
@@ -213,8 +213,6 @@ img {
 }
 
 .contour {
-  outline-style: dotted;
-  outline-color: gray;
   height: 380px;
   width: 700px;
   margin: 20px 0px 50px 10px;

+ 6 - 6
src/views/transportation/configImg/belt/Chart.vue

@@ -71,7 +71,7 @@ export default {
             },
             axisTick: { show: false },
             boundaryGap: false,
-            data: [1, 2, 3, 4],
+            data: [],
           },
         ],
         title: {
@@ -123,7 +123,7 @@ export default {
             },
             areaStyle: { normal: { color: "#5AAAFA", opacity: 0.5 } },
             connectNulls: true,
-            data: [1, 2, 3, 4],
+            data: [],
           },
         ],
       },
@@ -197,10 +197,10 @@ export default {
     // 先画图
     this.myChart = this.$echarts.init(this.$refs.testLine);
     this.myChart.setOption(this.option);
-    // this.websocket = new WebSocket(
-    //   `ws://${this.websocketIP}/hbase/ws/belt/${this.id}`
-    // );
-    // this.initWebSocket();
+    this.websocket = new WebSocket(
+      `ws://${this.websocketIP}/hbase/ws/belt/${this.id}`
+    );
+    this.initWebSocket();
   },
 };
 </script>

+ 1 - 33
src/views/tunnelling/zutai.vue

@@ -1,8 +1,5 @@
 <template>
   <div class="main1">
-    <!-- <div class="top_title">
-      <img src="../../assets/img/tunneling/top_title.png"/>
-    </div> -->
     <div class="datas">
       <div class="data_left">
         <div class="left_top">
@@ -11,34 +8,12 @@
               <ruler></ruler>
             </div>
             <div class="hard">
-              <!-- 割接轨迹 -->
               <hard></hard>
             </div>
 
           </div>
         </div>
         <div class="left_bottom">
-          <!-- <div class="left_top_title"></div> -->
-
-          <!-- <div class="middle_top_list">
-            <div class="list_title">压入式风机风压</div>
-            <div class="list_num list_num1"><span class="counter-value">548</span>m^3/min</div>
-
-          </div>
-          <div class="middle_top_list">
-            <div class="list_title">压入式风机风量</div>
-            <div class="list_num list_num2"><span class="counter-value">1149.66</span>m^3/min</div>
-          </div>
-
-          <div class="middle_top_list">
-            <div class="list_title">除尘风机风压</div>
-            <div class="list_num list_num1"><span class="counter-value">687</span>m^3/min</div>
-
-          </div>
-          <div class="middle_top_list">
-            <div class="list_title">除尘风机风量</div>
-            <div class="list_num list_num2"><span class="counter-value">3803</span>m^3/min</div>
-          </div> -->
           <lmid></lmid>
           <lbottom></lbottom>
         </div>
@@ -99,7 +74,7 @@
           <el-col :span="10">
             <div class="grid-content temperature" style="margin-top:120px">
               <!-- 油缸温度 -->
-              <div>
+              <div style="margin-right:50px">
                 <span class="text">油缸温度</span>
                 <tempChart></tempChart>
               </div>
@@ -114,16 +89,10 @@
       </div>
       <div class="data_right">
         <div class="right_top">
-
-          <!-- 掘进机控制系统 -->
           <rtop></rtop>
-
-          <!-- 远控模式 -->
           <rtone></rtone>
-
         </div>
          <div class="right_bootom">
-
            <worklog></worklog>
         </div>
 
@@ -170,7 +139,6 @@ export default {
     lmid,
     lbottom,
   },
-  data() {},
 };
 </script>