From dbebb78b1ea21a14da666df5328737e298d9a325 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Fri, 19 May 2023 23:36:52 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B45=E6=9C=8819=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

---
 .../site/common/video/videojs/viewPage.vue    | 37 ++++++++++++++++++-
 src/views/site/jrkclb/kclbRkb.vue             | 11 ++----
 src/views/site/jrkclb/kclbXyjk.vue            | 13 +++++--
 src/views/site/jrkclb/kclbZzsk.vue            | 19 ++++++----
 4 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/src/views/site/common/video/videojs/viewPage.vue b/src/views/site/common/video/videojs/viewPage.vue
index 3b711b8..22592db 100644
--- a/src/views/site/common/video/videojs/viewPage.vue
+++ b/src/views/site/common/video/videojs/viewPage.vue
@@ -24,8 +24,11 @@
                       <div >{{ mainVideoCardBoxTitle || '' }}</div>
                       <bVideo ref="mainVideo" videoId="mainVideo" :videoOption="{ autoplay: true }"/>
                       <div style="width: 100%;">
-                        <a-textarea style="width: calc(100% - 7rem);height:120px;" v-model:value="model.notes" placeholder="您可以填写听课笔记"></a-textarea>
-                        <a-button type="primary" style="width: 7rem;height: 100%;" @click="saveSuibi">保存听课笔记</a-button>
+                        <a-textarea style="width: calc(100% - 7rem);height:120px;float: left;" v-model:value="model.notes" placeholder="您可以填写听课笔记"></a-textarea>
+                        <div style="width: 7rem;height: 100%;float: right;">
+                          <a-button type="primary" style="width: 7rem;height: 100%;" @click="openAllSuiBi">查看听课笔记</a-button>
+                          <a-button type="primary" style="width: 7rem;height: 100%;margin-top: 1rem;" @click="saveSuibi">保存听课笔记</a-button>
+                        </div>
                       </div>
                     </div>
                   </a-card>
@@ -70,6 +73,15 @@
     </div>
   </div>
   <addModalPage ref="tingKeZuJiAddModal"/>
+  <a-modal title="查看听课笔记" width="800px" :visible="tkbjVisible" :okButtonProps="{ class: { 'jee-hidden': true } }" @cancel="() => tkbjVisible = false" cancelText="关闭">
+    <div style="white-space:normal; word-break:break-all;overflow:hidden;">
+      <a-table tableLayout="fixed" :dataSource="suibiList" :scroll="{ x: true }" :pagination="false">
+        <a-table-column width="160px" title="填写时间" key="createTime" data-index="createTime" />
+        <a-table-column title="内容" key="notes" data-index="notes" />
+      </a-table>
+    </div>
+  </a-modal>
+
 </template>
 <script lang="ts" setup name="zhihuijiaoshiIndexPage">
 
@@ -91,7 +103,9 @@ const kcCardBoxTitle = ref<any>('');
 const ktangInfo = ref<any>({});
 const mainVideoCardBoxTitle = ref<any>('');
 const tableData = ref<Recordable>([])
+const suibiList = ref<Recordable>([])
 const isError = ref(false);
+const tkbjVisible = ref(false);
 
 const model = reactive<Record<string, any>>({ notes:'' });
 
@@ -211,6 +225,25 @@ function saveSuibi(){
   // }
 }
 
+function openAllSuiBi(){
+  //打开弹窗
+  tkbjVisible.value = true;
+  //查询随笔
+  let param = {
+    userId: getUserId(),
+    ketangbiaoId: route.query.ktId,
+    column: 'createTime',
+    order: 'desc',
+  };
+  querySuibi(param).then(res => {
+    // model = (res.records??[{}])[0];
+    suibiList.value = res.records??[]
+  }).finally(() => {
+    //关闭等待
+  });
+
+}
+
 </script>
 <style lang="less" scoped>
 #siteMain {
diff --git a/src/views/site/jrkclb/kclbRkb.vue b/src/views/site/jrkclb/kclbRkb.vue
index 3a5b4d7..ab804e6 100644
--- a/src/views/site/jrkclb/kclbRkb.vue
+++ b/src/views/site/jrkclb/kclbRkb.vue
@@ -4,14 +4,12 @@
     <a-row style="margin-top:20px;">
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
         <a-form-item label="" style="padding: 10px;">
-          <a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择结束时间'" style="width:100%;"
-            v-model:value="queryParam.ywTime"></a-date-picker>
+          <a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择结束时间'" style="width:100%;" v-model:value="queryParam.ywTime"></a-date-picker>
         </a-form-item>
       </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="`kc_kkdw_view,kkdw,kkdw`" />
+          <JDictSelectTag placeholder="请选择院系" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`" />
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
@@ -31,8 +29,7 @@
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 5 }">
         <a-form-item label="" style="padding: 10px;">
-          <a-input-search placeholder="请输入课程或教师名称" v-model:value="queryParam.ywmc" enter-button="查询"
-          @search="zbLoadData"></a-input-search>
+          <a-input-search placeholder="请输入课程或教师名称" v-model:value="queryParam.ywmc" enter-button="查询" @search="zbLoadData"></a-input-search>
         </a-form-item>
       </a-col>
       <!-- <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" style="padding: 10px;">
@@ -105,7 +102,7 @@ function zbLoadData() {
   txhyqueryParam.value.kcxz = queryParam.value.kcxz
   txhyqueryParam.value.zbpx ='1'
   txhyqueryParam.value.ywskxs = '1'
-  
+
   zibiaoCard(1);
 }
 /**
diff --git a/src/views/site/jrkclb/kclbXyjk.vue b/src/views/site/jrkclb/kclbXyjk.vue
index 9e3430f..518a3e8 100644
--- a/src/views/site/jrkclb/kclbXyjk.vue
+++ b/src/views/site/jrkclb/kclbXyjk.vue
@@ -6,8 +6,12 @@
     <a-row style="margin-top:20px;">
       <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="`kc_kkdw_view,kkdw,kkdw`" />
+          <JDictSelectTag placeholder="请选择院系" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`" />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+        <a-form-item label="" style="padding: 10px;">
+          <a-input placeholder="请输入上课地点" v-model:value="queryParam.skdd"></a-input>
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
@@ -29,7 +33,7 @@
               {{xxkcTotal}}</div>
           </div>
         </template>
-        <kclbList ref="wqxxkcModeal" :queryParam="xxkcqueryParam" @setTotal="xxkcTotal = $event;jzzyload()"></kclbList>
+        <kclbList ref="wqxxkcModeal" :queryParam="xxkcqueryParam" @set-total="xxkcTotal = $event;jzzyload()"></kclbList>
 
       </a-tab-pane>
       <a-tab-pane key="2">
@@ -41,7 +45,7 @@
               {{txhyTotal}}</div>
           </div>
         </template>
-        <kclbList ref="txhyModeal" :queryParam="txhyqueryParam"  @setTotal="txhyTotal = $event;jzzyload()"></kclbList>
+        <kclbList ref="txhyModeal" :queryParam="txhyqueryParam"  @set-total="txhyTotal = $event;jzzyload()"></kclbList>
       </a-tab-pane>
     </a-tabs>
   </div>
@@ -71,6 +75,7 @@ function zbLoadData() {
   xxkcqueryParam.value.ywmc = queryParam.value.ywmc
   xxkcqueryParam.value.skxs = '1'
   xxkcqueryParam.value.type = 0
+  xxkcqueryParam.value.skdd = queryParam.value.skdd
 
   //----------------------腾讯会议-------------------
   txhyqueryParam.value.skrq = queryParam.value.ywTime
diff --git a/src/views/site/jrkclb/kclbZzsk.vue b/src/views/site/jrkclb/kclbZzsk.vue
index 37feda2..b893830 100644
--- a/src/views/site/jrkclb/kclbZzsk.vue
+++ b/src/views/site/jrkclb/kclbZzsk.vue
@@ -3,17 +3,21 @@
     <div style="color:#1c84c6;font-weight: 600;font-size: 16px;" v-show="queryParam.jieci">
       以下是 <span>{{queryParam.ywTime}}</span><span>第{{queryParam.jieci}}节课</span> 的课表
     </div>
-    
+
     <div style="color:#1c84c6;font-weight: 600;font-size: 16px;" v-show="!queryParam.jieci">
-      现在是 <span>{{queryParam.ywTime}}</span> 非上课时段 
+      现在是 <span>{{queryParam.ywTime}}</span> 非上课时段
     </div>
 
-    
+
     <a-row style="margin-top:20px;">
       <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="`kc_kkdw_view,kkdw,kkdw`" />
+          <JDictSelectTag placeholder="请选择院系" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,kkdw`" />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+        <a-form-item label="" style="padding: 10px;">
+          <a-input placeholder="请输入上课地点" v-model:value="queryParam.skdd"></a-input>
         </a-form-item>
       </a-col>
       <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
@@ -35,7 +39,7 @@
               {{xxkcTotal}}</div>
           </div>
         </template>
-        <kclbList ref="wqxxkcModeal" :queryParam="xxkcqueryParam" @setTotal="xxkcTotal = $event;jzzyload()"></kclbList>
+        <kclbList ref="wqxxkcModeal" :queryParam="xxkcqueryParam" @set-total="xxkcTotal = $event;jzzyload()"></kclbList>
 
       </a-tab-pane>
       <a-tab-pane key="2">
@@ -47,7 +51,7 @@
               {{txhyTotal}}</div>
           </div>
         </template>
-        <kclbList ref="txhyModeal" :queryParam="txhyqueryParam"  @setTotal="txhyTotal = $event;jzzyload()"></kclbList>
+        <kclbList ref="txhyModeal" :queryParam="txhyqueryParam"  @set-total="txhyTotal = $event;jzzyload()"></kclbList>
       </a-tab-pane>
     </a-tabs>
   </div>
@@ -77,6 +81,7 @@ function zbLoadData() {
   xxkcqueryParam.value.ywmc = queryParam.value.ywmc
   xxkcqueryParam.value.skxs = 1
   xxkcqueryParam.value.type = 1
+  xxkcqueryParam.value.skdd = queryParam.value.skdd
 
   //----------------------腾讯会议-------------------
   txhyqueryParam.value.skrq = queryParam.value.ywTime