zhangdan 4 년 전
부모
커밋
a976a53f6e
2개의 변경된 파일11개의 추가작업 그리고 85개의 파일을 삭제
  1. 0 1
      src/views/cleanManage/netWorkCleanRecord.vue
  2. 11 84
      src/views/cleanManage/notCleanNetwork.vue

+ 0 - 1
src/views/cleanManage/netWorkCleanRecord.vue

@@ -55,7 +55,6 @@
       bordered
     >
       <span slot="action" slot-scope="text,record">
-        <!-- <a-button type="primary" @click="handleDetail(record)" id="netWorkCleanRecord-handleDetail">查看详情</a-button> -->
         <a-button type="primary" @click="handleDetail(record)" v-hasPermission="'B_netWorkCleanRecord_detail'" id="netWorkCleanRecord-handleDetail">查看详情</a-button>
         <span v-if="!$hasPermissions('B_netWorkCleanRecord_detail')">--</span>
       </span>

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

@@ -129,7 +129,7 @@
       </template>
       <!-- 可回收物 -->
       <template slot="recycling" slot-scope="text,record">
-        <span :style="{ color: record.maxVal==record.recycling ? 'red' : '' }">{{ record.recycling/1000 || 0 }}</span>
+        <span :style="{ color: record.maxVal==record.recycling ? 'red' : '' }">{{ (record.recycling/1000).toFixed(2) || 0 }}</span>
       </template>
       <!-- 操作 -->
       <span slot="action" slot-scope="text,record">
@@ -216,90 +216,17 @@ export default {
         { title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
         { slots: { title: 'customTitle' },
-          children: [{ title: '废旧衣物',
-            scopedSlots: {
-              customRender: 'clothes'
-            },
-            width: 100,
-            align: 'center'
-          },
-          {
-            title: '废旧纸张',
-            scopedSlots: {
-              customRender: 'paper'
-            },
-            width: 100,
-            align: 'center'
-          },
-          {
-            title: '废旧塑料',
-            scopedSlots: {
-              customRender: 'plastic'
-            },
-            width: 100,
-            align: 'center'
-          },
-          {
-            title: '废旧金属',
-            scopedSlots: {
-              customRender: 'metal'
-            },
-            width: 100,
-            align: 'center'
-          },
-          {
-            title: '废旧金属/塑料',
-            scopedSlots: {
-              customRender: 'metPla'
-            },
-            width: 100,
-            align: 'center'
-          },
-          {
-            title: '废旧玻璃',
-            scopedSlots: {
-              customRender: 'glass'
-            },
-            width: 100,
-            align: 'center'
-          },
-          {
-            title: '可回收物',
-            scopedSlots: {
-              customRender: 'recycling'
-            },
-            width: 100,
-            align: 'center'
-          }
-          ]
-        },
-        {
-          title: '可回收垃圾小计(kg)',
-          dataIndex: 'totalWeight',
-          width: 100,
-          align: 'center',
-          customRender: (text) => {
-            return (text / 1000).toFixed(2) || 0
-          }
+          children: [{ title: '废旧衣物', scopedSlots: { customRender: 'clothes' }, width: 100, align: 'center' },
+            { title: '废旧纸张', scopedSlots: { customRender: 'paper' }, width: 100, align: 'center' },
+            { title: '废旧塑料', scopedSlots: { customRender: 'plastic' }, width: 100, align: 'center' },
+            { title: '废旧金属', scopedSlots: { customRender: 'metal' }, width: 100, align: 'center' },
+            { title: '废旧金属/塑料', scopedSlots: { customRender: 'metPla' }, width: 100, align: 'center' },
+            { title: '废旧玻璃', scopedSlots: { customRender: 'glass' }, width: 100, align: 'center' },
+            { title: '可回收物', scopedSlots: { customRender: 'recycling' }, 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'
-          }
-        }
+        { title: '可回收垃圾小计(kg)', dataIndex: 'totalWeight', width: 100, align: 'center', customRender: (text) => { return (text / 1000).toFixed(2) || 0 } },
+        { title: '最后清运时间', dataIndex: 'lastCleanDate', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
+        { title: '操作', dataIndex: 'action', width: 100, align: 'center', scopedSlots: { customRender: 'action' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {