Merge pull request '1' (#247) from pc-master into portal

Reviewed-on: #247

src/assets/css/main.css

@@ -692,6 +692,10 @@ textarea {
   border-right: 1px solid rgba(2, 148, 226, 0.5);
 }
 
+.input-main-200 input {
+  width: 200px !important;
+}
+
 .input-main span {
   padding: 0 10px;
 }
@@ -812,6 +816,10 @@ textarea {
   color: #859BB6;
 }
 
+.input-main-60 input.w-100 {
+  width: 100px;
+}
+
 .input-main-one {
   width: 100%;
   flex-wrap: wrap;

src/assets/css/main.scss

@@ -716,7 +716,11 @@ textarea{
 .border-right {
     border-right: 1px solid rgba(2, 148, 226, 0.5);
 }
-
+.input-main-200{
+    input{
+        width: 200px!important;
+    }
+}
 .input-main {
     span {
         padding: 0 10px;
@@ -848,6 +852,9 @@ textarea{
         &::placeholder {
             color: #859BB6;
         }
+        &.w-100{
+            width: 100px;
+        }
     }
 }
 

src/views/page/irrigateSet-soil.vue

@@ -140,6 +140,13 @@
           <img src="../../assets/image/rotate.png" alt="" />轮模式启用
         </div> -->
     </div>
+     <div class="flex-view">
+        <div class="input-main-60">
+          <span>本灌溉组启动追随阀</span>
+          <input @blur="blurChange('1' + (10 + (indexs - 1))  + '73', $event)" v-model="inputData['1' + (10 + (indexs - 1)) + '73']"
+            @input="change('1' + (10 + (indexs - 1)) + '73', $event)" type="number" placeholder="0" />
+        </div>
+      </div>
     <div class="flex-view">
       <!-- <div @click="(open1 = !open1), change59()" class="open-btn" :class="open1 ? 'active' : ''">
           <img v-if="!open1" src="../../assets/image/irrigateSet-icon1.png" alt="" />

src/views/page/realTime.vue

@@ -1508,9 +1508,11 @@ export default {
 
         },
         chart_fidata(equipmentId){
+             var store = this.$store.state
                this.api.chart_fidata(equipmentId).then(res=>{
                     if (res.data.code == 200) {
                         var chartsData = res.data.data
+                         var data1 = store.equipmentList[this.indexs - 1].deviceId
                         realTimeLine('realTime-line', chartsData, data1)
                     } else {
                         // this.$message.error(res.data.msg);

src/views/page/status-soil.vue

@@ -6,9 +6,9 @@
         </div>
         <div class="flex-view">
             <div class="input-main-60">
-                <template v-for="item, index in dataInfo2_list">
+                <template v-for="item, index in dataInfo2_list" >
                     <span>{{ item.title }}</span>
-                    <input  v-model="item.timer" type="text" value="60" disabled placeholder="60" />
+                    <input :class="index==2?'w-100':''" v-model="item.timer" type="text" value="60" disabled placeholder="60" />
                     <span>{{ item.unit }}</span>
                 </template>
             </div>

src/views/page/systemSet-soil.vue

@@ -11,13 +11,13 @@
                 <img src="../../assets/image/system.png" alt=""> 系统参数设置
             </div>
             <div class="flex-view border-none padding-none">
-            <div class="input-main-60" style="width: auto;">
+            <div class="input-main-60 input-main-100" style="width: auto;">
                 <span>软件版本号</span>
                 <input disabled  v-model="inputData['3039']"  type="text" placeholder="0">
 
                 <span></span>
             </div>
-            <div class="input-main">
+            <div class="input-main-60 input-main-200" style="width: auto;">
                 <span>智能灌溉控制器</span>
                 <input disabled v-model="inputData['3040']"  type="text" placeholder="0">
                 <span></span>