src/service/request/instance.ts

@@ -63,11 +63,18 @@ export default class CustomAxiosInstance {
         const { status } = response;
         if (status === 200 || status < 300 || status === 304 || response.status === 200) {
           const backend = response.data;
+<<<<<<< HEAD
+          console.log(response);
+          const { codeKey, dataKey, successCode } = this.backendConfig;
+          // 请求成功
+          if (backend[codeKey] === successCode) {
+=======
           const { codeKey, dataKey, successCode } = this.backendConfig;
           // 请求成功
           console.log(response.status);
           if (backend[codeKey] === successCode || response.status === 200) {
             console.log('fanhui');
+>>>>>>> a962471d9288b654c62797e07bc5995d02e97fc3
             return handleServiceResult(null, backend[dataKey]);
           }
 

src/views/management/role/index.vue

@@ -30,19 +30,10 @@ const pagination: PaginationProps = ref({
 async function getTableData() {
   const pageNum = pagination.page as number;
   const pageSize = pagination.pageSize as number;
-
-  const params: QueryParams = {
-    name: '',
-    description: '',
-    isActive: '',
-    createTime: '',
-    modifyTime: '',
-    createUid: 0,
-    disabled: ''
-  };
+  const params: QueryParams = {};
 
   query(pageNum, pageSize, params).then(res => {
-    console.log(res);
+    // console.log(res);
     tableData.value = res.data as [];
   });
 }

src/views/management/role/queryUser.vue

@@ -1,36 +1,33 @@
 <template>
-	<div class="h-full overflow-hidden">
-		<n-card title="权限管理" :bordered="false" class="rounded-16px shadow-sm">
-			<n-data-table :columns="columns" :data="tableData" :pagination="pagination" />
-		</n-card>
-	</div>
+  <div class="h-full overflow-hidden">
+    <n-card title="权限管理" :bordered="false" class="rounded-16px shadow-sm">
+      <n-data-table :columns="columns" :data="tableData" :pagination="pagination" />
+    </n-card>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { ref } from 'vue';
 import type { Ref } from 'vue';
-
 import type { DataTableColumns, PaginationProps } from 'naive-ui';
-
 import { query } from '~/src/service/api/user';
 import type { QueryParams } from '~/src/service/api/user';
 
 const tableData = ref<QueryParams[]>([]);
 
-
 async function getTableData() {
-	const pageNum = pagination.page as number;
-	const pageSize = pagination.pageSize as number;
+  const pageNum = pagination.page as number;
+  const pageSize = pagination.pageSize as number;
 
-	const params: QueryParams = {
-		name: '',
-		description: '',
-		isActive: '',
-		createTime: "",
-		modifyTime: "" ,
-		createUid: 0,
-		disabled: '',
-	};
+  const params: QueryParams = {
+    name: '',
+    description: '',
+    isActive: '',
+    createTime: '',
+    modifyTime: "" ,
+    createUid: 0,
+    disabled: '',
+  };
 
 	query(pageNum, pageSize, params).then((res) => {
 			console.log(res);

src/views/management/role/userPa.vue

@@ -8,33 +8,31 @@
 import { reactive } from 'vue';
 import { defineComponent, ref } from 'vue';
 import type { QueryParams } from '~/src/service/api/user';
-import { query } from '~/src/service/api/user';
 
 export default defineComponent({
   setup() {
-		const pageNum = ref(2)
-		const pageSize = ref<any>(10)
-		const queryData = reactive<QueryParams>({})
-		function queryList (){
-			console.log(1);
+    const pageNum = ref(2);
+    const pageSize = ref<any>(10);
+    const queryData = reactive<QueryParams>({});
+    function queryList() {
+      console.log(1);
 
-			// query(1, 10, queryData).then(r => {
-			// 	console.log(r);
-			// });
-		}
+      // query(1, 10, queryData).then(r => {
+      // 	console.log(r);
+      // });
+    }
 
     return {
-			// 每页条数， 可自定义 page-size
+      // 每页条数， 可自定义 page-size
       pageNum,
-			//page-count
+      // page-count
       pageSize,
-			queryList,
-			queryData,
-			// page: ref(2),
+      queryList,
+      queryData
+      // page: ref(2),
       // pageSize: ref(20),
       // queryData:reactive({})
     };
-
   }
 });
 </script>

src/views/management/user/index.vue

@@ -1,113 +1,108 @@
 <template>
-	<div class="h-full overflow-hidden">
-		<n-card title="权限管理" :bordered="false" class="rounded-16px shadow-sm">
-			<n-data-table :columns="columns" :data="tableData" :pagination="pagination" />
-		</n-card>
-	</div>
+  <div class="h-full overflow-hidden">
+    <n-card title="权限管理" :bordered="false" class="rounded-16px shadow-sm">
+      <n-data-table :columns="columns" :data="tableData" :pagination="pagination" />
+    </n-card>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { ref } from 'vue';
 import type { Ref } from 'vue';
-
 import type { DataTableColumns, PaginationProps } from 'naive-ui';
-
 import { query_1 } from '~/src/service/api/user';
 import type { Query_1Params } from '~/src/service/api/user';
 
 const tableData = ref<Query_1Params[]>([]);
-
+const pagination: PaginationProps = ref({
+  page: 1,
+  pageSize: 10,
+  showSizePicker: true,
+  pageSizes: [10, 20, 50]
+  // onChange: (page: number) => {
+  // 	// 处理页码变化
+  // },
+  // onUpdatePageSize: (pageSize: number) => {
+  // 	// 处理每页显示数量变化
+  // }
+}).value;
 
 async function getTableData() {
-	const pageNum = pagination.page as number;
-	const pageSize = pagination.pageSize as number;
+  const pageNum = pagination.page as number;
+  const pageSize = pagination.pageSize as number;
 
-	const params: Query_1Params = {
-		depname: '',
-		address: '',
-		phone: '',
-		email: '',
-		manager: '',
-		createTime: "",
-		modifyTime: "" ,
-		createUid: 0,
-		disabled: '',
-	};
+  const params: Query_1Params = {
+    depname: '',
+    address: '',
+    phone: '',
+    email: '',
+    manager: '',
+    createTime: '',
+    modifyTime: '',
+    createUid: 0,
+    disabled: ''
+  };
 
-	query_1(pageNum, pageSize, params).then((res) => {
-			console.log(res);
-			tableData.value =  res.data as[]
-		})
+  query_1(pageNum, pageSize, params).then(res => {
+    console.log(res);
+    tableData.value = res.data as [];
+  });
 }
 
 const columns: Ref<DataTableColumns<Query_1Params>> = ref([
-	{
-		type: 'selection',
-		align: 'center'
-	},
-	{
-		key: 'depname',
-		title: '部门名称',
-		align: 'center'
-	},
-	{
-		key: 'address',
-		title: '部门地址',
-		align: 'center'
-	},
-	{
-		key: 'phone',
-		title: '部门电话',
-		align: 'center'
-	},
-	{
-		key: 'email',
-		title: '部门电子邮箱',
-		align: 'center',
-	},
-	{
-		key: 'manager',
-		title: '部门负责人',
-		align: 'center'
-	},
-	{
-		key: 'createTime',
-		title: '创建时间',
-		align: 'center'
-	},
-	{
-		key: 'modifyTime',
-		title: '修改时间',
-		align: 'center'
-	},
-	{
-		key: 'createUid',
-		title: '创建用户ID',
-		align: 'center'
-	},
-	{
-		key: 'disabled',
-		title: '状态',
-		align: 'center'
-	},
-
+  {
+    type: 'selection',
+    align: 'center'
+  },
+  {
+    key: 'depname',
+    title: '部门名称',
+    align: 'center'
+  },
+  {
+    key: 'address',
+    title: '部门地址',
+    align: 'center'
+  },
+  {
+    key: 'phone',
+    title: '部门电话',
+    align: 'center'
+  },
+  {
+    key: 'email',
+    title: '部门电子邮箱',
+    align: 'center'
+  },
+  {
+    key: 'manager',
+    title: '部门负责人',
+    align: 'center'
+  },
+  {
+    key: 'createTime',
+    title: '创建时间',
+    align: 'center'
+  },
+  {
+    key: 'modifyTime',
+    title: '修改时间',
+    align: 'center'
+  },
+  {
+    key: 'createUid',
+    title: '创建用户ID',
+    align: 'center'
+  },
+  {
+    key: 'disabled',
+    title: '状态',
+    align: 'center'
+  }
 ]) as Ref<DataTableColumns<Query_1Params>>;
 
-const pagination: PaginationProps = ref({
-	page: 1,
-	pageSize: 10,
-	showSizePicker: true,
-	pageSizes: [10, 20, 50],
-	onChange: (page: number) => {
-		// 处理页码变化
-	},
-	onUpdatePageSize: (pageSize: number) => {
-		// 处理每页显示数量变化
-	}
-}).value;
-
 function init() {
-	getTableData();
+  getTableData();
 }
 
 // 初始化