From 92ff34bfa0965c66716f85f3a21c305726390a40 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 27 Sep 2024 14:12:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=9D=E6=94=BF=E8=AF=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/kcZzSzkc/KcZzSzkc.data.ts        |  2 +-
 src/views/kc/wjxCswj/WjxCywjV2List.vue        |  2 +-
 .../components/WjxWjxxTmlbForm.vue            | 40 +++++++++----------
 .../site/common/video/videojs/viewPage.vue    | 37 ++++++++++++++++-
 .../site/tingKeZuJi/components/addForm.vue    |  2 +-
 src/views/site/tingKeZuJi/page/qaAddPage.vue  |  5 ++-
 6 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/src/views/kc/kcZzSzkc/KcZzSzkc.data.ts b/src/views/kc/kcZzSzkc/KcZzSzkc.data.ts
index cdba3cf..f099d2b 100644
--- a/src/views/kc/kcZzSzkc/KcZzSzkc.data.ts
+++ b/src/views/kc/kcZzSzkc/KcZzSzkc.data.ts
@@ -118,7 +118,7 @@ export const columns: BasicColumn[] = [
   {
     title: '总体评价',
     align: "center",
-    dataIndex: 'ans14'
+    dataIndex: 'ans14_dictText'
   },
   {
     title: '课堂诊断',
diff --git a/src/views/kc/wjxCswj/WjxCywjV2List.vue b/src/views/kc/wjxCswj/WjxCywjV2List.vue
index 4f0c12f..bc35974 100644
--- a/src/views/kc/wjxCswj/WjxCywjV2List.vue
+++ b/src/views/kc/wjxCswj/WjxCywjV2List.vue
@@ -713,7 +713,7 @@
                 </a-row>
               </a-card>
 
-              <a-card v-if="item.endTime && item.qpublish == '1'" bodyStyle="">
+              <a-card v-if="item.endTime && (item.qpublish == '1' || item.qpublish == '2') " bodyStyle="">
                 <template #title>
                   <span>第{{ item.sort }}次测验：{{ item.title }}</span>
                   <span class="card-label">已发布</span>
diff --git a/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue
index d2de011..dafdd98 100644
--- a/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue
+++ b/src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue
@@ -45,13 +45,6 @@
                     ></a-input-number>
                     <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled">返回</span>
                   </a-tooltip>
-                  <a-tooltip placement="topRight" title="删除此题"
-                    ><Icon
-                      icon="ant-design:delete-outlined"
-                      style="cursor: pointer; font-size: 20px; margin: 10px"
-                      @click="handleDelTigan(item, index)"
-                      v-if="!editDisabled"
-                  /></a-tooltip>
                 </template>
                 <a-row v-if="isShow">
                   <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
@@ -127,13 +120,6 @@
                     ></a-input-number>
                     <span v-if="item.wjSfqh == '1'" @click="handleQiehuan(item, '0')" style="color: #9e9e9e" :disabled="editDisabled">返回</span>
                   </a-tooltip>
-                  <a-tooltip placement="topRight" title="删除此题"
-                    ><Icon
-                      icon="ant-design:delete-outlined"
-                      style="cursor: pointer; font-size: 20px; margin: 10px"
-                      @click="handleDelTigan(item, index)"
-                      v-if="!editDisabled"
-                  /></a-tooltip>
                 </template>
                 <a-row v-if="isShow">
                   <a-col :span="24" style="color: darkgrey; font-size: 13px"> 注：选中即为正确答案 </a-col>
@@ -396,14 +382,24 @@ export default defineComponent({
     }
 
     async function submitForm() {
-      const mainData = await getFormData();
-      const subData = await getSubFormAndTableData();
-      const values = Object.assign({}, dbData, mainData, subData);
-      console.log('表单提交数据', values);
-      const isUpdate = values.id ? true : false;
-      await saveOrUpdate(values, isUpdate);
-      //关闭弹窗
-      emit('success');
+      // const mainData = await getFormData();
+      // const subData = await getSubFormAndTableData();
+      // const values = Object.assign({}, dbData, mainData, subData);
+      // console.log('表单提交数据', values);
+      // const isUpdate = values.id ? true : false;
+      // await saveOrUpdate(values, isUpdate);
+      
+  const data = tiganData.value;
+  if(data.length==0){
+    createMessage.warning('请添加选项！');
+    return;
+  }
+  console.log('🧝‍♀️', data[0]);
+  defHttp.post({ url: '/wjxWjxxTmlb/wjxWjxxTmlb/edit', params: data[0] }).then((res) => {
+    //关闭弹窗
+    emit('success');
+  });
+      
     }
 
     function setFieldsValue(values) {
diff --git a/src/views/site/common/video/videojs/viewPage.vue b/src/views/site/common/video/videojs/viewPage.vue
index 02c6c54..d85097b 100644
--- a/src/views/site/common/video/videojs/viewPage.vue
+++ b/src/views/site/common/video/videojs/viewPage.vue
@@ -15,7 +15,7 @@
                       <span class="" style="border-radius: 5px;">
                         {{ ktangInfo.kcmc || ' ' }}
                       </span>
-                      <span style="float: right;margin-left: 10px;background: #1c84c6;color: #fff;padding: 9px;border-radius: 5px;font-size: 16px;" @click="() => tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })">填写评价表</span>
+                      <span style="float: right;margin-left: 10px;background: #1c84c6;color: #fff;padding: 9px;border-radius: 5px;font-size: 16px;" @click="funpingjia(ktangInfo)">填写评价表</span>
                       <div style="font-size: 12px;">
                         {{ ktangInfo.zc || ' ' }}&nbsp;&nbsp;{{ ktangInfo.skjs || ' ' }}&nbsp;&nbsp;学分：{{ ktangInfo.xf || ' ' }}
                         &nbsp;&nbsp;课程性质：{{ ktangInfo.kcxz || ' ' }}
@@ -132,7 +132,7 @@
 <script lang="ts" setup name="zhihuijiaoshiIndexPage">
 
 import { defHttp } from '/@/utils/http/axios';
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive, onMounted, createVNode, h } from 'vue';
 import headerPage from '/@/views/site/common/header.vue';
 import bVideo from '/@/views/site/common/video/videojs/video.vue';
 import addModalPage from '/@/views/site/tingKeZuJi/components/addModal.vue';
@@ -146,6 +146,8 @@ import { useMessage } from '/@/hooks/web/useMessage';
 import { baseApiUrl, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
 import KcDetectionMainModal from '/@/views/kc/detection/components/KcDetectionMainModal.vue'
 import { useModal } from '/@/components/Modal';
+import { Modal } from 'ant-design-vue';
+import { CloseOutlined } from '@ant-design/icons-vue';
 
 const { createMessage, createInfoModal, createErrorModal } = useMessage();
 
@@ -225,6 +227,37 @@ function handleBaocuo(item) {
   kcErrorreportIndexModal.value.disableSubmit = false;
   kcErrorreportIndexModal.value.add(item);
 }
+
+
+const listTkjlApi = (params) => defHttp.get({ url: '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId', params });
+function funpingjia(record) {
+  var item = { ketangbiaoid: record.id };
+  let userid = getUserId();
+  listTkjlApi({ userid: userid, ketangbiaoid: item.ketangbiaoid }).then((res) => {
+    var list = res;
+    console.log(`🚀 ~ file: list.vue:106 ~ listTkjlApi ~ list:`, list);
+    if (list.length > 0) {
+      var score = list[0].score;
+      if (score) {
+        Modal.error({
+          icon: createVNode({}),
+          content: h('div', { style: 'height:200px;text-align:center;' }, [
+            h('icon', { style: 'font-size:80px;font-weight:600;color:red;' }, createVNode(CloseOutlined)),
+            h('p', { style: 'font-size:22px;font-weight:600;color:black;' }, '已经对此课程进行评价，不可重复评价！'),
+          ]),
+          okText: 'OK',
+          width: '500px',
+        });
+      } else {
+        // tingKeZuJiAddModal.value.view(item);
+      tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })
+      }
+    } else {
+      // tingKeZuJiAddModal.value.view(item);
+      tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })
+    }
+  });
+}
 /**
  * 子页加载完成后回调
  * @param player
diff --git a/src/views/site/tingKeZuJi/components/addForm.vue b/src/views/site/tingKeZuJi/components/addForm.vue
index d0a2f6e..f05e2cf 100644
--- a/src/views/site/tingKeZuJi/components/addForm.vue
+++ b/src/views/site/tingKeZuJi/components/addForm.vue
@@ -13,7 +13,7 @@
           <a-button type="primary" class="wenZiJiaCu" style="font-size: 18px;height: 45px;"><RouterLink target='_blank' :to="{path:'/site/qaAddPageThpjb',query:{ type: 4, ktId }}">同行评价表</RouterLink></a-button>
         </a-col>
         <a-col :span="8" style="text-align: center;">
-          <a-button type="primary" class="wenZiJiaCu" style="font-size: 18px;height: 45px;"><RouterLink target='_blank' :to="{path:'/site/qaAddPageThpjb',query:{ type: 5, ktId }}">思政课程表</RouterLink></a-button>
+          <a-button type="primary" class="wenZiJiaCu" style="font-size: 18px;height: 45px;"><RouterLink target='_blank' :to="{path:'/site/qaAddPageThpjb',query:{ type: 5, ktId }}">思政课听课表</RouterLink></a-button>
         </a-col>
       </a-row>
     </div>
diff --git a/src/views/site/tingKeZuJi/page/qaAddPage.vue b/src/views/site/tingKeZuJi/page/qaAddPage.vue
index ada5839..56f7343 100644
--- a/src/views/site/tingKeZuJi/page/qaAddPage.vue
+++ b/src/views/site/tingKeZuJi/page/qaAddPage.vue
@@ -25,7 +25,7 @@
               </div>
             </template>
             <div style="text-align: left;font-size: 1rem;font-weight: 700;margin: 1rem;">
-              <span v-if="$route.query.type == '5'">教学态度包含1,2,3题，教学内容包含4,5,6,7题，教学方法包含8,9,10，教学效果包含11,12,13题</span>
+              <span v-if="$route.query.type == '5'">教学态度包含1,2,3题，教学内容包含4,5,6,7题，教学方法包含8,9,10题，教学效果包含11,12,13题</span>
               <span v-else-if="$route.query.type == '4'">该评价表是专门为该课程方面的专家/教师听课研制的评价表，更能反映该课堂的教学质量。</span>
               <span v-else-if="$route.query.type == '3'">该评价表是方便行政人员和非该课程所属学科的教师听课使用的评价表，主要用来反映课堂教学的整体情况。</span>
               <span v-else-if="$route.query.type == '2'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;该评价表是根据线上课堂的特点研制的，如果您听的是线上课堂，请您填写该评价表；如果您同时是该课程所属学科的专家/教师，也欢迎您同时填写《同行评价表》。</span>
@@ -74,7 +74,8 @@
               </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" style="margin-right: 1rem;" :loading="confirmLoading">取消</a-button> -->
+              <a-button type="primary" :loading="confirmLoading" style="margin-right: 1rem;"><RouterLink to="/site/index">返回首页</RouterLink></a-button>
               <a-button type="primary" @click="save" :loading="confirmLoading">提交</a-button>
             </div>
             <!-- <div>