zhangdan 4 lat temu
rodzic
commit
f4fd184e1d

+ 2 - 2
src/api/collector.js

@@ -15,7 +15,7 @@ export const getCollectorList = params => {
 // 重置密码
 export const resetPSD = params => {
   return axios({
-    url: `gatherUser/resetPwd/resetPwd/${params.id}`,
+    url: `gatherUser/resetPwd/${params.id}`,
     data: {},
     method: 'get'
   })
@@ -50,7 +50,7 @@ export const saveCollector = params => {
 
 // 编辑查详情
 export const collectorDetails = (params) => {
-  const url = `sleler/user/findById/${params.id}`
+  const url = `gatherUser/getById/${params.id}`
   return axios({
     url: url,
     data: params,

+ 2 - 2
src/views/cleanManage/cleanDetail.vue

@@ -166,7 +166,7 @@ export default {
               const _item = res.data.list[i]
               _item.no = no + i + 1
               if (_item.cleanWeight != null || 0) {
-                _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(3)
+                _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(3)/1
               }
             }
             this.totalNum = res.data.count
@@ -246,7 +246,7 @@ export default {
       getCleanDetailsTotal(params).then(res => {
         if (res.status == 200) {
           if (res.data != 0 || null) {
-            this.cleanWeightTotal = (res.data.cleanWeight / 1000).toFixed(3)
+            this.cleanWeightTotal = (res.data.cleanWeight / 1000).toFixed(3)/1
           }
         } else {
           this.cleanWeightTotal = 0

+ 1 - 1
src/views/cleanManage/cleanDetailModal.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal title="清运详情" :footer="null" v-model="isShow" @cancel="cancel" centered>
     <a-spin :spinning="loading">
-      <div class="detail-item" v-for="item in itemData" :key="item.index"><span>{{ item.rubbishTypeDictValue }}:</span>{{ (item.cleanWeight/1000).toFixed(3) }} kg</div>
+      <div class="detail-item" v-for="item in itemData" :key="item.index"><span>{{ item.rubbishTypeDictValue }}:</span>{{ (item.cleanWeight/1000).toFixed(3)/1 }} kg</div>
       <a-empty v-if="itemData.length == 0" style="text-align: center;" />
     </a-spin>
   </a-modal>

+ 1 - 1
src/views/cleanManage/netWorkCleanModal.vue

@@ -68,7 +68,7 @@ export default {
               const _item = res.data.list[i]
               _item.no = no + i + 1
               if (_item.cleanWeight != null || 0) {
-                _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(3)
+                _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(3)/1
               }
             }
             return res.data

+ 2 - 2
src/views/cleanManage/netWorkCleanRecord.vue

@@ -144,7 +144,7 @@ export default {
               const _item = res.data.list[i]
               _item.no = no + i + 1
               if (_item.cleanWeight != null || 0) {
-                _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(3)
+                _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(3)/1
               }
             }
             this.totalNum = res.data.count
@@ -215,7 +215,7 @@ export default {
       getCleanStationTotal(params).then(res => {
         if (res.status == 200) {
           if (res.data != 0 || null) {
-            this.cleanWeightTotal = (res.data.cleanWeight / 1000).toFixed(3)
+            this.cleanWeightTotal = (res.data.cleanWeight / 1000).toFixed(3)/1
           }
         } else {
           this.cleanWeightTotal = 0

+ 16 - 16
src/views/cleanManage/notCleanNetwork.vue

@@ -104,35 +104,35 @@
       </template>
       <!-- 废旧衣物 -->
       <template slot="clothes" slot-scope="text,record">
-        <span :style="{ color: record.maxVal==record.clothes ? 'red' : '' }">{{ record.clothes ? (record.clothes/1000).toFixed(3) : '0.00' }}</span>
+        <span :style="{ color: record.maxVal==record.clothes ? 'red' : '' }">{{ record.clothes ? (record.clothes/1000).toFixed(3)/1 : '0.00' }}</span>
       </template>
       <!-- 废旧纸张 -->
       <template slot="paper" slot-scope="text,record">
-        <span :style="{ color: record.maxVal==record.paper ? 'red' : '' }">{{ record.paper ? (record.paper/1000).toFixed(3) : '0.00' }}</span>
+        <span :style="{ color: record.maxVal==record.paper ? 'red' : '' }">{{ record.paper ? (record.paper/1000).toFixed(3)/1 : '0.00' }}</span>
       </template>
       <!-- 废旧塑料 -->
       <template slot="plastic" slot-scope="text,record">
-        <span :style="{ color: record.maxVal==record.plastic ? 'red' : '' }">{{ record.plastic ? (record.plastic/1000).toFixed(3) : '0.000' }}</span>
+        <span :style="{ color: record.maxVal==record.plastic ? 'red' : '' }">{{ record.plastic ? (record.plastic/1000).toFixed(3)/1 : '0.000' }}</span>
       </template>
       <!-- 废旧金属 -->
       <template slot="metal" slot-scope="text,record">
-        <span :style="{ color: record.maxVal==record.metal ? 'red' : '' }">{{ record.metal ? (record.metal/1000).toFixed(3) : '0.000' }}</span>
+        <span :style="{ color: record.maxVal==record.metal ? 'red' : '' }">{{ record.metal ? (record.metal/1000).toFixed(3)/1 : '0.000' }}</span>
       </template>
       <!-- 废旧金属/塑料 -->
       <template slot="plaMet" slot-scope="text,record">
-        <span :style="{ color: record.maxVal==record.plaMet ? 'red' : '' }">{{ record.plaMet ? (record.plaMet/1000).toFixed(3) : '0.000' }}</span>
+        <span :style="{ color: record.maxVal==record.plaMet ? 'red' : '' }">{{ record.plaMet ? (record.plaMet/1000).toFixed(3)/1 : '0.000' }}</span>
       </template>
       <!-- 废旧玻璃 -->
       <template slot="glass" slot-scope="text,record">
-        <span :style="{ color: record.maxVal==record.glass ? 'red' : '' }">{{ record.glass ? (record.glass/1000).toFixed(3) : '0.000' }}</span>
+        <span :style="{ color: record.maxVal==record.glass ? 'red' : '' }">{{ record.glass ? (record.glass/1000).toFixed(3)/1 : '0.000' }}</span>
       </template>
       <!-- 可回收物 -->
       <template slot="recycling" slot-scope="text,record">
-        <span :style="{ color: record.maxVal==record.recycling ? 'red' : '' }">{{ record.recycling ? (record.recycling/1000).toFixed(3) : '0.000' }}</span>
+        <span :style="{ color: record.maxVal==record.recycling ? 'red' : '' }">{{ record.recycling ? (record.recycling/1000).toFixed(3)/1 : '0.000' }}</span>
       </template>
       <!-- 可回收物小计 -->
       <template slot="totalWeight" slot-scope="text,record">
-        <span >{{ record.totalWeight ? (record.totalWeight/1000).toFixed(3) : '0.000' }}</span>
+        <span >{{ record.totalWeight ? (record.totalWeight/1000).toFixed(3)/1 : '0.000' }}</span>
       </template>
       <!-- 操作 -->
       <span slot="action" slot-scope="text,record">
@@ -356,14 +356,14 @@ export default {
       getCleanStationSum(params).then(res => {
         if (res.status == 200) {
           if (res.data) {
-            this.recyclableWasteTotal = res.data.totalWeight ? (res.data.totalWeight / 1000).toFixed(3) : '0.000'
-            this.wastePaper = res.data.paper ? (res.data.paper / 1000).toFixed(3) : '0.000'
-            this.wasteClothes = res.data.clothes ? (res.data.clothes / 1000).toFixed(3) : '0.000'
-            this.wasteMetal = res.data.metal ? (res.data.metal / 1000).toFixed(3) : '0.000'
-            this.wastePlastics = res.data.plastic ? (res.data.plastic / 1000).toFixed(3) : '0.000'
-            this.wasteMetalPlastic = res.data.plaMet ? (res.data.plaMet / 1000).toFixed(3) : '0.000'
-            this.wasteGlass = res.data.glass ? (res.data.glass / 1000).toFixed(3) : '0.000'
-            this.recyclable = res.data.recycling ? (res.data.recycling / 1000).toFixed(3) : '0.000'
+            this.recyclableWasteTotal = res.data.totalWeight ? (res.data.totalWeight / 1000).toFixed(3)/1 : '0.000'
+            this.wastePaper = res.data.paper ? (res.data.paper / 1000).toFixed(3)/1 : '0.000'
+            this.wasteClothes = res.data.clothes ? (res.data.clothes / 1000).toFixed(3)/1 : '0.000'
+            this.wasteMetal = res.data.metal ? (res.data.metal / 1000).toFixed(3)/1 : '0.000'
+            this.wastePlastics = res.data.plastic ? (res.data.plastic / 1000).toFixed(3)/1 : '0.000'
+            this.wasteMetalPlastic = res.data.plaMet ? (res.data.plaMet / 1000).toFixed(3)/1 : '0.000'
+            this.wasteGlass = res.data.glass ? (res.data.glass / 1000).toFixed(3)/1 : '0.000'
+            this.recyclable = res.data.recycling ? (res.data.recycling / 1000).toFixed(3)/1 : '0.000'
           } else {
             this.recyclableWasteTotal = 0
             this.wasteClothes = 0

+ 5 - 5
src/views/cleanManage/statisticalReport.vue

@@ -193,7 +193,7 @@ export default {
           const has = list.find(obj => obj.rubbishType == item.code)
           temp.push({
             name: item.dispName,
-            value: has ? Number(has.cleanWeight / 1000).toFixed(3) : 0
+            value: has ? Number(has.cleanWeight / 1000).toFixed(3)/1 : 0
           })
         })
       }
@@ -207,7 +207,7 @@ export default {
         list.map(item => {
           temp.push({
             name: item.operatorName,
-            value: Number(item.cleanWeight / 1000).toFixed(3)
+            value: Number(item.cleanWeight / 1000).toFixed(3)/1
           })
         })
       }
@@ -440,12 +440,12 @@ export default {
           const a = res.data.deliveryReportData
           const b = res.data.cleanReportData
           for (const key in a) {
-            const val = Number(a[key] / 1000).toFixed(3)
+            const val = Number(a[key] / 1000).toFixed(3)/1
             this.clearnChartData[0].data.push(val)
           }
           for (const key in b) {
             this.XdaysData.push(key)
-            const val = Number(b[key] / 1000).toFixed(3)
+            const val = Number(b[key] / 1000).toFixed(3)/1
             this.clearnChartData[1].data.push(val)
           }
           this.isNoData = false
@@ -487,7 +487,7 @@ export default {
         for (let i = 0; i < keyArr.length; i++) {
           const leve2 = data[keyArr[i]]
           const row = leve2[item.code]
-          const val = row ? Number(row.cleanWeight / 1000).toFixed(3) : 0
+          const val = row ? Number(row.cleanWeight / 1000).toFixed(3)/1 : 0
           ret.push(val)
         }
         item.data = ret

+ 13 - 10
src/views/equipmentManage/collector/addCollector.vue

@@ -61,7 +61,7 @@ export default {
       isShow: this.openModal, // 弹框状态
       titleText: '新增',
       rules: {
-        stationNo: [{ required: true, message: '请选择网点名称', trigger: 'change' }],
+        stationNo: [{ required: true, message: '请选择网点', trigger: 'change' }],
         gatherPhone: [{ required: true, message: '请输入正确的手机号', trigger: 'blur' }]
       },
       loading: false,
@@ -87,14 +87,17 @@ export default {
     getPageInfo () {
       const _this = this
       _this.loading = true
-      // collectorDetails({
-      //   id: _this.id
-      // }).then(res => {
-      //   if (res.status == 200) {
-      //     _this.loading = false
-      //     _this.formData = Object.assign({}, this.formData, res.data)
-      //   }
-      // })
+      collectorDetails({
+        id: _this.collectorId
+      }).then(res => {
+        if (res.status == 200) {
+          console.log(res, '-------数据')
+          _this.loading = false
+          _this.formData.gatherName = res.data.gatherName
+          _this.formData.gatherPhone = res.data.gatherPhone
+          _this.formData.stationNo = res.data.stationName
+        }
+      })
     },
     // 保存
     handleSubmit () {
@@ -139,7 +142,7 @@ export default {
         this.getStationList()
         if (this.collectorId) { // 编辑
           this.titleText = '编辑'
-          // this.getPageInfo()
+          this.getPageInfo()
         } else {
           this.titleText = '新增'
         }

+ 43 - 36
src/views/reportForm/unRecyclableRubbishDetails.vue

@@ -10,7 +10,7 @@
       >
         <a-row :gutter="24">
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
-            <a-form-model-item label="最后清运时间" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
+            <a-form-model-item label="查询时间区间" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
               <a-range-picker
                 id="notCleanNetwork-time"
                 v-model="time"
@@ -23,7 +23,7 @@
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="采集员" :label-col="{ span:8}" :wrapper-col="{ span:16}">
-              <a-input id="network-queryWord" allowClear :maxLength="30" v-model="queryParam.queryWord" placeholder="请输入姓名/手机号码" />
+              <a-input id="network-gatherNameOrPhone" allowClear :maxLength="30" v-model="queryParam.gatherNameOrPhone" placeholder="请输入姓名/手机号码" />
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
@@ -33,7 +33,6 @@
                 id="notCleanNetwork-stationNo"
                 placeholder="请选择网点名称"
                 allowClear
-                mode="multiple"
                 v-model="queryParam.stationNo"
                 :showSearch="true"
                 option-filter-prop="children"
@@ -42,9 +41,9 @@
               </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :xs="24" :sm="12" :md="6" :lg="4">
-            <a-button type="primary" @click="$refs.table.refresh(true)" id="notCleanNetwork-refresh" style="margin: 4px 10px 0 20px">查询</a-button>
-            <a-button type="" @click="reset" id="notCleanNetwork-reset" style="margin-top: 4px">重置</a-button>
+          <a-col :xs="24" :sm="12" :md="6" :lg="5">
+            <a-button type="primary" @click="$refs.table.refresh(true)" id="notCleanNetwork-refresh" style="margin-top: 4px">查询</a-button>
+            <a-button type="" @click="reset" id="notCleanNetwork-reset" style="margin: 4px 0 0 10px">重置</a-button>
           </a-col>
         </a-row>
 
@@ -52,19 +51,19 @@
     </div>
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">总计<span> {{ orderTotal }} </span>条,<span> {{ recyclableWasteTotal }} </span>kg。
-        其中,其他垃圾总计<span> {{ }} </span>kg,厨余垃圾总计<span>{{ }} </span>kg,建筑垃圾总计<span> {{ }} </span>kg
+      <div class="ftext" slot="message">总计<span> {{ orderTotal }} </span>条,<span> {{ total }} </span>kg。
+        其中,其他垃圾总计<span> {{ otherTotal }} </span>kg,厨余垃圾总计<span>{{ chuyuTotal }} </span>kg,建筑垃圾总计<span> {{ jianzhuTotal }} </span>kg
       </div>
     </a-alert>
     <!-- 列表 -->
-    <s-table ref="table" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
+    <s-table ref="table" :rowKey="record => record.id" :columns="columns" :data="loadData" bordered>
       <!-- 图片 -->
-      <template slot="img">
-        <img :src="images[0]" class="image1" @click="isShow">
-        <viewer :images="images" class="viewer" ref="viewer"@inited="inited">
-          <img v-for="src in images" :src="src" :key="src" class="image">
+      <template slot="img" slot-scope="text,record">
+        <img :src="record.imageUrlList ? record.imageUrlList[0] :''" class="image1" @click="isShow">
+        <viewer :images="record.imageUrlList? record.imageUrlList:[]" class="viewer" ref="viewer" @inited="inited" rebuild>
+          <img v-for="src in record.imageUrlList" :src="src" :key="src" class="image">
         </viewer>
-        <P>{{ images ? images.length+' 张' :'' }}</P>
+        <P>{{ record.imageUrlList ? record.imageUrlList.length+' 张' :'0 张' }}</P>
       </template>
     </s-table>
     </s-table>
@@ -85,14 +84,15 @@ export default {
   data () {
     return {
       orderTotal: 0, //  总计条数
-      recyclableWasteTotal: 0, //  可回收垃圾总计
-      wasteClothes: 0, //  废旧衣物总计
-      wastePaper: 0, //  废旧纸张总计
-      wasteMetal: 0, //  废旧金属总计
+      total: 0, //  可回收垃圾总计
+      otherTotal: 0, //  其他垃圾总计
+      jianzhuTotal: 0, //  建筑垃圾总计
+      chuyuTotal: 0, //  厨余垃圾总计
       queryParam: {
         stationNo: undefined, // 网点名称
         beginDate: null, // 开始时间
-        endDate: null // 结束时间
+        endDate: null, // 结束时间
+        gatherNameOrPhone: ''
       },
       optionData: [], // 网点列表数据
       // 将默认当天时间日期回显在时间选择框中
@@ -103,22 +103,19 @@ export default {
       dateFormat: 'YYYY-MM-DD', // 日期格式
       columns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
-        { title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '采集员姓名', dataIndex: '', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '采集员手机', dataIndex: '', width: 100, align: 'center' },
-        { title: '其他垃圾(kg)', dataIndex: 'gatherOther', width: 100, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) : '0' } },
-        { title: '厨余垃圾(kg)', dataIndex: 'gatherKitchen', width: 100, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) : '0' } },
-        { title: '建筑垃圾(kg)', dataIndex: 'gatherBuilding', width: 100, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) : '0' } },
-        { title: '总计(kg)', dataIndex: 'gatherTotal', width: 100, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) : '0' } },
-        { title: '备注', dataIndex: '', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '图片', width: 100, dataIndex: 'img', align: 'center', scopedSlots: { customRender: 'img' } }
+        { title: '创建时间', dataIndex: 'createDate', width: 150, align: 'center' },
+        { title: '网点名称', dataIndex: 'stationName', width: 120, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '采集员姓名', dataIndex: 'gatherName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '采集员手机', dataIndex: 'gatherPhone', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '其他垃圾(kg)', dataIndex: 'gatherOther', width: 80, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) / 1 : '0' } },
+        { title: '厨余垃圾(kg)', dataIndex: 'gatherKitchen', width: 80, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) / 1 : '0' } },
+        { title: '建筑垃圾(kg)', dataIndex: 'gatherBuilding', width: 80, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) / 1 : '0' } },
+        { title: '总计(kg)', dataIndex: 'gatherTotal', width: 80, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3) / 1 : '0' } },
+        { title: '备注', dataIndex: 'remarks', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '图片', width: 100, align: 'center', scopedSlots: { customRender: 'img' } }
       ],
       // 图片
-      images: [
-        'https://picsum.photos/400/400',
-        'https://picsum.photos/600/600',
-        'https://picsum.photos/500/500'
-      ],
+      images: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)
@@ -135,6 +132,7 @@ export default {
             for (let i = 0; i < res.data.list.length; i++) {
               const _item = res.data.list[i]
               _item.no = no + i + 1
+              // this.images = _item.imageUrlList ? _item.imageUrlList : []
             }
             this.orderTotal = res.data.count || 0
             this.getTotal()
@@ -189,8 +187,10 @@ export default {
       getRubbishDetailTotal(params).then(res => {
         if (res.status == 200) {
           if (res.data) {
-            this.recyclableWasteTotal = res.data.totalWeight ? (res.data.totalWeight / 1000).toFixed(3) : '0'
-            this.wastePaper = res.data.paper ? (res.data.paper / 1000).toFixed(3) : '0'
+            this.otherTotal = res.data.GATHER_OTHER ? (res.data.GATHER_OTHER / 1000).toFixed(3) / 1 : '0'
+            this.jianzhuTotal = res.data.GATHER_BUILDING ? (res.data.GATHER_BUILDING / 1000).toFixed(3) / 1 : '0'
+            this.chuyuTotal = res.data.GATHER_KITCHEN ? (res.data.GATHER_KITCHEN / 1000).toFixed(3) / 1 : '0'
+            this.total = res.data.GATHER_TOTAL ? (res.data.GATHER_TOTAL / 1000).toFixed(3) / 1 : '0'
           }
         }
       })
@@ -200,6 +200,7 @@ export default {
       this.queryParam.stationNo = undefined
       this.queryParam.beginDate = null
       this.queryParam.endDate = null
+      this.queryParam.gatherNameOrPhone = ''
       this.time = [
         moment(getDate.getRecentday().starttime, 'YYYY-MM-DD'),
         moment(getDate.getRecentday().endtime, 'YYYY-MM-DD')
@@ -207,10 +208,16 @@ export default {
       this.$refs.table.refresh(true)
     },
     inited (viewer) {
+      console.log('-------------44444', this.$viewer)
       this.$viewer = viewer
+      console.log()
     },
     isShow () {
-      this.$viewer.view()
+      console.log('-dianji', this.$viewer)
+      // const vuer = this.$el.querySelector('.viewer').$vuer
+      // vuer.isShow()
+      this.$viewer.update()
+      // this.$viewer.view()
     }
   }
 }

+ 19 - 18
src/views/reportForm/unRecyclableRubbishTotal.vue

@@ -10,7 +10,7 @@
       >
         <a-row :gutter="24">
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
-            <a-form-model-item label="最后清运时间" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
+            <a-form-model-item label="采集时间区间" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
               <a-range-picker
                 id="notCleanNetwork-time"
                 v-model="time"
@@ -53,7 +53,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="4">
-            <a-button type="primary" @click="$refs.table.refresh(true)" id="notCleanNetwork-refresh" style="margin: 4px 10px 0 20px">查询</a-button>
+            <a-button type="primary" @click="$refs.table.refresh(true)" id="notCleanNetwork-refresh" style="margin: 4px 10px 0 0">查询</a-button>
             <a-button type="" @click="reset" id="notCleanNetwork-reset" style="margin-top: 4px">重置</a-button>
           </a-col>
         </a-row>
@@ -65,7 +65,6 @@
                 id="notCleanNetwork-stationNo"
                 placeholder="请选择网点名称"
                 allowClear
-                mode="multiple"
                 v-model="queryParam.stationNo"
                 :showSearch="true"
                 option-filter-prop="children"
@@ -79,15 +78,15 @@
     </div>
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">总计<span> {{ orderTotal }} </span>条,<span> {{ }} </span>kg。
-        其中,其他垃圾总计<span> {{ }} </span>kg,厨余垃圾总计<span>{{ }} </span>kg,建筑垃圾总计<span> {{ }} </span>kg
+      <div class="ftext" slot="message">总计<span> {{ orderTotal }} </span>条,<span> {{ total }} </span>kg。
+        其中,其他垃圾总计<span> {{otherTotal }} </span>kg,厨余垃圾总计<span>{{chuyuTotal }} </span>kg,建筑垃圾总计<span> {{ jianzhuTotal}} </span>kg
       </div>
     </a-alert>
     <!-- 列表 -->
     <s-table ref="table" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
       <!-- 可回收物小计 -->
       <template slot="totalWeight" slot-scope="text,record">
-        <span >{{ record.totalWeight ? (record.totalWeight/1000).toFixed(3) : '0' }}</span>
+        <span >{{ record.totalWeight ? (record.totalWeight/1000).toFixed(3)/1 : '0' }}</span>
       </template>
       <!-- 操作 -->
     </s-table>
@@ -109,14 +108,14 @@ export default {
   data () {
     return {
       orderTotal: 0, //  总计条数
-      recyclableWasteTotal: 0, //  可回收垃圾总计
-      wasteClothes: 0, //  废旧衣物总计
-      wastePaper: 0, //  废旧纸张总计
-      wasteMetal: 0, //  废旧金属总计
+     total: 0, //  可回收垃圾总计
+     otherTotal: 0, //  其他垃圾总计
+     jianzhuTotal: 0, //  建筑垃圾总计
+     chuyuTotal: 0, //  厨余垃圾总计
       queryParam: {
         stationNo: undefined, // 网点名称
-        findRubbishDatafindRubbishDataBeginDate: null, // 开始时间
-        findRubbishDatafindRubbishDataEndDate: null, // 结束时间
+        findRubbishDataBeginDate: null, // 开始时间
+        findRubbishDataEndDate: null, // 结束时间
         provinceCode: undefined, //  省
         cityCode: undefined, // 市
         districtCode: undefined // 区
@@ -134,10 +133,10 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
-        { title: '其他垃圾(kg)', scopedSlots: { customRender: 'plastic' }, width: 100, align: 'center' },
-        { title: '厨余垃圾(kg)', scopedSlots: { customRender: 'plastic' }, width: 100, align: 'center' },
-        { title: '建筑垃圾(kg)', scopedSlots: { customRender: 'plastic' }, width: 100, align: 'center' },
-        { title: '总计(kg)', dataIndex: 'totalWeight', width: 100, align: 'center', customRender: (text) => { return text || '--' } }
+        { title: '其他垃圾(kg)',  dataIndex: 'GATHER_OTHER', width: 100, align: 'center',customRender: (text) => { return text ? (text / 1000).toFixed(3)/1 : '0' } },
+        { title: '厨余垃圾(kg)',  dataIndex: 'GATHER_KITCHEN', width: 100, align: 'center',customRender: (text) => { return text ? (text / 1000).toFixed(3)/1 : '0' } },
+        { title: '建筑垃圾(kg)',  dataIndex: 'GATHER_BUILDING', width: 100, align: 'center',customRender: (text) => { return text ? (text / 1000).toFixed(3)/1 : '0' } },
+        { title: '总计(kg)', dataIndex: 'GATHER_TOTAL', width: 100, align: 'center', customRender: (text) => { return text ? (text / 1000).toFixed(3)/1 : '0' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -256,8 +255,10 @@ export default {
       getRubbishTotal(params).then(res => {
         if (res.status == 200) {
           if (res.data) {
-            // this.recyclableWasteTotal = res.data.totalWeight ? (res.data.totalWeight / 1000).toFixed(3) : '0'
-            // this.wastePaper = res.data.paper ? (res.data.paper / 1000).toFixed(3) : '0'
+            this.otherTotal = res.data.GATHER_OTHER ? (res.data.GATHER_OTHER / 1000).toFixed(3)/1 : '0'
+            this.jianzhuTotal = res.data.GATHER_BUILDING ? (res.data.GATHER_BUILDING / 1000).toFixed(3)/1 : '0'
+            this.chuyuTotal = res.data.GATHER_KITCHEN ? (res.data.GATHER_KITCHEN / 1000).toFixed(3)/1 : '0'
+            this.total = res.data.GATHER_TOTAL ? (res.data.GATHER_TOTAL / 1000).toFixed(3)/1 : '0'
           }
         }
       })