zhangyun hace 3 años
padre
commit
8f902ba0eb

+ 2 - 2
minggao/config/index.js

@@ -12,9 +12,9 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
-         target: 'http://192.168.1.17:12345', //翟毅飞
+        //  target: 'http://192.168.1.17:12345', //翟毅飞
         //  target: 'https://yfznscd.com', //线上
-        //  target: 'https://www.toreskj.com', //线上
+         target: 'https://www.toreskj.com', //线上
         // target: 'http://192.168.1.77:12345', //曹世祥
         // target:"http://114.115.147.140:12345",
         // target: 'https://www.yfznscd.com',

+ 0 - 1
minggao/src/page/commandCenter/superviseDetails.vue

@@ -423,7 +423,6 @@ export default {
         font-size: 18px;
         width: 20%;
         text-align: right;
-        margin: 0px 0 0 -35px;
       }
     }
   }

+ 4 - 3
minggao/src/page/forecasting/cbd/Cbd.vue

@@ -56,6 +56,7 @@
           :xl="6"
           v-for="item in equipList"
           :key="item.imei"
+          style="margin-bottom:10px;"
         >
           <el-card class="box-card">
             <equip-item :is_online="item.device_status">
@@ -1886,14 +1887,14 @@ export default {
 .haiguan {
   display: flex;
   flex-wrap: wrap;
-  margin-top: 10px;
+  margin-top: 5px;
   .haiguan_item {
-    width: 70px;
+    // width: 70px;
     height: 20px;
     border: 1px solid #d4d2d2;
     line-height: 20px;
     margin-right: 10px;
-    padding: 0 0 0 10px;
+    padding: 2px 10px;
     border-radius: 5px;
   }
   .haiguan_itemnone {

+ 1 - 1
minggao/src/page/forecasting/cbd/DataDetails.vue

@@ -26,7 +26,7 @@
     <!-- 统计图 -->
     <el-row :gutter="10">
       <el-col :md="24" :lg="9">
-        <el-card class="box-card">
+        <el-card class="box-card" style="height:492px;">
           <el-row :gutter="10">
             <el-col :xs="12" :sm="12" :md="6" :lg="12">
               <div class="equipStatus">

+ 3 - 3
minggao/src/page/forecasting/trap/trap.vue

@@ -1208,14 +1208,14 @@ export default {
 .haiguan {
   display: flex;
   flex-wrap: wrap;
-  margin-top: 10px;
+  margin-top: 5px;
   .haiguan_item {
-    width: 70px;
+    // width: 70px;
     height: 20px;
     border: 1px solid #d4d2d2;
     line-height: 20px;
     margin-right: 10px;
-    padding: 0 0 0 10px;
+    padding: 2px 10px;
     border-radius: 5px;
   }
   .haiguan_itemnone {

+ 1 - 0
minggao/src/page/home/index.vue

@@ -354,6 +354,7 @@ export default {
         if (!this.$refs.qrCodeUrl.firstChild) {
           new QRCode(this.$refs.qrCodeUrl, {
             text: this.$deriveData+this.app_url, // 需要转换为二维码的内容
+            // text: "http://114.115.147.140:12345"+this.app_url,
             width: 100,
             height: 100,
             colorDark: "#000000",

+ 7 - 7
minggao/src/page/homepage/facilitydistribute.vue

@@ -686,13 +686,13 @@ export default {
         //   // console.log(obj2)
         // }
         // console.log(arr1,obj2)
-        if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message({
-            showClose: true,
-            message: "数据获取成功!",
-            type: "success",
-          });
-        }
+        // if (document.getElementsByClassName("el-message").length == 0) {
+        //   // this.$message({
+        //   //   showClose: true,
+        //   //   message: "数据获取成功!",
+        //   //   type: "success",
+        //   // });
+        // }
         this.init(res.data.data);
         // this.inoffoptions = res.data.data.point_data;
       });

+ 14 - 14
minggao/src/page/monitor/Monitor.vue

@@ -147,12 +147,12 @@
             v-show="playType == 0"
             @click="checkPlayType(1)"
             class="playtype1"
-          ></div> -->
+          ></div>
           <div
             v-show="playType == 1"
             @click="checkPlayType(0)"
             class="playtype0"
-          ></div>
+          ></div> -->
           <!-- <div @click="addEquip()" class="addequip"></div>
           <div @click="bindingSIM()" class="addequipA"></div> -->
           <!-- 绑定SIM卡及SIM卡查询 -->
@@ -1287,14 +1287,14 @@ export default {
           var data = eval("(" + res.data.data + ")");
           let hlsHdSrc = data.hlsHd;
           let rtmpHdSrc = data.rtmpHd;
-          if (this.playType == 1) {
-            //插件
-            this.html = `<video id="player" autoplay muted poster='' controls playsInline webkit-playsinline src="${rtmpHdSrc}" style="width:100%; height:100%;"></video>`;
-            setTimeout(() => {
-              this.myVideo["xPlayer"] = new EZUIKit.EZUIPlayer(player);
-              this.myVideo["xPlayer"].play();
-            }, 1000);
-          } else if (this.playType == 0) {
+          // if (this.playType == 1) {
+          //   //插件
+          //   this.html = `<video id="player" autoplay muted poster='' controls playsInline webkit-playsinline src="${rtmpHdSrc}" style="width:100%; height:100%;"></video>`;
+          //   setTimeout(() => {
+          //     this.myVideo["xPlayer"] = new EZUIKit.EZUIPlayer(player);
+          //     this.myVideo["xPlayer"].play();
+          //   }, 1000);
+          // } else if (this.playType == 0) {
             let playHtml = `<video id="myPlayer${this.selected}"  muted autoplay  poster='' controls playsInline  webkit-playsinline src="${hlsHdSrc}"  style="width:100%; height:100%;"></video>`;
             document.getElementById("my-video" + this.selected).innerHTML =
               playHtml;
@@ -1317,7 +1317,7 @@ export default {
               // this.player.play()
               // this.player.load()
             });
-          }
+          // }
         }
       });
     },
@@ -2665,14 +2665,14 @@ export default {
 .haiguan {
   display: flex;
   flex-wrap: wrap;
-  margin-top: 10px;
+  margin-top: 5px;
   .haiguan_item {
-    width: 70px;
+    // width: 70px;
     height: 20px;
     border: 1px solid #d4d2d2;
     line-height: 20px;
     margin-right: 10px;
-    padding: 0 0 0 10px;
+    padding: 2px 10px;
     border-radius: 5px;
   }
   .haiguan_itemnone {

+ 72 - 64
minggao/src/page/systemmanger/role.vue

@@ -69,12 +69,12 @@
         :data="tableData"
         v-loading="loading"
         stripe
-        style="width: 100%;overflow-y: auto"
+        style="width: 100%; overflow-y: auto"
         :height="48 * 13"
       >
         <el-table-column prop="ind" label="序号">
           <template slot-scope="scope">
-            <span>{{ ((page-1)*20)+scope.row.ind}}</span>
+            <span>{{ (page - 1) * 20 + scope.row.ind }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -125,6 +125,7 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :visible.sync="addrUserVisible"
+      @close="addrUserclose"
       width="500px"
     >
       <el-form ref="form" :rules="rules" :model="form" label-width="90px">
@@ -207,13 +208,13 @@ export default {
       addrUserVisible: false,
       form: {
         name: "",
-        describe: ""
+        describe: "",
       },
       rules: {
         name: [{ required: true, message: "请输入角色名称", trigger: "blur" }],
         describe: [
-          { required: true, message: "请输入角色描述", trigger: "blur" }
-        ]
+          { required: true, message: "请输入角色描述", trigger: "blur" },
+        ],
       },
 
       // 分配权限
@@ -225,11 +226,11 @@ export default {
       //  树形控件的属性绑定对象
       treeProps: {
         label: "purview_name",
-        children: "children"
+        children: "children",
       },
 
       isClick: true, // 防止重复弹框
-      submitBtn: false // 防止弹框确定按钮重复请求
+      submitBtn: false, // 防止弹框确定按钮重复请求
     };
   },
   //监听属性 类似于data概念
@@ -251,7 +252,7 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件,导致卡顿
           that.timer = false;
         }, 400);
@@ -262,7 +263,7 @@ export default {
       if (val == false) {
         this.defKeys = [];
       }
-    }
+    },
   },
   //方法集合
   methods: {
@@ -284,10 +285,10 @@ export default {
         data: this.qs.stringify({
           page: this.page,
           page_item: "20",
-          role_name: this.input
-        })
+          role_name: this.input,
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.total_item !== 0) {
             var data = res.data.data.page_list;
             this.pagesum = res.data.data.total_item;
@@ -303,7 +304,7 @@ export default {
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
         });
     },
@@ -335,9 +336,15 @@ export default {
       this.form.describe = data.role_message; // 角色描述
       this.addrUserVisible = true;
     },
+    //弹框关闭回调
+    addrUserclose() {
+      console.log(5555555555)
+      this.form.name = ''; // 角色名称
+      this.form.describe = ''; // 角色描述
+    },
     // 添加、编辑角色确定
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.tltData == "添加角色") {
             // 添加
@@ -360,17 +367,17 @@ export default {
         url: "/api/api_gateway?method=sysmenage.usermanager.role_add",
         data: this.qs.stringify({
           role_name: this.form.name,
-          role_message: this.form.describe
-        })
+          role_message: this.form.describe,
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data == true) {
             if (document.getElementsByClassName("el-message").length == 0) {
-            this.$message({
-              message: "成功!",
-              type: "success",
-              duration: 1500
-            });
+              this.$message({
+                message: "成功!",
+                type: "success",
+                duration: 1500,
+              });
             }
             this.addrUserVisible = false;
             this.tabListData();
@@ -378,7 +385,7 @@ export default {
           this.submitBtn = false;
           // this.addrUserVisible = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.submitBtn = false;
         });
     },
@@ -392,17 +399,17 @@ export default {
         data: this.qs.stringify({
           role_id: this.describeData.id,
           role_name: this.form.name,
-          role_message: this.form.describe
-        })
+          role_message: this.form.describe,
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data == true) {
             if (document.getElementsByClassName("el-message").length == 0) {
-            this.$message({
-              message: "成功!",
-              type: "success",
-              duration: 1500
-            });
+              this.$message({
+                message: "成功!",
+                type: "success",
+                duration: 1500,
+              });
             }
             this.addrUserVisible = false;
             this.tabListData();
@@ -410,7 +417,7 @@ export default {
           this.addrUserVisible = false;
           this.submitBtn = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.submitBtn = false;
         });
     },
@@ -423,9 +430,9 @@ export default {
         this.isClick = false;
         this.$axios({
           method: "POST",
-          url: "/api/api_gateway?method=sysmenage.usermanager.user_info"
+          url: "/api/api_gateway?method=sysmenage.usermanager.user_info",
         })
-          .then(res => {
+          .then((res) => {
             if (res.data.message == "") {
               var data = res.data.data.children;
               this.rightsList = [];
@@ -434,14 +441,14 @@ export default {
             } else {
               this.rightsList = [];
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message.error("获取权限列表失败!");
+                this.$message.error("获取权限列表失败!");
               }
             }
             setTimeout(() => {
               that.isClick = true;
             }, 2500);
           })
-          .catch(err => {
+          .catch((err) => {
             setTimeout(() => {
               that.isClick = true;
             }, 2500);
@@ -454,10 +461,10 @@ export default {
         method: "POST",
         url: "/api/api_gateway?method=sysmenage.usermanager.role_info",
         data: this.qs.stringify({
-          role_id: this.describeData.id //角色ID
-        })
+          role_id: this.describeData.id, //角色ID
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data) {
             this.setRightDialogVisible = true;
             var list = this.tableData;
@@ -475,14 +482,14 @@ export default {
           //   this.tabListData = list;
           // this.tableData = list;
         })
-        .catch(err => {});
+        .catch((err) => {});
     },
 
     getLeafkeys(node, arr) {
       if (!node.children) {
         return arr.push(node.pur_id);
       }
-      node.children.forEach(item => this.getLeafkeys(item, arr));
+      node.children.forEach((item) => this.getLeafkeys(item, arr));
     },
     setRightDialogClosed() {
       this.rightsList = [];
@@ -494,7 +501,7 @@ export default {
       // 获得当前选中的Id
       const keys = [
         ...this.$refs.treeRef.getCheckedKeys(),
-        ...this.$refs.treeRef.getHalfCheckedKeys()
+        ...this.$refs.treeRef.getHalfCheckedKeys(),
       ];
       const idStr = keys.join(",");
       this.$axios({
@@ -502,20 +509,20 @@ export default {
         url: "/api/api_gateway?method=sysmenage.usermanager.role_perm",
         data: this.qs.stringify({
           pur_id: idStr, // 权限id
-          role_id: this.describeData.id // 角色id
-        })
+          role_id: this.describeData.id, // 角色id
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.message == "") {
             if (document.getElementsByClassName("el-message").length == 0) {
-            this.$message.success("分配权限成功!");
+              this.$message.success("分配权限成功!");
             }
             that.setRightDialogVisible = false;
             that.tabListData();
           }
           this.submitBtn = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.submitBtn = false;
         });
     },
@@ -525,39 +532,39 @@ export default {
       this.$confirm("此操作将永久删除, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           this.$axios({
             method: "POST",
             url: "/api/api_gateway?method=sysmenage.usermanager.role_delete",
             data: this.qs.stringify({
-              role_id: data.id
-            })
+              role_id: data.id,
+            }),
           })
-            .then(res => {
+            .then((res) => {
               if (res.data.message == "") {
                 if (document.getElementsByClassName("el-message").length == 0) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!",
-                  duration: 1500
-                });
+                  this.$message({
+                    type: "success",
+                    message: "删除成功!",
+                    duration: 1500,
+                  });
                 }
               }
               this.tabListData();
             })
-            .catch(err => {});
+            .catch((err) => {});
         })
         .catch(() => {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
           }
         });
-    }
+    },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {},
@@ -572,7 +579,7 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {} //如果页面有keep-alive缓存功能,这个函数会触发
+  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
 <style lang="less" scoped>
@@ -610,7 +617,8 @@ export default {
 
 // 文本域样式更改
 /deep/.el-textarea__inner {
-  font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
+    "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
 }
 
 /deep/.el-button--info {