diff --git a/src/views/kc/wjxCswj/WjxCswjList.vue b/src/views/kc/wjxCswj/WjxCswjList.vue
index ef5d460..2b0db5a 100644
--- a/src/views/kc/wjxCswj/WjxCswjList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjList.vue
@@ -11,11 +11,13 @@
           </a-col>
           <a-col :lg="7">
             <a-form-item label="测验类型">
-              <a-select placeholder="请选择问卷状态" ref="select" v-model:value="queryParam.qpublish">
+              <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>
+                <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">
@@ -34,7 +36,7 @@
       <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 280px;">
-          <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish =='0'? '待发布':'已发布'}}</div>
+          <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish_dictText}}</div>
           <a-row style="top: -48px;position: relative;">
             <a-col :span="24" style="margin-bottom: 10px;height:53px;overflow:hidden;">
               <div style="font-size: 18px;font-weight: bold;">{{item.title}}</div>
@@ -100,6 +102,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import { Input, Popover, Pagination, Empty } from 'ant-design-vue';
   import { list ,deleteOne } from '/@/views/kc/wjxWjxx/WjxWjxx.api';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import WjxWjxxModal from '/@/views/kc/wjxWjxx/components/WjxWjxxModal.vue'
   import WjxWjxxTmlbModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbModal.vue'
   import WjxWjxxTmlbDjModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjModal.vue'
@@ -281,6 +284,8 @@
       return "background: #a7a6a6";
     }else if(type == '1'){
       return "background: #18a689";
+    }else if(type == '2'){
+      return "background: #6583f8";
     }
   }
 
diff --git a/src/views/kc/wjxDcwj/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue
index 15ea013..5bbc309 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue
@@ -11,11 +11,12 @@
           </a-col>
           <a-col :lg="7">
             <a-form-item label="问卷类型">
-              <a-select placeholder="请选择问卷类型" ref="select" v-model:value="queryParam.qpublish">
+              <j-dict-select-tag placeholder="请选择问卷类型" v-model:value="queryParam.zyStatus" 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>
+              </a-select> -->
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -34,7 +35,7 @@
       <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 280px;">
-          <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish =='0'? '待发布':'已发布'}}</div>
+          <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish_dictText}}</div>
           <a-row style="top: -48px;position: relative;">
             <a-col :span="24" style="margin-bottom: 10px;height:53px;overflow:hidden;">
               <div style="font-size: 18px;font-weight: bold;">{{item.title}}</div>
@@ -62,12 +63,12 @@
               </a-row>
             </a-col>
             <a-col :span="24" style="text-align:center;margin-top:20px;">
-              <a-button type="primary" @click="handleEdit(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">编辑</a-button>
-              <a-button type="primary" @click="handlePeizhi(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">配置</a-button>
-              <a-button type="primary" @click="handleFabu(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">发布</a-button>
-              <a-button type="primary" @click="handleDelete(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">删除</a-button>
-              <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">详情</a-button>
-              <a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">配置</a-button>
+              <a-button type="primary" @click="handleEdit(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">编辑问卷</a-button>
+              <a-button type="primary" @click="handlePeizhi(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">问卷设置</a-button>
+              <a-button type="primary" @click="handleFabu(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">发布问卷</a-button>
+              <a-button type="primary" @click="handleDelete(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">删除问卷</a-button>
+              <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">问卷详情</a-button>
+              <a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">问卷设置</a-button>
 <!--              <a-button type="primary" @click="handleDjjgs(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">结果</a-button>-->
             </a-col>
 <!--            <a-col :span="24" style="text-align:center;margin-top:20px;">-->
@@ -109,6 +110,7 @@
   import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
   import {useRouter} from "vue-router";
   import { JInput } from '/@/components/Form';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
   //当前路由信息
   const { currentRoute } = useRouter();
@@ -234,6 +236,8 @@
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.atype = "1";
+    queryParam.value.column = 'endTime';
+    queryParam.value.order = 'desc';
     defHttp.get({ url: '/wjxWjxx/wjxWjxx/list', params: queryParam.value }).then(res => {
       // console.log(`🚀 ~ defHttp.get ~ res:`, res)
       total.value = res.total;
@@ -283,6 +287,8 @@
       return "background: #a7a6a6";
     }else if(type == '1'){
       return "background: #18a689";
+    }else if(type == '2'){
+      return "background: #6583f8";
     }
   }
 
diff --git a/src/views/site/jingCaiGongKaiKe/index.vue b/src/views/site/jingCaiGongKaiKe/index.vue
index 685c6ca..c4a1923 100644
--- a/src/views/site/jingCaiGongKaiKe/index.vue
+++ b/src/views/site/jingCaiGongKaiKe/index.vue
@@ -12,7 +12,8 @@
           {{funSj(item.rq)}} {{item.kssj}}-{{item.jssj}}
         </div>
         <div>
-          <a href="javascript:void(0)" @click="funGkk(item.jslj)">
+          <!-- <a href="javascript:void(0)" @click="funGkk(item.jslj)"> -->
+          <a href="javascript:void(0)">
             <div>
               <span style="position: absolute;top: 4rem;border-radius: 0 10px 10px 0;background: #1ab394;color: #FFF;padding: 3px 10px 3px 5px;z-index: 2;" v-if="item.dqztpx == 1">{{item.dqzt}}</span>
               <span style="position: absolute;top: 4rem;border-radius: 0 10px 10px 0;background: #1c84c6;color: #FFF;padding: 3px 10px 3px 5px;z-index: 2;" v-if="item.dqztpx == 2">{{item.dqzt}}</span>
@@ -26,7 +27,8 @@
             </div>
           </a>
           <div style="padding: 10px 1rem 1rem;background: #f3f3f3;">
-          <a href="javascript:void(0)" @click="funGkk(item.jslj)">
+          <a href="javascript:void(0)" >
+          <!-- <a href="javascript:void(0)" @click="funGkk(item.jslj)"> -->
             <div class="ggkTitle ggkCcxs" :title="item.hxr +`·`+item.hxrlb">{{item.hxr}} · {{item.hxrlb}}</div>
             <div class="ggkTwoTitle ggkCcxs" :title="item.zc +`·`+item.xy">{{item.zc}} {{item.xy}}</div>
             <div class="ggkThreeTitle ggkCcxs">{{item.ktzt}}</div>
diff --git a/src/views/zy/zyInfo/ZyInfoList.vue b/src/views/zy/zyInfo/ZyInfoList.vue
index 2a4650c..16958ec 100644
--- a/src/views/zy/zyInfo/ZyInfoList.vue
+++ b/src/views/zy/zyInfo/ZyInfoList.vue
@@ -72,7 +72,7 @@
     </a-row>
 
     <ZyInfoModal ref="registerModal" @success="handleSuccess"></ZyInfoModal>
-    <ZyInfoStudentListModal ref="ZyInfoStudentListModalPage"></ZyInfoStudentListModal>
+    <ZyInfoStudentListModal ref="ZyInfoStudentListModalPage" @success="handleSuccess"></ZyInfoStudentListModal>
     <ZyInfoStudentModal ref="ZyInfoStudentModalPage"></ZyInfoStudentModal>
     <XxhbbksListModal ref="XxhbbksListModalPage"></XxhbbksListModal>
   </div>
@@ -128,6 +128,8 @@ import dayjs from 'dayjs';
       return "background: #a7a6a6";
     }else if(type == '1'){
       return "background: #18a689";
+    }else if(type == '2'){
+      return "background: #6583f8";
     }
   }
   /**
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue
index 8a4d2a9..350809a 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue
@@ -40,7 +40,6 @@
    */
   function submitCallback() {
     handleCancel();
-    emit('success');
   }
 
   /**
@@ -48,6 +47,7 @@
    */
   function handleCancel() {
     visible.value = false;
+    emit('success');
   }
 
   defineExpose({