ehs_tanghHe
/
tanghe-report
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

气泡地图增加背景色调整

Browse Source
qianming 4 years ago
parent 27f8238786
commit 414e03a0a0
2 changed files with 64 additions and 173 deletions
Show Stats Download Patch File Download Diff File

182
report-ui/src/views/report/bigscreen/designer/tools.js
Unescape Escape View File

@ -5714,7 +5714,7 @@ const widgetTools = [
name: 'background', name: 'background',
required: false, required: false,
placeholder: '', placeholder: '',
value: '' value: '#0F1C3C'
}, },
[ [
{ {
@ -5819,174 +5819,70 @@ const widgetTools = [
}, },
], ],
}, },
/* {
name: '数值设定',
list: [
{
type: 'el-switch',
label: '显示',
name: 'isShow',
required: false,
placeholder: '',
value: true,
},
{
type: 'el-switch',
label: '数值',
name: 'numberValue',
require: false,
placeholder: '',
value: true,
},
{
type: 'el-switch',
label: '百分比',
name: 'percentage',
require: false,
placeholder: '',
value: false,
},
{ {
type: 'el-input-number', name: '自定义配色',
label: '字体大小', list: [
name: 'fontSize',
required: false,
placeholder: '',
value: 14,
},
{ {
type: 'vue-color', type: 'customColor',
label: '字体颜色', label: '',
name: 'subTextColor', name: 'customColor',
required: false, required: false,
placeholder: '', value: [{color: '#FF801C'}, {color: '#F5FF46'}, {color: '#00FE65'}, {color: '#00FEFF'}, {color: '#ffa800'}]
value: ''
}, },
{
type: 'el-select',
label: '字体粗细',
name: 'fontWeight',
required: false,
placeholder: '',
selectOptions: [
{code: 'normal', name: '正常'},
{code: 'bold', name: '粗体'},
{code: 'bolder', name: '特粗体'},
{code: 'lighter', name: '细体'}
], ],
value: 'normal'
}, },
], ],
},
{
name: '提示语设置',
list: [
{
type: 'el-input-number',
label: '字体大小',
name: 'fontSize',
required: false,
placeholder: '',
value: 12
},
{
type: 'vue-color',
label: '网格线颜色',
name: 'lineColor',
required: false,
placeholder: '',
value: ''
},
], ],
}, data: [
{
name: '图例操作',
list: [
{
type: 'el-switch',
label: '图例',
name: 'isShowLegend',
required: false,
placeholder: '',
value: true,
},
{ {
type: 'vue-color', type: 'el-radio-group',
label: '字体颜色', label: '数据类型',
name: 'lengedColor', name: 'dataType',
required: false, require: false,
placeholder: '', placeholder: '',
value: '#fff', selectValue: true,
}, selectOptions: [
{ {
type: 'el-input-number', code: 'staticData',
label: '字体大小', name: '静态数据',
name: 'lengedFontSize',
required: false,
placeholder: '',
value: 16,
}, },
{ {
type: 'el-input-number', code: 'dynamicData',
label: '图例宽度', name: '动态数据',
name: 'lengedWidth',
required: false,
placeholder: '',
value: 15,
}, },
{
type: 'el-select',
label: '横向位置',
name: 'lateralPosition',
required: false,
placeholder: '',
selectOptions: [
{code: 'left', name: '左对齐'},
{code: 'right', name: '右对齐'},
], ],
value: '' value: 'staticData',
}, },
{ {
type: 'el-select', type: 'el-input-number',
label: '纵向位置', label: '刷新时间(毫秒)',
name: 'longitudinalPosition', name: 'refreshTime',
required: false, relactiveDom: 'dataType',
placeholder: '', relactiveDomValue: 'dynamicData',
selectOptions: [ value: 5000
{code: 'top', name: '顶部'},
{code: 'bottom', name: '底部'},
],
value: ''
}, },
{ {
type: 'el-select', type: 'el-button',
label: '布局前置', label: '静态数据',
name: 'layoutFront', name: 'staticData',
required: false, required: false,
placeholder: '', placeholder: 'px',
selectOptions: [ relactiveDom: 'dataType',
{code: 'vertical', name: '竖排'}, relactiveDomValue: 'staticData',
{code: 'horizontal', name: '横排'}, value: '[{"value": 1048,"name": "搜索引擎"},{"value": 735, "name": "直接访问"},{"value": 580, "name": "邮件营销"},{"value": 484,"name":"联盟广告"},{"value":300,"name":"视频广告"}]',
],
value: ''
}, },
],
},*/
{ {
name: '自定义配色', type: 'dycustComponents',
list: [
{
type: 'customColor',
label: '', label: '',
name: 'customColor', name: 'dynamicData',
required: false, required: false,
value: [{color: '#FF801C'}, {color: '#F5FF46'}, {color: '#00FE65'}, {color: '#00FEFF'}, {color: '#ffa800'}] placeholder: 'px',
}, relactiveDom: 'dataType',
], chartType: 'widget-piechart',
relactiveDomValue: 'dynamicData',
value: '',
}, },
], ],
],
data: [],
position: [ position: [
{ {
type: 'el-input-number', type: 'el-input-number',

31
report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue
Unescape Escape View File

@ -329,7 +329,7 @@ export default {
offset: 1, offset: 1,
color: 'rgba(0,108,255,0.7)' color: 'rgba(0,108,255,0.7)'
}], }],
global: false // 缺省为 false global: false
}, },
} }
}, },
@ -354,14 +354,16 @@ export default {
symbolSize: function (val) { symbolSize: function (val) {
if (val[2] == 0) { if (val[2] == 0) {
return 0; return 0;
} };
;
return ((maxSize4Pin - minSize4Pin) / (max - min)) * val[2] + (maxSize4Pin - ((maxSize4Pin - minSize4Pin) / (max - min)) * max) * 1.2; return ((maxSize4Pin - minSize4Pin) / (max - min)) * val[2] + (maxSize4Pin - ((maxSize4Pin - minSize4Pin) / (max - min)) * max) * 1.2;
}, },
data: convertData(data), data: convertData(data),
zlevel: 1, zlevel: 1,
}] }]
}, },
optionsStyle: {}, // 样式
optionsData: {}, // 数据
optionsCollapse: {}, // 图标属性
optionsSetup: {} optionsSetup: {}
} }
}, },
@ -373,22 +375,25 @@ export default {
height: this.optionsStyle.height + "px", height: this.optionsStyle.height + "px",
left: this.optionsStyle.left + "px", left: this.optionsStyle.left + "px",
top: this.optionsStyle.top + "px", top: this.optionsStyle.top + "px",
background: this.optionsSetup.background background: this.optionsCollapse.background
}; };
} }
}, },
watch: { watch: {
value: { value: {
handler(val) { handler(val) {
this.optionsStyle = val.position; /* this.optionsStyle = val.position;
this.optionsData = val.data;
this.optionsSetup = val.setup;*/
this.optionsCollapse = val.setup;
this.editorOptions();
}, },
deep: true deep: true
} }
}, },
created() {
this.optionsStyle = this.value.position;
},
mounted() { mounted() {
this.optionsStyle = this.value.position;
this.optionsCollapse = this.value.setup;
}, },
methods: { methods: {
// 修改图标options属性 // 修改图标options属性
@ -415,16 +420,6 @@ export default {
}; };
this.options.title = title; this.options.title = title;
}, },
setdata(outname, outvalue) {
const outdata = {}
for (var i = 0; i < outname.length; i++) {
outdata.push({
name: outname[i],
value: outvalue[i]
})
}
return outdata
},
//数据解析 //数据解析
setOptionsData() { setOptionsData() {
const optionsData = this.optionsData; // 数据类型 静态 or 动态 const optionsData = this.optionsData; // 数据类型 静态 or 动态

Write Preview
Loading…
Cancel
Save