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

Reviewed-on: #167

src/api/index.js

@@ -14,7 +14,7 @@ function sendGetRequest(url, data) {
       params: data
     })
       .then(function (res) { //请求成功，response接收返回参数
-        if (res.data.code == 403) {
+        if (res.data.code == 401) {
           localStorage.removeItem('token')
           router.push({
             name: 'login'
@@ -41,7 +41,7 @@ function sendUploadRequest(url, data) {
       }
     }).then(
       (res) => {
-        if (res.data.code == 403) {
+        if (res.data.code == 401) {
           localStorage.removeItem('token')
           router.push({
             name: 'login'

src/views/page/intrinsicParameter-soil.vue

@@ -39,7 +39,7 @@
                         <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">{{
+                        <el-dropdown-item v-for="item, index in typeList2" :key="index" :command="item.value">{{
                             item.label }}</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>

src/views/page/irrigateSet-soil.vue

@@ -443,16 +443,16 @@
         <div class="model1-content model3-content">
           <div class="input-main-80">
             <span class="text">最低土壤湿度</span>
-            <input @blur="blurChange('1' + (10 + (indexs - 1)) + '37', $event)"
+            <input @blur="blurChange10('1' + (10 + (indexs - 1)) + '37', $event)"
               v-model="inputData['1' + (10 + (indexs - 1)) + '37']"
-              @input="change('1' + (10 + (indexs - 1)) + '37', $event)" type="number" placeholder="0" />
+              @input="changeData10('1' + (10 + (indexs - 1)) + '37', $event)" type="number" placeholder="0" />
             <span class="text">%</span>
           </div>
           <div class="input-main-80">
             <span class="text">最高土壤湿度</span>
-            <input @blur="blurChange('1' + (10 + (indexs - 1)) + '38', $event)"
+            <input @blur="blurChange10('1' + (10 + (indexs - 1)) + '38', $event)"
               v-model="inputData['1' + (10 + (indexs - 1)) + '38']"
-              @input="change('1' + (10 + (indexs - 1)) + '38', $event)" type="number" placeholder="0" />
+              @input="changeData10('1' + (10 + (indexs - 1)) + '38', $event)" type="number" placeholder="0" />
             <span class="text">%</span>
           </div>
           <div class="input-main-80">
@@ -547,17 +547,17 @@
           <div>
             <div class="input-main-80">
               <span>液位信号通道</span>
-              <input @blur="blurChange('1' + (10 + (indexs - 1)) + '72', $event)"
-                v-model="inputData['1' + (10 + (indexs - 1)) + '72']"
-                @input="change('1' + (10 + (indexs - 1)) + '72', $event)" type="number" placeholder="0" />
+              <input @blur="blurChange('1' + (10 + (indexs - 1)) + '68', $event)"
+                v-model="inputData['1' + (10 + (indexs - 1)) + '68']"
+                @input="change('1' + (10 + (indexs - 1)) + '68', $event)" type="number" placeholder="0" />
             </div>
           </div>
           <div>
             <div class="input-main-80">
               <span>启动低液位值</span>
-              <input @blur="blurChange('1' + (10 + (indexs - 1)) + '73', $event)"
-                v-model="inputData['1' + (10 + (indexs - 1)) + '73']"
-                @input="change('1' + (10 + (indexs - 1)) + '73', $event)" type="number" placeholder="0" />
+              <input @blur="blurChange('1' + (10 + (indexs - 1)) + '69', $event)"
+                v-model="inputData['1' + (10 + (indexs - 1)) + '69']"
+                @input="change('1' + (10 + (indexs - 1)) + '69', $event)" type="number" placeholder="0" />
               <span>cm</span>
             </div>
 
@@ -565,9 +565,9 @@
           <div>
             <div class="input-main-80">
               <span>停止高液位值</span>
-              <input @blur="blurChange('1' + (10 + (indexs - 1)) + '74', $event)"
-                v-model="inputData['1' + (10 + (indexs - 1)) + '74']"
-                @input="change('1' + (10 + (indexs - 1)) + '74', $event)" type="number" placeholder="0" />
+              <input @blur="blurChange('1' + (10 + (indexs - 1)) + '70', $event)"
+                v-model="inputData['1' + (10 + (indexs - 1)) + '70']"
+                @input="change('1' + (10 + (indexs - 1)) + '70', $event)" type="number" placeholder="0" />
               <span>cm</span>
             </div>
           </div>
@@ -833,6 +833,9 @@ export default {
           this.inputData['1' + (10 + (indexs - 1)) + '40'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '40'])
           this.inputData['1' + (10 + (indexs - 1)) + '43'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '43'])
           this.inputData['1' + (10 + (indexs - 1)) + '44'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '44'])
+          this.inputData['1' + (10 + (indexs - 1)) + '37'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '37'])
+          this.inputData['1' + (10 + (indexs - 1)) + '38'] = this.countData10(this.inputData['1' + (10 + (indexs - 1)) + '38'])
+         
           this.model4Sel = this.inputData['1' + (10 + (indexs - 1)) + '71']
         } else {
           this.$message.error(res.data.msg);

src/views/page/sensorSet-con.vue

@@ -191,7 +191,7 @@
                 <div class="tips-model-tr">
                     <div class="tips-model-text">土湿：</div>
                     <div class="tips-model-text">0</div>
-                    <div class="tips-model-text">-40</div>
+                    <div class="tips-model-text">0</div>
                     <div class="tips-model-text">1000</div>
                     <div class="tips-model-text">100</div>
                 </div>