掘进系统修改

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/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>