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

src/store/index.js

@@ -9,7 +9,6 @@ export default new Vuex.Store({
     ip:"http://49.235.67.21/",
     name: "",
     title: "主界面",
-    // efficiency: window.config.efficiency,
     efficiency: [ { name: '额定负载', xAxis: 0.8 },{ name: '额定负载',xAxis: 1.2 },{ name: '效率',yAxis: 0.7 },{ name: '效率',yAxis: 1 }]
 
   },

src/views/app_beam_tube_inspection/albox.vue

@@ -39,7 +39,9 @@ export default {
 <style scoped>
 .class1{
   column-rule-color: #00aaff;
-
+  margin-left: 67%;
+  margin-top: -38px;
+  width:32%;
 }
 /*.class1 .el-select {*/
 /*  width: 200px;*/
@@ -48,7 +50,7 @@ export default {
 .class1 >>> .el-input--small .el-input__inner {
   /*color: #f3db5c;*/
   color: #4adefe;
-  font-size: 17px;
+  font-size: 16px;
   background: none;
   text-align: center;
 }

src/views/app_beam_tube_inspection/dataBoardtest.vue

@@ -32,7 +32,7 @@
         <el-col :span="8">
           <div class="center_center">
             <div class="title2" style="width: 100%;margin-left: 225px;padding-top: 0px;font-size: 19px;color: #4ADEFE;font-weight: 350;">工况分析</div>
-            <albox style="margin-left: 67%;margin-top: -38px; color: gray;width:32%;"></albox> <!--算法框-->
+            <albox ></albox> <!--算法框-->
             <div class="title2" style="width: 100%;font-size: 18px;margin-top: -20px;">区域状态：<span style="color: #f3db5c;font-size: 14px">{{work.info}}</span>
 <!--              <sandian style="margin-top: -38px;z-index: 1;"></sandian>-->
               <sandian style="margin-top: -7%;margin-left: -4%;z-index: 1;"></sandian>

src/views/app_beam_tube_inspection/picture/dangqian.vue

@@ -3,7 +3,7 @@
 <!--    <div ref="testLine" style="width: 600px; height: 230px"></div>-->
     <div ref="testLine" style="width: 100%; height: 230px"></div>
 <!--    <timeselect @getMsg="chooseDate" style="margin-left: 480px;color: gray;margin-top: -228px;width:100px;"></timeselect> &lt;!&ndash;算法框&ndash;&gt;-->
-    <timeselect @getMsg="chooseDate" style="margin-left: 79%;color: gray;margin-top: -228px;width:20%;"></timeselect> <!--算法框-->
+    <timeselect @getMsg="chooseDate" ></timeselect> <!--算法框-->
 
     <!--    230-->
   </div>

src/views/app_beam_tube_inspection/picture/dunmei.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div ref="testLine" style="width: 100%; height: 230px"></div>
-    <timeselect @getMsg="chooseDate" style="margin-left: 79%;color: gray;margin-top: -228px;width:20%;"></timeselect> <!--算法框-->
+    <timeselect @getMsg="chooseDate" ></timeselect> <!--算法框-->
 
     <!--    230-->
   </div>

src/views/app_beam_tube_inspection/picture/fuzai.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div ref="testLine" style="width: 100%; height: 230px"></div>
-    <timeselect @getMsg="chooseDate" style="margin-left: 79%;color: gray;margin-top: -228px;width:20%;"></timeselect> <!--算法框-->
+    <timeselect @getMsg="chooseDate" ></timeselect> <!--算法框-->
 
 <!--    230-->
   </div>

src/views/app_beam_tube_inspection/picture/shuru.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div ref="testLine" style="width: 100%; height: 230px"></div>
-    <timeselect @getMsg="chooseDate" style="margin-left: 79%;color: gray;margin-top: -228px;width:20%;"></timeselect> <!--算法框-->
+    <timeselect @getMsg="chooseDate" ></timeselect> <!--算法框-->
 
     <!--    230-->
   </div>

src/views/app_beam_tube_inspection/picture/xiaolv.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div ref="testLine" style="width: 100%; height: 230px"></div>
-    <timeselect @getMsg="chooseDate" style="margin-left: 79%;color: gray;margin-top: -228px;width:20%;"></timeselect> <!--算法框-->
+    <timeselect @getMsg="chooseDate" ></timeselect> <!--算法框-->
 
     <!--    230-->
   </div>

src/views/app_beam_tube_inspection/tiemselect.vue

@@ -47,7 +47,20 @@ export default {
 <style scoped>
 .class1{
   column-rule-color: #00aaff;
+  margin-left: 78%;
+  margin-top: -228px;
+  width:22%;
 
 }
+.class1 >>> .el-input--small .el-input__inner {
+  /*color: #f3db5c;*/
+  color: #4adefe;
+  font-size: 16px;
+  background: none;
+  text-align: center;
+}
+.class1 >>> .el-input__inner {
+  border: 0;
+}
 
 </style>