From 8b4cbb1eded3444bb7248e983da5f1d95369e41e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Wed, 22 Jan 2025 09:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=EF=BC=9A=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=8A=A0=E8=BD=BD=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=20=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=EF=BC=9A=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8B=E6=95=B0=E6=8D=AE=E9=99=90=E5=88=B6=E5=8D=95=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/auth/model/index.vue    | 92 ++++++++++++-------
 .../src/views/backend/historyData/index.vue   |  2 +-
 2 files changed, 61 insertions(+), 33 deletions(-)

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 @@
                 </el-form-item>
             </el-form>
             <template #footer v-if="modelDialogState !== ModelDialogTitleStateType['detail']">
-                <el-button type="primary" @click="submitModelForm">保存</el-button>
+                <el-button type="primary" @click="submitModelForm" :loading="submitModelLoading">保存</el-button>
                 <el-button @click="cancelModelForm">取消</el-button>
             </template>
         </el-dialog>
@@ -285,7 +285,7 @@
                 </el-form-item>
             </el-form>
             <template #footer>
-                <el-button type="primary" @click="submitAttributeForm">保存</el-button>
+                <el-button type="primary" @click="submitAttributeForm" :loading="submitAttributeLoading">保存</el-button>
                 <el-button @click="closeAttributeForm">取消</el-button>
             </template>
         </el-dialog>
@@ -308,7 +308,7 @@
                 </el-form-item>
             </el-form>
             <template #footer>
-                <el-button type="primary" @click="submitServiceForm">保存</el-button>
+                <el-button type="primary" @click="submitServiceForm" :loading="submitServiceLoading">保存</el-button>
                 <el-button @click="closeServiceForm">取消</el-button>
             </template>
         </el-dialog>
@@ -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 @@
                     <div class="pointDialogColTitle">风机列表</div>
                     <div class="pointDialogColContent">
                         <el-scrollbar>
-                            <el-checkbox-group v-model="selectWindBlower">
+                            <el-checkbox-group v-model="selectWindBlower" :max="searchData.interval === 'NONE' ? 1 : 99">
                                 <el-checkbox
                                     v-for="v in windBlowerOptions"
                                     :key="v.value"