From 698a663e65c95bb18c17e2f4952793c9aa1bdc0b Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Tue, 12 Oct 2021 09:41:09 +0800
Subject: [PATCH 1/9] update

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9de3e173..c2fbb644 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ http://serverip:9095
 
 源码编译部署参考文档：https://report.anji-plus.com/report-doc/guide/quicklySource.html <br>
 发行版部署参考文档：https://report.anji-plus.com/report-doc/guide/quicklyDistribution.html <br>
-前后端分类部署参考文档：https://report.anji-plus.com/report-doc/guide/quicklySeparate.html <br>
+前后端分离部署参考文档：https://report.anji-plus.com/report-doc/guide/quicklySeparate.html <br>
 
 ## 操作手册
 

From ef04ff2dc94cc138757eadd3ed377a0ab18a4ea1 Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Wed, 13 Oct 2021 09:47:05 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=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/question.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/docs/guide/question.md b/doc/docs/guide/question.md
index 59a9718b..d55be121 100644
--- a/doc/docs/guide/question.md
+++ b/doc/docs/guide/question.md
@@ -32,6 +32,9 @@
   https://my.oschina.net/u/4517014/blog/5270828 <br>
   **注**：http数据源未来会挪到数据集那边 <br>
 
+- 执行编译脚本（build.sh）报错提示“*** No such file or directory” <br>
+可能原因1：Node.js版本不是V14，导致前端编译失败 <br>
+可能原因2：Mvn版本过低，导致后端编译失败 <br>
 
 
 

From 3deba9de1ae11ed459af5a94eac78d8d390932bb Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Fri, 15 Oct 2021 13:11:28 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=B0=94=E6=B3=A1=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=8C=97=E4=BA=AC=E5=B8=82=E5=90=8D=E7=A7=B0=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue b/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue
index fb4e5718..d4ee1a1d 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue
@@ -13,7 +13,7 @@ var geoCoordMap = {
   '黑龙江': [127.9688, 45.368],
   '内蒙古': [110.3467, 41.4899],
   "吉林": [125.8154, 44.2584],
-  '北京市': [116.4551, 40.2539],
+  '北京': [116.4551, 40.2539],
   "辽宁": [123.1238, 42.1216],
   "河北": [114.4995, 38.1006],
   "天津": [117.4219, 39.4189],

From 4689f336cebe71099c8ae0670384ad5272a59673 Mon Sep 17 00:00:00 2001
From: qianlishi <1432731663@qq.com>
Date: Mon, 18 Oct 2021 09:32:40 +0800
Subject: [PATCH 4/9] update

---
 report-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report-ui/package.json b/report-ui/package.json
index fcb3473e..efd67958 100644
--- a/report-ui/package.json
+++ b/report-ui/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@ckeditor/ckeditor5-build-decoupled-document": "^23.1.0",
-    "@smallwei/avue": "^2.8.14",
+    "@smallwei/avue": "^2.8.23",
     "axios": "0.18.0",
     "chokidar": "^3.5.2",
     "codemirror": "^5.58.1",

From 6a582f9b3458d21051d8606c1a264b0696b6c3fc Mon Sep 17 00:00:00 2001
From: smallwei <1634566606@qq.com>
Date: Mon, 18 Oct 2021 07:17:16 +0000
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E7=BC=A9=E6=94=BE?=
 =?UTF-8?q?=E5=BC=95=E5=8F=91=E7=9A=84=E7=A7=BB=E5=8A=A8=E9=94=99=E4=BD=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report-ui/src/views/report/bigscreen/designer/index.vue       | 4 ++++
 .../src/views/report/bigscreen/designer/widget/widget.vue     | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue
index eb548dc4..66efcf2e 100644
--- a/report-ui/src/views/report/bigscreen/designer/index.vue
+++ b/report-ui/src/views/report/bigscreen/designer/index.vue
@@ -212,6 +212,7 @@
               :key="index"
               v-model="widget.value"
               :index="index"
+              :step="step"
               :type="widget.type"
               :bigscreen="{ bigscreenWidth, bigscreenHeight }"
               @onActivated="setOptionsOnClickWidget"
@@ -373,6 +374,9 @@ export default {
     };
   },
   computed: {
+    step () {
+      return Number(100 / (this.bigscreenScaleInWorkbench * 100))
+    },
     headers() {
       return {
         Authorization: getToken() // 直接从本地获取token就行
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
index 1f587d61..a3486f04 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
@@ -6,6 +6,7 @@
  !-->
 <template>
   <avue-draggable
+    :step="step"
     :width="widgetsWidth"
     :height="widgetsHeight"
     :left="widgetsLeft"
@@ -89,7 +90,8 @@ export default {
     value: {
       type: [Object],
       default: () => {}
-    }
+    }，
+    step: Number
   },
   data() {
     return {

From 97885c8962215e1413f9d9d9e1acd9c2272fb336 Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Mon, 18 Oct 2021 15:41:13 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report-ui/src/views/report/bigscreen/designer/widget/widget.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
index a3486f04..ba4b3552 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widget.vue
@@ -90,7 +90,7 @@ export default {
     value: {
       type: [Object],
       default: () => {}
-    }，
+    },
     step: Number
   },
   data() {

From 4f7ca904f0735c83daa58f6058ea27f5f8e91668 Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Thu, 21 Oct 2021 13:39:55 +0800
Subject: [PATCH 7/9] update

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c2fbb644..ef9ac057 100644
--- a/README.md
+++ b/README.md
@@ -76,14 +76,14 @@
 ### 前端
 
 - [npm](https://www.npmjs.com/)：node.js的包管理工具，用于统一管理我们前端项目中需要用到的包、插件、工具、命令等，便于开发和维护。
-- [webpack](https://webpack.docschina.org/)：用于现代 JavaScript 应用程序的_静态模块打包工具
-- [ES6](https://es6.ruanyifeng.com/)：Javascript的新版本，ECMAScript6的简称。利用ES6我们可以简化我们的JS代码，同时利用其提供的强大功能来快速实现JS逻辑。
+- [webpack](https://webpack.docschina.org/)：用于现代 JavaScript 应用程序的静态模块打包工具。
+- [ES6](https://es6.ruanyifeng.com/)：JavaScript的新版本，ECMAScript6的简称。利用ES6我们可以简化我们的JS代码，同时利用其提供的强大功能来快速实现JS逻辑。
 - [vue-cli](https://cli.vuejs.org/)：Vue的脚手架工具，用于自动生成Vue项目的目录及文件。
 - [vue-router](https://router.vuejs.org/)： Vue提供的前端路由工具，利用其我们实现页面的路由控制，局部刷新及按需加载，构建单页应用，实现前后端分离。
 - [element-ui](https://element.eleme.cn/#/zh-CN)：基于MVVM框架Vue开源出来的一套前端ui组件。
-- [avue](https://www.avuejs.com/): 用该组件包裹后可以变成拖拽组件,采用相对于父类绝对定位;用键盘的上下左右也可以控制移动
-- [vue-echarts](https://www.npmjs.com/package/vue-echarts/): vue-echarts是封装后的vue插件,基于 ECharts v4.0.1+ 开发
-- [vue-superslide](https://www.npmjs.com/package/vue-super-slider/): Vue-SuperSlide(Github) 是 SuperSlide 的 Vue 封装版本
+- [avue](https://www.avuejs.com/): 用该组件包裹后可以变成拖拽组件，采用相对于父类绝对定位，用键盘的上下左右也可以控制移动。
+- [vue-echarts](https://www.npmjs.com/package/vue-echarts/): vue-echarts是封装后的vue插件，基于 ECharts v4.0.1+ 开发。
+- [vue-superslide](https://www.npmjs.com/package/vue-super-slider/): Vue-SuperSlide(Github) 是 SuperSlide 的 Vue 封装版本。
 - [vuedraggable](https://github.com/SortableJS/Vue.Draggable/): 是一款基于Sortable.js实现的vue拖拽插件。
 - [luckysheet](https://gitee.com/mengshukeji/Luckysheet): Luckysheet ，一款纯前端类似excel的在线表格，功能强大、配置简单、完全开源。
 

From 72ca63ddf39cdd317876d28d22dfb42036c32445 Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Thu, 21 Oct 2021 13:56:26 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=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/question.md | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/doc/docs/guide/question.md b/doc/docs/guide/question.md
index d55be121..14004cca 100644
--- a/doc/docs/guide/question.md
+++ b/doc/docs/guide/question.md
@@ -2,7 +2,7 @@
   ![img.png](../picture/qusetion/img.png) <br>
   请使用Maven Package进行打包 <br>
 
--- 版本问题：[开发环境参考](https://report.anji-plus.com/report-doc/guide/quicklyDevelop.html)
+### 版本问题：[开发环境参考](https://report.anji-plus.com/report-doc/guide/quicklyDevelop.html)
 
 - 底层数据库为Mysql8.0+时，flyway执行SQL报错<br>
 - Node.js是V16版本时 npm install失败 <br>
@@ -17,12 +17,11 @@
 
 - 部署完进入系统，点击预览大屏，大屏提示：**执行sql失败** <br>
   ![img](../picture/qusetion/img_3.png) <br>
-  请先重置数据源的mysql连接，修改mysql的账号密码。<br>
+  请先重置mysql数据源，修改mysql数据源的账号密码。<br>
 
 - flyway执行报错1.0.10sql失败 <br>
   错误提示：Caused by: org.flywaydb.core.api.FlywayException: Validate failed: Detected failed <br>
   migration to version 1.0.10 (create report share) <br>
-  **注：0.93发行版及之后使用Report的小伙伴不用担心会出现此问题** <br>
   请参考此Issue解决此问题：https://gitee.com/anji-plus/report/issues/I47JNE <br>
 
 - 禁用flyway及切换底层数据库方案 <br>
@@ -32,9 +31,24 @@
   https://my.oschina.net/u/4517014/blog/5270828 <br>
   **注**：http数据源未来会挪到数据集那边 <br>
 
-- 执行编译脚本（build.sh）报错提示“*** No such file or directory” <br>
-可能原因1：Node.js版本不是V14，导致前端编译失败 <br>
-可能原因2：Mvn版本过低，导致后端编译失败 <br>
+### 执行源码编译脚本（build.sh）报错
+
+- 提示：“*** report-ui/dist/* *** No such file or directory” <br>
+  前端编译失败。<br>
+  99%的原因是Node.js版本过高（高于14），导致前端编译失败，Nodejs在编译执行初始化时会去下载一些依赖，如果依赖下载不来，也会导致失败。<br>
+  剩下极少数情况可能是你编译的linux系统问题。<br>
+
+- 提示：“report-core/target/aj-report-*.zip *** No such file or directory” <br>
+  后端编译失败。<br>
+  可能原因有：Mvn版本过低/过高，导致后端编译失败 <br>
+
+- 使用eclipse进行源码编译时失败 <br>
+  失败的提示有很多，这里建议换成IDEA  <br>
+
+- 使用IDEA进行源码编译时提示：“*** openjdk-***” <br>
+  请使用jdk1.8
+
+
 
 
 

From 9231bfe5085a030cbe4aa915defb1195dfae2c25 Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Thu, 21 Oct 2021 14:01:09 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=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/question.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/docs/guide/question.md b/doc/docs/guide/question.md
index 14004cca..fc1ebdd1 100644
--- a/doc/docs/guide/question.md
+++ b/doc/docs/guide/question.md
@@ -15,7 +15,7 @@
 
 - 浏览器兼容性 当前未对部分浏览器做兼容性适配，推荐使用谷歌浏览器进行访问。<br>
 
-- 部署完进入系统，点击预览大屏，大屏提示：**执行sql失败** <br>
+- 部署完进入系统，点击预览大屏，大屏提示：“执行sql失败“ <br>
   ![img](../picture/qusetion/img_3.png) <br>
   请先重置mysql数据源，修改mysql数据源的账号密码。<br>