Bladeren bron

Merge branch 'deploy_0106' of http://git.chelingzhu.com/chelingzhu-web/zxyj-admin-html into deploy_0106

lilei 4 jaren geleden
bovenliggende
commit
5906ff3500
1 gewijzigde bestanden met toevoegingen van 3 en 4 verwijderingen
  1. 3 4
      src/views/cleanManage/notCleanNetwork.vue

+ 3 - 4
src/views/cleanManage/notCleanNetwork.vue

@@ -88,8 +88,7 @@
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div class="ftext" slot="message">总计<span> {{ orderTotal }} </span>条,可回收垃圾总计<span> {{ recyclableWasteTotal }} </span>kg。
-        其中,废旧衣物<span> {{ wasteClothes }} </span>kg,废旧纸张<span> {{ wastePaper }} </span>kg,废旧金属<span> {{ wasteMetal }} </span>kg,废旧塑料<span>
-          {{ wastePlastics }} </span>kg,废旧金属/塑料<span> {{ wasteMetalPlastic }} </span>kg,废旧玻璃<span> {{ wasteGlass }} </span>kg,可回收物<span>
+        其中,废旧衣物<span> {{ wasteClothes }} </span>kg,废旧塑料<span>{{ wastePlastics }} </span>kg,废旧金属<span> {{ wasteMetal }} </span>kg,废旧纸张<span> {{ wastePaper }} </span>kg,废旧金属/塑料<span> {{ wasteMetalPlastic }} </span>kg,废旧玻璃<span> {{ wasteGlass }} </span>kg,可回收物<span>
           {{ recyclable }} </span>kg</div>
     </a-alert>
     <!-- 列表 -->
@@ -208,9 +207,9 @@ export default {
         { 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: 'metal' }, width: 100, align: 'center' },
             { title: '废旧塑料', scopedSlots: { customRender: 'plastic' }, width: 100, align: 'center' },
+            { title: '废旧金属', scopedSlots: { customRender: 'metal' }, width: 100, align: 'center' },
+            { title: '废旧纸张', scopedSlots: { customRender: 'paper' }, width: 100, align: 'center' },
             { title: '废旧金属/塑料', scopedSlots: { customRender: 'plaMet' }, width: 100, align: 'center' },
             { title: '废旧玻璃', scopedSlots: { customRender: 'glass' }, width: 100, align: 'center' },
             { title: '可回收物', scopedSlots: { customRender: 'recycling' }, width: 100, align: 'center' }]