From b40b28adddaf32538f6550cbcea1ac24f0c0ac0d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 18 Jun 2022 17:20:11 +0800 Subject: [PATCH 01/27] =?UTF-8?q?TODO=E9=83=A8=E7=BD=B2=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tools/UserMenu.vue | 5 ++++- jero-web/src/permission.js | 13 ++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index 21152b55b..a52b3a8c9 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -222,12 +222,15 @@ onOk() { return that.Logout({}).then(() => { // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面 + // TODO 在部署线上时注掉以下代码 that.$router.push({ path: '/user/login' }) + // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' + // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地 - + // TODO 在部署线上时解开以下代码 // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 + localStorage.removeItem('language') // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面 //window.location.reload() diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index 4ac026048..653f3352a 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -11,9 +11,15 @@ import { getAction } from '@/api/manage' import { welcome } from '@/utils/util' NProgress.configure({ showSpinner: false }) // NProgress Configuration +// TODO 线上部署在conmponetns/tools/UserMenu.vue的退出登录时需解开代码以及注释代码 +// TODO 在部署线上时注掉以下代码 const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] + +// TODO 在部署线上时解开一下代码 // const whiteList = [] + + // no redirect whitelist router.beforeEach((to, from, next) => { @@ -89,7 +95,9 @@ router.beforeEach((to, from, next) => { })*/ // query: { redirect: to.fullPath } store.dispatch('Logout').then(() => { + // TODO 在部署线上时注掉此代码 next({ path: '/user/login', query: { redirect: to.fullPath } }) + let fullPath = '' if (to.fullPath == '/') { fullPath = INDEX_MAIN_PAGE_PATH @@ -100,6 +108,7 @@ router.beforeEach((to, from, next) => { // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 + // TODO 在部署线上时解开此代码 // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 }) @@ -113,6 +122,7 @@ router.beforeEach((to, from, next) => { // 在免登录白名单，直接进入 next() } else { + // TODO 在部署线上时注掉此代码 next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' @@ -124,9 +134,10 @@ router.beforeEach((to, from, next) => { // http://grp.nioint.com // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 - + // TODO 在部署线上时解开此代码 // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } } From d0d13171f1dbc7160bde80600e4c543ac495938c Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 20 Jun 2022 17:45:33 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 6 +++--- jero-web/src/common/lang/zh-cn.js | 2 +- jero-web/src/views/dashboard/customContentList.vue | 2 +- .../documentTools/searchCenter/components/whole.vue | 5 ++++- .../src/views/documentTools/searchCenter/index.vue | 13 +++++++++++++ jero-web/src/views/system/UserAnnouncementList.vue | 2 +- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7b534e09c..34507c021 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -902,11 +902,11 @@ module.exports = { testReportLocation: 'Report Location', explain: 'Comment', dataCannotEmpty: 'Data Cannot Empty', - documentDynamics: 'Document Dynamics', + documentDynamics: 'Document Update', theNumberAgain: 'The number already exists and cannot be added again', myList: 'My to-do list', - myNews: 'My News', - monthlyReportRegulations: 'Monthly report regulations', + myNews: 'My Message', + monthlyReportRegulations: 'Regulation Monthly Report', Pending: 'Pending', custom: 'Custom', notSelected: 'Not selected', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c99f0daca..b7d2738aa 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -868,7 +868,7 @@ module.exports = { listConfirmationProgress: '清单确认进度', taskConfirmationProgress: '任务确认进度', designComplianceConfirmationProgress: '设计符合性确认进度', - preHomeConfirmProgress: 'Pre-Home确认进度', + preHomeConfirmProgress: 'Pre-Homo确认进度', verificationComplianceConfirmationProgress: '验证符合性确认进度', totalTable: '总数', applicableSupplement: '适用增补件', diff --git a/jero-web/src/views/dashboard/customContentList.vue b/jero-web/src/views/dashboard/customContentList.vue index 4d1e3016a..130996eaf 100644 --- a/jero-web/src/views/dashboard/customContentList.vue +++ b/jero-web/src/views/dashboard/customContentList.vue @@ -39,7 +39,7 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" :dataSource="dataSource" - :scroll="{x: 1600}" + :scroll="{x: '100%'}" :pagination="ipagination" :loading="loading" @change="handleTableChange"> diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index fde6d2f2d..3d5dc8df3 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -124,7 +124,10 @@ } }, mounted() { - this.getList() + this.conList = [] + // if (!this.queryParam.selectValue) { + // this.getList() + // } }, methods: { checkedClick(item) { diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue index 3363b6a2e..15cd518b7 100644 --- a/jero-web/src/views/documentTools/searchCenter/index.vue +++ b/jero-web/src/views/documentTools/searchCenter/index.vue @@ -105,12 +105,25 @@ this.$refs.wholeRef.searchData(this.selectValueTwo) } }) + } else { + this.$nextTick(() => { + if (this.$refs.wholeRef) { + this.$refs.wholeRef.searchData() + } + }) } }, methods: { callback(key) { this.active = key this.selectValueTwo = '' + if (this.active == this.$t('whole')) { + this.$nextTick(() => { + if (this.$refs.wholeRef) { + this.$refs.wholeRef.searchData() + } + }) + } }, ResetSearch() { this.selectValueTwo = '' diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index c3a8ed208..8a258b4a9 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -61,7 +61,7 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" :dataSource="dataSource" - :scroll="{x: 1600}" + :scroll="{x: '100%'}" :pagination="ipagination" :loading="loading" @change="handleTableChange"> From 414756854ce76e284d0c40eb06db74fe375f232b Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 20 Jun 2022 18:27:24 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/addModel.vue | 100 ++++++++++-------- .../components/listAddModel.vue | 34 +++--- 2 files changed, 73 insertions(+), 61 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue index c28ec7490..97be5e2e4 100644 --- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue @@ -11,37 +11,37 @@
- - -
-
- {{$t('standard')}} + + +
+
+ {{$t('standard')}} +
+
- -
- - -
-
- {{$t('title')}} + + +
+
+ {{$t('title')}} +
+
- -
- - -
-
- {{$t('status')}} + + +
+
+ {{$t('status')}} +
+
- -
- - + + {{$t('reset')}} - +
@@ -121,17 +121,23 @@ ellipsis: true }, { - title: this.$t('status'), - dataIndex: 'state', - align: 'center', - ellipsis: true - }, - { - title: this.$t('technicalField'), - dataIndex: 'technology_territory', + title: this.$t('zoneOfApplication'), + dataIndex: 'region', align: 'center', ellipsis: true }, + // { + // title: this.$t('status'), + // dataIndex: 'state', + // align: 'center', + // ellipsis: true + // }, + // { + // title: this.$t('technicalField'), + // dataIndex: 'technology_territory', + // align: 'center', + // ellipsis: true + // }, { title: this.$t('ImplementationDate'), dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1', @@ -143,13 +149,13 @@ dataIndex: 'implement_time', align: 'center', ellipsis: true - }, - { - title: this.$t('correspondingStandard'), - dataIndex: 'corresponding_standard', - align: 'center', - ellipsis: true } + // { + // title: this.$t('correspondingStandard'), + // dataIndex: 'corresponding_standard', + // align: 'center', + // ellipsis: true + // } ], dataList: [], content: [], @@ -159,7 +165,7 @@ total: 0, fieldList: [], queryParamQuery: {}, - queryConditionVOList: [], + queryConditionVOList: [] } }, mounted() { @@ -201,7 +207,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, ...this.queryParam, - queryConditionVOList: JSON.stringify(queryConditionVOList), + queryConditionVOList: JSON.stringify(queryConditionVOList) } this.loading = true postAction(this.url.addModelList, query).then((res) => { @@ -266,8 +272,8 @@ } else { this.$refs.globalAdvancedQueryRef.superQueryFlag = true this.queryConditionVOList = params - this.queryConditionVOList.forEach(res=>{ - res.type = matchType + this.queryConditionVOList.forEach(res => { + res.type = matchType }) } this.replacePage() diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue index b281465ef..be9fb7648 100644 --- a/jero-web/src/views/projectManagement/components/listAddModel.vue +++ b/jero-web/src/views/projectManagement/components/listAddModel.vue @@ -113,17 +113,23 @@ ellipsis: true }, { - title: this.$t('status'), - dataIndex: 'state', - align: 'center', - ellipsis: true - }, - { - title: this.$t('technicalField'), - dataIndex: 'technology_territory', + title: this.$t('zoneOfApplication'), + dataIndex: 'region', align: 'center', ellipsis: true }, + // { + // title: this.$t('status'), + // dataIndex: 'state', + // align: 'center', + // ellipsis: true + // }, + // { + // title: this.$t('technicalField'), + // dataIndex: 'technology_territory', + // align: 'center', + // ellipsis: true + // }, { title: this.$t('ImplementationDate'), dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1', @@ -136,12 +142,12 @@ align: 'center', ellipsis: true }, - { - title: this.$t('correspondingStandard'), - dataIndex: 'corresponding_standard', - align: 'center', - ellipsis: true - } + // { + // title: this.$t('correspondingStandard'), + // dataIndex: 'corresponding_standard', + // align: 'center', + // ellipsis: true + // } ], dataList: [], content: [], From c06f4004d0610d61f8c4c71d2770ac78e5aa06dd Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 21 Jun 2022 09:25:33 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA(=E8=8B=B1=E6=96=87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DummyInventoryInfoEOServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index d6c697d6b..c486e1588 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1836,8 +1836,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Tue, 21 Jun 2022 09:35:25 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tools/UserMenu.vue | 6 +++--- jero-web/src/permission.js | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index a52b3a8c9..d36ba82c2 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -223,13 +223,13 @@ return that.Logout({}).then(() => { // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面 // TODO 在部署线上时注掉以下代码 - that.$router.push({ path: '/user/login' }) + // that.$router.push({ path: '/user/login' }) // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' + // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地 // TODO 在部署线上时解开以下代码 - // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + - // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 + window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + + encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 localStorage.removeItem('language') // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面 diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index 653f3352a..a2f25c93e 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -14,10 +14,10 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration // TODO 线上部署在conmponetns/tools/UserMenu.vue的退出登录时需解开代码以及注释代码 // TODO 在部署线上时注掉以下代码 -const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] +// const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] // TODO 在部署线上时解开一下代码 -// const whiteList = [] +const whiteList = [] // no redirect whitelist @@ -96,7 +96,7 @@ router.beforeEach((to, from, next) => { // query: { redirect: to.fullPath } store.dispatch('Logout').then(() => { // TODO 在部署线上时注掉此代码 - next({ path: '/user/login', query: { redirect: to.fullPath } }) + // next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' if (to.fullPath == '/') { @@ -109,8 +109,8 @@ router.beforeEach((to, from, next) => { // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 // TODO 在部署线上时解开此代码 - // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 }) }) } else { @@ -123,7 +123,7 @@ router.beforeEach((to, from, next) => { next() } else { // TODO 在部署线上时注掉此代码 - next({ path: '/user/login', query: { redirect: to.fullPath } }) + // next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' if (to.fullPath == '/') { @@ -135,8 +135,8 @@ router.beforeEach((to, from, next) => { // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 // TODO 在部署线上时解开此代码 - // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } From 7680c975162e87e8eef5aaec4913e58927593fe0 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 21 Jun 2022 09:44:33 +0800 Subject: [PATCH 06/27] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E5=AF=BC?= =?UTF-8?q?=E5=85=A5--=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index a674d8386..f77224154 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4777,7 +4777,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = getWorkbookTitle("cn"); + List list = getWorkbookTitle(cut); int pos = file.getOriginalFilename().lastIndexOf("."); String str = file.getOriginalFilename().substring(pos + 1).toLowerCase(); String filenameorg = file.getOriginalFilename().substring(0, pos); @@ -4961,7 +4961,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl dictItemList = sysDictItemServiceImpl.selectItemsAll(); //表头 - List> addForm = getField(ModuleEnum.DOCUMENT_LIBRARY.getValue(), "cn", "add"); + List> addForm = getField(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut, "add"); exportDatas(dataList, addForm, categoryList, dictItemList, zipEntryName,saveDirectory,cut); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); From f9d6dd4bbee332f7cd7a9c02728d77b2d56ec6d1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 21 Jun 2022 09:49:50 +0800 Subject: [PATCH 07/27] =?UTF-8?q?bug54600=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLibraryBaseServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 14ce2292c..8dc6fa3f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -233,9 +233,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl Date: Tue, 21 Jun 2022 09:56:05 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tools/UserMenu.vue | 6 +++--- jero-web/src/permission.js | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index d36ba82c2..a52b3a8c9 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -223,13 +223,13 @@ return that.Logout({}).then(() => { // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面 // TODO 在部署线上时注掉以下代码 - // that.$router.push({ path: '/user/login' }) + that.$router.push({ path: '/user/login' }) // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' + // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地 // TODO 在部署线上时解开以下代码 - window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + - encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 + // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + + // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 localStorage.removeItem('language') // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面 diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index a2f25c93e..653f3352a 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -14,10 +14,10 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration // TODO 线上部署在conmponetns/tools/UserMenu.vue的退出登录时需解开代码以及注释代码 // TODO 在部署线上时注掉以下代码 -// const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] +const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] // TODO 在部署线上时解开一下代码 -const whiteList = [] +// const whiteList = [] // no redirect whitelist @@ -96,7 +96,7 @@ router.beforeEach((to, from, next) => { // query: { redirect: to.fullPath } store.dispatch('Logout').then(() => { // TODO 在部署线上时注掉此代码 - // next({ path: '/user/login', query: { redirect: to.fullPath } }) + next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' if (to.fullPath == '/') { @@ -109,8 +109,8 @@ router.beforeEach((to, from, next) => { // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 // TODO 在部署线上时解开此代码 - window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 }) }) } else { @@ -123,7 +123,7 @@ router.beforeEach((to, from, next) => { next() } else { // TODO 在部署线上时注掉此代码 - // next({ path: '/user/login', query: { redirect: to.fullPath } }) + next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' if (to.fullPath == '/') { @@ -135,8 +135,8 @@ router.beforeEach((to, from, next) => { // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 // TODO 在部署线上时解开此代码 - window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } From a3afb45bfe72c7a2da9eb28340764fbbc4a1c7ac Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 21 Jun 2022 10:05:35 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectCommentEOServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java index 896dbd2ba..b97c123aa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java @@ -9,6 +9,7 @@ import com.jero.modules.project.mapper.ProjectCommentEOMapper; import com.jero.modules.project.service.IProjectCommentEOService; import com.jero.modules.project.service.IProjectReplyEOService; import com.jero.modules.project.vo.ProjectCommentVO; +import com.jero.modules.system.util.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -107,7 +108,10 @@ public class ProjectCommentEOServiceImpl extends ServiceImpl getInfoList(ProjectCommentEO projectCommentEOTemp) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - + if(StringUtils.isNotBlank(projectCommentEOTemp.getCommentContent())){ + String replace = projectCommentEOTemp.getCommentContent().replaceAll("\\*", ""); + wrapper.like(ProjectCommentEO::getCommentContent,replace); + } //验证当前用户在该项目中是什么角色 int isProjectRole = projectLawsInventoryEOService.checkUserRole(projectCommentEOTemp.getProjectLibraryId(), sysUser.getId(), ""); if(!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))){ From 3dc4ac411c25d250a026604c6a25d451fd6bc83e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 21 Jun 2022 10:12:39 +0800 Subject: [PATCH 10/27] =?UTF-8?q?bug54574=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLawsInventoryEOServiceImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 3065a6c35..2fdb18437 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1643,8 +1643,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(","))); List projectLawsInventoryEOList = this.list(wrapper); + List projectTaskInventoryEOList = new ArrayList<>(); for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) { - projectLawsInventoryEO.setId(UUID.randomUUID().toString().replace("-", "")); + + String projectLawsInventoryId = UUID.randomUUID().toString().replace("-", ""); + projectLawsInventoryEO.setId(projectLawsInventoryId); + + ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); + String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); + projectTaskInventoryEO.setId(projectTaskInventoryId); + projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryId); + projectTaskInventoryEOList.add(projectTaskInventoryEO); } this.saveBatch(projectLawsInventoryEOList); @@ -1657,6 +1666,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Tue, 21 Jun 2022 10:20:23 +0800 Subject: [PATCH 11/27] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectRelatedPersonnelServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 0a1fe46f2..e15738e30 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -506,7 +506,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl Date: Tue, 21 Jun 2022 10:23:57 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E9=99=86?= =?UTF-8?q?=E4=B8=BA=E6=AD=A3=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 22 +++++++++---------- jero-web/src/components/tools/UserMenu.vue | 6 ++--- jero-web/src/permission.js | 16 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml index 100922224..e42c282f8 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8008 + port: 8013 tomcat: max-swallow-size: -1 error: @@ -136,7 +136,7 @@ spring: # password: 123456 # driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false - url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://10.132.162.58:3306/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: hzwlsoft.com driver-class-name: com.mysql.cj.jdbc.Driver @@ -152,7 +152,7 @@ spring: allow-bean-definition-overriding: true redis: database: 2 - host: 121.36.69.172 + host: 10.132.162.58 lettuce: pool: max-active: 8 #最大连接数据库连接数,设 0 为没有限制 @@ -161,7 +161,7 @@ spring: min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 100ms password: 'hzwlsoft.com' - port: 4780 + port: 6379 #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:com/jero/**/xml/*Mapper.xml @@ -184,9 +184,9 @@ jero : uploadType: local path : #文件上传根目录 设置 - upload: /data/DeploymentPackage/laws-weilai/upFiles + upload: /data/DeploymentPackage/upFiles #webapp文件路径 - webapp: /data/DeploymentPackage/laws-weilai/webapp + webapp: /data/DeploymentPackage/webapp shiro: excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储配置 @@ -199,7 +199,7 @@ jero : # ElasticSearch 6设置 elasticsearch: cluster-name: elasticsearch - cluster-nodes: 121.36.69.172:9200 + cluster-nodes: 10.132.162.58:9200 check-enabled: false # 表单设计器配置 desform: @@ -248,7 +248,7 @@ jero : data-type: yml #分布式锁配置 redisson: - address: 127.0.0.1:4780 + address: 10.132.162.58:6379 password: type: STANDALONE enabled: true @@ -301,7 +301,7 @@ OCR: #handleFileUrl: http://sws.trans-cosmos.com.cn/WebService.asmx/FileConversion handleFileUrl: http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 - callBackUrl: http://139.9.235.66:8012/local-tool/ocr/ocrHandleResult + callBackUrl: http://10.132.130.150:8014/local-tool/ocr/ocrHandleResult # OCR认证用户 userId: dayuzhou1234 # OCR认证编码 @@ -311,7 +311,7 @@ OCR: # OCR文件存储路径 ocrPath: /data/DeploymentPackage/laws_weilai/APPSOFT/LAWSOCRDEMO/OCRFILE/ # OCR文件下载地址 - ocrDownPath: http://139.9.235.66:9020/downfile/ + ocrDownPath: http://139.9.235.66:8013/downfile/ # OCR接口超时时间 times: 20 # OCR转换类型 @@ -359,6 +359,6 @@ Feishu: batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/ # local-tool local-tool: - uri: http://139.9.235.66:8012 + uri: http://10.132.130.150:8014 opensso: redirectUri: http%3A%2F%2F139.9.235.66%3A8010 diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index 21152b55b..7eccc5148 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -222,12 +222,12 @@ onOk() { return that.Logout({}).then(() => { // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面 - that.$router.push({ path: '/user/login' }) + // that.$router.push({ path: '/user/login' }) // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' + // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地 - // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + - // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 + window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + + encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 localStorage.removeItem('language') // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面 //window.location.reload() diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index 4ac026048..a2771c76c 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -12,8 +12,8 @@ import { welcome } from '@/utils/util' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] -// const whiteList = [] +// const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] +const whiteList = [] // no redirect whitelist router.beforeEach((to, from, next) => { @@ -89,7 +89,7 @@ router.beforeEach((to, from, next) => { })*/ // query: { redirect: to.fullPath } store.dispatch('Logout').then(() => { - next({ path: '/user/login', query: { redirect: to.fullPath } }) + // next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' if (to.fullPath == '/') { fullPath = INDEX_MAIN_PAGE_PATH @@ -100,8 +100,8 @@ router.beforeEach((to, from, next) => { // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 - // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 }) }) } else { @@ -113,7 +113,7 @@ router.beforeEach((to, from, next) => { // 在免登录白名单，直接进入 next() } else { - next({ path: '/user/login', query: { redirect: to.fullPath } }) + // next({ path: '/user/login', query: { redirect: to.fullPath } }) let fullPath = '' if (to.fullPath == '/') { @@ -125,8 +125,8 @@ router.beforeEach((to, from, next) => { // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 - // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 + window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } } From 1ecb2e3baa5b69bb586179f17a701dff9232853f Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 21 Jun 2022 10:29:49 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0(=E5=88=97=E8=A1=A8=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=80=82=E7=94=A8=E5=9C=B0=E5=8C=BA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../document/service/impl/BussDocumentLibraryEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index f77224154..529525ec7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5621,6 +5621,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Tue, 21 Jun 2022 10:40:30 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/components/customContent.vue | 23 +++++---- .../virtualList/components/editModel.vue | 48 +++++++++++++++++++ .../components/virtualListDetails.vue | 24 ++++++++-- .../certificationProgressEchart.vue | 8 ++-- .../components/deliverableStatusEchart.vue | 10 ++-- 5 files changed, 93 insertions(+), 20 deletions(-) diff --git a/jero-web/src/views/dashboard/components/customContent.vue b/jero-web/src/views/dashboard/components/customContent.vue index ff021373d..57feafe6c 100644 --- a/jero-web/src/views/dashboard/components/customContent.vue +++ b/jero-web/src/views/dashboard/components/customContent.vue @@ -1,18 +1,19 @@