up

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'
+  });
+};
+
 /**
  * 状态修改
  */

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 {
   /**
    *

src/api/question/title/types.ts

@@ -14,6 +14,8 @@ export interface TitleVO {
    */
   labelId: string | number;
 
+  labelName : string;
+
 }
 
 export interface TitleForm extends BaseEntity {
@@ -32,6 +34,8 @@ export interface TitleForm extends BaseEntity {
    */
   labelId?: string | number;
 
+  labelName : string;
+
 }
 
 export interface TitleQuery extends PageQuery {

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-form-item label="标题" prop="question">
-            <el-input v-model="queryParams.question" placeholder="请输入题目" clearable style="width: 240px" @keyup.enter="handleQuery" />
+            <el-input v-model="queryParams.question" placeholder="请输入标题" clearable style="width: 240px"
+              @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="题目标签类型" prop="labelId">
+          <el-form-item label="标签" prop="labelId">
-            <el-select v-model="queryParams.labelId" placeholder="请选择题目标签类型" clearable>
+            <el-select v-model="queryParams.labelId" placeholder="请选择标签" clearable>
-              <el-option
+              <el-option v-for="dict in labelList" :key="dict.value" :label="dict.label" :value="dict.value" />
-                v-for="dict in sys_notice_type"
-                :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="id" v-if="true" />
-        <el-table-column label="题目" align="center" prop="question" />
+        <el-table-column label="标题" align="center" prop="question" />
-        <el-table-column label="题目标签类型" align="center" prop="labelId">
+        <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
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-          v-show="total>0"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
-          :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-form-item label="标题" prop="question">
-          <el-input v-model="form.question" placeholder="请输入题目" />
+          <el-input v-model="form.question" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="题目标签类型" prop="labelId">
+        <el-form-item label="标签" prop="labelId">
-          <el-select v-model="form.labelId" placeholder="请选择题目标签类型">
+          <el-select v-model="form.labelId" @change="handleLabelChange" placeholder="请选择标签">
-            <el-option
+            <el-option v-for="dict in labelList" :key="dict.value" :label="dict.label"
-                v-for="dict in sys_notice_type"
+              :value="dict.value"></el-option>
-                :key="dict.value"
-                :label="dict.label"
-                :value="parseInt(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,6 +122,7 @@ const initFormData: TitleForm = {
   id: undefined,
   question: undefined,
   labelId: undefined,
+  labelName : "",
 }
 const data = reactive<PageData<TitleForm, TitleQuery>>({
   form: { ...initFormData },
@@ -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();
@@ -245,5 +256,6 @@ const handleExport = () => {
 
 onMounted(() => {
   getList();
+  getLabelList();
 });
 </script>