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

修改大屏问题

dev_xd
lj7788@126.com 2025-06-11 22:01:29 +08:00
parent b3ddd1ae17
commit 9db50321d6
4 changed files with 191 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
yanzhu-bigscreen/src/api/greenCarbon.js
View File

@ -1,5 +1,5 @@
import request from "@/utils/request";
import dayjs from 'dayjs'
import dayjs from "dayjs";
const groupByAll = (data) => {
return new Promise((resolve) => {
return request({
@ -7,24 +7,24 @@ const groupByAll = (data) => {
method: "get",
params: data,
}).then((d) => {
let tmps=(d.data||[]).map(it=>{
let tmps = (d.data || []).map((it) => {
it.sumEmissionReduction = (it.sumEstimateValue || 0) - (it.sumPracticalValue || 0);
it.emissionReduction = (it.estimateValue || 0) - (it.practicalValue || 0);
return it;
})
});
let sumEmissionReduction = 0;
let sumEstimateValue = 0;
let sumPracticalValue = 0;
let emissionReduction = 0;
let estimateValue = 0;
let practicalValue = 0;
tmps.forEach(it=>{
sumEmissionReduction+=(it.sumEmissionReduction||0);
sumEstimateValue+=(it.sumEstimateValue||0);
sumPracticalValue+=(it.sumPracticalValue||0);
emissionReduction+=(it.emissionReduction||0);
estimateValue+=(it.estimateValue||0);
practicalValue+=(it.practicalValue||0);
tmps.forEach((it) => {
sumEmissionReduction += it.sumEmissionReduction || 0;
sumEstimateValue += it.sumEstimateValue || 0;
sumPracticalValue += it.sumPracticalValue || 0;
emissionReduction += it.emissionReduction || 0;
estimateValue += it.estimateValue || 0;
practicalValue += it.practicalValue || 0;
});
tmps.push({
factorType: 0,
@ -33,9 +33,9 @@ const groupByAll = (data) => {
sumPracticalValue: sumPracticalValue,
emissionReduction: emissionReduction,
estimateValue: estimateValue,
practicalValue:practicalValue
})
resolve(tmps)
practicalValue: practicalValue,
});
resolve(tmps);
});
});
};
@ -46,26 +46,26 @@ const groupCurrentMonth = (data) => {
url: "/manage/greenCarbonData/groupCurrentMonth",
method: "get",
params: data,
}).then(d=>{
let tmps=(d.data||[]).map(it=>{
}).then((d) => {
let tmps = (d.data || []).map((it) => {
it.emissionReduction = (it.estimateValue || 0) - (it.practicalValue || 0);
return it;
})
});
let emissionReduction = 0;
let estimateValue = 0;
let practicalValue = 0;
tmps.forEach(it=>{
emissionReduction+=(it.emissionReduction||0);
estimateValue+=(it.estimateValue||0);
practicalValue+=(it.practicalValue||0);
tmps.forEach((it) => {
emissionReduction += it.emissionReduction || 0;
estimateValue += it.estimateValue || 0;
practicalValue += it.practicalValue || 0;
});
tmps.push({
factorType: 0,
emissionReduction: emissionReduction,
estimateValue: estimateValue,
practicalValue:practicalValue
})
resolve(tmps)
practicalValue: practicalValue,
});
resolve(tmps);
});
});
};
@ -78,26 +78,28 @@ const getGroupData=(tmps,data,factorType,dataType)=>{
let year = date.$y;
let month = date.$M + 1;
titles.push(month + "月");
let objs=tmps.filter(it=>(it.factorType==factorType||factorType==0)&& it.comId==year && it.projectId==month);
let val=null;
let objs = tmps.filter((it) => (it.factorType == factorType || factorType == 0) && it.comId == year && it.projectId == month);
let val = 0;
if (objs.length > 0) {
objs.forEach((obj) => {
if (dataType == 1) {
val=objs[0].estimateValue/1000.0
val += obj.estimateValue / 1000.0;
}
if (dataType == 2) {
val=objs[0].practicalValue/1000.0
val += obj.practicalValue / 1000.0;
}
if (dataType == 3) {
val=((objs[0].estimateValue||0) - (val=objs[0].practicalValue||0))/1000.0
val += ((obj.estimateValue || 0) - (val = obj.practicalValue || 0)) / 1000.0;
}
});
}
res.push(val);
}
return {
titles: titles,
datas:res
}
}
datas: res,
};
};
const groupByYearMonth = (data) => {
return new Promise((resolve) => {
@ -105,7 +107,7 @@ const groupByYearMonth = (data) => {
url: "/manage/greenCarbonData/groupByYearMonth",
method: "get",
params: data,
}).then(d=>{
}).then((d) => {
let tmps = d.data || [];
let buildData = {
//预估
@ -144,8 +146,7 @@ const groupByYearMonth = (data) => {
oilData: oilData,
powerData: powerData,
totalData: totalData,
})
});
});
});
};

2
yanzhu-bigscreen/src/views/greenCarbon.vue
View File

@ -268,7 +268,7 @@ export default {
series: [
{
type: 'pie',
radius: '70%',
radius: '50%',
avoidLabelOverlap: false,
bottom: is1K ? '5%' : is2K ? '15%' : '10%',
top: '-10%',

4
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java
View File

@ -276,6 +276,10 @@ public class SysUserController extends BaseController {
@GetMapping("/getInfo")
public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getSysUser();
SysDept dept= deptService.selectDeptById(user.getDeptId());
user.setComId(dept.getComId());
user.setActiveComId(dept.getComId());
user.setDept(dept);
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
if(Objects.nonNull(user.getRoles()) && user.getRoles().size()>0){

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

@ -109,7 +109,11 @@ import useUserStore from "@/store/modules/user";
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 {
devicePositionGet,
devicePositionAddItems,
devicePositionUpdateItems,
} from "@/api/bim/bim.js";
import icons from "./icons.js";
export default {
name: "SandTableSetting",
@ -159,51 +163,55 @@ export default {
confirmButtonText: "确 认",
cancelButtonText: "取 消",
}).then(() => {
let adds=this.devices.filter((item)=>{
return item.id==null
}).map(item=>{
let adds = this.devices
.filter((item) => {
return item.id == null;
})
.map((item) => {
return {
deviceId: item.deviceId,
deviceType: item.deviceType,
position: JSON.stringify(item.position),
enabled: item.show ? 1 : 0,
currentUser: this.userStore.name,
remark:'',
}
remark: "",
};
});
let updates = this.devices
.filter((item) => {
return item.id != null;
})
let updates=this.devices.filter((item)=>{
return item.id!=null
}).map(item=>{
.map((item) => {
return {
id: item.id,
position: JSON.stringify(item.position),
currentUser: this.userStore.name,
enabled: item.show ? 1 : 0,
}
})
console.log("-->",adds,updates)
};
});
console.log("-->", adds, updates);
let ajaxs = [];
if (adds.length > 0) {
ajaxs.push(devicePositionAddItems({items:adds}))
ajaxs.push(devicePositionAddItems({ items: adds }));
}
if (updates.length > 0) {
ajaxs.push(devicePositionUpdateItems({items:updates}))
ajaxs.push(devicePositionUpdateItems({ items: updates }));
}
Promise.all(ajaxs).then((res) => {
ElMessage.success("保存成功")
})
ElMessage.success("保存成功");
});
});
},
clearLabels() {
this.addLabels.forEach(id=>{
this.addLabels.forEach((id) => {
window.sandSettingApi.Label.removeBalloon(id);
})
});
this.addLabels = [];
},
addDeviceLabel() {
this.devices.forEach(d=>{
this.devices.forEach((d) => {
if (d.position && d.position.length > 0) {
this.AddLable(d)
this.AddLable(d);
}
});
},
@ -249,18 +257,22 @@ export default {
window.sandSettingApi.Feature.getByPosition([e.x, e.y], (n) => {
if (n && n["id"]) {
this.positionByModalId = n.id.split("^")[0];
} else {
ElMessage.warning("请在模型上选点！");
}
});
});
window.sandSettingApi.Public.pickupCoordinate(true, (e) => {
if (!this.positionByModalId) {
return;
}
this.selItem.position = e;
window.sandSettingApi.Label.removeBalloon(item.elId);
this.AddLable(this.selItem);
window.sandSettingApi.Public.pickupCoordinate(false);
window.sandSettingApi.Public.clearHandler();
});
} else {
ElMessage.warning("请在模型上选点！");
}
});
});
},
doToolsClose() {
this.activeMenu = 0;