Merge remote-tracking branch 'origin/master'

# Conflicts:
#	data-room-ui/packages/BasicComponents/Map/settingConfig.js
main
liu.shiyi 1 year ago
commit 2925abcaf9

@ -29,10 +29,10 @@ const customConfig = {
skewY: 0 skewY: 0
}, },
customize: { customize: {
fontSize: 28, fontSize: 14,
fontWeight: 700, fontWeight: 300,
fontFamily: '', // 字体类型 fontFamily: 'ds-digitalbold', // 字体类型
color: 'rgb(155 159 172)' color: '#ffffff'
} }
} }

@ -28,7 +28,7 @@ const customConfig = {
skewY: 0 skewY: 0
}, },
customize: { customize: {
htmlStr: '<h1 style="color:#ffffff;font-size: 30px">我是自定义html内容</h1>' // html的内容 htmlStr: '<h1 style="color:#6b74e4;font-size: 20px;font-style: italic;">我是自定义html内容</h1>' // html的内容
} }
} }

@ -33,11 +33,11 @@ const customConfig = {
// 自定义属性 // 自定义属性
customize: { customize: {
// 选择框背景颜色 // 选择框背景颜色
bgColor: '#35393F', bgColor: '#00000000',
// 选择框文字颜色 // 选择框文字颜色
fontColor: '#FFFFFF', fontColor: '#FFFFFF',
// 选择框字大小 // 选择框大小
fontSize: 20, fontSize: 14,
// 显示类型 year/month/date/ datetime/datetimerange/daterange // 显示类型 year/month/date/ datetime/datetimerange/daterange
type: 'datetimerange', type: 'datetimerange',
// 时间格式化类型:时间戳timestamp自定义custom // 时间格式化类型:时间戳timestamp自定义custom

@ -12,7 +12,7 @@
:model="config.customize" :model="config.customize"
label-position="left" label-position="left"
class="setting-body bs-el-form" class="setting-body bs-el-form"
label-width="90px" label-width="100px"
> >
<SettingTitle>标题</SettingTitle> <SettingTitle>标题</SettingTitle>
<div class="lc-field-body"> <div class="lc-field-body">

@ -60,7 +60,7 @@ const customConfig = {
mapName: false, mapName: false,
// 文字颜色 // 文字颜色
mapNameColor: '#fff', mapNameColor: '#fff',
// 字大小 // 大小
mapNameSize: 12, mapNameSize: 12,
// 文字权重 // 文字权重
mapNameWeight: 500, mapNameWeight: 500,

@ -19,7 +19,7 @@ const customConfig = {
type: 'iframeChart', type: 'iframeChart',
root: { root: {
version: '2023071001', version: '2023071001',
url: 'https://www.runoob.com/', url: 'http://gcpaas.gccloud.com',
// 绕x轴旋转角度 // 绕x轴旋转角度
rotateX: 0, rotateX: 0,
// 绕y轴旋转角度 // 绕y轴旋转角度

@ -44,19 +44,28 @@
</div> --> </div> -->
<SettingTitle>基础</SettingTitle> <SettingTitle>基础</SettingTitle>
<div class="lc-field-body"> <div class="lc-field-body">
<el-form-item label-width="100px" label="渐变背景色一"> <el-form-item
label-width="100px"
label="渐变背景色一"
>
<ColorPicker <ColorPicker
v-model="config.customize.gradientColor0" v-model="config.customize.gradientColor0"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="渐变背景色二"> <el-form-item
label-width="100px"
label="渐变背景色二"
>
<ColorPicker <ColorPicker
v-model="config.customize.gradientColor1" v-model="config.customize.gradientColor1"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="渐变色方向"> <el-form-item
label-width="100px"
label="渐变色方向"
>
<el-select <el-select
v-model="config.customize.gradientDirection" v-model="config.customize.gradientDirection"
popper-class="bs-el-select" popper-class="bs-el-select"
@ -70,13 +79,19 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="边框颜色"> <el-form-item
label-width="100px"
label="边框颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.borderColor" v-model="config.customize.borderColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="边框粗细"> <el-form-item
label-width="100px"
label="边框粗细"
>
<el-input-number <el-input-number
v-model="config.customize.borderWidth" v-model="config.customize.borderWidth"
:precision="0" :precision="0"
@ -84,7 +99,10 @@
label="请输入粗细" label="请输入粗细"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="边框圆角"> <el-form-item
label-width="100px"
label="边框圆角"
>
<el-input-number <el-input-number
v-model="config.customize.borderRadius" v-model="config.customize.borderRadius"
:precision="0" :precision="0"
@ -100,8 +118,7 @@
v-model="config.customize.src" v-model="config.customize.src"
clearable clearable
placeholder="请输入链接" placeholder="请输入链接"
> />
</el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="单位" label="单位"
@ -111,10 +128,12 @@
v-model="config.customize.unit" v-model="config.customize.unit"
clearable clearable
placeholder="请输入单位" placeholder="请输入单位"
> />
</el-input>
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="单位字体大小"> <el-form-item
label-width="100px"
label="单位字体大小"
>
<el-input-number <el-input-number
v-model="config.customize.unitSize" v-model="config.customize.unitSize"
:precision="0" :precision="0"
@ -122,13 +141,19 @@
label="请输入单位字体大小" label="请输入单位字体大小"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="单位字体颜色"> <el-form-item
label-width="100px"
label="单位字体颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.unitColor" v-model="config.customize.unitColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="左右间距"> <el-form-item
label-width="100px"
label="左右间距"
>
<el-input-number <el-input-number
v-model="config.customize.distance" v-model="config.customize.distance"
:precision="0" :precision="0"
@ -136,7 +161,10 @@
label="请输入左右间距" label="请输入左右间距"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="上下间距"> <el-form-item
label-width="100px"
label="上下间距"
>
<el-input-number <el-input-number
v-model="config.customize.lineDistance" v-model="config.customize.lineDistance"
:precision="0" :precision="0"
@ -144,7 +172,10 @@
label="请输入上下间距" label="请输入上下间距"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="图标大小"> <el-form-item
label-width="100px"
label="图标大小"
>
<el-input-number <el-input-number
v-model="config.customize.imgSize" v-model="config.customize.imgSize"
:precision="0" :precision="0"
@ -152,12 +183,15 @@
label="请输入图标大小" label="请输入图标大小"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="首行文字大小"> <el-form-item
label-width="100px"
label="第一行字体大小"
>
<el-input-number <el-input-number
v-model="config.customize.firstSize" v-model="config.customize.firstSize"
:precision="0" :precision="0"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入首行文字大小" label="请输入第一行字体大小"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -177,19 +211,25 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="首行字体颜色"> <el-form-item
label-width="100px"
label="第一行字体颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.firstColor" v-model="config.customize.firstColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="首行字体粗细"> <el-form-item
label-width="100px"
label="第一行字体粗细"
>
<el-input-number <el-input-number
v-model="config.customize.firstWeight" v-model="config.customize.firstWeight"
:precision="0" :precision="0"
:step="100" :step="100"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入行字体粗细" label="请输入第一行字体粗细"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -202,21 +242,30 @@
placeholder="请输入第二行文字内容" placeholder="请输入第二行文字内容"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="第二行文字大小"> <el-form-item
label-width="100px"
label="第二行字体大小"
>
<el-input-number <el-input-number
v-model="config.customize.secondSize" v-model="config.customize.secondSize"
:precision="0" :precision="0"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入行字体粗细" label="请输入第一行字体粗细"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="第二行字体颜色"> <el-form-item
label-width="100px"
label="第二行字体颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.secondColor" v-model="config.customize.secondColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="第二行字体粗细"> <el-form-item
label-width="100px"
label="第二行字体粗细"
>
<el-input-number <el-input-number
v-model="config.customize.secondWeight" v-model="config.customize.secondWeight"
:precision="0" :precision="0"
@ -235,7 +284,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
import ColorPicker from 'data-room-ui/ColorPicker/index.vue' import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue' import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
import {predefineColors} from "data-room-ui/js/utils/colorList"; import { predefineColors } from 'data-room-ui/js/utils/colorList'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
import fontList from 'data-room-ui/js/utils/fontList' import fontList from 'data-room-ui/js/utils/fontList'
export default { export default {
@ -285,7 +334,7 @@ export default {
], ],
// //
predefineThemeColors: predefineColors, predefineThemeColors: predefineColors,
fontFamilyList: fontList, fontFamilyList: fontList
} }
}, },
computed: { computed: {

@ -52,21 +52,21 @@ const customConfig = {
src: '', src: '',
borderRadius: 0, borderRadius: 0,
borderWidth: 0, borderWidth: 0,
fontFamily:'', fontFamily: 'ds-digitalbold',
lineDistance: 6, lineDistance: 6,
borderColor: '', borderColor: '',
gradientDirection: 'to right', gradientDirection: 'to right',
gradientColor0: 'rgba(0, 122, 255, 0.07)', gradientColor0: '#4391f4',
gradientColor1:'rgba(0, 122, 255, 0.07)', gradientColor1: '#67d3fc',
distance: 30, distance: 30,
imgSize: 80, imgSize: 60,
firstSize: 64, firstSize: 36,
firstColor: '#007aff', firstColor: '#ffffff',
firstWeight: 500, firstWeight: 500,
secondSize: 21, secondSize: 18,
secondColor: '#ffffff', secondColor: '#ffffff',
secondWeight: 500, secondWeight: 500,
secondLine: '装机处理及时率', secondLine: '已上线数',
unit: '', unit: '',
unitSize: 32, unitSize: 32,
unitColor: '#fff' unitColor: '#fff'

@ -44,19 +44,28 @@
</div> </div>
<SettingTitle>基础</SettingTitle> <SettingTitle>基础</SettingTitle>
<div class="lc-field-body"> <div class="lc-field-body">
<el-form-item label-width="100px" label="渐变背景色一"> <el-form-item
label-width="100px"
label="渐变背景色一"
>
<ColorPicker <ColorPicker
v-model="config.customize.gradientColor0" v-model="config.customize.gradientColor0"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="渐变背景色二"> <el-form-item
label-width="100px"
label="渐变背景色二"
>
<ColorPicker <ColorPicker
v-model="config.customize.gradientColor1" v-model="config.customize.gradientColor1"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="渐变色方向"> <el-form-item
label-width="100px"
label="渐变色方向"
>
<el-select <el-select
v-model="config.customize.gradientDirection" v-model="config.customize.gradientDirection"
popper-class="bs-el-select" popper-class="bs-el-select"
@ -70,13 +79,19 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="边框颜色"> <el-form-item
label-width="100px"
label="边框颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.borderColor" v-model="config.customize.borderColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="边框粗细"> <el-form-item
label-width="100px"
label="边框粗细"
>
<el-input-number <el-input-number
v-model="config.customize.borderWidth" v-model="config.customize.borderWidth"
:precision="0" :precision="0"
@ -84,7 +99,10 @@
label="请输入粗细" label="请输入粗细"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="边框圆角"> <el-form-item
label-width="100px"
label="边框圆角"
>
<el-input-number <el-input-number
v-model="config.customize.borderRadius" v-model="config.customize.borderRadius"
:precision="0" :precision="0"
@ -100,8 +118,7 @@
v-model="config.customize.src" v-model="config.customize.src"
clearable clearable
placeholder="请输入链接" placeholder="请输入链接"
> />
</el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="单位" label="单位"
@ -111,10 +128,12 @@
v-model="config.customize.unit" v-model="config.customize.unit"
clearable clearable
placeholder="请输入单位" placeholder="请输入单位"
> />
</el-input>
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="单位字体大小"> <el-form-item
label-width="100px"
label="单位字体大小"
>
<el-input-number <el-input-number
v-model="config.customize.unitSize" v-model="config.customize.unitSize"
:precision="0" :precision="0"
@ -122,13 +141,19 @@
label="请输入单位字体大小" label="请输入单位字体大小"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="单位字体颜色"> <el-form-item
label-width="100px"
label="单位字体颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.unitColor" v-model="config.customize.unitColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="左右间距"> <el-form-item
label-width="100px"
label="左右间距"
>
<el-input-number <el-input-number
v-model="config.customize.distance" v-model="config.customize.distance"
:precision="0" :precision="0"
@ -136,7 +161,10 @@
label="请输入左右间距" label="请输入左右间距"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="上下间距"> <el-form-item
label-width="100px"
label="上下间距"
>
<el-input-number <el-input-number
v-model="config.customize.lineDistance" v-model="config.customize.lineDistance"
:precision="0" :precision="0"
@ -144,7 +172,10 @@
label="请输入上下间距" label="请输入上下间距"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="图标大小"> <el-form-item
label-width="100px"
label="图标大小"
>
<el-input-number <el-input-number
v-model="config.customize.imgSize" v-model="config.customize.imgSize"
:precision="0" :precision="0"
@ -152,45 +183,57 @@
label="请输入图标大小" label="请输入图标大小"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="首行文字大小"> <el-form-item
label-width="100px"
label="第一行字体大小"
>
<el-input-number <el-input-number
v-model="config.customize.firstSize" v-model="config.customize.firstSize"
:precision="0" :precision="0"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入首行文字大小" label="请输入第一行字体大小"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="首行字体颜色"> <el-form-item
label-width="100px"
label="第一行字体颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.firstColor" v-model="config.customize.firstColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="首行字体粗细"> <el-form-item
label-width="100px"
label="第一行字体粗细"
>
<el-input-number <el-input-number
v-model="config.customize.firstWeight" v-model="config.customize.firstWeight"
:precision="0" :precision="0"
:step="100" :step="100"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入行字体粗细" label="请输入第一行字体粗细"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="第行文字内容" label="第行文字内容"
label-width="100px" label-width="100px"
> >
<el-input <el-input
v-model="config.customize.secondLine" v-model="config.customize.secondLine"
clearable clearable
placeholder="请输入第行文字内容" placeholder="请输入第行文字内容"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="第二行文字大小"> <el-form-item
label-width="100px"
label="第二行字体大小"
>
<el-input-number <el-input-number
v-model="config.customize.secondSize" v-model="config.customize.secondSize"
:precision="0" :precision="0"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入第二行字大小" label="请输入第二行大小"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -210,13 +253,19 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="第二行字体颜色"> <el-form-item
label-width="100px"
label="第二行字体颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.secondColor" v-model="config.customize.secondColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="第二行字体粗细"> <el-form-item
label-width="100px"
label="第二行字体粗细"
>
<el-input-number <el-input-number
v-model="config.customize.secondWeight" v-model="config.customize.secondWeight"
:precision="0" :precision="0"
@ -232,7 +281,7 @@
</template> </template>
<script> <script>
import SettingTitle from 'data-room-ui/SettingTitle/index.vue' import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
import {predefineColors} from "data-room-ui/js/utils/colorList"; import { predefineColors } from 'data-room-ui/js/utils/colorList'
import ColorPicker from 'data-room-ui/ColorPicker/index.vue' import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue' import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
@ -285,7 +334,7 @@ export default {
], ],
// //
predefineThemeColors: predefineColors, predefineThemeColors: predefineColors,
fontFamilyList: fontList, fontFamilyList: fontList
} }
}, },
computed: { computed: {

@ -54,19 +54,19 @@ const customConfig = {
borderWidth: 0, borderWidth: 0,
lineDistance: 6, lineDistance: 6,
borderColor: '', borderColor: '',
fontFamily:'', fontFamily: 'ds-digitalbold',
gradientDirection: 'to right', gradientDirection: 'to right',
gradientColor0: 'rgba(0, 122, 255, 0.07)', gradientColor0: '#4391f4',
gradientColor1:'rgba(0, 122, 255, 0.07)', gradientColor1: '#36c49f',
distance: 30, distance: 30,
imgSize: 80, imgSize: 60,
firstSize: 21, firstSize: 18,
firstColor: '#ffffff', firstColor: '#ffffff',
firstWeight: 500, firstWeight: 500,
secondSize: 64, secondSize: 36,
secondColor: '#007aff', secondColor: '#ffffff',
secondWeight: 500, secondWeight: 500,
secondLine: '装机处理及时率', secondLine: '历史工单量',
unit: '', unit: '',
unitSize: 32, unitSize: 32,
unitColor: '#fff' unitColor: '#fff'

@ -35,7 +35,8 @@
'line-height':customize.unitSize + 'px', 'line-height':customize.unitSize + 'px',
color:customize.unitColor, color:customize.unitColor,
'margin-bottom':customize.lineDistance +'px' 'margin-bottom':customize.lineDistance +'px'
}"> }"
>
{{ unit }} {{ unit }}
</span> </span>
</div> </div>
@ -96,7 +97,7 @@ export default {
}, },
customize () { customize () {
return this.config?.customize return this.config?.customize
}, }
// tableData () { // tableData () {
// let dataList = '' // let dataList = ''
// if (this.optionData instanceof Array && this.optionData.length > 0) { // if (this.optionData instanceof Array && this.optionData.length > 0) {

@ -44,19 +44,28 @@
</div> --> </div> -->
<SettingTitle>基础</SettingTitle> <SettingTitle>基础</SettingTitle>
<div class="lc-field-body"> <div class="lc-field-body">
<el-form-item label-width="100px" label="渐变背景色一"> <el-form-item
label-width="100px"
label="渐变背景色一"
>
<ColorPicker <ColorPicker
v-model="config.customize.gradientColor0" v-model="config.customize.gradientColor0"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="渐变背景色二"> <el-form-item
label-width="100px"
label="渐变背景色二"
>
<ColorPicker <ColorPicker
v-model="config.customize.gradientColor1" v-model="config.customize.gradientColor1"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="渐变色方向"> <el-form-item
label-width="100px"
label="渐变色方向"
>
<el-select <el-select
v-model="config.customize.gradientDirection" v-model="config.customize.gradientDirection"
popper-class="bs-el-select" popper-class="bs-el-select"
@ -70,13 +79,19 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="边框颜色"> <el-form-item
label-width="100px"
label="边框颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.borderColor" v-model="config.customize.borderColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="边框粗细"> <el-form-item
label-width="100px"
label="边框粗细"
>
<el-input-number <el-input-number
v-model="config.customize.borderWidth" v-model="config.customize.borderWidth"
:precision="0" :precision="0"
@ -84,7 +99,10 @@
label="请输入粗细" label="请输入粗细"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="边框圆角"> <el-form-item
label-width="100px"
label="边框圆角"
>
<el-input-number <el-input-number
v-model="config.customize.borderRadius" v-model="config.customize.borderRadius"
:precision="0" :precision="0"
@ -100,10 +118,12 @@
v-model="config.customize.unit" v-model="config.customize.unit"
clearable clearable
placeholder="请输入单位" placeholder="请输入单位"
> />
</el-input>
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="单位字体大小"> <el-form-item
label-width="100px"
label="单位字体大小"
>
<el-input-number <el-input-number
v-model="config.customize.unitSize" v-model="config.customize.unitSize"
:precision="0" :precision="0"
@ -111,13 +131,19 @@
label="请输入单位字体大小" label="请输入单位字体大小"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="单位字体颜色"> <el-form-item
label-width="100px"
label="单位字体颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.unitColor" v-model="config.customize.unitColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="上下间距"> <el-form-item
label-width="100px"
label="上下间距"
>
<el-input-number <el-input-number
v-model="config.customize.lineDistance" v-model="config.customize.lineDistance"
:precision="0" :precision="0"
@ -125,12 +151,15 @@
label="请输入上下间距" label="请输入上下间距"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="首行文字大小"> <el-form-item
label-width="100px"
label="第一行字体大小"
>
<el-input-number <el-input-number
v-model="config.customize.firstSize" v-model="config.customize.firstSize"
:precision="0" :precision="0"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入首行文字大小" label="请输入第一行字体大小"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -150,19 +179,25 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="首行字体颜色"> <el-form-item
label-width="100px"
label="第一行字体颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.firstColor" v-model="config.customize.firstColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="首行字体粗细"> <el-form-item
label-width="100px"
label="第一行字体粗细"
>
<el-input-number <el-input-number
v-model="config.customize.firstWeight" v-model="config.customize.firstWeight"
:precision="0" :precision="0"
:step="100" :step="100"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入行字体粗细" label="请输入第一行字体粗细"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -175,21 +210,30 @@
placeholder="请输入第二行文字内容" placeholder="请输入第二行文字内容"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="第二行文字大小"> <el-form-item
label-width="100px"
label="第二行字体大小"
>
<el-input-number <el-input-number
v-model="config.customize.secondSize" v-model="config.customize.secondSize"
:precision="0" :precision="0"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入第二行字大小" label="请输入第二行大小"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="第二行字体颜色"> <el-form-item
label-width="100px"
label="第二行字体颜色"
>
<ColorPicker <ColorPicker
v-model="config.customize.secondColor" v-model="config.customize.secondColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="第二行字体粗细"> <el-form-item
label-width="100px"
label="第二行字体粗细"
>
<el-input-number <el-input-number
v-model="config.customize.secondWeight" v-model="config.customize.secondWeight"
:precision="0" :precision="0"
@ -206,7 +250,7 @@
<script> <script>
import SettingTitle from 'data-room-ui/SettingTitle/index.vue' import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
import ColorPicker from 'data-room-ui/ColorPicker/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 BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
@ -258,7 +302,7 @@ export default {
], ],
// //
predefineThemeColors: predefineColors, predefineThemeColors: predefineColors,
fontFamilyList: fontList, fontFamilyList: fontList
} }
}, },
computed: { computed: {

@ -53,17 +53,17 @@ const customConfig = {
borderWidth: 0, borderWidth: 0,
lineDistance: 25, lineDistance: 25,
borderColor: '', borderColor: '',
fontFamily:'', fontFamily: 'ds-digitalbold',
gradientDirection: 'to right', gradientDirection: 'to right',
gradientColor0: 'rgba(0, 122, 255, 1)', gradientColor0: '#6b74e4',
gradientColor1:'rgba(0, 122, 255, 1)', gradientColor1: '#4391f4',
firstSize: 50, firstSize: 36,
firstColor: '#ffffff', firstColor: '#ffffff',
firstWeight: 500, firstWeight: 500,
secondSize: 32, secondSize: 18,
secondColor: '#ffffff', secondColor: '#ffffff',
secondWeight: 500, secondWeight: 500,
secondLine: '装机处理及时率', secondLine: '总省份数',
unit: '', unit: '',
unitSize: 32, unitSize: 32,
unitColor: '#fff' unitColor: '#fff'

@ -37,7 +37,8 @@
'font-size': customize.secondSize + 'px', 'font-size': customize.secondSize + 'px',
color:customize.secondColor, color:customize.secondColor,
'font-weight':customize.secondWeight, 'font-weight':customize.secondWeight,
}"> }"
>
{{ optionData }} {{ optionData }}
</span> </span>
<span <span
@ -46,7 +47,8 @@
'font-size': customize.unitSize + 'px', 'font-size': customize.unitSize + 'px',
'line-height':customize.unitSize + 'px', 'line-height':customize.unitSize + 'px',
color:customize.unitColor, color:customize.unitColor,
}"> }"
>
{{ unit }} {{ unit }}
</span> </span>
</div> </div>
@ -96,7 +98,7 @@ export default {
}, },
customize () { customize () {
return this.config?.customize return this.config?.customize
}, }
// tableData () { // tableData () {
// let dataList = '' // let dataList = ''
// if (this.optionData instanceof Array && this.optionData.length > 0) { // if (this.optionData instanceof Array && this.optionData.length > 0) {

@ -125,27 +125,27 @@
label="请输入上下间距" label="请输入上下间距"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="首行文字大小"> <el-form-item label-width="100px" label="第一行字体大小">
<el-input-number <el-input-number
v-model="config.customize.firstSize" v-model="config.customize.firstSize"
:precision="0" :precision="0"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入首行文字大小" label="请输入第一行字体大小"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="行字体颜色"> <el-form-item label-width="100px" label="第一行字体颜色">
<ColorPicker <ColorPicker
v-model="config.customize.firstColor" v-model="config.customize.firstColor"
:predefine="predefineThemeColors" :predefine="predefineThemeColors"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="行字体粗细"> <el-form-item label-width="100px" label="第一行字体粗细">
<el-input-number <el-input-number
v-model="config.customize.firstWeight" v-model="config.customize.firstWeight"
:precision="0" :precision="0"
:step="100" :step="100"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入行字体粗细" label="请输入第一行字体粗细"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -158,12 +158,12 @@
placeholder="请输入第二行文字内容" placeholder="请输入第二行文字内容"
/> />
</el-form-item> </el-form-item>
<el-form-item label-width="100px" label="第二行字大小"> <el-form-item label-width="100px" label="第二行大小">
<el-input-number <el-input-number
v-model="config.customize.secondSize" v-model="config.customize.secondSize"
:precision="0" :precision="0"
class="bs-el-input-number" class="bs-el-input-number"
label="请输入第二行字大小" label="请输入第二行大小"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item

@ -50,20 +50,20 @@ const customConfig = {
}, },
customize: { customize: {
borderRadius: 0, borderRadius: 0,
fontFamily:'', fontFamily: 'ds-digitalbold',
borderWidth: 0, borderWidth: 0,
lineDistance: 25, lineDistance: 25,
borderColor: '', borderColor: '',
gradientDirection: 'to right', gradientDirection: 'to right',
gradientColor0: 'rgba(0, 122, 255, 1)', gradientColor0: '#4391f4',
gradientColor1:'rgba(0, 122, 255, 1)', gradientColor1: '#38bbe5',
firstSize: 32, firstSize: 18,
firstColor: '#ffffff', firstColor: '#ffffff',
firstWeight: 500, firstWeight: 500,
secondSize: 50, secondSize: 36,
secondColor: '#ffffff', secondColor: '#ffffff',
secondWeight: 500, secondWeight: 500,
secondLine: '装机处理及时率', secondLine: '项目总数',
unit: '', unit: '',
unitSize: 32, unitSize: 32,
unitColor: '#fff' unitColor: '#fff'

@ -35,17 +35,17 @@ const customConfig = {
titleStyle: { titleStyle: {
// 标题大小 // 标题大小
fontSize: 18, fontSize: 14,
// 标题颜色 // 标题颜色
color: '#fff', color: '#ffffff',
// 标题间距 // 标题间距
marginRight: 10 marginRight: 10
}, },
inputStyle: { inputStyle: {
// 输入值字体大小 // 输入值字体大小
fontSize: 20, fontSize: 14,
// 输入值字体颜色 // 输入值字体颜色
color: '#fff', color: '#ffffff',
// 输入值左间距 // 输入值左间距
paddingLeft: 10 paddingLeft: 10
}, },
@ -65,7 +65,7 @@ const customConfig = {
// 边框样式 // 边框样式
borderStyle: { borderStyle: {
// 边框颜色 // 边框颜色
borderColor: '#dcdfe6', borderColor: '#ffffff',
// 边框宽度 // 边框宽度
borderWidth: 1, borderWidth: 1,
// 边框样式 // 边框样式
@ -75,7 +75,7 @@ const customConfig = {
}, },
backgroundStyle: { backgroundStyle: {
// 背景颜色 // 背景颜色
backgroundColor: '#151a26' backgroundColor: '#00000000'
} }
} }
} }

@ -31,13 +31,15 @@
<div class="bs-setting-wrap"> <div class="bs-setting-wrap">
<PosWhSetting :config="config" /> <PosWhSetting :config="config" />
</div> </div>
<SettingTitle v-if="config.border"></SettingTitle> <SettingTitle v-if="config.border">
边框
</SettingTitle>
<div class="lc-field-body"> <div class="lc-field-body">
<BorderSetting <BorderSetting
v-if="config.border" v-if="config.border"
label-width="100px" label-width="100px"
:config="config.border" :config="config.border"
:bigTitle='config.title' :big-title="config.title"
/> />
</div> </div>
<SettingTitle>旋转</SettingTitle> <SettingTitle>旋转</SettingTitle>
@ -69,7 +71,7 @@
class="bs-el-select" class="bs-el-select"
> >
<el-option <el-option
v-for="type in openTypeList" v-for="(type) in openTypeList"
:key="type.label" :key="type.label"
:label="type.label" :label="type.label"
:value="type.value" :value="type.value"

@ -46,9 +46,9 @@ const customConfig = {
title: '超链接占位符', title: '超链接占位符',
fontSize: 20, fontSize: 20,
fontWeight: 700, fontWeight: 700,
color: 'left,#ffffff,#ffffff', color: 'left,#007aff,#007aff',
url: '', // 链接地址 url: 'http://gcpaas.gccloud.com', // 链接地址
openType: '', // 打开方式 openType: '_blank', // 打开方式
dialogW: 1000, // 弹窗宽度 dialogW: 1000, // 弹窗宽度
dialogH: 500// 弹窗高度 dialogH: 500// 弹窗高度
} }

@ -43,8 +43,8 @@ const customConfig = {
skewY: 0 skewY: 0
}, },
customize: { customize: {
title: '跑马灯占位符', title: 'DataRoom由GCPAAS开源社区开源',
fontSize: 40, fontSize: 14,
fontWeight: 700, fontWeight: 700,
icon: { icon: {
name: '', name: '',

@ -51,12 +51,12 @@
<SettingTitle>基础</SettingTitle> <SettingTitle>基础</SettingTitle>
<div class="lc-field-body"> <div class="lc-field-body">
<el-form-item <el-form-item
label="字大小" label="大小"
label-width="100px" label-width="100px"
> >
<el-input <el-input
v-model="config.customize.fontSize" v-model="config.customize.fontSize"
placeholder="请输入字大小" placeholder="请输入大小"
clearable clearable
> >
<template slot="append"> <template slot="append">
@ -87,7 +87,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="字类型" label="类型"
label-width="100px" label-width="100px"
> >
<el-select <el-select

@ -55,9 +55,9 @@ const customConfig = {
}, },
customize: { customize: {
title: '1234', title: '1234',
fontSize: 20, fontSize: 40,
fontWeight: 700, fontWeight: 700,
fontFamily: '', // 字体类型 fontFamily: 'ds-digitalbold', // 字体类型
color: 'left,#ffffff,#ffffff', color: 'left,#ffffff,#ffffff',
thousands: false, // 千分位分隔 thousands: false, // 千分位分隔
align: 'center', // 文字对齐方式 align: 'center', // 文字对齐方式

@ -41,9 +41,9 @@ const customConfig = {
customize: { customize: {
placeholder: '请选择', placeholder: '请选择',
// 输入框背景颜色 // 输入框背景颜色
backgroundColor: '#35393F', backgroundColor: '#00000000',
// 输入框字体大小 // 输入框字体大小
fontSize: 20, fontSize: 14,
// 输入框字体颜色 // 输入框字体颜色
fontColor: '#FFFFFF', fontColor: '#FFFFFF',
// 下拉框背景颜色 // 下拉框背景颜色

@ -19,13 +19,15 @@
/> />
</el-form-item> </el-form-item>
</div> </div>
<SettingTitle v-if="config.border"></SettingTitle> <SettingTitle v-if="config.border">
边框
</SettingTitle>
<div class="lc-field-body"> <div class="lc-field-body">
<BorderSetting <BorderSetting
v-if="config.border" v-if="config.border"
label-width="120px" label-width="120px"
:config="config.border" :config="config.border"
:bigTitle='config.title' :big-title="config.title"
/> />
</div> </div>
<SettingTitle>位置</SettingTitle> <SettingTitle>位置</SettingTitle>
@ -115,7 +117,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
import { chartSettingMixins } from 'data-room-ui/js/mixins/chartSettingMixins' import { chartSettingMixins } from 'data-room-ui/js/mixins/chartSettingMixins'
import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue' import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue' import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
import {predefineColors} from "data-room-ui/js/utils/colorList"; import { predefineColors } from 'data-room-ui/js/utils/colorList'
export default { export default {
components: { components: {
ColorPicker, ColorPicker,

@ -51,12 +51,12 @@
<SettingTitle>基础</SettingTitle> <SettingTitle>基础</SettingTitle>
<div class="lc-field-body"> <div class="lc-field-body">
<el-form-item <el-form-item
label="字大小" label="大小"
label-width="100px" label-width="100px"
> >
<el-input <el-input
v-model="config.customize.fontSize" v-model="config.customize.fontSize"
placeholder="请输入字大小" placeholder="请输入大小"
clearable clearable
> >
<template slot="append"> <template slot="append">

@ -28,10 +28,10 @@ const customConfig = {
skewY: 0 skewY: 0
}, },
customize: { customize: {
fontSize: 28, fontSize: 14,
fontWeight: 700, fontWeight: 300,
fontFamily: '', // 字体类型 fontFamily: 'ds-digitalbold', // 字体类型
color: 'rgb(155 159 172)' color: '#ffffff'
} }
} }

@ -34,11 +34,11 @@ const customConfig = {
customize: { customize: {
value: '', value: '',
// 选择框背景颜色 // 选择框背景颜色
backgroundColor: '#35393F', backgroundColor: '#00000000',
// 选择框文字颜色 // 选择框文字颜色
fontColor: '#FFFFFF', fontColor: '#FFFFFF',
// 选择框字大小 // 选择框大小
fontSize: 20, fontSize: 14,
// 下拉框背景颜色 // 下拉框背景颜色
dropDownBackgroundColor: '#35393F', dropDownBackgroundColor: '#35393F',
// 下拉框字体颜色 // 下拉框字体颜色

@ -452,22 +452,22 @@ const setting = [
// 模拟数据 // 模拟数据
const data = [ const data = [
{ date: '2016年', value: 100, type: '已处理' }, { date: '2016年', value: 140, type: '已处理' },
{ date: '2017年', value: 200, type: '已处理' }, { date: '2017年', value: 240, type: '已处理' },
{ date: '2018年', value: 300, type: '已处理' }, { date: '2018年', value: 340, type: '已处理' },
{ date: '2019年', value: 200, type: '已处理' }, { date: '2019年', value: 240, type: '已处理' },
{ date: '2020年', value: 100, type: '已处理' }, { date: '2020年', value: 140, type: '已处理' },
{ date: '2021年', value: 200, type: '已处理' }, { date: '2021年', value: 240, type: '已处理' },
{ date: '2022年', value: 300, type: '已处理' }, { date: '2022年', value: 340, type: '已处理' },
{ date: '2023年', value: 400, type: '已处理' }, { date: '2023年', value: 440, type: '已处理' },
{ date: '2016年', value: 400, type: '未处理' }, { date: '2016年', value: 400 + 340, type: '未处理' },
{ date: '2017年', value: 100, type: '未处理' }, { date: '2017年', value: 100 + 340, type: '未处理' },
{ date: '2018年', value: 200, type: '未处理' }, { date: '2018年', value: 200 + 340, type: '未处理' },
{ date: '2019年', value: 300, type: '未处理' }, { date: '2019年', value: 300 + 340, type: '未处理' },
{ date: '2020年', value: 200, type: '未处理' }, { date: '2020年', value: 200 + 340, type: '未处理' },
{ date: '2021年', value: 100, type: '未处理' }, { date: '2021年', value: 100 + 340, type: '未处理' },
{ date: '2022年', value: 200, type: '未处理' }, { date: '2022年', value: 200 + 340, type: '未处理' },
{ date: '2023年', value: 300, type: '未处理' } { date: '2023年', value: 300 + 340, type: '未处理' }
] ]
// 配置处理脚本 // 配置处理脚本

@ -129,7 +129,7 @@ export default function getComponentConfig (type) {
icon: Icon.getNameList()[6], icon: Icon.getNameList()[6],
className: className:
'com.gccloud.dataroom.core.module.chart.components.ScreenCurrentTimeChart', 'com.gccloud.dataroom.core.module.chart.components.ScreenCurrentTimeChart',
w: 380, w: 300,
h: 60, h: 60,
x: 0, x: 0,
y: 0, y: 0,
@ -142,7 +142,7 @@ export default function getComponentConfig (type) {
icon: Icon.getNameList()[7], icon: Icon.getNameList()[7],
className: className:
'com.gccloud.dataroom.core.module.chart.components.ScreenTimeCountDownChart', 'com.gccloud.dataroom.core.module.chart.components.ScreenTimeCountDownChart',
w: 500, w: 300,
h: 60, h: 60,
x: 0, x: 0,
y: 0, y: 0,
@ -306,8 +306,8 @@ export default function getComponentConfig (type) {
icon: null, icon: null,
img: require('data-room-ui/assets/images/cardImg/card.png'), img: require('data-room-ui/assets/images/cardImg/card.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart', className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart',
w: 400, w: 300,
h: 170, h: 114,
x: 0, x: 0,
y: 0, y: 0,
type type
@ -319,8 +319,8 @@ export default function getComponentConfig (type) {
icon: null, icon: null,
img: require('data-room-ui/assets/images/cardImg/card2.png'), img: require('data-room-ui/assets/images/cardImg/card2.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart', className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart',
w: 400, w: 300,
h: 170, h: 114,
x: 0, x: 0,
y: 0, y: 0,
type type
@ -332,8 +332,8 @@ export default function getComponentConfig (type) {
icon: null, icon: null,
img: require('data-room-ui/assets/images/cardImg/indicard.png'), img: require('data-room-ui/assets/images/cardImg/indicard.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart', className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',
w: 400, w: 300,
h: 170, h: 114,
x: 0, x: 0,
y: 0, y: 0,
type type
@ -345,8 +345,8 @@ export default function getComponentConfig (type) {
icon: null, icon: null,
img: require('data-room-ui/assets/images/cardImg/indcard2.png'), img: require('data-room-ui/assets/images/cardImg/indcard2.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart', className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',
w: 400, w: 300,
h: 170, h: 114,
x: 0, x: 0,
y: 0, y: 0,
type type

Loading…
Cancel
Save