Merge remote-tracking branch 'origin/dev' into dev

qianming 2 years ago
commit 82f6d55a3e

@ -1,6 +1,5 @@
import miment from 'miment'
import {getData} from '@/api/bigscreen'
import { getData } from '@/api/bigscreen'
export default {
data() {
return {
@ -59,6 +58,7 @@ export default {
},
computed: {},
created() {
},
mounted() {
},
@ -96,7 +96,7 @@ export default {
// 查询echarts 数据
queryEchartsData(params) {
return new Promise(async (resolve) => {
const {code, data} = await getData(params);
const { code, data } = await getData(params);
if (code != 200) return
const analysisData = this.analysisChartsData(params, data);
resolve(analysisData)
@ -277,7 +277,7 @@ export default {
// 字段名
const radarField = [];
let nameField;
for(const key in chartProperties) {
for (const key in chartProperties) {
if (chartProperties[key] == 'radar') {
radarField.push(key)
}

@ -0,0 +1,5 @@
import Vue from 'vue'
const eventBus = new Vue()
export { eventBus }

@ -0,0 +1,34 @@
import { eventBus } from "@/utils/eventBus";
export function setAssChartData(widgets, options) {
const selectOptions = options.filter(item => item.uuid).map(item => {
return {
code: item.uuid,
name: item.label
}
})
widgets.forEach(item => {
const setup = item['options']['setup']
console.log(setup)
setup.forEach(sItem => {
if (sItem.name == 'assChart') {
sItem['selectOptions'] = selectOptions
}
})
})
}
export function eventBusParams(optionsSetup, optionsData, callback) {
eventBus.$on("eventParams", (formParams) => {
const uuid = optionsSetup.uuid;
if (formParams.assChart.includes(uuid)) {
const contextData = optionsData.dynamicData.contextData;
for (const key in contextData) {
if (formParams.hasOwnProperty(key)) {
contextData[key] = formParams[key];
}
}
callback(optionsData.dynamicData, optionsSetup)
}
});
}

@ -88,6 +88,7 @@
size="mini"
:disabled="item.disabled"
v-model="formData[item.name]"
:multiple="item.multiple"
clearable
placeholder="请选择"
@change="(val) => changed(val, item.name)"
@ -384,6 +385,8 @@ export default {
},
//
changed(val, key) {
console.log(val);
console.log(key);
if (val.extend) {
this.$set(this.formData, key, val.value);
} else {

@ -312,6 +312,7 @@ import VueRulerTool from "vue-ruler-tool"; // 大屏设计页面的标尺插件
import contentMenu from "./components/contentMenu";
import { getToken } from "@/utils/auth";
import { Revoke } from "@/utils/revoke"; // 2022-02-22
import { setAssChartData } from "@/utils/screen.js";
export default {
name: "Login",
@ -444,7 +445,6 @@ export default {
watch: {
widgets: {
handler(val) {
this.handlerLayerWidget(val);
//
this.$nextTick(() => {
this.revoke.push(this.widgets);
@ -491,7 +491,7 @@ export default {
this.widgets = record;
},
handlerLayerWidget(val) {
console.log(val)
console.log(val);
const layerWidgetArr = [];
for (let i = 0; i < val.length; i++) {
const obj = {};
@ -501,11 +501,14 @@ export default {
if (el.name == "layerName") {
obj.label = el.value;
}
if (el.name == "uuid") {
obj.uuid = el.value;
}
});
layerWidgetArr.push(obj);
}
this.layerWidget = layerWidgetArr;
console.log(this.layerWidget);
setAssChartData(this.widgets, this.layerWidget);
},
async initEchartData() {
const reportCode = this.$route.query.reportCode;
@ -517,6 +520,7 @@ export default {
this.dashboard = screenData;
this.bigscreenWidth = this.dashboard.width;
this.bigscreenHeight = this.dashboard.height;
this.handlerLayerWidget(this.widgets);
},
handleBigScreen(data) {
const optionScreen = getToolByCode("screen").options;
@ -746,6 +750,7 @@ export default {
this.setOptionsOnClickWidget(this.widgets.length - 1);
console.log("123", this.widgets);
this.handlerLayerWidget(this.widgets);
},
//

@ -3,7 +3,7 @@
* @Author: qianlishi qianlishi@anji-plus.com
* @Date: 2023-01-09 13:02:59
* @LastEditors: qianlishi qianlishi@anji-plus.com
* @LastEditTime: 2023-01-10 09:40:53
* @LastEditTime: 2023-01-12 14:39:29
*/
export const widgetSelect = {
@ -24,11 +24,11 @@ export const widgetSelect = {
},
{
type: 'el-input-text',
label: '默认值',
name: 'text',
label: '字段属性值',
name: 'field',
required: false,
placeholder: '',
value: '超链接',
placeholder: '请输入',
value: '',
},
{
type: 'vue-color',
@ -52,11 +52,8 @@ export const widgetSelect = {
name: 'assChart',
required: false,
placeholder: '',
selectOptions: [
{ code: 'center', name: '居中' },
{ code: 'left', name: '左对齐' },
{ code: 'right', name: '右对齐' },
],
multiple: true,
selectOptions: [],
value: '',
},
{
@ -102,11 +99,11 @@ export const widgetSelect = {
relactiveDom: 'dataType',
relactiveDomValue: 'staticData',
value: [
{ "axis": "苹果", "data": 1000 },
{ "axis": "三星", "data": 2229 },
{ "axis": "小米", "data": 3879 },
{ "axis": "oppo", "data": 2379 },
{ "axis": "vivo", "data": 4079 },
{ "name": "苹果", "code": 1000 },
{ "name": "三星", "code": 2229 },
{ "name": "小米", "code": 3879 },
{ "name": "oppo", "code": 2379 },
{ "name": "vivo", "code": 4079 },
],
},
{
@ -117,8 +114,8 @@ export const widgetSelect = {
placeholder: '',
relactiveDom: 'dataType',
relactiveDomValue: 'dynamicData',
chartType: 'widget-barchart',
dictKey: 'BAR_PROPERTIES',
chartType: 'widget-select',
dictKey: 'SELECT_PROPERTIES',
value: '',
},
],

@ -1,16 +1,17 @@
<template>
<div :style="styleObj">
<v-chart :options="options" autoresize/>
<v-chart :options="options" autoresize />
</div>
</template>
<script>
import { eventBusParams } from "@/utils/screen";
export default {
name: "WidgetBarchart",
components: {},
props: {
value: Object,
ispreview: Boolean
ispreview: Boolean,
},
data() {
return {
@ -18,8 +19,8 @@ export default {
grid: {},
legend: {
textStyle: {
color: "#fff"
}
color: "#fff",
},
},
xAxis: {
type: "category",
@ -27,9 +28,9 @@ export default {
axisLabel: {
show: true,
textStyle: {
color: "#fff"
}
}
color: "#fff",
},
},
},
yAxis: {
type: "value",
@ -37,9 +38,9 @@ export default {
axisLabel: {
show: true,
textStyle: {
color: "#fff"
}
}
color: "#fff",
},
},
},
series: [
{
@ -47,15 +48,15 @@ export default {
type: "bar",
barGap: "0%",
itemStyle: {
borderRadius: null
}
}
]
borderRadius: null,
},
},
],
},
optionsStyle: {}, //
optionsData: {}, //
optionsSetup: {},
flagInter: null
flagInter: null,
};
},
computed: {
@ -66,9 +67,9 @@ export default {
height: this.optionsStyle.height + "px",
left: this.optionsStyle.left + "px",
top: this.optionsStyle.top + "px",
background: this.optionsSetup.background
background: this.optionsSetup.background,
};
}
},
},
watch: {
value: {
@ -79,8 +80,8 @@ export default {
this.optionsSetup = val.setup;
this.editorOptions();
},
deep: true
}
deep: true,
},
},
mounted() {
this.optionsStyle = this.value.position;
@ -88,6 +89,14 @@ export default {
this.optionsCollapse = this.value.setup;
this.optionsSetup = this.value.setup;
this.editorOptions();
eventBusParams(
this.optionsSetup,
this.optionsData,
(dynamicData, optionsSetup) => {
this.getEchartData(dynamicData, optionsSetup);
}
);
},
methods: {
// options
@ -134,7 +143,7 @@ export default {
name: optionsSetup.nameX,
nameTextStyle: {
color: optionsSetup.nameColorX,
fontSize: optionsSetup.nameFontSizeX
fontSize: optionsSetup.nameFontSizeX,
},
//
inverse: optionsSetup.reversalX,
@ -147,23 +156,23 @@ export default {
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX
}
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
color: optionsSetup.lineColorX,
width: optionsSetup.lineWidthX,
}
},
},
splitLine: {
show: optionsSetup.isShowSplitLineX,
lineStyle: {
color: optionsSetup.splitLineColorX,
width: optionsSetup.splitLineWidthX,
}
}
},
},
};
this.options.xAxis = xAxis;
},
@ -181,7 +190,7 @@ export default {
name: optionsSetup.textNameY,
nameTextStyle: {
color: optionsSetup.nameColorY,
fontSize: optionsSetup.nameFontSizeY
fontSize: optionsSetup.nameFontSizeY,
},
//
inverse: optionsSetup.reversalY,
@ -192,23 +201,23 @@ export default {
textStyle: {
//
color: optionsSetup.colorY,
fontSize: optionsSetup.fontSizeY
}
fontSize: optionsSetup.fontSizeY,
},
},
axisLine: {
show: true,
lineStyle: {
color: optionsSetup.lineColorY,
width: optionsSetup.lineWidthY,
}
},
},
splitLine: {
show: optionsSetup.isShowSplitLineY,
lineStyle: {
color: optionsSetup.splitLineColorY,
width: optionsSetup.splitLineWidthY,
}
}
},
},
};
this.options.yAxis = yAxis;
},
@ -220,14 +229,14 @@ export default {
if (optionsSetup.verticalShow) {
series[0].label = {
show: optionsSetup.isShow,
position: 'right',
position: "right",
distance: optionsSetup.distance,
textStyle: {
fontSize: optionsSetup.fontSize,
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.fontWeight
}
}
fontWeight: optionsSetup.fontWeight,
},
};
} else {
series[0].label = {
show: optionsSetup.isShow,
@ -235,8 +244,8 @@ export default {
distance: optionsSetup.distance,
fontSize: optionsSetup.fontSize,
color: optionsSetup.subTextColor,
fontWeight: optionsSetup.fontWeight
}
fontWeight: optionsSetup.fontWeight,
};
}
}
series[0].barWidth = optionsSetup.maxWidth;
@ -250,8 +259,8 @@ export default {
show: true,
textStyle: {
color: optionsSetup.tipsColor,
fontSize: optionsSetup.tipsFontSize
}
fontSize: optionsSetup.tipsFontSize,
},
};
this.options.tooltip = tooltip;
},
@ -263,7 +272,7 @@ export default {
right: optionsSetup.marginRight,
bottom: optionsSetup.marginBottom,
top: optionsSetup.marginTop,
containLabel: true
containLabel: true,
};
this.options.grid = grid;
},
@ -278,11 +287,11 @@ export default {
}
const itemStyle = {
normal: {
color: params => {
color: (params) => {
return arrColor[params.dataIndex];
},
barBorderRadius: optionsSetup.radius
}
barBorderRadius: optionsSetup.radius,
},
};
for (const key in this.options.series) {
if (this.options.series[key].type == "bar") {
@ -297,11 +306,7 @@ export default {
const optionsData = this.optionsData; // or
optionsData.dataType == "staticData"
? this.staticDataFn(optionsData.staticData)
: this.dynamicDataFn(
optionsData.dynamicData,
optionsData.refreshTime,
optionsSetup
);
: this.dynamicDataFn(optionsData.refreshTime);
},
//
staticDataFn(val) {
@ -311,7 +316,7 @@ export default {
let data = [];
for (const i in val) {
axis[i] = val[i].axis;
data[i] = val[i].data
data[i] = val[i].data;
}
// x
if (optionsSetup.verticalShow) {
@ -330,7 +335,10 @@ export default {
}
},
//
dynamicDataFn(val, refreshTime, optionsSetup) {
dynamicDataFn(refreshTime) {
const optionsSetup = this.optionsSetup;
const optionsData = this.optionsData;
const val = optionsData.dynamicData;
if (!val) return;
if (this.ispreview) {
this.getEchartData(val, optionsSetup);
@ -343,7 +351,7 @@ export default {
},
getEchartData(val, optionsSetup) {
const data = this.queryEchartsData(val);
data.then(res => {
data.then((res) => {
this.renderingFn(optionsSetup, res);
});
},
@ -367,8 +375,8 @@ export default {
series[i].data = val.series[i].data;
}
}
}
}
},
},
};
</script>

@ -1,16 +1,17 @@
<template>
<div :style="styleObj">
<v-chart :options="options" autoresize/>
<v-chart :options="options" autoresize />
</div>
</template>
<script>
import { eventBusParams } from "@/utils/screen";
export default {
name: "WidgetBarlinechart",
components: {},
props: {
value: Object,
ispreview: Boolean
ispreview: Boolean,
},
data() {
return {
@ -20,16 +21,16 @@ export default {
title: {
text: "",
textStyle: {
color: "#fff"
}
color: "#fff",
},
},
tooltip: {
trigger: "item",
formatter: "{a} <br/>{b} : {c}%"
formatter: "{a} <br/>{b} : {c}%",
},
legend: {
textStyle: {
color: "#fff"
color: "#fff",
},
},
xAxis: [
@ -39,10 +40,10 @@ export default {
axisLabel: {
show: false,
textStyle: {
color: "#fff"
}
}
}
color: "#fff",
},
},
},
],
yAxis: [
{
@ -54,9 +55,9 @@ export default {
axisLabel: {
show: true,
textStyle: {
color: "#fff"
}
}
color: "#fff",
},
},
},
{
type: "value",
@ -67,10 +68,10 @@ export default {
axisLabel: {
show: true,
textStyle: {
color: "#fff"
}
}
}
color: "#fff",
},
},
},
],
series: [
{
@ -79,22 +80,22 @@ export default {
yAxisIndex: 0,
data: [],
itemStyle: {
barBorderRadius: null
}
barBorderRadius: null,
},
},
{
name: "",
type: "line",
yAxisIndex: 1,
data: [],
itemStyle: {}
}
]
itemStyle: {},
},
],
},
optionsStyle: {}, //
optionsData: {}, //
optionsCollapse: {}, //
optionsSetup: {}
optionsSetup: {},
};
},
computed: {
@ -105,9 +106,9 @@ export default {
height: this.optionsStyle.height + "px",
left: this.optionsStyle.left + "px",
top: this.optionsStyle.top + "px",
background: this.optionsSetup.background
background: this.optionsSetup.background,
};
}
},
},
watch: {
value: {
@ -118,8 +119,8 @@ export default {
this.optionsSetup = val.setup;
this.editorOptions();
},
deep: true
}
deep: true,
},
},
created() {
this.optionsStyle = this.value.position;
@ -127,6 +128,14 @@ export default {
this.optionsCollapse = this.value.collapse;
this.optionsSetup = this.value.setup;
this.editorOptions();
eventBusParams(
this.optionsSetup,
this.optionsData,
(dynamicData, optionsSetup) => {
this.getEchartData(dynamicData, optionsSetup);
}
);
},
methods: {
// options
@ -175,7 +184,7 @@ export default {
name: optionsSetup.nameX,
nameTextStyle: {
color: optionsSetup.nameColorX,
fontSize: optionsSetup.nameFontSizeX
fontSize: optionsSetup.nameFontSizeX,
},
//
inverse: optionsSetup.reversalX,
@ -188,23 +197,23 @@ export default {
textStyle: {
//
color: optionsSetup.colorX,
fontSize: optionsSetup.fontSizeX
}
fontSize: optionsSetup.fontSizeX,
},
},
axisLine: {
show: true,
lineStyle: {
color: optionsSetup.lineColorX,
width: optionsSetup.lineWidthX,
}
},
},
splitLine: {
show: optionsSetup.isShowSplitLineX,
lineStyle: {
color: optionsSetup.splitLineColorX,
width: optionsSetup.splitLineWidthX,
}
}
},
},
};
this.options.xAxis = xAxis;
},
@ -223,7 +232,7 @@ export default {
//
nameTextStyle: {
color: optionsSetup.nameColorYLeft,
fontSize: optionsSetup.nameFontSizeYLeft
fontSize: optionsSetup.nameFontSizeYLeft,
},
axisLabel: {
show: true,
@ -232,10 +241,11 @@ export default {
textStyle: {
//
color: optionsSetup.colorYLeft,
fontSize: optionsSetup.fontSizeYLeft
}
fontSize: optionsSetup.fontSizeYLeft,
},
},
axisTick: { //
axisTick: {
//
show: optionsSetup.tickLineYLeft,
},
axisLine: {
@ -243,15 +253,15 @@ export default {
lineStyle: {
width: optionsSetup.lineWidthYLeft,
color: optionsSetup.lineColorYLeft,
}
},
},
splitLine: {
show: optionsSetup.isShowSplitLineYLeft,
lineStyle: {
color: optionsSetup.splitLineColorYLeft,
width: optionsSetup.splitLineFontWidthYLeft,
}
}
},
},
},
{
type: "value",
@ -264,7 +274,7 @@ export default {
//
nameTextStyle: {
color: optionsSetup.nameColorYRight,
fontSize: optionsSetup.nameFontSizeYRight
fontSize: optionsSetup.nameFontSizeYRight,
},
axisLabel: {
show: true,
@ -273,10 +283,11 @@ export default {
textStyle: {
//
color: optionsSetup.colorYRight,
fontSize: optionsSetup.fontSizeYRight
}
fontSize: optionsSetup.fontSizeYRight,
},
},
axisTick: { //
axisTick: {
//
show: optionsSetup.tickLineYRight,
},
axisLine: {
@ -284,16 +295,16 @@ export default {
lineStyle: {
width: optionsSetup.lineWidthYRight,
color: optionsSetup.lineColorYRight,
}
},
},
splitLine: {
show: optionsSetup.isShowSplitLineYRight,
lineStyle: {
color: optionsSetup.splitLineColorYRight,
width: optionsSetup.splitLineFontWidthYRight,
}
}
}
},
},
},
];
this.options.yAxis = yAxis;
},
@ -309,15 +320,15 @@ export default {
series[key].smooth = optionsSetup.smoothCurve;
if (optionsSetup.area) {
series[key].areaStyle = {
opacity: optionsSetup.areaThickness / 100
opacity: optionsSetup.areaThickness / 100,
};
} else {
series[key].areaStyle = {
opacity: 0
opacity: 0,
};
}
series[key].lineStyle = {
width: optionsSetup.lineWidth
width: optionsSetup.lineWidth,
};
series[key].itemStyle.borderRadius = optionsSetup.radius;
series[key].label = {
@ -326,7 +337,7 @@ export default {
distance: optionsSetup.distanceLine,
fontSize: optionsSetup.fontSizeLine,
color: optionsSetup.subTextColorLine,
fontWeight: optionsSetup.fontWeightLine
fontWeight: optionsSetup.fontWeightLine,
};
}
}
@ -344,7 +355,7 @@ export default {
distance: optionsSetup.distanceBar,
fontSize: optionsSetup.fontSizeBar,
color: optionsSetup.subTextColorBar,
fontWeight: optionsSetup.fontWeightBar
fontWeight: optionsSetup.fontWeightBar,
};
series[key].barWidth = optionsSetup.maxWidth;
series[key].barMinHeight = optionsSetup.minHeight;
@ -361,8 +372,8 @@ export default {
show: true,
textStyle: {
color: optionsSetup.tipsColor,
fontSize: optionsSetup.tipsFontSize
}
fontSize: optionsSetup.tipsFontSize,
},
};
this.options.tooltip = tooltip;
},
@ -374,7 +385,7 @@ export default {
right: optionsSetup.marginRight,
bottom: optionsSetup.marginBottom,
top: optionsSetup.marginTop,
containLabel: true
containLabel: true,
};
this.options.grid = grid;
},
@ -384,32 +395,31 @@ export default {
legend.show = optionsSetup.isShowLegend;
legend.left = optionsSetup.lateralPosition;
legend.top = optionsSetup.longitudinalPosition;
legend.bottom =
optionsSetup.longitudinalPosition;
legend.bottom = optionsSetup.longitudinalPosition;
legend.orient = optionsSetup.layoutFront;
legend.textStyle = {
color: optionsSetup.legendColor,
fontSize: optionsSetup.legendFontSize
fontSize: optionsSetup.legendFontSize,
};
legend.itemWidth = optionsSetup.legendWidth;
},
//
setOptionsLegendName(name){
setOptionsLegendName(name) {
const optionsSetup = this.optionsSetup;
const series = this.options.series;
const legendName = optionsSetup.legendName;
//
if (null == legendName || legendName == '') {
if (null == legendName || legendName == "") {
for (let i = 0; i < name.length; i++) {
series[i].name = name[i];
}
this.options.legend['data'] = name;
}else {
const arr = legendName.split('|');
this.options.legend["data"] = name;
} else {
const arr = legendName.split("|");
for (let i = 0; i < arr.length; i++) {
series[i].name = arr[i];
}
this.options.legend['data'] = arr
this.options.legend["data"] = arr;
}
},
//
@ -452,9 +462,9 @@ export default {
}
}
const legendName = [];
legendName.push('bar');
legendName.push('line');
this.options.legend['data'] = legendName;
legendName.push("bar");
legendName.push("line");
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
},
dynamicDataFn(val, refreshTime) {
@ -470,7 +480,7 @@ export default {
},
getEchartData(val) {
const data = this.queryEchartsData(val);
data.then(res => {
data.then((res) => {
this.renderingFn(res);
});
},
@ -487,10 +497,10 @@ export default {
}
legendName.push(val.series[i].name);
}
this.options.legend['data'] = legendName;
this.options.legend["data"] = legendName;
this.setOptionsLegendName(legendName);
}
}
},
},
};
</script>

@ -4,11 +4,13 @@
:style="styleObj"
v-model="selectValue"
:localOptions="options"
label="text"
option="id"
label="name"
option="code"
@[eventChange]="change"
/>
</template>
<script>
import { eventBus } from "@/utils/eventBus";
export default {
name: "WidgetSelect",
props: {
@ -17,28 +19,6 @@ export default {
},
data() {
return {
options: [
{
id: "选项1",
text: "黄金糕",
},
{
id: "选项2",
text: "双皮奶",
},
{
id: "选项3",
text: "蚵仔煎",
},
{
id: "选项4",
text: "龙须面",
},
{
id: "选项5",
text: "北京烤鸭",
},
],
selectValue: "",
optionsStyle: {},
optionsData: {},
@ -55,10 +35,18 @@ export default {
top: this.optionsStyle.top + "px",
};
},
options() {
const data = this.optionsData;
return data.dataType == "staticData" ? data.staticData : data.dynamicData;
},
eventChange() {
return this.optionsSetup.event || "change";
},
},
watch: {
value: {
handler(val) {
console.log("val", val);
this.optionsSetup = val.setup;
this.optionsData = val.data;
this.optionsStyle = val.position;
@ -71,7 +59,15 @@ export default {
this.optionsData = this.value.data;
this.optionsStyle = this.value.position;
},
methods: {},
methods: {
change(event) {
const optionsSetup = this.optionsSetup;
const params = {};
params[optionsSetup.field] = event;
params["assChart"] = optionsSetup.assChart;
eventBus.$emit("eventParams", params);
},
},
};
</script>
<style lang="scss" scoped>

Loading…
Cancel
Save