jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd 

# Conflicts:
#	yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java
#	yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml
#	yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue
#	yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
#	yanzhu-ui-vue3/src/views/tool/gen/index.vue
dev_xd
姜玉琦 2024-09-10 00:07:55 +08:00
parent ac7ee58db2 1c95a50d1c
commit 38419e4369
36 changed files with 834 additions and 660 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -44,6 +44,11 @@ nbdist/
*.xml.versionsBackup
*.swp
!*/build/*.java
!*/build/*.html
!*/build/*.xml
**/pom.xml
**/bootstrap.yml

6
bin/run-auth.bat
View File

@ -1,14 +1,14 @@
@echo off
echo.
echo [信息] 使用Jar命令运行Auth工程。
echo [<EFBFBD><EFBFBD>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Auth<74><68><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../ruoyi-auth/target
cd ../yanzhu-auth/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar yanzhu-auth.jar
cd bin
pause

6
bin/run-gateway.bat
View File

@ -1,14 +1,14 @@
@echo off
echo.
echo [信息] 使用Jar命令运行Gateway工程。
echo [<EFBFBD><EFBFBD>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Gateway<61><79><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../ruoyi-gateway/target
cd ../yanzhu-gateway/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar yanzhu-gateway.jar
cd bin
pause

6
bin/run-modules-file.bat
View File

@ -1,14 +1,14 @@
@echo off
echo.
echo [信息] 使用Jar命令运行Modules-File工程。
echo [<EFBFBD><EFBFBD>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-File<6C><65><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../ruoyi-modules/ruoyi-file/target
cd ../yanzhu-modules/yanzhu-file/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-file.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar yanzhu-modules-file.jar
cd bin
pause

4
bin/run-modules-gen.bat
View File

@ -1,6 +1,6 @@
@echo off
echo.
echo [信息] 使用Jar命令运行Modules-Gen工程。
echo [<EFBFBD><EFBFBD>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-Gen<65><6E><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
@ -8,7 +8,7 @@ cd ../ruoyi-modules/ruoyi-gen/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-gen.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar yanzhu-modules-gen.jar
cd bin
pause

4
bin/run-modules-job.bat
View File

@ -1,6 +1,6 @@
@echo off
echo.
echo [信息] 使用Jar命令运行Modules-Job工程。
echo [<EFBFBD><EFBFBD>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-Job<6F><62><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
@ -8,7 +8,7 @@ cd ../ruoyi-modules/ruoyi-job/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-job.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar yanzhu-modules-job.jar
cd bin
pause

6
bin/run-modules-system.bat
View File

@ -1,14 +1,14 @@
@echo off
echo.
echo [信息] 使用Jar命令运行Modules-System工程。
echo [<EFBFBD><EFBFBD>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-System<65><6D><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../ruoyi-modules/ruoyi-system/target
cd ../yanzhu-modules/yanzhu-system/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar yanzhu-modules-system.jar
cd bin
pause

4
bin/run-monitor.bat
View File

@ -1,6 +1,6 @@
@echo off
echo.
echo [信息] 使用Jar命令运行Monitor工程。
echo [<EFBFBD><EFBFBD>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Monitor<6F><72><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
@ -8,7 +8,7 @@ cd ../ruoyi-visual/ruoyi-monitor/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-visual-monitor.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar yanzhu-visual-monitor.jar
cd bin
pause

3
bin/run.bat 100644
View File

@ -0,0 +1,3 @@
start bin\run-auth.bat
start bin\run-gateway.bat
start bin\run-modules-system.bat

9
yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java
View File

@ -109,6 +109,15 @@ public class SysUser extends BaseEntity
})
private SysDept dept;
public SysDept getComp() {
return comp;
}
public void setComp(SysDept comp) {
this.comp = comp;
}
private SysDept comp;
/** 角色对象 */
private List<SysRole> roles;

10
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusTrainingVideo.java
View File

@ -22,6 +22,16 @@ public class BusTrainingVideo extends BaseEntity
@Excel(name = "部门主键")
private Long deptId;
public String getDeptName() {
return deptName;
}
public void setDeptName(String deptName) {
this.deptName = deptName;
}
private String deptName;
/** 项目主键 */
@Excel(name = "项目主键")
private Long projectId;

5
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusTrainingVideoMapper.xml
View File

@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="BusTrainingVideo" id="BusTrainingVideoResult">
<result property="id" column="id" />
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name"/>
<result property="projectId" column="project_id" />
<result property="trainTitle" column="train_title" />
<result property="trainType" column="train_type" />
@ -27,7 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectBusTrainingVideoVo">
select id, dept_id, project_id, train_title, train_type, train_level, craft_type, craft_post, train_file_type,ord, train_file_path, train_file_image, train_file_times, is_del, create_by, create_time, update_by, update_time, remark from bus_training_video
select bus_training_video.*,sys_dept.dept_name
from bus_training_video
left join sys_dept on bus_training_video.dept_id=sys_dept.dept_id
</sql>
<select id="selectBusTrainingVideoList" parameterType="BusTrainingVideo" resultMap="BusTrainingVideoResult">

39
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml
View File

@ -45,10 +45,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<association property="setting" column="ps_id" javaType="ProProjectInfoSetting" resultMap="ProProjectInfoSettingResult" />
<collection property="projectDeptsList" javaType="java.util.List" resultMap="ProProjectInfoDeptsResult" />
</resultMap>
<resultMap id="ProProjectInfoDeptsResult" type="ProProjectInfoDepts">
<result property="id" column="pd_id" />
<result property="projectId" column="id" />
<result property="projectName" column="project_name" />
<result property="deptType" column="pd_type" />
<result property="deptName" column="pd_name" />
<result property="deptCode" column="pd_code" />
<result property="leader" column="pd_leader" />
<result property="phone" column="pd_phone" />
</resultMap>
<resultMap id="ProProjectInfoSettingResult" type="ProProjectInfoSetting">
<result property="id" column="ps_id" />
<result property="projectId" column="id" />
<result property="projectName" column="project_name" />
<result property="orgName" column="ps_org_name" />
<result property="orgLogo" column="ps_org_logo" />
<result property="orgImage" column="ps_org_image" />
<result property="orgVideo" column="ps_org_video" />
<result property="orgPlane" column="ps_org_plane" />
</resultMap>
<sql id="selectProProjectInfoVo">
select pi.id, pi.dept_id, sd.dept_name, pi.vis_dept_id, pi.dis_dept_id, pi.project_name, pi.project_code, pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_address, pi.project_nature, pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark from pro_project_info pi
select pi.id, pi.dept_id, sd.dept_name, pi.vis_dept_id, pi.dis_dept_id, pi.project_name, pi.project_code, pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_address, pi.project_nature, pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark
from pro_project_info pi
left join sys_dept sd on sd.dept_id = pi.dept_id
</sql>
@ -73,7 +95,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectProProjectInfoById" parameterType="Long" resultMap="ProProjectInfoResult">
<include refid="selectProProjectInfoVo"/>
select pi.id, pi.dept_id, sd.dept_name, pi.vis_dept_id, pi.dis_dept_id, pi.project_name,
pi.project_code, pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_address, pi.project_nature,
pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment,
pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time,
pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status,
pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark,
pd.id pd_id,pd.dept_type pd_type,pd.dept_name pd_name,pd.dept_code pd_code,pd.leader pd_leader,pd.phone pd_phone,
ps.id ps_id,ps.org_name ps_org_name,ps.org_logo ps_org_logo,ps.org_image ps_org_image,ps.org_video ps_org_video,ps.org_plane ps_org_plane
from pro_project_info pi
left join sys_dept sd on sd.dept_id = pi.dept_id
left join pro_project_info_depts pd on pi.id=pd.project_id
left join pro_project_info_setting ps on pi.id=ps.project_id
where pi.id = #{id}
</select>

3
yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java
View File

@ -4,6 +4,8 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Paths;
import java.util.Objects;
import com.yanzhu.common.core.utils.file.ImageUtils;
import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile;
import com.yanzhu.common.core.exception.file.FileNameLengthLimitExceededException;
@ -80,6 +82,7 @@ public class FileUploadUtils
String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
file.transferTo(Paths.get(absPath));
return getPathFileName(fileName);
}

29
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java
View File

@ -2,6 +2,10 @@ package com.yanzhu.manage.service.impl;
import java.util.List;
import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.manage.domain.ProProjectInfoDepts;
import com.yanzhu.manage.domain.ProProjectInfoSetting;
import com.yanzhu.manage.mapper.ProProjectInfoDeptsMapper;
import com.yanzhu.manage.mapper.ProProjectInfoSettingMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.yanzhu.manage.mapper.ProProjectInfoMapper;
@ -19,7 +23,10 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService
{
@Autowired
private ProProjectInfoMapper proProjectInfoMapper;
@Autowired
private ProProjectInfoDeptsMapper deptsMapper;
@Autowired
private ProProjectInfoSettingMapper settingMapper;
/**
* 查询项目信息
*
@ -67,6 +74,26 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService
public int updateProProjectInfo(ProProjectInfo proProjectInfo)
{
proProjectInfo.setUpdateTime(DateUtils.getNowDate());
List<ProProjectInfoDepts> depts= proProjectInfo.getProjectDeptsList();
if(depts!=null){
depts.forEach(dept->{
dept.setProjectId(proProjectInfo.getId());
if(dept.getId()!=null){
deptsMapper.updateProProjectInfoDepts(dept);
}else{
deptsMapper.insertProProjectInfoDepts(dept);
}
});
}
ProProjectInfoSetting setting= proProjectInfo.getSetting();
if(setting!=null){
setting.setProjectId(proProjectInfo.getId());
if(setting.getId()!=null){
settingMapper.updateProProjectInfoSetting(setting);
}else{
settingMapper.insertProProjectInfoSetting(setting);
}
}
return proProjectInfoMapper.updateProProjectInfo(proProjectInfo);
}

12
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysDeptController.java
View File

@ -1,5 +1,6 @@
package com.yanzhu.system.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@ -7,6 +8,7 @@ import com.yanzhu.common.core.constant.CacheConstants;
import com.yanzhu.common.core.constant.Constants;
import com.yanzhu.common.core.enums.IsDelEnums;
import com.yanzhu.common.redis.service.RedisService;
import com.yanzhu.system.domain.vo.TreeSelect;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@ -159,4 +161,14 @@ public class SysDeptController extends BaseController
redisService.setCacheObject(key,depts, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
return success(depts);
}
@RequiresPermissions("system:dept:list")
@GetMapping("/deptTree")
public AjaxResult userDeptTree(){
SysDept comp= SecurityUtils.getLoginUser().getSysUser().getComp();
if(comp==null){
return success(deptService.buildDeptTreeSelect(new ArrayList<>()));
}
List<TreeSelect> treeList = deptService.buildDeptTreeSelect(deptService.selectDeptListForComp(comp));
return success(treeList);
}
}

2
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysRoleController.java
View File

@ -275,7 +275,7 @@ public class SysRoleController extends BaseController
* @param deptId
* @return
*/
@GetMapping("/deptRole/{deptId}")
@GetMapping("/deptRole/{roleId}")
public AjaxResult list(@PathVariable("roleId") Long deptId)
{
List<SysRole> list = roleService.findDeptRoleList(deptId);

13
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/domain/vo/TreeSelect.java
View File

@ -23,6 +23,16 @@ public class TreeSelect implements Serializable
/** 节点名称 */
private String label;
public Object getData() {
return data;
}
public void setData(Object data) {
this.data = data;
}
private Object data;
/** 子节点 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<TreeSelect> children;
@ -37,6 +47,7 @@ public class TreeSelect implements Serializable
this.id = dept.getDeptId();
this.label = dept.getDeptName();
this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
this.data=dept;
}
public TreeSelect(SysMenu menu)
@ -44,6 +55,7 @@ public class TreeSelect implements Serializable
this.id = menu.getMenuId();
this.label = menu.getMenuName();
this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
this.data=menu;
}
public TreeSelect(SysArea area)
@ -51,6 +63,7 @@ public class TreeSelect implements Serializable
this.id = area.getId();
this.label = area.getCname();
this.children = area.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
this.data=area;
}
public Long getId()

5
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java
View File

@ -19,6 +19,11 @@ public interface SysDeptMapper
*/
public List<SysDept> selectDeptList(SysDept dept);
/**
* 根据deptId查询此ID及下面的子项，用于构建树
*/
public List<SysDept> selectDeptListForComp(SysDept dept);
/**
* 根据角色ID查询部门树信息
*

4
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDeptService.java
View File

@ -121,4 +121,8 @@ public interface ISysDeptService
* @return 结果
*/
public int deleteDeptById(Long deptId);
/**
* 根据deptId查询此ID及下面的子项，用于构建树
*/
List<SysDept> selectDeptListForComp(SysDept comp);
}

7
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDeptServiceImpl.java
View File

@ -293,6 +293,13 @@ public class SysDeptServiceImpl implements ISysDeptService
{
return deptMapper.deleteDeptById(deptId);
}
/**
* 根据deptId查询此ID及下面的子项，用于构建树
*/
@Override
public List<SysDept> selectDeptListForComp(SysDept comp) {
return deptMapper.selectDeptListForComp(comp);
}
/**
* 递归列表

9
yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -56,7 +56,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.dataScope}
order by d.parent_id, d.order_num
</select>
<select id="selectDeptListForComp" parameterType="SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where d.del_flag = '0'
<if test="deptId != null and deptId != 0">
AND(find_in_set( #{deptId}, ancestors) or dept_id= #{deptId})
</if>
order by d.parent_id, d.order_num
</select>
<select id="selectDeptListByRoleId" resultType="Long">
select d.dept_id
from sys_dept d

10
yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -31,7 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
<association property="comp" column="com_id" javaType="SysDept" resultMap="compResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@ -48,6 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="status" column="dept_status" />
</resultMap>
<resultMap id="compResult" type="SysDept">
<id property="deptId" column="com_id" />
<result property="deptName" column="com_dept_name" />
</resultMap>
<resultMap id="RoleResult" type="SysRole">
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
@ -60,9 +67,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectUserVo">
select u.user_id, u.com_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_type, u.card_code, u.user_picture, u.card_img_pos, u.card_img_inv, u.user_infos, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.dept_short_name, d.dept_code, d.dept_type, d.order_num, d.leader, d.status as dept_status,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,com.dept_name com_dept_name
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_dept com on u.com_id = com.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
</sql>

3
yanzhu-ui-vue3/.env.development
View File

@ -6,3 +6,6 @@ VITE_APP_ENV = 'development'
# 若依管理系统/开发环境
VITE_APP_BASE_API = '/dev-api'
VUE_APP_FILE_API='/statics'

2
yanzhu-ui-vue3/.env.production
View File

@ -9,3 +9,5 @@ VITE_APP_BASE_API = '/prod-api'
# 是否在打包时开启压缩，支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip
VUE_APP_FILE_API='/statics'

9
yanzhu-ui-vue3/src/App.vue
View File

@ -12,3 +12,12 @@ onMounted(() => {
})
})
</script>
<style lang="scss">
.no-form-label{
.el-form-item{
.el-form-item__label{
display: none !important;
}
}
}
</style>

7
yanzhu-ui-vue3/src/api/system/dept.js
View File

@ -58,3 +58,10 @@ export function projectDeptList() {
method: 'get'
})
}
export function deptTree(){
return request({
url: '/system/dept/deptTree',
method: 'get'
})
}

11
yanzhu-ui-vue3/src/api/system/user.js
View File

@ -32,7 +32,16 @@ export function updateUser(data) {
return request({
url: '/system/user',
method: 'put',
data: data
data: {
userId:data.userId,
userName:data.userName,
userType:data.userType,
sex:data.sex,
status:data.status,
postIds:data.postIds,
roles:data.roles,
roleIds:data.roleIds
}
})
}

2
yanzhu-ui-vue3/src/components/BaiduMap/Map.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog :title="title" v-model="show" width="800px" append-to-body custom-class="baidu-map-dialog"
<el-dialog :title="title" v-model="show" width="800px" append-to-body class="baidu-map-dialog"
:close-on-click-modal="false" :close-on-press-escape="false" >
<div class="div-info">
<div>经度纬度:{{point?(point.lng.toFixed(5)+","+point.lat.toFixed(5)):'' }}</div>

2
yanzhu-ui-vue3/src/store/modules/user.js
View File

@ -9,6 +9,7 @@ const useUserStore = defineStore(
token: getToken(),
name: '',
avatar: '',
compInfo:{},
roles: [],
permissions: []
}),
@ -44,6 +45,7 @@ const useUserStore = defineStore(
this.roles = ['ROLE_DEFAULT']
}
this.name = user.userName
this.compInfo=user.comp;
this.avatar = avatar;
resolve(res)
}).catch(error => {

2
yanzhu-ui-vue3/src/utils/request.js
View File

@ -17,7 +17,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: import.meta.env.VITE_APP_BASE_API,
// 超时
timeout: 10000
timeout: 60000
})
// request拦截器

198
yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue
View File

@ -1,8 +1,8 @@
<template>
<div class="app-container">
<div class="app-container bus-training-video-index">
<el-row :gutter="20">
<!--部门数据-->
<el-col :span="6" :xs="24">
<el-col :span="6" :xs="24" v-if="1==2">
<div class="head-container">
<el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search"
style="margin-bottom: 20px" />
@ -13,40 +13,22 @@
:default-expanded-keys="defaultEK" @node-click="handleNodeClick" />
</div>
</el-col>
<el-col :span="18" :xs="24">
<el-col :span="24" :xs="24">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="部门主键" prop="deptId">
<el-input v-model="queryParams.deptId" placeholder="请输入部门主键" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="项目主键" prop="projectId">
<el-input v-model="queryParams.projectId" placeholder="请输入项目主键" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="培训名称" prop="trainTitle">
<el-form-item label="文件名称" prop="trainTitle">
<el-input v-model="queryParams.trainTitle" placeholder="请输入培训名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="培训类型" prop="trainType">
<el-select v-model="queryParams.trainType" placeholder="请选择培训类型" clearable>
<el-option v-for="dict in edu_train_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="培训级别" prop="trainLevel">
<el-form-item label="教育级别" prop="trainLevel">
<el-select v-model="queryParams.trainLevel" placeholder="请选择培训级别" clearable>
<el-option v-for="dict in edu_train_level" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="工种类型" prop="craftType">
<el-select v-model="queryParams.craftType" placeholder="请选择工种类型" clearable>
<el-form-item label="工种" v-if="queryParams.trainLevel==4" prop="craftType" className="fitem-craft-type el-form-item el-form-item--default asterisk-left">
<el-select v-model="queryParams.craftType" placeholder="请选择工种类型" clearable @change="getQueryCraftPost">
<el-option v-for="dict in pro_craft_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="工种岗位" prop="craftPost">
<el-select v-model="queryParams.craftPost" placeholder="请选择工种岗位" clearable>
<el-option v-for="dict in pro_craft_post" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="删除标识" prop="isDel">
<el-select v-model="queryParams.isDel" placeholder="请选择删除标识" clearable>
<el-option v-for="dict in sys_is_del" :key="dict.value" :label="dict.label" :value="dict.value" />
<el-select style="margin-left:10px;" v-model="queryParams.craftPost" placeholder="请选择工种岗位" clearable>
<el-option v-for="dict in data.queryCraftPostList" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
@ -60,6 +42,7 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['manage:busTrainingVideo:add']">新增</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['manage:busTrainingVideo:edit']">修改</el-button>
@ -72,17 +55,17 @@
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['manage:busTrainingVideo:export']">导出</el-button>
</el-col>
-->
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="busTrainingVideoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" />
<el-table-column label="部门主键" align="center" prop="deptId" />
<el-table-column label="项目主键" align="center" prop="projectId" />
<el-table-column label="培训名称" align="center" prop="trainTitle" />
<el-table-column label="培训类型" align="center" prop="trainType">
<el-table-column label="部门" align="center" prop="deptName" />
<el-table-column label="归属模块" align="center" prop="trainType">
<template #default="scope">
<dict-tag :options="edu_train_type" :value="scope.row.trainType" />
<dict-tag :options="video_module" :value="scope.row.trainType" />
</template>
</el-table-column>
<el-table-column label="培训级别" align="center" prop="trainLevel">
@ -90,28 +73,22 @@
<dict-tag :options="edu_train_level" :value="scope.row.trainLevel" />
</template>
</el-table-column>
<el-table-column label="工种类型" align="center" prop="craftType">
<el-table-column label="工种" align="center" width="300">
<template #default="scope">
<dict-tag :options="pro_craft_type" :value="scope.row.craftType" />
</template>
</el-table-column>
<el-table-column label="工种岗位" align="center" prop="craftPost">
<template #default="scope">
<dict-tag :options="pro_craft_post" :value="scope.row.craftPost" />
</template>
</el-table-column>
<el-table-column label="培训文件类型" align="center" prop="trainFileType" />
<el-table-column label="培训文件地址" align="center" prop="trainFilePath" />
<el-table-column label="培训文件主图" align="center" prop="trainFileImage" width="100">
<el-table-column label="视频路径" align="center" prop="videoUrl" width="200px">
<template #default="scope">
<image-preview :src="scope.row.trainFileImage" :width="50" :height="50" />
<video height="80" width="200" controls :key="scope.row.trainFilePath" v-if="scope.row.trainFilePath">
<source :src="scope.row.trainFilePath" type="video/mp4"/>
您的浏览器不支持Video标签。
</video>
</template>
</el-table-column>
<el-table-column label="培训文件时长" align="center" prop="trainFileTimes" />
<el-table-column label="删除标识" align="center" prop="isDel">
<template #default="scope">
<dict-tag :options="sys_is_del" :value="scope.row.isDel" />
</template>
<el-table-column label="培训文件时长" align="center" prop="trainFileTimes">
<template #default="scope">{{ scope.row.trainFileTimes }}秒</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
@ -129,50 +106,59 @@
</el-row>
<!-- 添加或修改培训视频对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-dialog :title="title" v-model="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false" class="bus-training-video-dlg">
<el-form ref="busTrainingVideoRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="部门主键" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门主键" />
<el-form-item label="归属公司" prop="deptId">
<el-input v-model="form.compName" disabled/>
</el-form-item>
<el-form-item label="项目主键" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目主键" />
</el-form-item>
<el-form-item label="培训名称" prop="trainTitle">
<el-input v-model="form.trainTitle" placeholder="请输入培训名称" />
</el-form-item>
<el-form-item label="培训类型" prop="trainType">
<el-form-item label="归属模块" prop="trainType">
<el-select v-model="form.trainType" placeholder="请选择培训类型">
<el-option v-for="dict in edu_train_type" :key="dict.value" :label="dict.label"
<el-option v-for="dict in video_module" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="培训级别" prop="trainLevel">
<el-form-item label="文件名称" prop="trainTitle">
<el-input v-model="form.trainTitle" placeholder="请输入培训名称" />
</el-form-item>
<el-form-item label="教育级别" prop="trainLevel">
<el-select v-model="form.trainLevel" placeholder="请选择培训级别">
<el-option v-for="dict in edu_train_level" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工种类型" prop="craftType">
<el-select v-model="form.craftType" placeholder="请选择工种类型">
<el-row v-if="form.trainLevel==4">
<el-col :span="12">
<el-form-item label="归属工种" prop="craftType">
<el-select v-model="form.craftType" placeholder="请选择工种类型" @change="getCraftPost">
<el-option v-for="dict in pro_craft_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工种岗位" prop="craftPost">
</el-col>
<el-col :span="12" class="no-form-label" style="padding-left:10px;">
<el-form-item label="no" prop="craftPost">
<el-select v-model="form.craftPost" placeholder="请选择工种岗位">
<el-option v-for="dict in pro_craft_post" :key="dict.value" :label="dict.label"
<el-option v-for="dict in data.craftPostList" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="显示排序" prop="ord">
<el-input-number v-model="form.ord" controls-position="right" :min="0" style="width:160px;"/>
</el-form-item>
<el-form-item label="视频时长" prop="trainFileTimes">
<el-input v-model="form.trainFileTimes" placeholder="请输入视频时长" style="width:180px;">
<template #append>秒</template>
</el-input>
</el-form-item>
<el-form-item label="培训文件类型" prop="trainFileType">
<el-input v-model="form.trainFileType" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="培训文件地址" prop="trainFilePath">
<file-upload v-model="form.trainFilePath" :fileType="['mp4']" />
</el-form-item>
<el-form-item label="培训文件主图" prop="trainFileImage">
<image-upload v-model="form.trainFileImage" />
</el-form-item>
@ -184,9 +170,8 @@
<el-option v-for="dict in sys_is_del" :key="dict.value" :label="dict.label"
:value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item label="视频文件" prop="trainFilePath" :class="form.trainFilePath?'has-video':'no-video'" class="fitem-video">
<file-upload v-model="form.trainFilePath" :limit="1" :fileType="['mp4']" :fileSize="100"/>
</el-form-item>
</el-form>
<template #footer>
@ -202,8 +187,9 @@
<script setup name="BusTrainingVideo">
import { listBusTrainingVideo, getBusTrainingVideo, delBusTrainingVideo, addBusTrainingVideo, updateBusTrainingVideo } from "@/api/manage/busTrainingVideo";
import { deptTreeSelect } from "@/api/system/user";
import useUserStore from '@/store/modules/user'
const { proxy } = getCurrentInstance();
const { edu_train_level, edu_train_type, pro_craft_type, sys_is_del, pro_craft_post } = proxy.useDict('edu_train_level', 'edu_train_type', 'pro_craft_type', 'sys_is_del', 'pro_craft_post');
const { edu_train_level, edu_train_type, pro_craft_type, sys_is_del, pro_craft_post,video_module } = proxy.useDict('edu_train_level', 'edu_train_type', 'pro_craft_type', 'sys_is_del', 'pro_craft_post','video_module');
const busTrainingVideoList = ref([]);
const open = ref(false);
@ -234,10 +220,22 @@ const data = reactive({
isDel: null,
},
rules: {
}
deptId:[{ required: true, message: "归属公司不能为空", trigger: "blur" }],
trainType:[{ required: true, message: "归属模块不能为空", trigger: "blur" }],
trainTitle:[{ required: true, message: "文件名称不能为空", trigger: "blur" }],
trainLevel:[{ required: true, message: "教育级别不能为空", trigger: "blur" }],
craftType:[{ required: true, message: "工种不能为空", trigger: "blur" }],
craftPost:[{ required: true, message: "工种岗位不能为空", trigger: "blur" }],
ord:[{ required: true, message: "显示排序不能为空", trigger: "blur" }],
trainFileTimes:[{ required: true, message: "视频时长不能为空", trigger: "blur" }],
//trainFilePath:[{ required: true, message: "视频不能为空", trigger: "blur" }],
},
craftPostList:[],
queryCraftPostList:[]
});
const { queryParams, form, rules } = toRefs(data);
const userStore = useUserStore()
/** 查询培训视频列表 */
function getList() {
@ -259,7 +257,7 @@ function cancel() {
function reset() {
form.value = {
id: null,
deptId: null,
deptId: userStore.compInfo.deptId||'',
projectId: null,
trainTitle: null,
trainType: null,
@ -270,16 +268,31 @@ function reset() {
trainFilePath: null,
trainFileImage: null,
trainFileTimes: null,
isDel: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
compName:userStore.compInfo.deptName||'',
ord:1,
remark: null
};
proxy.resetForm("busTrainingVideoRef");
data.craftPostList=[]
}
function getQueryCraftPost(){
let datas=pro_craft_post._object.pro_craft_post;
if(queryParams.value.craftType){
data.queryCraftPostList= datas.filter(d=>d.elTagClass==queryParams.value.craftType);
}else{
data.queryCraftPostList= [];
}
}
function getCraftPost(){
let datas=pro_craft_post._object.pro_craft_post;
if(form.value.craftType){
data.craftPostList= datas.filter(d=>d.elTagClass==form.value.craftType);
}else{
data.craftPostList= [];
}
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
@ -328,6 +341,8 @@ function handleUpdate(row) {
function submitForm() {
proxy.$refs["busTrainingVideoRef"].validate(valid => {
if (valid) {
let path=form.value.trainFilePath;
form.value.trainFilePath=path.substring( path.indexOf("/statics/"));
if (form.value.id != null) {
updateBusTrainingVideo(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
@ -381,3 +396,26 @@ function getDeptTree() {
getList();
getDeptTree();
</script>
<style lang="scss">
.bus-training-video-index{
.fitem-craft-type{
.el-select{
width:150px;
}
}
}
.bus-training-video-dlg{
.fitem-video{
&.has-video{
.el-form-item__content{
.upload-file-uploader{
display: none;
}
.el-upload__tip{
display: none;
}
}
}
}
}
</style>

404
yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue
View File

@ -2,21 +2,12 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
@keyup.enter="handleQuery"
/>
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="项目类型" prop="projectType">
<el-select v-model="queryParams.projectType" placeholder="请选择项目类型" clearable>
<el-option
v-for="dict in pro_project_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option v-for="dict in pro_project_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item>
@ -27,70 +18,48 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['manage:proProjectInfo:add']"
>新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['manage:proProjectInfo:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['manage:proProjectInfo:edit']"
>修改</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['manage:proProjectInfo:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['manage:proProjectInfo:remove']"
>删除</el-button>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['manage:proProjectInfo:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['manage:proProjectInfo:export']"
>导出</el-button>
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['manage:proProjectInfo:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="proProjectInfoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目名称" align="center" prop="projectName" width="250"/>
<el-table-column label="项目部门" align="center" prop="deptName" width="200"/>
<el-table-column label="项目名称" align="center" prop="projectName" width="250" />
<el-table-column label="项目部门" align="center" prop="deptName" width="200" />
<el-table-column label="项目简称" align="center" prop="simpleName" />
<el-table-column label="项目类型" align="center" prop="projectType" width="100">
<template #default="scope">
<dict-tag :options="pro_project_type" :value="scope.row.projectType"/>
<dict-tag :options="pro_project_type" :value="scope.row.projectType" />
</template>
</el-table-column>
<el-table-column label="二维码" align="center" prop="projectQrCode" width="80">
<template #default="scope">
<image-preview :src="scope.row.projectQrCode" :width="50" :height="50"/>
<image-preview :src="scope.row.projectQrCode" :width="50" :height="50" />
</template>
</el-table-column>
<el-table-column label="项目排序" align="center" prop="projectSort" width="120">
<template #default="scope">
<el-input-number size="mini" v-model="scope.row.projectSort" :min="1" :max="999"
<el-input-number v-model="scope.row.projectSort" :min="1" :max="999"
@change="setProjectSort(scope.row, $event)"></el-input-number>
</template>
</el-table-column>
<el-table-column label="项目地址" align="center" prop="projectAddress" width="250"/>
<el-table-column label="负责人" align="center" prop="projectPerson" width="100"/>
<el-table-column label="负责人电话" align="center" prop="projectPersonPhone" width="120"/>
<el-table-column label="项目地址" align="center" prop="projectAddress" width="250" />
<el-table-column label="负责人" align="center" prop="projectPerson" width="100" />
<el-table-column label="负责人电话" align="center" prop="projectPersonPhone" width="120" />
<el-table-column label="项目工期" align="center" prop="projectTimeLimit" width="120">
<template #default="scope">
<el-tag effect="plain">
@ -98,14 +67,14 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="总投资" align="center" prop="totalInvestment" >
<el-table-column label="总投资" align="center" prop="totalInvestment">
<template #default="scope">
<el-tag effect="dark">
{{ scope.row.totalInvestment + ' 万元' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="合同金额" align="center" prop="contractAmount" >
<el-table-column label="合同金额" align="center" prop="contractAmount">
<template #default="scope">
<el-tag effect="dark">
{{ scope.row.contractAmount + ' 万元' }}
@ -114,16 +83,16 @@
</el-table-column>
<el-table-column label="项目进度" align="center" prop="projectSchedule">
<template #default="scope">
<dict-tag :options="pro_project_schedule" :value="scope.row.projectSchedule"/>
<dict-tag :options="pro_project_schedule" :value="scope.row.projectSchedule" />
</template>
</el-table-column>
<el-table-column label="计划开始时间" align="center" prop="scheduledStartTime" width="120"/>
<el-table-column label="计划完工时间" align="center" prop="plannedCompletionTime" width="120"/>
<el-table-column label="实际开始时间" align="center" prop="actualOperatingTime" width="120"/>
<el-table-column label="实际完工时间" align="center" prop="actualCompletionTime" width="120"/>
<el-table-column label="计划开始时间" align="center" prop="scheduledStartTime" width="120" />
<el-table-column label="计划完工时间" align="center" prop="plannedCompletionTime" width="120" />
<el-table-column label="实际开始时间" align="center" prop="actualOperatingTime" width="120" />
<el-table-column label="实际完工时间" align="center" prop="actualCompletionTime" width="120" />
<el-table-column label="项目状态" align="center" prop="isDel">
<template #default="scope">
<dict-tag :options="sys_is_del" :value="scope.row.isDel"/>
<dict-tag :options="sys_is_del" :value="scope.row.isDel" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
@ -133,22 +102,19 @@
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:proProjectInfo:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:proProjectInfo:remove']">删除</el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:proProjectInfo:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['manage:proProjectInfo:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改项目信息对话框 -->
<el-dialog :title="title" v-model="open" width="1080px" append-to-body>
<el-dialog :title="title" v-model="open" width="1080px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false" class="project-info-edit-dlg">
<el-form ref="proProjectInfoRef" :model="form" :rules="rules" label-width="100px">
<el-tabs
v-model="activeTags"
@ -157,30 +123,19 @@
>
<el-tab-pane label="项目基本信息" name="base">
<el-row :gutter="20">
<el-col :span="16">
<el-form-item label="所属部门" prop="deptId">
<el-tree-select
v-model="form.deptId"
:data="deptOptions"
:props="{ value: 'id', label: 'label', children: 'children' }"
value-key="id"
placeholder="请选择所属部门"
check-strictly
style="width:100%"
/>
<el-col :span="8">
<el-form-item label="归属单位" prop="deptId">
<el-select v-model="form.deptId" placeholder="请选择公司" clearable @change="doChangeComp">
<el-option v-for="dict in data.compOptions" :key="dict.deptId" :label="dict.deptName"
:value="dict.deptId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="显示层级" prop="disDeptId">
<el-tree-select
v-model="form.disDeptId"
:data="deptOptions"
:props="{ value: 'id', label: 'label', children: 'children' }"
value-key="id"
placeholder="请选择显示层级"
check-strictly
style="width:100%"
/>
<el-form-item label="归属部门" prop="disDeptId">
<el-tree-select v-model="form.disDeptId" :data="deptOptions"
:props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择显示层级"
check-strictly style="width:100%" />
</el-form-item>
</el-col>
</el-row>
@ -200,12 +155,8 @@
<el-col :span="8">
<el-form-item label="项目类型" prop="projectType">
<el-select v-model="form.projectType" placeholder="请选择项目类型" style="width:100%">
<el-option
v-for="dict in pro_project_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option v-for="dict in pro_project_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -223,13 +174,11 @@
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="项目地址" prop="projectAddress">
<el-input
v-model="addressInfos"
placeholder="请选择项目地址信息"
@focus="getMapInfo"
>
<el-input v-model="addressInfos" placeholder="请选择项目地址信息" @focus="getMapInfo">
<template #prefix>
<el-icon class="el-input__icon"><Location /></el-icon>
<el-icon class="el-input__icon">
<Location />
</el-icon>
</template>
</el-input>
</el-form-item>
@ -238,7 +187,7 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="项目工期" prop="projectTimeLimit">
<el-input v-model.number="form.projectTimeLimit" maxlength="10" show-word-limit placeholder="请输入项目工期" >
<el-input v-model.number="form.projectTimeLimit" maxlength="10" show-word-limit placeholder="请输入项目工期">
<template #append>天</template>
</el-input>
</el-form-item>
@ -269,110 +218,70 @@
<el-col :span="8">
<el-form-item label="项目进度" prop="projectSchedule">
<el-select v-model="form.projectSchedule" placeholder="请选择项目进度" style="width:100%">
<el-option
v-for="dict in pro_project_schedule"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option v-for="dict in pro_project_schedule" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="计划开工时间" prop="scheduledStartTime" >
<el-date-picker
v-model="form.scheduledStartTime"
type="date"
placeholder="请选择计划开工时间"
style="width:100%"
/>
<el-form-item label="计划开工时间" prop="scheduledStartTime">
<el-date-picker v-model="form.scheduledStartTime" type="date" placeholder="请选择计划开工时间"
style="width:100%" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="计划完工时间" prop="plannedCompletionTime">
<el-date-picker
v-model="form.plannedCompletionTime"
type="date"
placeholder="请选择计划完工时间"
style="width:100%"
/>
<el-date-picker v-model="form.plannedCompletionTime" type="date" placeholder="请选择计划完工时间"
style="width:100%" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际开工时间" prop="actualOperatingTime">
<el-date-picker
v-model="form.actualOperatingTime"
type="date"
placeholder="请选择实际开工时间"
style="width:100%"
/>
<el-date-picker v-model="form.actualOperatingTime" type="date" placeholder="请选择实际开工时间"
style="width:100%" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际完工时间" prop="actualCompletionTime">
<el-date-picker
v-model="form.actualCompletionTime"
type="date"
placeholder="请选择实际完工时间"
style="width:100%"
/>
<el-date-picker v-model="form.actualCompletionTime" type="date" placeholder="请选择实际完工时间"
style="width:100%" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="项目概述" prop="projectSummarize">
<el-input
v-model="form.projectSummarize"
type="textarea"
:rows="3"
placeholder="请输入项目概述"
maxlength="1024"
show-word-limit
/>
<el-input v-model="form.projectSummarize" type="textarea" :rows="3" placeholder="请输入项目概述"
maxlength="1024" show-word-limit />
</el-form-item>
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane label="参建单位信息" name="depts">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="Plus" @click="handleAddDepts">添加</el-button>
<el-tab-pane label="参建单位信息" name="depts" v-if="data.opt=='edit'">
<div v-for="(it,idx) in projectDeptsList" :key="idx" class="prj-dept-item">
<div class="dept-item-header">
<el-icon size="14" color="#2196F3"><OfficeBuilding /></el-icon>
<span class="sp-header">{{ it.deptType }}</span>
</div>
<el-row>
<el-col :span="8">
<span class="sp-label">{{ it.deptType }}名称</span>
<el-input v-model="it.deptName" class="txt-dept-name"/>
</el-col>
<el-col :span="1.5">
<el-button type="danger" icon="Delete" @click="handleDeleteDepts">删除</el-button>
<el-col :span="8">
<span class="sp-label">负责人姓名</span>
<el-input v-model="it.leader" class="txt-leader"/>
</el-col>
<el-col :span="8">
<span class="sp-label">负责人联系电话</span>
<el-input v-model="it.phone" class="txt-phone"/>
</el-col>
</el-row>
<el-table :data="projectDeptsList" :row-class-name="rowProjectDeptsIndex" @selection-change="handleDeptsSelectionChange" ref="projectDeptsRef">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="单位类型" prop="deptType" align="center">
<template #default="scope">
<el-select v-model="scope.row.deptType" placeholder="请选择单位类型">
<el-option
v-for="dict in pro_dept_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="单位负责人" prop="leader" align="center">
<template #default="scope">
<el-input v-model="scope.row.leader" placeholder="请输入负责人姓名" />
</template>
</el-table-column>
<el-table-column label="负责人联系电话" prop="phone" align="center">
<template #default="scope">
<el-input v-model="scope.row.phone" placeholder="请输入负责人联系电话" />
</template>
</el-table-column>
</el-table>
</div>
</el-tab-pane>
<el-tab-pane label="项目大屏设置" name="setting">
<el-tab-pane label="项目大屏设置" name="setting" v-if="data.opt=='edit'" class="pan-setting">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="项目显示名" prop="orgName">
@ -381,28 +290,28 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="12" :class="form.setting.orgLogo?'no-up':'can-up'" class="up-img">
<el-form-item label="显示LOGO" prop="orgLogo">
<image-upload v-model="form.setting.orgLogo" :limit="1"/>
<image-upload v-model="form.setting.orgLogo" :limit="1" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" :class="form.setting.orgPlane?'no-up':'can-up'" class="up-img">
<el-form-item label="项目平面图" prop="orgPlane">
<image-upload v-model="form.setting.orgPlane" :limit="3"/>
<image-upload v-model="form.setting.orgPlane" :limit="1" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="项目图片" prop="orgImage">
<image-upload v-model="form.setting.orgImage" :limit="9"/>
<el-col :span="24" :class="form.setting.orgImage && form.setting.orgImage.split(',').length==9?'no-up':'can-up'" class="up-img">
<el-form-item label="项目预览图" prop="orgImage">
<image-upload v-model="form.setting.orgImage" :limit="9" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-col :span="24" :class="form.setting.orgVideo?'no-up':'can-up'" class="up-video">
<el-form-item label="项目视频" prop="orgVideo">
<file-upload v-model="form.setting.orgVideo" :limit="1" :fileType="['mp4']" :fileSize="100"/>
<file-upload v-model="form.setting.orgVideo" :limit="1" :fileType="['mp4']" :fileSize="100" />
</el-form-item>
</el-col>
</el-row>
@ -423,10 +332,10 @@
<script setup name="ProProjectInfo">
import { deptTreeSelect } from "@/api/system/user";
import { projectDeptList } from "@/api/system/dept";
import { projectDeptList, deptTree, listDept } from "@/api/system/dept";
import { listProProjectInfo, getProProjectInfo, delProProjectInfo, addProProjectInfo, updateProProjectInfo } from "@/api/manage/proProjectInfo";
import BaiduMap from "@/components/BaiduMap/Map.vue";
import useUserStore from '@/store/modules/user'
const { proxy } = getCurrentInstance();
const { pro_project_type, pro_project_schedule, pro_dept_type, sys_is_del } = proxy.useDict('pro_project_type', 'pro_project_schedule', 'pro_dept_type', 'sys_is_del');
@ -446,10 +355,10 @@ const projectDeptsList = ref([]);
const checkedProjectDepts = ref([]);
const deptOptions = ref([]);
const userStore = useUserStore()
const data = reactive({
form: {
setting:{}
setting: {}
},
queryParams: {
pageNum: 1,
@ -479,7 +388,11 @@ const data = reactive({
projectTimeLimit: [{ required: true, message: "工程期限不能为空", trigger: "blur" }],
totalInvestment: [{ required: true, message: "项目总投资不能为空", trigger: "blur" }],
contractAmount: [{ required: true, message: "合同金额不能为空", trigger: "blur" }],
}
},
allDeptTree:[],
compOptions:[],
opt:'',
});
const { queryParams, form, rules } = toRefs(data);
@ -553,6 +466,7 @@ function reset() {
setting: {}
};
proxy.resetForm("proProjectInfoRef");
activeName.value="base";
}
/** 搜索按钮操作 */
@ -576,6 +490,7 @@ function handleSelectionChange(selection) {
/** 新增按钮操作 */
function handleAdd() {
data.opt="add"
reset();
open.value = true;
title.value = "添加项目信息";
@ -583,12 +498,30 @@ function handleAdd() {
/** 修改按钮操作 */
function handleUpdate(row) {
data.opt="edit"
reset();
const _id = row.id || ids.value
getProProjectInfo(_id).then(response => {
form.value = response.data;
form.value.setting=response.data.setting||{
orgName:'',
orgLogo:'',
orgPlane:'',
orgImage:[],
orgVideo:''
};
open.value = true;
title.value = "修改项目信息";
projectDeptsList.value=(response.data.projectDeptsList||[]).filter(d=>d.id);
if(projectDeptsList.value.length==0){
projectDeptsList.value=[
{deptType:'建设单位',deptName:'',leader:'',phone:''},
{deptType:'监理单位',deptName:'',leader:'',phone:''},
{deptType:'设计单位',deptName:'',leader:'',phone:''},
{deptType:'检测单位',deptName:'',leader:'',phone:''},
{deptType:'勘察单位',deptName:'',leader:'',phone:''},
];
}
});
}
@ -614,7 +547,7 @@ function handleDeleteDepts() {
} else {
const projectDeptsList = projectDeptsList.value;
const checkedProjectDepts = checkedProjectDepts.value;
projectDeptsList.value = projectDeptsList.filter(function(item) {
projectDeptsList.value = projectDeptsList.filter(function (item) {
return checkedProjectDepts.indexOf(item.index) == -1
});
}
@ -627,17 +560,21 @@ function handleDeptsSelectionChange(selection) {
/** 提交按钮 */
function submitForm() {
debugger
proxy.$refs["proProjectInfoRef"].validate(valid => {
if (valid) {
form.value.projectDeptsList = projectDeptsList.value;
let postData={
...form.value
}
if (form.value.id != null) {
updateProProjectInfo(form.value).then(response => {
updateProProjectInfo(postData).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
addProProjectInfo(form.value).then(response => {
addProProjectInfo(postData).then(response => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
@ -662,12 +599,12 @@ function setProjectSort(row, val) {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value;
proxy.$modal.confirm('是否确认删除项目信息编号为"' + _ids + '"的数据项？').then(function() {
proxy.$modal.confirm('是否确认删除项目信息编号为"' + _ids + '"的数据项？').then(function () {
return delProProjectInfo(_ids);
}).then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => { });
}
/** 导出按钮操作 */
@ -680,12 +617,38 @@ function handleExport() {
/** 查询部门下拉树结构 */
function getDeptTree() {
deptTreeSelect().then(response => {
deptOptions.value = response.data;
data.allDeptTree = response.data;
});
listDept({ deptType: 2 }).then(response => {
data.compOptions = response.data;
});
};
//公司下拉选择
function doChangeComp(){
const findDept=nodes=>{
let tmps=nodes.filter(d=>d.data.deptId==form.value.deptId);
if(tmps.length>0){
return tmps[0].children;
}else{
for(let i=0;i<nodes.length;i++){
let obj=findDept(nodes[i].children);
if(obj){
return obj;
}
}
return [];
}
};
if(form.value.deptId){
deptOptions.value=findDept(data.allDeptTree);
}else{
deptOptions.value=[]
}
}
/** 地图选择 */
function getMapInfo(){
function getMapInfo() {
mapRef.value.showDlg();
}
@ -693,3 +656,54 @@ function getMapInfo(){
getList();
getDeptTree();
</script>
<style lang="scss">
.project-info-edit-dlg{
.prj-dept-item{
margin-bottom: 20px;
.dept-item-header{
display: flex;
color: #2196F3;
align-items: center;
.sp-header{
display: inline-block;
margin-left: 4px;
}
}
.el-input{
display: inline-block;
width:auto;
}
.sp-label{
font-size:12px;
color:#888;
&::after{
content: ":";
}
}
}
.el-tab-pane.pan-setting{
.el-form-item{
flex-flow: column;
margin-bottom:0px;
}
.up-img{
&.no-up{
.el-upload__tip{
display: none;
}
}
}
.up-video{
&.no-up{
.el-upload__tip{
display: none;
}
.upload-file-uploader{
display: none;
}
}
}
}
}
</style>

281
yanzhu-ui-vue3/src/views/system/user/index.vue
View File

@ -4,74 +4,35 @@
<!--部门数据-->
<el-col :span="4" :xs="24">
<div class="head-container">
<el-input
v-model="deptName"
placeholder="请输入部门名称"
clearable
prefix-icon="Search"
style="margin-bottom: 20px"
/>
<el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search"
style="margin-bottom: 20px" />
</div>
<div class="head-container">
<el-tree
:data="deptOptions"
:props="{ label: 'label', children: 'children' }"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="deptTreeRef"
node-key="id"
highlight-current
accordion
:default-expanded-keys="defaultEK"
@node-click="handleNodeClick"
/>
<el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }"
:expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id"
highlight-current accordion :default-expanded-keys="defaultEK" @node-click="handleNodeClick" />
</div>
</el-col>
<!--用户数据-->
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户名称" prop="nickName">
<el-input
v-model="queryParams.nickName"
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
<el-input v-model="queryParams.nickName" placeholder="请输入用户名称" clearable style="width: 240px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="queryParams.phonenumber"
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="用户状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="用户状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="创建时间" style="width: 308px;">
<el-date-picker
v-model="dateRange"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -81,51 +42,24 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['system:user:add']"
>新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['system:user:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:user:edit']"
>修改</el-button>
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:user:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:user:remove']"
>删除</el-button>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:user:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="Upload"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button>
<el-button type="info" plain icon="Upload" @click="handleImport"
v-hasPermi="['system:user:import']">导入</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['system:user:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
@ -133,23 +67,23 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="用户名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="所属部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="用户类型" align="center" v-if="columns[4].visible" >
<el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
:show-overflow-tooltip="true" />
<el-table-column label="用户名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
:show-overflow-tooltip="true" />
<el-table-column label="所属部门" align="center" key="deptName" prop="dept.deptName"
v-if="columns[3].visible" :show-overflow-tooltip="true" />
<el-table-column label="用户类型" align="center" v-if="columns[4].visible">
<template #default="scope">
<dict-tag :options="sys_user_type" :value="scope.row.userType" />
</template>
</el-table-column>
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[5].visible" width="120" />
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
v-if="columns[5].visible" width="120" />
<el-table-column label="用户状态" align="center" key="status" v-if="columns[6].visible">
<template #default="scope">
<el-switch
v-model="scope.row.status"
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
@change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[7].visible" width="160">
@ -160,27 +94,26 @@
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"></el-button>
</el-tooltip>
<el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
<el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)"
v-hasPermi="['system:user:resetPwd']"></el-button>
</el-tooltip>
<el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
<el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
<el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"
v-hasPermi="['system:user:edit']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-col>
</el-row>
@ -190,16 +123,9 @@
<el-row>
<el-col :span="24">
<el-form-item label="所属部门" prop="deptId">
<el-tree-select
v-model="form.deptId"
:data="deptOptions"
:props="{ value: 'id', label: 'label', children: 'children' }"
value-key="id"
placeholder="请选择所属部门"
check-strictly
style="width:100%"
@change="handleChangeDept"
/>
<el-tree-select ref="selTreeDept" v-model="form.deptId" :data="deptOptions"
:props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
placeholder="请选择所属部门" check-strictly style="width:100%" @change="handleChangeDept" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -210,71 +136,52 @@
<el-col :span="12">
<el-form-item label="用户类型" prop="userType">
<el-select v-model="form.userType" placeholder="请选择用户类型" style="width: 100%">
<el-option
v-for="dict in sys_user_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in sys_user_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="form.phonenumber" :disabled="form.userId" placeholder="请输入手机号码" maxlength="11" />
<el-input v-model="form.phonenumber" :disabled="form.userId" placeholder="请输入手机号码"
maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="登录密码" prop="password">
<el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="20" :disabled="form.userId" :show-password="!form.userId" />
<el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="20"
:disabled="form.userId" :show-password="!form.userId" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择用户性别" style="width:100%">
<el-option
v-for="dict in sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio>
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择用户岗位" style="width:100%">
<el-option
v-for="item in postOptions"
:key="item.postId"
:label="item.postName"
:value="item.postId"
:disabled="item.status == 1"
></el-option>
<el-option v-for="item in postOptions" :key="item.postId" :label="item.postName"
:value="item.postId" :disabled="item.status == 1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择用户角色" style="width:100%">
<el-option
v-for="item in roleOptions"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
<el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName"
:value="item.roleId" :disabled="item.status == 1"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -290,18 +197,9 @@
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
<el-upload
ref="uploadRef"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<template #tip>
@ -310,7 +208,8 @@
<el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
@click="importTemplate">下载模板</el-link>
</div>
</template>
</el-upload>
@ -348,7 +247,7 @@ const deptOptions = ref(undefined);
const initPassword = ref(undefined);
const postOptions = ref([]);
const roleOptions = ref([]);
const selTreeDept = ref();
const defaultEK = ref([100]);
/*** 用户导入参数 */
@ -451,13 +350,13 @@ function handleDelete(row) {
}).then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => { });
};
/** 导出按钮操作 */
function handleExport() {
proxy.download("system/user/export", {
...queryParams.value,
},`user_${new Date().getTime()}.xlsx`);
}, `user_${new Date().getTime()}.xlsx`);
};
/** 用户状态修改 */
function handleStatusChange(row) {
@ -500,7 +399,7 @@ function handleResetPwd(row) {
resetUserPwd(row.userId, value).then(response => {
proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
});
}).catch(() => {});
}).catch(() => { });
};
/** 选择条数 */
function handleSelectionChange(selection) {
@ -561,6 +460,14 @@ function cancel() {
function handleAdd() {
reset();
getUser().then(response => {
data.rules={
deptId: [{ required: true, message: "所属单位不能为空", trigger: "change" }],
userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
nickName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }],
userType: [{ required: true, message: "用户类型不能为空", trigger: "change" }],
password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
}
postOptions.value = response.posts;
open.value = true;
title.value = "添加用户";
@ -572,6 +479,12 @@ function handleUpdate(row) {
reset();
const userId = row.userId || ids.value;
getUser(userId).then(response => {
data.rules={
deptId: [{ required: true, message: "所属单位不能为空", trigger: "change" }],
userType: [{ required: true, message: "用户类型不能为空", trigger: "change" }],
phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
}
form.value = response.data;
postOptions.value = response.posts;
form.value.postIds = response.postIds;
@ -584,17 +497,39 @@ function handleUpdate(row) {
};
/** 根据单位选择角色 */
function handleChangeDept(value){
function handleChangeDept(value) {
form.roleIds = null;
getDeptRole(value).then(response => {
roleOptions.value = response.data;
});
}
const getCompId=()=>{
const getCompId=n=>{
if(n.data.data.deptType==2){
return n.data.id
}else{
let pnode=node.parent;
if(!pnode){
return ""
}else{
return getCompId(pnode);
}
}
}
let ndData=selTreeDept.value.getCurrentNode();
let node=selTreeDept.value.getNode(ndData.id);
let compId=getCompId(node);
return compId;
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["userRef"].validate(valid => {
form.comId=getCompId();
if (valid) {
form.value.userName = form.value.nickName;
if (form.value.userId != undefined) {
updateUser(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");

2
yanzhu-ui-vue3/src/views/tool/gen/index.vue
View File

@ -132,7 +132,7 @@
@pagination="getList"
/>
<!-- 预览界面 -->
<el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body custom-class="scrollbar">
<el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
<el-tabs v-model="preview.activeTags">
<el-tab-pane
v-for="(value, key) in preview.data"

8
yanzhu-ui-vue3/vite.config.js
View File

@ -34,7 +34,13 @@ export default defineConfig(({ mode, command }) => {
target: 'http://localhost:8080',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
}
},
'/statics': {
target: `http://localhost:9300/statics/`,
changeOrigin: true,
rewrite: (p) => p.replace(/^\/statics/, '')
},
}
},
//fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file