zhangdan 4 anos atrás
pai
commit
b6178f3f6e

+ 1 - 1
src/config/router.config.js

@@ -428,7 +428,7 @@ export const asyncRouterMap = [{
       name: 'unRecyclableRubbishDetails',
       component: () => import(/* webpackChunkName: "reportForm" */ '@/views/reportForm/unRecyclableRubbishDetails.vue'),
       meta: {
-        title: '非可回收垃圾明细',
+        title: '非可回收垃圾明细',
         icon: 'fund',
         permission: 'M_unRecyclableDetails_list'
       }

+ 4 - 3
src/views/reportForm/unRecyclableRubbishTotal.vue

@@ -79,7 +79,7 @@
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div class="ftext" slot="message">总计<span> {{ orderTotal }} </span>条,<span> {{ total }} </span>kg。
-        其中,可回收物总计<span>{{ huishouTotal}} </span>kg,有害垃圾总计<span>{{harmTotal }} </span>kg,厨余垃圾总计<span>{{ chuyuTotal }} </span>kg,其他垃圾总计<span> {{ otherTotal }} </span>kg,建筑垃圾总计<span> {{ jianzhuTotal }} </span>kg
+        其中,可回收物总计<span>{{ huishouTotal }} </span>kg,有害垃圾总计<span>{{ harmTotal }} </span>kg,厨余垃圾总计<span>{{ chuyuTotal }} </span>kg,其他垃圾总计<span> {{ otherTotal }} </span>kg,建筑垃圾总计<span> {{ jianzhuTotal }} </span>kg
       </div>
     </a-alert>
     <!-- 列表 -->
@@ -109,8 +109,8 @@ export default {
     return {
       orderTotal: 0, //  总计条数
       total: 0, //  可回收垃圾总计
-      huishouTotal:0, // 可回收物
-      harmTotal:0, // 有害垃圾
+      huishouTotal: 0, // 可回收物
+      harmTotal: 0, // 有害垃圾
       otherTotal: 0, //  其他垃圾总计
       jianzhuTotal: 0, //  建筑垃圾总计
       chuyuTotal: 0, //  厨余垃圾总计
@@ -139,6 +139,7 @@ export default {
         { title: '有害垃圾(kg)', dataIndex: 'GATHER_HARM', 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_OTHER', 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 对象