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

Reviewed-on: #136

src/views/page/irrigateSet.vue

@@ -23,152 +23,75 @@
         </div>
         <div class="input-main">
           <span>手动启动时间</span>
-          <input @blur="blurChange10(10 + (indexs - 1) + '01', $event)"
+          <input @blur="blurChange10(10 + (indexs - 1) + '01', $event)" v-model="inputData[10 + (indexs - 1) + '01']"
-            v-model="inputData[10 + (indexs - 1) + '01']"
+            @input="changeData10(10 + (indexs - 1) + '01', $event)" type="text" value="60" placeholder="60" />
-            @input="changeData10(10 + (indexs - 1) + '01', $event)"
-            type="text"
-            value="60"
-            placeholder="60"
-          />
         </div>
       </div>
       <div class="flex-view">
         <div class="input-main-80">
           <span>自动运行起始日期</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '02', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '02', $event)" v-model="inputData[10 + (indexs - 1) + '02']"
-            v-model="inputData[10 + (indexs - 1) + '02']"
+            @input="change(10 + (indexs - 1) + '02', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '02', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>年</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '03', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '03', $event)" v-model="inputData[10 + (indexs - 1) + '03']"
-            v-model="inputData[10 + (indexs - 1) + '03']"
+            @input="change(10 + (indexs - 1) + '03', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '03', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>月</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '04', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '04', $event)" v-model="inputData[10 + (indexs - 1) + '04']"
-            v-model="inputData[10 + (indexs - 1) + '04']"
+            @input="change(10 + (indexs - 1) + '04', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '04', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>日</span>
         </div>
         <div class="input-main-80">
           <span>间隔灌溉天数</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '05', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '05', $event)" v-model="inputData[10 + (indexs - 1) + '05']"
-            v-model="inputData[10 + (indexs - 1) + '05']"
+            @input="change(10 + (indexs - 1) + '05', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '05', $event)"
-            type="number"
-            placeholder="0"
-          />
         </div>
       </div>
       <div class="flex-view">
         <div class="input-main-80">
           <span>灌溉</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '51', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '51', $event)" v-model="inputData[10 + (indexs - 1) + '51']"
-            v-model="inputData[10 + (indexs - 1) + '51']"
+            @input="change(10 + (indexs - 1) + '51', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '51', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>次清水，间隔灌溉</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '52', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '52', $event)" v-model="inputData[10 + (indexs - 1) + '52']"
-            v-model="inputData[10 + (indexs - 1) + '52']"
+            @input="change(10 + (indexs - 1) + '52', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '52', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>次施肥。</span>
         </div>
       </div>
       <div class="flex-view">
         <div class="input-main-80">
           <span>施肥时采用</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '58', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '58', $event)" v-model="inputData[10 + (indexs - 1) + '58']"
-            v-model="inputData[10 + (indexs - 1) + '58']"
+            @input="change(10 + (indexs - 1) + '58', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '58', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>号配方。</span>
           <span>达到中液位混合</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '66', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '66', $event)" v-model="inputData[10 + (indexs - 1) + '66']"
-            v-model="inputData[10 + (indexs - 1) + '66']"
+            @input="change(10 + (indexs - 1) + '66', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '66', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>(秒)电磁阀开始输出</span>
         </div>
       </div>
       <div class="flex-view">
         <div class="input-main-80">
           <span>电磁阀控制通道</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '54', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '54', $event)" v-model="inputData[10 + (indexs - 1) + '54']"
-            v-model="inputData[10 + (indexs - 1) + '54']"
+            @input="change(10 + (indexs - 1) + '54', $event)" type="text" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '54', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '55', $event)" v-model="inputData[10 + (indexs - 1) + '55']"
-            type="text"
+            @input="change(10 + (indexs - 1) + '55', $event)" type="text" placeholder="0" />
-            placeholder="0"
+          <input @blur="blurChange(10 + (indexs - 1) + '56', $event)" v-model="inputData[10 + (indexs - 1) + '56']"
-          />
+            @input="change(10 + (indexs - 1) + '56', $event)" type="text" placeholder="0" />
-          <input @blur="blurChange(10 + (indexs - 1) + '55', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '57', $event)" v-model="inputData[10 + (indexs - 1) + '57']"
-            v-model="inputData[10 + (indexs - 1) + '55']"
+            @input="change(10 + (indexs - 1) + '57', $event)" type="text" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '55', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '60', $event)" v-model="inputData[10 + (indexs - 1) + '60']"
-            type="text"
+            @input="change(10 + (indexs - 1) + '60', $event)" type="text" placeholder="0" />
-            placeholder="0"
+          <input @blur="blurChange(10 + (indexs - 1) + '61', $event)" v-model="inputData[10 + (indexs - 1) + '61']"
-          />
+            @input="change(10 + (indexs - 1) + '61', $event)" type="text" placeholder="0" />
-          <input @blur="blurChange(10 + (indexs - 1) + '56', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '62', $event)" v-model="inputData[10 + (indexs - 1) + '62']"
-            v-model="inputData[10 + (indexs - 1) + '56']"
+            @input="change(10 + (indexs - 1) + '62', $event)" type="text" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '56', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '63', $event)" v-model="inputData[10 + (indexs - 1) + '63']"
-            type="text"
+            @input="change(10 + (indexs - 1) + '63', $event)" type="text" placeholder="0" />
-            placeholder="0"
+          <input @blur="blurChange(10 + (indexs - 1) + '64', $event)" v-model="inputData[10 + (indexs - 1) + '64']"
-          />
+            @input="change(10 + (indexs - 1) + '64', $event)" type="text" placeholder="0" />
-          <input @blur="blurChange(10 + (indexs - 1) + '57', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '65', $event)" v-model="inputData[10 + (indexs - 1) + '65']"
-            v-model="inputData[10 + (indexs - 1) + '57']"
+            @input="change(10 + (indexs - 1) + '65', $event)" type="text" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '57', $event)"
-            type="text"
-            placeholder="0"
-          />
-          <input @blur="blurChange(10 + (indexs - 1) + '60', $event)"
-            v-model="inputData[10 + (indexs - 1) + '60']"
-            @input="change(10 + (indexs - 1) + '60', $event)"
-            type="text"
-            placeholder="0"
-          />
-          <input @blur="blurChange(10 + (indexs - 1) + '61', $event)"
-            v-model="inputData[10 + (indexs - 1) + '61']"
-            @input="change(10 + (indexs - 1) + '61', $event)"
-            type="text"
-            placeholder="0"
-          />
-          <input @blur="blurChange(10 + (indexs - 1) + '62', $event)"
-            v-model="inputData[10 + (indexs - 1) + '62']"
-            @input="change(10 + (indexs - 1) + '62', $event)"
-            type="text"
-            placeholder="0"
-          />
-          <input @blur="blurChange(10 + (indexs - 1) + '63', $event)"
-            v-model="inputData[10 + (indexs - 1) + '63']"
-            @input="change(10 + (indexs - 1) + '63', $event)"
-            type="text"
-            placeholder="0"
-          />
-          <input @blur="blurChange(10 + (indexs - 1) + '64', $event)"
-            v-model="inputData[10 + (indexs - 1) + '64']"
-            @input="change(10 + (indexs - 1) + '64', $event)"
-            type="text"
-            placeholder="0"
-          />
-          <input @blur="blurChange(10 + (indexs - 1) + '65', $event)"
-            v-model="inputData[10 + (indexs - 1) + '65']"
-            @input="change(10 + (indexs - 1) + '65', $event)"
-            type="text"
-            placeholder="0"
-          />
         </div>
         <!-- <div class="btn green">
           <img src="../../assets/image/rotate.png" alt="" />轮模式启用
@@ -176,72 +99,24 @@
       </div>
       <div class="flex-view">
 
-        <div
+        <div @click="(open1 = !open1), change59()" class="open-btn" :class="open1 ? 'active' : ''">
-          @click="(open1 = !open1), change59()"
+          <img v-if="!open1" src="../../assets/image/irrigateSet-icon1.png" alt="" />
-          class="open-btn"
+          <img v-else src="../../assets/image/irrigateSet-icon1-act.png" alt="" />
-          :class="open1 ? 'active' : ''"
-        >
-          <img
-            v-if="!open1"
-            src="../../assets/image/irrigateSet-icon1.png"
-            alt=""
-          />
-          <img
-            v-else
-            src="../../assets/image/irrigateSet-icon1-act.png"
-            alt=""
-          />
           灌溉清水时不启动施肥机
         </div>
-        <div
+        <div @click="(open2 = !open2), change59()" class="open-btn" :class="open2 ? 'active' : ''">
-          @click="(open2 = !open2), change59()"
+          <img v-if="!open2" src="../../assets/image/irrigateSet-icon2.png" alt="" />
-          class="open-btn"
+          <img v-else src="../../assets/image/irrigateSet-icon2-act.png" alt="" />
-          :class="open2 ? 'active' : ''"
-        >
-          <img
-            v-if="!open2"
-            src="../../assets/image/irrigateSet-icon2.png"
-            alt=""
-          />
-          <img
-            v-else
-            src="../../assets/image/irrigateSet-icon2-act.png"
-            alt=""
-          />
           灌溉结束时，清空混液罐
         </div>
-        <div
+        <div @click="(open3 = !open3), change59()" class="open-btn" :class="open3 ? 'active' : ''">
-          @click="(open3 = !open3), change59()"
+          <img v-if="!open3" src="../../assets/image/irrigateSet-icon2.png" alt="" />
-          class="open-btn"
+          <img v-else src="../../assets/image/irrigateSet-icon2-act.png" alt="" />
-          :class="open3 ? 'active' : ''"
-        >
-          <img
-            v-if="!open3"
-            src="../../assets/image/irrigateSet-icon2.png"
-            alt=""
-          />
-          <img
-            v-else
-            src="../../assets/image/irrigateSet-icon2-act.png"
-            alt=""
-          />
           轮灌模式
         </div>
-        <div
+        <div @click="(open4 = !open4), change59()" class="open-btn" :class="open4 ? 'active' : ''">
-          @click="(open4 = !open4), change59()"
+          <img v-if="!open4" src="../../assets/image/irrigateSet-icon0.png" alt="" />
-          class="open-btn"
+          <img v-else src="../../assets/image/irrigateSet-icon0-act.png" alt="" />
-          :class="open4 ? 'active' : ''"
-        >
-          <img
-            v-if="!open4"
-            src="../../assets/image/irrigateSet-icon0.png"
-            alt=""
-          />
-          <img
-            v-else
-            src="../../assets/image/irrigateSet-icon0-act.png"
-            alt=""
-          />
           灌溉清水时不启动进水泵
         </div>
       </div>
@@ -250,13 +125,7 @@
           <span>施肥机自动运行模式选择</span>
           <el-dropdown trigger="click" @command="handleCommand">
             <div class="el-dropdown-link">
-              <input
+              <input type="text" value="选择设定弹窗" v-model="data53" class="input-input" placeholder="无" />
-                type="text"
-                value="选择设定弹窗"
-                v-model="data53"
-                class="input-input"
-                placeholder="无"
-              />
               <div class="arrow">
                 <img src="../../assets/image/arrow.png" alt="" />
               </div>
@@ -273,27 +142,17 @@
       </div>
     </div>
 
-    <el-dialog
+    <el-dialog :modal-append-to-body="false" :show-close="false" :close-on-click-modal="true" :visible.sync="model1"
-      :modal-append-to-body="false"
+      width="440px" :before-close="handleClose1">
-      :show-close="false"
+      <div class="page-title title-302">{{ indexs }}#灌溉组控制参数配置</div>
-      :close-on-click-modal="true"
-      :visible.sync="model1"
-      width="440px"
-      :before-close="handleClose1"
-    >
-      <div class="page-title title-302">1#灌溉组控制参数配置</div>
       <div class="model1-top">
         <div class="btn blue">
           <img src="../../assets/image/play.png" alt="" />时间点启动
         </div>
         <div class="input-main-80">
           <span>每次灌溉时长</span>
-          <input @blur="blurChange10(10 + (indexs - 1) + '06', $event)"
+          <input @blur="blurChange10(10 + (indexs - 1) + '06', $event)" v-model="inputData[10 + (indexs - 1) + '06']"
-            v-model="inputData[10 + (indexs - 1) + '06']"
+            @input="changeData10(10 + (indexs - 1) + '06', $event)" type="number" placeholder="0" />
-            @input="changeData10(10 + (indexs - 1) + '06', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>分</span>
         </div>
       </div>
@@ -303,91 +162,51 @@
           <div>
             <div class="number">1</div>
             <div class="input-main-80">
-              <input @blur="blurChange(10 + (indexs - 1) + '07', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '07', $event)" v-model="inputData[10 + (indexs - 1) + '07']"
-                v-model="inputData[10 + (indexs - 1) + '07']"
+                @input="change(10 + (indexs - 1) + '07', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '07', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '08', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '08', $event)" v-model="inputData[10 + (indexs - 1) + '08']"
-                v-model="inputData[10 + (indexs - 1) + '08']"
+                @input="change(10 + (indexs - 1) + '08', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '08', $event)"
-                type="number"
-                placeholder="0"
-              />
             </div>
           </div>
           <div>
             <div class="number">2</div>
             <div class="input-main-80">
-              <input @blur="blurChange(10 + (indexs - 1) + '09', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '09', $event)" v-model="inputData[10 + (indexs - 1) + '09']"
-                v-model="inputData[10 + (indexs - 1) + '09']"
+                @input="change(10 + (indexs - 1) + '09', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '09', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '10', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '10', $event)" v-model="inputData[10 + (indexs - 1) + '10']"
-                v-model="inputData[10 + (indexs - 1) + '10']"
+                @input="change(10 + (indexs - 1) + '10', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '10', $event)"
-                type="number"
-                placeholder="0"
-              />
             </div>
           </div>
           <div>
             <div class="number">3</div>
             <div class="input-main-80">
-              <input @blur="blurChange(10 + (indexs - 1) + '11', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '11', $event)" v-model="inputData[10 + (indexs - 1) + '11']"
-                v-model="inputData[10 + (indexs - 1) + '11']"
+                @input="change(10 + (indexs - 1) + '11', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '11', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '12', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '12', $event)" v-model="inputData[10 + (indexs - 1) + '12']"
-                v-model="inputData[10 + (indexs - 1) + '12']"
+                @input="change(10 + (indexs - 1) + '12', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '12', $event)"
-                type="number"
-                placeholder="0"
-              />
             </div>
           </div>
           <div>
             <div class="number">4</div>
             <div class="input-main-80">
-              <input @blur="blurChange(10 + (indexs - 1) + '13', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '13', $event)" v-model="inputData[10 + (indexs - 1) + '13']"
-                v-model="inputData[10 + (indexs - 1) + '13']"
+                @input="change(10 + (indexs - 1) + '13', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '13', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '14', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '14', $event)" v-model="inputData[10 + (indexs - 1) + '14']"
-                v-model="inputData[10 + (indexs - 1) + '14']"
+                @input="change(10 + (indexs - 1) + '14', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '14', $event)"
-                type="number"
-                placeholder="0"
-              />
             </div>
           </div>
           <div>
             <div class="number">5</div>
             <div class="input-main-80">
-              <input @blur="blurChange(10 + (indexs - 1) + '15', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '15', $event)" v-model="inputData[10 + (indexs - 1) + '15']"
-                v-model="inputData[10 + (indexs - 1) + '15']"
+                @input="change(10 + (indexs - 1) + '15', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '15', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '16', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '16', $event)" v-model="inputData[10 + (indexs - 1) + '16']"
-                v-model="inputData[10 + (indexs - 1) + '16']"
+                @input="change(10 + (indexs - 1) + '16', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '16', $event)"
-                type="number"
-                placeholder="0"
-              />
             </div>
           </div>
         </div>
@@ -399,27 +218,17 @@
       </div>
     </el-dialog>
 
-    <el-dialog
+    <el-dialog :modal-append-to-body="false" :show-close="false" :close-on-click-modal="true" :visible.sync="model2"
-      :modal-append-to-body="false"
+      width="760px" :before-close="handleClose2">
-      :show-close="false"
+      <div class="page-title title-302">{{ indexs }}#灌溉组控制参数配置</div>
-      :close-on-click-modal="true"
-      :visible.sync="model2"
-      width="760px"
-      :before-close="handleClose2"
-    >
-      <div class="page-title title-302">1#灌溉组控制参数配置</div>
       <div class="model1-top model2-top">
         <div class="btn blue">
           <img src="../../assets/image/play.png" alt="" />间隔启动
         </div>
         <div class="input-main-80">
           <span>每次灌溉时长</span>
-          <input @blur="blurChange10(10 + (indexs - 1) + '17', $event)"
+          <input @blur="blurChange10(10 + (indexs - 1) + '17', $event)" v-model="inputData[10 + (indexs - 1) + '17']"
-            v-model="inputData[10 + (indexs - 1) + '17']"
+            @input="changeData10(10 + (indexs - 1) + '17', $event)" type="number" placeholder="0" />
-            @input="changeData10(10 + (indexs - 1) + '17', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>分</span>
         </div>
       </div>
@@ -429,118 +238,58 @@
           <div>
             <div class="number">1</div>
             <div class="input-main-80">
-              <input @blur="blurChange(10 + (indexs - 1) + '19', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '19', $event)" v-model="inputData[10 + (indexs - 1) + '19']"
-                v-model="inputData[10 + (indexs - 1) + '19']"
+                @input="change(10 + (indexs - 1) + '19', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '19', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '20', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '20', $event)" v-model="inputData[10 + (indexs - 1) + '20']"
-                v-model="inputData[10 + (indexs - 1) + '20']"
+                @input="change(10 + (indexs - 1) + '20', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '20', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>-</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '21', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '21', $event)" v-model="inputData[10 + (indexs - 1) + '21']"
-                v-model="inputData[10 + (indexs - 1) + '21']"
+                @input="change(10 + (indexs - 1) + '21', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '21', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '22', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '22', $event)" v-model="inputData[10 + (indexs - 1) + '22']"
-                v-model="inputData[10 + (indexs - 1) + '22']"
+                @input="change(10 + (indexs - 1) + '22', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '22', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span style="font-size: 16px">时间段里启动次数</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '18', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '18', $event)" v-model="inputData[10 + (indexs - 1) + '18']"
-                v-model="inputData[10 + (indexs - 1) + '18']"
+                @input="change(10 + (indexs - 1) + '18', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '18', $event)"
-                type="number"
-                placeholder="0"
-              />
             </div>
           </div>
           <div>
             <div class="number">2</div>
             <div class="input-main-80">
-              <input @blur="blurChange(10 + (indexs - 1) + '24', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '24', $event)" v-model="inputData[10 + (indexs - 1) + '24']"
-                v-model="inputData[10 + (indexs - 1) + '24']"
+                @input="change(10 + (indexs - 1) + '24', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '24', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '25', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '25', $event)" v-model="inputData[10 + (indexs - 1) + '25']"
-                v-model="inputData[10 + (indexs - 1) + '25']"
+                @input="change(10 + (indexs - 1) + '25', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '25', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>-</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '26', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '26', $event)" v-model="inputData[10 + (indexs - 1) + '26']"
-                v-model="inputData[10 + (indexs - 1) + '26']"
+                @input="change(10 + (indexs - 1) + '26', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '26', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '27', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '27', $event)" v-model="inputData[10 + (indexs - 1) + '27']"
-                v-model="inputData[10 + (indexs - 1) + '27']"
+                @input="change(10 + (indexs - 1) + '27', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '27', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span style="font-size: 16px">时间段里启动次数</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '23', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '23', $event)" v-model="inputData[10 + (indexs - 1) + '23']"
-                v-model="inputData[10 + (indexs - 1) + '23']"
+                @input="change(10 + (indexs - 1) + '23', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '23', $event)"
-                type="number"
-                placeholder="0"
-              />
             </div>
           </div>
           <div>
             <div class="number">3</div>
             <div class="input-main-80">
-              <input @blur="blurChange(10 + (indexs - 1) + '29', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '29', $event)" v-model="inputData[10 + (indexs - 1) + '29']"
-                v-model="inputData[10 + (indexs - 1) + '29']"
+                @input="change(10 + (indexs - 1) + '29', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '29', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '30', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '30', $event)" v-model="inputData[10 + (indexs - 1) + '30']"
-                v-model="inputData[10 + (indexs - 1) + '30']"
+                @input="change(10 + (indexs - 1) + '30', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '30', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>-</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '31', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '31', $event)" v-model="inputData[10 + (indexs - 1) + '31']"
-                v-model="inputData[10 + (indexs - 1) + '31']"
+                @input="change(10 + (indexs - 1) + '31', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '31', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '32', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '32', $event)" v-model="inputData[10 + (indexs - 1) + '32']"
-                v-model="inputData[10 + (indexs - 1) + '32']"
+                @input="change(10 + (indexs - 1) + '32', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '32', $event)"
-                type="number"
-                placeholder="0"
-              />
               <span style="font-size: 16px">时间段里启动次数</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '28', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '28', $event)" v-model="inputData[10 + (indexs - 1) + '28']"
-                v-model="inputData[10 + (indexs - 1) + '28']"
+                @input="change(10 + (indexs - 1) + '28', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '28', $event)"
-                type="number"
-                placeholder="0"
-              />
             </div>
           </div>
         </div>
@@ -552,98 +301,56 @@
       </div>
     </el-dialog>
 
-    <el-dialog
+    <el-dialog :modal-append-to-body="false" :show-close="false" :close-on-click-modal="true" :visible.sync="model3"
-      :modal-append-to-body="false"
+      width="760px" :before-close="handleClose3">
-      :show-close="false"
+      <div class="page-title title-302">{{ indexs }}#灌溉组控制参数配置</div>
-      :close-on-click-modal="true"
-      :visible.sync="model3"
-      width="760px"
-      :before-close="handleClose3"
-    >
-      <div class="page-title title-302">1#灌溉组控制参数配置</div>
       <div class="model1-top model3-top">
         <div class="btn blue">
           <img src="../../assets/image/model3-icon.png" alt="" />光积累启动
         </div>
         <div class="input-main-80">
           <span>有效检测时间段</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '45', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '45', $event)" v-model="inputData[10 + (indexs - 1) + '45']"
-            v-model="inputData[10 + (indexs - 1) + '45']"
+            @input="change(10 + (indexs - 1) + '45', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '45', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>:</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '46', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '46', $event)" v-model="inputData[10 + (indexs - 1) + '46']"
-            v-model="inputData[10 + (indexs - 1) + '46']"
+            @input="change(10 + (indexs - 1) + '46', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '46', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>-</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '47', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '47', $event)" v-model="inputData[10 + (indexs - 1) + '47']"
-            v-model="inputData[10 + (indexs - 1) + '47']"
+            @input="change(10 + (indexs - 1) + '47', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '47', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>:</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '48', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '48', $event)" v-model="inputData[10 + (indexs - 1) + '48']"
-            v-model="inputData[10 + (indexs - 1) + '48']"
+            @input="change(10 + (indexs - 1) + '48', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '48', $event)"
-            type="number"
-            placeholder="0"
-          />
         </div>
       </div>
       <div class="model1-bottom model3-bottom">
         <div class="model1-content model3-content">
           <div class="input-main-80">
             <span class="text">启动时灌湛时长</span>
-            <input @blur="blurChange10(10 + (indexs - 1) + '40', $event)"
+            <input @blur="blurChange10(10 + (indexs - 1) + '40', $event)" v-model="inputData[10 + (indexs - 1) + '40']"
-              v-model="inputData[10 + (indexs - 1) + '40']"
+              @input="changeData10(10 + (indexs - 1) + '40', $event)" type="number" placeholder="0" />
-              @input="changeData10(10 + (indexs - 1) + '40', $event)"
-              type="number"
-              placeholder="0"
-            />
             <span class="text">分</span>
           </div>
           <div class="input-main-80">
             <span class="text">光积累启动值</span>
-            <input @blur="blurChange(10 + (indexs - 1) + '41', $event)"
+            <input @blur="blurChange(10 + (indexs - 1) + '41', $event)" v-model="inputData[10 + (indexs - 1) + '41']"
-              v-model="inputData[10 + (indexs - 1) + '41']"
+              @input="change(10 + (indexs - 1) + '41', $event)" type="number" placeholder="0" />
-              @input="change(10 + (indexs - 1) + '41', $event)"
-              type="number"
-              placeholder="0"
-            />
           </div>
           <div class="input-main-80">
             <span class="text">最小光照值</span>
-            <input @blur="blurChange(10 + (indexs - 1) + '42', $event)"
+            <input @blur="blurChange(10 + (indexs - 1) + '42', $event)" v-model="inputData[10 + (indexs - 1) + '42']"
-              v-model="inputData[10 + (indexs - 1) + '42']"
+              @input="change(10 + (indexs - 1) + '42', $event)" type="number" placeholder="0" />
-              @input="change(10 + (indexs - 1) + '42', $event)"
-              type="number"
-              placeholder="0"
-            />
             <span class="text">Klux</span>
           </div>
           <div class="input-main-80">
             <span class="text" style="padding-left: 20px">最短灌溉间隔</span>
-            <input @blur="blurChange10(10 + (indexs - 1) + '43', $event)"
+            <input @blur="blurChange10(10 + (indexs - 1) + '43', $event)" v-model="inputData[10 + (indexs - 1) + '43']"
-              v-model="inputData[10 + (indexs - 1) + '43']"
+              @input="changeData10(10 + (indexs - 1) + '43', $event)" type="number" placeholder="0" />
-              @input="changeData10(10 + (indexs - 1) + '43', $event)"
-              type="number"
-              placeholder="0"
-            />
           </div>
           <div class="input-main-80">
             <span class="text">最长灌溉间隔</span>
-            <input @blur="blurChange10(10 + (indexs - 1) + '44', $event)"
+            <input @blur="blurChange10(10 + (indexs - 1) + '44', $event)" v-model="inputData[10 + (indexs - 1) + '44']"
-              v-model="inputData[10 + (indexs - 1) + '44']"
+              @input="changeData10(10 + (indexs - 1) + '44', $event)" type="number" placeholder="0" />
-              @input="changeData10(10 + (indexs - 1) + '44', $event)"
-              type="number"
-              placeholder="0"
-            />
           </div>
         </div>
       </div>
@@ -654,80 +361,46 @@
       </div>
     </el-dialog>
 
-    <el-dialog
+    <el-dialog :modal-append-to-body="false" :show-close="false" :close-on-click-modal="true" :visible.sync="model5"
-      :modal-append-to-body="false"
+      width="760px" :before-close="handleClose5">
-      :show-close="false"
+      <div class="page-title title-302">{{ indexs }}#灌溉组控制参数配置</div>
-      :close-on-click-modal="true"
-      :visible.sync="model5"
-      width="760px"
-      :before-close="handleClose5"
-    >
-      <div class="page-title title-302">1#灌溉组控制参数配置</div>
       <div class="model1-top model3-top">
         <div class="btn blue">
           <img src="../../assets/image/model3-icon.png" alt="" />土壤传感器
         </div>
         <div class="input-main-80">
           <span>有效检测时间段</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '33', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '33', $event)" v-model="inputData[10 + (indexs - 1) + '33']"
-            v-model="inputData[10 + (indexs - 1) + '33']"
+            @input="change(10 + (indexs - 1) + '33', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '33', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>:</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '34', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '34', $event)" v-model="inputData[10 + (indexs - 1) + '34']"
-            v-model="inputData[10 + (indexs - 1) + '34']"
+            @input="change(10 + (indexs - 1) + '34', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '34', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>-</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '35', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '35', $event)" v-model="inputData[10 + (indexs - 1) + '35']"
-            v-model="inputData[10 + (indexs - 1) + '35']"
+            @input="change(10 + (indexs - 1) + '35', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '35', $event)"
-            type="number"
-            placeholder="0"
-          />
           <span>:</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '36', $event)"
+          <input @blur="blurChange(10 + (indexs - 1) + '36', $event)" v-model="inputData[10 + (indexs - 1) + '36']"
-            v-model="inputData[10 + (indexs - 1) + '36']"
+            @input="change(10 + (indexs - 1) + '36', $event)" type="number" placeholder="0" />
-            @input="change(10 + (indexs - 1) + '36', $event)"
-            type="number"
-            placeholder="0"
-          />
         </div>
       </div>
       <div class="model1-bottom model3-bottom">
         <div class="model1-content model3-content">
           <div class="input-main-80">
             <span class="text">最低土壤湿度</span>
-            <input @blur="blurChange(10 + (indexs - 1) + '37', $event)"
+            <input @blur="blurChange(10 + (indexs - 1) + '37', $event)" v-model="inputData[10 + (indexs - 1) + '37']"
-              v-model="inputData[10 + (indexs - 1) + '37']"
+              @input="change(10 + (indexs - 1) + '37', $event)" type="number" placeholder="0" />
-              @input="change(10 + (indexs - 1) + '37', $event)"
-              type="number"
-              placeholder="0"
-            />
             <span class="text">%</span>
           </div>
           <div class="input-main-80">
             <span class="text">最高土壤湿度</span>
-            <input @blur="blurChange(10 + (indexs - 1) + '38', $event)"
+            <input @blur="blurChange(10 + (indexs - 1) + '38', $event)" v-model="inputData[10 + (indexs - 1) + '38']"
-              v-model="inputData[10 + (indexs - 1) + '38']"
+              @input="change(10 + (indexs - 1) + '38', $event)" type="number" placeholder="0" />
-              @input="change(10 + (indexs - 1) + '38', $event)"
-              type="number"
-              placeholder="0"
-            />
             <span class="text">%</span>
           </div>
           <div class="input-main-80">
             <span class="text">灌溉时长上限</span>
-            <input @blur="blurChange10(10 + (indexs - 1) + '39', $event)"
+            <input @blur="blurChange10(10 + (indexs - 1) + '39', $event)" v-model="inputData[10 + (indexs - 1) + '39']"
-              v-model="inputData[10 + (indexs - 1) + '39']"
+              @input="changeData10(10 + (indexs - 1) + '39', $event)" type="number" placeholder="0" />
-              @input="changeData10(10 + (indexs - 1) + '39', $event)"
-              type="number"
-              placeholder="0"
-            />
             <span class="text">分</span>
           </div>
         </div>
@@ -738,15 +411,9 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog
+    <el-dialog :modal-append-to-body="false" :show-close="false" :close-on-click-modal="true" :visible.sync="model4"
-      :modal-append-to-body="false"
+      width="560px" :before-close="handleClose4">
-      :show-close="false"
+      <div class="page-title title-302">{{ indexs }}#灌溉组控制参数配置</div>
-      :close-on-click-modal="true"
-      :visible.sync="model4"
-      width="460px"
-      :before-close="handleClose4"
-    >
-      <div class="page-title title-302">1#灌溉组控制参数配置</div>
       <div class="model1-top model4-top">
         <div class="btn blue" @click="model4 = true">
           <img src="../../assets/image/model4-icon.png" alt="" />外控模式
@@ -756,28 +423,36 @@
             <div class="number">1</div>
             <div class="input-main-80">
               <span>外部输入通道</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '49', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '49', $event)" v-model="inputData[10 + (indexs - 1) + '49']"
-                v-model="inputData[10 + (indexs - 1) + '49']"
+                @input="change(10 + (indexs - 1) + '49', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '49', $event)"
-                type="number"
-                placeholder="0"
-              />
             </div>
           </div>
           <div>
             <div class="number">2</div>
             <div class="input-main-80">
               <span>外部输入通道</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '50', $event)"
+              <input @blur="blurChange(10 + (indexs - 1) + '50', $event)" v-model="inputData[10 + (indexs - 1) + '50']"
-                v-model="inputData[10 + (indexs - 1) + '50']"
+                @input="change(10 + (indexs - 1) + '50', $event)" type="number" placeholder="0" />
-                @input="change(10 + (indexs - 1) + '50', $event)"
-                type="number"
-                placeholder="0"
-              />
             </div>
           </div>
         </div>
       </div>
+      <div>
+        <div class="input-main-80">
+          <span>有效时间：</span>
+          <input @blur="blurChange(10 + (indexs - 1) + '67', $event)" v-model="inputData[10 + (indexs - 1) + '67']"
+            @input="change(10 + (indexs - 1) + '67', $event)" type="number" placeholder="0" />
+          <span>:</span>
+          <input @blur="blurChange(10 + (indexs - 1) + '68', $event)" v-model="inputData[10 + (indexs - 1) + '68']"
+            @input="change(10 + (indexs - 1) + '68', $event)" type="number" placeholder="0" />
+            <span>--</span>
+            <input @blur="blurChange(10 + (indexs - 1) + '69', $event)" v-model="inputData[10 + (indexs - 1) + '69']"
+            @input="change(10 + (indexs - 1) + '69', $event)" type="number" placeholder="0" />
+            <span>:</span>
+            <input @blur="blurChange(10 + (indexs - 1) + '70', $event)" v-model="inputData[10 + (indexs - 1) + '70']"
+            @input="change(10 + (indexs - 1) + '70', $event)" type="number" placeholder="0" />
+        </div>
+      </div>
       <div class="model-return">
         <div @click="model4 = false" class="btn green">
           <img src="../../assets/image/return.png" alt="" />返回
@@ -1158,4 +833,3 @@ export default {
 };
 </script>
 <style lang="scss"></style>
-    

src/views/page/realTime.vue

@@ -258,7 +258,7 @@
             || item.type == 13 || item.type == 14 || item.type == 15 || item.type == 16">
                                 <div class="status-true-text-left">{{ getNumberStatus(item) }}</div>
                                 <div class="status-true-text-right"
-                                    v-if="item.type == 6 || item.type == 5 || item.type == 2 || item.type == 15 || item.type == 14 || item.type == 13 || item.type == 12">
+                                    v-if="item.type == 6 || item.type == 5 || item.type == 2 || item.type == 15|| item.type == 16 || item.type == 14 || item.type == 13 || item.type == 12">
                                     {{ item.progress }}%</div>
                             </div>