Forráskód Böngészése

网点设备去掉各箱体投放情况

chenrui 4 éve
szülő
commit
94b15d7f91

+ 0 - 15
src/views/equipmentManage/equipment/equipment.vue

@@ -32,12 +32,6 @@
       :columns="columns"
       :data="loadData"
       bordered>
-      <!-- 箱体投放比例 -->
-      <template slot="boxOnePercent" slot-scope="text, record">{{ record.boxOnePercent ? record.boxOnePercent + '%' : '--' }}</template>
-      <template slot="boxTwoPercent" slot-scope="text, record">{{ record.boxTwoPercent ? record.boxTwoPercent + '%' : '--' }}</template>
-      <template slot="boxThreePercent" slot-scope="text, record">{{ record.boxThreePercent ? record.boxThreePercent + '%' : '--' }}</template>
-      <template slot="boxFourPercent" slot-scope="text, record">{{ record.boxFourPercent ? record.boxFourPercent + '%' : '--' }}</template>
-      <template slot="boxFivePercent" slot-scope="text, record">{{ record.boxFivePercent ? record.boxFivePercent + '%' : '--' }}</template>
       <!-- 设备状态 -->
       <template slot="onlineFlag" slot-scope="text, record">
         <span :class="record.onlineFlag==0 ? 'red' : record.onlineFlag==1 ? 'green' : ''">{{ record.onlineFlag == 0 ? '离线' : record.onlineFlag == 1 ? '在线' : '--' }}</span>
@@ -88,15 +82,6 @@ export default {
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 200, align: 'center' },
         { title: '箱体类型', dataIndex: 'deviceTypeName', width: 200, align: 'center' },
         { title: '内置箱体数', dataIndex: 'boxNum', width: 200, align: 'center' },
-        { title: '内置各箱体已投放比例(%)',
-          children: [
-            { title: '1号箱', scopedSlots: { customRender: 'boxOnePercent' }, width: 100, align: 'center' },
-            { title: '2号箱', scopedSlots: { customRender: 'boxTwoPercent' }, width: 100, align: 'center' },
-            { title: '3号箱', scopedSlots: { customRender: 'boxThreePercent' }, width: 100, align: 'center' },
-            { title: '4号箱', scopedSlots: { customRender: 'boxFourPercent' }, width: 100, align: 'center' },
-            { title: '5号箱', scopedSlots: { customRender: 'boxFivePercent' }, width: 100, align: 'center' }
-          ]
-        },
         { title: '版本', dataIndex: 'boxVersion', width: 200, align: 'center' },
         { title: '设备状态', scopedSlots: { customRender: 'onlineFlag' }, width: 150, align: 'center' },
         { title: '工作状态', scopedSlots: { customRender: 'state' }, width: 150, align: 'center' },

+ 0 - 9
src/views/equipmentManage/network/equipmentModal.vue

@@ -53,14 +53,6 @@
         <template slot="onlineFlag" slot-scope="text, record">
           <span :class="record.onlineFlag==0 ? 'red' : record.onlineFlag==1 ? 'green' : ''">{{ record.onlineFlag == 0 ? '离线' : record.onlineFlag == 1 ? '在线' : '--' }}</span>
         </template>
-        <!-- 投放情况 -->
-        <template slot="situation" slot-scope="text, record">
-          [{{ record.boxOnePercent ? record.boxOnePercent + '%' : '--' }}] --
-          [{{ record.boxTwoPercent ? record.boxTwoPercent + '%' : '--' }}] -
-          [{{ record.boxThreePercent ? record.boxThreePercent + '%' : '--' }}] -
-          [{{ record.boxFourPercent ? record.boxFourPercent + '%' : '--' }}] -
-          [{{ record.boxFivePercent ? record.boxFivePercent + '%' : '--' }}]
-        </template>
         <!-- 箱体类型 -->
         <template slot="type" slot-scope="record">
           <a-select
@@ -131,7 +123,6 @@ export default {
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 100, align: 'center' },
         { title: '设备状态', scopedSlots: { customRender: 'onlineFlag' }, width: 150, align: 'center' },
-        { title: '投放情况', scopedSlots: { customRender: 'situation' }, width: 150, align: 'center' },
         { title: '箱体类型', scopedSlots: { customRender: 'type' }, width: 150, align: 'center' },
         { title: '工作状态', scopedSlots: { customRender: 'workStatus' }, width: 150, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center' }