From 8b9443e36615497b002a18fa3cd50521dc1decca Mon Sep 17 00:00:00 2001
From: Jin Lei <jinlei_182@163.com>
Date: 星期六, 11 十一月 2023 17:43:51 +0800
Subject: [PATCH] [viewer]解决路径冲突
---
src/components/map/viewer1.vue | 5 +-
src/components/map/viewer.vue | 4 +-
src/components/menu/tools/analysis.vue | 6 +-
src/components/menu/tools/setting.vue | 96 ++++++++++++++++++++++++++++++++++++------------
4 files changed, 80 insertions(+), 31 deletions(-)
diff --git a/src/components/map/viewer.vue b/src/components/map/viewer.vue
index a2875be..c9b1318 100644
--- a/src/components/map/viewer.vue
+++ b/src/components/map/viewer.vue
@@ -80,8 +80,8 @@
window.sgworld = new SmartEarth.EarthCtrl(
"sdkContainer",
{
- StaticFileBaseUrl: "../../../static/CimSDK/",
- // StaticFileBaseUrl: "../../../YZXNCS/static/CimSDK/",
+ // StaticFileBaseUrl: "../../../static/CimSDK/",
+ StaticFileBaseUrl: "../../../YZXNCS/static/CimSDK/",
},
{},
{},
diff --git a/src/components/map/viewer1.vue b/src/components/map/viewer1.vue
index 0439c00..bba459a 100644
--- a/src/components/map/viewer1.vue
+++ b/src/components/map/viewer1.vue
@@ -1042,8 +1042,9 @@
position: absolute;
z-index: 999;
top: 20%;
- left: 35%;
- /* right: -68%; */
+ /* left: 35%; */
+ right: 0%;
+ transform: translateX(50%);
padding-top: 20px;
width: 401px;
height: 549px;
diff --git a/src/components/menu/tools/analysis.vue b/src/components/menu/tools/analysis.vue
index 352e406..fc6c7e6 100644
--- a/src/components/menu/tools/analysis.vue
+++ b/src/components/menu/tools/analysis.vue
@@ -140,17 +140,17 @@
/* border-radius: 30px; */
box-shadow: 0px 0px 10px rgba(101, 180, 253, 0.8) inset;
background-color: rgba(5, 39, 126, 0.7);
+ width: 350px;
/* border-image-source: radial-gradient(
52% 120%,
transparent 0px,
transparent 100%,
cyan 100%
- ); */
+ );
border-image-slice: 1;
border-width: 1px;
border-style: solid;
- border-image-outset: 0;
- width: 350px;
+ border-image-outset: 0; */
}
.analysisList {
background: transparent;
diff --git a/src/components/menu/tools/setting.vue b/src/components/menu/tools/setting.vue
index 09f79f2..d1290e8 100644
--- a/src/components/menu/tools/setting.vue
+++ b/src/components/menu/tools/setting.vue
@@ -15,8 +15,14 @@
></el-checkbox> -->
<label class="labelText">浜害</label>
- <el-slider class="sl" v-model="brightness" :show-tooltip="false" @change="ld" :step="0.1" :min="0"
- :max="3"></el-slider>
+ <el-slider
+ class="sl"
+ v-model="brightness"
+ @input="ld()"
+ :step="0.1"
+ :min="0"
+ :max="2"
+ ></el-slider>
</div>
<div class="in-yxw">
<!-- <el-checkbox
@@ -27,8 +33,14 @@
></el-checkbox> -->
<label class="labelText">瀵规瘮搴�</label>
- <el-slider class="sl" v-model="contrast" :show-tooltip="false" @change="dbd" :step="0.1" :min="0"
- :max="3"></el-slider>
+ <el-slider
+ class="sl"
+ v-model="contrast"
+ @input="dbd()"
+ :step="0.1"
+ :min="0"
+ :max="2"
+ ></el-slider>
</div>
<div class="in-yxw">
<!-- <el-checkbox
@@ -38,24 +50,61 @@
@change="wu('checkbox')"
></el-checkbox> -->
<label class="labelText">楗卞拰搴�</label>
- <el-slider class="sl" v-model="saturation" :show-tooltip="false" @change="bhd" :step="0.1" :min="0"
- :max="3"></el-slider>
+ <el-slider
+ class="sl"
+ v-model="saturation"
+ @input="bhd()"
+ :step="0.1"
+ :min="0"
+ :max="2"
+ ></el-slider>
</div>
<div class="in-yxw">
- <el-checkbox v-model="checkedYu" class="y" label="闆�" @change="yu('checkbox')"></el-checkbox>
- <el-slider class="sl" v-model="value1" :show-tooltip="false" @change="yu" :disabled="!checkedYu"></el-slider>
+ <el-checkbox
+ v-model="checkedYu"
+ class="y"
+ label="闆�"
+ @change="yu('checkbox')"
+ ></el-checkbox>
+ <el-slider
+ class="sl"
+ v-model="value1"
+ :show-tooltip="false"
+ @change="yu"
+ :disabled="!checkedYu"
+ ></el-slider>
</div>
<div class="in-yxw">
- <el-checkbox v-model="checkedXue" class="y" label="闆�" @change="xue('checkbox')"></el-checkbox>
- <el-slider class="sl" v-model="value2" :show-tooltip="false" @change="xue"
- :disabled="!checkedXue"></el-slider>
+ <el-checkbox
+ v-model="checkedXue"
+ class="y"
+ label="闆�"
+ @change="xue('checkbox')"
+ ></el-checkbox>
+ <el-slider
+ class="sl"
+ v-model="value2"
+ :show-tooltip="false"
+ @change="xue"
+ :disabled="!checkedXue"
+ ></el-slider>
</div>
<div class="in-yxw">
- <el-checkbox v-model="checkedWu" class="y" label="闆�" @change="wu('checkbox')"></el-checkbox>
- <el-slider class="sl" v-model="value3" :show-tooltip="false" @change="wu" :disabled="!checkedWu"></el-slider>
+ <el-checkbox
+ v-model="checkedWu"
+ class="y"
+ label="闆�"
+ @change="wu('checkbox')"
+ ></el-checkbox>
+ <el-slider
+ class="sl"
+ v-model="value3"
+ :show-tooltip="false"
+ @change="wu"
+ :disabled="!checkedWu"
+ ></el-slider>
</div>
-
</div>
</div>
</div>
@@ -79,19 +128,22 @@
enableLight: false,
};
},
+ mounted() {
+ sgworld.environment.showEffect("colorAdjustment");
+ },
methods: {
ld() {
- sgworld.brightness = this.brightness;
+ sgworld.environment.colorAdjustment.brightness = this.brightness;
},
dbd() {
- sgworld.contrast = this.contrast;
+ sgworld.environment.colorAdjustment.contrast = this.contrast;
},
bhd() {
- sgworld.saturation = this.saturation;
+ sgworld.environment.colorAdjustment.saturation = this.saturation;
},
closeJm() {
- this.$store.commit('showSetBox', false)
+ this.$store.commit("showSetBox", false);
},
// yhadd
//闆ㄩ洩闆�
@@ -156,12 +208,8 @@
sgworld.Analysis.createWeather("fog", true, fogValue);
}
},
-
passSta() {
- var sta =
- this.checkedYu ||
- this.checkedXue ||
- this.checkedWu;
+ var sta = this.checkedYu || this.checkedXue || this.checkedWu;
if (sta) {
this.$parent.$parent.$parent.speEffectImgSta = true;
// this.$parent.$parent.$parent.sceneImgSta = true;
@@ -189,7 +237,7 @@
color: #fff;
top: 40%;
right: 350px;
- transform: translate(0, -50%)
+ transform: translate(0, -50%);
}
/* yhadd */
--
Gitblit v1.9.3