代码更新 z

minggao/config/index.js

@@ -22,7 +22,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
+    host: '192.168.1.29', // can be overwritten by process.env.HOST
     port: 8888, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

minggao/src/assets/icon/demo_index.html

@@ -55,6 +55,42 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe63e;</span>
+                <div class="name">205用户_用户6</div>
+                <div class="code-name">&amp;#xe63e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe63f;</span>
+                <div class="name">203用户_用户4</div>
+                <div class="code-name">&amp;#xe63f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe678;</span>
+                <div class="name">密码、锁</div>
+                <div class="code-name">&amp;#xe678;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6a4;</span>
+                <div class="name">用户-角色-用户名-单人_jurassic</div>
+                <div class="code-name">&amp;#xe6a4;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64d;</span>
+                <div class="name">密码</div>
+                <div class="code-name">&amp;#xe64d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe631;</span>
+                <div class="name">文件</div>
+                <div class="code-name">&amp;#xe631;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe64c;</span>
                 <div class="name">通知</div>
                 <div class="code-name">&amp;#xe64c;</div>
@@ -738,9 +774,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1640585699305') format('woff2'),
-       url('iconfont.woff?t=1640585699305') format('woff'),
-       url('iconfont.ttf?t=1640585699305') format('truetype');
+  src: url('iconfont.woff2?t=1644976836266') format('woff2'),
+       url('iconfont.woff?t=1644976836266') format('woff'),
+       url('iconfont.ttf?t=1644976836266') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -767,6 +803,60 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-205yonghu_yonghu6"></span>
+            <div class="name">
+              205用户_用户6
+            </div>
+            <div class="code-name">.icon-205yonghu_yonghu6
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-203yonghu_yonghu4"></span>
+            <div class="name">
+              203用户_用户4
+            </div>
+            <div class="code-name">.icon-203yonghu_yonghu4
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mimasuo"></span>
+            <div class="name">
+              密码、锁
+            </div>
+            <div class="code-name">.icon-mimasuo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jurassic_user"></span>
+            <div class="name">
+              用户-角色-用户名-单人_jurassic
+            </div>
+            <div class="code-name">.icon-jurassic_user
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mima2"></span>
+            <div class="name">
+              密码
+            </div>
+            <div class="code-name">.icon-mima2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-wenjian"></span>
+            <div class="name">
+              文件
+            </div>
+            <div class="code-name">.icon-wenjian
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-tongzhi"></span>
             <div class="name">
               通知
@@ -1794,6 +1884,54 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-205yonghu_yonghu6"></use>
+                </svg>
+                <div class="name">205用户_用户6</div>
+                <div class="code-name">#icon-205yonghu_yonghu6</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-203yonghu_yonghu4"></use>
+                </svg>
+                <div class="name">203用户_用户4</div>
+                <div class="code-name">#icon-203yonghu_yonghu4</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mimasuo"></use>
+                </svg>
+                <div class="name">密码、锁</div>
+                <div class="code-name">#icon-mimasuo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jurassic_user"></use>
+                </svg>
+                <div class="name">用户-角色-用户名-单人_jurassic</div>
+                <div class="code-name">#icon-jurassic_user</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mima2"></use>
+                </svg>
+                <div class="name">密码</div>
+                <div class="code-name">#icon-mima2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-wenjian"></use>
+                </svg>
+                <div class="name">文件</div>
+                <div class="code-name">#icon-wenjian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tongzhi"></use>
                 </svg>
                 <div class="name">通知</div>

minggao/src/assets/icon/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 1738837 */
-  src: url('iconfont.woff2?t=1640585699305') format('woff2'),
-       url('iconfont.woff?t=1640585699305') format('woff'),
-       url('iconfont.ttf?t=1640585699305') format('truetype');
+  font-family: 'iconfont';  /* Project id 1738837 */
+  src: url('//at.alicdn.com/t/font_1738837_u6z3ppm6nm.woff2?t=1644976660546') format('woff2'),
+       url('//at.alicdn.com/t/font_1738837_u6z3ppm6nm.woff?t=1644976660546') format('woff'),
+       url('//at.alicdn.com/t/font_1738837_u6z3ppm6nm.ttf?t=1644976660546') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-205yonghu_yonghu6:before {
+  content: "\e63e";
+}
+
+.icon-203yonghu_yonghu4:before {
+  content: "\e63f";
+}
+
+.icon-mimasuo:before {
+  content: "\e678";
+}
+
+.icon-jurassic_user:before {
+  content: "\e6a4";
+}
+
+.icon-mima2:before {
+  content: "\e64d";
+}
+
+.icon-wenjian:before {
+  content: "\e631";
+}
+
 .icon-tongzhi:before {
   content: "\e64c";
 }

minggao/src/assets/icon/iconfont.json

@@ -6,6 +6,48 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "1308387",
+      "name": "205用户_用户6",
+      "font_class": "205yonghu_yonghu6",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "1308390",
+      "name": "203用户_用户4",
+      "font_class": "203yonghu_yonghu4",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "5651488",
+      "name": "密码、锁",
+      "font_class": "mimasuo",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "10593835",
+      "name": "用户-角色-用户名-单人_jurassic",
+      "font_class": "jurassic_user",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "925483",
+      "name": "密码",
+      "font_class": "mima2",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "1118",
+      "name": "文件",
+      "font_class": "wenjian",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    },
+    {
       "icon_id": "8652825",
       "name": "通知",
       "font_class": "tongzhi",

minggao/src/page/commandCenter/laboratory.vue

@@ -47,11 +47,12 @@
               size="mini"
               v-model="value1"
               @change="searchData"
-              type="datetimerange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               align="right"
+              :editable="false"
             >
             </el-date-picker>
 
@@ -888,4 +889,10 @@ export default {
 /deep/ input[type="number"] {
   -moz-appearance: textfield !important;
 }
+/deep/.el-date-editor{
+  cursor: pointer;
+  .el-range-input{
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/page/commandCenter/supervise.vue

@@ -47,11 +47,12 @@
               size="mini"
               v-model="value"
               @change="searchData"
-              type="datetimerange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               align="right"
+              :editable="false"
             >
             </el-date-picker>
 
@@ -358,4 +359,10 @@ export default {
     color: #1890ff;
   }
 }
+/deep/.el-date-editor{
+  cursor: pointer;
+  .el-range-input{
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/page/commandCenter/superviseAdmin.vue

@@ -80,11 +80,12 @@
               size="mini"
               v-model="value2"
               @change="searchData"
-              type="datetimerange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               align="right"
+              :editable="false"
             >
             </el-date-picker>
 
@@ -459,4 +460,10 @@ export default {
     overflow-y: auto;
   }
 }
+/deep/.el-date-editor{
+  cursor: pointer;
+  .el-range-input{
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/page/commandCenter/superviseLog.vue

@@ -28,11 +28,12 @@
               size="mini"
               v-model="value"
               @change="searchData"
-              type="datetimerange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               align="right"
+              :editable="false"
             >
             </el-date-picker>
 
@@ -341,4 +342,10 @@ export default {
     overflow-y: auto;
   }
 }
+/deep/.el-date-editor{
+  cursor: pointer;
+  .el-range-input{
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/page/commandCenter/taskRegulator.vue

@@ -65,7 +65,7 @@
             </el-select>
 
             <!-- 时间筛选 -->
-            <el-date-picker
+            <!-- <el-date-picker
               size="mini"
               v-model="value2"
               @change="searchData"
@@ -74,6 +74,19 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               align="right"
+              :editable="false"
+            >
+            </el-date-picker> -->
+            <el-date-picker
+              v-model="value2"
+              @change="searchData"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :editable="false"
+              align="right"
+              size="mini"
             >
             </el-date-picker>
 
@@ -102,6 +115,7 @@
         v-loading="loading"
         stripe
         style="width: 100%"
+        :height="48 * 13"
       >
         <el-table-column prop="ind" label="序号" width="80"></el-table-column>
         <el-table-column prop="task_id" label="任务编号" width="100">
@@ -278,11 +292,12 @@
               <el-date-picker
                 size="mini"
                 v-model="ruleForm.date"
-                type="datetimerange"
+                type="daterange"
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 align="right"
+                :editable="false"
               >
               </el-date-picker>
             </el-form-item>
@@ -484,24 +499,24 @@ export default {
       options2: [
         {
           value: "未开始",
-          label: "未开始"
+          label: "未开始",
         },
         {
           value: "处理中",
-          label: "处理中"
+          label: "处理中",
         },
         {
           value: "已完成",
-          label: "已完成"
+          label: "已完成",
         },
         {
           value: "未处理",
-          label: "未处理"
+          label: "未处理",
         },
         {
           value: "逾期完成",
-          label: "逾期完成"
-        }
+          label: "逾期完成",
+        },
       ], // 任务状态 - 列表
       value2: "", //时间筛选
       startTime: "", // 开始时间
@@ -519,24 +534,24 @@ export default {
       type_status: [
         {
           name: "未开始",
-          color: "#E6A23C"
+          color: "#E6A23C",
         },
         {
           name: "处理中",
-          color: "#E6A23C"
+          color: "#E6A23C",
         },
         {
           name: "已完成",
-          color: "#67C23A"
+          color: "#67C23A",
         },
         {
           name: "未处理",
-          color: "#F56C6C"
+          color: "#F56C6C",
         },
         {
           name: "逾期完成",
-          color: "#409EFF"
-        }
+          color: "#409EFF",
+        },
       ],
 
       // 新增任务弹框
@@ -550,52 +565,48 @@ export default {
         endTime: "", // 结束时间
         type: "", // 任务类型
         checkList: [], //诱捕器
-        desc: "" // 任务描述
+        desc: "", // 任务描述
       },
       rules: {
         region: [
-          { required: true, message: "请选择任务处理人", trigger: "change" }
+          { required: true, message: "请选择任务处理人", trigger: "blur" },
         ],
         overseer: [
-          { required: true, message: "请选择任务监督人", trigger: "change" }
-        ],
-        date: [
-          { required: true, message: "请选择任务时间", trigger: "change" }
-        ],
-        type: [
-          { required: true, message: "请选择任务类型", trigger: "change" }
+          { required: true, message: "请选择任务监督人", trigger: "blur" },
         ],
+        date: [{ required: true, message: "请选择任务时间", trigger: "blur" }],
+        type: [{ required: true, message: "请选择任务类型", trigger: "blur" }],
         checkList: [
-          { required: true, message: "请选择诱捕器", trigger: "change" }
-        ]
+          { required: true, message: "请选择诱捕器", trigger: "blur" },
+        ],
         // desc: [{ required: true, message: "请填写任务描述", trigger: "blur" }]
       },
       // 任务类型
       typeList: [
         {
           value: "有害生物监测",
-          label: "有害生物监测"
+          label: "有害生物监测",
         },
         {
           value: "入境口岸监测调查",
-          label: "入境口岸监测调查"
+          label: "入境口岸监测调查",
         },
         {
           value: "外来有害杂草监测",
-          label: "外来有害杂草监测"
+          label: "外来有害杂草监测",
         },
         {
           value: "其他监测任务",
-          label: "其他监测任务"
+          label: "其他监测任务",
         },
         {
           value: "挂放",
-          label: "挂放"
+          label: "挂放",
         },
         {
           value: "维护",
-          label: "维护"
-        }
+          label: "维护",
+        },
       ],
 
       // 选择诱捕器
@@ -604,7 +615,7 @@ export default {
       deviceForm: {
         monitorDot: "", // 监测点
         tissue: "", // 组织
-        serial: "" // 设备编号
+        serial: "", // 设备编号
       },
       loading5: false, // 加载
       page2: 1, //当前页码
@@ -612,7 +623,7 @@ export default {
       checkList: [], // 已选中设备列表
       orgData: [], // 组织列表
       pointData: [], // 监测点列表
-      taskObj: {} // 点击编辑获取到的任务数据
+      taskObj: {}, // 点击编辑获取到的任务数据
     };
   },
   //监听属性 类似于data概念
@@ -634,7 +645,7 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件，导致卡顿
           that.timer = false;
         }, 400);
@@ -681,7 +692,7 @@ export default {
           }
         }
       }
-    }
+    },
   },
   //方法集合
   methods: {
@@ -727,8 +738,8 @@ export default {
     // 分页
     newPage(page) {
       this.page = page;
+      this.tableList();
     },
-
     // 表格数据
     tableList() {
       this.$axios({
@@ -741,16 +752,16 @@ export default {
           owner_user_id: this.input2, // 任务发布id
           start_time: this.startTime, // 开始时间
           end_time: this.endTime, // 结束时间
-          task_status: this.value // 任务状态
-        })
+          task_status: this.value, // 任务状态
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.total_item !== 0) {
             var data = res.data.data.page_list;
             this.tableSum = res.data.data.total_item;
             var list = [];
             data.forEach((item, index) => {
-              item.ind = index;
+              item.ind = index + 1;
               list.push(item);
             });
             // console.log(list);
@@ -758,7 +769,7 @@ export default {
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           // console.log(err);
         });
@@ -769,8 +780,8 @@ export default {
       this.$router.push({
         path: "/index/taskRegulatorDetails",
         query: {
-          id: data.task_id
-        }
+          id: data.task_id,
+        },
       });
     },
 
@@ -784,9 +795,9 @@ export default {
         method: "POST",
         url: "/api/api_gateway?method=control_center.task.task_info",
         data: this.qs.stringify({
-          task_id: data.task_id
-        })
-      }).then(res => {
+          task_id: data.task_id,
+        }),
+      }).then((res) => {
         var data = res.data.data;
         this.ruleForm.region = data.operator_user; // 任务处理人
         this.ruleForm.overseer = data.supervisor_user; // 任务监督人
@@ -795,7 +806,7 @@ export default {
         this.ruleForm.desc = data.tesk_msg; //任务描述
         this.ybqCheckList = ""; // 诱捕器
         var list = [];
-        data.trap_record_list.forEach(item => {
+        data.trap_record_list.forEach((item) => {
           var obj = {};
           obj["name"] = item.trap_number;
           obj["id"] = item.trap_id;
@@ -813,22 +824,22 @@ export default {
       this.$confirm("此操作将永久删除该条任务, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           this.$axios({
             method: "POST",
             url: "/api/api_gateway?method=control_center.task.task_delete",
             data: this.qs.stringify({
-              task_id: data.task_id
-            })
-          }).then(res => {
+              task_id: data.task_id,
+            }),
+          }).then((res) => {
             // console.log(res);
             if (res.data.data == true) {
               this.$message({
                 type: "success",
                 message: "删除成功!",
-                duration: 1500
+                duration: 1500,
               });
               this.tableData = [];
               this.loading = true;
@@ -840,7 +851,7 @@ export default {
           this.$message({
             type: "info",
             message: "已取消删除",
-            duration: 1500
+            duration: 1500,
           });
         });
     },
@@ -854,14 +865,14 @@ export default {
           user_type: type, // 用户类型，operator（任务处理人）, supervisor（任务监督人）, owner（任务发布人）
           operator_id: a, // 已经选择的任务处理人id
           supervisor_id: b, // 已经选择的任务监督人id
-          owner_id: c // 已经选择的任务发布人id
-        })
+          owner_id: c, // 已经选择的任务发布人id
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.length !== 0) {
             var data = res.data.data;
             var list = [];
-            data.forEach(item => {
+            data.forEach((item) => {
               var obj = {};
               obj["value"] = item.user_id;
               obj["label"] = item.real_name;
@@ -880,7 +891,7 @@ export default {
             }
           }
         })
-        .catch(err => {});
+        .catch((err) => {});
     },
 
     // 筛选列表 - 任务处理人、任务监督人
@@ -937,7 +948,7 @@ export default {
 
     // 新建任务 、 编辑任务 - 发布
     submitForm(formName) {
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.ruleForm.date) {
             this.ruleForm.startTime = this.formatTime(
@@ -965,9 +976,9 @@ export default {
                 task_type: this.ruleForm.type, // 任务类型
                 tesk_msg: this.ruleForm.desc, // 任务描述
                 // trap_id_list: JSON.stringify(this.checkList) // 诱捕器id列表
-                trap_id_list: JSON.stringify(this.ruleForm.checkList) // 诱捕器id列表
-              })
-            }).then(res => {
+                trap_id_list: JSON.stringify(this.ruleForm.checkList), // 诱捕器id列表
+              }),
+            }).then((res) => {
               // console.log(res);
               if (res.data.message == "") {
                 this.loading = true;
@@ -977,8 +988,11 @@ export default {
                 this.$message({
                   type: "success",
                   message: "新增成功!",
-                  duration: 1500
+                  duration: 1500,
                 });
+                for (var key in this.ruleForm) {
+                  this.ruleForm[key] = "";
+                }
               }
             });
           } else if (this.titleData == "编辑任务") {
@@ -992,9 +1006,9 @@ export default {
                 task_type: this.ruleForm.type, // 任务类型
                 tesk_msg: this.ruleForm.desc, // 任务描述
                 // trap_id_list: JSON.stringify(this.checkList) // 诱捕器id列表
-                trap_id_list: JSON.stringify(this.ruleForm.checkList) // 诱捕器id列表
-              })
-            }).then(res => {
+                trap_id_list: JSON.stringify(this.ruleForm.checkList), // 诱捕器id列表
+              }),
+            }).then((res) => {
               // console.log(res);
               if (res.data.message == "") {
                 this.loading = true;
@@ -1004,7 +1018,7 @@ export default {
                 this.$message({
                   type: "success",
                   message: "编辑成功!",
-                  duration: 1500
+                  duration: 1500,
                 });
               }
             });
@@ -1017,18 +1031,23 @@ export default {
 
     // 新建任务 - 取消
     resetForm(formName) {
-      this.ruleForm.region = ""; // 任务处理人
-      this.ruleForm.overseer = ""; //任务监督人
-      this.ruleForm.date = ""; // 任务时间
-      this.ruleForm.startTime = ""; // 开始时间
-      this.ruleForm.endTime = ""; // 结束时间
-      this.ruleForm.type = ""; // 任务类型
-      this.ruleForm.checkList = ""; // 诱捕器
-      this.ruleForm.desc = ""; // 任务描述
-      if (this.titleData == "编辑任务") {
-        location.reload();
+      // this.ruleForm.region = ""; // 任务处理人
+      // this.ruleForm.overseer = ""; //任务监督人
+      // this.ruleForm.date = ""; // 任务时间
+      // this.ruleForm.startTime = ""; // 开始时间
+      // this.ruleForm.endTime = ""; // 结束时间
+      // this.ruleForm.type = ""; // 任务类型
+      // this.ruleForm.checkList = ""; // 诱捕器
+      // this.ruleForm.desc = ""; // 任务描述
+      // if (this.titleData == "编辑任务") {
+      //   location.reload();
+      // }
+      for (var key in this.ruleForm) {
+        this.ruleForm[key] = "";
+        // console.log(key)
       }
-      this.$refs[formName].resetFields();
+      // this.$refs[formName].resetFields();
+      // console.log(this.ruleForm)
       this.dialogVisible = false;
     },
 
@@ -1043,15 +1062,15 @@ export default {
           org_id: this.deviceForm.tissue, // 设备所属组织id
           trap_status: "", // 诱捕器状态 0停用 1正常
           page: this.page2, // 页码
-          page_size: "36" //每页数量，默认为10
-        })
+          page_size: "36", //每页数量，默认为10
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.total_item !== 0) {
             var data = res.data.data;
             this.listSum = data.total_item;
             var list = [];
-            data.page_list.forEach(item => {
+            data.page_list.forEach((item) => {
               var obj = {};
               obj["value"] = item.trap_id;
               obj["label"] = item.trap_number;
@@ -1061,7 +1080,7 @@ export default {
           }
           this.loading5 = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading5 = false;
         });
     },
@@ -1070,16 +1089,16 @@ export default {
     ybqScreenList() {
       this.$axios({
         method: "POST",
-        url: "/api/api_gateway?method=monitor_manage.trap_manage.trap_org"
+        url: "/api/api_gateway?method=monitor_manage.trap_manage.trap_org",
       })
-        .then(res => {
+        .then((res) => {
           // console.log(res);
           var data = res.data.data;
 
           // 组织
           if (data.org_data.length !== 0) {
             var list = [];
-            data.org_data.forEach(item => {
+            data.org_data.forEach((item) => {
               var obj = {};
               obj["value"] = item.org_id;
               obj["label"] = item.org_name;
@@ -1091,7 +1110,7 @@ export default {
           // 监测点
           if (data.point_data.length !== 0) {
             var list2 = [];
-            data.org_data.forEach(item => {
+            data.org_data.forEach((item) => {
               var obj = {};
               obj["value"] = item.org_id;
               obj["label"] = item.org_name;
@@ -1100,7 +1119,7 @@ export default {
             this.pointData = list2;
           }
         })
-        .catch(err => {
+        .catch((err) => {
           // console.log(err);
         });
     },
@@ -1165,13 +1184,13 @@ export default {
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=control_center.task.task_export",
-        responseType: "blob"
+        responseType: "blob",
       })
-        .then(res => {
+        .then((res) => {
           this.downloadFile(res, "任务列表.xls");
           this.loadingShow = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loadingShow = false;
         });
     },
@@ -1185,7 +1204,7 @@ export default {
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
-    }
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
@@ -1194,7 +1213,7 @@ export default {
     this.loading = true;
     this.tableList(); // 表格数据
     // this.conductorAxios(); // 筛选列表 - 任务处理人
-  }
+  },
 };
 </script>
 <style lang="less" scoped>
@@ -1285,4 +1304,10 @@ export default {
     margin: 10px 30px 10px 0;
   }
 }
+/deep/.el-date-editor {
+  cursor: pointer;
+  .el-range-input {
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/page/forecasting/maintain/maintain.vue

@@ -20,7 +20,7 @@
     </div>
     <el-card class="box-card" style="margin-top: 15px">
       <div class="cbdboxs_table" v-loading="loading">
-        <el-table :data="tableData" style="width: 100%" :stripe="true">
+        <el-table :data="tableData" style="width: 100%" :stripe="true" :height="48*13">
           <el-table-column prop="index" label="序号"> </el-table-column>
           <el-table-column
             prop="point_name"
@@ -55,8 +55,9 @@
       </div>
       <el-pagination
         background
-        layout="prev, pager, next"
+        layout="prev, pager, next,jumper"
         :total="total"
+        :page-size="20"
         @current-change="pageChange"
       >
       </el-pagination>
@@ -224,7 +225,7 @@ export default {
         method: "POST",
         url: "/api/api_gateway?method=monitor_manage.maintain.checkpoint_list",
         data: this.qs.stringify({
-          page_size: 10,
+          page_size: 20,
           page: this.page,
           org_name: this.monitorname, //              非必传(string)     诱剂名称 搜索项
         }),

minggao/src/page/forecasting/trap/bait.vue

@@ -20,7 +20,12 @@
     </div>
     <el-card class="box-card" style="margin-top: 15px">
       <div class="cbdboxs_table" v-loading="loading">
-        <el-table :data="tableData" style="width: 100%" :stripe="true">
+        <el-table
+          :data="tableData"
+          style="width: 100%"
+          :stripe="true"
+          :height="48 * 13"
+        >
           <el-table-column prop="index" label="序号"> </el-table-column>
           <el-table-column
             prop="inducer_name"
@@ -47,8 +52,9 @@
       </div>
       <el-pagination
         background
-        layout="prev, pager, next"
+        layout="prev, pager, next,jumper"
         :total="total"
+        :page-size="20"
         @current-change="pageChange"
       >
       </el-pagination>
@@ -148,7 +154,7 @@ export default {
         method: "POST",
         url: "/api/api_gateway?method=monitor_manage.maintain.inducer_list",
         data: this.qs.stringify({
-          page_size: 10,
+          page_size: 20,
           page: this.queryInfo.page,
           inducer_name: this.queryInfo.inducer_name, //              非必传(string)     诱剂名称 搜索项
         }),
@@ -291,8 +297,8 @@ export default {
     resetForm(formName) {
       this.addtraptf = false;
       this.$refs[formName].resetFields();
-      for(var key in this.ruleForm){
-          this.ruleForm[key] = ''
+      for (var key in this.ruleForm) {
+        this.ruleForm[key] = "";
       }
     },
     dioclose() {

minggao/src/page/forecasting/trap/fillinrecord.vue

@@ -55,6 +55,7 @@
         end-placeholder="结束日期"
         @change="oickchange"
         size="mini"
+        :editable="false"
       >
       </el-date-picker>
       <el-button type="info" @click="search" size="mini">搜索</el-button>
@@ -65,7 +66,7 @@
     </div>
     <el-card class="box-card" style="margin-top: 15px">
       <div class="cbdboxs_table" v-loading="loading">
-        <el-table :data="tableData" style="width: 100%" :stripe="true">
+        <el-table :data="tableData" style="width: 100%" :stripe="true" :height="48*13">
           <el-table-column prop="index" label="序号" width="60px"> </el-table-column>
           <el-table-column prop="trap_number" label="编号"></el-table-column>
           <el-table-column prop="org_name" label="组织">
@@ -102,8 +103,9 @@
       </div>
       <el-pagination
         background
-        layout="prev, pager, next"
+        layout="prev, pager, next,jumper"
         :total="total"
+        :page-size="20"
         @current-change="pageChange"
       >
       </el-pagination>
@@ -181,7 +183,7 @@ export default {
         method: "POST",
         url: "/api/api_gateway?method=monitor_manage.trap_manage.trap_pest_record",
         data: this.qs.stringify({
-          page_size: 10,
+          page_size: 20,
           page: this.queryInfo.page,
           trap_number: this.queryInfo.trap_number, //              非必传(string)               设备编号 搜索项
           point_name: this.queryInfo.point_name, //                  非必传(string)               设备所属监测点 搜索项

minggao/src/page/forecasting/trap/trap.vue

@@ -72,8 +72,17 @@
     </div>
     <el-card class="box-card" style="margin-top: 15px">
       <div class="cbdboxs_table" v-loading="loading">
-        <el-table :data="tableData" style="width: 100%" :stripe="true">
-          <el-table-column prop="index" label="序号" width="60px"></el-table-column>
+        <el-table
+          :data="tableData"
+          style="width: 100%; overflow-y: auto"
+          :stripe="true"
+          :height="48*13"
+        >
+          <el-table-column
+            prop="index"
+            label="序号"
+            width="60px"
+          ></el-table-column>
           <el-table-column prop="trap_number" label="编号"></el-table-column>
           <el-table-column prop="lng" label="经度">
             <template slot-scope="scope">
@@ -147,8 +156,9 @@
       </div>
       <el-pagination
         background
-        layout="prev, pager, next"
+        layout="prev, pager, next,jumper"
         :total="total"
+        :page-size="20"
         @current-change="pageChange"
       >
       </el-pagination>
@@ -480,7 +490,7 @@ export default {
         method: "POST",
         url: "/api/api_gateway?method=monitor_manage.trap_manage.trap_list",
         data: this.qs.stringify({
-          page_size: 10,
+          page_size: 20,
           page: this.queryInfo.page,
           trap_number: this.queryInfo.trap_number,
           point_id: this.queryInfo.point_id,
@@ -941,6 +951,9 @@ export default {
 };
 </script>
 <style scoped lang="less">
+.cbdbox {
+  height: 100%;
+}
 .cbdboxs_search {
   display: flex;
   justify-content: flex-start;
@@ -1019,4 +1032,10 @@ export default {
   background-color: #409eff;
   border-color: #409eff;
 }
+/deep/.el-date-editor{
+  cursor: pointer;
+  .el-range-input{
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/page/home/index.vue

@@ -1,6 +1,12 @@
 <!--  -->
 <template>
-  <div class="indexbox">
+  <div
+    class="indexbox"
+    v-loading="indexloading"
+    element-loading-text="欢迎登录大数据平台！加载中，请稍后..."
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(255, 255, 255)"
+  >
     <div class="menubox">
       <div class="index_title">
         <img
@@ -60,10 +66,7 @@
                 :key="items.pur_id"
                 @click="skip('/index/' + items.menu)"
               >
-                <span slot="title"
-                  ><i class="el-icon-collection-tag"></i
-                  >{{ items.purview_name }}</span
-                >
+                <span slot="title">{{ items.purview_name }}</span>
                 <el-menu-item-group>
                   <el-menu-item
                     v-for="item2 in items.children"
@@ -71,10 +74,7 @@
                     :key="item2.pur_id"
                     @click="skip('/index/' + item2.menu)"
                   >
-                    <span slot="title"
-                      ><i class="el-icon-collection-tag"></i
-                      >{{ item2.purview_name }}</span
-                    >
+                    <span slot="title">{{ item2.purview_name }}</span>
                   </el-menu-item>
                 </el-menu-item-group>
               </el-submenu>
@@ -85,10 +85,7 @@
                 @click="skip('/index/' + items.menu)"
                 class="el-menu-item2"
               >
-                <span slot="title"
-                  ><i class="el-icon-collection-tag"></i
-                  >{{ items.purview_name }}</span
-                >
+                <span slot="title"> {{ items.purview_name }}</span>
               </el-menu-item>
             </template>
           </el-submenu>
@@ -103,8 +100,9 @@
               ><a
                 v-if="index == routerinfo.length - 2 && item.menu != ''"
                 :href="'/#/index/' + item.menu"
+                style="cursor:pointer"
                 >{{ item.purview_name }}</a
-              ><a v-else>{{ item.purview_name }}</a></el-breadcrumb-item
+              ><span v-else>{{ item.purview_name }}</span></el-breadcrumb-item
             >
           </el-breadcrumb>
         </div>
@@ -211,6 +209,8 @@ export default {
           { validator: validatePass, trigger: "blur" },
         ],
       },
+      indexloading: false,
+      perm_id: "",
     };
   },
   //监听属性 类似于data概念
@@ -232,10 +232,12 @@ export default {
     handleClose() {},
     // user.login.user_login_info
     getuserinfo() {
+      this.indexloading = true;
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=sysmenage.usermanager.user_info",
       }).then((res) => {
+        this.indexloading = false;
         this.imgurl = res.data.data.theme_info.logo_url;
         this.headline = res.data.data.theme_info.sys_name;
         this.routerdata = JSON.parse(JSON.stringify(res.data.data.children));
@@ -254,20 +256,20 @@ export default {
       if (e == "a") {
         this.alterpassTF = true;
       } else if (e == "b") {
-        this.outsystem()
+        this.outsystem();
       }
     },
-    outsystem(){
+    outsystem() {
       this.$axios({
-          method: "POST",
-          url: "/api/api_gateway?method=sysmenage.usermanager.user_logout",
-        }).then((res) => {
-          if (res.data.data) {
-            localStorage.removeItem("session");
-            localStorage.removeItem("username");
-            this.$router.push("/Login");
-          }
-        });
+        method: "POST",
+        url: "/api/api_gateway?method=sysmenage.usermanager.user_logout",
+      }).then((res) => {
+        if (res.data.data) {
+          localStorage.removeItem("session");
+          localStorage.removeItem("username");
+          this.$router.push("/Login");
+        }
+      });
     },
     skip(path) {
       // console.log(this.$route);ssssss
@@ -293,10 +295,10 @@ export default {
                 message: "修改成功！",
                 type: "success",
               });
-              this.outsystem()
+              this.outsystem();
             } else {
               this.$message({
-                message: "修改失败！"+res.data.data.message,
+                message: "修改失败！" + res.data.data.message,
                 type: "error",
               });
             }
@@ -320,7 +322,6 @@ export default {
         if (item.menu != "") {
           if (newrouter.indexOf(item.menu) != -1) {
             //第一层菜单是否包含当前路由
-            // console.log(item);
             return [item.menu, item.pur_id];
           } else {
             if (item.children) {
@@ -366,7 +367,26 @@ export default {
           }
         });
         this.routerinfo.unshift(newpath[0]);
-        console.log(this.routerinfo);
+        // console.log(this.routerinfo);
+      } else {
+        // console.log(this.routerinfo);
+        var obj = {
+          menu: "",
+          parent_perm_id: "88",
+          pur_id: "88",
+          purview_name: "查看详情",
+        };
+        if (this.routerinfo[1] && !this.routerinfo[2]) {
+          if (this.$route.path == "/index/taskRegulatorDetails") {
+            this.routerinfo.push(obj);
+          } else if (this.$route.path == "/index/superviseAdminDetails") {
+            this.routerinfo.push(obj);
+          } else if (this.$route.path == "/index/superviseDetails") {
+            this.routerinfo.push(obj);
+          } else if (this.$route.path == "/index/superviseLogDetails") {
+            this.routerinfo.push(obj);
+          }
+        }
       }
     },
   },
@@ -432,23 +452,37 @@ p {
     }
     /deep/.el-submenu__title {
       text-align: left;
+      // padding-left: 67px !important;
+    }
+    /deep/.el-menu--inline {
+      .el-submenu__title {
+        text-align: left;
+        padding-left: 67px !important;
+      }
+      .el-menu-item {
+        padding-left: 80px !important;
+      }
     }
     /deep/.el-submenu__title:hover {
-      background-color: #490eff !important;
+      color: rgb(64, 158, 255) !important;
+      background-color: rgba(0, 0, 0, 0.3) !important;
     }
     /deep/.is-opened > .el-submenu__title {
-      background-color: #490eff !important;
+      background-color: rgba(0, 0, 0, 0.3) !important;
     }
-    /deep/.el-menu-item {
-      text-align: left;
-      // padding-left: 53px !important;
+    /deep/.is-active {
       background-color: rgba(0, 0, 0, 0.3) !important;
     }
-    .el-menu-item2 {
-      background-color: transparent !important;
+    /deep/.el-menu-item {
+      text-align: left;
+      // background-color: rgba(0, 0, 0, 0.3) !important;
     }
     /deep/.el-menu-item:hover {
-      background-color: #490eff !important;
+      color: rgb(64, 158, 255) !important;
+    }
+    /deep/.el-menu--inline > .el-menu-item2 {
+      padding-left: 67px !important;
+      background-color: transparent !important;
     }
     /deep/.el-menu-item-group__title {
       display: none;
@@ -456,10 +490,6 @@ p {
     .firstmenu {
       text-align: left;
       padding-left: 20px !important;
-      background-color: #0d3756 !important;
-    }
-    /deep/.is-active {
-      background-color: #490eff !important;
     }
   }
   /*滚动条样式*/

minggao/src/page/homepage/facilitydistribute.vue

@@ -103,7 +103,7 @@
         <div class="infobox">
           <h3>设备信息</h3>
           <p>
-            <span>设备名称：</span><span>{{ baseinfo[0].device_name }}</span>
+            <span>设备名称：</span><span>{{ baseinfo[0].device_name==""?"暂无":baseinfo[0].device_name }}</span>
           </p>
           <p>
             <span>设备编号：</span><span>{{ baseinfo[0].device_id }}</span>
@@ -112,7 +112,7 @@
             <span>所属监测点：</span><span>{{ baseinfo[0].poin_name }}</span>
           </p>
           <p>
-            <span>所属监测点：</span
+            <span>隶属海关：</span
             ><span
               v-for="item in baseinfo[0].temp_org_list"
               :key="item.org_id"
@@ -167,7 +167,6 @@
               v-for="(item, index) in baseinfo[0].photo_data"
               :key="index"
             >
-              <!-- <h3>{{ item }}</h3> -->
               <img :src="item.addr" alt="" />
             </el-carousel-item>
           </el-carousel>
@@ -176,11 +175,6 @@
           <h3 class="title">实时监控</h3>
           <div id="videoBon"></div>
         </div>
-
-        <!-- v-loading="pieloading"
-          element-loading-text="拼命加载中"
-          element-loading-spinner="el-icon-loading"
-          element-loading-background="rgba(0, 0, 0, 0.8)" -->
       </div>
     </div>
   </div>
@@ -291,7 +285,9 @@ export default {
           console.log(params.value[2]);
           this.device_type_id = params.value[2];
           this.pietf = true;
-          this.getbaseinfo(params.name);
+          // if(this.device_type_id == 6){
+            this.getbaseinfo(params.name);
+          // }
         }
       });
       var convertData = function (data) {
@@ -503,6 +499,9 @@ export default {
               this.myVideo2[`myPlayer`].play();
             }, 150);
           });
+        } else {
+          var dom = document.getElementById("myPlayer")
+          dom.style.display = "none"
         }
       });
     },

minggao/src/page/homepage/pestdistribute.vue

@@ -56,6 +56,7 @@
         end-placeholder="结束日期"
         @change="oickchange"
         size="mini"
+        :editable="false"
       >
       </el-date-picker>
       <el-button type="info" @click="search" size="mini">搜索</el-button>
@@ -168,6 +169,7 @@ export default {
   //方法集合
   methods: {
     init(trap_data_arr) {
+      console.log(trap_data_arr);
       var that = this;
       let myChart = echarts.init(document.getElementById("mychart"));
       var arr = [];
@@ -305,11 +307,29 @@ export default {
             animation: false,
             data: [],
           },
+          // ["scatter","effectScatter"]
           {
             name: "害虫",
             type: "scatter",
             coordinateSystem: "geo",
             // geoIndex: 2,
+            symbolSize: function (val) {
+              // var num = Number(that.ruleForm.threshold)
+              // if(val<Math.floor(num*0.2)){
+              //   return 12
+              // }else if(val<Math.floor(num*0.4)){
+              //   return 14
+              // }else if(val<Math.floor(num*0.6)){
+              //   return 16
+              // }else if(val<Math.floor(num*0.8)){
+              //   return 18
+              // }else if(val<num){
+              //   return 20
+              // }else{
+              //   return 22
+              // }
+              return 12;
+            },
             data: trap_data_arr,
             label: {
               normal: {
@@ -556,21 +576,33 @@ export default {
         this.init(trap_data_arr);
         var pest_count = res.data.data.pest_count;
         var arr = [];
-        this.wornoptions = [];
         for (var i = 0; i < pest_count.length; i++) {
           var obj = {
             value: pest_count[i].sum,
             name: pest_count[i].pest_name,
           };
           arr.push(obj);
+        }
+        
+        this.initpie(arr);
+      });
+    },
+    getwornlistflex(){
+      this.$axios({
+        method: "POST",
+        url: "/api/api_gateway?method=monitor_manage.home_map.pest_name_list",
+      }).then((res) => {
+        console.log(res.data.data)
+        this.wornoptions = [];
+        var pest_list = res.data.data
+        for (var i = 0; i < pest_list.length; i++) {
           var obj2 = {
-            point_id: pest_count[i].pest_name,
-            point_name: pest_count[i].pest_name,
+            point_id: pest_list[i].pest_name,
+            point_name: pest_list[i].pest_name,
           };
           this.wornoptions.push(obj2);
         }
-        this.initpie(arr);
-      });
+      })
     },
     tabtime(times) {
       //时间转换
@@ -591,6 +623,7 @@ export default {
       this.inoffvalue = "";
       this.versionsvalue2 = "";
       this.timevalue = "";
+      this.getwornlist()
     },
     getmon2() {
       this.$axios({
@@ -619,6 +652,7 @@ export default {
                 message: "设置成功",
                 type: "success",
               });
+              this.getwornlist()
             } else {
               this.$message({
                 showClose: true,
@@ -652,6 +686,7 @@ export default {
       this.init();
     }, 500);
     this.getwornlist();
+    this.getwornlistflex()
     // this.getmon();
     this.getmon2();
   },
@@ -716,4 +751,10 @@ export default {
     width: 50%;
   }
 }
+/deep/.el-date-editor{
+  cursor: pointer;
+  .el-range-input{
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/page/login/login.vue

@@ -1,22 +1,43 @@
 <!--  -->
 <template>
-  <div class="">
+  <div class="loginback">
     <div class="loginbox">
-      <el-input
-        placeholder="请输入用户名"
-        prefix-icon="el-icon-search"
-        v-model="input"
+      <div class="loginbox_title">
+        <p class="top">深圳海关外来入侵物种</p>
+        <p class="bottom">监测指挥中心</p>
+      </div>
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        ref="ruleForm"
+        class="demo-ruleForm"
       >
-      </el-input>
-      <el-input
-        placeholder="请输入密码"
-        prefix-icon="el-icon-search"
-        v-model="input2"
-        type="password"
-        autocomplete="off"
-      >
-      </el-input>
-      <el-button type="primary" @click="login">登录</el-button>
+        <el-form-item label="" prop="username">
+          <el-input
+            prefix-icon="iconfont icon-yonghu"
+            v-model="ruleForm.username"
+            placeholder="请输入用户名"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="" prop="password">
+          <el-input
+            prefix-icon="iconfont icon-mima2"
+            v-model="ruleForm.password"
+            placeholder="请输入密码"
+            type="password"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="">
+          <el-checkbox-group v-model="ruleForm.type">
+            <el-checkbox label="记住密码" name="type"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="info" @click="submitForm('ruleForm')" size="mini"
+            >登&emsp;&emsp;录</el-button
+          >
+        </el-form-item>
+      </el-form>
     </div>
   </div>
 </template>
@@ -30,8 +51,17 @@ export default {
   data() {
     //这里存放数据
     return {
-      input: "",
-      input2: "",
+      ruleForm: {
+        username: "",
+        password: "",
+        type: "",
+      },
+      rules: {
+        username: [
+          { required: true, message: "请输入用户名", trigger: "blur" },
+        ],
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+      },
     };
   },
   //监听属性 类似于data概念
@@ -40,33 +70,36 @@ export default {
   watch: {},
   //方法集合
   methods: {
-    login() {
-      if (this.input == "") {
-        this.$message({
-          message: "请输入用户名!",
-          type: "warning",
-        });
-      } else if (this.input2 == "") {
-        this.$message({
-          message: "请输入密码！",
-          type: "warning",
-        });
-      } else {
-        this.$axios({
-          method: "POST",
-          url: "/api/api_gateway?method=sysmenage.usermanager.user_login",
-          data: this.qs.stringify({
-            username: this.input,
-            password: this.input2,
-          }),
-        }).then((res) => {
-          console.log(res);
-          if(res.data.data){
-            localStorage.setItem('session', res.data.data.session_key)
-              this.$router.push("/Index/facilitydistribute")
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.ruleForm.type) {
+            localStorage.setItem("username", this.ruleForm.username);
+            localStorage.setItem("password", this.ruleForm.password);
+            localStorage.setItem("type", 1);
+          } else {
+            localStorage.removeItem("username");
+            localStorage.removeItem("password");
+            localStorage.setItem("type", 0);
           }
-        });
-      }
+          this.$axios({
+            method: "POST",
+            url: "/api/api_gateway?method=sysmenage.usermanager.user_login",
+            data: this.qs.stringify({
+              username: this.ruleForm.username,
+              password: this.ruleForm.password,
+            }),
+          }).then((res) => {
+            // console.log(res);
+            if (res.data.data) {
+              localStorage.setItem("session", res.data.data.session_key);
+              this.$router.push("/Index/facilitydistribute");
+            }
+          });
+        } else {
+          return false;
+        }
+      });
     },
   },
   beforeCreate() {}, //生命周期 - 创建之前
@@ -74,7 +107,14 @@ export default {
   created() {},
   beforeMount() {}, //生命周期 - 挂载之前
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {},
+  mounted() {
+    this.ruleForm.type = Boolean(Number(localStorage.getItem("type")));
+    // console.log(this.ruleForm.type)
+    if (this.ruleForm.type) {
+      this.ruleForm.username = localStorage.getItem("username");
+      this.ruleForm.password = localStorage.getItem("password");
+    }
+  },
   beforeUpdate() {}, //生命周期 - 更新之前
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
@@ -83,17 +123,46 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.loginback {
+  width: 100%;
+  height: 100vh;
+  background: url("../../assets/loginbg.png");
+  background-color: #fff;
+}
 .loginbox {
   width: 20%;
-  // height: 250px;
-  //   background-color: red;
   padding: 20px;
   position: absolute;
-  top: 32%;
-  left: 50%;
-  margin-left: -10%;
+  top: 25%;
+  right: 17%;
+  .loginbox_title {
+    margin-bottom: 22px;
+    p {
+      font-weight: 700;
+    }
+    .top {
+      font-size: 22px;
+      margin-bottom: 10px;
+    }
+    .bottom {
+      font-size: 28px;
+    }
+  }
   .el-input {
-    margin-bottom: 15px;
+    // margin-bottom: 15px;
+  }
+  /deep/.el-input__inner {
+    background-color: transparent;
+    border: 0;
+    border-bottom: 1px solid #cccccc;
+    border-radius: 0;
+  }
+  /deep/.el-button--info {
+    background-color: #409eff;
+    border-color: #409eff;
+    width: 100%;
+    height: 40px;
+    font-size: 16px;
   }
 }
 </style>

minggao/src/page/monitoring/monitoringtask.vue

@@ -25,6 +25,7 @@
         start-placeholder="开始月份"
         end-placeholder="结束月份"
         size="mini"
+        :editable="false"
       >
       </el-date-picker>
       <el-button type="info" size="mini" @click="searchchilk">搜索</el-button>
@@ -378,4 +379,10 @@ export default {
     // }
   }
 }
+/deep/.el-date-editor{
+  cursor: pointer;
+  .el-range-input{
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/page/monitoring/supervisiontask.vue

@@ -25,6 +25,7 @@
         start-placeholder="开始月份"
         end-placeholder="结束月份"
         size="mini"
+        :editable="false"
       >
       </el-date-picker>
       <el-button type="info" size="mini" @click="searchchilk">搜索</el-button>
@@ -374,4 +375,10 @@ export default {
     // }
   }
 }
+/deep/.el-date-editor{
+  cursor: pointer;
+  .el-range-input{
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/page/superviseModule/superviseModule.vue

@@ -47,11 +47,12 @@
               size="mini"
               v-model="value"
               @change="searchData"
-              type="datetimerange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               align="right"
+              :editable="false"
             >
             </el-date-picker>
 
@@ -358,4 +359,10 @@ export default {
     color: #1890ff;
   }
 }
+/deep/.el-date-editor{
+  cursor: pointer;
+  .el-range-input{
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/page/systemmanger/customsManger.vue

@@ -298,6 +298,7 @@ export default {
         },
       ];
       this.addrUserVisible = true;
+      this.tabListData()
     },
 
     // 添加用户 || 编辑用户 -- 确定

minggao/src/page/systemmanger/dayRecord.vue

@@ -27,11 +27,12 @@
               size="mini"
               v-model="value1"
               @change="searchData"
-              type="datetimerange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               align="right"
+              :editable="false"
             >
             </el-date-picker>
             <div class="btn_box">
@@ -246,4 +247,10 @@ export default {
     color: #1890ff;
   }
 }
+/deep/.el-date-editor{
+  cursor: pointer;
+  .el-range-input{
+    cursor: pointer;
+  }
+}
 </style>

minggao/src/router/index.js

@@ -26,7 +26,7 @@ const taskRegulator = () => import('@/Page/commandCenter/taskRegulator') //任
 const taskRegulatorDetails = () => import('@/Page/commandCenter/taskRegulatorDetails') //任务管理 - 详情
 const superviseAdmin = () => import('@/Page/commandCenter/superviseAdmin') //监督管理
 const superviseAdminDetails = () => import('@/Page/commandCenter/superviseAdminDetails') //监督管理 - 详情
-const supervise = () => import('@/Page/commandCenter/supervise') //监督记录
+const superviserec = () => import('@/Page/commandCenter/supervise') //监督记录
 const superviseDetails = () => import('@/Page/commandCenter/superviseDetails') //监督记录 - 详情
 const superviseLog = () => import('@/Page/commandCenter/superviseLog') //监测日志
 const superviseLogDetails = () => import('@/Page/commandCenter/superviseLogDetails') //监测日志 - 详情
@@ -180,8 +180,8 @@ export default new Router({
           }
         },
         {
-          path: 'supervise',
-          component: supervise,
+          path: 'superviserec',
+          component: superviserec,
           meta: {
             title: '监督记录'
           }