Merge remote-tracking branch 'origin/pet' into pet

src/views/emergen_cyrescue/emergency_team/expert_group/components/expertlist.vue

@@ -123,10 +123,18 @@ export default {
           }
         ).then((data) => {
           if (data.result === 'success') {
+            this.$message({
+              message: '移除成功',
+              type: 'success'
+            })
             this.listISLOADing = false
             this.getList()
           }
         }).catch((e) => {
+          this.$message({
+            message: '移除失败',
+            type: 'error'
+          })
           this.listISLOADing = false
         })
       }).catch(() => {

src/views/emergen_cyrescue/emergency_team/expert_group/components/expertselect.vue

@@ -5,6 +5,9 @@
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
         搜索
       </el-button>
+      <el-button class="filter-item" type="default" icon="el-icon-search" @click="resetQuery">
+        重置
+      </el-button>
 
       <div class="ui-foot">
         <el-button type="primary" @click="goBack">返回专家列表</el-button>
@@ -98,6 +101,10 @@ export default {
           this.listISLOADing = false
         })
     },
+    resetQuery() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
     //* ***************************数据保存**********************************
 
     handleAdd(id, name) {
@@ -115,10 +122,18 @@ export default {
           }
         ).then((data) => {
           if (data.result == 'success') {
+            this.$message({
+              message: '添加成功',
+              type: 'success'
+            })
             this.listISLOADing = false
             this.getList()
           }
         }).catch((e) => {
+          this.$message({
+            message: '添加失败',
+            type: 'error'
+          })
           this.listISLOADing = false
         })
       }).catch(() => {

src/views/emergen_cyrescue/resource_management/closed_bayonet/components/list.vue

@@ -231,12 +231,20 @@ export default {
     dataSave() {
       this.listLoading = true
       requestFN('/major/checkpoint/save', this.form).then((data) => {
+        this.$message({
+          message: '操作成功',
+          type: 'success'
+        })
         this.listLoading = false
         this.dialogFormEdit = false
         this.varList = []
         this.listQuery.page = 1
         this.getList()
       }).catch((e) => {
+        this.$message({
+          message: '操作失败',
+          type: 'error'
+        })
         this.listLoading = false
       })
     },
@@ -248,11 +256,19 @@ export default {
       }).then(() => {
         this.listLoading = true
         requestFN('/major/checkpoint/delete', { id: id }).then((data) => {
-          if (data.result == 'success') {
+          if (data.result === 'success') {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
             this.listLoading = false
             this.getList()
           }
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listLoading = false
         })
       }).catch(() => {

src/views/emergen_cyrescue/resource_management/drainage_well/components/list.vue

@@ -262,12 +262,20 @@ export default {
     dataSave() {
       this.listLoading = true
       requestFN('/major/drainage/save', this.form).then((data) => {
+        this.$message({
+          message: '操作成功',
+          type: 'success'
+        })
         this.listLoading = false
         this.dialogFormEdit = false
         this.varList = []
         this.listQuery.page = 1
         this.getList()
       }).catch((e) => {
+        this.$message({
+          message: '操作失败',
+          type: 'error'
+        })
         this.listLoading = false
       })
     },
@@ -280,10 +288,18 @@ export default {
         this.listLoading = true
         requestFN('/major/drainage/delete', { id: id }).then((data) => {
           if (data.result == 'success') {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
             this.listLoading = false
             this.getList()
           }
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listLoading = false
         })
       }).catch(() => {})
@@ -302,12 +318,20 @@ export default {
       }).then(() => {
         this.listLoading = true
         requestFN('/major/drainage/deleteAll', { ids: ids }).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
           this.listLoading = false
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
           this.getList()
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listLoading = false
         })
       }).catch(() => {})

src/views/emergen_cyrescue/resource_management/emergency_shelter/components/list.vue

@@ -554,12 +554,20 @@ export default {
       requestFN(
         '/shelterRefuge/save', this.form
       ).then((data) => {
+        this.$message({
+          message: '操作成功',
+          type: 'success'
+        })
         this.listISLOADing = false
         this.dialogFormEdit = false
         this.varList = []
         this.listQuery.page = 1
         this.getList()
       }).catch((e) => {
+        this.$message({
+          message: '操作失败',
+          type: 'error'
+        })
         this.listISLOADing = false
       })
     },
@@ -578,10 +586,18 @@ export default {
           }
         ).then((data) => {
           if (data.result == 'success') {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
             this.listISLOADing = false
             this.getList()
           }
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listISLOADing = false
         })
       }).catch(() => {
@@ -614,12 +630,20 @@ export default {
             ids: ids
           }
         ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
           this.listISLOADing = false
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
           this.getList()
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listISLOADing = false
         })
       }).catch(() => {

src/views/emergen_cyrescue/resource_management/equipment_library/components/equipment.vue

@@ -292,8 +292,16 @@ export default {
         '/file/upload',
         formData
       ).then((data) => {
+        this.$message({
+          message: '上传成功',
+          type: 'success'
+        })
         fun(data.fileurl)
       }).catch((e) => {
+        this.$message({
+          message: '上传失败',
+          type: 'error'
+        })
       })
     },
     //* ****************************************
@@ -543,12 +551,20 @@ export default {
       requestFN(
         '/rescueEquip/save', this.form
       ).then((data) => {
+        this.$message({
+          message: '操作成功',
+          type: 'success'
+        })
         this.listISLOADing = false
         this.dialogFormEdit = false
         this.varList = []
         this.listQuery.page = 1
         this.getList()
       }).catch((e) => {
+        this.$message({
+          message: '操作失败',
+          type: 'error'
+        })
         this.listISLOADing = false
       })
     },
@@ -567,10 +583,18 @@ export default {
           }
         ).then((data) => {
           if (data.result == 'success') {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
             this.listISLOADing = false
             this.getList()
           }
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listISLOADing = false
         })
       }).catch(() => {
@@ -603,12 +627,20 @@ export default {
             ids: ids
           }
         ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
           this.listISLOADing = false
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
           this.getList()
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listISLOADing = false
         })
       }).catch(() => {

src/views/emergen_cyrescue/resource_management/equipment_library/components/facilities.vue

@@ -285,8 +285,16 @@ export default {
         '/file/upload',
         formData
       ).then((data) => {
+        this.$message({
+          message: '上传成功',
+          type: 'success'
+        })
         fun(data.fileurl)
       }).catch((e) => {
+        this.$message({
+          message: '上传失败',
+          type: 'error'
+        })
       })
     },
     //* ****************************************
@@ -527,12 +535,20 @@ export default {
       requestFN(
         '/equipmentfacilities/save', this.form
       ).then((data) => {
+        this.$message({
+          message: '操作成功',
+          type: 'success'
+        })
         this.listISLOADing = false
         this.dialogFormEdit = false
         this.varList = []
         this.listQuery.page = 1
         this.getList()
       }).catch((e) => {
+        this.$message({
+          message: '操作失败',
+          type: 'error'
+        })
         this.listISLOADing = false
       })
     },
@@ -551,10 +567,18 @@ export default {
           }
         ).then((data) => {
           if (data.result == 'success') {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
             this.listISLOADing = false
             this.getList()
           }
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listISLOADing = false
         })
       }).catch(() => {
@@ -587,12 +611,20 @@ export default {
             ids: ids
           }
         ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
           this.listISLOADing = false
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
           this.getList()
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listISLOADing = false
         })
       }).catch(() => {

src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue

@@ -284,12 +284,20 @@ export default {
     dataSave() {
       this.listLoading = true
       requestFN('/major/resource/save', this.form).then((data) => {
+        this.$message({
+          message: '操作成功',
+          type: 'success'
+        })
         this.listLoading = false
         this.dialogFormEdit = false
         this.varList = []
         this.listQuery.page = 1
         this.getList()
       }).catch((e) => {
+        this.$message({
+          message: '操作失败',
+          type: 'error'
+        })
         this.listLoading = false
       })
     },
@@ -302,10 +310,18 @@ export default {
         this.listLoading = true
         requestFN('/major/resource/delete', { id: id }).then((data) => {
           if (data.result == 'success') {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
             this.listLoading = false
             this.getList()
           }
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listLoading = false
         })
       }).catch(() => {})
@@ -324,12 +340,20 @@ export default {
       }).then(() => {
         this.listLoading = true
         requestFN('/major/resource/deleteAll', { ids: ids }).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
           this.listLoading = false
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
           this.getList()
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listLoading = false
         })
       }).catch(() => {})

src/views/emergen_cyrescue/resource_management/equipment_library/components/supplies.vue

@@ -290,8 +290,16 @@ export default {
         '/file/upload',
         formData
       ).then((data) => {
+        this.$message({
+          message: '上传成功',
+          type: 'success'
+        })
         fun(data.fileurl)
       }).catch((e) => {
+        this.$message({
+          message: '上传失败',
+          type: 'error'
+        })
       })
     },
     //* ****************************************
@@ -540,12 +548,20 @@ export default {
       requestFN(
         '/rescueSupplies/save', this.form
       ).then((data) => {
+        this.$message({
+          message: '操作成功',
+          type: 'success'
+        })
         this.listISLOADing = false
         this.dialogFormEdit = false
         this.varList = []
         this.listQuery.page = 1
         this.getList()
       }).catch((e) => {
+        this.$message({
+          message: '操作失败',
+          type: 'error'
+        })
         this.listISLOADing = false
       })
     },
@@ -564,10 +580,18 @@ export default {
           }
         ).then((data) => {
           if (data.result == 'success') {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
             this.listISLOADing = false
             this.getList()
           }
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listISLOADing = false
         })
       }).catch(() => {
@@ -600,12 +624,20 @@ export default {
             ids: ids
           }
         ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
           this.listISLOADing = false
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
           this.getList()
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listISLOADing = false
         })
       }).catch(() => {

src/views/emergen_cyrescue/resource_management/fireInfo_report/components/list.vue

@@ -211,6 +211,7 @@ export default {
       this.keySelect.FIRE_DEVICE_TYPE_ID = ''
       this.keySelect.FIRE_REGION_ID = ''
       this.keySelect.FIRE_DEVICE_CODE = ''
+      this.keySelect.FIRE_POINT_NAME = ''
       this.getList()
     },
     getDict() {

src/views/emergency/equipment/components/list.vue

@@ -253,10 +253,18 @@ export default {
             '/emergencyequipment/' + this.dialogType,
             this.form
           ).then((data) => {
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
             this.listLoading = false
             this.dialogFormEdit = false
             this.getList()
           }).catch((e) => {
+            this.$message({
+              message: '操作失败',
+              type: 'error'
+            })
             this.listLoading = false
           })
         } else {
@@ -287,6 +295,10 @@ export default {
           this.listQuery.page = 1
           this.getList()
         }).catch((e) => {
+          this.$message({
+            message: '删除失败',
+            type: 'error'
+          })
           this.listLoading = false
         })
       }).catch(() => {