From 2abbbef916a36814b9514ae050c89cad9552d0d1 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Thu, 11 Mar 2021 10:14:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/README.md | 4 +- jero-web/src/components/chart/BarMultid.vue | 4 +- .../src/components/chart/LineChartMultid.vue | 26 +++---- jero-web/src/components/chart/README.md | 32 ++++----- jero-web/src/components/page/GlobalFooter.vue | 7 +- jero-web/src/components/page/GlobalHeader.vue | 2 +- jero-web/src/utils/request.js | 2 +- .../src/views/{jeecg => jero}/ImagCropper.vue | 0 .../src/views/{jeecg => jero}/ImagPreview.vue | 0 .../src/views/{jeecg => jero}/ImgDragSort.vue | 0 .../src/views/{jeecg => jero}/ImgTurnPage.vue | 0 .../views/{jeecg => jero}/InterfaceTest.vue | 0 .../views/{jeecg => jero}/JVXETableDemo.vue | 4 +- .../{jeecg => jero}/JVxeDemo/JVxeDemo1.vue | 0 .../{jeecg => jero}/JVxeDemo/JVxeDemo2.vue | 2 +- .../JVxeDemo/demo/JSBCDemo.vue | 0 .../JVxeDemo/demo/PopupSubTable.vue | 0 .../JVxeDemo/demo/SocketReload.vue | 0 .../JVxeDemo/layout-demo/ErpTemplate.vue | 0 .../JVxeDemo/layout-demo/Index.vue | 0 .../JVxeDemo/layout-demo/Template1.vue | 0 .../JVxeDemo/layout-demo/Template2.vue | 0 .../JVxeDemo/layout-demo/Template3.vue | 0 .../JVxeDemo/layout-demo/Template4.vue | 0 .../JVxeDemo/layout-demo/Template5.vue | 0 .../views/{jeecg => jero}/JeecgDemoList.vue | 0 .../JeecgEditableTableExample.vue | 0 .../{jeecg => jero}/JeecgOrderMainList.vue | 0 .../JeecgOrderMainListForJEditableTable.vue | 0 .../views/{jeecg => jero}/JeecgPdfView.vue | 0 .../views/{jeecg => jero}/JeecgTreeTable.vue | 0 .../src/views/{jeecg => jero}/PrintDemo.vue | 0 .../views/{jeecg => jero}/RowspanTable.vue | 0 .../src/views/{jeecg => jero}/SelectDemo.vue | 2 +- .../src/views/{jeecg => jero}/SplitPanel.vue | 0 .../views/{jeecg => jero}/TableExpandeSub.vue | 2 +- .../src/views/{jeecg => jero}/TableTotal.vue | 0 .../src/views/{jeecg => jero}/helloworld.vue | 0 .../src/views/{jeecg => jero}/helloworld2.vue | 0 .../modules/JEditableTable/DefaultTable.vue | 0 .../modules/JEditableTable/ReadOnlyTable.vue | 0 .../modules/JEditableTable/ThreeLinkage.vue | 0 .../modules/JeecgDemoModal.vue | 0 .../modules/JeecgDemoTabsModal.vue | 0 .../modules/JeecgOrderMainModal.vue | 0 .../JeecgOrderModalForJEditableTable.vue | 0 .../modules/PdfPreviewModal.vue | 0 .../{jeecg => jero}/modules/SplitPanelA.vue | 0 .../{jeecg => jero}/modules/SplitPanelB.vue | 0 .../modules/SplitPanelModal.vue | 0 .../modules/SuperQueryModal.vue | 0 .../{jeecg => jero}/modules/VueCronModal.vue | 0 .../views/{jeecg => jero}/report/Analysis.vue | 0 .../report/ArchivesStatisticst.vue | 0 .../{jeecg => jero}/report/ViserChartDemo.vue | 0 .../tablist/JeroOrderCustomerList.vue} | 12 ++-- .../tablist/JeroOrderDMainList.vue} | 68 +++++++++---------- .../tablist/JeroOrderTicketList.vue} | 8 +-- .../tablist/form/JeroOrderCustomerModal.vue} | 2 +- .../tablist/form/JeroOrderDMainModal.vue} | 2 +- .../tablist/form/JeroOrderTicketModal.vue} | 2 +- ...rdLoginMixin.js => JeroThirdLoginMixin.js} | 2 +- jero-web/src/views/user/third/ThirdLogin.vue | 4 +- 63 files changed, 92 insertions(+), 95 deletions(-) rename jero-web/src/views/{jeecg => jero}/ImagCropper.vue (100%) rename jero-web/src/views/{jeecg => jero}/ImagPreview.vue (100%) rename jero-web/src/views/{jeecg => jero}/ImgDragSort.vue (100%) rename jero-web/src/views/{jeecg => jero}/ImgTurnPage.vue (100%) rename jero-web/src/views/{jeecg => jero}/InterfaceTest.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVXETableDemo.vue (80%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/JVxeDemo1.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/JVxeDemo2.vue (98%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/demo/JSBCDemo.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/demo/PopupSubTable.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/demo/SocketReload.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/layout-demo/ErpTemplate.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/layout-demo/Index.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/layout-demo/Template1.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/layout-demo/Template2.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/layout-demo/Template3.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/layout-demo/Template4.vue (100%) rename jero-web/src/views/{jeecg => jero}/JVxeDemo/layout-demo/Template5.vue (100%) rename jero-web/src/views/{jeecg => jero}/JeecgDemoList.vue (100%) rename jero-web/src/views/{jeecg => jero}/JeecgEditableTableExample.vue (100%) rename jero-web/src/views/{jeecg => jero}/JeecgOrderMainList.vue (100%) rename jero-web/src/views/{jeecg => jero}/JeecgOrderMainListForJEditableTable.vue (100%) rename jero-web/src/views/{jeecg => jero}/JeecgPdfView.vue (100%) rename jero-web/src/views/{jeecg => jero}/JeecgTreeTable.vue (100%) rename jero-web/src/views/{jeecg => jero}/PrintDemo.vue (100%) rename jero-web/src/views/{jeecg => jero}/RowspanTable.vue (100%) rename jero-web/src/views/{jeecg => jero}/SelectDemo.vue (99%) rename jero-web/src/views/{jeecg => jero}/SplitPanel.vue (100%) rename jero-web/src/views/{jeecg => jero}/TableExpandeSub.vue (98%) rename jero-web/src/views/{jeecg => jero}/TableTotal.vue (100%) rename jero-web/src/views/{jeecg => jero}/helloworld.vue (100%) rename jero-web/src/views/{jeecg => jero}/helloworld2.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/JEditableTable/DefaultTable.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/JEditableTable/ReadOnlyTable.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/JEditableTable/ThreeLinkage.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/JeecgDemoModal.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/JeecgDemoTabsModal.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/JeecgOrderMainModal.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/JeecgOrderModalForJEditableTable.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/PdfPreviewModal.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/SplitPanelA.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/SplitPanelB.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/SplitPanelModal.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/SuperQueryModal.vue (100%) rename jero-web/src/views/{jeecg => jero}/modules/VueCronModal.vue (100%) rename jero-web/src/views/{jeecg => jero}/report/Analysis.vue (100%) rename jero-web/src/views/{jeecg => jero}/report/ArchivesStatisticst.vue (100%) rename jero-web/src/views/{jeecg => jero}/report/ViserChartDemo.vue (100%) rename jero-web/src/views/{jeecg/tablist/JeecgOrderCustomerList.vue => jero/tablist/JeroOrderCustomerList.vue} (93%) rename jero-web/src/views/{jeecg/tablist/JeecgOrderDMainList.vue => jero/tablist/JeroOrderDMainList.vue} (77%) rename jero-web/src/views/{jeecg/tablist/JeecgOrderTicketList.vue => jero/tablist/JeroOrderTicketList.vue} (95%) rename jero-web/src/views/{jeecg/tablist/form/JeecgOrderCustomerModal.vue => jero/tablist/form/JeroOrderCustomerModal.vue} (99%) rename jero-web/src/views/{jeecg/tablist/form/JeecgOrderDMainModal.vue => jero/tablist/form/JeroOrderDMainModal.vue} (99%) rename jero-web/src/views/{jeecg/tablist/form/JeecgOrderTicketModal.vue => jero/tablist/form/JeroOrderTicketModal.vue} (99%) rename jero-web/src/views/user/third/{JeecgThirdLoginMixin.js => JeroThirdLoginMixin.js} (99%) diff --git a/jero-web/src/components/README.md b/jero-web/src/components/README.md index 1742c705..aea9f1c0 100644 --- a/jero-web/src/components/README.md +++ b/jero-web/src/components/README.md @@ -9,8 +9,8 @@ onEnd倒计时结束触发函数 ![输入图片说明](https://static.oschina.net/uploads/img/201904/12182046_mwqJ.png "在这里输入图片标题") ####5.dict包：数据字典专用，用法参考文件夹下readme文件 ####6.Ellipsis包：字符串截取组件,可以指定字符串的显示长度,并将全部内容显示到tip中,简单使用参考src\views\system\PermissionList.vue -####7.jeecg包：该包下自定义了很多列表/表单中用到的组件 参考包下readme文件 -####8.jeecgbiz包：该包下定义了一些业务相关的组件，比如选择用户弹框,根据部门选择用户等等 +####7.jero包：该包下自定义了很多列表/表单中用到的组件 参考包下readme文件 +####8.jerobiz包：该包下定义了一些业务相关的组件，比如选择用户弹框,根据部门选择用户等等 ####9.layouts+page包：系统页面布局相关组件，比如登陆进去之后页面顶部显示什么，底部显示什么，菜单点击触发多个tab的布局等等 一般情况不需要修改 ####10.menun包：菜单组件，俩个，一个折叠菜单一个正常显示的菜单 ####11.NumberInfo:数字信息显示组件 如下图 diff --git a/jero-web/src/components/chart/BarMultid.vue b/jero-web/src/components/chart/BarMultid.vue index 3e21e940..029a5d2c 100644 --- a/jero-web/src/components/chart/BarMultid.vue +++ b/jero-web/src/components/chart/BarMultid.vue @@ -25,8 +25,8 @@ dataSource: { type: Array, default: () => [ - { type: 'Jeecg', 'Jan.': 18.9, 'Feb.': 28.8, 'Mar.': 39.3, 'Apr.': 81.4, 'May': 47, 'Jun.': 20.3, 'Jul.': 24, 'Aug.': 35.6 }, - { type: 'Jeebt', 'Jan.': 12.4, 'Feb.': 23.2, 'Mar.': 34.5, 'Apr.': 99.7, 'May': 52.6, 'Jun.': 35.5, 'Jul.': 37.4, 'Aug.': 42.4 } + { type: 'JeroOne', 'Jan.': 18.9, 'Feb.': 28.8, 'Mar.': 39.3, 'Apr.': 81.4, 'May': 47, 'Jun.': 20.3, 'Jul.': 24, 'Aug.': 35.6 }, + { type: 'JeroTwo', 'Jan.': 12.4, 'Feb.': 23.2, 'Mar.': 34.5, 'Apr.': 99.7, 'May': 52.6, 'Jun.': 35.5, 'Jul.': 37.4, 'Aug.': 42.4 } ] }, fields: { diff --git a/jero-web/src/components/chart/LineChartMultid.vue b/jero-web/src/components/chart/LineChartMultid.vue index 68a85345..90698f44 100644 --- a/jero-web/src/components/chart/LineChartMultid.vue +++ b/jero-web/src/components/chart/LineChartMultid.vue @@ -26,23 +26,23 @@ dataSource: { type: Array, default: () => [ - { type: 'Jan', jeecg: 7.0, jeebt: 3.9 }, - { type: 'Feb', jeecg: 6.9, jeebt: 4.2 }, - { type: 'Mar', jeecg: 9.5, jeebt: 5.7 }, - { type: 'Apr', jeecg: 14.5, jeebt: 8.5 }, - { type: 'May', jeecg: 18.4, jeebt: 11.9 }, - { type: 'Jun', jeecg: 21.5, jeebt: 15.2 }, - { type: 'Jul', jeecg: 25.2, jeebt: 17.0 }, - { type: 'Aug', jeecg: 26.5, jeebt: 16.6 }, - { type: 'Sep', jeecg: 23.3, jeebt: 14.2 }, - { type: 'Oct', jeecg: 18.3, jeebt: 10.3 }, - { type: 'Nov', jeecg: 13.9, jeebt: 6.6 }, - { type: 'Dec', jeecg: 9.6, jeebt: 4.8 } + { type: 'Jan', jeroOne: 7.0, jeroTwo: 3.9 }, + { type: 'Feb', jeroOne: 6.9, jeroTwo: 4.2 }, + { type: 'Mar', jeroOne: 9.5, jeroTwo: 5.7 }, + { type: 'Apr', jeroOne: 14.5, jeroTwo: 8.5 }, + { type: 'May', jeroOne: 18.4, jeroTwo: 11.9 }, + { type: 'Jun', jeroOne: 21.5, jeroTwo: 15.2 }, + { type: 'Jul', jeroOne: 25.2, jeroTwo: 17.0 }, + { type: 'Aug', jeroOne: 26.5, jeroTwo: 16.6 }, + { type: 'Sep', jeroOne: 23.3, jeroTwo: 14.2 }, + { type: 'Oct', jeroOne: 18.3, jeroTwo: 10.3 }, + { type: 'Nov', jeroOne: 13.9, jeroTwo: 6.6 }, + { type: 'Dec', jeroOne: 9.6, jeroTwo: 4.8 } ] }, fields: { type: Array, - default: () => ['jeecg', 'jeebt'] + default: () => ['jeroOne', 'jeroTwo'] }, // 别名，需要的格式：[{field:'name',alias:'姓名'}, {field:'sex',alias:'性别'}] aliases:{ diff --git a/jero-web/src/components/chart/README.md b/jero-web/src/components/chart/README.md index a606c1fe..9aacf09d 100644 --- a/jero-web/src/components/chart/README.md +++ b/jero-web/src/components/chart/README.md @@ -102,7 +102,7 @@ import BarMultid from '@/components/chart/BarMultid' ```json [ { - "type": "Jeecg", // 列名 + "type": "jero", // 列名 "Jan.": 18.9, "Feb.": 28.8, "Mar.": 39.3, @@ -113,7 +113,7 @@ import BarMultid from '@/components/chart/BarMultid' "Aug.": 35.6 }, { - "type": "Jeebt", + "type": "jeroTwo", "Jan.": 12.4, "Feb.": 23.2, "Mar.": 34.5, @@ -219,7 +219,7 @@ import LineChartMultid from '@/components/chart/LineChartMultid' ##### fields 示例 ```json -["jero", "jeebt"] +["jero", "jeroTwo"] ``` ##### dataSource 示例 @@ -228,20 +228,20 @@ import LineChartMultid from '@/components/chart/LineChartMultid' [ { "type": "Jan", // 列名 - "jeecg": 7, - "jeebt": 3.9 + "jero": 7, + "jeroTwo": 3.9 }, - { "type": "Feb", "jeecg": 6.9, "jeebt": 4.2 }, - { "type": "Mar", "jeecg": 9.5, "jeebt": 5.7 }, - { "type": "Apr", "jeecg": 14.5, "jeebt": 8.5 }, - { "type": "May", "jeecg": 18.4, "jeebt": 11.9 }, - { "type": "Jun", "jeecg": 21.5, "jeebt": 15.2 }, - { "type": "Jul", "jeecg": 25.2, "jeebt": 17 }, - { "type": "Aug", "jeecg": 26.5, "jeebt": 16.6 }, - { "type": "Sep", "jeecg": 23.3, "jeebt": 14.2 }, - { "type": "Oct", "jeecg": 18.3, "jeebt": 10.3 }, - { "type": "Nov", "jeecg": 13.9, "jeebt": 6.6 }, - { "type": "Dec", "jeecg": 9.6, "jeebt": 4.8 } + { "type": "Feb", "jero": 6.9, "jeroTwo": 4.2 }, + { "type": "Mar", "jero": 9.5, "jeroTwo": 5.7 }, + { "type": "Apr", "jero": 14.5, "jeroTwo": 8.5 }, + { "type": "May", "jero": 18.4, "jeroTwo": 11.9 }, + { "type": "Jun", "jero": 21.5, "jeroTwo": 15.2 }, + { "type": "Jul", "jero": 25.2, "jeroTwo": 17 }, + { "type": "Aug", "jero": 26.5, "jeroTwo": 16.6 }, + { "type": "Sep", "jero": 23.3, "jeroTwo": 14.2 }, + { "type": "Oct", "jero": 18.3, "jeroTwo": 10.3 }, + { "type": "Nov", "jero": 13.9, "jeroTwo": 6.6 }, + { "type": "Dec", "jero": 9.6, "jeroTwo": 4.8 } ] ``` diff --git a/jero-web/src/components/page/GlobalFooter.vue b/jero-web/src/components/page/GlobalFooter.vue index 8f4d09e6..d715bbff 100644 --- a/jero-web/src/components/page/GlobalFooter.vue +++ b/jero-web/src/components/page/GlobalFooter.vue @@ -1,17 +1,14 @@ diff --git a/jero-web/src/components/page/GlobalHeader.vue b/jero-web/src/components/page/GlobalHeader.vue index 55986ec8..6146be07 100644 --- a/jero-web/src/components/page/GlobalHeader.vue +++ b/jero-web/src/components/page/GlobalHeader.vue @@ -17,7 +17,7 @@ :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggle"/> - 欢迎进入 Jeecg-Boot 企业级快速开发平台 + 欢迎进入 Jero-Boot 平台 Jeecg-Boot diff --git a/jero-web/src/utils/request.js b/jero-web/src/utils/request.js index bdfc4201..18a5ece7 100644 --- a/jero-web/src/utils/request.js +++ b/jero-web/src/utils/request.js @@ -11,7 +11,7 @@ import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types" * 则映射后端域名，通过 vue.config.js * @type {*|string} */ -let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot"; +let apiBaseUrl = window._CONFIG['domianURL'] || "/jero-boot"; //console.log("apiBaseUrl= ",apiBaseUrl) // 创建 axios 实例 const service = axios.create({ diff --git a/jero-web/src/views/jeecg/ImagCropper.vue b/jero-web/src/views/jero/ImagCropper.vue similarity index 100% rename from jero-web/src/views/jeecg/ImagCropper.vue rename to jero-web/src/views/jero/ImagCropper.vue diff --git a/jero-web/src/views/jeecg/ImagPreview.vue b/jero-web/src/views/jero/ImagPreview.vue similarity index 100% rename from jero-web/src/views/jeecg/ImagPreview.vue rename to jero-web/src/views/jero/ImagPreview.vue diff --git a/jero-web/src/views/jeecg/ImgDragSort.vue b/jero-web/src/views/jero/ImgDragSort.vue similarity index 100% rename from jero-web/src/views/jeecg/ImgDragSort.vue rename to jero-web/src/views/jero/ImgDragSort.vue diff --git a/jero-web/src/views/jeecg/ImgTurnPage.vue b/jero-web/src/views/jero/ImgTurnPage.vue similarity index 100% rename from jero-web/src/views/jeecg/ImgTurnPage.vue rename to jero-web/src/views/jero/ImgTurnPage.vue diff --git a/jero-web/src/views/jeecg/InterfaceTest.vue b/jero-web/src/views/jero/InterfaceTest.vue similarity index 100% rename from jero-web/src/views/jeecg/InterfaceTest.vue rename to jero-web/src/views/jero/InterfaceTest.vue diff --git a/jero-web/src/views/jeecg/JVXETableDemo.vue b/jero-web/src/views/jero/JVXETableDemo.vue similarity index 80% rename from jero-web/src/views/jeecg/JVXETableDemo.vue rename to jero-web/src/views/jero/JVXETableDemo.vue index 7895b518..89783737 100644 --- a/jero-web/src/views/jeecg/JVXETableDemo.vue +++ b/jero-web/src/views/jero/JVXETableDemo.vue @@ -15,8 +15,8 @@