diff --git a/jero-web/src/components/_util/Area.js b/jero-web/src/components/_util/Area.js index 020682e9..a68675e6 100644 --- a/jero-web/src/components/_util/Area.js +++ b/jero-web/src/components/_util/Area.js @@ -1,5 +1,4 @@ -import { pcaa } from 'area-data' - +import Vue from 'vue' /** * 省市区 */ @@ -78,6 +77,7 @@ export default class Area { if(item.pid != '86'){ this.getAreaBycode(item.pid, arr, --index) } + } } } diff --git a/jero-web/src/components/jero/index.js b/jero-web/src/components/jero/index.js index 7a28c234..386b842c 100644 --- a/jero-web/src/components/jero/index.js +++ b/jero-web/src/components/jero/index.js @@ -26,7 +26,7 @@ import JSlider from './JSlider.vue' import JSwitch from './JSwitch.vue' import JTime from './JTime.vue' import JTreeTable from './JTreeTable.vue' -import JEasyCron from "@/components/jeecg/JEasyCron" +import JEasyCron from "@/components/jero/JEasyCron" //jerobiz import JSelectDepart from '../jerobiz/JSelectDepart.vue' import JSelectMultiUser from '../jerobiz/JSelectMultiUser.vue' diff --git a/jero-web/src/components/onlineForm/onlineForm.js b/jero-web/src/components/onlineForm/onlineForm.js index ea22a0d4..7f771c5a 100644 --- a/jero-web/src/components/onlineForm/onlineForm.js +++ b/jero-web/src/components/onlineForm/onlineForm.js @@ -13140,7 +13140,7 @@ VUE_APP_API_BASE_URL: "https://bootapi.jeecg.com", VUE_APP_CAS_BASE_URL: "http://localhost:8888/cas", VUE_APP_ONLINE_BASE_URL: "http://fileview.jeecg.com/onlinePreview", - VUE_APP_PLATFORM_NAME: "JeecgBoot 企业级快速开发平台", + VUE_APP_PLATFORM_NAME: "JeroBoot 企业级快速开发平台", VUE_APP_SSO: "false", BASE_URL: "/" }) diff --git a/jero-web/src/views/demo/ImgDragSort.vue b/jero-web/src/views/demo/ImgDragSort.vue index 43b0a3fb..de78279b 100644 --- a/jero-web/src/views/demo/ImgDragSort.vue +++ b/jero-web/src/views/demo/ImgDragSort.vue @@ -42,11 +42,11 @@ spinning: false, //数据集 dataSource: [ - {id:'000',sort: 0,filePath: 'https://static.jeecg.com/upload/test/1_1588149743473.jpg'}, - {id:'111',sort: 1,filePath: 'https://static.jeecg.com/upload/test/u27356337152749454924fm27gp0_1588149731821.jpg'}, - {id:'222',sort: 2,filePath: 'https://static.jeecg.com/upload/test/u24454681402491956848fm27gp0_1588149712663.jpg'}, - {id:'333',sort: 3,filePath: 'https://static.jeecg.com/temp/国炬软件logo_1606575029126.png'}, - {id:'444',sort: 4,filePath: 'https://static.jeecg.com/upload/test/u8891206113801177793fm27gp0_1588149704459.jpg'} + {id:'000',sort: 0,filePath: 'https://static.jero.com/upload/test/1_1588149743473.jpg'}, + {id:'111',sort: 1,filePath: 'https://static.jero.com/upload/test/u27356337152749454924fm27gp0_1588149731821.jpg'}, + {id:'222',sort: 2,filePath: 'https://static.jero.com/upload/test/u24454681402491956848fm27gp0_1588149712663.jpg'}, + {id:'333',sort: 3,filePath: 'https://static.jero.com/temp/国炬软件logo_1606575029126.png'}, + {id:'444',sort: 4,filePath: 'https://static.jero.com/upload/test/u8891206113801177793fm27gp0_1588149704459.jpg'} ], oldDateSource:[], newDateSource:[], diff --git a/jero-web/src/views/demo/ImgTurnPage.vue b/jero-web/src/views/demo/ImgTurnPage.vue index 02e2955d..258e095d 100644 --- a/jero-web/src/views/demo/ImgTurnPage.vue +++ b/jero-web/src/views/demo/ImgTurnPage.vue @@ -50,11 +50,11 @@ children: [{ title: '1页', key: '0-0-0', - imgUrl:'https://static.jeecg.com/upload/test/1_1588149743473.jpg' + imgUrl:'https://static.jero.com/upload/test/1_1588149743473.jpg' }, { title: '2页', key: '0-0-1', - imgUrl:'https://static.jeecg.com/upload/test/u27356337152749454924fm27gp0_1588149731821.jpg' + imgUrl:'https://static.jero.com/upload/test/u27356337152749454924fm27gp0_1588149731821.jpg' }] },{ title: '第二页', @@ -62,11 +62,11 @@ children: [{ title: '1页', key: '0-1-0', - imgUrl:'https://static.jeecg.com/upload/test/u24454681402491956848fm27gp0_1588149712663.jpg' + imgUrl:'https://static.jero.com/upload/test/u24454681402491956848fm27gp0_1588149712663.jpg' }, { title: '2页', key: '0-1-1', - imgUrl:'https://static.jeecg.com/upload/test/u8891206113801177793fm27gp0_1588149704459.jpg' + imgUrl:'https://static.jero.com/upload/test/u8891206113801177793fm27gp0_1588149704459.jpg' }] },{ title: '第三页',