admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
cjp 2024-01-17 15:55:13 +08:00
parent 93d7444514
commit 1c11dbb2d4
10 changed files with 240 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -9,10 +9,10 @@ NODE_ENV = 'development'
# VITE_API_URL = "http://101.43.164.214:45022" # VITE_API_URL = "http://101.43.164.214:45022"
# VITE_API_URL = 'http://192.168.34.221:30002' # VITE_API_URL = 'http://192.168.34.221:30002'
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://192.168.34.221:28888'
# 百色七参数线上地址 # 百色七参数线上地址
# VITE_API_URL = 'http://101.43.164.214:11113' VITE_API_URL = 'http://101.43.164.214:11113'
# 上传 # 上传
VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

5
src/routers/modules/staticRouter.ts
View File

@ -201,6 +201,11 @@ export const staticRouter: RouteRecordRaw[] = [
path: "/digitalFactory", path: "/digitalFactory",
name: "数字梁厂", name: "数字梁厂",
component: () => import("@/views/sevenLargeScreen/newModel/index.vue") component: () => import("@/views/sevenLargeScreen/newModel/index.vue")
},
{
path: "/monitorBall",
name: "监控控球",
component: () => import("@/views/sevenLargeScreen/monitorBall/index.vue")
} }
], ],
meta: { meta: {

69
src/views/sevenLargeScreen/bImModel/index.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<div class="bimBox" id="domId"> <div class="bimBox" id="domId">
<!-- <iframe :src="url" frameborder="0" width="100%" height="100%" id="iframe"></iframe> --> <!-- <iframe :src="url" frameborder="0" width="100%" height="100%" id="iframe"></iframe> -->
<iframe :src="url" frameborder="0" width="100%" height="100%" id="iframe"></iframe>
</div> </div>
</template> </template>
@ -31,52 +32,50 @@ function getBimfaceList() {
// //
// }); // });
// } // }
// 声明viewer及app变量 // 声明viewer及app变量
let viewer, app; let viewer, app;
// 声明viewToken变量，填入想要显示的模型/图纸/场景token // 声明viewToken变量，填入想要显示的模型/图纸/场景token
let viewToken = '44e2a106c2e24e9ab10967214005fef6'; let viewToken = "44e2a106c2e24e9ab10967214005fef6";
// 构造BimfaceSDKLoaderConfig对象 // 构造BimfaceSDKLoaderConfig对象
let loaderConfig = new BimfaceSDKLoaderConfig(); let loaderConfig = new BimfaceSDKLoaderConfig();
// 设置BimfaceSDKLoaderConfig的viewToken // 设置BimfaceSDKLoaderConfig的viewToken
loaderConfig.viewToken = viewToken; loaderConfig.viewToken = viewToken;
// 调用BimfaceSDKLoader的load方法加载模型 // 调用BimfaceSDKLoader的load方法加载模型
BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback); BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback);
// 加载成功回调函数 // 加载成功回调函数
function successCallback(viewMetaData) { function successCallback(viewMetaData) {
// 获取DOM元素
let domShow = document.getElementById("domId");
// 创建WebApplicationGISConfig
let webAppConfig = new Glodon.Bimface.Application.WebApplicationGISConfig();
// 设置创建WebApplicationGIS的dom对象
webAppConfig.domElement = domShow;
// 创建WebApplicationGIS
app = new Glodon.Bimface.Application.WebApplicationGIS(webAppConfig);
// 获取DOM元素 // 加载待显示的场景
let domShow = document.getElementById('domId'); app.addScene(viewToken);
// 创建WebApplicationGISConfig
let webAppConfig = new Glodon.Bimface.Application.WebApplicationGISConfig();
// 设置创建WebApplicationGIS的dom对象
webAppConfig.domElement = domShow;
// 创建WebApplicationGIS
app = new Glodon.Bimface.Application.WebApplicationGIS(webAppConfig);
// 加载待显示的场景 // 获取ViewerGIS对象
app.addScene(viewToken); viewer = app.getViewer();
}
// 获取ViewerGIS对象 // 加载失败回调函数
viewer = app.getViewer(); function failureCallback(error) {
console.log(error);
}; }
onMounted(() => {
// 加载失败回调函数 url.value = "http://jxj.zhgdyun.com:8082/bim/bimshow.html?fileId=10000831193551&projectSn=B64AEF7D362644B5A1708944901768AE";
function failureCallback(error) { });
console.log(error);
};
onMounted(() => {});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.bimBox { .bimBox {
width: 100%; width: 100%;
height: 90%; height: 99%;
margin-top: 20px; margin-top: 20px;
} }
</style> </style>

87
src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue
View File

@ -32,7 +32,7 @@
<div style="width: 5px; height: 5px; background: rgba(130, 251, 234, 1); border-radius: 10px; margin: 1%"></div> <div style="width: 5px; height: 5px; background: rgba(130, 251, 234, 1); border-radius: 10px; margin: 1%"></div>
<div><i>里程碑</i></div> <div><i>里程碑</i></div>
</div> </div>
<el-scrollbar style="width: 94%; margin: 3% 0% 0% 3%; height: 30%"> <el-scrollbar style="width: 94%; margin: 3% 0% 0% 3%; height: 30%" v-if="progressList.length > 0">
<div class="progressData"> <div class="progressData">
<div class="data" v-for="item in progressList" :key="item.id"> <div class="data" v-for="item in progressList" :key="item.id">
<div v-if="item.status == 0" class="text" :title="item.name">{{ item.name }}</div> <div v-if="item.status == 0" class="text" :title="item.name">{{ item.name }}</div>
@ -55,6 +55,10 @@
</div> </div>
</div> </div>
</el-scrollbar> </el-scrollbar>
<div class="notoDta" v-else>
<img src="@/assets/images/noData.png" alt="" />
<div>暂无数据</div>
</div>
</div> </div>
</Card> </Card>
</div> </div>
@ -65,36 +69,37 @@ import Card from "@/components/card.vue";
import { ref, watch, onMounted } from "vue"; import { ref, watch, onMounted } from "vue";
import { getStageOption } from "@/api/modules/projectOverview"; import { getStageOption } from "@/api/modules/projectOverview";
const progressList = ref([ // const progressList = ref([
{ // {
name: "施工证获取", // name: "施工证获取",
status: 0 // status: 0
}, // },
{ // {
name: "土方开挖", // name: "土方开挖",
status: 0 // status: 0
}, // },
{ // {
name: "桩基", // name: "桩基",
status: 0 // status: 0
}, // },
{ // {
name: "支护开始", // name: "支护开始",
status: 0 // status: 0
}, // },
{ // {
name: "垫层完成", // name: "垫层完成",
status: 0 // status: 0
}, // },
{ // {
name: "正负零", // name: "正负零",
status: 0 // status: 0
}, // },
{ // {
name: "工程达到预售条件", // name: "工程达到预售条件",
status: 0 // status: 0
} // }
] as any); // ] as any);
const progressList = ref([] as any);
// ts // ts
type Props = { type Props = {
projectData?: any; // 传入项目信息 projectData?: any; // 传入项目信息
@ -114,7 +119,9 @@ watch(
// props.xData = newVal; // props.xData = newVal;
projectData.value = newVal; projectData.value = newVal;
console.log("当前阶段", projectData.value.constructionStage); console.log("当前阶段", projectData.value.constructionStage);
progressList.value[projectData.value.constructionStage - 1].status = 1; if (progressList.value.length > 0) {
progressList.value[projectData.value.constructionStage - 1].status = 1;
}
} }
} }
); );
@ -122,7 +129,7 @@ watch(
//获取里程碑option //获取里程碑option
const getProgressOption = async () => { const getProgressOption = async () => {
const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage" }); const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage" });
if (res.success) { if (res.result.length > 0) {
let newArray = res.result.map((item: any) => { let newArray = res.result.map((item: any) => {
return { return {
name: item.name, name: item.name,
@ -250,4 +257,18 @@ onMounted(() => {
height: 80%; height: 80%;
margin-top: 1.8%; margin-top: 1.8%;
} }
.notoDta {
bottom: 10%;
width: 20%;
left: 35%;
text-align: center;
position: absolute;
img {
width: 40%;
}
div {
color: #fff;
font-size: 14px;
}
}
</style> </style>

27
src/views/sevenLargeScreen/comprehensiveManage/projectOverview/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="projectContent"> <div class="projectContent">
<div class="left"> <!-- <div class="left">
<leftTop :projectData="projectData" class="leftTop"></leftTop> <leftTop :projectData="projectData" class="leftTop"></leftTop>
<leftCenter :statisticsCount="statisticsCount" class="leftCenter"></leftCenter> <leftCenter :statisticsCount="statisticsCount" class="leftCenter"></leftCenter>
<leftBottom :statisticsCount="statisticsCount" class="leftBottom"></leftBottom> <leftBottom :statisticsCount="statisticsCount" class="leftBottom"></leftBottom>
@ -13,25 +13,26 @@
<rightTop class="rightTop"></rightTop> <rightTop class="rightTop"></rightTop>
<rightCenter class="rightCenter"></rightCenter> <rightCenter class="rightCenter"></rightCenter>
<rightBottom class="rightBottom"></rightBottom> <rightBottom class="rightBottom"></rightBottom>
</div> </div> -->
<iframe :src="url" frameborder="0" width="100%" height="100%" id="iframe"></iframe>
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import leftTop from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue"; // import leftTop from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue";
import leftCenter from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue"; // import leftCenter from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue";
import leftBottom from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftBottom.vue"; // import leftBottom from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftBottom.vue";
import centerTop from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue"; // import centerTop from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerTop.vue";
import centerBottom from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue"; // import centerBottom from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue";
import rightTop from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/rightTop.vue"; // import rightTop from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/rightTop.vue";
import rightCenter from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/rightCenter.vue"; // import rightCenter from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/rightCenter.vue";
import rightBottom from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/rightBottom.vue"; // import rightBottom from "@/views/sevenLargeScreen/comprehensiveManage/projectOverview/rightBottom.vue";
import { GlobalStore } from "@/stores"; import { GlobalStore } from "@/stores";
const store = GlobalStore(); const store = GlobalStore();
import { getWorkerStatisticsCountApi, getProjectDetail } from "@/api/modules/projectOverview"; import { getWorkerStatisticsCountApi, getProjectDetail } from "@/api/modules/projectOverview";
import { ref, onMounted } from "vue"; import { ref, onMounted } from "vue";
const statisticsCount = ref(null as any); const statisticsCount = ref(null as any);
const url = ref("https://ai.goviewlink.com/chart/preview/clpwdujtn007lnvtzs00kncr5")
const projectData = ref(null as any); const projectData = ref(null as any);
//获取项目信息 //获取项目信息
const getProjectInfo = async () => { const getProjectInfo = async () => {
@ -47,8 +48,8 @@ const getPersonDetail = async () => {
statisticsCount.value = res.result; statisticsCount.value = res.result;
}; };
onMounted(() => { onMounted(() => {
getPersonDetail(); // getPersonDetail();
getProjectInfo(); // getProjectInfo();
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

2
src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="leftTop"> <div class="leftTop">
<Card title="项目信息"> <Card title="项目信息">
<div class="projectInfo"> <div class="projectInfo" v-if="projectData">
<div><span>项目名称：</span> {{ projectData.projectName || "" }}</div> <div><span>项目名称：</span> {{ projectData.projectName || "" }}</div>
<div :title="projectLocal"><span>项目地址：</span> {{ projectLocal }}</div> <div :title="projectLocal"><span>项目地址：</span> {{ projectLocal }}</div>
<div><span>项目经理：</span> {{ projectData.projectManage || "" }}</div> <div><span>项目经理：</span> {{ projectData.projectManage || "" }}</div>

73
src/views/sevenLargeScreen/indexL.vue
View File

@ -124,12 +124,12 @@ let showUserBox = ref(false as any);
let adminName = ref("" as any); let adminName = ref("" as any);
let menuList = ref([ let menuList = ref([
{ {
moduleName: "劳务管理", moduleName: "工程概况",
modulePath: "/laborManagement", modulePath: "/projectOverview",
menuList: [ menuList: [
{ {
menuName: "劳务管理", menuName: "工程概况",
companyPath: "/laborManagement" companyPath: "/projectOverview"
} }
] ]
}, },
@ -140,29 +140,33 @@ let menuList = ref([
{ {
menuName: "视频监控", menuName: "视频监控",
companyPath: "/videoManagement" companyPath: "/videoManagement"
} },
]
},
{
moduleName: "质量管理",
modulePath: "/qualityManagement",
menuList: [
{ {
menuName: "质量管理", menuName: "监控控球",
companyPath: "/qualityManagement" companyPath: "/monitorBall"
}
]
},
{
moduleName: "安全管理",
modulePath: "/securityManagement",
menuList: [
{
menuName: "安全管理",
companyPath: "/securityManagement"
} }
] ]
}, },
// {
// moduleName: "质量管理",
// modulePath: "/qualityManagement",
// menuList: [
// {
// menuName: "质量管理",
// companyPath: "/qualityManagement"
// }
// ]
// },
// {
// moduleName: "安全管理",
// modulePath: "/securityManagement",
// menuList: [
// {
// menuName: "安全管理",
// companyPath: "/securityManagement"
// }
// ]
// },
{ {
moduleName: "进度管理", moduleName: "进度管理",
modulePath: "/schedulePlan", modulePath: "/schedulePlan",
@ -201,16 +205,16 @@ let menuList = ref([
} }
] ]
}, },
// { {
// moduleName: "BIM模型", moduleName: "BIM模型",
// modulePath: "/bImModel", modulePath: "/bImModel",
// menuList: [ menuList: [
// { {
// menuName: "BIM模型", menuName: "BIM模型",
// companyPath: "/bImModel" companyPath: "/bImModel"
// } }
// ] ]
// } }
]); ]);
// let menuList = ref([ // let menuList = ref([
// { // {
@ -458,7 +462,8 @@ onMounted(async () => {
document.addEventListener("click", bodyCloseMenus); document.addEventListener("click", bodyCloseMenus);
const subMenus = document.querySelectorAll(".menStyle"); const subMenus = document.querySelectorAll(".menStyle");
if (subMenus.length >= 5) { if (subMenus.length >= 5) {
subMenus[4].style.marginLeft = "30%"; subMenus[3].style.marginLeft = "35%";
subMenus[0].style.marginLeft = "5%";
} }
await getProjectInfo(); await getProjectInfo();
}); });

7
src/views/sevenLargeScreen/largeMachinery/hangBasket/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<!-- 挂篮监测 --> <!-- 挂篮监测 -->
<div class="hang-basket"> <div class="hang-basket">
<div class="left"> <!-- <div class="left">
<hangLeft></hangLeft> <hangLeft></hangLeft>
</div> </div>
<div class="right"> <div class="right">
@ -16,7 +16,8 @@
<div class="right-bottom"> <div class="right-bottom">
<rightBottom></rightBottom> <rightBottom></rightBottom>
</div> </div>
</div> </div> -->
<iframe :src="url" frameborder="0" width="100%" height="100%" id="iframe"></iframe>
</div> </div>
</template> </template>
@ -25,6 +26,8 @@ import hangLeft from "@/views/sevenLargeScreen/largeMachinery/hangBasket/hangLef
import rightBottom from "@/views/sevenLargeScreen/largeMachinery/hangBasket/rightBottom.vue"; import rightBottom from "@/views/sevenLargeScreen/largeMachinery/hangBasket/rightBottom.vue";
import topLeft from "@/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue"; import topLeft from "@/views/sevenLargeScreen/largeMachinery/hangBasket/topLeft.vue";
import topRight from "@/views/sevenLargeScreen/largeMachinery/hangBasket/topRight.vue"; import topRight from "@/views/sevenLargeScreen/largeMachinery/hangBasket/topRight.vue";
import { ref, reactive, onMounted, onBeforeUnmount } from "vue";
let url = ref("https://ai.goviewlink.com/chart/preview/clprpr0gw03ddnvf7ignn3xny") as any;
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

82
src/views/sevenLargeScreen/monitorBall/index.vue Normal file
View File

@ -0,0 +1,82 @@
<template>
<!-- 监控控球 -->
<div class="bimBox" id="domId">
<!-- <iframe :src="url" frameborder="0" width="100%" height="100%" id="iframe"></iframe> -->
<iframe :src="url" frameborder="0" width="100%" height="100%" id="iframe"></iframe>
</div>
</template>
<script lang="ts" setup>
import { GlobalStore } from "@/stores";
import { getSelectProjectBimfaceList, getViewTokenByFileId } from "@/api/modules/binModel";
import { ref, onMounted } from "vue";
const store = GlobalStore();
const url = ref("");
const token = ref("" as any);
//获取bim列表
function getBimfaceList() {
getSelectProjectBimfaceList({ projectSn: store.sn }).then(res => {
res.result.page.records.forEach(item => {
if (item.isEnable) {
token.value = res.result.viewToken;
console.log("token的值", token.value);
localStorage.setItem("bimToken", JSON.stringify(token.value));
}
});
});
}
//获取token
// function getBimfaceToken(fileId) {
// getViewTokenByFileId({ projectSn: store.sn, fileId }).then(res => {
// console.log("token结果", res);
//
// });
// }
// 声明viewer及app变量
let viewer, app;
// 声明viewToken变量，填入想要显示的模型/图纸/场景token
let viewToken = "44e2a106c2e24e9ab10967214005fef6";
// 构造BimfaceSDKLoaderConfig对象
let loaderConfig = new BimfaceSDKLoaderConfig();
// 设置BimfaceSDKLoaderConfig的viewToken
loaderConfig.viewToken = viewToken;
// 调用BimfaceSDKLoader的load方法加载模型
BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback);
// 加载成功回调函数
function successCallback(viewMetaData) {
// 获取DOM元素
let domShow = document.getElementById("domId");
// 创建WebApplicationGISConfig
let webAppConfig = new Glodon.Bimface.Application.WebApplicationGISConfig();
// 设置创建WebApplicationGIS的dom对象
webAppConfig.domElement = domShow;
// 创建WebApplicationGIS
app = new Glodon.Bimface.Application.WebApplicationGIS(webAppConfig);
// 加载待显示的场景
app.addScene(viewToken);
// 获取ViewerGIS对象
viewer = app.getViewer();
}
// 加载失败回调函数
function failureCallback(error) {
console.log(error);
}
onMounted(() => {
url.value = "http://jxj.zhgdyun.com:8082/ds-jkkq";
});
</script>
<style lang="scss" scoped>
.bimBox {
width: 100%;
height: 99%;
margin-top: 20px;
}
</style>

6
src/views/sevenLargeScreen/qualityControl/schedulePlan/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="schedule-plan"> <div class="schedule-plan">
<div class="left"> <!-- <div class="left">
<leftTop class="leftTop"></leftTop> <leftTop class="leftTop"></leftTop>
<leftBottom class="leftBottom"></leftBottom> <leftBottom class="leftBottom"></leftBottom>
</div> </div>
@ -10,7 +10,8 @@
<rightBottomLeft class="rightBottomLeft"></rightBottomLeft> <rightBottomLeft class="rightBottomLeft"></rightBottomLeft>
<rightBottomRight class="rightBottomRight"></rightBottomRight> <rightBottomRight class="rightBottomRight"></rightBottomRight>
</div> </div>
</div> </div> -->
<iframe :src="url" frameborder="0" width="100%" height="100%" id="iframe"></iframe>
</div> </div>
</template> </template>
@ -21,6 +22,7 @@ import leftBottom from "./leftBottom.vue";
import rightTop from "./rightTop.vue"; import rightTop from "./rightTop.vue";
import rightBottomLeft from "./rightBottomLeft.vue"; import rightBottomLeft from "./rightBottomLeft.vue";
import rightBottomRight from "./rightBottomRight.vue"; import rightBottomRight from "./rightBottomRight.vue";
const url = ref("http://jxj.zhgdyun.com:8082/ds-jdgl");
onMounted(() => {}); onMounted(() => {});
</script> </script>