修改设备号提示

src/views/Login.vue

@@ -39,7 +39,7 @@
 
 <script>
 import { httpGet, httpPostForJson, putForJson } from "@/common/httpBean.js";
-import { login, code, apiEquipmentQuery, vehicleInformationQuery} from "@/axios/api.js";
+import { login, code, apiEquipmentQuery, vehicleInformationQuery, personalCenterInforQuery} from "@/axios/api.js";
 import { encrypt } from "@/utils/rsaEncrypt.js";
 import Cookies from "js-cookie";
 import { config as appConfig } from "../config.js";
@@ -95,37 +95,37 @@ export default {
               //查询车辆表中设备是否与车辆绑定
               httpGet(vehicleInformationQuery,{equipmentName:that.deviceOAID}).then((resCar) => {
                 if(resCar.code == 200 && resCar.data.totalElements != 0){
-                  that.$message({
-                    message: "设备检索完毕，可进行登录!",
-                    type: 'success'
-                  });
+                  // that.$message({
+                  //   message: "设备检索完毕，可进行登录!",
+                  //   type: 'success'
+                  // });
                   that.bindingStatus = true;
                 }else{
-                  that.$message({
-                    message: "请在后台系统中将该设备与车辆绑定后再进行登录!",
-                    type: 'error'
-                  });
-                  that.$message({
-                    showClose: true,
-                    message: "设备号:" + that.deviceOAID,
-                    type: 'error',
-                    duration: 0
-                  });
+                  // that.$message({
+                  //   message: "请在后台系统中将该设备与车辆绑定后再进行登录!",
+                  //   type: 'error'
+                  // });
+                  // that.$message({
+                  //   showClose: true,
+                  //   message: "设备号:" + that.deviceOAID,
+                  //   type: 'error',
+                  //   duration: 0
+                  // });
                   that.bindingStatus = false;
                 }
               })
             }else{
               httpPostForJson(apiEquipmentQuery,{name:that.deviceOAID,status:'正常'}).then((res)=>{
-                that.$message({
-                  message: "请在后台系统中将该设备与车辆绑定后再进行登录!",
-                  type: 'error'
-                });
-                that.$message({
-                  showClose: true,
-                  message: "设备号:" + that.deviceOAID,
-                  type: 'error',
-                  duration: 0
-                });
+                // that.$message({
+                //   message: "请在后台系统中将该设备与车辆绑定后再进行登录!",
+                //   type: 'error'
+                // });
+                // that.$message({
+                //   showClose: true,
+                //   message: "设备号:" + that.deviceOAID,
+                //   type: 'error',
+                //   duration: 0
+                // });
                 that.bindingStatus = false;
               })
             }
@@ -133,10 +133,10 @@ export default {
         },
         fail:function(e){
           console.log('getDeviceInfo failed: '+JSON.stringify(e));
-          that.$message({
-            message: "获取设备信息失败，请退出系统并且开启权限后重试!",
-            type: 'error'
-          });
+          // that.$message({
+          //   message: "获取设备信息失败，请退出系统并且开启权限后重试!",
+          //   type: 'error'
+          // });
           that.bindingStatus = false;
         }
       })
@@ -159,6 +159,13 @@ export default {
     },
     //登录前操作判断
     loginBeforeFn() {
+      if(!this.deviceOAID){
+        this.$message({
+          message: "获取设备信息失败，请退出系统并且开启权限后重试!",
+          type: 'warning'
+        });
+        return
+      }
       httpGet(apiEquipmentQuery,{name:this.deviceOAID}).then((resSheiBei) => {
         if(resSheiBei.code == 200 && resSheiBei.data.totalElements != 0){
           //查询车辆表中设备是否与车辆绑定
@@ -170,14 +177,16 @@ export default {
             }else{
               this.$message({
                 message: "请在后台系统中将该设备与车辆绑定后再进行登录!",
-                type: 'error'
+                type: 'warning'
               });
+              this.$nextTick(()=>{
                 this.$message({
                   showClose: true,
                   message: "设备号:" + this.deviceOAID,
-                type: 'error',
+                  type: 'warning',
                   duration: 0
                 });
+              })
               this.bindingStatus = false;
             }
           })
@@ -185,14 +194,16 @@ export default {
           httpPostForJson(apiEquipmentQuery,{name:this.deviceOAID,status:'正常'}).then((res)=>{
             this.$message({
               message: "请在后台系统中将该设备与车辆绑定后再进行登录!",
-              type: 'error'
+              type: 'warning'
             });
+            this.$nextTick(()=>{
               this.$message({
                 showClose: true,
                 message: "设备号:" + this.deviceOAID,
-              type: 'error',
+                type: 'warning',
                 duration: 0
               });
+            })
             this.bindingStatus = false;
           })
         }