回滚一些不必要的文件修改

This commit is contained in:
DESKTOP-IGCH756\PC 2023-09-27 17:37:59 +08:00
parent 667ef266a9
commit bad992d57f
4 changed files with 37 additions and 88 deletions

View File

@ -1,14 +1,13 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { DemoVO, DemoForm, DemoPageQuery, DemoCountQuery } from '@/api/demo/demo/types';
import { DemoVO, DemoForm, DemoQuery } from '@/api/demo/demo/types';
/**
*
* @param query
* @returns {*}
*/
export const listDemo = (query?: DemoPageQuery): AxiosPromise<DemoVO[]> => {
export const listDemo = (query?: DemoQuery): AxiosPromise<DemoVO[]> => {
return request({
url: '/demo/demo/list',
method: 'get',
@ -16,19 +15,6 @@ export const listDemo = (query?: DemoPageQuery): AxiosPromise<DemoVO[]> => {
});
};
/**
*
* @param query
* @returns {*}
*/
export const countDemo = (query?: DemoCountQuery): AxiosPromise<number> => {
return request({
url: '/demo/demo/count',
method: 'get',
params: query
});
};
/**
*
* @param id

View File

@ -62,7 +62,7 @@ export interface DemoForm extends BaseEntity {
value?: string;
}
export interface DemoPageQuery extends PageQuery {
export interface DemoQuery extends PageQuery {
/**
* id
*/
@ -87,41 +87,4 @@ export interface DemoPageQuery extends PageQuery {
*
*/
value?: string;
/**
*
*/
params?: any;
}
export interface DemoCountQuery {
/**
* id
*/
deptId?: string | number;
/**
* id
*/
userId?: string | number;
/**
*
*/
orderNum?: number;
/**
* key键
*/
testKey?: string;
/**
*
*/
value?: string;
/**
*
*/
params?: any;
}

View File

@ -1,7 +1,8 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div class="search" v-show="showSearch">
<div class="mb-[10px]" v-show="showSearch">
<el-card shadow="hover">
<el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item label="部门id" prop="deptId">
<el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable style="width: 240px" @keyup.enter="handleQuery" />
@ -23,10 +24,11 @@
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<el-card shadow="hover">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -99,8 +101,8 @@
</template>
<script setup name="Demo" lang="ts">
import { listDemo, getDemo, delDemo, addDemo, updateDemo } from "@/api/demo/demo";
import { DemoVO, DemoPageQuery, DemoForm } from '@/api/demo/demo/types';
import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -129,7 +131,7 @@ const initFormData: DemoForm = {
testKey: undefined,
value: undefined,
}
const data = reactive<PageData<DemoForm, DemoPageQuery>>({
const data = reactive<PageData<DemoForm, DemoQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
@ -139,8 +141,6 @@ const data = reactive<PageData<DemoForm, DemoPageQuery>>({
orderNum: undefined,
testKey: undefined,
value: undefined,
params: {
}
},
rules: {
id: [

View File

@ -193,7 +193,7 @@ const handleGenTable = async (row?: TableVO) => {
await genCode(row.tableId);
proxy?.$modal.msgSuccess('成功生成到自定义路径:' + row.genPath);
} else {
proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'codegen-ruoyi.zip');
proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip');
}
}
/** 同步数据库操作 */