diff --git a/.env b/.env
index fd20c63d..d1b3d4e2 100644
--- a/.env
+++ b/.env
@@ -3,9 +3,9 @@ VITE_DEV_PORT = '8080'
# development path
# VITE_DEV_PATH = 'http://192.168.0.34:11887'
-VITE_DEV_PATH = 'http://192.168.0.34:8102'
+VITE_DEV_PATH = 'http://114.115.222.135:9008/'
# VITE_DEV_PATH = 'http://192.168.0.120:3001'
-VITE_DEV_TOKEN = 'dd23c593-c823-4eb3-86d0-54ec77c99880'
+VITE_DEV_TOKEN = 'e5982f26-54bb-45d8-827a-02bbb42a2eae'
# production path
VITE_PRO_PATH = 'http://192.168.0.235:8177'
diff --git a/src/assets/images/chart/customponents/JumpBtn.png b/src/assets/images/chart/customponents/JumpBtn.png
new file mode 100644
index 00000000..68ea68d8
Binary files /dev/null and b/src/assets/images/chart/customponents/JumpBtn.png differ
diff --git a/src/assets/images/chart/customponents/Position.png b/src/assets/images/chart/customponents/Position.png
new file mode 100644
index 00000000..0f6c71da
Binary files /dev/null and b/src/assets/images/chart/customponents/Position.png differ
diff --git a/src/assets/images/common/告警定位.svg b/src/assets/images/common/告警定位.svg
new file mode 100644
index 00000000..693b7779
--- /dev/null
+++ b/src/assets/images/common/告警定位.svg
@@ -0,0 +1,43 @@
+
+
+
diff --git a/src/assets/images/common/普通定位.svg b/src/assets/images/common/普通定位.svg
new file mode 100644
index 00000000..70ad1a55
--- /dev/null
+++ b/src/assets/images/common/普通定位.svg
@@ -0,0 +1,43 @@
+
+
+
diff --git a/src/packages/components/CustomComponents/CustomComponents/JumpBtn/config.ts b/src/packages/components/CustomComponents/CustomComponents/JumpBtn/config.ts
new file mode 100644
index 00000000..93182ba2
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/JumpBtn/config.ts
@@ -0,0 +1,26 @@
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { JumpBtnConfig } from './index'
+import cloneDeep from 'lodash/cloneDeep'
+// import logo from '@/assets/logo.png'
+
+export const option = {}
+export const customData = {
+ label: '1号楼',
+ id: null,
+ id1: null,
+ showInterval: true,
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+ constructor() {
+ super();
+ this.attr.w = 100
+ this.attr.h = 40
+ this.request.requestInterval = 15
+ }
+ public key = JumpBtnConfig.key
+ public chartConfig = cloneDeep(JumpBtnConfig)
+ public option = cloneDeep(option)
+ public customData = cloneDeep(customData)
+}
diff --git a/src/packages/components/CustomComponents/CustomComponents/JumpBtn/config.vue b/src/packages/components/CustomComponents/CustomComponents/JumpBtn/config.vue
new file mode 100644
index 00000000..ccedcbe7
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/JumpBtn/config.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/CustomComponents/CustomComponents/JumpBtn/configData.vue b/src/packages/components/CustomComponents/CustomComponents/JumpBtn/configData.vue
new file mode 100644
index 00000000..d500a337
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/JumpBtn/configData.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/packages/components/CustomComponents/CustomComponents/JumpBtn/index.ts b/src/packages/components/CustomComponents/CustomComponents/JumpBtn/index.ts
new file mode 100644
index 00000000..7899fdd2
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/JumpBtn/index.ts
@@ -0,0 +1,16 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/CustomComponents/index.d'
+
+export const JumpBtnConfig: ConfigType = {
+ key: 'JumpBtn',
+ chartKey: 'VJumpBtn',
+ conKey: 'VCJumpBtn',
+ // VCD开头
+ conDataKey: 'VCDJumpBtn',
+ title: '跳转按钮',
+ category: ChatCategoryEnum.CUSTOMCOMPONENTS,
+ categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS,
+ package: PackagesCategoryEnum.CUSTOMCOMPONENTS,
+ chartFrame: ChartFrameEnum.COMMON,
+ image: 'JumpBtn.png'
+}
diff --git a/src/packages/components/CustomComponents/CustomComponents/JumpBtn/index.vue b/src/packages/components/CustomComponents/CustomComponents/JumpBtn/index.vue
new file mode 100644
index 00000000..0d8c2ee4
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/JumpBtn/index.vue
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/CustomComponents/CustomComponents/Position/config.ts b/src/packages/components/CustomComponents/CustomComponents/Position/config.ts
new file mode 100644
index 00000000..ad96112a
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/Position/config.ts
@@ -0,0 +1,25 @@
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { PositionConfig } from './index'
+import cloneDeep from 'lodash/cloneDeep'
+// import logo from '@/assets/logo.png'
+
+export const option = {}
+export const customData = {
+ label: '数据中心',
+ id: null,
+ showInterval: true,
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+ constructor() {
+ super();
+ this.attr.w = 100
+ this.attr.h = 100
+ this.request.requestInterval = 15
+ }
+ public key = PositionConfig.key
+ public chartConfig = cloneDeep(PositionConfig)
+ public option = cloneDeep(option)
+ public customData = cloneDeep(customData)
+}
diff --git a/src/packages/components/CustomComponents/CustomComponents/Position/config.vue b/src/packages/components/CustomComponents/CustomComponents/Position/config.vue
new file mode 100644
index 00000000..ccedcbe7
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/Position/config.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/CustomComponents/CustomComponents/Position/configData.vue b/src/packages/components/CustomComponents/CustomComponents/Position/configData.vue
new file mode 100644
index 00000000..4b7b1970
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/Position/configData.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/packages/components/CustomComponents/CustomComponents/Position/index.ts b/src/packages/components/CustomComponents/CustomComponents/Position/index.ts
new file mode 100644
index 00000000..ddcc34df
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/Position/index.ts
@@ -0,0 +1,16 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '@/packages/components/CustomComponents/index.d'
+
+export const PositionConfig: ConfigType = {
+ key: 'Position',
+ chartKey: 'VPosition',
+ conKey: 'VCPosition',
+ // VCD开头
+ conDataKey: 'VCDPosition',
+ title: '告警定位',
+ category: ChatCategoryEnum.CUSTOMCOMPONENTS,
+ categoryName: ChatCategoryEnumName.CUSTOMCOMPONENTS,
+ package: PackagesCategoryEnum.CUSTOMCOMPONENTS,
+ chartFrame: ChartFrameEnum.COMMON,
+ image: 'Position.png'
+}
diff --git a/src/packages/components/CustomComponents/CustomComponents/Position/index.vue b/src/packages/components/CustomComponents/CustomComponents/Position/index.vue
new file mode 100644
index 00000000..3cbe7052
--- /dev/null
+++ b/src/packages/components/CustomComponents/CustomComponents/Position/index.vue
@@ -0,0 +1,129 @@
+
+
+
{{customData.label}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/CustomComponents/CustomComponents/index.ts b/src/packages/components/CustomComponents/CustomComponents/index.ts
index f3396076..1701fcc0 100644
--- a/src/packages/components/CustomComponents/CustomComponents/index.ts
+++ b/src/packages/components/CustomComponents/CustomComponents/index.ts
@@ -16,6 +16,8 @@ import { PowerCapacityConfig } from './PowerCapacity'
import { ElectricityConsumptionConfig } from './ElectricityConsumption'
import { DeviceRunningStateConfig } from './DeviceRunningState'
import { TemperatureTop10Config } from './TemperatureTop10'
+import { PositionConfig } from './Position'
+import { JumpBtnConfig } from './JumpBtn'
export default [
// Theme1Config,
@@ -36,4 +38,6 @@ export default [
ElectricityConsumptionConfig,
DeviceRunningStateConfig,
TemperatureTop10Config,
+ PositionConfig,
+ JumpBtnConfig,
]
diff --git a/vite.config.ts b/vite.config.ts
index 1e5aac66..1be37600 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -25,6 +25,10 @@ export default ({ mode } : { mode:any }) => defineConfig({
find: '@',
replacement: pathResolve('src')
},
+ {
+ find: '~@',
+ replacement: pathResolve('src')
+ },
{
find: 'vue-i18n',
replacement: 'vue-i18n/dist/vue-i18n.cjs.js' //解决i8n警告