From 64ff8c4695e1dcfd4442b2656480b3b3a138227d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 23 Dec 2021 09:35:06 +0800
Subject: [PATCH] 冲突
---
src/store/modules/popupParams.js | 1 +
vue.config.js | 32 ++++++++++++++++++++------------
src/components/map/component/mapPopup.vue | 3 ++-
src/router/axios.js | 4 ++--
src/components/map/index.vue | 20 ++++++++++++++++++--
5 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/src/components/map/component/mapPopup.vue b/src/components/map/component/mapPopup.vue
index f96a9e1..c5209fc 100644
--- a/src/components/map/component/mapPopup.vue
+++ b/src/components/map/component/mapPopup.vue
@@ -17,7 +17,8 @@
<div class="label-wrap">
<div class="title">
{{stateName}}
- <img @click="audioPlay"
+ <img v-show="introduceText != null && introduceText != ''"
+ @click="audioPlay"
class="audio-control"
src="/img/navicon/audio.png"
alt="">
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 1a404d2..5c27ad0 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -171,14 +171,30 @@
// })
const tilesetLayer = new that.DC.TilesetLayer('tilesetLayer')
+ // tilesetLayer.luminanceAtZenith = 1.8
viewer.addLayer(tilesetLayer)
const tileset = new that.DC.Tileset(
- 'http://data.mars3d.cn/3dtiles/max-shihua/tileset.json'
+ 'http://data.mars3d.cn/3dtiles/max-shihua/tileset.json',
+ {
+ luminanceAtZenith: 0.5
+ }
)
+ console.log(tilesetLayer, tileset, 7878787)
+
+ // luminanceAtZenith
+
tilesetLayer.addOverlay(tileset)
viewer.flyTo(tileset)
+ // viewer.scene.globe.enableLighting = true
+
+ // viewer.scene.light = new that.DC.Namespace.Cesium.DirectionalLight({ // 去除时间原因影响模型颜色
+ // direction: new that.DC.Position(Number(-157), Number(-30), Number(0))
+ // })
+
tileset.on(that.DC.MouseEventType.CLICK, e => {
- console.log(e, 123333)
+ console.log()
+
+ console.log(e)
// that.popupFlag = true
viewer.scene.globe.depthTestAgainstTerrain = false
diff --git a/src/router/axios.js b/src/router/axios.js
index 56b898b..b96680a 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -9,8 +9,8 @@
const service = axios.create({
// baseURL: 'http://192.168.0.107:83',
- baseURL: 'http://192.168.0.107:80',
- // baseURL: 'http://localhost:82',
+ // baseURL: 'http://192.168.0.107:80',
+ baseURL: 'http://s16s652780.51mypc.cn/api',
timeout: 600000 // request timeout
})
diff --git a/src/store/modules/popupParams.js b/src/store/modules/popupParams.js
index b055c9d..077817e 100644
--- a/src/store/modules/popupParams.js
+++ b/src/store/modules/popupParams.js
@@ -67,6 +67,7 @@
CLEAR_ALL (state, param) {
state.siteName = param
state.introduceText = param
+ state.telephone = param
state.panoramaUrl = param
state.teachList = []
state.liveList = []
diff --git a/vue.config.js b/vue.config.js
index abae206..a9d6f3c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,16 +3,24 @@
const dvgisDist = './node_modules/@dvgis'
module.exports = {
+ publicPath: '/',
lintOnSave: false,
- // 其他配置
- chainWebpack: (config) => {
- config.plugin('copy').use(CopywebpackPlugin, [
- [
- {
- from: path.join(dvgisDist, 'dc-sdk/dist/resources'),
- to: 'libs/dc-sdk/resources',
- },
- ],
- ])
- },
-}
\ No newline at end of file
+
+ // 其他配置
+ chainWebpack: (config) => {
+ config.plugin('copy').use(CopywebpackPlugin, [
+ [{
+ from: path.join(dvgisDist, 'dc-sdk/dist/resources'),
+ to: 'libs/dc-sdk/resources'
+ },
+ {
+ from: './public/img',
+ to: 'img'
+ },
+ {
+ from: './public/examples',
+ to: 'examples'
+ }]
+ ])
+ }
+}
--
Gitblit v1.9.3