Bladeren bron

设备管理数据展示功能处理,修复bug370

oyq28 3 jaren geleden
bovenliggende
commit
5c09c57f49

+ 1 - 1
imcs-ui/src/views/zuihou/resourceProductMgr/deviceMgr/Index.vue

@@ -545,7 +545,7 @@
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
 	      // 固定参数(采集的生产资源)
 	      this.queryParams.resourceStatus = "1"
-		  this.queryParams.isAutoCode = "1"
+		  this.queryParams.displayStatus = "1"
 
 	      equipmentMgrApi.getPageList(this.queryParams).then(response => {
 	        const res = response.data

+ 2 - 7
imcs-ui/src/views/zuihou/resourceProductMgr/resourcesMgr/components/TenantCodeEdit.vue

@@ -63,12 +63,7 @@
                     </span>  
               </el-tag>
               <el-tag  v-if="row.category == '4'"> 
-                   <span v-if="isLine"> 
-                     {{ row.resourceId == 1 ? '质量中心机器人':(row.resourceId == 2 ? '柔性线机器人': '智能单元机器人' )  }}
-                    </span>
-                    <span v-else>
-                      {{ row.resourceId == 1 ? '舱体线机器人':(row.resourceId == 2 ? '伺服舵机': '框体线机器人' )  }} 
-                    </span>                                               	      
+                     其它设备                                               	      
               </el-tag>
           </template>        
       </el-table-column> 
@@ -84,7 +79,7 @@
                      {{ row.command == "1" ? '取':'放' }}   
               </el-tag>
               <el-tag  v-if=" row.category =='4' "> 
-                     {{ row.command == "1" ? '取':'放' }}   
+                     默认操作   
               </el-tag>              
           </template>
       </el-table-column>