接口对接

src/views/Login/login.vue

@@ -267,52 +267,52 @@ export default {
         let configValue = res.data.configValue
         let version = config.version;
         if (this.compareVersion(version,configValue)){
-          // var systemConfigPosJson = OpenDataWap.share.selectSystemConfigPoList();
-          // var systemConfigPos = JSON.parse(systemConfigPosJson);
-          // //拿到本地数据
-          // if(systemConfigPos.length>0 && systemConfigPos[0].version.toString()!=version.toString()){
-          //   // const store1 = useStore();
-          //   var systemConfig = systemConfigPos[0]
-          //   listSubsystem({ authCode: systemConfig.authCode }).then((response) => {
-          //     // 授权码获取产线信息
-          //     // store1.dispatch("sysConf/setProductLine", response.rows[0]);
-          //     self.form = response.rows[0];
-          //     self.form.status = 1;
-          //     self.form.subSystemRegisterStatus = 0;
-          //     self.form.version = version;
-          //     self.form.ip=systemConfig.ipAddress
-          //     const controlunit = {
-          //       "subSysName":response.rows[0].name,
-          //       "subSysCode":response.rows[0].code,
-          //       "subSysId":response.rows[0].id,
-          //       "deviceSN": systemConfig.deviceSN,
-          //       "unitModel": systemConfig.unitModel,
-          //       "unitTypeCode":"CE020103",
-          //       "unitTypeName":"PDA"
-          //     }
-          //     const system = {
-          //       cloudAddress:systemConfig.cloudAddress,
-          //       authCode:systemConfig.authCode,
-          //       code:response.rows[0].code,
-          //       name:response.rows[0].name,
-          //       ipAddress:systemConfig.ipAddress,
-          //       runMode:"box",
-          //       version:version,
-          //       unitModel:systemConfig.unitModel,
-          //       deviceSN:systemConfig.deviceSN,
-          //     }
-          //     // 添加设备到 厂级
-          //     uploadControlunit(controlunit).then(res => {
-          //       if (res.code==500){
-          //         Notify({type: 'warning', message: '该子系统已被注册或SN不正确', duration: 1500});
-          //       }else {
-          //         //注册信息保存到本地
-          //         updateSubsystem(self.form).then((response) => {});
-          //         OpenDataWap.share.insertSystemConfigPo(JSON.stringify(system));
-          //       }
-          //     })
-          //   });
-          // }
+          var systemConfigPosJson = OpenDataWap.share.selectSystemConfigPoList();
+          var systemConfigPos = JSON.parse(systemConfigPosJson);
+          //拿到本地数据
+          if(systemConfigPos.length>0 && systemConfigPos[0].version.toString()!=version.toString()){
+            // const store1 = useStore();
+            var systemConfig = systemConfigPos[0]
+            listSubsystem({ authCode: systemConfig.authCode }).then((response) => {
+              // 授权码获取产线信息
+              // store1.dispatch("sysConf/setProductLine", response.rows[0]);
+              self.form = response.rows[0];
+              self.form.status = 1;
+              self.form.subSystemRegisterStatus = 0;
+              self.form.version = version;
+              self.form.ip=systemConfig.ipAddress
+              const controlunit = {
+                "subSysName":response.rows[0].name,
+                "subSysCode":response.rows[0].code,
+                "subSysId":response.rows[0].id,
+                "deviceSN": systemConfig.deviceSN,
+                "unitModel": systemConfig.unitModel,
+                "unitTypeCode":"CE020103",
+                "unitTypeName":"PDA"
+              }
+              const system = {
+                cloudAddress:systemConfig.cloudAddress,
+                authCode:systemConfig.authCode,
+                code:response.rows[0].code,
+                name:response.rows[0].name,
+                ipAddress:systemConfig.ipAddress,
+                runMode:"box",
+                version:version,
+                unitModel:systemConfig.unitModel,
+                deviceSN:systemConfig.deviceSN,
+              }
+              // 添加设备到 厂级
+              uploadControlunit(controlunit).then(res => {
+                if (res.code==500){
+                  Notify({type: 'warning', message: '该子系统已被注册或SN不正确', duration: 1500});
+                }else {
+                  //注册信息保存到本地
+                  updateSubsystem(self.form).then((response) => {});
+                  OpenDataWap.share.insertSystemConfigPo(JSON.stringify(system));
+                }
+              })
+            });
+          }
           this.loading = true;
           if (this.loginForm.rememberMe) {
             Cookies.set("username", this.loginForm.username, { expires: 30 });

src/views/ManualOperation/ScanResults/index.vue

@@ -167,11 +167,6 @@ export default {
         qrCode: qrCode
       }
       queryQrCodeMap(query).then(response => {
-        // this.$message({
-        //   showClose: response.code === 200,
-        //   message: response.msg,
-        //   type: 'success'
-        // });
         if (response.code === 200) {
           this.data = response.data
         }