fix: BUG修改
This commit is contained in:
kun
parent
43bcdc65d5
commit
86308e1978
@ -20,7 +20,7 @@ var COMPANY = '' //通用
|
||||
// COMPANY = 'shjg'//上海优益（上海建工）
|
||||
// COMPANY = 'syhy'//沈阳和盈
|
||||
// COMPANY = 'jxwjj'//嘉兴王江泾公用码头项目
|
||||
// COMPANY = 'gxbs'//广西百色
|
||||
COMPANY = 'gxbs'//广西百色
|
||||
|
||||
var PROJECT = {
|
||||
local_test: 'common', // 普通版
|
||||
|
||||
@ -82,12 +82,12 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
|
||||
axios.defaults.baseURL = 'http://192.168.34.221:30002/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:30002/' //郭圣雄本地
|
||||
// axios.defaults.baseURL ='http://192.168.34.221:30012/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
|
||||
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
|
||||
axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
|
||||
|
||||
|
||||
|
||||
@ -1190,6 +1190,13 @@ const routes2 = [
|
||||
component: () =>
|
||||
import('@/views/projectFront/BIMCenter/BIMManageV3.vue'),
|
||||
},
|
||||
//BIM中心-构件关联进度
|
||||
{
|
||||
path: '/project/bim/componentProgress',
|
||||
name: '构件关联进度',
|
||||
component: () =>
|
||||
import('@/views/projectFront/BIMCenter/progressManagement.vue'),
|
||||
},
|
||||
//BIMBASE中心
|
||||
{
|
||||
path: '/project/bim/bimBaseManage',
|
||||
|
||||
@ -142,24 +142,26 @@ export default {
|
||||
},
|
||||
getIframeMessage(e) {
|
||||
console.log("Message from iframe：", e.data.msg);
|
||||
if (this.formData.type == 1) {
|
||||
let dataIndex = null;
|
||||
dataIndex = this.selectedHideList.find((item) => {
|
||||
return item == e.data.msg;
|
||||
});
|
||||
if (!dataIndex) {
|
||||
this.selectedHideList.push(e.data.msg);
|
||||
}
|
||||
} else {
|
||||
let dataIndex = null;
|
||||
dataIndex = this.selectedColorList.find((item) => {
|
||||
return item.name == e.data.msg;
|
||||
});
|
||||
if (!dataIndex) {
|
||||
this.selectedColorList.push({
|
||||
name: e.data.msg,
|
||||
color: this.formData.color,
|
||||
if (e.data.msg) {
|
||||
if (this.formData.type == 1) {
|
||||
let dataIndex = null;
|
||||
dataIndex = this.selectedHideList.find((item) => {
|
||||
return item == e.data.msg;
|
||||
});
|
||||
if (!dataIndex) {
|
||||
this.selectedHideList.push(e.data.msg);
|
||||
}
|
||||
} else {
|
||||
let dataIndex = null;
|
||||
dataIndex = this.selectedColorList.find((item) => {
|
||||
return item.name == e.data.msg;
|
||||
});
|
||||
if (!dataIndex) {
|
||||
this.selectedColorList.push({
|
||||
name: e.data.msg,
|
||||
color: this.formData.color,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
399
src/views/projectFront/BIMCenter/progressManagement.vue
Normal file
399
src/views/projectFront/BIMCenter/progressManagement.vue
Normal file
@ -0,0 +1,399 @@
|
||||
<template>
|
||||
<div class="fullHeight">
|
||||
<div>
|
||||
<div class="searchBox whiteBlock">
|
||||
<el-form
|
||||
:inline="true"
|
||||
size="medium"
|
||||
:model="queryInfo"
|
||||
class="demo-form-inline"
|
||||
>
|
||||
<el-form-item label="分部分项工程名称">
|
||||
<el-input
|
||||
v-model="queryInfo.taskName"
|
||||
placeholder="请输入"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-select v-model="queryInfo.status" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="(item, index) in options"
|
||||
:key="index"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="实际完成日期">
|
||||
<el-date-picker
|
||||
v-model="daterange"
|
||||
@change="changeDate"
|
||||
type="daterange"
|
||||
:range-separator="$t('message.energyManage.to')"
|
||||
:start-placeholder="$t('message.energyManage.start')"
|
||||
:end-placeholder="$t('message.energyManage.end')"
|
||||
value-format="yyyy-MM-dd"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" plain @click="getProgressListData"
|
||||
>查询</el-button
|
||||
>
|
||||
<el-button type="warning" plain @click="refreshBtn">刷新</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="table_wrap whiteBlock">
|
||||
<vue-scroll>
|
||||
<el-table
|
||||
height="650"
|
||||
class="tables"
|
||||
:data="listData"
|
||||
lazy
|
||||
row-key="id"
|
||||
default-expand-all
|
||||
:tree-props="{ children: 'children' }"
|
||||
>
|
||||
<el-table-column
|
||||
width="200"
|
||||
prop="taskName"
|
||||
label="分部分项工程名称"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span
|
||||
:title="scope.row.taskName"
|
||||
style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;width: 150px;position: absolute;"
|
||||
>
|
||||
{{ scope.row.taskName }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="startDate"
|
||||
label="计划开始时间"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="finishDate"
|
||||
label="计划完成时间"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="actualStartDate"
|
||||
label="实际开始时间"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="actualFinishDate"
|
||||
label="实际完成时间"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="dutyUserName"
|
||||
label="负责人"
|
||||
></el-table-column>
|
||||
<el-table-column align="center" prop="progressRatio" label="进度">
|
||||
<template slot-scope="scope">{{
|
||||
scope.row.progressRatio + "%"
|
||||
}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="status" align="center" label="执行状态">
|
||||
<template slot-scope="scope">{{
|
||||
scope.row.status == 0
|
||||
? "未开始"
|
||||
: scope.row.status == 1
|
||||
? "进行中"
|
||||
: scope.row.status == 2
|
||||
? "已完成"
|
||||
: "未开始"
|
||||
}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="beginWarning"
|
||||
align="center"
|
||||
label="开始预警"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<div
|
||||
style="color: #fe6565;"
|
||||
v-if="scope.row.beginWarning === 3"
|
||||
>
|
||||
{{
|
||||
scope.row.beginWarning == 1
|
||||
? "提前"
|
||||
: scope.row.beginWarning == 2
|
||||
? "正常"
|
||||
: "逾期"
|
||||
}}
|
||||
</div>
|
||||
<div v-else>
|
||||
{{
|
||||
scope.row.beginWarning == 1
|
||||
? "提前"
|
||||
: scope.row.beginWarning == 2
|
||||
? "正常"
|
||||
: "逾期"
|
||||
}}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="endWarning" align="center" label="结束预警">
|
||||
<template slot-scope="scope">
|
||||
<div style="color: #fe6565;" v-if="scope.row.endWarning === 3">
|
||||
{{
|
||||
scope.row.endWarning == 1
|
||||
? "提前"
|
||||
: scope.row.endWarning == 2
|
||||
? "正常"
|
||||
: "逾期"
|
||||
}}
|
||||
</div>
|
||||
<div v-else>
|
||||
{{
|
||||
scope.row.endWarning == 1
|
||||
? "提前"
|
||||
: scope.row.endWarning == 2
|
||||
? "正常"
|
||||
: "逾期"
|
||||
}}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="300" label="操作" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click.native.stop="relativeComponent(scope.row)"
|
||||
>
|
||||
关联构件
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</vue-scroll>
|
||||
<el-pagination
|
||||
class="pagerBox"
|
||||
style="position: absolute; top: 85%; left: 40%"
|
||||
@size-change="SizeChange"
|
||||
@current-change="CurrentChange"
|
||||
:current-page="pagInfo.pageNo"
|
||||
:page-sizes="$store.state.PAGESIZRS"
|
||||
:page-size="pagInfo.pageSize"
|
||||
layout="total, sizes, prev, pager, next"
|
||||
:total="Number(pagInfo.total)"
|
||||
background
|
||||
></el-pagination>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 关联构件 -->
|
||||
<el-dialog
|
||||
width="80%"
|
||||
:modal-append-to-body="false"
|
||||
:visible.sync="showRelative"
|
||||
title="关联构件"
|
||||
>
|
||||
<div class="data-show">
|
||||
<span>选中的数据值：</span>
|
||||
<div class="selected-box">
|
||||
<template v-show="selectedList.length > 0">
|
||||
<div v-for="(item, index) in selectedList" :key="index">
|
||||
<span>{{ item }}</span>
|
||||
<i class="el-icon-close" @click="deleteSelected(index)"></i>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<el-button type="primary" size="small" @click="saveSelected"
|
||||
>保存</el-button
|
||||
>
|
||||
</div>
|
||||
<div class="model-box">
|
||||
<iframe
|
||||
:src="url"
|
||||
frameborder="0"
|
||||
width="100%"
|
||||
id="iframe"
|
||||
style="flex: 1"
|
||||
></iframe>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
<script
|
||||
src="https://static.bimface.com/api/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js"
|
||||
charset="utf-8"
|
||||
></script>
|
||||
<script>
|
||||
import { getTaskProgressPageApi } from "@/assets/js/api/progressManagement";
|
||||
export default {
|
||||
mounted() {},
|
||||
data() {
|
||||
return {
|
||||
url: "",
|
||||
iframe: "",
|
||||
selectedList: [],
|
||||
showRelative: false,
|
||||
rowData: {},
|
||||
options: [
|
||||
{
|
||||
label: "未开始",
|
||||
value: 0,
|
||||
},
|
||||
{
|
||||
label: "进行中",
|
||||
value: 1,
|
||||
},
|
||||
{
|
||||
label: "已完成",
|
||||
value: 2,
|
||||
},
|
||||
// {
|
||||
// label: '已逾期',
|
||||
// value: 3
|
||||
// },
|
||||
],
|
||||
pagInfo: {
|
||||
pageNo: 1, //页数
|
||||
pageSize: 10, //条数
|
||||
total: 0, //总条数
|
||||
},
|
||||
daterange: [],
|
||||
projectSn: "",
|
||||
listData: [],
|
||||
queryInfo: {
|
||||
taskName: "",
|
||||
status: "",
|
||||
actualStartDate: "",
|
||||
actualFinishDate: "",
|
||||
},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.projectSn = this.$store.state.projectSn;
|
||||
this.getProgressListData();
|
||||
},
|
||||
mounted() {
|
||||
(this.url = window.location.origin + "./progressModel.html"),
|
||||
(this.iframe = document.getElementById("iframe"));
|
||||
this.iframe.contentWindow.postMessage({
|
||||
token,
|
||||
hideArr: this.selectedHideList,
|
||||
colorArr: this.selectedColorList,
|
||||
});
|
||||
// this.getModelList()
|
||||
},
|
||||
methods: {
|
||||
// 删除选中数据
|
||||
deleteSelected(index) {
|
||||
this.selectedList.splice(index, 1);
|
||||
this.$forceUpdate();
|
||||
},
|
||||
// 关联构件
|
||||
relativeComponent(row) {
|
||||
this.rowData = row;
|
||||
this.showRelative = true;
|
||||
},
|
||||
//获取列表数据
|
||||
getProgressListData() {
|
||||
let data = {
|
||||
projectSn: this.projectSn,
|
||||
pageNo: this.pagInfo.pageNo,
|
||||
pageSize: this.pagInfo.pageSize,
|
||||
taskName: this.queryInfo.taskName,
|
||||
status: this.queryInfo.status,
|
||||
actualFinishDate_begin: this.queryInfo.actualStartDate,
|
||||
actualFinishDate_end: this.queryInfo.actualFinishDate,
|
||||
};
|
||||
getTaskProgressPageApi(data).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.listData = res.result.records;
|
||||
this.pagInfo.total = res.result.total;
|
||||
}
|
||||
});
|
||||
},
|
||||
//刷新
|
||||
refreshBtn() {
|
||||
this.daterange = [];
|
||||
this.pagInfo.pageNo = 1;
|
||||
this.pagInfo.pageSize = 10;
|
||||
this.queryInfo = {
|
||||
status: "",
|
||||
actualStartDate: "",
|
||||
actualFinishDate: "",
|
||||
taskName: "",
|
||||
};
|
||||
this.getProgressListData();
|
||||
},
|
||||
SizeChange(val) {
|
||||
this.pagInfo.pageSize = val;
|
||||
this.getProgressListData();
|
||||
},
|
||||
CurrentChange(val) {
|
||||
this.pagInfo.pageNo = val;
|
||||
this.getProgressListData();
|
||||
},
|
||||
changeDate() {
|
||||
if (this.daterange) {
|
||||
this.queryInfo.actualStartDate = this.daterange[0];
|
||||
this.queryInfo.actualFinishDate = this.daterange[1];
|
||||
} else {
|
||||
this.queryInfo.actualStartDate = "";
|
||||
this.queryInfo.actualFinishDate = "";
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
@mixin flex {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.table_wrap {
|
||||
height: 800px;
|
||||
overflow: auto;
|
||||
}
|
||||
.data-show {
|
||||
width: max-content;
|
||||
max-width: 100%;
|
||||
@include flex;
|
||||
margin-top: 10px;
|
||||
.selected-box {
|
||||
flex: 1%;
|
||||
min-width: 208px;
|
||||
min-height: 32px;
|
||||
border: 1px solid #c0c4cc;
|
||||
border-radius: 4px;
|
||||
@include flex;
|
||||
flex-wrap: wrap;
|
||||
padding-left: 6px;
|
||||
margin-right: 15px;
|
||||
> div {
|
||||
@include flex;
|
||||
background-color: #f4f4f5;
|
||||
padding: 3px 5px;
|
||||
margin: 3px 6px 3px 0;
|
||||
span {
|
||||
color: #909399;
|
||||
margin-right: 3px;
|
||||
}
|
||||
.el-icon-close {
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.model-box{
|
||||
width: 100%;
|
||||
min-height: 500px;
|
||||
border: 1px solid #ccc;
|
||||
margin-top: 10px;
|
||||
}
|
||||
</style>
|
||||
96
src/views/projectFront/BIMCenter/progressModel.html
Normal file
96
src/views/projectFront/BIMCenter/progressModel.html
Normal file
@ -0,0 +1,96 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>My first BIMFACE app</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="domId" style="width: 100%; height: 95vh"></div>
|
||||
<script
|
||||
src="https://static.bimface.com/api/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js"
|
||||
charset="utf-8"
|
||||
></script>
|
||||
<script>
|
||||
let model3D;
|
||||
let viewer3D;
|
||||
let app;
|
||||
let modelState;
|
||||
let configValue = {
|
||||
hideArr: [],
|
||||
colorArr: [],
|
||||
};
|
||||
const bimCallback = (viewToken) => {
|
||||
// let viewToken = '11b0d307c09f43bfa5fa3922bcce0342'
|
||||
let loaderConfig = new BimfaceSDKLoaderConfig();
|
||||
loaderConfig.viewToken = viewToken;
|
||||
BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback);
|
||||
function successCallback(viewMetaData) {
|
||||
let domShow = document.getElementById("domId");
|
||||
let webAppConfig = new Glodon.Bimface.Application.WebApplication3DConfig();
|
||||
webAppConfig.domElement = domShow;
|
||||
app = new Glodon.Bimface.Application.WebApplication3D(webAppConfig);
|
||||
app.addView(viewToken);
|
||||
viewer3D = app.getViewer();
|
||||
// 监听添加view完成的事件
|
||||
viewer3D.addEventListener(
|
||||
Glodon.Bimface.Viewer.Viewer3DEvent.ViewAdded,
|
||||
function() {
|
||||
// 调用viewer3D对象的Method，可以继续扩展功能
|
||||
// 从viewer3D对象中获取模型对象model3D
|
||||
model3D = viewer3D.getModel();
|
||||
// 获取模型状态
|
||||
modelState = viewer3D.getCurrentState();
|
||||
// 渲染3D模型
|
||||
viewer3D.render();
|
||||
// 操作模型
|
||||
renderConfigModel();
|
||||
}
|
||||
);
|
||||
// 添加构件单击事件
|
||||
viewer3D.addEventListener(
|
||||
Glodon.Bimface.Viewer.Viewer3DEvent.MouseClicked,
|
||||
(data) => {
|
||||
console.log(data);
|
||||
// 往父级传递
|
||||
window.parent.postMessage({ msg: data.elementId });
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
function failureCallback(error) {
|
||||
console.log(error);
|
||||
}
|
||||
};
|
||||
function renderConfigModel() {
|
||||
// 恢复模型状态
|
||||
viewer3D.setState(modelState);
|
||||
model3D.hideComponentsById(configValue.hideArr);
|
||||
configValue.colorArr.map((item) => {
|
||||
model3D.overrideComponentsColorById(
|
||||
[item.name],
|
||||
new Glodon.Web.Graphics.Color(item.color, 1)
|
||||
);
|
||||
});
|
||||
viewer3D.render();
|
||||
}
|
||||
// 监听父组件的信息传递
|
||||
window.addEventListener("message", async function(e) {
|
||||
// const modelId = e.data.modelId
|
||||
const data = e.data || {};
|
||||
if (data.token) {
|
||||
// removeModel(modelId)
|
||||
document.getElementById("domId").innerHTML = "";
|
||||
await bimCallback(data.token);
|
||||
if (data.hideArr && data.colorArr) {
|
||||
configValue.hideArr = data.hideArr;
|
||||
configValue.colorArr = data.colorArr;
|
||||
}
|
||||
}
|
||||
// console.log(e.data, '父级页面传来的数据')
|
||||
// setTimeout(() => {
|
||||
// window.parent.postMessage({ msg: 'hello' })
|
||||
// }, 2000)
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
x
Reference in New Issue
Block a user