Merge branch 'xy-ly' of http://dev.xinyingpower.com:8080/git/xymp/frontend into xy-ly

src/components/common/Header.vue

@@ -22,7 +22,7 @@
         </el-dropdown>
       </div>
     </div>
-    <password-dialog ref="passwordref"  ></password-dialog>
+    <password-dialog ref="passwordref"></password-dialog>
   </div>
 </template>
 <script>
@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      userName: localStorage.getItem('userName')
+      userName: localStorage.getItem("userName"),
     };
   },
   methods: {
@@ -46,10 +46,14 @@ export default {
           console.log(command);
           break;
         case "changePwd": //修改密码
-          this.$refs.passwordref.display()
+          this.$refs.passwordref.display();
           break;
         case "loginout": //退出登录
-          this.$message.success("退出成功");
+          this.$message({
+            showClose: true,
+            message: "退出成功",
+            type: "success",
+          });
           this.$store.commit("REMOVE_INFO");
           this.$router.push("/login");
           break;

src/views/Login.vue

@@ -109,7 +109,12 @@ export default {
                 this.$store.commit("SET_TOKEN", res.data.sessionId); //将token保存在vuex中
                 this.$store.commit("SET_USERINFO", res.data); //将用户信息保存在vuex中
                 this.$router.push("/realTimeMonitor");
-                this.$message.success("登录成功");
+
+                this.$message({
+                  showClose: true,
+                  message: "登录成功",
+                  type: "success",
+                });
               } else {
                 this.$message.error(res.msg);
               }

src/views/cameraChannel/index.vue

@@ -156,10 +156,18 @@ export default {
           deleteChannelapi({ list: deleteArr }).then((res) => {
             this.deviceList(); //刷新
           });
-          this.$message({ type: "success", message: "删除成功!" });
+          this.$message({
+            showClose: true,
+            type: "success",
+            message: "删除成功!",
+          });
         })
         .catch(() => {
-          this.$message({ type: "info", message: "已取消删除" });
+          this.$message({
+            showClose: true,
+            type: "info",
+            message: "已取消删除",
+          });
         });
     },
     //点击分页

src/views/devicePhotoSchedule/index.vue

@@ -193,10 +193,18 @@ export default {
           deleteScheduleRulel({ list: deleteArr }).then((res) => {
             this.deviceList(); //刷新
           });
-          this.$message({ type: "success", message: "删除成功!" });
+          this.$message({
+            showClose: true,
+            type: "success",
+            message: "删除成功!",
+          });
         })
         .catch(() => {
-          this.$message({ type: "info", message: "已取消删除" });
+          this.$message({
+            showClose: true,
+            type: "info",
+            message: "已取消删除",
+          });
         });
     },
     //点击分页

src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue

@@ -324,6 +324,7 @@ export default {
           this.$message({
             type: "success",
             message: "绘制保存成功",
+            showClose: true,
           });
         })
         .catch((err) => {});

src/views/management/monitoringEquipment/photographicDevice/index.vue

@@ -335,15 +335,24 @@ export default {
           resetTerminalApi({ cmId: data.cmdid })
             .then((res) => {
               if (res.code == 200) {
-                this.$message({ message: "装置已复位", type: "success" });
+                this.$message({
+                  showClose: true,
+                  message: "装置已复位",
+                  type: "success",
+                });
               } else {
-                this.$message({ message: res.msg, type: "error" });
+                this.$message({
+                  showClose: true,
+                  message: res.msg,
+                  type: "error",
+                });
               }
             })
             .catch((err) => {});
         })
         .catch(() => {
           this.$message({
+            showClose: true,
             type: "info",
             message: "已取消删除",
           });
@@ -386,6 +395,7 @@ export default {
             this.$message({
               message: "成功开启GPS",
               type: "success",
+              showClose: true,
             });
           }
         })
@@ -454,12 +464,14 @@ export default {
           this.$message({
             type: "success",
             message: "删除成功!",
+            showClose: true,
           });
         })
         .catch(() => {
           this.$message({
             type: "info",
             message: "已取消删除",
+            showClose: true,
           });
         });
     },

src/views/management/userEquipment/lineInformation/index.vue

@@ -173,10 +173,18 @@ export default {
           deleteLineJoggle({ list: deleteArr }).then((res) => {
             this.lineList(); //刷新
           });
-          this.$message({ type: "success", message: "删除成功!" });
+          this.$message({
+            showClose: true,
+            type: "success",
+            message: "删除成功!",
+          });
         })
         .catch(() => {
-          this.$message({ type: "info", message: "已取消删除" });
+          this.$message({
+            showClose: true,
+            type: "info",
+            message: "已取消删除",
+          });
         });
     },
     //点击分页

src/views/management/userEquipment/towerInformation/index.vue

@@ -160,10 +160,18 @@ export default {
           delTowerApi({ list: deleteArr }).then((res) => {
             this.deviceList(); //刷新
           });
-          this.$message({ type: "success", message: "删除成功!" });
+          this.$message({
+            showClose: true,
+            type: "success",
+            message: "删除成功!",
+          });
         })
         .catch(() => {
-          this.$message({ type: "info", message: "已取消删除" });
+          this.$message({
+            showClose: true,
+            type: "info",
+            message: "已取消删除",
+          });
         });
     },
     //点击分页

src/views/realTimeMonitor/components/setschedule.bak.vue

@@ -294,6 +294,7 @@ export default {
           clearInterval(this.timer);
           this.timer = null;
           this.$message({
+            showClose: true,
             message: "时间表查询无响应，请稍后再试！",
             type: "warning",
           });

src/views/realTimeMonitor/index.vue

@@ -493,11 +493,13 @@ export default {
           if (res.code == 200) {
             if (val == 1) {
               this.$message({
+                showClose: true,
                 message: "声光报警开启成功",
                 type: "success",
               });
             } else {
               this.$message({
+                showClose: true,
                 message: "声光报警关闭成功",
                 type: "success",
               });
@@ -506,6 +508,7 @@ export default {
         })
         .catch((err) => {
           this.$message({
+            showClose: true,
             message: "声光报警操作失败",
             type: "error",
           });
@@ -524,6 +527,7 @@ export default {
     },
     handleShowErr() {
       this.$message({
+        showClose: true,
         message: "该功能暂未开发,敬请期待",
         type: "warning",
       });
@@ -541,6 +545,7 @@ export default {
       })
         .then((res) => {
           this.$message({
+            showClose: true,
             message: "手动拍照请求成功！",
             type: "success",
           });
@@ -570,6 +575,7 @@ export default {
       })
         .then((res) => {
           this.$message({
+            showClose: true,
             message: "手动拍视频请求成功！",
             type: "success",
           });
@@ -642,6 +648,7 @@ export default {
           clearInterval(this.timer);
           this.timer = null;
           this.$message({
+            showClose: true,
             message: "装置暂无响应，请稍后再试！",
             type: "warning",
           });

src/views/realTimeSearch/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="realTimeSearch">
-    <div class="searchMain" >
-      <div class="searchBox">
+    <div class="searchMain">
+      <div class="searchBox" ref="searchref">
         <el-form :inline="true" :model="formdata" class="demo-form-inline">
           <el-form-item label="电压等级">
             <el-select v-model="formdata.dyid" @change="getSearchxl">
@@ -35,7 +35,12 @@
           </el-form-item>
           <el-form-item label="装置名称">
             <el-select v-model="formdata.termid" @change="getSearchtd">
-              <el-option v-for="item in zzOptions" :key="item.id" :label="item.name" :value="item.id">
+              <el-option
+                v-for="item in zzOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -104,7 +109,7 @@
               ></video>
               <div class="caption">
                 <p class="infoTop">
-                  {{ item.linename }} / {{ item.displayname }};
+                  {{ item.linename }} / {{ item.displayname }}
                 </p>
                 <p class="infoBottom">
                   拍照时间：{{
@@ -155,11 +160,11 @@ export default {
         zoomable: true,
         url: "src",
       },
-      dyOptions: [{ id: 0, name: '全部'}], //电压数据
-      xlOptions: [{ id: 0, name: '全部'}], //线路数据
-      gtOptions: [{ id: 0, name: '全部'}], //杆塔数据
-      zzOptions: [{ id: 0, name: '全部'}], //装置数据
-      tdOptions: [{ id: 0, name: '全部'}], //通道数据
+      dyOptions: [{ id: 0, name: "全部" }], //电压数据
+      xlOptions: [{ id: 0, name: "全部" }], //线路数据
+      gtOptions: [{ id: 0, name: "全部" }], //杆塔数据
+      zzOptions: [{ id: 0, name: "全部" }], //装置数据
+      tdOptions: [{ id: 0, name: "全部" }], //通道数据
       formdata: {
         dyid: "",
         lineid: "",
@@ -206,7 +211,7 @@ export default {
     getSearchxl() {
       getSearchInfo({ type: 2, id: this.formdata.dyid })
         .then((res) => {
-          this.xlOptions = [{ id: 0, name: '全部'}]
+          this.xlOptions = [{ id: 0, name: "全部" }];
           this.xlOptions = this.xlOptions.concat(res.data.list);
           this.formdata.lineid = this.xlOptions[0].id;
           this.getSearchgt();
@@ -217,10 +222,10 @@ export default {
     getSearchgt() {
       getSearchInfo({ type: 3, id: this.formdata.lineid })
         .then((res) => {
-          this.gtOptions = [{ id: 0, name: '全部'}]
+          this.gtOptions = [{ id: 0, name: "全部" }];
           this.gtOptions = this.gtOptions.concat(res.data.list);
           this.formdata.towerid = this.gtOptions[0].id;
-          this.getSearchzz()
+          this.getSearchzz();
         })
         .catch((err) => {});
     },
@@ -228,7 +233,7 @@ export default {
     getSearchzz() {
       getSearchInfo({ type: 4, id: this.formdata.towerid })
         .then((res) => {
-          this.zzOptions = [{ id: 0, name: '全部'}]
+          this.zzOptions = [{ id: 0, name: "全部" }];
           this.zzOptions = this.zzOptions.concat(res.data.list);
           this.formdata.termid = this.zzOptions[0].id;
           this.getSearchtd();
@@ -239,7 +244,7 @@ export default {
     getSearchtd() {
       getSearchInfo({ type: 5, id: this.formdata.termid })
         .then((res) => {
-          this.tdOptions = [{ id: 0, name: '全部'}]
+          this.tdOptions = [{ id: 0, name: "全部" }];
           this.tdOptions = this.tdOptions.concat(res.data.list);
           this.formdata.channelid = this.tdOptions[0].id;
           // if (this.signtype == 0) {

src/views/system/userManagement.vue

@@ -20,20 +20,38 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
-          <el-table-column label="用户名" show-overflow-tooltip prop="userName" ></el-table-column>
-          <el-table-column label="角色" show-overflow-tooltip prop="role" >
-            <template slot-scope="scope">{{ scope.row.role == 1 ? '管理员' : '用户' }}</template>
+          <el-table-column
+            label="用户名"
+            show-overflow-tooltip
+            prop="userName"
+          ></el-table-column>
+          <el-table-column label="角色" show-overflow-tooltip prop="role">
+            <template slot-scope="scope">{{
+              scope.row.role == 1 ? "管理员" : "用户"
+            }}</template>
           </el-table-column>
-          <el-table-column label="创建时间" show-overflow-tooltip prop="createTime" >
-            <template slot-scope="scope">{{ $moment(scope.row.createTime).format("yy-MM-DD HH:mm:ss") }}</template>
+          <el-table-column
+            label="创建时间"
+            show-overflow-tooltip
+            prop="createTime"
+          >
+            <template slot-scope="scope">{{
+              $moment(scope.row.createTime).format("yy-MM-DD HH:mm:ss")
+            }}</template>
           </el-table-column>
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
                 @click.native.stop="handleResive(scope.row)"
                 type="text"
-                >修改</el-button>
-              <el-button type="text" class="deleteText" @click.native.stop="handleDelete(scope.row)" >删除</el-button>
+                >修改</el-button
+              >
+              <el-button
+                type="text"
+                class="deleteText"
+                @click.native.stop="handleDelete(scope.row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -61,7 +79,7 @@ import { getUserList, delUserApi } from "@/utils/api/index";
 
 export default {
   components: {
-    addUser
+    addUser,
   },
   data() {
     return {
@@ -130,7 +148,11 @@ export default {
           });
         })
         .catch(() => {
-          this.$message({ type: "info", message: "已取消删除" });
+          this.$message({
+            showClose: true,
+            type: "info",
+            message: "已取消删除",
+          });
         });
     },
     //点击分页