Browse Source

待清运修改

1004749546@qq.com 4 năm trước cách đây
mục cha
commit
99b82af354
1 tập tin đã thay đổi với 11 bổ sung11 xóa
  1. 11 11
      src/views/cleanManage/notCleanNetwork.vue

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

@@ -151,20 +151,20 @@ export default {
       time: [],
       dateFormat: 'YYYY-MM-DD', // 日期格式
       columns: [{ title: '网点名称', dataIndex: 'no', width: 100, align: 'center' },
-        { title: '设备编号', dataIndex: 'name', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '设备编号', dataIndex: 'srcDeviceCode', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { slots: { title: 'customTitle' },
           children: [
-            { title: '废旧衣物', dataIndex: 'yiwu', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
-            { title: '废旧纸张', dataIndex: 'zhizhang', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
-            { title: '废旧塑料', dataIndex: 'suliao', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
-            { title: '废旧金属', dataIndex: 'jinshu', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
-            { title: '废旧金属/塑料', dataIndex: 'jssl', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
-            { title: '废旧玻璃', dataIndex: 'boli', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
-            { title: '可回收物', dataIndex: 'huishou', width: 100, align: 'center', customRender: (text) => { return text || 0 } }
+            { title: '废旧衣物', dataIndex: 'clothes', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
+            { title: '废旧纸张', dataIndex: 'paper', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
+            { title: '废旧塑料', dataIndex: 'plastic', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
+            { title: '废旧金属', dataIndex: 'metal', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
+            { title: '废旧金属/塑料', dataIndex: 'metPla', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
+            { title: '废旧玻璃', dataIndex: 'glass', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
+            { title: '可回收物', dataIndex: 'recycling', width: 100, align: 'center', customRender: (text) => { return text || 0 } }
           ]
         },
-        { title: '可回收垃圾小计(kg)', dataIndex: 'createDate', width: 100, align: 'center' },
-        { title: '最后清运时间', dataIndex: 'changjia', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '可回收垃圾小计(kg)', dataIndex: 'totalWeight', width: 100, align: 'center' },
+        { title: '最后清运时间', dataIndex: 'lastCleanDate', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '操作', dataIndex: 'action', width: 100, align: 'center', scopedSlots: { customRender: 'action' } }],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -176,7 +176,7 @@ export default {
           searchData.beginDate = null
           searchData.endDate = null
         }
-        return netWorkCleanRecordList(searchData).then(res => {
+        return netWorkCleanRecordList({pageNo:1,pageSize:10}).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++) {