diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/_layout/components/AppMain.vue similarity index 100% rename from ruoyi-ui/src/layout/components/AppMain.vue rename to ruoyi-ui/src/_layout/components/AppMain.vue diff --git a/ruoyi-ui/src/layout/components/InnerLink/index.vue b/ruoyi-ui/src/_layout/components/InnerLink/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/InnerLink/index.vue rename to ruoyi-ui/src/_layout/components/InnerLink/index.vue diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/_layout/components/Navbar.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Navbar.vue rename to ruoyi-ui/src/_layout/components/Navbar.vue diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/ruoyi-ui/src/_layout/components/Settings/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Settings/index.vue rename to ruoyi-ui/src/_layout/components/Settings/index.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js b/ruoyi-ui/src/_layout/components/Sidebar/FixiOSBug.js similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/FixiOSBug.js rename to ruoyi-ui/src/_layout/components/Sidebar/FixiOSBug.js diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/ruoyi-ui/src/_layout/components/Sidebar/Item.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/Item.vue rename to ruoyi-ui/src/_layout/components/Sidebar/Item.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/Link.vue b/ruoyi-ui/src/_layout/components/Sidebar/Link.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/Link.vue rename to ruoyi-ui/src/_layout/components/Sidebar/Link.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/_layout/components/Sidebar/Logo.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/Logo.vue rename to ruoyi-ui/src/_layout/components/Sidebar/Logo.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue b/ruoyi-ui/src/_layout/components/Sidebar/SidebarItem.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue rename to ruoyi-ui/src/_layout/components/Sidebar/SidebarItem.vue diff --git a/ruoyi-ui/src/layout/components/Sidebar/index.vue b/ruoyi-ui/src/_layout/components/Sidebar/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebar/index.vue rename to ruoyi-ui/src/_layout/components/Sidebar/index.vue diff --git a/ruoyi-ui/src/layout/components/Sidebarblue/FixiOSBug.js b/ruoyi-ui/src/_layout/components/Sidebarblue/FixiOSBug.js similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebarblue/FixiOSBug.js rename to ruoyi-ui/src/_layout/components/Sidebarblue/FixiOSBug.js diff --git a/ruoyi-ui/src/layout/components/Sidebarblue/ItemBlue.vue b/ruoyi-ui/src/_layout/components/Sidebarblue/ItemBlue.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebarblue/ItemBlue.vue rename to ruoyi-ui/src/_layout/components/Sidebarblue/ItemBlue.vue diff --git a/ruoyi-ui/src/layout/components/Sidebarblue/LinkBlue.vue b/ruoyi-ui/src/_layout/components/Sidebarblue/LinkBlue.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebarblue/LinkBlue.vue rename to ruoyi-ui/src/_layout/components/Sidebarblue/LinkBlue.vue diff --git a/ruoyi-ui/src/layout/components/Sidebarblue/LogoBlue.vue b/ruoyi-ui/src/_layout/components/Sidebarblue/LogoBlue.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebarblue/LogoBlue.vue rename to ruoyi-ui/src/_layout/components/Sidebarblue/LogoBlue.vue diff --git a/ruoyi-ui/src/layout/components/Sidebarblue/SidebarItemBlue.vue b/ruoyi-ui/src/_layout/components/Sidebarblue/SidebarItemBlue.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebarblue/SidebarItemBlue.vue rename to ruoyi-ui/src/_layout/components/Sidebarblue/SidebarItemBlue.vue diff --git a/ruoyi-ui/src/layout/components/Sidebarblue/index.vue b/ruoyi-ui/src/_layout/components/Sidebarblue/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/Sidebarblue/index.vue rename to ruoyi-ui/src/_layout/components/Sidebarblue/index.vue diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/ruoyi-ui/src/_layout/components/TagsView/ScrollPane.vue similarity index 100% rename from ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue rename to ruoyi-ui/src/_layout/components/TagsView/ScrollPane.vue diff --git a/ruoyi-ui/src/layout/components/TagsView/index.vue b/ruoyi-ui/src/_layout/components/TagsView/index.vue similarity index 100% rename from ruoyi-ui/src/layout/components/TagsView/index.vue rename to ruoyi-ui/src/_layout/components/TagsView/index.vue diff --git a/ruoyi-ui/src/layout/components/index.js b/ruoyi-ui/src/_layout/components/index.js similarity index 100% rename from ruoyi-ui/src/layout/components/index.js rename to ruoyi-ui/src/_layout/components/index.js diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/_layout/index.vue similarity index 100% rename from ruoyi-ui/src/layout/index.vue rename to ruoyi-ui/src/_layout/index.vue diff --git a/ruoyi-ui/src/layout/mixin/ResizeHandler.js b/ruoyi-ui/src/_layout/mixin/ResizeHandler.js similarity index 100% rename from ruoyi-ui/src/layout/mixin/ResizeHandler.js rename to ruoyi-ui/src/_layout/mixin/ResizeHandler.js diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss index 7dede843..653cd834 100644 --- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss +++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss @@ -22,7 +22,7 @@ .el-form-item__content { color: $textColor; - height: $inputHeight; + // height: $inputHeight; } .el-input { @@ -125,9 +125,8 @@ } } } - .el-menu--popup-bottom-start{ - margin-top: 16px; - } + + // 导航菜单 .el-menu--popup { border-radius: 0; background: linear-gradient(180deg, rgba(6, 66, 88, 0.5) 0%, #064258 93%); @@ -164,4 +163,7 @@ color: #FFF; } } + .el-menu--popup-bottom-start { + margin-top: 16px; + } } \ No newline at end of file diff --git a/ruoyi-ui/src/common/infoBoardTestData.js b/ruoyi-ui/src/common/infoBoardTestData.js new file mode 100644 index 00000000..92768821 --- /dev/null +++ b/ruoyi-ui/src/common/infoBoardTestData.js @@ -0,0 +1,97 @@ +// residenceTime 停留时间 +// screenEntryMethod 入屏方式 +// screenOutputMethod 出屏方式 +// screenEntrySpeed 入屏速度 +// flickerSpeed 闪烁速度 +// flashingFrequency 闪烁次数 +// playbackCount 播放次数 +// xCoordinate x +// yCoordinate y +// displayAreaWidth 宽度 +// displayAreaHeight 高度 +// font 字体 +// fontSize 字号 +// fontStyle 字体风格 +// horizontalAlignment 水平对齐 +// verticalAlignment 垂直对齐 +// lineSpacing 行距 +// fontSpacing 字距 +// foregroundColor 前景颜色 +// backgroundColor 背景颜色 +// playSpecialEffects 播放特效 +// specialEffectsSpeed 特效速度 +// playbackDuration 播放时长 +// playbackCount 播放次数 +// textContent 文本内容 +// whetherToPlayText 是否播放文字 +// whetherToSynchronizePlayback 是否同步播放 +// setUpTheSpeaker 设置发声音人 +// volume 音量 +// speechSpeed 语速 +// intonation 语调 +export default [ + { + "backgroundColor": "00000000", + "displayAreaHeight": "120", + "displayAreaWidth": "768", + "flashingFrequency": "5", //闪烁次数 + "flickerSpeed": "0", //闪烁速度 + "font": "微软雅黑", + "fontSize": "14", + "fontSpacing": "4", + "fontStyle": "0", + "foregroundColor": "ffff00", + "horizontalAlignment": "2", + "intonation": "0", + "lineSpacing": "0", + "playSpecialEffects": "0", + "playbackCount": "1", + "playbackDuration": "50", + "residenceTime": "18", //停留时间 + "screenEntryMethod": "1", //入屏方式 + "screenEntrySpeed": "1", //入屏速度 + "screenOutputMethod": "1", //出屏方式 + "setUpTheSpeaker": "0", + "specialEffectsSpeed": "1", + "speechSpeed": "0", + "textContent": "因改扩建施工最高限速100km/h", + "verticalAlignment": "2", + "volume": "0", + "whetherToPlayText": "0", + "whetherToSynchronizePlayback": "0", + "xCoordinate": "0", + "yCoordinate": "0" + }, + { + "backgroundColor": "00000000", + "displayAreaHeight": "180", + "displayAreaWidth": "700", + "flashingFrequency": "5", + "flickerSpeed": "0", + "font": "微软雅黑", + "fontSize": "30", + "fontSpacing": "20", + "fontStyle": "0", + "foregroundColor": "ff0000", + "horizontalAlignment": "1", + "intonation": "0", + "lineSpacing": "10", + "playSpecialEffects": "0", + "playbackCount": "1", + "playbackDuration": "50", + "residenceTime": "50", + "screenEntryMethod": "1", + "screenEntrySpeed": "1", + "screenOutputMethod": "1", + "setUpTheSpeaker": "0", + "specialEffectsSpeed": "1", + "speechSpeed": "0", + "textContent": "因改扩建施工最高限速100km/h", + "verticalAlignment": "2", + "volume": "0", + "whetherToPlayText": "0", + "whetherToSynchronizePlayback": "0", + "xCoordinate": "0", + "yCoordinate": "0" + } +] diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js index e120ea31..52e8e625 100644 --- a/ruoyi-ui/src/common/menuData.js +++ b/ruoyi-ui/src/common/menuData.js @@ -58,12 +58,6 @@ export default [ name: "controlEventEvent", component: "control/event/event/index.vue", }, - { - title: "感知事件2", - path: "/control/event/perception", - name: "perception", - component: "control/event/perception/index.vue", - }, { title: "协调调度记录", path: "/control/event/coordinateSchedulingRecords", diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue index bc16776d..d9471822 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue @@ -1,11 +1,8 @@