浏览代码

2022/2/24

zkl 4 年之前
父节点
当前提交
29716eec3c

+ 8 - 3
minggao/src/page/commandCenter/superviseAdminDetails.vue

@@ -231,12 +231,12 @@ export default {
       },
       rules2: {
         region: [
-          { required: true, message: "请选择活动区域", trigger: "change" },
+          { required: true, message: "请选择监督单位", trigger: "change" },
         ],
         resource: [
-          { required: true, message: "请选择活动资源", trigger: "change" },
+          { required: true, message: "请输入监督形式", trigger: "change" },
         ],
-        desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }],
+        desc: [{ required: true, message: "请输入监督情况", trigger: "blur" }],
       },
       loading2: false, //加载
       isClick: true, // 防止重复弹框
@@ -484,4 +484,9 @@ export default {
     }
   }
 }
+
+// 文本域样式更改
+/deep/.el-textarea__inner {
+  font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
 </style>

+ 48 - 20
minggao/src/page/commandCenter/superviseLog.vue

@@ -63,7 +63,7 @@
         :height="48 * 13"
         style="width: 100%; overflow-y: auto"
       >
-        <el-table-column prop="ind" label="序号" width="100"> </el-table-column>
+        <!-- <el-table-column prop="ind" label="序号" width="100"> </el-table-column>
         <el-table-column prop="owner_user" label="监测人员" width="200">
         </el-table-column>
         <el-table-column prop="monitor_time" label="监测时间" width="250">
@@ -85,6 +85,30 @@
               >查看</a
             >
           </template>
+        </el-table-column> -->
+
+        <el-table-column prop="ind" label="序号"> </el-table-column>
+        <el-table-column prop="owner_user" label="监测人员">
+        </el-table-column>
+        <el-table-column prop="monitor_time" label="监测时间" >
+        </el-table-column>
+        <el-table-column prop="weather" label="天气" >
+        </el-table-column>
+        <el-table-column prop="temperature" label="温度">
+        </el-table-column>
+        <el-table-column prop="address" label="地点" >
+        </el-table-column>
+        <el-table-column prop="monitor_time" label="提交时间" >
+        </el-table-column>
+        <el-table-column label="操作"  fixed="right">
+          <template slot-scope="scope">
+            <a
+              href="javascript:;"
+              class="reset"
+              @click="examineDetail(scope.row)"
+              >查看</a
+            >
+          </template>
         </el-table-column>
       </el-table>
 
@@ -128,7 +152,7 @@ export default {
       // 分页
       page: 1, // 当前页码
       tableSum: 0, // 总页码
-      btnShow: false // 防止导出数据重复下载
+      btnShow: false, // 防止导出数据重复下载
     };
   },
   //监听属性 类似于data概念
@@ -141,12 +165,12 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件,导致卡顿
           that.timer = false;
         }, 400);
       }
-    }
+    },
   },
   //方法集合
   methods: {
@@ -171,10 +195,10 @@ export default {
           page_item: "20", //
           monitor_user_id: "", // 监测人id
           start_time: this.startTime, // 开始时间
-          end_time: this.endTime // 结束时间
-        })
+          end_time: this.endTime, // 结束时间
+        }),
       })
-        .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;
@@ -191,7 +215,7 @@ export default {
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
         });
     },
@@ -205,14 +229,14 @@ export default {
           user_type: "supervisor", // 用户类型,operator(任务处理人), supervisor(任务监督人), owner(任务发布人)
           operator_id: "", // 已经选择的任务处理人id
           supervisor_id: "", // 已经选择的任务监督人id
-          owner_id: "" // 已经选择的任务发布人id
-        })
+          owner_id: "", // 已经选择的任务发布人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;
@@ -221,7 +245,7 @@ export default {
             this.conductorList = list;
           }
         })
-        .catch(err => {});
+        .catch((err) => {});
     },
 
     // 筛选
@@ -262,8 +286,8 @@ export default {
       this.$router.push({
         path: "/index/superviseLogDetails",
         query: {
-          id: data.id
-        }
+          id: data.id,
+        },
       });
     },
 
@@ -274,16 +298,16 @@ export default {
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=control_center.task.monitor_log_export",
-        responseType: "blob"
+        responseType: "blob",
       })
-        .then(res => {
+        .then((res) => {
           this.downloadFile(res, "监测日志.xls");
           this.loadingShow = false;
           setTimeout(() => {
             this.btnShow = false;
           }, 1500);
         })
-        .catch(err => {
+        .catch((err) => {
           this.loadingShow = false;
           setTimeout(() => {
             this.btnShow = false;
@@ -301,7 +325,7 @@ export default {
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
-    }
+    },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {},
@@ -318,7 +342,7 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {} //如果页面有keep-alive缓存功能,这个函数会触发
+  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
 <style lang="less" scoped>
@@ -362,4 +386,8 @@ export default {
     cursor: pointer;
   }
 }
+
+/deep/.el-table .cell {
+  text-align: center;
+}
 </style>

+ 5 - 0
minggao/src/page/commandCenter/taskRegulator.vue

@@ -1359,4 +1359,9 @@ export default {
     cursor: pointer;
   }
 }
+
+// 文本域样式更改
+/deep/.el-textarea__inner {
+  font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
 </style>

+ 4 - 0
minggao/src/page/forecasting/cbd/cbdDataPhotos.vue

@@ -2074,6 +2074,10 @@ export default {
             this.imgDataList = arr;
             console.log(this.imgDataList);
             this.imgListShow = true;
+
+            if (res.data.message == "") {
+              this.$message.success("图片刷新成功");
+            }
           } else {
             // 没数据
             this.imgListShow = false;

+ 5 - 0
minggao/src/page/forecasting/maintain/maintain.vue

@@ -684,4 +684,9 @@ export default {
     }
   }
 }
+
+// 文本域样式更改
+/deep/.el-textarea__inner {
+  font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
 </style>

+ 6 - 1
minggao/src/page/forecasting/trap/bait.vue

@@ -74,7 +74,7 @@
           class="demo-ruleForm"
         >
           <el-form-item label="诱剂名称" prop="inducer_name">
-            <el-input v-model="ruleForm.inducer_name"></el-input>
+            <el-input type="text" v-model="ruleForm.inducer_name"></el-input>
           </el-form-item>
           <el-form-item label="有效期天数" prop="expire">
             <el-input v-model="ruleForm.expire"></el-input>
@@ -356,4 +356,9 @@ export default {
   background-color: #409eff;
   border-color: #409eff;
 }
+
+// 文本域样式更改
+/deep/.el-textarea__inner {
+  font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
 </style>

+ 5 - 0
minggao/src/page/systemmanger/harmfulBiology.vue

@@ -456,4 +456,9 @@ export default {
     width: 80%;
   }
 }
+
+// 文本域样式更改
+/deep/.el-textarea__inner {
+  font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
 </style>

+ 5 - 0
minggao/src/page/systemmanger/role.vue

@@ -554,4 +554,9 @@ export default {
     height: 14px;
   }
 }
+
+// 文本域样式更改
+/deep/.el-textarea__inner {
+  font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+}
 </style>