diff --git a/ruoyi-ui/src/assets/board/subheadClick.png b/ruoyi-ui/src/assets/board/subheadClick.png
new file mode 100644
index 0000000..939f44a
Binary files /dev/null and b/ruoyi-ui/src/assets/board/subheadClick.png differ
diff --git a/ruoyi-ui/src/assets/board/subheadClick1.png b/ruoyi-ui/src/assets/board/subheadClick1.png
new file mode 100644
index 0000000..7e0d246
Binary files /dev/null and b/ruoyi-ui/src/assets/board/subheadClick1.png differ
diff --git a/ruoyi-ui/src/layout/index2.vue b/ruoyi-ui/src/layout/index2.vue
index 08e1dcc..d129b24 100644
--- a/ruoyi-ui/src/layout/index2.vue
+++ b/ruoyi-ui/src/layout/index2.vue
@@ -1,6 +1,44 @@
+
+
+
+ 监控主页
+
+
+
+
+
+ 智慧场景
+
+
+
+
+
+
+ 智能巡检
+
+
+
+
+ 无线测温
+
+
+
+
+
+
+
+
+
+ 管 理
+
+
+
+
@@ -9,11 +47,84 @@
export default {
name: 'BoardIndex',
data() {
- return {
- }
+ return {}
},
+ methods: {
+ toIndex() {
+ this.$router.replace({path: "/index"});
+ },
+ async dropdownLink(e,) {
+ await this.$router.replace({path: "/board/" + e});
+ },
+ toLink(e, nowMenu) {
+ this.$router.replace({path: "/board/" + e});
+ },
+ }
}
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index c568979..31f226a 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/register']
+const whiteList = ['/login', '/register','/board/index','/board/index1','/board/index2']
router.beforeEach((to, from, next) => {
NProgress.start()
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index a381c7c..0a71103 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -85,6 +85,12 @@ export const constantRoutes = [
name: 'Board1',
meta: { title: '看板2', icon: 'dashboard', affix: true }
},
+ {
+ path: 'index2',
+ component: () => import('@/views/board/index2'),
+ name: 'Board3',
+ meta: { title: '看板3', icon: 'dashboard', affix: true }
+ },
]
},
{
diff --git a/ruoyi-ui/src/views/board/index.vue b/ruoyi-ui/src/views/board/index.vue
index 103ea8d..10d9800 100644
--- a/ruoyi-ui/src/views/board/index.vue
+++ b/ruoyi-ui/src/views/board/index.vue
@@ -23,7 +23,7 @@
19 ℃
0 ℃
- 当前状态:巡检中
+ 当前状态:巡检中
diff --git a/ruoyi-ui/src/views/board/index2.vue b/ruoyi-ui/src/views/board/index2.vue
new file mode 100644
index 0000000..f942dfd
--- /dev/null
+++ b/ruoyi-ui/src/views/board/index2.vue
@@ -0,0 +1,504 @@
+
+
+
+
赛轮智慧热电无人巡检系统
+
{{ i.name }}
+
已安全运行 382 天
+
{{ parseTime(new Date(), '{y}.{m}.{d} {h}:{i}:{s} 周{a}') }}
+
智能巡检
+
无线测温
+
动力环境
+
3838
+
3838
+
3838
+
13℃
+
+
30℃
+
+
温度
+
湿度
+
照度
+
410-1烟感
+
410-2烟感
+
水浸
+
+
设备监控
+
温度
+
湿度
+
照度
+
颗粒物
+
烟感
+
噪声
+
+
+
+
+
+
+
+
+
+
+ 报警开始时间
+
+
+ 报警来源
+
+
+ 告警等级
+
+
+ 报警内容
+
+
+ 操作
+
+
+
+
+
+
+ {{ item.value1 }}
+
+
+ {{ item.value2 }}
+
+
+ {{ item.value3 }}
+
+
+ {{ item.value4 }}
+
+
+ 查看
+ 处理
+
+
+
+
+
+
+
+
+
+
+