2020-6-13

yfbch/src/assets/style/scss/examine.scss

@@ -30,6 +30,7 @@
 
 .examine-box .el-dialog {
   width: 5rem;
+  margin-left: 4.5rem;
 }
 
 .examine-box .el-dialog__title {
@@ -65,7 +66,7 @@
 
 .examine-box .el-dialog__body {
   padding: 2px 20px;
-  font-size: 25px;
+  font-size: 15px;
 }
 
 .examine-box .tanchuk1 {
@@ -85,7 +86,7 @@
 }
 
 .examine-box .el-button {
-  font-size: 30px;
+  font-size: 15px;
 }
 
 // 多选框开始
@@ -116,7 +117,7 @@
 // 多选框结束
 
 .examine-box .el-button--primary {
-  font-size: 30px;
+  font-size: 15px;
 }
 
 body {

yfbch/src/components/examine/examine.vue

@@ -747,16 +747,27 @@ export default {
                     this.$message({
                       message: "删除成功",
                       type: "success",
+                      showClose: true,
                       duration: 1500
                     });
                     localStorage.removeItem("defaultID"); //删除默认ID
                     localStorage.removeItem("defaultType"); //删除默认类型
                     _this.refreshData(); //请求数据
                   } else if (res.data.code == null) {
-                    this.$message.error("删除错误，请重试");
+                    this.$message({
+                      showClose: true,
+                      duration: 1500,  
+                      message: "删除错误，请重试",
+                      type: "error"
+                    });
                   }
                 } else {
-                  this.$message.error("请求失败，请查看网络");
+                  this.$message({
+                    showClose: true,
+                    duration: 1500,  
+                    message: "请求失败，请查看网络",
+                    type: "error"
+                  });
                 }
               })
               .catch(err => {
@@ -791,14 +802,25 @@ export default {
                 this.$message({
                   message: "删除成功",
                   type: "success",
-                  duration: 1500
+                  duration: 1500,
+                  showClose: true
                 });
                 _this.refreshData(); //请求数据
               } else if (res.data.code == null) {
-                this.$message.error("删除错误，请重试");
+                this.$message({
+                  showClose: true,
+                  message: "删除错误，请重试",
+                  type: "error",
+                  duration: 1500
+                });
               }
             } else {
-              this.$message.error("请求失败，请查看网络");
+              this.$message({
+                showClose: true,
+                message: "请求失败，请查看网络",
+                type: "error",
+                duration: 1500
+              });
             }
           })
           .catch(err => {
@@ -901,23 +923,6 @@ export default {
       _this.shanShow = false;
     },
 
-    //点击导出触发事件
-    doachu() {
-      this.$notify({
-        title: "提示",
-        message: "此功能暂无法使用，请见谅",
-        duration: 1000
-      });
-    },
-    // 多选导出事件
-    multiple() {
-      this.$notify({
-        title: "提示",
-        message: "此功能暂无法使用，请见谅",
-        duration: 1000
-      });
-    },
-
     //多选删除按钮事件
     del() {
       let _this = this;
@@ -1082,8 +1087,7 @@ export default {
             // window.location.href =
             //   "http://47.104.218:8000/" + res.data[0].file;
 
-            window.location.href =
-              "https://www.yfznscd.com/" + res.data[0].file;
+            window.location.href = "https://www.yfznscd.com/" + res.data[0].file;
 
             _this.shanShow = false;
             _this.checked = [];

yfbch/src/components/insectPlug/insectPlug.vue

@@ -4,209 +4,209 @@
     <!-- <el-header>
       <el-page-header @back="goBack" title content="虫害"></el-page-header>
       <el-button type="primary" class="pathology-btn1" @click="judge()">完成</el-button>
-    </el-header> -->
+    </el-header>-->
 
     <!-- 页面主内容 -->
-      <!-- 主内容列表 -->
-      <ul class="insect-ul">
-        <!-- 虫害名称 -->
-        <li class="insect-li">
-          <img src="../../assets/plantImg/addr.png" alt class="insect-li-imgone dandu" />
-          <div class="insect-li-div">
-            <div>
-              <div class="insect-li-divone danoneA">虫害名称</div>
-            </div>
-
-            <!-- 测试 -->
-            <div class="insect-li-input">
-              <el-input
-                type="text"
-                :rows="10"
-                placeholder="输入要添加的虫害名称"
-                v-model.trim="inputInsect"
-                clearable
-                @blur="animateWidthB()"
-              ></el-input>
-            </div>
-          </div>
-        </li>
-        <!-- 虫害名称 -->
-
-        <!-- 虫害名称 -->
-        <li class="insect-li">
-          <img src="../../assets/imageOne/insect.png" alt class="insect-li-imgone dandu" />
-          <div class="insect-li-div">
+    <!-- 主内容列表 -->
+    <ul class="insect-ul">
+      <!-- 虫害名称 -->
+      <li class="insect-li">
+        <img src="../../assets/plantImg/addr.png" alt class="insect-li-imgone dandu" />
+        <div class="insect-li-div">
+          <div>
             <div class="insect-li-divone danoneA">虫害名称</div>
-            <el-cascader
-              :options="optionsB"
-              v-model="valueA"
-              placeholder="请选择虫害种类"
-              @change="resultB($event)"
-              class="content insectName"
-            ></el-cascader>
           </div>
-        </li>
-
-        <!-- 生育期 -->
-        <li class="insect-li">
-          <img src="../../assets/imageOne/raise.png" alt class="insect-li-imgone dandu" />
-          <div class="insect-li-div">
-            <div>
-              <div class="insect-li-divone danoneA">生育期</div>
-            </div>
 
-            <!-- 测试 -->
-            <div class="insect-li-input">
-              <el-input
-                @blur="animateWidthC()"
-                v-bind:disabled="disabledInput"
-                type="text"
-                :rows="10"
-                placeholder="请输入生育期"
-                v-model.trim="inputC"
-                clearable
-              ></el-input>
-            </div>
+          <!-- 测试 -->
+          <div class="insect-li-input">
+            <el-input
+              type="text"
+              :rows="10"
+              placeholder="输入要添加的虫害名称"
+              v-model.trim="inputInsect"
+              clearable
+              @blur="animateWidthB()"
+            ></el-input>
           </div>
-        </li>
-        <!-- 生育期 -->
-
-        <!-- 统计方法 -->
-        <li class="insect-li">
-          <img src="../../assets/imageOne/danwei.png" alt class="insect-li-imgone dandu2" />
-          <div class="insect-li-div danxuan">
-            <div class="insect-li-divone danxuan2">统计方法</div>
-            <!-- 测试 -->
-            <el-cascader v-model="value" :options="options" @change="handleChange"></el-cascader>
-            <!-- 测试 -->
+        </div>
+      </li>
+      <!-- 虫害名称 -->
+
+      <!-- 虫害名称 -->
+      <li class="insect-li">
+        <img src="../../assets/imageOne/insect.png" alt class="insect-li-imgone dandu" />
+        <div class="insect-li-div">
+          <div class="insect-li-divone danoneA">虫害名称</div>
+          <el-cascader
+            :options="optionsB"
+            v-model="valueA"
+            placeholder="请选择虫害种类"
+            @change="resultB($event)"
+            class="content insectName"
+          ></el-cascader>
+        </div>
+      </li>
+
+      <!-- 生育期 -->
+      <li class="insect-li">
+        <img src="../../assets/imageOne/raise.png" alt class="insect-li-imgone dandu" />
+        <div class="insect-li-div">
+          <div>
+            <div class="insect-li-divone danoneA">生育期</div>
           </div>
-        </li>
-
-        <!-- 作物数量 -->
-        <li class="insect-li">
-          <img src="../../assets/imageOne/number.png" alt class="insect-li-imgone dandu3" />
-          <div class="insect-li-div">
-            <div>
-              <div class="insect-li-divone shuliang">作物数量</div>
-            </div>
 
-            <!-- 测试 -->
-            <div class="insect-li-input">
-              <el-input
-                type="number"
-                :rows="10"
-                placeholder="只能输入数字"
-                v-model.trim="inputA"
-                @blur="animateWidthA()"
-                @focus="animateWidth()"
-                clearable
-              ></el-input>
-            </div>
-            <!-- 测试 -->
+          <!-- 测试 -->
+          <div class="insect-li-input">
+            <el-input
+              @blur="animateWidthC()"
+              v-bind:disabled="disabledInput"
+              type="text"
+              :rows="10"
+              placeholder="请输入生育期"
+              v-model.trim="inputC"
+              clearable
+            ></el-input>
           </div>
-        </li>
-
-        <!--  -->
-        <li class="insect-li ceshi">
-          <img src="../../assets/imageOne/dingwei.png" alt class="insect-li-imgone dandu" />
-          <div class="insect-li-div">
-            <div class="insect-li-divone danone">上传图片</div>
-
-            <!-- 删除 -->
-            <el-button @click="delBtn()" type="primary" v-if="btnShow">删除</el-button>
+        </div>
+      </li>
+      <!-- 生育期 -->
+
+      <!-- 统计方法 -->
+      <li class="insect-li">
+        <img src="../../assets/imageOne/danwei.png" alt class="insect-li-imgone dandu2" />
+        <div class="insect-li-div danxuan">
+          <div class="insect-li-divone danxuan2">统计方法</div>
+          <!-- 测试 -->
+          <el-cascader v-model="value" :options="options" @change="handleChange"></el-cascader>
+          <!-- 测试 -->
+        </div>
+      </li>
+
+      <!-- 作物数量 -->
+      <li class="insect-li">
+        <img src="../../assets/imageOne/number.png" alt class="insect-li-imgone dandu3" />
+        <div class="insect-li-div">
+          <div>
+            <div class="insect-li-divone shuliang">作物数量</div>
           </div>
-          <div class="shangchuan_box">
-            <el-upload
-              ref="upload"
-              action="/account_photo"
-              list-type="picture-card"
-              :on-preview="handlePictureCardPreview"
-              :http-request="handleHttpRequest"
-              :on-remove="handleRemove"
-              :limit="imgLimit"
-            >
-              <i class="el-icon-plus"></i>
-            </el-upload>
-            <el-dialog :visible.sync="dialogVisible">
-              <img width="100%" :src="dialogImageUrl" alt />
-            </el-dialog>
+
+          <!-- 测试 -->
+          <div class="insect-li-input">
+            <el-input
+              type="number"
+              :rows="10"
+              placeholder="只能输入数字"
+              v-model.trim="inputA"
+              @blur="animateWidthA()"
+              @focus="animateWidth()"
+              clearable
+            ></el-input>
           </div>
-        </li>
-
-        <!-- 虫害级别 -->
-        <li class="insect-li bgji">
-          <img src="../../assets/imageOne/insect.png" alt class="insect-li-img" />
-          <div class="insect-li-div">
-            <div class="insect-li-text bingji">虫级</div>
-            <div class="insect-div-box">
-              <div class="insect-text-box">
-                <span class="insect-text-box-span">(1)卵:</span>
-                <input type="number" placeholder class="insect-inputX" v-model.number="input1" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span">(2)蛹:</span>
-                <input type="number" placeholder class="insect-inputX" v-model.number="input2" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-one">(3)幼虫:</span>
-                <input type="number" placeholder class="insect-inputE" v-model.number="input3" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-one">(4)落虫:</span>
-                <input type="number" placeholder class="insect-inputE" v-model.number="input4" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-two">(5)齡雄虫1:</span>
-                <input type="number" placeholder class="insect-inputA" v-model.number="input5" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-two">(6)齡雄虫2:</span>
-                <input type="number" placeholder class="insect-inputA" v-model.number="input6" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-two">(7)齡雄虫3:</span>
-                <input type="number" placeholder class="insect-inputA" v-model.number="input7" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-two">(8)齡雄虫4:</span>
-                <input type="number" placeholder class="insect-inputA" v-model.number="input8" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-two">(9)齡雄虫5:</span>
-                <input type="number" placeholder class="insect-inputA" v-model.number="input9" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-three">(10)齡雄虫6:</span>
-                <input type="number" placeholder class="insect-inputB" v-model.number="input10" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-three">(11)齡雌虫1:</span>
-                <input type="number" placeholder class="insect-inputB" v-model.number="input11" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-three">(12)齡雌虫2:</span>
-                <input type="number" placeholder class="insect-inputB" v-model.number="input12" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-three">(13)齡雌虫3:</span>
-                <input type="number" placeholder class="insect-inputB" v-model.number="input13" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-three">(14)齡雌虫4:</span>
-                <input type="number" placeholder class="insect-inputB" v-model.number="input14" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-three">(15)齡雌虫5:</span>
-                <input type="number" placeholder class="insect-inputB" v-model.number="input15" />
-              </div>
-              <div class="insect-text-box">
-                <span class="insect-text-box-span-three">(16)齡雌虫6:</span>
-                <input type="number" placeholder class="insect-inputB" v-model.number="input16" />
-              </div>
+          <!-- 测试 -->
+        </div>
+      </li>
+
+      <!--  -->
+      <li class="insect-li ceshi">
+        <img src="../../assets/imageOne/dingwei.png" alt class="insect-li-imgone dandu" />
+        <div class="insect-li-div">
+          <div class="insect-li-divone danone">上传图片</div>
+
+          <!-- 删除 -->
+          <el-button @click="delBtn()" type="primary" v-if="btnShow">删除</el-button>
+        </div>
+        <div class="shangchuan_box">
+          <el-upload
+            ref="upload"
+            action="/account_photo"
+            list-type="picture-card"
+            :on-preview="handlePictureCardPreview"
+            :http-request="handleHttpRequest"
+            :on-remove="handleRemove"
+            :limit="imgLimit"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt />
+          </el-dialog>
+        </div>
+      </li>
+
+      <!-- 虫害级别 -->
+      <li class="insect-li bgji">
+        <img src="../../assets/imageOne/insect.png" alt class="insect-li-img" />
+        <div class="insect-li-div">
+          <div class="insect-li-text bingji">虫级</div>
+          <div class="insect-div-box">
+            <div class="insect-text-box">
+              <span class="insect-text-box-span">(1)卵:</span>
+              <input type="number" placeholder class="insect-inputX" v-model.number="input1" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span">(2)蛹:</span>
+              <input type="number" placeholder class="insect-inputX" v-model.number="input2" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-one">(3)幼虫:</span>
+              <input type="number" placeholder class="insect-inputE" v-model.number="input3" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-one">(4)落虫:</span>
+              <input type="number" placeholder class="insect-inputE" v-model.number="input4" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-two">(5)齡雄虫1:</span>
+              <input type="number" placeholder class="insect-inputA" v-model.number="input5" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-two">(6)齡雄虫2:</span>
+              <input type="number" placeholder class="insect-inputA" v-model.number="input6" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-two">(7)齡雄虫3:</span>
+              <input type="number" placeholder class="insect-inputA" v-model.number="input7" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-two">(8)齡雄虫4:</span>
+              <input type="number" placeholder class="insect-inputA" v-model.number="input8" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-two">(9)齡雄虫5:</span>
+              <input type="number" placeholder class="insect-inputA" v-model.number="input9" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-three">(10)齡雄虫6:</span>
+              <input type="number" placeholder class="insect-inputB" v-model.number="input10" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-three">(11)齡雌虫1:</span>
+              <input type="number" placeholder class="insect-inputB" v-model.number="input11" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-three">(12)齡雌虫2:</span>
+              <input type="number" placeholder class="insect-inputB" v-model.number="input12" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-three">(13)齡雌虫3:</span>
+              <input type="number" placeholder class="insect-inputB" v-model.number="input13" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-three">(14)齡雌虫4:</span>
+              <input type="number" placeholder class="insect-inputB" v-model.number="input14" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-three">(15)齡雌虫5:</span>
+              <input type="number" placeholder class="insect-inputB" v-model.number="input15" />
+            </div>
+            <div class="insect-text-box">
+              <span class="insect-text-box-span-three">(16)齡雌虫6:</span>
+              <input type="number" placeholder class="insect-inputB" v-model.number="input16" />
             </div>
           </div>
-        </li>
-      </ul>
+        </div>
+      </li>
+    </ul>
 
     <!-- 添加病虫害名称提示框 -->
     <el-dialog
@@ -229,6 +229,7 @@ export default {
   name: "insect",
   data() {
     return {
+      isClick: true,
       disabledInput: true, //生育期input框是否禁用
       valueA: "", //病害名称数据
       inputInsect: "", //添加虫害名称
@@ -311,7 +312,7 @@ export default {
         label: "insect_type"
       },
       optionsB: [],
-      selectedOptionsB: "",
+      selectedOptionsB: ""
     };
   },
   watch: {
@@ -426,6 +427,7 @@ export default {
         .then(res => {
           if (res.data.code == null) {
             this.$notify.error({
+              showClose: true,
               title: "失败",
               message: "数据保存失败",
               duration: 1000
@@ -433,6 +435,7 @@ export default {
           } else if (res.data.code == 200) {
             _this.$router.push("home");
             this.$notify({
+              showClose: true,
               title: "成功",
               message: "数据保存成功了",
               type: "success",
@@ -458,6 +461,7 @@ export default {
     animateWidthA() {
       if (this.inputA === "") {
         this.$notify({
+          showClose: true,
           title: "警告",
           message: "这是必填项，不能为空",
           type: "warning",
@@ -476,6 +480,7 @@ export default {
       ) {
         this.$notify({
           title: "警告",
+          showClose: true,
           message: "请先选择统计方法之后，再填写数量",
           type: "warning",
           duration: 1000
@@ -493,12 +498,13 @@ export default {
       ) {
         this.$notify({
           title: "警告",
+          showClose: true,
           message: "此项为必填项，请填写完后再填写下一项",
           type: "warning",
           duration: 1000
         });
       } else {
-        localStorage.setItem('maternity', _this.inputC) //生育期数据保存
+        localStorage.setItem("maternity", _this.inputC); //生育期数据保存
       }
     },
 
@@ -632,33 +638,44 @@ export default {
       let postData = _this.$qs.stringify({
         pic_list: localStorage.getItem("add")
       });
-      _this
-        .$axios({
-          method: "post",
-          url: "https://www.yfznscd.com/del_account_photo",
-          data: postData,
-          headers: {
-            "Content-Type": "application/x-www-form-urlencoded"
-          }
-        })
-        .then(res => {
-          localStorage.removeItem("add");
-          this.$notify({
-            title: "成功",
-            message: "图片删除成功",
-            type: "success"
-          });
-          _this.add = []
-          this.$refs.upload.clearFiles();
-          localStorage.removeItem("add");
-        })
-        .catch(error => {
-          console.log(error);
-          this.$notify.error({
-            title: "失败",
-            message: "图片删除失败"
+      var isClick = _this.isClick;
+      if (isClick === true) {
+        _this.isClick = false;
+        _this
+          .$axios({
+            method: "post",
+            url: "https://www.yfznscd.com/del_account_photo",
+            data: postData,
+            headers: {
+              "Content-Type": "application/x-www-form-urlencoded"
+            }
+          })
+          .then(res => {
+            localStorage.removeItem("add");
+            this.$notify({
+              showClose: true,
+              duration: 1500,
+              title: "成功",
+              message: "图片删除成功",
+              type: "success"
+            });
+            _this.add = [];
+            this.$refs.upload.clearFiles();
+            localStorage.removeItem("add");
+          })
+          .catch(error => {
+            console.log(error);
+            this.$notify.error({
+              showClose: true,
+              title: "失败",
+              message: "图片删除失败",
+              duration: 1500
+            });
           });
-        });
+        setTimeout(function() {
+          _this.isClick = true;
+        }, 1500);
+      }
     },
 
     //监听虫害名称添加input-失去焦点-虫害名称

yfbch/src/components/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login-box" :style="'height:' + fullHeight + 'px'"  v-loading="loading">
+  <div class="login-box" :style="'height:' + fullHeight + 'px'" v-loading="loading">
     <img src="../assets/imageOne/222.jpg" alt class />
     <div class="piece">
       <!-- title -->
@@ -52,7 +52,7 @@
               </el-checkbox>
             </div>
           </div>
-          
+
           <el-form-item>
             <el-button type="primary" @click.13="login()">
               <i class="el-icon-loading" v-show="iShow"></i>
@@ -63,7 +63,7 @@
       </div>
 
       <!-- 首次登陆时要输入验证码 -->
-      <div class='verification_box' v-else>
+      <div class="verification_box" v-else>
         <!-- <div class="verify_text">请先输入验证码，验证成功后才能进入程序进行操作</div> -->
         <el-input
           v-if="iptSHow"
@@ -116,6 +116,7 @@ export default {
   data() {
     let self = this;
     return {
+      isClick: true,
       loading: true, //加载
       ruleForm: {
         username: "",
@@ -144,7 +145,7 @@ export default {
       customColor: "#409eff",
       customColors: [
         { color: "#f56c6c", percentage: 5 },
-        { color: "#e6a23c", percentage:  10},
+        { color: "#e6a23c", percentage: 10 },
         { color: "#5cb87a", percentage: 20 },
         { color: "#1989fa", percentage: 30 },
         { color: "#6f7ad3", percentage: 40 },
@@ -159,7 +160,7 @@ export default {
       inptShow: false, //激活验证码显示登陆按钮
       inputV: "", //验证码
       iptSHow: true, //判断当前设备是否激活过
-      imeiID: '', //手机设备唯一标识
+      imeiID: "" //手机设备唯一标识
     };
   },
   components: {
@@ -189,16 +190,16 @@ export default {
           duration: 1000
         });
       }
-    },
+    }
   },
   created() {
     this.getLocalStorage(); //页面加载调用获取LocalStorage值
-    this.imeiID = localStorage.getItem('uuID')
+    this.imeiID = localStorage.getItem("uuID");
     // console.log(localStorage.getItem("uuID"))
   },
   mounted() {
     let _this = this;
-    console.log(this.imeiID)
+    console.log(this.imeiID);
     _this.ceshi();
     _this.get_boderHeight();
     _this
@@ -207,8 +208,8 @@ export default {
         url: "https://www.yfznscd.com/app_upgrade"
       })
       .then(res => {
-        if (res.data.app_num === "1.4") {
-        } else if (res.data.app_num > "1.4") {
+        if (res.data.app_num === "1.1.5") {
+        } else if (res.data.app_num > "1.1.5") {
           this.$message({
             message: "检测到有新版本",
             type: "success",
@@ -235,25 +236,26 @@ export default {
 
     ceshi() {
       //判断用户是否激活app
-     var _this = this;
+      var _this = this;
       let postData = this.$qs.parse({
         imei: _this.imeiID
       });
-      _this.$axios({
-        method: "post",
-        url: "https://www.yfznscd.com/decide",
-        data: postData
-      })
+      _this
+        .$axios({
+          method: "post",
+          url: "https://www.yfznscd.com/decide",
+          data: postData
+        })
         .then(res => {
           if (res.data !== null && res.data !== 2 && res.data !== 0) {
             _this.inptShow = true;
             _this.inputV = res.data[0].cipher;
-            _this.loading = false
+            _this.loading = false;
           } else if (res.data == 2) {
             //还未注册
             _this.inptShow = false; //登录按钮
             _this.iptSHow = true;
-            _this.loading = false
+            _this.loading = false;
           }
         })
         .catch(error => {});
@@ -294,119 +296,130 @@ export default {
       let _this = this;
       _this.username = _this.$refs.input1.value; //获取input
       _this.password = _this.$refs.input2.value;
-      if (_this.ruleForm.username === "" || _this.ruleForm.password === "") {
-        this.$notify({
-          title: "失败",
-          message: "账号密码不能为空",
-          type: "error",
-          duration: 1000
-        });
-      } else {
-        let login = this.$qs.stringify({
-          username: this.username,
-          password: this.password
-        });
-        this.iShow = true;
-        this.$axios({
-          method: "post",
-          url: "https://www.yfznscd.com/app_log",
-          data: login
-        }).then(res => {
-          if (res.data !== 1 && res.data !== 2) {
-            //判断用户是否没有把app升级到最新版本
-            if (sessionStorage.getItem("offApp") === null) {
-              sessionStorage.setItem("login", this.ruleForm.username);
-              this.iShow = false;
-              this.$notify({
-                title: "成功",
-                message: "您已成功登陆",
-                type: "success",
-                duration: 1000
-              });
-              this.$router.replace("/home");
-              if (_this.checked == true) {
-                _this.setLocalStorage(
-                  _this.ruleForm.username,
-                  _this.ruleForm.password
-                );
-              } else {
-                //清空localStorage
-                _this.clearLocalStorage();
-              }
+      var isClick = _this.isClick;
+      if (isClick === true) {
+        _this.isClick = false;
+        if (_this.ruleForm.username === "" || _this.ruleForm.password === "") {
+          this.$notify({
+            title: "失败",
+            message: "账号密码不能为空",
+            type: "error",
+            duration: 1000
+          });
+        } else {
+          let login = this.$qs.stringify({
+            username: this.username,
+            password: this.password
+          });
+          this.iShow = true;
+          this.$axios({
+            method: "post",
+            url: "https://www.yfznscd.com/app_log",
+            data: login
+          }).then(res => {
+            if (res.data !== 1 && res.data !== 2) {
+              //判断用户是否没有把app升级到最新版本
+              if (sessionStorage.getItem("offApp") === null) {
+                sessionStorage.setItem("login", this.ruleForm.username);
+                this.iShow = false;
+                this.$notify({
+                  title: "成功",
+                  message: "您已成功登陆",
+                  type: "success",
+                  duration: 1000
+                });
+                this.$router.replace("/home");
+                if (_this.checked == true) {
+                  _this.setLocalStorage(
+                    _this.ruleForm.username,
+                    _this.ruleForm.password
+                  );
+                } else {
+                  //清空localStorage
+                  _this.clearLocalStorage();
+                }
 
-              //判断账号是什么身份
-              if (
-                res.data[0].is_active === true &&
-                res.data[0].is_staff === true &&
-                res.data[0].is_superuser === true
-              ) {
-                console.log('这是管理者')
-                sessionStorage.setItem("Administrator", "管理员"); //管理员
-                sessionStorage.removeItem("common");
-              } else {
-                console.log('这是普通用户')
-                sessionStorage.setItem("common", "普通用户"); //普通用户
-                sessionStorage.removeItem("Administrator");
-              }
-              _this
-                .$axios({
-                  method: "get",
-                  url: "https://www.yfznscd.com/app_user_in"
-                })
-                .then(res => {
-                  localStorage.setItem("personAxios", JSON.stringify(res.data));
-                })
-                .catch(error => {
+                //判断账号是什么身份
+                if (
+                  res.data[0].is_active === true &&
+                  res.data[0].is_staff === true &&
+                  res.data[0].is_superuser === true
+                ) {
+                  console.log("这是管理者");
+                  sessionStorage.setItem("Administrator", "管理员"); //管理员
+                  sessionStorage.removeItem("common");
+                } else {
+                  console.log("这是普通用户");
+                  sessionStorage.setItem("common", "普通用户"); //普通用户
+                  sessionStorage.removeItem("Administrator");
+                }
+                _this
+                  .$axios({
+                    method: "get",
+                    url: "https://www.yfznscd.com/app_user_in"
+                  })
+                  .then(res => {
+                    localStorage.setItem(
+                      "personAxios",
+                      JSON.stringify(res.data)
+                    );
+                  })
+                  .catch(error => {
                     this.$notify({
-                    title: "失败",
-                    message: "请求失败",
-                    type: "error",
-                    duration: 1000
+                      title: "失败",
+                      message: "请求失败",
+                      type: "error",
+                      duration: 1000
+                    });
                   });
-                });
 
-              //
-              if (localStorage.getItem("personAxios") !== null) {
-                _this.isShow = true;
-              } else {
-                _this.isShow = false;
+                //
+                if (localStorage.getItem("personAxios") !== null) {
+                  _this.isShow = true;
+                } else {
+                  _this.isShow = false;
+                }
+              } else if (sessionStorage.getItem("offApp") !== null) {
+                this.$notify({
+                  title: "警告",
+                  message: "请您先升级到最新版",
+                  type: "error",
+                  duration: 1000
+                });
               }
-            } else if (sessionStorage.getItem("offApp") !== null) {
+            } else if (res.data === 1) {
+              console.log("失败");
               this.$notify({
-                title: "警告",
-                message: "请您先升级到最新版",
+                title: "失败",
+                message: "用户名错误或用户不存在",
                 type: "error",
                 duration: 1000
               });
+              console.log("error submit!!");
+              const timer = setInterval(() => {
+                this.iShow = false;
+              }, 3000);
+              return false;
+            } else if (res.data === 2) {
+              console.log("失败1");
+              this.$notify({
+                title: "失败",
+                message: "密码错误",
+                type: "error",
+                duration: 1000
+              });
+              console.log("error submit!!");
+              const timer = setInterval(() => {
+                this.iShow = false;
+              }, 3000);
+              return false;
             }
-          } else if (res.data === 1) {
-            console.log("失败");
-            this.$notify({
-              title: "失败",
-              message: "用户名错误或用户不存在",
-              type: "error",
-              duration: 1000
-            });
-            console.log("error submit!!");
-            const timer = setInterval(() => {
-              this.iShow = false;
-            }, 3000);
-            return false;
-          } else if (res.data === 2) {
-            console.log("失败1");
-            this.$notify({
-              title: "失败",
-              message: "密码错误",
-              type: "error",
-              duration: 1000
-            });
-            console.log("error submit!!");
-            const timer = setInterval(() => {
-              this.iShow = false;
-            }, 3000);
-            return false;
-          }
-        });
+          });
+        }
+
+        setTimeout(function() {
+          _this.isClick = true;
+        }, 1500);
       }
     },
 
@@ -433,74 +446,82 @@ export default {
     //点击提交验证码
     verify() {
       let _this = this;
-      let postData = _this.$qs.parse({
-        num: _this.inputV,
-        imei: localStorage.getItem("uuID")
-      });
-      _this
-        .$axios({
-          method: "post",
-          url: "https://www.yfznscd.com/census",
-          data: postData
-        })
-        .then(res => {
-          if (res.data === 0) {
-            //没有获取手机meid
+      var isClick = _this.isClick;
+      if (isClick === true) {
+        _this.isClick = false;
+        let postData = _this.$qs.parse({
+          num: _this.inputV,
+          imei: localStorage.getItem("uuID")
+        });
+        _this
+          .$axios({
+            method: "post",
+            url: "https://www.yfznscd.com/census",
+            data: postData
+          })
+          .then(res => {
+            if (res.data === 0) {
+              //没有获取手机meid
+              this.$notify.error({
+                title: "失败",
+                message: "验证失败",
+                duration: 1000
+              });
+            } else if (res.data === 1) {
+              //该手机已绑定其它验证码
+              this.$notify.error({
+                title: "失败",
+                message: "该手机已绑定其它验证码",
+                duration: 1000
+              });
+            } else if (res.data === 2) {
+              // 验证码输入错误
+              this.$notify.error({
+                title: "失败",
+                message: " 验证码输入错误",
+                duration: 1000
+              });
+            } else if (res.data === 3) {
+              //该验证码已绑定其它手机号
+              this.$notify.error({
+                title: "失败",
+                message: " 该验证码已绑定其它手机号",
+                duration: 1000
+              });
+            } else if (res.data === 4) {
+              //绑定验证码
+              this.$notify({
+                title: "成功",
+                message: "绑定成功",
+                duration: 2000,
+                type: "success"
+              });
+              _this.inptShow = true;
+              localStorage.setItem("decide", "1"); //存储一个标识，进行判断当前需要显示激活码
+            } else if (res.data === 5) {
+              //验证成功
+              this.$notify({
+                title: "成功",
+                message: "验证成功",
+                duration: 1000,
+                type: "success"
+              });
+              _this.inptShow = true;
+              localStorage.setItem("decide", "1"); //存储一个标识，进行判断当前需要显示激活码
+            }
+          })
+          .catch(error => {
             this.$notify.error({
               title: "失败",
               message: "验证失败",
               duration: 1000
             });
-          } else if (res.data === 1) {
-            //该手机已绑定其它验证码
-            this.$notify.error({
-              title: "失败",
-              message: "该手机已绑定其它验证码",
-              duration: 1000
-            });
-          } else if (res.data === 2) {
-            // 验证码输入错误
-            this.$notify.error({
-              title: "失败",
-              message: " 验证码输入错误",
-              duration: 1000
-            });
-          } else if (res.data === 3) {
-            //该验证码已绑定其它手机号
-            this.$notify.error({
-              title: "失败",
-              message: " 该验证码已绑定其它手机号",
-              duration: 1000
-            });
-          } else if (res.data === 4) {
-            //绑定验证码
-            this.$notify({
-              title: "成功",
-              message: "绑定成功",
-              duration: 2000,
-              type: "success"
-            });
-            _this.inptShow = true;
-            localStorage.setItem("decide", "1"); //存储一个标识，进行判断当前需要显示激活码
-          } else if (res.data === 5) {
-            //验证成功
-            this.$notify({
-              title: "成功",
-              message: "验证成功",
-              duration: 1000,
-              type: "success"
-            });
-            _this.inptShow = true;
-            localStorage.setItem("decide", "1"); //存储一个标识，进行判断当前需要显示激活码
-          }
-        })
-        .catch(error => {
-          this.$notify.error({
-            title: "失败",
-            message: "验证失败",
-            duration: 1000
           });
-        });
+
+        setTimeout(function() {
+          _this.isClick = true;
+        }, 1500);
+      }
     }
   }
 };

yfbch/src/components/newmessage/newmessage.vue

@@ -112,6 +112,7 @@ export default {
   data() {
     const self = this;
     return {
+      isClick: true,
       plantName: localStorage.plantName, //作物名称
       radio: localStorage.radioData, //病虫害选择
       monthType: localStorage.monthType, //月份类型
@@ -178,21 +179,29 @@ export default {
     // 病虫害选择
     radio(val) {
       let _this = this;
+      var isClick = _this.isClick;
       if (
         localStorage.getItem("monthID") !== null &&
         localStorage.getItem("regionID") !== null
       ) {
         localStorage.setItem("radioData", val);
-        console.log(val);
         localStorage.removeItem("plantName"); //清除作物名称
         _this.plantName = undefined;
       } else {
-        this.$message({
-          type: "warning",
-          message: "请先选择月份!"
-        });
+        if (isClick === true) {
+          _this.isClick = false;
+          this.$message({
+            type: "warning",
+            message: "请先选择月份!",
+            duration: 1000
+          });
+          setTimeout(function() {
+            _this.isClick = true;
+          }, 1500);
+        }
         _this.radio = "";
       }
+
       //判断是否选择了地址,选择了就显示病害和虫害的选择
       // if (
       //   localStorage.getItem("monthID") !== null &&
@@ -380,18 +389,31 @@ export default {
 
     //病害信息保存
     Plantjudge() {
-      if (
-        localStorage.getItem("classify_palnt") &&
-        localStorage.getItem("maternity") &&
-        localStorage.getItem("area") &&
-        localStorage.getItem("unit") &&
-        localStorage.getItem("plantNumber") &&
-        localStorage.getItem("add")
-      ) {
-        this.baocun();
-        // this.bingji()
-      } else {
-        this.$message.error("必填项没有完成不能保存！！");
+      let _this = this;
+      var isClick = _this.isClick;
+      if (isClick === true) {
+        _this.isClick = false;
+        if (
+          localStorage.getItem("classify_palnt") &&
+          localStorage.getItem("maternity") &&
+          localStorage.getItem("area") &&
+          localStorage.getItem("unit") &&
+          localStorage.getItem("plantNumber") &&
+          localStorage.getItem("add")
+        ) {
+          this.baocun();
+          // this.bingji()
+        } else {
+          this.$message({
+            type: "warning",
+            showClose: true,
+            message: "必填项没有完成不能保存！！!",
+            duration: 1000
+          });
+        }
+        setTimeout(function() {
+          _this.isClick = true;
+        }, 1500);
       }
     },
     //保存病级值
@@ -456,62 +478,77 @@ export default {
       localStorage.setItem("input5", _this.plantNum.input9);
       localStorage.setItem("input6", _this.plantNum.input11);
 
-      // let postData = _this.$qs.stringify({
-      //   harm_id: localStorage.getItem("classify_palnt"), //病虫害ID
-      //   growth_stages: localStorage.getItem("maternity"), //生育期
-      //   addr_photo: localStorage.getItem("add"), //病虫害照片路径
-      //   area: localStorage.getItem("plantNumber"), //统计面积
-      //   pestname: localStorage.getItem("iptList"), //病害值
-      //   cens_method: localStorage.getItem("area") + localStorage.getItem("unit") //统计方法
-      // });
-
-      // _this
-      //   .$axios({
-      //     method: "POST",
-      //     url: "https://www.yfznscd.com/cate",
-      //     data: postData,
-      //     headers: {
-      //       "Content-Type": "application/x-www-form-urlencoded"
-      //     }
-      //   })
-      //   .then(res => {
-      //     if (res.data.code == null) {
-      //       this.$notify.error({
-      //         title: "失败",
-      //         message: "数据保存失败",
-      //         duration: 1000
-      //       });
-      //     } else if (res.data.code == 200) {
-      //       _this.$router.push("home");
-      //       this.$notify({
-      //         title: "成功",
-      //         message: "数据保存成功了",
-      //         type: "success",
-      //         duration: 1000
-      //       });
-      //       //删除存在本地的值
-      //       this.delData();
-      //     }
-      //   })
-      //   .catch(error => {
-      //     alert("请求失败");
-      //     console.log(error);
-      //   });
+      let postData = _this.$qs.stringify({
+        harm_id: localStorage.getItem("classify_palnt"), //病虫害ID
+        growth_stages: localStorage.getItem("maternity"), //生育期
+        addr_photo: localStorage.getItem("add"), //病虫害照片路径
+        area: localStorage.getItem("plantNumber"), //统计面积
+        pestname: localStorage.getItem("iptList"), //病害值
+        cens_method: localStorage.getItem("area") + localStorage.getItem("unit") //统计方法
+      });
+
+      _this
+        .$axios({
+          method: "POST",
+          url: "https://www.yfznscd.com/cate",
+          data: postData,
+          headers: {
+            "Content-Type": "application/x-www-form-urlencoded"
+          }
+        })
+        .then(res => {
+          if (res.data.code == null) {
+            this.$notify.error({
+              showClose: true,
+              title: "失败",
+              message: "数据保存失败",
+              duration: 1000
+            });
+          } else if (res.data.code == 200) {
+            _this.$router.push("home");
+            this.$notify({
+              showClose: true,
+              title: "成功",
+              message: "数据保存成功了",
+              type: "success",
+              duration: 1000
+            });
+            //删除存在本地的值
+            this.delData();
+          }
+        })
+        .catch(error => {
+          alert("请求失败");
+          console.log(error);
+        });
     },
 
     //虫害信息保存
     Insectjudge() {
-      if (
-        localStorage.getItem("classify_palnt") &&
-        localStorage.getItem("maternity") &&
-        localStorage.getItem("area") &&
-        localStorage.getItem("unit") &&
-        localStorage.getItem("plantNumber") &&
-        localStorage.getItem("add")
-      ) {
-        this.binghai();
-      } else {
-        this.$message.error("必填项没有完成不能保存！！");
+      let _this = this;
+      var isClick = _this.isClick;
+      if (isClick === true) {
+        _this.isClick = false;
+        if (
+          localStorage.getItem("classify_palnt") &&
+          localStorage.getItem("maternity") &&
+          localStorage.getItem("area") &&
+          localStorage.getItem("unit") &&
+          localStorage.getItem("plantNumber") &&
+          localStorage.getItem("add")
+        ) {
+          this.binghai();
+        } else {
+          this.$message({
+            showClose: true,
+            type: "warning",
+            message: "必填项没有完成不能保存！！!",
+            duration: 1000
+          });
+        }
+        setTimeout(function() {
+          _this.isClick = true;
+        }, 1500);
       }
     },
     //   给后端传递病虫害值和虫害级别
@@ -540,6 +577,7 @@ export default {
         .then(res => {
           if (res.data.code == null) {
             this.$notify.error({
+              showClose: true,
               title: "失败",
               message: "数据保存失败",
               duration: 1000
@@ -547,6 +585,7 @@ export default {
           } else if (res.data.code == 200) {
             _this.$router.push("home");
             this.$notify({
+              showClose: true,
               title: "成功",
               message: "数据保存成功了",
               type: "success",

yfbch/src/components/plantPlug/plantPlug.vue

@@ -1,202 +1,186 @@
 <template>
-  <div class="secondstep-box" >
+  <div class="secondstep-box">
     <!-- 页头 -->
     <!-- <el-header>
       <el-page-header title @back="goBack" content="病害"></el-page-header>
       <el-button type="primary" class="secondstep-btn1" @click="judge()">完成</el-button>
-    </el-header> -->
+    </el-header>-->
 
     <!-- 页面主内容 -->
-      <!-- 主内容列表 -->
-      <ul class="secondstep-ul">
-        <!-- 病虫害数据添加 -->
-        <li class="secondstep-li">
-          <img src="../../assets/plantImg/addr.png" alt class="secondstep-li-imgone dandu" />
-          <div class="secondstep-li-div">
-            <div class="secondstep-li-divone danoneA">病害名称添加</div>
-            <div class="secondstep-li-input">
-              <el-input
-                type="text"
-                :rows="10"
-                placeholder="输入要添加的病害名称"
-                v-model.trim="inputPlant"
-                maxlength="20"
-                @blur="animateWidthB()"
-                clearable
-              ></el-input>
-            </div>
+    <!-- 主内容列表 -->
+    <ul class="secondstep-ul">
+      <!-- 病虫害数据添加 -->
+      <li class="secondstep-li">
+        <img src="../../assets/plantImg/addr.png" alt class="secondstep-li-imgone dandu" />
+        <div class="secondstep-li-div">
+          <div class="secondstep-li-divone danoneA">病害名称添加</div>
+          <div class="secondstep-li-input">
+            <el-input
+              type="text"
+              :rows="10"
+              placeholder="输入要添加的病害名称"
+              v-model.trim="inputPlant"
+              maxlength="20"
+              @blur="animateWidthB()"
+              clearable
+            ></el-input>
           </div>
-        </li>
-        <!-- 生育期 -->
-
-        <!-- 病害名称 -->
-        <li class="secondstep-li">
-          <img src="../../assets/imageOne/plant.png" alt class="secondstep-li-imgone dandu" />
-          <div class="secondstep-li-div">
-            <div class="secondstep-li-divone danoneA">病害名称</div>
-            <el-cascader
-              :options="optionsB"
-              v-model="valueA"
-              placeholder="请选择病害种类"
-              @change="resultB($event)"
-              class="content"
-            ></el-cascader>
+        </div>
+      </li>
+      <!-- 生育期 -->
+
+      <!-- 病害名称 -->
+      <li class="secondstep-li">
+        <img src="../../assets/imageOne/plant.png" alt class="secondstep-li-imgone dandu" />
+        <div class="secondstep-li-div">
+          <div class="secondstep-li-divone danoneA">病害名称</div>
+          <el-cascader
+            :options="optionsB"
+            v-model="valueA"
+            placeholder="请选择病害种类"
+            @change="resultB($event)"
+            class="content"
+          ></el-cascader>
+        </div>
+      </li>
+
+      <!-- 生育期 -->
+      <li class="secondstep-li">
+        <img src="../../assets/imageOne/raise.png" alt class="secondstep-li-imgone dandu" />
+        <div class="secondstep-li-div">
+          <div class="secondstep-li-divone danoneA">生育期</div>
+          <div class="secondstep-li-input">
+            <el-input
+              v-bind:disabled="disabledInput"
+              maxlength="20"
+              type="text"
+              :rows="10"
+              placeholder="请输入生育期"
+              v-model.trim="inputB"
+              @blur="animateWidthC()"
+              clearable
+            ></el-input>
           </div>
-        </li>
-
-        <!-- 生育期 -->
-        <li class="secondstep-li">
-          <img src="../../assets/imageOne/raise.png" alt class="secondstep-li-imgone dandu" />
-          <div class="secondstep-li-div">
-            <div class="secondstep-li-divone danoneA">生育期</div>
-            <div class="secondstep-li-input">
-              <el-input
-                v-bind:disabled="disabledInput"
-                maxlength="20"
-                type="text"
-                :rows="10"
-                placeholder="请输入生育期"
-                v-model.trim="inputB"
-                @blur="animateWidthC()"
-                clearable
-              ></el-input>
-            </div>
+        </div>
+      </li>
+      <!-- 生育期 -->
+
+      <!-- 统计方法 -->
+      <li class="secondstep-li">
+        <img src="../../assets/imageOne/danwei.png" alt class="secondstep-li-imgone dandu1" />
+        <div class="secondstep-li-div danxuan">
+          <div class="secondstep-li-divone danxuan2">统计方法</div>
+          <!-- 测试 -->
+          <el-cascader v-model="value" :options="options" @change="handleChange"></el-cascader>
+          <!-- 测试 -->
+        </div>
+      </li>
+
+      <!-- 作物数量 -->
+      <li class="secondstep-li">
+        <img src="../../assets/imageOne/number.png" alt class="secondstep-li-imgone dandu1" />
+        <div class="secondstep-li-div">
+          <div>
+            <div class="secondstep-li-divone shuliang">作物数量</div>
           </div>
-        </li>
-        <!-- 生育期 -->
-
-        <!-- 统计方法 -->
-        <li class="secondstep-li">
-          <img src="../../assets/imageOne/danwei.png" alt class="secondstep-li-imgone dandu1" />
-          <div class="secondstep-li-div danxuan">
-            <div class="secondstep-li-divone danxuan2">统计方法</div>
-            <!-- 测试 -->
-            <el-cascader v-model="value" :options="options" @change="handleChange"></el-cascader>
-            <!-- 测试 -->
+          <!-- 测试 -->
+          <div class="secondstep-li-input">
+            <el-input
+              type="number"
+              :rows="10"
+              placeholder="只能输入数字"
+              v-model.trim="inputA"
+              @blur="animateWidthA()"
+              @focus="animateWidth()"
+              clearable
+            ></el-input>
           </div>
-        </li>
-
-        <!-- 作物数量 -->
-        <li class="secondstep-li">
-          <img src="../../assets/imageOne/number.png" alt class="secondstep-li-imgone dandu1" />
-          <div class="secondstep-li-div">
-            <div>
-              <div class="secondstep-li-divone shuliang">作物数量</div>
+          <!-- 测试 -->
+        </div>
+      </li>
+
+      <!-- 上传图片 -->
+      <li class="secondstep-li ceshi">
+        <img src="../../assets/imageOne/image.png" alt class="secondstep-li-imgone dandu" />
+        <div class="secondstep-li-div">
+          <div class="secondstep-li-divone danone">上传图片</div>
+
+          <!-- 删除 -->
+          <el-button @click="delBtn()" type="primary" v-if="btnShow">删除</el-button>
+        </div>
+        <div class="shangchuan_box">
+          <el-upload
+            ref="upload"
+            action="/account_photo"
+            list-type="picture-card"
+            :on-preview="handlePictureCardPreview"
+            :http-request="handleHttpRequest"
+            :on-remove="handleRemove"
+            :limit="imgLimit"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt />
+          </el-dialog>
+        </div>
+      </li>
+
+      <!-- 病级 -->
+      <li class="secondstep-li bgji">
+        <img src="../../assets/imageOne/plant.png" alt class="secondstep-li-img" />
+        <div class="secondstep-li-div plantList">
+          <div class="secondstep-li-text bingji">病级</div>
+          <div class="secondstep-div-box">
+            <div class="secondstep-text-box">
+              (1)
+              <input type="text" class="secondstep-input" v-model.number="input1" />
+              值:
+              <input type="number" class="secondstep-input" v-model.number="input2" />
+            </div>
+            <div class="secondstep-text-box">
+              (2)
+              <input type="text" class="secondstep-input" v-model.number="input3" />
+              值:
+              <input type="number" class="secondstep-input" v-model.number="input4" />
+            </div>
+            <div class="secondstep-text-box">
+              (3)
+              <input type="text" class="secondstep-input" v-model.number="input5" />
+              值:
+              <input type="number" class="secondstep-input" v-model.number="input6" />
+            </div>
+            <div class="secondstep-text-box">
+              (4)
+              <input type="type" class="secondstep-input" v-model.number="input7" />
+              值:
+              <input type="number" class="secondstep-input" v-model.number="input8" />
             </div>
-            <!-- 测试 -->
-            <div class="secondstep-li-input">
-              <el-input
+            <div class="secondstep-text-box">
+              (5)
+              <input type="text" class="secondstep-input" v-model.number="input9" />
+              值:
+              <input
                 type="number"
-                :rows="10"
-                placeholder="只能输入数字"
-                v-model.trim="inputA"
-                @blur="animateWidthA()"
-                @focus="animateWidth()"
-                clearable
-              ></el-input>
+                class="secondstep-input"
+                v-model.number="input10"
+              />
             </div>
-            <!-- 测试 -->
-          </div>
-        </li>
-
-        <!-- 上传图片 -->
-        <li class="secondstep-li ceshi">
-          <img src="../../assets/imageOne/image.png" alt class="secondstep-li-imgone dandu" />
-          <div class="secondstep-li-div">
-            <div class="secondstep-li-divone danone">上传图片</div>
-
-            <!-- 删除 -->
-            <el-button @click="delBtn()" type="primary" v-if="btnShow">删除</el-button>
-          </div>
-          <div class="shangchuan_box">
-            <el-upload
-              ref="upload"
-              action="/account_photo"
-              list-type="picture-card"
-              :on-preview="handlePictureCardPreview"
-              :http-request="handleHttpRequest"
-              :on-remove="handleRemove"
-              :limit="imgLimit"
-            >
-              <i class="el-icon-plus"></i>
-            </el-upload>
-            <el-dialog :visible.sync="dialogVisible">
-              <img width="100%" :src="dialogImageUrl" alt />
-            </el-dialog>
-          </div>
-        </li>
-
-        <!-- 病级 -->
-        <li class="secondstep-li bgji">
-          <img src="../../assets/imageOne/plant.png" alt class="secondstep-li-img" />
-          <div class="secondstep-li-div plantList">
-            <div class="secondstep-li-text bingji">病级</div>
-            <div class="secondstep-div-box">
-              <div class="secondstep-text-box">
-                (1)
-                <input type="text" class="secondstep-input" v-model.number="input1" />
-                值:
-                <input
-                  type="number"
-                  class="secondstep-input"
-                  v-model.number="input2"
-                />
-              </div>
-              <div class="secondstep-text-box">
-                (2)
-                <input type="text" class="secondstep-input" v-model.number="input3" />
-                值:
-                <input
-                  type="number"
-                  class="secondstep-input"
-                  v-model.number="input4"
-                />
-              </div>
-              <div class="secondstep-text-box">
-                (3)
-                <input type="text" class="secondstep-input" v-model.number="input5" />
-                值:
-                <input
-                  type="number"
-                  class="secondstep-input"
-                  v-model.number="input6"
-                />
-              </div>
-              <div class="secondstep-text-box">
-                (4)
-                <input type="type" class="secondstep-input" v-model.number="input7" />
-                值:
-                <input
-                  type="number"
-                  class="secondstep-input"
-                  v-model.number="input8"
-                />
-              </div>
-              <div class="secondstep-text-box">
-                (5)
-                <input type="text" class="secondstep-input" v-model.number="input9" />
-                值:
-                <input
-                  type="number"
-                  class="secondstep-input"
-                  v-model.number="input10"
-                />
-              </div>
-              <div class="secondstep-text-box">
-                (6)
-                <input type="text" class="secondstep-input" v-model.number="input11" />
-                值:
-                <input
-                  type="number"
-                  placeholder="0"
-                  class="secondstep-input"
-                  v-model.number="input12"
-                />
-              </div>
+            <div class="secondstep-text-box">
+              (6)
+              <input type="text" class="secondstep-input" v-model.number="input11" />
+              值:
+              <input
+                type="number"
+                placeholder="0"
+                class="secondstep-input"
+                v-model.number="input12"
+              />
             </div>
           </div>
-        </li>
-      </ul>
+        </div>
+      </li>
+    </ul>
 
     <!-- 添加病害名称提示框 -->
     <el-dialog
@@ -219,6 +203,7 @@ export default {
   name: "secondstep",
   data() {
     return {
+      isClick: true,
       valueA: "", //病害名称数据
       disabledInput: true, //生育期input框是否禁用
       inputPlant: "", //添加病虫害名称
@@ -445,6 +430,7 @@ export default {
         .then(res => {
           if (res.data.code == null) {
             this.$notify.error({
+              showClose: true,
               title: "失败",
               message: "数据保存失败",
               duration: 1000
@@ -452,6 +438,7 @@ export default {
           } else if (res.data.code == 200) {
             _this.$router.push("home");
             this.$notify({
+              showClose: true,
               title: "成功",
               message: "数据保存成功了",
               type: "success",
@@ -477,6 +464,7 @@ export default {
     animateWidthA() {
       if (this.inputA === "") {
         this.$notify({
+          showClose: true,
           title: "警告",
           message: "这是必填项，不能为空",
           type: "warning",
@@ -494,6 +482,7 @@ export default {
         localStorage.getItem("unit") === null
       ) {
         this.$notify({
+          showClose: true,
           title: "警告",
           message: "请先选择统计方法之后，再填写数量",
           type: "warning",
@@ -575,13 +564,14 @@ export default {
         _this.inputB === ""
       ) {
         this.$notify({
+          showClose: true,
           title: "警告",
           message: "此项为必填项，请填写完后再填写下一项",
           type: "warning",
           duration: 1000
         });
       } else {
-        localStorage.setItem('maternity', _this.inputB) //生育期数据保存
+        localStorage.setItem("maternity", _this.inputB); //生育期数据保存
       }
     },
 
@@ -647,36 +637,49 @@ export default {
       let postData = _this.$qs.stringify({
         pic_list: localStorage.getItem("add")
       });
-      _this
-        .$axios({
-          method: "post",
-          url: "https://www.yfznscd.com/del_account_photo",
-          data: postData,
-          headers: {
-            "Content-Type": "application/x-www-form-urlencoded"
-          }
-        })
-        .then(res => {
-          localStorage.removeItem("add");
-          this.$notify({
-            title: "成功",
-            message: "图片删除成功",
-            type: "success"
-          });
-          _this.add = []
-          this.$refs.upload.clearFiles();
-          localStorage.removeItem("add");
-          // const timer = setInterval(() => {
-          //   location.reload();
-          // }, 1000);
-        })
-        .catch(error => {
-          console.log(error);
-          this.$notify.error({
-            title: "失败",
-            message: "图片删除失败"
+      var isClick = _this.isClick;
+      if (isClick === true) {
+        _this.isClick = false;
+        _this
+          .$axios({
+            method: "post",
+            url: "https://www.yfznscd.com/del_account_photo",
+            data: postData,
+            headers: {
+              "Content-Type": "application/x-www-form-urlencoded"
+            }
+          })
+          .then(res => {
+            localStorage.removeItem("add");
+            this.$notify({
+              showClose: true,
+              title: "成功",
+              message: "图片删除成功",
+              duration: 1500,
+              type: "success"
+            });
+            _this.add = [];
+            this.$refs.upload.clearFiles();
+            localStorage.removeItem("add");
+            _this.btnShow = false
+            // const timer = setInterval(() => {
+            //   location.reload();
+            // }, 1000);
+          })
+          .catch(error => {
+            console.log(error);
+            this.$notify.error({
+              showClose: true,
+              title: "失败",
+              message: "图片删除失败",
+              duration: 1500
+            });
           });
-        });
+
+        setTimeout(function() {
+          _this.isClick = true;
+        }, 1500);
+      }
     },
 
     //下拉框选中病害名称

yfbch/src/components/screen_plant/screen_plant.vue

@@ -157,6 +157,7 @@ export default {
   data() {
     //这里存放数据
     return {
+      isClick: true,
       //添加弹框
       dialogFormVisible: false,
       titleNameA: "",
@@ -240,13 +241,13 @@ export default {
           var postData = _this.$qs.stringify({
             ret: "harm",
             month_id: localStorage.getItem("yuefenID"),
-            pest_sort: localStorage.getItem('radioData')
+            pest_sort: localStorage.getItem("radioData")
           });
         } else {
           var postData = _this.$qs.stringify({
             ret: "harm",
             month_id: localStorage.getItem("yfenID"),
-            pest_sort: localStorage.getItem('radioData')
+            pest_sort: localStorage.getItem("radioData")
           });
         }
       }
@@ -355,140 +356,156 @@ export default {
         }
       }
 
-      // 判断是添加到昆虫种类还是昆虫名称;
-      if (_this.form.chongmeg !== "" && _this.titleNameA === "粮食作物添加") {
-        let postData = _this.$qs.stringify({
-          pest: _this.form.chongmeg, //添加的作物名字
-          crop_sort: "1", //作物类型
-          ret: "crea",
-          month_id: month, //月份
-          pest_sort: localStorage.getItem("radioData")
-        });
-        _this
-          .$axios({
-            method: "post",
-            url: "https://www.yfznscd.com/city",
-            data: postData,
-            headers: {
-              "Content-Type": "application/x-www-form-urlencoded"
-            }
-          })
-          .then(res => {
-            if (res.data.code == 200) {
-              this.$message({
-                type: "success",
-                message: "添加成功!"
-              });
-              _this.listData(); //重新请求数据
-              // const timer = setInterval(() => {
-              //   location.reload();
-              // }, 1000);
-            } else if (res.data.code == null) {
-              this.$message({
-                type: "warning",
-                message: "数据已存在!"
-              });
-            }
-            _this.cancel();
-          })
-          .catch(error => {
-            this.$message({
-              showClose: true,
-              message: "失败",
-              type: "error"
-            });
+      var isClick = _this.isClick;
+      if (isClick === true) {
+        _this.isClick = false;
+        // 判断是添加到昆虫种类还是昆虫名称;
+        if (_this.form.chongmeg !== "" && _this.titleNameA === "粮食作物添加") {
+          let postData = _this.$qs.stringify({
+            pest: _this.form.chongmeg, //添加的作物名字
+            crop_sort: "1", //作物类型
+            ret: "crea",
+            month_id: month, //月份
+            pest_sort: localStorage.getItem("radioData")
           });
-      } else if (
-        _this.form.chongmeg !== "" &&
-        _this.titleNameA === "林业作物添加"
-      ) {
-        let postData = _this.$qs.stringify({
-          pest: _this.form.chongmeg, //添加的作物名字
-          crop_sort: "3", //作物类型
-          ret: "crea",
-          month_id: month, //月份
-          pest_sort: localStorage.getItem("radioData")
-        });
-        _this
-          .$axios({
-            method: "post",
-            url: "https://www.yfznscd.com/city",
-            data: postData,
-            headers: {
-              "Content-Type": "application/x-www-form-urlencoded"
-            }
-          })
-          .then(res => {
-            if (res.data.code == 200) {
+          _this
+            .$axios({
+              method: "post",
+              url: "https://www.yfznscd.com/city",
+              data: postData,
+              headers: {
+                "Content-Type": "application/x-www-form-urlencoded"
+              }
+            })
+            .then(res => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "添加成功!",
+                  duration: 1500
+                });
+                _this.listData(); //重新请求数据
+                // const timer = setInterval(() => {
+                //   location.reload();
+                // }, 1000);
+              } else if (res.data.code == null) {
+                this.$message({
+                  type: "warning",
+                  message: "数据已存在!",
+                  duration: 1500
+                });
+              }
+              _this.cancel();
+            })
+            .catch(error => {
               this.$message({
-                type: "success",
-                message: "添加成功!",
+                showClose: true,
+                message: "失败",
+                type: "error",
                 duration: 1500
               });
-              _this.listData(); //重新请求数据
-            } else if (res.data.code == null) {
+            });
+        } else if (
+          _this.form.chongmeg !== "" &&
+          _this.titleNameA === "林业作物添加"
+        ) {
+          let postData = _this.$qs.stringify({
+            pest: _this.form.chongmeg, //添加的作物名字
+            crop_sort: "3", //作物类型
+            ret: "crea",
+            month_id: month, //月份
+            pest_sort: localStorage.getItem("radioData")
+          });
+          _this
+            .$axios({
+              method: "post",
+              url: "https://www.yfznscd.com/city",
+              data: postData,
+              headers: {
+                "Content-Type": "application/x-www-form-urlencoded"
+              }
+            })
+            .then(res => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "添加成功!",
+                  duration: 1500
+                });
+                _this.listData(); //重新请求数据
+              } else if (res.data.code == null) {
+                this.$message({
+                  type: "warning",
+                  message: "数据已存在!",
+                  duration: 1500
+                });
+              }
+              _this.cancel();
+            })
+            .catch(error => {
               this.$message({
-                type: "warning",
-                message: "数据已存在!",
+                showClose: true,
+                message: "失败",
+                type: "error",
                 duration: 1500
               });
-            }
-            _this.cancel();
-          })
-          .catch(error => {
-            this.$message({
-              showClose: true,
-              message: "失败",
-              type: "error"
             });
+        } else if (
+          _this.form.chongmeg !== "" &&
+          _this.titleNameA === "经济作物添加"
+        ) {
+          let postData = _this.$qs.stringify({
+            pest: _this.form.chongmeg, //添加的作物名字
+            crop_sort: "2", //作物类型
+            ret: "crea",
+            month_id: month, //月份
+            pest_sort: localStorage.getItem("radioData")
           });
-      } else if (
-        _this.form.chongmeg !== "" &&
-        _this.titleNameA === "经济作物添加"
-      ) {
-        let postData = _this.$qs.stringify({
-          pest: _this.form.chongmeg, //添加的作物名字
-          crop_sort: "2", //作物类型
-          ret: "crea",
-          month_id: month, //月份
-          pest_sort: localStorage.getItem("radioData")
-        });
-        _this
-          .$axios({
-            method: "post",
-            url: "https://www.yfznscd.com/city",
-            data: postData,
-            headers: {
-              "Content-Type": "application/x-www-form-urlencoded"
-            }
-          })
-          .then(res => {
-            if (res.data.code == 200) {
-              this.$message({
-                type: "success",
-                message: "添加成功!"
-              });
-              _this.listData(); //重新请求数据
-            } else if (res.data.code == null) {
+          _this
+            .$axios({
+              method: "post",
+              url: "https://www.yfznscd.com/city",
+              data: postData,
+              headers: {
+                "Content-Type": "application/x-www-form-urlencoded"
+              }
+            })
+            .then(res => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "添加成功!",
+                  duration: 1500
+                });
+                _this.listData(); //重新请求数据
+              } else if (res.data.code == null) {
+                this.$message({
+                  type: "warning",
+                  message: "数据已存在!",
+                  duration: 1500
+                });
+              }
+              _this.cancel();
+            })
+            .catch(error => {
               this.$message({
-                type: "warning",
-                message: "数据已存在!"
+                showClose: true,
+                message: "失败",
+                type: "error",
+                duration: 1500
               });
-            }
-            _this.cancel();
-          })
-          .catch(error => {
-            this.$message({
-              showClose: true,
-              message: "失败",
-              type: "error"
             });
+        } else if (_this.form.chongmeg === "") {
+          this.$message({
+            type: "warning",
+            message: "不能为空!",
+            duration: 1500
           });
-      } else if (_this.form.chongmeg === "") {
-        this.$message({
-          type: "warning",
-          message: "不能为空!"
-        });
+        }
+
+        setTimeout(function() {
+          _this.isClick = true;
+        }, 1500);
       }
     },
 
@@ -523,60 +540,67 @@ export default {
           month_id: localStorage.getItem("monthID") //月份ID
         });
       }
+      var isClick = _this.isClick;
+      if (isClick === true) {
+        _this.isClick = false;
+        //判断当前是否选择了作物
+        if (
+          localStorage.getItem("screenIndex") !== null &&
+          localStorage.getItem("plantName") !== null
+        ) {
+          _this
+            .$axios({
+              url: "https://www.yfznscd.com/city",
+              method: "post",
+              data: postData,
+              headers: {
+                "Content-Type": "application/x-www-form-urlencoded"
+              }
+            })
+            .then(res => {
+              // if (res.data.code !== null) {
+              this.$message({
+                type: "success",
+                message: "选择成功!",
+                duration: 1500
+              });
 
-      //判断当前是否选择了作物
-      if (
-        localStorage.getItem("screenIndex") !== null &&
-        localStorage.getItem("plantName") !== null
-      ) {
-        _this
-          .$axios({
-            url: "https://www.yfznscd.com/city",
-            method: "post",
-            data: postData,
-            headers: {
-              "Content-Type": "application/x-www-form-urlencoded"
-            }
-          })
-          .then(res => {
-            // if (res.data.code !== null) {
-            this.$message({
-              type: "success",
-              message: "选择成功!",
-              duration: 1500
-            });
-
-            //判断当前是默认编辑还是新建
-            if (localStorage.getItem("defaultID") !== null) {
-              var aa = JSON.stringify(res.data);
-              localStorage.setItem("pestName", aa);
-              //默认编辑
-              _this.$router.push("/acquiescent");
-            } else {
-              var aa = JSON.stringify(res.data);
-              localStorage.setItem("pestName", aa);
-              //新建
-              //判断是跳转到病害还是虫害
-              if (localStorage.getItem("radioData") == "1") {
-                //病害
-                // _this.$router.push("/secondstep");
-                _this.$router.push('/newmessage')
-                location.reload();
-              } else if (localStorage.getItem("radioData") == "2") {
-                //虫害
-                // _this.$router.push("/insect");
-                _this.$router.push('/newmessage')
-                location.reload();
+              //判断当前是默认编辑还是新建
+              if (localStorage.getItem("defaultID") !== null) {
+                var aa = JSON.stringify(res.data);
+                localStorage.setItem("pestName", aa);
+                //默认编辑
+                _this.$router.push("/acquiescent");
+              } else {
+                var aa = JSON.stringify(res.data);
+                localStorage.setItem("pestName", aa);
+                //新建
+                //判断是跳转到病害还是虫害
+                if (localStorage.getItem("radioData") == "1") {
+                  //病害
+                  // _this.$router.push("/secondstep");
+                  _this.$router.push("/newmessage");
+                  location.reload();
+                } else if (localStorage.getItem("radioData") == "2") {
+                  //虫害
+                  // _this.$router.push("/insect");
+                  _this.$router.push("/newmessage");
+                  location.reload();
+                }
               }
-            }
-          })
-          .catch(err => {});
-      } else {
-        this.$notify.error({
-          title: "错误",
-          message: "请先选择作物再进行下一步",
-          duration: 1500
-        });
+            })
+            .catch(err => {});
+        } else {
+          this.$notify.error({
+            title: "错误",
+            message: "请先选择作物再进行下一步",
+            duration: 1500
+          });
+        }
+
+        setTimeout(function() {
+          _this.isClick = true;
+        }, 1500);
       }
     }
   },

yfbch/src/components/system/system.vue

@@ -270,7 +270,7 @@ export default {
             url: "https://www.yfznscd.com/app_upgrade"
           })
           .then(res => {
-            if (res.data.app_num > "1.4") {
+            if (res.data.app_num > "1.1.5") {
               this.$notify({
                 title: "成功",
                 message: "检测到有新版本，需要更新",
@@ -286,7 +286,7 @@ export default {
                   this.percentage = 100;
                 }
               }, 1000);
-            } else if (res.data.app_num == "1.4") {
+            } else if (res.data.app_num == "1.1.5") {
               this.$notify({
                 title: "警告",
                 message: "已是最新版本",