From d5712cfc706f4d0931fb8251cfce01fcb23a948d Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 9 Jun 2022 09:19:15 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/virtualListDetails.vue | 2 +- .../ProjectDetails/index.vue | 30 +++++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 4174018c0..3fa069bd2 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -10,7 +10,7 @@
-
{{$t('UpdateLog')}} diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 72237a898..7f7cd4780 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -95,7 +95,7 @@ return { title: this.$t('projectDetails'), isDisplayNum: '', - textTitle: '项目详情', + textTitle: this.$t('projectDetails'), url: { logList: '/project/projectLawsInventoryLogEO/page', historicalVersionUrl: '', @@ -133,18 +133,22 @@ textColor[0].classList.remove('Virtual-detail-left-text-color') } let text = document.getElementsByClassName('Virtual-detail-left-text') - if (text && text.length > 0) { - for (let i = 0; i < text.length; i++) { - if (text[i].title == name) { - text[i].classList.add('Virtual-detail-left-text-color') - } else if (text[i].title == name) { - text[i].classList.add('Virtual-detail-left-text-color') - } else if (text[i].title == name) { - text[i].classList.add('Virtual-detail-left-text-color') - } else if (text[i].title == name) { - text[i].classList.add('Virtual-detail-left-text-color') - } else if (text[i].title == name) { - text[i].classList.add('Virtual-detail-left-text-color') + if (num == 0) { + text[num].classList.add('Virtual-detail-left-text-color') + } else { + if (text && text.length > 0) { + for (let i = 0; i < text.length; i++) { + if (text[i].title == name) { + text[i].classList.add('Virtual-detail-left-text-color') + } else if (text[i].title == name) { + text[i].classList.add('Virtual-detail-left-text-color') + } else if (text[i].title == name) { + text[i].classList.add('Virtual-detail-left-text-color') + } else if (text[i].title == name) { + text[i].classList.add('Virtual-detail-left-text-color') + } else if (text[i].title == name) { + text[i].classList.add('Virtual-detail-left-text-color') + } } } } From 5854256e451fc55eb574ef6b633bf17cdf59d6d6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 9 Jun 2022 09:20:07 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParameterItemCollection/ProjectDetails/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue index a9017a60a..78c731198 100644 --- a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue @@ -96,7 +96,7 @@ data() { return { title: this.$t('projectDetails'), - textTitle: '认证参数收集', + textTitle: this.$t('TaskParameterCollection'), isDisplayNum: '', areaOfResponsibility: {}, url: { From bd4b50b86f385802b2d5d5b0eec0a74bde4b0bc0 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 9 Jun 2022 09:21:20 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/ProjectDetails/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 7f7cd4780..5cab8e6ee 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -133,8 +133,8 @@ textColor[0].classList.remove('Virtual-detail-left-text-color') } let text = document.getElementsByClassName('Virtual-detail-left-text') - if (num == 0) { - text[num].classList.add('Virtual-detail-left-text-color') + if (name == 0) { + text[name].classList.add('Virtual-detail-left-text-color') } else { if (text && text.length > 0) { for (let i = 0; i < text.length; i++) { From 991269bc6114c3dcf0f8512a647bb483fc2bd91a Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 9 Jun 2022 09:39:43 +0800 Subject: [PATCH 04/11] [update] 53700 --- jero-web/src/views/documentManage/tags/tabs/TagItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue index de4062fdb..3b8025019 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue @@ -18,7 +18,7 @@ {{$t('ChineseName')}}
+ v-model="queryParamTwo.dbFieldTxt">
From 32eb453e47ffd2cc07dba7cdb29d75e4a3c52f0b Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 9 Jun 2022 09:49:06 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BDtoken?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/api/manage.js | 79 +++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/jero-web/src/api/manage.js b/jero-web/src/api/manage.js index 570bdebeb..24c7c2b61 100644 --- a/jero-web/src/api/manage.js +++ b/jero-web/src/api/manage.js @@ -1,6 +1,9 @@ import Vue from 'vue' import { axios } from '@/utils/request' +import store from '@/store' import JLoadingOne from '../components/jero/JLoadingOne' +import { Modal } from 'ant-design-vue' +import { ACCESS_TOKEN, TENANT_ID } from '@/store/mutation-types' const showDrawer = {} @@ -153,29 +156,61 @@ export function downloadFile(url, fileName, parameter, callback) { isTrue: isTrue }) return downFile(url, parameter).then((data) => { - console.log(data) - if (!data || data.size === 0) { - Vue.prototype['$message'].warning('文件下载失败') - return + let fileReader = new FileReader() + fileReader.onload = function(event) { + try { + let jsonData = JSON.parse(event.target.result) + if (jsonData.message.includes('token')) { + index.showDrawer({ + loading: false, + isTrue: isTrue + }) + Modal.error({ + title: '登录已过期', + content: '很抱歉，登录已过期，请重新登录', + okText: '重新登录', + mask: false, + onOk: () => { + store.dispatch('Logout').then(() => { + Vue.ls.remove(ACCESS_TOKEN) + try { + let path = window.document.location.pathname + if (path != '/' && path.indexOf('/user/login') == -1) { + window.location.reload() + } + } catch (e) { + window.location.reload() + } + }) + } + }) + } + } catch (e) { + if (!data || data.size === 0) { + Vue.prototype['$message'].warning('文件下载失败') + return + } + if (typeof window.navigator.msSaveBlob !== 'undefined') { + window.navigator.msSaveBlob(new Blob([data]), fileName) + } else { + let url = window.URL.createObjectURL(new Blob([data])) + let link = document.createElement('a') + link.style.display = 'none' + link.href = url + link.setAttribute('download', fileName) + document.body.appendChild(link) + link.click() + document.body.removeChild(link) //下载完成移除元素 + window.URL.revokeObjectURL(url) //释放掉blob对象 + } + index.showDrawer({ + loading: false, + isTrue: isTrue + }) + callback && callback() + } } - if (typeof window.navigator.msSaveBlob !== 'undefined') { - window.navigator.msSaveBlob(new Blob([data]), fileName) - } else { - let url = window.URL.createObjectURL(new Blob([data])) - let link = document.createElement('a') - link.style.display = 'none' - link.href = url - link.setAttribute('download', fileName) - document.body.appendChild(link) - link.click() - document.body.removeChild(link) //下载完成移除元素 - window.URL.revokeObjectURL(url) //释放掉blob对象 - } - index.showDrawer({ - loading: false, - isTrue: isTrue - }) - callback && callback() + fileReader.readAsText(data) }) } From 01dd3282a966f78499b44e545ea456317be125a8 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 9 Jun 2022 10:29:50 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 44 +++++++++++++------ 1 file changed, 31 insertions(+), 13 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 788601a3a..9c8005283 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 @@ -3012,7 +3012,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp); //订阅技术领域发消息 List domainUserRelList = domainManageService.list(); + List thirdIdListAll = new ArrayList<>(); + List userListAll = new ArrayList<>(); List thirdIdList = new ArrayList<>(); + List userList = new ArrayList<>(); String technologyTerritoryNameEn = ""; if(StringUtils.isNotBlank(technologyTerritory) && !technologyTerritory.equals(technologyTerritoryNew) && domainUserRelList.size() != 0){ List collect = domainUserRelList.stream() @@ -3025,6 +3028,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysUsersFeishu = this.sysUserMapper.selectBatchIds(userIdList); if(sysUsersFeishu.size() != 0){ thirdIdList = sysUsersFeishu.stream().map(SysUser::getThirdId).collect(Collectors.toList()); + userList = sysUsersFeishu.stream().map(SysUser::getId).collect(Collectors.toList()); + if(thirdIdList.size() != 0){ + thirdIdListAll.addAll(thirdIdList); + } + if(userList.size() != 0){ + userListAll.addAll(userList); + } } } if(domainIdList.size() != 0){ @@ -3060,25 +3070,33 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Thu, 9 Jun 2022 10:53:03 +0800 Subject: [PATCH 07/11] =?UTF-8?q?[update]=20=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 7 + jero-web/src/common/lang/zh-cn.js | 7 + .../src/components/CollectionType/index.vue | 421 ++++++++++++++++-- 3 files changed, 406 insertions(+), 29 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c820ebdde..7720a2d63 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -712,6 +712,13 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'Enclosure', // 认证 + chinese: 'chinese', + integerOrDecimal: 'integer Or Decimal', + OneDecimalPlace: 'One Decimal Place', + TwoDecimalplaces: 'Two Decimal places', + Threedecimalplaces: 'Threedecimalplaces', + FourDecimalplaces: 'FourDecimalplaces', + Positivefloatingpointnumber: 'Positive floating point number', oneconfigurationInformation: 'Contains at least one configuration information', Correspondingstandarddeleted: 'Correspondingstandarddeleted', changeTheTitle: 'Title already exists, please change the title', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index ecb692dbe..14fbf2d2a 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -723,6 +723,13 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + chinese: '中文', + integerOrDecimal: '整数或小数', + OneDecimalPlace: '一位小数', + TwoDecimalplaces: '两位小数', + Threedecimalplaces: '三位小数', + FourDecimalplaces:'四位小数', + Positivefloatingpointnumber: '正浮点数', oneconfigurationInformation: '至少含有一个配置信息', Correspondingstandarddeleted: '对应标准已删除', changeTheTitle: '标题已存在，请更换标题', diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index e9235a513..29464e56a 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -4,23 +4,93 @@
-
- - - - - - - - - - -
- +
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
@@ -76,20 +146,186 @@
-
- +
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
-
- +
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
@@ -105,10 +341,93 @@
-
- +
+ + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+
@@ -358,4 +718,7 @@ export default { .add-width{ width: 30%; } +/deep/.ant-table-column-sort .ant-table-row-cell-ellipsis{ + text-align: left; +} From 443608c4c83a6a4198f868918806a4e9ac651af1 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 9 Jun 2022 11:10:20 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysDictItemServiceImpl.java | 54 ++++++++++--------- .../service/impl/SysDictServiceImpl.java | 11 +++- .../service/impl/OnlCgformTagServiceImpl.java | 4 ++ 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index 1f9d5269b..a207bf6ce 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -82,6 +82,8 @@ public class SysDictItemServiceImpl extends ServiceImpl= geOrderNumList.size()){ + break; } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); @@ -105,35 +107,35 @@ public class SysDictItemServiceImpl extends ServiceImpl 0) { - Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId())) - .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0); - queryWrapper.eq("sort_order", inputOrderNum); - Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper); - if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1 - //设置排序 - QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); - orderNumQueryWrapper.ge("sort_order", inputOrderNum) - .eq("dict_id", sysDictItem.getDictId()) - .eq("del_flag", CommonConstant.DEL_FLAG_0) - .eq("is_tag_dict", sysDictItem.getIsTagDict()) - .orderByAsc("sort_order"); - List geOrderNumList = list(orderNumQueryWrapper); - //判断相邻的序号,去掉不邻的 - for (int i = 0; i < geOrderNumList.size(); i++) { - if (geOrderNumList.size() == 1) { - break; - } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { - int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); - geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); - break; - } + Integer orderNumData = getById(sysDictItem.getId()).getSortOrder(); + queryWrapper.eq("sort_order", inputOrderNum); + Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper); + if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1 + //设置排序 + QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); + orderNumQueryWrapper.ge("sort_order", inputOrderNum) + .eq("dict_id", sysDictItem.getDictId()) + .eq("del_flag", CommonConstant.DEL_FLAG_0) + .eq("is_tag_dict", sysDictItem.getIsTagDict()) + .orderByAsc("sort_order"); + List geOrderNumList = list(orderNumQueryWrapper); + + //判断相邻的序号,去掉不邻的 + for (int i = 0; i < geOrderNumList.size(); i++) { + if (geOrderNumList.size() == 1) { + break; + }else if(i+1 >= geOrderNumList.size()){ + break; + } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { + int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); + geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); + break; } - - geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1)); - saveOrUpdateBatch(geOrderNumList); } + + geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1)); + saveOrUpdateBatch(geOrderNumList); } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index 23b6dfd8c..b97383d94 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -455,6 +455,7 @@ public class SysDictServiceImpl extends ServiceImpl impl //查询展示顺序相同的 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0) + .eq("is_tag_dict", sysDict.getIsTagDict()) .orderByAsc("order_num"); queryWrapper.eq("order_num", inputOrderNum); Integer orderNumCount = sysDictMapper.selectCount(queryWrapper); @@ -470,6 +471,8 @@ public class SysDictServiceImpl extends ServiceImpl impl for (int i = 0; i < geOrderNumList.size(); i++) { if (geOrderNumList.size() == 1) { break; + }else if(i+1 >= geOrderNumList.size()){ + break; } else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) { int deleteStart = geOrderNumList.get(i + 1).getOrderNum(); geOrderNumList = geOrderNumList.stream().filter(e -> e.getOrderNum() < deleteStart).collect(Collectors.toList()); @@ -490,8 +493,10 @@ public class SysDictServiceImpl extends ServiceImpl impl //查询展示顺序相同的 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0) + .eq("is_tag_dict", sysDict.getIsTagDict()) .orderByAsc("order_num"); - Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDict.getId())) + List dataList = list(queryWrapper); + Integer orderNumData = dataList.stream().filter(e -> e.getId().equals(sysDict.getId())) .map(e -> e.getOrderNum()).collect(Collectors.toList()).get(0); queryWrapper.eq("order_num", inputOrderNum); Integer orderNumCount = sysDictMapper.selectCount(queryWrapper); @@ -507,7 +512,9 @@ public class SysDictServiceImpl extends ServiceImpl impl for (int i = 0; i < geOrderNumList.size(); i++) { if (geOrderNumList.size() == 1) { break; - } else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) { + } else if(i+1 >= geOrderNumList.size()){ + break; + }else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) { int deleteStart = geOrderNumList.get(i + 1).getOrderNum(); geOrderNumList = geOrderNumList.stream().filter(e -> e.getOrderNum() < deleteStart).collect(Collectors.toList()); break; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 21d1de081..d25fead6b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -86,6 +86,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl= geOrderNumList.size()){ + break; }else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) { int deleteStart = geOrderNumList.get(i+1).getOrderNum(); geOrderNumList = geOrderNumList.stream().filter(e->e.getOrderNum() < deleteStart).collect(Collectors.toList()); @@ -178,6 +180,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl= geOrderNumList.size()){ + break; }else if (geOrderNumList.get(i + 1).getOrderNum() - geOrderNumList.get(i).getOrderNum() > 1) { int deleteStart = geOrderNumList.get(i+1).getOrderNum(); geOrderNumList = geOrderNumList.stream().filter(e->e.getOrderNum() < deleteStart).collect(Collectors.toList()); From ef37e16d76a51eb9f9fe160e095168c577747463 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 9 Jun 2022 11:10:30 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/service/impl/SysCategoryServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 4a73bd12e..acc4e45cc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -352,7 +352,9 @@ public class SysCategoryServiceImpl extends ServiceImpl 1) { + } else if(i+1 >= geOrderNumList.size()){ + break; + }else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); if(geOrderNumList.size()!=(i+1)) { @@ -404,6 +406,8 @@ public class SysCategoryServiceImpl extends ServiceImpl= geOrderNumList.size()){ + break; } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); From 49b9f6de191286be6a80cb9373fb45997e21bd71 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 9 Jun 2022 11:50:02 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 3a5bef3ce..f88d076b7 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 @@ -545,7 +545,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl可以 projectRelatedPersonnel.setLawEngineerName(""); projectRelatedPersonnel.setEngineeringInterfacePersonName(""); projectRelatedPersonnel.setCertificationEngineerName(""); - }/*else {//除了责任领域,备注,有一个为空都报错 + }else {//除了责任领域,备注,有一个为空都报错 if(CutEnum.CN.getValue().equals(cut)){ - throw new JeroBootException("请填写必填字段内容,带*的为必填.请检查第 "+ (i+1) + "行"); + throw new JeroBootException("法规工程师、工程接口人、认证工程师三个为必填字段.请检查第 "+ (i+1) + "行"); }else{ - throw new JeroBootException("Please fill in the required fields marked with * .Please check line" + (i+1)); + throw new JeroBootException("Regulation Engineer,Engineering Interface and Homologation Engineer are required fields..Please check line" + (i+1)); } - }*/ + } //导入的备注为数字,被识别成小数点后一位 Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); From a2868a1c9a26a0d8c25fce5f3a4be09e6253c3d6 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 9 Jun 2022 12:03:43 +0800 Subject: [PATCH 11/11] =?UTF-8?q?[update]=20=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/AssignedBy/index.vue | 6 ++++++ jero-web/src/mixins/JeroListMixin.js | 2 ++ jero-web/src/views/projectManagement/dialog/configure.vue | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/jero-web/src/components/AssignedBy/index.vue b/jero-web/src/components/AssignedBy/index.vue index 12bbb7ef4..9441b302a 100644 --- a/jero-web/src/components/AssignedBy/index.vue +++ b/jero-web/src/components/AssignedBy/index.vue @@ -138,8 +138,14 @@ export default { pageSize: this.pageSize, ...this.form } + if(this.form.username !== undefined) { + this.form.username = `*${this.form.username}*` + } getAction(`sys/user/page`, params).then(res => { if (res.success) { + if(this.form.username !== undefined) { + this.form.username = this.form.username.slice(1,this.form.username.length-1) + } this.areaTable = [...res.result.records] this.total = res.result.total } diff --git a/jero-web/src/mixins/JeroListMixin.js b/jero-web/src/mixins/JeroListMixin.js index a02e10385..a63723895 100644 --- a/jero-web/src/mixins/JeroListMixin.js +++ b/jero-web/src/mixins/JeroListMixin.js @@ -81,6 +81,7 @@ export const JeroListMixin = { if (arg === 1) { this.ipagination.current = 1; } + var params = this.getQueryParams();//查询条件 this.loading = true; getAction(this.url.list, params).then((res) => { @@ -123,6 +124,7 @@ export const JeroListMixin = { sqp['superQueryParams']=encodeURI(this.superQueryParams) sqp['superQueryMatchType'] = this.superQueryMatchType } + console.log(this.queryParam,'this.queryParam') var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters); param.field = this.getQueryField(); param.pageNo = this.ipagination.current; diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index f15450981..41740661d 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -16,6 +16,7 @@
+ * {{$t('configurationName')}}
@@ -30,6 +31,7 @@
+ * {{$t('Version')}}
@@ -45,6 +47,7 @@
+ * {{$t('Model')}}
@@ -59,6 +62,7 @@
+ * {{$t('Battery')}}
@@ -74,6 +78,7 @@
+ * {{$t('electricMachinery')}}