.env.development

@@ -1,5 +1,4 @@
-VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
-#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
-#VUE_APP_BACKEND_URL=http://192.168.77.222:8086/smart-community-server
+#VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
+VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
 #VUE_APP_BACKEND_URL=http://kr6zr7.natappfree.cc/smart-community-server/

src/views/base/personDeviceLog-list.vue

@@ -205,10 +205,10 @@ export default {
       formData.append("position", self.queryModel.position);
       formData.append("matchMsg", self.queryModel.matchMsg);
 
-      // formData.append(
-      //   "temperatureRanges",
-      //   self.queryModel.temperatureBegin + "," + self.queryModel.temperatureEnd
-      // );
+      formData.append(
+        "temperatureRanges",
+        self.queryModel.temperatureBegin + "," + self.queryModel.temperatureEnd
+      );
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -249,6 +249,7 @@ export default {
     handleReset(name) {
       this.$refs[name].resetFields();
       this.queryModel.timeRanges = "";
+      this.queryModel.temperatureEnd = "";
     },
     onDetailModalClose(refreshed) {
       //保存成功后回调

src/views/base/personDeviceRelation-BoundList.vue

@@ -149,13 +149,6 @@ export default {
     },
     handleDelete(record) {
       var self = this;
-      // this.$confirm("是否绑定？", "提示", {
-      //   confirmButtonText: "确定",
-      //   cancelButtonText: "取消",
-      //   type: "warning",
-      //   distinguishCancelAndClose: true
-      // })
-      //   .then(() => {
       if(confirm("是否绑定？")){
         self.loading = true;
 
@@ -174,11 +167,6 @@ export default {
           }
         });
       }
-        // })
-        // .catch(error => {
-        //   self.loading = false;
-        //   // self.$message.error(error + "");
-        // });
     },
     handleRemoveAll() {
       var self = this;

src/views/base/personInfo-list.vue

@@ -615,19 +615,6 @@ export default {
                 type: "success",
                 message: "删除成功!"
               });
-            } else {
-              if (response.message != null) {
-                //下载有错误信息提示的报表
-                //window.open(response.data);
-                this.$message({
-                  showClose: true,
-                  dangerouslyUseHTMLString: true,
-                  message:
-                    '错误' +
-                    `,<a href="${response.message}" target="_blank">点击下载未导入的数据报表</a>&nbsp;`,
-                  duration: 30000
-                });
-              }
             }
           })
           .catch(() => {
@@ -791,11 +778,26 @@ export default {
         var jsonData = response.data;
         self.loading = false;
         if (jsonData.result) {
-          self.changePage(self.pageIndex);
-          self.$message({
-            type: "success",
-            message: "同步成功!"
-          });
+          if (jsonData.data) {
+            self.changePage(self.pageIndex);
+            self.$message({
+              type: "success",
+              message: "同步成功!"
+            });
+          } else {
+            if (jsonData.message != null) {
+              //下载有错误信息提示的报表
+              //window.open(response.data);
+              self.$message({
+                showClose: true,
+                dangerouslyUseHTMLString: true,
+                message:
+                  "错误" +
+                  `,<a href="${jsonData.message}" target="_blank">点击下载错误报表</a>&nbsp;`,
+                duration: 30000
+              });
+            }
+          }
         } else {
           self.$message({
             type: "warning",
@@ -822,12 +824,26 @@ export default {
             var jsonData = response.data;
             self.loading = false;
             if (jsonData.result) {
-              self.changePage(self.pageIndex);
-
-              self.$message({
-                type: "success",
-                message: "同步成功!"
-              });
+              if (jsonData.data) {
+                self.changePage(self.pageIndex);
+                self.$message({
+                  type: "success",
+                  message: "同步成功!"
+                });
+              } else {
+                if (jsonData.message != null) {
+                  //下载有错误信息提示的报表
+                  //window.open(response.data);
+                  self.$message({
+                    showClose: true,
+                    dangerouslyUseHTMLString: true,
+                    message:
+                      "错误" +
+                      `,<a href="${jsonData.message}" target="_blank">点击下载错误报表</a>&nbsp;`,
+                    duration: 30000
+                  });
+                }
+              }
             } else {
               self.$message({
                 type: "warning",