From 0b619fe937c6d39dac5e4a67258df688b73ad16e Mon Sep 17 00:00:00 2001
From: xuziqiang <1344691446@qq.com>
Date: Tue, 16 Jul 2024 15:22:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/view/equipmentManage/group/config.ts       | 1 +
 hx-ai-intelligent/src/view/equipmentManage/group/edit.vue        | 5 ++++-
 hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue     | 5 ++++-
 hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue | 6 +++++-
 hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue   | 4 ++++
 hx-ai-intelligent/src/view/equipmentManage/group/index.vue       | 4 ----
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
index 5288eeb..be69c2c 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
@@ -227,6 +227,7 @@ export const tableConfig = (el, elGroup, elFormula, defaultParams) => {
         label: '编辑',
         name: 'groupEdit',
         type: 'primary',
+        dynamicDisabled: () => !defaultParams.value?.id,
         handle: (a, b) => {
           el.value.toggle();
         },
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue b/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue
index f9785ef..455cc0f 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue
@@ -59,7 +59,10 @@
 
   const btnClick = () => {
     // visible.value = false;
-
+    if (!currentId.value) {
+      NsMessage.warn('请先选择公司');
+      return;
+    }
     http
       .post(group.saveGroupList, {
         ...props.params,
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue
index 5d29b12..f60b997 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue
@@ -60,7 +60,10 @@
   };
 
   const btnClick = () => {
-    // visible.value = false;
+    if (!currentId.value) {
+      NsMessage.warn('请先选择公司');
+      return;
+    }
 
     http
       .post(group.saveComputeList, {
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue
index 905f7fa..8ab2a97 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue
@@ -2,7 +2,7 @@
   <ns-drawer
     v-model:visible="visible"
     width="520"
-    title="公式编辑"
+    title=" "
     :ok="btnClick"
     :cancel="() => (visible = false)"
     placement="right">
@@ -140,6 +140,10 @@
   ];
 
   const btnClick = () => {
+    if (!model.value?.formula) {
+      NsMessage.warn('请填写公式');
+      return;
+    }
     http
       .post(group.formula, {
         ...props.params,
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue
index 85ef207..6240169 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue
@@ -267,6 +267,10 @@
   };
 
   const btnClick = () => {
+    if (!selectedRowKeys.value[0]) {
+      NsMessage.warn('请选择分组');
+      return;
+    }
     http
       .post(group.saveComputeGroupInfo, {
         ...props.params,
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
index 7eb9cd3..0ee490a 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
@@ -5,10 +5,6 @@
   <editGroup ref="editGroupRef" :params="defaultParams" @sure="handleOk" />
   <editFormula ref="editFormulaRef" :params="defaultParams" @sure="handleOk" />
 
-  <!-- <ns-modal ref="modalRef" title="新增" v-model:visible="visible">
-    <ns-form ref="formRef" :schemas="formSchema" :model="formData" formLayout="formVertical" />
-  </ns-modal> -->
-
   <NsModalFrom ref="modalFormRef" v-bind="nsModalFormConfig" />
   <div class="groupContainer">
     <div class="tree">