From 1c5af8d70b104baa683f246c2341e1f68fe2eae0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 九月 2024 14:03:24 +0800
Subject: [PATCH] 模型平台分组管理

---
 src/api/model/mpk/group.ts                   |    4 ++--
 src/views/model/mpk/menu/MenuForm.vue        |    9 +++------
 src/views/model/mpk/menu/group/index.vue     |    4 ++--
 src/views/model/mpk/menu/group/GroupForm.vue |    8 ++++++--
 src/views/model/mpk/menu/index.vue           |    8 ++++----
 src/views/model/mpk/icon/IconForm.vue        |    2 +-
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/api/model/mpk/group.ts b/src/api/model/mpk/group.ts
index 3da3e2c..82ef4f8 100644
--- a/src/api/model/mpk/group.ts
+++ b/src/api/model/mpk/group.ts
@@ -7,8 +7,8 @@
 }
 
 // 查询列表
-export const getList = () => {
-  return request.get({ url: '/model/mpk/group/list' })
+export const getList = (params) => {
+  return request.get({ url: '/model/mpk/group/list', params })
 }
 
 // 获得
diff --git a/src/views/model/mpk/icon/IconForm.vue b/src/views/model/mpk/icon/IconForm.vue
index cd59d02..13a4fba 100644
--- a/src/views/model/mpk/icon/IconForm.vue
+++ b/src/views/model/mpk/icon/IconForm.vue
@@ -14,7 +14,7 @@
         <el-input v-model="formData.iconDesc" placeholder="请输入图标描述" />
       </el-form-item>
       <el-form-item label="排序" prop="sort">
-        <el-input v-model="formData.sort" placeholder="请输入排序" />
+        <el-input-number v-model="formData.sort" :min="0" clearable controls-position="right" />
       </el-form-item>
 
     </el-form>
diff --git a/src/views/model/mpk/menu/MenuForm.vue b/src/views/model/mpk/menu/MenuForm.vue
index 55f58d9..7d6888c 100644
--- a/src/views/model/mpk/menu/MenuForm.vue
+++ b/src/views/model/mpk/menu/MenuForm.vue
@@ -7,14 +7,11 @@
       :rules="formRules"
       label-width="80px"
     >
-      <el-form-item label="图标名称" prop="iconName">
-        <el-input v-model="formData.iconName" placeholder="请输入图标名称" />
-      </el-form-item>
-      <el-form-item label="图标描述" prop="iconDesc">
-        <el-input v-model="formData.iconDesc" placeholder="请输入图标描述" />
+      <el-form-item label="菜单名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入菜单名称" />
       </el-form-item>
       <el-form-item label="排序" prop="sort">
-        <el-input v-model="formData.sort" placeholder="请输入排序" />
+        <el-input-number v-model="formData.sort" :min="0" clearable controls-position="right" />
       </el-form-item>
 
     </el-form>
diff --git a/src/views/model/mpk/menu/group/GroupForm.vue b/src/views/model/mpk/menu/group/GroupForm.vue
index ab2e5b2..cdfc001 100644
--- a/src/views/model/mpk/menu/group/GroupForm.vue
+++ b/src/views/model/mpk/menu/group/GroupForm.vue
@@ -11,7 +11,7 @@
         <el-input v-model="formData.name" placeholder="请输入分组名称" />
       </el-form-item>
       <el-form-item label="排序" prop="sort">
-        <el-input v-model="formData.sort" placeholder="请输入排序" />
+        <el-input-number v-model="formData.sort" :min="0" clearable controls-position="right" />
       </el-form-item>
 
     </el-form>
@@ -35,6 +35,7 @@
 const formType = ref('') // 表单的类型:create - 新增;update - 修改
 const formData = ref({
   id: undefined,
+  menuId: '',
   name: '',
   sort: undefined
 })
@@ -44,11 +45,14 @@
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, id?: string, menuId?: string) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  if (menuId) {
+    formData.value.menuId = menuId
+  }
   // 修改时,设置数据
   if (id) {
     formLoading.value = true
diff --git a/src/views/model/mpk/menu/group/index.vue b/src/views/model/mpk/menu/group/index.vue
index 30fcf85..85bd737 100644
--- a/src/views/model/mpk/menu/group/index.vue
+++ b/src/views/model/mpk/menu/group/index.vue
@@ -104,7 +104,7 @@
   loading.value = true
   try {
     const data = await MpkGroupApi.getList(queryParams)
-    list.value = data.list
+    list.value = data
   } finally {
     loading.value = false
   }
@@ -124,7 +124,7 @@
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: string) => {
-  formRef.value.open(type, id)
+  formRef.value.open(type, id, queryParams.menuId)
 }
 
 /** 删除按钮操作 */
diff --git a/src/views/model/mpk/menu/index.vue b/src/views/model/mpk/menu/index.vue
index 91fb49f..0578c7e 100644
--- a/src/views/model/mpk/menu/index.vue
+++ b/src/views/model/mpk/menu/index.vue
@@ -8,9 +8,9 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="模型名称" prop="iconName">
+      <el-form-item label="菜单名称" prop="name">
         <el-input
-          v-model="queryParams.iconName"
+          v-model="queryParams.name"
           placeholder="请输入名称"
           clearable
           class="!w-240px"
@@ -46,7 +46,7 @@
       :data="list"
       row-key="id"
     >
-      <el-table-column prop="name" label="名称"/>
+      <el-table-column prop="name" label="菜单名称"/>
       <el-table-column prop="sort" label="排序"/>
       <el-table-column label="操作" align="center" width="200px">
         <template #default="scope">
@@ -105,7 +105,7 @@
   loading.value = true
   try {
     const data = await MpkMenuApi.getList(queryParams)
-    list.value = data.list
+    list.value = data
   } finally {
     loading.value = false
   }

--
Gitblit v1.9.3