From 9241a593c567db695216e3a8e4f4cdd7f2dab78b Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 18 May 2022 17:41:03 +0800 Subject: [PATCH 01/29] =?UTF-8?q?update--=E4=B8=AD=E5=9B=BD=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE-=E8=B7=AF=E7=BA=BF=E5=9B=BE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/widget/widgetMap.vue | 224 +++++++++++++++--- 1 file changed, 185 insertions(+), 39 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/widgetMap.vue index dd6b8867..147b7614 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/widgetMap.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/widgetMap.vue @@ -1,10 +1,11 @@ + diff --git a/report-ui/src/views/screenDesigner/widget/mapCharts/widgetMap.vue b/report-ui/src/views/screenDesigner/widget/mapCharts/widgetMap.vue deleted file mode 100644 index dd6b8867..00000000 --- a/report-ui/src/views/screenDesigner/widget/mapCharts/widgetMap.vue +++ /dev/null @@ -1,468 +0,0 @@ - - - diff --git a/report-ui/src/views/screenDesigner/widget/texts/widgetTime.vue b/report-ui/src/views/screenDesigner/widget/texts/widgetTime.vue index 5a55bc02..1c3d8918 100644 --- a/report-ui/src/views/screenDesigner/widget/texts/widgetTime.vue +++ b/report-ui/src/views/screenDesigner/widget/texts/widgetTime.vue @@ -94,11 +94,11 @@ export default { }, formatWeek(date, fmt) { const year = date.getFullYear(); - const month = date.getMonth() + 1; - const day = date.getDate(); - const hours = date.getHours(); - const minutes = date.getMinutes(); - const seconds = date.getSeconds(); + const month = this.check(date.getMonth() + 1); + const day = this.check(date.getDate()); + const hours = this.check(date.getHours()); + const minutes = this.check(date.getMinutes()); + const seconds = this.check(date.getSeconds()); let dayCycle = date.getDay(); const dayCycleArray = ["日", "一", "二", "三", "四", "五", "六"]; for (let i = 0; i < 7; i++) { From a8738fcfb47d330670932acad45d87b3df81c359 Mon Sep 17 00:00:00 2001 From: qianming Date: Thu, 9 Jun 2022 16:27:37 +0800 Subject: [PATCH 27/29] update start.bat --- report-core/src/main/assembly/bin/start.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report-core/src/main/assembly/bin/start.bat b/report-core/src/main/assembly/bin/start.bat index 50c1804a..e0650a8a 100755 --- a/report-core/src/main/assembly/bin/start.bat +++ b/report-core/src/main/assembly/bin/start.bat @@ -38,5 +38,5 @@ IF "%JAVA_HOME%" == "" ( set JAVA_OPTS= -server -Xms1g -Xmx2g -Xmn256m -XX:PermSize=128m -Xss256k rem 正式启动 - %JAVA_HOME%\bin\java %JAVA_OPTS% -Xbootclasspath/a:%LIB_JARS% -jar -Dspring.config.location=%CONF_YML% %BIN_DIR%\lib\%BOOT_JAR% + "%JAVA_HOME%"\bin\java %JAVA_OPTS% -Xbootclasspath/a:%LIB_JARS% -jar -Dspring.config.location=%CONF_YML% %BIN_DIR%\lib\%BOOT_JAR% pause From a797577e17a9609f7da7cdba0cc3c08fcd720bc7 Mon Sep 17 00:00:00 2001 From: qianming Date: Fri, 10 Jun 2022 17:04:00 +0800 Subject: [PATCH 28/29] =?UTF-8?q?=E4=BC=98=E5=8C=96--=E4=B8=AD=E5=9B=BD?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE-=E6=B0=94=E6=B3=A1=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/configure/widget-airbubble-map.js | 10 +++++++- .../widget/map/widgetAirBubbleMap.vue | 24 +++++-------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js index 979c7da5..363a03ad 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js @@ -134,8 +134,16 @@ export const widgetAirbubbleMap = { ], }, { - name: '字体设置', + name: '地图设置', list: [ + { + type: 'el-switch', + label: '文字显示', + name: 'isShowMap', + required: false, + placeholder: '', + value: true + }, { type: 'el-input-number', label: '文字大小', diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue index e8d08a65..f16f75ae 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue @@ -215,24 +215,12 @@ export default { options: { //backgroundColor: '#0F1C3C', tooltip: { - show: true, - formatter: function(params) { - if (params.value.length > 1) { - return ( - "  " + - params.name + - "   " + - params.value[2] + - "  " - ); + trigger: 'item', + formatter: function (params) { + if (params.value.length >1 ) { + return params.data.name + "" + params.data.value[2]; } else { - return ( - "  " + - params.name + - "   " + - params.value + - "  " - ); + return params.name; } } }, @@ -472,7 +460,7 @@ export default { const label = this.options.series[0]["label"]; const normal = { position: "right", - show: true, + show: optionsSetup.isShowMap, color: optionsSetup.fontTextColor, fontSize: optionsSetup.fontTextSize, fontWeight: optionsSetup.fontTextWeight From 5d3993444e59e89b4549b3535939e018d2f4d80e Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 15 Jun 2022 09:15:23 +0800 Subject: [PATCH 29/29] =?UTF-8?q?doc=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/docs/guide/charts.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/docs/guide/charts.md b/doc/docs/guide/charts.md index 59e03751..a2f2b96d 100644 --- a/doc/docs/guide/charts.md +++ b/doc/docs/guide/charts.md @@ -148,7 +148,7 @@ ### 数据格式 -可以参考静态数据,目前路线地图仅能显示“市”级别,如果要显示其他级别,请参考源码自行修改
+可以参考静态数据,目前路线地图仅能显示“市”级别,注意地图数据名称要和地图底层数据名称保持一致,即完整的市名,可以看静态数据,如果和你提供的动态数据名称有差异,请参考源码自行修改
![img25](../picture/charts/img_25.png)
## 中国地图-气泡图 @@ -159,7 +159,7 @@ ### 数据格式 -可参考静态数据,目前气泡地图仅能显示“省”级别,如果要显示其他级别,请参考源码自行修改
+可参考静态数据,目前气泡地图仅能显示“省”级别,注意动态数据的名称要和地图底层数据名称保持一致,即完整的省名,可以看静态数据,如果和你提供的动态数据名称有差异,请参考源码自行修改
## 柱状堆叠图