@@ -122,11 +122,11 @@
diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts
index f32b5de..ec4029b 100644
--- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts
+++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts
@@ -3,6 +3,8 @@ import { PieCircleCommenConfig } from './index'
import { CreateComponentType } from '@/packages/index.d'
import cloneDeep from 'lodash/cloneDeep'
import dataJson from './data.json'
+import { pad, padEnd } from 'lodash'
+import { calcPadding } from '@visactor/vchart/esm/util'
export const includes = ['legend']
@@ -10,6 +12,29 @@ const otherConfig = {
// 轮播动画
isCarousel: false,
color: ['#3B72E8', '#45B5E3', '#50D4A8', '#F8B55B'],
+ selectOption: {
+ show: true,
+ selectValue: 'day',
+ dataset: [
+ { label: '今日', value: 'day' },
+ { label: '本周', value: 'week' },
+ { label: '本月', value: 'month' }
+ ]
+ },
+ titleText: '今日数据',
+ titleOption: {
+ color: '#ffffff',
+ fontSize: '17px',
+ fontStyle: 'normal',
+ fontWeight: 'normal',
+ fontFamily: 'CustomFont',
+ },
+ headerOption: {
+ paddingLeft: 30,
+ paddingRight:0,
+ paddingTop: 0,
+ paddingBottom: 0
+ }
}
// ECharts配置
diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue
index bc59265..13a3018 100644
--- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue
+++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue
@@ -1,7 +1,10 @@
-
-
+
+
+
@@ -16,7 +19,7 @@ import { mergeTheme } from '@/packages/public/chart'
import config, { includes } from './config'
import { useChartDataFetch } from '@/hooks'
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-
+import SmallBaorder01 from '../SmallBorder01Co/index.vue'
import {
DatasetComponent,
GridComponent,
@@ -106,6 +109,14 @@ const dataHandle = (newData: any) => {
}
+
+const handleBorderSelectChange = (newValue: string) => {
+ props.chartConfig.option.selectOption.selectValue = newValue // <--- 更新本地的响应式数据
+ console.log('选择器值已更改为:', newValue)
+ // 更新图表数据
+
+}
+
// 监听配置中的数据集变化（配置时）
watch(
() => props.chartConfig.option.dataset,
@@ -133,5 +144,16 @@ onMounted(() => {
diff --git a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/config.ts b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/config.ts
new file mode 100644
index 0000000..880e14b
--- /dev/null
+++ b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/config.ts
@@ -0,0 +1,17 @@
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { SmallBorder01CoConfig } 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 = SmallBorder01CoConfig.key
+ public chartConfig = cloneDeep(SmallBorder01CoConfig)
+ public option = cloneDeep(option)
+
+
+}
diff --git a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/config.vue b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/config.vue
new file mode 100644
index 0000000..8c5b2c2
--- /dev/null
+++ b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/config.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+ 恢复默认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.ts b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.ts
new file mode 100644
index 0000000..34606c0
--- /dev/null
+++ b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.ts
@@ -0,0 +1,17 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+// import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+// 曲线图
+export const SmallBorder01CoConfig: ConfigType = {
+ key: 'SmallBorder01Co',
+ chartKey: 'VSmallBorder01Co',
+ conKey: 'VCSmallBorder01Co',
+ title: '带标题小边框+',
+ category: 'ConfinedSpace',
+ categoryName: '有限空间',
+ package: 'Charts',
+ chartFrame: ChartFrameEnum.COMMON,
+ image: "SmallBorder01Co.png",
+}
+
+// 默认导出配置对象
+// export default SmallBorder01Config
\ No newline at end of file
diff --git a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue
new file mode 100644
index 0000000..0cc4f4d
--- /dev/null
+++ b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/index.vue
@@ -0,0 +1,373 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/select.vue b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/select.vue
new file mode 100644
index 0000000..39e2284
--- /dev/null
+++ b/src/packages/components/Charts/ConfinedSpace/SmallBorder01Co/select.vue
@@ -0,0 +1,159 @@
+
+
+
+ {{ getSelectedLabel() }}
+ ▼
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Charts/ConfinedSpace/index.ts b/src/packages/components/Charts/ConfinedSpace/index.ts
index e3d3c87..f2bd322 100644
--- a/src/packages/components/Charts/ConfinedSpace/index.ts
+++ b/src/packages/components/Charts/ConfinedSpace/index.ts
@@ -1,6 +1,7 @@
-import {MapConfig} from './Map'
-import {PieCircleCommenConfig} from './PieCircleCommen'
-import {AlarmNowListConfig} from './AlarmNowList'
+import { MapConfig } from './Map'
+import { PieCircleCommenConfig } from './PieCircleCommen'
+import { AlarmNowListConfig } from './AlarmNowList'
import { LineDropdownConfig } from './LineDropdown/index'
-export default [MapConfig,LineDropdownConfig,PieCircleCommenConfig,AlarmNowListConfig]
+import { SmallBorder01CoConfig } from './SmallBorder01Co'
+export default [MapConfig, LineDropdownConfig, PieCircleCommenConfig, AlarmNowListConfig, SmallBorder01CoConfig]
diff --git a/src/packages/components/Charts/MyComponents/AlarmList/config.ts b/src/packages/components/Charts/MyComponents/AlarmList/config.ts
index 82a22b6..ea16112 100644
--- a/src/packages/components/Charts/MyComponents/AlarmList/config.ts
+++ b/src/packages/components/Charts/MyComponents/AlarmList/config.ts
@@ -22,15 +22,16 @@ export const FontStyleObject = {
[FontStyleEnum.ITALIC]: 'italic',
}
export const option = {
- dataset: dataJson.source,
+ dataset: dataJson,
header: ['报警事件', '时间', '所属企业', '状态'],
headerTextColor: '#B4B4B4',
textColor: '#ffffff',
headerBackgroundColor: '#17325F',
itemBackgroundColor: '#242834',
statusColors: {
- '未解决': '#FF4D4F',
- '已解决': '#ffffff'
+ // '未解决': '#FF4D4F',
+ // '已解决': '#ffffff'
+ '重大风险': 'red'
},
headerHeight: 28,
itemHeight: 28,
diff --git a/src/packages/components/Charts/MyComponents/AlarmList/data.json b/src/packages/components/Charts/MyComponents/AlarmList/data.json
index 7b85d05..e6827ec 100644
--- a/src/packages/components/Charts/MyComponents/AlarmList/data.json
+++ b/src/packages/components/Charts/MyComponents/AlarmList/data.json
@@ -1,40 +1,8 @@
-{
- "source": [
- {
- "event": "报警报警报警报警",
- "time": "10:13:24",
- "enterprise": "企业简称企业简称",
- "status": "未解决"
- },
- {
- "event": "报警报警报警报警",
- "time": "10:13:24",
- "enterprise": "企业简称企业简称",
- "status": "已解决"
- },
- {
- "event": "报警报警报警报警",
- "time": "10:13:24",
- "enterprise": "企业简称企业简称",
- "status": "未解决"
- },
- {
- "event": "报警报警报警报警",
- "time": "10:13:24",
- "enterprise": "企业简称企业简称",
- "status": "未解决"
- },
- {
- "event": "报警报警报警报警",
- "time": "10:13:24",
- "enterprise": "企业简称企业简称",
- "status": "未解决"
- },
- {
- "event": "报警报警报警报警",
- "time": "10:13:24",
- "enterprise": "企业简称企业简称",
- "status": "未解决"
- }
- ]
-}
+[
+ {
+ "alarmTime": "Nananananna",
+ "alarmLevel": "Nananananna",
+ "compName": "Nananananna",
+ "alarmDescname": "Nananananna"
+ }
+]
\ No newline at end of file
diff --git a/src/packages/components/Charts/MyComponents/AlarmList/index.vue b/src/packages/components/Charts/MyComponents/AlarmList/index.vue
index 9f53c41..4f88324 100644
--- a/src/packages/components/Charts/MyComponents/AlarmList/index.vue
+++ b/src/packages/components/Charts/MyComponents/AlarmList/index.vue
@@ -31,19 +31,22 @@
+
+
- {{ item.event }}
+ {{ item.alarmDescname }}
- {{ item.time }}
+ {{ item.alarmTime }}
- {{ item.enterprise }}
+ {{ item.compName }}
-
- {{ item.status }}
+
+ {{ item.alarmLevel }}
@@ -53,21 +56,92 @@