diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml index 12df13f..89b5afa 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml @@ -2,7 +2,7 @@ server: tomcat: uri-encoding: UTF-8 #tomcat编码 - port: 30000 #tomcat端口 + port: 50000 #tomcat端口 spring: devtools: #spring开发者工具模块 @@ -21,7 +21,7 @@ spring: port: 3309 username: root password: linus,.123 - db-name: jnpf_ningxia + db-name: ningxia_pro db-schema: #金仓达梦选填 prepare-url: #自定义url diff --git a/jnpf-java-boot/jnpf-web/README.md b/jnpf-java-boot/jnpf-web/README.md index b4c939f..c8ff17d 100644 --- a/jnpf-java-boot/jnpf-web/README.md +++ b/jnpf-java-boot/jnpf-web/README.md @@ -108,7 +108,7 @@ npm run build ```bash # 修改网站标题(第11行) -const name = defaultSettings.title || 'JNPF快速开发平台' +const name = defaultSettings.title || '西夏聚宝商户端' # 修改本地运行端口(第18行) const port = process.env.port || process.env.npm_config_port || 3000 diff --git a/jnpf-java-boot/jnpf-web/package.json b/jnpf-java-boot/jnpf-web/package.json index 7c8851c..09a8ad7 100644 --- a/jnpf-java-boot/jnpf-web/package.json +++ b/jnpf-java-boot/jnpf-web/package.json @@ -1,8 +1,8 @@ { "name": "jnpf-web", "version": "3.4.7", - "description": "JNPF快速开发平台", - "author": "JNPF快速开发平台", + "description": "西夏聚宝商户端", + "author": "西夏聚宝商户端", "license": "MIT", "scripts": { "dev": "vue-cli-service serve --open", diff --git a/jnpf-java-boot/jnpf-web/src/components/PrintBrowse/printMinxin.js b/jnpf-java-boot/jnpf-web/src/components/PrintBrowse/printMinxin.js index d7645c5..60bce93 100644 --- a/jnpf-java-boot/jnpf-web/src/components/PrintBrowse/printMinxin.js +++ b/jnpf-java-boot/jnpf-web/src/components/PrintBrowse/printMinxin.js @@ -541,7 +541,7 @@ const printOptionApi = { }).then((res) => { }); }; - document.title = "JNPF快速开发平台"; + document.title = "西夏聚宝商户端"; iframe.contentWindow.print(); document.title = oldTitle; setTimeout(() => { diff --git a/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/RightComponents/chat/Chart.vue b/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/RightComponents/chat/Chart.vue index 54edcab..362ed4b 100644 --- a/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/RightComponents/chat/Chart.vue +++ b/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/RightComponents/chat/Chart.vue @@ -712,11 +712,11 @@ export default { }, textChange() { this.activeData.option.defaultValue = '' - if (this.activeData.dataType == 'static') this.activeData.option.defaultValue = 'JNPF快速开发平台' + if (this.activeData.dataType == 'static') this.activeData.option.defaultValue = '西夏聚宝商户端' }, dataTypeChange() { this.activeData.option.defaultValue = '' - if (this.activeData.dataType == 'static') this.activeData.option.defaultValue = 'JNPF快速开发平台' + if (this.activeData.dataType == 'static') this.activeData.option.defaultValue = '西夏聚宝商户端' this.activeData.propsApi = '' this.activeData.propsName = '' }, diff --git a/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/components/config.js b/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/components/config.js index e917e5d..ad07387 100644 --- a/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/components/config.js +++ b/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/components/config.js @@ -568,7 +568,7 @@ export const basicComponents = [{ ], appDefaultValue: [ { - fullName: "JNPF快速开发", + fullName: "西夏聚宝商户端", moduleId: "", linkType: '2', urlAddress: 'https://www.jnpfsoft.com/', @@ -872,7 +872,7 @@ export const basicComponents = [{ option: { styleType: 2, defaultValue: "", - textDefaultValue: "JNPF快速开发平台", + textDefaultValue: "西夏聚宝商户端", textFontSize: 14, textFontColor: '#fff', textFontWeight: false, @@ -1615,7 +1615,7 @@ export const chartComponents = [{ seriesCenterTop: 50, //右边距 seriesItemStyleOpacity: 1, //散点透明度 seriesType: 'effectScatter', //散点类型 - seriesPointSize: 20, //热力图点的大小 + seriesPointSize: 20, //热力图点的大小 seriesBlurSize: 20, //热力图点的模糊大小 seriesMaxOpacity: 1, //热力图最大透明度 showNumber: undefined, //数据显示数量 @@ -1633,9 +1633,9 @@ export const chartComponents = [{ barTitleTextStyleFontSize: '14', barTitleTextStyleFontWeight: false, barTitleTextStyleColor: "#303133", - berGridTop: 35, //顶边距 - berGridRight: 10, //右边距 - berGridBottom: 180, //底边距 + berGridTop: 35, //顶边距 + berGridRight: 10, //右边距 + berGridBottom: 180, //底边距 updateMapType: '' }, refresh: { diff --git a/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/components/index.vue b/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/components/index.vue index b62a102..5bf8940 100644 --- a/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/components/index.vue +++ b/jnpf-java-boot/jnpf-web/src/components/VisualPortal/PortalDesign/components/index.vue @@ -314,7 +314,7 @@ export default { }, getDefaultValue(row) { const jnpfKey = row.jnpfKey - if (jnpfKey == 'text') return "JNPF快速开发平台" + if (jnpfKey == 'text') return "西夏聚宝商户端" if (jnpfKey == 'image') return "https://app.cdn.jnpfsoft.com/image/3.2/banner1.png" if (jnpfKey == 'video') return "https://cdn.jnpfsoft.com/2022/video/index_video.mp4" if (jnpfKey == 'barChart' || jnpfKey == 'lineChart' || jnpfKey == 'pieChart') return chartData.baseBarData diff --git a/jnpf-java-boot/jnpf-web/src/settings.js b/jnpf-java-boot/jnpf-web/src/settings.js index c252e90..cbbe5e8 100644 --- a/jnpf-java-boot/jnpf-web/src/settings.js +++ b/jnpf-java-boot/jnpf-web/src/settings.js @@ -1,5 +1,5 @@ module.exports = { - title: 'JNPF快速开发平台', + title: '西夏聚宝商户端', /** * @type {boolean} true | false diff --git a/jnpf-java-boot/jnpf-web/src/utils/apiUrl.js b/jnpf-java-boot/jnpf-web/src/utils/apiUrl.js index 0156cec..37f0dcf 100644 --- a/jnpf-java-boot/jnpf-web/src/utils/apiUrl.js +++ b/jnpf-java-boot/jnpf-web/src/utils/apiUrl.js @@ -8,7 +8,7 @@ */ module.exports = { // 开发环境接口配置 - APIURl: 'http://127.0.0.1:30000' + APIURl: 'http://127.0.0.1:50000' // 测试环境接口配置 // APIURl: 'http://222.71.165.187:50000' } \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/utils/get-page-title.js b/jnpf-java-boot/jnpf-web/src/utils/get-page-title.js index adcc7b7..0084d67 100644 --- a/jnpf-java-boot/jnpf-web/src/utils/get-page-title.js +++ b/jnpf-java-boot/jnpf-web/src/utils/get-page-title.js @@ -3,7 +3,7 @@ import i18n from '@/lang' import { getLanguage } from '@/lang/index' import store from '@/store' export default function getPageTitle(key, fullName) { - const title = store.getters.sysConfig.title || "JNPF快速开发平台" + const title = store.getters.sysConfig.title || "西夏聚宝商户端" const realTitle = getLanguage() === 'en' ? title : getLanguage() === 'zhtw' ? title : title const hasKey = i18n.te(`route.${key}`) if (hasKey) { diff --git a/jnpf-java-boot/jnpf-web/src/views/dashboard/admin/index.vue b/jnpf-java-boot/jnpf-web/src/views/dashboard/admin/index.vue index 9da3f26..892201d 100644 --- a/jnpf-java-boot/jnpf-web/src/views/dashboard/admin/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/dashboard/admin/index.vue @@ -155,7 +155,7 @@ export default { opinionData: ["3", "2", "4", "4", "5"], massageList: [ { title: '【通知】中秋国庆双节放假通知', listDate: '2020-09-19' }, - { title: '【公告】你好朋友,感谢使用 JNPF快速开发平台新版本', listDate: '2020-09-18' }, + { title: '【公告】你好朋友,感谢使用 西夏聚宝商户端新版本', listDate: '2020-09-18' }, { title: '【通知】月饼发放通知,请各部门主管到行政部领取', listDate: '2020-09-17' }, { title: '【公告】本季度销售之星名单公示', listDate: '2020-09-16' }, { title: '【通知】公司上班时间调整通知,下月执行', listDate: '2020-09-15' }, diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/documentPreview/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/documentPreview/index.vue index a6b74b4..920705e 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/documentPreview/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/documentPreview/index.vue @@ -27,7 +27,7 @@
-
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/graphDemo/highchartsArea/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/graphDemo/highchartsArea/index.vue index 316d16f..45b0324 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/graphDemo/highchartsArea/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/graphDemo/highchartsArea/index.vue @@ -1,6 +1,6 @@