From bad992d57f7f8258883e2d0ad5eb4991893b33c4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-IGCH756\\PC" <921509429@qq.com>
Date: Wed, 27 Sep 2023 17:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E4=B8=80=E4=BA=9B=E4=B8=8D?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/demo/demo/index.ts    | 18 ++--------
 src/api/demo/demo/types.ts    | 39 +--------------------
 src/views/demo/demo/index.vue | 66 +++++++++++++++++------------------
 src/views/tool/gen/index.vue  |  2 +-
 4 files changed, 37 insertions(+), 88 deletions(-)

diff --git a/src/api/demo/demo/index.ts b/src/api/demo/demo/index.ts
index 6882b9d..7441720 100644
--- a/src/api/demo/demo/index.ts
+++ b/src/api/demo/demo/index.ts
@@ -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
diff --git a/src/api/demo/demo/types.ts b/src/api/demo/demo/types.ts
index c7a8d77..ea51d32 100644
--- a/src/api/demo/demo/types.ts
+++ b/src/api/demo/demo/types.ts
@@ -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;
 }
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index b7a1f18..a7f3bd7 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -1,32 +1,34 @@
 <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">
-        <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" />
-          </el-form-item>
-          <el-form-item label="用户id" prop="userId">
-            <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="排序号" prop="orderNum">
-            <el-input v-model="queryParams.orderNum" placeholder="请输入排序号" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="key键" prop="testKey">
-            <el-input v-model="queryParams.testKey" placeholder="请输入key键" clearable style="width: 240px" @keyup.enter="handleQuery" />
-          </el-form-item>
-          <el-form-item label="值" prop="value">
-            <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-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
+      <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" />
+            </el-form-item>
+            <el-form-item label="用户id" prop="userId">
+              <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable style="width: 240px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="排序号" prop="orderNum">
+              <el-input v-model="queryParams.orderNum" placeholder="请输入排序号" clearable style="width: 240px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="key键" prop="testKey">
+              <el-input v-model="queryParams.testKey" placeholder="请输入key键" clearable style="width: 240px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="值" prop="value">
+              <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-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">
@@ -67,7 +69,7 @@
         </el-table-column>
       </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-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -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,8 +131,8 @@ const initFormData: DemoForm = {
   testKey: undefined,
   value: undefined,
 }
-const data = reactive<PageData<DemoForm, DemoPageQuery>>({
-  form: {...initFormData},
+const data = reactive<PageData<DemoForm, DemoQuery>>({
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -139,8 +141,6 @@ const data = reactive<PageData<DemoForm, DemoPageQuery>>({
     orderNum: undefined,
     testKey: undefined,
     value: undefined,
-    params: {
-    }
   },
   rules: {
     id: [
@@ -183,7 +183,7 @@ const cancel = () => {
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   demoFormRef.value?.resetFields();
 }
 
@@ -229,9 +229,9 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateDemo(form.value).finally(() =>  buttonLoading.value = false);
+        await updateDemo(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addDemo(form.value).finally(() =>  buttonLoading.value = false);
+        await addDemo(form.value).finally(() => buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("修改成功");
       dialog.visible = false;
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index f1038a2..82d5228 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -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');
   }
 }
 /** 同步数据库操作 */