diff --git a/yanzhu-manage/src/main/java/com/yanzhu/project/controller/CompanyController.java b/yanzhu-manage/src/main/java/com/yanzhu/project/controller/CompanyController.java new file mode 100644 index 0000000..572ea08 --- /dev/null +++ b/yanzhu-manage/src/main/java/com/yanzhu/project/controller/CompanyController.java @@ -0,0 +1,30 @@ +package com.yanzhu.project.controller; + +import com.yanzhu.common.core.controller.BaseController; +import com.yanzhu.common.core.domain.AjaxResult; +import com.yanzhu.common.core.domain.entity.SysDept; +import com.yanzhu.system.service.ISysDeptService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/project/company") +public class CompanyController extends BaseController { + @Autowired + private ISysDeptService deptService; + + + @PreAuthorize("@ss.hasPermi('project:company:list')") + @PostMapping("/list") + public AjaxResult companyList(@RequestBody SysDept where) + { + where.setParentId(100l); + where.setDelFlag("0"); + List depts = deptService.selectDeptList(where); + return success(depts); + } + +} diff --git a/yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProjectController.java b/yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProjectController.java new file mode 100644 index 0000000..2ea4778 --- /dev/null +++ b/yanzhu-manage/src/main/java/com/yanzhu/project/controller/ProjectController.java @@ -0,0 +1,32 @@ +package com.yanzhu.project.controller; + +import com.yanzhu.common.core.controller.BaseController; +import com.yanzhu.common.core.domain.AjaxResult; +import com.yanzhu.common.core.domain.entity.SysDept; +import com.yanzhu.system.service.ISysDeptService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/project/project") +public class ProjectController extends BaseController { + @Autowired + private ISysDeptService deptService; + + + @PreAuthorize("@ss.hasPermi('project:project:list')") + @PostMapping("/list") + public AjaxResult companyList(@RequestBody SysDept where) + { + where.setDelFlag("0"); + List depts = deptService.selectDeptList(where); + return success(depts); + } + +} diff --git a/yanzhu-ui/.env.development b/yanzhu-ui/.env.development index 302ecd1..edb5851 100644 --- a/yanzhu-ui/.env.development +++ b/yanzhu-ui/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 研筑临时项目管理系统 # 开发环境配置 ENV = 'development' -# 若依管理系统/开发环境 +# 研筑临时项目管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/yanzhu-ui/.env.production b/yanzhu-ui/.env.production index b4893b0..ecce34d 100644 --- a/yanzhu-ui/.env.production +++ b/yanzhu-ui/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 研筑临时项目管理系统 # 生产环境配置 ENV = 'production' -# 若依管理系统/生产环境 +# 研筑临时项目管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/yanzhu-ui/.env.staging b/yanzhu-ui/.env.staging index 361859f..477f9d9 100644 --- a/yanzhu-ui/.env.staging +++ b/yanzhu-ui/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 研筑临时项目管理系统 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 若依管理系统/测试环境 +# 研筑临时项目管理系统/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/yanzhu-ui/package.json b/yanzhu-ui/package.json index d7fd40b..ff4aa2a 100644 --- a/yanzhu-ui/package.json +++ b/yanzhu-ui/package.json @@ -1,8 +1,8 @@ { "name": "yanZhu", "version": "3.8.7", - "description": "若依管理系统", - "author": "若依", + "description": "研筑临时项目管理系统", + "author": "研筑科技", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", diff --git a/yanzhu-ui/src/api/project/company.js b/yanzhu-ui/src/api/project/company.js new file mode 100644 index 0000000..047c631 --- /dev/null +++ b/yanzhu-ui/src/api/project/company.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + + +// 查询项目申请列表 +export function companyList(data) { + return request({ + url: '/project/company/list', + method: 'post', + data:data + }) + } \ No newline at end of file diff --git a/yanzhu-ui/src/api/project/project.js b/yanzhu-ui/src/api/project/project.js new file mode 100644 index 0000000..def82e3 --- /dev/null +++ b/yanzhu-ui/src/api/project/project.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' + + +// 查询项目申请列表 +export function projectList(data) { + return request({ + url: '/project/project/list', + method: 'post', + data:data + }) + } \ No newline at end of file diff --git a/yanzhu-ui/src/layout/components/Navbar.vue b/yanzhu-ui/src/layout/components/Navbar.vue index ed92f3d..4eeb58f 100644 --- a/yanzhu-ui/src/layout/components/Navbar.vue +++ b/yanzhu-ui/src/layout/components/Navbar.vue @@ -9,13 +9,8 @@