diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index 996b1df..65acfef 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -114,17 +114,17 @@ export default { // }, ], }, - { - icon: "el-icon-monitor", - index: "/system", - title: "系统管理", - subs: [ - { - index: "/userManagement", - title: "用户管理", - }, - ], - }, + // { + // icon: "el-icon-monitor", + // index: "/system", + // title: "系统管理", + // subs: [ + // { + // index: "/userManagement", + // title: "用户管理", + // }, + // ], + // }, ], }; }, diff --git a/src/views/cameraChannel/components/adddeviceDialog.vue b/src/views/cameraChannel/components/adddeviceDialog.vue index 4c16e3e..0bc4e70 100644 --- a/src/views/cameraChannel/components/adddeviceDialog.vue +++ b/src/views/cameraChannel/components/adddeviceDialog.vue @@ -89,7 +89,11 @@ export default { .then((res) => { //this.errorMsg = ""; if (res.code == 200) { - this.$message.success("添加成功"); + this.$message({ + showClose: true, + message: "添加成功", + type: "success", + }); this.$parent.deviceList(); this.isShow = false; } else { @@ -98,7 +102,11 @@ export default { } }) .catch((err) => { - this.$message.error("添加失败"); + this.$message({ + showClose: true, + message: "添加失败", + type: "error", + }); }); } else { updateChannelapi(this.formdata) diff --git a/src/views/cameraChannel/components/setdevice.vue b/src/views/cameraChannel/components/setdevice.vue index 040b9bd..a0c4092 100644 --- a/src/views/cameraChannel/components/setdevice.vue +++ b/src/views/cameraChannel/components/setdevice.vue @@ -135,11 +135,19 @@ export default { setScheduleRulel({ list: this.parmsList, ruleid: this.selid }) .then((res) => { this.isShow = false; - this.$message.success("添加成功"); + this.$message({ + showClose: true, + message: "添加成功", + type: "success", + }); this.$parent.deviceList(); }) .catch((err) => { - this.$message.error("添加失败"); + this.$message({ + showClose: true, + message: "添加失败", + type: "error", + }); }); }, display() { diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue index 87e961e..66b8cc0 100644 --- a/src/views/cameraChannel/index.vue +++ b/src/views/cameraChannel/index.vue @@ -2,6 +2,7 @@
+

通道管理

{ this.isShow = false; - this.$message.success("添加成功"); + this.$message({ + showClose: true, + message: "添加成功", + type: "success", + }); this.$parent.deviceList(); }) .catch((err) => { - this.$message.error("添加失败"); + this.$message({ + showClose: true, + message: "添加失败", + type: "error", + }); }); } else { updateScheduleRulel(this.ruleForm) diff --git a/src/views/devicePhotoSchedule/components/setdevice copy.vue b/src/views/devicePhotoSchedule/components/setdevice copy.vue index 59b66cd..e23eff8 100644 --- a/src/views/devicePhotoSchedule/components/setdevice copy.vue +++ b/src/views/devicePhotoSchedule/components/setdevice copy.vue @@ -235,11 +235,17 @@ export default { }) .then((res) => { this.isShow = false; - this.$message.success("添加成功"); + this.$message({ + showClose: true, + message: '添加成功',type: 'success' + });; this.$parent.deviceList(); }) .catch((err) => { - this.$message.error("添加失败"); + this.$message({ + showClose: true, + message: '添加失败',type: 'error' + }); }); } // if (this.parmsList.length == 0) @@ -247,11 +253,17 @@ export default { // setScheduleRulel({ list: this.parmsList, ruleid: this.selid }) // .then((res) => { // this.isShow = false; - // this.$message.success("添加成功"); + // this.$message({ + showClose: true, + message: '添加成功',type: 'success' + });; // this.$parent.deviceList(); // }) // .catch((err) => { - // this.$message.error("添加失败"); + // this.$message({ + showClose: true, + message: '添加失败',type: 'error' + }); // }); }, display() { diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue index 7069df3..07d76fd 100644 --- a/src/views/devicePhotoSchedule/components/setdevice.vue +++ b/src/views/devicePhotoSchedule/components/setdevice.vue @@ -198,7 +198,11 @@ export default { if (this.termidArrNum < this.termidArr.length) { this.sureSum(); } else { - this.$message.success("添加成功"); + this.$message({ + showClose: true, + message: "添加成功", + type: "success", + }); this.isShow = false; this.$parent.deviceList(); clearTimeout(this.timer); @@ -217,10 +221,17 @@ export default { scheduleid: this.selid, }) .then((res) => { - // this.$message.success("添加成功"); + // this.$message({ + // showClose: true, + // message: '添加成功',type: 'success' + // });; }) .catch((err) => { - this.$message.error("添加失败"); + this.$message({ + showClose: true, + message: "添加失败", + type: "error", + }); }); }, display() { diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue index c68660e..a1d776b 100644 --- a/src/views/devicePhotoSchedule/index.vue +++ b/src/views/devicePhotoSchedule/index.vue @@ -2,6 +2,7 @@
+

拍照时间表设置

{ this.isShow = false; - this.$message.success("添加成功"); + this.$message({ + showClose: true, + message: "添加成功", + type: "success", + }); this.$parent.terminalList(); //刷新 }) .catch((err) => { - this.$message.error("添加失败"); + this.$message({ + showClose: true, + message: "添加失败", + type: "error", + }); }); } else { this.formInfo = { diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 3534801..9ae2447 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -2,6 +2,7 @@
+

拍照装置管理

新增 @@ -47,14 +48,14 @@ - - + -->

@@ -99,17 +97,15 @@ >

- {{ item.linename }};{{ item.displayname }};{{ - item.channnelname - }} + {{ item.linename }};{{ item.displayname }};

拍照时间:{{ - $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss") - }} - 上传时间:{{ + $moment(item.photoTime).format("MM-DD HH:mm") + }};{{ item.channnelname }} +

diff --git a/src/views/system/components/addUser.vue b/src/views/system/components/addUser.vue index a352966..c6f1fd8 100644 --- a/src/views/system/components/addUser.vue +++ b/src/views/system/components/addUser.vue @@ -15,15 +15,28 @@ :model="formdata" > - + - + - + - +