9/13下午提交

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;
@@ -1842,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;
@@ -1850,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;
@@ -1907,31 +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 .title, .el-dialog__wrapper .el-dialog .el-dialog__body .model1-bottom .number {
+.model1-bottom .title, .model1-bottom .number {
   color: #fff;
 }
 
-.el-dialog__wrapper .el-dialog .el-dialog__body .model1-bottom.model3-bottom .title {
+.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;
@@ -1942,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;
 }
 

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%;
@@ -1935,7 +1954,12 @@ textarea {
                 justify-content: flex-end;
             }
 
-            .model1-top {
+          
+        }
+    }
+}
+
+.model1-top {
     padding: 20px 15px;
     border-bottom: 1px solid rgba(0, 180, 255, 0.35);
     display: flex;
@@ -2010,9 +2034,9 @@ textarea {
             }
         }
     }
-            }
+}
 
-            .model1-bottom {
+.model1-bottom {
     padding: 20px 15px;
     border-bottom: 1px solid rgba(0, 180, 255, 0.35);
     .title,.number{
@@ -2065,17 +2089,12 @@ textarea {
 
             >div {
                 display: block;
-                            width: calc(100% / 3);
+                // width: calc(100% / 3);
                 flex-shrink: 0;
             }
         }
     }
-            }
-        }
-    }
 }
-
-
 .login {
     color: #fff;
 

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' },
                 {
@@ -80,6 +83,40 @@ 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, },]
+                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
+           }))
+                },
+                { 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, },]
+            }
             setTimeout(() => {
                   this.getList()
             }, 0);

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,
+                        };
+                    });
         }
       })
     },

src/views/page/stir.vue

@@ -3,9 +3,15 @@
     <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">
-        <span>控制模式选择</span>
         <div
           class="btn"
           @click="change00(2)"
@@ -451,6 +457,18 @@
           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>
@@ -463,7 +481,10 @@
           placeholder="60"
         />
       </div>
-      <span></span>
+    
+    </div>
+
+    <div class="flex-view padding-none border-none shrink-none">
         <div class="input-main-60">
         <span>G肥通道选择</span>
         <input
@@ -475,9 +496,7 @@
           placeholder="60"
         />
       </div>
-    </div>
+      <span></span>
-
-    <div class="flex-view padding-none border-none shrink-none">
       <div class="input-main-60">
         <span>H肥通道选择</span>
         <input
@@ -671,13 +690,15 @@ export default {
 
     // 工作方式选择
     changeOpen(index) {
-      this.inputData[21400] = index;
+      this.inputData['600'] = index;
       var dataNum = {
         target: {
           value: index,
         },
       };
-      this.changeBtn(21400, dataNum);
+      
+          this.getType00();
+      this.changeBtn('600', dataNum);
     },
     change00(index) {
       var list = ["0", "0", "0"];
@@ -691,6 +712,7 @@ export default {
           value: parseInt(num, 2),
         },
       };
+      this.inputData['600']=parseInt(num, 2)
       this.changeBtn("600", dataNum);
     },
     getType00() {

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', //地址