From d01868523cdf43eacb9adc35e6eedc11a6f6a724 Mon Sep 17 00:00:00 2001
From: LiuY <1622779752@qq.com>
Date: Mon, 18 Apr 2022 17:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/meeting/impl/MeetingServiceImpl.java      |  1 +
 src/main/resources/static/route/workreport/save.html  |  2 +-
 .../resources/static/route/workreport/update.html     | 11 +++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/com/tenlion/systemoa/service/meeting/impl/MeetingServiceImpl.java b/src/main/java/cn/com/tenlion/systemoa/service/meeting/impl/MeetingServiceImpl.java
index 5e2691d..93ce2d7 100644
--- a/src/main/java/cn/com/tenlion/systemoa/service/meeting/impl/MeetingServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/systemoa/service/meeting/impl/MeetingServiceImpl.java
@@ -320,6 +320,7 @@ public class MeetingServiceImpl extends DefaultBaseService implements IMeetingSe
         scheduleVO.setScheduleTitle(meetingVO.getMeetingTitle());
         scheduleVO.setScheduleStart(meetingVO.getMeetingStartTime());
         scheduleVO.setScheduleEnd(meetingVO.getMeetingEndTime());
+        scheduleVO.setScheduleMessageStatus("0");
         scheduleVO.setScheduleMessageType("1,2");//站内+短信
         scheduleVO.setScheduleMessageConfig(10);//提前十分钟提醒
         scheduleVO.setScheduleOpen("0");//不公开
diff --git a/src/main/resources/static/route/workreport/save.html b/src/main/resources/static/route/workreport/save.html
index 79ee51b..d5efce5 100644
--- a/src/main/resources/static/route/workreport/save.html
+++ b/src/main/resources/static/route/workreport/save.html
@@ -118,7 +118,7 @@
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/js-base64@3.6.0/base64.min.js"></script>
+<script type="text/javascript" src="assets/js/vendor/base64/base64.min.js"></script>
 <script>
     layui.config({
         base: 'assets/layuiadmin/' //静态资源所在路径
diff --git a/src/main/resources/static/route/workreport/update.html b/src/main/resources/static/route/workreport/update.html
index 2361bea..be0728e 100644
--- a/src/main/resources/static/route/workreport/update.html
+++ b/src/main/resources/static/route/workreport/update.html
@@ -59,7 +59,7 @@
                             <span class="layui-btn-group">
                                 <div class="upload-file-box">
                                     <!--href="route/file/download/false/{{item.fileId}}" -->
-                                    <a class="upload-file-a showFile" title="{{item.fileName}} - 点击下载">
+                                    <a class="upload-file-a showFile" title="{{item.fileName}}" data-id="{{item.fileId}}">
                                         {{# if(item.fileType == 'doc' || item.fileType == 'docx') { }}
                                         <img src="assets/images/filetype/word.png"/>
                                         {{# } else if(item.fileType == 'xls' || item.fileType == 'xlsx') { }}
@@ -114,6 +114,7 @@
 <script src="assets/js/vendor/ckplayer/ckplayer/ckplayer.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/js-base64@3.6.0/base64.min.js"></script>
 <script>
     layui.config({
         base: 'assets/layuiadmin/' //静态资源所在路径
@@ -289,11 +290,13 @@
             var fileId = $(this).attr('data-id')
             var url = "http://192.168.0.120:8080/systemoa/route/file/download/false/" + fileId;
             var previewUrl = url + '?fullfilename=' + fileName
+            console.log(previewUrl)
             layer.open({
                 type: 2,
-                title: '文件预览',
-                closeBtn: 1,
-                area: ['80%', '80%'],
+                title: false,
+                closeBtn: 0,
+                maxmin: true,
+                area: ['100%', '100%'],
                 shadeClose: true,
                 anim: 2,
                 content: 'http://192.168.0.120:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(previewUrl)),