diff --git a/src/api/data/simulationParameterLibrary.ts b/src/api/data/simulationParameterLibrary.ts index 195ab030..6b2a62f2 100644 --- a/src/api/data/simulationParameterLibrary.ts +++ b/src/api/data/simulationParameterLibrary.ts @@ -69,3 +69,7 @@ export const editSimulationParameterApi = (params: any) => { export const updateSimulationParameterValuesApi = (params: any) => { return post(`${PREFIX}simulationParameterLibrary/updateSimulationParameterValues`, params); }; +// 判断下级是否有参数对象 +export const hasParameterObjectApi = (params: any) => { + return get(`${PREFIX}simulationParameterLibrary/hasParameterObject`, params); +}; diff --git a/src/components/common/table/tableFormDia.vue b/src/components/common/table/tableFormDia.vue index c789e8b8..c8bfc017 100644 --- a/src/components/common/table/tableFormDia.vue +++ b/src/components/common/table/tableFormDia.vue @@ -24,6 +24,7 @@ @@ -150,19 +152,20 @@ const actionList = ref([ // }); const addOrEditNode = async () => { - loadingInterface.value = true; - if (props.dialogType === 'create') { - // emits('completeFun', 'nodePage'); - await addNodeDisposeFun(nodeTableList.value); - } else { - await editNodeDisposeFun(); - } - if (deleteIdList.value.length > 0) { - await deleteNodeFun(); - } - loadingInterface.value = false; - closeNodeListFun(); - emits('completeFun', 'phasePage'); + // 不在保存时修改,这里导致了bug977 + // loadingInterface.value = true; + // if (props.dialogType === 'create') { + // // emits('completeFun', 'nodePage'); + // await addNodeDisposeFun(nodeTableList.value); + // } else { + // await editNodeDisposeFun(); + // } + // if (deleteIdList.value.length > 0) { + // await deleteNodeFun(); + // } + // loadingInterface.value = false; + closeNodeListFun(); // 关闭阶段信息弹窗 + emits('completeFun', 'phasePage'); // 点击完成 主页的阶段列表刷新 }; const addNodeDisposeFun = async (addList: any[]) => { @@ -312,11 +315,27 @@ const addOrEditOneNodeFun = async () => { return item; }); } - baseTableRef.value?.setDataFun(nodeTableList.value); + // 即时调接口 + if (props.dialogType === 'create') { + // emits('completeFun', 'nodePage'); + await addNodeDisposeFun(nodeTableList.value); + } else { + await editNodeDisposeFun(); + } + nodeListApi(); // 刷新列表,不然新增的节点id没有入库,无法编辑和删除 + // baseTableRef.value?.setDataFun(nodeTableList.value); closeNodeFormFun(); } }; +watch( + () => nodeTableList.value, + () => { + deleteIdList.value = []; + }, + { deep: true } +); + const validSameName = (fromData: { nodeName: string; id: any }) => { if ( nodeTableList.value.some((item) => { @@ -331,12 +350,15 @@ const validSameName = (fromData: { nodeName: string; id: any }) => { const deleteIdList = ref>([]); -const disposeDeleteListFun = ({ type, uuid }: { type: string; uuid: string }) => { +const disposeDeleteListFun = async ({ type, uuid }: { type: string; uuid: string }) => { if (type !== 'add') { deleteIdList.value.push(uuid); } - nodeTableList.value = nodeTableList.value.filter((item) => item.uuid !== uuid); - baseTableRef.value?.setDataFun(nodeTableList.value); + if (deleteIdList.value.length > 0) { + await deleteNodeFun(); + } + // nodeTableList.value = nodeTableList.value.filter((item) => item.uuid !== uuid); + // baseTableRef.value?.setDataFun(nodeTableList.value); }; const deleteNodeFun = async () => { @@ -344,9 +366,10 @@ const deleteNodeFun = async () => { const res: any = await deleteNodeApi({ deleteNodeIdList: deleteIdList.value }); if (res && res.code === 200) { ElMessage.success('删除节点成功'); + deleteIdList.value = []; nodeListApi(); } else { - ElMessage.error(res.message || '删除节点失败'); + deleteIdList.value = []; } }; @@ -372,7 +395,7 @@ const nodeListApi = async () => { } else { nodeTableList.value = []; } - baseTableRef.value?.setDataFun(nodeTableList.value); + // baseTableRef.value?.setDataFun(nodeTableList.value); }; // const disabledDateFun = (time:string, type:string) => { @@ -408,7 +431,7 @@ watch( if (props.dialogType === 'create') { if (nodeTableList.value.length === 0) { getDictPhaseList(); - baseTableRef.value?.setDataFun(nodeTableList.value); + // baseTableRef.value?.setDataFun(nodeTableList.value); } } }); diff --git a/src/views/data/overview/components/configuration.vue b/src/views/data/overview/components/configuration.vue index f84279b5..994f3254 100644 --- a/src/views/data/overview/components/configuration.vue +++ b/src/views/data/overview/components/configuration.vue @@ -112,6 +112,7 @@ import AddConfigurationDia from './addConfigurationDia.vue'; import type { TabPaneName } from 'element-plus'; import { NODE_TYPE } from '@/utils/enum/node'; import Dialog from '@/components/common/dialog/index.vue'; +import { useDict } from '@/utils/useDict'; interface SelectLevelItem { name: string; @@ -154,6 +155,7 @@ const editableTabs = ref([]); const selectLevelFormRef = ref({}); const addDiaVisible = ref(false); const treeKey = ref(+new Date()); +const { POOL_CATEGORY_TYPE } = useDict('POOL_CATEGORY_TYPE'); const options = ref([ { label: '项目', @@ -163,14 +165,8 @@ const options = ref([ label: '阶段', value: NODE_TYPE.PHASE, }, - { - label: '机台', - value: 'machine', - }, - { - label: '工位', - value: 'workspace', - }, + // 应该读字典 POOL_CATEGORY_TYPE + ...POOL_CATEGORY_TYPE.value.A, ]); // ***************** 维度名称编辑功能 start ***************** diff --git a/src/views/simulation/parameter/components/addParamLib.vue b/src/views/simulation/parameter/components/addParamLib.vue index a617f49f..558c1a1c 100644 --- a/src/views/simulation/parameter/components/addParamLib.vue +++ b/src/views/simulation/parameter/components/addParamLib.vue @@ -10,7 +10,7 @@ @@ -33,11 +33,13 @@ const closeFun = () => { emits('close'); }; +const confirmLoading = ref(false); const onConfirmFun = () => { if (!formData.value.parameterLibraryName) { ElMessage.warning('请输入参数库名称!'); return; } else { + confirmLoading.value = true; emits('createFun', formData.value); } }; diff --git a/src/views/simulation/parameter/index.vue b/src/views/simulation/parameter/index.vue index caa808cd..8b73c824 100644 --- a/src/views/simulation/parameter/index.vue +++ b/src/views/simulation/parameter/index.vue @@ -20,13 +20,14 @@
{{ data.name }}
-
+ +
-
+
@@ -43,7 +44,7 @@ ref="paramTableRef" tableName="PARAMETER_LIST" hidePagination - :actionList="actionList" + :actionList="currentNode.shenpi ? [] : actionList" >