Skip to content

刘远 / 3d_dc

Go to a project
Toggle navigation
Toggle navigation pinning
3f79c517 by jikai
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/Home.vue
2 parents c0e79425 507a6490
Inline Side-by-side
Showing 17 changed files with 35 additions and 46 deletions
This file is too large to display.
......@@ -11,6 +11,7 @@
"core-js": "^3.6.5",
"echarts": "^4.8.0",
"element-ui": "^2.13.2",
"esri-loader": "^2.15.0",
"vue": "^2.6.11",
"vue-router": "^3.2.0",
"vuex": "^3.4.0"
......
......@@ -18,7 +18,6 @@
<!-- <script src="./js/bootstrap.min.js"></script> -->
<script src="./js/spectrum.js"></script>
<script type="text/javascript" src="./js/supermap/SuperMap.Include.js"></script>
<script type="text/javascript" src="./js/require.min.js" data-main="js/main"></script>
</head>
<body>
<noscript>
......
......@@ -12,29 +12,35 @@
<div style="margin-top: 10px; font-size: 14px;">方案对比</div>
</div>
</div>
<div @click="EKgfz()">
<div @click="EAddProject()">
<div>
<img src="../assets/一张图/新增项目.png" alt="">
<div style="margin-top: 10px; font-size: 14px;">新增项目</div>
</div>
</div>
<!-- <div @click="EKgfz()">
<div>
<img src="../assets/一张图/icon_方案审查_辅助审查_控高分析.png" alt="">
<div style="margin-top: 10px; font-size: 14px;">控高分析</div>
</div>
</div>
</div> -->
</div>
<div class="box">
<div @click="EGzfx()">
<!-- <div class="box"> -->
<!-- <div @click="EGzfx()">
<div>
<img src="../assets/一张图/icon_方案审查_辅助审查_光照分析.png" alt="">
<div style="margin-top: 10px; font-size: 14px;">光照分析</div>
</div>
</div>
</div> -->
<!-- css 占位 -->
<div style="visibility:hidden">
<!-- <div>
<div>
<img src="../assets/一张图/icon_方案审查_辅助审查_控高分析.png" alt="">
<div style="margin-top: 10px; font-size: 14px;">控高分析</div>
<img src="../assets/一张图/新增项目.png" alt="">
<div style="margin-top: 10px; font-size: 14px;">新增项目</div>
</div>
</div>
</div> -->
</div>
<!-- </div> -->
</div>
</div>
</template>
......@@ -76,6 +82,10 @@
EGzfx() {
this.$emit('EGzfx');
},
// 新增项目
EAddProject() {
this.$emit('EAddProject');
}
}
}
</script>
......
......@@ -6,7 +6,7 @@
</div>
</div>
<div class="mian">
<div class="title">
<div class="title-bt">
<span>控高分析</span>
<span @click="closePop" class="close">×</span>
</div>
......@@ -132,7 +132,7 @@
}
.title {
.title-bt {
display: flex;
justify-content: space-between;
border-bottom: 1px solid rgba(255, 255, 255, 0.15);
......
......@@ -76,7 +76,7 @@
<!--淹没分析 -->
<div class="func-ico" :class="[ymAnslysis?'selected':'']" @click="handleymAnslysis('ymAnslysis')">
<el-tooltip class="item" effect="dark" content="淹没" placement="left">
<img src="../assets/一张图/icon_通视.png" alt="">
<img src="../assets/一张图/淹没分析.png" alt="">
</el-tooltip>
</div>
......@@ -84,28 +84,28 @@
<!--阴影分析 -->
<div class="func-ico" :class="[yyAnslysis?'selected':'']" @click="handleyyAnslysis('yyAnslysis')">
<el-tooltip class="item" effect="dark" content="阴影" placement="left">
<img src="../assets/一张图/icon_通视.png" alt="">
<img src="../assets/一张图/阴影分析.png" alt="">
</el-tooltip>
</div>
<!--控高分析 -->
<!-- <div class="func-ico" :class="[kgAnalusis?'selected':'']" @click="handlekgAnalusis('kgAnalusis')">
<div class="func-ico" :class="[kgAnalusis?'selected':'']" @click="handlekgAnalusis('kgAnalusis')">
<el-tooltip class="item" effect="dark" content="控高" placement="left">
<img src="../assets/一张图/icon_通视.png" alt="">
<img src="../assets/一张图/控高分析.png" alt="">
</el-tooltip>
</div> -->
</div>
<!--天际线分析 -->
<div class="func-ico" :class="[tjxAnslysis?'selected':'']" @click="handletjxAnslysis('tjxAnslysis')">
<!-- <div class="func-ico" :class="[tjxAnslysis?'selected':'']" @click="handletjxAnslysis('tjxAnslysis')">
<el-tooltip class="item" effect="dark" content="天际线" placement="left">
<img src="../assets/一张图/icon_通视.png" alt="">
</el-tooltip>
</div>
</div> -->
<!--可视域分析 -->
<div class="func-ico" :class="[visualField?'selected':'']" @click="handlevisualField('visualField')">
<el-tooltip class="item" effect="dark" content="可视域分析" placement="left">
<img src="../assets/一张图/icon_通视.png" alt="">
<img src="../assets/一张图/视域分析.png" alt="">
</el-tooltip>
</div>
......
......@@ -53,9 +53,9 @@
<div class="bottomNav">
<bottomNav></bottomNav>
</div>
<!-- <div class="leftAssert">
<div class="leftAssert">
<leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert>
</div> -->
</div>
<!-- <div class="mapPop">
<mapPop></mapPop>
</div> -->
......@@ -127,14 +127,13 @@
// import flood from "../assets/js/map/flood";
// import viewpoint from "../assets/js/map/viewpoint";
// import visual from "../assets/js/map/visual";
import { loadModules } from "esri-loader";
import TopTitle from '../components/topTitle';
import rightTopFunc from '../components/rightTopFunc';
import rightFunc from '../components/rightFunc';
import bottomNav from '../components/bottomNav';
// import leftAssert from '../components/leftAssert';
import leftAssert from '../components/leftAssert';
// import mapPop from '../components/mapPop';
import allSee from '../components/allSee'; //通视
......@@ -154,7 +153,7 @@
rightTopFunc,
rightFunc,
bottomNav,
// leftAssert,
leftAssert,
// mapPop,
allSee,
......@@ -195,24 +194,6 @@
}
},
mounted() {
// loadModules([
// "esri/Map",
// "esri/Basemap",
// "esri/views/MapView",
// "esri/layers/TileLayer",
// "esri/layers/WebTileLayer",
// // "dojo/domReady!"
// ]).then(([Map, Basemap, MapView, TileLayer, WebTileLayer]) => {
// // let configure = mapUrl[a],
// // args = { baseLayers: [] };
// // configure.layers.forEach(e => {
// // args.baseLayers.push(new WebTileLayer(e));
// // });
// // configure.url && (args.baseLayers.thumbnailUrl = configure.url);
// // this.map.basemap = new Basemap(args);
// });
this.viewer = new Cesium.Viewer('cesiumContainer', {shadows : true});
this.viewer.imageryLayers.addImageryProvider(new Cesium.TiandituImageryProvider({
credit : new Cesium.Credit('天地图全球影像服务'),
......@@ -351,7 +332,6 @@
EtjxAnslysis(val) {
this[val] = !this[val];
this.onlySelect(val);
},
// 可视化分析
EvisualField(val) {
......@@ -367,7 +347,6 @@
EkgAnalusis(val) {
this[val] = !this[val];
this.onlySelect(val);
},
// 关闭pop方法
closePop(val) {
......