diff --git a/.env.development b/.env.development index 67b2660..4f79e0e 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.155:19111' -# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 +VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 # VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://121.196.214.246/api' @@ -25,7 +25,7 @@ NODE_ENV = 'development' # 七参数标准版(演示平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # agjt -VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 +# VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 # VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 苏立信/重庆市南岸区 diff --git a/.env.production b/.env.production index dfd0848..b9f4c4f 100644 --- a/.env.production +++ b/.env.production @@ -22,7 +22,7 @@ NODE_ENV = "production" # VITE_API_URL = 'http://182.90.224.237:15551' # agjt # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 -# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 +VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # 苏立信/重庆市南岸区 # VITE_API_URL = 'http://101.43.164.214:11111' # 中科安信 @@ -34,7 +34,7 @@ NODE_ENV = "production" # 九柱 # VITE_API_URL = 'http://jxjzw.zhgdyun.com:11111' # 同济 -VITE_API_URL = 'http://192.168.110.220:9809' +# VITE_API_URL = 'http://192.168.110.220:9809' # 打包 VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' diff --git a/package-lock.json b/package-lock.json index 76858e0..f8d8cdc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@element-plus/icons-vue": "^2.0.10", "@vueup/vue-quill": "^1.0.0-alpha.40", "@vueuse/core": "^9.12.0", - "@wangeditor/editor": "^5.1.12", + "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "amfe-flexible": "^2.2.1", "axios": "^1.2.1", @@ -3963,7 +3963,7 @@ }, "node_modules/@wangeditor/editor": { "version": "5.1.23", - "resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.1.23.tgz", + "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz", "integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==", "dependencies": { "@uppy/core": "^2.1.1", @@ -19422,7 +19422,7 @@ }, "@wangeditor/editor": { "version": "5.1.23", - "resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.1.23.tgz", + "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz", "integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==", "requires": { "@uppy/core": "^2.1.1", diff --git a/package.json b/package.json index 8020e6b..067533c 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@element-plus/icons-vue": "^2.0.10", "@vueup/vue-quill": "^1.0.0-alpha.40", "@vueuse/core": "^9.12.0", - "@wangeditor/editor": "^5.1.12", + "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "amfe-flexible": "^2.2.1", "axios": "^1.2.1", diff --git a/public/static/bim.html b/public/static/bim.html index 89077f9..3b541f2 100644 --- a/public/static/bim.html +++ b/public/static/bim.html @@ -1,108 +1,116 @@ - - - My first BIMFACE app - - - -
- - + - - + + 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, '父级页面传来的数据') + let viewer3D; + let app; + // let viewToken = "06c56a5e060d42659f29c078af03536e"; + let viewToken = e.data.token; + console.log('viewToken', viewToken); + 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(); + } + + function failureCallback(error) { + console.log(error); + } + // setTimeout(() => { + // window.parent.postMessage({ msg: 'hello' }) + // }, 2000) + }); + // 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(); + // } + // ); + // } + + // function failureCallback(error) { + // console.log(error); + // } + // }; + // function renderConfigModel() { + // // 恢复模型状态 + // viewer3D.setState(modelState); + // viewer3D.render(); + // } + // console.log(666) + // bimCallback("06c56a5e060d42659f29c078af03536e"); + // 监听父组件的信息传递 + // window.addEventListener("message", async function(e) { + // // const modelId = e.data.modelId + // const data = e.data || {}; + // console.log(data,'发送的值') + // if (data.token) { + // // removeModel(modelId) + // document.getElementById("domId").innerHTML = ""; + // await bimCallback("06c56a5e060d42659f29c078af03536e"); + // } + // }); + + + + \ No newline at end of file diff --git a/src/api/modules/agjtLiveApi.ts b/src/api/modules/agjtLiveApi.ts index 1487771..8d6345f 100644 --- a/src/api/modules/agjtLiveApi.ts +++ b/src/api/modules/agjtLiveApi.ts @@ -43,6 +43,21 @@ export const configWeekVideoListApi = (params: {}, noLoading: boolean) => { return http.get(BASEURL + `/xmgl/educationConfigWeekVideo/list`, params, { headers: { noLoading: noLoading } }); }; +//现场大屏视频API +export const getLiveScreenProgramPage = (params: {}, noLoading: boolean) => { + return http.get(BASEURL + `/xmgl/xzLiveScreenProgram/page`, params, { headers: { noLoading: noLoading } }); +}; + +//现场大屏保存弹幕API +export const getLiveScreenDanmuSaveObj = (params: {}, noLoading: boolean) => { + return http.post(BASEURL + `/xmgl/xzLiveScreenDanmu/saveObj`, params, { headers: { noLoading: noLoading } }); +}; + +//现场大屏保存弹幕API +export const getLiveScreenDanmuPage = (params: {}, noLoading: boolean) => { + return http.get(BASEURL + `/xmgl/xzLiveScreenDanmu/page`, params, { headers: { noLoading: noLoading } }); +}; + //获取劳务实名制信息API---上 export const selectPersonTypeAndEduStatisticsApi = (params: {}, noLoading: boolean) => { // return http.post(BASEURL + `/xmgl/workerInfo/selectPersonTypeAndEduStatistics`, params, { headers: { noLoading: noLoading } }); diff --git a/src/components/setBarrageDialog.vue b/src/components/setBarrageDialog.vue new file mode 100644 index 0000000..63e2a23 --- /dev/null +++ b/src/components/setBarrageDialog.vue @@ -0,0 +1,400 @@ + + + + + + diff --git a/src/config/config.ts b/src/config/config.ts index 9e7c092..dde00df 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -28,8 +28,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 -export const COMPANY: string = "tj"; // 同济项目 -// export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 +// export const COMPANY: string = "tj"; // 同济项目 +export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index d0cedfd..f875a6c 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -24,9 +24,9 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/large", name: "大屏", - component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 + // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 - // component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 + component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 // component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏 // component: () => import("@/views/locationLive/locationL.vue"), //人员定位大屏 // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 diff --git a/src/views/agjtLiveScreen/indexLive.vue b/src/views/agjtLiveScreen/indexLive.vue index 5c25b37..fec91c8 100644 --- a/src/views/agjtLiveScreen/indexLive.vue +++ b/src/views/agjtLiveScreen/indexLive.vue @@ -310,10 +310,10 @@ function loginOut() { .dataBoardContent { // height: 81%;//二级 - height: 85%; //一级 + height: 86%; //一级 // height: calc(100% - 15px - 50px - 60px - 20px); // margin: 75px auto 16px auto;//二级 - margin: 10px auto 10px auto; //一级 + margin: 0 auto 10px auto; //一级 width: calc(100% - 40px); // background-color: #01131F; // opacity: 0.9; diff --git a/src/views/agjtLiveScreen/liveScreen/centerTop.vue b/src/views/agjtLiveScreen/liveScreen/centerTop.vue index 2027a68..a81d55d 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerTop.vue @@ -1,7 +1,11 @@ diff --git a/src/views/commandScreen/dialogCompnnents/weather-info.vue b/src/views/commandScreen/dialogCompnnents/weather-info.vue index 61a13f7..3560de5 100644 --- a/src/views/commandScreen/dialogCompnnents/weather-info.vue +++ b/src/views/commandScreen/dialogCompnnents/weather-info.vue @@ -174,474 +174,7 @@
-
-
-
- - - - {{ p.taskName }} - -
-
{{ p.startDate }}
-
{{ p.finishDate }}
-
-
-
-
-
-
-
- -
-
-
- - - - {{ child.taskName }} - -
-
{{ child.startDate }}
-
{{ child.finishDate }}
-
-
-
-
-
-
- -
- - -
-
-
- - - - {{ second.taskName }} - -
- -
{{ second.startDate }}
-
{{ second.finishDate }}
-
-
-
-
-
-
- -
- - -
-
-
- - - - {{ third.taskName }} - -
- -
{{ third.startDate }}
-
{{ third.finishDate }}
-
-
-
-
-
-
- -
- - -
-
-
- - - - {{ fouth.taskName }} - -
- -
{{ fouth.startDate }}
-
{{ fouth.finishDate }}
-
-
-
-
-
-
- -
- - -
-
-
- - - - {{ fifth.taskName }} - -
-
{{ fifth.startDate }}
-
{{ fifth.finishDate }}
-
-
-
-
-
-
- -
- - -
-
-
- - - - {{ sixth.taskName }} - -
-
{{ sixth.startDate }}
-
{{ sixth.finishDate }}
-
-
-
-
-
-
- -
- - -
-
-
- - - - {{ seventh.taskName }} - -
-
{{ seventh.startDate }}
-
{{ seventh.finishDate }}
-
-
-
-
-
-
- -
- - -
-
-
- - - - {{ eighth.taskName }} - -
-
{{ eighth.startDate }}
-
{{ eighth.finishDate }}
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
+
{{ tooltipContent.taskName }} @@ -669,6 +202,7 @@