Skip to content

刘远 / 3d_dc

Go to a project
Toggle navigation
Toggle navigation pinning
8aa70952 by jikai
Options

Merge remote-tracking branch 'origin/master'

2 parents cdb1e393 d3b8532c
Expand all
Inline Side-by-side
Showing 14 changed files with 38 additions and 6 deletions
This file is too large to display.
...@@ -50,7 +50,8 @@ ...@@ -50,7 +50,8 @@
50 async:false, 50 async:false,
51 data:{username:'案件查处',password:'123'}, 51 data:{username:'案件查处',password:'123'},
52 success:(res) => { 52 success:(res) => {
53 window.open(`http://10.6.144.88:10001/frontweb/index.jsp?type=${label}`) 53 // window.open(`http://10.6.144.88:10001/frontweb/index.jsp?type=${label}`)
54 window.open(`http://192.168.5.143:80/frontweb/index.jsp?type=${label}`)
54 }, 55 },
55 fail: () => { 56 fail: () => {
56 57
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 </div> 34 </div>
35 35
36 <div style="margin-top: 16px;"> 36 <div style="margin-top: 16px;">
37 <auxiliaryReview @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></auxiliaryReview> 37 <auxiliaryReview @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx' @EAddProject='EAddProject'></auxiliaryReview>
38 </div> 38 </div>
39 </div> 39 </div>
40 </template> 40 </template>
...@@ -84,6 +84,10 @@ ...@@ -84,6 +84,10 @@
84 EGzfx() { 84 EGzfx() {
85 this.$emit('EGzfx'); 85 this.$emit('EGzfx');
86 }, 86 },
87 // 新增项目
88 EAddProject() {
89 this.$emit('EAddProject');
90 },
87 } 91 }
88 } 92 }
89 </script> 93 </script>
......
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
6 */ 6 */
7 export default { 7 export default {
8 url: '', 8 url: '',
9 loginUrl: 'http://10.6.144.88:10001/orup', 9 loginUrl: 'http://192.168.5.143:80/orup',
10 mapToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJhMzMwMjAwZS1lODRmLTRhNzQtODBkOS01YjZkM2ZkYzRmOGMiLCJpZCI6MzE3MzEsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1OTU5MDA0Njd9.K5Rnvdzv5vDjlEbBH-2vEPMJYPgBDs__uvQHZz6jXTc' 10 mapToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJhMzMwMjAwZS1lODRmLTRhNzQtODBkOS01YjZkM2ZkYzRmOGMiLCJpZCI6MzE3MzEsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1OTU5MDA0Njd9.K5Rnvdzv5vDjlEbBH-2vEPMJYPgBDs__uvQHZz6jXTc'
11 } 11 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
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' @EAddProject='EAddProject'></leftAssert>
58 </div> 58 </div>
59 <!-- <div class="mapPop"> 59 <!-- <div class="mapPop">
60 <mapPop></mapPop> 60 <mapPop></mapPop>
...@@ -87,6 +87,11 @@ ...@@ -87,6 +87,11 @@
87 <kgAnalusis @closePop='closePop'></kgAnalusis> 87 <kgAnalusis @closePop='closePop'></kgAnalusis>
88 </div> 88 </div>
89 89
90 <div class="add-project-msg" v-if='addProjectMsg'>
91 <addProjectMsg @closeAddProjectMsg='EcloseAddProjectMsg'></addProjectMsg>
92 </div>
93
94
90 <div id="cesiumContainer"> 95 <div id="cesiumContainer">
91 <div id="vertical-slider" style="display: none;"></div> 96 <div id="vertical-slider" style="display: none;"></div>
92 <div id="horizontal-slider" style="display: none;"></div> 97 <div id="horizontal-slider" style="display: none;"></div>
...@@ -142,7 +147,10 @@ ...@@ -142,7 +147,10 @@
142 import tjxAnslysis from '../components/tjxAnslysis'; // 天际线分析 147 import tjxAnslysis from '../components/tjxAnslysis'; // 天际线分析
143 import yyAnslysis from '../components/yyAnslysis'; // 阴影分析 148 import yyAnslysis from '../components/yyAnslysis'; // 阴影分析
144 import kgAnalusis from '../components/kgAnalusis'; // 控高分析 149 import kgAnalusis from '../components/kgAnalusis'; // 控高分析
145 import visualField from '../components/visualField' //可视域分析 150 import visualField from '../components/visualField'; //可视域分析
151 import addProjectMsg from '../components/addProjectMsg'; // 建设项目信息表
152
153
146 import URL_CONFIG from "./../config/urlConfig.vue"; 154 import URL_CONFIG from "./../config/urlConfig.vue";
147 const Cesium = window.Cesium; 155 const Cesium = window.Cesium;
148 156
...@@ -163,6 +171,8 @@ ...@@ -163,6 +171,8 @@
163 tjxAnslysis, 171 tjxAnslysis,
164 yyAnslysis, 172 yyAnslysis,
165 kgAnalusis, 173 kgAnalusis,
174
175 addProjectMsg,
166 }, 176 },
167 data() { 177 data() {
168 return { 178 return {
...@@ -191,7 +201,9 @@ ...@@ -191,7 +201,9 @@
191 keepArr: ['isReturn', 'enlarge', 'narrow', 'coordinate', 'distance', 201 keepArr: ['isReturn', 'enlarge', 'narrow', 'coordinate', 'distance',
192 'area', 'marker', 'rollerShutter', 'splitScreen', 'toNorth', 202 'area', 'marker', 'rollerShutter', 'splitScreen', 'toNorth',
193 'topSee', 'roundSee', 'horizon', 'allSee', 'ymAnslysis', 203 'topSee', 'roundSee', 'horizon', 'allSee', 'ymAnslysis',
194 'tjxAnslysis', 'yyAnslysis', 'visualField', 'kgAnalusis'] 204 'tjxAnslysis', 'yyAnslysis', 'visualField', 'kgAnalusis'],
205
206 addProjectMsg: false, // 建设项目信息表
195 } 207 }
196 }, 208 },
197 mounted() { 209 mounted() {
...@@ -392,6 +404,9 @@ ...@@ -392,6 +404,9 @@
392 closePop(val) { 404 closePop(val) {
393 this[val] = false; 405 this[val] = false;
394 }, 406 },
407 EcloseAddProjectMsg() {
408 this.addProjectMsg = false;
409 },
395 onlySelect(val) { 410 onlySelect(val) {
396 this.keepArr.forEach(ele => { 411 this.keepArr.forEach(ele => {
397 if(val == ele) { 412 if(val == ele) {
...@@ -412,6 +427,10 @@ ...@@ -412,6 +427,10 @@
412 // 光照分析 427 // 光照分析
413 EGzfx() { 428 EGzfx() {
414 }, 429 },
430 // 打开新增项目列表
431 EAddProject() {
432 this.addProjectMsg = true;
433 }
415 } 434 }
416 } 435 }
417 </script> 436 </script>
...@@ -572,6 +591,14 @@ ...@@ -572,6 +591,14 @@
572 top: 416px; 591 top: 416px;
573 } 592 }
574 593
594 .add-project-msg {
595 position: absolute;
596 z-index: 1000;
597 top: 50%;
598 left: 50%;
599 transform: translate(-50%, -50%);
600 }
601
575 .tjx-anslysis { 602 .tjx-anslysis {
576 top: 265px; 603 top: 265px;
577 } 604 }
......