diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java index 3cb58f24e..e6b310329 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGnxtwhController.java @@ -54,6 +54,7 @@ public class OtaBaSjGnxtwhController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(otaBaSjGnxtwh, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + queryWrapper.orderByDesc("create_time"); IPage pageList = otaBaSjGnxtwhService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 03b7480fb..e5cbbbd3b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1731,4 +1731,7 @@ module.exports = { theDeliverablesCannotReferencedPleaseReselect:'The deliverables of this project cannot be referenced, please reselect', regulationListModuleMaintenance:'Regulation list module maintenance', regulationListModule:'Regulation list module', + gnxtwh:'Functional system maintenance', + gnxt:'Functional system', + dykzq:'Corresponding controller', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 3e270c66d..6a59e83ea 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1833,4 +1833,7 @@ module.exports = { theDeliverablesCannotReferencedPleaseReselect:'不能引用本项目的交付物,请重新选择', regulationListModuleMaintenance:'法规清单模块维护', regulationListModule:'法规清单模块', + gnxtwh:'功能系统维护', + gnxt:'功能系统', + dykzq:'对应控制器', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue new file mode 100644 index 000000000..1cf59e6b4 --- /dev/null +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue @@ -0,0 +1,348 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index 2440d63b6..d364fa0c5 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -114,10 +114,7 @@
- - - - + @@ -125,7 +122,7 @@ formInline.wwcfj == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} -

{{$t('format')}}

+

{{$t('format')}}

diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index b2330f285..658e2efeb 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -119,6 +119,12 @@ {{$t('templateDownload')}} +
+ + {{$t('gnxtwh')}} +
+ @@ -174,6 +181,7 @@