diff --git a/src/assets/images/chart/zhilan/textbg.png b/src/assets/images/chart/zhilan/textbg.png
new file mode 100644
index 0000000..0526ef2
Binary files /dev/null and b/src/assets/images/chart/zhilan/textbg.png differ
diff --git a/src/assets/images/chart/zhilan/zlbtnbg.png b/src/assets/images/chart/zhilan/zlbtnbg.png
new file mode 100644
index 0000000..28be398
Binary files /dev/null and b/src/assets/images/chart/zhilan/zlbtnbg.png differ
diff --git a/src/assets/images/chart/zhilan/zlgnlx.png b/src/assets/images/chart/zhilan/zlgnlx.png
new file mode 100644
index 0000000..db1df2f
Binary files /dev/null and b/src/assets/images/chart/zhilan/zlgnlx.png differ
diff --git a/src/assets/images/chart/zhilan/zllabelicon01.png b/src/assets/images/chart/zhilan/zllabelicon01.png
new file mode 100644
index 0000000..bd3e31c
Binary files /dev/null and b/src/assets/images/chart/zhilan/zllabelicon01.png differ
diff --git a/src/assets/images/chart/zhilan/zllabelicon02.png b/src/assets/images/chart/zhilan/zllabelicon02.png
new file mode 100644
index 0000000..fe6e654
Binary files /dev/null and b/src/assets/images/chart/zhilan/zllabelicon02.png differ
diff --git a/src/assets/images/chart/zhilan/zlline.png b/src/assets/images/chart/zhilan/zlline.png
new file mode 100644
index 0000000..c7c4331
Binary files /dev/null and b/src/assets/images/chart/zhilan/zlline.png differ
diff --git a/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/config.ts b/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/config.ts
new file mode 100644
index 0000000..a36e6fb
--- /dev/null
+++ b/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/config.ts
@@ -0,0 +1,24 @@
+import { PublicConfigClass } from '@/packages/public'
+import { chartInitConfig,requestSqlConfig } from '@/settings/designSetting'
+import { CreateComponentType } from '@/packages/index.d'
+import { ZhiLanGongNengLeiXingConfig } from './index'
+import cloneDeep from 'lodash/cloneDeep'
+
+export const option = {
+ textColors: ['#738073','#FFFFFF','#D0E6CF'],
+ textSize: [16,14,13],
+ backgroundColor: '#2D332B',
+ dataset: [
+ { label: '水泵取水' , value: '400 m³' },
+ { label: '直升机调放' , value: '4331 m³' }
+ ],
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+ public key = ZhiLanGongNengLeiXingConfig.key
+ public attr = { ...chartInitConfig, w: 398, h: 200, zIndex: 1 }
+ public chartConfig = cloneDeep(ZhiLanGongNengLeiXingConfig)
+ public option = cloneDeep(option)
+ public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from ' }, }
+ public filter = "return res.result;"
+}
diff --git a/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/config.vue b/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/config.vue
new file mode 100644
index 0000000..7bad505
--- /dev/null
+++ b/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/config.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+ 恢复默认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 恢复默认
+
+
+
+
+
+
+
diff --git a/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/index.ts b/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/index.ts
new file mode 100644
index 0000000..b0b00a7
--- /dev/null
+++ b/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/index.ts
@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d';
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d';
+
+export const ZhiLanGongNengLeiXingConfig: ConfigType = {
+ key: 'ZhiLanGongNengLeiXing',
+ chartKey: 'VZhiLanGongNengLeiXing',
+ conKey: 'VCZhiLanGongNengLeiXing',
+ title: '功能类型统计',
+ category: ChatCategoryEnum.ZHILAN,
+ categoryName: ChatCategoryEnumName.ZHILAN,
+ package: PackagesCategoryEnum.ZHILAN,
+ chartFrame: ChartFrameEnum.STATIC,
+ image: 'zlgnlx.png',
+};
diff --git a/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/index.vue b/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/index.vue
new file mode 100644
index 0000000..94d7b06
--- /dev/null
+++ b/src/packages/components/Zhilan/Zhilan/ZhiLanGongNengLeiXing/index.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
{{ item.label }}
+
{{ item.value }}
+
+
+
{{ item.label }}
+
+
+
+
+
+
diff --git a/src/packages/components/Zhilan/Zhilan/ZhiLanRenYuanLeiXing/config.ts b/src/packages/components/Zhilan/Zhilan/ZhiLanRenYuanLeiXing/config.ts
index 1a7f50a..4745e56 100644
--- a/src/packages/components/Zhilan/Zhilan/ZhiLanRenYuanLeiXing/config.ts
+++ b/src/packages/components/Zhilan/Zhilan/ZhiLanRenYuanLeiXing/config.ts
@@ -1,17 +1,39 @@
import { PublicConfigClass } from '@/packages/public'
-import { chartInitConfig } from '@/settings/designSetting'
+import { chartInitConfig,requestSqlConfig } from '@/settings/designSetting'
import { CreateComponentType } from '@/packages/index.d'
import { ZhiLanRenYuanLeiXingConfig } from './index'
import cloneDeep from 'lodash/cloneDeep'
export const option = {
- boxId: 'linearGradientZhiLanRenYuanLeiXing',
- colors: [],
+ borderColor: '#D5D5D5',
+ textColors: ['#D0E6CF','#FFFFFF'],
+ textSize: [14,28],
+ backgroundColor: '#2D332B',
+ dataset: [
+ { label: '护林员' , value: '38' },
+ { label: '消防员' , value: '75' },
+ { label: '驻防队伍' , value: '102' },
+ { label: '林区住户' , value: '103' },
+ { label: '向导' , value: '103' },
+ { label: '防火驿站' , value: '103' },
+ { label: '墓地' , value: '103' },
+ ],
+ animalColor: [
+ { color1: '#215229', color2: '#91F2A1' },
+ { color1: '#81510E', color2: '#FFCF47' },
+ { color1: '#5C230A', color2: '#FC2D22' },
+ { color1: '#0A5C4D', color2: '#22FCF0' },
+ { color1: '#0A5C2D', color2: '#22FC4A' },
+ { color1: '#0A285C', color2: '#1832F1' },
+ { color1: '#210A5C', color2: '#8222FC' }
+ ]
}
export default class Config extends PublicConfigClass implements CreateComponentType {
public key = ZhiLanRenYuanLeiXingConfig.key
- public attr = { ...chartInitConfig, w: 346, h: 30, zIndex: 1 }
+ public attr = { ...chartInitConfig, w: 398, h: 500, zIndex: 1 }
public chartConfig = cloneDeep(ZhiLanRenYuanLeiXingConfig)
public option = cloneDeep(option)
+ public request = { ...requestSqlConfig, requestSQLContent: { sql: 'select * from ' }, }
+ public filter = "return res.result;"
}
diff --git a/src/packages/components/Zhilan/Zhilan/ZhiLanRenYuanLeiXing/config.vue b/src/packages/components/Zhilan/Zhilan/ZhiLanRenYuanLeiXing/config.vue
index 158afeb..8172374 100644
--- a/src/packages/components/Zhilan/Zhilan/ZhiLanRenYuanLeiXing/config.vue
+++ b/src/packages/components/Zhilan/Zhilan/ZhiLanRenYuanLeiXing/config.vue
@@ -1,5 +1,118 @@
-
+
+
+
+
+
+
+
+ 恢复默认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 恢复默认
+
+
+
+
+
+
+
+
+
+ 恢复默认
+
+
+
+
+
+
+
+
+
+
+
+ 恢复默认
+
+
+
+
+
+
+
+ 恢复默认
+
+
+ -
+
+
+ + 新增
+
+
diff --git a/src/packages/components/Zhilan/Zhilan/ZhiLanTitles/config.ts b/src/packages/components/Zhilan/Zhilan/ZhiLanTitles/config.ts
index f683ff7..4233a08 100644
--- a/src/packages/components/Zhilan/Zhilan/ZhiLanTitles/config.ts
+++ b/src/packages/components/Zhilan/Zhilan/ZhiLanTitles/config.ts
@@ -6,7 +6,9 @@ import cloneDeep from 'lodash/cloneDeep'
export const option = {
boxId: 'linearGradientZhiLanTitles',
- colors: [],
+ textColor: '#58FF95',
+ textSize: 18,
+ text: '人员类型统计'
}
export default class Config extends PublicConfigClass implements CreateComponentType {
diff --git a/src/packages/components/Zhilan/Zhilan/ZhiLanTitles/config.vue b/src/packages/components/Zhilan/Zhilan/ZhiLanTitles/config.vue
index 158afeb..1e5880d 100644
--- a/src/packages/components/Zhilan/Zhilan/ZhiLanTitles/config.vue
+++ b/src/packages/components/Zhilan/Zhilan/ZhiLanTitles/config.vue
@@ -1,5 +1,44 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 恢复默认
+
+
+
+
@@ -26,21 +28,13 @@ const {
@include go('title-03') {
position: relative;
display: flex;
- justify-content: center;
align-items: center;
- svg {
+ .span{
position: absolute;
- z-index: -1;
- }
- .fill {
- fill: v-bind('colors[0]');
- }
- .fill-none {
- fill: none;
- }
- .stroke {
- stroke: v-bind('colors[1]');
+ left: 12%;
+ color: v-bind('textColor');
+ font-size: v-bind('textSize+"px"');
}
}
diff --git a/src/packages/components/Zhilan/Zhilan/index.ts b/src/packages/components/Zhilan/Zhilan/index.ts
index 4ee27c2..1946863 100644
--- a/src/packages/components/Zhilan/Zhilan/index.ts
+++ b/src/packages/components/Zhilan/Zhilan/index.ts
@@ -15,12 +15,14 @@ import { ZhiLanIcons14Config } from './ZhiLanIcons14/index';
import { ZLLingZhongMianJiConfig } from './ZLLingZhongMianJi/index';
import { ZhiLanTitlesConfig } from './ZhiLanTitles/index';
import { ZhiLanRenYuanLeiXingConfig } from './ZhiLanRenYuanLeiXing/index';
+import { ZhiLanGongNengLeiXingConfig } from './ZhiLanGongNengLeiXing/index';
export default [
ZhiLanTitlesConfig,
ZLLingZhongMianJiConfig,
ZhiLanRenYuanLeiXingConfig,
+ ZhiLanGongNengLeiXingConfig,
ZhiLanIcons01Config,
ZhiLanIcons02Config,
ZhiLanIcons03Config,