修改了委托地区查询

api/soil/soil-statistics.js

@@ -20,5 +20,13 @@ export default {
   pageCustomer: data =>
     http
       .post('soil/v1/statistics/page_customer_entrust_statistics', data)
+      .then(res => res),
+  listCoordinateStatistics: data =>
+    http
+      .post('soil/v1/statistics/list_coordinate_statistics', data)
+      .then(res => res),
+  pageCustomerEntrustStatistics: data =>
+    http
+      .post('soil/v1/statistics/page_customer_entrust_statistics', data)
       .then(res => res)
 }

pages/soil-statistics/client_location/ClientLocationIndex.vue

@@ -22,31 +22,7 @@
               <ClientLocationSearch ref="clientMap"></ClientLocationSearch>
             </Col>
             <Col span="10">
-              <element-table
-                id="table-year"
-                ref="pageTable"
-                :get-page="getPage"
-                hide-checkbox
-              >
-                <el-table-column fixed type="index" label="序号" width="100">
-                </el-table-column>
-                <el-table-column
-                  v-for="item in pageColumns"
-                  :key="item.key"
-                  :prop="item.key"
-                  :label="item.title"
-                  :width="item.width"
-                  :min-width="200"
-                  :fixed="item.fixed?item.fixed:undefined"
-                >
-                  <template slot-scope="scope">
-                    <div v-if="item.detail">
-                      <a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
-                    </div>
-                    <span v-else>{{ scope.row[item.key] }}</span>
-                  </template>
-                </el-table-column>
-              </element-table>
+              <LocationWatch></LocationWatch>
             </Col>
           </Row>
           </Col>
@@ -58,8 +34,9 @@
 
 <script>
 import ClientLocationSearch from './ClientLocationSearch'
+import LocationWatch from './LocationWatch'
 export default {
-  components: { ClientLocationSearch },
+  components: { ClientLocationSearch, LocationWatch },
   data() {
     return {
       formObj: {},

pages/soil-statistics/client_location/ClientLocationSearch.vue

 <template>
     <div style="position:relative;">
       <div style="margin-top: 6px ;position:relative; ">
-        <Form id="edit-form11" label-width="50" inline  >
+        <Form id="edit-form11" :label-width="50" inline  >
           <label class="label-sign"></label>
 <!--          <Form-item label="人员:" prop="username" >-->
 <!--            <Select v-model="formObj.username" @on-change="_chargerChange" :label-in-value="true" style="width: 100px" name="username"-->
@@ -21,14 +21,19 @@
 <!--          </Form-item>-->
         </Form>
       </div>
-      <div id="map"></div>
+      <div id="map" :style="contentStyleObj"></div>
     </div>
 </template>
 <script>
+import { soilStatistics } from '../../../api'
+
 export default {
   name: 'PeopleLocationSearchVue',
   data() {
     return {
+      contentStyleObj: {
+        height: ''
+      },
       regdateBegin: '',
       regdateEnd: '',
       value: '',
@@ -41,12 +46,18 @@ export default {
       locationList: []
     }
   },
+  created() {
+    this.getHeight()
+  },
   mounted() {
-    // this._getLocationList()
+    this._getLocationList()
     // this._getUserList()
-    this.getMapInfo()
+    // this.getMapInfo()
   },
   methods: {
+    getHeight() {
+      this.contentStyleObj.height = window.innerHeight - 100 + 'px'
+    },
     _getUserList() {
       // 用户列表
       this.$store.dispatch('LmsStaffInfo/list', { status: 1 }).then(() => {
@@ -63,15 +74,20 @@ export default {
         })
     },
 
-    _getLocationList() {
-      this.$store
-        .dispatch('LmsStaffInfo/getLocationList', this.formObj)
-        .then(() => {
-          this.locationList = this.$store.state.LmsStaffInfo.listLocation
-
-          this.getMapInfo(this.locationList)
-          // this.getMapInfoPoint(this.locationList);
-        })
+    _getLocationList: async function() {
+      const result = await soilStatistics.listCoordinateStatistics()
+      if (result) {
+        console.log(result)
+        this.getMapInfo(result)
+      }
+      // this.$store
+      //   .dispatch('LmsStaffInfo/getLocationList', this.formObj)
+      //   .then(() => {
+      //     this.locationList = this.$store.state.LmsStaffInfo.listLocation
+      //
+      //     this.getMapInfo(this.locationList)
+      //     // this.getMapInfoPoint(this.locationList);
+      //   })
     },
 
     getMapInfo(data) {
@@ -102,42 +118,44 @@ export default {
         }
       )
       console.log(myIcon)
-      // for (let i = 0; i < data.length; i++) {
+      for (let i = 0; i < data.length; i++) {
         // const location = data[i]
         // const objs = location.usersList
-      //   const userName = location.username
-      //
-      //   console.log('--objs-', objs)
-      //
-      //   const pois = []
+        // const clientName = location.client
+        const pois = []
+        // eslint-disable-next-line no-undef
+        pois[i] = new BMap.Point(data[i].longitude, data[i].latitude)
+        console.log('--pois-', pois)
         // for (let j = 0; j < objs.length; j++) {
         //   const obj = objs[j]
-      //     // eslint-disable-next-line no-undef
+        // eslint-disable-next-line no-undef
         // pois[j] = new BMap.Point(obj.longitude, obj.latitude)
-      //     // eslint-disable-next-line no-undef
-      //     const marker = new BMap.Marker(
-      //       // eslint-disable-next-line no-undef
-      //       new BMap.Point(obj.longitude, obj.latitude),
-      //       { icon: myIcon }
-      //     ) // 创建标注
-      //     const content =
-      //       '人员：' +
-      //       userName +
-      //       ' </br> ' +
-      //       '时间：' +
-      //       this.$dateformat(obj.sendDate, 'yyyy-mm-dd HH:MM:ss')
-      //     map.addOverlay(marker) // 将标注添加到地图中
-      //     addClickHandler(content, marker)
+        // eslint-disable-next-line no-undef
+        const marker = new BMap.Marker(
+          // eslint-disable-next-line no-undef
+          new BMap.Point(data[i].longitude, data[i].latitude),
+          { icon: myIcon }
+        ) // 创建标注
+        const content =
+          '委托单位：' +
+          data[i].client +
+          '<br>' +
+          '钻孔名称：' +
+          data[i].boreholeName +
+          '<br>' +
+          '钻孔位置：' +
+          data[i].boreholeLocation
+        map.addOverlay(marker) // 将标注添加到地图中
+        addClickHandler(content, marker)
         // }
-      //   console.log('--pois-', pois)
-      //   // eslint-disable-next-line no-undef
+        // eslint-disable-next-line no-undef
         // const polyline = new BMap.Polyline(pois, {
         //   strokeColor: 'blue',
         //   strokeWeight: 2,
         //   strokeOpacity: 1
         // }) // 创建折线
         // map.addOverlay(polyline) // 增加折线
-      // }
+      }
       // eslint-disable-next-line no-unused-vars
       function addClickHandler(content, marker) {
         marker.addEventListener('click', function(e) {
@@ -180,9 +198,14 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
 #map {
-  height: 400px;
   margin-top: -9px;
 }
+.BMap_cpyCtrl {
+  display: none !important;
+}
+.anchorBL {
+  display: none !important;
+}
 </style>

pages/soil-statistics/client_location/LocationWatch.vue

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main intra-line">
+        <Row>
+          <!--            查询-->
+          <!-- 表格 -->
+          <Col span="24">
+            <element-table-height
+              ref="pageTable"
+              :table-height="tableHeight"
+              :get-page="getPage"
+              @on-result-change="_tableResultChange"
+              hide-checkbox
+            >
+              <el-table-column
+                :prop="item.key"
+                :label="item.title"
+                :width="item.width"
+                :min-width="200"
+                :fixed="item.fixed?item.fixed:undefined"
+                v-for="item in pageColumns"
+                :key="item.key"
+                show-overflow-tooltip sortable>
+                <template slot-scope="scope">
+                     <span v-if="item.key === 'status'">
+<!--                      {{ scope.row[item.value] === PASS?'通过':'' }}-->
+                      {{ scope.row.status.display }}
+                     </span>
+                  <span v-else-if="item.key==='ctime'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
+                  <div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}</div>
+                  <span v-else>{{ scope.row[item.key] }}</span>
+                </template>
+              </el-table-column>
+              <!--                <el-table-column-->
+              <!--                  label="操作"-->
+              <!--                  align="center"-->
+              <!--                  :width="$optColWidth(iconMsg)"-->
+              <!--                  fixed="right" v-if="$optColWidth(iconMsg)>0?true:false">-->
+              <!--                  <template slot-scope="scope">-->
+              <!--                    <IconList :msg="type == 1?iconMsg1:iconMsg" @on-result-change="_iconClick" :rowData="scope.row"-->
+              <!--                              :rowIndex="scope.$index"></IconList>-->
+              <!--                  </template>-->
+              <!--                </el-table-column>-->
+            </element-table-height>
+          </Col>
+
+        </Row>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+// eslint-disable-next-line no-unused-vars
+import global from '../../../api/config'
+import { soilStatistics } from '../../../api'
+
+export default {
+  name: 'FormFiles',
+  components: {},
+  data() {
+    return {
+      getPage: {
+        records: []
+        // records: [
+        //     {formName: '79874'}
+        // ]
+      },
+      detectionDate: '',
+      formObj: {
+        username: '',
+        sendDate: '',
+        sendDateBegin: '',
+        sendDateEnd: ''
+      },
+      startTime: '',
+      endTime: '',
+      pageColumns: [
+        { title: '委托单位', key: 'client' },
+        { title: '委托数量', key: 'quantity' }
+      ],
+      selectIds: [],
+      selectData: [],
+      iconMsg: [
+        // { type: 'images', id: '', name: '预览' },
+        // { type: 'ios-download', id: '', name: '下载' },
+        // { type: 'ios-clock', id: '', name: '操作日志' },
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('noSearch') + 60
+    }
+  },
+  mounted() {
+    this._page()
+  },
+  methods: {
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _search() {
+      this._page()
+    },
+    _page: async function() {
+      const result = await soilStatistics.pageCustomerEntrustStatistics(
+        this.$serializeFormSearch(this.formObj)
+      )
+      if (result) {
+        this.getPage.records = result
+      }
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this._page()
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData)
+          break
+        default:
+          this._page()
+      }
+    },
+    _iconClick(res, data) {
+      switch (res) {
+        case '预览':
+          this._viewReport(data)
+          break
+      }
+    }
+    // 日期查询
+    // _dateChange(date) {
+    //   // eslint-disable-next-line no-sequences
+    //   ;(this.formObj.sendDateBegin = date[0]),
+    //     (this.formObj.sendDateEnd = date[1])
+    // }
+  }
+}
+</script>
+
+<style scoped>
+</style>

plugins/global.js

@@ -15,11 +15,13 @@ import FileManage from '../components/file/file-manage/FileManage'
 import VXESettingCol from '../components/base/VXESettingCol'
 import ElTableNoPage from '../components/table/ElTableNoPage'
 import PhotoManage from '../components/file/photo-manage/PhotoManage'
+import elementTableHeight from '../components/table/elementTableHeight'
 
 Vue.use(VXETable)
 Vue.component('btn-list', btnList)
 Vue.component('icon-list', iconList)
 Vue.component('element-table', elementTable)
+Vue.component('element-table-height', elementTableHeight)
 Vue.component('modal-footer', modalFooter)
 Vue.component('PTVXETable', PTVXETable)
 Vue.component('PTVXETableData', PTVXETableData)