From 546696d86afc88faf6ea966a2b058a771c3ae490 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 31 Oct 2024 19:48:38 +0800
Subject: [PATCH] =?UTF-8?q?dictData=E6=9C=AA=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/system/dictionary/dictData/index.ts   |  28 +++
 frontend/src/views/system/dictionary/data.vue | 223 ++++++++----------
 .../dictData/components/dataPopup.vue         |   6 +
 .../system/dictionary/dictData/index.vue      |   9 +
 .../dictType/components/typePopup.vue         |  12 +
 .../system/dictionary/dictType/index.vue      |  25 +-
 6 files changed, 157 insertions(+), 146 deletions(-)
 create mode 100644 frontend/src/views/system/dictionary/dictData/components/dataPopup.vue

diff --git a/frontend/src/api/system/dictionary/dictData/index.ts b/frontend/src/api/system/dictionary/dictData/index.ts
index e69de29..bee0146 100644
--- a/frontend/src/api/system/dictionary/dictData/index.ts
+++ b/frontend/src/api/system/dictionary/dictData/index.ts
@@ -0,0 +1,28 @@
+import http from '@/api'
+import {type Dict} from '@/api/system/dictionary/interface'
+
+//获取字典数据
+export const getDictDataListByTypeId = (params: Dict.ReqDictDataParams) => {
+    return http.post(`/dictData/listByTypeId`, params)
+}
+
+//添加字典数据
+export const addDictData = (params: Dict.ResDictData) => {
+    return http.post(`/dictData/add`, params)
+}
+
+//编辑字典数据
+export const updateDictData = (params: Dict.ResDictData) => {
+    return http.post(`/dictData/update`, params)
+}
+
+//删除字典数据
+export const deleteDictData = (params: string[]) => {
+    return http.post(`/dictData/delete`, params)
+}
+
+export const getDicDataById = (params: string) => {
+    return http.post('/dictData/getDicDataById', params)
+}
+
+
diff --git a/frontend/src/views/system/dictionary/data.vue b/frontend/src/views/system/dictionary/data.vue
index 2546342..873fbe3 100644
--- a/frontend/src/views/system/dictionary/data.vue
+++ b/frontend/src/views/system/dictionary/data.vue
@@ -1,14 +1,15 @@
 <template>
-  <el-dialog class='table-box' v-model='dialogVisible1' top='114px'
-    :style="{ height: height, maxHeight: height, overflow: 'hidden' }" :title='title1' :width='width' :modal='false'>
-    <div class="table-box">
+  <div class="table-box">
+    <el-dialog class='table-box' v-model='dialogVisible1' top='114px'
+               :style="{ height: height, maxHeight: height, overflow: 'hidden' }" :title='title1' :width='width'
+               :modal='false'>
       <ProTable :columns="columns" :data="data">
         <template #tableHeader="scope">
           <el-button type="primary" :icon="CirclePlus" @click="openDrawer('新增')">新增</el-button>
           <el-button type="primary" :icon="Upload" plain @click="batchAdd">批量添加</el-button>
           <el-button type="primary" :icon="Download" plain @click="downloadFile">导出</el-button>
           <el-button type="danger" :icon="Delete" plain :disabled="!scope.isSelected"
-            @click="batchDelete(scope.selectedListIds)">
+                     @click="batchDelete(scope.selectedListIds)">
             批量删除
           </el-button>
         </template>
@@ -18,25 +19,26 @@
           <el-button type="primary" link :icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </ProTable>
-    </div>
-  </el-dialog>
-  <el-dialog v-model="dialogVisible2" :title="dialogType2 === '新增' ? '新增字典数据' : '编辑字典数据'" v-bind="dialogSmall">
+    </el-dialog>
+  </div>
+  <el-dialog v-model="dialogVisible2" :title="dialogTitle"
+             v-bind="dialogSmall">
     <div>
-      <el-form :model="dialogForm" ref="dialogFormRef" :rules="rules">
+      <el-form :model="formContent" ref="dialogFormRef" :rules="rules">
         <el-form-item label="字典类型编码" :label-width="100">
-          <el-input :value="route.params.code" disabled />
+          <el-input :value="route.params.code" disabled/>
         </el-form-item>
         <el-form-item label="名称" :label-width="100" prop="name">
-          <el-input v-model="dialogForm.name" placeholder="请输入" autocomplete="off" />
+          <el-input v-model="formContent.name" placeholder="请输入" autocomplete="off"/>
         </el-form-item>
         <el-form-item label="编码" :label-width="100" prop="code">
-          <el-input v-model="dialogForm.code" placeholder="请输入" autocomplete="off" />
+          <el-input v-model="formContent.code" placeholder="请输入" autocomplete="off"/>
         </el-form-item>
         <el-form-item label="值" :label-width="100" prop="value">
-          <el-input v-model="dialogForm.value" placeholder="请输入" autocomplete="off" />
+          <el-input v-model="formContent.value" placeholder="请输入" autocomplete="off"/>
         </el-form-item>
         <el-form-item label="显示排序" :label-width="100">
-          <el-input-number v-model="dialogForm.sort" />
+          <el-input-number v-model="formContent.sort"/>
         </el-form-item>
       </el-form>
     </div>
@@ -52,25 +54,24 @@
 </template>
 
 <script setup lang="tsx" name="dictData">
-import { useRoute } from 'vue-router'
-import { CirclePlus, Delete, EditPen, Download, Upload } from '@element-plus/icons-vue'
-import { Dict } from '@/api/system/dictionary/interface'
-import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
+import {useRoute} from 'vue-router'
+import {CirclePlus, Delete, EditPen, Download, Upload} from '@element-plus/icons-vue'
+import {Dict} from '@/api/system/dictionary/interface'
+import {ProTableInstance, ColumnProps} from '@/components/ProTable/interface'
 import ImportExcel from '@/components/ImportExcel/index.vue'
-import { dialogSmall } from '@/utils/elementBind'
-import { useDictStore } from '@/stores/modules/dict'
-import { useHandleData } from '@/hooks/useHandleData'
-import { useDownload } from '@/hooks/useDownload'
-import { dictDataList } from '@/api/system/dictionary/dictExample'
-import { FormItemRule } from 'element-plus'
+import {dialogSmall} from '@/utils/elementBind'
+import {useDictStore} from '@/stores/modules/dict'
+import {useHandleData} from '@/hooks/useHandleData'
+import {useDownload} from '@/hooks/useDownload'
+import {dictDataList} from '@/api/system/dictionary/dictExample'
+import {FormItemRule} from 'element-plus'
 import {
-  getDictDataList,
-  updateDictData,
+  getDictDataListByTypeId,
   addDictData,
-  batchAddDictData,
-  exportDictData,
-  deleteDictData
-} from '@/api/system/dictionary'
+  updateDictData,
+  deleteDictData,
+  getDicDataById
+} from "@/api/system/dictionary/dictData";
 
 const route = useRoute()
 
@@ -83,9 +84,20 @@ const dialogVisible1 = ref(false)
 const title1 = ref('')
 const dialogFormRef = ref()
 
+const props = defineProps({
+  width: {
+    type: String,
+    default: '800px',
+  },
+  height: {
+    type: String,
+    default: '744px',
+  },
+})
+
 const columns = reactive<ColumnProps<Dict.ResDictData>[]>([
-  { type: 'selection', fixed: 'left', width: 70 },
-  { type: 'index', fixed: 'left', width: 70, label: '序号' },
+  {type: 'selection', fixed: 'left', width: 70},
+  {type: 'index', fixed: 'left', width: 70, label: '序号'},
   {
     prop: 'name',
     label: '名称',
@@ -110,87 +122,58 @@ const columns = reactive<ColumnProps<Dict.ResDictData>[]>([
   {
     prop: 'level',
     label: '事件等级',
-    width: 120,
+    width: 180,
     render: scope => {
       return (
-        <>
-          {scope.row.level === 0 || scope.row.level === null || scope.row.level === undefined ?
-            (<span>—</span>) :
-            (<el-tag type={scope.row.level === 1 ? 'info' : scope.row.level === 2 ? 'warning' : 'danger'}>
-              {scope.row.level === 1 ? '普通' : scope.row.level === 2 ? '警告' : '危险'}
-            </el-tag>)
-          }
-        </>
+          <>
+            {scope.row.level === 0 || scope.row.level === null || scope.row.level === undefined ?
+                (<span>—</span>) :
+                (<el-tag type={scope.row.level === 1 ? 'info' : scope.row.level === 2 ? 'warning' : 'danger'}>
+                  {scope.row.level === 1 ? '普通' : scope.row.level === 2 ? '警告' : '危险'}
+                </el-tag>)
+            }
+          </>
       )
     }
   },
-  {
-    prop: 'state',
-    label: '状态',
-    minWidth: 100,
-    enum: dictStore.getDictData('status'),
-    search: {
-      el: 'tree-select',
-      props: { filterable: true }
-    },
-    fieldNames: { label: 'label', value: 'code' },
-    render: scope => {
-      return (
-        <>
-          {
-            <el-tag type={scope.row.state ? 'success' : 'danger'} > {scope.row.state ? '正常' : '禁用'} </el-tag>
-          }
-        </>
-      )
-    },
-  },
   {
     prop: 'createTime',
     label: '创建时间',
-    width: 180,
-    search: {
-      el: 'date-picker',
-      props: { type: 'daterange', valueFormat: 'YYYY-MM-DD' }
-    }
+    width: 180
   },
   {
     prop: 'operation',
     label: '操作',
     fixed: 'right',
-    width: 330
+    minWidth: 300
   },
 ])
-const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
-  name: [{ required: true, message: '类型名称必填！', trigger: 'blur' }],
-  code: [{ required: true, message: '类型编码必填！', trigger: 'blur' }],
-  value: [{ required: true, message: '类型值必填！', trigger: 'blur' }],
-})
 
-const { dialogVisible2, dialogType2, dialogForm } = useCount();
-function useCount() {
+const {dialogVisible2, titleType2, formContent} = useMetaInfo();
+function useMetaInfo() {
   const dialogVisible2 = ref(false)
-  const dialogType2 = ref('新增')
+  const titleType2 = ref('add')
 
-  const dialogForm = ref({
+  const formContent = ref<Dict.ResDictData>({
     id: "",
+    typeId:"",
     name: "",
     code: "",
     value: "",
     sort: 100,
+    state:1,
   })
 
-  return { dialogVisible2, dialogType2, dialogForm };
+  return {dialogVisible2, titleType2, formContent};
 }
 
-const props = defineProps({
-  width: {
-    type: String,
-    default: '800px',
-  },
-  height: {
-    type: String,
-    default: '744px',
-  },
+let dialogTitle = computed(() => {
+  return titleType2.value === 'add' ? '新增字典类型' : '编辑字典类型'
+})
+const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+  name: [{required: true, message: '类型名称必填！', trigger: 'blur'}],
+  code: [{required: true, message: '类型编码必填！', trigger: 'blur'}],
+  value: [{required: true, message: '类型值必填！', trigger: 'blur'}],
 })
 
 const open = (textTitle: string, id: string) => {
@@ -202,59 +185,53 @@ const open = (textTitle: string, id: string) => {
   // }
 }
 
-defineExpose({ open })
+defineExpose({open})
 
 // 打开 drawer(新增、查看、编辑)
 const openDrawer = (title: string, row: Partial<Dict.ResDictType> = {}) => {
   dialogVisible2.value = true
-  dialogType2.value = title
+  titleType2.value = title
   if (title === '编辑') {
-    row && (dialogForm.value = row as { id: string; name: string; code: string; value: string; sort: number; state: number; });
+    row && (formContent.value = row as {
+      id: "",
+      typeId:"",
+      name: "",
+      code: "",
+      value: "",
+      sort: 100,
+      state:1,
+    });
   }
 }
 
-// 批量添加字典数据
-const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
-const batchAdd = () => {
-  const params = {
-    title: '字典数据',
-    tempApi: exportDictData,
-    importApi: batchAddDictData,
-    getTableList: proTable.value?.getTableList,
-  }
-  dialogRef.value?.acceptParams(params)
-}
-
-// 导出字典数据
-const downloadFile = async () => {
-  ElMessageBox.confirm('确认导出字典数据?', '温馨提示', { type: 'warning' }).then(() =>
-    useDownload(exportDictData, '字典数据列表', proTable.value?.searchParam),
-  )
-}
-
 // 批量删除字典数据
 const batchDelete = async (id: string[]) => {
-  await useHandleData(deleteDictData, { id }, '删除所选字典数据')
+  await useHandleData(deleteDictData, {id}, '删除所选字典数据')
   proTable.value?.clearSelection()
   proTable.value?.getTableList()
 }
 
 // 删除字典数据
 const handleDelete = async (params: Dict.ResDictType) => {
-  await useHandleData(deleteDictData, { id: [params.id] }, `删除【${params.name}】字典数据`)
+  await useHandleData(deleteDictData, {id: [params.id]}, `删除【${params.name}】字典数据`)
   proTable.value?.getTableList()
 }
 
+const resetFormContent = () => {
+  formContent.value = {
+    id: "",
+    typeId:"",
+    name: "",
+    code: "",
+    value: "",
+    sort: 100,
+    state:1,
+  }
+}
+
 const close = () => {
   dialogVisible2.value = false
-  //清空dialogForm中的值
-  dialogForm.value = {
-    id: "",
-    name: "",
-    code: "",
-    value: "",
-    sort: 100
-  }
+  resetFormContent()
   dialogFormRef.value?.resetFields()
 }
 
@@ -262,13 +239,15 @@ const save = () => {
   try {
     dialogFormRef.value?.validate(async (valid: boolean) => {
       if (valid) {
-        let params = JSON.stringify(dialogForm.value)
-        console.log(params)
-        if (dialogType2.value === '新增') {
-          await useHandleData(addDictData, dialogForm.value, '新增字典数据')
+        let params = JSON.stringify(formContent.value)
+        if (formContent.value.id) {
+          await updateDictData(formContent.value)
+          // await useHandleData(addDictData, formContent.value, '新增字典数据')
         } else {
-          await useHandleData(updateDictData, dialogForm.value, '编辑字典数据')
+          await addDictData(formContent.value)
+         // await useHandleData(updateDictData, formContent.value, '编辑字典数据')
         }
+        ElMessage.success({ message: `${dialogTitle.value}成功！` })
         close()
         proTable.value?.getTableList()
       } else {
diff --git a/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue b/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue
new file mode 100644
index 0000000..67af5df
--- /dev/null
+++ b/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue
@@ -0,0 +1,6 @@
+<template>
+
+</template>
+<script lang="tsx" setup>
+
+</script>
\ No newline at end of file
diff --git a/frontend/src/views/system/dictionary/dictData/index.vue b/frontend/src/views/system/dictionary/dictData/index.vue
index e69de29..7a7423f 100644
--- a/frontend/src/views/system/dictionary/dictData/index.vue
+++ b/frontend/src/views/system/dictionary/dictData/index.vue
@@ -0,0 +1,9 @@
+<template>
+
+</template>
+<script lang="tsx" setup>
+
+
+
+
+</script>
\ No newline at end of file
diff --git a/frontend/src/views/system/dictionary/dictType/components/typePopup.vue b/frontend/src/views/system/dictionary/dictType/components/typePopup.vue
index ea60098..f6364e5 100644
--- a/frontend/src/views/system/dictionary/dictType/components/typePopup.vue
+++ b/frontend/src/views/system/dictionary/dictType/components/typePopup.vue
@@ -8,6 +8,18 @@
         <el-form-item label='类型编码' :label-width='100' prop='code'>
           <el-input v-model='formContent.code' placeholder='请输入' autocomplete='off' />
         </el-form-item>
+        <el-form-item label="开启等级" :label-width="100">
+          <el-radio-group v-model="formContent.openLevel" size="medium">
+            <el-radio-button label="开启" :value="1"></el-radio-button>
+            <el-radio-button label="关闭" :value="0"></el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="开启描述" :label-width="100">
+          <el-radio-group v-model="formContent.openDescribe" size="medium">
+            <el-radio-button label="开启" :value="1"></el-radio-button>
+            <el-radio-button label="关闭" :value="0"></el-radio-button>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label='显示排序' :label-width='100'>
           <el-input-number v-model='formContent.sort' />
         </el-form-item>
diff --git a/frontend/src/views/system/dictionary/dictType/index.vue b/frontend/src/views/system/dictionary/dictType/index.vue
index 29aed39..d97df93 100644
--- a/frontend/src/views/system/dictionary/dictType/index.vue
+++ b/frontend/src/views/system/dictionary/dictType/index.vue
@@ -68,35 +68,12 @@ const columns = reactive<ColumnProps<Dict.ResDictType>[]>([
   {
     prop: 'remark',
     label: '描述',
-    width: 340,
-  },
-  {
-    prop: 'state',
-    label: '状态',
-    enum: dictStore.getDictData('status'),
-    search: {
-      el: 'tree-select',
-      props: { filterable: true },
-    },
-    fieldNames: { label: 'label', value: 'code' },
-    render: scope => {
-      return (
-          <>
-            {
-              <el-tag type={scope.row.state ? 'success' : 'danger'}> {scope.row.state ? '正常' : '禁用'} </el-tag>
-            }
-          </>
-      )
-    },
+    minWidth: 300,
   },
   {
     prop: 'createTime',
     label: '创建时间',
     width: 180,
-    search: {
-      el: 'date-picker',
-      props: { type: 'daterange', valueFormat: 'YYYY-MM-DD' },
-    },
   },
   {
     prop: 'operation',