修改了地区查询

api/soil/soil-statistics.js

@@ -28,5 +28,9 @@ export default {
   pageCustomerEntrustStatistics: data =>
     http
       .post('soil/v1/statistics/page_customer_entrust_statistics', data)
+      .then(res => res),
+  pageCoordinateStatistics: data =>
+    http
+      .post('soil/v1/statistics/page_coordinate_statistics', data)
       .then(res => res)
 }

pages/meter-aptitude/standard-manage/StandardManage.vue

@@ -96,7 +96,7 @@ import global from '../../../api/config'
 import DownloadTemplateImport from '../../../components/import/DownloadTemplateImport' // 导入
 import StandardsManageEdit from './StandardsManageEdit' // 添加、编辑
 import SubstitutionalRelation from './SubstitutionalRelation' // 查看替代关系
-import UploadModal from './UploadModal' // 上传文件
+import UploadModal from './UploadFileModal' // 上传文件
 
 export default {
   components: {
@@ -151,8 +151,7 @@ export default {
         {
           type: 'md-add',
           id: '',
-          name: '上传',
-          componentName: 'UploadModal'
+          name: '上传'
         },
         { type: 'ios-download', id: '', name: '下载' },
         { type: 'ios-book', id: '', name: '预览' },

pages/meter-aptitude/standard-manage/UploadFileModal.vue

+<!--下载模板导入-->
+<template>
+  <div>
+    <Modal v-model="showModal" :mask-closable="false" class="zIndex-1100">
+      <p slot="header">{{modalTitle}}</p>
+      <Alert v-if="showError" type="error" show-icon style="margin-top: 10px">{{errorMessage}}</Alert>
+      <Alert v-if="showSuccess" type="success" show-icon style="margin-top: 10px">{{successMessage}}</Alert>
+      <div v-show="isLoad">
+        <Spin >
+          <Icon type="load-c" size=18 class="file-spin-icon-load"></Icon>
+          <div>正在导入,请稍后...</div>
+        </Spin>
+      </div>
+      <div>
+        <label>
+          <Upload
+            :action="importUrl"
+            :on-success="_handelsuccess"
+            :before-upload="_beupload"
+            :on-progress="_handelprogress"
+            :on-format-error="_formatError"
+            :data="dataObj"
+            :with-credentials="true"
+            :show-upload-list="false"
+            :format="format"
+          >
+            <Button :disabled="isDisabled" type="primary">上传</Button>
+          </Upload>
+        </label>
+      </div>
+      <div slot="footer" class="btn-width">
+        <Button @click="_cancel" :loading="isLoad">取消</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+/**
+ * 导入并下载模板
+ */
+import global from '../../../api/config'
+export default {
+  components: {},
+  data() {
+    return {
+      modalTitle: '上传文件',
+      showModal: false,
+      isLoad: false,
+      isDisabled: false,
+      showError: false,
+      showSuccess: false,
+      dataObj: {
+        file: ''
+      },
+      errorMessage: '',
+      successMessage: '',
+      format: ['doc', 'docx', 'xlsx', 'xls'],
+      importUrl: ''
+    }
+  },
+  methods: {
+    _open(data) {
+      this.isLoad = false
+      this.showModal = true
+      this.isDisabled = false
+      this.showError = false
+      this.showSuccess = false
+      this.importUrl = global.baseURL + data.importUrl
+    },
+    _cancel() {
+      this.showModal = false
+    },
+    _beupload(file) {
+      this.dataObj.file = file.name
+    },
+    _handelprogress(event, file, fileList) {
+      this.isLoad = true
+      this.isDisabled = true
+    },
+    _handelsuccess(response, file, fileList) {
+      // 上传成功
+      if (response.success) {
+        this.isLoad = false
+        this.$Message.success('导入成功！')
+        this.$emit('on-result-change')
+        this.showModal = false
+        this.isDisabled = false
+        this.showError = false
+        this.showSuccess = true
+        this.successMessage = response.msg
+      } else {
+        this.isLoad = false
+        this.showSuccess = false
+        this.isDisabled = false
+        this.errorMessage = response.msg
+        this.showError = true
+        this.$Message.error(response.msg)
+      }
+    },
+    _formatError(file) {
+      this.$Notice.error({
+        title: '文件格式不正确',
+        duration: 10,
+        desc:
+          '文件 ' +
+          file.name +
+          ' 格式不正确，请上传格式为 doc、docx、xlsx 格式的文件！'
+      })
+      this.isLoad = false
+    }
+  }
+}
+</script>

pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue

@@ -117,6 +117,11 @@ export default {
           id: '',
           name: '管理样品和报告'
         },
+        {
+          type: 'ios-book',
+          id: '',
+          name: '查看原始记录'
+        },
         // {
         //   type: 'ios-document-outline',
         //   id: '',

pages/soil-statistics/client_location/ClientLocationIndex.vue

@@ -11,6 +11,7 @@
                 <Form-item label="委托单位:">
                   <Input v-model="formObj.client"  name="client" placeholder="请输入委托单位" clearable/>
                 </Form-item>
+                <Button style="margin-left: 5px;" type="primary" @click="searchPage">搜索</Button>
               </Form>
             </div>
             <div class="clear"></div>
@@ -22,7 +23,7 @@
               <ClientLocationSearch ref="clientMap"></ClientLocationSearch>
             </Col>
             <Col span="10">
-              <LocationWatch></LocationWatch>
+              <LocationWatch ref="clientTable"></LocationWatch>
             </Col>
           </Row>
           </Col>
@@ -39,7 +40,9 @@ export default {
   components: { ClientLocationSearch, LocationWatch },
   data() {
     return {
-      formObj: {},
+      formObj: {
+        client: ''
+      },
       getPage: {},
       pageColumns: [
         { title: '委托商', key: 'client', width: 200 },
@@ -50,7 +53,12 @@ export default {
     }
   },
   mounted() {},
-  methods: {}
+  methods: {
+    searchPage() {
+      this.$refs.clientMap._getLocationList(this.formObj.client)
+      this.$refs.clientTable._page(this.formObj.client)
+    }
+  }
 }
 </script>
 <style>

pages/soil-statistics/client_location/ClientLocationSearch.vue

@@ -74,8 +74,10 @@ export default {
         })
     },
 
-    _getLocationList: async function() {
-      const result = await soilStatistics.listCoordinateStatistics()
+    _getLocationList: async function(client) {
+      const result = await soilStatistics.listCoordinateStatistics({
+        client: client
+      })
       if (result) {
         console.log(result)
         this.getMapInfo(result)

pages/soil-statistics/client_location/LocationWatch.vue

@@ -78,7 +78,10 @@ export default {
       endTime: '',
       pageColumns: [
         { title: '委托单位', key: 'client' },
-        { title: '委托数量', key: 'quantity' }
+        { title: '钻孔位置', key: 'boreholeLocation' },
+        { title: '钻孔名称', key: 'boreholeName' },
+        { title: '经度', key: 'longitude' },
+        { title: '纬度', key: 'latitude' }
       ],
       selectIds: [],
       selectData: [],
@@ -104,12 +107,17 @@ export default {
     _search() {
       this._page()
     },
-    _page: async function() {
-      const result = await soilStatistics.pageCustomerEntrustStatistics(
+    _page: async function(client) {
+      if (client) {
+        this.formObj.client = client
+      } else {
+        this.formObj.client = undefined
+      }
+      const result = await soilStatistics.pageCoordinateStatistics(
         this.$serializeFormSearch(this.formObj)
       )
       if (result) {
-        this.getPage.records = result
+        this.getPage = result
       }
     },
     _tableResultChange(msg, data) {