2022/2/24

minggao/src/page/commandCenter/laboratory.vue

@@ -205,7 +205,7 @@
       title="填报"
       v-loading="loading1"
       :visible.sync="dialogVisible"
-      width="50%"
+      width="800px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
     >
@@ -221,6 +221,7 @@
           <div v-for="(item, index) in fillList" :key="item.ind">
             <el-select
               v-model="models[index]"
+              disabled
               size="mini"
               clearable
               @change="compileInsect($event, item, index)"
@@ -236,6 +237,7 @@
             </el-select>
 
             <el-input
+              disabled
               placeholder="请输入内容"
               size="mini"
               v-model="item.num"
@@ -658,6 +660,16 @@ export default {
         array.push(obj);
       }
 
+      if (this.insectVal !== "" && this.numVal !== "") {
+        array = [
+          {
+            pest_name: this.insectVal,
+            pest_number: this.numVal,
+          },
+          ...array,
+        ];
+      }
+
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=control_center.task.discern_add",
@@ -684,7 +696,6 @@ export default {
           this.submitBtn = false;
         })
         .catch((err) => {
-          // console.log(err);
           this.submitBtn = false;
         });
     },
@@ -717,7 +728,7 @@ export default {
       if (keynum == 189 || keynum == 109) {
         //禁止输入负数
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message.warning("禁止输入负数");
+          this.$message.warning("禁止输入负数");
         }
         e.target.value = 0;
       }
@@ -726,7 +737,7 @@ export default {
       } else {
         //禁止输入负数
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message.warning("禁止输入负数");
+          this.$message.warning("禁止输入负数");
         }
         e.target.value = 0;
       }

minggao/src/page/commandCenter/realTime.vue

@@ -132,7 +132,7 @@
       v-dialogDrag
       :title="videoTle"
       :visible.sync="videoVisible"
-      width="40%"
+      width="600px"
     >
       <div class="video_box">
         <div class="host_video" v-if="videoShow">
@@ -234,7 +234,7 @@
       :modal="false"
       :close-on-press-escape="false"
       :visible.sync="dialogVisible"
-      width="30%"
+      width="500px"
     >
       <!-- 聊天内容 -->
       <ul class="ul_list test-5" id="msgBox">

minggao/src/page/commandCenter/superviseAdminDetails.vue

@@ -144,7 +144,7 @@
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      width="30%"
+      width="500px"
     >
       <ul class="insect_ul">
         <li
@@ -164,7 +164,7 @@
       :visible.sync="superviseVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      width="30%"
+      width="500px"
     >
       <el-form
         v-loading="loading2"

minggao/src/page/commandCenter/superviseDetails.vue

@@ -202,7 +202,7 @@
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      width="30%"
+      width="500px"
     >
       <ul class="insect_ul">
         <li

minggao/src/page/commandCenter/taskRegulator.vue

@@ -229,7 +229,7 @@
       :title="titleData"
       :show-close="false"
       :visible.sync="dialogVisible"
-      width="45%"
+      width="800px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
     >
@@ -400,7 +400,7 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :visible.sync="deviceVisible"
-      width="45%"
+      width="800px"
     >
       <!-- 筛选 -->
       <ul class="device_seek">
@@ -705,6 +705,7 @@ export default {
       }
     },
     checkList(val) {
+      console.log(val)
       this.ybqCheckList = [];
       this.ruleForm.checkList = [];
       for (let i = 0; i < val.length; i++) {
@@ -716,6 +717,7 @@ export default {
           }
         }
       }
+      console.log(this.ruleForm.checkList)
     },
   },
   //方法集合
@@ -994,6 +996,19 @@ export default {
             this.ruleForm.endTime = "";
           }
 
+          // 判断当前是否有修改诱捕器，如果没有修改需要将诱捕器列表格式更改
+          var arr = []
+          for (var i = 0; i < this.ruleForm.checkList.length; i++) {
+            if (typeof this.ruleForm.checkList[i] == "object") {
+              arr.push(this.ruleForm.checkList[i].id)
+            }
+          }
+
+          if (arr.length == 0) {
+            arr = this.ruleForm.checkList
+          } 
+
+
           // 判断当前任务类型是否为有害生物
           if (this.ruleForm.type !== "有害生物监测") {
             this.ruleForm.checkList = [];
@@ -1011,7 +1026,7 @@ export default {
                 last_time: this.ruleForm.endTime, // 任务完成时间
                 task_type: this.ruleForm.type, // 任务类型
                 tesk_msg: this.ruleForm.desc, // 任务描述
-                trap_id_list: JSON.stringify(this.ruleForm.checkList), // 诱捕器id列表
+                trap_id_list: JSON.stringify(arr), // 诱捕器id列表
               }),
             })
               .then((res) => {
@@ -1049,7 +1064,7 @@ export default {
                 last_time: this.ruleForm.endTime, // 任务完成时间
                 task_type: this.ruleForm.type, // 任务类型
                 tesk_msg: this.ruleForm.desc, // 任务描述
-                trap_id_list: JSON.stringify(this.ruleForm.checkList), // 诱捕器id列表
+                trap_id_list: JSON.stringify(arr), // 诱捕器id列表
               }),
             })
               .then((res) => {

minggao/src/page/forecasting/cbd/cbdDataPhotos.vue

@@ -1465,9 +1465,6 @@ export default {
       // if (val == false) {
       //   this.addFunData = {}
       // }
-<<<<<<< HEAD
-    },
-=======
 
       if (val == false) {
         this.imgShow = true
@@ -1478,7 +1475,6 @@ export default {
         // });
       }
     }
->>>>>>> d9153c93674a2b211f20166e3674d4a966a95b36
   },
 
   methods: {

minggao/src/page/superviseModule/superviseModuleDetails.vue

@@ -197,7 +197,7 @@
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      width="30%"
+      width="500px"
     >
       <ul class="insect_ul">
         <li

minggao/src/page/systemmanger/customsManger.vue

@@ -63,7 +63,7 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :visible.sync="addrUserVisible"
-      width="25%"
+      width="500px"
     >
       <el-form ref="form" :model="form" label-width="80px">
         <el-form-item label="上级: ">

minggao/src/page/systemmanger/dayRecord.vue

@@ -94,7 +94,7 @@
     </el-card>
 
     <!-- 详情弹框 -->
-    <el-dialog title="动作详情" :visible.sync="dialogVisible" width="30%">
+    <el-dialog title="动作详情" :visible.sync="dialogVisible" width="500px">
       <div>
         <span>{{ objData.action }}：</span>
         <span>{{ objData.op_details }}</span>

minggao/src/page/systemmanger/harmfulBiology.vue

@@ -27,7 +27,7 @@
     </el-row>
     <el-card style="margin-top: 15px">
       <!-- 列表 -->
-      <el-table
+      <!-- <el-table
         :data="tableData"
         v-loading="loading"
         stripe
@@ -75,6 +75,52 @@
             >
           </template>
         </el-table-column>
+      </el-table> -->
+      <el-table
+        :data="tableData"
+        v-loading="loading"
+        stripe
+        :height="48 * 13"
+        style="width: 100%"
+      >
+        <el-table-column prop="ind" label="序号"> </el-table-column>
+        <el-table-column
+          prop="pest_name"
+          :show-overflow-tooltip="true"
+          label="有害生物名称"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="quarantine"
+          label="检疫性有害生物(是/否)"
+        >
+        </el-table-column>
+        <el-table-column prop="alien_specie" label="是否外来物种">
+        </el-table-column>
+        <el-table-column
+          prop="messages"
+          :show-overflow-tooltip="true"
+          label="备注"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.messages || "无" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="create_time" label="添加时间">
+        </el-table-column>
+        <el-table-column prop="modify_time" label="最后修改时间">
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <a class="reset" href="javascript:;" @click="actionFunc(scope.row)"
+              >编辑</a
+            >
+            <i class="line"></i>
+            <a class="delete" href="javascript:;" @click="deleteFunc(scope.row)"
+              >删除</a
+            >
+          </template>
+        </el-table-column>
       </el-table>
 
       <!-- 分页 -->
@@ -96,7 +142,7 @@
       :close-on-press-escape="false"
       :title="tltData"
       :visible.sync="addrInsectVisible"
-      width="30%"
+      width="500px"
     >
       <el-form ref="form" :rules="rules" :model="form" label-width="150px">
         <el-form-item label="有害生物名称: " prop="name">

minggao/src/page/systemmanger/motif.vue

@@ -47,7 +47,7 @@
     <el-dialog
       title="编辑"
       :visible.sync="redactVisible"
-      width="50%"
+      width="800px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
     >

minggao/src/page/systemmanger/role.vue

@@ -27,7 +27,7 @@
     </el-row>
     <el-card style="margin-top: 15px">
       <!-- 列表 -->
-      <el-table
+      <!-- <el-table
         :data="tableData"
         v-loading="loading"
         stripe
@@ -64,6 +64,42 @@
             >
           </template>
         </el-table-column>
+      </el-table> -->
+      <el-table
+        :data="tableData"
+        v-loading="loading"
+        stripe
+        style="width: 100%;overflow-y: auto"
+        :height="48 * 13"
+      >
+        <el-table-column prop="ind" label="序号"></el-table-column>
+        <el-table-column
+          prop="role_name"
+          :show-overflow-tooltip="true"
+          label="角色名称"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="role_message"
+          :show-overflow-tooltip="true"
+          label="角色描述"
+        >
+        </el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <a class="reset" href="javascript:;" @click="actionFunc(scope.row)"
+              >编辑</a
+            >
+            <i class="line"></i>
+            <a class="delete" href="javascript:;" @click="deleteFunc(scope.row)"
+              >删除</a
+            >
+            <i class="line"></i>
+            <a class="addr" href="javascript:;" @click="limitsData(scope.row)"
+              >分配权限</a
+            >
+          </template>
+        </el-table-column>
       </el-table>
 
       <!-- 分页 -->
@@ -85,7 +121,7 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :visible.sync="addrUserVisible"
-      width="45%"
+      width="500px"
     >
       <el-form ref="form" :rules="rules" :model="form" label-width="90px">
         <el-form-item label="角色名称: " prop="name">
@@ -125,7 +161,7 @@
     <el-dialog
       title="分配权限"
       :visible.sync="setRightDialogVisible"
-      width="50%"
+      width="600px"
       @close="setRightDialogClosed"
       :close-on-click-modal="false"
       :close-on-press-escape="false"

minggao/src/page/systemmanger/userManger.vue

@@ -171,7 +171,7 @@
       :visible.sync="userVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      width="30%"
+      width="500px"
     >
       <el-form ref="form" :rules="rules" :model="form" label-width="150px">
         <el-form-item label="账号: " prop="user">