diff --git a/ui/dasadmin/src/views/backend/auth/model/index.vue b/ui/dasadmin/src/views/backend/auth/model/index.vue index 231d42ab..3a7b5498 100644 --- a/ui/dasadmin/src/views/backend/auth/model/index.vue +++ b/ui/dasadmin/src/views/backend/auth/model/index.vue @@ -32,7 +32,7 @@ @@ -285,7 +285,7 @@ @@ -308,7 +308,7 @@ @@ -441,36 +441,48 @@ const modelFormRules = { iotModelCode: [{ required: true, message: '请输入物模型编码', trigger: 'blur' }], objectType: [{ required: true, message: '请选择物模型类型', trigger: 'blur' }], } +const submitModelLoading = ref(false) const submitModelForm = () => { - if (modelDialogState.value === ModelDialogTitleStateType['add']) { - addModelReq(modelForm.value) - .then((res) => { - if (res.success) { - ElMessage.success('新增物模型成功') - modelDialogVisible.value = false - getModelList() - } else { - ElMessage.error(res.msg) - } - }) - .catch((err) => { - ElMessage.error(err?.response?.data?.msg ?? '新增失败') - }) - } else if (modelDialogState.value === ModelDialogTitleStateType['edit']) { - updateModelReq(modelForm.value) - .then((res) => { - if (res.success) { - ElMessage.success('修改物模型成功') - modelDialogVisible.value = false - getModelList() - } else { - ElMessage.error(res.msg) - } - }) - .catch((err) => { - ElMessage.error(err?.response?.data?.msg ?? '修改失败') - }) - } + modelFormRef.value?.validate((valid) => { + if (valid) { + submitModelLoading.value = true + if (modelDialogState.value === ModelDialogTitleStateType['add']) { + addModelReq(modelForm.value) + .then((res) => { + if (res.success) { + ElMessage.success('新增物模型成功') + modelDialogVisible.value = false + getModelList() + } else { + ElMessage.error(res.msg) + } + }) + .catch((err) => { + ElMessage.error(err?.response?.data?.msg ?? '新增失败') + }) + .finally(() => { + submitModelLoading.value = false + }) + } else if (modelDialogState.value === ModelDialogTitleStateType['edit']) { + updateModelReq(modelForm.value) + .then((res) => { + if (res.success) { + ElMessage.success('修改物模型成功') + modelDialogVisible.value = false + getModelList() + } else { + ElMessage.error(res.msg) + } + }) + .catch((err) => { + ElMessage.error(err?.response?.data?.msg ?? '修改失败') + }) + .finally(() => { + submitModelLoading.value = false + }) + } + } + }) } const getModelList = (name?: string) => { return new Promise((resolve) => { @@ -837,9 +849,11 @@ const closeAttributeForm = () => { attributeForm.value = JSON.parse(JSON.stringify(originAttributeForm)) attributeFormRef.value?.resetFields() } +const submitAttributeLoading = ref(false) const submitAttributeForm = () => { attributeFormRef.value?.validate((valid: boolean) => { if (valid) { + submitAttributeLoading.value = true const copyFormData = JSON.parse(JSON.stringify(attributeForm.value)) copyFormData.highSpeed = copyFormData.highSpeed ? 1 : 0 copyFormData.visible = copyFormData.visible ? 1 : 0 @@ -864,6 +878,9 @@ const submitAttributeForm = () => { .catch((err) => { ElMessage.error(err?.response?.data?.msg ?? '新增失败') }) + .finally(() => { + submitAttributeLoading.value = false + }) } else if (attributeFormTitle.value === AttributeDialogTitleStateType['edit']) { updateModelAttributeReq(copyFormData) .then((res) => { @@ -878,6 +895,9 @@ const submitAttributeForm = () => { .catch((err) => { ElMessage.error(err?.response?.data?.msg ?? '修改失败') }) + .finally(() => { + submitAttributeLoading.value = false + }) } } }) @@ -905,9 +925,11 @@ const closeServiceForm = () => { serviceForm.value = JSON.parse(JSON.stringify(originServiceForm)) serviceFormRef.value?.resetFields() } +const submitServiceLoading = ref(false) const submitServiceForm = () => { serviceFormRef.value?.validate((valid: boolean) => { if (valid) { + submitServiceLoading.value = true if (serviceFormTitle.value === serviceDialogTitleStateType['add']) { serviceForm.value.iotModelId = curContextMenuTreeData.value!.id! addModelServiceReq(serviceForm.value) @@ -923,6 +945,9 @@ const submitServiceForm = () => { .catch((err) => { ElMessage.error(err?.response?.data?.msg ?? '新增失败') }) + .finally(() => { + submitServiceLoading.value = false + }) } else if (serviceFormTitle.value === serviceDialogTitleStateType['edit']) { updateModelServiceReq(serviceForm.value) .then((res) => { @@ -937,6 +962,9 @@ const submitServiceForm = () => { .catch((err) => { ElMessage.error(err?.response?.data?.msg ?? '修改失败') }) + .finally(() => { + submitServiceLoading.value = false + }) } } }) diff --git a/ui/dasadmin/src/views/backend/historyData/index.vue b/ui/dasadmin/src/views/backend/historyData/index.vue index ba4a829d..9760941d 100644 --- a/ui/dasadmin/src/views/backend/historyData/index.vue +++ b/ui/dasadmin/src/views/backend/historyData/index.vue @@ -67,7 +67,7 @@
风机列表
- +