diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/SectionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/SectionController.java index 9737e39..46588c1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/SectionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/section/SectionController.java @@ -11,4 +11,9 @@ public class SectionController { public String index() { return "section/home"; } + + @RequestMapping("/substation") + public String substation() { + return "section/substation"; + } } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 94032da..75eb60b 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/power_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://121.36.58.109:3306/power_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: 123456 + password: Haiwei123456 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/static/css/main.css b/ruoyi-admin/src/main/resources/static/css/main.css index 5fdcd75..698422b 100644 --- a/ruoyi-admin/src/main/resources/static/css/main.css +++ b/ruoyi-admin/src/main/resources/static/css/main.css @@ -2,6 +2,19 @@ font-family: Arial, Calibri, DengXian, "Microsoft YaHei", SimSun, monospace; } +.main-title { + position: absolute; + text-align: center; + color: #FFFFFF; + font-size: 160%; + width: 100%; + top: 1.5%; + font-weight: bold; + text-shadow: rgba(195, 255, 250, 0.5) 0 0 5px; + letter-spacing: 1px; + z-index: 0; +} + body.body-bg-1 { background: url("../img/index-background.jpg") no-repeat center fixed; -webkit-background-size: cover; @@ -10,10 +23,27 @@ body.body-bg-1 { background-size: 100% 100%; } +body.body-home-1 { + background: url("../img/home-background.png") no-repeat center fixed; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: 100% 100%; +} + +body.body-substation-1 { + background: url("../img/wire-background.png") no-repeat center fixed; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: 100% 100%; +} + .section-button-area { position: absolute; top: 3.7%; left: 2.7%; + z-index: 1; } .section-button { @@ -39,7 +69,7 @@ body.body-bg-1 { font-family: "Agency FB", Arial, Calibri, DengXian, "Microsoft YaHei", SimSun, monospace; font-weight: bold; font-size: 130%; - width: 5%; + width: 5.5%; text-align: center; color: #FFFFFF; letter-spacing: 2px; @@ -48,28 +78,44 @@ body.body-bg-1 { .tab-group { width: 100%; padding: 0 1rem; + border-bottom: #23C1FF 1px solid; } .tab-group-item { display: inline-block; - min-width: 7rem; - min-height: 1.6rem; - padding: 0; - color: #FFFFFF; - border: #FFFFFF solid 1px; + min-width: 6.125rem; + min-height: 1.4rem; + padding: 0 0 0 6px; + color: #01f8ff; + font-size: 0.7rem; + letter-spacing: 1px; + /*border: #FFFFFF solid 1px;*/ border-radius: 0; + background: url("../img/tab-background.png"); + text-align: left; } .tab-group-item:hover, .tab-group-item.active { - color: #004b4b; + color: #01f8ff; font-weight: bold; - background-color: #0dcaf0; + background-color: #23C1FF3F; } .tab-group-item .close-btn { opacity: 0; + color: #FFFFFF; + font-size: 80%; + /*margin-left: 20%;*/ + float: right; + margin-right: 7%; + z-index: 1; } .tab-group-item:hover .close-btn, .tab-group-item.active .close-btn { opacity: 1; -} \ No newline at end of file +} + +.text-success-light { + color: #3bfd00 !important; +} + diff --git a/ruoyi-admin/src/main/resources/static/img/tab-background.png b/ruoyi-admin/src/main/resources/static/img/tab-background.png new file mode 100644 index 0000000..5f7525a Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/tab-background.png differ diff --git a/ruoyi-admin/src/main/resources/static/js/queuing-menu.js b/ruoyi-admin/src/main/resources/static/js/queuing-menu.js index 3e9fdf7..866e2c6 100644 --- a/ruoyi-admin/src/main/resources/static/js/queuing-menu.js +++ b/ruoyi-admin/src/main/resources/static/js/queuing-menu.js @@ -2,9 +2,8 @@ class QueuingMenu { constructor(menuParent, queueParent, menu, { onRenderMenuItem = (parent, index, menuName, submenuNames) => {}, - onLinkMenuItem = (parent, el, index, menuName, submenuNames) => {}, + onLinkMenu = (parent, menu) => {}, onRenderQueueItem = (parent, index, item) => {}, - onLinkQueueItem = (parent, el, index, item) => {}, onLinkQueue = (parent, queue) => {}, onSelect = (menuParent, name, index, subIndex) => {}, onEnqueue = (queueParent, name, queueindex, menuIndex, menuSubindex) => {}, @@ -15,9 +14,8 @@ class QueuingMenu { this.queueParent = queueParent this.menu = menu this.onRenderMenuItem = onRenderMenuItem - this.onLinkMenuItem = onLinkMenuItem + this.onLinkMenu = onLinkMenu this.onRenderQueueItem = onRenderQueueItem - this.onLinkQueueItem = onLinkQueueItem this.onLinkQueue = onLinkQueue this.onSelect = onSelect this.onEnqueue = onEnqueue @@ -33,14 +31,14 @@ class QueuingMenu { if (menu) { for (let entry of Object.entries(this.menu)) { this.menuParent.innerHTML += this.onRenderMenuItem(this.menuParent, parseInt(entry[0]), entry[1].name, entry[1].submenu) - this.onLinkMenuItem(this.menuParent, this.menuParent.children[this.menuParent.children.length - 1], parseInt(entry[0]), entry[1].name, entry[1].submenu) } + + this.onLinkMenu(parent, this.menu) } if (queue) { for (let entry of Object.entries(this.queue)) { this.queueParent.innerHTML += this.onRenderQueueItem(this.queueParent, parseInt(entry[0]), entry[1]) - this.onLinkQueueItem(this.queueParent, this.queueParent.children[this.queueParent.children.length - 1], parseInt(entry[0]), entry[1]) } this.onLinkQueue(this.queueParent, this.queue) diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 88f4fca..9753d4f 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -19,6 +19,14 @@ position: absolute; top: 8%; } + + #main-display-frame { + position: absolute; + width: 95%; + bottom: 0; + left: 2.5%; + height: 87%; + }
@@ -28,15 +36,18 @@ - +