2021-12-17

src/views/Alarm/AlarmSet.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:06:41
- * @LastEditTime: 2021-12-06 16:10:36
+ * @LastEditTime: 2021-12-17 16:08:35
  * @LastEditors: Please set LastEditors
  * @Description: 报警阈值设置
  * @FilePath: \hyyfClient\src\views\Alarm\AlarmSet.vue
@@ -58,7 +58,7 @@ export default {
     async handleSubmit() {
       const loading = this.$loading({
         lock: true,
-        text: "Loading",
+        text: "加载中...",
         spinner: "el-icon-loading",
         background: "rgba(0, 0, 0, 0.7)",
       });

src/views/BioSafety/DeadPig.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-09-16 11:27:35
- * @LastEditTime: 2021-12-07 13:38:02
+ * @LastEditTime: 2021-12-17 16:11:00
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \hyyfClient\src\views\BioSafety\DeadPig.vue
@@ -163,6 +163,12 @@ export default {
     },
     // 死猪管理
     pigManage() {
+      const loading = this.$loading({
+        lock: true,
+        text: "加载中...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       let queryParams = {
         pageNum: this.pageNum,
         pageSize: this.size,
@@ -239,7 +245,7 @@ export default {
         dbType: 0,
       };
       getCarWash(queryParams).then(async (res) => {
-        console.log("res:", JSON.parse(res.result));
+        loading.close();
         const result = JSON.parse(res.result);
         this.listData = result.data.pageData;
         this.listData.forEach((item) => {

src/views/BioSafety/DoorAdmin.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-17 15:50:33
- * @LastEditTime: 2021-12-17 16:06:00
+ * @LastEditTime: 2021-12-17 16:10:05
  * @LastEditors: Please set LastEditors
  * @Description: 大门事件
  * @FilePath: \hyyfClient\src\views\BioSafety\DoorAdmin.vue
@@ -163,6 +163,12 @@ export default {
     },
     // 死猪管理
     pigManage() {
+      const loading = this.$loading({
+        lock: true,
+        text: "加载中...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       let queryParams = {
         pageNum: this.pageNum,
         pageSize: this.size,
@@ -170,13 +176,17 @@ export default {
         alarmEndDateString: this.params.time[1] + " 23:59:59",
       };
       getDoorAdmin(queryParams).then(async (res) => {
-        const result = JSON.parse(res.data.result);
-        console.log("res:", result);
-        this.listData = result.data.pageData;
-        this.listData.forEach((item) => {
-          item.alarmPicture = `${this.ip}/video/picture/get?alarmPicture=${item.alarmPicture}`;
-        });
-        this.total = parseInt(res.total);
+        loading.close();
+        if (res.code === 0) {
+          const result = JSON.parse(res.data.result);
+          this.listData = result.data.pageData;
+          this.listData.forEach((item) => {
+            item.alarmPicture = `${this.ip}/video/picture/get?alarmPicture=${item.alarmPicture}`;
+          });
+          this.total = parseInt(res.total);
+        } else {
+          this.$message.warning(res.message);
+        }
       });
     },
     // 死猪管理 - 总数