员工信息导出，一张图

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -57,6 +57,15 @@ public class CmcProjectController extends BaseController
     {
         startPage();
         List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
+        for (CmcProject project : list) {
+            String underTakingDept = cmcProject.getUndertakingDept();
+            StringBuilder underTakingDeptName = new StringBuilder();
+            if (underTakingDept != null && !underTakingDept.equals("") && underTakingDept.split(",").length > 0) {
+                for (String dept : underTakingDept.split(","))
+                    underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
+                cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
+            }
+        }
         return getDataTable(list);
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -9,6 +9,8 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.IDCard;
+import com.ruoyi.framework.web.domain.server.Sys;
 import com.ruoyi.oa.domain.CmcUserHistory;
 import com.ruoyi.oa.service.ICmcUserHistoryService;
 import org.apache.commons.lang3.ArrayUtils;
@@ -86,6 +88,16 @@ public class SysUserController extends BaseController
     public void export(HttpServletResponse response, SysUser user)
     {
         List<SysUser> list = userService.selectUserList(user);
+        for (SysUser sysUser : list) {
+            sysUser.setAge(IDCard.getBirAgeSex(sysUser.getIdCard()).getInteger("age"));
+            sysUser.setBirthday(IDCard.getBirAgeSex(sysUser.getIdCard()).getDate("birthday"));
+            StringBuilder postName = new StringBuilder();
+            List<Long> userPostList = postService.selectPostListByUserId(sysUser.getUserId());
+            for (Long post : userPostList)
+                postName.append(postService.selectPostById(post).getPostName()).append("、");
+            sysUser.setPostNames(postName.substring(0, postName.length() - 1));
+            sysUser.setUserId(sysUser.getUserId() - 1);
+        }
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.exportExcel(response, list, "用户数据");
     }

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -31,7 +31,7 @@ public class SysUser extends BaseEntity
     private Long deptId;
 
     /** 用户账号 */
-    @Excel(name = "登录名称")
+//    @Excel(name = "登录名称")
     private String userName;
 
     /** 用户昵称 */
@@ -39,7 +39,7 @@ public class SysUser extends BaseEntity
     private String nickName;
 
     /** 用户邮箱 */
-    @Excel(name = "用户邮箱")
+//    @Excel(name = "用户邮箱")
     private String email;
 
     /** 手机号码 */
@@ -64,24 +64,19 @@ public class SysUser extends BaseEntity
     private String delFlag;
 
     /** 最后登录IP */
-    @Excel(name = "最后登录IP", type = Type.EXPORT)
+//    @Excel(name = "最后登录IP", type = Type.EXPORT)
     private String loginIp;
 
     /** 最后登录时间 */
-    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+//    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
-    /** 部门经理级别 */
-    @Excel(name = "部门经理级别", readConverterExp = "0=一级,1=二级,2=三级")
-    private String pmLevel;
-
-    /** 岗级 */
-    @Excel(name = "岗级", readConverterExp = "0=一岗,1=二岗,2=三岗,3=四岗,4=五岗,5=六岗,6=七岗,7=八岗")
-    private String postLevel;
+    @Excel(name = "岗位")
+    private String postNames;
 
-    /** 薪档 */
-    @Excel(name = "薪档", readConverterExp = "0=一档,1=二档,2=三档,3=四档,4=五档,5=六档,6=七档,7=八档")
-    private String salaryLevel;
+    /** 项目经理级别 */
+    @Excel(name = "项目经理级别", readConverterExp = "0=一级,1=二级,2=三级")
+    private String pmLevel;
 
     /** 工程师岗级 */
     @Excel(name = "工程师岗级", readConverterExp = "0=一级,1=二级,2=三级,3=四级,4=五级,5=六级")
@@ -91,6 +86,14 @@ public class SysUser extends BaseEntity
     @Excel(name = "技工等级", readConverterExp = "0=一级,1=二级,2=三级")
     private String operatorLevel;
 
+    /** 岗级 */
+    @Excel(name = "岗级", readConverterExp = "0=一岗,1=二岗,2=三岗,3=四岗,4=五岗,5=六岗,6=七岗,7=八岗")
+    private String postLevel;
+
+    /** 薪档 */
+    @Excel(name = "薪档", readConverterExp = "0=一档,1=二档,2=三档,3=四档,4=五档,5=六档,6=七档,7=八档")
+    private String salaryLevel;
+
     /** 技术职称 */
     @Excel(name = "技术职称", readConverterExp = "0=正高级工程师,1=高级工程师,2=中级工程师,3=助理工程师,4=高级会计师,5=会计师,6=助理会计师,7=高级经济师,8=经济师,9=助理经济师,10=工人高级工,11=工人中级工,12=工人初级工,13=无职称")
     private String titles;
@@ -158,7 +161,7 @@ public class SysUser extends BaseEntity
     /** 部门对象 */
     @Excels({
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
-        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+//        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
     })
     private SysDept dept;
 
@@ -589,6 +592,15 @@ public class SysUser extends BaseEntity
     {
         return homePlace;
     }
+    public void setPostNames(String postNames)
+    {
+        this.postNames = postNames;
+    }
+
+    public String getPostNames()
+    {
+        return postNames;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/utils/IDCard.java

@@ -0,0 +1,47 @@
+package com.ruoyi.common.utils;
+
+import com.alibaba.fastjson2.JSONObject;
+
+import java.util.Calendar;
+
+public class IDCard {
+    /**
+     * 通过身份证号码获取出生日期、性别、年龄
+     * @param certificateNo
+     * @return 返回的出生日期格式：1990-01-01 性别格式：F-女，M-男
+     */
+    public static JSONObject getBirAgeSex(String certificateNo) {
+        String birthday = "";
+        int age = 0;
+        String sexCode = "";
+
+        int year = Calendar.getInstance().get(Calendar.YEAR);
+        int month = Calendar.getInstance().get(Calendar.MONTH) + 1;
+        int day = Calendar.getInstance().get(Calendar.DATE);
+        char[] number = certificateNo.toCharArray();
+        boolean flag = true;
+        if (number.length == 18) {
+            for (int x = 0; x < number.length - 1; x++) {
+                if (!flag)
+                    return new JSONObject();
+                flag = Character.isDigit(number[x]);
+            }
+        }
+        if (flag && number.length == 18) {
+            birthday = certificateNo.substring(6, 10) + "-" + certificateNo.substring(10, 12) + "-"
+                    + certificateNo.substring(12, 14);
+            sexCode = Integer.parseInt(certificateNo.substring(certificateNo.length() - 4, certificateNo.length() - 1))
+                    % 2 == 0 ? "F" : "M";
+            if ((Integer.parseInt(certificateNo.substring(10, 12)) < month) || (Integer.parseInt(certificateNo.substring(10, 12)) == month && (Integer.parseInt(certificateNo.substring(12, 14))<= day) )){
+                age = year - Integer.parseInt(certificateNo.substring(6, 10));
+            }else {
+                age = year - Integer.parseInt(certificateNo.substring(6, 10)) - 1;
+            }
+        }
+        JSONObject map = new JSONObject();
+        map.put("birthday", birthday);
+        map.put("age", age);
+        map.put("sexCode", sexCode);
+        return map;
+    }
+}

oa-back/sql/sql.sql

@@ -380,11 +380,12 @@ insert into sys_menu values('4', 	'人事管理', '0', '4', 'staff',		null, '',
 insert into sys_menu values('5', 	'设备管理', '0', '5', 'device',		null, '', 1, 0, 'M', '0', '0', '', 'equipment',	'admin', sysdate(), '', null, '设备管理菜单');
 insert into sys_menu values('6', 	'车辆管理', '0', '6', 'car',		'oa/car/index', 			'', 1, 0, 'C', '0', '0', 'oa:car:list', 	'car',		'admin', sysdate(), '', null, '车辆管理菜单');
 insert into sys_menu values('7', 	'投标管理', '0', '7', 'tender',		'oa/tender/index', 			'', 1, 0, 'C', '0', '0', 'oa:tender:list', 	'guide',	'admin', sysdate(), '', null, '投标管理菜单');
-insert into sys_menu values('8', 	'合同管理', '0', '8', 'contract',	'oa/contract/index', 		'', 1, 0, 'C', '0', '0', 'oa:contract:list','documentation',	'admin', sysdate(), '', null, '合同管理菜单');
-insert into sys_menu values('9', 	'项目台账', '0', '9', 'project',	'oa/project/index', 		'', 1, 0, 'C', '0', '0', 'oa:project:list', 'project',	'admin', sysdate(), '', null, '项目管理菜单');
-insert into sys_menu values('10', 	'单价管理', '0', '10', 'price',		'oa/price/index', 			'', 1, 0, 'C', '0', '0', 'oa:price:list', 	'money',	'admin', sysdate(), '', null, '单价管理菜单');
-insert into sys_menu values('11', 	'资料管理', '0', '11', 'file', 		'file/filesProject/index',  '', 1, 0, 'C', '0', '0', 'oa:archive:list',	'education','admin', sysdate(), '', NULL, '资料管理菜单');
-insert into sys_menu values('12', 	'一张图', 	'0', '12', 'gis', 		'file/index',  				'', 1, 0, 'C', '0', '0', '', 				'international','admin', sysdate(), '', NULL, '一张图菜单');
+insert into sys_menu values('8', 	'品牌项目', '0', '8', 'brand',		'oa/brand/brandProject', 	'', 1, 0, 'C', '0', '0', 'oa:brand:list', 	'project',	'admin', sysdate(), '', null, '品牌项目管理菜单');
+insert into sys_menu values('9', 	'合同管理', '0', '9', 'contract',	'oa/contract/index', 		'', 1, 0, 'C', '0', '0', 'oa:contract:list','documentation',	'admin', sysdate(), '', null, '合同管理菜单');
+insert into sys_menu values('10', 	'项目台账', '0', '10', 'project',	'oa/project/index', 		'', 1, 0, 'C', '0', '0', 'oa:project:list', 'project',	'admin', sysdate(), '', null, '项目管理菜单');
+insert into sys_menu values('11', 	'单价管理', '0', '11', 'price',		'oa/price/index', 			'', 1, 0, 'C', '0', '0', 'oa:price:list', 	'money',	'admin', sysdate(), '', null, '单价管理菜单');
+insert into sys_menu values('12', 	'资料管理', '0', '12', 'file', 		'file/filesProject/index',  '', 1, 0, 'C', '0', '0', 'oa:archive:list',	'education','admin', sysdate(), '', NULL, '资料管理菜单');
+insert into sys_menu values('13', 	'一张图', 	'0', '13', 'gis', 		'file/index',  				'', 1, 0, 'C', '0', '0', '', 				'international','admin', sysdate(), '', NULL, '一张图菜单');
 
 -- 二级菜单
 insert into sys_menu values('100',  '用户管理', '1',   '1', 'user',       'system/user/index',        '', 1, 0, 'C', '0', '0', 'system:user:list',        'user',          'admin', sysdate(), '', null, '用户管理菜单');
@@ -506,42 +507,48 @@ insert into sys_menu values('1074', '投标新增', '7', '2', '#', '', '', 1, 0,
 insert into sys_menu values('1075', '投标修改', '7', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:tender:edit',            	'#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1076', '投标删除', '7', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:tender:remove',          	'#', 'admin', sysdate(), '', null, '');
 insert into sys_menu values('1077', '投标导出', '7', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:tender:export',          	'#', 'admin', sysdate(), '', null, '');
+-- 品牌项目管理按钮
+insert into sys_menu values('1078', '品牌项目查询', '8', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brand:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1079', '品牌项目新增', '8', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brand:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1080', '品牌项目修改', '8', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brand:edit',            '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1081', '品牌项目删除', '8', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brand:remove',          '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1082', '品牌项目导出', '8', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:brand:export',          '#', 'admin', sysdate(), '', null, '');
 -- 合同管理按钮
-insert into sys_menu values('1078', '合同查询', '8', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1079', '合同新增', '8', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1080', '合同修改', '8', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:edit',             '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1081', '合同删除', '8', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:remove',           '#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1082', '合同导出', '8', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:export',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1083', '合同查询', '9', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1084', '合同新增', '9', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1085', '合同修改', '9', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:edit',             '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1086', '合同删除', '9', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:remove',           '#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1087', '合同导出', '9', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:contract:export',           '#', 'admin', sysdate(), '', null, '');
 -- 项目管理按钮
-insert into sys_menu values('1083', '项目查询', '9', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:query',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1084', '项目新增', '9', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1085', '项目修改', '9', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:edit',            	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1086', '项目删除', '9', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:remove',          	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1087', '项目导出', '9', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:export',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1088', '项目查询', '10', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1089', '项目新增', '10', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1090', '项目修改', '10', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:edit',            	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1091', '项目删除', '10', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:remove',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1092', '项目导出', '10', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:project:export',          	'#', 'admin', sysdate(), '', null, '');
 -- 项目管理按钮
-insert into sys_menu values('1088', '工资查询', '119', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1089', '工资新增', '119', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1090', '工资修改', '119', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:edit',            	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1091', '工资删除', '119', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:remove',          	'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1092', '工资导出', '119', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:export',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1093', '工资查询', '119', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1094', '工资新增', '119', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1095', '工资修改', '119', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:edit',            	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1096', '工资删除', '119', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:remove',          	'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1097', '工资导出', '119', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:salary:export',          	'#', 'admin', sysdate(), '', null, '');
 -- 资料管理按钮
-insert into sys_menu values('1093', '资料查询', '11', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1094', '资料新增', '11', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1095', '资料修改', '11', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:edit',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1096', '资料删除', '11', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:remove',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1097', '资料导出', '11', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:export',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1098', '资料查询', '12', '1', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1099', '资料新增', '12', '2', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1100', '资料修改', '12', '3', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:edit',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1101', '资料删除', '12', '4', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:remove',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1102', '资料导出', '12', '5', '#', '', '', 1, 0, 'F', '0', '0', 'oa:archive:export',			'#', 'admin', sysdate(), '', null, '');
 -- 设备记录按钮
-insert into sys_menu values('1098', '记录查询', '5', '3', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:query',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1099', '记录新增', '5', '4', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:add',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1100', '记录修改', '5', '5', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:edit',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1101', '记录删除', '5', '6', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:remove',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1102', '记录导出', '5', '7', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:export',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1103', '记录查询', '5', '3', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:query',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1104', '记录新增', '5', '4', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:add',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1105', '记录修改', '5', '5', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:edit',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1106', '记录删除', '5', '6', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:remove',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1107', '记录导出', '5', '7', '#', '', '', 1, 0, 'F', '0', '0', 'device:record:export',			'#', 'admin', sysdate(), '', null, '');
 -- 车辆记录按钮
-insert into sys_menu values('1103', '记录查询', '6', '6', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:query',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1104', '记录新增', '6', '7', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:add',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1105', '记录修改', '6', '8', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:edit',				'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1106', '记录删除', '6', '9', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:remove',			'#', 'admin', sysdate(), '', null, '');
-insert into sys_menu values('1107', '记录导出', '6', '10', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:export',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1108', '记录查询', '6', '6', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:query',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1109', '记录新增', '6', '7', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:add',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1110', '记录修改', '6', '8', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:edit',				'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1111', '记录删除', '6', '9', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:remove',			'#', 'admin', sysdate(), '', null, '');
+insert into sys_menu values('1112', '记录导出', '6', '10', '#', '', '', 1, 0, 'F', '0', '0', 'car:record:export',			'#', 'admin', sysdate(), '', null, '');
 
 -- ----------------------------
 -- 6、用户和角色关联表  用户N-1角色
@@ -749,7 +756,7 @@ create table sys_role_menu (
 -- ----------------------------
 -- 初始化-角色和菜单关联表数据
 -- ----------------------------
-insert into `sys_role_menu` values (2, 9);
+insert into `sys_role_menu` values (2, 10);
 insert into `sys_role_menu` values (2, 1000);
 insert into `sys_role_menu` values (2, 1001);
 insert into `sys_role_menu` values (2, 1017);
@@ -771,11 +778,11 @@ insert into `sys_role_menu` values (4, 1069);
 insert into `sys_role_menu` values (4, 1070);
 insert into `sys_role_menu` values (4, 1071);
 insert into `sys_role_menu` values (4, 1072);
-insert into `sys_role_menu` values (4, 1098);
-insert into `sys_role_menu` values (4, 1099);
-insert into `sys_role_menu` values (4, 1100);
-insert into `sys_role_menu` values (4, 1101);
-insert into `sys_role_menu` values (4, 1102);
+insert into `sys_role_menu` values (4, 1103);
+insert into `sys_role_menu` values (4, 1104);
+insert into `sys_role_menu` values (4, 1105);
+insert into `sys_role_menu` values (4, 1106);
+insert into `sys_role_menu` values (4, 1107);
 insert into `sys_role_menu` values (5, 6);
 insert into `sys_role_menu` values (5, 1063);
 insert into `sys_role_menu` values (5, 1064);
@@ -787,12 +794,13 @@ insert into `sys_role_menu` values (5, 1104);
 insert into `sys_role_menu` values (5, 1105);
 insert into `sys_role_menu` values (5, 1106);
 insert into `sys_role_menu` values (5, 1107);
-insert into `sys_role_menu` values (6, 11);
-insert into `sys_role_menu` values (6, 1093);
-insert into `sys_role_menu` values (6, 1094);
-insert into `sys_role_menu` values (6, 1095);
-insert into `sys_role_menu` values (6, 1096);
-insert into `sys_role_menu` values (6, 1097);
+insert into `sys_role_menu` values (6, 12);
+insert into `sys_role_menu` values (6, 13);
+insert into `sys_role_menu` values (6, 1098);
+insert into `sys_role_menu` values (6, 1099);
+insert into `sys_role_menu` values (6, 1100);
+insert into `sys_role_menu` values (6, 1101);
+insert into `sys_role_menu` values (6, 1102);
 insert into `sys_role_menu` values (7, 4);
 insert into `sys_role_menu` values (7, 5);
 insert into `sys_role_menu` values (7, 6);
@@ -800,6 +808,9 @@ insert into `sys_role_menu` values (7, 7);
 insert into `sys_role_menu` values (7, 8);
 insert into `sys_role_menu` values (7, 9);
 insert into `sys_role_menu` values (7, 10);
+insert into `sys_role_menu` values (7, 11);
+insert into `sys_role_menu` values (7, 12);
+insert into `sys_role_menu` values (7, 13);
 insert into `sys_role_menu` values (7, 118);
 insert into `sys_role_menu` values (7, 119);
 insert into `sys_role_menu` values (7, 120);
@@ -812,13 +823,14 @@ insert into `sys_role_menu` values (7, 1067);
 insert into `sys_role_menu` values (7, 1068);
 insert into `sys_role_menu` values (7, 1072);
 insert into `sys_role_menu` values (7, 1073);
-insert into `sys_role_menu` values (7, 1077);
 insert into `sys_role_menu` values (7, 1078);
 insert into `sys_role_menu` values (7, 1082);
 insert into `sys_role_menu` values (7, 1083);
 insert into `sys_role_menu` values (7, 1087);
-insert into `sys_role_menu` values (7, 1098);
+insert into `sys_role_menu` values (7, 1088);
+insert into `sys_role_menu` values (7, 1092);
 insert into `sys_role_menu` values (7, 1103);
+insert into `sys_role_menu` values (7, 1108);
 insert into `sys_role_menu` values (7, 2023);
 insert into `sys_role_menu` values (7, 2024);
 insert into `sys_role_menu` values (7, 2025);
@@ -828,6 +840,7 @@ insert into `sys_role_menu` values (7, 2032);
 insert into `sys_role_menu` values (7, 2033);
 insert into `sys_role_menu` values (8, 7);
 insert into `sys_role_menu` values (8, 8);
+insert into `sys_role_menu` values (8, 13);
 insert into `sys_role_menu` values (8, 1073);
 insert into `sys_role_menu` values (8, 1074);
 insert into `sys_role_menu` values (8, 1075);
@@ -838,7 +851,12 @@ insert into `sys_role_menu` values (8, 1079);
 insert into `sys_role_menu` values (8, 1080);
 insert into `sys_role_menu` values (8, 1081);
 insert into `sys_role_menu` values (8, 1082);
+insert into `sys_role_menu` values (8, 1083);
+insert into `sys_role_menu` values (8, 1084);
+insert into `sys_role_menu` values (8, 1085);
+insert into `sys_role_menu` values (8, 1086);
 insert into `sys_role_menu` values (8, 1087);
+insert into `sys_role_menu` values (8, 1092);
 
 -- ----------------------------
 -- 8、角色和部门关联表  角色1-N部门
@@ -932,9 +950,9 @@ insert into `sys_user_post` values (26, 27);
 insert into `sys_user_post` values (27, 26);
 insert into `sys_user_post` values (28, 27);
 insert into `sys_user_post` values (29, 16);
-insert into `sys_user_post` values (30, 25);
-insert into `sys_user_post` values (31, 27);
-insert into `sys_user_post` values (32, 27);
+insert into `sys_user_post` values (30, 28);
+insert into `sys_user_post` values (31, 29);
+insert into `sys_user_post` values (32, 28);
 insert into `sys_user_post` values (33, 15);
 insert into `sys_user_post` values (34, 30);
 insert into `sys_user_post` values (35, 25);

oa-ui/package.json

@@ -60,6 +60,7 @@
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
+    "ol": "^6.0.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
@@ -67,6 +68,7 @@
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
+    "vue-demi": "^0.14.8",
     "vue-meta": "2.4.0",
     "vue-print-nb": "^1.7.5",
     "vue-router": "3.4.9",

oa-ui/src/store/getters.js

@@ -24,5 +24,6 @@ const getters = {
   topbarRouters: state => state.permission.topbarRouters,
   defaultRoutes: state => state.permission.defaultRoutes,
   sidebarRouters: state => state.permission.sidebarRouters,
+  map: state => state.ol.map
 }
 export default getters

oa-ui/src/store/index.js

@@ -8,6 +8,7 @@ import permission from './modules/permission'
 import settings from './modules/settings'
 import getters from './getters'
 import projectProcess from './modules/projectProcess'
+import ol from './modules/ol'
 
 Vue.use(Vuex)
 
@@ -19,7 +20,8 @@ const store = new Vuex.Store({
     tagsView,
     permission,
     settings,
-    projectProcess
+    projectProcess,
+    ol
   },
   getters
 })

oa-ui/src/store/modules/ol.js

@@ -0,0 +1,25 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: ysh
+ * @Date: 2022-10-21 14:24:36
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-10-21 14:55:10
+ */
+const ol = {
+  state: {
+    map: null
+  },
+
+  mutations: {
+    SET_MAP: (state, map) => {
+      state.map = map;
+    }
+  },
+  actions:{
+    toggleMap({ commit },map) {
+      commit('SET_MAP',map)
+    },
+  }
+}
+export default ol

oa-ui/src/views/file/index.vue

@@ -0,0 +1,601 @@
+<!--
+ * @Author: wrh
+ * @Date: 2024-06-06 13:40:02
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-07 16:00:36
+-->
+<template>
+  <div class="warpper-container">
+    <!-- 地图 -->
+    <div class="map-container" id="maps" tabindex="0" ref="maps"></div>
+    <!-- 鼠标移动坐标 -->
+    <div id="mouse-position"></div>
+    <!-- 项目信息弹出框 -->
+    <InfoBox :datas="datas" @closePopup="closePopup" @open="openAchiList"></InfoBox>
+    <!-- 工具栏列表 -->
+    <div class="tool-box">
+      <div class="item">
+        <el-tooltip effect="dark" content="视角复位" placement="right">
+          <div class="view" @click="resetView()"></div>
+        </el-tooltip>
+      </div>
+      <div class="item">
+        <el-tooltip effect="dark" content="图层" placement="right">
+          <div class="layers" @click="layersOpen = !layersOpen"></div>
+        </el-tooltip>
+      </div>
+      <!-- <div class="item">
+        <el-tooltip effect="dark" content="矩形框选" placement="right">
+          <div class="select" @click="rectSelect()"></div>
+        </el-tooltip>
+      </div>
+      <div class="item">
+        <el-tooltip effect="dark" content="多边形框选" placement="right">
+          <div class="selectM" @click="polygonSelect()"></div>
+        </el-tooltip>
+      </div> -->
+    </div>
+    <!-- 图层显示 -->
+    <transition-group appear name="animate__animated animate__bounce" enter-active-class="animate__fadeInLeft"
+      leave-active-class="animate__fadeOutLeft">
+      <div class="layer-type dialog_wrap" v-if="layersOpen" @mousedown.stop="move">
+        <div class="layer-content">
+          <div>
+            <el-icon class="close" @click="layersOpen = false">
+              <CloseBold />
+            </el-icon>
+          </div>
+          <el-tabs v-model="activeName" class="demo-tabs">
+            <el-tab-pane label="项目图层" name="first">
+              <ProjectLayer :proTree="proTableData"></ProjectLayer>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </div>
+    </transition-group>
+
+    <!-- 地图样式 -->
+    <div class="switch-map">
+      <SwitchMap></SwitchMap>
+    </div>
+  </div>
+</template>
+<script>
+
+import 'ol/ol.css';
+import { Map, View } from 'ol';
+import { XYZ, Cluster, Vector as VectorSource } from 'ol/source';
+import Overlay from 'ol/Overlay';
+import TileLayer from 'ol/layer/Tile';
+import VectorLayer from 'ol/layer/Vector';
+import { MousePosition, defaults as defaultControls } from 'ol/control';
+import { boundingExtent } from 'ol/extent';
+import { createStringXY } from 'ol/coordinate';
+import Feature from 'ol/Feature';
+import { Point } from 'ol/geom';
+import { Circle, Fill, Stroke, Style, Text } from 'ol/style';
+import ProjectLayer from './index/projectLayer.vue';
+import SwitchMap from './index/switchMap.vue';
+import InfoBox from './index/infoBox.vue';
+import { listProject } from "@/api/file/project";
+import { getAchievementByProject } from "@/api/file/achievement";
+
+export default {
+  components: {
+    ProjectLayer,
+    InfoBox,
+    SwitchMap
+  },
+  data() {
+    return {
+      map: null,
+      clusters: null,
+      popup: null,
+      mousePositionControl: null,
+      proTableData: [],
+      allproTableData: [],
+      layersOpen: false,
+      achiDialogData: [],
+      dialogTableVisible: false,
+      dialogTitle: '',
+      viewCenter: [105.55, 34.18],
+      datas: {
+        clickFeacture: {},
+        selectFeatures: null,
+        selectProjectNumber: "",
+        type: '',
+        infoData: {}
+      },
+      tileLayers: [
+        new TileLayer({
+          source: new XYZ({
+            url: "https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}"
+          }),
+          properties: {
+            name: '高德'
+          },
+          visible: true
+        }),
+        new TileLayer({
+          source: new XYZ({
+            url: "https://gac-geo.googlecnapps.cn/maps/vt?lyrs=s,m&gl=CN&x={x}&y={y}&z={z}"
+          }),
+          properties: {
+            name: '谷歌'
+          },
+          visible: false
+        }),
+        new TileLayer({
+          source: new XYZ({
+            url: "http://t4.tianditu.com/DataServer?T=ter_c&tk=4d02670f819130ba862ebc24a1aebaf3&x={x}&y={y}&l={z}"
+          }),
+          properties: {
+            name: '天地图地形'
+          },
+          visible: false
+        }),
+        new TileLayer({
+          source: new XYZ({
+            url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=81b9a9cf3e4be1df181e7bf54c5949fc&x={x}&y={y}&l={z}"
+          }),
+          properties: {
+            name: '矢量图'
+          },
+          visible: false
+        }),
+        new TileLayer({
+          source: new XYZ({
+            url: 'http://t4.tianditu.com/DataServer?T=img_w&tk=4d02670f819130ba862ebc24a1aebaf3&x={x}&y={y}&l={z}'
+          }),
+          properties: {
+            name: '天地图'
+          },
+          visible: false
+        }),
+        new TileLayer({
+          source: new XYZ({
+            url: "https://tiles1.geovisearth.com/base/v1/img/{z}/{x}/{y}?format=webp&tmsIds=w&token=9b56a7bcb2f51c939753bc066fa6d0e7b7f55cfbf1939fa9e04f53050f4154b9"
+          }),
+          properties: {
+            name: '中科星图'
+          },
+          visible: false
+        }),
+        new TileLayer({
+          source: new XYZ({
+            url: "https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}"
+          }),
+          properties: {
+            name: 'ArcGIS'
+          },
+          visible: false
+        })
+      ],
+    };
+  },
+  watch: {
+    map: function (newval, oldval) {
+      console.log(oldval);
+      console.log(newval);
+    }
+  },
+  mounted() {
+  },
+  created() {
+    this.initMap();
+    this.getProTableData()
+  },
+  methods: {
+    initMap() {
+      const mousePositionControl = new MousePosition({
+        coordinateFormat: createStringXY(4),
+        projection: 'EPSG:4326',
+        className: 'custom-mouse-position',
+        target: document.getElementById('mouse-position'),
+      });
+      this.popup = new Overlay({
+        element: document.getElementById('popup'),
+        autoPan: {
+          animation: {
+            duration: 250,
+          },
+        },
+      });
+      this.popup.setPosition(undefined);
+      this.map = new Map({
+        target: document.getElementById('maps'),
+        controls: defaultControls().extend([mousePositionControl]),
+        overlays: [this.popup],
+        layers: this.tileLayers,
+        view: new View({
+          projection: "EPSG:4326", // 坐标系，有EPSG:4326和EPSG:3857
+          center: this.viewCenters, // 中心点
+          // zoom: 5, // // 地图缩放级别(打开页面时默认级别)
+          // maxZoom: 20,
+          // minZoom: 1,  // 地图缩放最小级别
+        })
+      });
+    },
+    getProTableData() {
+      let param = {
+        pageNum: 1,
+        pageSize: 10000,
+      }
+      listProject(param).then(res => {
+        let data = res.rows;
+        let features = [];
+        let datas = [];
+        for (let d of data) {
+          if (d.kmlLat && d.kmlLng) {
+            let f = new Feature(new Point([Number(d.kmlLng), Number(d.kmlLat)]));
+            f.name = d.projectNumber;
+            features.push(f);
+            datas.push(d);
+          }
+        }
+        this.proTableData = datas;
+        this.allproTableData = datas;
+        let source = new VectorSource({
+          features: features,
+        });
+        let clusterSource = new Cluster({
+          distance: 100,     //群集之间的最小距离（以像素为单位）。
+          source: source,	   //数据源
+        });
+        this.clusters = new VectorLayer({
+          name: 'clusters',
+          source: clusterSource,
+          style: this.clusterStyle(features,),
+          zIndex: 99
+        })
+        this.map.addLayer(this.clusters);
+        this.map.on('click', (e) => {
+          this.clusters.getFeatures(e.pixel).then((clickedFeatures) => {
+            if (clickedFeatures.length) {
+              // Get clustered Coordinates
+              const features = clickedFeatures[0].get('features');
+              if (features.length > 1) {
+                const extent = boundingExtent(
+                  features.map((r) => r.getGeometry().getCoordinates())
+                );
+                this.map.getView().fit(extent, { duration: 1000, padding: [100, 100, 100, 100] });
+              }
+            }
+          });
+        });
+      })
+    },
+
+    clusterStyle(feature, resolution) {
+      let styleCache = {};
+      const size = feature.length;
+      let style = styleCache[size];
+      if (!style) {
+        style = [
+          new Style({
+            image: new Circle({
+              radius: 20,
+              fill: new Fill({
+                color: 'rgba(107,72,255,0.4)',
+              }),
+            }),
+            text: new Text({
+              text: this.getText(feature, resolution),
+              backgroundFill: new Fill({
+                color: '#000',
+              }),
+              fill: new Fill({
+                color: '#fff',
+              }),
+              backgroundStroke: new Stroke({
+                color: '#EFDC05',
+                width: 2,
+              }),
+              padding: [0, 5, 0, 5],
+              // stroke: new Stroke({
+              //   color: 'rgba(0, 0, 0, 0.6)',
+              //   width: 3,
+              // }),
+              font: '18px Calibri,sans-serif',
+              offsetY: -30
+            })
+          }),
+          new Style({
+            image: new Circle({
+              radius: 14,
+              fill: new Fill({
+                color: 'rgba(107,72,255,0.9)',
+              }),
+            }),
+            text: new Text({
+              text: size.toString(),
+              fill: new Fill({
+                color: '#fff',
+              }),
+              stroke: new Stroke({
+                color: 'rgba(0, 0, 0, 0.6)',
+                width: 3,
+              }),
+            })
+          })
+        ];
+        styleCache[size] = style;
+      }
+      return style;
+    },
+    getText(feature, resolution) {
+      let features = feature;
+      let reo = resolution * 100;
+      let text;
+      if (reo > 2) {
+        text = '';
+      } else {
+        if (features.length == 1) {
+          text = features[0].name;
+        }
+      }
+      return text;
+    },
+    closePopup() {
+      this.popup.setPosition(undefined);
+    },
+    openAchiList() {
+      this.dialogTableVisible = true;
+      let projectId = this.datas.clickFeacture.id;
+      this.dialogTitle = this.datas.clickFeacture.projectNumber
+      getAchievementByProject({ projectId }).then(res => {
+        if (res.data.length == 0) {
+          this.$message.error('暂无成果，请添加!');
+          this.achiDialogData = [];
+        } else {
+          this.dialogTableVisible = true;
+          this.achiDialogData = res.data;
+        }
+      })
+    },
+
+    // 视角复位
+    resetView() {
+      this.map.getView().setCenter(this.viewCenter);
+      this.map.getView().setZoom(5)
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+:deep(.el-descriptions__label) {
+  font-weight: bold;
+}
+
+:deep(.el-checkbox__label) {
+  color: #fff;
+}
+
+:deep(.el-dialog) {
+  margin-top: 10vh !important;
+}
+
+.warpper-container {
+  position: relative;
+}
+
+.map-container {
+  width: 100%;
+  height: calc(100vh - 84px);
+}
+
+.layer-type {
+  position: absolute;
+  top: 67px;
+  left: 53px;
+  width: 250px;
+  padding: 12px 10px;
+  background-color: #fff;
+  border-radius: 5px;
+  cursor: move;
+
+  .title {
+    font-size: 16px;
+    text-align: center;
+    line-height: 45px;
+  }
+
+  .layer-content {
+    cursor: default;
+    position: relative;
+
+    .close {
+      position: absolute;
+      top: 0px;
+      right: 2px;
+      z-index: 12;
+    }
+
+    .close:hover {
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+}
+
+.right-project {
+  width: v-bind('theme.width');
+  min-height: 800px;
+  max-height: calc(100vh - 110px);
+  padding: 10px;
+  position: absolute;
+  top: 10px;
+  right: v-bind('theme.right');
+  background-color: #fff;
+  box-shadow: v-bind(--el - box - shadow - dark);
+  transition: all 0.6s ease-in-out;
+
+  .header {
+    width: 100%;
+    text-align: center;
+    line-height: 50px;
+    font-size: 22px;
+    font-weight: 700;
+  }
+
+  .expand-info {
+    .desLabel {
+      font-weight: bold;
+    }
+
+    .look-achi {
+      text-align: right;
+      color: #409EFF;
+      cursor: pointer;
+    }
+
+    .look-achi:hover {
+      color: #1165b8;
+    }
+  }
+
+  .result-click {
+    width: 36px;
+    height: 36px;
+    position: absolute;
+    top: 0;
+    left: -36px;
+    font-size: 16px;
+    transform: translate(0, 0);
+    background-color: #fff;
+    text-align: center;
+    padding: 10px;
+    border-radius: 4px 0 0 4px;
+    cursor: pointer;
+  }
+
+  .search-box {
+    padding: 0px 15px;
+  }
+}
+
+.achi-list {
+  width: 425px;
+  min-height: 300px;
+  background-color: #fff;
+  position: absolute;
+  top: 55px;
+  right: 520px;
+  padding: 10px;
+  border-radius: 4px;
+  box-shadow: 0 0 10px rgba($color: #000000, $alpha: 0.5);
+  cursor: move;
+
+  .achi-content {
+    cursor: default;
+  }
+
+  .achi-projectNumber {
+    padding-left: 20px;
+    font-size: 14px;
+    font-family: '微软雅黑';
+  }
+
+  .achi-header {
+    text-align: center;
+    line-height: 40px;
+    font-weight: bold;
+    font-family: '黑体';
+    position: relative;
+
+    .close {
+      position: absolute;
+      right: 20px;
+      top: 10px;
+    }
+
+    .close:hover {
+      color: #409EFF;
+      cursor: pointer;
+    }
+  }
+}
+
+.tool-box {
+  position: absolute;
+  top: 60px;
+  left: 8px;
+  width: 50px;
+  border-radius: 5px;
+  // background-color: #fff;
+
+  .item {
+    margin-top: 10px;
+    width: 40px;
+    height: 40px;
+    padding: 6px;
+    background-color: rgba($color: #000000, $alpha: 0.5);
+    border-radius: 50%;
+    cursor: pointer;
+  }
+
+  .view {
+    width: 100%;
+    height: 100%;
+    background: url('../../assets/images/gis/home.png') no-repeat;
+    background-size: contain;
+  }
+
+  .layers {
+    width: 100%;
+    height: 100%;
+    background: url('../../assets/images/gis/layers.png') no-repeat;
+    background-size: contain;
+  }
+
+  .select {
+    width: 100%;
+    height: 100%;
+    background: url('../../assets/images/gis/select.png') no-repeat;
+    background-size: contain;
+  }
+
+  .selectM {
+    width: 100%;
+    height: 100%;
+    background: url('../../assets/images/gis/selectM.png') no-repeat;
+    background-size: contain;
+  }
+}
+
+.projectpoint-switch {
+  position: absolute;
+  top: 10px;
+  left: 60px;
+  width: 100px;
+  height: 50px;
+  color: #fff;
+}
+
+.alter-position {
+  width: 470px;
+  position: absolute;
+  left: 50%;
+  top: 10px;
+  transform: translate(-50%, 0);
+}
+
+.switch-map {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+}
+
+/* 鼠标移动，坐标样式 */
+#mouse-position {
+  width: 220px;
+  height: 40px;
+  line-height: 40px;
+  position: absolute;
+  top: 0px;
+  left: 50%;
+  transform: translate(-50%, 0%);
+  padding-left: 15px;
+  color: #fff;
+}
+</style>

oa-ui/src/views/file/index/infoBox.vue

@@ -0,0 +1,135 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: ysh
+ * @Date: 2022-11-22 11:41:47
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-07 13:43:54
+-->
+<template>
+  <div>
+    <div id="popup" class="ol-popup">
+      <span id="popup-closer" class="ol-popup-closer" @click="$emit('closePopup')"></span>
+      <div id="popup-content">
+        <el-descriptions :column="1" border v-if="datas.type == 'projectPoint'">
+          <el-descriptions-item label="项目编号" width="130px">
+            {{ datas.clickFeacture.projectNumber }}
+          </el-descriptions-item>
+          <el-descriptions-item label="项目名称" width="130px">
+            {{ datas.clickFeacture.projectName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="项目负责人" width="130px">
+            {{ datas.clickFeacture.projectLeader }}
+          </el-descriptions-item>
+          <el-descriptions-item label="存放地址" width="130px">
+            {{ datas.clickFeacture.storageAddress == '' || datas.clickFeacture.storageAddress == null ? '暂无' :
+              datas.clickFeacture.storageAddress }}
+          </el-descriptions-item>
+        </el-descriptions>
+
+        <div v-if="datas.type == 'featurePoint'">
+          <div class="title">项目编号:{{ datas.selectProjectNumber }}</div>
+          <el-descriptions :column="1" border>
+            <el-descriptions-item label="名称" width="130px">
+              {{ datas.selectFeatures.values_.name }}
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
+      <div class="look-achi" @click="$emit('open')" v-if="datas.type == 'projectPoint'">成果目录>></div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+  props:{
+    datas: {
+      type: Object,
+      required: true
+    },
+  },
+  data() {
+    return {
+    };
+  },
+  methods: {},
+}
+
+</script>
+
+<style lang="scss" scoped>
+// 弹出框
+.ol-popup {
+  position: absolute;
+  background-color: #fff;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2);
+  padding: 22px;
+  border-radius: 10px;
+  // border: 1px solid #cccccc;
+  bottom: 17px;
+  left: -129px;
+  min-width: 280px;
+  width: 200px;
+
+  .ol-popup-closer {
+    text-decoration: none;
+    position: absolute;
+    top: 2px;
+    right: 8px;
+  }
+
+  .ol-popup-closer:after {
+    content: "✖";
+    cursor: pointer;
+  }
+
+  .ol-popup-closer:hover:after {
+    color: #409EFF;
+  }
+}
+
+
+.ol-popup:after,
+.ol-popup:before {
+  top: 100%;
+  border: solid transparent;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+}
+
+.ol-popup:after {
+  border-top-color: #fff;
+  border-width: 10px;
+  left: 50%;
+  transform: translate(-50%, 0);
+  margin-left: -10px;
+}
+
+.ol-popup:before {
+  border-top-color: #fff;
+  border-width: 11px;
+  left: 50%;
+  transform: translate(-50%, 0);
+  margin-left: -11px;
+}
+
+.look-achi {
+  text-align: right;
+  color: #409EFF;
+  cursor: pointer;
+  font-size: 14px;
+  margin-top: 10px;
+  font-family: '微软雅黑';
+}
+
+.title{
+  font-size: 14px;
+  font-family:'Times New Roman','黑体', Times, serif,;
+}
+</style>

oa-ui/src/views/file/index/projectLayer.vue

@@ -0,0 +1,286 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: ysh
+ * @Date: 2022-10-20 17:27:09
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-07 09:04:52
+-->
+<template>
+  <div class="layer-box">
+    <div class="checkList">
+      <el-checkbox-group v-model="checkList">
+        <el-checkbox label="范围" @change="checkedRange" />
+        <el-checkbox label="控制点" @change="checkedCp" />
+      </el-checkbox-group>
+    </div>
+    <div style="margin-top: 10px;">
+      <!-- <el-button @click="handleExpand">展开/折叠</el-button> -->
+      <el-button @click="handleAllSelect">全选</el-button>
+      <el-button @click="handleCancelSelect">全不选</el-button>
+    </div>
+    <div style="margin-top: 10px;">
+      <el-input v-model="filterInput" class="w-50 m-2" placeholder="请输入项目编号" @keyup.enter="handleFilterNode">
+        <template #append>
+          <el-button icon="Search" @click="handleFilterNode"></el-button>
+        </template>
+      </el-input>
+    </div>
+    <el-scrollbar height="400px">
+      <el-tree :data="treeDatas" :props="defaultProps" node-key="id" show-checkbox ref="projectTree"
+        :default-checked-keys="selectedNodeKey" @check-change="handleCheckChange" default-expand-all
+        @node-click="handleNodeClick" highlight-current :filter-node-method="filterNode" />
+    </el-scrollbar>
+  </div>
+</template>
+
+<script>
+import sjx from '@/assets/images/gis/sjd-active.png';
+import { listProject, getProjectKml } from "@/api/file/project";
+// ------------------------------------------------ol--------------------------------------------------------------------//
+import 'ol/ol.css'
+import { Map, View } from 'ol';
+import KML from 'ol/format/KML';
+import Overlay from 'ol/Overlay';
+import Feature from 'ol/Feature';
+import { toLonLat } from 'ol/proj';
+import TileLayer from 'ol/layer/Tile';
+import { Select } from "ol/interaction";
+import VectorLayer from 'ol/layer/Vector';
+import { boundingExtent } from 'ol/extent';
+import { Cluster, Vector as VectorSource, XYZ } from 'ol/source';
+import { Point, Polygon, MultiPolygon, MultiLineString } from 'ol/geom';
+import { toStringXY, createStringXY, toStringHDMS } from 'ol/coordinate';
+import { Circle, Fill, Stroke, Style, RegularShape, Icon, Text } from 'ol/style';
+import { MousePosition, ScaleLine, defaults as defaultControls } from 'ol/control';
+import { linear, easeIn } from 'ol/easing';
+// --------------------------------------------------------------------------------------------------------------------//
+
+export default {
+  props: {
+    proTree: {
+      type: Array,
+      required: true
+    },
+  },
+  data() {
+    return {
+      kmlPath: process.env.VUE_APP_BASE_API,
+      treeDatas: [],
+      selectedNodeKey: [],
+      allNodeKey: [],
+      checkList: ['范围', '控制点'],
+      filterInput: '',
+      defaultProps: { label: 'name', children: 'children' }
+    };
+  },
+  mounted() {
+    this.initTree();
+  },
+  methods: {
+    initTree() {
+      let param = {
+        pageNum: 1,
+        pageSize: 99999999
+      }
+      listProject(param).then(res => {
+        if (res.code == 200) {
+          let alldata = res.rows;
+          let tree = [];
+          for (let d of alldata) {
+            if (d.kmlLat && d.kmlLng) {
+              tree.push(d);
+            }
+          }
+          let list = [];
+          let selectList = [];
+          for (let t of tree) {
+            let kmlUrl = this.kmlPath + "/profile/" + t.projectKml;
+            let cpUrl = this.kmlPath + "/profile/" + t.projectCp;
+            let obj = {};
+            obj.id = t.projectNumber;
+            obj.name = t.projectNumber + '-' + t.projectName;
+            let color = 'rgba(' + parseInt(Math.random() * 255) + ',' + parseInt(Math.random() * 255) + ',' + parseInt(Math.random() * 255) + ',0.8)';
+            obj.range = new VectorLayer({
+              title: t.projectNumber,
+              style: new Style({
+                // fill: new Fill({
+                //   color: color,
+                // }),
+                stroke: new Stroke({
+                  color: '#30A9DE',
+                  width: 3
+                })
+              }),
+              source: new VectorSource({
+                url: kmlUrl,
+                format: new KML({
+                  extractStyles: false
+                }),
+                projection: 'EPSG:4326'
+              })
+            });
+            obj.cp = new VectorLayer({
+              title: t.projectNumber,
+              // style: new Style({
+              //   image: new Icon({
+              //     src: sjx,
+              //     crossOrigin: 'anonymous',
+              //   }),
+              //   fill: new Fill({
+              //     color: '#30A9DE',
+              //   })
+              // }),
+              style: this.cpStyle(obj),
+              source: new VectorSource({
+                url: cpUrl,
+                format: new KML({
+                  extractStyles: false,
+                  writeStyles: true,
+                  showPointNames: true
+                }),
+                projection: 'EPSG:4326'
+              })
+            });
+            selectList.push(obj.id);
+            obj.range.setVisible(false);
+            obj.cp.setVisible(false);
+            this.$store.getters.map.addLayer(obj.range);
+            this.$store.getters.map.addLayer(obj.cp);
+            list.push(obj);
+            // this.$refs.projectTree.setCheckedKeys(selectList);
+          }
+          this.treeDatas = list;
+          this.allNodeKey = selectList;
+        }
+      })
+    },
+    /* 全选 */
+    handleAllSelect() {
+      this.$refs.projectTree.setCheckedKeys(this.allNodeKey);
+    },
+    /* 全不选 */
+    handleCancelSelect() {
+      this.$refs.projectTree.setCheckedKeys([]);
+    },
+    // 筛选
+    filterNode(value, data) {
+      if (!value)
+        return true
+      return data.name.includes(value)
+    },
+    // 触发筛选
+    handleFilterNode() {
+      this.$refs.projectTree.filter(filterInput.value)
+    },
+    handleCheckChange(data, checked, indeterminate) {
+      if (this.checkList.indexOf('范围') != -1) {
+        data.range.setVisible(checked);
+      } else {
+        data.range.setVisible(false);
+      }
+      if (this.checkList.indexOf('控制点') != -1) {
+        data.cp.setVisible(checked);
+      } else {
+        data.cp.setVisible(false);
+      }
+    },
+    handleNodeClick(nodeObj) {
+      let checkedKeys = this.$refs.projectTree.getCheckedKeys();
+      let currentKey = this.$refs.projectTree.getCurrentKey();
+      if (checkedKeys.includes(currentKey)) {
+        let view = this.$store.getters.map.getView();
+        let source = nodeObj.range.getSource();
+        view.fit(source.getExtent());
+      } else {
+        checkedKeys.push(currentKey);
+        this.$refs.projectTree.setCheckedKeys(checkedKeys);
+        setTimeout(() => {
+          let view = this.$store.getters.map.getView();
+          let source = nodeObj.range.getSource();
+          view.fit(source.getExtent());
+        }, 200);
+      }
+    },
+    checkedRange(val) {
+      let datas = this.$refs.projectTree.getCheckedNodes();
+      for (let d of datas) {
+        d.range.setVisible(val);
+      }
+    },
+    checkedCp(val) {
+      let datas = this.$refs.projectTree.getCheckedNodes();
+      for (let d of datas) {
+        d.cp.setVisible(val);
+      }
+    },
+    cpStyle(obj) {
+      let feature = obj[0];
+      let resolution = obj[1];
+      let style = new Style({
+        image: new Icon({
+          src: sjx,
+          crossOrigin: 'anonymous',
+        }),
+        fill: new Fill({
+          color: '#30A9DE',
+        }),
+        text: new Text({
+          text: this.getText(feature, resolution),
+          font: '14px sans-serif',
+          textAlign: 'center',
+          textBaseline: 'middle',
+          justify: 'center',
+          // backgroundFill: new Fill({
+          //   color: '#fff',
+          // }),
+          stroke: new Stroke({
+            color: '#F9F871',
+            width: 2
+          }),
+          offsetY: -30,
+          padding: [1, 1, 1, 1]
+        })
+      });
+      return style
+    },
+    /* 根据缩放决定text是否显示 */
+    getText(feature, resolution) {
+      let reo = resolution * 100;
+      let text;
+      if (reo > 2) {
+        text = '';
+      } else {
+        text = feature.values_.name;
+      }
+      return text;
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.checkList {
+  display: flex;
+  text-align: center;
+  justify-content: center;
+  border: 1px dashed #bccfec;
+}
+
+:deep(.el-checkbox__label) {
+  color: var(--el-tree-text-color) !important;
+}
+
+:deep(.el-tree-node) {
+  white-space: normal;
+}
+
+:deep(.el-tree-node__content) {
+  height: 100%;
+  align-items: baseline;
+}
+
+:deep(.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content) {
+  background-color: #bccfec !important;
+}
+</style>

oa-ui/src/views/file/index/switchMap.vue

@@ -0,0 +1,190 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: ysh
+ * @Date: 2023-06-02 14:13:06
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-07 11:47:21
+-->
+<template>
+  <div class="map-box">
+    <div class="open-box" v-if="isClose" @click="closeSwitch">
+      <i class="el-icon-d-arrow-right"></i>
+    </div>
+    <div class="close-box"  @click="closeSwitch">
+      <i class="el-icon-d-arrow-left"></i>
+    </div>
+    <el-tooltip class="box-item" effect="dark" content="高德" placement="top">
+      <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('高德')">
+      </div>
+    </el-tooltip>
+    <el-tooltip class="box-item" effect="dark" content="谷歌" placement="top">
+      <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('谷歌')">
+      </div>
+    </el-tooltip>
+    <el-tooltip class="box-item" effect="dark" content="天地图" placement="top">
+      <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('天地图')">
+      </div>
+    </el-tooltip>
+    <el-tooltip class="box-item" effect="dark" content="中科星图" placement="top">
+      <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('中科星图')">
+      </div>
+    </el-tooltip>
+    <el-tooltip class="box-item" effect="dark" content="ArcGIS" placement="top">
+      <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('ArcGIS')">
+      </div>
+    </el-tooltip>
+    <el-tooltip class="box-item" effect="dark" content="天地图地形" placement="top">
+      <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('天地图地形')">
+      </div>
+    </el-tooltip>
+    <el-tooltip class="box-item" effect="dark" content="矢量图" placement="top">
+      <div class="box-item" :class="{ close: isClose }" @click="translateMapBox('矢量图')">
+      </div>
+    </el-tooltip>
+  </div>
+</template>
+
+<script>
+import TileLayer from 'ol/layer/Tile';
+
+export default {
+  data() {
+    return {
+      isClose: true,
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    translateMapBox(type) {
+      let layers = this.$store.getters.map.getAllLayers();
+      for (let layer of layers) {
+        if (layer instanceof TileLayer) {
+          layer.setVisible(false);
+          let name = layer.getProperties().name;
+          if (name == "标注") {
+            layer.setVisible(true);
+          }
+          if (name == type) {
+            if (type == '高德') {
+              layer.setVisible(true);
+            } else if (type == '天地图') {
+              layer.setVisible(true);
+            } else if (type == '中科星图') {
+              layer.setVisible(true);
+            } else if (type == '谷歌') {
+              layer.setVisible(true);
+            } else if (type == 'ArcGIS') {
+              layer.setVisible(true);
+            } else if (type == '天地图地形') {
+              layer.setVisible(true);
+            } else if (type == '矢量图') {
+              layer.setVisible(true);
+            }
+          }
+        }
+      }
+    },
+    closeSwitch() {
+      this.isClose = !this.isClose;
+    }
+  },
+}
+
+</script>
+
+<style lang="scss" scoped>
+.map-box {
+  display: flex;
+  position: relative;
+
+  .box-item {
+    width: 100px;
+    height: 100px;
+    margin: 0px 3px;
+    border: 1px solid #000;
+    cursor: pointer;
+  }
+}
+
+.open-box {
+  color: #fff;
+  position: absolute;
+  font-size: 26px;
+  right: -132px;
+  top: -100px;
+  height: 99px;
+  line-height: 99px;
+  border-radius: 0 3px 3px 0;
+  cursor: pointer;
+  background-color: rgba($color: #000000, $alpha: 0.5);
+  z-index: 13px;
+}
+
+.close-box {
+  color: #fff;
+  position: absolute;
+  font-size: 26px;
+  right: -26px;
+  top: 1px;
+  height: 99px;
+  line-height: 99px;
+  border-radius: 0 3px 3px 0;
+  cursor: pointer;
+  background-color: rgba($color: #000000, $alpha: 0.5);
+}
+
+
+.box-item:hover {
+  border: 2px solid #fff;
+}
+
+.close {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+}
+
+.box-item:nth-child(2) {
+  background-image: url('../../../assets/images/gis/高德.png');
+  background-size: 100% 100%;
+  z-index: 11;
+}
+
+.box-item:nth-child(3) {
+  background-image: url('../../../assets/images/gis/谷歌影像.png');
+  background-size: 100% 100%;
+  z-index: 10;
+}
+
+.box-item:nth-child(4) {
+  background-image: url('../../../assets/images/gis/天地图.png');
+  background-size: 100% 100%;
+  z-index: 9;
+}
+
+.box-item:nth-child(5) {
+  background-image: url('../../../assets/images/gis/中科星图影像.png');
+  background-size: 100% 100%;
+  z-index: 8;
+}
+
+.box-item:nth-child(6) {
+  background-image: url('../../../assets/images/gis/ArcGIS.png');
+  background-size: 100% 100%;
+  z-index: 7;
+}
+
+.box-item:nth-child(7) {
+  background-image: url('../../../assets/images/gis/天地图地形图.png');
+  background-size: 100% 100%;
+  z-index: 7;
+}
+
+.box-item:nth-child(8) {
+  background-image: url('../../../assets/images/gis/矢量图.png');
+  background-size: 100% 100%;
+  z-index: 7;
+}
+</style>

oa-ui/src/views/oa/brand/brandProject.vue

@@ -95,7 +95,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['oa:brandProject:add']"
+          v-hasPermi="['oa:brand:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -106,7 +106,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['oa:brandProject:edit']"
+          v-hasPermi="['oa:brand:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -117,7 +117,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['oa:brandProject:remove']"
+          v-hasPermi="['oa:brand:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -127,7 +127,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['oa:brandProject:export']"
+          v-hasPermi="['oa:brand:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -154,14 +154,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:brandProject:edit']"
+            v-hasPermi="['oa:brand:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:brandProject:remove']"
+            v-hasPermi="['oa:brand:remove']"
           >删除</el-button>
         </template>
       </el-table-column>