Browse Source

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

lilei 4 years ago
parent
commit
b20b47cf10

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

@@ -57,14 +57,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="state" slot-scope="text, record">
           <span :class="record.state==0 ? 'red' : record.state==1 ? 'green' : ''">{{ record.state == 0 ? '已禁用' : record.state == 1 ? '已启用' : '--' }}</span>
@@ -102,7 +94,6 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 200, align: 'center' },
         { title: '设备状态', scopedSlots: { customRender: 'onlineFlag' }, width: 200, align: 'center' },
-        { title: '投放情况', scopedSlots: { customRender: 'situation' }, width: 200, align: 'center' },
         { title: '工作状态', scopedSlots: { customRender: 'state' }, width: 200, align: 'center' },
         { title: '箱体类型', dataIndex: 'deviceTypeName', width: 200, align: 'center' }
       ],

+ 1 - 1
src/views/shop/GoodsOrder.vue

@@ -78,7 +78,7 @@ export default {
       selectedRowKeys: [], //  已选项
       columns: [
         { title: '商品名称', dataIndex: 'goodsName', width: 200, align: 'center' },
-        { title: '商品价', dataIndex: 'payGold', width: 200, align: 'center' },
+        { title: '商品价', dataIndex: 'payGold', width: 200, align: 'center' },
         { title: '购买数量', dataIndex: 'buyQty', width: 200, align: 'center' }
       ]
     }