diff --git a/.env.development b/.env.development index 98d6f8a..0b9ee42 100644 --- a/.env.development +++ b/.env.development @@ -9,10 +9,10 @@ NODE_ENV = 'development' # VITE_API_URL = "http://101.43.164.214:45022" # VITE_API_URL = 'http://192.168.34.221:30002' # 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=' diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 2386d17..69b331a 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -201,6 +201,11 @@ export const staticRouter: RouteRecordRaw[] = [ path: "/digitalFactory", name: "数字梁厂", component: () => import("@/views/sevenLargeScreen/newModel/index.vue") + }, + { + path: "/monitorBall", + name: "监控控球", + component: () => import("@/views/sevenLargeScreen/monitorBall/index.vue") } ], meta: { diff --git a/src/views/sevenLargeScreen/bImModel/index.vue b/src/views/sevenLargeScreen/bImModel/index.vue index 783c54f..8ca6a4f 100644 --- a/src/views/sevenLargeScreen/bImModel/index.vue +++ b/src/views/sevenLargeScreen/bImModel/index.vue @@ -1,6 +1,7 @@ @@ -31,52 +32,50 @@ function getBimfaceList() { // // }); // } - // 声明viewer及app变量 - let viewer, app; - // 声明viewToken变量，填入想要显示的模型/图纸/场景token - let viewToken = '44e2a106c2e24e9ab10967214005fef6'; - - // 构造BimfaceSDKLoaderConfig对象 - let loaderConfig = new BimfaceSDKLoaderConfig(); - // 设置BimfaceSDKLoaderConfig的viewToken - loaderConfig.viewToken = viewToken; +// 声明viewer及app变量 +let viewer, app; +// 声明viewToken变量，填入想要显示的模型/图纸/场景token +let viewToken = "44e2a106c2e24e9ab10967214005fef6"; - // 调用BimfaceSDKLoader的load方法加载模型 - BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback); +// 构造BimfaceSDKLoaderConfig对象 +let loaderConfig = new BimfaceSDKLoaderConfig(); +// 设置BimfaceSDKLoaderConfig的viewToken +loaderConfig.viewToken = viewToken; - // 加载成功回调函数 - function successCallback(viewMetaData) { +// 调用BimfaceSDKLoader的load方法加载模型 +BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback); - // 获取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); +// 加载成功回调函数 +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); + // 加载待显示的场景 + app.addScene(viewToken); - // 获取ViewerGIS对象 - viewer = app.getViewer(); + // 获取ViewerGIS对象 + viewer = app.getViewer(); +} - }; - - // 加载失败回调函数 - function failureCallback(error) { - - console.log(error); - - }; -onMounted(() => {}); +// 加载失败回调函数 +function failureCallback(error) { + console.log(error); +} +onMounted(() => { + url.value = "http://jxj.zhgdyun.com:8082/bim/bimshow.html?fileId=10000831193551&projectSn=B64AEF7D362644B5A1708944901768AE"; +}); diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue index 20479ed..660ec36 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue @@ -32,7 +32,7 @@
里程碑
- +
{{ item.name }}
@@ -55,6 +55,10 @@
+
+ +
暂无数据
+
@@ -65,36 +69,37 @@ import Card from "@/components/card.vue"; import { ref, watch, onMounted } from "vue"; import { getStageOption } from "@/api/modules/projectOverview"; -const progressList = ref([ - { - name: "施工证获取", - status: 0 - }, - { - name: "土方开挖", - status: 0 - }, - { - name: "桩基", - status: 0 - }, - { - name: "支护开始", - status: 0 - }, - { - name: "垫层完成", - status: 0 - }, - { - name: "正负零", - status: 0 - }, - { - name: "工程达到预售条件", - status: 0 - } -] as any); +// const progressList = ref([ +// { +// name: "施工证获取", +// status: 0 +// }, +// { +// name: "土方开挖", +// status: 0 +// }, +// { +// name: "桩基", +// status: 0 +// }, +// { +// name: "支护开始", +// status: 0 +// }, +// { +// name: "垫层完成", +// status: 0 +// }, +// { +// name: "正负零", +// status: 0 +// }, +// { +// name: "工程达到预售条件", +// status: 0 +// } +// ] as any); +const progressList = ref([] as any); // ts type Props = { projectData?: any; // 传入项目信息 @@ -114,7 +119,9 @@ watch( // props.xData = newVal; projectData.value = newVal; 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 const getProgressOption = async () => { const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage" }); - if (res.success) { + if (res.result.length > 0) { let newArray = res.result.map((item: any) => { return { name: item.name, @@ -250,4 +257,18 @@ onMounted(() => { height: 80%; 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; + } +} diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/index.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/index.vue index c4d0df8..d1024b6 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/index.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/index.vue @@ -1,6 +1,6 @@ diff --git a/src/views/sevenLargeScreen/qualityControl/schedulePlan/index.vue b/src/views/sevenLargeScreen/qualityControl/schedulePlan/index.vue index df10a7a..6d3b785 100644 --- a/src/views/sevenLargeScreen/qualityControl/schedulePlan/index.vue +++ b/src/views/sevenLargeScreen/qualityControl/schedulePlan/index.vue @@ -1,6 +1,6 @@ @@ -21,6 +22,7 @@ import leftBottom from "./leftBottom.vue"; import rightTop from "./rightTop.vue"; import rightBottomLeft from "./rightBottomLeft.vue"; import rightBottomRight from "./rightBottomRight.vue"; +const url = ref("http://jxj.zhgdyun.com:8082/ds-jdgl"); onMounted(() => {});