{
- if(el.name == 'width'){
- el.value = this.bigscreenWidth
- }else if(el.name == 'height'){
- el.value = this.bigscreenHeight
+ if (el.name == "width") {
+ el.value = this.bigscreenWidth;
+ } else if (el.name == "height") {
+ el.value = this.bigscreenHeight;
}
- newSetup.push(el)
+ newSetup.push(el);
});
- this.widgetOptions.setup = newSetup
+ this.widgetOptions.setup = newSetup;
} else {
for (let i = 0; i < this.widgets.length; i++) {
if (this.widgetIndex == i) {
@@ -964,7 +934,7 @@ export default {
border: 1px solid #3a4659;
background: #282a30;
}
- .tools-item-text{
+ .tools-item-text {
}
}
}
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-iframe.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-iframe.js
index a38ba9832fe8e97167fbb676a421575f83fde500..8aa78f08b85cbc57c17d02ab0d7804b292f47562 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-iframe.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-iframe.js
@@ -1,6 +1,6 @@
/*
* @Descripttion: iframe json
- * @version:
+ * @version:
* @Author: qianlishi
* @Date: 2021-08-29 07:17:55
* @LastEditors: qianlishi
@@ -28,7 +28,7 @@ export const widgetIframe = {
name: 'iframeAdress',
required: false,
placeholder: '',
- value: 'https://report.anji-plus.com/index.html',
+ value: 'https://ajreport.beliefteam.cn/index.html',
},
],
// 数据
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/index.js b/report-ui/src/views/bigscreenDesigner/designer/tools/index.js
index 805318696bc3ee81df00d7a6c383dc14dff80e93..40c3974dd502bd6ed4eb7b206ece6f6db113be39 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/index.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/index.js
@@ -1,6 +1,6 @@
/*
* @Descripttion: 主文件
- * @version:
+ * @version:
* @Author: qianlishi
* @Date: 2021-08-29 06:43:07
* @LastEditors: qianlishi
@@ -59,7 +59,7 @@ const screenConfig = {
name: 'backgroundImage',
required: false,
placeholder: '',
- value: 'https://report.anji-plus.com/file/download/bf566e48-ccad-40e1-8ee9-228427e5466b',
+ value: 'https://ajreport.beliefteam.cn/file/download/bf566e48-ccad-40e1-8ee9-228427e5466b',
},
],
data: [],
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
index b7c057e61ca9d5bb2ae51774935d1a523e221968..e71d3b6cc35fbad93054d2c83182ddceb99f7621 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
@@ -533,9 +533,9 @@ export default {
const legend = this.options.legend;
legend.show = optionsSetup.isShowLegend;
legend.left = optionsSetup.lateralPosition;
- legend.top = optionsSetup.longitudinalPosition == "top" ? 0 : "auto";
+ legend.top = optionsSetup.longitudinalPosition;
legend.bottom =
- optionsSetup.longitudinalPosition == "bottom" ? 0 : "auto";
+ optionsSetup.longitudinalPosition;
legend.orient = optionsSetup.layoutFront;
legend.textStyle = {
color: optionsSetup.lengedColor,
@@ -543,6 +543,25 @@ export default {
};
legend.itemWidth = optionsSetup.lengedWidth;
},
+ // 图例名称设置
+ setOptionsLegendName(name){
+ const optionsSetup = this.optionsSetup;
+ const series = this.options.series;
+ const legendName = optionsSetup.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('|');
+ for (let i = 0; i < arr.length; i++) {
+ series[i].name = arr[i];
+ }
+ this.options.legend['data'] = arr
+ }
+ },
// 颜色修改、宽度修改
setOptionsColor() {
const optionsSetup = this.optionsSetup;
@@ -591,19 +610,20 @@ export default {
let xAxisList = [];
let yAxisList = [];
let arrayList = [];
+ const legendName = [];
for (const i in val) {
- xAxisList[i] = val[i].axis
- yAxisList[i] = val[i].name
+ xAxisList[i] = val[i].axis;
+ yAxisList[i] = val[i].name;
}
- xAxisList = this.setUnique(xAxisList)
- yAxisList = this.setUnique(yAxisList)
+ xAxisList = this.setUnique(xAxisList);
+ yAxisList = this.setUnique(yAxisList);
for (const i in yAxisList) {
- const data = new Array(yAxisList.length).fill(0)
+ const data = new Array(yAxisList.length).fill(0);
for (const j in xAxisList) {
for (const k in val) {
if (val[k].name == yAxisList[i]) {
if (val[k].axis == xAxisList[j]) {
- data[j] = val[k].data
+ data[j] = val[k].data;
}
}
}
@@ -612,13 +632,16 @@ export default {
name: yAxisList[i],
data: data
})
+ legendName.push(yAxisList[i]);
}
- this.options.series[0]['name'] = arrayList[0].name
- this.options.series[0]['data'] = arrayList[0].data
- this.options.series[1]['name'] = arrayList[1].name
- this.options.series[1]['data'] = arrayList[1].data
- this.options.xAxis[0]['data'] = xAxisList
- this.options.xAxis[1]['data'] = xAxisList
+ this.options.series[0]['name'] = arrayList[0].name;
+ this.options.series[0]['data'] = arrayList[0].data;
+ this.options.series[1]['name'] = arrayList[1].name;
+ this.options.series[1]['data'] = arrayList[1].data;
+ this.options.xAxis[0]['data'] = xAxisList;
+ this.options.xAxis[1]['data'] = xAxisList;
+ this.options.legend['data'] = legendName;
+ this.setOptionsLegendName(legendName);
},
// 动态数据
dynamicDataFn(val, refreshTime, optionsSetup) {
@@ -639,14 +662,19 @@ export default {
});
},
renderingFn(optionsSetup, val) {
- this.options.xAxis[0]['data'] = val.xAxis
- this.options.xAxis[1]['data'] = val.xAxis
+ const legendName = [];
+ this.options.xAxis[0]['data'] = val.xAxis;
+ this.options.xAxis[1]['data'] = val.xAxis;
if (val.series[0].type == "line") {
- this.options.series[0]['name'] = val.series[0].name
- this.options.series[0]['data'] = val.series[0].data
- this.options.series[1]['name'] = val.series[1].name
- this.options.series[1]['data'] = val.series[1].data
+ this.options.series[0]['name'] = val.series[0].name;
+ this.options.series[0]['data'] = val.series[0].data;
+ this.options.series[1]['name'] = val.series[1].name;
+ this.options.series[1]['data'] = val.series[1].data;
+ legendName.push(val.series[0].name);
+ legendName.push(val.series[1].name);
}
+ this.options.legend['data'] = legendName;
+ this.setOptionsLegendName(legendName);
}
}
};
diff --git a/report-ui/src/views/excelreport/viewer/index.vue b/report-ui/src/views/excelreport/viewer/index.vue
index b94dd9a92f0c426cd061dd965ec31be60a0d9931..7aed447bd9d55c83b7133d9f0f1ceaa429d11a24 100644
--- a/report-ui/src/views/excelreport/viewer/index.vue
+++ b/report-ui/src/views/excelreport/viewer/index.vue
@@ -23,25 +23,32 @@
表格查询
查询
-
-
#### 开源不易，劳烦各位star ☺
diff --git a/doc/docs/guide/README.md b/doc/docs/guide/README.md
index 6af10628a8224b30774eeae023a811a3cc45cd4c..ef54e6f99c9784f12d03d63d52cced68996fba82 100644
--- a/doc/docs/guide/README.md
+++ b/doc/docs/guide/README.md
@@ -10,7 +10,7 @@
## 在线体验
-#### [在线体验](https://report.anji-plus.com/index.html "链接"): https://report.anji-plus.com/index.html 体验账号：guest 密码：guest
+#### [在线体验](https://ajreport.beliefteam.cn/index.html "链接"): https://ajreport.beliefteam.cn/index.html 体验账号：guest 密码：guest
#### [在线提问](https://gitee.com/anji-plus/report/issues "issue"): https://gitee.com/anji-plus/report/issues 
- V0.9.6
+ V0.9.6.1