From 08d4018e84039c5a9d400790704fa931afdc861b Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期三, 31 七月 2024 23:18:01 +0800 Subject: [PATCH] 模板变量维护更新 --- src/views/tigerprojects/mes/eng/route/index.vue | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/views/tigerprojects/mes/eng/route/index.vue b/src/views/tigerprojects/mes/eng/route/index.vue index 7c9646d..4040672 100644 --- a/src/views/tigerprojects/mes/eng/route/index.vue +++ b/src/views/tigerprojects/mes/eng/route/index.vue @@ -113,6 +113,8 @@ const IsOperation = ref(false); const title = ref(''); const posttitle = ref(''); + let _num = 1; + let _numEdge = 1; watch( () => props.rotId, (v) => { @@ -187,7 +189,7 @@ ROT_VER: currRoute.value.ROT_VER, IS_ACTIVE: currRoute.value.IS_ACTIVE, REMARK: currRoute.value.REMARK, - AUTH_ORG: '', + AUTH_ORG: useUserStore().getUserInfo.orgCode, AUTH_PROD: '', AUTH_WH: '', }, @@ -197,7 +199,6 @@ }; var _nodes = unref(lf).getGraphData().nodes as node[]; var _edges = unref(lf).getGraphData().edges as edge[]; - var _num = 1; const diffnodes = routeConfig.routeData.nodes.filter((itemA) => _nodes.some((itemB) => itemB.id === itemA.ID), ); @@ -223,7 +224,7 @@ GPH_PROP: JSON.stringify(n.properties), GPH_TEXT: n.text.value, REMARK: a.REMARK, - AUTH_ORG: '', + AUTH_ORG: useUserStore().getUserInfo.orgCode, AUTH_PROD: '', AUTH_WH: '', OPTION_1: '', @@ -234,6 +235,7 @@ ACT_NAME: isNullOrEmpty(a.ACT_NAME) ? `${n.text.value}_${_num}` : a.ACT_NAME, ACT_CODE: a.ACT_CODE, NEED_SETUP: a.NEED_SETUP, + NEED_RESET: a.NEED_RESET, NODE_ID: a.NODE_ID, ACT_TYPE: a.ACT_TYPE, // DO_TYPE: a.DO_TYPE, @@ -279,7 +281,7 @@ IS_CALC_FPY: nd.IS_CALC_FPY, CAN_SKIP: nd.CAN_SKIP, REMARK: nd.REMARK, - AUTH_ORG: '', + AUTH_ORG: useUserStore().getUserInfo.orgCode, AUTH_PROD: '', AUTH_WH: '', IS_FIRST_NODE: 'N', @@ -329,7 +331,7 @@ GPH_PROP: JSON.stringify(e.properties), GPH_POTS: JSON.stringify(e.pointsList), REMARK: '', - AUTH_ORG: '', + AUTH_ORG: useUserStore().getUserInfo.orgCode, AUTH_PROD: '', AUTH_WH: '', EDGE_TYPE: 0, @@ -342,6 +344,7 @@ }; routeConfig.routeData.edges.push(edge); currRotData.edges.push(edge); + _numEdge++; }); return currRotData; }; @@ -425,7 +428,7 @@ UPDATE_TIME: currRoute.value.UPDATE_TIME, UPDATE_USER: useUserStore().getUserInfo.userId as string, GHOST_ROW: false, - NODE_NAME: `${selectnode.value.text.value}_0`, + NODE_NAME: `${selectnode.value.text.value}_${_num}`, ROT_ID: currRoute.value.ID, SEGMENT: '', OPER_CODE: selectnode.value.type, @@ -438,7 +441,7 @@ IS_CALC_FPY: 'N', CAN_SKIP: 'N', REMARK: '', - AUTH_ORG: '', + AUTH_ORG: useUserStore().getUserInfo.orgCode, AUTH_PROD: '', AUTH_WH: '', IS_FIRST_NODE: '', @@ -452,6 +455,7 @@ node: {} as node, }; routeConfig.routeData.nodes.push(_node); + _num++; } //鏄涓� if ( @@ -471,10 +475,10 @@ UPDATE_TIME: currRoute.value.UPDATE_TIME, UPDATE_USER: useUserStore().getUserInfo.userId as string, GHOST_ROW: false, - AUTH_ORG: '', + AUTH_ORG: useUserStore().getUserInfo.orgCode, AUTH_PROD: '', AUTH_WH: '', - ACT_NAME: `${selectnode.value.text.value}_0`, + ACT_NAME: `${selectnode.value.text.value}_${_numEdge}`, ACT_CODE: '', ROT_ID: currRoute.value.ID, NODE_ID: '', @@ -484,7 +488,8 @@ GPH_Y: selectnode.value.y, GPH_PROP: JSON.stringify(selectnode.value.properties), GPH_TEXT: selectnode.value.text.value, - NEED_SETUP: 0, + NEED_SETUP: 'Y', + NEED_RESET: 'N', // DO_TYPE: 0, // DO_METHOD: '', // DO_IF_PASS: '', @@ -499,6 +504,7 @@ node: {} as node, }; routeConfig.routeData.acts.push(_act); + _numEdge++; } routeConfig.currentAct = { ID: selectnode.value.id, @@ -507,9 +513,9 @@ UPDATE_TIME: currRoute.value.UPDATE_TIME, UPDATE_USER: useUserStore().getUserInfo.userId as string, GHOST_ROW: false, - AUTH_ORG: '', - AUTH_PROD: '', - AUTH_WH: '', + AUTH_ORG: _act.AUTH_ORG, + AUTH_PROD: _act.AUTH_PROD, + AUTH_WH: _act.AUTH_WH, ACT_NAME: _act.ACT_NAME, ACT_CODE: _act.ACT_CODE, ROT_ID: currRoute.value.ID, @@ -521,6 +527,7 @@ GPH_PROP: JSON.stringify(selectnode.value.properties), GPH_TEXT: selectnode.value.text.value, NEED_SETUP: _act.NEED_SETUP, + NEED_RESET: _act.NEED_RESET, // DO_TYPE: _act.DO_TYPE, // DO_METHOD: _act.DO_METHOD, // DO_IF_PASS: _act.DO_IF_PASS, @@ -546,6 +553,9 @@ UPDATE_TIME: currRoute.value.UPDATE_TIME, UPDATE_USER: useUserStore().getUserInfo.userId as string, GHOST_ROW: false, + AUTH_ORG: _node.AUTH_ORG, + AUTH_PROD: _node.AUTH_PROD, + AUTH_WH: _node.AUTH_WH, NODE_NAME: _node.NODE_NAME ?? '', ROT_ID: currRoute.value.ID, SEGMENT: _node.SEGMENT, -- Gitblit v1.9.3