From f7e70a14956ca19cdf03c1fe9807e36f7a02c6bb Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Fri, 11 Oct 2024 16:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E7=BB=93=E4=B8=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TwoDimensionalCode.vue        |  2 +-
 src/components/TwoDimensionalCodeNew.vue     |  2 +-
 src/views/courselibrary/CoursewareManage.vue | 13 ++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue
index be7735e5..20b1dbe0 100644
--- a/src/components/TwoDimensionalCode.vue
+++ b/src/components/TwoDimensionalCode.vue
@@ -39,7 +39,7 @@
               ></qrcode-vue>
             </div>
           </div>
-          <div class="codeUrl" :style="{ display: showUrl ? 'flex' : 'flex' }">
+          <div class="codeUrl" :style="{ display: showUrl ? 'flex' : 'none' }">
             <div class="codeUrlLink">链接</div>
             <a-input
               :value="codeInfo.url.startsWith('/')?`${domain+codeInfo.url}&t=10`:`${codeInfo.url}&t=10`"
diff --git a/src/components/TwoDimensionalCodeNew.vue b/src/components/TwoDimensionalCodeNew.vue
index 2e8518c3..de4f7bdd 100644
--- a/src/components/TwoDimensionalCodeNew.vue
+++ b/src/components/TwoDimensionalCodeNew.vue
@@ -176,7 +176,7 @@ export default {
       state.codeInfo = Object.assign(obj, props.codeInfo);
       console.log("codeInfo22222", state.codeInfo, props.index, props.type);
 
-      if (props.type === "签到二维码") {
+      if (props.type === "签到二维码"|| props.type === "评估二维码") {
         state.showUrl = false;
         console.log(" state.showUrl", state.showUrl);
       } else if (props.type === "课程二维码") {
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 1bf0fd16..b08bf869 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1553,17 +1553,13 @@
                   <div class="bc_box">
                     <div class="ol_checkbox">
                       <a-radio
-                        v-model:checked="checked"
                         :value="1"
-                        @click="clear_jyradioV1"
                         >结业
                       </a-radio>
                     </div>
                     <div class="ol_checkbox">
                       <a-radio
-                        v-model:checked="checked"
                         :value="2"
-                        @click="clear_jyradioV1"
                         >不结业
                       </a-radio>
                     </div>
@@ -1780,7 +1776,7 @@
     v-model:codevisible="codevisible"
     :codeInfo="codeInfo"
     :index="codeIndex"
-    :type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : ''"
+    :type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : '评估二维码'"
   />
   <!-- 二维码弹窗 -->
 </template>
@@ -2776,7 +2772,7 @@ export default defineComponent({
       scoreId: null, //录入成绩id
       isgetStudent: false, //是否重新获取学员
       //结业
-      jyradioV1: "",
+      jyradioV1: 1,
 
       imageUrl: "",
       imgList: [],
@@ -4432,6 +4428,7 @@ function onFocusEnd(){
     const graduate_exit = () => {
       state.graduate_hs = false;
       state.addLoading = false;
+      state.jyradioV1 = 1;
     };
     const agreereject_exit = () => {
       state.agreereject_hs = false;
@@ -4498,7 +4495,7 @@ function onFocusEnd(){
       }
     };
     const handleJie = async () => {
-      if (state.graduate_hs) {
+      if (state.graduate_hs && state.jyradioV1 == 1) {
         // state.studentItem.id
         // console.log("state.studentItem.id", state.studentItem.id);
         api1
@@ -4514,6 +4511,8 @@ function onFocusEnd(){
               delete_exit1();
             }
           });
+      }else{
+        graduate_exit()
       }
     };
     //确认复制