From d54281a3febf06f1917f66cf39a56c08c4719296 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 11 May 2023 09:48:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ota-=E5=8D=87=E7=BA=A7=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=A2=9E=E5=8A=A0=E6=96=87=E6=9C=AC=E6=A1=86?= =?UTF-8?q?=20ota-=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otamanagement/upgradeactivity/index.vue | 7 +++ .../components/upgradeimpactassessment.vue | 63 ++++++++++++------- 2 files changed, 49 insertions(+), 21 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 0a0362325..48692641d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -255,6 +255,13 @@ export default { ellipsis: true, width: 170 }, + { + title: this.$t('taskname'), + align: 'left', + dataIndex: 'rwmc', + ellipsis: true, + width: 170 + }, { title: this.$t('noticebatch'), align: 'left', diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 5c2556420..0d58ef2e1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -105,15 +105,24 @@ {{$t('upgradefailureorinterruption')}} - - + +
+ +
+
+ +
@@ -190,6 +199,7 @@ export default { exportData: '/ota/otaBaSjSjyxpg/exportData', importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入 }, + flag:false, loading: false, disable:false, columns: [ @@ -379,18 +389,14 @@ this.$forceUpdate() if(res.result.zxsj==null){ res.result.zxsj=undefined } - this.form=res.result==null ? { - sjmd:'', - // fhgd:1, - // zdjsxg:2, - // sfyxaq:2, - // yhqr:1, - // aqkkx:1, - // zxsj:2, - // aqjz:'2', - // sjbcs:'3,4' - } : res.result + this.form=res.result==null ? { sjmd:'' } : res.result } + console.log(this.form.aqjz) + if(this.form.aqjz == '2'){ + this.flag = true + }else{ + this.flag = false + } }) }, save(){ @@ -417,6 +423,13 @@ this.$forceUpdate() this.save() this.$emit('safetyPrecautionsdown') }, + changeQuery(val) { + if(val.indexOf('将车辆置于安全状态') != -1 || val.indexOf('Put the vehicle in a safe position') != -1){ + this.flag = true + }else{ + this.flag = false + } + }, } } @@ -446,13 +459,21 @@ this.$forceUpdate() margin-left: 40px; } .box-input1 { - display: inline-block; + //display: inline-block; width: calc(100% - 80px); position: absolute; height: 38px; margin-left: 40px; top: 4px; } +.box-input2 { + //display: inline-block; + width: calc(100% - 80px); + position: absolute; + height: 38px; + margin-left: 40px; + top: 50px; +} ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title { white-space: pre-wrap!important; } From 6c473f3ab32c3dadc4ce1ab38b1c9ca9dd059324 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 11 May 2023 09:53:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A1=AB=E5=86=99=E8=AE=B0=E5=BD=95=20?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/otamanagement/upgradeactivityrecord/index.vue | 2 +- jero-web/src/views/otamanagement/vehicleinformation/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue index feb4c9855..adbea406a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue @@ -59,7 +59,7 @@ + v-model='queryParam.context' /> diff --git a/jero-web/src/views/otamanagement/vehicleinformation/index.vue b/jero-web/src/views/otamanagement/vehicleinformation/index.vue index d62bd937a..7f291a631 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/index.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/index.vue @@ -59,7 +59,7 @@ + v-model='queryParam.context' /> From eddc47631c53fd32302380a5b3d4c73f15dbe239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 11 May 2023 21:28:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E7=89=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 4 ++-- .../impl/ParamsManifestEOServiceImpl.java | 16 ++++++++++++++++ .../controller/ProjectLibraryBaseController.java | 2 +- .../impl/ProjectLibraryBaseServiceImpl.java | 4 ++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index b3d6abffe..69b474d20 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -128,8 +128,8 @@ public class SysUserController { * @return */ @ApiOperation(value = "用户管理-分页查询") - @RequiresPermissions("sys:user:list") - @PermissionData(pageComponent = "system/UserList") +// @RequiresPermissions("sys:user:list") +// @PermissionData(pageComponent = "system/UserList") @RequestMapping(value = "/page", method = RequestMethod.GET) public Result> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 2bbf14a84..5ea394321 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -226,6 +226,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl delList = new ArrayList<>(); + for (ParamsCollectManifestEO target : paramsCollectManifestEOList) { + boolean isHave = false; + for (ParamsInfoPublishEO source : paramsInfoPublishEOList) { + if (target.getNioNumber().equals(source.getNioNumber())) { + isHave = true; + break; + } + } + if(!isHave){ + delList.add(target.getId()); + } + } + paramsCollectManifestEOService.deleteByIds(delList); }catch (Exception e){ e.printStackTrace(); return false; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index b870ca39e..c747e6bdc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -41,7 +41,7 @@ import java.util.Map; */ @Api(tags="项目库基础表") @RestController -@RequestMapping("/project/projectLibraryBase") +@RequestMapping("/已同步生产环境braryBase") @Slf4j public class ProjectLibraryBaseController extends JeroController { @Autowired 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 0e3d4a4fc..ac836dd1d 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 @@ -259,6 +259,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl Date: Thu, 11 May 2023 21:29:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E7=89=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/ProjectLibraryBaseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index c747e6bdc..b870ca39e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -41,7 +41,7 @@ import java.util.Map; */ @Api(tags="项目库基础表") @RestController -@RequestMapping("/已同步生产环境braryBase") +@RequestMapping("/project/projectLibraryBase") @Slf4j public class ProjectLibraryBaseController extends JeroController { @Autowired