From 42c49d9d8c085e996a6a6b42461e7a259f74b178 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 8 Dec 2023 21:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/kcZzThpjb/components/KcZzThpjbForm.vue |  4 ++--
 src/views/kc/kcZzXstkb/components/KcZzXstkbForm.vue |  4 ++--
 src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue |  4 ++--
 src/views/kc/ktgl/KcKechengbiaoList.vue             |  2 +-
 src/views/kc/pktj/pktjb/pktjb.data.ts               | 12 ++++++++++--
 src/views/site/common/video/videojs/viewPage.vue    |  2 +-
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/kc/kcZzThpjb/components/KcZzThpjbForm.vue b/src/views/kc/kcZzThpjb/components/KcZzThpjbForm.vue
index 2a55a65..86983fd 100644
--- a/src/views/kc/kcZzThpjb/components/KcZzThpjbForm.vue
+++ b/src/views/kc/kcZzThpjb/components/KcZzThpjbForm.vue
@@ -36,8 +36,8 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="评课教师编号" v-bind="validateInfos.pkjsbh">
-            <a-input v-model:value="formData.pkjsbh" placeholder="请输入授课教师" :disabled="disabled"></a-input>
+          <a-form-item label="工号" v-bind="validateInfos.pkjsbh">
+            <a-input v-model:value="formData.pkjsbh" placeholder="请输入工号" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="8">
diff --git a/src/views/kc/kcZzXstkb/components/KcZzXstkbForm.vue b/src/views/kc/kcZzXstkb/components/KcZzXstkbForm.vue
index 5a290be..9a7bd6b 100644
--- a/src/views/kc/kcZzXstkb/components/KcZzXstkbForm.vue
+++ b/src/views/kc/kcZzXstkb/components/KcZzXstkbForm.vue
@@ -36,8 +36,8 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="评课教师工号" v-bind="validateInfos.tkjsgh">
-            <a-input v-model:value="formData.tkjsgh" placeholder="请输入评课教师工号" :disabled="disabled"></a-input>
+          <a-form-item label="工号" v-bind="validateInfos.tkjsgh">
+            <a-input v-model:value="formData.tkjsgh" placeholder="请输入工号" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="8">
diff --git a/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue b/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue
index b65a8d9..b3fecc3 100644
--- a/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue
+++ b/src/views/kc/kcZzYbtkb/components/KcZzYbtkbForm.vue
@@ -36,8 +36,8 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="评课教师编号" v-bind="validateInfos.tkjsbh">
-            <a-input v-model:value="formData.tkjsbh" placeholder="请输入评课教师编号" disabled="true"></a-input>
+          <a-form-item label="工号" v-bind="validateInfos.tkjsbh">
+            <a-input v-model:value="formData.tkjsbh" placeholder="请输入工号" disabled="true"></a-input>
           </a-form-item>
         </a-col>
         <a-col :span="8">
diff --git a/src/views/kc/ktgl/KcKechengbiaoList.vue b/src/views/kc/ktgl/KcKechengbiaoList.vue
index 08e8ae9..26e29b4 100644
--- a/src/views/kc/ktgl/KcKechengbiaoList.vue
+++ b/src/views/kc/ktgl/KcKechengbiaoList.vue
@@ -7,7 +7,7 @@
           <a-col :lg="8">
             <a-form-item label="开课单位">
               <!-- <a-input placeholder="请输入开课单位" v-model:value="queryParam.kkdw"></a-input> -->
-              <j-dict-select-tag placeholder="请选择开课单位" v-model:value="queryParam.kkdw" dictCode="kc_kkdw_view,kkdw,id"/>
+              <j-dict-select-tag placeholder="请选择开课单位" v-model:value="queryParam.kkdw" dictCode="kc_kkdw_view,kkdw,kkdw"/>
             </a-form-item>
           </a-col>
           <a-col :lg="8">
diff --git a/src/views/kc/pktj/pktjb/pktjb.data.ts b/src/views/kc/pktj/pktjb/pktjb.data.ts
index 529c938..7b58ce6 100644
--- a/src/views/kc/pktj/pktjb/pktjb.data.ts
+++ b/src/views/kc/pktj/pktjb/pktjb.data.ts
@@ -22,12 +22,20 @@ export const columns: BasicColumn[] = [
   {
     title: '听课身份',
     align: "center",
-    dataIndex: 'tksf1'
+    dataIndex: 'tksf1',
   },
   {
     title: '本学期应听课次数',
     align: "center",
-    dataIndex: 'tkyq'
+    dataIndex: 'tkyq',
+    customRender: ({ record }) => {
+      console.log(`🚀 ~ file: pktjb.data.ts:32 ~ record:`, record)
+      var tkyq = record.tkyq
+      if(tkyq.indexOf(".")>-1){
+        tkyq = tkyq.substring(0,tkyq.indexOf("."))
+      }
+      return tkyq;
+    }
   },
   {
     title: '本学期已听课次数',
diff --git a/src/views/site/common/video/videojs/viewPage.vue b/src/views/site/common/video/videojs/viewPage.vue
index aecf37c..63edd8e 100644
--- a/src/views/site/common/video/videojs/viewPage.vue
+++ b/src/views/site/common/video/videojs/viewPage.vue
@@ -204,7 +204,7 @@ function changeLive(item:any){
   // mainVideo?.player?.src([{ type:'application/x-mpegURL',src: 'http://127.0.0.1/live_hls/a.m3u8' }])
   mainVideo?.player?.src([{ type:'application/x-mpegURL',src: url }])
 
-  mainVideoCardBoxTitle.value = item.jsmc+item.xm;
+  mainVideoCardBoxTitle.value = item.jsmc+" "+item.xm;
   console.log(`🚀 --------------------------------------------------------------------------------🚀`);
   console.log(`🚀 ~ file: viewPage.vue:164 ~ changeLive ~ mainVideo?.player:`, mainVideo?.player);
   console.log(`🚀 --------------------------------------------------------------------------------🚀`);