diff --git a/src/views/modules/tooling/components/com_tool_property_show.vue b/src/views/modules/tooling/components/com_tool_property_show.vue index a8f4004..4dca897 100644 --- a/src/views/modules/tooling/components/com_tool_property_show.vue +++ b/src/views/modules/tooling/components/com_tool_property_show.vue @@ -25,7 +25,7 @@
@@ -48,6 +48,7 @@ export default { propertyType: 'TL', propertyNo: 'TL01', dataNo: '1001',//数据编码 + site: '', visible: false, showFlag: false, pageData: { @@ -63,14 +64,15 @@ export default { //初始化组件的参数 init(toolInfo, dataType) { - //区分工具和工具实例 + //设置site + this.site = toolInfo.site; if(dataType === 'TL'){ this.showFlag = false; this.dataNo = toolInfo.toolId; this.propertyNo = toolInfo.propertyNo; this.propertyType = 'TL'; this.titleCon = '工具属性维护'; - this.pageData.site = '*'; + this.pageData.site = toolInfo.site; this.pageData.toolId = toolInfo.toolId; this.pageData.toolInstance = ''; }else if(dataType === 'TLI'){ @@ -79,7 +81,7 @@ export default { this.propertyNo = toolInfo.propertyNo; this.propertyType = 'TLI'; this.titleCon = '工具实例属性维护'; - this.pageData.site = '*'; + this.pageData.site = toolInfo.site; this.pageData.toolId = toolInfo.toolId; this.pageData.toolInstance = toolInfo.toolInstance; } diff --git a/src/views/modules/tooling/components/orderProperties.vue b/src/views/modules/tooling/components/orderProperties.vue index 401273a..17cc210 100644 --- a/src/views/modules/tooling/components/orderProperties.vue +++ b/src/views/modules/tooling/components/orderProperties.vue @@ -74,10 +74,7 @@