diff --git a/core/core-backend/src/main/java/io/gisbi/application/baseinfo/controller/ApplicationController.java b/core/core-backend/src/main/java/io/gisbi/application/baseinfo/controller/ApplicationController.java index 8864517..9d1567b 100644 --- a/core/core-backend/src/main/java/io/gisbi/application/baseinfo/controller/ApplicationController.java +++ b/core/core-backend/src/main/java/io/gisbi/application/baseinfo/controller/ApplicationController.java @@ -40,8 +40,7 @@ public class ApplicationController { * 新增应用 */ @PostMapping("/save") - public ResponseResult save(@RequestBody Application application) { - return ResponseResult.successData(applicationService.save(application)); + public ResponseResult save(@RequestBody Application application) {return ResponseResult.successData(applicationService.save(application)); } /** diff --git a/core/core-backend/src/main/java/io/gisbi/application/module/controller/ModuleController.java b/core/core-backend/src/main/java/io/gisbi/application/module/controller/ModuleController.java index 1abf994..590a432 100644 --- a/core/core-backend/src/main/java/io/gisbi/application/module/controller/ModuleController.java +++ b/core/core-backend/src/main/java/io/gisbi/application/module/controller/ModuleController.java @@ -8,6 +8,8 @@ import io.gisbi.config.ResponseResult; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** *

@@ -29,8 +31,10 @@ public class ModuleController { @GetMapping("/list") public ResponseResult page(@RequestParam String appId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Module::getAppId,appId); wrapper.orderByDesc(Module::getPid,Module::getSort); // 按编码倒序排列 - return ResponseResult.successData(moduleService.list(wrapper)); + List list = moduleService.list(wrapper); + return ResponseResult.successData(list); } // 新增模块 diff --git a/core/core-frontend/src/api/application/application.ts b/core/core-frontend/src/api/application/application.ts new file mode 100644 index 0000000..e9e0003 --- /dev/null +++ b/core/core-frontend/src/api/application/application.ts @@ -0,0 +1,8 @@ +import request from '@/config/axios' + +export const applicationPage = (params) => request.get({ url: '/application/page',params }) +export const applicationAdd = data => request.post({ url: '/application/save', data }) + +export const findApplicationById = async id => + request.get({ url: `/application/${id}` }) + diff --git a/core/core-frontend/src/api/application/module.ts b/core/core-frontend/src/api/application/module.ts new file mode 100644 index 0000000..0045516 --- /dev/null +++ b/core/core-frontend/src/api/application/module.ts @@ -0,0 +1,15 @@ +import request from '@/config/axios' + +export const moduleList = (params) => request.get({ url: '/application/module/list',params }) +export const moduleAdd = data => request.post({ url: '/application/module/save', data }) + +export const moduleUpdate = data => request.post({ url: '/application/module/update', data }) + + + + +// export const findApplicationById = async id => +// request.get({ url: `/application/module/${id}` }) + + export const moduleDel = async id => + request.delete({ url: `/application/module/${id}` }) \ No newline at end of file diff --git a/core/core-frontend/src/assets/newimg/avatar.png b/core/core-frontend/src/assets/newimg/avatar.png new file mode 100644 index 0000000..5dbc0a9 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/avatar.png differ diff --git a/core/core-frontend/src/assets/newimg/avatar.svg b/core/core-frontend/src/assets/newimg/avatar.svg new file mode 100644 index 0000000..0a23116 --- /dev/null +++ b/core/core-frontend/src/assets/newimg/avatar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/core-frontend/src/assets/newimg/exit.png b/core/core-frontend/src/assets/newimg/exit.png new file mode 100644 index 0000000..e34a02a Binary files /dev/null and b/core/core-frontend/src/assets/newimg/exit.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/add.png b/core/core-frontend/src/assets/newimg/icon/add.png new file mode 100644 index 0000000..c083c0c Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/add.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/bianji.png b/core/core-frontend/src/assets/newimg/icon/bianji.png new file mode 100644 index 0000000..4d25a70 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/bianji.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/caidan.png b/core/core-frontend/src/assets/newimg/icon/caidan.png new file mode 100644 index 0000000..7efe925 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/caidan.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/del.png b/core/core-frontend/src/assets/newimg/icon/del.png new file mode 100644 index 0000000..dfa9b76 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/del.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/dian.png b/core/core-frontend/src/assets/newimg/icon/dian.png new file mode 100644 index 0000000..8dc2561 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/dian.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/edit.png b/core/core-frontend/src/assets/newimg/icon/edit.png new file mode 100644 index 0000000..b36aabb Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/edit.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/export.png b/core/core-frontend/src/assets/newimg/icon/export.png new file mode 100644 index 0000000..2779acc Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/export.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/fuwu.png b/core/core-frontend/src/assets/newimg/icon/fuwu.png new file mode 100644 index 0000000..24b94e6 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/fuwu.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/permission.png b/core/core-frontend/src/assets/newimg/icon/permission.png new file mode 100644 index 0000000..e4db4e7 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/permission.png differ diff --git a/core/core-frontend/src/assets/newimg/icon/release.png b/core/core-frontend/src/assets/newimg/icon/release.png new file mode 100644 index 0000000..755a2fb Binary files /dev/null and b/core/core-frontend/src/assets/newimg/icon/release.png differ diff --git a/core/core-frontend/src/assets/newimg/logo.png b/core/core-frontend/src/assets/newimg/logo.png new file mode 100644 index 0000000..274e9d9 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/logo.png differ diff --git a/core/core-frontend/src/assets/newimg/logosmall.png b/core/core-frontend/src/assets/newimg/logosmall.png new file mode 100644 index 0000000..a200697 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/logosmall.png differ diff --git a/core/core-frontend/src/assets/newimg/u103.png b/core/core-frontend/src/assets/newimg/u103.png new file mode 100644 index 0000000..9803aca Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u103.png differ diff --git a/core/core-frontend/src/assets/newimg/u110.png b/core/core-frontend/src/assets/newimg/u110.png new file mode 100644 index 0000000..1859b87 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u110.png differ diff --git a/core/core-frontend/src/assets/newimg/u166.png b/core/core-frontend/src/assets/newimg/u166.png new file mode 100644 index 0000000..64f01f8 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u166.png differ diff --git a/core/core-frontend/src/assets/newimg/u17.png b/core/core-frontend/src/assets/newimg/u17.png new file mode 100644 index 0000000..d7cc6be Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u17.png differ diff --git a/core/core-frontend/src/assets/newimg/u22.png b/core/core-frontend/src/assets/newimg/u22.png new file mode 100644 index 0000000..1a93964 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u22.png differ diff --git a/core/core-frontend/src/assets/newimg/u42.png b/core/core-frontend/src/assets/newimg/u42.png new file mode 100644 index 0000000..e6394f3 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u42.png differ diff --git a/core/core-frontend/src/assets/newimg/u43.png b/core/core-frontend/src/assets/newimg/u43.png new file mode 100644 index 0000000..648dbad Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u43.png differ diff --git a/core/core-frontend/src/assets/newimg/u47.png b/core/core-frontend/src/assets/newimg/u47.png new file mode 100644 index 0000000..fd7aadf Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u47.png differ diff --git a/core/core-frontend/src/assets/newimg/u56.png b/core/core-frontend/src/assets/newimg/u56.png new file mode 100644 index 0000000..6b70b8c Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u56.png differ diff --git a/core/core-frontend/src/assets/newimg/u594.png b/core/core-frontend/src/assets/newimg/u594.png new file mode 100644 index 0000000..719d3bd Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u594.png differ diff --git a/core/core-frontend/src/assets/newimg/u62.png b/core/core-frontend/src/assets/newimg/u62.png new file mode 100644 index 0000000..bf0258c Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u62.png differ diff --git a/core/core-frontend/src/assets/newimg/u74.png b/core/core-frontend/src/assets/newimg/u74.png new file mode 100644 index 0000000..74b4194 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u74.png differ diff --git a/core/core-frontend/src/assets/newimg/u76.png b/core/core-frontend/src/assets/newimg/u76.png new file mode 100644 index 0000000..2e5c2e3 Binary files /dev/null and b/core/core-frontend/src/assets/newimg/u76.png differ diff --git a/core/core-frontend/src/assets/svg/DataEase1.svg b/core/core-frontend/src/assets/svg/DataEase1.svg new file mode 100644 index 0000000..3fe02e0 --- /dev/null +++ b/core/core-frontend/src/assets/svg/DataEase1.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/core/core-frontend/src/assets/svg/logo1.svg b/core/core-frontend/src/assets/svg/logo1.svg new file mode 100644 index 0000000..6acaee2 --- /dev/null +++ b/core/core-frontend/src/assets/svg/logo1.svg @@ -0,0 +1,21 @@ + + + diff --git a/core/core-frontend/src/router/index.ts b/core/core-frontend/src/router/index.ts index 0d64e54..5dff11d 100644 --- a/core/core-frontend/src/router/index.ts +++ b/core/core-frontend/src/router/index.ts @@ -134,6 +134,13 @@ export const routes: AppRouteRecordRaw[] = [ meta: {}, component: () => import('@/custom-component/rich-text/DeRichTextView.vue') }, + { + path: '/module', + name: 'module', + hidden: true, + meta: {}, + component: () => import('@/viewsnew/application/module/index.vue') + }, { path: '/modify-pwd', name: 'modify-pwd', diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less index eaf547b..4abbe0d 100644 --- a/core/core-frontend/src/style/index.less +++ b/core/core-frontend/src/style/index.less @@ -667,3 +667,7 @@ strong { height: 22px !important; line-height: 22px !important; } + +.ed-main{ + overflow: hidden !important; +} diff --git a/core/core-frontend/src/utils/validate.ts b/core/core-frontend/src/utils/validate.ts index efb9858..0bbe3de 100644 --- a/core/core-frontend/src/utils/validate.ts +++ b/core/core-frontend/src/utils/validate.ts @@ -14,3 +14,34 @@ export function validUsername(str) { export const PHONE_REGEX = '^1[3|4|5|7|8][0-9]{9}$' export const EMAIL_REGEX = '^[a-zA-Z0-9_._-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$' + + +export function publicTree(equiptrees:any,equipname:any) { + let arr:any = [] + let newequiptree = JSON.parse(JSON.stringify(equiptrees)) + if(equipname !=''&& equipname !=null){ + newequiptree.forEach((item:any) => { + if(item.name.toLowerCase().indexOf(equipname.toLowerCase()) !== -1){ + arr.push(item) + } + }) + }else{ + arr = newequiptree + } + if(!Array.isArray(arr) || !arr.length) return; + let map:any = {}; + arr.forEach(item => {//建立每个数组元素id和该对象的关系 + map[item.id] = item //这里可以理解为浅拷贝，共享引用 + }) + let roots:any = []; + arr.forEach(item => { + const parent = map[item.pid]; + if(parent){ + (parent.children || (parent.children=[])).push(item); + } + else{ + roots.push(item); + } + }) + return roots +} diff --git a/core/core-frontend/src/viewsnew/application/addpopup.vue b/core/core-frontend/src/viewsnew/application/addpopup.vue new file mode 100644 index 0000000..3f1ae39 --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/addpopup.vue @@ -0,0 +1,245 @@ + + + + + diff --git a/core/core-frontend/src/viewsnew/application/index.vue b/core/core-frontend/src/viewsnew/application/index.vue new file mode 100644 index 0000000..9066bd1 --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/index.vue @@ -0,0 +1,252 @@ + + + + diff --git a/core/core-frontend/src/viewsnew/application/module/Leftmenu/addpopup.vue b/core/core-frontend/src/viewsnew/application/module/Leftmenu/addpopup.vue new file mode 100644 index 0000000..a5ce33d --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/module/Leftmenu/addpopup.vue @@ -0,0 +1,245 @@ + + + + + diff --git a/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue b/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue new file mode 100644 index 0000000..6a11e5a --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue @@ -0,0 +1,435 @@ + + + + + diff --git a/core/core-frontend/src/viewsnew/application/module/Rightmenu/index.vue b/core/core-frontend/src/viewsnew/application/module/Rightmenu/index.vue new file mode 100644 index 0000000..75c7e61 --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/module/Rightmenu/index.vue @@ -0,0 +1,98 @@ + + + + diff --git a/core/core-frontend/src/viewsnew/application/module/header.vue b/core/core-frontend/src/viewsnew/application/module/header.vue new file mode 100644 index 0000000..8a04938 --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/module/header.vue @@ -0,0 +1,108 @@ + + + + diff --git a/core/core-frontend/src/viewsnew/application/module/index.vue b/core/core-frontend/src/viewsnew/application/module/index.vue new file mode 100644 index 0000000..d29e969 --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/module/index.vue @@ -0,0 +1,39 @@ + + + + diff --git a/core/core-frontend/src/viewsnew/layout/components/Header.vue b/core/core-frontend/src/viewsnew/layout/components/Header.vue new file mode 100644 index 0000000..140129a --- /dev/null +++ b/core/core-frontend/src/viewsnew/layout/components/Header.vue @@ -0,0 +1,36 @@ + + + + + diff --git a/core/core-frontend/src/viewsnew/layout/components/Sidebar.vue b/core/core-frontend/src/viewsnew/layout/components/Sidebar.vue new file mode 100644 index 0000000..822b5b6 --- /dev/null +++ b/core/core-frontend/src/viewsnew/layout/components/Sidebar.vue @@ -0,0 +1,111 @@ + + + \ No newline at end of file diff --git a/core/core-frontend/src/viewsnew/layout/index.vue b/core/core-frontend/src/viewsnew/layout/index.vue new file mode 100644 index 0000000..384178e --- /dev/null +++ b/core/core-frontend/src/viewsnew/layout/index.vue @@ -0,0 +1,104 @@ + + + + +