合并代码

src/components/common/Sidebar.vue

@@ -114,17 +114,17 @@ export default {
             // },
           ],
         },
-        {
+        // {
-          icon: "el-icon-monitor",
+        //   icon: "el-icon-monitor",
-          index: "/system",
+        //   index: "/system",
-          title: "系统管理",
+        //   title: "系统管理",
-          subs: [
+        //   subs: [
-            {
+        //     {
-              index: "/userManagement",
+        //       index: "/userManagement",
-              title: "用户管理",
+        //       title: "用户管理",
-            },
+        //     },
-          ],
+        //   ],
-        },
+        // },
       ],
     };
   },

src/views/Login.vue

@@ -70,8 +70,8 @@ export default {
   data: function () {
     return {
       userInfo: {
-        username: "",
+        username: "xytest",
-        password: "",
+        password: "111121",
         //verificationCode: "",
       },
       rules: {

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)

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() {

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 {

src/views/components/carouselChart.vue

@@ -12,11 +12,7 @@
           bigPicPath ? 'backgroundImage:url(' + bigPicPath + '!128x72)' : ''
         "
       >
-        <img
+        <img class="animImg" :src="bigPicPath + '!1280x720'" />
-          class="animImg"
-          v-if="bigPicPath !== ''"
-          :src="bigPicPath + '!1280x720'"
-        />
         <!-- <p class="mark">
           {{ bigPicPath }}
           <span>{{ this.activeSmall }}</span>

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)

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() {

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() {

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 {

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 = {

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 {

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 {

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!!");

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 {

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 {

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 {

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'
+        });
           });
       }
     },

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",
+            });
           });
       }
     },

src/views/realTimeSearch/index.vue

@@ -3,7 +3,7 @@
     <div class="searchMain" v-loading="loadingSearch">
       <div class="searchBox">
         <el-form :inline="true" :model="formdata" class="demo-form-inline">
-          <el-form-item label="电压名称">
+          <el-form-item label="电压等级">
             <el-select v-model="formdata.dyid" @change="getSearchxl">
               <el-option
                 v-for="item in dyOptions"
@@ -75,17 +75,16 @@
 
               <div class="caption">
                 <p class="infoTop">
-                  {{ item.linename }};{{ item.displayname }};{{
+                  {{ item.linename }} / {{ item.displayname }}
-                    item.channnelname
-                  }}
                 </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 +98,16 @@
               ></video>
               <div class="caption">
                 <p class="infoTop">
-                  {{ item.linename }};{{ item.displayname }};{{
+                  {{ item.linename }} / {{ item.displayname }};
-                    item.channnelname
-                  }}
                 </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>

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-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 {