From 18e92eac7df7a49276b5373452947240497b2a88 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Wed, 10 Jan 2024 09:22:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/common/menuData.js | 8 +-
ruoyi-ui/src/router/index.js | 234 +-
ruoyi-ui/src/router/routerCreater.js | 2 +-
ruoyi-ui/src/store/modules/permission.js | 31 +-
.../pages/service/board/addinfo.vue | 973 ++++++++
.../pages/service/board/boardData.json | 1 +
.../pages/service/board/editInfo.vue | 963 ++++++++
.../pages/service/board/index.vue | 2009 +++++++++++++++++
8 files changed, 4087 insertions(+), 134 deletions(-)
create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/board/addinfo.vue
create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/board/boardData.json
create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/board/editInfo.vue
create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index 52e8e625..300d6c21 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -92,7 +92,13 @@ export default [
name: "service",
position: "right",
path: "/service",
- component: "developing.vue",
+ redirect:"serviceBoard",
+ children:[{
+ title:"情报板",
+ name:"serviceBoard",
+ path:"/service/board",
+ component:"service/board/index.vue",
+ }]
},
{
title: "数据可视化",
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 0936a545..a5ff008c 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -1,16 +1,16 @@
-import Layout from "@/layout";
+// import Layout from "@/layout";
const constantRoutes = [
- {
- path: '/redirect',
- component: Layout,
- hidden: true,
- children: [
- {
- path: '/redirect/:path(.*)',
- component: (resolve) => require(['@/views/redirect'], resolve)
- }
- ]
- },
+ // {
+ // path: '/redirect',
+ // component: Layout,
+ // hidden: true,
+ // children: [
+ // {
+ // path: '/redirect/:path(.*)',
+ // component: (resolve) => require(['@/views/redirect'], resolve)
+ // }
+ // ]
+ // },
{
path: '/loginjqtunnel',
component: (resolve) => require(['@/views/loginjqtunnel'], resolve),
@@ -75,98 +75,98 @@ const constantRoutes = [
}
]
}, */
- {
- path: '/user',
- component: Layout,
- hidden: true,
- redirect: 'noredirect',
- children: [
- {
- path: 'profile',
- component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
- name: 'Profile',
- meta: { title: '个人中心', icon: 'user' }
- }
- ]
- },
- {
- path: '/system/user-auth',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'role/:userId(\\d+)',
- component: (resolve) => require(['@/views/system/user/authRole'], resolve),
- name: 'AuthRole',
- meta: { title: '分配角色', activeMenu: '/system/user' }
- }
- ]
- },
- {
- path: '/system/role-auth',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'user/:roleId(\\d+)',
- component: (resolve) => require(['@/views/system/role/authUser'], resolve),
- name: 'AuthUser',
- meta: { title: '分配用户', activeMenu: '/system/role' }
- }
- ]
- },
- {
- path: '/electromechanicalPatrol/teamsManage',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'teamsUser/:deptId',
- component: (resolve) => require(['@/views/electromechanicalPatrol/teamsManage/authTeamsUser'], resolve),
- name: 'AuthUser',
- meta: { title: '包含用户', activeMenu: '/electromechanicalPatrol/teamsManage' }
- }
- ]
- },
- {
- path: '/system/dict-data',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'index/:dictId(\\d+)',
- component: (resolve) => require(['@/views/system/dict/data'], resolve),
- name: 'Data',
- meta: { title: '字典数据', activeMenu: '/system/dict' }
- }
- ]
- },
- {
- path: '/monitor/job-log',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'index',
- component: (resolve) => require(['@/views/monitor/job/log'], resolve),
- name: 'JobLog',
- meta: { title: '调度日志', activeMenu: '/monitor/job' }
- }
- ]
- },
- {
- path: '/tool/gen-edit',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'index',
- component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
- name: 'GenEdit',
- meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
- }
- ]
- },
+ // {
+ // path: '/user',
+ // component: Layout,
+ // hidden: true,
+ // redirect: 'noredirect',
+ // children: [
+ // {
+ // path: 'profile',
+ // component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
+ // name: 'Profile',
+ // meta: { title: '个人中心', icon: 'user' }
+ // }
+ // ]
+ // },
+ // {
+ // path: '/system/user-auth',
+ // component: Layout,
+ // hidden: true,
+ // children: [
+ // {
+ // path: 'role/:userId(\\d+)',
+ // component: (resolve) => require(['@/views/system/user/authRole'], resolve),
+ // name: 'AuthRole',
+ // meta: { title: '分配角色', activeMenu: '/system/user' }
+ // }
+ // ]
+ // },
+ // {
+ // path: '/system/role-auth',
+ // component: Layout,
+ // hidden: true,
+ // children: [
+ // {
+ // path: 'user/:roleId(\\d+)',
+ // component: (resolve) => require(['@/views/system/role/authUser'], resolve),
+ // name: 'AuthUser',
+ // meta: { title: '分配用户', activeMenu: '/system/role' }
+ // }
+ // ]
+ // },
+ // {
+ // path: '/electromechanicalPatrol/teamsManage',
+ // component: Layout,
+ // hidden: true,
+ // children: [
+ // {
+ // path: 'teamsUser/:deptId',
+ // component: (resolve) => require(['@/views/electromechanicalPatrol/teamsManage/authTeamsUser'], resolve),
+ // name: 'AuthUser',
+ // meta: { title: '包含用户', activeMenu: '/electromechanicalPatrol/teamsManage' }
+ // }
+ // ]
+ // },
+ // {
+ // path: '/system/dict-data',
+ // component: Layout,
+ // hidden: true,
+ // children: [
+ // {
+ // path: 'index/:dictId(\\d+)',
+ // component: (resolve) => require(['@/views/system/dict/data'], resolve),
+ // name: 'Data',
+ // meta: { title: '字典数据', activeMenu: '/system/dict' }
+ // }
+ // ]
+ // },
+ // {
+ // path: '/monitor/job-log',
+ // component: Layout,
+ // hidden: true,
+ // children: [
+ // {
+ // path: 'index',
+ // component: (resolve) => require(['@/views/monitor/job/log'], resolve),
+ // name: 'JobLog',
+ // meta: { title: '调度日志', activeMenu: '/monitor/job' }
+ // }
+ // ]
+ // },
+ // {
+ // path: '/tool/gen-edit',
+ // component: Layout,
+ // hidden: true,
+ // children: [
+ // {
+ // path: 'index',
+ // component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
+ // name: 'GenEdit',
+ // meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
+ // }
+ // ]
+ // },
// {
// path: '/bigscreen/index.html',
// name: '数据可视化大屏',
@@ -191,19 +191,19 @@ const constantRoutes = [
component: (resolve) => require(['@/views/equipment/param/index'], resolve),
hidden: true
},
- {
- path: '/equipment/eqlist-point',
- component: Layout,
- hidden: true,
- children: [
- {
- path: 'index',
- component: (resolve) => require(['@/views/equipment/protocol/index'], resolve),
- name: 'devPoint',
- meta: { title: '设备点位配置', activeMenu: '/equipment/eqlist' }
- }
- ]
- },
+ // {
+ // path: '/equipment/eqlist-point',
+ // component: Layout,
+ // hidden: true,
+ // children: [
+ // {
+ // path: 'index',
+ // component: (resolve) => require(['@/views/equipment/protocol/index'], resolve),
+ // name: 'devPoint',
+ // meta: { title: '设备点位配置', activeMenu: '/equipment/eqlist' }
+ // }
+ // ]
+ // },
{
path: '/tool/gen',
component: (resolve) => require(['@/views/tool/gen/index'], resolve),
diff --git a/ruoyi-ui/src/router/routerCreater.js b/ruoyi-ui/src/router/routerCreater.js
index 100507c5..a79be1b6 100644
--- a/ruoyi-ui/src/router/routerCreater.js
+++ b/ruoyi-ui/src/router/routerCreater.js
@@ -5,7 +5,7 @@ import compX from "@/views/JiHeExpressway/components/compX.vue";
Vue.use(Router);
/* Layout */
-import Layout from "@/layout";
+// import Layout from "@/layout";
import menuData from "@/common/menuData";
import { resolve } from "mathjs";
// 公共路由
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index dba9252f..657e55ec 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -1,8 +1,8 @@
import { constantRoutes } from '@/router'
import { getRouters } from '@/api/menu'
-import Layout from '@/layout/index'
-import ParentView from '@/components/ParentView';
-import InnerLink from '@/layout/components/InnerLink'
+// import Layout from '@/layout/index'
+// import ParentView from '@/components/ParentView';
+// import InnerLink from '@/layout/components/InnerLink'
const permission = {
state: {
@@ -60,18 +60,19 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
if (type && route.children) {
route.children = filterChildren(route.children)
}
- if (route.component) {
- // Layout ParentView 组件特殊处理
- if (route.component === 'Layout') {
- route.component = Layout
- } else if (route.component === 'ParentView') {
- route.component = ParentView
- } else if (route.component === 'InnerLink') {
- route.component = InnerLink
- } else {
- route.component = loadView(route.component)
- }
- }
+ // if (route.component) {
+ // // Layout ParentView 组件特殊处理
+ // if (route.component === 'Layout') {
+ // route.component = Layout
+ // } else if (route.component === 'ParentView') {
+ // route.component = ParentView
+ // } else if (route.component === 'InnerLink') {
+ // route.component = InnerLink
+ // } else {
+ // route.component = loadView(route.component)
+ // }
+ // }
+ route.component = loadView(route.component)
if (route.children != null && route.children && route.children.length) {
route.children = filterAsyncRouter(route.children, route, type)
} else {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/addinfo.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/addinfo.vue
new file mode 100644
index 00000000..7adc2eef
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/addinfo.vue
@@ -0,0 +1,973 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 左对齐
+ 左右居中
+ 右对齐
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/boardData.json b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/boardData.json
new file mode 100644
index 00000000..881570aa
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/boardData.json
@@ -0,0 +1 @@
+"{\"support\":{\"PROTOCOL_TYPE\":\"GUANGDIAN_V33\",\"FONT_SIZE\":\"3232,2424,1616\",\"DEVICEID\":\"102111101\",\"COLOR\":\"红色,绿色,蓝色,黄色\",\"FONT\":\"宋体,黑体,楷体\"},\"content\":[{\"ITEM000\":[{\"SPEED\":\"1\",\"FONT_SIZE\":\"3232\",\"ACTION\":\"1\",\"COLOR\":\"黄色\",\"STATE\":true,\"CONTENT\":\"进入隧道 请开大灯1\",\"COORDINATE\":\"063004\",\"FONT\":\"黑体\",\"STAY\":\"500\"}]}]}"
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/editInfo.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/editInfo.vue
new file mode 100644
index 00000000..9c2f25bc
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/editInfo.vue
@@ -0,0 +1,963 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 左对齐
+ 左右居中
+ 右对齐
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
new file mode 100644
index 00000000..af4e24ab
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
@@ -0,0 +1,2009 @@
+
+
+
+
+
+
+
+

+
情报板列表
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ itm.deviceName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
情报板列表
+
【 {{ form.devicePixel }}】
+
+

+
+
+
+ 添加信息
+ 发布信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
情报板列表
+
【 {{ form.devicePixel }}】
+
+

+
+
+
+ 添加模板
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+