|
|
@@ -66,7 +66,7 @@
|
|
|
<el-table-column prop="code" :label='$t("resource.table.resours.no")' :show-overflow-tooltip="true" width="100px"></el-table-column>
|
|
|
<el-table-column prop="brand" :label='$t("resource.table.resours.brand")' width="100px"></el-table-column>
|
|
|
<el-table-column prop="specification" :label='$t("resource.table.resours.specification")'></el-table-column>
|
|
|
-
|
|
|
+
|
|
|
<el-table-column prop="capitalNo" :label='$t("resource.table.resours.capitalNo")'></el-table-column>
|
|
|
<el-table-column prop="capitalName" :label='$t("resource.table.resours.capitalName")'></el-table-column>
|
|
|
<el-table-column prop="capitalType" :label='$t("resource.table.resours.capitalType")'></el-table-column>
|
|
|
@@ -75,7 +75,7 @@
|
|
|
<el-table-column prop="productionDate" :label='$t("resource.table.resours.productionDate")'></el-table-column>
|
|
|
<el-table-column prop="productionNo" :label='$t("resource.table.resours.productionNo")'></el-table-column>
|
|
|
<el-table-column prop="manufacturer" :label='$t("resource.table.resours.manufacturer")'></el-table-column>
|
|
|
-
|
|
|
+
|
|
|
<el-table-column prop="model" :label='$t("resource.table.resours.model")'></el-table-column>
|
|
|
<el-table-column prop="category.data" :label='$t("resource.table.resours.category")' width="100px"></el-table-column>
|
|
|
<el-table-column prop="zoneName" :label='$t("resource.table.resours.zoneName")' width="180px"></el-table-column>
|
|
|
@@ -190,8 +190,8 @@
|
|
|
@close="editDetailConfClose"
|
|
|
@success="editDetailConfSuccess"
|
|
|
/>
|
|
|
-
|
|
|
- <el-dialog
|
|
|
+
|
|
|
+ <el-dialog
|
|
|
:title='$t("resource.buttons.autoCode")'
|
|
|
:visible.sync="autoCodeVisible"
|
|
|
width="80%"
|
|
|
@@ -261,7 +261,7 @@
|
|
|
return {
|
|
|
currentRow: null, // 当前选中的行数据
|
|
|
equipmentVisible: false, // 设备管理
|
|
|
- autoCodeVisible:false, //节点配置
|
|
|
+ autoCodeVisible:false, //节点配置
|
|
|
rowData: {}, // row数据,
|
|
|
audioStatus: [],
|
|
|
dialog: {
|
|
|
@@ -275,7 +275,7 @@
|
|
|
dialogDetailConf: {
|
|
|
isVisible: false,
|
|
|
title: ""
|
|
|
- },
|
|
|
+ },
|
|
|
preview: {
|
|
|
isVisible: false,
|
|
|
context: ''
|
|
|
@@ -516,7 +516,7 @@
|
|
|
// 【硬件配置】-事件
|
|
|
editHardware (row) {
|
|
|
// 如果可以配置（agv、arm、machine）
|
|
|
- let str = "agv,arm,machine";
|
|
|
+ let str = "agv,arm,machine,tuoban";
|
|
|
if(str.indexOf(row.category.key) > -1) {
|
|
|
this.$refs.hardware.setTenant(row)
|
|
|
this.$refs.hardware.type = "edit"
|
laoyao