巡检添加首页

master/src/main/java/com/ruoyi/project/patrol/patrol/controller/TPatrolPlanController.java

@@ -140,7 +140,8 @@ public class TPatrolPlanController extends BaseController {
         for (TPatrolPlan plan : list) {
             if (StringUtils.isNotEmpty(plan.getConfirmed())) {
                 SysUser sysUser = sysUserService.selectUserById(Long.valueOf(plan.getConfirmed()));
-                plan.setConfirmed(sysUser.getNickName());
+                if(sysUser!=null)
+                    plan.setConfirmed(sysUser.getNickName());
             }
         }
         return getDataTable(list);

ui/src/api/patrol/index.js

@@ -0,0 +1,7 @@
+import request from '@/utils/request'
+export function getCountNums() {
+  return request({
+    url: '/patrol/index/countNums',
+    method: 'get'
+  })
+}

ui/src/views/patrol/commonuse/bicycle/index.vue

@@ -419,13 +419,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateBicycle(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addBicycle(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -436,11 +436,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除自行车编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除自行车编号为"' + ids + '"的数据项？').then(function() {
         return delBicycle(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/commonuse/cover/index.vue

@@ -334,13 +334,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCover(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCover(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -351,11 +351,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除地井盖编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除地井盖编号为"' + ids + '"的数据项？').then(function() {
         return delCover(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/commonuse/downspout/index.vue

@@ -329,13 +329,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateDownspout(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addDownspout(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -346,11 +346,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除落水管编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除落水管编号为"' + ids + '"的数据项？').then(function() {
         return delDownspout(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/commonuse/earplug/index.vue

@@ -336,13 +336,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateEarplug(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addEarplug(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -353,11 +353,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除耳塞分配器检查记录编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除耳塞分配器检查记录编号为"' + ids + '"的数据项？').then(function() {
         return delEarplug(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/commonuse/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>

ui/src/views/patrol/commonuse/movement/index.vue

@@ -350,13 +350,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateMovement(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addMovement(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -367,11 +367,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除移动平台及移动梯编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除移动平台及移动梯编号为"' + ids + '"的数据项？').then(function() {
         return delMovement(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/commonuse/pump/index.vue

@@ -340,13 +340,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updatePump(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addPump(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -357,11 +357,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除水泵接合器编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除水泵接合器编号为"' + ids + '"的数据项？').then(function() {
         return delPump(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/commonuse/safetyBelt/index.vue

@@ -347,13 +347,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateSafetyBelt(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addSafetyBelt(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -364,11 +364,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除安全带编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除安全带编号为"' + ids + '"的数据项？').then(function() {
         return delSafetyBelt(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/commonuse/tester/index.vue

@@ -440,13 +440,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateTester(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addTester(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -457,11 +457,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除检测仪检查记录编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除检测仪检查记录编号为"' + ids + '"的数据项？').then(function() {
         return delTester(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/commonuse/walkitTalkie/index.vue

@@ -343,13 +343,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateWalkitTalkie(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addWalkitTalkie(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -360,11 +360,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除对讲机编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除对讲机编号为"' + ids + '"的数据项？').then(function() {
         return delWalkitTalkie(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/alarm/index.vue

@@ -297,13 +297,13 @@ export default {
             this.form.ignoreColumn = this.ignoreColumn.join(",");
           if (this.form.id != null) {
             updateAlarm(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addAlarm(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -314,11 +314,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除现场可燃气体检测器/火灾报警系统编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除现场可燃气体检测器/火灾报警系统编号为"' + ids + '"的数据项？').then(function() {
         return delAlarm(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/annihilator/index.vue

@@ -347,13 +347,13 @@ export default {
             this.form.ignoreColumn = this.ignoreColumn.join(",");
           if (this.form.id != null) {
             updateAnnihilator(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addAnnihilator(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -364,11 +364,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除灭火器材编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除灭火器材编号为"' + ids + '"的数据项？').then(function() {
         return delAnnihilator(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/bicycle/index.vue

@@ -275,13 +275,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateBicycle(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addBicycle(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -292,11 +292,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除自行车编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除自行车编号为"' + ids + '"的数据项？').then(function() {
         return delBicycle(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/cabinet/index.vue

@@ -395,13 +395,13 @@ export default {
             this.form.ignoreColumn = this.ignoreColumn.join(",");
           if (this.form.id != null) {
             updateCabinet(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCabinet(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -412,11 +412,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除应急事故柜编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除应急事故柜编号为"' + ids + '"的数据项？').then(function () {
         return delCabinet(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/dev/cannon/index.vue

@@ -290,13 +290,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCannon(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCannon(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -307,11 +307,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除消防水炮检查记录编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除消防水炮检查记录编号为"' + ids + '"的数据项？').then(function() {
         return delCannon(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/cctv/index.vue

@@ -278,13 +278,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCctv(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCctv(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -295,11 +295,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除CCTV系统编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除CCTV系统编号为"' + ids + '"的数据项？').then(function() {
         return delCctv(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/cofferdam/index.vue

@@ -286,13 +286,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCofferdam(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCofferdam(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -303,11 +303,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除蒸汽裂解装置各区域围堰编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除蒸汽裂解装置各区域围堰编号为"' + ids + '"的数据项？').then(function () {
         return delCofferdam(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/dev/cover/index.vue

@@ -292,13 +292,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCover(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCover(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -309,11 +309,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除地井盖编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除地井盖编号为"' + ids + '"的数据项？').then(function() {
         return delCover(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/curtain/index.vue

@@ -278,13 +278,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCurtain(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCurtain(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -295,11 +295,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除蒸汽幕编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除蒸汽幕编号为"' + ids + '"的数据项？').then(function() {
         return delCurtain(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/door/index.vue

@@ -330,13 +330,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateDoor(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addDoor(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -347,11 +347,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除常闭式防爆门/防火门编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除常闭式防爆门/防火门编号为"' + ids + '"的数据项？').then(function () {
         return delDoor(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/dev/downspout/index.vue

@@ -278,13 +278,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateDownspout(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addDownspout(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -295,11 +295,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除落水管编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除落水管编号为"' + ids + '"的数据项？').then(function() {
         return delDownspout(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/earplug/index.vue

@@ -292,13 +292,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateEarplug(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addEarplug(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -309,11 +309,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除耳塞分配器编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除耳塞分配器编号为"' + ids + '"的数据项？').then(function() {
         return delEarplug(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/eyewash/index.vue

@@ -291,13 +291,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateEyewash(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addEyewash(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -308,11 +308,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除洗眼器编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除洗眼器编号为"' + ids + '"的数据项？').then(function() {
         return delEyewash(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/hoseBox/index.vue

@@ -299,13 +299,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateHoseBox(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addHoseBox(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -316,11 +316,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除消防水带箱检查记录编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除消防水带箱检查记录编号为"' + ids + '"的数据项？').then(function () {
         return delHoseBox(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/dev/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>

ui/src/views/patrol/dev/movement/index.vue

@@ -318,13 +318,13 @@ export default {
             this.form.ignoreColumn = this.ignoreColumn.join(",");
           if (this.form.id != null) {
             updateMovement(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addMovement(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -335,11 +335,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除移动平台及移动梯编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除移动平台及移动梯编号为"' + ids + '"的数据项？').then(function () {
         return delMovement(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/dev/paga/index.vue

@@ -292,13 +292,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updatePaga(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addPaga(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -309,11 +309,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除PAGA编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除PAGA编号为"' + ids + '"的数据项？').then(function() {
         return delPaga(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/postFire/index.vue

@@ -292,13 +292,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updatePostFire(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addPostFire(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -309,11 +309,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除地上消火栓检查记录编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除地上消火栓检查记录编号为"' + ids + '"的数据项？').then(function() {
         return delPostFire(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/pump/index.vue

@@ -295,13 +295,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updatePump(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addPump(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -312,11 +312,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除水泵接合器编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除水泵接合器编号为"' + ids + '"的数据项？').then(function() {
         return delPump(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/safetyBelt/index.vue

@@ -303,13 +303,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateSafetyBelt(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addSafetyBelt(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -320,11 +320,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除安全带编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除安全带编号为"' + ids + '"的数据项？').then(function () {
         return delSafetyBelt(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/dev/sandbox/index.vue

@@ -292,13 +292,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateSandbox(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addSandbox(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -309,11 +309,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除应急沙箱编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除应急沙箱编号为"' + ids + '"的数据项？').then(function() {
         return delSandbox(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/shield/index.vue

@@ -280,13 +280,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateShield(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addShield(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -297,11 +297,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除CO2气体保护系统编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除CO2气体保护系统编号为"' + ids + '"的数据项？').then(function() {
         return delShield(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/sprinkler/index.vue

@@ -292,13 +292,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateSprinkler(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addSprinkler(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -309,11 +309,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除自动喷淋灭火系统编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除自动喷淋灭火系统编号为"' + ids + '"的数据项？').then(function() {
         return delSprinkler(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/standpipe/index.vue

@@ -292,13 +292,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateStandpipe(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addStandpipe(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -309,11 +309,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除消防竖管编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除消防竖管编号为"' + ids + '"的数据项？').then(function() {
         return delStandpipe(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/tester/index.vue

@@ -309,13 +309,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateTester(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addTester(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -326,11 +326,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除检测仪编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除检测仪编号为"' + ids + '"的数据项？').then(function() {
         return delTester(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/walkieTalkie/index.vue

@@ -278,13 +278,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateWalkieTalkie(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addWalkieTalkie(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -295,11 +295,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除对讲机编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除对讲机编号为"' + ids + '"的数据项？').then(function() {
         return delWalkieTalkie(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/dev/weathervane/index.vue

@@ -309,13 +309,13 @@ export default {
             this.form.ignoreColumn = this.ignoreColumn.join(",");
           if (this.form.id != null) {
             updateWeathervane(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addWeathervane(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -326,11 +326,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除风向标/风向袋/新风系统正压计编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除风向标/风向袋/新风系统正压计编号为"' + ids + '"的数据项？').then(function() {
         return delWeathervane(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/emergency/cabinet/index.vue

@@ -436,13 +436,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCabinet(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCabinet(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -453,11 +453,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除应急事故柜编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除应急事故柜编号为"' + ids + '"的数据项？').then(function() {
         return delCabinet(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/emergency/cctv/index.vue

@@ -342,13 +342,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCctv(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCctv(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -359,11 +359,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除CCTV系统编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除CCTV系统编号为"' + ids + '"的数据项？').then(function() {
         return delCctv(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/emergency/cofferdam/index.vue

@@ -340,13 +340,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCofferdam(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCofferdam(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -357,11 +357,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除蒸汽裂解装置各区域围堰编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除蒸汽裂解装置各区域围堰编号为"' + ids + '"的数据项？').then(function() {
         return delCofferdam(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/emergency/eyewash/index.vue

@@ -523,13 +523,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateEyewash(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addEyewash(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -540,11 +540,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除洗眼器检查记录编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除洗眼器检查记录编号为"' + ids + '"的数据项？').then(function () {
         return delEyewash(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/emergency/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>

ui/src/views/patrol/emergency/paga/index.vue

@@ -471,13 +471,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updatePaga(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addPaga(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -488,11 +488,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除PAGA系统编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除PAGA系统编号为"' + ids + '"的数据项？').then(function() {
         return delPaga(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/fire/alarm/index.vue

@@ -443,13 +443,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateAlarm(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addAlarm(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -460,11 +460,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除现场可燃气体检测器/火灾报警系统编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除现场可燃气体检测器/火灾报警系统编号为"' + ids + '"的数据项？').then(function () {
         return delAlarm(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/fire/annihilator/index.vue

@@ -560,13 +560,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateAnnihilator(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addAnnihilator(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -577,11 +577,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除手提式/小推车式灭火器/灭火器材箱编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除手提式/小推车式灭火器/灭火器材箱编号为"' + ids + '"的数据项？').then(function () {
         return delAnnihilator(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/fire/cannon/index.vue

@@ -414,13 +414,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCannon(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCannon(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -431,11 +431,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除消防水炮检查记录编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除消防水炮检查记录编号为"' + ids + '"的数据项？').then(function () {
         return delCannon(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/fire/curtain/index.vue

@@ -337,13 +337,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateCurtain(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addCurtain(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -354,11 +354,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除蒸汽幕检查记录编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除蒸汽幕检查记录编号为"' + ids + '"的数据项？').then(function() {
         return delCurtain(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/fire/door/index.vue

@@ -412,13 +412,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateDoor(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addDoor(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -429,11 +429,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除常闭式防爆门/防火门编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除常闭式防爆门/防火门编号为"' + ids + '"的数据项？').then(function () {
         return delDoor(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/fire/hoseBox/index.vue

@@ -486,13 +486,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateHoseBox(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addHoseBox(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -503,11 +503,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除消防水带箱检查记录编号为"' + ids + '"的数据项？').then(function () {
+      this.confirm('是否确认删除消防水带箱检查记录编号为"' + ids + '"的数据项？').then(function () {
         return delHoseBox(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/fire/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>

ui/src/views/patrol/fire/postFire/index.vue

@@ -481,13 +481,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updatePostFire(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addPostFire(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -498,11 +498,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除地上消火栓检查记录编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除地上消火栓检查记录编号为"' + ids + '"的数据项？').then(function() {
         return delPostFire(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/fire/sandbox/index.vue

@@ -461,13 +461,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateSandbox(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addSandbox(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -478,11 +478,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除应急沙箱编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除应急沙箱编号为"' + ids + '"的数据项？').then(function() {
         return delSandbox(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/fire/shield/index.vue

@@ -514,13 +514,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateShield(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addShield(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -531,11 +531,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除CO2气体保护系统编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除CO2气体保护系统编号为"' + ids + '"的数据项？').then(function() {
         return delShield(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/fire/sprinkler/index.vue

@@ -468,13 +468,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateSprinkler(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addSprinkler(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -485,11 +485,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除自动喷淋灭火系统检查记录编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除自动喷淋灭火系统检查记录编号为"' + ids + '"的数据项？').then(function() {
         return delSprinkler(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/fire/standpipe/index.vue

@@ -471,13 +471,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateStandpipe(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addStandpipe(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -488,11 +488,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除消防竖管编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除消防竖管编号为"' + ids + '"的数据项？').then(function() {
         return delStandpipe(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/fire/weathervane/index.vue

@@ -355,13 +355,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateWeathervane(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addWeathervane(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -372,11 +372,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除风向标/风向袋/新风系统正压计编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除风向标/风向袋/新风系统正压计编号为"' + ids + '"的数据项？').then(function() {
         return delWeathervane(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/home/dashboard/BarChart.vue

@@ -0,0 +1,102 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts';
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+const animationDuration = 6000
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        grid: {
+          top: 10,
+          left: '2%',
+          right: '2%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [{
+          type: 'category',
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          axisTick: {
+            alignWithLabel: true
+          }
+        }],
+        yAxis: [{
+          type: 'value',
+          axisTick: {
+            show: false
+          }
+        }],
+        series: [{
+          name: 'pageA',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [79, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }, {
+          name: 'pageB',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [80, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }, {
+          name: 'pageC',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [30, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>

ui/src/views/patrol/home/dashboard/LineChart.vue

@@ -0,0 +1,135 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts';
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '350px'
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+    },
+    setOptions({ expectedData, actualData } = {}) {
+      this.chart.setOption({
+        xAxis: {
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          boundaryGap: false,
+          axisTick: {
+            show: false
+          }
+        },
+        grid: {
+          left: 10,
+          right: 10,
+          bottom: 20,
+          top: 30,
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
+          },
+          padding: [5, 10]
+        },
+        yAxis: {
+          axisTick: {
+            show: false
+          }
+        },
+        legend: {
+          data: ['expected', 'actual']
+        },
+        series: [{
+          name: 'expected', itemStyle: {
+            normal: {
+              color: '#FF005A',
+              lineStyle: {
+                color: '#FF005A',
+                width: 2
+              }
+            }
+          },
+          smooth: true,
+          type: 'line',
+          data: expectedData,
+          animationDuration: 2800,
+          animationEasing: 'cubicInOut'
+        },
+        {
+          name: 'actual',
+          smooth: true,
+          type: 'line',
+          itemStyle: {
+            normal: {
+              color: '#3888fa',
+              lineStyle: {
+                color: '#3888fa',
+                width: 2
+              },
+              areaStyle: {
+                color: '#f3f8ff'
+              }
+            }
+          },
+          data: actualData,
+          animationDuration: 2800,
+          animationEasing: 'quadraticOut'
+        }]
+      })
+    }
+  }
+}
+</script>

ui/src/views/patrol/home/dashboard/NoticeChart.vue

@@ -0,0 +1,165 @@
+<template>
+  <div>
+    <div :style="{height:height,width:width}" class="text-container">
+      <ul class="allNotice" @mouseleave="handleMouseLeave" @mouseover="handleMouseOver">
+        <li v-for="(item,index) in noticeList" class="info">
+          <span
+            style="padding-left: 20px; display: inline-block; width: 30%">截止日期：{{
+              parseTime(item.deadline, '{yyyy}-{mm}-{dd}')
+            }}</span>
+          <span style="padding-left: 20px; display: inline-block; width: 60%">{{ item.planName }}</span>
+          <span style="padding-left: 20px; display: inline-block; width: 10%">
+            <el-tag v-if="item.status==0" effect="dark" type="danger">未完成</el-tag>
+            <el-tag v-if="item.status==1" effect="dark" type="success">已完成</el-tag>
+                      </span>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+import {listAllPlan} from "@/api/patrol/patrol/plan";
+
+export default {
+  name: "NoticeChart",
+  props: {
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '570px'
+    }
+  },
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        planQuarter: new Date().getMonth() + 1, planYear: new Date().getFullYear()
+      },
+      // 公示公告列表
+      noticeList: null,
+    }
+  },
+  created() {
+    this.listNoticeNoPage();
+  },
+  methods: {
+    handleMouseOver() {
+      let elem = document.querySelector('.allNotice');
+      elem.style['animation-play-state'] = 'paused';
+    },
+    handleMouseLeave() {
+      let elem = document.querySelector('.allNotice');
+      elem.style['animation-play-state'] = 'running';
+    },
+    listNoticeNoPage() {
+      listAllPlan(this.queryParams).then(response => {
+        this.noticeList = response.data;
+        //判断是否需要滚动
+        if (this.noticeList.length > 4) {
+          //设置文字滚动一轮时间
+          let elem = document.querySelector('.allNotice');
+          let state = elem.style['animation'];
+          let time = this.noticeList.length * 2
+          elem.style['animation'] = 'myMove2 ' + time + 's linear infinite';
+          let state1 = elem.style['animation-fill-mode'];
+          elem.style['animation-fill-mode'] = 'forwards';
+          //设置文字无缝滚动高度
+          let param = this.noticeList.length * 50
+          let myFirstkeyframes = "@keyframes myMove2{0% {transform: translateY(200px);}100% {transform: translateY(-" + param + "px);}}";
+          let style = document.createElement("style");
+          style.setAttribute("type", "text/css");
+          document.head.appendChild(style);
+          const sheet = style.sheet;
+          sheet.insertRule(myFirstkeyframes, 0);
+        }
+      });
+    },
+  }
+}
+</script>
+
+<style scoped>
+.text-container {
+  line-height: 30px;
+  overflow: hidden;
+  background-color: rgba(255, 255, 255, 0.6);
+  padding-top: 10px;
+}
+
+.dangao {
+  width: 40px !important;
+  height: 40px !important;
+}
+
+.info {
+  //font-weight: bold;
+  list-style: none;
+  display: flex;
+  margin: 10px 0 0 0;
+  align-items: center; /* 垂直居中 */
+  /*border-radius:5px 5px 5px 5px ;*/
+  /*border: 2px solid rgba(41, 107, 155, 0.71);*/
+  background-color: transparent;
+  border-bottom: 1px dashed #C0C0C0;
+}
+
+.allNotice {
+  margin: -10px 0 0 0;
+  padding: 0 20px 0 20px;
+  /*animation: myMove 10s linear infinite;
+  animation-fill-mode: forwards;*/
+}
+
+/*文字无缝滚动*/
+/*@keyframes myMove {
+  0% {
+    transform: translateY(200px);
+  }
+  100% {
+    transform: translateY(-300px);
+  }
+}*/
+
+/*文字停顿滚动*/
+@keyframes myMove2 {
+  0% {
+    transform: translateY(0);
+  }
+  10% {
+    transform: translateY(-30px);
+  }
+  20% {
+    transform: translateY(-30px);
+  }
+  30% {
+    transform: translateY(-60px);
+  }
+  40% {
+    transform: translateY(-60px);
+  }
+  50% {
+    transform: translateY(-90px);
+  }
+  60% {
+    transform: translateY(-90px);
+  }
+  70% {
+    transform: translateY(-120px);
+  }
+  80% {
+    transform: translateY(-120px);
+  }
+  90% {
+    transform: translateY(-150px);
+  }
+  100% {
+    transform: translateY(-150px);
+  }
+}
+
+
+</style>

ui/src/views/patrol/home/dashboard/PanelGroup.vue

@@ -0,0 +1,193 @@
+<template>
+  <el-row :gutter="40" class="panel-group">
+    <el-col :lg="6" :sm="12" :xs="12" class="card-panel-col">
+      <div class="card-panel">
+        <div class="card-panel-icon-wrapper icon-people">
+          <svg-icon class-name="card-panel-icon" icon-class="dev"/>
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            总设备数
+          </div>
+          <count-to :duration="3000" :end-val="devNum" :start-val="0" class="card-panel-num"/>
+        </div>
+      </div>
+    </el-col>
+    <el-col :lg="6" :sm="12" :xs="12" class="card-panel-col">
+      <div class="card-panel">
+        <div class="card-panel-icon-wrapper icon-message">
+          <svg-icon class-name="card-panel-icon" icon-class="uncheck"/>
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            本月未完成计划
+          </div>
+          <count-to :duration="3000" :end-val="uncheckPlanNum" :start-val="0" class="card-panel-num"/>
+        </div>
+      </div>
+    </el-col>
+    <el-col :lg="6" :sm="12" :xs="12" class="card-panel-col">
+      <div class="card-panel">
+        <div class="card-panel-icon-wrapper icon-money">
+          <svg-icon class-name="card-panel-icon" icon-class="checked"/>
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            本月已完成计划
+          </div>
+          <count-to :duration="3000" :end-val="checkedPlanNum" :start-val="0" class="card-panel-num"/>
+        </div>
+      </div>
+    </el-col>
+    <el-col :lg="6" :sm="12" :xs="12" class="card-panel-col">
+      <div class="card-panel">
+        <div class="card-panel-icon-wrapper icon-shopping">
+          <svg-icon class-name="card-panel-icon" icon-class="issue"/>
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            未处理问题数量
+          </div>
+          <count-to :duration="3000" :end-val="issueNum" :start-val="0" class="card-panel-num"/>
+        </div>
+      </div>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CountTo from 'vue-count-to'
+import {getCountNums} from "@/api/patrol";
+
+export default {
+  components: {
+    CountTo
+  },
+  data() {
+    return {
+      devNum: 0,
+      uncheckPlanNum: 0,
+      checkedPlanNum: 0,
+      issueNum: 0,
+    }
+  },
+  created() {
+    getCountNums().then(res => {
+      this.devNum = res.data.devNum;
+      this.uncheckPlanNum = res.data.uncheckPlanNum;
+      this.checkedPlanNum = res.data.checkedPlanNum;
+      this.issueNum = res.data.issueNum;
+    })
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.panel-group {
+  margin-top: 18px;
+
+  .card-panel-col {
+    margin-bottom: 32px;
+  }
+
+  .card-panel {
+    height: 108px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #666;
+    background: #fff;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+
+      .icon-people {
+        background: #40c9c6;
+      }
+
+      .icon-message {
+        background: #36a3f7;
+      }
+
+      .icon-money {
+        background: #f4516c;
+      }
+
+      .icon-shopping {
+        background: #34bfa3
+      }
+    }
+
+    .icon-people {
+      color: #40c9c6;
+    }
+
+    .icon-message {
+      color: #36a3f7;
+    }
+
+    .icon-money {
+      color: #f4516c;
+    }
+
+    .icon-shopping {
+      color: #34bfa3
+    }
+
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
+
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
+
+    .card-panel-description {
+      float: right;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 0px;
+
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+}
+
+@media (max-width: 550px) {
+  .card-panel-description {
+    display: none;
+  }
+
+  .card-panel-icon-wrapper {
+    float: none !important;
+    width: 100%;
+    height: 100%;
+    margin: 0 !important;
+
+    .svg-icon {
+      display: block;
+      margin: 14px auto !important;
+      float: none !important;
+    }
+  }
+}
+</style>

ui/src/views/patrol/home/dashboard/PieChart.vue

@@ -0,0 +1,94 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+import resize from './mixins/resize'
+import {listAllPlan} from "@/api/patrol/patrol/plan";
+
+require('echarts/theme/macarons') // echarts theme
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '570px'
+    }
+  },
+  data() {
+    return {
+      chart: null,
+      planList: [],
+      // 查询参数
+      queryParams: {
+        planQuarter: new Date().getMonth() + 1, planYear: new Date().getFullYear()
+      },
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.getList()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    getList(){
+      listAllPlan(this.queryParams).then(response => {
+        response.data.forEach(item=>{
+          this.planList.push({name:item.planName,value:item.uncheckedNum})
+        })
+        this.initChart();
+      })},
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          type: 'scroll',
+          orient: 'horizontalAndVertical',
+          top: '70%',
+          data: this.planList,
+        },
+        series: [
+          {
+            name: '计划中未检测的设备数量',
+            type: 'pie',
+            radius: ['30%','50%'],
+            center: ['50%', '30%'],
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            },
+            data: this.planList,
+            animationEasing: 'cubicInOut',
+            animationDuration: 2600
+          }
+        ]
+      })
+    }
+  }
+}
+</script>

ui/src/views/patrol/home/dashboard/RaddarChart.vue

@@ -0,0 +1,116 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts';
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+const animationDuration = 3000
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        radar: {
+          radius: '66%',
+          center: ['50%', '42%'],
+          splitNumber: 8,
+          splitArea: {
+            areaStyle: {
+              color: 'rgba(127,95,132,.3)',
+              opacity: 1,
+              shadowBlur: 45,
+              shadowColor: 'rgba(0,0,0,.5)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 15
+            }
+          },
+          indicator: [
+            { name: 'Sales', max: 10000 },
+            { name: 'Administration', max: 20000 },
+            { name: 'Information Techology', max: 20000 },
+            { name: 'Customer Support', max: 20000 },
+            { name: 'Development', max: 20000 },
+            { name: 'Marketing', max: 20000 }
+          ]
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
+        },
+        series: [{
+          type: 'radar',
+          symbolSize: 0,
+          areaStyle: {
+            normal: {
+              shadowBlur: 13,
+              shadowColor: 'rgba(0,0,0,.2)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 10,
+              opacity: 1
+            }
+          },
+          data: [
+            {
+              value: [5000, 7000, 12000, 11000, 15000, 14000],
+              name: 'Allocated Budget'
+            },
+            {
+              value: [4000, 9000, 15000, 15000, 13000, 11000],
+              name: 'Expected Spending'
+            },
+            {
+              value: [5500, 11000, 12000, 15000, 12000, 12000],
+              name: 'Actual Spending'
+            }
+          ],
+          animationDuration: animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>

ui/src/views/patrol/home/dashboard/mixins/resize.js

@@ -0,0 +1,56 @@
+import { debounce } from '@/utils'
+
+export default {
+  data() {
+    return {
+      $_sidebarElm: null,
+      $_resizeHandler: null
+    }
+  },
+  mounted() {
+    this.initListener()
+  },
+  activated() {
+    if (!this.$_resizeHandler) {
+      // avoid duplication init
+      this.initListener()
+    }
+
+    // when keep-alive chart activated, auto resize
+    this.resize()
+  },
+  beforeDestroy() {
+    this.destroyListener()
+  },
+  deactivated() {
+    this.destroyListener()
+  },
+  methods: {
+    // use $_ for mixins properties
+    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+    $_sidebarResizeHandler(e) {
+      if (e.propertyName === 'width') {
+        this.$_resizeHandler()
+      }
+    },
+    initListener() {
+      this.$_resizeHandler = debounce(() => {
+        this.resize()
+      }, 100)
+      window.addEventListener('resize', this.$_resizeHandler)
+
+      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
+    },
+    destroyListener() {
+      window.removeEventListener('resize', this.$_resizeHandler)
+      this.$_resizeHandler = null
+
+      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
+    },
+    resize() {
+      const { chart } = this
+      chart && chart.resize()
+    }
+  }
+}

ui/src/views/patrol/home/index.vue

@@ -0,0 +1,67 @@
+<template>
+  <div class="dashboard-editor-container">
+<!--    <el-button @click="sendNotification" type="text">发送通知</el-button>-->
+    <panel-group/>
+
+    <el-row>
+      <el-col :xs="32" :sm="32" :lg="12">
+        <div class="chart-wrapper">
+          <pie-chart/>
+        </div>
+      </el-col>
+      <el-col :xs="32" :sm="32" :lg="12">
+        <div class="chart-wrapper">
+          <notice-chart />
+        </div>
+      </el-col>
+    </el-row>
+
+  </div>
+</template>
+
+<script>
+import PanelGroup from './dashboard/PanelGroup'
+import LineChart from './dashboard/LineChart'
+import RaddarChart from './dashboard/RaddarChart'
+import PieChart from './dashboard/PieChart'
+import BarChart from './dashboard/BarChart'
+import NoticeChart from "./dashboard/NoticeChart.vue";
+
+export default {
+  name: 'Index',
+  components: {
+    NoticeChart,
+    PanelGroup,
+    LineChart,
+    RaddarChart,
+    PieChart,
+    BarChart
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dashboard-editor-container {
+  padding: 32px;
+  background-color: rgb(240, 242, 245);
+  position: relative;
+
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 15px;
+  }
+}
+/*
+@media (max-width: 1024px) {
+  .chart-wrapper {
+    padding: 8px;
+  }
+}*/
+</style>

ui/src/views/patrol/patrol/file/index.vue

@@ -375,13 +375,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateFile(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addFile(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -392,11 +392,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除附件编号为"' + ids + '"的数据项？').then(function() {
+      this.confirm('是否确认删除附件编号为"' + ids + '"的数据项？').then(function() {
         return delFile(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {});
     },
     /** 导出按钮操作 */

ui/src/views/patrol/patrol/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>

ui/src/views/patrol/patrol/main/index.vue

@@ -552,13 +552,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateMain(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addMain(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -569,11 +569,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认数据项？').then(function () {
+      this.confirm('是否确认数据项？').then(function () {
         return delMain(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },

ui/src/views/patrol/patrol/plan/index.vue

@@ -453,11 +453,11 @@ export default {
       }
     },
     handleConform(row) {
-      this.$modal.confirm('是否确认检查计划已完成？').then(function () {
+      this.confirm('是否确认检查计划已完成？').then(function () {
         return conformPlan(row);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("确认成功");
+        this.msgSuccess("确认成功");
       }).catch(() => {
       });
     },
@@ -567,14 +567,14 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updatePlan(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             this.fullscreenLoading = true;
             addPlan(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.msgSuccess("新增成功");
               this.fullscreenLoading = false;
               this.open = false;
               this.getList();
@@ -588,11 +588,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除该检查计划？').then(function () {
+      this.$confirm('是否确认删除该检查计划？').then(function () {
         return delPlan(ids);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
+        this.msgSuccess("删除成功");
       }).catch(() => {
       });
     },