From 16979ff77904e294c0e7661c3c42afcbfd12e046 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Sat, 2 Jul 2022 10:57:02 +0800 Subject: [PATCH 1/2] =?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 --- .../src/components/CollectionType/index.vue | 26 +++++++++++++++++- .../src/components/tableCollection/index.vue | 4 +-- .../ParameterItemCollectionList.vue | 27 ++++++++++--------- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index c1a98b68e..b1667ab35 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -18,6 +18,7 @@
@@ -163,6 +164,7 @@
@@ -170,6 +172,7 @@
@@ -263,6 +267,7 @@
@@ -366,6 +372,7 @@
- + {{ itemin.label }} @@ -513,6 +520,7 @@
@@ -521,6 +529,7 @@
@@ -694,6 +703,13 @@ .ant-table td { white-space: nowrap; } + .selectWid .ant-select-selection--multiple { + overflow: auto; + } + + .selectWid .ant-select-selection--multiple::-webkit-scrollbar { + display: none; /* Chrome Safari */ + } diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index fe68141ec..5aec4838b 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -375,10 +375,10 @@ this.areaVisible = true // this.$refs.ruleForm.clearValidate() this.$nextTick(() => { + this.Dateline = {...this.Dateline} this.getquerySdtList(record) + this.$refs.ruleForm.clearValidate() }) - this.$refs.ruleForm.clearValidate() - }, dataValueTobeinitiated() { this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission')) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 79b133147..9bc09aff5 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -983,30 +983,31 @@ ishandleSubmit() { let _this = this let postDate = [] - for (let i = 0; i < this.selectedRowKeysValue.length; i++) { + let selectedRowKeysValue = JSON.parse(JSON.stringify(this.selectedRowKeysValue)) + for (let i = 0; i < selectedRowKeysValue.length; i++) { let postDateobj = {} - let itemIn = Object.keys(this.selectedRowKeysValue[i]) + let itemIn = Object.keys(selectedRowKeysValue[i]) for (let j = 0; j < itemIn.length; j++) { if (itemIn[j] !== 'sdt') { - if (this.selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(this.selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { - postDateobj[itemIn[j]] = this.selectedRowKeysValue[i][itemIn[j]] - for (let k = 0; k < this.selectedRowKeysValue[i][itemIn[j]].list.length; k++) { - if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { - this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') + if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) { + postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]] + for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) { + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',') } - if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { - this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() + if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) { + selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString() } - if (!this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && this.selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1' - && this.selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') { - this.$message.warning(this.selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) + if (!selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1' + && selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') { + this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) return } } } } } - postDateobj.id = this.selectedRowKeysValue[i].id + postDateobj.id = selectedRowKeysValue[i].id postDate.push(postDateobj) } From ee95f795662dae2ac96cfca2ad946fddcb1a644b Mon Sep 17 00:00:00 2001 From: liyawei Date: Sat, 2 Jul 2022 11:02:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsManifestEOController.java | 26 ++++++++++--------- .../cert/collect/entity/ParamsManifestEO.java | 3 --- .../ParamsCollectManifestEOServiceImpl.java | 10 ++++--- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index bead11a58..88cada6f2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -68,7 +69,7 @@ public class ParamsManifestEOController extends JeroController queryPageList(ParamsManifestEO paramsManifestEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -130,12 +131,13 @@ public class ParamsManifestEOController extends JeroController getManifestConfigFlag(@RequestParam(name="paramsManifestId", required = true) String paramsManifestId) { boolean configFlag = paramsCollectManifestEOService.getManifestConfigFlag(paramsManifestId); return Result.OK(configFlag); @@ -150,7 +152,7 @@ public class ParamsManifestEOController extends JeroController add(@Validated @RequestBody ParamsManifestEO paramsManifestEO) { boolean isSuccess = paramsManifestEOService.add(paramsManifestEO); if (isSuccess) { @@ -169,7 +171,7 @@ public class ParamsManifestEOController extends JeroController edit(@Validated @RequestBody ParamsManifestEO paramsManifestEO) { boolean isSuccess = paramsManifestEOService.editById(paramsManifestEO); if (isSuccess) { @@ -188,7 +190,7 @@ public class ParamsManifestEOController extends JeroController delete(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { boolean isSuccess = paramsManifestEOService.deleteById(id, cut); if (isSuccess) { @@ -207,7 +209,7 @@ public class ParamsManifestEOController extends JeroController deleteBatch(@RequestBody ParamsManifestVO paramsManifestVO) { if (StringUtils.isEmpty(paramsManifestVO.getIds()) || StringUtils.isEmpty(paramsManifestVO.getCut())) { return Result.error("参数不能为空！"); @@ -229,7 +231,7 @@ public class ParamsManifestEOController extends JeroController changeExtension(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { boolean isSuccess = paramsManifestEOService.changeExtension(id, cut); if(isSuccess) { @@ -248,7 +250,7 @@ public class ParamsManifestEOController extends JeroController history(@RequestParam(name="title",required=true) String title) { List historyVersionList = paramsManifestEOService.getHistoryVersionList(title); return Result.OK(historyVersionList); @@ -263,7 +265,7 @@ public class ParamsManifestEOController extends JeroController getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="projectName",required=false) String projectName) { @@ -280,7 +282,7 @@ public class ParamsManifestEOController extends JeroController getParamsTemplatePageOfCopy(ParamsTemplateEO paramsTemplateEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -299,7 +301,7 @@ public class ParamsManifestEOController extends JeroController copy(@RequestBody ParamsManifestVO paramsManifestVO) { ParamsManifestEO paramsManifestEO = new ParamsManifestEO(); BeanUtils.copyProperties(paramsManifestVO, paramsManifestEO); @@ -315,7 +317,7 @@ public class ParamsManifestEOController extends JeroController queryList(@RequestParam(name = "paramsManifestId") String paramsManifestId) { List list = paramsConfigEOService.queryList(paramsManifestId); if (CollectionUtil.isNotEmpty(list)) { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index 68430dd6e..4862bf93f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -97,9 +97,6 @@ public class ParamsManifestEO implements Serializable { @TableField(exist = false) private String paramsTemplateName; - @TableField(exist = false) - private Boolean configFlag; // true-可添加配置；false-不可添加配置 - @TableField(exist = false) private String cut; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 55655c56c..917df22c9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -36,6 +36,7 @@ import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOSe import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsgVo; +import com.jero.modules.ocr.service.WebSocketServer; import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; @@ -115,7 +116,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl