fix:bug修复完成

minggao/src/components/DateSearch/index.vue

@@ -244,9 +244,9 @@ export default {
           new Date(this.timeRange[1]).getTime() / 1000
         );
       } else {
-        this.btnSelected = 2;
+        this.btnSelected = 4;
         this.queryInfo.begin = parseInt(
-          (Date.now() - 24 * 3600000 * 30) / 1000
+          (Date.now() - 24 * 3600000 * 30 * 3) / 1000
         );
         this.queryInfo.end = parseInt((Date.now() + 24 * 3600000) / 1000);
       }

minggao/src/page/commandCenter/laboratory.vue

@@ -767,7 +767,7 @@ export default {
 
     // 添加有害生物
     addInsect() {
-      if (this.insectVal !== '' && this.numVal !== '') {
+      if (this.insectVal !== '' && this.numVal > 0) {
         var array = [];
         var arr = [];
         for (var i = 0; i < this.options2.length; i++) {
@@ -802,7 +802,7 @@ export default {
         if (document.getElementsByClassName('el-message').length == 0) {
           this.$message({
             type: 'info',
-            message: '请将信息填写完整！',
+            message: '请将信息填写完整,害虫数量必须大于0！',
             duration: 1500
           });
         }
@@ -868,6 +868,7 @@ export default {
             this.fillList = [];
             this.models = [];
             this.dialogVisible = false;
+            this.tableList();
           }
           this.insectVal = '';
           this.numVal = '';

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

@@ -563,7 +563,7 @@
               </p>
             </div>
           </el-form-item>
-          <el-form-item label="隶属组织" prop="org_id">
+          <el-form-item label="隶属组织" prop="org_id" class="is-required">
             <el-cascader
               :change-on-select="true"
               v-model="ruleForm.org_id"

minggao/src/page/forecasting/monthKillingLamp/index.vue

@@ -542,7 +542,7 @@
               </p>
             </div>
           </el-form-item>
-          <el-form-item label="隶属组织" prop="org_id">
+          <el-form-item label="隶属组织" prop="org_id" class="is-required">
             <el-cascader
               :change-on-select="true"
               v-model="ruleForm.org_id"

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

@@ -253,7 +253,7 @@
               </p>
             </div>
           </el-form-item>
-          <el-form-item label="隶属组织" prop="org_id">
+          <el-form-item label="隶属组织" prop="org_id" class="is-required">
             <el-cascader
               :change-on-select="true"
               v-model="ruleForm.org_id"
@@ -456,6 +456,11 @@ export default {
         callback();
       }
     };
+
+    var ignoreRule = (rule, value, callback) => {
+      callback();
+    };
+
     return {
       idinput: '',
       inoffvalue: '',
@@ -516,9 +521,7 @@ export default {
           { required: true, message: '请输入纬度', trigger: 'blur' }
           // { validator: checklnglat, trigger: "blur" },
         ],
-        // org_id: [
-        //   { required: true, message: "请选择隶属组织", trigger: "change" },
-        // ],
+        // org_id: [],
         point_id: [
           { required: true, message: '请选择所在监测点', trigger: 'change' }
         ],
@@ -950,7 +953,7 @@ export default {
       var map = new AMap.Map('mapContainer2', {
         center: this.center,
         resizeEnable: true,
-        zoom: 10,
+        zoom: 10
       });
       AMap.plugin(['AMap.ToolBar', 'AMap.Geocoder'], () => {
         map.addControl(new AMap.ToolBar());

minggao/src/page/homepage/pestdistribute.vue

@@ -529,9 +529,12 @@ export default {
           type_id: this.typevalue
         })
       }).then(res => {
-        // console.log(res.data.data);
+        console.log(res.data.data);
         this.map && this.map.clearMap();
-        this.mouseTool.close(true);
+        if (this.mouseTool) {
+          this.mouseTool.close(true);
+        }
+
         var resdata = res.data.data;
         this.loading = false;
         var pest_count = res.data.data.pest_count;

minggao/src/page/systemmanger/userManger.vue

@@ -368,6 +368,8 @@
 </template>
 
 <script>
+import { flatMapDeepDataList } from '@/util/helpers';
+
 export default {
   //import引入的组件需要注入到对象中才能使用
   components: {},
@@ -479,7 +481,8 @@ export default {
       isClick: true, // 防止重复弹框
       submitBtn: false, // 防止弹框确定按钮重复请求
       content: '',
-      content2: ''
+      content2: '',
+      flattenOrgList: []
     };
   },
   //监听属性 类似于data概念
@@ -580,6 +583,8 @@ export default {
         roleList.push(a);
       }
 
+      console.log(list, '--------------------------- sddsdsafsafsafsa ');
+
       setTimeout(() => {
         this.form = {
           user: e.username,
@@ -893,6 +898,7 @@ export default {
         })
       })
         .then(res => {
+          console.log(res, '-0------ user manager');
           if (res.data.data.page_list.length !== 0) {
             // var obj = {
             //   org_name: '全部',
@@ -902,6 +908,7 @@ export default {
             this.tissueList = list; // 弹框组织列表
             var data = res.data.data.page_list;
             this.data = [...data]; // 左侧组织列表
+            this.flattenOrgList = flatMapDeepDataList(list, 'childrens');
           }
           this.loading = false;
         })
@@ -929,6 +936,7 @@ export default {
         .catch(err => {});
     },
     judgeData(item) {
+      console.log(item, '----------------');
       this.form.judge = item;
     },
     roleChange(item) {

minggao/src/util/helpers.js

@@ -1,5 +1,21 @@
-import { zipObject, map } from 'lodash-es';
+import { zipObject, map, each, omit } from 'lodash-es';
 
 export function normalization(arr, key = 'id') {
   return zipObject(map(arr, key), arr);
 }
+
+export function flatMapDeepDataList(arr, key = 'children') {
+  let initDataList = [];
+
+  each(arr, item => {
+    if (item[key] && item[key].length) {
+      const children = item[key];
+      initDataList.push(omit(item, [key]));
+      initDataList.push(...flatMapDeepDataList(children, key));
+    } else {
+      initDataList.push(item);
+    }
+  });
+
+  return initDataList;
+}