提前完工
@@ -329,9 +421,9 @@ const css = ``;
import debounce from "lodash.debounce";
import videoDialog from "./bim/videoDialog.vue";
-import bimTools from './bim/bimTools'
-import apiTools from './bim/apiTools.js'
-import sapiTools from './bim/sapiTools.js'
+import bimTools from "./bim/bimTools";
+import apiTools from "./bim/apiTools.js";
+import sapiTools from "./bim/sapiTools.js";
export default {
components: {
videoDialog,
@@ -390,10 +482,11 @@ export default {
menuShowCount: 0,
modelLoadSuccess: false, //模型加载成功
mode: "model", //显示模式 model-整体模型 plan-形象进度
- isClient: false,
+ isClient: false
};
},
beforeDestroy() {
+ bimTools.destroyRouter(this);
document.body.classList.remove("is-sapi");
},
mounted() {
@@ -425,14 +518,24 @@ export default {
this.updateButtonShow();
});
this.updateButtonShow();
+ bimTools.initIdleDetection(this,"bimMgrApi");
},
methods: {
+
updateButtonShow() {
let objs = this.$root.showMenus || [];
- this.menuShow.video = objs.find((it) => it.component == "video") ? true : false;
- this.menuShow.pit = objs.find((it) => it.component == "pit") ? true : false;
- this.menuShow.tower = objs.find((it) => it.component == "tower") ? true : false;
- this.menuShow.power = objs.find((it) => it.component == "power") ? true : false;
+ this.menuShow.video = objs.find((it) => it.component == "video")
+ ? true
+ : false;
+ this.menuShow.pit = objs.find((it) => it.component == "pit")
+ ? true
+ : false;
+ this.menuShow.tower = objs.find((it) => it.component == "tower")
+ ? true
+ : false;
+ this.menuShow.power = objs.find((it) => it.component == "power")
+ ? true
+ : false;
this.menuShowCount = 0;
for (let key in this.menuShow) {
if (this.menuShow[key]) {
@@ -453,7 +556,13 @@ export default {
tooltip: {
show: true,
formatter: function (params) {
- return params.seriesName + "
" + params.marker + (params.value * 100).toFixed(2) + "%";
+ return (
+ params.seriesName +
+ "
" +
+ params.marker +
+ (params.value * 100).toFixed(2) +
+ "%"
+ );
},
},
series: [
@@ -502,21 +611,27 @@ export default {
projectId: this.selProject.id,
comId: this.selProject.comId,
};
- this.$api.safety.listCountForBG({ ...postData, infoType: 0 }).then((d) => {
- this.safetyListCount = d.data;
- let func = (lbl) => {
- let obj = this.safetyListCount.find((it) => it.remark == lbl);
- return obj ? obj.id || 0 : 0;
- };
- this.safetyInfo.safetyCount = func("全部");
- this.safetyInfo.safetyRectifyCount = func("完成");
- if (this.safetyInfo.safetyCount == 0) {
- this.safetyInfo.safetyRectifyRate = 100;
- } else {
- this.safetyInfo.safetyRectifyRate = ((this.safetyInfo.safetyRectifyCount / this.safetyInfo.safetyCount) * 100.0).toFixed(2);
- }
- this.safetyInfo.safetyTimeoutCount = func("整改超时");
- });
+ this.$api.safety
+ .listCountForBG({ ...postData, infoType: 0 })
+ .then((d) => {
+ this.safetyListCount = d.data;
+ let func = (lbl) => {
+ let obj = this.safetyListCount.find((it) => it.remark == lbl);
+ return obj ? obj.id || 0 : 0;
+ };
+ this.safetyInfo.safetyCount = func("全部");
+ this.safetyInfo.safetyRectifyCount = func("完成");
+ if (this.safetyInfo.safetyCount == 0) {
+ this.safetyInfo.safetyRectifyRate = 100;
+ } else {
+ this.safetyInfo.safetyRectifyRate = (
+ (this.safetyInfo.safetyRectifyCount /
+ this.safetyInfo.safetyCount) *
+ 100.0
+ ).toFixed(2);
+ }
+ this.safetyInfo.safetyTimeoutCount = func("整改超时");
+ });
},
selectLastPhotography() {
this.$api.detail.photographyList(this.selProject.id).then((d) => {
@@ -524,18 +639,20 @@ export default {
});
},
getFinishRate() {
- this.$api.planSchedule.findAllPlanDatas(this.selProject.id).then((res) => {
- let _ywcjhs = [];
+ this.$api.planSchedule
+ .findAllPlanDatas(this.selProject.id)
+ .then((res) => {
+ let _ywcjhs = [];
- res.data.forEach((item) => {
- if (item.taskStatus == "zcwc" || item.taskStatus == "zhwc") {
- _ywcjhs.push(item);
- }
+ res.data.forEach((item) => {
+ if (item.taskStatus == "zcwc" || item.taskStatus == "zhwc") {
+ _ywcjhs.push(item);
+ }
+ });
+
+ this.finishRate = (_ywcjhs.length / res.data.length).toFixed(4);
+ this.chart2Key++;
});
-
- this.finishRate = (_ywcjhs.length / res.data.length).toFixed(4);
- this.chart2Key++;
- });
},
getProjectInfo() {
this.$api.project.getProjectInfo(this.selProject.id).then((d) => {
@@ -652,7 +769,10 @@ export default {
})
.then((d) => {
let objs = d.data || [];
- this.planFinishRate = objs.length > 0 ? ((objs[0].scheduleNode || 0) / 100.0).toFixed(4) : 0;
+ this.planFinishRate =
+ objs.length > 0
+ ? ((objs[0].scheduleNode || 0) / 100.0).toFixed(4)
+ : 0;
this.chart1Key++;
});
},
@@ -687,11 +807,14 @@ export default {
.map((item) => {
item.show = item.enabled != 0;
item.position = this.$tryToJson(item.position, []);
- item.elId = (item.deviceId ? item.deviceId : cnt++) + "-" + item.deviceType;
+ item.elId =
+ (item.deviceId ? item.deviceId : cnt++) + "-" + item.deviceType;
return item;
})
.filter((item) => item.position.length == 3);
- this.showDevices = this.devices.filter((item) => this.devicTypes.includes(item.deviceType));
+ this.showDevices = this.devices.filter((item) =>
+ this.devicTypes.includes(item.deviceType)
+ );
this.clearLabels();
this.addDeviceLabel();
setTimeout(() => {
@@ -706,7 +829,9 @@ export default {
} else {
this.devicTypes.push(n);
}
- this.showDevices = this.devices.filter((item) => this.devicTypes.includes(item.deviceType));
+ this.showDevices = this.devices.filter((item) =>
+ this.devicTypes.includes(item.deviceType)
+ );
this.clearLabels();
this.addDeviceLabel();
setTimeout(() => {
@@ -766,7 +891,7 @@ export default {
maxDistance: 1000,
html: html,
id: item.elId,
- position: item.position
+ position: item.position,
});
this.addLabels.push(item.elId);
@@ -783,11 +908,10 @@ export default {
this.showDevices.forEach((d) => {
if (d.position && d.position.length > 0) {
if (this.isClient) {
- this.AddClientLable(d)
+ this.AddClientLable(d);
} else {
this.AddLable(d);
}
-
}
});
},
@@ -812,7 +936,12 @@ export default {
this.elId++;
this.activeMenu = 0;
setTimeout(() => {
- bimTools.initEngine("bimMgrApi", "bimManageContainer", this.bimCfg, this.initLoadModel);
+ bimTools.initEngine(
+ "bimMgrApi",
+ "bimManageContainer",
+ this.bimCfg,
+ this.initLoadModel
+ );
}, 10);
},
initLoadModel() {
@@ -848,18 +977,26 @@ export default {
if (this.models.length == 0) {
this.$message.error("暂无模型，请先关联模型");
} else {
- bimTools.addModelList(window.bimMgrApi, this.bimCfg, this.models, (hideParts) => {
- console.log(":--->", hideParts);
- this.loadDevicePosition();
- setTimeout(() => {
- bimTools.setDefaultViewPoint(window.bimMgrApi, this.bimCfg, this.viewPoint)
- this.hideParts=hideParts;
- bimTools.hideParts(window.bimMgrApi, hideParts);
- this.modelLoadSuccess = true;
- this.resetScene();
- }, 1000);
- });
-
+ bimTools.addModelList(
+ window.bimMgrApi,
+ this.bimCfg,
+ this.models,
+ (hideParts) => {
+ console.log(":--->", hideParts);
+ this.loadDevicePosition();
+ setTimeout(() => {
+ bimTools.setDefaultViewPoint(
+ window.bimMgrApi,
+ this.bimCfg,
+ this.viewPoint
+ );
+ this.hideParts = hideParts;
+ bimTools.hideParts(window.bimMgrApi, hideParts);
+ this.modelLoadSuccess = true;
+ this.resetScene();
+ }, 1000);
+ }
+ );
}
});
},
@@ -881,62 +1018,76 @@ export default {
bimTools.hideParts(api, this.hideParts);
this.resetScene();
} else {
- this.$api.planSchedule.findPlanProgress(this.selProject.id).then((d) => {
- let datas = d.data || [];
- let beforeData = []; //提前完工
- let afterData = []; //延迟完工
- let processData = []; //进行中
- let standData = []; //正常完工
- let allData = [];
- datas.forEach((it) => {
- let planFinishDate = it.planFinishDate;
- let finishDate = it.finishDate;
- it.bim = this.$tryToJson(it.bimId, []);
- if (finishDate == "2000-01-01") {
- it.bim.forEach((item) => {
- processData.push(item);
- allData.push(item);
- });
- } else if (planFinishDate == finishDate) {
- it.bim.forEach((item) => {
- standData.push(item);
- allData.push(item);
- });
- } else if (this.$dt(planFinishDate) < this.$dt(finishDate)) {
- it.bim.forEach((item) => {
- afterData.push(item);
- allData.push(item);
- });
- } else {
- it.bim.forEach((item) => {
- beforeData.push(item);
- allData.push(item);
+ this.$api.planSchedule
+ .findPlanProgress(this.selProject.id)
+ .then((d) => {
+ let datas = d.data || [];
+ let beforeData = []; //提前完工
+ let afterData = []; //延迟完工
+ let processData = []; //进行中
+ let standData = []; //正常完工
+ let allData = [];
+ datas.forEach((it) => {
+ let planFinishDate = it.planFinishDate;
+ let finishDate = it.finishDate;
+ it.bim = this.$tryToJson(it.bimId, []);
+ if (finishDate == "2000-01-01") {
+ it.bim.forEach((item) => {
+ processData.push(item);
+ allData.push(item);
+ });
+ } else if (planFinishDate == finishDate) {
+ it.bim.forEach((item) => {
+ standData.push(item);
+ allData.push(item);
+ });
+ } else if (this.$dt(planFinishDate) < this.$dt(finishDate)) {
+ it.bim.forEach((item) => {
+ afterData.push(item);
+ allData.push(item);
+ });
+ } else {
+ it.bim.forEach((item) => {
+ beforeData.push(item);
+ allData.push(item);
+ });
+ }
+ });
+ if (allData.length > 0) {
+ allData = allData.map((item) => item.featureId);
+ this.models.forEach((model) => {
+ api.Model.setAlpha(model.lightweightName, 0.5);
});
+ if (beforeData.length > 0) {
+ api.Feature.setColor(
+ beforeData.map((it) => it.featureId).join("#"),
+ "rgba(59, 255, 0,1)"
+ );
+ }
+ if (standData.length > 0) {
+ api.Feature.setColor(
+ standData.map((it) => it.featureId).join("#"),
+ "rgba(255,255,255,1)"
+ );
+ }
+ if (processData.length > 0) {
+ api.Feature.setColor(
+ processData.map((it) => it.featureId).join("#"),
+ "rgba(0,0, 255,1)"
+ );
+ }
+ if (afterData.length > 0) {
+ api.Feature.setColor(
+ afterData.map((it) => it.featureId).join("#"),
+ "rgba(250, 0, 0,1)"
+ );
+ }
}
});
- if (allData.length > 0) {
- allData = allData.map((item) => item.featureId);
- this.models.forEach((model) => {
- api.Model.setAlpha(model.lightweightName, 0.5);
- });
- if (beforeData.length > 0) {
- api.Feature.setColor(beforeData.map((it) => it.featureId).join("#"), "rgba(59, 255, 0,1)");
- }
- if (standData.length > 0) {
- api.Feature.setColor(standData.map((it) => it.featureId).join("#"), "rgba(255,255,255,1)");
- }
- if (processData.length > 0) {
- api.Feature.setColor(processData.map((it) => it.featureId).join("#"), "rgba(0,0, 255,1)");
- }
- if (afterData.length > 0) {
- api.Feature.setColor(afterData.map((it) => it.featureId).join("#"), "rgba(250, 0, 0,1)");
- }
- }
- });
}
},
resetScene() {
- bimTools.resetScene(this, bimMgrApi)
+ bimTools.resetScene(this, bimMgrApi);
},
loadDeviceData() {
if (this.loadDevDatatimeOut) {
@@ -988,7 +1139,9 @@ export default {
let tmps = this.towerWarning.filter((d) => d.value == item.warnings);
warning = tmps.length > 0 ? tmps[0].label : "";
}
- let warningHtml = warning ? `
警报：${warning}
` : "";
+ let warningHtml = warning
+ ? `
警报：${warning}
`
+ : "";
txtHtml = `${warningHtml}
高度：${item.height}
@@ -1104,33 +1257,32 @@ export default {
#bimManageContainer {
height: 100%;
- .tag-box {
- height: 120px;
- display: flex;
- justify-content: center;
- align-items: center;
- width: 100%;
- position: relative;
- }
+ .tag-box {
+ height: 120px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 100%;
+ position: relative;
+ }
- .tag-svg {
- width: 38px;
- height: 38px;
- position: absolute;
- bottom: -17px;
- left: 50%;
- margin-left: -19px;
+ .tag-svg {
+ width: 38px;
+ height: 38px;
+ position: absolute;
+ bottom: -17px;
+ left: 50%;
+ margin-left: -19px;
+ }
- }
+ .tag-img {
+ position: absolute;
+ }
- .tag-img {
- position: absolute;
- }
-
- .tag-txt {
- font-size: 16px;
- color: #fff;
- }
+ .tag-txt {
+ font-size: 16px;
+ color: #fff;
+ }
}
}
@@ -1635,7 +1787,8 @@ export default {
}
.tag-txt {
- box-shadow: #1a9047 0px 4px 16px, rgba(10, 31, 68, 0.06) 0px 8px 24px, rgba(17, 17, 26, 0.1) 0px 16px 56px;
+ box-shadow: #1a9047 0px 4px 16px, rgba(10, 31, 68, 0.06) 0px 8px 24px,
+ rgba(17, 17, 26, 0.1) 0px 16px 56px;
color: #75fbfd;
font-size: 12px;
padding: 10px;
@@ -1727,7 +1880,6 @@ export default {
}
.tb-prj {
-
td,
th {
border: solid 1px #6ea9ab68;
@@ -1742,7 +1894,6 @@ export default {
.worker-chart {
.chart-item {
-
.chart-gif,
.chart-text {
left: 24px;
@@ -2004,7 +2155,6 @@ export default {
}
.tb-prj {
-
td,
th {
border: solid 1px #6ea9ab68;
@@ -2019,7 +2169,6 @@ export default {
.worker-chart {
.chart-item {
-
.chart-gif,
.chart-text {
left: 40px;
diff --git a/yanzhu-bigscreen/src/views/machmater/components/processControlBar.vue b/yanzhu-bigscreen/src/views/machmater/components/processControlBar.vue
index a28e9bd9..d279d8a0 100644
--- a/yanzhu-bigscreen/src/views/machmater/components/processControlBar.vue
+++ b/yanzhu-bigscreen/src/views/machmater/components/processControlBar.vue
@@ -11,14 +11,14 @@
{{ item.total }} {{ item.unit }}
（
- {{ item.yesMonitor }} {{ item.unit }} / {{ item.notMonitor }} {{ item.unit }}
+ {{ item.yesMonitor }} {{ item.unit }} / {{ item.notMonitor }} {{ item.unit }}
）
-
- 
- 
-
-
-目前2023.11.14更新rocketMq发送消息类型：
-
-1.同步发送：通过调用 send() 方法发送消息，阻塞等待服务器响应。
-
-2.异步发送：通过调用 send() 方法，并传入一个 SendCallback 对象，在发送消息的同时可以继续处理其他逻辑，消息发送结果通过回调函数通知。
-
-3.单向发送：通过调用 sendOneway() 方法发送消息，不关心发送结果，适用于对可靠性要求不高的场景。
-
-4.顺序发送：通过设置 List
-
-## 内置功能
-
-1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。
-2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。
-3. 岗位管理：配置系统用户所属担任职务。
-4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。
-5. 角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。
-6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。
-7. 参数管理：对系统动态配置常用参数。
-8. 通知公告：系统通知公告信息发布维护。
-9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。
-10. 登录日志：系统登录日志记录查询包含登录异常。
-11. 在线用户：当前系统中活跃用户状态监控。
-12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。
-13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。
-14. 系统接口：根据业务代码自动生成相关的api接口文档。
-15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。
-16. 在线构建器：拖动表单元素生成相应的HTML代码。
-17. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。
-
-## 演示图
-
-
