zhangdan 4 jaren geleden
bovenliggende
commit
e16996ebb2

+ 2 - 2
src/api/reportForm.js

@@ -65,7 +65,7 @@ export const getSumTotal = (params) => {
 
 // 非可回收垃圾汇总列表
 export const getRubbishList = (params) => {
-  const url = `stationRubbishRubbish/sum/query/${params.pageNo}/${params.pageSize}`
+  const url = `stationRubbish/sum/query/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -77,7 +77,7 @@ export const getRubbishList = (params) => {
 
 // 非可回收垃圾合计
 export const getRubbishTotal = (params) => {
-  const url = `stationRubbishRubbish/totalSumInfo`
+  const url = `stationRubbish/totalSumInfo`
   return axios({
     url: url,
     data: params,

+ 1 - 1
src/views/equipmentManage/collector/collector.vue

@@ -175,8 +175,8 @@ export default {
       this.queryParam.registerEndDate = undefined
       this.queryParam.queryWord = ''
       this.time = []
-      this.$refs.table.refresh(true)
       this.queryParam.stationNo = undefined
+      this.$refs.table.refresh(true)
     },
     //  新增、编辑网点
     handleEdit (row) {

+ 2 - 1
src/views/equipmentManage/equipment/equipment.vue

@@ -286,7 +286,8 @@ export default {
           light: '#ffffff'
         }
       }
-      const url = 'id=' + item.srcDeviceCode + '&type=dustbin'
+      const url = 'http://www.sxzxyj.net/web/static/qrcode/download-app.html?' + 'id=' + item.srcDeviceCode + '&type=dustbin'
+      console.log(url, '------二维码地址')
       _this.shName = (item.stationNo ? item.stationNo : '') + item.srcDeviceCode.substring(item.srcDeviceCode.length - 6)
       if (url) {
         QRCode.toDataURL(url, opts, function (err, url) {

+ 3 - 3
src/views/reportForm/rubbishDeliveryTotal.vue

@@ -162,7 +162,7 @@ export default {
         const searchData = Object.assign(parameter, this.queryParam)
         if (this.time && this.time.length) {
           searchData.beginDate = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
-          searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD 00:00:00')
+          searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD 23:59:59')
         } else {
           searchData.beginDate = ''
           searchData.endDate = ''
@@ -285,7 +285,7 @@ export default {
       const params = this.queryParam
       if (this.time && this.time.length) {
         params.beginDate = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
-        params.endDate = moment(this.time[1]).format('YYYY-MM-DD 00:00:00')
+        params.endDate = moment(this.time[1]).format('YYYY-MM-DD 23:59:59')
       } else {
         params.beginDate = ''
         params.endDate = ''
@@ -348,7 +348,7 @@ export default {
       const params = this.queryParam
       if (this.time && this.time.length) {
         params.beginDate = moment(this.time[0]).format('YYYY-MM-DD 00:00:00')
-        params.endDate = moment(this.time[1]).format('YYYY-MM-DD 00:00:00')
+        params.endDate = moment(this.time[1]).format('YYYY-MM-DD 23:59:59')
       } else {
         params.beginDate = ''
         params.endDate = ''