From 3d568574fdeb2b2cee106b05ef15cba3dd484fdf Mon Sep 17 00:00:00 2001
From: Fluyan <754122931@qq.com>
Date: Sun, 21 May 2023 10:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Sidebar.vue             | 22 ++++-----
 .../components/adddeviceDialog.vue            | 12 ++++-
 .../cameraChannel/components/setdevice.vue    | 12 ++++-
 src/views/cameraChannel/index.vue             |  4 +-
 .../components/adddeviceDialog.vue            | 12 ++++-
 .../components/setdevice copy.vue             | 20 ++++++--
 .../components/setdevice.vue                  | 17 +++++--
 src/views/devicePhotoSchedule/index.vue       |  4 +-
 .../components/addPhotoDialog.vue             | 12 ++++-
 .../photographicDevice/index.vue              |  8 ++--
 .../components/addLineDialog.vue              | 26 +++++++++--
 .../components/addTowerDialog.vue             | 12 ++++-
 .../userEquipment/lineInformation/index.vue   |  4 +-
 .../towerInformation/components/addDialog.vue | 26 +++++++++--
 .../userEquipment/towerInformation/index.vue  |  4 +-
 .../components/setschedule.bak.vue            | 10 +++-
 .../components/setschedule.vue                | 11 ++++-
 src/views/realTimeSearch/index.vue            | 24 ++++------
 src/views/system/components/addUser.vue       | 46 ++++++++++++++-----
 19 files changed, 213 insertions(+), 73 deletions(-)

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 @@
   <div class="camerChannel">
     <div class="deviceBox">
       <div class="deviceBtnGroup">
+        <h4>通道管理</h4>
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -183,7 +184,8 @@ export default {
   }
   .deviceBtnGroup {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
+    align-items: center;
   }
 
   .deviceTable {
diff --git a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
index 0dfdf30..fee7596 100644
--- a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
+++ b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
@@ -141,11 +141,19 @@ export default {
             addScheduleRulel(this.ruleForm)
               .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",
+                });
               });
           } 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 @@
   <div class="deviceInformation">
     <div class="deviceBox">
       <div class="deviceBtnGroup">
+        <h4>拍照时间表设置</h4>
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -213,7 +214,8 @@ export default {
   }
   .deviceBtnGroup {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
+    align-items: center;
   }
 
   .deviceTable {
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index 1c1c4f7..ef2f6a4 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -164,11 +164,19 @@ export default {
             addTerminalJoggle(this.formInfo)
               .then((res) => {
                 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 @@
   <div class="photoGraphicDevice">
     <div class="photoBox">
       <div class="photoGraphicBtnGroup">
+        <h4>拍照装置管理</h4>
         <el-button type="primary" icon="el-icon-plus" @click="handleAddPhoto()"
           >新增</el-button
         >
@@ -47,14 +48,14 @@
               <span v-if="scope.row.hasPan == 1">是</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="updateTime"
             label="修改时间"
             :show-overflow-tooltip="true"
             :formatter="dateFormat"
             width="160px"
           >
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column prop="equipName" label="装置名称"> </el-table-column>
           <el-table-column prop="model" label="装置型号"> </el-table-column>
           <!-- <el-table-column label="经维度">
@@ -375,7 +376,8 @@ export default {
   }
   .photoGraphicBtnGroup {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
+    align-items: center;
   }
 
   .photoGraphicTable {
diff --git a/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue b/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue
index 77997d9..9f4699f 100644
--- a/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue
+++ b/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue
@@ -96,22 +96,40 @@ export default {
             addLineJoggle({ list: formArr })
               .then((res) => {
                 this.isShow = false;
-                this.$message.success("添加成功");
+                this.$message({
+                  showClose: true,
+                  message: "添加成功",
+                  type: "success",
+                });
                 this.$parent.lineList();
               })
               .catch((err) => {
                 console.log(err); //代码错误、请求失败捕获
-                this.$message.error("添加失败");
+                this.$message({
+                  showClose: true,
+                  message: "添加失败",
+                  type: "error",
+                });
               });
           } else {
             updateLineJoggle(this.formdata)
               .then((res) => {
                 this.isShow = false;
-                this.$message.success("修改成功");
+                //this.$message.success("修改成功");
+                this.$message({
+                  showClose: true,
+                  message: "修改成功",
+                  type: "success",
+                });
                 this.$parent.lineList();
               })
               .catch((err) => {
-                this.$message.error("修改失败");
+                this.$message({
+                  showClose: true,
+                  message: "修改失败",
+                  type: "error",
+                });
+                //this.$message.error("修改失败");
               });
           }
         } else {
diff --git a/src/views/management/userEquipment/lineInformation/components/addTowerDialog.vue b/src/views/management/userEquipment/lineInformation/components/addTowerDialog.vue
index 252ee89..4e5cfac 100644
--- a/src/views/management/userEquipment/lineInformation/components/addTowerDialog.vue
+++ b/src/views/management/userEquipment/lineInformation/components/addTowerDialog.vue
@@ -77,10 +77,18 @@ export default {
           })
             .then((res) => {
               this.isShow = false;
-              this.$message.success("添加成功");
+              this.$message({
+                showClose: true,
+                message: "添加成功",
+                type: "success",
+              });
             })
             .catch((err) => {
-              this.$message.error("添加失败");
+              this.$message({
+                showClose: true,
+                message: "添加失败",
+                type: "error",
+              });
             });
         } else {
           console.log("error submit!!");
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 3d89930..5c8f03b 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -2,6 +2,7 @@
   <div class="lineInformation">
     <div class="lineBox">
       <div class="lineBtnGroup">
+        <h4>线路信息管理</h4>
         <el-button type="primary" icon="el-icon-plus" @click="handleAddLine()"
           >新增</el-button
         >
@@ -199,7 +200,8 @@ export default {
   }
   .lineBtnGroup {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
+    align-items: center;
   }
 
   .lineTable {
diff --git a/src/views/management/userEquipment/towerInformation/components/addDialog.vue b/src/views/management/userEquipment/towerInformation/components/addDialog.vue
index cfdf9c1..c369f08 100644
--- a/src/views/management/userEquipment/towerInformation/components/addDialog.vue
+++ b/src/views/management/userEquipment/towerInformation/components/addDialog.vue
@@ -83,22 +83,40 @@ export default {
             addTowerApi({ list: formArr })
               .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",
+                });
               });
           } else {
             console.log(this.formdata);
             updateTowerApi(this.formdata)
               .then((res) => {
                 this.isShow = false;
-                this.$message.success("修改成功");
+                //this.$message.success("修改成功");
+                this.$message({
+                  showClose: true,
+                  message: "修改成功",
+                  type: "success",
+                });
                 this.$parent.deviceList();
               })
               .catch((err) => {
-                this.$message.error("修改失败");
+                //this.$message.error("修改失败");
+                this.$message({
+                  showClose: true,
+                  message: "修改失败",
+                  type: "error",
+                });
               });
           }
         } else {
diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue
index d4d372f..15c3932 100644
--- a/src/views/management/userEquipment/towerInformation/index.vue
+++ b/src/views/management/userEquipment/towerInformation/index.vue
@@ -2,6 +2,7 @@
   <div class="deviceInformation">
     <div class="deviceBox">
       <div class="deviceBtnGroup">
+        <h4>杆塔信息管理</h4>
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -188,7 +189,8 @@ export default {
   }
   .deviceBtnGroup {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
+    align-items: center;
   }
 
   .deviceTable {
diff --git a/src/views/realTimeMonitor/components/setschedule.bak.vue b/src/views/realTimeMonitor/components/setschedule.bak.vue
index da64626..38f88f8 100644
--- a/src/views/realTimeMonitor/components/setschedule.bak.vue
+++ b/src/views/realTimeMonitor/components/setschedule.bak.vue
@@ -427,7 +427,10 @@ export default {
           .then((res) => {
             this.isShowset = false;
             console.log(res);
-            //this.$message.success("添加成功");
+            // this.$message({
+          showClose: true,
+          message: '添加成功',type: 'success'
+        });;
             console.log(this.checkList);
             // this.$store.commit("SET_CHANNELID", this.checkList); //将通道保存在vuex中
             // this.$store.commit("SET_TERMID", this.deviceListData.zzid); //将装置保存在vuex中
@@ -435,7 +438,10 @@ export default {
             this.deviceList();
           })
           .catch((err) => {
-            this.$message.error("添加失败");
+             this.$message({
+          showClose: true,
+          message: '添加失败',type: 'error'
+        });
           });
       }
     },
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index d94f742..9a9bf9a 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -421,7 +421,10 @@ export default {
           .then((res) => {
             this.isShowset = false;
             console.log(res);
-            //this.$message.success("添加成功");
+            //     // this.$message({
+            //   showClose: true,
+            //   message: '添加成功',type: 'success'
+            // });;
             console.log(this.checkList);
             // this.$store.commit("SET_CHANNELID", this.checkList); //将通道保存在vuex中
             // this.$store.commit("SET_TERMID", this.deviceListData.zzid); //将装置保存在vuex中
@@ -429,7 +432,11 @@ export default {
             this.deviceList();
           })
           .catch((err) => {
-            this.$message.error("添加失败");
+            this.$message({
+              showClose: true,
+              message: "添加失败",
+              type: "error",
+            });
           });
       }
     },
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index a9ccda0..14b34bc 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -75,17 +75,15 @@
 
               <div class="caption">
                 <p class="infoTop">
-                  {{ item.linename }};{{ item.displayname }};{{
-                    item.channnelname
-                  }}
+                  {{ item.linename }};{{ item.displayname }};
                 </p>
                 <p class="infoBottom">
                   拍照时间：{{
-                    $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss")
-                  }}
-                  上传时间：{{
+                    $moment(item.photoTime).format("MM-DD HH:mm")
+                  }};{{ item.channnelname }}
+                  <!-- 上传时间：{{
                     $moment(item.recvTime).format("YYYY-MM-DD HH:mm:ss")
-                  }}
+                  }} -->
                 </p>
               </div>
             </viewer>
@@ -99,17 +97,15 @@
               ></video>
               <div class="caption">
                 <p class="infoTop">
-                  {{ item.linename }};{{ item.displayname }};{{
-                    item.channnelname
-                  }}
+                  {{ item.linename }};{{ item.displayname }};
                 </p>
                 <p class="infoBottom">
                   拍照时间：{{
-                    $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss")
-                  }}
-                  上传时间：{{
+                    $moment(item.photoTime).format("MM-DD HH:mm")
+                  }};{{ item.channnelname }}
+                  <!-- 上传时间：{{
                     $moment(item.recvTime).format("YYYY-MM-DD HH:mm:ss")
-                  }}
+                  }} -->
                 </p>
               </div>
             </div>
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"
     >
       <el-form-item label="用户名：" prop="username">
-        <el-input placeholder="请输入用户名" v-model="formdata.username" autocomplete="off"></el-input>
+        <el-input
+          placeholder="请输入用户名"
+          v-model="formdata.username"
+          autocomplete="off"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="角色：" prop="role" >
+      <el-form-item label="角色：" prop="role">
         <el-select v-model="formdata.role" placeholder="请选择">
-          <el-option v-for="item in roleoptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+          <el-option
+            v-for="item in roleoptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="密码：" prop="password">
-        <el-input placeholder="请输入密码" v-model="formdata.password" show-password></el-input>
+        <el-input
+          placeholder="请输入密码"
+          v-model="formdata.password"
+          show-password
+        ></el-input>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -41,18 +54,23 @@ export default {
   data() {
     return {
       isShow: false,
-      roleoptions:[{
+      roleoptions: [
+        {
           value: 1,
-          label: '管理员'
-        }, {
+          label: "管理员",
+        },
+        {
           value: 2,
-          label: '用户'
-        }],
+          label: "用户",
+        },
+      ],
       formdata: {},
       rules: {
-        username: [{ required: true, message: "请输入用户名", trigger: "blur" }],
+        username: [
+          { required: true, message: "请输入用户名", trigger: "blur" },
+        ],
         role: [{ required: true, message: "请选择角色", trigger: "blur" }],
-        password: [{ required: true, message: "请输入密码", trigger: "blur" }]
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
       },
     };
   },
@@ -75,7 +93,11 @@ export default {
             addChannelapi({ list: formArr })
               .then((res) => {
                 if (res.code == 200) {
-                  this.$message.success("添加成功");
+                  this.$message({
+                    showClose: true,
+                    message: "添加成功",
+                    type: "success",
+                  });
                   this.$parent.deviceList();
                   this.isShow = false;
                 } else {