diff --git a/.env.development b/.env.development
index ace5949..8354952 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
# 页面标题
-VITE_APP_TITLE = 标题
+VITE_APP_TITLE = 地上地下一体化管线风险识别与预警系统
# 接口请求地址,会设置到 axios 的 baseURL 参数上
-# VITE_APP_API_BASEURL = http://XXXXXXX:XXXXXXX
+VITE_APP_API_BASEURL = http://111.198.10.15:11639
# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
diff --git a/package.json b/package.json
index e3741e8..f840022 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
"@antfu/eslint-config": "^0.29.4",
"@iconify-json/ep": "^1.1.8",
"@iconify/vue": "^4.0.0",
+ "@types/node": "^20.4.2",
"@types/nprogress": "^0.2.0",
"@types/path-browserify": "^1.0.0",
"@types/qrcode": "^1.5.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 14870f3..372f27b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,6 +6,7 @@
'@iconify-json/ep': ^1.1.8
'@iconify/vue': ^4.0.0
'@tinymce/tinymce-vue': ^5.0.0
+ '@types/node': ^20.4.2
'@types/nprogress': ^0.2.0
'@types/path-browserify': ^1.0.0
'@types/qrcode': ^1.5.0
@@ -112,6 +113,7 @@
'@antfu/eslint-config': 0.29.4_rmayb2veg2btbq6mbmnyivgasy
'@iconify-json/ep': 1.1.8
'@iconify/vue': 4.0.0_vue@3.2.44
+ '@types/node': 20.4.2
'@types/nprogress': 0.2.0
'@types/path-browserify': 1.0.0
'@types/qrcode': registry.npmmirror.com/@types/qrcode/1.5.0
@@ -140,7 +142,7 @@
typescript: 4.8.4
unplugin-auto-import: 0.11.4_@vueuse+core@9.5.0
unplugin-vue-components: 0.22.9_vue@3.2.44
- vite: 3.2.3_sass@1.56.1
+ vite: 3.2.3_bz74jcrgqqruyij6fjopfw6e7a
vite-plugin-banner: 0.6.1
vite-plugin-compression: 0.5.1_vite@3.2.3
vite-plugin-html: 3.2.0_vite@3.2.3
@@ -879,7 +881,7 @@
resolution: {integrity: sha512-Ny/PJkO6nxWAQnaet8q/oWz15lrfwvdvBpuY4treB0CSsBO1CG0fVuNLngR3m3bepQLd+E4c3Y3DlC2okpUvPw==}
dependencies:
'@types/fined': 1.1.3
- '@types/node': 18.11.3
+ '@types/node': 20.4.2
dev: true
/@types/mdast/3.0.10:
@@ -900,8 +902,8 @@
resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
dev: true
- /@types/node/18.11.3:
- resolution: {integrity: sha512-fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A==}
+ /@types/node/20.4.2:
+ resolution: {integrity: sha512-Dd0BYtWgnWJKwO1jkmTrzofjK2QXXcai0dmtzvIBhcA+RsG5h8R3xlyta0kGOZRNfL9GuRtb1knmPEhQrePCEw==}
dev: true
/@types/normalize-package-data/2.4.1:
@@ -927,7 +929,7 @@
/@types/resolve/1.17.1:
resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==}
dependencies:
- '@types/node': 18.11.3
+ '@types/node': 20.4.2
dev: true
/@types/semver/7.3.13:
@@ -937,13 +939,13 @@
/@types/svgo/2.6.4:
resolution: {integrity: sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng==}
dependencies:
- '@types/node': 18.11.3
+ '@types/node': 20.4.2
dev: true
/@types/through/0.0.30:
resolution: {integrity: sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==}
dependencies:
- '@types/node': 18.11.3
+ '@types/node': 20.4.2
dev: true
/@types/unist/2.0.6:
@@ -1133,7 +1135,7 @@
'@babel/core': 7.19.6
'@babel/plugin-transform-typescript': 7.20.2_@babel+core@7.19.6
'@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.19.6
- vite: 3.2.3_sass@1.56.1
+ vite: 3.2.3_bz74jcrgqqruyij6fjopfw6e7a
vue: 3.2.44
transitivePeerDependencies:
- supports-color
@@ -1146,7 +1148,7 @@
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.3_sass@1.56.1
+ vite: 3.2.3_bz74jcrgqqruyij6fjopfw6e7a
vue: 3.2.44
dev: true
@@ -7939,7 +7941,7 @@
chalk: 4.1.2
debug: 4.3.4
fs-extra: 10.1.0
- vite: 3.2.3_sass@1.56.1
+ vite: 3.2.3_bz74jcrgqqruyij6fjopfw6e7a
transitivePeerDependencies:
- supports-color
dev: true
@@ -7961,7 +7963,7 @@
html-minifier-terser: 6.1.0
node-html-parser: 5.4.2
pathe: 0.2.0
- vite: 3.2.3_sass@1.56.1
+ vite: 3.2.3_bz74jcrgqqruyij6fjopfw6e7a
dev: true
/vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@3.2.3:
@@ -7981,7 +7983,7 @@
fast-glob: 3.2.12
mockjs: 1.1.0
path-to-regexp: 6.2.1
- vite: 3.2.3_sass@1.56.1
+ vite: 3.2.3_bz74jcrgqqruyij6fjopfw6e7a
transitivePeerDependencies:
- rollup
- supports-color
@@ -8004,7 +8006,7 @@
json5: 2.2.1
local-pkg: 0.4.2
picocolors: 1.0.0
- vite: 3.2.3_sass@1.56.1
+ vite: 3.2.3_bz74jcrgqqruyij6fjopfw6e7a
yaml: 2.1.3
transitivePeerDependencies:
- supports-color
@@ -8034,7 +8036,7 @@
pathe: 0.2.0
svg-baker: 1.7.0
svgo: 2.8.0
- vite: 3.2.3_sass@1.56.1
+ vite: 3.2.3_bz74jcrgqqruyij6fjopfw6e7a
transitivePeerDependencies:
- supports-color
dev: true
@@ -8049,7 +8051,7 @@
'@vue/compiler-sfc': 3.2.41
debug: 4.3.4
fast-glob: 3.2.12
- vite: 3.2.3_sass@1.56.1
+ vite: 3.2.3_bz74jcrgqqruyij6fjopfw6e7a
vue: 3.2.44
vue-router: 4.1.6_vue@3.2.44
transitivePeerDependencies:
@@ -8063,10 +8065,10 @@
dependencies:
'@vue/compiler-sfc': 3.2.41
magic-string: 0.25.9
- vite: 3.2.3_sass@1.56.1
+ vite: 3.2.3_bz74jcrgqqruyij6fjopfw6e7a
dev: true
- /vite/3.2.3_sass@1.56.1:
+ /vite/3.2.3_bz74jcrgqqruyij6fjopfw6e7a:
resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
@@ -8091,6 +8093,7 @@
terser:
optional: true
dependencies:
+ '@types/node': 20.4.2
esbuild: 0.15.12
postcss: 8.4.18
resolve: 1.22.1
@@ -8405,18 +8408,12 @@
version: 4.14.186
dev: false
- registry.npmmirror.com/@types/node/18.11.3:
- resolution: {integrity: sha512-fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/node/-/node-18.11.3.tgz}
- name: '@types/node'
- version: 18.11.3
- dev: true
-
registry.npmmirror.com/@types/qrcode/1.5.0:
resolution: {integrity: sha512-x5ilHXRxUPIMfjtM+1vf/GPTRWZ81nqscursm5gMznJeK9M0YnZ1c3bEvRLQ0zSSgedLx1J6MGL231ObQGGhaA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@types/qrcode/-/qrcode-1.5.0.tgz}
name: '@types/qrcode'
version: 1.5.0
dependencies:
- '@types/node': registry.npmmirror.com/@types/node/18.11.3
+ '@types/node': 20.4.2
dev: true
registry.npmmirror.com/@types/web-bluetooth/0.0.16:
diff --git a/src/assets/icons/icon-delete.svg b/src/assets/icons/icon-delete.svg
new file mode 100644
index 0000000..3866dcf
--- /dev/null
+++ b/src/assets/icons/icon-delete.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/assets/icons/icon-home.svg b/src/assets/icons/icon-home.svg
new file mode 100644
index 0000000..68e76b2
--- /dev/null
+++ b/src/assets/icons/icon-home.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-inspection.svg b/src/assets/icons/icon-inspection.svg
new file mode 100644
index 0000000..ae85e50
--- /dev/null
+++ b/src/assets/icons/icon-inspection.svg
@@ -0,0 +1 @@
+
diff --git a/src/assets/icons/icon-print.svg b/src/assets/icons/icon-print.svg
index 7795328..1131a16 100644
--- a/src/assets/icons/icon-print.svg
+++ b/src/assets/icons/icon-print.svg
@@ -1,3 +1,4 @@
+
diff --git a/src/global.d.ts b/src/global.d.ts
index dde63b4..73cc6fc 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -292,7 +292,7 @@
}
// 字典
-interface dictType {
+export interface dictType {
id: string
name: string
value: string
diff --git a/src/layouts/components/Logo/index.vue b/src/layouts/components/Logo/index.vue
index bdcd228..367fdfe 100644
--- a/src/layouts/components/Logo/index.vue
+++ b/src/layouts/components/Logo/index.vue
@@ -41,7 +41,6 @@
position: fixed;
z-index: 1000;
top: 0;
- width: inherit;
padding: 0 10px;
display: flex;
align-items: center;
@@ -51,6 +50,10 @@
overflow: hidden;
text-decoration: none;
+ // 添加
+ font-size: 20px;
+ width: 450px;
+
&.is-link {
cursor: pointer;
}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index c0a9540..dfac14e 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -68,7 +68,7 @@
}
onMounted(() => {
// 连接 websocket
- websocket.initWebSocket()
+ // websocket.initWebSocket()
})
onBeforeMount(() => {
// 断开 websocket
@@ -105,7 +105,7 @@
-
+
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 8feb9d6..f735371 100644
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -56,7 +56,7 @@
@@ -69,7 +69,7 @@
-
+