瀏覽代碼

报表接口对接

1004749546@qq.com 4 年之前
父節點
當前提交
e052b3824c
共有 4 個文件被更改,包括 211 次插入148 次删除
  1. 64 0
      src/api/reportForm.js
  2. 56 70
      src/views/reportForm/rubbishDeliverySearchTime.vue
  3. 89 76
      src/views/reportForm/rubbishDeliveryTotal.vue
  4. 2 2
      vue.config.js

+ 64 - 0
src/api/reportForm.js

@@ -0,0 +1,64 @@
+import { axios } from '@/utils/request'
+
+// 垃圾投递分时查询表
+// 列表查询
+export const getPutInTimeList = (params) => {
+  const url = `putInTimeShareing/query/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 导出
+export const exportTnTimeForm = (params) => {
+  return axios.request({
+    url: 'putInTimeShareing/exportPutInTimeShareing',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 合计
+export const getDetailTotal = (params) => {
+  const url = `putInTimeShareing/sumAllOfDetail`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+/**
+ * 垃圾投递汇总表
+ */
+// 列表查询
+export const getSumList = (params) => {
+  const url = `putInTimeShareing/querySum/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 导出
+export const exportSumForm = (params) => {
+  return axios.request({
+    url: 'putInTimeShareing/exportPutInTimeShareingSum',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 合计
+export const getSumTotal = (params) => {
+  const url = `putInTimeShareing/sumAllOfSum`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 56 - 70
src/views/reportForm/rubbishDeliverySearchTime.vue

@@ -4,10 +4,11 @@
       <a-form layout="inline" @keyup.enter.native="refresh">
         <a-row :gutter="20">
           <a-col :span="8">
-            <a-form-item label="投递时间:" :label-col="{ span: 7 }" :wrapper-col="{ span: 17}">
+            <a-form-item label="投递时间:" :label-col="{ span: 5 }" :wrapper-col="{ span: 19}">
               <a-range-picker
                 id="network-time"
                 v-model="time"
+                style="width: 100%;"
                 :format="dateFormat"
                 :showTime="{ format: 'HH'}"
                 :placeholder="['开始时间','结束时间']"
@@ -46,7 +47,7 @@
     </div>
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">总计<span> {{ orderTotal }} </span>条,可回收垃圾总计<span> {{ amountTotal }} </span>千克,有害垃圾总计<span> {{ amountTotal }} </span>千克</div>
+      <div class="ftext" slot="message">总计<span> {{ totalNum }} </span>条,可回收垃圾总计<span> {{ recyclTotal }} </span>千克,有害垃圾总计<span> {{ harmTotal }} </span>千克</div>
     </a-alert>
     <s-table
       ref="table"
@@ -55,39 +56,6 @@
       :columns="columns"
       :data="loadData"
       bordered>
-      <!-- 订单状态 -->
-      <template slot="one" slot-scope="text, record">
-        <span v-if="record.rubbishType=='CLOTHES'">{{ record.rubbishWeight }}</span>
-        <span v-else>0</span>
-      </template>
-      <template slot="two" slot-scope="text, record">
-        <span v-if="record.rubbishType=='PAPER'">{{ record.rubbishWeight }}</span>
-        <span v-else>0</span>
-        </span></template>
-      <template slot="three" slot-scope="text, record">
-        <span v-if="record.rubbishType=='PLASTIC'">{{ record.rubbishWeight }}</span>
-        <span v-else>0</span>
-      </template>
-      <template slot="four" slot-scope="text, record">
-        <span v-if="record.rubbishType=='METAL'">{{ record.rubbishWeight }}</span>
-        <span v-else>0</span>
-      </template>
-      <template slot="five" slot-scope="text, record">
-        <span v-if="record.rubbishType=='HARM'">{{ record.rubbishWeight }}</span>
-        <span v-else>0</span>
-      </template>
-      <template slot="six" slot-scope="text, record">
-        <span v-if="record.rubbishType=='MET_PLA'">{{ record.rubbishWeight }}</span>
-        <span v-else>0</span>
-      </template>
-      <template slot="seven" slot-scope="text, record">
-        <span v-if="record.rubbishType=='GLASS'">{{ record.rubbishWeight }}</span>
-        <span v-else>0</span>
-      </template>
-      <template slot="eight" slot-scope="text, record">
-        <span v-if="record.rubbishType=='RECYCLING'">{{ record.rubbishWeight }}</span>
-        <span v-else>0</span>
-      </template>
     </s-table>
   </a-card>
 
@@ -95,8 +63,12 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { getDeliveryLogList, getDeliveryLogTotal, stationList, exportDeliveryLog } from '@/api/releaseRecord.js'
+import {
+  stationList
+} from '@/api/releaseRecord.js'
+import { getPutInTimeList, exportTnTimeForm, getDetailTotal } from '@/api/reportForm.js'
 import moment from 'moment'
+import getDate from '@/libs/getDate.js'
 export default {
   components: { STable, VSelect },
   data () {
@@ -107,8 +79,11 @@ export default {
         labelCol: { span: 4 },
         wrapperCol: { span: 16 }
       },
-      // 将默认当天时间日期回显在时间选择框中
-      time: [],
+      // 将默认近七天时间日期回显在时间选择框中
+      time: [
+        moment(getDate.getRecentday().starttime, 'YYYY-MM-DD HH'),
+        moment(getDate.getRecentday().endtime, 'YYYY-MM-DD HH')
+      ],
       dateFormat: 'YYYY-MM-DD HH',
       // 查询参数
       queryParam: {
@@ -117,58 +92,65 @@ export default {
         stationNo: undefined // 网点名称
       },
       optionData: [],
-      orderTotal: 0,	// 总单数
-      amountTotal: 0,	// 总金额
+      totalNum: 0,	// 总条数
+      recyclTotal: 0,	// 可回收总计
+	  harmTotal: 0, // 有害垃圾总计
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
-        { title: '投放时间', dataIndex: 'deliveryTime', width: 100, align: 'center' },
+        { title: '投递时间', dataIndex: 'putInDate', width: 100, align: 'center' },
         { title: '可回收垃圾投递量(kg)',
           children: [
-            { title: '废旧衣物', width: 100, align: 'center', scopedSlots: { customRender: 'one' } },
-            { title: '废旧纸张', width: 100, align: 'center', scopedSlots: { customRender: 'two' } },
-            { title: '废旧塑料', width: 100, align: 'center', scopedSlots: { customRender: 'three' } },
-            { title: '废旧金属', width: 100, align: 'center', scopedSlots: { customRender: 'four' } },
-            // { title: '有害垃圾', width: 100, align: 'center', scopedSlots: { customRender: 'five' } },
-            { title: '废旧金属/塑料', width: 100, align: 'center', scopedSlots: { customRender: 'six' } },
-            { title: '废旧玻璃', width: 100, align: 'center', scopedSlots: { customRender: 'seven' } },
-            { title: '可回收物', width: 100, align: 'center', scopedSlots: { customRender: 'eight' } }
+            { title: '废旧衣物', width: 100, align: 'center', dataIndex: 'clothesWeight', customRender: (text) => { return text || 0 } },
+            { title: '废旧纸张', width: 100, align: 'center', dataIndex: 'paperWeight', customRender: (text) => { return text || 0 } },
+            { title: '废旧塑料', width: 100, align: 'center', dataIndex: 'plasticWeight', customRender: (text) => { return text || 0 } },
+            { title: '废旧金属', width: 100, align: 'center', dataIndex: 'metalWeight', customRender: (text) => { return text || 0 } },
+            { title: '废旧金属/塑料', width: 100, align: 'center', dataIndex: 'plasticOrMetalWeight', customRender: (text) => { return text || 0 } },
+            { title: '废旧玻璃', width: 100, align: 'center', dataIndex: 'glassWeight', customRender: (text) => { return text || 0 } },
+            { title: '可回收物', width: 100, align: 'center', dataIndex: 'recyclingWeight', customRender: (text) => { return text || 0 } }
           ]
         },
-        { title: '有害垃圾(kg)', dataIndex: '', width: 100, align: 'center' }
+        { title: '可回收垃圾小计(kg)', dataIndex: 'recyclTotalWeight', width: 100, align: 'center' },
+        { title: '有害垃圾(kg)', dataIndex: 'harmWeight', width: 100, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)
         if (this.time && this.time.length) {
-          searchData.beginDate = moment(this.time[0]).format('YYYY-MM-DD HH')
-          searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD HH')
+          searchData.beginDate = moment(this.time[0])
+          searchData.endDate = moment(this.time[1])
         } else {
           searchData.beginDate = ''
           searchData.endDate = ''
         }
-        return getDeliveryLogList(searchData).then(res => {
+        return getPutInTimeList(searchData).then(res => {
           if (res.status == 200) {
             const no = (res.data.pageNo - 1) * res.data.pageSize
             for (let i = 0; i < res.data.list.length; i++) {
               const _item = res.data.list[i]
               _item.no = no + i + 1
             }
+            this.totalNum = res.data.count
             this.getListTotal()
             return res.data
-          }
+          } else {
+			  this.totalNum = 0
+		  }
         })
       }
     }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.handleReset()
+      vm.time = [
+		  moment(getDate.getRecentday().starttime, 'YYYY-MM-DD HH'),
+		  moment(getDate.getRecentday().endtime, 'YYYY-MM-DD HH')
+	  ]
+      vm.queryParam.stationNo = undefined
       vm.getStationList()
     })
   },
   methods: {
-    moment,
     // 不可选日期
     disabledDate (date, dateStrings) {
       return date && date.valueOf() > Date.now()
@@ -189,22 +171,21 @@ export default {
     handleExport () {
       const params = this.queryParam
       if (this.time && this.time.length) {
-        params.beginDate = moment(this.time[0]).format('YYYY-MM-DD HH')
-        params.endDate = moment(this.time[1]).format('YYYY-MM-DD HH')
+        params.beginDate = moment(this.time[0])
+        params.endDate = moment(this.time[1])
       } else {
         params.beginDate = ''
         params.endDate = ''
       }
       if (!params.beginDate && !params.endDate) {
         this.$message.error('请先选择需要导出的投放时间区间再进行导出!')
-        return
       }
       // 判断两个时间段是否相差m个月  第二个参数指相差单位,第三个参数指是否返回浮点形式(小数)
       if (moment(params.endDate).diff(moment(params.beginDate), 'months', true) > 3) {
         this.$message.error('单次最多只能导出3个月的数据,请缩小查询区间后再进行导出!')
       }
       this.loading = true
-      exportDeliveryLog(params).then(res => {
+      exportTnTimeForm(params).then(res => {
         this.loading = false
         this.download(res)
       })
@@ -215,8 +196,10 @@ export default {
       const link = document.createElement('a')
       link.style.display = 'none'
       link.href = url
-      const a = moment().format('YYYY-MM-DD-HH')
-      const fname = a + '分时投递统计'
+      const a = moment(this.queryParam.beginDate).format('LL') + '-' + moment(this.queryParam.endDate).format('LL')
+	  console.log(a)
+	  const name = this.queryParam.stationNo ? this.optionData.find(item => item.stationNo == this.queryParam.stationNo).name : ''
+      const fname = a + '分时投递统计表' + (name ? '(' + name + ')' : '')
       link.setAttribute('download', fname + '.xlsx')
       document.body.appendChild(link)
       link.click()
@@ -241,27 +224,30 @@ export default {
         stationNo: this.queryParam.stationNo // 网点名称
       }
       if (this.time && this.time.length) {
-        params.beginDate = moment(this.time[0]).format('YYYY-MM-DD')
-        params.endDate = moment(this.time[1]).format('YYYY-MM-DD')
+        params.beginDate = moment(this.time[0])
+        params.endDate = moment(this.time[1])
       } else {
         params.beginDate = ''
         params.endDate = ''
       }
-      getDeliveryLogTotal(params).then(res => {
+      getDetailTotal(params).then(res => {
         if (res.status == 200) {
           if (res.data) {
-            this.orderTotal = res.data.totalNum || 0
-            this.amountTotal = res.data.goldNum || 0
+            this.recyclTotal = res.data.recyclAll || 0
+            this.harmTotal = res.data.harmAll || 0
           } else {
-            this.orderTotal = 0
-            this.amountTotal = 0
+            this.recyclTotal = 0
+            this.harmTotal = 0
           }
         }
       })
     },
     // 重置
     handleReset () {
-      this.time = [],
+      this.time = [
+		  moment(getDate.getRecentday().starttime, 'YYYY-MM-DD HH'),
+		  moment(getDate.getRecentday().endtime, 'YYYY-MM-DD HH')
+	  ]
       this.queryParam.stationNo = undefined
       this.$refs.table.refresh(true)
     }

+ 89 - 76
src/views/reportForm/rubbishDeliveryTotal.vue

@@ -1,44 +1,45 @@
 <template>
   <a-card :bordered="false" class="shopOrder-table-page-search-wrapper">
     <div class="network-searchForm">
-      <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
+      <a-form-model ref="queryForm" :model="queryParam" layout="inline" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="24">
           <a-col :span="6">
-            <a-form-item label="投递时间" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+            <a-form-model-item label="投递时间" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <a-range-picker
                 id="network-time"
                 v-model="time"
+                style="width: 100%;"
                 :format="dateFormat"
                 :placeholder="['开始时间','结束时间']"
                 :disabledDate="disabledDate"
                 @change="onChange" />
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
-          <a-col :span="4">
-            <a-form-item prop="provinceCode" label="所属区域:">
+          <a-col :span="6">
+            <a-form-model-item prop="provinceCode" label="所属区域:" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
               <a-select v-model="queryParam.provinceCode" @change="getCityList" placeholder="请选择省">
                 <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
               </a-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
-          <a-col :span="4">
-            <a-form-item prop="cityCode">
+          <a-col :span="5">
+            <a-form-model-item prop="cityCode" label=" " :colon="false" :label-col="{ span:1 }" :wrapper-col="{ span:22}">
               <a-select v-model="queryParam.cityCode" @change="getAreaList" placeholder="请选择市">
                 <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
               </a-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
-          <a-col :span="4">
-            <a-form-item prop="districtCode">
+          <a-col :span="5">
+            <a-form-model-item prop="districtCode" label=" " :colon="false" :label-col="{ span:0 }" :wrapper-col="{ span:20}">
               <a-select v-model="queryParam.districtCode" placeholder="请选择区/县">
                 <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
               </a-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="6">
-            <a-form-item label="网点名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+            <a-form-model-item label="网点名称" prop="stationNo" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <a-select
                 id="releaseRecordList-stationNo"
                 placeholder="请选择网点名称"
@@ -49,20 +50,19 @@
                 :filter-option="filterOption">
                 <a-select-option v-for="item in optionData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
               </a-select>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="10">
             <a-button class="handle-btn serach-btn" id="network-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
             <a-button class="handle-btn serach-btn" type="" id="network-btn-reset" @click="handleReset">重置</a-button>
             <a-button class="export-btn" id="releaseRecordList-export" :loading="loading" @click="handleExport">导出</a-button>
           </a-col>
         </a-row>
-      </a-form>
+      </a-form-model>
     </div>
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">总计<span> {{ orderTotal }} </span>条,可回收垃圾总计<span> {{ amountTotal }} </span>千克,有害垃圾总计<span>
-        {{ amountTotal }} </span>千克</div>
+      <div class="ftext" slot="message">总计<span> {{ totalNum }} </span>条,可回收垃圾总计<span> {{ recyclTotal }} </span>千克,有害垃圾总计<span> {{ harmTotal }} </span>千克</div>
     </a-alert>
     <s-table
       ref="table"
@@ -125,7 +125,13 @@ import {
   getCityByPro,
   getDistrictByCity
 } from '@/api/station'
+import {
+  getSumList,
+  exportSumForm,
+  getSumTotal
+} from '@/api/reportForm.js'
 import moment from 'moment'
+import getDate from '@/libs/getDate.js'
 export default {
   components: {
     STable,
@@ -143,8 +149,11 @@ export default {
           span: 17
         }
       },
-      // 将默认当天时间日期回显在时间选择框中
-      time: [],
+      // 将默认近七天时间日期回显在时间选择框中
+      time: [
+        moment(getDate.getRecentday().starttime, 'YYYY-MM-DD HH'),
+        moment(getDate.getRecentday().endtime, 'YYYY-MM-DD HH')
+      ],
       dateFormat: 'YYYY-MM-DD',
       // 查询参数
       queryParam: {
@@ -159,8 +168,9 @@ export default {
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
       optionData: [],
-      orderTotal: 0, // 总单数
-      amountTotal: 0, // 总金额
+      totalNum: 0,	// 总条数
+      recyclTotal: 0,	// 可回收总计
+      harmTotal: 0, // 有害垃圾总计
       // 表头
       columns: [{
         title: '序号',
@@ -169,8 +179,8 @@ export default {
         align: 'center'
       },
       {
-        title: '投放时间',
-        dataIndex: 'deliveryTime',
+        title: '网点名称',
+        dataIndex: 'stationName',
         width: 100,
         align: 'center'
       },
@@ -180,64 +190,76 @@ export default {
           title: '废旧衣物',
           width: 100,
           align: 'center',
-          scopedSlots: {
-            customRender: 'one'
+          dataIndex: 'clothesWeight',
+          customRender: (text) => {
+            return text || 0
           }
         },
         {
           title: '废旧纸张',
           width: 100,
           align: 'center',
-          scopedSlots: {
-            customRender: 'two'
+          dataIndex: 'paperWeight',
+          customRender: (text) => {
+            return text || 0
           }
         },
         {
           title: '废旧塑料',
           width: 100,
           align: 'center',
-          scopedSlots: {
-            customRender: 'three'
+          dataIndex: 'plasticWeight',
+          customRender: (text) => {
+            return text || 0
           }
         },
         {
           title: '废旧金属',
           width: 100,
           align: 'center',
-          scopedSlots: {
-            customRender: 'four'
+          dataIndex: 'metalWeight',
+          customRender: (text) => {
+            return text || 0
           }
         },
-        // { title: '有害垃圾', width: 100, align: 'center', scopedSlots: { customRender: 'five' } },
         {
           title: '废旧金属/塑料',
           width: 100,
           align: 'center',
-          scopedSlots: {
-            customRender: 'six'
+          dataIndex: 'plasticOrMetalWeight',
+          customRender: (text) => {
+            return text || 0
           }
         },
         {
           title: '废旧玻璃',
           width: 100,
           align: 'center',
-          scopedSlots: {
-            customRender: 'seven'
+          dataIndex: 'glassWeight',
+          customRender: (text) => {
+            return text || 0
           }
         },
         {
           title: '可回收物',
           width: 100,
           align: 'center',
-          scopedSlots: {
-            customRender: 'eight'
+          dataIndex: 'recyclingWeight',
+          customRender: (text) => {
+            return text || 0
           }
         }
         ]
       },
+      {
+        title: '可回收垃圾小计(kg)',
+        dataIndex: 'recyclTotalWeight',
+        width: 100,
+        align: 'center'
+      },
       {
         title: '有害垃圾(kg)',
-        dataIndex: '',
+        dataIndex: 'harmWeight',
         width: 100,
         align: 'center'
       }
@@ -252,29 +274,35 @@ export default {
           searchData.beginDate = ''
           searchData.endDate = ''
         }
-        return getDeliveryLogList(searchData).then(res => {
+        return getSumList(searchData).then(res => {
           if (res.status == 200) {
             const no = (res.data.pageNo - 1) * res.data.pageSize
             for (let i = 0; i < res.data.list.length; i++) {
               const _item = res.data.list[i]
               _item.no = no + i + 1
             }
+            this.totalNum = res.data.count
             this.getListTotal()
             return res.data
-          }
+          } else {
+			  this.totalNum = 0
+		  }
         })
       }
     }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.handleReset()
+      vm.time = [
+		  moment(getDate.getRecentday().starttime, 'YYYY-MM-DD HH'),
+		  moment(getDate.getRecentday().endtime, 'YYYY-MM-DD HH')
+      ]
+      vm.$refs.queryForm.resetFields()
       vm.getStationList()
       vm.getProvinceList()
     })
   },
   methods: {
-    moment,
     // 不可选日期
     disabledDate (date, dateStrings) {
       return date && date.valueOf() > Date.now()
@@ -356,7 +384,7 @@ export default {
         this.$message.error('单次最多只能导出3个月的数据,请缩小查询区间后再进行导出!')
       }
       this.loading = true
-      exportDeliveryLog(params).then(res => {
+      exportSumForm(params).then(res => {
         this.loading = false
         this.download(res)
       })
@@ -369,8 +397,11 @@ export default {
       const link = document.createElement('a')
       link.style.display = 'none'
       link.href = url
-      const a = moment().format('YYYY-MM-DD')
-      const fname = a + '垃圾分类投递量统计表' + '(陕西省西安市)'
+      const a = moment(this.queryParam.beginDate).format('LL') + '-' + moment(this.queryParam.endDate).format('LL')
+      const address = this.queryParam.provinceCode ? this.addrProvinceList.find(item => item.id == this.queryParam.provinceCode).name +
+	  (this.queryParam.cityCode ? this.addrCityList.find(item => item.id == this.queryParam.cityCode).name : '') +
+	  (this.queryParam.districtCode ? this.addrDistrictList.find(item => item.id == this.queryParam.districtCode).name : '') : ''
+      const fname = a + '垃圾分类投递量统计表' + (address ? '(' + address + ')' : '')
       link.setAttribute('download', fname + '.xlsx')
       document.body.appendChild(link)
       link.click()
@@ -389,11 +420,7 @@ export default {
     },
     // 合计
     getListTotal () {
-      const params = {
-        beginDate: this.queryParam.beginDate,
-        endDate: this.queryParam.endDate,
-        stationNo: this.queryParam.stationNo // 网点名称
-      }
+      const params = this.queryParam
       if (this.time && this.time.length) {
         params.beginDate = moment(this.time[0]).format('YYYY-MM-DD')
         params.endDate = moment(this.time[1]).format('YYYY-MM-DD')
@@ -401,22 +428,25 @@ export default {
         params.beginDate = ''
         params.endDate = ''
       }
-      getDeliveryLogTotal(params).then(res => {
+      getSumTotal(params).then(res => {
         if (res.status == 200) {
           if (res.data) {
-            this.orderTotal = res.data.totalNum || 0
-            this.amountTotal = res.data.goldNum || 0
+            this.recyclTotal = res.data.recyclAll || 0
+            this.harmTotal = res.data.harmAll || 0
           } else {
-            this.orderTotal = 0
-            this.amountTotal = 0
+            this.recyclTotal = 0
+            this.harmTotal = 0
           }
         }
       })
     },
     // 重置
     handleReset () {
-      this.time = []
-      this.queryParam.stationNo = undefined
+      this.time = [
+		  moment(getDate.getRecentday().starttime, 'YYYY-MM-DD HH'),
+		  moment(getDate.getRecentday().endtime, 'YYYY-MM-DD HH')
+	  ]
+      this.$refs.queryForm.resetFields()
       this.$refs.table.refresh(true)
     }
   }
@@ -424,23 +454,6 @@ export default {
 </script>
 <style lang="less" scoped>
 	.shopOrder-table-page-search-wrapper {
-
-		// .shopOrder-searchForm{
-		//   .ant-form-inline .ant-form-item{
-		//     width: 100%;
-		//   }
-		//   // 搜索框的下间距
-		//   .ant-form-item {
-		// width: 100%;
-		//   	margin-bottom: 10px;
-		//   }
-		//   .handle-btn{
-		//     margin-bottom: 15px;
-		//   }
-		//   .serach-btn{
-		//     margin-right: 10px;
-		//   }
-		// }
 		.network-searchForm {
 			.ant-form-inline .ant-form-item {
 				width: 100%;

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.105:8301/gc-admin/',
-        target: 'https://lese.test.sxzxyj.net/gc-admin/',
+        target: 'http://192.168.16.153:8301/gc-admin/',
+        // target: 'https://lese.test.sxzxyj.net/gc-admin/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {