From 7e01ab0360eea5aa3e149dc60c020248bb3c3ea4 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Sat, 15 Apr 2023 15:49:46 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B44=E6=9C=8815=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/site/common/header.vue             | 26 ++++++++++----
 src/views/site/index.vue                     |  4 +--
 src/views/site/tingKeZuJi/index.vue          |  2 +-
 src/views/site/tingKeZuJi/more.vue           |  2 +-
 src/views/site/tingKeZuJi/page/qaAddPage.vue | 36 +++++++++++++++++---
 src/views/site/yuYueKeCheng/more.vue         |  2 +-
 6 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/src/views/site/common/header.vue b/src/views/site/common/header.vue
index 0b9df0d..7219fb66 100644
--- a/src/views/site/common/header.vue
+++ b/src/views/site/common/header.vue
@@ -1,13 +1,19 @@
 <template>
   <a-layout-header>
     <!-- <BackTop/> -->
-    <div id="topDiv">
-      <div class="topButton" @click="toTop">
-        <ArrowUpOutlined/>
-      </div>
-      <div class="topYiJianFanKui" @click="funYjfk">
-        意见反馈
-      </div>
+    <div id="topDiv" v-show="props.showRightButton">
+      <a-row >
+        <a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }">
+          <div class="topButton" @click="toTop">
+            <ArrowUpOutlined/>
+          </div>
+        </a-col>
+        <a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }">
+          <div class="topYiJianFanKui" @click="funYjfk">
+            意见反馈
+          </div>
+        </a-col>
+      </a-row>
     </div>
     <span class="topTitle">
       {{ projectName }}
@@ -40,6 +46,11 @@
   import { useUserStore } from '/@/store/modules/user';
   import YjfkModal from '/@/views/site/yjfk/YjfkModal.vue';
 
+  const props = defineProps({
+    showRightButton: { type: Boolean, default: false }
+  });
+
+
   const projectName = import.meta.env.VITE_GLOB_APP_TITLE;
 
   const YjfkModalTab = ref();
@@ -91,6 +102,7 @@
   right: 1rem;
   top: 5rem;
   z-index: 1;
+  width: 4rem;
   .topButton {
     background: #c2c2c2;
     margin-bottom: 2rem;
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index b1c82c4..7b4dde9 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -25,7 +25,7 @@
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <a-layout>
       <!-- 页头 -->
-      <headerPage/>
+      <headerPage showRightButton/>
       <!-- 主体部分 -->
       <a-layout-content>
         <!-- 统计 -->
@@ -39,7 +39,7 @@
         <!-- 听课足迹 -->
         <tingKeZuJiPage/>
         <!-- 预约课程 -->
-        <yuYueKeChengPage  ref="yykcModeal"  @ortherLoad="yykcLoad"/>
+        <yuYueKeChengPage  ref="yykcModeal" @ortherLoad="yykcLoad"/>
         <!-- 精彩公开课 -->
         <jingCaiGongKaiKePage/>
         <!-- 今日课程列表 -->
diff --git a/src/views/site/tingKeZuJi/index.vue b/src/views/site/tingKeZuJi/index.vue
index 7372ade..99a3433 100644
--- a/src/views/site/tingKeZuJi/index.vue
+++ b/src/views/site/tingKeZuJi/index.vue
@@ -7,7 +7,7 @@
     <template #extra>
       <RouterLink target='_blank' to="/site/tingKeZuJiMore">查看更多</RouterLink>
     </template>
-    <listPage/>
+    <listPage :queryParam="{ pageSize: 5 }"/>
   </a-card>
 </template>
 <script setup lang="ts">
diff --git a/src/views/site/tingKeZuJi/more.vue b/src/views/site/tingKeZuJi/more.vue
index 27fccde..62f5e81 100644
--- a/src/views/site/tingKeZuJi/more.vue
+++ b/src/views/site/tingKeZuJi/more.vue
@@ -13,7 +13,7 @@
                 <a-date-picker placeholder="请选择开始日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.startDate" style="width: 100%" />
               </a-col>
               <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
-                <a-date-picker placeholder="请选择结束日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.startDate" style="width: 100%" />
+                <a-date-picker placeholder="请选择结束日期" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD" v-model:value="queryParam.endDate" style="width: 100%" />
               </a-col>
               <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" class="dictBox">
                 <j-dict-select-tag v-model:value="queryParam.kkdw" dictCode="tkrszdw_view,college,college" placeholder="请选择院系" style="width: 100%;"/>
diff --git a/src/views/site/tingKeZuJi/page/qaAddPage.vue b/src/views/site/tingKeZuJi/page/qaAddPage.vue
index 3638ef6..70db4eb 100644
--- a/src/views/site/tingKeZuJi/page/qaAddPage.vue
+++ b/src/views/site/tingKeZuJi/page/qaAddPage.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="siteMain">
     <div id="maxSite">
-      <a-layout>
+      <a-layout v-show="isAdd">
         <!-- 页头 -->
         <headerPage/>
         <!-- 主体部分 -->
@@ -22,8 +22,8 @@
             </template>
             <div style="text-align: center;font-size: 1rem;font-weight: 700;margin: 1rem;">
               <span v-if="$route.query.type == '4'">该评价表是专门为该课程方面的专家/教师听课研制的评价表，更能反映该课堂的教学质量。</span>
-              <span v-else-if="$route.query.type == '3'">东北师范大学听课记录表</span>
-              <span v-else-if="$route.query.type == '2'">线上教学课堂看课、听课评价表</span>
+              <span v-else-if="$route.query.type == '3'">该评价表是方便行政人员和非该课程所属学科的教师听课使用的评价表，主要用来反映课堂教学的整体情况。</span>
+              <span v-else-if="$route.query.type == '2'">该评价表是根据线上课堂的特点研制的，如果您听的是线上课堂，请您填写该评价表；如果您同时是该课程所属学科的专家/教师，也欢迎您同时填写《同行评价表》。</span>
             </div>
             <div style="padding: 0 15rem;font-weight: 700;">
               <a-row :gutter="[16,16]">
@@ -69,6 +69,7 @@
               </a-row>
             </div>
             <div style="text-align: center;padding-top: 1rem;">
+              <a-button type="primary" style="margin-right: 1rem;" :loading="confirmLoading">取消</a-button>
               <a-button type="primary" @click="save" :loading="confirmLoading">提交</a-button>
             </div>
             <!-- <div>
@@ -82,6 +83,24 @@
         <!-- 页尾 -->
         <footerPage/>
       </a-layout>
+      <div v-show="!isAdd">
+        <div style="text-align: center;height: calc(100vh);">
+          <div style="padding: 5rem;font-size: 1.1rem;" class="wenZiJiaCu">
+            <p>
+              提交成功
+            </p>
+            <p>
+              您的评价对于我们很重要，感谢您的参与。
+            </p>
+            <p>
+              您可以关闭本页，或点击下方按钮打开主页
+            </p>
+            <p>
+              <a-button type="primary" :loading="confirmLoading"><RouterLink to="/site/index">返回首页</RouterLink></a-button>
+            </p>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -106,6 +125,7 @@ const list = ref<any>([]);
 const selectedMap = ref<any>({});
 
 const confirmLoading = ref<boolean>(false);
+const isAdd = ref<boolean>(true);
 const { createMessage } = useMessage();
 
 const route = useRoute();
@@ -189,7 +209,8 @@ function save() {
           formData.ansList.push(...genAns(x,data,false))
         }
       }else{
-        errorMsg = '有必填选项未填写，请检查后重新提交。'+x.id+'-'+x.content + data;
+        // errorMsg = '有必填选项未填写，请检查后重新提交。'+x.id+'-'+x.content + data;
+        errorMsg = '有必填选项未填写，请检查后重新提交。';
       }
     }else{
       //非必填收集数据
@@ -217,6 +238,7 @@ function save() {
       if (res.success) {
         createMessage.success(res.message);
         // emit('ok');
+        isAdd.value = false;
       } else {
         createMessage.warning(res.message);
       }
@@ -286,4 +308,10 @@ function save() {
     background: #3499ec;
   }
 }
+.wenZiJiaCu {
+  font-weight: 700;
+}
+a {
+  color: #337ab7;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/site/yuYueKeCheng/more.vue b/src/views/site/yuYueKeCheng/more.vue
index 052ead4..d2d2d31 100644
--- a/src/views/site/yuYueKeCheng/more.vue
+++ b/src/views/site/yuYueKeCheng/more.vue
@@ -27,7 +27,7 @@
           </a-col>
           <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
             <a-form-item label="" style="padding: 10px;">
-              <JDictSelectTag placeholder="请选择院系" v-model:value="queryParam.kkdw" :dictCode="`tkrszdw_view,college,college`" />
+              <JDictSelectTag placeholder="请选择院系" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,id`" />
             </a-form-item>
           </a-col>
           <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">