diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 118ec505..8d3d34b7 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -868,6 +868,28 @@ textarea {
   padding-top: 31px;
 }
 
+.manage-radio {
+  display: flex;
+  align-items: center;
+  margin-bottom: 15px;
+  height: 30px;
+  color: #fff;
+}
+
+.manage-radio .radio-label {
+  margin-right: 5px;
+  width: 160px;
+}
+
+.manage-radio .el-radio {
+  margin-right: 5px;
+}
+
+.manage-radio .el-radio__label {
+  padding-left: 5px;
+  color: #fff;
+}
+
 .input-main-60 {
   width: 100%;
   flex-wrap: wrap;
@@ -1436,6 +1458,22 @@ textarea {
   color: #00C0F7;
 }
 
+.circle.number {
+  width: 30px !important;
+  margin-right: 10px;
+  height: 30px;
+  background: #0294E2;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.irrigateSet {
+  color: #fff;
+}
+
 .irrigateSet .open-btn {
   width: 300px;
   height: 54px;
@@ -1826,7 +1864,7 @@ textarea {
   justify-content: flex-end;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top {
+.model1-top {
   padding: 20px 15px;
   border-bottom: 1px solid rgba(0, 180, 255, 0.35);
   display: flex;
@@ -1834,53 +1872,53 @@ textarea {
   justify-content: space-between;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top.model2-top {
+.model1-top.model2-top {
   justify-content: flex-start;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top.model3-top .btn {
+.model1-top.model3-top .btn {
   padding: 0 10px;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top.model3-top .btn img {
+.model1-top.model3-top .btn img {
   width: 26px;
   height: 22px;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top.model4-top {
+.model1-top.model4-top {
   align-items: flex-start;
   padding: 20px 0 0;
   justify-content: flex-start;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top.model4-top .btn {
+.model1-top.model4-top .btn {
   padding: 0 10px;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top.model4-top .btn img {
+.model1-top.model4-top .btn img {
   width: 22px;
   height: 24px;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top.model4-top .model-left {
+.model1-top.model4-top .model-left {
   display: flex;
   align-items: center;
   height: 54px;
   margin-right: 10px;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top .btn img {
+.model1-top .btn img {
   width: 10px;
   height: 14px;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top .model-right > div {
+.model1-top .model-right > div {
   display: flex;
   align-items: center;
   margin-bottom: 20px;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top .model-right > div .number {
+.model1-top .model-right > div .number {
   width: 30px;
   margin-right: 10px;
   height: 30px;
@@ -1891,27 +1929,31 @@ textarea {
   justify-content: center;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-top .model-right > div .input-main-60 {
+.model1-top .model-right > div .input-main-60 {
   width: auto;
   color: #fff;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-bottom {
+.model1-bottom {
   padding: 20px 15px;
   border-bottom: 1px solid rgba(0, 180, 255, 0.35);
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-bottom.model3-bottom .title {
+.model1-bottom .title, .model1-bottom .number {
+  color: #fff;
+}
+
+.model1-bottom.model3-bottom .title {
   padding: 0 4px;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-bottom .model1-content > div {
+.model1-bottom .model1-content > div {
   display: flex;
   align-items: center;
   padding: 10px 0;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-bottom .model1-content > div .number {
+.model1-bottom .model1-content > div .number {
   width: 30px;
   margin-right: 10px;
   height: 30px;
@@ -1922,25 +1964,24 @@ textarea {
   justify-content: center;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-bottom .model1-content .input-main-60 span {
+.model1-bottom .model1-content .input-main-60 span {
   font-size: 20px;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-bottom .model1-content .input-main-60 span.text {
+.model1-bottom .model1-content .input-main-60 span.text {
   font-size: 16px;
   padding: 0 4px;
   flex-shrink: 0;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-bottom .model1-content.model3-content {
+.model1-bottom .model1-content.model3-content {
   display: flex;
   align-items: center;
   flex-wrap: wrap;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-bottom .model1-content.model3-content > div {
+.model1-bottom .model1-content.model3-content > div {
   display: block;
-  width: calc(100% / 3);
   flex-shrink: 0;
 }
 
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index a541f5e7..195fbaaa 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -922,7 +922,26 @@ textarea {
 .p-t-31 {
     padding-top: 31px;
 }
-
+.manage-radio{
+    display: flex;
+    align-items: center;
+    margin-bottom:15px ;
+    height: 30px;
+    color: #fff;
+    
+    .radio-label{
+        // font-size: 14px;
+        margin-right: 5px;
+        width: 160px;
+    }
+    .el-radio{
+        margin-right: 5px;
+    }
+    .el-radio__label{
+        padding-left: 5px;
+        color: #fff;
+    }
+}
 
 .input-main-60 {
     width: 100%;
@@ -1504,10 +1523,23 @@ textarea {
         color: #00C0F7;
     }
 }
+.circle{
+    &.number{
+            width: 30px!important;
+            margin-right: 10px;
+            height: 30px;
+            background: #0294E2;
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex-shrink: 0;
 
+    }
+}
 .irrigateSet {
 
-
+    color: #fff;
     .open-btn {
         width: 300px;
         height: 54px;
@@ -1922,145 +1954,147 @@ textarea {
                 justify-content: flex-end;
             }
 
-            .model1-top {
-                padding: 20px 15px;
-                border-bottom: 1px solid rgba(0, 180, 255, 0.35);
+          
+        }
+    }
+}
+
+.model1-top {
+    padding: 20px 15px;
+    border-bottom: 1px solid rgba(0, 180, 255, 0.35);
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    &.model2-top {
+        justify-content: flex-start;
+    }
+
+    &.model3-top {
+        .btn {
+            padding: 0 10px;
+
+            img {
+                width: 26px;
+                height: 22px;
+            }
+        }
+    }
+
+    &.model4-top {
+        align-items: flex-start;
+        padding: 20px 0 0;
+        justify-content: flex-start;
+
+        .btn {
+            padding: 0 10px;
+
+            img {
+                width: 22px;
+                height: 24px;
+            }
+        }
+
+        .model-left {
+            display: flex;
+            align-items: center;
+            height: 54px;
+            margin-right: 10px;
+        }
+    }
+
+    .btn {
+        img {
+            width: 10px;
+            height: 14px;
+        }
+    }
+
+    .model-right {
+        >div {
+            display: flex;
+            align-items: center;
+            margin-bottom: 20px;
+
+            .number {
+                width: 30px;
+                margin-right: 10px;
+                height: 30px;
+                background: #0294E2;
+                border-radius: 50%;
                 display: flex;
                 align-items: center;
-                justify-content: space-between;
+                justify-content: center;
 
-                &.model2-top {
-                    justify-content: flex-start;
-                }
-
-                &.model3-top {
-                    .btn {
-                        padding: 0 10px;
-
-                        img {
-                            width: 26px;
-                            height: 22px;
-                        }
-                    }
-                }
-
-                &.model4-top {
-                    align-items: flex-start;
-                    padding: 20px 0 0;
-                    justify-content: flex-start;
-
-                    .btn {
-                        padding: 0 10px;
-
-                        img {
-                            width: 22px;
-                            height: 24px;
-                        }
-                    }
-
-                    .model-left {
-                        display: flex;
-                        align-items: center;
-                        height: 54px;
-                        margin-right: 10px;
-                    }
-                }
-
-                .btn {
-                    img {
-                        width: 10px;
-                        height: 14px;
-                    }
-                }
-
-                .model-right {
-                    >div {
-                        display: flex;
-                        align-items: center;
-                        margin-bottom: 20px;
-
-                        .number {
-                            width: 30px;
-                            margin-right: 10px;
-                            height: 30px;
-                            background: #0294E2;
-                            border-radius: 50%;
-                            display: flex;
-                            align-items: center;
-                            justify-content: center;
-
-                        }
-
-                        .input-main-60 {
-                            width: auto;
-                            color: #fff;
-                        }
-                    }
-                }
             }
 
-            .model1-bottom {
-                padding: 20px 15px;
-                border-bottom: 1px solid rgba(0, 180, 255, 0.35);
-
-                &.model3-bottom {
-                    .title {
-                        padding: 0 4px;
-                    }
-                }
-
-                .model1-content {
-                    >div {
-                        display: flex;
-                        align-items: center;
-                        padding: 10px 0;
-
-                        .number {
-                            width: 30px;
-                            margin-right: 10px;
-                            height: 30px;
-                            background: #0294E2;
-                            border-radius: 50%;
-                            display: flex;
-                            align-items: center;
-                            justify-content: center;
-
-                        }
-
-                    }
-
-                    .input-main-60 {
-
-                        span {
-                            font-size: 20px;
-
-                            &.text {
-                                font-size: 16px;
-                                padding: 0 4px;
-                                flex-shrink: 0;
-                            }
-                        }
-
-                    }
-
-                    &.model3-content {
-                        display: flex;
-                        align-items: center;
-                        flex-wrap: wrap;
-
-                        >div {
-                            display: block;
-                            width: calc(100% / 3);
-                            flex-shrink: 0;
-                        }
-                    }
-                }
+            .input-main-60 {
+                width: auto;
+                color: #fff;
             }
         }
     }
 }
 
+.model1-bottom {
+    padding: 20px 15px;
+    border-bottom: 1px solid rgba(0, 180, 255, 0.35);
+    .title,.number{
+        color: #fff;
+    }
+    &.model3-bottom {
+        .title {
+            padding: 0 4px;
+        }
+    }
 
+    .model1-content {
+        >div {
+            display: flex;
+            align-items: center;
+            padding: 10px 0;
+
+            .number {
+                width: 30px;
+                margin-right: 10px;
+                height: 30px;
+                background: #0294E2;
+                border-radius: 50%;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+            }
+
+        }
+
+        .input-main-60 {
+
+            span {
+                font-size: 20px;
+
+                &.text {
+                    font-size: 16px;
+                    padding: 0 4px;
+                    flex-shrink: 0;
+                }
+            }
+
+        }
+
+        &.model3-content {
+            display: flex;
+            align-items: center;
+            flex-wrap: wrap;
+
+            >div {
+                display: block;
+                // width: calc(100% / 3);
+                flex-shrink: 0;
+            }
+        }
+    }
+}
 .login {
     color: #fff;
 
diff --git a/src/assets/image/right-view3new.png b/src/assets/image/right-view3new.png
new file mode 100644
index 00000000..ab4cb3db
Binary files /dev/null and b/src/assets/image/right-view3new.png differ
diff --git a/src/assets/image/right-view3new2.png b/src/assets/image/right-view3new2.png
new file mode 100644
index 00000000..10efe538
Binary files /dev/null and b/src/assets/image/right-view3new2.png differ
diff --git a/src/components/setParams.vue b/src/components/setParams.vue
index 0cc813a9..36fdea94 100644
--- a/src/components/setParams.vue
+++ b/src/components/setParams.vue
@@ -26,7 +26,7 @@
                         </li>
                     </ul>
                 </el-collapse-item>
-                <div @click="toRouter(item)" :class="routerNow == item.router ? 'active' : ''" class="no-list" v-else>{{
+                <div @click="toRouter(item)" :key="index" :class="routerNow == item.router ? 'active' : ''" class="no-list" v-else>{{
                     item.name
                 }}</div>
             </template>
@@ -46,11 +46,13 @@ export default {
     watch: {
         "$route"(newName, oldName) {
             this.gerRouter();
+            
         }, 
 
         '$store.state.equipmentIndex': function (newValue, oldValue) {
       const that = this;
     this.getByid()
+       this.initRouterList()
     },
          '$i18n.locale'() {
     this.initRouterList()
@@ -65,6 +67,7 @@ export default {
     },
     methods: {
         initRouterList(){
+            
             this.routerList=[
                 { name:  this.$t('setParams.formulaSettings'), list: [], router: 'formula' },
                 {
@@ -72,6 +75,40 @@ export default {
           name,
           status: -1,
           router: 'irrigateSet',
+          index: index + 1
+           }))
+                },
+                { name: this.$t('setParams.mixing'), list: [], router: 'stir', isRouter: true, },
+                { name: this.$t('setParams.internalPIDConfig'), list: [], router: 'PIDSet', isRouter: true, },
+                { name:this.$t('setParams.systemParamsConfig'), list: [], router: 'systemSet', isRouter: true, },
+                { name: this.$t('setParams.sensorChannelConfig'), list: [], router: 'sensorSet', isRouter: true, },
+                { name: this.$t('setParams.dataUpload'), list: [], router: 'upload', isRouter: true, },]
+                var store = this.$store.state
+                // 有无搅拌
+            if(store.equipmentList[store.equipmentIndex - 1].fertilizerType==1){
+                  this.routerList=[
+                { name:  this.$t('setParams.formulaSettings'), list: [], router: 'formula' },
+                {
+                    name:this.$t('setParams.irrigationGroupConfig'), router: 'irrigateSet', list:  this.$t('setParams.irrigationGroups').map((name, index) => ({
+          name,
+          status: -1,
+          router: 'irrigateSet',
+          index: index + 1
+           }))
+                },
+                { name: this.$t('setParams.mixing'), list: [], router: 'stir', isRouter: true, },
+                { name: this.$t('setParams.internalPIDConfig'), list: [], router: 'PIDSet', isRouter: true, },
+                { name:this.$t('setParams.systemParamsConfig'), list: [], router: 'systemSet', isRouter: true, },
+                { name: this.$t('setParams.sensorChannelConfig'), list: [], router: 'sensorSet', isRouter: true, },
+                { name: this.$t('setParams.dataUpload'), list: [], router: 'upload', isRouter: true, },]
+            }else{
+                     this.routerList=[
+                { name:  this.$t('setParams.formulaSettings'), list: [], router: 'formula' },
+                {
+                    name:this.$t('setParams.irrigationGroupConfig'), router: 'irrigateSet', list:  this.$t('setParams.irrigationGroups').map((name, index) => ({
+          name,
+          status: -1,
+          router: 'irrigateSet',
           index: index + 1
            }))
                 },
@@ -79,6 +116,7 @@ export default {
                 { name:this.$t('setParams.systemParamsConfig'), list: [], router: 'systemSet', isRouter: true, },
                 { name: this.$t('setParams.sensorChannelConfig'), list: [], router: 'sensorSet', isRouter: true, },
                 { name: this.$t('setParams.dataUpload'), list: [], router: 'upload', isRouter: true, },]
+            }
             setTimeout(() => {
                   this.getList()
             }, 0);
diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js
index 8f38e31e..1958c71a 100644
--- a/src/i18n/lang/en.js
+++ b/src/i18n/lang/en.js
@@ -235,6 +235,7 @@ module.exports = {
     irrigationGroupConfig: 'Irrigation Group Configuration',
     intrinsicParams: 'Intrinsic Parameters',
     internalPIDConfig: 'Internal PID Configuration',
+    mixing: 'Mixing program',
     systemParamsConfig: 'System Parameters Configuration',
     sensorChannelConfig: 'Sensor Channel Configuration',
     dataUpload: 'Data Upload',
@@ -1180,6 +1181,7 @@ module.exports = {
       "e": "E",
       "f": "F",
       "g": "G",
+      "h": "H",
       "acid": "Acid",
       "acidFertilizer": "Acid"
     },
diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js
index 491c41d8..5c0122b9 100644
--- a/src/i18n/lang/zh.js
+++ b/src/i18n/lang/zh.js
@@ -242,6 +242,7 @@ module.exports = {
     irrigationGroupConfig: '灌溉组配置',
     intrinsicParams: '固有参数',
     internalPIDConfig: '厂家内部PID配置',
+    mixing: '搅拌配置',
     systemParamsConfig: '系统参数配置',
     sensorChannelConfig: '传感器通道配置',
     dataUpload: '数据上传',
@@ -1178,7 +1179,7 @@ module.exports = {
     "executingGroup": "执行灌溉组号",
     "fertilizerPump": "配肥泵",
 
-    "fertilizerIntensity": "配肥强度",
+    "fertilizerIntensity": "配肥",
     "targetPH": "目标PH",
     "measuredPH": "实测PH",
     "measuredEC": "实测EC",
@@ -1190,7 +1191,7 @@ module.exports = {
     "value": "数值",
     "adValue": "AD值",
 
-    "fertilizationSpeed": "配肥速度",
+    "fertilizationSpeed": "搅拌",
     "fertilizerTypes": {
       "a": "A肥",
       "b": "B肥",
@@ -1199,6 +1200,7 @@ module.exports = {
       "e": "E肥",
       "f": "F肥",
       "g": "G肥",
+      "h": "H肥",
       "acid": "酸",
       "acidFertilizer": "酸肥"
     },
diff --git a/src/router/index.js b/src/router/index.js
index 648de555..3c247d89 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,6 +5,7 @@ import index from '../views/index.vue'
 import login from '../views/login.vue'
 import control from '../views/control.vue'
 import soil from '../views/soil.vue'
+import fertilizer from '../views/fertilizer.vue'
 Vue.use(VueRouter)
 
 const routes = [
@@ -71,10 +72,6 @@ const routes = [
       path: '/realTime',
       name: 'realTime',
       component: () => import('../views/page/realTime.vue')
-    },{
-      path: '/formula',
-      name: 'formula',
-      component: () => import('../views/page/formula.vue')
     },{
       path: '/historyData',
       name: 'historyData',
@@ -87,26 +84,6 @@ const routes = [
       path: '/videoMonitoring',
       name: 'videoMonitoring',
       component: () => import('../views/page/videoMonitoring.vue')
-    },{
-      path: '/irrigateSet',
-      name: 'irrigateSet',
-      component: () => import('../views/page/irrigateSet.vue')
-    },{
-      path: '/PIDSet',
-      name: 'PIDSet',
-      component: () => import('../views/page/PIDSet.vue')
-    },{
-      path: '/systemSet',
-      name: 'systemSet',
-      component: () => import('../views/page/systemSet.vue')
-    },{
-      path: '/upload',
-      name: 'upload',
-      component: () => import('../views/page/upload.vue')
-    },{
-      path: '/sensorSet',
-      name: 'sensorSet',
-      component: () => import('../views/page/sensorSet.vue')
     },{
       path: '/dataAnalysis',
       name: 'dataAnalysis',
@@ -198,7 +175,41 @@ const routes = [
     },
     ]
     }, 
-   
+    {
+      path: '/fertilizer',
+      name: 'fertilizer',
+      component: fertilizer, 
+      redirect: '/irrigateSet',
+      children: [{
+        path: '/formula',
+        name: 'formula',
+        component: () => import('../views/page/formula.vue')
+      },{
+        path: '/irrigateSet',
+        name: 'irrigateSet',
+        component: () => import('../views/page/irrigateSet.vue')
+      },{
+        path: '/PIDSet',
+        name: 'PIDSet',
+        component: () => import('../views/page/PIDSet.vue')
+      },{
+        path: '/systemSet',
+        name: 'systemSet',
+        component: () => import('../views/page/systemSet.vue')
+      },{
+        path: '/upload',
+        name: 'upload',
+        component: () => import('../views/page/upload.vue')
+      },{
+        path: '/sensorSet',
+        name: 'sensorSet',
+        component: () => import('../views/page/sensorSet.vue')
+      },{
+        path: '/stir',
+        name: 'stir',
+        component: () => import('../views/page/stir.vue')
+      },]
+    },
      {
       path: '/control',
       name: 'control',
diff --git a/src/views/fertilizer.vue b/src/views/fertilizer.vue
new file mode 100644
index 00000000..c78b1ae2
--- /dev/null
+++ b/src/views/fertilizer.vue
@@ -0,0 +1,28 @@
+<template>
+  <div class="formula control">
+    <setParams></setParams>
+    <div class="page-content">
+      <router-view></router-view>
+    </div>
+  </div>
+</template>
+  <script>
+import setParams from "../components/setParams.vue";
+export default {
+  components: {
+    setParams,
+  },
+  // 当控制器整体页面关闭时 清楚控制器数据
+  beforeDestroy() {
+    var store = this.$store.state;
+    // store.ControlData = null;
+  },
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+  <style lang="scss">
+</style>
\ No newline at end of file
diff --git a/src/views/index.vue b/src/views/index.vue
index 9f64c286..f6bb19ef 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -262,7 +262,7 @@ export default {
                 { name: this.$t('index.home'), img: require('../assets/image/index-icon.png'), list: [], router: 'realTime', isRouter: true, },
                 { name: this.$t('index.greenhouse'), routerList: ['realTime', 'dataAnalysis', 'historyData','air-conditioning', 'exitSettings','heatFan', 'videoMonitoring','imageData', 'skylight', 'control', 'systemSet-con', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img0.png'), list: [] },
                 // { name: '二号温室', img: require('../assets/image/left-img1.png'), list: [] },
-                { name: this.$t('index.fertigation'), routerList: ['status-soil','formula', 'dataAnalysis', 'historyData', 'irrigateSet', 'videoMonitoring','imageData', 'PIDSet', 'systemSet', 'upload', 'sensorSet', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/left-img2.png'), list: [] },
+                { name: this.$t('index.fertigation'), routerList: ['status-soil','stir','formula', 'dataAnalysis', 'historyData', 'irrigateSet', 'videoMonitoring','imageData', 'PIDSet', 'systemSet', 'upload', 'sensorSet', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/left-img2.png'), list: [] },
                 { name:this.$t('index.smartIrrigation') , routerList: ['realTime', 'dataAnalysis', 'historyData','irrigateSet-soil', 'videoMonitoring','imageData','PIDSet-soil', 'systemSet-soil', 'upload-soil', 'sensorSet-soil', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/irrigateSet-icon1-act.png'), list: [] },
                   { name:this.$t('index.dataCollector') , routerList: ['realTime', 'historyData', 'exitSettings', 'skylight', 'control', 'systemSet-con','imageData', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img3.png'), list: [] },
                 { name:this.$t('index.weatherStation') , routerList: ['realTime', 'historyData', 'exitSettings', 'skylight', 'control', 'systemSet-con','imageData', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img3.png'), list: [] },
diff --git a/src/views/manage/deviceInfoManage.vue b/src/views/manage/deviceInfoManage.vue
index 9c174524..ffe82d48 100644
--- a/src/views/manage/deviceInfoManage.vue
+++ b/src/views/manage/deviceInfoManage.vue
@@ -212,6 +212,16 @@
             <input ref="fileInput" type="file" :multiple="false" id="sel-img" accept="image/*"
               @change="handleImageChange($event, 0)" />
           </div>
+          <div class="manage-radio">
+            <div class="radio-label">是否有自动搅拌功能</div>
+
+            <el-radio v-model="nowData.fertilizerType" :label="1"
+              >开启</el-radio
+            >
+            <el-radio v-model="nowData.fertilizerType" :label="0"
+              >关闭</el-radio
+            >
+          </div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -495,8 +505,20 @@ export default {
   // },
   mounted() { this.dataInit() },
   methods: {
-
+     // 根据deviceName获取router
+        deviceNameRouter(deviceName){
+            if(deviceName==1){
+                return 'formula'
+            }else if(deviceName==10){
+                return 'control'
+            }else if(deviceName==20){
+                return 'soil'
+            }else{
+                return 'formula'
+            }
+        },
     dataInit() {
+      const that = this
       var user = JSON.parse(localStorage.getItem('userInfo'))
       this.api.selUserbyid(user.userid).then(res => {
         this.tableData = []
@@ -518,6 +540,15 @@ export default {
               this.tableData4.push(el)
             }
           })
+
+                    var data=res.data.data.devices
+            this.$store.state.equipmentList =data.map((item, index) => {
+                        return {
+                            ...item,
+                            router: that.deviceNameRouter(item.deviceName),
+                            index: index + 1,
+                        };
+                    });
         }
       })
     },
diff --git a/src/views/page/PIDSet.vue b/src/views/page/PIDSet.vue
index 702a34ab..be0c4792 100644
--- a/src/views/page/PIDSet.vue
+++ b/src/views/page/PIDSet.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="formula irrigateSet PIDSet">
-    <set-params></set-params>
-    <div class="page-content ">
+  <div class="irrigateSet PIDSet">
+    <div class="">
       <div class="table-title">
         <img src="../../assets/image/set.png" alt=""> {{$t('PIDSet.pageTitle')}}
       </div>
diff --git a/src/views/page/formula.vue b/src/views/page/formula.vue
index e0431dea..630d282b 100644
--- a/src/views/page/formula.vue
+++ b/src/views/page/formula.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="formula">
-    <set-params></set-params>
-    <div class="page-content">
+  <div class="irrigateSet">
+    <div class="">
       <div class="table-title">
         <img src="../../assets/image/formula.png" alt=""> {{ titleName }}{{$t('formula.parameters')}} <div class="tips">{{$store.state.equipmentName['fertilization' + $store.state.nameList[indexs-1]]}}</div>
       </div>
diff --git a/src/views/page/irrigateSet.vue b/src/views/page/irrigateSet.vue
index 866a8729..59a334ab 100644
--- a/src/views/page/irrigateSet.vue
+++ b/src/views/page/irrigateSet.vue
@@ -1,515 +1,1009 @@
 <template>
-  <div class="formula irrigateSet">
-    <set-params></set-params>
-    <div class="page-content">
+  <div class="irrigateSet">
+    <div class="">
       <div class="table-title">
         <img src="../../assets/image/irrigateSet.png" alt="" />
-        {{ $store.state.equipmentName['solenoid' + $store.state.nameList[indexs - 1]] }}
-        <div class="tips"> {{ $store.state.equipmentName['solenoid' + $store.state.nameList[indexs - 1]] }}</div>
+        {{
+          $store.state.equipmentName[
+            "solenoid" + $store.state.nameList[indexs - 1]
+          ]
+        }}
+        <div class="tips">
+          {{
+            $store.state.equipmentName[
+              "solenoid" + $store.state.nameList[indexs - 1]
+            ]
+          }}
+        </div>
       </div>
       <div class="flex-view">
         <div class="input-btn">
-          <span>{{$t('irrigateSetSoil.label')}}</span>
-          <div class="btn" @click="change00(1)" :class="topActive == 1 ? 'blue' : 'green'">
-            <img src="../../assets/image/irrigateSet1.png" alt="" />{{$t('text.stop')}}
+          <span>{{ $t("irrigateSetSoil.label") }}</span>
+          <div
+            class="btn"
+            @click="change00(1)"
+            :class="topActive == 1 ? 'blue' : 'green'"
+          >
+            <img src="../../assets/image/irrigateSet1.png" alt="" />{{
+              $t("text.stop")
+            }}
           </div>
-          <div class="btn" @click="change00(2)" :class="topActive == 2 ? 'blue' : 'green'">
-            <img src="../../assets/image/irrigateSet3.png" alt="" />{{$t('text.manual')}}
+          <div
+            class="btn"
+            @click="change00(2)"
+            :class="topActive == 2 ? 'blue' : 'green'"
+          >
+            <img src="../../assets/image/irrigateSet3.png" alt="" />{{
+              $t("text.manual")
+            }}
           </div>
-          <div class="btn" @click="change00(3)" :class="topActive == 3 ? 'blue' : 'green'">
-            <img src="../../assets/image/irrigateSet2.png" alt="" />{{$t('text.auto')}}
+          <div
+            class="btn"
+            @click="change00(3)"
+            :class="topActive == 3 ? 'blue' : 'green'"
+          >
+            <img src="../../assets/image/irrigateSet2.png" alt="" />{{
+              $t("text.auto")
+            }}
           </div>
-
         </div>
         <div class="input-main">
-          <span>{{$t('irrigateSetSoil.manualStartTime')}}</span>
-          <input @blur="blurChange10(10 + (indexs - 1) + '01', $event)" v-model="inputData[10 + (indexs - 1) + '01']"
-            @input="changeData10(10 + (indexs - 1) + '01', $event)" type="text" value="60" placeholder="60" />
+          <span>{{ $t("irrigateSetSoil.manualStartTime") }}</span>
+          <input
+            @blur="blurChange10(10 + (indexs - 1) + '01', $event)"
+            v-model="inputData[10 + (indexs - 1) + '01']"
+            @input="changeData10(10 + (indexs - 1) + '01', $event)"
+            type="text"
+            value="60"
+            placeholder="60"
+          />
         </div>
       </div>
       <div class="flex-view">
         <div class="input-main-60">
-          <span>{{$t('irrigateSetSoil.autoRun.startDate')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '02', $event)" v-model="inputData[10 + (indexs - 1) + '02']"
-            @input="change(10 + (indexs - 1) + '02', $event)" type="number" placeholder="0" />
-          <span>{{$t('irrigateSetSoil.autoRun.year')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '03', $event)" v-model="inputData[10 + (indexs - 1) + '03']"
-            @input="change(10 + (indexs - 1) + '03', $event)" type="number" placeholder="0" />
-          <span>{{$t('irrigateSetSoil.autoRun.month')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '04', $event)" v-model="inputData[10 + (indexs - 1) + '04']"
-            @input="change(10 + (indexs - 1) + '04', $event)" type="number" placeholder="0" />
-          <span>{{$t('irrigateSetSoil.autoRun.day')}}</span>
+          <span>{{ $t("irrigateSetSoil.autoRun.startDate") }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '02', $event)"
+            v-model="inputData[10 + (indexs - 1) + '02']"
+            @input="change(10 + (indexs - 1) + '02', $event)"
+            type="number"
+            placeholder="0"
+          />
+          <span>{{ $t("irrigateSetSoil.autoRun.year") }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '03', $event)"
+            v-model="inputData[10 + (indexs - 1) + '03']"
+            @input="change(10 + (indexs - 1) + '03', $event)"
+            type="number"
+            placeholder="0"
+          />
+          <span>{{ $t("irrigateSetSoil.autoRun.month") }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '04', $event)"
+            v-model="inputData[10 + (indexs - 1) + '04']"
+            @input="change(10 + (indexs - 1) + '04', $event)"
+            type="number"
+            placeholder="0"
+          />
+          <span>{{ $t("irrigateSetSoil.autoRun.day") }}</span>
         </div>
         <div class="input-main-60">
-          <span>{{$t('irrigateSetSoil.autoRun.intervalDays')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '05', $event)" v-model="inputData[10 + (indexs - 1) + '05']"
-            @input="change(10 + (indexs - 1) + '05', $event)" type="number" placeholder="0" />
+          <span>{{ $t("irrigateSetSoil.autoRun.intervalDays") }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '05', $event)"
+            v-model="inputData[10 + (indexs - 1) + '05']"
+            @input="change(10 + (indexs - 1) + '05', $event)"
+            type="number"
+            placeholder="0"
+          />
         </div>
       </div>
       <div class="flex-view">
         <div class="input-main-60">
-          <span>{{$t('irrigateSet.irrigation')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '51', $event)" v-model="inputData[10 + (indexs - 1) + '51']"
-            @input="change(10 + (indexs - 1) + '51', $event)" type="number" placeholder="0" />
-          <span>{{$t('irrigateSet.clearWaterTimes')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '52', $event)" v-model="inputData[10 + (indexs - 1) + '52']"
-            @input="change(10 + (indexs - 1) + '52', $event)" type="number" placeholder="0" />
-          <span>{{$t('irrigateSet.fertilizationTimes')}}</span>
+          <span>{{ $t("irrigateSet.irrigation") }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '51', $event)"
+            v-model="inputData[10 + (indexs - 1) + '51']"
+            @input="change(10 + (indexs - 1) + '51', $event)"
+            type="number"
+            placeholder="0"
+          />
+          <span>{{ $t("irrigateSet.clearWaterTimes") }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '52', $event)"
+            v-model="inputData[10 + (indexs - 1) + '52']"
+            @input="change(10 + (indexs - 1) + '52', $event)"
+            type="number"
+            placeholder="0"
+          />
+          <span>{{ $t("irrigateSet.fertilizationTimes") }}</span>
         </div>
       </div>
       <div class="flex-view">
         <div class="input-main-60">
-          <span>{{$t('irrigateSet.useFormula')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '58', $event)" v-model="inputData[10 + (indexs - 1) + '58']"
-            @input="change(10 + (indexs - 1) + '58', $event)" type="number" placeholder="0" />
-          <span>{{$t('irrigateSet.formulaNumber')}}</span>
-          <span>{{$t('irrigateSet.reachMidLevel')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '66', $event)" v-model="inputData[10 + (indexs - 1) + '66']"
-            @input="change(10 + (indexs - 1) + '66', $event)" type="number" placeholder="0" />
-          <span>{{$t('irrigateSet.solenoidValveOutput')}}</span>
+          <span>{{ $t("irrigateSet.useFormula") }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '58', $event)"
+            v-model="inputData[10 + (indexs - 1) + '58']"
+            @input="change(10 + (indexs - 1) + '58', $event)"
+            type="number"
+            placeholder="0"
+          />
+          <span>{{ $t("irrigateSet.formulaNumber") }}</span>
+          <span>{{ $t("irrigateSet.reachMidLevel") }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '66', $event)"
+            v-model="inputData[10 + (indexs - 1) + '66']"
+            @input="change(10 + (indexs - 1) + '66', $event)"
+            type="number"
+            placeholder="0"
+          />
+          <span>{{ $t("irrigateSet.solenoidValveOutput") }}</span>
         </div>
       </div>
       <div class="flex-view">
         <div class="input-main-60">
-          <span>{{$t('irrigateSet.solenoidValveChannel')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '54', $event)" v-model="inputData[10 + (indexs - 1) + '54']"
-            @input="change(10 + (indexs - 1) + '54', $event)" type="text" placeholder="0" />
-          <input @blur="blurChange(10 + (indexs - 1) + '55', $event)" v-model="inputData[10 + (indexs - 1) + '55']"
-            @input="change(10 + (indexs - 1) + '55', $event)" type="text" 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) + '57', $event)" v-model="inputData[10 + (indexs - 1) + '57']"
-            @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" />
+          <span>{{ $t("irrigateSet.solenoidValveChannel") }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '54', $event)"
+            v-model="inputData[10 + (indexs - 1) + '54']"
+            @input="change(10 + (indexs - 1) + '54', $event)"
+            type="text"
+            placeholder="0"
+          />
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '55', $event)"
+            v-model="inputData[10 + (indexs - 1) + '55']"
+            @input="change(10 + (indexs - 1) + '55', $event)"
+            type="text"
+            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) + '57', $event)"
+            v-model="inputData[10 + (indexs - 1) + '57']"
+            @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="" />轮模式启用
         </div> -->
       </div>
-        <div class="flex-view" v-if="indexs>=5&&indexs<=8">
+      <div class="flex-view" v-if="indexs >= 5 && indexs <= 8">
         <div class="input-main-60">
-          <span>{{$t('irrigateSet.activateFollowValve')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '75', $event)" v-model="inputData[10 + (indexs - 1) + '75']"
-            @input="change(10 + (indexs - 1) + '75', $event)" type="number" placeholder="0" />
+          <span>{{ $t("irrigateSet.activateFollowValve") }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '75', $event)"
+            v-model="inputData[10 + (indexs - 1) + '75']"
+            @input="change(10 + (indexs - 1) + '75', $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="" />
-          <img v-else src="../../assets/image/irrigateSet-icon1-act.png" alt="" />
-          {{$t('irrigateSet.options.noFertilizer')}}
+        <div
+          @click="(open1 = !open1), change59()"
+          class="open-btn"
+          :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=""
+          />
+          {{ $t("irrigateSet.options.noFertilizer") }}
         </div>
-        <div @click="(open2 = !open2), change59()" class="open-btn" :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="" />
-          {{$t('irrigateSet.options.emptyTank')}}
+        <div
+          @click="(open2 = !open2), change59()"
+          class="open-btn"
+          :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=""
+          />
+          {{ $t("irrigateSet.options.emptyTank") }}
         </div>
-        <div @click="(open3 = !open3), change59()" class="open-btn" :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="" />
-          {{$t('irrigateSet.options.rotationMode')}}
+        <div
+          @click="(open3 = !open3), change59()"
+          class="open-btn"
+          :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=""
+          />
+          {{ $t("irrigateSet.options.rotationMode") }}
         </div>
-        <div @click="(open4 = !open4), change59()" class="open-btn" :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="" />
-          {{$t('irrigateSet.options.noInletPump')}}
+        <div
+          @click="(open4 = !open4), change59()"
+          class="open-btn"
+          :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=""
+          />
+          {{ $t("irrigateSet.options.noInletPump") }}
         </div>
       </div>
       <div class="input-view">
         <div class="input-sel">
-          <span>{{$t('irrigateSetSoil.fertilizerMode.label')}}</span>
+          <span>{{ $t("irrigateSetSoil.fertilizerMode.label") }}</span>
           <el-dropdown trigger="click" @command="handleCommand">
             <div class="el-dropdown-link">
-              <input type="text" value="选择设定弹窗" v-model="data53" class="input-input" placeholder="无" />
+              <input
+                type="text"
+                value="选择设定弹窗"
+                v-model="data53"
+                class="input-input"
+                placeholder="无"
+              />
               <div class="arrow">
                 <img src="../../assets/image/arrow.png" alt="" />
               </div>
             </div>
             <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="1">{{$t('irrigateSetSoil.fertilizerMode.timePoint')}}</el-dropdown-item>
-            <el-dropdown-item command="2">{{$t('irrigateSetSoil.fertilizerMode.timeRange')}}</el-dropdown-item>
-            <el-dropdown-item command="3">{{$t('irrigateSetSoil.fertilizerMode.soilSensor')}}</el-dropdown-item>
-            <el-dropdown-item command="4">{{$t('irrigateSetSoil.fertilizerMode.lightSensor')}}</el-dropdown-item>
-            <el-dropdown-item command="5">{{$t('irrigateSetSoil.fertilizerMode.externalSignal')}}</el-dropdown-item>
+              <el-dropdown-item command="1">{{
+                $t("irrigateSetSoil.fertilizerMode.timePoint")
+              }}</el-dropdown-item>
+              <el-dropdown-item command="2">{{
+                $t("irrigateSetSoil.fertilizerMode.timeRange")
+              }}</el-dropdown-item>
+              <el-dropdown-item command="3">{{
+                $t("irrigateSetSoil.fertilizerMode.soilSensor")
+              }}</el-dropdown-item>
+              <el-dropdown-item command="4">{{
+                $t("irrigateSetSoil.fertilizerMode.lightSensor")
+              }}</el-dropdown-item>
+              <el-dropdown-item command="5">{{
+                $t("irrigateSetSoil.fertilizerMode.externalSignal")
+              }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
       </div>
     </div>
-
-    <el-dialog :modal-append-to-body="false" :show-close="false" :close-on-click-modal="true" :visible.sync="model1"
-      width="440px" :before-close="handleClose1">
-      <div class="page-title title-302">{{ $t('irrigateSetSoil.timePointStart.controlParamsConfig', {index:indexs}) }}</div>
+    <block v-show="this.inputData[10 + (this.indexs - 1) + '53']==1">
       <div class="model1-top">
         <div class="btn blue">
-          <img src="../../assets/image/play.png" alt="" />{{$t('irrigateSetSoil.timePointStart.title')}}
+          <img src="../../assets/image/play.png" alt="" />{{
+            $t("irrigateSetSoil.timePointStart.title")
+          }}
         </div>
         <div class="input-main-60">
-          <span>{{$t('irrigateSetSoil.timePointStart.durationLabel')}}</span>
-          <input @blur="blurChange10(10 + (indexs - 1) + '06', $event)" v-model="inputData[10 + (indexs - 1) + '06']"
-            @input="changeData10(10 + (indexs - 1) + '06', $event)" type="number" placeholder="0" />
-          <span>{{$t('text.min')}}</span>
+          <span>{{ $t("irrigateSetSoil.timePointStart.durationLabel") }}</span>
+          <input
+            @blur="blurChange10(10 + (indexs - 1) + '06', $event)"
+            v-model="inputData[10 + (indexs - 1) + '06']"
+            @input="changeData10(10 + (indexs - 1) + '06', $event)"
+            type="number"
+            placeholder="0"
+          />
+          <span>{{ $t("text.min") }}</span>
         </div>
       </div>
       <div class="model1-bottom">
-        <div class="title">{{$t('irrigateSetSoil.timePointStart.startTimes')}}</div>
+        <div class="title">
+          {{ $t("irrigateSetSoil.timePointStart.startTimes") }}
+        </div>
         <div class="model1-content">
           <div>
             <div class="number">1</div>
             <div class="input-main-60">
-              <input @blur="blurChange(10 + (indexs - 1) + '07', $event)" v-model="inputData[10 + (indexs - 1) + '07']"
-                @input="change(10 + (indexs - 1) + '07', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '07', $event)"
+                v-model="inputData[10 + (indexs - 1) + '07']"
+                @input="change(10 + (indexs - 1) + '07', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '08', $event)" v-model="inputData[10 + (indexs - 1) + '08']"
-                @input="change(10 + (indexs - 1) + '08', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '08', $event)"
+                v-model="inputData[10 + (indexs - 1) + '08']"
+                @input="change(10 + (indexs - 1) + '08', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
           <div>
             <div class="number">2</div>
             <div class="input-main-60">
-              <input @blur="blurChange(10 + (indexs - 1) + '09', $event)" v-model="inputData[10 + (indexs - 1) + '09']"
-                @input="change(10 + (indexs - 1) + '09', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '09', $event)"
+                v-model="inputData[10 + (indexs - 1) + '09']"
+                @input="change(10 + (indexs - 1) + '09', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '10', $event)" v-model="inputData[10 + (indexs - 1) + '10']"
-                @input="change(10 + (indexs - 1) + '10', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '10', $event)"
+                v-model="inputData[10 + (indexs - 1) + '10']"
+                @input="change(10 + (indexs - 1) + '10', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
           <div>
             <div class="number">3</div>
             <div class="input-main-60">
-              <input @blur="blurChange(10 + (indexs - 1) + '11', $event)" v-model="inputData[10 + (indexs - 1) + '11']"
-                @input="change(10 + (indexs - 1) + '11', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '11', $event)"
+                v-model="inputData[10 + (indexs - 1) + '11']"
+                @input="change(10 + (indexs - 1) + '11', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '12', $event)" v-model="inputData[10 + (indexs - 1) + '12']"
-                @input="change(10 + (indexs - 1) + '12', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '12', $event)"
+                v-model="inputData[10 + (indexs - 1) + '12']"
+                @input="change(10 + (indexs - 1) + '12', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
           <div>
             <div class="number">4</div>
             <div class="input-main-60">
-              <input @blur="blurChange(10 + (indexs - 1) + '13', $event)" v-model="inputData[10 + (indexs - 1) + '13']"
-                @input="change(10 + (indexs - 1) + '13', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '13', $event)"
+                v-model="inputData[10 + (indexs - 1) + '13']"
+                @input="change(10 + (indexs - 1) + '13', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '14', $event)" v-model="inputData[10 + (indexs - 1) + '14']"
-                @input="change(10 + (indexs - 1) + '14', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '14', $event)"
+                v-model="inputData[10 + (indexs - 1) + '14']"
+                @input="change(10 + (indexs - 1) + '14', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
           <div>
             <div class="number">5</div>
             <div class="input-main-60">
-              <input @blur="blurChange(10 + (indexs - 1) + '15', $event)" v-model="inputData[10 + (indexs - 1) + '15']"
-                @input="change(10 + (indexs - 1) + '15', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '15', $event)"
+                v-model="inputData[10 + (indexs - 1) + '15']"
+                @input="change(10 + (indexs - 1) + '15', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '16', $event)" v-model="inputData[10 + (indexs - 1) + '16']"
-                @input="change(10 + (indexs - 1) + '16', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '16', $event)"
+                v-model="inputData[10 + (indexs - 1) + '16']"
+                @input="change(10 + (indexs - 1) + '16', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
         </div>
       </div>
-      <div class="model-return">
-        <div @click="model1 = false" class="btn green">
-          <img src="../../assets/image/return.png" alt="" />{{$t('text.return')}}
-        </div>
-      </div>
-    </el-dialog>
+    </block>
 
-    <el-dialog :modal-append-to-body="false" :show-close="false" :close-on-click-modal="true" :visible.sync="model2"
-      width="760px" :before-close="handleClose2">
-      <div class="page-title title-302">{{ $t('irrigateSetSoil.timePointStart.controlParamsConfig', {index:indexs}) }}</div>
+    <block  v-show="this.inputData[10 + (this.indexs - 1) + '53']==2">
       <div class="model1-top model2-top">
         <div class="btn blue">
-          <img src="../../assets/image/play.png" alt="" />{{$t('irrigateSetSoil.intervalStart.title')}}
+          <img src="../../assets/image/play.png" alt="" />{{
+            $t("irrigateSetSoil.intervalStart.title")
+          }}
         </div>
         <div class="input-main-60">
-          <span>{{$t('irrigateSetSoil.timePointStart.durationLabel')}}</span>
-          <input @blur="blurChange10(10 + (indexs - 1) + '17', $event)" v-model="inputData[10 + (indexs - 1) + '17']"
-            @input="changeData10(10 + (indexs - 1) + '17', $event)" type="number" placeholder="0" />
-          <span>{{$t('text.min')}}</span>
+          <span>{{ $t("irrigateSetSoil.timePointStart.durationLabel") }}</span>
+          <input
+            @blur="blurChange10(10 + (indexs - 1) + '17', $event)"
+            v-model="inputData[10 + (indexs - 1) + '17']"
+            @input="changeData10(10 + (indexs - 1) + '17', $event)"
+            type="number"
+            placeholder="0"
+          />
+          <span>{{ $t("text.min") }}</span>
         </div>
       </div>
       <div class="model1-bottom">
-        <div class="title">{{$t('irrigateSetSoil.timePointStart.startTimes')}}</div>
+        <div class="title">
+          {{ $t("irrigateSetSoil.timePointStart.startTimes") }}
+        </div>
         <div class="model1-content">
           <div>
             <div class="number">1</div>
             <div class="input-main-60">
-              <input @blur="blurChange(10 + (indexs - 1) + '19', $event)" v-model="inputData[10 + (indexs - 1) + '19']"
-                @input="change(10 + (indexs - 1) + '19', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '19', $event)"
+                v-model="inputData[10 + (indexs - 1) + '19']"
+                @input="change(10 + (indexs - 1) + '19', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '20', $event)" v-model="inputData[10 + (indexs - 1) + '20']"
-                @input="change(10 + (indexs - 1) + '20', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '20', $event)"
+                v-model="inputData[10 + (indexs - 1) + '20']"
+                @input="change(10 + (indexs - 1) + '20', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>-</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '21', $event)" v-model="inputData[10 + (indexs - 1) + '21']"
-                @input="change(10 + (indexs - 1) + '21', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '21', $event)"
+                v-model="inputData[10 + (indexs - 1) + '21']"
+                @input="change(10 + (indexs - 1) + '21', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '22', $event)" v-model="inputData[10 + (indexs - 1) + '22']"
-                @input="change(10 + (indexs - 1) + '22', $event)" type="number" placeholder="0" />
-              <span style="font-size: 16px">{{$t('irrigateSetSoil.intervalStart.timesInRange')}}</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '18', $event)" v-model="inputData[10 + (indexs - 1) + '18']"
-                @input="change(10 + (indexs - 1) + '18', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '22', $event)"
+                v-model="inputData[10 + (indexs - 1) + '22']"
+                @input="change(10 + (indexs - 1) + '22', $event)"
+                type="number"
+                placeholder="0"
+              />
+              <span style="font-size: 16px">{{
+                $t("irrigateSetSoil.intervalStart.timesInRange")
+              }}</span>
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '18', $event)"
+                v-model="inputData[10 + (indexs - 1) + '18']"
+                @input="change(10 + (indexs - 1) + '18', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
           <div>
             <div class="number">2</div>
             <div class="input-main-60">
-              <input @blur="blurChange(10 + (indexs - 1) + '24', $event)" v-model="inputData[10 + (indexs - 1) + '24']"
-                @input="change(10 + (indexs - 1) + '24', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '24', $event)"
+                v-model="inputData[10 + (indexs - 1) + '24']"
+                @input="change(10 + (indexs - 1) + '24', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '25', $event)" v-model="inputData[10 + (indexs - 1) + '25']"
-                @input="change(10 + (indexs - 1) + '25', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '25', $event)"
+                v-model="inputData[10 + (indexs - 1) + '25']"
+                @input="change(10 + (indexs - 1) + '25', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>-</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '26', $event)" v-model="inputData[10 + (indexs - 1) + '26']"
-                @input="change(10 + (indexs - 1) + '26', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '26', $event)"
+                v-model="inputData[10 + (indexs - 1) + '26']"
+                @input="change(10 + (indexs - 1) + '26', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '27', $event)" v-model="inputData[10 + (indexs - 1) + '27']"
-                @input="change(10 + (indexs - 1) + '27', $event)" type="number" placeholder="0" />
-              <span style="font-size: 16px">{{$t('irrigateSetSoil.intervalStart.timesInRange')}}</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '23', $event)" v-model="inputData[10 + (indexs - 1) + '23']"
-                @input="change(10 + (indexs - 1) + '23', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '27', $event)"
+                v-model="inputData[10 + (indexs - 1) + '27']"
+                @input="change(10 + (indexs - 1) + '27', $event)"
+                type="number"
+                placeholder="0"
+              />
+              <span style="font-size: 16px">{{
+                $t("irrigateSetSoil.intervalStart.timesInRange")
+              }}</span>
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '23', $event)"
+                v-model="inputData[10 + (indexs - 1) + '23']"
+                @input="change(10 + (indexs - 1) + '23', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
           <div>
             <div class="number">3</div>
             <div class="input-main-60">
-              <input @blur="blurChange(10 + (indexs - 1) + '29', $event)" v-model="inputData[10 + (indexs - 1) + '29']"
-                @input="change(10 + (indexs - 1) + '29', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '29', $event)"
+                v-model="inputData[10 + (indexs - 1) + '29']"
+                @input="change(10 + (indexs - 1) + '29', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '30', $event)" v-model="inputData[10 + (indexs - 1) + '30']"
-                @input="change(10 + (indexs - 1) + '30', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '30', $event)"
+                v-model="inputData[10 + (indexs - 1) + '30']"
+                @input="change(10 + (indexs - 1) + '30', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>-</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '31', $event)" v-model="inputData[10 + (indexs - 1) + '31']"
-                @input="change(10 + (indexs - 1) + '31', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '31', $event)"
+                v-model="inputData[10 + (indexs - 1) + '31']"
+                @input="change(10 + (indexs - 1) + '31', $event)"
+                type="number"
+                placeholder="0"
+              />
               <span>:</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '32', $event)" v-model="inputData[10 + (indexs - 1) + '32']"
-                @input="change(10 + (indexs - 1) + '32', $event)" type="number" placeholder="0" />
-              <span style="font-size: 16px">{{$t('irrigateSetSoil.intervalStart.timesInRange')}}</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '28', $event)" v-model="inputData[10 + (indexs - 1) + '28']"
-                @input="change(10 + (indexs - 1) + '28', $event)" type="number" placeholder="0" />
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '32', $event)"
+                v-model="inputData[10 + (indexs - 1) + '32']"
+                @input="change(10 + (indexs - 1) + '32', $event)"
+                type="number"
+                placeholder="0"
+              />
+              <span style="font-size: 16px">{{
+                $t("irrigateSetSoil.intervalStart.timesInRange")
+              }}</span>
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '28', $event)"
+                v-model="inputData[10 + (indexs - 1) + '28']"
+                @input="change(10 + (indexs - 1) + '28', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
         </div>
       </div>
-      <div class="model-return">
-        <div @click="model2 = false" class="btn green">
-          <img src="../../assets/image/return.png" alt="" />{{$t('text.return')}}
-        </div>
-      </div>
-    </el-dialog>
+    </block>
 
-    <el-dialog :modal-append-to-body="false" :show-close="false" :close-on-click-modal="true" :visible.sync="model3"
-      width="760px" :before-close="handleClose3">
-      <div class="page-title title-302">{{ $t('irrigateSetSoil.timePointStart.controlParamsConfig', {index:indexs}) }}</div>
+    <block  v-show="this.inputData[10 + (this.indexs - 1) + '53']==4">
       <div class="model1-top model3-top">
         <div class="btn blue">
-          <img src="../../assets/image/model3-icon.png" alt="" />{{$t('irrigateSetSoil.lightAccumulation.title')}}
+          <img src="../../assets/image/model3-icon.png" alt="" />{{
+            $t("irrigateSetSoil.lightAccumulation.title")
+          }}
         </div>
         <div class="input-main-60">
-          <span>{{$t('irrigateSetSoil.lightAccumulation.validTimeLabel')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '45', $event)" v-model="inputData[10 + (indexs - 1) + '45']"
-            @input="change(10 + (indexs - 1) + '45', $event)" type="number" placeholder="0" />
+          <span>{{
+            $t("irrigateSetSoil.lightAccumulation.validTimeLabel")
+          }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '45', $event)"
+            v-model="inputData[10 + (indexs - 1) + '45']"
+            @input="change(10 + (indexs - 1) + '45', $event)"
+            type="number"
+            placeholder="0"
+          />
           <span>:</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '46', $event)" v-model="inputData[10 + (indexs - 1) + '46']"
-            @input="change(10 + (indexs - 1) + '46', $event)" type="number" placeholder="0" />
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '46', $event)"
+            v-model="inputData[10 + (indexs - 1) + '46']"
+            @input="change(10 + (indexs - 1) + '46', $event)"
+            type="number"
+            placeholder="0"
+          />
           <span>-</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '47', $event)" v-model="inputData[10 + (indexs - 1) + '47']"
-            @input="change(10 + (indexs - 1) + '47', $event)" type="number" placeholder="0" />
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '47', $event)"
+            v-model="inputData[10 + (indexs - 1) + '47']"
+            @input="change(10 + (indexs - 1) + '47', $event)"
+            type="number"
+            placeholder="0"
+          />
           <span>:</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '48', $event)" v-model="inputData[10 + (indexs - 1) + '48']"
-            @input="change(10 + (indexs - 1) + '48', $event)" type="number" placeholder="0" />
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '48', $event)"
+            v-model="inputData[10 + (indexs - 1) + '48']"
+            @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="flex-view padding-none border-none shrink-none">
           <div class="input-main-60">
-             <span class="text">{{$t('irrigateSetSoil.lightAccumulation.durationLabel')}}</span>
-            <input @blur="blurChange10(10 + (indexs - 1) + '40', $event)" v-model="inputData[10 + (indexs - 1) + '40']"
-              @input="changeData10(10 + (indexs - 1) + '40', $event)" type="number" placeholder="0" />
-            <span class="text">{{$t('text.min')}}</span>
+            <span class="text">{{
+              $t("irrigateSetSoil.lightAccumulation.durationLabel")
+            }}</span>
+            <input
+              @blur="blurChange10(10 + (indexs - 1) + '40', $event)"
+              v-model="inputData[10 + (indexs - 1) + '40']"
+              @input="changeData10(10 + (indexs - 1) + '40', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span class="text">{{ $t("text.min") }}</span>
           </div>
           <div class="input-main-60">
-            <span class="text">{{$t('irrigateSetSoil.lightAccumulation.thresholdLabel')}}</span>
-            <input @blur="blurChange(10 + (indexs - 1) + '41', $event)" v-model="inputData[10 + (indexs - 1) + '41']"
-              @input="change(10 + (indexs - 1) + '41', $event)" type="number" placeholder="0" />
+            <span class="text">{{
+              $t("irrigateSetSoil.lightAccumulation.thresholdLabel")
+            }}</span>
+            <input
+              @blur="blurChange(10 + (indexs - 1) + '41', $event)"
+              v-model="inputData[10 + (indexs - 1) + '41']"
+              @input="change(10 + (indexs - 1) + '41', $event)"
+              type="number"
+              placeholder="0"
+            />
           </div>
           <div class="input-main-60">
-             <span class="text">{{$t('irrigateSetSoil.lightAccumulation.minLightLabel')}}</span>
-            <input @blur="blurChange(10 + (indexs - 1) + '42', $event)" v-model="inputData[10 + (indexs - 1) + '42']"
-              @input="change(10 + (indexs - 1) + '42', $event)" type="number" placeholder="0" />
+            <span class="text">{{
+              $t("irrigateSetSoil.lightAccumulation.minLightLabel")
+            }}</span>
+            <input
+              @blur="blurChange(10 + (indexs - 1) + '42', $event)"
+              v-model="inputData[10 + (indexs - 1) + '42']"
+              @input="change(10 + (indexs - 1) + '42', $event)"
+              type="number"
+              placeholder="0"
+            />
             <span class="text">Klux</span>
           </div>
+       
+        </div>
+         <div class="flex-view padding-none border-none shrink-none">
           <div class="input-main-60">
-             <span class="text" style="padding-left: 20px">{{$t('irrigateSetSoil.lightAccumulation.minIntervalLabel')}}</span>
-            <input @blur="blurChange10(10 + (indexs - 1) + '43', $event)" v-model="inputData[10 + (indexs - 1) + '43']"
-              @input="changeData10(10 + (indexs - 1) + '43', $event)" type="number" placeholder="0" />
+            <span class="text" style="padding-left: 20px">{{
+              $t("irrigateSetSoil.lightAccumulation.minIntervalLabel")
+            }}</span>
+            <input
+              @blur="blurChange10(10 + (indexs - 1) + '43', $event)"
+              v-model="inputData[10 + (indexs - 1) + '43']"
+              @input="changeData10(10 + (indexs - 1) + '43', $event)"
+              type="number"
+              placeholder="0"
+            />
           </div>
           <div class="input-main-60">
-            <span class="text">{{$t('irrigateSetSoil.lightAccumulation.maxIntervalLabel')}}</span>
-            <input @blur="blurChange10(10 + (indexs - 1) + '44', $event)" v-model="inputData[10 + (indexs - 1) + '44']"
-              @input="changeData10(10 + (indexs - 1) + '44', $event)" type="number" placeholder="0" />
+            <span class="text">{{
+              $t("irrigateSetSoil.lightAccumulation.maxIntervalLabel")
+            }}</span>
+            <input
+              @blur="blurChange10(10 + (indexs - 1) + '44', $event)"
+              v-model="inputData[10 + (indexs - 1) + '44']"
+              @input="changeData10(10 + (indexs - 1) + '44', $event)"
+              type="number"
+              placeholder="0"
+            />
           </div>
         </div>
       </div>
-      <div class="model-return">
-        <div @click="model3 = false" class="btn green">
-          <img src="../../assets/image/return.png" alt="" />{{$t('text.return')}}
-        </div>
-      </div>
-    </el-dialog>
+    </block>
 
-    <el-dialog :modal-append-to-body="false" :show-close="false" :close-on-click-modal="true" :visible.sync="model5"
-      width="760px" :before-close="handleClose5">
-      <div class="page-title title-302">{{ $t('irrigateSetSoil.timePointStart.controlParamsConfig', {index:indexs}) }}</div>
+    <block  v-show="this.inputData[10 + (this.indexs - 1) + '53']==3">
       <div class="model1-top model3-top">
         <div class="btn blue">
-          <img src="../../assets/image/model3-icon.png" alt="" />{{$t('irrigateSetSoil.soilSensor.title')}}
+          <img src="../../assets/image/model3-icon.png" alt="" />{{
+            $t("irrigateSetSoil.soilSensor.title")
+          }}
         </div>
         <div class="input-main-60">
-          <span>{{$t('irrigateSetSoil.lightAccumulation.validTimeLabel')}}</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '33', $event)" v-model="inputData[10 + (indexs - 1) + '33']"
-            @input="change(10 + (indexs - 1) + '33', $event)" type="number" placeholder="0" />
+          <span>{{
+            $t("irrigateSetSoil.lightAccumulation.validTimeLabel")
+          }}</span>
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '33', $event)"
+            v-model="inputData[10 + (indexs - 1) + '33']"
+            @input="change(10 + (indexs - 1) + '33', $event)"
+            type="number"
+            placeholder="0"
+          />
           <span>:</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '34', $event)" v-model="inputData[10 + (indexs - 1) + '34']"
-            @input="change(10 + (indexs - 1) + '34', $event)" type="number" placeholder="0" />
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '34', $event)"
+            v-model="inputData[10 + (indexs - 1) + '34']"
+            @input="change(10 + (indexs - 1) + '34', $event)"
+            type="number"
+            placeholder="0"
+          />
           <span>-</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '35', $event)" v-model="inputData[10 + (indexs - 1) + '35']"
-            @input="change(10 + (indexs - 1) + '35', $event)" type="number" placeholder="0" />
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '35', $event)"
+            v-model="inputData[10 + (indexs - 1) + '35']"
+            @input="change(10 + (indexs - 1) + '35', $event)"
+            type="number"
+            placeholder="0"
+          />
           <span>:</span>
-          <input @blur="blurChange(10 + (indexs - 1) + '36', $event)" v-model="inputData[10 + (indexs - 1) + '36']"
-            @input="change(10 + (indexs - 1) + '36', $event)" type="number" placeholder="0" />
+          <input
+            @blur="blurChange(10 + (indexs - 1) + '36', $event)"
+            v-model="inputData[10 + (indexs - 1) + '36']"
+            @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="flex-view padding-none border-none shrink-none">
           <div class="input-main-60">
-             <span class="text">{{$t('irrigateSetSoil.soilSensor.minMoistureLabel')}}</span>
-            <input @blur="blurChange(10 + (indexs - 1) + '37', $event)" v-model="inputData[10 + (indexs - 1) + '37']"
-              @input="change(10 + (indexs - 1) + '37', $event)" type="number" placeholder="0" />
+            <span class="text">{{
+              $t("irrigateSetSoil.soilSensor.minMoistureLabel")
+            }}</span>
+            <input
+              @blur="blurChange(10 + (indexs - 1) + '37', $event)"
+              v-model="inputData[10 + (indexs - 1) + '37']"
+              @input="change(10 + (indexs - 1) + '37', $event)"
+              type="number"
+              placeholder="0"
+            />
             <span class="text">%</span>
           </div>
           <div class="input-main-60">
-             <span class="text">{{$t('irrigateSetSoil.soilSensor.maxMoistureLabel')}}</span>
-            <input @blur="blurChange(10 + (indexs - 1) + '38', $event)" v-model="inputData[10 + (indexs - 1) + '38']"
-              @input="change(10 + (indexs - 1) + '38', $event)" type="number" placeholder="0" />
+            <span class="text">{{
+              $t("irrigateSetSoil.soilSensor.maxMoistureLabel")
+            }}</span>
+            <input
+              @blur="blurChange(10 + (indexs - 1) + '38', $event)"
+              v-model="inputData[10 + (indexs - 1) + '38']"
+              @input="change(10 + (indexs - 1) + '38', $event)"
+              type="number"
+              placeholder="0"
+            />
             <span class="text">%</span>
           </div>
           <div class="input-main-60">
-             <span class="text">{{$t('irrigateSetSoil.soilSensor.maxDurationLabel')}}</span>
-            <input @blur="blurChange10(10 + (indexs - 1) + '39', $event)" v-model="inputData[10 + (indexs - 1) + '39']"
-              @input="changeData10(10 + (indexs - 1) + '39', $event)" type="number" placeholder="0" />
-            <span class="text">{{$t('text.min')}}</span>
+            <span class="text">{{
+              $t("irrigateSetSoil.soilSensor.maxDurationLabel")
+            }}</span>
+            <input
+              @blur="blurChange10(10 + (indexs - 1) + '39', $event)"
+              v-model="inputData[10 + (indexs - 1) + '39']"
+              @input="changeData10(10 + (indexs - 1) + '39', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span class="text">{{ $t("text.min") }}</span>
           </div>
         </div>
       </div>
-      <div class="model-return">
-        <div @click="model5 = false" class="btn green">
-          <img src="../../assets/image/return.png" alt="" />{{$t('text.return')}}
-        </div>
-      </div>
-    </el-dialog>
-    <el-dialog :modal-append-to-body="false" :show-close="false" :close-on-click-modal="true" :visible.sync="model4"
-      width="700px" :before-close="handleClose4">
-      <div class="page-title title-302">{{ $t('irrigateSetSoil.timePointStart.controlParamsConfig', {index:indexs}) }}</div>
-      <div style="display: flex;align-items: center;">
+    </block>
+
+    <block  v-show="this.inputData[10 + (this.indexs - 1) + '53']==5">
+      <div style="display: flex; align-items: center">
         <div class="btn blue">
-          <img src="../../assets/image/model4-icon.png" alt="" />{{$t('irrigateSetSoil.externalControl.title')}}
+          <img src="../../assets/image/model4-icon.png" alt="" />{{
+            $t("irrigateSetSoil.externalControl.title")
+          }}
         </div>
         <div>
-        <div class="input-main-60">
-          <span>{{$t('irrigateSetSoil.lightAccumulation.validTimeLabel')}}</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" min="0" max="23" />
-          <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"  min="0" max="59" />
-            <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"  min="0" max="23"  />
+          <div class="input-main-60">
+            <span>{{
+              $t("irrigateSetSoil.lightAccumulation.validTimeLabel")
+            }}</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"
+              min="0"
+              max="23"
+            />
             <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"  min="0" max="59"  />
+            <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"
+              min="0"
+              max="59"
+            />
+            <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"
+              min="0"
+              max="23"
+            />
+            <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"
+              min="0"
+              max="59"
+            />
+          </div>
         </div>
       </div>
-      </div>
-    
+
       <div class="model1-top model4-top">
         <div class="model-left">
-          <div class="btn btn-w70"  @click="blurChange(10 + (indexs - 1) + '71', {target:{value:1}}),model4Sel=1" :class="model4Sel==1?'blue':'off'">
-            {{model4Sel==1?$t('text.valid'):$t('text.invalid')}}
+          <div
+            class="btn btn-w70"
+            @click="
+              blurChange(10 + (indexs - 1) + '71', { target: { value: 1 } }),
+                (model4Sel = 1)
+            "
+            :class="model4Sel == 1 ? 'blue' : 'off'"
+          >
+            {{ model4Sel == 1 ? $t("text.valid") : $t("text.invalid") }}
+          </div>
+          <span>{{
+            $t("irrigateSetSoil.externalControl.digitalControl")
+          }}</span>
         </div>
-        <span>{{$t('irrigateSetSoil.externalControl.digitalControl')}}</span>
-        </div>
-        
+
         <div class="model-right">
           <div>
             <div class="number">1</div>
             <div class="input-main-60">
-              <span>{{$t('irrigateSetSoil.externalControl.channelLabel')}}</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '49', $event)" v-model="inputData[10 + (indexs - 1) + '49']"
-                @input="change(10 + (indexs - 1) + '49', $event)" type="number" placeholder="0" />
+              <span>{{
+                $t("irrigateSetSoil.externalControl.channelLabel")
+              }}</span>
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '49', $event)"
+                v-model="inputData[10 + (indexs - 1) + '49']"
+                @input="change(10 + (indexs - 1) + '49', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
           <div>
             <div class="number">2</div>
             <div class="input-main-60">
-              <span>{{$t('irrigateSetSoil.externalControl.channelLabel')}}</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '50', $event)" v-model="inputData[10 + (indexs - 1) + '50']"
-                @input="change(10 + (indexs - 1) + '50', $event)" type="number" placeholder="0" />
+              <span>{{
+                $t("irrigateSetSoil.externalControl.channelLabel")
+              }}</span>
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '50', $event)"
+                v-model="inputData[10 + (indexs - 1) + '50']"
+                @input="change(10 + (indexs - 1) + '50', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
         </div>
       </div>
       <div class="model1-top model4-top">
         <div class="model-left">
-          <div class="btn btn-w70 " @click="blurChange(10 + (indexs - 1) + '71', {target:{value:2}}),model4Sel=2"  :class="model4Sel==2?'blue':'off'">
-         {{model4Sel==2?$t('text.valid'):$t('text.invalid')}}
+          <div
+            class="btn btn-w70"
+            @click="
+              blurChange(10 + (indexs - 1) + '71', { target: { value: 2 } }),
+                (model4Sel = 2)
+            "
+            :class="model4Sel == 2 ? 'blue' : 'off'"
+          >
+            {{ model4Sel == 2 ? $t("text.valid") : $t("text.invalid") }}
+          </div>
+          <span>{{ $t("irrigateSetSoil.externalControl.levelControl") }}</span>
         </div>
-        <span>{{$t('irrigateSetSoil.externalControl.levelControl')}}</span>
-        </div>
-        
+
         <div class="model-right">
           <div>
             <div class="input-main-60">
-              <span>{{$t('irrigateSetSoil.externalControl.levelChannelLabel')}}</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '72', $event)" v-model="inputData[10 + (indexs - 1) + '72']"
-                @input="change(10 + (indexs - 1) + '72', $event)" type="number" placeholder="0" />
+              <span>{{
+                $t("irrigateSetSoil.externalControl.levelChannelLabel")
+              }}</span>
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '72', $event)"
+                v-model="inputData[10 + (indexs - 1) + '72']"
+                @input="change(10 + (indexs - 1) + '72', $event)"
+                type="number"
+                placeholder="0"
+              />
             </div>
           </div>
           <div>
             <div class="input-main-60">
-              <span>{{$t('irrigateSetSoil.externalControl.startLevelLabel')}}</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '73', $event)" v-model="inputData[10 + (indexs - 1) + '73']"
-                @input="change(10 + (indexs - 1) + '73', $event)" type="number" placeholder="0" />
-                <span>cm</span>
-              </div>
-       
+              <span>{{
+                $t("irrigateSetSoil.externalControl.startLevelLabel")
+              }}</span>
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '73', $event)"
+                v-model="inputData[10 + (indexs - 1) + '73']"
+                @input="change(10 + (indexs - 1) + '73', $event)"
+                type="number"
+                placeholder="0"
+              />
+              <span>cm</span>
+            </div>
           </div>
           <div>
             <div class="input-main-60">
-              <span>{{$t('irrigateSetSoil.externalControl.stopLevelLabel')}}</span>
-              <input @blur="blurChange(10 + (indexs - 1) + '74', $event)" v-model="inputData[10 + (indexs - 1) + '74']"
-                @input="change(10 + (indexs - 1) + '74', $event)" type="number" placeholder="0" />
-                <span>cm</span>
-              </div>
+              <span>{{
+                $t("irrigateSetSoil.externalControl.stopLevelLabel")
+              }}</span>
+              <input
+                @blur="blurChange(10 + (indexs - 1) + '74', $event)"
+                v-model="inputData[10 + (indexs - 1) + '74']"
+                @input="change(10 + (indexs - 1) + '74', $event)"
+                type="number"
+                placeholder="0"
+              />
+              <span>cm</span>
+            </div>
           </div>
         </div>
       </div>
-      <div class="model-return">
-        <div @click="model4 = false" class="btn green">
-          <img src="../../assets/image/return.png" alt="" />{{$t('text.return')}}
-        </div>
-      </div>
-    </el-dialog>
+    </block>
   </div>
 </template>
 <script>
@@ -529,24 +1023,24 @@ export default {
       model2: false,
       model3: false,
       model4: false,
-      model4Sel:0,
+      model4Sel: 0,
       model5: false,
       timer: null,
       indexs: 2,
       data53: "",
       inputData: {},
-      loading:null,
+      loading: null,
     };
   },
   watch: {
-    '$store.state.equipmentIndex': function (newValue, oldValue) {
+    "$store.state.equipmentIndex": function (newValue, oldValue) {
       const that = this;
       this.loading = this.$loading({
-    lock: true,
-    text: this.$t('message.loading'),
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
+        lock: true,
+        text: this.$t("message.loading"),
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       setTimeout(() => {
         that.dataInit();
       }, 0);
@@ -555,11 +1049,11 @@ export default {
       const that = this;
       this.indexs = this.$route.query.id ? this.$route.query.id : 1;
       this.loading = this.$loading({
-    lock: true,
-    text: this.$t('message.loading'),
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
+        lock: true,
+        text: this.$t("message.loading"),
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       setTimeout(() => {
         that.dataInit();
       }, 0);
@@ -569,36 +1063,36 @@ export default {
     const that = this;
     this.indexs = this.$route.query.id ? this.$route.query.id : 1;
     this.loading = this.$loading({
-    lock: true,
-    text: this.$t('message.loading'),
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
+      lock: true,
+      text: this.$t("message.loading"),
+      spinner: "el-icon-loading",
+      background: "rgba(0, 0, 0, 0.7)",
+    });
     setTimeout(() => {
       that.dataInit();
     }, 0);
     //input获取焦点后全选
-    let inputList = document.querySelectorAll('input');
+    let inputList = document.querySelectorAll("input");
     for (let index = 0; index < inputList.length; index++) {
-      inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
+      inputList[index].onfocus = this.selectValue; //input放入焦点，全选文本
     }
   },
   methods: {
     countData10(data) {
       if (data) {
-        return data / 10
+        return data / 10;
       } else {
-        return 0
+        return 0;
       }
     },
     changeData10(code, el) {
-      var data = el.target.value * 10
+      var data = el.target.value * 10;
       var sendData = {
         target: {
-          value: data
-        }
-      }
-      this.change(code, sendData)
+          value: data,
+        },
+      };
+      this.change(code, sendData);
     },
     handleCommand(command) {
       if (command == "1") {
@@ -613,33 +1107,32 @@ export default {
         this.model4 = true;
       }
       this.inputData[10 + (this.indexs - 1) + "53"] = command;
-      this.get53data(command)
+      this.get53data(command);
       var data53 = {
         target: {
           value: this.inputData[10 + (this.indexs - 1) + "53"],
         },
-      }
+      };
       this.changeBtn(10 + (this.indexs - 1) + "53", data53);
-
     },
     get53data(index) {
       var data = index;
       var text53 = "";
       if (data == "1") {
-        text53 =  this.$t('irrigateSetSoil.fertilizerMode.timePoint');
+        text53 = this.$t("irrigateSetSoil.fertilizerMode.timePoint");
       } else if (data == "2") {
-        text53 =  this.$t('irrigateSetSoil.fertilizerMode.timeRange');
+        text53 = this.$t("irrigateSetSoil.fertilizerMode.timeRange");
       } else if (data == "3") {
-        text53 =  this.$t('irrigateSetSoil.fertilizerMode.soilSensor');
+        text53 = this.$t("irrigateSetSoil.fertilizerMode.soilSensor");
       } else if (data == "4") {
-        text53 = this.$t('irrigateSetSoil.fertilizerMode.lightSensor');
+        text53 = this.$t("irrigateSetSoil.fertilizerMode.lightSensor");
       } else if (data == "5") {
-        text53 =  this.$t('irrigateSetSoil.fertilizerMode.externalSignal');
+        text53 = this.$t("irrigateSetSoil.fertilizerMode.externalSignal");
       }
       this.data53 = text53;
     },
     change00(index) {
-      this.topActive = index
+      this.topActive = index;
       var list = ["0", "0", "0"];
       if (index == 1) {
         list[0] = "1";
@@ -665,19 +1158,22 @@ export default {
       this.changeBtn(10 + (this.indexs - 1) + "00", dataNum);
     },
     padString(str, length) {
-      return str.padStart(length, '0');
+      return str.padStart(length, "0");
     },
     getType00() {
-      var number = this.padString(this.inputData[10 + (this.indexs - 1) + "00"].toString(2), 3)
+      var number = this.padString(
+        this.inputData[10 + (this.indexs - 1) + "00"].toString(2),
+        3
+      );
 
       if (Number(number[0])) {
-        this.topActive = 1
+        this.topActive = 1;
       } else if (Number(number[1])) {
-        this.topActive = 2
+        this.topActive = 2;
       } else if (Number(number[2])) {
-        this.topActive = 3
+        this.topActive = 3;
       } else {
-        this.topActive = 0
+        this.topActive = 0;
       }
       console.log(this.topActive, 11);
     },
@@ -712,7 +1208,10 @@ export default {
       this.changeBtn(10 + (this.indexs - 1) + "59", dataNum);
     },
     getType() {
-      var number = this.padString(this.inputData[10 + (this.indexs - 1) + "59"].toString(2), 4)
+      var number = this.padString(
+        this.inputData[10 + (this.indexs - 1) + "59"].toString(2),
+        4
+      );
       console.log(number);
       if (Number(number[3])) {
         this.open1 = true;
@@ -738,28 +1237,42 @@ export default {
       }
     },
     dataInit() {
-      var indexs = this.indexs
-      var store = this.$store.state
+      var indexs = this.indexs;
+      var store = this.$store.state;
       var data = {
         equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
         pattern: 10 + (this.indexs - 1) + "00", //需要根据文档填写 //6目标ph-数值
         regNum: 76,
       };
       this.api.postReg(data).then((res) => {
-        this.loading.close()
+        this.loading.close();
         if (res.data.code == 200) {
           this.inputData = res.data.data;
           this.getType();
           this.getType00();
           this.get53data(this.inputData[10 + (this.indexs - 1) + "53"]);
-          this.inputData[10 + (indexs - 1) + '01'] = this.countData10(this.inputData[10 + (indexs - 1) + '01'])
-          this.inputData[10 + (indexs - 1) + '06'] = this.countData10(this.inputData[10 + (indexs - 1) + '06'])
-          this.inputData[10 + (indexs - 1) + '17'] = this.countData10(this.inputData[10 + (indexs - 1) + '17'])
-          this.inputData[10 + (indexs - 1) + '39'] = this.countData10(this.inputData[10 + (indexs - 1) + '39'])
-          this.inputData[10 + (indexs - 1) + '40'] = this.countData10(this.inputData[10 + (indexs - 1) + '40'])
-          this.inputData[10 + (indexs - 1) + '43'] = this.countData10(this.inputData[10 + (indexs - 1) + '43'])
-          this.inputData[10 + (indexs - 1) + '44'] = this.countData10(this.inputData[10 + (indexs - 1) + '44'])
-          this.model4Sel= this.inputData[10 + (indexs - 1) + '71']
+          this.inputData[10 + (indexs - 1) + "01"] = this.countData10(
+            this.inputData[10 + (indexs - 1) + "01"]
+          );
+          this.inputData[10 + (indexs - 1) + "06"] = this.countData10(
+            this.inputData[10 + (indexs - 1) + "06"]
+          );
+          this.inputData[10 + (indexs - 1) + "17"] = this.countData10(
+            this.inputData[10 + (indexs - 1) + "17"]
+          );
+          this.inputData[10 + (indexs - 1) + "39"] = this.countData10(
+            this.inputData[10 + (indexs - 1) + "39"]
+          );
+          this.inputData[10 + (indexs - 1) + "40"] = this.countData10(
+            this.inputData[10 + (indexs - 1) + "40"]
+          );
+          this.inputData[10 + (indexs - 1) + "43"] = this.countData10(
+            this.inputData[10 + (indexs - 1) + "43"]
+          );
+          this.inputData[10 + (indexs - 1) + "44"] = this.countData10(
+            this.inputData[10 + (indexs - 1) + "44"]
+          );
+          this.model4Sel = this.inputData[10 + (indexs - 1) + "71"];
         } else {
           this.$message.error(res.data.msg);
         }
@@ -767,13 +1280,13 @@ export default {
     },
     //全选文本
     selectValue(e) {
-      var store = this.$store.state
-      store.nowInput = e.target.value
+      var store = this.$store.state;
+      store.nowInput = e.target.value;
       e.currentTarget.select();
     },
     //失去焦点
     blurChange10(code, el) {
-      var store = this.$store.state
+      var store = this.$store.state;
       var data = {
         equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
         regAddress: code,
@@ -786,11 +1299,10 @@ export default {
       //     this.timer && clearInterval(this.timer);
       //     this.changeData(data);
       // }
-
     },
     //失去焦点
     blurChange(code, el) {
-      var store = this.$store.state
+      var store = this.$store.state;
       var data = {
         equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
         regAddress: code,
@@ -803,10 +1315,9 @@ export default {
       //     this.timer && clearInterval(this.timer);
       //     this.changeData(data);
       // }
-
     },
     changeBtn(code, el) {
-      var store = this.$store.state
+      var store = this.$store.state;
       var data = {
         equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
         regAddress: code,
@@ -830,12 +1341,10 @@ export default {
         }
       }, 100);
     },
-    changeModel4(){
-
-    },
+    changeModel4() {},
     //间隔灌溉天数
     change(code, el) {
-      var store = this.$store.state
+      var store = this.$store.state;
       var data = {
         equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
         regAddress: code,
@@ -850,7 +1359,6 @@ export default {
       // let j = this.$store.state.lateSend;
       // //避免开启多个计时器
       // this.timer && clearInterval(this.timer);
-
       // this.timer = setInterval(() => {
       //   ++i;
       //   if (i == j) {
@@ -860,20 +1368,20 @@ export default {
       // }, 100);
     },
     changeData(data) {
-      var store = this.$store.state
+      var store = this.$store.state;
       this.api.postWriteFs(data).then((res) => {
         if (res.data.code == 200) {
           this.$message({
             message: res.data.msg,
             type: "success",
           });
-          store.nowInput = ''
+          store.nowInput = "";
           // this.dataInit();
         } else {
-          this.inputData[data.regAddress] = store.nowInput
+          this.inputData[data.regAddress] = store.nowInput;
           this.$message.error(res.data.msg);
         }
-        this.timer = null
+        this.timer = null;
       });
     },
     handleClose1(done) {
@@ -904,7 +1412,7 @@ export default {
       //   })
       //   .catch(_ => {});
     },
-    handleClose5(done) { },
+    handleClose5(done) {},
   },
 };
 </script>
diff --git a/src/views/page/sensorSet.vue b/src/views/page/sensorSet.vue
index 2d52d120..64a072b5 100644
--- a/src/views/page/sensorSet.vue
+++ b/src/views/page/sensorSet.vue
@@ -1,7 +1,6 @@
 <template>
-    <div class="formula irrigateSet sensorSet">
-        <set-params></set-params>
-        <div class="page-content ">
+    <div class="irrigateSet sensorSet">
+        <div class="">
             <div class="table-title">
                 <img src="../../assets/image/sensor.png" alt=""> {{$t('sensorSet.pageTitle')}}
             </div>
diff --git a/src/views/page/status.vue b/src/views/page/status.vue
index 3db45080..08b4e511 100644
--- a/src/views/page/status.vue
+++ b/src/views/page/status.vue
@@ -13,18 +13,16 @@
                             <div class="input-title">{{$t('status.instantFlow')}}</div>
                             <div class="input">{{ countData(inputData['28']) }}</div>
                         </div>
-                    </div>
-                    <div>
-                        <div class="input-50">
+                         <div class="input-50">
                             <div class="input-title">{{$t('status.currentVolume')}}</div>
                             <div class="input">{{ countData(inputData['37']) }}</div>
                         </div>
+                    </div>
+                    <div>
                         <div class="input-50">
                             <div class="input-title">{{$t('status.startupMethod')}}</div>
                             <div class="input green">{{ openType }}</div>
                         </div>
-                    </div>
-                    <div>
                         <div class="input-50">
                             <div class="input-title">{{$t('status.formulaNumber')}}</div>
                             <div class="input">{{ countData(inputData['31']) }}</div>
@@ -34,6 +32,14 @@
                             <div class="input">{{ countData(inputData['38']) }}</div>
                         </div>
                     </div>
+                     <!-- <div>
+                        <div class="input-50">
+                            <div class="input-title">什么方式启动搅拌</div>
+                            <div class="input green">{{ openTypeStir }}</div>
+                        </div>
+                         
+                          
+                    </div> -->
                     <div class="left-btn">
                         <div :class="left1Act[1]==1 ? 'active' : ''">{{$t('status.inletPump')}}</div>
                         <div :class="left1Act[0]==1 ? 'active' : ''">{{$t('status.fertilizerPump')}}</div>
@@ -45,10 +51,21 @@
                 <div class="main-title"><span>{{$t('status.fertilizerIntensity')}} </span></div>
                 <div class="view-content">
                     <div v-for="item, index in left2List" :key="index">
-                        <div class="left" :style="item.img ? `background: url(${item.img}) no-repeat center;` : ''"><span>{{
-                            item.title }}</span></div>
-                        <div class="name">{{ item.name }}</div>
-                        <div class="number">{{ item.number }}</div>
+                        <div class="left"><span>{{
+                            item.name }}</span></div>
+                       
+                        <div class="right">
+                            <div class="flex">
+                                 <div class="name">强度</div>
+                             <div class="number">{{ item.number }}</div>
+                            </div>
+                             <div class="line"></div>
+                            <div class="flex">
+                              <div class="name">速度</div>
+                         
+                             <div class="number">{{ item.speed }}<span>L/h</span></div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -123,11 +140,17 @@
                 </div>
             </div>
             <div class="right-view3">
-                <div class="main-title"><span>{{$t('status.fertilizationSpeed')}} (L/h) </span></div>
+                <div class="main-title"><span>{{$t('status.fertilizationSpeed')}}</span>
+                <div class="right"><span>启动方式: </span>
+                     <div class="input-50">
+                            <div class="input">{{openTypeStir}}</div>
+                        </div></div>
+                </div>
                 <div class="view-content">
-                    <div v-for="item, index in rightList3" :key="index">
+                    <div class="grid" :class="rightList3Show[index]==1?'active':''"  v-for="item, index in rightList3" :key="index">
+                         <div>
                         <div class="name">{{ item.name }}</div>
-                        <div class="number">{{ item.number }}</div>
+                    </div>
                     </div>
                 </div>
             </div>
@@ -142,8 +165,10 @@ export default {
             pageTimer: null,
             left1Act: [0,0],
             openType: '',
+            openTypeStir:'',
             centerAct: 0,
             right2Index: [],
+            rightList3Show:[],
             inputData: [],
             deviceDetail: null,
             centerBottom: [],
@@ -172,41 +197,55 @@ export default {
                     title: 'A',
                     name: this.$t('status.fertilizerTypes.a'),
                     number: '26%',
+                    speed:0,
                     img: ''
                 }, {
                     title: 'B',
                     name: this.$t('status.fertilizerTypes.b'),
                     number: '26%',
+                    speed:0,
                     img: ''
                 }, {
                     title: 'C',
                     name: this.$t('status.fertilizerTypes.c'),
                     number: '26%',
+                    speed:0,
                     img: ''
                 }, {
                     title: 'D',
                     name: this.$t('status.fertilizerTypes.d'),
                     number: '26%',
+                    speed:0,
                     img: ''
                 }, {
                     title: 'E',
                     name: this.$t('status.fertilizerTypes.e'),
                     number: '26%',
+                    speed:0,
                     img: ''
                 }, {
                     title: 'F',
                     name: this.$t('status.fertilizerTypes.f'),
                     number: '26%',
+                    speed:0,
                     img: ''
                 }, {
                     title: 'G',
                     name: this.$t('status.fertilizerTypes.g'),
                     number: '26%',
+                    speed:0,
                     img: ''
                 }, {
+                    title: 'H',
+                    name: this.$t('status.fertilizerTypes.h'),
+                    number: '26%',
+                    speed:0,
+                    img: ''
+                },{
                     title: '',
                     name: this.$t('status.fertilizerTypes.acid'),
                     number: '26%',
+                    speed:0,
                     img: require('../../assets/image/left2-icon1.png')
                 },
             ]
@@ -216,28 +255,22 @@ export default {
             var data=[
                 {
                     name: this.$t('status.fertilizerTypes.a'),
-                    number: '0',
                 }, {
                     name: this.$t('status.fertilizerTypes.b'),
-                    number: '0',
                 }, {
                     name: this.$t('status.fertilizerTypes.c'),
-                    number: '0',
                 }, {
                     name: this.$t('status.fertilizerTypes.d'),
-                    number: '0',
                 }, {
                     name: this.$t('status.fertilizerTypes.e'),
-                    number: '0',
                 }, {
                     name: this.$t('status.fertilizerTypes.f'),
-                    number: '0',
                 }, {
                     name: this.$t('status.fertilizerTypes.g'),
-                    number: '0',
                 }, {
-                    name: this.$t('status.fertilizerTypes.acidFertilizer'),
-                    number: '0',
+                    name: this.$t('status.fertilizerTypes.h'),
+                }, {
+                    name: this.$t('status.fertilizerTypes.acid'),
                 },
             ]
             return data
@@ -458,16 +491,23 @@ export default {
             }
         },
         getrightList3() {
-            var list = [19, 20, 21, 22, 23, 24, 25, 27]
-            list.forEach((el, index) => {
-                this.rightList3[index].number = this.inputData[el]
-            })
+            // var num = this.inputData['82']
+            var num = this.inputData['82']
+
+            var num1 = this.padString(num.toString(2), 8)
+            var openListNew = []
+            openListNew = num1.split("")
+            this.rightList3Show = openListNew.reverse();
         },
         getleft2List() {
-            var list = [10, 11, 12, 13, 14, 15, 16, 18]
+            var list = [10, 11, 12, 13, 14, 15, 16,17, 18]
             list.forEach((el, index) => {
                 this.left2List[index].number = this.inputData[el] + '%'
             })
+               var list1 = [19, 20, 21, 22, 23, 24, 25,26, 27]
+            list1.forEach((el, index) => {
+                 this.left2List[index].speed = this.inputData[el]
+            })
         },
         countData(data) {
             if (data) {
@@ -485,6 +525,19 @@ export default {
             } else {
                 return 0
             }
+        },
+         getType81(list) {
+          if(list[0]==1){
+            return '定时启动'
+          }else if(list[1]==1){
+            return '间隔启动'
+          }else if(list[2]==1){
+            return '联动启动'
+          }else if(list[3]==1){
+            return '手动启动'
+          }else{
+            return '无'
+          }
         },
         getType29(index) {
           if (index == 5) {
@@ -519,22 +572,15 @@ export default {
                 }
             }
             this.openType = this.getType29(typeNumber)
+        },
+        //什么方式启动的搅拌
+        getData81() {
+            var number = this.padString(this.inputData['81'].toString(2), 4)
 
-            // var statusIndex = 8
-            // var list=[]
-         
-            // for (var j = 0; j < statusIndex; j++) {
-            //     if (Number(number[number.length - 1 - j])) {
-            //         if (j == 0) {
-            //             list.push('1')
-            //         } else if (j == 1) {
-            //             list.push('0')
-            //         } else {
-            //             list.push(j)
-            //         }
-            //     }
-            // }
-            // this.right2Index=list
+              var openListNew = []
+            openListNew = number.split("")
+            var stirList = openListNew.reverse();
+            this.openTypeStir = this.getType81(stirList)
         },
         //进水泵和出水泵状态
         getData30() {
@@ -559,7 +605,7 @@ export default {
             var data = {
                 "equipmentId": deviceDetail.deviceId,
                 "pattern": 0,//需要根据文档填写 //6目标ph-数值
-                "regNum": 72
+                "regNum": 81
             }
             var week = [
                 "星期日",
@@ -575,7 +621,7 @@ export default {
                     this.inputData = res.data.data;
                     this.getData30()    //数据30/进水出水泵
                     this.getData29()//数据29 启动方式/信号
-
+                    this.getData81()
 
                     this.getleft2List()//获取左下角数据
                     this.getrightList3()//获取又下角数据
@@ -633,7 +679,27 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-
+    .main-title{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .right{
+            display: flex;
+        align-items: center;
+        flex-shrink: 0;
+        .input-50{
+            width: 100px;
+            height: 40px;
+        flex-shrink: 0;
+        .input{
+            line-height: 40px;
+            height: 40px;
+            font-weight: bold;
+            color: #3CFDFF;
+        }
+        }
+        }
+    }
     >div {
         height: 100%;
     }
@@ -649,7 +715,8 @@ export default {
             width: 100%;
 
             .view-content {
-                height: 400px;
+                // height: 400px;
+                height: 270px;
                 padding: 20px 16px 37px;
                 display: flex;
                 flex-direction: column;
@@ -700,20 +767,20 @@ export default {
             width: 100%;
 
             .view-content {
-                height: 321px;
+                height: 430px;
                 display: grid;
                 grid-template-columns: repeat(2, 1fr);
-                grid-row-gap: 10px; //纵向间隔
-                grid-column-gap: auto; //横向间隔
-                padding: 20px 20px 0;
+                grid-row-gap: 5px; //纵向间隔
+                grid-column-gap: 5px; //横向间隔
+                padding: 5px 20px 0;
 
                 >div {
                     display: flex;
                     align-items: center;
 
                     .left {
-                        width: 65px;
-                        height: 65px;
+                        width: 60px;
+                        height: 60px;
                         display: flex;
                         align-items: center;
                         justify-content: center;
@@ -722,7 +789,7 @@ export default {
                         background-size: 100% 100%;
 
                         span {
-                            font-size: 34px;
+                            font-size:18px;
                             font-family: Oswald;
                             font-weight: 500;
                             color: #FFFFFF;
@@ -734,23 +801,41 @@ export default {
                     }
 
                     .name {
-                        font-size: 20px;
+                        font-size: 16px;
                         font-family: Alibaba PuHuiTiR;
                         font-weight: 400;
                         color: #FFFFFF;
-                        width: 49px;
+                        // width: 49px;
                         padding-left: 5px;
+                        margin-right: 5px;
+                    }
+                    .line{
+                        width: 100%;
+                        height: 1px;
+                        background: rgba(52, 175, 246,0.5);
                     }
 
+                    .right{
+width: calc(100% - 65px);
+                    }
+                    .flex{
+                        display: flex;
+                        align-items: center;
+                    }
                     .number {
-                        font-size: 32px;
+                        // width: 100%;
+                        font-size: 24px;
                         font-family: Oswald;
                         font-weight: 500;
                         color: #FFFFFF;
-
+                        line-height: 26px;
                         background: linear-gradient(180deg, #34AFF6 0%, #EDFDFF 100%);
                         -webkit-background-clip: text;
                         -webkit-text-fill-color: transparent;
+                        span{
+                            font-size:18px;
+                        font-family: Oswald;
+                        }
                     }
                 }
             }
@@ -772,23 +857,42 @@ export default {
             width: 100%;
 
             .view-content {
-                padding: 20px 20px 0;
+                padding: 0 20px 0;
                 display: grid;
-                grid-template-columns: repeat(4, 1fr);
-                grid-row-gap: 30px; //纵向间隔
-                grid-column-gap: auto; //横向间隔
-
-                >div {
-                    width: 86px;
-                    height: 117px;
-                    background: url(../../assets/image/right-view3.png) no-repeat center;
+                grid-template-columns: repeat(3, 1fr);
+                grid-row-gap: 0px; //纵向间隔
+                grid-column-gap: 10px; //横向间隔
+             
+                .grid{
+                    display: flex;
+                    align-items: center;
+                    justify-content: center; 
+                    &.active{
+                      
+                      >div{
+                           background: url(../../assets/image/right-view3new2.png) no-repeat center;
                     background-size: 100% 100%;
-                    padding-top: 20px;
+
+                     .name {
+                        
+                        background: linear-gradient(0deg, #F9FBFF 0%, #77ff89 100%);
+                        -webkit-background-clip: text;
+                        -webkit-text-fill-color: transparent;
+                    }
+                      }
+                       
+                    }
+                      >div {
+                    width: 86px;
+                    height: 86px;
+                    background: url(../../assets/image/right-view3new.png) no-repeat center;
+                    background-size: 100% 100%;
+                    // padding-top: 20px;
                     display: flex;
                     flex-direction: column;
                     align-items: center;
-                    justify-content: space-between;
-
+                    justify-content: center;
+                   
                     .name {
                         font-size: 20px;
                         font-family: Alibaba PuHuiTi;
@@ -812,6 +916,8 @@ export default {
                         color: #FFFFFF;
                     }
                 }
+                }
+              
             }
         }
 
diff --git a/src/views/page/stir.vue b/src/views/page/stir.vue
new file mode 100644
index 00000000..7ece9a06
--- /dev/null
+++ b/src/views/page/stir.vue
@@ -0,0 +1,866 @@
+<template>
+  <div class="irrigateSet">
+    <div class="table-title">
+      <img src="../../assets/img/intrinsicParameter.png" alt="" />{{ pageName }}
+    </div>
+      <div class="title-tips">控制模式选择
+            <div class="input-btn">
+                <div class="btn btn-tips" @click="changeOpen(0)" :class="inputData['600'] == 0 ? 'green' : 'blue'">
+                    {{ inputData['600'] == 0 ? $t('text.invalid') : $t('text.valid') }}
+                </div>
+            </div>
+        </div>
+    <div class="flex-view">
+      <div class="input-btn">
+        <div
+          class="btn"
+          @click="change00(2)"
+          :class="topActive[2] == 1 ? 'blue' : 'green'"
+        >
+          <img src="../../assets/image/irrigateSet1.png" alt="" />{{
+            $t("text.stop")
+          }}
+        </div>
+        <div
+          class="btn"
+          @click="change00(1)"
+          :class="topActive[1] == 1 ? 'blue' : 'green'"
+        >
+          <img src="../../assets/image/irrigateSet3.png" alt="" />{{
+            $t("text.manual")
+          }}
+        </div>
+        <div
+          class="btn"
+          @click="change00(0)"
+          :class="topActive[0] == 1 ? 'blue' : 'green'"
+        >
+          <img src="../../assets/image/irrigateSet2.png" alt="" />{{
+            $t("text.auto")
+          }}
+        </div>
+      </div>
+    </div>
+    <div class="flex-view border-none padding-none">
+      <div class="input-main-60">
+        <span>手动启动时间</span>
+        <input
+          @blur="blurChange10('601', $event)"
+          v-model="inputData['601']"
+          @input="changeData10('601', $event)"
+          type="text"
+          value="60"
+          placeholder="60"
+        />
+        <span>分</span>
+      </div>
+    </div>
+    <div class="text-tips">手自动启动搅拌电机选择:</div>
+    <div class="flex-view">
+      <div class="input-btn">
+        <div
+          class="btn btn-w70"
+          @click="changeIndexOpen1(0)"
+          :class="actList1[0] == '1' ? 'blue' : 'off'"
+        >
+          A肥
+        </div>
+        <div
+          class="btn btn-w70"
+          @click="changeIndexOpen1(1)"
+          :class="actList1[1] == '1' ? 'blue' : 'off'"
+        >
+          B肥
+        </div>
+        <div
+          class="btn btn-w70"
+          @click="changeIndexOpen1(2)"
+          :class="actList1[2] == '1' ? 'blue' : 'off'"
+        >
+          C肥
+        </div>
+        <div
+          class="btn btn-w70"
+          @click="changeIndexOpen1(3)"
+          :class="actList1[3] == '1' ? 'blue' : 'off'"
+        >
+          D肥
+        </div>
+        <div
+          class="btn btn-w70"
+          @click="changeIndexOpen1(4)"
+          :class="actList1[4] == '1' ? 'blue' : 'off'"
+        >
+          E肥
+        </div>
+        <div
+          class="btn btn-w70"
+          @click="changeIndexOpen1(5)"
+          :class="actList1[5] == '1' ? 'blue' : 'off'"
+        >
+          F肥
+        </div>
+        <div
+          class="btn btn-w70"
+          @click="changeIndexOpen1(6)"
+          :class="actList1[6] == '1' ? 'blue' : 'off'"
+        >
+          G肥
+        </div>
+        <div
+          class="btn btn-w70"
+          @click="changeIndexOpen1(7)"
+          :class="actList1[7] == '1' ? 'blue' : 'off'"
+        >
+          H肥
+        </div>
+        <div
+          class="btn btn-w70"
+          @click="changeIndexOpen1(8)"
+          :class="actList1[8] == '1' ? 'blue' : 'off'"
+        >
+          酸
+        </div>
+      </div>
+    </div>
+    <div class="flex-view padding-none shrink-none">
+      <div class="input-sel input-sel-w180">
+        <span>运行模式选择:</span>
+        <el-dropdown @command="handleCommand1($event, 603)">
+          <div class="el-dropdown-link">
+            <input
+              v-model="inputDataNew[603]"
+              type="text"
+              class="input-input"
+              placeholder="无"
+            />
+            <div class="arrow">
+              <img src="../../assets/image/arrow.png" alt="" />
+            </div>
+          </div>
+          <el-dropdown-menu class="input-menu-180" slot="dropdown">
+            <el-dropdown-item
+              v-for="(item, index) in typeList1"
+              :key="index"
+              :command="item.value"
+              >{{ item.label }}</el-dropdown-item
+            >
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </div>
+    <!-- 时间点模式 -->
+    <!--  -->
+    <block v-show="inputData['603'] == 1">
+      <template>
+        <div class="title-tips-bold">时间点模式：</div>
+        <div class="flex-view border-none padding-none shrink-none">
+          <div class="input-main-60">
+            <span>每次启动时长</span>
+            <input
+              @blur="blurChange10('604', $event)"
+              v-model="inputData['604']"
+              @input="changeData10('604', $event)"
+              type="text"
+              value="60"
+              placeholder="60"
+            />
+            <span>分</span>
+          </div>
+        </div>
+        <div class="flex-view border-none padding-none shrink-none">
+          <div class="number circle">1</div>
+          <div class="input-main-60">
+            <input
+              @blur="blurChange('605', $event)"
+              v-model="inputData['605']"
+              @input="change('605', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>:</span>
+            <input
+              @blur="blurChange('606', $event)"
+              v-model="inputData['606']"
+              @input="change('606', $event)"
+              type="number"
+              placeholder="0"
+            />
+          </div>
+        </div>
+        <div class="flex-view border-none padding-none shrink-none">
+          <div class="number circle">2</div>
+          <div class="input-main-60">
+            <input
+              @blur="blurChange('607', $event)"
+              v-model="inputData['607']"
+              @input="change('607', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>:</span>
+            <input
+              @blur="blurChange('608', $event)"
+              v-model="inputData['608']"
+              @input="change('608', $event)"
+              type="number"
+              placeholder="0"
+            />
+          </div>
+        </div>
+        <div class="flex-view border-none padding-none shrink-none">
+          <div class="number circle">3</div>
+          <div class="input-main-60">
+            <input
+              @blur="blurChange('609', $event)"
+              v-model="inputData['609']"
+              @input="change('609', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>:</span>
+            <input
+              @blur="blurChange('610', $event)"
+              v-model="inputData['610']"
+              @input="change('610', $event)"
+              type="number"
+              placeholder="0"
+            />
+          </div>
+        </div>
+        <div class="flex-view border-none padding-none shrink-none">
+          <div class="number circle">4</div>
+          <div class="input-main-60">
+            <input
+              @blur="blurChange('611', $event)"
+              v-model="inputData['611']"
+              @input="change('611', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>:</span>
+            <input
+              @blur="blurChange('612', $event)"
+              v-model="inputData['612']"
+              @input="change('612', $event)"
+              type="number"
+              placeholder="0"
+            />
+          </div>
+        </div>
+        <div class="flex-view padding-none shrink-none">
+          <div class="number circle">5</div>
+          <div class="input-main-60">
+            <input
+              @blur="blurChange('613', $event)"
+              v-model="inputData['613']"
+              @input="change('613', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>:</span>
+            <input
+              @blur="blurChange('614', $event)"
+              v-model="inputData['614']"
+              @input="change('614', $event)"
+              type="number"
+              placeholder="0"
+            />
+          </div>
+        </div>
+      </template>
+    </block>
+
+    <!-- 时间段模式 -->
+    <!--  -->
+    <block v-show="inputData['603'] == 2">
+      <template>
+        <div class="title-tips-bold">时间段模式：</div>
+        <div class="flex-view border-none padding-none shrink-none">
+          <div class="input-main-60">
+            <span>每次启动时长</span>
+            <input
+              @blur="blurChange10('615', $event)"
+              v-model="inputData['615']"
+              @input="changeData10('615', $event)"
+              type="text"
+              value="60"
+              placeholder="60"
+            />
+            <span>分</span>
+          </div>
+        </div>
+        <div class="flex-view border-none padding-none shrink-none">
+          <div class="number circle">1</div>
+          <div class="input-main-60">
+            <input
+              @blur="blurChange('617', $event)"
+              v-model="inputData['617']"
+              @input="change('617', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>:</span>
+            <input
+              @blur="blurChange('618', $event)"
+              v-model="inputData['618']"
+              @input="change('618', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>-</span>
+            <input
+              @blur="blurChange('619', $event)"
+              v-model="inputData['619']"
+              @input="change('619', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>:</span>
+            <input
+              @blur="blurChange('620', $event)"
+              v-model="inputData['620']"
+              @input="change('620', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span style="font-size: 16px">{{
+              $t("irrigateSetSoil.intervalStart.timesInRange")
+            }}</span>
+            <input
+              @blur="blurChange('616', $event)"
+              v-model="inputData['616']"
+              @input="change('616', $event)"
+              type="number"
+              placeholder="0"
+            />
+          </div>
+        </div>
+        <div class="flex-view shrink-none">
+          <div class="number circle">2</div>
+          <div class="input-main-60">
+            <input
+              @blur="blurChange('622', $event)"
+              v-model="inputData['622']"
+              @input="change('622', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>:</span>
+            <input
+              @blur="blurChange('623', $event)"
+              v-model="inputData['623']"
+              @input="change('623', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>-</span>
+            <input
+              @blur="blurChange('624', $event)"
+              v-model="inputData['624']"
+              @input="change('624', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span>:</span>
+            <input
+              @blur="blurChange('625', $event)"
+              v-model="inputData['625']"
+              @input="change('625', $event)"
+              type="number"
+              placeholder="0"
+            />
+            <span style="font-size: 16px">{{
+              $t("irrigateSetSoil.intervalStart.timesInRange")
+            }}</span>
+            <input
+              @blur="blurChange('621', $event)"
+              v-model="inputData['621']"
+              @input="change('621', $event)"
+              type="number"
+              placeholder="0"
+            />
+          </div>
+        </div>
+      </template>
+    </block>
+
+    <!-- 联动模式 -->
+    <!--  -->
+    <block v-show="inputData['603'] == 3">
+      <template>
+        <div class="title-tips-bold">联动模式：</div>
+        <div class="flex-view shrink-none">
+          <div class="input-main-60">
+            <span>施肥机启动时提前</span>
+            <input
+              @blur="blurChange('626', $event)"
+              v-model="inputData['626']"
+              @input="change('626', $event)"
+              type="text"
+              value="60"
+              placeholder="60"
+            />
+            <span>秒，联动施肥配方搅拌。</span>
+          </div>
+        </div>
+      </template>
+    </block>
+
+    <div class="flex-view padding-none border-none shrink-none">
+      <div class="input-main-60">
+        <span>A肥搅拌通道选择</span>
+        <input
+          @blur="blurChange('627', $event)"
+          v-model="inputData['627']"
+          @input="change('627', $event)"
+          type="text"
+          value="60"
+          placeholder="60"
+        />
+      </div>
+      <span></span>
+      <div class="input-main-60">
+        <span>B肥搅拌通道选择</span>
+        <input
+          @blur="blurChange('628', $event)"
+          v-model="inputData['628']"
+          @input="change('628', $event)"
+          type="text"
+          value="60"
+          placeholder="60"
+        />
+      </div>
+      <span></span>
+      <div class="input-main-60">
+        <span>C肥搅拌通道选择</span>
+        <input
+          @blur="blurChange('629', $event)"
+          v-model="inputData['629']"
+          @input="change('629', $event)"
+          type="text"
+          value="60"
+          placeholder="60"
+        />
+      </div>
+    </div>
+
+    <div class="flex-view padding-none border-none shrink-none">
+      <div class="input-main-60">
+        <span>D肥搅拌通道选择</span>
+        <input
+          @blur="blurChange('630', $event)"
+          v-model="inputData['630']"
+          @input="change('630', $event)"
+          type="text"
+          value="60"
+          placeholder="60"
+        />
+      </div>
+      <span></span>
+       <div class="input-main-60">
+        <span>E肥搅拌通道选择</span>
+        <input
+          @blur="blurChange('631', $event)"
+          v-model="inputData['631']"
+          @input="change('631', $event)"
+          type="text"
+          value="60"
+          placeholder="60"
+        />
+      </div>
+      <span></span>
+      <div class="input-main-60">
+        <span>F肥搅拌通道选择</span>
+        <input
+          @blur="blurChange('632', $event)"
+          v-model="inputData['632']"
+          @input="change('632', $event)"
+          type="text"
+          value="60"
+          placeholder="60"
+        />
+      </div>
+    
+    </div>
+
+    <div class="flex-view padding-none border-none shrink-none">
+        <div class="input-main-60">
+        <span>G肥搅拌通道选择</span>
+        <input
+          @blur="blurChange('633', $event)"
+          v-model="inputData['633']"
+          @input="change('633', $event)"
+          type="text"
+          value="60"
+          placeholder="60"
+        />
+      </div>
+      <span></span>
+      <div class="input-main-60">
+        <span>H肥搅拌通道选择</span>
+        <input
+          @blur="blurChange('634', $event)"
+          v-model="inputData['634']"
+          @input="change('634', $event)"
+          type="text"
+          value="60"
+          placeholder="60"
+        />
+      </div>
+      <span></span>
+      <div class="input-main-60">
+        <span>酸搅拌通道选择</span>
+        <input
+          @blur="blurChange('635', $event)"
+          v-model="inputData['635']"
+          @input="change('635', $event)"
+          type="text"
+          value="60"
+          placeholder="60"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      topActive: 1,
+      inputData: [],
+      inputDataNew: [],
+      actList1: [],
+      loading: null,
+      pageName: "搅拌配置",
+      typeList1: [
+        { label: "时间点模式", value: 1 },
+        { label: "时间段模式", value: 2 },
+        { label: "联动模式", value: 3 },
+      ],
+    };
+  },
+  watch: {
+    $route(newVal, oldVal) {
+      const that = this;
+      this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+      if (this.$route.query.name) {
+        this.pageName = this.$route.query.name;
+      }
+      setTimeout(() => {
+        that.getActive1();
+      }, 0);
+    },
+    "$store.state.equipmentIndex"(newVal, oldVal) {
+      this.dataInit();
+    },
+  },
+  mounted() {
+    const that = this;
+    this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+
+    setTimeout(() => {
+      that.dataInit();
+    }, 0);
+    //input获取焦点后全选
+    let inputList = document.querySelectorAll("input");
+    for (let index = 0; index < inputList.length; index++) {
+      inputList[index].onfocus = this.selectValue; //input放入焦点，全选文本
+    }
+    if (this.$route.query.name) {
+      this.pageName = this.$route.query.name;
+    }
+  },
+  methods: {
+    //失去焦点 计算公式 x/10
+    blurChange10(code, el) {
+      var store = this.$store.state;
+      var data = {
+        equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
+        regAddress: code,
+        num: el.target.value * 10,
+      }; //避免开启多个计时器
+      if (store.nowInput != el.target.value) {
+        this.changeData(data);
+      }
+      // if (this.timer) {
+      //     this.timer && clearInterval(this.timer);
+      //     this.changeData(data);
+      // }
+    },
+    //反向计算 计算公式 x/10
+    changeCount10(code, el) {
+      var data = el.target.value * 10;
+      var sendData = {
+        target: {
+          value: data,
+        },
+      };
+      this.change(code, sendData);
+    },
+    // 计算展示值 计算公式 x/10
+    countData10(data) {
+      if (data) {
+        return data / 10;
+      } else {
+        return 0;
+      }
+    },
+    // 计算展示值 计算公式 (x - 400) / 10
+    countData(data) {
+      if (data) {
+        return (data - 400) / 10;
+      } else {
+        return 0;
+      }
+    },
+    //失去焦点
+    blurChangeCount(code, el) {
+      var store = this.$store.state;
+      var data = {
+        equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
+        regAddress: code,
+        num: el.target.value * 10 + 400,
+      }; //避免开启多个计时器
+      if (store.nowInput != el.target.value) {
+        this.changeData(data);
+      }
+      // if (this.timer) {
+      //     this.timer && clearInterval(this.timer);
+      //     this.changeData(data);
+      // }
+    },
+    changeCountData(code, el) {
+      var data = el.target.value * 10 + 400;
+      var sendData = {
+        target: {
+          value: data,
+        },
+      };
+      this.change(code, sendData);
+    },
+    getData1(data) {
+      var name = "";
+      this.typeList1.forEach((el, index) => {
+        if (el.value == data) {
+          name = el.label;
+        }
+      });
+      return name;
+    },
+    handleCommand1(command, code) {
+      this.typeList1.forEach((el, index) => {
+        if (el.value == command) {
+          this.inputDataNew[code] = el.label;
+        }
+      });
+      this.inputData[code] = command;
+      var dataNum = {
+        target: {
+          value: command,
+        },
+      };
+      this.changeBtn(code, dataNum);
+    },
+    changeIndexOpen1(active) {
+      if (this.actList1[active] == "1") {
+        this.actList1[active] = "0";
+      } else {
+        this.actList1[active] = "1";
+      }
+      this.$forceUpdate();
+      var revList = this.actList1.slice().reverse();
+      var num = revList.join("");
+      var dataNum = {
+        target: {
+          value: parseInt(num, 2),
+        },
+      };
+      this.changeBtn(602, dataNum);
+    },
+    getActive1() {
+      this.actList1 = [];
+      var num = this.inputData["602"];
+
+      var num1 = this.padString(num.toString(2), 8);
+      var openListNew = [];
+      openListNew = num1.split("");
+      this.actList1 = openListNew.reverse();
+    },
+
+    // 工作方式选择
+    changeOpen(index) {
+      this.inputData['600'] = index;
+      var dataNum = {
+        target: {
+          value: index,
+        },
+      };
+      
+          this.getType00();
+      this.changeBtn('600', dataNum);
+    },
+    change00(index) {
+      var list = ["0", "0", "0"];
+      list[index] = "1";
+      this.topActive = list;
+      this.$forceUpdate();
+      var revList = list.slice().reverse();
+      var num = revList.join("");
+      var dataNum = {
+        target: {
+          value: parseInt(num, 2),
+        },
+      };
+      this.inputData['600']=parseInt(num, 2)
+      this.changeBtn("600", dataNum);
+    },
+    getType00() {
+      var number = this.padString(this.inputData["600"].toString(2), 3);
+      console.log(number);
+      var openListNew = [];
+      openListNew = number.split("");
+      this.topActive = openListNew.reverse();
+      // if (Number(number[0])) {
+      //   this.topActive = 1
+      // } else if (Number(number[1])) {
+      //   this.topActive = 2
+      // } else if (Number(number[2])) {
+      //   this.topActive = 3
+      // } else {
+      //   this.topActive = 0
+      // }
+    },
+    dataInit() {
+      this.loading = this.$loading({
+        lock: true,
+        text: this.$t("message.loading"),
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      var store = this.$store.state;
+      var data = {
+        equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
+        pattern: 600, //需要根据文档填写 //6目标ph-数值
+        regNum: 36,
+      };
+      this.api.postReg(data).then((res) => {
+        this.loading.close();
+        if (res.data.code == 200) {
+          this.inputData = res.data.data;
+          this.inputDataNew = JSON.parse(JSON.stringify(res.data.data));
+
+          this.getType00();
+
+          this.getActive1();
+
+          this.inputDataNew[603] = this.getData1(this.inputData[603]);
+
+          this.inputData[601] = this.countData10(this.inputData[601]);
+          this.inputData[604] = this.countData10(this.inputData[604]);
+          this.inputData[615] = this.countData10(this.inputData[615]);
+        }
+      });
+    },
+    //二进制转换后的补全
+    padString(str, length) {
+      return str.padStart(length, "0");
+    },
+    //反转数组 不影响原数组
+    myReverse(arr) {
+      return [...arr].reverse();
+    },
+    //全选文本
+    selectValue(e) {
+      var store = this.$store.state;
+      store.nowInput = e.target.value;
+      e.currentTarget.select();
+    },
+    //失去焦点
+    blurChange(code, el) {
+      var store = this.$store.state;
+      var data = {
+        equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
+        regAddress: code,
+        num: el.target.value,
+      }; //避免开启多个计时器
+      console.log(store.nowInput, el.target.value);
+      if (store.nowInput != el.target.value) {
+        this.changeData(data);
+      }
+      // if (this.timer) {
+      //     this.timer && clearInterval(this.timer);
+      //     this.changeData(data);
+      // }
+    },
+    //修改数据的函数
+    changeBtn(code, el) {
+      var store = this.$store.state;
+      var data = {
+        equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
+        regAddress: code,
+        num: el.target.value,
+      };
+      this.delayTimerBtn(0, data);
+    },
+    //切换btn的限制 写入停止后j*100毫秒调取函数
+    delayTimerBtn(i, data) {
+      const that = this;
+      //整体接口
+      let j = this.$store.state.lateSendBtn;
+      //避免开启多个计时器
+      this.timer && clearInterval(this.timer);
+
+      this.timer = setInterval(() => {
+        ++i;
+        if (i == j) {
+          that.changeData(data);
+          clearInterval(this.timer);
+        }
+      }, 100);
+    },
+    change(code, el) {
+      var store = this.$store.state;
+      var data = {
+        equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
+        regAddress: code,
+        num: el.target.value,
+      };
+      this.delayTimer(0, data);
+    },
+    //限制 写入停止后j*100毫秒调取函数
+    delayTimer(i, data) {
+      // const that = this;
+      // //整体接口
+      // let j = this.$store.state.lateSend;
+      // //避免开启多个计时器
+      // this.timer && clearInterval(this.timer);
+      // this.timer = setInterval(() => {
+      //     ++i;
+      //     if (i == j) {
+      //         that.changeData(data);
+      //         clearInterval(this.timer);
+      //     }
+      // }, 100);
+    },
+    changeData(data) {
+      var store = this.$store.state;
+      this.api.postWriteFs(data).then((res) => {
+        if (res.data.code == 200) {
+          this.$message({
+            message: res.data.msg,
+            type: "success",
+          });
+          store.nowInput = "";
+          // this.dataInit();
+        } else {
+          this.inputData[data.regAddress] = store.nowInput;
+          this.$message.error(res.data.msg);
+        }
+        this.timer = null;
+      });
+    },
+  },
+};
+</script>
+<style lang="scss"></style>
\ No newline at end of file
diff --git a/src/views/page/systemSet.vue b/src/views/page/systemSet.vue
index 8fe414b8..16d9cddc 100644
--- a/src/views/page/systemSet.vue
+++ b/src/views/page/systemSet.vue
@@ -1,7 +1,6 @@
 <template>
-    <div class="formula irrigateSet systemSet">
-        <set-params></set-params>
-        <div class="page-content ">
+    <div class="irrigateSet systemSet">
+        <div class="">
             <div class="export">
                 <label for="upInput">
                     <div class="export-btn">{{ $t('systemSet.importSettings') }}</div>
diff --git a/src/views/page/upload.vue b/src/views/page/upload.vue
index f420e306..0b1a5649 100644
--- a/src/views/page/upload.vue
+++ b/src/views/page/upload.vue
@@ -1,7 +1,6 @@
 <template>
-    <div class="formula irrigateSet upload">
-        <set-params></set-params>
-        <div class="page-content ">
+    <div class="irrigateSet upload">
+        <div class="">
             <div class="table-title">
                 <img src="../../assets/image/upload.png" alt=""> {{$t('upload.dataUpload')}}
             </div>
diff --git a/vue.config.js b/vue.config.js
index 5ced73b8..674db9de 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -45,6 +45,7 @@ module.exports = {
       proxy: {
         "/api": {
           target: 'https://api.lihe-control.com', //地址
+          // target: 'http://jiaxingtest.f1.luyouxia.net:13996', //地址
           // target: 'http://jiaxingtest.a1.luyouxia.net:21114', //地址
           // target: 'http://jiaxingtest.e1.luyouxia.top:19159', //地址
           // target: 'http://jiaxingtest.a1.luyouxia.net:25762', //地址