优化字典管理接口

src/api/system/index.ts

@@ -32,7 +32,12 @@ export default {
     getTypeList: (params: object) => get('/common/dict/type/list', params),
     getType: (dictId: number) => get('/common/dict/type/get', { dictId }),
     addType: (data: object) => post('/common/dict/type/add', data),
+    addData: (data: object) => post('/common/dict/data/add', data),
     editType: (data: object) => put('/common/dict/type/edit', data),
-    deleteType: (dictIds: object) => del('/common/dict/type/delete', { dictIds }),
+    editData: (data: object) => put('/common/dict/data/edit', data),
+    deleteType: (dictIds: object[]) => del('/common/dict/type/delete', { dictIds }),
+    getDataList: (params: object) => get('/common/dict/data/list', params),
+    getData: (dictCode: string) => get('/common/dict/data/get', { dictCode }),
+    deleteData: (ids: object[]) => del('/common/dict/data/delete', { ids }),
   }
 }

src/utils/request.ts

@@ -44,10 +44,10 @@ service.interceptors.response.use(
 			// 分页的数据
 			if (res.data?.Total !== undefined) {
 				return {
-					...res.data,
 					list: res.data.Data,
 					total: res.data.Total,
 					page: res.data.currentPage,
+					...res.data,
 				}
 			}
 			if (res.data?.Data) {

src/views/system/dict/component/editDicData.vue

@@ -46,8 +46,8 @@
 
 <script lang="ts">
 import { reactive, toRefs, defineComponent,ref, unref } from 'vue';
-import { getData,addData,editData } from '/@/api/common/dict/data';
 import {ElMessage} from "element-plus";
+import api from '/@/api/system';
 interface RuleFormState {
   dictCode: number;
   dictLabel: string;
@@ -102,7 +102,7 @@ export default defineComponent({
 		const openDialog = (row: RuleFormState|null) => {
       resetForm();
       if (row){
-        getData(row.dictCode).then((res:any)=>{
+        api.dict.getData(row.dictCode).then((res:any)=>{
           state.ruleForm = res.data.dict
         })
         state.ruleForm = row;
@@ -137,14 +137,14 @@ export default defineComponent({
         if (valid) {
           if(state.ruleForm.dictCode!==0){
             //修改
-            editData(state.ruleForm).then(()=>{
+            api.dict.editData(state.ruleForm).then(()=>{
               ElMessage.success('字典数据修改成功');
               closeDialog(); // 关闭弹窗
               emit('dataList')
             })
           }else{
             //添加
-            addData(state.ruleForm).then(()=>{
+            api.dict.addData(state.ruleForm).then(()=>{
               ElMessage.success('字典数据添加成功');
               closeDialog(); // 关闭弹窗
               emit('dataList')

src/views/system/dict/dataList.vue

@@ -11,6 +11,7 @@
           </el-form-item>
           <el-form-item label="状态" prop="status" style="width: 200px;">
             <el-select v-model="tableData.param.status" placeholder="字典状态" clearable size="default" style="width: 240px">
+              <el-option label="全部" :value="-1" />
               <el-option label="启用" :value="1" />
               <el-option label="禁用" :value="0" />
             </el-select>
@@ -74,7 +75,7 @@
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import EditDic from './component/editDicData.vue';
-import { getDataList, deleteData } from '/@/api/common/dict/data';
+import api from '/@/api/system';
 import { useRoute } from 'vue-router';
 
 // 定义接口来定义对象的类型
@@ -99,7 +100,7 @@ interface TableDataState {
 			pageSize: number;
 			dictType: string;
 			dictLabel: string;
-			status: string;
+			status: number;
 		};
 	};
 }
@@ -123,7 +124,7 @@ export default defineComponent({
 					pageSize: 10,
 					dictLabel: '',
 					dictType: '',
-					status: '',
+					status: -1,
 				},
 			},
 		});
@@ -132,7 +133,7 @@ export default defineComponent({
 			dataList();
 		};
 		const dataList = () => {
-			getDataList(state.tableData.param).then((res: any) => {
+			api.dict.getDataList(state.tableData.param).then((res: any) => {
 				state.tableData.data = res.data.list;
 				state.tableData.total = res.data.total;
 			});
@@ -165,7 +166,7 @@ export default defineComponent({
 				type: 'warning',
 			})
 				.then(() => {
-					deleteData(ids).then(() => {
+					api.dict.deleteData(ids).then(() => {
 						ElMessage.success('删除成功');
 						dataList();
 					});
@@ -174,8 +175,7 @@ export default defineComponent({
 		};
 		// 页面加载时
 		onMounted(() => {
-      const dictType = route.params && route.params.dictType;
-      console.log(dictType)
+			const dictType = route.params && route.params.dictType;
 			state.tableData.param.dictType = <string>dictType;
 			initTableData();
 		});

src/views/system/menu/component/editMenu.vue

@@ -149,6 +149,7 @@ const itemForm = {
 	isAffix: 0, // 是否固定
 	linkUrl: '', // 外链/内嵌时链接地址（http:xxx.com），开启外链条件，`1、isLink:true 2、链接地址不为空`
 	isIframe: 0, // 是否内嵌，开启条件，`1、isIframe:true 2、链接地址不为空`
+	status: 1, 
 };
 
 export default defineComponent({