abu/wzj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/demo/demo/index.ts
View File

@ -1,14 +1,13 @@
import request from '@/utils/request'; import request from '@/utils/request';
import { AxiosPromise } from 'axios'; 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 * @param query
* @returns {*} * @returns {*}
*/ */
export const listDemo = (query?: DemoQuery): AxiosPromise<DemoVO[]> => {
export const listDemo = (query?: DemoPageQuery): AxiosPromise<DemoVO[]> => {
return request({ return request({
url: '/demo/demo/list', url: '/demo/demo/list',
method: 'get', 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 * @param id

39
src/api/demo/demo/types.ts
View File

@ -62,7 +62,7 @@ export interface DemoForm extends BaseEntity {
value?: string; value?: string;
} }
export interface DemoPageQuery extends PageQuery { export interface DemoQuery extends PageQuery {
/** /**
* 部门id * 部门id
*/ */
@ -87,41 +87,4 @@ export interface DemoPageQuery extends PageQuery {
* 值 * 值
*/ */
value?: string; value?: string;
/**
* 日期范围参数
*/
params?: any;
}
export interface DemoCountQuery {
/**
* 部门id
*/
deptId?: string | number;
/**
* 用户id
*/
userId?: string | number;
/**
* 排序号
*/
orderNum?: number;
/**
* key键
*/
testKey?: string;
/**
* 值
*/
value?: string;
/**
* 日期范围参数
*/
params?: any;
} }

66
src/views/demo/demo/index.vue
View File

@ -1,32 +1,34 @@
<template> <template>
<div class="p-2"> <div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> <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-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px"> <el-card shadow="hover">
<el-form-item label="部门id" prop="deptId"> <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable style="width: 240px" @keyup.enter="handleQuery" /> <el-form-item label="部门id" prop="deptId">
</el-form-item> <el-input v-model="queryParams.deptId" placeholder="请输入部门id" clearable style="width: 240px" @keyup.enter="handleQuery" />
<el-form-item label="用户id" prop="userId"> </el-form-item>
<el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable style="width: 240px" @keyup.enter="handleQuery" /> <el-form-item label="用户id" prop="userId">
</el-form-item> <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable style="width: 240px" @keyup.enter="handleQuery" />
<el-form-item label="排序号" prop="orderNum"> </el-form-item>
<el-input v-model="queryParams.orderNum" placeholder="请输入排序号" clearable style="width: 240px" @keyup.enter="handleQuery" /> <el-form-item label="排序号" prop="orderNum">
</el-form-item> <el-input v-model="queryParams.orderNum" placeholder="请输入排序号" clearable style="width: 240px" @keyup.enter="handleQuery" />
<el-form-item label="key键" prop="testKey"> </el-form-item>
<el-input v-model="queryParams.testKey" placeholder="请输入key键" clearable style="width: 240px" @keyup.enter="handleQuery" /> <el-form-item label="key键" prop="testKey">
</el-form-item> <el-input v-model="queryParams.testKey" placeholder="请输入key键" clearable style="width: 240px" @keyup.enter="handleQuery" />
<el-form-item label="值" prop="value"> </el-form-item>
<el-input v-model="queryParams.value" placeholder="请输入值" clearable style="width: 240px" @keyup.enter="handleQuery" /> <el-form-item label="值" prop="value">
</el-form-item> <el-input v-model="queryParams.value" placeholder="请输入值" clearable style="width: 240px" @keyup.enter="handleQuery" />
<el-form-item> </el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-form-item>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
</el-form-item> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form> </el-form-item>
</el-form>
</el-card>
</div> </div>
</transition> </transition>
<el-card shadow="never"> <el-card shadow="hover">
<template #header> <template #header>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
@ -67,7 +69,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card> </el-card>
<!-- 添加或修改测试单对话框 --> <!-- 添加或修改测试单对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@ -99,8 +101,8 @@
</template> </template>
<script setup name="Demo" lang="ts"> <script setup name="Demo" lang="ts">
import { listDemo, getDemo, delDemo, addDemo, updateDemo } from "@/api/demo/demo"; import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
import { DemoVO, DemoPageQuery, DemoForm } from '@/api/demo/demo/types'; import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -129,8 +131,8 @@ const initFormData: DemoForm = {
testKey: undefined, testKey: undefined,
value: undefined, value: undefined,
} }
const data = reactive<PageData<DemoForm, DemoPageQuery>>({ const data = reactive<PageData<DemoForm, DemoQuery>>({
form: {...initFormData}, form: { ...initFormData },
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -139,8 +141,6 @@ const data = reactive<PageData<DemoForm, DemoPageQuery>>({
orderNum: undefined, orderNum: undefined,
testKey: undefined, testKey: undefined,
value: undefined, value: undefined,
params: {
}
}, },
rules: { rules: {
id: [ id: [
@ -183,7 +183,7 @@ const cancel = () => {
/** 表单重置 */ /** 表单重置 */
const reset = () => { const reset = () => {
form.value = {...initFormData}; form.value = { ...initFormData };
demoFormRef.value?.resetFields(); demoFormRef.value?.resetFields();
} }
@ -229,9 +229,9 @@ const submitForm = () => {
if (valid) { if (valid) {
buttonLoading.value = true; buttonLoading.value = true;
if (form.value.id) { if (form.value.id) {
await updateDemo(form.value).finally(() => buttonLoading.value = false); await updateDemo(form.value).finally(() => buttonLoading.value = false);
} else { } else {
await addDemo(form.value).finally(() => buttonLoading.value = false); await addDemo(form.value).finally(() => buttonLoading.value = false);
} }
proxy?.$modal.msgSuccess("修改成功"); proxy?.$modal.msgSuccess("修改成功");
dialog.visible = false; dialog.visible = false;

2
src/views/tool/gen/index.vue
View File

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