浏览代码

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

zhangdan 4 年之前
父节点
当前提交
fcbd8bcf2f
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8 2
      src/views/equipmentManage/network/detailsModal.vue

+ 8 - 2
src/views/equipmentManage/network/detailsModal.vue

@@ -51,6 +51,7 @@
         :rowKey="record => record.id"
         :columns="columns"
         :dataSource="equipmentData"
+        :loading="loading"
         :pagination="false"
         bordered>
         <!-- 设备状态 -->
@@ -59,7 +60,8 @@
         </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>
+          <span v-if="record.deviceType!='STEELYARD'" :class="record.state==0 ? 'red' : record.state==1 ? 'green' : ''">{{ record.state == 0 ? '已禁用' : record.state == 1 ? '已启用' : '--' }}</span>
+          <span v-else>--</span>
         </template>
       </a-table>
     </div>
@@ -97,7 +99,8 @@ export default {
         { title: '工作状态', scopedSlots: { customRender: 'state' }, width: 200, align: 'center' },
         { title: '箱体类型', dataIndex: 'deviceTypeName', width: 200, align: 'center' }
       ],
-      equipmentData: []
+      equipmentData: [],
+      loading: false
     }
   },
   methods: {
@@ -111,6 +114,7 @@ export default {
     },
     //  已绑设备
     getDevice () {
+      this.loading = true
       deviceListQuery({ stationNo: this.networkNo }).then(res => {
         console.log(res)
         if (res.status == 200) {
@@ -121,6 +125,7 @@ export default {
         } else {
           this.equipmentData = []
         }
+        this.loading = false
       })
     }
   },
@@ -132,6 +137,7 @@ export default {
     //  重定义的弹框状态
     isShow (newValue, oldValue) {
       if (!newValue) {
+        this.equipmentData = []
         this.$emit('close')
       }
     },