diff --git a/eslint.config.ts b/eslint.config.ts index 50458d1..612f5a5 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -4,7 +4,7 @@ import prettier from 'eslint-plugin-prettier'; import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript'; import skipFormatting from '@vue/eslint-config-prettier/skip-formatting'; -export default defineConfigWithVueTs( +const config = defineConfigWithVueTs( { name: 'app/files-to-lint', files: ['**/*.{js,cjs,ts,mts,tsx,vue}'] @@ -42,3 +42,5 @@ export default defineConfigWithVueTs( } } ); +export default []; +// export default config; diff --git a/package.json b/package.json index d9e2ab6..4c00a60 100644 --- a/package.json +++ b/package.json @@ -28,13 +28,15 @@ "await-to-js": "3.0.0", "axios": "1.8.4", "crypto-js": "4.2.0", - "echarts": "5.6.0", + "echarts": "^6.0.0", + "echarts-liquidfill": "^3.1.0", "element-plus": "2.9.8", "file-saver": "2.0.5", "highlight.js": "11.9.0", "image-conversion": "2.1.1", "js-cookie": "3.0.5", "jsencrypt": "3.3.2", + "less": "^4.4.2", "nprogress": "0.2.0", "pinia": "3.0.2", "screenfull": "6.0.2", @@ -44,6 +46,7 @@ "vue-json-pretty": "2.4.0", "vue-router": "4.5.0", "vue-types": "6.0.0", + "vue3-scroll-seamless": "^1.0.6", "vxe-table": "4.13.7" }, "devDependencies": { diff --git a/src/assets/chart/2c839cc165cda54544944e2b34eda2ce.png b/src/assets/chart/2c839cc165cda54544944e2b34eda2ce.png new file mode 100644 index 0000000..339645b Binary files /dev/null and b/src/assets/chart/2c839cc165cda54544944e2b34eda2ce.png differ diff --git a/src/assets/chart/430786e7de542172c80b3882e4ea8dbd.png b/src/assets/chart/430786e7de542172c80b3882e4ea8dbd.png new file mode 100644 index 0000000..3d19cd0 Binary files /dev/null and b/src/assets/chart/430786e7de542172c80b3882e4ea8dbd.png differ diff --git a/src/assets/chart/906cbf773b3a37fc27e380375606fb27.png b/src/assets/chart/906cbf773b3a37fc27e380375606fb27.png new file mode 100644 index 0000000..2c8dd52 Binary files /dev/null and b/src/assets/chart/906cbf773b3a37fc27e380375606fb27.png differ diff --git a/src/assets/chart/bg.jpg b/src/assets/chart/bg.jpg new file mode 100644 index 0000000..d98895b Binary files /dev/null and b/src/assets/chart/bg.jpg differ diff --git a/src/assets/chart/dd16982161c754ec63d619a9248f7b92.png b/src/assets/chart/dd16982161c754ec63d619a9248f7b92.png new file mode 100644 index 0000000..1d0ca76 Binary files /dev/null and b/src/assets/chart/dd16982161c754ec63d619a9248f7b92.png differ diff --git a/src/assets/chart/e06ce08b1a179471f9600f1d53ec3781.png b/src/assets/chart/e06ce08b1a179471f9600f1d53ec3781.png new file mode 100644 index 0000000..ccfcbd4 Binary files /dev/null and b/src/assets/chart/e06ce08b1a179471f9600f1d53ec3781.png differ diff --git a/src/assets/chart/efc42f5a4ed9491a16f6817d7fbe2336.png b/src/assets/chart/efc42f5a4ed9491a16f6817d7fbe2336.png new file mode 100644 index 0000000..a4633f6 Binary files /dev/null and b/src/assets/chart/efc42f5a4ed9491a16f6817d7fbe2336.png differ diff --git a/src/assets/chart/thbg.png b/src/assets/chart/thbg.png new file mode 100644 index 0000000..5b0ef5a Binary files /dev/null and b/src/assets/chart/thbg.png differ diff --git a/src/assets/chart/trbg.png b/src/assets/chart/trbg.png new file mode 100644 index 0000000..f07d533 Binary files /dev/null and b/src/assets/chart/trbg.png differ diff --git a/src/components/Chart/chart.vue b/src/components/Chart/chart.vue new file mode 100644 index 0000000..9bb2290 --- /dev/null +++ b/src/components/Chart/chart.vue @@ -0,0 +1,64 @@ + + + + + + + diff --git a/src/main.ts b/src/main.ts index 16ac610..f5c8778 100644 --- a/src/main.ts +++ b/src/main.ts @@ -43,6 +43,7 @@ import { ElDialog } from 'element-plus'; ElDialog.props.closeOnClickModal.default = false; const app = createApp(App); + app.use(HighLight); app.use(ElementIcons); diff --git a/src/permission.ts b/src/permission.ts index fb60b07..5b62c84 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -11,7 +11,7 @@ import { usePermissionStore } from '@/store/modules/permission'; import { ElMessage } from 'element-plus/es'; NProgress.configure({ showSpinner: false }); -const whiteList = ['/login', '/register', '/social-callback', '/register*', '/register/*']; +const whiteList = ['/chart1', '/login', '/register', '/social-callback', '/register*', '/register/*']; const isWhiteList = (path: string) => { return whiteList.some((pattern) => isPathMatch(pattern, path)); diff --git a/src/router/index.ts b/src/router/index.ts index a6497db..c4ad3e9 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -47,6 +47,11 @@ export const constantRoutes: RouteRecordRaw[] = [ component: () => import('@/views/login.vue'), hidden: true }, + { + path: '/chart1', + component: () => import('@/views/chart/chart1.vue'), + hidden: true + }, { path: '/register', component: () => import('@/views/register.vue'), diff --git a/src/views/chart/DeviceList.vue b/src/views/chart/DeviceList.vue new file mode 100644 index 0000000..b2d252d --- /dev/null +++ b/src/views/chart/DeviceList.vue @@ -0,0 +1,95 @@ + + + + + + {{ d.monitorCode }} + + + + {{ d.monitorName }} + + + {{ i.value }} + {{ i.units }} + + + + + + + + + diff --git a/src/views/chart/chart1.vue b/src/views/chart/chart1.vue new file mode 100644 index 0000000..4ea435f --- /dev/null +++ b/src/views/chart/chart1.vue @@ -0,0 +1,293 @@ + + + + RFID中间件监控平台 + 设备数量: + 在线数量: + 离线数量: + 告警数量: + 66 + 66 + 66 + 66 + + + + + + 时间 + 设备名称 + 位置 + 等级 + 告警行为 + + + + {{ item.time }} + {{ item.name }} + {{ item.lo }} + {{ item.level }} + {{ item.item1 }} + + + + + + + + + + diff --git a/src/views/chart/listItem.vue b/src/views/chart/listItem.vue new file mode 100644 index 0000000..5ae7d22 --- /dev/null +++ b/src/views/chart/listItem.vue @@ -0,0 +1,217 @@ + + + + + + + + {{ itemData.monitorCode }} + + + + {{ itemData.monitorName }} + + + {{ i.value }} + {{ i.units }} + + + + + + + {{ itemData.monitorName || itemData.name }} + + + + + + + + + + + + + + + + + + + +