地图

src/utils/index.js

@@ -45,7 +45,9 @@ export function parseTime(time, cFormat) {
   const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
     const value = formatObj[key]
     // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+    if (key === 'a') {
+      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    }
     return value.toString().padStart(2, '0')
   })
   return time_str
@@ -94,6 +96,64 @@ export function formatTime(time, option) {
   }
 }
 
+// 获取当前月份的第一天
+
+export function getCurrentMonthFirst() {
+  const date = new Date();
+
+  date.setDate(1);
+
+  var month = parseInt(date.getMonth() + 1);
+
+  var day = date.getDate();
+
+  if (month < 10) {
+    month = '0' + month
+
+  }
+
+  if (day < 10) {
+    day = '0' + day
+
+  }
+
+  return date.getFullYear() + '-' + month + '-' + day;
+
+}
+
+// 获取当前月份的最后一天
+
+export function getCurrentMonthLast() {
+  const date = new Date();
+
+  var currentMonth = date.getMonth();
+
+  var nextMonth = ++currentMonth;
+
+  var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1);
+
+  var oneDay = 1000 * 60 * 60 * 24;
+
+  var lastTime = new Date(nextMonthFirstDay - oneDay);
+
+  var month = parseInt(lastTime.getMonth() + 1);
+
+  var day = lastTime.getDate();
+
+  if (month < 10) {
+    month = '0' + month
+
+  }
+
+  if (day < 10) {
+    day = '0' + day
+
+  }
+
+  return date.getFullYear() + '-' + month + '-' + day;
+
+}
+
 /**
  * @param {string} url
  * @returns {Object}

src/views/rain/inspection/components/maps.vue

@@ -294,7 +294,6 @@ export default {
       this.singleclick()
 
             // this.map.layer2.setVisible(false)
-
     },
 
 

src/views/rain/inspection/inspection.vue

@@ -50,7 +50,7 @@
               <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
               <Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button>
               <Button type="primary" @click="exportExcel()" style="margin-left: 10px">导出</Button>
-              <Button type="primary" @click="showMap()" style="margin-left: 10px">地图</Button>
+              <Button type="primary" @click="showMap()" style="margin-left: 10px">当月点位</Button>
             </div>
           </slot>
         </LxHeader>
@@ -507,6 +507,8 @@
         listall({
           page: 1,
           page_size: 9999999,
+          start_date:getCurrentMonthFirst(),
+          end_date:getCurrentMonthLast(),
           ...search
         }).then(response => {
           for (var m of response.data) {

src/views/rain/maintain/maintain.vue

@@ -46,7 +46,7 @@
               <Button type="primary" @click="edit()" style="margin-left: 10px">新增</Button>
               <Button type="primary" @click="review()" style="margin-left: 10px">批量复核</Button>
               <Button type="primary" @click="exportExcel()" style="margin-left: 10px">导出</Button>
-              <Button type="primary" @click="showMap()" style="margin-left: 10px">地图</Button>
+              <Button type="primary" @click="showMap()" style="margin-left: 10px">当月点位</Button>
             </div>
           </slot>
         </LxHeader>
@@ -222,6 +222,7 @@
   import editMire from '@/views/rain/maintain/components/editMire'
   import AvueMap from 'avue-plugin-map'
   import maps from '@/views/rain/maintain/components/maps'
+  import {getCurrentMonthFirst,getCurrentMonthLast} from "@/utils/index"
 
   export default {
     components: {
@@ -539,12 +540,27 @@
         listmain({
           page: 1,
           page_size: 9999999,
+          start_date:getCurrentMonthFirst(),
+          end_date:getCurrentMonthLast(),
           ...search
         }).then(response => {
           for (var m of response.data) {
-            this.mapArr.push([
-              m.longitude,m.latitude,m.address,m.id,m.old_type
-            ])
+            if(m.help_discharge_info){
+              this.mapArr.push([
+                m.help_discharge_info.longitude,m.help_discharge_info.latitude,m.help_discharge_info.address,m.id,m.old_type
+              ])
+            }
+            if(m.circulation_info){
+              this.mapArr.push([
+                m.circulation_info.longitude,m.circulation_info.latitude,m.circulation_info.address,m.id,m.old_type
+              ])
+            }
+            if(m.mire_info){
+              this.mapArr.push([
+                m.mire_info.longitude,m.mire_info.latitude,m.mire_info.address,m.id,m.old_type
+              ])
+            }
+
           }
           this.$refs.maps.showSearch = false
           this.$refs.maps.pointArr = this.mapArr