From 8038477f54f34583fc3f4a2f644eafff8789ab23 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 9 May 2024 22:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/wjxWjxx/WjxWjxxList.vue                        | 6 +++---
 src/views/kc/wjxWjxx/components/WjxWjxxForm.vue             | 3 ++-
 src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue   | 2 +-
 src/views/zy/zyInfo/ZyInfoList.vue                          | 2 +-
 src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/kc/wjxWjxx/WjxWjxxList.vue b/src/views/kc/wjxWjxx/WjxWjxxList.vue
index 3e61273..7af79da 100644
--- a/src/views/kc/wjxWjxx/WjxWjxxList.vue
+++ b/src/views/kc/wjxWjxx/WjxWjxxList.vue
@@ -14,6 +14,7 @@
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a-button type="primary" preIcon="ant-design:plus-outlined" @click="handleAdd" style="margin-left: 8px"> 新增</a-button>
               </a-col>
             </span>
           </a-col>
@@ -21,11 +22,10 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+    <BasicTable @register="registerTable" >
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button type="primary" @click="init" preIcon="ant-design:plus-outlined"> 登录</a-button>
+        <!-- <a-button type="primary" @click="init" preIcon="ant-design:plus-outlined"> 登录</a-button> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue
index afa4c44..8cb2eff 100644
--- a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue
+++ b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue
@@ -8,7 +8,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="问卷类型" v-bind="validateInfos.title">
+          <a-form-item label="问卷类型" v-bind="validateInfos.atype">
             <a-select
               ref="select"
               v-model:value="formData.atype"
@@ -65,6 +65,7 @@
   //表单验证
   const validatorRules = {
     title: [{ required: true, message: '请输入问卷名称!'},],
+    atype: [{ required: true, message: '请选择问卷类型!'},],
   };
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
 
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
index ac2fbbf..3a22bba 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
@@ -61,7 +61,7 @@
     var href = "/zy/dqkcDqzy";
     if(zytype=='dqzy'){
       href = "/zy/dqkcDqzy";
-    }else if(type=='dqwj'){
+    }else if(zytype=='dqwj'){
       href = "/zy/dqkcWenjuan";
     }else if(zytype=='lszy'){
       href = "/zy/dqkcLszy";
diff --git a/src/views/zy/zyInfo/ZyInfoList.vue b/src/views/zy/zyInfo/ZyInfoList.vue
index bcc1b12..81c397d 100644
--- a/src/views/zy/zyInfo/ZyInfoList.vue
+++ b/src/views/zy/zyInfo/ZyInfoList.vue
@@ -53,7 +53,7 @@
               <a-button type="primary" @click="handleFabu(item)" style="margin-left:5px;background:rgb(28, 132, 198);" v-if="item.zyStatus==0">发布</a-button>
               <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;background:rgb(28, 132, 198);">详情</a-button>
               <a-button type="primary" @click="handleZyxx(item)" style="margin-left:5px;background:rgb(28, 132, 198);" v-if="item.zyStatus==1||item.zyStatus==2||item.zyStatus==3">作业</a-button>
-              <!-- <a-button type="primary" @click="handleShangchuan(item)" style="margin-left:5px;" v-if="item.zyStatus==1||item.zyStatus==2||item.zyStatus==3">上传</a-button> -->
+              <a-button type="primary" @click="handleShangchuan(item)" style="margin-left:5px;background:rgb(28, 132, 198);" v-if="item.zyStatus==1||item.zyStatus==2||item.zyStatus==3">上传</a-button>
             </a-col>
           </a-row>
         </a-card>
diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
index e186122..ce85080 100644
--- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
+++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
@@ -3,7 +3,7 @@
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
         <a-col :span="24">
-          <a-form-item label="作业附件" v-bind="validateInfos.filePath">
+          <a-form-item label="上传作业" v-bind="validateInfos.filePath">
 	          <j-upload v-model:value="formData.filePath"  :disabled="disabled" ></j-upload>
           </a-form-item>
         </a-col>