diff --git a/components.d.ts b/components.d.ts
index 94f030ca..bb441b79 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -11,17 +11,12 @@ declare module 'vue' {
500: typeof import('./src/components/errorMessage/500.vue')['default']
AButton: typeof import('ant-design-vue/es')['Button']
AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider']
- ADropdown: typeof import('ant-design-vue/es')['Dropdown']
AForm: typeof import('ant-design-vue/es')['Form']
AFormItem: typeof import('ant-design-vue/es')['FormItem']
AImage: typeof import('ant-design-vue/es')['Image']
AInput: typeof import('ant-design-vue/es')['Input']
AInputPassword: typeof import('ant-design-vue/es')['InputPassword']
- AMenu: typeof import('ant-design-vue/es')['Menu']
- AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
- ASegmented: typeof import('ant-design-vue/es')['Segmented']
ASpin: typeof import('ant-design-vue/es')['Spin']
- AStatistic: typeof import('ant-design-vue/es')['Statistic']
ATimeline: typeof import('ant-design-vue/es')['Timeline']
ATimelineItem: typeof import('ant-design-vue/es')['TimelineItem']
ATree: typeof import('ant-design-vue/es')['Tree']
diff --git a/package-lock.json b/package-lock.json
index 4d0032e5..b66d5f53 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
"@amap/amap-jsapi-types": "^0.0.13",
+ "@ant-design/icons-vue": "^7.0.1",
"@codemirror/lang-java": "^6.0.1",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-sql": "^6.5.4",
@@ -42,6 +43,7 @@
"pinia": "^2.1.6",
"pinia-plugin-persistedstate": "^3.2.0",
"terser": "^5.19.2",
+ "v-scale-screen": "^2.2.0",
"vue": "^3.3.4",
"vue-codemirror": "^6.1.1",
"vue-router": "4",
@@ -4230,6 +4232,17 @@
"uuid": "dist/bin/uuid"
}
},
+ "node_modules/v-scale-screen": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmmirror.com/v-scale-screen/-/v-scale-screen-2.2.0.tgz",
+ "integrity": "sha512-GHzwRYQwj5MTiYWxtdxI5S6DgEzFjSSMxg53TLddRgXjNSe/dG++Q+6AgrYS3HKDcWzccs19agF6UFcckxn1yA==",
+ "dependencies": {
+ "vue": "^3.2.37"
+ },
+ "peerDependencies": {
+ "vue": "^3.2.37"
+ }
+ },
"node_modules/vite": {
"version": "4.5.3",
"resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz",
diff --git a/src/views/page/hkplay.vue b/src/views/page/hkplay.vue
index b78f7512..9564bae0 100644
--- a/src/views/page/hkplay.vue
+++ b/src/views/page/hkplay.vue
@@ -1,66 +1,92 @@
-
+
-
-
\ No newline at end of file
+
diff --git a/src/views/page/index.vue b/src/views/page/index.vue
index c8984d59..3d5becd4 100644
--- a/src/views/page/index.vue
+++ b/src/views/page/index.vue
@@ -1016,6 +1016,7 @@
}
const getSubstanceInfoWindowContent2 = (obj, type) => {
+ console.log("🚀 ~ getSubstanceInfoWindowContent2 ~ obj, type:", obj, type)
var station = obj['station']
var nickname = ''
if (obj.deviceType == '04' || obj.deviceType == '00') {