111

src/views/Login.vue

@@ -95,37 +95,13 @@ export default {
               //查询车辆表中设备是否与车辆绑定
               httpGet(vehicleInformationQuery,{equipmentName:that.deviceOAID}).then((resCar) => {
                 if(resCar.code == 200 && resCar.data.totalElements != 0){
-                  // 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.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.bindingStatus = false;
               })
             }
@@ -133,10 +109,6 @@ export default {
         },
         fail:function(e){
           console.log('getDeviceInfo failed: '+JSON.stringify(e));
-          // that.$message({
-          //   message: "获取设备信息失败，请退出系统并且开启权限后重试!",
-          //   type: 'error'
-          // });
           that.bindingStatus = false;
         }
       })
@@ -175,35 +147,23 @@ export default {
               this.bindingStatus = true;
               this.LoginInitiation();
             }else{
-              this.$message({
-                message: "请在后台系统中将该设备与车辆绑定后再进行登录!",
-                type: 'warning'
-              });
-              this.$nextTick(()=>{
               this.$message({
                 showClose: true,
-                  message: "设备号:" + this.deviceOAID,
+                message: "请在后台系统中将该设备与车辆绑定后再进行登录!设备号:" + this.deviceOAID,
                 type: 'warning',
                 duration: 0
               });
-              })
               this.bindingStatus = false;
             }
           })
         }else{
           httpPostForJson(apiEquipmentQuery,{name:this.deviceOAID,status:'正常'}).then((res)=>{
-            this.$message({
-              message: "请在后台系统中将该设备与车辆绑定后再进行登录!",
-              type: 'warning'
-            });
-            this.$nextTick(()=>{
             this.$message({
               showClose: true,
-                message: "设备号:" + this.deviceOAID,
+              message: "请在后台系统中将该设备与车辆绑定后再进行登录!设备号:" + this.deviceOAID,
               type: 'warning',
               duration: 0
             });
-            })
             this.bindingStatus = false;
           })
         }