From a1f1f8af632a9c5a9ae98c37c01a0a394977deb6 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 28 Feb 2024 13:16:09 +0800 Subject: [PATCH] 3dtiles --- .gitignore | 2 ++ public/index.html | 4 +-- src/main.js | 6 +++++ src/views/bigScreen/cesiumtest.vue | 36 ++++++++++++++++++++++++++ src/views/bigScreen/index_enp_blue.vue | 23 +++++++++------- 5 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 src/views/bigScreen/cesiumtest.vue diff --git a/.gitignore b/.gitignore index 36af3596..f967ed64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ .DS_Store node_modules /public/img/ignore/ +/public/3dtiles/ +/public/cesium/ /dist .VSCodeCounter/ diff --git a/public/index.html b/public/index.html index 4019e00c..d6a75cf4 100644 --- a/public/index.html +++ b/public/index.html @@ -13,8 +13,8 @@ <%= VUE_APP_TITLE %> - - + + diff --git a/src/main.js b/src/main.js index 1979fa8d..e8a9f3f6 100644 --- a/src/main.js +++ b/src/main.js @@ -13,12 +13,17 @@ import preventReClick from './utils/preventReClick' import Print from './utils/print2' import Xlsx from './utils/xlsx' import DataVVue3 from '@kjgl77/datav-vue3' +import * as Cesium from '../public/cesium/Cesium.js' +import '../public/cesium/Widgets/widgets.css' +// Vue.prototype.Cesium = Cesium + const app = createApp(App); app.use(store); app.use(router); app.use(ElementPlus); +app.use(Cesium); app.use(i18n); app.use(scui); app.use(ehsui); @@ -26,6 +31,7 @@ app.use(preventReClick); app.use(Print); app.use(Xlsx); app.use(DataVVue3) + //挂载app app.mount('#app'); for (const [key, component] of Object.entries(ElementPlusIconsVue)) { diff --git a/src/views/bigScreen/cesiumtest.vue b/src/views/bigScreen/cesiumtest.vue new file mode 100644 index 00000000..9b26103f --- /dev/null +++ b/src/views/bigScreen/cesiumtest.vue @@ -0,0 +1,36 @@ + + + + + \ No newline at end of file diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue index 35d03fa8..d6b9c70a 100644 --- a/src/views/bigScreen/index_enp_blue.vue +++ b/src/views/bigScreen/index_enp_blue.vue @@ -11,7 +11,7 @@ @click="configDark"> -
+
@@ -51,7 +51,7 @@
-
+
-
+
+
@@ -342,6 +343,7 @@ import * as BABYLON from "babylonjs" import * as BABYLON_GUI from "babylonjs-gui" import * as BABYLON_GRID from "@/utils/gridMaterial" import * as BABYLON_MATERIAL from "@/utils/babylonMaterial" +import Cesium from './cesiumtest.vue' import orgDialog from "./enpComponents/orgwryList" import cemsDrawer from './enpComponents/cems.vue' import cems2Drawer from './enpComponents/cems2.vue' @@ -361,6 +363,7 @@ import 'babylonjs-loaders'; import 'animate.css'; export default { components: { + Cesium, orgDialog, cemsDrawer, cems2Drawer, @@ -609,10 +612,10 @@ export default { left_other.style.position = 'absolute'; left_other.style.width = '20%'; right_other.style.position = 'absolute'; - right_other.style.width = '20%'; - model.style.position = 'absolute'; - model.style.height = (windowHeight - 4) + 'px'; - model.style.top = 0; + // right_other.style.width = '20%'; + // model.style.position = 'absolute'; + // model.style.height = (windowHeight - 4) + 'px'; + // model.style.top = 0; var chartHeight1 = (100 - 18) * 0.31 + 'vh'; var chartHeight2 = (100 - 18) * 0.37 + 'vh'; @@ -1179,8 +1182,9 @@ header { position: relative; align-items: center; box-sizing: border-box; - padding: 1.3vh 0.4vw 0 0.4vw; + padding: 0.7vh 0.4vw; justify-content: space-between; + background-image: url('/public/img/enp_blue/bg_enp.png'); } .headerImg { @@ -1191,6 +1195,7 @@ header { font-size: 1.8vw; text-align: center; position: relative; + } .sysName { @@ -1302,7 +1307,7 @@ header { .model { - top: 0; + top: 8%; left: 0; width: 100%; background-image: url('/public/img/enp_blue/bg_enp.png');