diff --git a/package-lock.json b/package-lock.json index fbb65fb..6c42293 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "buffer": "^6.0.3", "core-js": "^3.40.0", "crypto-browserify": "^3.12.1", + "dayjs": "^1.11.19", "mqtt": "^4.3.8", "postcss-pxtorem": "^6.1.0", "process": "^0.11.10", @@ -4471,6 +4472,12 @@ "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz", "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, + "node_modules/dayjs": { + "version": "1.11.19", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz", + "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==", + "license": "MIT" + }, "node_modules/de-indent": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz", @@ -14396,6 +14403,11 @@ "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz", "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, + "dayjs": { + "version": "1.11.19", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz", + "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==" + }, "de-indent": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz", diff --git a/package.json b/package.json index e6a0151..417e0d0 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "buffer": "^6.0.3", "core-js": "^3.40.0", "crypto-browserify": "^3.12.1", + "dayjs": "^1.11.19", "mqtt": "^4.3.8", "postcss-pxtorem": "^6.1.0", "process": "^0.11.10", diff --git a/public/index.html b/public/index.html index 0b9d6d9..8bb659b 100644 --- a/public/index.html +++ b/public/index.html @@ -1,17 +1,20 @@ - + - + + <%= htmlWebpackPlugin.options.title %> - - - -
- - + + + +
+ + diff --git a/src/assets/images/bigScreen/1.png b/src/assets/images/bigScreen/1.png new file mode 100644 index 0000000..0bb93ed Binary files /dev/null and b/src/assets/images/bigScreen/1.png differ diff --git a/src/assets/images/bigScreen/2.png b/src/assets/images/bigScreen/2.png new file mode 100644 index 0000000..7fcc5de Binary files /dev/null and b/src/assets/images/bigScreen/2.png differ diff --git a/src/assets/images/bigScreen/3.png b/src/assets/images/bigScreen/3.png new file mode 100644 index 0000000..b809a61 Binary files /dev/null and b/src/assets/images/bigScreen/3.png differ diff --git a/src/assets/images/bigScreen/4.png b/src/assets/images/bigScreen/4.png new file mode 100644 index 0000000..a01e60a Binary files /dev/null and b/src/assets/images/bigScreen/4.png differ diff --git a/src/assets/images/bigScreen/bigBg.png b/src/assets/images/bigScreen/bigBg.png new file mode 100644 index 0000000..98d3b12 Binary files /dev/null and b/src/assets/images/bigScreen/bigBg.png differ diff --git a/src/assets/images/bigScreen/boy.png b/src/assets/images/bigScreen/boy.png new file mode 100644 index 0000000..fd9351a Binary files /dev/null and b/src/assets/images/bigScreen/boy.png differ diff --git a/src/assets/images/bigScreen/girl.png b/src/assets/images/bigScreen/girl.png new file mode 100644 index 0000000..e3f0ceb Binary files /dev/null and b/src/assets/images/bigScreen/girl.png differ diff --git a/src/assets/images/bigScreen/voice.png b/src/assets/images/bigScreen/voice.png new file mode 100644 index 0000000..74050a5 Binary files /dev/null and b/src/assets/images/bigScreen/voice.png differ diff --git a/src/router/index.js b/src/router/index.js index 0ca9442..d3a707f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -112,6 +112,15 @@ const routes = [ }, component: () => import('@/views/dataBoard/dataBoard.vue') }, + { + path: '/dataBoard1', + name: 'dataBoard1', + meta: { + title: '数据看板', + rootValue: 192 + }, + component: () => import('@/views/dataBoard/dataBoard1.vue') + }, { path: '/dishesDetails', name: 'dishesDetails', diff --git a/src/views/dataBoard/dataBoard.vue b/src/views/dataBoard/dataBoard.vue index ad2bb50..85991da 100644 --- a/src/views/dataBoard/dataBoard.vue +++ b/src/views/dataBoard/dataBoard.vue @@ -1,495 +1,325 @@ + + + \ No newline at end of file diff --git a/src/views/dataBoard/dataBoard1.vue b/src/views/dataBoard/dataBoard1.vue new file mode 100644 index 0000000..d4ebda6 --- /dev/null +++ b/src/views/dataBoard/dataBoard1.vue @@ -0,0 +1,496 @@ + + + + +