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

Compare commits

base: jiangyq:751aa308846652d4f975f666d86f2e58120f6c88
Branches Tags
jiangyq:dev_xd
jiangyq:main
..
compare: jiangyq:b3479543c42f9527c79d71557ebf680f4178cb93
Branches Tags
jiangyq:dev_xd
jiangyq:main

No commits in common. "751aa308846652d4f975f666d86f2e58120f6c88" and "b3479543c42f9527c79d71557ebf680f4178cb93" have entirely different histories.
751aa30884 ... b3479543c4

42 changed files with 52 additions and 179 deletions
Show Stats Expand all files Collapse all files

BIN
yanzhu-bigscreen/public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 894 B

4
yanzhu-bigscreen/src/api-old/device/tower/index.js
View File

@ -18,7 +18,7 @@ const findTowerConfigListByProjectId=(deptId, projectId)=> {
// 查询塔基运行统计
const findTowerStatisticsView=(deviceSn)=> {
return request({
url: `bgscreen/tower/findTowerStatisticsView?deviceKey=${deviceSn}`,
url: `bgscreen/tower/findTowerStatisticsView?deviceSn=${deviceSn}`,
method: 'get'
})
}
@ -34,7 +34,7 @@ const selectDevTowerDataLimitList=(deviceSn)=> {
// 查询塔基实时数据
const selectDevTowerDataRunList=(deviceSn)=> {
return request({
url: `bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10`,
url: `bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10&warnings=Y`,
method: 'get'
})
}

4
yanzhu-bigscreen/src/api/tower.js
View File

@ -20,7 +20,7 @@ const findTowerConfigListByProjectId = (data) => {
// 查询塔基运行统计
const findTowerStatisticsView = (deviceSn) => {
return request({
url: `/manage/bgscreen/tower/findTowerStatisticsView?deviceKey=${deviceSn}`,
url: `/manage/bgscreen/tower/findTowerStatisticsView?deviceSn=${deviceSn}`,
method: "get",
});
};
@ -36,7 +36,7 @@ const selectDevTowerDataLimitList = (deviceSn) => {
// 查询塔基实时数据
const selectDevTowerDataRunList = (deviceSn) => {
return request({
url: `manage/bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10`,
url: `manage/bgscreen/tower/selectDevTowerDataRunList?deviceKey=${deviceSn}&pageNum=1&pageSize=10&warnings=Y`,
method: "get",
});
};

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
View File

@ -74,8 +74,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId != null "> and dtdc.project_id = #{projectId}</if>
<if test="comId != null "> and dtdc.com_id = #{comId}</if>
<if test="deptId != null "> and dtdc.dept_id = #{deptId}</if>
<if test="activeComId != null "> and dtdc.com_id = #{activeComId}</if>
<if test="activeProjectId != null "> and dtdc.project_id = #{activeProjectId}</if>
<if test="projectName != null and projectName != ''"> and dtdc.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
<if test="comName != null and comName != ''"> and dtdc.com_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
<if test="deviceKey != null and deviceKey != ''"> and dtdc.device_key = #{deviceKey}</if>

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
View File

@ -75,8 +75,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
<if test="comId != null "> and dtdl.com_id = #{comId}</if>
<if test="deptId != null "> and dtdl.dept_id = #{deptId}</if>
<if test="activeComId != null "> and dtdl.com_id = #{activeComId}</if>
<if test="activeProjectId != null "> and dtdl.project_id = #{activeProjectId}</if>
<if test="projectName != null and projectName != ''"> and dtdl.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
<if test="comName != null and comName != ''"> and dtdl.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
<if test="deviceKey != null and deviceKey != ''"> and dtdl.device_key = #{deviceKey}</if>

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
View File

@ -89,8 +89,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
<if test="comId != null "> and dtdl.com_id = #{comId}</if>
<if test="deptId != null "> and dtdl.dept_id = #{deptId}</if>
<if test="activeComId != null "> and dtdl.com_id = #{activeComId}</if>
<if test="activeProjectId != null "> and dtdl.project_id = #{activeProjectId}</if>
<if test="projectName != null and projectName != ''"> and dtdl.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
<if test="comName != null and comName != ''"> and dtdl.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
<if test="deviceKey != null and deviceKey != ''"> and dtdl.device_key = #{deviceKey}</if>

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
View File

@ -106,8 +106,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
<if test="comId != null "> and dtdr.com_id = #{comId}</if>
<if test="deptId != null "> and dtdr.dept_id = #{deptId}</if>
<if test="activeComId != null "> and dtdr.com_id = #{activeComId}</if>
<if test="activeProjectId != null "> and dtdr.project_id = #{activeProjectId}</if>
<if test="projectName != null and projectName != ''"> and dtdr.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
<if test="comName != null and comName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
<if test="deviceKey != null and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>

5
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
View File

@ -90,18 +90,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataRunList" parameterType="DevTowerDataRun" resultMap="DevTowerDataRunResult">
<include refid="selectDevTowerDataRunVo"/>
<where>
dtdr.is_del=0
<if test="cfgId != null">and dtdr.cfg_id = #{cfgId}</if>
<if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
<if test="comId != null "> and dtdr.com_id = #{comId}</if>
<if test="deptId != null "> and dtdr.dept_id = #{deptId}</if>
<if test="activeComId != null "> and dtdr.com_id = #{activeComId}</if>
<if test="activeProjectId != null "> and dtdr.project_id = #{activeProjectId}</if>
<if test="projectName != null and projectName != ''"> and dtdr.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
<if test="comName != null and comName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
<if test="deviceKey != null and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
<if test="deviceSource != null and deviceSource != ''"> and dtdr.device_source = #{deviceSource}</if>
<if test="warnings != null and warnings != ''"> and dtdr.warnings is not null </if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and dtdr.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
and dtdr.is_del=0
</where>
order by dtdr.id desc
</select>

2
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
View File

@ -79,8 +79,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId != null "> and dtdw.project_id = #{projectId}</if>
<if test="comId != null "> and dtdw.com_id = #{comId}</if>
<if test="deptId != null "> and dtdw.dept_id = #{deptId}</if>
<if test="activeComId != null "> and dtdw.com_id = #{activeComId}</if>
<if test="activeProjectId != null "> and dtdw.project_id = #{activeProjectId}</if>
<if test="projectName != null and projectName != ''"> and dtdw.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
<if test="comName != null and comName != ''"> and dtdw.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
<if test="deviceKey != null and deviceKey != ''"> and dtdw.device_key = #{deviceKey}</if>

4
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
View File

@ -75,19 +75,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerProjectConfigList" parameterType="DevTowerProjectConfig" resultMap="DevTowerProjectConfigResult">
<include refid="selectDevTowerProjectConfigVo"/>
<where>
dtpc.is_del = 0
<if test="projectId != null "> and dtpc.project_id = #{projectId}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<if test="comId != null "> and dtpc.com_id = #{comId}</if>
<if test="deptId != null "> and dtpc.dept_id = #{deptId}</if>
<if test="activeComId != null "> and dtpc.com_id = #{activeComId}</if>
<if test="activeProjectId != null "> and dtpc.project_id = #{activeProjectId}</if>
<if test="comName != null and comName != ''"> and sd.dept_name like concat('%', #{comName}, '%')</if>
<if test="deviceSn != null and deviceSn != ''"> and dtpc.device_sn like concat('%', #{deviceSn}, '%')</if>
<if test="deviceName != null and deviceName != ''"> and dtpc.device_name like concat('%', #{deviceName}, '%')</if>
<if test="deviceSource != null and deviceSource != ''"> and dtpc.device_source = #{deviceSource}</if>
<if test="towerId != null and towerId != ''"> and dtpc.tower_id = #{towerId}</if>
<if test="towerType != null and towerType != ''"> and dtpc.tower_type = #{towerType}</if>
and dtpc.is_del = 0
</where>
order by dtpc.id desc
</select>

69
yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
View File

@ -164,7 +164,6 @@
// for (int i = 0; i < arr.size(); i++) {
// JSONObject json = arr.getJSONObject(i);
// String subDeptType = convertSubDeptType(json.getString("corpType"));
// // 总包单位不同步
// if(!"1".equals(subDeptType)){
// rowId = json.getLong("id");
// QuartzProSubdepts quartzProSubdeptsQuery = new QuartzProSubdepts();
@ -174,7 +173,6 @@
// List<QuartzProSubdepts> list = quartzProSubdeptsService.selectQuartzProSubdeptsList(quartzProSubdeptsQuery);
// if(StringUtils.isNotEmpty(list)){
// QuartzProSubdepts quartzProSubdepts = list.get(0);
// quartzProSubdepts.setSubDeptType(subDeptType);
// quartzProSubdepts.setSubDeptName(json.getString("corpName"));
// quartzProSubdepts.setSubDeptCode(json.getString("corpCode"));
// quartzProSubdepts.setSubDeptLeaderName(json.getString("pmName"));
@ -190,7 +188,6 @@
// subDeptInfos.put("businessAddress",json.getString("businessAddress"));
// subDeptInfos.put("officePhone",json.getString("officePhone"));
// quartzProSubdepts.setSubDeptInfos(JSON.toJSONString(subDeptInfos));
// quartzProSubdepts.setSource(code.toUpperCase());
// quartzProSubdeptsService.updateQuartzProSubdepts(quartzProSubdepts);
// }else{
// QuartzProSubdepts quartzProSubdepts = new QuartzProSubdepts();
@ -214,7 +211,7 @@
// quartzProSubdepts.setSubDeptInfos(JSON.toJSONString(subDeptInfos));
// quartzProSubdepts.setUseStatus(UseStateEnums.IN.getCode());
// quartzProSubdepts.setApproveStatus(ApproveStatus.passed.getCode());
// quartzProSubdepts.setSource(code.toUpperCase());
// quartzProSubdepts.setSource(code);
// quartzProSubdeptsService.insertQuartzProSubdepts(quartzProSubdepts);
// }
// }
@ -287,15 +284,13 @@
// long rowId = 0;
// for (int i = 0; i < arr.size(); i++) {
// JSONObject json = arr.getJSONObject(i);
// String subDeptType = convertSubDeptType(json.getString("corpType"));
// QuartzProSubdeptsGroup quartzProSubdeptsGroupQuery = new QuartzProSubdeptsGroup();
// quartzProSubdeptsGroupQuery.setComId(it.getComId());
// quartzProSubdeptsGroupQuery.setProjectId(it.getProjectId());
// quartzProSubdeptsGroupQuery.setGroupName(json.getString("teamName"));
// List<QuartzProSubdeptsGroup> list = quartzProSubdeptsGroupService.selectQuartzProSubdeptsGroupList(quartzProSubdeptsGroupQuery);
// if(StringUtils.isNotEmpty(list)){
// QuartzProSubdeptsGroup quartzProSubdeptsGroup = list.get(0);
// quartzProSubdeptsGroup
//
// }else{
//
// }
@ -321,66 +316,6 @@
// }
// }
//
// /**
// * 转换工种类型
// * @param jobTypes
// * @return
// */
// private Map<String, String> convertSubJobTypes(String jobTypes){
// Map<String, String> dataMap = new HashMap<>();
// switch (jobTypes){
// case "3001" : dataMap.put("type","2");dataMap.put("post","1015"); break;
// case "3002" : dataMap.put("type","2");dataMap.put("post","1014"); break;
// case "3003" :
// case "3004" : dataMap.put("type","2");dataMap.put("post","2021"); break;
// case "3005" : dataMap.put("type","2");dataMap.put("post","2022"); break;
// case "3006" : dataMap.put("type","2");dataMap.put("post","1013"); break;
// case "3007" : dataMap.put("type","1");dataMap.put("post","1006"); break;
// case "3008" : dataMap.put("type","1");dataMap.put("post","1004"); break;
// case "3009" : dataMap.put("type","1");dataMap.put("post","1001"); break;
// case "3010" : dataMap.put("type","1");dataMap.put("post","1003"); break;
// case "3011" : dataMap.put("type","1");dataMap.put("post","1017"); break;
// case "3012" : dataMap.put("type","1");dataMap.put("post","1007"); break;
// case "3013" : dataMap.put("type","1");dataMap.put("post","1008"); break;
// case "3014" : dataMap.put("type","1");dataMap.put("post","1009"); break;
// case "3015" : dataMap.put("type","1");dataMap.put("post","1012"); break;
// case "3016" : dataMap.put("type","3");dataMap.put("post","3024"); break;
// case "3017" : dataMap.put("type","1");dataMap.put("post","1010"); break;
// case "3018" : dataMap.put("type","3");dataMap.put("post","3025"); break;
// case "3071" :
// case "3019" : dataMap.put("type","2");dataMap.put("post","2017"); break;
// case "3020" : dataMap.put("type","2");dataMap.put("post","2018"); break;
// case "3021" : dataMap.put("type","2");dataMap.put("post","2016"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3032" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
// default : subDeptType = "99"; break;
// }
// return subDeptType;
// }
//
// private String getWorkTypeName(String appid, String token, String type, String key) {
// String ckey = "attendance_jgw_work_type_" + type;
// Object obj = redisService.getCacheObject(ckey);

5
yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsGroupMapper.xml
View File

@ -37,10 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectQuartzProSubdeptsGroupVo">
select psg.id, psg.com_id, sd.dept_name as com_name, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, psg.craft_post, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark, psg.source
select psg.id, psg.com_id, sd.dept_name as com_name, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, dic0.dict_label as sub_dept_type_name, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, dic1.dict_label as craft_type_name, psg.craft_post, dic2.dict_label as craft_post_name, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark, psg.source
from pro_project_info_subdepts_group psg
left join pro_project_info pi on pi.id = psg.project_id
left join sys_dept sd on sd.dept_id = psg.com_id
left join sys_dict_data dic0 on psg.`sub_dept_type`=dic0.`dict_value` and dic0.`dict_type`='sub_dept_type'
left join sys_dict_data dic1 on psg.`craft_type`=dic1.`dict_value` and dic1.`dict_type`='pro_craft_type'
left join sys_dict_data dic2 on psg.`craft_post`=dic2.`dict_value` and dic2.`dict_type`='pro_craft_post'
</sql>
<select id="selectQuartzProSubdeptsGroupList" parameterType="QuartzProSubdeptsGroup" resultMap="QuartzProSubdeptsGroupResult">

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasSignetServiceImpl.java
View File

@ -46,7 +46,7 @@ public class BasSignetServiceImpl implements IBasSignetService
public List<BasSignet> selectBasSignetList(BasSignet basSignet)
{
if(Objects.isNull(basSignet.getProjectId())){
//basSignet.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
basSignet.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
basSignet.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return basSignetMapper.selectBasSignetList(basSignet);

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasTemplateServiceImpl.java
View File

@ -43,7 +43,7 @@ public class BasTemplateServiceImpl implements IBasTemplateService
@Override
public List<BasTemplate> selectBasTemplateList(BasTemplate basTemplate)
{
//basTemplate.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
basTemplate.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
basTemplate.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
return basTemplateMapper.selectBasTemplateList(basTemplate);
}

6
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamInfoServiceImpl.java
View File

@ -48,10 +48,8 @@ public class BusExamInfoServiceImpl implements IBusExamInfoService
@Override
public List<BusExamInfo> selectBusExamInfoList(BusExamInfo busExamInfo)
{
if(busExamInfo.getProjectId()==null){
//busExamInfo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busExamInfo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
busExamInfo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busExamInfo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
return busExamInfoMapper.selectBusExamInfoList(busExamInfo);
}

6
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamQuestionServiceImpl.java
View File

@ -53,10 +53,8 @@ public class BusExamQuestionServiceImpl implements IBusExamQuestionService
@Override
public List<BusExamQuestion> selectBusExamQuestionList(BusExamQuestion busExamQuestion)
{
if(busExamQuestion.getProjectId()==null){
//busExamQuestion.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busExamQuestion.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
busExamQuestion.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busExamQuestion.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
return busExamQuestionMapper.selectBusExamQuestionList(busExamQuestion);
}

6
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java
View File

@ -79,10 +79,8 @@ public class BusExamUserServiceImpl implements IBusExamUserService
@Override
public List<BusExamUser> selectBusExamUserList(BusExamUser busExamUser)
{
if(busExamUser.getProjectId()==null){
//busExamUser.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busExamUser.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
busExamUser.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busExamUser.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
return busExamUserMapper.selectBusExamUserList(busExamUser);
}

12
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoServiceImpl.java
View File

@ -64,10 +64,8 @@ public class BusTrainingVideoServiceImpl implements IBusTrainingVideoService
@Override
public List<BusTrainingVideo> selectBusTrainingVideoList(BusTrainingVideo busTrainingVideo)
{
if(busTrainingVideo.getProjectId()==null){
//busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
return busTrainingVideoMapper.selectBusTrainingVideoList(busTrainingVideo);
}
@ -79,10 +77,8 @@ public class BusTrainingVideoServiceImpl implements IBusTrainingVideoService
*/
@Override
public List<Map<String, Object>> findBusTrainingVideoByLevel(BusTrainingVideo busTrainingVideo){
if(busTrainingVideo.getProjectId()==null){
//busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
return busTrainingVideoMapper.findBusTrainingVideoByLevel(busTrainingVideo);
}

6
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoUserServiceImpl.java
View File

@ -68,10 +68,8 @@ public class BusTrainingVideoUserServiceImpl implements IBusTrainingVideoUserSer
@Override
public List<BusTrainingVideoUser> selectBusTrainingVideoUserList(BusTrainingVideoUser busTrainingVideoUser)
{
if(busTrainingVideoUser.getProjectId()==null){
//busTrainingVideoUser.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busTrainingVideoUser.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
busTrainingVideoUser.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
busTrainingVideoUser.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
return busTrainingVideoUserMapper.selectBusTrainingVideoUserList(busTrainingVideoUser);
}

6
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectConfigServiceImpl.java
View File

@ -77,10 +77,8 @@ public class DevAiProjectConfigServiceImpl implements IDevAiProjectConfigService
@Override
public List<DevAiProjectConfig> selectDevAiProjectConfigList(DevAiProjectConfig devAiProjectConfig)
{
if(devAiProjectConfig.getProjectId()==null){
//devAiProjectConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devAiProjectConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
devAiProjectConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devAiProjectConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
return devAiProjectConfigMapper.selectDevAiProjectConfigList(devAiProjectConfig);
}

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectDataServiceImpl.java
View File

@ -67,7 +67,7 @@ public class DevAiProjectDataServiceImpl implements IDevAiProjectDataService
public List<DevAiProjectData> selectDevAiProjectDataList(DevAiProjectData devAiProjectData)
{
if(devAiProjectData.getProjectId()==null){
//devAiProjectData.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devAiProjectData.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devAiProjectData.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devAiProjectDataMapper.selectDevAiProjectDataList(devAiProjectData);

6
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotConfigPointServiceImpl.java
View File

@ -43,10 +43,8 @@ public class DevIotConfigPointServiceImpl implements IDevIotConfigPointService
@Override
public List<DevIotConfigPoint> selectDevIotConfigPointList(DevIotConfigPoint devIotConfigPoint)
{
if(devIotConfigPoint.getProjectId()==null){
//devIotConfigPoint.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devIotConfigPoint.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
devIotConfigPoint.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devIotConfigPoint.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
return devIotConfigPointMapper.selectDevIotConfigPointList(devIotConfigPoint);
}

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotConfigServiceImpl.java
View File

@ -46,7 +46,7 @@ public class DevIotConfigServiceImpl implements IDevIotConfigService
public List<DevIotConfig> selectDevIotConfigList(DevIotConfig devIotConfig)
{
if(devIotConfig.getProjectId()==null){
//devIotConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devIotConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devIotConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devIotConfigMapper.selectDevIotConfigList(devIotConfig);

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotDatasServiceImpl.java
View File

@ -43,7 +43,7 @@ public class DevIotDatasServiceImpl implements IDevIotDatasService
public List<DevIotDatas> selectDevIotDatasList(DevIotDatas devIotDatas)
{
if(devIotDatas.getProjectId()==null){
//devIotDatas.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devIotDatas.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devIotDatas.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devIotDatasMapper.selectDevIotDatasList(devIotDatas);

2
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotWarningServiceImpl.java
View File

@ -51,7 +51,7 @@ public class DevIotWarningServiceImpl implements IDevIotWarningService
public List<DevIotWarning> selectDevIotWarningList(DevIotWarning devIotWarning)
{
if(devIotWarning.getProjectId()==null){
//devIotWarning.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devIotWarning.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devIotWarning.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devIotWarningMapper.selectDevIotWarningList(devIotWarning);

5
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataCollideServiceImpl.java
View File

@ -2,7 +2,6 @@ package com.yanzhu.manage.service.impl;
import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.common.core.utils.StringUtils;
import com.yanzhu.common.security.utils.SecurityUtils;
import com.yanzhu.device.domain.DevTowerDataCollide;
import com.yanzhu.device.domain.DevTowerDataCollideDetail;
import com.yanzhu.device.mapper.DevTowerDataCollideMapper;
@ -46,10 +45,6 @@ public class DevTowerDataCollideServiceImpl implements IDevTowerDataCollideServi
@Override
public List<DevTowerDataCollide> selectDevTowerDataCollideList(DevTowerDataCollide devTowerDataCollide)
{
if(devTowerDataCollide.getProjectId()==null){
//devTowerDataCollide.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devTowerDataCollide.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devTowerDataCollideMapper.selectDevTowerDataCollideList(devTowerDataCollide);
}

5
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLimitServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.yanzhu.manage.service.impl;
import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.common.security.utils.SecurityUtils;
import com.yanzhu.device.domain.DevTowerDataLimit;
import com.yanzhu.device.mapper.DevTowerDataLimitMapper;
import com.yanzhu.manage.service.IDevTowerDataLimitService;
@ -42,10 +41,6 @@ public class DevTowerDataLimitServiceImpl implements IDevTowerDataLimitService
@Override
public List<DevTowerDataLimit> selectDevTowerDataLimitList(DevTowerDataLimit devTowerDataLimit)
{
if(devTowerDataLimit.getProjectId()==null){
//devTowerDataLimit.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devTowerDataLimit.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devTowerDataLimitMapper.selectDevTowerDataLimitList(devTowerDataLimit);
}

5
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLocalServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.yanzhu.manage.service.impl;
import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.common.security.utils.SecurityUtils;
import com.yanzhu.device.domain.DevTowerDataLocal;
import com.yanzhu.device.mapper.DevTowerDataLocalMapper;
import com.yanzhu.manage.service.IDevTowerDataLocalService;
@ -42,10 +41,6 @@ public class DevTowerDataLocalServiceImpl implements IDevTowerDataLocalService
@Override
public List<DevTowerDataLocal> selectDevTowerDataLocalList(DevTowerDataLocal devTowerDataLocal)
{
if(devTowerDataLocal.getProjectId()==null){
//devTowerDataLocal.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devTowerDataLocal.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devTowerDataLocalMapper.selectDevTowerDataLocalList(devTowerDataLocal);
}

5
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRoundServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.yanzhu.manage.service.impl;
import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.common.security.utils.SecurityUtils;
import com.yanzhu.device.domain.DevTowerDataRound;
import com.yanzhu.device.mapper.DevTowerDataRoundMapper;
import com.yanzhu.manage.service.IDevTowerDataRoundService;
@ -42,10 +41,6 @@ public class DevTowerDataRoundServiceImpl implements IDevTowerDataRoundService
@Override
public List<DevTowerDataRound> selectDevTowerDataRoundList(DevTowerDataRound devTowerDataRound)
{
if(devTowerDataRound.getProjectId()==null){
//devTowerDataRound.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devTowerDataRound.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devTowerDataRoundMapper.selectDevTowerDataRoundList(devTowerDataRound);
}

5
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRunServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.yanzhu.manage.service.impl;
import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.common.security.utils.SecurityUtils;
import com.yanzhu.device.domain.DevTowerDataRound;
import com.yanzhu.device.domain.DevTowerDataRun;
import com.yanzhu.device.mapper.DevTowerDataCollideMapper;
@ -56,10 +55,6 @@ public class DevTowerDataRunServiceImpl implements IDevTowerDataRunService
@Override
public List<DevTowerDataRun> selectDevTowerDataRunList(DevTowerDataRun devTowerDataRun)
{
if(devTowerDataRun.getProjectId()==null){
//devTowerDataRun.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devTowerDataRun.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devTowerDataRunMapper.selectDevTowerDataRunList(devTowerDataRun);
}

5
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataWarningServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.yanzhu.manage.service.impl;
import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.common.security.utils.SecurityUtils;
import com.yanzhu.device.domain.DevTowerDataWarning;
import com.yanzhu.device.mapper.DevTowerDataWarningMapper;
import com.yanzhu.manage.service.IDevTowerDataWarningService;
@ -42,10 +41,6 @@ public class DevTowerDataWarningServiceImpl implements IDevTowerDataWarningServi
@Override
public List<DevTowerDataWarning> selectDevTowerDataWarningList(DevTowerDataWarning devTowerDataWarning)
{
if(devTowerDataWarning.getProjectId()==null){
//devTowerDataWarning.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devTowerDataWarning.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devTowerDataWarningMapper.selectDevTowerDataWarningList(devTowerDataWarning);
}

4
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerProjectConfigServiceImpl.java
View File

@ -82,10 +82,6 @@ public class DevTowerProjectConfigServiceImpl implements IDevTowerProjectConfigS
@Override
public List<DevTowerProjectConfig> selectDevTowerProjectConfigList(DevTowerProjectConfig devTowerProjectConfig)
{
if(devTowerProjectConfig.getProjectId()==null){
//devTowerProjectConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
devTowerProjectConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return devTowerProjectConfigMapper.selectDevTowerProjectConfigList(devTowerProjectConfig);
}

4
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java
View File

@ -84,7 +84,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu
public List<ProProjectInfoSubdeptsGroup> selectProProjectInfoSubdeptsGroupList(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup)
{
if(proProjectInfoSubdeptsGroup.getProjectId()==null){
//proProjectInfoSubdeptsGroup.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
proProjectInfoSubdeptsGroup.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
proProjectInfoSubdeptsGroup.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(proProjectInfoSubdeptsGroup);
@ -100,7 +100,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu
public List<Map<String, Object>> findProProjectInfoSubdeptsGroupCount(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup)
{
if(proProjectInfoSubdeptsGroup.getProjectId()==null){
//proProjectInfoSubdeptsGroup.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
proProjectInfoSubdeptsGroup.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
proProjectInfoSubdeptsGroup.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return proProjectInfoSubdeptsGroupMapper.findProProjectInfoSubdeptsGroupCount(proProjectInfoSubdeptsGroup);

4
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
View File

@ -98,7 +98,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
public List<ProProjectInfoSubdepts> selectProProjectInfoSubdeptsList(ProProjectInfoSubdepts proProjectInfoSubdepts)
{
if(proProjectInfoSubdepts.getProjectId()==null){
//proProjectInfoSubdepts.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
proProjectInfoSubdepts.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
proProjectInfoSubdepts.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return proProjectInfoSubdeptsMapper.selectProProjectInfoSubdeptsList(proProjectInfoSubdepts);
@ -114,7 +114,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
public List<Map<String, Object>> findProProjectInfoSubdeptsCount(ProProjectInfoSubdepts proProjectInfoSubdepts)
{
if(proProjectInfoSubdepts.getProjectId()==null){
//proProjectInfoSubdepts.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
proProjectInfoSubdepts.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
proProjectInfoSubdepts.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
return proProjectInfoSubdeptsMapper.findProProjectInfoSubdeptsCount(proProjectInfoSubdepts);

6
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/WxMenuConfigServiceImpl.java
View File

@ -54,10 +54,8 @@ public class WxMenuConfigServiceImpl implements IWxMenuConfigService
@Override
public List<WxMenuConfig> selectWxMenuConfigList(WxMenuConfig wxMenuConfig)
{
if(wxMenuConfig.getProjectId()==null){
//wxMenuConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
wxMenuConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
}
wxMenuConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
wxMenuConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
List<WxMenuConfig> list = wxMenuConfigMapper.selectWxMenuConfigList(wxMenuConfig);
if(StringUtils.isNotEmpty(list)){
List<Long> smcIds = list.stream().map(WxMenuConfig::getId).collect(Collectors.toList());

BIN
yanzhu-ui-vue3/public/favicon2.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 894 B

BIN
yanzhu-ui-vue3/src/assets/logo/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

4
yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
View File

@ -298,8 +298,8 @@ export default {
this.dict = this.useDict('sys_common_isdel');
this.userStore = useUserStore()
this.isAdmin = this.userStore.isAdmin;
//this.queryParams.projectId = this.userStore.currentPrjId;
//this.queryParams.comId = this.userStore.currentComId;
this.queryParams.projectId = this.userStore.currentPrjId;
this.queryParams.comId = this.userStore.currentComId;
this.currentPrjId = this.userStore.currentPrjId;
this.queryProjectChange();
this.getList();

4
yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
View File

@ -299,8 +299,8 @@ export default {
this.dict = this.useDict('sys_common_isdel');
this.userStore = useUserStore()
this.isAdmin = this.userStore.isAdmin;
//this.queryParams.projectId = this.userStore.currentPrjId;
//this.queryParams.comId = this.userStore.currentComId;
this.queryParams.projectId = this.userStore.currentPrjId;
this.queryParams.comId = this.userStore.currentComId;
this.currentPrjId = this.userStore.currentPrjId;
this.queryProjectChange();
this.getList();

4
yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
View File

@ -274,8 +274,8 @@ export default {
this.dict = this.useDict('sys_common_isdel', 'device_tower_warning');
this.userStore = useUserStore()
this.isAdmin = this.userStore.isAdmin;
//this.queryParams.projectId = this.userStore.currentPrjId;
//this.queryParams.comId = this.userStore.currentComId;
this.queryParams.projectId = this.userStore.currentPrjId;
this.queryParams.comId = this.userStore.currentComId;
this.currentPrjId = this.userStore.currentPrjId;
this.queryProjectChange();
this.getList();

4
yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
View File

@ -285,8 +285,8 @@ export default {
this.dict = this.useDict('sys_common_isdel', 'device_tower_warning', 'device_braking_status', 'device_rotation_state');
this.userStore = useUserStore()
this.isAdmin = this.userStore.isAdmin;
//this.queryParams.projectId = this.userStore.currentPrjId;
//this.queryParams.comId = this.userStore.currentComId;
this.queryParams.projectId = this.userStore.currentPrjId;
this.queryParams.comId = this.userStore.currentComId;
this.queryProjectChange();
this.currentPrjId = this.userStore.currentPrjId;
this.getList();

6
yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue
View File

@ -429,9 +429,9 @@ export default {
);
this.userStore = useUserStore();
this.isAdmin = this.userStore.isAdmin;
//this.queryParams.projectId = this.userStore.currentPrjId;
//this.queryParams.comId = this.userStore.currentComId;
//this.queryParams.deptId = "";
this.queryParams.projectId = this.userStore.currentPrjId;
this.queryParams.comId = this.userStore.currentComId;
this.queryParams.deptId = "";
this.queryProjectChange();
this.currentPrjId = this.userStore.currentPrjId;
this.getList();