From 83097f6b10acc6314649b7fd0ed8e8d749741696 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Fri, 17 Nov 2023 00:52:04 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=8817=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AF=BC=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jiaoshi/KcZhihuijiaoshiMonitorLogList.vue | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue b/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue
index fc37aed..dc442cf 100644
--- a/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue
+++ b/src/views/kc/jiaoshi/KcZhihuijiaoshiMonitorLogList.vue
@@ -96,9 +96,8 @@
 
     <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-descriptions title="" :column="2" :colon="2">
+          <a-descriptions-item label="开始时间">
             <a-date-picker
               :showTime="false"
               valueFormat="YYYY-MM-DD"
@@ -106,9 +105,8 @@
               v-model:value="expQueryParam.startTime"
               style="width:100%;"
             ></a-date-picker>
-          </a-col>
-          <a-col :span="2">结束时间:</a-col>
-          <a-col :span="9">
+          </a-descriptions-item>
+          <a-descriptions-item label="结束时间">
             <a-date-picker
               :showTime="false"
               valueFormat="YYYY-MM-DD"
@@ -116,12 +114,24 @@
               v-model:value="expQueryParam.endTime"
               style="width:100%;"
             ></a-date-picker>
+          </a-descriptions-item>
+          <a-descriptions-item label="教学楼名称" :span="2">
+            <j-checkbox type="checkbox" v-model:value="expQueryParam.jxlName" :dictCode="`kc_jiaoxuelou_info,JXLH_NAME,JXLH_NAME`" placeholder="请选择教学楼"/>
+          </a-descriptions-item>
+        </a-descriptions>
+
+<!--
+        <a-row>
+          <a-col :span="3">开始时间:</a-col>
+          <a-col :span="9">
+          </a-col>
+          <a-col :span="2">结束时间:</a-col>
+          <a-col :span="9">
           </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-row> -->
       </a-card>
     </a-modal>
 
@@ -223,6 +233,19 @@
   }
 
   function exportPdfhandleOk(){
+    let expParamsForm = expQueryParam.value;
+    if(!expParamsForm.startTime){
+      createMessage.warning('请选择开始时间');
+      return;
+    }
+    if(!expParamsForm.endTime){
+      createMessage.warning('请选择结束时间');
+      return;
+    }
+    if(!expParamsForm.jxlName){
+      createMessage.warning('请选择教学楼');
+      return;
+    }
     exportPdfvisible.value = false;
     onExportPdf();
   }
@@ -301,6 +324,7 @@
   }
 
 async function onExportPdf(){
+
   await onExport('pdf');
 }
 async function onExportWord(){