diff --git a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js index bc2917e0..9d887005 100644 --- a/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/CurrentTime/settingConfig.js @@ -29,10 +29,10 @@ const customConfig = { skewY: 0 }, customize: { - fontSize: 28, - fontWeight: 700, - fontFamily: '', // 字体类型 - color: 'rgb(155 159 172)' + fontSize: 14, + fontWeight: 300, + fontFamily: 'ds-digitalbold', // 字体类型 + color: '#ffffff' } } diff --git a/data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js b/data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js index b7d5afd8..67098120 100644 --- a/data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/CustomHtml/settingConfig.js @@ -28,7 +28,7 @@ const customConfig = { skewY: 0 }, customize: { - htmlStr: '

我是自定义html内容

' // html的内容 + htmlStr: '

我是自定义html内容

' // html的内容 } } diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js b/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js index 14e68276..ba9e4458 100644 --- a/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/DateTimePicker/settingConfig.js @@ -33,11 +33,11 @@ const customConfig = { // 自定义属性 customize: { // 选择框背景颜色 - bgColor: '#35393F', + bgColor: '#00000000', // 选择框文字颜色 fontColor: '#FFFFFF', - // 选择框文字大小 - fontSize: 20, + // 选择框字体大小 + fontSize: 14, // 显示类型 year/month/date/ datetime/datetimerange/daterange type: 'datetimerange', // 时间格式化类型:时间戳（timestamp），自定义（custom） diff --git a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue index 73c302e0..f06d8b1a 100644 --- a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue +++ b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue @@ -12,7 +12,7 @@ :model="config.customize" label-position="left" class="setting-body bs-el-form" - label-width="90px" + label-width="100px" > 标题
diff --git a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js index 5cba54cc..fd6f143d 100644 --- a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js @@ -60,7 +60,7 @@ const customConfig = { mapName: false, // 文字颜色 mapNameColor: '#fff', - // 文字大小 + // 字体大小 mapNameSize: 12, // 文字权重 mapNameWeight: 500, diff --git a/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js b/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js index 7f9043f5..df4d9226 100644 --- a/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/IframeChart/settingConfig.js @@ -19,7 +19,7 @@ const customConfig = { type: 'iframeChart', root: { version: '2023071001', - url: 'https://www.runoob.com/', + url: 'http://gcpaas.gccloud.com', // 绕x轴旋转角度 rotateX: 0, // 绕y轴旋转角度 diff --git a/data-room-ui/packages/BasicComponents/IndexCard/setting.vue b/data-room-ui/packages/BasicComponents/IndexCard/setting.vue index ac236a42..86638cb4 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndexCard/setting.vue @@ -27,13 +27,13 @@
- 旋转 + 旋转
- 基础
- + - + - - - - - - + + + + + + - + - + - + /> - + /> - + - + - + - + - + - + - @@ -177,19 +211,25 @@ /> - + - + - + - + - +
--> - 旋转 + 旋转
基础
- + - + - - - - - - + + + + + + - + - + - + /> - @@ -111,10 +128,12 @@ v-model="config.customize.unit" clearable placeholder="请输入单位" - > - + /> - + - + - + - + - + - + - + - + - + - + - + diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue index a0e09f1e..67f2b7de 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue @@ -27,13 +27,13 @@
- 旋转 + 旋转
- 基础
- + - + - - - - - - + + + + + + - + - + - + /> - + - + - + - + - + - + - + - + - + import SettingTitle from 'data-room-ui/SettingTitle/index.vue' import ColorPicker from 'data-room-ui/ColorPicker/index.vue' -import {predefineColors} from "data-room-ui/js/utils/colorList"; +import { predefineColors } from 'data-room-ui/js/utils/colorList' import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' @@ -223,42 +267,42 @@ export default { data () { return { options: [ - { - label: '从左到右', - value: 'to right' - }, - { - label: '从右到左', - value: 'to left' - }, - { - label: '从上到下', - value: 'to bottom' - }, - { - label: '从下到上', - value: 'to top' - }, - { - label: '从左上到右下', - value: 'to bottom right' - }, - { - label: '从右上到左下', - value: 'to bottom left' - }, - { - label: '从左下到右上', - value: 'to top right' - }, - { - label: '从右下到左上', - value: 'to top left' - } - ], + { + label: '从左到右', + value: 'to right' + }, + { + label: '从右到左', + value: 'to left' + }, + { + label: '从上到下', + value: 'to bottom' + }, + { + label: '从下到上', + value: 'to top' + }, + { + label: '从左上到右下', + value: 'to bottom right' + }, + { + label: '从右上到左下', + value: 'to bottom left' + }, + { + label: '从左下到右上', + value: 'to top right' + }, + { + label: '从右下到左上', + value: 'to top left' + } + ], // 预设主题色 predefineThemeColors: predefineColors, - fontFamilyList: fontList, + fontFamilyList: fontList } }, computed: { diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js b/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js index d4b32f27..ff4ed66b 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/IndicatorCard/settingConfig.js @@ -53,20 +53,20 @@ const customConfig = { borderWidth: 0, lineDistance: 25, borderColor: '', - fontFamily:'', - gradientDirection:'to right', - gradientColor0: 'rgba(0, 122, 255, 1)', - gradientColor1:'rgba(0, 122, 255, 1)', - firstSize: 50, + fontFamily: 'ds-digitalbold', + gradientDirection: 'to right', + gradientColor0: '#6b74e4', + gradientColor1: '#4391f4', + firstSize: 36, firstColor: '#ffffff', firstWeight: 500, - secondSize: 32, + secondSize: 18, secondColor: '#ffffff', secondWeight: 500, - secondLine: '装机处理及时率', + secondLine: '总省份数', unit: '', unitSize: 32, - unitColor:'#fff' + unitColor: '#fff' } } export const dataConfig = { diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue index 05e9d874..baeec5b4 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/index.vue @@ -6,8 +6,8 @@
- {{ customize.secondLine }} + {{ customize.secondLine }}
- - {{ optionData }} - + {{ optionData }} + + - {{unit}} + }" + > + {{ unit }}
@@ -83,9 +85,9 @@ export default { return this.config.customize.gradientColor0 || this.config.customize.gradientColor1 || 'transparent' }, gradientColor1 () { - return this.config.customize.gradientColor1 || this.config.customize.gradientColor0 || 'transparent' + return this.config.customize.gradientColor1 || this.config.customize.gradientColor0 || 'transparent' }, - unit(){ + unit () { return this.config?.customize.unit || '' }, option () { @@ -96,7 +98,7 @@ export default { }, customize () { return this.config?.customize - }, + } // tableData () { // let dataList = '' // if (this.optionData instanceof Array && this.optionData.length > 0) { @@ -112,7 +114,7 @@ export default { methods: { dataFormatting (config, data) { let dataList = '' - if(data.success){ + if (data.success) { if (data.data instanceof Array) { dataList = config.dataSource.dimensionField ? data.data[0][config.dataSource.dimensionField] @@ -120,8 +122,8 @@ export default { } else { dataList = data.data[config.dataSource.dimensionField] } - }else{ - dataList=0 + } else { + dataList = 0 } config.option = { ...config.option, @@ -129,7 +131,7 @@ export default { } return config } - } + } } diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue index 919bf6ef..96dc9876 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue @@ -125,27 +125,27 @@ label="请输入上下间距" /> - + - + - + - +
- 边框 -
- -
- 旋转 -
- -
+ + 边框 + +
+ +
+ 旋转 +
+ +
基础
基础