Quellcode durchsuchen

修改一些问题

zhangsijie vor 1 Jahr
Ursprung
Commit
0587503d04

+ 3 - 3
minggao/config/index.js

@@ -2,7 +2,7 @@
  * @Author: zhangsijie 1935241421@qq.com
  * @Date: 2023-06-05 08:51:07
  * @LastEditors: lin
- * @LastEditTime: 2024-04-15 09:38:54
+ * @LastEditTime: 2024-04-22 14:37:25
  * @FilePath: \project\minggao_vue\MingGao_vue\minggao\config\index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -24,8 +24,8 @@ module.exports = {
         //  target: 'https://www.yhswjc.com', //线上
         // target: 'http://192.168.1.77:12345', //曹世祥
         // target: 'http://114.115.147.140:12345',
-        //  target: 'http://192.168.0.117:8001', //闫自林本地服务
-         target: 'http://192.168.0.120:8001', //孙夹克本地服务
+         target: 'http://192.168.0.117:8001', //闫自林本地服务
+        //  target: 'http://192.168.0.120:8001', //孙夹克本地服务
         changeOrigin: true,
         pathRewrite: {
           '^/api': '/api' //重写接口

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

@@ -19,11 +19,14 @@
         />
         <p>{{ headline }}</p>
       </div>
-      <div class="index_out" style="display: flex">
+      <div class="index_out" style="display: flex; align-items: center;">
         <div class="index_out_info">
           <i class="el-icon-message-solid" @click="towarn"></i>
           <p class="dian" v-if="warntf"></p>
         </div>
+        <div title="去大屏">
+          <router-link target="_blank" style="margin-right: 15px; font-size: 22px; color: #666666" to="/newHome/home"><i class="el-icon-monitor"></i></router-link>
+        </div>
         <div
           class="iconfont icon-erweima"
           style="margin-right: 15px; font-size: 22px; color: #666666"

+ 4 - 4
minggao/src/page/home/newHome/deviceHome.vue

@@ -3,7 +3,7 @@
  * @Autor: lin
  * @Date: 2024-04-09 14:26:43
  * @LastEditors: lin
- * @LastEditTime: 2024-04-20 11:34:23
+ * @LastEditTime: 2024-04-22 14:22:53
 -->
 <template>
   <div class="bigBg" v-loading="loading">
@@ -337,9 +337,9 @@ export default {
           // 默认渲染第一页
           this.initCharByIndex(this.activeIndex, 'tem');
         })
-        this.timmer = setInterval(() => {
-          this.$router.push('/newHome/home');
-        }, this.deviceList.length * 10000)
+        // this.timmer = setInterval(() => {
+        //   this.$router.push('/newHome/home');
+        // }, this.deviceList.length * 10000)
       })
     },
     // 折线图带渐变配置

+ 8 - 4
minggao/src/page/home/newHome/newHome.vue

@@ -3,7 +3,7 @@
  * @Autor: lin
  * @Date: 2024-04-09 14:26:07
  * @LastEditors: lin
- * @LastEditTime: 2024-04-20 11:28:44
+ * @LastEditTime: 2024-04-22 16:49:56
 -->
 <template>
   <div class="box">
@@ -51,7 +51,7 @@
                       <div>害虫总数</div>
                       <div>{{ item.sum }}</div>
                     </div>
-                    <div class="detailInfo" v-if="item.category != '外来有害杂草'">
+                    <div class="detailInfo" v-if="item.category != '杂草'">
                       <div>害虫种类</div>
                       <div>{{ item.count }}</div>
                     </div>
@@ -497,7 +497,10 @@ export default {
           return
         }
         console.log(res.data.data);
-        this.watchInfo = res.data.data;
+        this.watchInfo = res.data.data.pests;
+        this.watchYear = res.data.data.time;
+
+;
       })
     },
     // 获取任务统计图
@@ -768,7 +771,8 @@ export default {
           });
           var marker = new AMap.Marker({
             position: item.lng_lat, // 设置标记点的位置
-            icon: customIcon// 设置自定义图标的URL
+            icon: customIcon,// 设置自定义图标的URL
+            offset: new AMap.Pixel(-20, -53), // 设置偏移量,向左上方偏移10个像素
           });
           // 将标记点添加到地图上
           marker.setMap(this.map);

+ 23 - 6
minggao/src/page/systemmanger/harmfulBiology.vue

@@ -95,6 +95,7 @@
           label="有害生物名称"
         >
         </el-table-column>
+        <el-table-column prop="category" label="有害生物类型"></el-table-column>
         <el-table-column prop="quarantine" label="检疫性有害生物(是/否)">
         </el-table-column>
         <el-table-column prop="alien_specie" label="是否外来物种">
@@ -177,7 +178,12 @@
             v-model.trim="form.name"
           ></el-input>
         </el-form-item>
-
+        <el-form-item label="有害生物类型: " prop="category">
+          <el-select class="selectThem" v-model="form.category" size="mini" placeholder="请选择分类">
+            <el-option v-for="typeItem in typeList" :label="typeItem.label" :value="typeItem.value"
+              :key="typeItem.value"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="检疫性有害生物: " prop="judge">
           <el-select v-model="form.judge" placeholder="请选择检疫性有害生物">
             <el-option label="是" value="是"></el-option>
@@ -277,13 +283,18 @@ export default {
         judge2: '', //是否外来入侵物种
         remark: '', // 备注
         level: '1',
-        describe: ''
+        describe: '',
+        category:''
       },
       rules: {
         name: [
           { required: true, message: '请输入有害生物名称', trigger: 'blur' }
           //   { min: 3, max: 5, message: "长度在 1 到 15 个字符", trigger: "blur" },
         ],
+        category: [
+          { required: true, message: '请选择有害生物类型', trigger: 'blur' }
+          //   { min: 3, max: 5, message: "长度在 1 到 15 个字符", trigger: "blur" },
+        ],
         judge: [
           { required: true, message: '请选择检疫性有害生物', trigger: 'blur' }
           //   { min: 3, max: 5, message: "长度在 1 到 15 个字符", trigger: "blur" },
@@ -304,7 +315,8 @@ export default {
       },
       insectObj: {},
       isClick: true, // 防止重复弹框
-      submitBtn: false // 防止弹框确定按钮重复请求
+      submitBtn: false, // 防止弹框确定按钮重复请求
+      typeList:[]
     };
   },
   //监听属性 类似于data概念
@@ -333,6 +345,7 @@ export default {
         this.form.remark = ''; // 备注
         this.form.level = '';
         this.form.describe = '';
+        this.form.category = '';
         // this.$refs["form"].resetFields();
       }
     }
@@ -414,7 +427,8 @@ export default {
         judge2: data.alien_specie, //是否外来入侵物种
         remark: data.messages, // 备注
         level: data.level == '' ? '1' : data.level,
-        describe: data.describe
+        describe: data.describe,
+        category: data.category
       };
       this.addrInsectVisible = true;
     },
@@ -478,7 +492,8 @@ export default {
               quarantine: this.form.judge,
               messages: this.form.remark,
               level: this.form.level,
-              describe: this.form.describe
+              describe: this.form.describe,
+              category: this.form.category
             });
           } else if (this.tltData == '编辑有害生物') {
             var url = '/api/api_gateway?method=sysmenage.maintain.pest_modify';
@@ -489,7 +504,8 @@ export default {
               quarantine: this.form.judge,
               messages: this.form.remark,
               level: this.form.level,
-              describe: this.form.describe
+              describe: this.form.describe,
+              category: this.form.category
             });
           }
           this.$axios({
@@ -530,6 +546,7 @@ export default {
   created() {},
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
+    this.typeList = this.$store.state.pestTypeList; // 害虫分类
     this.loading = true;
     this.harmfulBiologyList();
   },

+ 1 - 1
minggao/src/page/warning/warninglist.vue

@@ -28,7 +28,7 @@
               <span>{{ (queryInfo.page - 1) * 20 + (scope.$index + 1) }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="group" label="组织" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="group" label="组织" width="180" show-overflow-tooltip></el-table-column>
           <el-table-column prop="content_alias" label="预警内容" show-overflow-tooltip>
           </el-table-column>
           <el-table-column prop="addtime_format" width="120" label="预警时间" show-overflow-tooltip>

+ 2 - 2
minggao/src/store/store.js

@@ -44,8 +44,8 @@ const store = new Vuex.Store({
       value: '实蝇',
     },
     {
-      label: '外来有害杂草',
-      value: '外来有害杂草',
+      label: '杂草',
+      value: '杂草',
     }], // 林木害虫类别分类
   },
   getters: {