diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 036b7c9..a970c9d 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -37,6 +37,7 @@ }, "dependencies": { "@riophae/vue-treeselect": "0.4.0", + "Vue-i18n": "npm:vue-i18n@^8.26.7", "axios": "0.24.0", "clipboard": "2.0.8", "core-js": "3.25.3", @@ -48,6 +49,8 @@ "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", + "less": "^4.2.0", + "less-loader": "5.0.0", "nprogress": "0.2.0", "quill": "1.3.7", "screenfull": "5.0.2", @@ -56,9 +59,9 @@ "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-i18n": "8.26.7", - "Vue-i18n": "npm:vue-i18n@^8.26.7", "vue-meta": "2.4.0", "vue-router": "3.4.9", + "vue-seamless-scroll": "^1.1.23", "vuedraggable": "2.24.3", "vuex": "3.6.0" }, diff --git a/ruoyi-ui/src/assets/board/common/bg1.png b/ruoyi-ui/src/assets/board/common/bg1.png new file mode 100644 index 0000000..987361f Binary files /dev/null and b/ruoyi-ui/src/assets/board/common/bg1.png differ diff --git a/ruoyi-ui/src/assets/board/common/subheadClick.png b/ruoyi-ui/src/assets/board/common/subheadClick.png new file mode 100644 index 0000000..939f44a Binary files /dev/null and b/ruoyi-ui/src/assets/board/common/subheadClick.png differ diff --git a/ruoyi-ui/src/assets/board/common/subheadClick1.png b/ruoyi-ui/src/assets/board/common/subheadClick1.png new file mode 100644 index 0000000..7e0d246 Binary files /dev/null and b/ruoyi-ui/src/assets/board/common/subheadClick1.png differ diff --git a/ruoyi-ui/src/assets/board/index/bg.jpg b/ruoyi-ui/src/assets/board/index/bg.jpg new file mode 100644 index 0000000..98b320c Binary files /dev/null and b/ruoyi-ui/src/assets/board/index/bg.jpg differ diff --git a/ruoyi-ui/src/assets/board/index/container.png b/ruoyi-ui/src/assets/board/index/container.png new file mode 100644 index 0000000..5de951d Binary files /dev/null and b/ruoyi-ui/src/assets/board/index/container.png differ diff --git a/ruoyi-ui/src/assets/board/senso/bg.jpg b/ruoyi-ui/src/assets/board/senso/bg.jpg new file mode 100644 index 0000000..17ec684 Binary files /dev/null and b/ruoyi-ui/src/assets/board/senso/bg.jpg differ diff --git a/ruoyi-ui/src/assets/board/senso/icon.png b/ruoyi-ui/src/assets/board/senso/icon.png new file mode 100644 index 0000000..7467489 Binary files /dev/null and b/ruoyi-ui/src/assets/board/senso/icon.png differ diff --git a/ruoyi-ui/src/assets/board/senso/iconBg.png b/ruoyi-ui/src/assets/board/senso/iconBg.png new file mode 100644 index 0000000..987361f Binary files /dev/null and b/ruoyi-ui/src/assets/board/senso/iconBg.png differ diff --git a/ruoyi-ui/src/assets/board/senso/iconBottom.png b/ruoyi-ui/src/assets/board/senso/iconBottom.png new file mode 100644 index 0000000..9915ec9 Binary files /dev/null and b/ruoyi-ui/src/assets/board/senso/iconBottom.png differ diff --git a/ruoyi-ui/src/assets/board/senso/itemBg.png b/ruoyi-ui/src/assets/board/senso/itemBg.png new file mode 100644 index 0000000..56ad201 Binary files /dev/null and b/ruoyi-ui/src/assets/board/senso/itemBg.png differ diff --git a/ruoyi-ui/src/assets/board/standard/bg.jpg b/ruoyi-ui/src/assets/board/standard/bg.jpg new file mode 100644 index 0000000..3061895 Binary files /dev/null and b/ruoyi-ui/src/assets/board/standard/bg.jpg differ diff --git a/ruoyi-ui/src/assets/board/standard/device.png b/ruoyi-ui/src/assets/board/standard/device.png new file mode 100644 index 0000000..5de951d Binary files /dev/null and b/ruoyi-ui/src/assets/board/standard/device.png differ diff --git a/ruoyi-ui/src/components/Charts/Chart.vue b/ruoyi-ui/src/components/Charts/Chart.vue new file mode 100644 index 0000000..0899129 --- /dev/null +++ b/ruoyi-ui/src/components/Charts/Chart.vue @@ -0,0 +1,35 @@ + + + diff --git a/ruoyi-ui/src/lang/index.js b/ruoyi-ui/src/lang/index.js index e580add..8e6c7a3 100644 --- a/ruoyi-ui/src/lang/index.js +++ b/ruoyi-ui/src/lang/index.js @@ -22,7 +22,7 @@ const messages = { const i18n = new VueI18n({ // 设置语言 选项 en_US | zh_CN - locale: Cookies.get('language') || 'en_US', + locale: Cookies.get('language') || 'zh_CN', // 设置文本内容 messages }) diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index c8b8883..a72209a 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -1,4 +1,6 @@ import Vue from 'vue' +import less from 'less' + import Cookies from 'js-cookie' @@ -64,6 +66,7 @@ Vue.component('ImagePreview', ImagePreview) Vue.use(directive) Vue.use(plugins) Vue.use(VueMeta) +Vue.use(less) DictData.install() /** diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index a1be94d..06fbac0 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -87,7 +87,38 @@ export const constantRoutes = [ meta: { title: '个人中心', icon: 'user' } } ] - } + }, + + // { + // path: '/board1', + // component: () => import('@/views/board/index'), + // name: 'Index', + // meta: { title: '1', icon: 'dashboard', affix: true } + // }, + // { + // path: '/board2', + // component: () => import('@/views/board/equipmentMonitoring'), + // name: 'Index', + // meta: { title: '2', icon: 'dashboard', affix: true } + // }, + // { + // path: '/board3', + // component: () => import('@/views/board/GPS'), + // name: 'Index', + // meta: { title: '3', icon: 'dashboard', affix: true } + // }, + // { + // path: '/board4', + // component: () => import('@/views/board/senso'), + // name: 'Index', + // meta: { title: '4', icon: 'dashboard', affix: true } + // }, + // { + // path: '/board5', + // component: () => import('@/views/board/smartScene'), + // name: 'Index', + // meta: { title: '5', icon: 'dashboard', affix: true } + // }, ] // 动态路由,基于用户权限动态去加载 diff --git a/ruoyi-ui/src/views/board/GPS/index.vue b/ruoyi-ui/src/views/board/GPS/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue b/ruoyi-ui/src/views/board/equipmentMonitoring/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue new file mode 100644 index 0000000..cf2ca17 --- /dev/null +++ b/ruoyi-ui/src/views/board/index/index.vue @@ -0,0 +1,655 @@ + + + + diff --git a/ruoyi-ui/src/views/board/senso/index.vue b/ruoyi-ui/src/views/board/senso/index.vue new file mode 100644 index 0000000..af82cfa --- /dev/null +++ b/ruoyi-ui/src/views/board/senso/index.vue @@ -0,0 +1,516 @@ + + + + diff --git a/ruoyi-ui/src/views/board/smartScene/index.vue b/ruoyi-ui/src/views/board/smartScene/index.vue new file mode 100644 index 0000000..a290e18 --- /dev/null +++ b/ruoyi-ui/src/views/board/smartScene/index.vue @@ -0,0 +1,537 @@ + + + +