From e26ec12fc616abfb24c1ce5bd48ede15b21fc327 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 29 一月 2023 13:21:58 +0800
Subject: [PATCH] #
---
src/main/webapp/views/index.html | 49 ++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/NewsController.java | 22 +++++++++++
pom.xml | 2
3 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 103f193..00a1c27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<properties>
<java.version>1.8</java.version>
- <cool.version>3.2.0</cool.version>
+ <cool.version>3.4.0</cool.version>
<mysql-driver.version>5.1.47</mysql-driver.version>
<mybatis-plus.version>2.3.2</mybatis-plus.version>
<fastjson.version>1.2.58</fastjson.version>
diff --git a/src/main/java/com/zy/asrs/controller/NewsController.java b/src/main/java/com/zy/asrs/controller/NewsController.java
new file mode 100644
index 0000000..a09bc3b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/NewsController.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.controller;
+
+import com.core.common.R;
+import com.zy.common.utils.News;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by vincent on 2022/12/28
+ */
+@Slf4j
+@RestController
+@RequestMapping("/news")
+public class NewsController {
+
+ @RequestMapping("/print")
+ public synchronized R print(){
+ return R.ok().add(News.print());
+ }
+
+}
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 8de3e96..e5fe9d1 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -51,5 +51,54 @@
// 绯荤粺杩愯鐘舵��
var systemRunning = true;
+
+
+ news();layx.min('wcs-news');
+ function news() {
+ layx.iframe(
+ 'wcs-news' // id
+ , '绯荤粺鍒嗘瀽鎶ュ憡'
+ , "news.html"
+ , {
+ shadow:false
+ , storeStatus:false
+ // , skin: 'news'
+ , width:800
+ , height:600
+ , position:'rb'
+ // , control:false
+ , opacity:0.9
+ , border:false
+ , icon:'<img src="../static/images/favicon.ico" style="height:22px;display:block;" alt=""/>'
+ , stickMenu:true
+ , maxMenu:false
+ , closeMenu:false
+ , moveLimit:{
+ leftOut: false,
+ rightOut: false,
+ topOut: false,
+ bottomOut: false,
+ }
+ , minWidth:300
+ , minHeight:300
+ , borderRadius: '8px'
+ , shadeDestroy:true
+ , escKey: false
+ , event:{
+ onmin: {
+ after: function () {
+ $('.layx-min-statu').css("left", "inherit").css("right", "10px")
+ }
+ }
+ , onrestore:{
+ after: function () {
+ let win = layx.getFrameContext('wcs-news');
+ win.autoScroll = true
+ }
+ }
+ }
+ }
+ );
+ }
</script>
</html>
--
Gitblit v1.9.1