From 903644f56c2aca4fe3714d801bf2fa6ba3e05c8e Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Sun, 12 Nov 2023 20:27:08 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=8812=E6=97=A5=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jiaoshi/KcZhihuijiaoshiMonitorLogList.vue | 58 ++++++++++++++++++-
 .../site/common/video/videojs/viewPage.vue    |  2 +-
 2 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue b/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue
index 2a99da8..cabef46 100644
--- a/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue
+++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue
@@ -37,8 +37,9 @@
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-                <a-button type="primary" preIcon="ant-design:up-outlined" @click="handleBaobiao" style="margin-left: 8px">报表</a-button>
+                <a-button hidden type="primary" preIcon="ant-design:up-outlined" @click="handleBaobiao" style="margin-left: 8px">报表</a-button>
 
+                <a-button type="primary" preIcon="ant-design:up-outlined" @click="openExportPdfParamPage" style="margin-left: 8px">报表</a-button>
                 <a-button hidden type="primary" preIcon="ant-design:up-outlined" @click="onExportWord" style="margin-left: 8px">导出word</a-button>
                 <a-button hidden type="primary" preIcon="ant-design:up-outlined" @click="onExportPdf" style="margin-left: 8px">导出pdf</a-button>
                 <!--<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
@@ -93,6 +94,38 @@
     <KcZhihuijiaoshiMonitorLogModal ref="registerModal" @success="handleSuccess"></KcZhihuijiaoshiMonitorLogModal>
     <KcZhihuijiaoshiMonitorStaticLogModal ref="registerStaticModal"></KcZhihuijiaoshiMonitorStaticLogModal>
 
+    <a-modal title="选择范围" width="800px" :visible="exportPdfvisible" @ok="exportPdfhandleOk" :okButtonProps="{ class: { 'jee-hidden': false } }" @cancel="exportPdfhandleCancel" cancelText="关闭">
+      <a-card>
+        <a-row>
+          <a-col :span="3">开始时间:</a-col>
+          <a-col :span="9">
+            <a-date-picker
+              :showTime="false"
+              valueFormat="YYYY-MM-DD"
+              :placeholder="'请选择开始时间'"
+              v-model:value="expQueryParam.startTime"
+              style="width:100%;"
+            ></a-date-picker>
+          </a-col>
+          <a-col :span="2">结束时间:</a-col>
+          <a-col :span="9">
+            <a-date-picker
+              :showTime="false"
+              valueFormat="YYYY-MM-DD"
+              :placeholder="'请选择结束时间'"
+              v-model:value="expQueryParam.endTime"
+              style="width:100%;"
+            ></a-date-picker>
+          </a-col>
+          <a-col :span="3">教学楼名称:</a-col>
+          <a-col :span="21">
+            <j-checkbox type="checkbox" v-model:value="expQueryParam.jxlName" :dictCode="`kc_jiaoxuelou_info,JXLH_NAME,JXLH_NAME`" placeholder="请选择教学楼"/>
+          </a-col>
+        </a-row>
+      </a-card>
+    </a-modal>
+
+
   </div>
 </template>
 
@@ -103,11 +136,12 @@
   import { columns } from './KcZhihuijiaoshiMonitorLog.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './KcZhihuijiaoshiMonitorLog.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
-import { JInput } from '/@/components/Form';
+  import { JInput } from '/@/components/Form';
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import KcZhihuijiaoshiMonitorLogModal from './components/KcZhihuijiaoshiMonitorLogModal.vue'
   import KcZhihuijiaoshiMonitorStaticLogModal from './staticlist/KcZhihuijiaoshiMonitorStaticLogModal.vue'
+  import JCheckbox from "/@/components/Form/src/jeecg/components/JCheckbox.vue";
 
   const queryParam = ref<any>({});
   const toggleSearchStatus = ref<boolean>(false);
@@ -115,6 +149,9 @@ import { JInput } from '/@/components/Form';
   const registerStaticModal = ref();
   const { createMessage } = useMessage();
 
+  const expQueryParam = ref<any>({});
+  const exportPdfvisible = ref<boolean>(false);
+
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
@@ -180,6 +217,20 @@ import { JInput } from '/@/components/Form';
     registerModal.value.edit(record);
   }
 
+  function openExportPdfParamPage() {
+    expQueryParam.value = {};
+    exportPdfvisible.value = true;
+  }
+
+  function exportPdfhandleOk(){
+    exportPdfvisible.value = false;
+    onExportPdf();
+  }
+
+  function exportPdfhandleCancel() {
+    exportPdfvisible.value = false;
+  }
+
   /**
    * 删除事件
    */
@@ -262,8 +313,9 @@ async function onExport(dcType){
   let fileName = dcType == 'pdf'?'教学听课情况表.pdf':'教学听课情况表.docx';
   // let fileName = '教学听课情况表.docx';
   let paramsForm = queryParam.value;
+  let expParamsForm = expQueryParam.value;
 
-  paramsForm = { ...paramsForm }
+  paramsForm = { ...paramsForm, ...expParamsForm }
 
   let url = dcType == 'pdf'?'/jiaoshi/kcZhihuijiaoshiMonitorLog/exportPdf':'/jiaoshi/kcZhihuijiaoshiMonitorLog/exportWord'
 
diff --git a/src/views/site/common/video/videojs/viewPage.vue b/src/views/site/common/video/videojs/viewPage.vue
index 17ab68c..aecf37c 100644
--- a/src/views/site/common/video/videojs/viewPage.vue
+++ b/src/views/site/common/video/videojs/viewPage.vue
@@ -17,7 +17,7 @@
                       </span>
                       <span style="margin-left: 10px;background: #1c84c6;color: #fff;padding: 3px;border-radius: 5px;font-size: 12px;" @click="() => tingKeZuJiAddModal.view({ ketangbiaoid: route.query.ktId })">填写评价表</span>
                       <div style="font-size: .5rem;">
-                        {{ ktangInfo.zc || ' ' }}-{{ ktangInfo.skjs || ' ' }}-学分：{{ ktangInfo.xf || ' ' }}-选课人数：{{ ktangInfo.xkrs || ' ' }}-课程性质：{{ ktangInfo.kcxz || ' ' }}-开课单位：{{ ktangInfo.kkdw || ' ' }}
+                        {{ ktangInfo.zc || ' ' }}&nbsp;&nbsp;{{ ktangInfo.skjs || ' ' }}&nbsp;&nbsp;学分：{{ ktangInfo.xf || ' ' }}&nbsp;&nbsp;选课人数：{{ ktangInfo.xkrs || ' ' }}&nbsp;&nbsp;课程性质：{{ ktangInfo.kcxz || ' ' }}&nbsp;&nbsp;开课单位：{{ ktangInfo.kkdw || ' ' }}
                       </div>
                     </template>
                     <div style="padding: 1rem;">