From 7680fc2c18c53b8739fdc3ccf070449b64b10fd8 Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Thu, 2 Nov 2023 19:41:25 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                       |  2 +-
 .env.production                        |  2 +-
 index.html                             |  2 +-
 src/layout/components/Sidebar/Logo.vue |  2 +-
 src/views/index.vue                    | 91 +-------------------------
 src/views/login.vue                    |  2 +-
 src/views/register.vue                 |  2 +-
 7 files changed, 8 insertions(+), 95 deletions(-)

diff --git a/.env.development b/.env.development
index 6d2f8ddf..0b5004bd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 题库管理系统
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
diff --git a/.env.production b/.env.production
index d723d2ad..e3f92290 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 题库管理系统
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
diff --git a/index.html b/index.html
index c0dab512..28dc9601 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
     <link rel="icon" href="/favicon.ico" />
-    <title>RuoYi-Vue-Plus多租户管理系统</title>
+    <title>题库管理系统</title>
     <!--[if lt IE 11
       ]><script>
         window.location.href='/html/ie.html';
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index a06158ac..285db729 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -35,7 +35,7 @@ defineProps({
     }
 })
 
-const title = ref('RuoYi-Vue-Plus');
+const title = ref('三尺青锋');
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
 </script>
diff --git a/src/views/index.vue b/src/views/index.vue
index 438c1afc..72b6e126 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,97 +1,10 @@
 <template>
   <div class="app-container home">
     <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>RuoYi-Vue-Plus多租户管理系统</h2>
-        <p>
-          RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 分布式集群 场景升级(不兼容原框架)
-          <br />
-          * 前端开发框架 Vue3、TS、Element Plus<br />
-          * 后端开发框架 Spring Boot<br />
-          * 容器框架 Undertow 基于 Netty 的高性能容器<br />
-          * 权限认证框架 Sa-Token 支持多终端认证系统<br />
-          * 关系数据库 MySQL 适配 8.X 最低 5.7<br />
-          * 缓存数据库 Redis 适配 6.X 最低 4.X<br />
-          * 数据库框架 Mybatis-Plus 快速 CRUD 增加开发效率<br />
-          * 数据库框架 p6spy 更强劲的 SQL 分析<br />
-          * 多数据源框架 dynamic-datasource 支持主从与多种类数据库异构<br />
-          * 序列化框架 Jackson 统一使用 jackson 高效可靠<br />
-          * Redis客户端 Redisson 性能强劲、API丰富<br />
-          * 分布式限流 Redisson 全局、请求IP、集群ID 多种限流<br />
-          * 分布式锁 Lock4j 注解锁、工具锁 多种多样<br />
-          * 分布式幂等 Lock4j 基于分布式锁实现<br />
-          * 分布式链路追踪 SkyWalking 支持链路追踪、网格分析、度量聚合、可视化<br />
-          * 分布式任务调度 PowerJob 高性能 高可靠 易扩展<br />
-          * 文件存储 Minio 本地存储<br />
-          * 文件存储 七牛、阿里、腾讯 云存储<br />
-          * 监控框架 SpringBoot-Admin 全方位服务监控<br />
-          * 校验框架 Validation 增强接口安全性 严谨性<br />
-          * Excel框架 Alibaba EasyExcel 性能优异 扩展性强<br />
-          * 文档框架 SpringDoc、javadoc 无注解零入侵基于java注释<br />
-          * 工具类框架 Hutool、Lombok 减少代码冗余 增加安全性<br />
-          * 代码生成器 适配MP、SpringDoc规范化代码 一键生成前后端代码<br />
-          * 部署方式 Docker 容器编排 一键部署业务集群<br />
-          * 国际化 SpringMessage Spring标准国际化方案<br />
-        </p>
-        <p><b>当前版本:</b> <span>v5.1.0</span></p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://gitee.com/dromara/RuoYi-Vue-Plus')">访问码云</el-button>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://github.com/dromara/RuoYi-Vue-Plus')">访问GitHub</el-button>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://plus-doc.dromara.org/#/ruoyi-vue-plus/changlog')"
-            >更新日志</el-button
-          >
-        </p>
-      </el-col>
-
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>RuoYi-Cloud-Plus多租户微服务管理系统</h2>
-        <p>
-          RuoYi-Cloud-Plus 微服务通用权限管理系统 重写 RuoYi-Cloud 全方位升级(不兼容原框架)
-          <br />
-          * 前端开发框架 Vue3、TS、Element UI<br />
-          * 后端开发框架 Spring Boot<br />
-          * 微服务开发框架 Spring Cloud、Spring Cloud Alibaba<br />
-          * 容器框架 Undertow 基于 XNIO 的高性能容器<br />
-          * 权限认证框架 Sa-Token、Jwt 支持多终端认证系统<br />
-          * 关系数据库 MySQL 适配 8.X 最低 5.7<br />
-          * 关系数据库 Oracle 适配 11g 12c<br />
-          * 关系数据库 PostgreSQL 适配 13 14<br />
-          * 关系数据库 SQLServer 适配 2017 2019<br />
-          * 缓存数据库 Redis 适配 6.X 最低 5.X<br />
-          * 分布式注册中心 Alibaba Nacos 采用2.X 基于GRPC通信高性能<br />
-          * 分布式配置中心 Alibaba Nacos 采用2.X 基于GRPC通信高性能<br />
-          * 服务网关 Spring Cloud Gateway 响应式高性能网关<br />
-          * 负载均衡 Spring Cloud Loadbalancer 负载均衡处理<br />
-          * RPC远程调用 Apache Dubbo 原生态使用体验、高性能<br />
-          * 分布式限流熔断 Alibaba Sentinel 无侵入、高扩展<br />
-          * 分布式事务 Alibaba Seata 无侵入、高扩展 支持 四种模式<br />
-          * 分布式消息队列 Spring Cloud Stream 门面框架兼容各种MQ集成<br />
-          * 分布式消息队列 Apache Kafka 高性能高速度<br />
-          * 分布式消息队列 Apache RocketMQ 高可用功能多样<br />
-          * 分布式消息队列 RabbitMQ 支持各种扩展插件功能多样性<br />
-          * 分布式搜索引擎 ElasticSearch 业界知名<br />
-          * 分布式链路追踪 Apache SkyWalking 链路追踪、网格分析、度量聚合、可视化<br />
-          * 分布式日志中心 ELK 业界成熟解决方案<br />
-          * 分布式监控 Prometheus、Grafana 全方位性能监控<br />
-          * 其余与 Vue 版本一致<br />
-        </p>
-        <p><b>当前版本:</b> <span>v2.1.0</span></p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://gitee.com/dromara/RuoYi-Cloud-Plus')">访问码云</el-button>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://github.com/dromara/RuoYi-Cloud-Plus')">访问GitHub</el-button>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://plus-doc.dromara.org/#/ruoyi-cloud-plus/changlog')"
-            >更新日志</el-button
-          >
-        </p>
+      <el-col style="text-align: center;">
+        <h2>题库管理系统</h2>
       </el-col>
     </el-row>
-    <el-divider />
   </div>
 </template>
 
diff --git a/src/views/login.vue b/src/views/login.vue
index e5c73faf..d08fb69d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
+      <h3 class="title">题库管理系统</h3>
       <el-form-item prop="tenantId" v-if="tenantEnabled">
         <el-select v-model="loginForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
diff --git a/src/views/register.vue b/src/views/register.vue
index c2dd6a3d..98c7944d 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
+      <h3 class="title">题库管理系统</h3>
       <el-form-item prop="tenantId" v-if="tenantEnabled">
         <el-select v-model="registerForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
-- 
Gitee


From 3a188d41ccc1608bbfb6eb64032fadea01988a30 Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Fri, 3 Nov 2023 18:19:54 +0800
Subject: [PATCH 02/10] up

---
 src/api/question/title/index.ts    |  63 ++++++++
 src/api/question/title/types.ts    |  56 +++++++
 src/views/question/title/index.vue | 230 +++++++++++++++++++++++++++++
 3 files changed, 349 insertions(+)
 create mode 100644 src/api/question/title/index.ts
 create mode 100644 src/api/question/title/types.ts
 create mode 100644 src/views/question/title/index.vue

diff --git a/src/api/question/title/index.ts b/src/api/question/title/index.ts
new file mode 100644
index 00000000..b21d65b3
--- /dev/null
+++ b/src/api/question/title/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { TitleVO, TitleForm, TitleQuery } from '@/api/question/title/types';
+
+/**
+ * 查询题目列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listTitle = (query?: TitleQuery): AxiosPromise<TitleVO[]> => {
+  return request({
+    url: '/question/title/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询题目详细
+ * @param id
+ */
+export const getTitle = (id: string | number): AxiosPromise<TitleVO> => {
+  return request({
+    url: '/question/title/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增题目
+ * @param data
+ */
+export const addTitle = (data: TitleForm) => {
+  return request({
+    url: '/question/title',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改题目
+ * @param data
+ */
+export const updateTitle = (data: TitleForm) => {
+  return request({
+    url: '/question/title',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除题目
+ * @param id
+ */
+export const delTitle = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/question/title/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/question/title/types.ts b/src/api/question/title/types.ts
new file mode 100644
index 00000000..b3147ae5
--- /dev/null
+++ b/src/api/question/title/types.ts
@@ -0,0 +1,56 @@
+export interface TitleVO {
+  /**
+   * 
+   */
+  id: string | number;
+
+  /**
+   * 题目
+   */
+  question: string;
+
+  /**
+   * 题目标签类型
+   */
+  labelId: string | number;
+
+}
+
+export interface TitleForm extends BaseEntity {
+  /**
+   * 
+   */
+  id?: string | number;
+
+  /**
+   * 题目
+   */
+  question?: string;
+
+  /**
+   * 题目标签类型
+   */
+  labelId?: string | number;
+
+}
+
+export interface TitleQuery extends PageQuery {
+
+  /**
+   * 题目
+   */
+  question?: string;
+
+  /**
+   * 题目标签类型
+   */
+  labelId?: string | number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/views/question/title/index.vue b/src/views/question/title/index.vue
new file mode 100644
index 00000000..a5c1a923
--- /dev/null
+++ b/src/views/question/title/index.vue
@@ -0,0 +1,230 @@
+<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="题目" prop="question">
+            <el-input v-model="queryParams.question" placeholder="请输入题目" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="题目标签类型" prop="labelId">
+            <el-input v-model="queryParams.labelId" 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>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['question:title:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['question:title:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['question:title:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['question:title:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="titleList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="" align="center" prop="id" v-if="true" />
+        <el-table-column label="题目" align="center" prop="question" />
+        <el-table-column label="题目标签类型" align="center" prop="labelId" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['question:title:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['question:title:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <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>
+      <el-form ref="titleFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="题目" prop="question">
+          <el-input v-model="form.question" placeholder="请输入题目" />
+        </el-form-item>
+        <el-form-item label="题目标签类型" prop="labelId">
+          <el-input v-model="form.labelId" placeholder="请输入题目标签类型" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Title" lang="ts">
+import { listTitle, getTitle, delTitle, addTitle, updateTitle } from '@/api/question/title';
+import { TitleVO, TitleQuery, TitleForm } from '@/api/question/title/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const titleList = ref<TitleVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const titleFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: TitleForm = {
+  id: undefined,
+  question: undefined,
+  labelId: undefined,
+}
+const data = reactive<PageData<TitleForm, TitleQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    question: undefined,
+    labelId: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "不能为空", trigger: "blur" }
+    ],
+    question: [
+      { required: true, message: "题目不能为空", trigger: "blur" }
+    ],
+    labelId: [
+      { required: true, message: "题目标签类型不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询题目列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listTitle(queryParams.value);
+  titleList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  titleFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: TitleVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加题目";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: TitleVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getTitle(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改题目";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  titleFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateTitle(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addTitle(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("修改成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: TitleVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除题目编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delTitle(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('question/title/export', {
+    ...queryParams.value
+  }, `title_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
-- 
Gitee


From d2328a531f8e307592b11144186e7627812922d6 Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Wed, 8 Nov 2023 18:22:59 +0800
Subject: [PATCH 03/10] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/question/label/index.ts    |  63 ++++++++
 src/api/question/label/types.ts    |  56 ++++++++
 src/views/question/label/index.vue | 224 +++++++++++++++++++++++++++++
 src/views/question/title/index.vue |  27 +++-
 4 files changed, 366 insertions(+), 4 deletions(-)
 create mode 100644 src/api/question/label/index.ts
 create mode 100644 src/api/question/label/types.ts
 create mode 100644 src/views/question/label/index.vue

diff --git a/src/api/question/label/index.ts b/src/api/question/label/index.ts
new file mode 100644
index 00000000..4e4f893a
--- /dev/null
+++ b/src/api/question/label/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { LabelVO, LabelForm, LabelQuery } from '@/api/question/label/types';
+
+/**
+ * 查询题目标签列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listLabel = (query?: LabelQuery): AxiosPromise<LabelVO[]> => {
+  return request({
+    url: '/question/label/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询题目标签详细
+ * @param id
+ */
+export const getLabel = (id: string | number): AxiosPromise<LabelVO> => {
+  return request({
+    url: '/question/label/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增题目标签
+ * @param data
+ */
+export const addLabel = (data: LabelForm) => {
+  return request({
+    url: '/question/label',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改题目标签
+ * @param data
+ */
+export const updateLabel = (data: LabelForm) => {
+  return request({
+    url: '/question/label',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除题目标签
+ * @param id
+ */
+export const delLabel = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/question/label/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/question/label/types.ts b/src/api/question/label/types.ts
new file mode 100644
index 00000000..fa4fa77a
--- /dev/null
+++ b/src/api/question/label/types.ts
@@ -0,0 +1,56 @@
+export interface LabelVO {
+  /**
+   * 
+   */
+  id: string | number;
+
+  /**
+   * 标签名称
+   */
+  label: string;
+
+  /**
+   * 标签状态 1：启用 0：禁用
+   */
+  status: number;
+
+}
+
+export interface LabelForm extends BaseEntity {
+  /**
+   * 
+   */
+  id?: string | number;
+
+  /**
+   * 标签名称
+   */
+  label?: string;
+
+  /**
+   * 标签状态 1：启用 0：禁用
+   */
+  status?: number;
+
+}
+
+export interface LabelQuery extends PageQuery {
+
+  /**
+   * 标签名称
+   */
+  label?: string;
+
+  /**
+   * 标签状态 1：启用 0：禁用
+   */
+  status?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/views/question/label/index.vue b/src/views/question/label/index.vue
new file mode 100644
index 00000000..e2d3835b
--- /dev/null
+++ b/src/views/question/label/index.vue
@@ -0,0 +1,224 @@
+<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="标签名称" prop="label">
+            <el-input v-model="queryParams.label" 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>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['question:label:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['question:label:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['question:label:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['question:label:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="labelList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="" align="center" prop="id" v-if="true" />
+        <el-table-column label="标签名称" align="center" prop="label" />
+        <el-table-column label="标签状态 1：启用 0：禁用" align="center" prop="status" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['question:label:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['question:label:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <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>
+      <el-form ref="labelFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标签名称" prop="label">
+          <el-input v-model="form.label" placeholder="请输入标签名称" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Label" lang="ts">
+import { listLabel, getLabel, delLabel, addLabel, updateLabel } from '@/api/question/label';
+import { LabelVO, LabelQuery, LabelForm } from '@/api/question/label/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const labelList = ref<LabelVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const labelFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: LabelForm = {
+  id: undefined,
+  label: undefined,
+  status: undefined,
+}
+const data = reactive<PageData<LabelForm, LabelQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    label: undefined,
+    status: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "不能为空", trigger: "blur" }
+    ],
+    label: [
+      { required: true, message: "标签名称不能为空", trigger: "blur" }
+    ],
+    status: [
+      { required: true, message: "标签状态 1：启用 0：禁用不能为空", trigger: "change" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询题目标签列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listLabel(queryParams.value);
+  labelList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  labelFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: LabelVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加题目标签";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: LabelVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getLabel(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改题目标签";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  labelFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateLabel(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addLabel(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("修改成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: LabelVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除题目标签编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delLabel(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('question/label/export', {
+    ...queryParams.value
+  }, `label_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/question/title/index.vue b/src/views/question/title/index.vue
index a5c1a923..725cee4d 100644
--- a/src/views/question/title/index.vue
+++ b/src/views/question/title/index.vue
@@ -7,7 +7,14 @@
             <el-input v-model="queryParams.question" placeholder="请输入题目" clearable style="width: 240px" @keyup.enter="handleQuery" />
           </el-form-item>
           <el-form-item label="题目标签类型" prop="labelId">
-            <el-input v-model="queryParams.labelId" placeholder="请输入题目标签类型" clearable style="width: 240px" @keyup.enter="handleQuery" />
+            <el-select v-model="queryParams.labelId" placeholder="请选择题目标签类型" clearable>
+              <el-option
+                v-for="dict in sys_notice_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -40,7 +47,11 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="" align="center" prop="id" v-if="true" />
         <el-table-column label="题目" align="center" prop="question" />
-        <el-table-column label="题目标签类型" align="center" prop="labelId" />
+        <el-table-column label="题目标签类型" align="center" prop="labelId">
+          <template #default="scope">
+            <dict-tag :options="sys_notice_type" :value="scope.row.labelId"/>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -68,7 +79,14 @@
           <el-input v-model="form.question" placeholder="请输入题目" />
         </el-form-item>
         <el-form-item label="题目标签类型" prop="labelId">
-          <el-input v-model="form.labelId" placeholder="请输入题目标签类型" />
+          <el-select v-model="form.labelId" placeholder="请选择题目标签类型">
+            <el-option
+                v-for="dict in sys_notice_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -86,6 +104,7 @@ import { listTitle, getTitle, delTitle, addTitle, updateTitle } from '@/api/ques
 import { TitleVO, TitleQuery, TitleForm } from '@/api/question/title/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_notice_type } = toRefs<any>(proxy?.useDict('sys_notice_type'));
 
 const titleList = ref<TitleVO[]>([]);
 const buttonLoading = ref(false);
@@ -127,7 +146,7 @@ const data = reactive<PageData<TitleForm, TitleQuery>>({
       { required: true, message: "题目不能为空", trigger: "blur" }
     ],
     labelId: [
-      { required: true, message: "题目标签类型不能为空", trigger: "blur" }
+      { required: true, message: "题目标签类型不能为空", trigger: "change" }
     ],
   }
 });
-- 
Gitee


From b35f7ef01675c977bf229c1f76d0afb5a3609599 Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Thu, 9 Nov 2023 18:11:29 +0800
Subject: [PATCH 04/10] up

---
 src/api/question/label/index.ts    | 15 ++++++
 src/api/question/label/types.ts    | 23 ++++-----
 src/views/question/label/index.vue | 75 ++++++++++++++++++++++++------
 3 files changed, 84 insertions(+), 29 deletions(-)

diff --git a/src/api/question/label/index.ts b/src/api/question/label/index.ts
index 4e4f893a..7a777952 100644
--- a/src/api/question/label/index.ts
+++ b/src/api/question/label/index.ts
@@ -16,6 +16,21 @@ export const listLabel = (query?: LabelQuery): AxiosPromise<LabelVO[]> => {
   });
 };
 
+/**
+ * 状态修改
+ */
+export const changeLabelStatus = (id: string | number, status: number) => {
+  const data = {
+    id,
+    status
+  };
+  return request({
+    url: '/question/label/changeStatus',
+    method: 'put',
+    data: data
+  });
+};
+
 /**
  * 查询题目标签详细
  * @param id
diff --git a/src/api/question/label/types.ts b/src/api/question/label/types.ts
index fa4fa77a..deb5951a 100644
--- a/src/api/question/label/types.ts
+++ b/src/api/question/label/types.ts
@@ -1,6 +1,6 @@
 export interface LabelVO {
   /**
-   * 
+   *
    */
   id: string | number;
 
@@ -10,7 +10,7 @@ export interface LabelVO {
   label: string;
 
   /**
-   * 标签状态 1：启用 0：禁用
+   * 标签状态 0：启用 1：禁用
    */
   status: number;
 
@@ -18,7 +18,7 @@ export interface LabelVO {
 
 export interface LabelForm extends BaseEntity {
   /**
-   * 
+   *
    */
   id?: string | number;
 
@@ -28,29 +28,24 @@ export interface LabelForm extends BaseEntity {
   label?: string;
 
   /**
-   * 标签状态 1：启用 0：禁用
+   * 标签状态 0：启用 1：禁用
    */
   status?: number;
-
 }
 
 export interface LabelQuery extends PageQuery {
-
   /**
    * 标签名称
    */
   label?: string;
 
   /**
-   * 标签状态 1：启用 0：禁用
+   * 标签状态 0：启用 1：禁用
    */
   status?: number;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
-
-
-
diff --git a/src/views/question/label/index.vue b/src/views/question/label/index.vue
index e2d3835b..aa6279c6 100644
--- a/src/views/question/label/index.vue
+++ b/src/views/question/label/index.vue
@@ -6,6 +6,11 @@
           <el-form-item label="标签名称" prop="label">
             <el-input v-model="queryParams.label" placeholder="请输入标签名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
           </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="标签状态" clearable style="width: 240px">
+              <el-option v-for="dict in dataStatus" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -21,10 +26,14 @@
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['question:label:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['question:label:edit']">修改</el-button>
+            <el-button type="success" plain @click="handleUpdate()" :disabled="single" icon="Edit" v-hasPermi="['question:label:edit']"
+              >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['question:label:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['question:label:remove']">
+              删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['question:label:export']">导出</el-button>
@@ -33,11 +42,23 @@
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="labelList" @selection-change="handleSelectionChange">
+      <el-table ref="labelTableRef" v-loading="loading" :data="labelList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="" align="center" prop="id" v-if="true" />
+        <el-table-column label="序号" align="center" prop="id" v-if="true" />
         <el-table-column label="标签名称" align="center" prop="label" />
-        <el-table-column label="标签状态 1：启用 0：禁用" align="center" prop="status" />
+        <el-table-column label="状态" align="center" width="100">
+          <template #default="scope">
+            <el-switch
+              v-model="scope.row.status"
+              inline-prompt
+              active-text="启用"
+              inactive-text="禁用"
+              :active-value="0"
+              :inactive-value="1"
+              @change="handleStatusChange(scope.row)"
+            ></el-switch>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -49,13 +70,12 @@
           </template>
         </el-table-column>
       </el-table>
-
       <pagination
-          v-show="total>0"
-          :total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
+        v-if="total > 0"
+        v-model:total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
       />
     </el-card>
     <!-- 添加或修改题目标签对话框 -->
@@ -64,6 +84,13 @@
         <el-form-item label="标签名称" prop="label">
           <el-input v-model="form.label" placeholder="请输入标签名称" />
         </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in dataStatus" :key="dict.value" :label="dict.value">{{
+              dict.label
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -76,11 +103,16 @@
 </template>
 
 <script setup name="Label" lang="ts">
-import { listLabel, getLabel, delLabel, addLabel, updateLabel } from '@/api/question/label';
+import { listLabel, getLabel, delLabel, addLabel, updateLabel,changeLabelStatus } from '@/api/question/label';
 import { LabelVO, LabelQuery, LabelForm } from '@/api/question/label/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+const dataStatus = ref([
+  { value: 0, label: "启用" },
+  { value: 1, label: "禁用" },
+])
+
 const labelList = ref<LabelVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -100,8 +132,8 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: LabelForm = {
   id: undefined,
-  label: undefined,
-  status: undefined,
+  label: "",
+  status: 1,
 }
 const data = reactive<PageData<LabelForm, LabelQuery>>({
   form: {...initFormData},
@@ -121,7 +153,7 @@ const data = reactive<PageData<LabelForm, LabelQuery>>({
       { required: true, message: "标签名称不能为空", trigger: "blur" }
     ],
     status: [
-      { required: true, message: "标签状态 1：启用 0：禁用不能为空", trigger: "change" }
+      { required: true, message: "标签状态不能为空", trigger: "change" }
     ],
   }
 });
@@ -168,6 +200,7 @@ const handleSelectionChange = (selection: LabelVO[]) => {
   multiple.value = !selection.length;
 }
 
+
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
@@ -185,6 +218,18 @@ const handleUpdate = async (row?: LabelVO) => {
   dialog.title = "修改题目标签";
 }
 
+/** 状态修改 */
+const handleStatusChange = async (row: LabelVO) => {
+  let text = row.status === 0 ? "启用" : "停用";
+  try {
+    await proxy?.$modal.confirm('确认要"' + text + '"吗?');
+    await changeLabelStatus(row.id, row.status);
+    proxy?.$modal.msgSuccess(text + "成功");
+  } catch {
+    row.status = row.status === 0 ? 1 : 0;
+  }
+}
+
 /** 提交按钮 */
 const submitForm = () => {
   labelFormRef.value?.validate(async (valid: boolean) => {
-- 
Gitee


From c7ea6db08fbc0d0fb3847d0b429ed2e76b6c21c7 Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Fri, 17 Nov 2023 18:20:20 +0800
Subject: [PATCH 05/10] up

---
 src/api/question/label/index.ts    |  14 +++-
 src/api/question/label/types.ts    |   5 ++
 src/api/question/title/types.ts    |   8 ++-
 src/views/question/title/index.vue | 100 ++++++++++++++++-------------
 4 files changed, 79 insertions(+), 48 deletions(-)

diff --git a/src/api/question/label/index.ts b/src/api/question/label/index.ts
index 7a777952..652d00a5 100644
--- a/src/api/question/label/index.ts
+++ b/src/api/question/label/index.ts
@@ -1,13 +1,12 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { LabelVO, LabelForm, LabelQuery } from '@/api/question/label/types';
+import { LabelVO, LabelForm, LabelQuery, QuestionLabel } from '@/api/question/label/types';
 
 /**
  * 查询题目标签列表
  * @param query
  * @returns {*}
  */
-
 export const listLabel = (query?: LabelQuery): AxiosPromise<LabelVO[]> => {
   return request({
     url: '/question/label/list',
@@ -16,6 +15,17 @@ export const listLabel = (query?: LabelQuery): AxiosPromise<LabelVO[]> => {
   });
 };
 
+/**
+ * 查询所有的标签
+ * @returns {*}
+ */
+export const queryAllLabel = (): AxiosPromise<QuestionLabel[]> => {
+  return request({
+    url: '/question/label/queryLabels',
+    method: 'get'
+  });
+};
+
 /**
  * 状态修改
  */
diff --git a/src/api/question/label/types.ts b/src/api/question/label/types.ts
index deb5951a..c7242278 100644
--- a/src/api/question/label/types.ts
+++ b/src/api/question/label/types.ts
@@ -16,6 +16,11 @@ export interface LabelVO {
 
 }
 
+export interface QuestionLabel {
+  value: string;
+  label: string;
+}
+
 export interface LabelForm extends BaseEntity {
   /**
    *
diff --git a/src/api/question/title/types.ts b/src/api/question/title/types.ts
index b3147ae5..de0e48e9 100644
--- a/src/api/question/title/types.ts
+++ b/src/api/question/title/types.ts
@@ -1,6 +1,6 @@
 export interface TitleVO {
   /**
-   * 
+   *
    */
   id: string | number;
 
@@ -14,11 +14,13 @@ export interface TitleVO {
    */
   labelId: string | number;
 
+  labelName : string;
+
 }
 
 export interface TitleForm extends BaseEntity {
   /**
-   * 
+   *
    */
   id?: string | number;
 
@@ -32,6 +34,8 @@ export interface TitleForm extends BaseEntity {
    */
   labelId?: string | number;
 
+  labelName : string;
+
 }
 
 export interface TitleQuery extends PageQuery {
diff --git a/src/views/question/title/index.vue b/src/views/question/title/index.vue
index 725cee4d..14638e3d 100644
--- a/src/views/question/title/index.vue
+++ b/src/views/question/title/index.vue
@@ -1,19 +1,16 @@
 <template>
   <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">
         <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-          <el-form-item label="题目" prop="question">
-            <el-input v-model="queryParams.question" placeholder="请输入题目" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          <el-form-item label="标题" prop="question">
+            <el-input v-model="queryParams.question" placeholder="请输入标题" clearable style="width: 240px"
+              @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="题目标签类型" prop="labelId">
-            <el-select v-model="queryParams.labelId" placeholder="请选择题目标签类型" clearable>
-              <el-option
-                v-for="dict in sys_notice_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+          <el-form-item label="标签" prop="labelId">
+            <el-select v-model="queryParams.labelId" placeholder="请选择标签" clearable>
+              <el-option v-for="dict in labelList" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -28,16 +25,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['question:title:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+              v-hasPermi="['question:title:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['question:title:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+              v-hasPermi="['question:title:edit']">修改</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['question:title:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+              v-hasPermi="['question:title:remove']">删除</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['question:title:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+              v-hasPermi="['question:title:export']">导出</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -45,11 +46,11 @@
 
       <el-table v-loading="loading" :data="titleList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="" align="center" prop="id" v-if="true" />
-        <el-table-column label="题目" align="center" prop="question" />
-        <el-table-column label="题目标签类型" align="center" prop="labelId">
+        <el-table-column label="序号" align="center" prop="id" v-if="true" />
+        <el-table-column label="标题" align="center" prop="question" />
+        <el-table-column label="标签" align="center" prop="labelName">
           <template #default="scope">
-            <dict-tag :options="sys_notice_type" :value="scope.row.labelId"/>
+            <dict-tag :options="labelList" :value="scope.row.labelName" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -58,34 +59,26 @@
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['question:title:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['question:title:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['question:title:remove']"></el-button>
             </el-tooltip>
           </template>
         </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>
       <el-form ref="titleFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="题目" prop="question">
-          <el-input v-model="form.question" placeholder="请输入题目" />
+        <el-form-item label="标题" prop="question">
+          <el-input v-model="form.question" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="题目标签类型" prop="labelId">
-          <el-select v-model="form.labelId" placeholder="请选择题目标签类型">
-            <el-option
-                v-for="dict in sys_notice_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="parseInt(dict.value)"
-            ></el-option>
+        <el-form-item label="标签" prop="labelId">
+          <el-select v-model="form.labelId" @change="handleLabelChange" placeholder="请选择标签">
+            <el-option v-for="dict in labelList" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -100,11 +93,12 @@
 </template>
 
 <script setup name="Title" lang="ts">
+import { queryAllLabel } from '@/api/question/label';
 import { listTitle, getTitle, delTitle, addTitle, updateTitle } from '@/api/question/title';
 import { TitleVO, TitleQuery, TitleForm } from '@/api/question/title/types';
+import { func } from 'vue-types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_notice_type } = toRefs<any>(proxy?.useDict('sys_notice_type'));
 
 const titleList = ref<TitleVO[]>([]);
 const buttonLoading = ref(false);
@@ -114,6 +108,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
+const labelList = ref<DictDataOption[]>([]);
 
 const queryFormRef = ref<ElFormInstance>();
 const titleFormRef = ref<ElFormInstance>();
@@ -127,9 +122,10 @@ const initFormData: TitleForm = {
   id: undefined,
   question: undefined,
   labelId: undefined,
+  labelName : "",
 }
 const data = reactive<PageData<TitleForm, TitleQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -143,10 +139,10 @@ const data = reactive<PageData<TitleForm, TitleQuery>>({
       { required: true, message: "不能为空", trigger: "blur" }
     ],
     question: [
-      { required: true, message: "题目不能为空", trigger: "blur" }
+      { required: true, message: "标题不能为空", trigger: "blur" }
     ],
     labelId: [
-      { required: true, message: "题目标签类型不能为空", trigger: "change" }
+      { required: true, message: "标签不能为空", trigger: "change" }
     ],
   }
 });
@@ -162,6 +158,21 @@ const getList = async () => {
   loading.value = false;
 }
 
+const getLabelList = async () => {
+  loading.value = true;
+  queryAllLabel().then((resp)=>{
+    labelList.value = resp.data.map((p: any): DictDataOption => ({ label: p.label, value: p.value, elTagType: "", elTagClass: "" }));
+  });
+  loading.value = false;
+}
+
+function handleLabelChange(val) {
+  const selectedLabel = labelList.value.find(item => item.value === val);
+  if (selectedLabel) {
+    form.value.labelName = selectedLabel.label;
+  }
+}
+
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -170,7 +181,7 @@ const cancel = () => {
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   titleFormRef.value?.resetFields();
 }
 
@@ -216,9 +227,9 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateTitle(form.value).finally(() =>  buttonLoading.value = false);
+        await updateTitle(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addTitle(form.value).finally(() =>  buttonLoading.value = false);
+        await addTitle(form.value).finally(() => buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("修改成功");
       dialog.visible = false;
@@ -245,5 +256,6 @@ const handleExport = () => {
 
 onMounted(() => {
   getList();
+  getLabelList();
 });
 </script>
-- 
Gitee


From 5e1736ca36b20fcc3691d7ac8d3f5020e4bbe982 Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Tue, 21 Nov 2023 18:26:08 +0800
Subject: [PATCH 06/10] up

---
 src/api/question/title/types.ts           |  15 +++
 src/components/Options/positionConfig.vue | 132 ++++++++++++++++++++++
 src/views/question/title/index.vue        |  16 ++-
 3 files changed, 161 insertions(+), 2 deletions(-)
 create mode 100644 src/components/Options/positionConfig.vue

diff --git a/src/api/question/title/types.ts b/src/api/question/title/types.ts
index de0e48e9..3344293a 100644
--- a/src/api/question/title/types.ts
+++ b/src/api/question/title/types.ts
@@ -16,6 +16,8 @@ export interface TitleVO {
 
   labelName : string;
 
+  // optionVoList : OptionVoList[];
+
 }
 
 export interface TitleForm extends BaseEntity {
@@ -36,6 +38,8 @@ export interface TitleForm extends BaseEntity {
 
   labelName : string;
 
+  // optionVoList : OptionVoList[];
+
 }
 
 export interface TitleQuery extends PageQuery {
@@ -56,5 +60,16 @@ export interface TitleQuery extends PageQuery {
     params?: any;
 }
 
+export interface OptionVoList {
+
+  id : number,
+
+  serial : number;
+
+  questionId : number;
+
+  optionContent : string;
+
+}
 
 
diff --git a/src/components/Options/positionConfig.vue b/src/components/Options/positionConfig.vue
new file mode 100644
index 00000000..741b7f5e
--- /dev/null
+++ b/src/components/Options/positionConfig.vue
@@ -0,0 +1,132 @@
+<!-- 档位配置 插件 -->
+<template>
+    <Form ref="formPosition" :label-width="configWidth" :model="formData" :rules="ruleValidate" style="padding-bottom:20px">
+        <FormItem :label="`选项${index + 1}：`" v-for="(item,index) in posNum" :key="item" class="m-t-20"
+            :prop="`gearValue[${index}]`" :rules="ruleValidate.gearValue">
+            <InputNumber
+                :min="0"
+                :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')"
+                placeholder="请填写" :disabled="isSee" class="w-200"
+                v-model="formData.gearValue[index]"
+            />
+            <img v-if="!isSee&&posNum<maxPosLen" :src="addImg" class="img-btn" @click="changePos(index,'add')">
+            <img v-if="!isSee&&posNum>1" :src="delImg" @click="changePos(index,'del')" class="img-btn">
+        </FormItem>
+    </Form>
+</template>
+
+<script>
+import addImg from '@/assets/image/add-icon.png'
+import delImg from '@/assets/image/del-icon.png'
+export default {
+    props: {
+        enumData: {
+            type: Object,
+            default: null
+        },
+        isSee: {
+            type: Boolean,
+            default: false
+        },
+        // label宽度
+        configWidth: {
+            type: Number,
+            default: 120
+        }
+    },
+    data() {
+        return {
+            addImg: addImg,
+            delImg: delImg,
+            maxPosLen: 20, // 最多20档
+            posNum: 1, // 当前档位数量
+            formData: {
+                gearValue: [null] // null:为了不让显示默认1
+            },
+            ruleValidate: {
+                gearValue: [
+                    { required: true, message: '请填写档位值' }
+                ]
+            }
+        }
+    },
+
+    methods: {
+        // 提交的校验
+        handleValidate() {
+            return new Promise((resolve, reject) => {
+                this.$refs.formPosition.validate((valid) => {
+                    if (valid) {
+                        // 数据转换为接口所需要的形式
+                        let obj = {};
+                        if (this.formData.gearValue) {
+                            if (this.formData.gearValue.length[0] === null) {
+                                obj.gearValue = null;
+                            } else {
+                                obj.gearValue = this.formData.gearValue.join();
+                            }
+                        } else {
+                            obj.gearValue = null;
+                        }
+                        resolve(obj)
+                    }
+                })
+            })
+        },
+
+        // 增删档位
+        changePos(idx, actType) {
+            if (actType === 'add') {
+                if (this.formData.gearValue.length < 20) {
+                    this.posNum++;
+                    this.formData.gearValue.splice(idx + 1, 0, null);
+                }
+            } else {
+                this.formData.gearValue.splice(idx, 1);
+                this.posNum--;
+            }
+        },
+
+        // 初始化(在父组件中调用)
+        initData(obj) {
+            if (obj.gearValue) {
+                if (obj.gearValue instanceof Array) {
+                    this.formData.gearValue = obj.gearValue;
+                } else if (typeof obj.gearValue === 'string') {
+                    let arr = [];
+                    if (obj.gearValue.indexOf(';') !== -1) {
+                        // 多个-接口传回来的（接口返回的是;分割）
+                        arr = obj.gearValue.split(';');
+                    } else {
+                        // 多个-正在编辑中 / 只有一个
+                        arr = obj.gearValue.split(',');
+                    }
+                    this.formData.gearValue = arr.map(item => {
+                        return Number(item);
+                    })
+                }
+            } else {
+                this.formData.gearValue = [null];
+            }
+            this.posNum = this.formData.gearValue.length;
+        },
+
+        // 重置表单(在父组件中调用)
+        resetForm() {
+            this.$refs.formPosition.resetFields();
+            this.formData.gearValue = [null];
+        }
+    }
+}
+</script>
+
+<style scoped>
+.img-btn {
+    display: inline-block;
+    vertical-align: middle;
+    margin-left: 10px;
+    width: 20px;
+    cursor: pointer;
+}
+</style>
+
diff --git a/src/views/question/title/index.vue b/src/views/question/title/index.vue
index 14638e3d..4418f52e 100644
--- a/src/views/question/title/index.vue
+++ b/src/views/question/title/index.vue
@@ -81,6 +81,18 @@
               :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
+
+        <el-table-column label="选项" align="center" prop="options">
+          <PositionConfig>
+
+          </PositionConfig>
+          <!-- <RadioGroup v-model="options" @change="changeFeeType($event, 'base')">
+                <Radio v-for="(item, index) in currentRowArr[1].feeTypeList" :key="index" :disabled="isSee"
+                    :label="item.itemCode">{{ item.itemName }}
+                </Radio>
+            </RadioGroup> -->
+        </el-table-column>
+
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -97,7 +109,6 @@ import { queryAllLabel } from '@/api/question/label';
 import { listTitle, getTitle, delTitle, addTitle, updateTitle } from '@/api/question/title';
 import { TitleVO, TitleQuery, TitleForm } from '@/api/question/title/types';
 import { func } from 'vue-types';
-
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const titleList = ref<TitleVO[]>([]);
@@ -123,6 +134,7 @@ const initFormData: TitleForm = {
   question: undefined,
   labelId: undefined,
   labelName : "",
+  options : [],
 }
 const data = reactive<PageData<TitleForm, TitleQuery>>({
   form: { ...initFormData },
@@ -166,7 +178,7 @@ const getLabelList = async () => {
   loading.value = false;
 }
 
-function handleLabelChange(val) {
+function handleLabelChange(val: string) {
   const selectedLabel = labelList.value.find(item => item.value === val);
   if (selectedLabel) {
     form.value.labelName = selectedLabel.label;
-- 
Gitee


From fce14ea749de62111e78f928687a08ec0553bb2a Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Wed, 22 Nov 2023 18:21:56 +0800
Subject: [PATCH 07/10] up

---
 src/api/question/title/types.ts               |   2 +-
 src/assets/images/add-icon.png                | Bin 0 -> 918 bytes
 src/assets/images/del-icon.png                | Bin 0 -> 854 bytes
 .../Options/{positionConfig.vue => index.vue} |  29 +++----
 src/views/question/title/index.vue            |  82 ++++++++++++++----
 5 files changed, 81 insertions(+), 32 deletions(-)
 create mode 100644 src/assets/images/add-icon.png
 create mode 100644 src/assets/images/del-icon.png
 rename src/components/Options/{positionConfig.vue => index.vue} (78%)

diff --git a/src/api/question/title/types.ts b/src/api/question/title/types.ts
index 3344293a..2d66ac8a 100644
--- a/src/api/question/title/types.ts
+++ b/src/api/question/title/types.ts
@@ -38,7 +38,7 @@ export interface TitleForm extends BaseEntity {
 
   labelName : string;
 
-  // optionVoList : OptionVoList[];
+  optionVoList : OptionVoList[];
 
 }
 
diff --git a/src/assets/images/add-icon.png b/src/assets/images/add-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..be5f7932261efaaf9980649d24244fd4f76c61e4
GIT binary patch
literal 918
zcmV;H18Mw;P)<h;3K|Lk000e1NJLTq001HY001Be1^@s6caN&c00001b5ch_0Itp)
z=>Px&P)S5VR9FekSWQS&Q562}n?Er}#TrGCbRh;62{P0$L=bHvXvAP>k<_kzP*fl)
zZE6>-0*MxZv@jDjq9}+KnUqK_tOOx{LdjoroUu25uXA7Cndi*B=W}$XE)3`YoR4$Q
zyYIeXFuAS{!!{qsDJ6y`1vsiGs02e5g<BXf2L-bvkCXhuq2Nuo7aJy1t8SFTc=<=*
z`YofCDY#4kN{ziYtqdW?@JwOo7&w6+W@2=K_{U(E1GtGeZV&*cnPjOx1SU+KdgzqU
z*5$!ks$DB*1kyZ;@@NP>l;ot=IcuKb8+Fvz@5O{(jx-?WKj8?Xcu4^V^@6h0uULWR
zUN7Efir)f6?L-ita{xlEO<T2Uv%%Bj#`jb(l2GuOhy~G`D-gU6J!vJ82nPIvC=+!B
zO#qSCaGQqGD-5}!1g1`wa6dJ_3dA>r3L4DosYWBY)K-DVjWg(SFQK-u!N@h;rl5st
z9@83BAcV4wx>2MxY{&EB2OQOK+RAXq>DkVGi=FC8^t-23O8ms6iM^y%=7~RhVVF+m
z%_Yr8ahlMT2u0qg0v3&+Nz{{KN>UKYd{G()pQy!W<ggI(PL*VBE6qn0A=6zhdkyNH
z$J6Y!g~_3>+t-No{r)tc>ChNvHom6mg@O*aN*W7BRAIhB1dN`TM~#yxchrd39Z@;9
zftFzx<akgwuE-A8Q#Tg*))+NJH^E*TnC~OTsXg_2iH)}AVs)z;_WD;RzO24YOJQPb
z!hIeT@U5{@J7y_^E|7)r6c(1I(uxG5s|npia0DNgx)ZWlh8i%(L2!S*HTu(JHe<Ga
zELmHk3uj-pd3GBoDaqPWxfSoIJ;^@rHoMt)+7gQ${lZ=9bR$BW)Fl*oq_3X4>Gr?5
z)VD8n<PIHd>q2RUPKHLYDE~wtvW)S-keQH#57mp)?^Z%V4AuX;=rL}mDee$*E-91n
zq~C)p+8Sy{xWZA4yM$^`Ys>{totSXMaV<4>q9fe!UtFF!klqH&!-{jnPIGyW*NTO%
z9GPzLyv~-6h{FHk11m8j0tBbLGX=#sLqpX@NCR5iPI#J!FvUM8X7Ct&<?);uJEAR?
s?MFDhL3&_8`>sF2wO}}(>%S%b0J`205j8O}eE<Le07*qoM6N<$f|in~EdT%j

literal 0
HcmV?d00001

diff --git a/src/assets/images/del-icon.png b/src/assets/images/del-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9edd2e96706597e64923fa520868347d729611bd
GIT binary patch
literal 854
zcmV-c1F8IpP)<h;3K|Lk000e1NJLTq001HY001Be1^@s6caN&c00001b5ch_0Itp)
z=>Px&5J^NqR9FekSj}q_K@@*)y4hGURFqbll!7!^Foi1hP(%dr=Ap%d;K~2NgQy@?
zyy!s?PyPc6f)?=u5j=<&dyrm4tZ7ry3Z~d7p{6v+=HvNhWVYM5yIE~EIuPc~%$xW7
z?VFkRW`Yo~(AZd{mM<Ky15Wak5d`W7z&H?f5#R~{<p41agwLY`y{~X)rWDY$Qo~lt
zluY(kExJNL=ZIi;D}6c6MmLz$BNL5lxSY-goa3%Wsg!B0moEar1tN;MYx(ygqQ#`{
zMogT-Oy-B5wyQ^IXsEAJrD-N{%x`kgF(x!;MqmOL7c*XSej`#DOs0q$FL=VB*QCGc
zM}&e9;&fyw^Tuud79z?M7QJgX2@T9-)<78J(WUuMx=+_a3u;eP;W4+{>IrRM*1Xw!
zs9t}@SbLoPQnra$#nNTolt-Ht+TW(6RV?3bwyTzg_K)ndYNZSx(Ou07VYC^v0Y>C-
zG@E{}?JJK|Y8z9XA|ZiEu0*YNQ<IQ2%7|&@3wgPI&VjIH_6nIIn!x2bj>^oewz_tr
z(<CG?dj+eFicA-(h&nXvhVJZC%{gj9WAPrrgSye_nviU4gR^Ly-Q-;oaS(?_y~lk<
zXnp}`!859Ja>RZP8Jq!-4E9J|t(b>F^Wg))frQ7Xe>auOV2vIDD7oJVn1l(#!+Y7v
zH^H=g9pVqwzEOkYt~@@TY2G?>c3Vs1<qi1>@|pnY^mi7(;GLV}r8(gFZC`TG;9nSp
zgXoIfAJR6T8u}OpND!MyXk&{m5Kn?k3PXoi#KsmzU(aiGPY46a$EFPN5j3A_6@jy}
zRSxm@bw}rFe5vz{#8lZgYV5qu!DYQuBz|23j7v^DMFg`SzH%PE<s1lAM!e^|i%2X*
zL<(lC`vxDSw^9zbV8)E?INyxHUfL}G#pPMj;djR>qBzCk=S_O;k@#fF=ftGj4PGK_
z@rZ`}7Y{6Zk7yE#9eXAk>pqEspNfb@=h&afGM5O%JEn=_ey==**~;)X9^upc2*0}R
gM|d;Au>Y3$30yuVLt3$Wc>n+a07*qoM6N<$f}L)aTmS$7

literal 0
HcmV?d00001

diff --git a/src/components/Options/positionConfig.vue b/src/components/Options/index.vue
similarity index 78%
rename from src/components/Options/positionConfig.vue
rename to src/components/Options/index.vue
index 741b7f5e..eeb187b3 100644
--- a/src/components/Options/positionConfig.vue
+++ b/src/components/Options/index.vue
@@ -1,23 +1,22 @@
 <!-- 档位配置 插件 -->
 <template>
-    <Form ref="formPosition" :label-width="configWidth" :model="formData" :rules="ruleValidate" style="padding-bottom:20px">
-        <FormItem :label="`选项${index + 1}：`" v-for="(item,index) in posNum" :key="item" class="m-t-20"
-            :prop="`gearValue[${index}]`" :rules="ruleValidate.gearValue">
-            <InputNumber
-                :min="0"
-                :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')"
-                placeholder="请填写" :disabled="isSee" class="w-200"
-                v-model="formData.gearValue[index]"
-            />
-            <img v-if="!isSee&&posNum<maxPosLen" :src="addImg" class="img-btn" @click="changePos(index,'add')">
-            <img v-if="!isSee&&posNum>1" :src="delImg" @click="changePos(index,'del')" class="img-btn">
-        </FormItem>
-    </Form>
+  <el-table-column :label="`选项${index + 1}：`" v-for="(item, index) in posNum" :key="item" class="m-t-20"
+    :prop="`gearValue[${index}]`" :rules="ruleValidate.gearValue" align="center" prop="options">
+    <el-input
+      :min="0"
+      :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')"
+      placeholder="请填写" :disabled="isSee" class="w-200"
+      v-model="form.value.options[index]"
+    />
+    <v-image v-if="!isSee&&posNum<maxPosLen" :src="addImg" class="img-btn" @click="changePos(index,'add')"/>
+    <v-image v-if="!isSee&&posNum>1" :src="delImg" @click="changePos(index,'del')" class="img-btn"/>
+  </el-table-column>
 </template>
 
+
 <script>
-import addImg from '@/assets/image/add-icon.png'
-import delImg from '@/assets/image/del-icon.png'
+import addImg from '@/assets/images/add-icon.png'
+import delImg from '@/assets/images/del-icon.png'
 export default {
     props: {
         enumData: {
diff --git a/src/views/question/title/index.vue b/src/views/question/title/index.vue
index 4418f52e..da24bd37 100644
--- a/src/views/question/title/index.vue
+++ b/src/views/question/title/index.vue
@@ -56,7 +56,8 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['question:title:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['question:title:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
@@ -77,20 +78,16 @@
         </el-form-item>
         <el-form-item label="标签" prop="labelId">
           <el-select v-model="form.labelId" @change="handleLabelChange" placeholder="请选择标签">
-            <el-option v-for="dict in labelList" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+            <el-option v-for="dict in labelList" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
 
-        <el-table-column label="选项" align="center" prop="options">
-          <PositionConfig>
-
-          </PositionConfig>
-          <!-- <RadioGroup v-model="options" @change="changeFeeType($event, 'base')">
-                <Radio v-for="(item, index) in currentRowArr[1].feeTypeList" :key="index" :disabled="isSee"
-                    :label="item.itemCode">{{ item.itemName }}
-                </Radio>
-            </RadioGroup> -->
+        <el-table-column :label="`选项${index + 1}：`" v-for="(item, index) in posNum" :key="item" class="m-t-20"
+          :prop="`gearValue[${index}]`" :rules="ruleValidate" align="center" prop="options">
+          <el-input :min="0" :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')" placeholder="请填写"
+            :disabled="isSee" class="w-200" v-model="form.value.options[index]" />
+          <v-image v-if="!isSee && posNum < maxPosLen" :src="addImg" class="img-btn" @click="changePos(index, 'add')" />
+          <v-image v-if="!isSee && posNum > 1" :src="delImg" @click="changePos(index, 'del')" class="img-btn" />
         </el-table-column>
 
       </el-form>
@@ -109,6 +106,8 @@ import { queryAllLabel } from '@/api/question/label';
 import { listTitle, getTitle, delTitle, addTitle, updateTitle } from '@/api/question/title';
 import { TitleVO, TitleQuery, TitleForm } from '@/api/question/title/types';
 import { func } from 'vue-types';
+import addImg from '@/assets/images/add-icon.png'
+import delImg from '@/assets/images/del-icon.png'
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const titleList = ref<TitleVO[]>([]);
@@ -119,7 +118,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const labelList = ref<DictDataOption[]>([]);
+const labelList = ref<DictDataOption[]>([]); let posNum = 20
 
 const queryFormRef = ref<ElFormInstance>();
 const titleFormRef = ref<ElFormInstance>();
@@ -133,8 +132,8 @@ const initFormData: TitleForm = {
   id: undefined,
   question: undefined,
   labelId: undefined,
-  labelName : "",
-  options : [],
+  labelName: "",
+  optionVoList: [],
 }
 const data = reactive<PageData<TitleForm, TitleQuery>>({
   form: { ...initFormData },
@@ -172,7 +171,7 @@ const getList = async () => {
 
 const getLabelList = async () => {
   loading.value = true;
-  queryAllLabel().then((resp)=>{
+  queryAllLabel().then((resp) => {
     labelList.value = resp.data.map((p: any): DictDataOption => ({ label: p.label, value: p.value, elTagType: "", elTagClass: "" }));
   });
   loading.value = false;
@@ -266,8 +265,59 @@ const handleExport = () => {
   }, `title_${new Date().getTime()}.xlsx`)
 }
 
+/**
+ * 增删档位
+ * @param idx
+ * @param actType
+ */
+const changePos = (idx: number, actType: string) => {
+  if (actType === 'add') {
+    if (form.value.optionVoList.length < 20) {
+      posNum++;
+      form.value.optionVoList.splice(idx + 1, 0);
+    }
+  } else {
+    form.value.optionVoList.splice(idx, 1);
+    posNum--;
+  }
+}
+
+/**
+ * 提交的校验
+ */
+const handleValidate = () =>{
+  return new Promise((resolve, reject) => {
+        $refs.formPosition.validate((valid) => {
+          if (valid) {
+            // 数据转换为接口所需要的形式
+            let obj = {};
+            if (form.value.optionVoList) {
+              if (form.value.optionVoList.length[0] === null) {
+                obj.optionVoList = null;
+              } else {
+                obj.optionVoList = form.value.optionVoList.join();
+              }
+            } else {
+              obj.optionVoList = null;
+            }
+            resolve(obj)
+          }
+        })
+      })
+}
+
 onMounted(() => {
   getList();
   getLabelList();
 });
 </script>
+
+<style scoped>
+.img-btn {
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: 10px;
+  width: 20px;
+  cursor: pointer;
+}
+</style>
-- 
Gitee


From 9148e4621144fd8609158d0872e8305278327cd3 Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Wed, 22 Nov 2023 18:23:06 +0800
Subject: [PATCH 08/10] up

---
 src/components/Options/index.vue | 200 +++++++++++++++----------------
 1 file changed, 97 insertions(+), 103 deletions(-)

diff --git a/src/components/Options/index.vue b/src/components/Options/index.vue
index eeb187b3..98691e18 100644
--- a/src/components/Options/index.vue
+++ b/src/components/Options/index.vue
@@ -1,15 +1,11 @@
 <!-- 档位配置 插件 -->
 <template>
   <el-table-column :label="`选项${index + 1}：`" v-for="(item, index) in posNum" :key="item" class="m-t-20"
-    :prop="`gearValue[${index}]`" :rules="ruleValidate.gearValue" align="center" prop="options">
-    <el-input
-      :min="0"
-      :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')"
-      placeholder="请填写" :disabled="isSee" class="w-200"
-      v-model="form.value.options[index]"
-    />
-    <v-image v-if="!isSee&&posNum<maxPosLen" :src="addImg" class="img-btn" @click="changePos(index,'add')"/>
-    <v-image v-if="!isSee&&posNum>1" :src="delImg" @click="changePos(index,'del')" class="img-btn"/>
+    :prop="`gearValue[${index}]`" :rules="ruleValidate" align="center" prop="options">
+    <el-input :min="0" :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')" placeholder="请填写"
+      :disabled="isSee" class="w-200" v-model="form.value.options[index]" />
+    <v-image v-if="!isSee && posNum < maxPosLen" :src="addImg" class="img-btn" @click="changePos(index, 'add')" />
+    <v-image v-if="!isSee && posNum > 1" :src="delImg" @click="changePos(index, 'del')" class="img-btn" />
   </el-table-column>
 </template>
 
@@ -18,114 +14,112 @@
 import addImg from '@/assets/images/add-icon.png'
 import delImg from '@/assets/images/del-icon.png'
 export default {
-    props: {
-        enumData: {
-            type: Object,
-            default: null
-        },
-        isSee: {
-            type: Boolean,
-            default: false
-        },
-        // label宽度
-        configWidth: {
-            type: Number,
-            default: 120
-        }
+  props: {
+    enumData: {
+      type: Object,
+      default: null
     },
-    data() {
-        return {
-            addImg: addImg,
-            delImg: delImg,
-            maxPosLen: 20, // 最多20档
-            posNum: 1, // 当前档位数量
-            formData: {
-                gearValue: [null] // null:为了不让显示默认1
-            },
-            ruleValidate: {
-                gearValue: [
-                    { required: true, message: '请填写档位值' }
-                ]
-            }
-        }
+    isSee: {
+      type: Boolean,
+      default: false
     },
+    // label宽度
+    configWidth: {
+      type: Number,
+      default: 120
+    }
+  },
+  data() {
+    return {
+      addImg: addImg,
+      delImg: delImg,
+      maxPosLen: 20, // 最多20档
+      posNum: 1, // 当前档位数量
+      formData: {
+        gearValue: [null] // null:为了不让显示默认1
+      },
+      ruleValidate: {
+        required: true, message: '请填写选项'
+      }
+    }
+  },
 
-    methods: {
-        // 提交的校验
-        handleValidate() {
-            return new Promise((resolve, reject) => {
-                this.$refs.formPosition.validate((valid) => {
-                    if (valid) {
-                        // 数据转换为接口所需要的形式
-                        let obj = {};
-                        if (this.formData.gearValue) {
-                            if (this.formData.gearValue.length[0] === null) {
-                                obj.gearValue = null;
-                            } else {
-                                obj.gearValue = this.formData.gearValue.join();
-                            }
-                        } else {
-                            obj.gearValue = null;
-                        }
-                        resolve(obj)
-                    }
-                })
-            })
-        },
-
-        // 增删档位
-        changePos(idx, actType) {
-            if (actType === 'add') {
-                if (this.formData.gearValue.length < 20) {
-                    this.posNum++;
-                    this.formData.gearValue.splice(idx + 1, 0, null);
-                }
+  methods: {
+    // 提交的校验
+    handleValidate() {
+      return new Promise((resolve, reject) => {
+        this.$refs.formPosition.validate((valid) => {
+          if (valid) {
+            // 数据转换为接口所需要的形式
+            let obj = {};
+            if (this.formData.gearValue) {
+              if (this.formData.gearValue.length[0] === null) {
+                obj.gearValue = null;
+              } else {
+                obj.gearValue = this.formData.gearValue.join();
+              }
             } else {
-                this.formData.gearValue.splice(idx, 1);
-                this.posNum--;
+              obj.gearValue = null;
             }
-        },
+            resolve(obj)
+          }
+        })
+      })
+    },
 
-        // 初始化(在父组件中调用)
-        initData(obj) {
-            if (obj.gearValue) {
-                if (obj.gearValue instanceof Array) {
-                    this.formData.gearValue = obj.gearValue;
-                } else if (typeof obj.gearValue === 'string') {
-                    let arr = [];
-                    if (obj.gearValue.indexOf(';') !== -1) {
-                        // 多个-接口传回来的（接口返回的是;分割）
-                        arr = obj.gearValue.split(';');
-                    } else {
-                        // 多个-正在编辑中 / 只有一个
-                        arr = obj.gearValue.split(',');
-                    }
-                    this.formData.gearValue = arr.map(item => {
-                        return Number(item);
-                    })
-                }
-            } else {
-                this.formData.gearValue = [null];
-            }
-            this.posNum = this.formData.gearValue.length;
-        },
+    // 增删档位
+    changePos(idx, actType) {
+      if (actType === 'add') {
+        if (this.formData.gearValue.length < 20) {
+          this.posNum++;
+          this.formData.gearValue.splice(idx + 1, 0, null);
+        }
+      } else {
+        this.formData.gearValue.splice(idx, 1);
+        this.posNum--;
+      }
+    },
 
-        // 重置表单(在父组件中调用)
-        resetForm() {
-            this.$refs.formPosition.resetFields();
-            this.formData.gearValue = [null];
+    // 初始化(在父组件中调用)
+    initData(obj) {
+      if (obj.gearValue) {
+        if (obj.gearValue instanceof Array) {
+          this.formData.gearValue = obj.gearValue;
+        } else if (typeof obj.gearValue === 'string') {
+          let arr = [];
+          if (obj.gearValue.indexOf(';') !== -1) {
+            // 多个-接口传回来的（接口返回的是;分割）
+            arr = obj.gearValue.split(';');
+          } else {
+            // 多个-正在编辑中 / 只有一个
+            arr = obj.gearValue.split(',');
+          }
+          this.formData.gearValue = arr.map(item => {
+            return Number(item);
+          })
         }
+      } else {
+        this.formData.gearValue = [null];
+      }
+      this.posNum = this.formData.gearValue.length;
+    },
+
+    // 重置表单(在父组件中调用)
+    resetForm() {
+      this.$refs.formPosition.resetFields();
+      this.formData.gearValue = [null];
     }
+  }
 }
 </script>
 
 <style scoped>
 .img-btn {
-    display: inline-block;
-    vertical-align: middle;
-    margin-left: 10px;
-    width: 20px;
-    cursor: pointer;
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: 10px;
+  width: 20px;
+  cursor: pointer;
 }
 </style>
 
-- 
Gitee


From 954df4594330f53d1aa0628c700776c27138b7a6 Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Fri, 24 Nov 2023 17:55:42 +0800
Subject: [PATCH 09/10] up

---
 src/api/question/title/types.ts    |  8 +--
 src/components/Options/index.vue   |  2 +-
 src/views/question/title/index.vue | 98 +++++++++++++++++-------------
 3 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/src/api/question/title/types.ts b/src/api/question/title/types.ts
index 2d66ac8a..7b6e4012 100644
--- a/src/api/question/title/types.ts
+++ b/src/api/question/title/types.ts
@@ -16,8 +16,7 @@ export interface TitleVO {
 
   labelName : string;
 
-  // optionVoList : OptionVoList[];
-
+  optionVoList : OptionVoList[];
 }
 
 export interface TitleForm extends BaseEntity {
@@ -61,13 +60,8 @@ export interface TitleQuery extends PageQuery {
 }
 
 export interface OptionVoList {
-
-  id : number,
-
   serial : number;
 
-  questionId : number;
-
   optionContent : string;
 
 }
diff --git a/src/components/Options/index.vue b/src/components/Options/index.vue
index 98691e18..bcbe60f8 100644
--- a/src/components/Options/index.vue
+++ b/src/components/Options/index.vue
@@ -4,7 +4,7 @@
     :prop="`gearValue[${index}]`" :rules="ruleValidate" align="center" prop="options">
     <el-input :min="0" :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')" placeholder="请填写"
       :disabled="isSee" class="w-200" v-model="form.value.options[index]" />
-    <v-image v-if="!isSee && posNum < maxPosLen" :src="addImg" class="img-btn" @click="changePos(index, 'add')" />
+    <v-image v-if="!isSee && posNum < maxPosLen && posNum == index+1" :src="addImg" class="img-btn" @click="changePos(index, 'add')" />
     <v-image v-if="!isSee && posNum > 1" :src="delImg" @click="changePos(index, 'del')" class="img-btn" />
   </el-table-column>
 </template>
diff --git a/src/views/question/title/index.vue b/src/views/question/title/index.vue
index da24bd37..ccef0615 100644
--- a/src/views/question/title/index.vue
+++ b/src/views/question/title/index.vue
@@ -49,9 +49,9 @@
         <el-table-column label="序号" align="center" prop="id" v-if="true" />
         <el-table-column label="标题" align="center" prop="question" />
         <el-table-column label="标签" align="center" prop="labelName">
-          <template #default="scope">
+          <!-- <template #default="scope">
             <dict-tag :options="labelList" :value="scope.row.labelName" />
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -71,24 +71,43 @@
         v-model:limit="queryParams.pageSize" @pagination="getList" />
     </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="800px" append-to-body>
       <el-form ref="titleFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="question">
           <el-input v-model="form.question" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="标签" prop="labelId">
-          <el-select v-model="form.labelId" @change="handleLabelChange" placeholder="请选择标签">
+        <el-form-item label="标签" prop="labelName">
+          <el-select v-model="form.labelName" @change="handleLabelChange" placeholder="请选择标签">
             <el-option v-for="dict in labelList" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
 
-        <el-table-column :label="`选项${index + 1}：`" v-for="(item, index) in posNum" :key="item" class="m-t-20"
-          :prop="`gearValue[${index}]`" :rules="ruleValidate" align="center" prop="options">
-          <el-input :min="0" :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')" placeholder="请填写"
-            :disabled="isSee" class="w-200" v-model="form.value.options[index]" />
-          <v-image v-if="!isSee && posNum < maxPosLen" :src="addImg" class="img-btn" @click="changePos(index, 'add')" />
-          <v-image v-if="!isSee && posNum > 1" :src="delImg" @click="changePos(index, 'del')" class="img-btn" />
-        </el-table-column>
+        <el-form-item :label="`选项${index + 1}`" v-for="(item, index) in posNum" :key="item" prop="options">
+          <el-col :span="15">
+            <el-input
+              :min="0"
+              :formatter="(value: any) => `${value}`"
+              placeholder="请填写"
+              :disabled="isSee"
+              class="w-200 m-2"
+              v-model="form.optionVoList[index].optionContent"
+             />
+          </el-col>
+          <el-col :span="5" class="text-center">
+            <ElImage
+              v-if="!isSee && posNum < maxPosLen && posNum == index+1"
+              :src="addImg"
+              class="img-btn"
+              @click="changePos(index, 'add')"
+            />
+            <ElImage
+              v-if="!isSee && posNum > 1"
+              :src="delImg"
+              @click="changePos(index, 'del')"
+              class="img-btn"
+            />
+          </el-col>
+        </el-form-item>
 
       </el-form>
       <template #footer>
@@ -118,7 +137,10 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const labelList = ref<DictDataOption[]>([]); let posNum = 20
+const labelList = ref<DictDataOption[]>([]);
+const isSee = ref(false);
+const maxPosLen = ref(20);
+const posNum = ref(1);
 
 const queryFormRef = ref<ElFormInstance>();
 const titleFormRef = ref<ElFormInstance>();
@@ -133,7 +155,12 @@ const initFormData: TitleForm = {
   question: undefined,
   labelId: undefined,
   labelName: "",
-  optionVoList: [],
+  optionVoList: [
+    {
+      serial:1,
+      optionContent:"",
+    }
+  ],
 }
 const data = reactive<PageData<TitleForm, TitleQuery>>({
   form: { ...initFormData },
@@ -155,6 +182,9 @@ const data = reactive<PageData<TitleForm, TitleQuery>>({
     labelId: [
       { required: true, message: "标签不能为空", trigger: "change" }
     ],
+    optionVoList: [
+      { required: true, message: "标签不能为空", trigger: "change" }
+    ],
   }
 });
 
@@ -172,7 +202,7 @@ const getList = async () => {
 const getLabelList = async () => {
   loading.value = true;
   queryAllLabel().then((resp) => {
-    labelList.value = resp.data.map((p: any): DictDataOption => ({ label: p.label, value: p.value, elTagType: "", elTagClass: "" }));
+    labelList.value = resp.data.map((p: any): DictDataOption => ({ label: p.label, value: p.value, elTagType: "", elTagClass: "primary" }));
   });
   loading.value = false;
 }
@@ -181,6 +211,7 @@ function handleLabelChange(val: string) {
   const selectedLabel = labelList.value.find(item => item.value === val);
   if (selectedLabel) {
     form.value.labelName = selectedLabel.label;
+    form.value.labelId = selectedLabel.value;
   }
 }
 
@@ -193,6 +224,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
+  posNum.value = 1;
   titleFormRef.value?.resetFields();
 }
 
@@ -229,6 +261,8 @@ const handleUpdate = async (row?: TitleVO) => {
   const res = await getTitle(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
+  form.value.optionVoList = res.data.optionVoList;
+  posNum.value = form.value.optionVoList.length;
   dialog.title = "修改题目";
 }
 
@@ -273,39 +307,19 @@ const handleExport = () => {
 const changePos = (idx: number, actType: string) => {
   if (actType === 'add') {
     if (form.value.optionVoList.length < 20) {
-      posNum++;
+      posNum.value++;
+      form.value.optionVoList.push({
+        serial:posNum.value,
+        optionContent:"",
+      });
       form.value.optionVoList.splice(idx + 1, 0);
     }
   } else {
     form.value.optionVoList.splice(idx, 1);
-    posNum--;
+    posNum.value--;
   }
 }
 
-/**
- * 提交的校验
- */
-const handleValidate = () =>{
-  return new Promise((resolve, reject) => {
-        $refs.formPosition.validate((valid) => {
-          if (valid) {
-            // 数据转换为接口所需要的形式
-            let obj = {};
-            if (form.value.optionVoList) {
-              if (form.value.optionVoList.length[0] === null) {
-                obj.optionVoList = null;
-              } else {
-                obj.optionVoList = form.value.optionVoList.join();
-              }
-            } else {
-              obj.optionVoList = null;
-            }
-            resolve(obj)
-          }
-        })
-      })
-}
-
 onMounted(() => {
   getList();
   getLabelList();
@@ -317,7 +331,7 @@ onMounted(() => {
   display: inline-block;
   vertical-align: middle;
   margin-left: 10px;
-  width: 20px;
+  width: 30px;
   cursor: pointer;
 }
 </style>
-- 
Gitee


From d01eaaed5c9f08631e312d547a3762d402262ec6 Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Mon, 27 Nov 2023 21:04:02 +0800
Subject: [PATCH 10/10] up

---
 src/api/question/rewards/index.ts    |  63 ++++++
 src/api/question/rewards/types.ts    |  86 ++++++++
 src/views/question/rewards/index.vue | 281 +++++++++++++++++++++++++++
 3 files changed, 430 insertions(+)
 create mode 100644 src/api/question/rewards/index.ts
 create mode 100644 src/api/question/rewards/types.ts
 create mode 100644 src/views/question/rewards/index.vue

diff --git a/src/api/question/rewards/index.ts b/src/api/question/rewards/index.ts
new file mode 100644
index 00000000..e48a7fda
--- /dev/null
+++ b/src/api/question/rewards/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { RewardsVO, RewardsForm, RewardsQuery } from '@/api/question/rewards/types';
+
+/**
+ * 查询奖品管理列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listRewards = (query?: RewardsQuery): AxiosPromise<RewardsVO[]> => {
+  return request({
+    url: '/question/rewards/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询奖品管理详细
+ * @param id
+ */
+export const getRewards = (id: string | number): AxiosPromise<RewardsVO> => {
+  return request({
+    url: '/question/rewards/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增奖品管理
+ * @param data
+ */
+export const addRewards = (data: RewardsForm) => {
+  return request({
+    url: '/question/rewards',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改奖品管理
+ * @param data
+ */
+export const updateRewards = (data: RewardsForm) => {
+  return request({
+    url: '/question/rewards',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除奖品管理
+ * @param id
+ */
+export const delRewards = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/question/rewards/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/question/rewards/types.ts b/src/api/question/rewards/types.ts
new file mode 100644
index 00000000..3bfdb263
--- /dev/null
+++ b/src/api/question/rewards/types.ts
@@ -0,0 +1,86 @@
+export interface RewardsVO {
+  /**
+   *
+   */
+  id: string | number;
+
+  /**
+   * 奖励类型
+   */
+  type: number;
+
+  /**
+   * 奖励名称
+   */
+  name: string;
+
+  /**
+   * 奖励图片
+   */
+  image: string;
+
+  /**
+   * 图片描述
+   */
+  imgDescribe: string;
+
+}
+
+export interface RewardsForm extends BaseEntity {
+  /**
+   *
+   */
+  id?: string | number;
+
+  /**
+   * 奖励类型
+   */
+  type?: number;
+
+  /**
+   * 奖励名称
+   */
+  name?: string;
+
+  /**
+   * 奖励图片
+   */
+  image?: string;
+
+  /**
+   * 图片描述
+   */
+  imgDescribe?: string;
+
+}
+
+export interface RewardsQuery extends PageQuery {
+
+  /**
+   * 奖励类型
+   */
+  type?: number;
+
+  /**
+   * 奖励名称
+   */
+  name?: string;
+
+  /**
+   * 奖励图片
+   */
+  image?: string;
+
+  /**
+   * 图片描述
+   */
+  imgDescribe?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/views/question/rewards/index.vue b/src/views/question/rewards/index.vue
new file mode 100644
index 00000000..7dd714f2
--- /dev/null
+++ b/src/views/question/rewards/index.vue
@@ -0,0 +1,281 @@
+<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="奖励类型" prop="type">
+            <el-select v-model="queryParams.type" placeholder="请选择奖励类型" clearable>
+              <el-option
+                v-for="dict in rewards_types"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="奖励名称" prop="name">
+            <el-input v-model="queryParams.name" placeholder="请输入奖励名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="图片描述" prop="imgDescribe">
+            <el-input v-model="queryParams.imgDescribe" 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>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['question:rewards:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['question:rewards:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['question:rewards:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['question:rewards:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="rewardsList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" prop="id" v-if="true" />
+        <el-table-column label="奖励类型" align="center" prop="typeName" />
+        <el-table-column label="奖励名称" align="center" prop="name" />
+        <el-table-column label="奖励图片" align="center" prop="image" width="100">
+          <template #default="scope">
+            <image-preview :src="scope.row.image" :width="50" :height="50"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="图片描述" align="center" prop="imgDescribe" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['question:rewards:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['question:rewards:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <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>
+      <el-form ref="rewardsFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="奖励类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择奖励类型">
+            <el-option
+                v-for="dict in rewards_types"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="奖励名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入奖励名称" />
+        </el-form-item>
+        <el-form-item label="奖励图片" prop="image">
+          <image-upload v-model="form.image"/>
+        </el-form-item>
+        <el-form-item label="图片描述" prop="imgDescribe">
+          <el-input v-model="form.imgDescribe" placeholder="请输入图片描述" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Rewards" lang="ts">
+import { listRewards, getRewards, delRewards, addRewards, updateRewards } from '@/api/question/rewards';
+import { RewardsVO, RewardsQuery, RewardsForm } from '@/api/question/rewards/types';
+import { getCurrentInstance, ComponentInternalInstance, ref, reactive, toRefs, onMounted } from 'vue';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const rewardsList = ref<RewardsVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const rewardsFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const rewards_types = ref([
+  {
+    "label":"兑换券奖励",
+    "value":"1"
+  },
+  {
+    "label":"文字奖励",
+    "value":"2"
+  }
+])
+
+const initFormData: RewardsForm = {
+  id: undefined,
+  type: undefined,
+  name: undefined,
+  image: undefined,
+  imgDescribe: undefined,
+}
+const data = reactive<PageData<RewardsForm, RewardsQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    type: undefined,
+    name: undefined,
+    image: undefined,
+    imgDescribe: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "不能为空", trigger: "blur" }
+    ],
+    type: [
+      { required: true, message: "奖励类型不能为空", trigger: "change" }
+    ],
+    name: [
+      { required: true, message: "奖励名称不能为空", trigger: "blur" }
+    ],
+    image: [
+      { required: true, message: "奖励图片不能为空", trigger: "blur" }
+    ],
+    imgDescribe: [
+      { required: true, message: "图片描述不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询奖品管理列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listRewards(queryParams.value);
+  rewardsList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  rewardsFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: RewardsVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加奖品管理";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: RewardsVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getRewards(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改奖品管理";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  rewardsFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateRewards(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addRewards(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("修改成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: RewardsVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除奖品管理编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delRewards(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('question/rewards/export', {
+    ...queryParams.value
+  }, `rewards_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
-- 
Gitee