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 @@ ...@@ -11,6 +11,7 @@
11 "core-js": "^3.6.5", 11 "core-js": "^3.6.5",
12 "echarts": "^4.8.0", 12 "echarts": "^4.8.0",
13 "element-ui": "^2.13.2", 13 "element-ui": "^2.13.2",
14 "esri-loader": "^2.15.0",
14 "vue": "^2.6.11", 15 "vue": "^2.6.11",
15 "vue-router": "^3.2.0", 16 "vue-router": "^3.2.0",
16 "vuex": "^3.4.0" 17 "vuex": "^3.4.0"
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
18 <!-- <script src="./js/bootstrap.min.js"></script> --> 18 <!-- <script src="./js/bootstrap.min.js"></script> -->
19 <script src="./js/spectrum.js"></script> 19 <script src="./js/spectrum.js"></script>
20 <script type="text/javascript" src="./js/supermap/SuperMap.Include.js"></script> 20 <script type="text/javascript" src="./js/supermap/SuperMap.Include.js"></script>
21 <script type="text/javascript" src="./js/require.min.js" data-main="js/main"></script>
22 </head> 21 </head>
23 <body> 22 <body>
24 <noscript> 23 <noscript>
......
...@@ -12,29 +12,35 @@ ...@@ -12,29 +12,35 @@
12 <div style="margin-top: 10px; font-size: 14px;">方案对比</div> 12 <div style="margin-top: 10px; font-size: 14px;">方案对比</div>
13 </div> 13 </div>
14 </div> 14 </div>
15 <div @click="EKgfz()"> 15 <div @click="EAddProject()">
16 <div>
17 <img src="../assets/一张图/新增项目.png" alt="">
18 <div style="margin-top: 10px; font-size: 14px;">新增项目</div>
19 </div>
20 </div>
21 <!-- <div @click="EKgfz()">
16 <div> 22 <div>
17 <img src="../assets/一张图/icon_方案审查_辅助审查_控高分析.png" alt=""> 23 <img src="../assets/一张图/icon_方案审查_辅助审查_控高分析.png" alt="">
18 <div style="margin-top: 10px; font-size: 14px;">控高分析</div> 24 <div style="margin-top: 10px; font-size: 14px;">控高分析</div>
19 </div> 25 </div>
26 </div> -->
20 </div> 27 </div>
21 </div> 28 <!-- <div class="box"> -->
22 <div class="box"> 29 <!-- <div @click="EGzfx()">
23 <div @click="EGzfx()">
24 <div> 30 <div>
25 <img src="../assets/一张图/icon_方案审查_辅助审查_光照分析.png" alt=""> 31 <img src="../assets/一张图/icon_方案审查_辅助审查_光照分析.png" alt="">
26 <div style="margin-top: 10px; font-size: 14px;">光照分析</div> 32 <div style="margin-top: 10px; font-size: 14px;">光照分析</div>
27 </div> 33 </div>
28 </div> 34 </div> -->
29 <!-- css 占位 --> 35 <!-- css 占位 -->
30 <div style="visibility:hidden"> 36 <!-- <div>
31 <div> 37 <div>
32 <img src="../assets/一张图/icon_方案审查_辅助审查_控高分析.png" alt=""> 38 <img src="../assets/一张图/新增项目.png" alt="">
33 <div style="margin-top: 10px; font-size: 14px;">控高分析</div> 39 <div style="margin-top: 10px; font-size: 14px;">新增项目</div>
34 </div>
35 </div> 40 </div>
41 </div> -->
36 42
37 </div> 43 <!-- </div> -->
38 </div> 44 </div>
39 </div> 45 </div>
40 </template> 46 </template>
...@@ -76,6 +82,10 @@ ...@@ -76,6 +82,10 @@
76 EGzfx() { 82 EGzfx() {
77 this.$emit('EGzfx'); 83 this.$emit('EGzfx');
78 }, 84 },
85 // 新增项目
86 EAddProject() {
87 this.$emit('EAddProject');
88 }
79 } 89 }
80 } 90 }
81 </script> 91 </script>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 </div> 6 </div>
7 </div> 7 </div>
8 <div class="mian"> 8 <div class="mian">
9 <div class="title"> 9 <div class="title-bt">
10 <span>控高分析</span> 10 <span>控高分析</span>
11 <span @click="closePop" class="close">×</span> 11 <span @click="closePop" class="close">×</span>
12 </div> 12 </div>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
132 } 132 }
133 133
134 134
135 .title { 135 .title-bt {
136 display: flex; 136 display: flex;
137 justify-content: space-between; 137 justify-content: space-between;
138 border-bottom: 1px solid rgba(255, 255, 255, 0.15); 138 border-bottom: 1px solid rgba(255, 255, 255, 0.15);
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
76 <!--淹没分析 --> 76 <!--淹没分析 -->
77 <div class="func-ico" :class="[ymAnslysis?'selected':'']" @click="handleymAnslysis('ymAnslysis')"> 77 <div class="func-ico" :class="[ymAnslysis?'selected':'']" @click="handleymAnslysis('ymAnslysis')">
78 <el-tooltip class="item" effect="dark" content="淹没" placement="left"> 78 <el-tooltip class="item" effect="dark" content="淹没" placement="left">
79 <img src="../assets/一张图/icon_通视.png" alt=""> 79 <img src="../assets/一张图/淹没分析.png" alt="">
80 </el-tooltip> 80 </el-tooltip>
81 </div> 81 </div>
82 82
...@@ -84,28 +84,28 @@ ...@@ -84,28 +84,28 @@
84 <!--阴影分析 --> 84 <!--阴影分析 -->
85 <div class="func-ico" :class="[yyAnslysis?'selected':'']" @click="handleyyAnslysis('yyAnslysis')"> 85 <div class="func-ico" :class="[yyAnslysis?'selected':'']" @click="handleyyAnslysis('yyAnslysis')">
86 <el-tooltip class="item" effect="dark" content="阴影" placement="left"> 86 <el-tooltip class="item" effect="dark" content="阴影" placement="left">
87 <img src="../assets/一张图/icon_通视.png" alt=""> 87 <img src="../assets/一张图/阴影分析.png" alt="">
88 </el-tooltip> 88 </el-tooltip>
89 </div> 89 </div>
90 <!--控高分析 --> 90 <!--控高分析 -->
91 <!-- <div class="func-ico" :class="[kgAnalusis?'selected':'']" @click="handlekgAnalusis('kgAnalusis')"> 91 <div class="func-ico" :class="[kgAnalusis?'selected':'']" @click="handlekgAnalusis('kgAnalusis')">
92 92
93 <el-tooltip class="item" effect="dark" content="控高" placement="left"> 93 <el-tooltip class="item" effect="dark" content="控高" placement="left">
94 <img src="../assets/一张图/icon_通视.png" alt=""> 94 <img src="../assets/一张图/控高分析.png" alt="">
95 </el-tooltip> 95 </el-tooltip>
96 </div> --> 96 </div>
97 97
98 <!--天际线分析 --> 98 <!--天际线分析 -->
99 <div class="func-ico" :class="[tjxAnslysis?'selected':'']" @click="handletjxAnslysis('tjxAnslysis')"> 99 <!-- <div class="func-ico" :class="[tjxAnslysis?'selected':'']" @click="handletjxAnslysis('tjxAnslysis')">
100 <el-tooltip class="item" effect="dark" content="天际线" placement="left"> 100 <el-tooltip class="item" effect="dark" content="天际线" placement="left">
101 <img src="../assets/一张图/icon_通视.png" alt=""> 101 <img src="../assets/一张图/icon_通视.png" alt="">
102 </el-tooltip> 102 </el-tooltip>
103 </div> 103 </div> -->
104 104
105 <!--可视域分析 --> 105 <!--可视域分析 -->
106 <div class="func-ico" :class="[visualField?'selected':'']" @click="handlevisualField('visualField')"> 106 <div class="func-ico" :class="[visualField?'selected':'']" @click="handlevisualField('visualField')">
107 <el-tooltip class="item" effect="dark" content="可视域分析" placement="left"> 107 <el-tooltip class="item" effect="dark" content="可视域分析" placement="left">
108 <img src="../assets/一张图/icon_通视.png" alt=""> 108 <img src="../assets/一张图/视域分析.png" alt="">
109 </el-tooltip> 109 </el-tooltip>
110 </div> 110 </div>
111 111
......
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
53 <div class="bottomNav"> 53 <div class="bottomNav">
54 <bottomNav></bottomNav> 54 <bottomNav></bottomNav>
55 </div> 55 </div>
56 <!-- <div class="leftAssert"> 56 <div class="leftAssert">
57 <leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert> 57 <leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert>
58 </div> --> 58 </div>
59 <!-- <div class="mapPop"> 59 <!-- <div class="mapPop">
60 <mapPop></mapPop> 60 <mapPop></mapPop>
61 </div> --> 61 </div> -->
...@@ -127,14 +127,13 @@ ...@@ -127,14 +127,13 @@
127 // import flood from "../assets/js/map/flood"; 127 // import flood from "../assets/js/map/flood";
128 // import viewpoint from "../assets/js/map/viewpoint"; 128 // import viewpoint from "../assets/js/map/viewpoint";
129 // import visual from "../assets/js/map/visual"; 129 // import visual from "../assets/js/map/visual";
130 import { loadModules } from "esri-loader";
131 130
132 131
133 import TopTitle from '../components/topTitle'; 132 import TopTitle from '../components/topTitle';
134 import rightTopFunc from '../components/rightTopFunc'; 133 import rightTopFunc from '../components/rightTopFunc';
135 import rightFunc from '../components/rightFunc'; 134 import rightFunc from '../components/rightFunc';
136 import bottomNav from '../components/bottomNav'; 135 import bottomNav from '../components/bottomNav';
137 // import leftAssert from '../components/leftAssert'; 136 import leftAssert from '../components/leftAssert';
138 // import mapPop from '../components/mapPop'; 137 // import mapPop from '../components/mapPop';
139 138
140 import allSee from '../components/allSee'; //通视 139 import allSee from '../components/allSee'; //通视
...@@ -154,7 +153,7 @@ ...@@ -154,7 +153,7 @@
154 rightTopFunc, 153 rightTopFunc,
155 rightFunc, 154 rightFunc,
156 bottomNav, 155 bottomNav,
157 // leftAssert, 156 leftAssert,
158 // mapPop, 157 // mapPop,
159 158
160 allSee, 159 allSee,
...@@ -195,24 +194,6 @@ ...@@ -195,24 +194,6 @@
195 } 194 }
196 }, 195 },
197 mounted() { 196 mounted() {
198 // loadModules([
199 // "esri/Map",
200 // "esri/Basemap",
201 // "esri/views/MapView",
202 // "esri/layers/TileLayer",
203 // "esri/layers/WebTileLayer",
204 // // "dojo/domReady!"
205 // ]).then(([Map, Basemap, MapView, TileLayer, WebTileLayer]) => {
206
207 // // let configure = mapUrl[a],
208 // // args = { baseLayers: [] };
209 // // configure.layers.forEach(e => {
210 // // args.baseLayers.push(new WebTileLayer(e));
211 // // });
212 // // configure.url && (args.baseLayers.thumbnailUrl = configure.url);
213 // // this.map.basemap = new Basemap(args);
214 // });
215
216 this.viewer = new Cesium.Viewer('cesiumContainer', {shadows : true}); 197 this.viewer = new Cesium.Viewer('cesiumContainer', {shadows : true});
217 this.viewer.imageryLayers.addImageryProvider(new Cesium.TiandituImageryProvider({ 198 this.viewer.imageryLayers.addImageryProvider(new Cesium.TiandituImageryProvider({
218 credit : new Cesium.Credit('天地图全球影像服务'), 199 credit : new Cesium.Credit('天地图全球影像服务'),
...@@ -351,7 +332,6 @@ ...@@ -351,7 +332,6 @@
351 EtjxAnslysis(val) { 332 EtjxAnslysis(val) {
352 this[val] = !this[val]; 333 this[val] = !this[val];
353 this.onlySelect(val); 334 this.onlySelect(val);
354
355 }, 335 },
356 // 可视化分析 336 // 可视化分析
357 EvisualField(val) { 337 EvisualField(val) {
...@@ -367,7 +347,6 @@ ...@@ -367,7 +347,6 @@
367 EkgAnalusis(val) { 347 EkgAnalusis(val) {
368 this[val] = !this[val]; 348 this[val] = !this[val];
369 this.onlySelect(val); 349 this.onlySelect(val);
370
371 }, 350 },
372 // 关闭pop方法 351 // 关闭pop方法
373 closePop(val) { 352 closePop(val) {
......