From b8db7d30e1c9980b3077458230db9a66d5320c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Sat, 25 May 2024 13:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=81=E7=AD=94=E5=8D=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/wjxCswj/WjxCswjList.vue      |  4 ++--
 src/views/kc/wjxCswj/WjxCswjTableList.vue | 19 ++++++++++---------
 src/views/kc/wjxDcwj/WjxDcwjList.vue      |  4 ++--
 src/views/kc/wjxDcwj/WjxDcwjTableList.vue | 19 ++++++++++---------
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/views/kc/wjxCswj/WjxCswjList.vue b/src/views/kc/wjxCswj/WjxCswjList.vue
index 7ec79c1..e4a8dfe 100644
--- a/src/views/kc/wjxCswj/WjxCswjList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjList.vue
@@ -10,8 +10,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="7">
-            <a-form-item label="测验类型">
-              <j-dict-select-tag placeholder="请选择测验类型" v-model:value="queryParam.qpublish" dictCode="zy_status"/>
+            <a-form-item label="测验状态">
+              <j-dict-select-tag placeholder="请选择测验状态" v-model:value="queryParam.qpublish" dictCode="zy_status"/>
               <!-- <a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.qpublish">
                 <a-select-option value="">全部</a-select-option>
                 <a-select-option value="0">待发布</a-select-option>
diff --git a/src/views/kc/wjxCswj/WjxCswjTableList.vue b/src/views/kc/wjxCswj/WjxCswjTableList.vue
index 66ef6f2..bad132e 100644
--- a/src/views/kc/wjxCswj/WjxCswjTableList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjTableList.vue
@@ -6,17 +6,18 @@
         <a-row :gutter="24">
           <a-col :lg="7">
             <a-form-item label="测验名称">
-              <j-input placeholder="请输入测验名称" v-model:value="queryParam.title"></j-input>
+              <a-input placeholder="请输入测验名称" v-model:value="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="7">
-            <a-form-item label="测验类型">
-              <a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.qpublish">
-                <a-select-option value="">全部</a-select-option>
-                <a-select-option value="0">待发布</a-select-option>
-                <a-select-option value="1">已发布</a-select-option>
-                <a-select-option value="2">已完成</a-select-option>
-              </a-select>
+            <a-form-item label="测验状态">
+              <j-dict-select-tag placeholder="请选择测验状态" v-model:value="queryParam.qpublish" dictCode="zy_status"/>
+<!--              <a-select placeholder="请选择测验状态" ref="select" v-model:value="queryParam.qpublish">-->
+<!--                <a-select-option value="">全部</a-select-option>-->
+<!--                <a-select-option value="0">待发布</a-select-option>-->
+<!--                <a-select-option value="1">已发布</a-select-option>-->
+<!--                <a-select-option value="2">已完成</a-select-option>-->
+<!--              </a-select>-->
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -51,6 +52,7 @@
 <script lang="ts" name="wjxWjxx-wjxWjxx" setup>
 import {ref, reactive, defineExpose, unref} from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 import { defHttp } from '/@/utils/http/axios';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { columns } from '/@/views/kc/wjxWjxx/WjxWjxx.data';
@@ -62,7 +64,6 @@ import WjxWjxxTmlbDjModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjModa
 import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue'
 import WjxWjxxTmlbDjjgsModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue'
 import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
-import { JInput } from '/@/components/Form';
 import {useRouter} from "vue-router";
 
 //当前路由信息
diff --git a/src/views/kc/wjxDcwj/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue
index 3fb4c85..4c7ac92 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue
@@ -10,8 +10,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="7">
-            <a-form-item label="问卷类型">
-              <j-dict-select-tag placeholder="请选择问卷类型" v-model:value="queryParam.zyStatus" dictCode="zy_status"/>
+            <a-form-item label="问卷状态">
+              <j-dict-select-tag placeholder="请选择问卷状态" v-model:value="queryParam.qpublish" dictCode="zy_status"/>
               <!-- <a-select placeholder="请选择问卷类型" ref="select" v-model:value="queryParam.qpublish">
                 <a-select-option value="">全部</a-select-option>
                 <a-select-option value="0">待发布</a-select-option>
diff --git a/src/views/kc/wjxDcwj/WjxDcwjTableList.vue b/src/views/kc/wjxDcwj/WjxDcwjTableList.vue
index 445ce61..e2384eb 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjTableList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjTableList.vue
@@ -6,17 +6,18 @@
         <a-row :gutter="24">
           <a-col :lg="7">
             <a-form-item label="测验名称">
-              <j-input placeholder="请输入测验名称" v-model:value="queryParam.title"></j-input>
+              <a-input placeholder="请输入测验名称" v-model:value="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="7">
-            <a-form-item label="测验类型">
-              <a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.qpublish">
-                <a-select-option value="">全部</a-select-option>
-                <a-select-option value="0">未发布</a-select-option>
-                <a-select-option value="1">已发布</a-select-option>
-                <a-select-option value="2">已完成</a-select-option>
-              </a-select>
+            <a-form-item label="问卷状态">
+              <j-dict-select-tag placeholder="请选择问卷状态" v-model:value="queryParam.qpublish" dictCode="zy_status"/>
+<!--              <a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.qpublish">-->
+<!--                <a-select-option value="">全部</a-select-option>-->
+<!--                <a-select-option value="0">未发布</a-select-option>-->
+<!--                <a-select-option value="1">已发布</a-select-option>-->
+<!--                <a-select-option value="2">已完成</a-select-option>-->
+<!--              </a-select>-->
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -51,6 +52,7 @@
 <script lang="ts" name="wjxWjxx-wjxWjxx" setup>
 import {ref, reactive, defineExpose, unref} from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useListPage } from '/@/hooks/system/useListPage';
   import { columns } from '/@/views/kc/wjxWjxx/WjxWjxx.data';
@@ -62,7 +64,6 @@ import {ref, reactive, defineExpose, unref} from 'vue';
   import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue'
   import WjxWjxxTmlbDjjgsDcModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcModal.vue'
   import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
-  import { JInput } from '/@/components/Form';
   import {useRouter} from "vue-router";
 
   //当前路由信息