From b2fdf4f25251229adbe9a6963cb35fb7fc868172 Mon Sep 17 00:00:00 2001 From: surprise <15810472099@163.com> Date: 星期二, 02 一月 2024 18:29:14 +0800 Subject: [PATCH] GLB模型添加.修改,删除 --- src/components/right/right-top.vue | 167 +++++++++++++++++++++++-------------------------------- 1 files changed, 69 insertions(+), 98 deletions(-) diff --git a/src/components/right/right-top.vue b/src/components/right/right-top.vue index 7a685c4..cf8be6d 100644 --- a/src/components/right/right-top.vue +++ b/src/components/right/right-top.vue @@ -1,50 +1,27 @@ <template> <div class="trigger" style="margin-top: 140px; margin-right: 10px"> - <div class="user"> - <el-avatar - class="user_btn" - :size="70.6" - icon="el-icon-user-solid" - alt="涓汉涓績" - ></el-avatar> + <!-- <div class="user"> + <el-avatar class="user_btn" :size="70.6" icon="el-icon-user-solid" alt="涓汉涓績"></el-avatar> <div class="transition-box"> <ul> <li @click="showLayer()">鏍囩粯鏁版嵁</li> - <!-- <li @click="dialogFormVisible = true">淇敼瀵嗙爜</li> --> + <li @click="dialogFormVisible = true">淇敼瀵嗙爜</li> </ul> </div> - </div> - <el-dialog - append-to-body - title="淇敼瀵嗙爜" - :visible.sync="dialogFormVisible" - width="30%" - :close-on-click-modal="false" - custom-class="psdDialog" - > + </div> --> + <el-dialog append-to-body title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible" width="30%" :close-on-click-modal="false" + custom-class="psdDialog"> <el-form :model="form" ref="pwdForm" :rules="rules"> <el-form-item label="鍘熷瘑鐮�"> - <el-input - show-password - v-model="form.oldPassword" - autocomplete="off" - ></el-input> + <el-input show-password v-model="form.oldPassword" autocomplete="off"></el-input> </el-form-item> <el-form-item label="鏂板瘑鐮�" prop="newPassword"> - <el-input - show-password - v-model="form.newPassword" - autocomplete="off" - ></el-input> + <el-input show-password v-model="form.newPassword" autocomplete="off"></el-input> </el-form-item> <el-form-item label="纭瀵嗙爜" prop="checkPassword"> - <el-input - show-password - v-model="form.checkPassword" - autocomplete="off" - ></el-input> + <el-input show-password v-model="form.checkPassword" autocomplete="off"></el-input> </el-form-item> </el-form> <div slot="footer" class="dialog-footer"> @@ -69,7 +46,11 @@ </div> --> - <div class="user_menu" v-show="isShowLayer"><Layer ref="Layer" /></div> + <div class="user_menu" v-show="$store.state.isShowLayer"> + <Layer ref="Layer" /> + </div> + <model-layer v-show="$store.state.showModelFlag"></model-layer> + <model-edit v-if="$store.state.isShowEditLayer"></model-edit> <querydata ref="drawer" /> <div class="resByMouseBox" v-if="showRangeBox"> @@ -85,13 +66,13 @@ <div class="listBox" v-for="(son, index) in fa" :key="index"> {{ son.properties["閮ㄤ欢缂栫爜"] - ? son.properties["閮ㄤ欢缂栫爜"] - : son.properties["浜曠紪鍙�"] + ? son.properties["閮ㄤ欢缂栫爜"] + : son.properties["浜曠紪鍙�"] }} {{ son.properties["閮ㄤ欢鍚嶇О"] - ? son.properties["閮ㄤ欢鍚嶇О"] - : son.properties["浜曞悕绉�"] + ? son.properties["閮ㄤ欢鍚嶇О"] + : son.properties["浜曞悕绉�"] }} <el-link @click.stop="showDetail(son)">璇︽儏</el-link> @@ -146,12 +127,7 @@ <div class="right-close" v-show="isShow" @click="simulationHoverOff"> 脳 </div> - <el-tabs - type="border-card" - :tab-position="tabPosition" - v-model="activeName" - @tab-click="tabclick" - > + <el-tabs type="border-card" :tab-position="tabPosition" v-model="activeName" @tab-click="tabclick"> <div v-show="isShowLocation" class="rightcontent"> <transition name="el-fade-in-linear"> <location v-show="isShowLocation" ref="location" /> @@ -159,12 +135,7 @@ </div> <el-tab-pane label="鏍囩粯" name="鏍囩粯"> <span slot="label" @click="simulationHoverOn('鏍囩粯')"> - <img - class="bhImg" - title="鏍囩粯" - v-if="!isShowPlotting" - src="@/assets/img/right/bh1.png" - /> + <img class="bhImg" title="鏍囩粯" v-if="!isShowPlotting" src="@/assets/img/right/bh1.png" /> <img v-else title="鏍囩粯" src="@/assets/img/right/bh-l.png" /> </span> <div v-show="isShowPlotting" class="rightcontent"> @@ -175,12 +146,7 @@ </el-tab-pane> <el-tab-pane label="閲忕畻" name="閲忕畻"> <span slot="label" @click="simulationHoverOn('閲忕畻')"> - <img - class="lsImg" - title="閲忕畻" - v-if="!isShowMeasure" - src="@/assets/img/right/ls-s.png" - /> + <img class="lsImg" title="閲忕畻" v-if="!isShowMeasure" src="@/assets/img/right/ls-s.png" /> <img v-else title="閲忕畻" src="@/assets/img/right/ls-l.png" /> </span> <div v-show="isShowMeasure" class="rightcontent"> @@ -191,12 +157,7 @@ </el-tab-pane> <el-tab-pane label="绌洪棿鏌ヨ" name="绌洪棿鏌ヨ"> <span slot="label" @click="simulationHoverOn('绌洪棿鏌ヨ')"> - <img - class="cxImg" - title="绌洪棿鏌ヨ" - v-if="!isShowQuery" - src="@/assets/img/right/cx-s.png" - /> + <img class="cxImg" title="绌洪棿鏌ヨ" v-if="!isShowQuery" src="@/assets/img/right/cx-s.png" /> <img v-else title="绌洪棿鏌ヨ" src="@/assets/img/right/cx-ll.png" /> </span> <div v-show="isShowQuery" class="rightcontent"> @@ -207,12 +168,7 @@ </el-tab-pane> <el-tab-pane label="婕父" name="婕父"> <span slot="label" @click="simulationHoverOn('婕父')"> - <img - class="myImg" - title="婕父" - v-if="!isShowRoam" - src="@/assets/img/right/my11.png" - /> + <img class="myImg" title="婕父" v-if="!isShowRoam" src="@/assets/img/right/my11.png" /> <img v-else title="婕父" src="@/assets/img/right/my-l.png" /> </span> <div v-show="isShowRoam" class="rightcontent"> @@ -227,16 +183,8 @@ </el-tab-pane> --> <el-tab-pane label="涓撻鍒嗘瀽" name="涓撻鍒嗘瀽"> <span slot="label" @click="simulationHoverOn('涓撻鍒嗘瀽')"> - <img - class="specialImg" - v-if="!isShowSpeAnalyseImg" - src="@/assets/img/left/specialanalyse4.png" - /> - <img - class="specialImg" - v-else - src="@/assets/img/left/specialanalyse4-s.png" - /> + <img class="specialImg" v-if="!isShowSpeAnalyseImg" src="@/assets/img/left/specialanalyse4.png" /> + <img class="specialImg" v-else src="@/assets/img/left/specialanalyse4-s.png" /> </span> <div v-show="isShowSpeAnalyse" class="leftContent"> <leftztfx ref="ZTFX" /> @@ -244,25 +192,16 @@ </el-tab-pane> <el-tab-pane label="鐗规晥" name="鐗规晥"> <span slot="label" @click="simulationHoverOn('鐗规晥')"> - <img - class="speEffectImg" - v-if="!isShowSpeEffectImg" - src="@/assets/img/left/specialeffect4.png" - /> - <img - class="speEffectImg" - v-else - src="@/assets/img/left/specialeffect4-s.png" - /> + <img class="speEffectImg" v-if="!isShowSpeEffectImg" src="@/assets/img/left/specialeffect4.png" /> + <img class="speEffectImg" v-else src="@/assets/img/left/specialeffect4-s.png" /> </span> <div v-show="isShowSpeEffect" class="leftContent"> <lefttx ref="TX" /> </div> </el-tab-pane> <el-tab-pane label="娓呴櫎" name="娓呴櫎"> - <span slot="label" @click="simulationHoverOn('娓呴櫎')" - ><img title="娓呴櫎" class="qcImg" src="@/assets/img/right/qc-s.png" - /></span> + <span slot="label" @click="simulationHoverOn('娓呴櫎')"><img title="娓呴櫎" class="qcImg" + src="@/assets/img/right/qc-s.png" /></span> </el-tab-pane> </el-tabs> </div> @@ -304,6 +243,7 @@ z-index: 1000; box-sizing: border-box; } + .resByMouseBox .closeBtn { color: #fff; position: absolute; @@ -311,9 +251,11 @@ top: 3px; font-size: 24px; } + .el-link.el-link--default { color: #409eff; } + .detailBox { width: 200px; /* height: 300px; */ @@ -327,6 +269,7 @@ padding: 20px 10px 10px; position: relative; } + .detailcCloseBtn { font-size: 24px; position: absolute; @@ -334,6 +277,7 @@ top: 5px; /* float: right; */ } + .detailBox :not(:first-child) { margin-top: 5px; } @@ -394,9 +338,11 @@ margin-top: 0px !important; /* border-radius: 3px !important; */ } + .user:hover .transition-box { display: block; } + .transition-box { display: none; width: 130px; @@ -411,19 +357,23 @@ box-sizing: border-box; z-index: 9999; } + .transition-box ul li { /* min-width: 154px; */ height: 35px; text-align: center; line-height: 35px; } + .transition-box ul li:hover { background: rgba(18, 80, 172, 0.6); box-shadow: 0px 0px 10px 5px rgba(0, 132, 255, 0.7) inset; } + .psdDialog .el-form-item { margin-bottom: 0px; } + /* .psdDialog, .psdDialog /deep/ .el-pager li { background-color: rgba(255, 0, 0, 0.0); @@ -489,6 +439,7 @@ .trigger { pointer-events: all; } + .specialTool { position: absolute; bottom: 60px; @@ -512,6 +463,7 @@ cursor: pointer; /* box-shadow: 0px 0px 5px 5px #fff; */ } + .top-btn-active { background: #0987ff !important; } @@ -678,19 +630,23 @@ margin: 1px; margin: 20px 0; } -.searchElBg{ + +.searchElBg { background-image: url("~@/assets/img/new/leftCircle.png") !important; background-size: 48px 48px !important; } + .searchBtn { margin-top: 3px; width: 40px; pointer-events: none; } -.searchElBg:hover{ + +.searchElBg:hover { background-image: url("~@/assets/img/new/leftCircle-y.png") !important; background-size: 48px 48px !important; } + .searchBg { position: absolute; left: -4px; @@ -699,6 +655,7 @@ height: 56px; z-index: -10; } + .active { background: #0987ff !important; } @@ -711,9 +668,11 @@ height: 71px; background-image: url("~@/assets/img/new/rightCircle.png"); } + .user:hover { background-image: url("~@/assets/img/new/rightCircle-y.png"); } + .user .el-avatar { background-color: transparent; margin: 3px auto 0; @@ -723,6 +682,7 @@ margin-right: 0px !important; font-size: 28.9px; } + .fcfhBox { position: relative; top: -50px; @@ -731,33 +691,40 @@ background-color: rgba(24, 87, 175, 0.7); border-radius: 4px; } + .fcfhactive { background-color: #17a8fc !important; } + .fcfhBox button { background-color: rgba(24, 64, 118, 1); } + .closeBtn { font-size: 24px; color: #fff; vertical-align: top; margin-left: 5px; } + .resByMouseBox /deep/ .el-collapse-item__header { background-color: transparent; color: #fff; height: 37px; padding-left: 15px; } + .resByMouseBox /deep/ .el-collapse-item__wrap { background-color: transparent; /* color: #fff; */ /* height: 37px; */ /* padding-left: 15px; */ } + .bottomWrap { margin-top: 28px; } + .bottomWrap /deep/ .el-collapse-item__content { /* max-height: 308px; */ /* overflow: auto; */ @@ -765,6 +732,7 @@ padding-left: 15px; padding-bottom: 0; } + .listBox { width: 90%; margin: 3px 0; @@ -788,9 +756,10 @@ import common from "@/components/common"; import { mapState, mapMutations } from "vuex"; import Bus from "../tools/Bus"; -import { queryBySquare } from "@/utils/request"; +// import { queryBySquare } from "@/utils/request"; import FCFH from "@/components/right/FCFH"; - +import modelLayer from "@/components/left/layerTree/modelLayer.vue"; +import modelEdit from '@/components/left/layerTree/modelEdit.vue'; //浜ら�氬浘灞� let trafficLayer, panoramaLayer; let flyPoint; @@ -807,6 +776,8 @@ lefttx, Layer, FCFH, + modelLayer, + modelEdit }, name: "right-top", data() { @@ -1306,7 +1277,7 @@ closeall() { try { this.$refs.measure.clearMeasure(); - } catch (e) {} + } catch (e) { } this.isShow = false; this.isShowLocation = false; this.isShowPlotting = false; @@ -1367,7 +1338,7 @@ layuiLayer.close(SmartEarthPopupData.layerProp); sgworld.drawObj && (sgworld.drawObj.drawHandler && sgworld.drawObj.drawHandler.destroy(), - sgworld.drawObj.end && sgworld.drawObj.end()); + sgworld.drawObj.end && sgworld.drawObj.end()); this.isShowInput = !this.isShowInput; !this.isShowInput && this.$refs.search.clear(); @@ -1379,7 +1350,7 @@ layuiLayer.close(SmartEarthPopupData.layerProp); sgworld.drawObj && (sgworld.drawObj.drawHandler && sgworld.drawObj.drawHandler.destroy(), - sgworld.drawObj.end && sgworld.drawObj.end()); + sgworld.drawObj.end && sgworld.drawObj.end()); this.isShowLocation = !this.isShowLocation; if (!this.isShowLocation) { @@ -1412,7 +1383,7 @@ layuiLayer.close(SmartEarthPopupData.layerProp); sgworld.drawObj && (sgworld.drawObj.drawHandler && sgworld.drawObj.drawHandler.destroy(), - sgworld.drawObj.end && sgworld.drawObj.end()); + sgworld.drawObj.end && sgworld.drawObj.end()); this.isShowTraffic = !this.isShowTraffic; -- Gitblit v1.9.3