diff --git a/src/packages/components/Charts/ConfinedSpace/Map/config.ts b/src/packages/components/Charts/ConfinedSpace/Map/config.ts
index bbf3c61..56a901d 100644
--- a/src/packages/components/Charts/ConfinedSpace/Map/config.ts
+++ b/src/packages/components/Charts/ConfinedSpace/Map/config.ts
@@ -3,7 +3,7 @@ import { MapConfig } from './index'
import { chartInitConfig } from '@/settings/designSetting'
import { CreateComponentType } from '@/packages/index.d'
import cloneDeep from 'lodash/cloneDeep'
-
+import dataJson from './data.json'
export const includes = []
const BAR_ITEM_DEFAULT_COLORS = [
{ color: "#00CF28", wfColor: "#03D61A" },
@@ -133,9 +133,9 @@ export class BarOption {
}
}
const option = {
+ dataset: { ...dataJson }
}
-export const MapDefaultConfig = { ...option }
export default class Config extends PublicConfigClass implements CreateComponentType {
public key: string = MapConfig.key
public attr = { ...chartInitConfig, w: 1300, h: 900, zIndex: -1 }
diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts
index a7b3ebd..9e3d953 100644
--- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts
+++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts
@@ -19,7 +19,7 @@ const otherConfig = {
color: ['#3B72E8', '#45B5E3', '#50D4A8', '#F8B55B'],
selectOption: {
show: true,
- selectValue: 'day',
+ selectValue: 'month',
dataset: [
{
label: '当天',
diff --git a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue
index 135f453..83f9b7d 100644
--- a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue
+++ b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue
@@ -239,7 +239,7 @@ import ConsumSelect from './select.vue'
const props = defineProps({
titleText: {
type: String,
- default: 'SmallBorder01',
+ default: '',
required: false
},
titleOption: {
diff --git a/src/packages/components/Charts/ConfinedSpace/index.ts b/src/packages/components/Charts/ConfinedSpace/index.ts
index 01c40f6..30e992e 100644
--- a/src/packages/components/Charts/ConfinedSpace/index.ts
+++ b/src/packages/components/Charts/ConfinedSpace/index.ts
@@ -1,8 +1,8 @@
import { MapConfig } from './Map'
import { PieCircleCommenConfig } from './PieCircleCommen'
import { AlarmNowListConfig } from './AlarmNowList'
-import { LineDropdownConfig } from './LineDropdown/index'
+import { LineDropdownConfig } from './LineDropdown'
import { SmallBorder01CoConfig } from './SmallBorder01Co'
-import { yushiVideoConfig } from './yushiVideo'
-export default [MapConfig, yushiVideoConfig, LineDropdownConfig, PieCircleCommenConfig, AlarmNowListConfig, SmallBorder01CoConfig]
+import { videoCheckConfig } from './videoCheck'
+export default [MapConfig, videoCheckConfig, LineDropdownConfig, PieCircleCommenConfig, AlarmNowListConfig, SmallBorder01CoConfig]
diff --git a/src/packages/components/Charts/ConfinedSpace/yushiVideo/cameratree.json b/src/packages/components/Charts/ConfinedSpace/videoCheck/cameratree.json
similarity index 100%
rename from src/packages/components/Charts/ConfinedSpace/yushiVideo/cameratree.json
rename to src/packages/components/Charts/ConfinedSpace/videoCheck/cameratree.json
diff --git a/src/packages/components/Charts/ConfinedSpace/yushiVideo/config.ts b/src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts
similarity index 88%
rename from src/packages/components/Charts/ConfinedSpace/yushiVideo/config.ts
rename to src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts
index 390e1ef..d27ca5f 100644
--- a/src/packages/components/Charts/ConfinedSpace/yushiVideo/config.ts
+++ b/src/packages/components/Charts/ConfinedSpace/videoCheck/config.ts
@@ -1,6 +1,6 @@
import { PublicConfigClass } from '@/packages/public'
import { CreateComponentType } from '@/packages/index.d'
-import { yushiVideoConfig } from './index'
+import { videoCheckConfig } from './index'
import cloneDeep from 'lodash/cloneDeep'
import dataJson from './cameratree.json'
export const option = {
@@ -43,7 +43,7 @@ export const option = {
}
export default class Config extends PublicConfigClass implements CreateComponentType {
- public key = yushiVideoConfig.key
- public chartConfig = cloneDeep(yushiVideoConfig)
+ public key = videoCheckConfig.key
+ public chartConfig = cloneDeep(videoCheckConfig)
public option = cloneDeep(option)
}
diff --git a/src/packages/components/Charts/ConfinedSpace/yushiVideo/config.vue b/src/packages/components/Charts/ConfinedSpace/videoCheck/config.vue
similarity index 100%
rename from src/packages/components/Charts/ConfinedSpace/yushiVideo/config.vue
rename to src/packages/components/Charts/ConfinedSpace/videoCheck/config.vue
diff --git a/src/packages/components/Charts/ConfinedSpace/yushiVideo/index.ts b/src/packages/components/Charts/ConfinedSpace/videoCheck/index.ts
similarity index 57%
rename from src/packages/components/Charts/ConfinedSpace/yushiVideo/index.ts
rename to src/packages/components/Charts/ConfinedSpace/videoCheck/index.ts
index ff479cb..6e87268 100644
--- a/src/packages/components/Charts/ConfinedSpace/yushiVideo/index.ts
+++ b/src/packages/components/Charts/ConfinedSpace/videoCheck/index.ts
@@ -1,10 +1,9 @@
import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-export const yushiVideoConfig: ConfigType = {
- key: 'yushiVideo',
- chartKey: 'VYushiVideo',
- conKey: 'VCYushiVideo',
+export const videoCheckConfig: ConfigType = {
+ key: 'videoCheck',
+ chartKey: 'VvideoCheck',
+ conKey: 'VCvideoCheck',
title: '宇视摄像头',
category: 'ConfinedSpace',
categoryName: '有限空间',
diff --git a/src/packages/components/Charts/ConfinedSpace/yushiVideo/index.vue b/src/packages/components/Charts/ConfinedSpace/videoCheck/index.vue
similarity index 100%
rename from src/packages/components/Charts/ConfinedSpace/yushiVideo/index.vue
rename to src/packages/components/Charts/ConfinedSpace/videoCheck/index.vue
diff --git a/src/packages/components/Charts/MyComponents/SmallBorder01/config.ts b/src/packages/components/Charts/MyComponents/SmallBorder01/config.ts
deleted file mode 100644
index 58a9c85..0000000
--- a/src/packages/components/Charts/MyComponents/SmallBorder01/config.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { SmallBorder01Config } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-
-export const option = {
- colors: ['#1089ff', '#0000ff'],
- backgroundColor: '#00000000'
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
- public key = SmallBorder01Config.key
- public chartConfig = cloneDeep(SmallBorder01Config)
- public option = cloneDeep(option)
-
-
-}
diff --git a/src/packages/components/Charts/MyComponents/SmallBorder01/config.vue b/src/packages/components/Charts/MyComponents/SmallBorder01/config.vue
deleted file mode 100644
index 8c5b2c2..0000000
--- a/src/packages/components/Charts/MyComponents/SmallBorder01/config.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
- 恢复默认
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/packages/components/Charts/MyComponents/SmallBorder01/index.ts b/src/packages/components/Charts/MyComponents/SmallBorder01/index.ts
deleted file mode 100644
index 848ef78..0000000
--- a/src/packages/components/Charts/MyComponents/SmallBorder01/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-// import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-// 曲线图
-export const SmallBorder01Config: ConfigType = {
- key: 'SmallBorder01',
- chartKey: 'VSmallBorder01',
- conKey: 'VCSmallBorder01',
- title: '带标题小边框+',
- category: 'MyComponents',
- categoryName: '自定义组件',
- package: 'Charts',
- chartFrame: ChartFrameEnum.COMMON,
- image: "SmallBorder.png",
-}
-
-// 默认导出配置对象
-// export default SmallBorder01Config
\ No newline at end of file
diff --git a/src/packages/components/Charts/MyComponents/SmallBorder01/index.vue b/src/packages/components/Charts/MyComponents/SmallBorder01/index.vue
deleted file mode 100644
index 20d5dd4..0000000
--- a/src/packages/components/Charts/MyComponents/SmallBorder01/index.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-
-
-
-
-
-
-
-
-
-