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

修改项目详情信息

dev_xd
lj7788@126.com 2025-06-21 16:18:49 +08:00
parent c0c76bfa6a
commit f19dc47e8f
9 changed files with 66 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
yanzhu-bigscreen/src/views/bim/briefingTools.js
View File

@ -96,7 +96,26 @@ function subFeatureSize(that) {
});
}
//构件面积
function measurementArea(that) {}
function measurementArea(that) {
let api = bimBriefingApi;
that.info = [];
api.Public.clearHandler(), api.Measurement.clearAllTrace();
api.Feature.getByEvent(true, (n) => {
console.log(n);
if (n && n["id"]) {
let featureId = n.id;
let modelId = featureId.split("^")[0];
clearSelectFeature(that);
api.Measurement.featureArea(featureId, (res) => {
that.info = [
{ name: "面积", value: (+res || 0).toFixed(2) + "" }
];
api.Feature.setColor(featureId, "rgba(255,0,255,1)", modelId);
that.selFeatureId = featureId;
});
}
});
}
//构件体积
function measuringVolume(that){

10
yanzhu-bigscreen/src/views/bimBriefing.vue
View File

@ -226,8 +226,10 @@ export default {
methods: {
doSelectMenu(index) {
this.selectMenu = index;
if(window.bimBriefingApi){
let api = bimBriefingApi;
api.Feature.getByEvent(false);
}
briefingTools.clearSelectFeature(this);
switch (index) {
case 0:
@ -343,7 +345,13 @@ export default {
},
initEngine() {
this.elId++;
this.activeMenu = 0;
this.modelTrees=[];
this.models=[];
this.propertyAttr=[];
this.propertyType=[];
this.viewPoint=[];
this.info=[];
this.attributeInformation="";
setTimeout(() => {
this.loadEngine();
}, 10);

1
yanzhu-bigscreen/src/views/bimManage.vue
View File

@ -1018,6 +1018,7 @@ export default {
.div-tools {
position: absolute;
top: calc(80vh - 50px);
left: 50%;
display: flex;
background: #00000080;
border-radius: 10px;

4
yanzhu-bigscreen/src/views/bimRoaming.vue
View File

@ -180,8 +180,8 @@ export default {
api.Camera.setImmersiveRoamConfig({
roamingMode: data.roamingMode,
moveRate: 0.5,
turnRate: 1,
moveRate: data.moveRate,
turnRate: data.turnRate,
bRecordLocus: false,
});
setTimeout(() => {

34
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
View File

@ -420,23 +420,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="groupWorkderNative" resultType="com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers">
select psu.card_code cardCode,nav.address comName
select psu.card_code cardCode,(select nav.address from sys_native nav where left(psu.card_code,2)=left(nav.id,2) LIMIT 1) comName
from pro_project_info_subdepts_users psu
left join sys_native nav on left(psu.card_code,6)=nav.id
where psu.project_id = #{projectId}
and psu.user_post != '66'
and psu.approve_status >= 100
and psu.is_del != 2
and psu.use_status=0
</select>
<select id="getWorkerCountGroupByType" resultMap="ProProjectInfoSubdeptsUsersResult">
select dic2.dict_label as craft_post_name,
count(1) id
from pro_project_info_subdepts_users psu
join sys_dict_data dic2 on psu.`craft_post` = dic2.`dict_value` and dic2.`dict_type` = 'pro_craft_post'
where psu.is_del!=2
and psu.project_id=#{projectId}
GROUP BY dic2.dict_label
order by count(1) desc
SELECT
dic2.dict_label AS craft_post_name,
count( 1 ) id
FROM
(
SELECT
ifnull( craft_post, 4037 ) craft_post
FROM
pro_project_info_subdepts_users
WHERE
project_id = #{projectId}
AND approve_status >= 100
AND is_del != 2
AND use_status = 0
) psu
JOIN sys_dict_data dic2 ON psu.`craft_post` = dic2.`dict_value`
AND dic2.`dict_type` = 'pro_craft_post'
GROUP BY
dic2.dict_label
ORDER BY
count( 1 ) DESC
</select>
<select id="getAttendanceAlert" resultMap="ProProjectInfoSubdeptsUsersResult">

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

@ -1706,7 +1706,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
*/
@Override
public JSONObject groupWorkderNative(Long prjId) {
List<ProProjectInfoSubdeptsUsers> list=proProjectInfoSubdeptsUsersMapper.groupWorkderNative(prjId);
List<ProProjectInfoSubdeptsUsers> list=proProjectInfoSubdeptsUsersMapper.groupWorkderNative(prjId).stream()
.filter(d->d!=null).collect(Collectors.toList());
list.stream().forEach(d->{
String nav=d.getComName();
if(StringUtils.isEmpty(nav)){
@ -1721,6 +1722,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
if(nav.contains("区")){
nav=nav.substring(0,nav.indexOf("区"));
}
if(StringUtils.isEmpty(nav)){
nav="其他";
}
d.setComName(nav);
String code=d.getCardCode();
if(StringUtils.isNotEmpty(code) && code.length()>=10){

4
yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming.vue
View File

@ -378,8 +378,8 @@ export default {
this.isStop = 0
api.Camera.setImmersiveRoamConfig({
roamingMode: data.roamingMode,
moveRate: this.form.moveRate,
turnRate: this.form.turnRate,
moveRate: data.moveRate,
turnRate: data.turnRate,
bRecordLocus: false,
})
this.isRoaming = true

6
yanzhu-ui-vue3/src/views/bim/sandTableSetting/icons.js
View File

@ -1,6 +0,0 @@
export default {
video: `<svg class="icon"
style="width: 1em;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1709">
<path d="M902.4 678.4L870.4 768c-2.133333 6.4-8.533333 10.666667-14.933333 6.4L55.466667 484.266667c-12.8 32 4.266667 70.4 38.4 81.066666L298.666667 640l-14.933334 42.666667c-4.266667 12.8-14.933333 21.333333-29.866666 21.333333H106.666667v-53.333333c0-17.066667-14.933333-32-32-32S42.666667 633.6 42.666667 650.666667v170.666666c0 17.066667 14.933333 32 32 32S106.666667 838.4 106.666667 821.333333V768h151.466666c36.266667 0 70.4-23.466667 81.066667-57.6l17.066667-49.066667 488.533333 179.2c32 12.8 68.266667-4.266667 81.066667-38.4l14.933333-40.533333c10.666667-34.133333-6.4-70.4-38.4-83.2zM951.466667 407.466667L253.866667 153.6c-44.8-17.066667-93.866667 6.4-110.933334 51.2L85.333333 364.8c-17.066667 44.8 6.4 93.866667 51.2 108.8L714.666667 682.666667c32 12.8 70.4 2.133333 93.866666-23.466667l164.266667-183.466667c17.066667-21.333333 8.533333-57.6-21.333333-68.266666z" p-id="1710">
</path></svg>`,
};

2
yanzhu-ui-vue3/src/views/bim/sandTableSetting/index.vue
View File

@ -76,7 +76,7 @@ import { listBimModel } from "@/api/bim/bimModel";
import { ElMessage, ElMessageBox } from "element-plus";
import { emitter } from "@/router/index.js";
import { devicePositionGet, devicePositionAddItems, devicePositionUpdateItems } from "@/api/bim/bim.js";
import icons from "./icons.js";
import { debounce } from "lodash-es";
export default {
name: "SandTableSetting",