8aa70952 by jikai

Merge remote-tracking branch 'origin/master'

2 parents cdb1e393 d3b8532c
This file is too large to display.
1 // 建设项目信息表 弹窗
2 <template>
3 <div class="container">
4 <div class="wrapper">
5 <div class="box">
6 </div>
7 </div>
8 <div class="mian">
9 <div class="title-bt">
10 <span>建设项目信息表</span>
11 <span @click="closePop" class="close">×</span>
12 </div>
13 <div class="main-box">
14 <div class="basic-msg">
15 <div class="title-basic">
16 <div class="vertical-line"></div>
17 <span>基本信息</span>
18 </div>
19 </div>
20 <div class="project-detail">
21 <div class="project">
22 <span class="title-name title-line-1">*项目编号</span>
23 <el-input v-model="col1" placeholder="请输入项目编号" class="input-one"></el-input>
24 </div>
25 <div class="project">
26 <span class="title-name title-line-2">*规划类型</span>
27 <el-input v-model="col2" placeholder="请输入规划类型" class="input-one"></el-input>
28 </div>
29 <div class="project">
30 <span class="title-name title-line-3">*规划级别</span>
31 <el-input v-model="col3" placeholder="请输入规划级别" class="input-one"></el-input>
32 </div>
33 <div class="project">
34 <span class="title-name title-line-4">*行政辖区</span>
35 <el-input v-model="col4" placeholder="请输入行政辖区" class="input-one"></el-input>
36 </div>
37 </div>
38 <div class="project-detail">
39 <div class="project">
40 <span class="title-name title-line-1">*规划名称</span>
41 <el-input v-model="col5" placeholder="请输入规划名称" class="input-two"></el-input>
42 </div>
43 <div class="project">
44 <span class="title-name title-line-3">*规划范围</span>
45 <el-input v-model="col6" placeholder="请输入规划类型" class="input-two"></el-input>
46 </div>
47 </div>
48 <div class="project-detail">
49 <div class="project">
50 <span class="title-name title-line-1">*规划基准年</span>
51 <el-input v-model="col7" placeholder="请输入规划基准年" class="input-one"></el-input>
52 </div>
53 <div class="project">
54 <span class="title-name title-line-2">*规划期限(年)</span>
55 <el-input v-model="col8" placeholder="请输入规划期限(年)" class="input-one"></el-input>
56 </div>
57 <div class="project">
58 <span class="title-name title-line-3">*近期(年)</span>
59 <el-input v-model="col9" placeholder="请输入近期(年)" class="input-one"></el-input>
60 </div>
61 <div class="project">
62 <span class="title-name title-line-4">*远期(年)</span>
63 <el-input v-model="col10" placeholder="请输入远期(年)" class="input-one"></el-input>
64 </div>
65 </div>
66 <div class="project-detail">
67 <div class="project">
68 <span class="title-name title-line-1">*总面积(平方公里)</span>
69 <el-input v-model="col8" placeholder="请输入总面积(平方公里)" class="input-one"></el-input>
70 </div>
71 <div class="project">
72 <span class="title-name title-line-2">*规划基准年</span>
73 <el-input v-model="col9" placeholder="请输入规划基准年" class="input-one"></el-input>
74 </div>
75 <div class="project" style="visibility:hidden;">
76 <span class="title-name title-line-3">*远期(年)</span>
77 <el-input v-model="col10" placeholder="请输入远期(年)" class="input-one"></el-input>
78 </div>
79 <div class="project" style="visibility:hidden;">
80 <span class="title-name title-line-4">*远期(年)</span>
81 <el-input v-model="col10" placeholder="请输入远期(年)" class="input-one"></el-input>
82 </div>
83 </div>
84 <div class="basic-msg">
85 <div class="title-basic">
86 <div class="vertical-line"></div>
87 <span>设计方案查询</span>
88 <el-upload class="upload-demo" action="" :accept='accept' :show-file-list='false'
89 :before-upload="importantPrograme">
90 <div class="import-programme">
91 <img src="../assets/一张图/导入.png" alt=""
92 style="width: 18px; height: 19px; margin-right: 12px;">
93 <span>导入方案</span>
94 </div>
95 </el-upload>
96 </div>
97 </div>
98 <div style="display: flex;">
99 <div v-if='isimportan1' style="width: 49%; padding-bottom: 36px;">
100 <div class="box-programe">
101 <span class="de-programe">*设计方案一</span>
102 <div style="margin-left: 12px; cursor: pointer;">
103 <el-tooltip class="item" effect="dark" content="科技路.doc" placement="top">
104 <img src="../assets/一张图/doc@2x.png" alt=""
105 style="width: 19px; height: 26px; margin-right: 12px;"> </el-tooltip>
106 <el-tooltip class="item" effect="dark" content="科技路.xls" placement="top">
107 <img src="../assets/一张图/xls@2x.png" alt=""
108 style="width: 19px; height: 26px; margin-right: 12px;">
109 </el-tooltip>
110 <el-tooltip class="item" effect="dark" content="科技路.max" placement="top">
111 <img src="../assets/一张图/max@2x.png" alt=""
112 style="width: 19px; height: 26px; margin-right: 12px;">
113 </el-tooltip>
114 </div>
115 </div>
116 <div class="table-programe">
117 <div class="table-box">
118 <span class="fixed-width">项目编号</span>
119 <span class="fixed-width-2">/</span>
120 </div>
121 <div class="table-box">
122 <span class="fixed-width">项目名称</span>
123 <span class="fixed-width-2">/</span>
124 </div>
125 <div class="table-box">
126 <span class="fixed-width">项目地址</span>
127 <span class="fixed-width-2">科技四路以北、科技三路以北、经八路以东、绿带以东</span>
128 </div>
129 <div class="table-box">
130 <span class="fixed-width">用地性质</span>
131 <span class="fixed-width-2">二类居住用地</span>
132 </div>
133 <div class="table-box">
134 <span class="fixed-width">净用地面积</span>
135 <span class="fixed-width-2">2.36</span>
136 </div>
137 <div class="table-box">
138 <span class="fixed-width">容积率</span>
139 <span class="fixed-width-2">≤3.8</span>
140 </div>
141 <div class="table-box">
142 <span class="fixed-width">绿地率</span>
143 <span class="fixed-width-2">≥23</span>
144 </div>
145 <div class="table-box">
146 <span class="fixed-width">建筑密度</span>
147 <span class="fixed-width-2">≤21</span>
148 </div>
149 <div class="table-box">
150 <span class="fixed-width">建筑高度</span>
151 <span class="fixed-width-2">≤110</span>
152 </div>
153 </div>
154 </div>
155 <div v-if='isimportan2' style="width: 49%; padding-bottom: 36px;">
156 <div class="box-programe">
157 <span class="de-programe">*设计方案二</span>
158 <div style="margin-left: 12px; cursor: pointer;">
159 <el-tooltip class="item" effect="dark" content="科技路.doc" placement="top">
160 <img src="../assets/一张图/doc@2x.png" alt=""
161 style="width: 19px; height: 26px; margin-right: 12px;"> </el-tooltip>
162 <el-tooltip class="item" effect="dark" content="科技路.xls" placement="top">
163 <img src="../assets/一张图/xls@2x.png" alt=""
164 style="width: 19px; height: 26px; margin-right: 12px;">
165 </el-tooltip>
166 <el-tooltip class="item" effect="dark" content="科技路.max" placement="top">
167 <img src="../assets/一张图/max@2x.png" alt=""
168 style="width: 19px; height: 26px; margin-right: 12px;">
169 </el-tooltip>
170 </div>
171 </div>
172 <div class="table-programe">
173 <div class="table-box">
174 <span class="fixed-width">项目编号</span>
175 <span class="fixed-width-2">/</span>
176 </div>
177 <div class="table-box">
178 <span class="fixed-width">项目名称</span>
179 <span class="fixed-width-2">/</span>
180 </div>
181 <div class="table-box">
182 <span class="fixed-width">项目地址</span>
183 <span class="fixed-width-2">科技四路以南、科技五路以北、经十二路以东、皂河绿带以西</span>
184 </div>
185 <div class="table-box">
186 <span class="fixed-width">用地性质</span>
187 <span class="fixed-width-2">二类居住用地</span>
188 </div>
189 <div class="table-box">
190 <span class="fixed-width">净用地面积</span>
191 <span class="fixed-width-2">5.56</span>
192 </div>
193 <div class="table-box">
194 <span class="fixed-width">容积率</span>
195 <span class="fixed-width-2">≤2.8</span>
196 </div>
197 <div class="table-box">
198 <span class="fixed-width">绿地率</span>
199 <span class="fixed-width-2">≥35</span>
200 </div>
201 <div class="table-box">
202 <span class="fixed-width">建筑密度</span>
203 <span class="fixed-width-2">≤25</span>
204 </div>
205 <div class="table-box">
206 <span class="fixed-width">建筑高度</span>
207 <span class="fixed-width-2">≤120</span>
208 </div>
209 </div>
210 </div>
211 </div>
212 </div>
213 </div>
214 </div>
215 </template>
216
217 <script>
218 export default {
219 name: 'kgAnalusis',
220 components: {},
221 data() {
222 return {
223 col1: '',
224 col2: '',
225 col3: '',
226 col4: '',
227 col5: '',
228 col6: '',
229 col7: '',
230 col8: '',
231 col9: '',
232 col10: '',
233 col11: '',
234 col12: '',
235
236 isimportan1: false,
237 isimportan2: false,
238
239 accept: '.zip',
240 }
241 },
242 mounted() {},
243 methods: {
244 closePop() {
245 this.$emit('closeAddProjectMsg')
246 },
247 EheightChange() {
248
249 },
250 importantPrograme(e) {
251 debugger
252 if (!this.isimportan1) {
253 this.isimportan1 = true;
254 } else {
255 this.isimportan2 = true;
256 }
257 }
258 }
259 }
260 </script>
261
262 <style scoped>
263 .container {
264 position: relative;
265 color: #fff;
266 font-size: 16px;
267 width: 1350px;
268 /* height: 750px; */
269 }
270
271 .wrapper {
272 position: absolute;
273 width: 100%;
274 height: 100%;
275 z-index: 1;
276 border: 1px solid rgba(151, 151, 151, 0.73);
277 }
278
279 .box {
280 background: rgba(4, 10, 10, 0.73);
281 box-shadow: 0px 4px 9px 0px rgba(0, 0, 0, 0.5);
282 /* filter: blur(10px); */
283 height: 100px;
284 position: absolute;
285 width: 100%;
286 height: 100%;
287 z-index: 1;
288 }
289
290 .mian {
291 position: relative;
292 width: 100%;
293 height: 100%;
294 z-index: 1000;
295 /* overflow-x: hidden; */
296 }
297
298 .main-box {
299 max-height: 730px;
300 overflow-y: auto;
301 }
302
303 .title-bt {
304 display: flex;
305 justify-content: space-between;
306 border-bottom: 1px solid rgba(255, 255, 255, 0.15);
307 padding: 18px 24px;
308 font-size: 20px;
309 }
310
311 .func-input {
312 display: flex;
313 align-items: center;
314 /* justify-content: space-between; */
315 padding: 18px 24px 0px 24px;
316 font-size: 18px;
317 cursor: pointer;
318 }
319
320 .func {
321 padding: 18px 24px;
322 }
323
324
325
326 .func-btn {
327 display: flex;
328 padding: 18px 24px 30px 24px;
329 align-items: center;
330 font-size: 18px;
331 cursor: pointer;
332 }
333
334 .title-basic {
335 display: flex;
336 align-items: center;
337 padding: 20px 31px;
338 font-size: 18px;
339 }
340
341 .vertical-line {
342 width: 4px;
343 height: 15px;
344 background: rgba(255, 255, 255, 1);
345 margin-right: 6px;
346 }
347
348 .input-one {
349 width: 180px;
350 height: 38px;
351 margin-left: 12px;
352 }
353
354 .input-two {
355 width: 508px;
356 height: 38px;
357 margin-left: 12px;
358 }
359
360 .project-detail {
361 display: flex;
362 justify-content: space-around;
363 }
364
365 .project {
366 margin-bottom: 24px;
367 }
368
369 .title-line-1 {
370 display: inline-block;
371 width: 140px;
372 text-align: right;
373 }
374
375 .title-line-2 {
376 display: inline-block;
377 width: 100px;
378 text-align: right;
379 }
380
381 .title-line-3 {
382 display: inline-block;
383 width: 100px;
384 text-align: right;
385 }
386
387 .title-line-4 {
388 display: inline-block;
389 width: 100px;
390 text-align: right;
391 }
392
393 .import-programme {
394 display: flex;
395 align-items: center;
396 cursor: pointer;
397 padding: 10px 38px;
398 border: 1px solid rgba(151, 151, 151, 0.58);
399 margin-left: 20px;
400 background: rgba(4, 10, 10, 0.58);
401 box-shadow: 0px 4px 9px 0px rgba(0, 0, 0, 0.5);
402 font-size: 18px;
403 }
404
405 .de-programe {
406 display: inline-block;
407 width: 156px;
408 font-size: 18px;
409 text-align: right;
410 }
411
412 .box-programe {
413 display: flex;
414 align-items: center;
415 }
416
417 .table-box {
418 padding: 10px 10px;
419 display: flex;
420 border: 1px solid #6D7278;
421 }
422
423 .fixed-width {
424 display: inline-block;
425 width: 100px;
426 text-align: right;
427 }
428
429 .fixed-width-2 {
430 display: inline-block;
431 width: 322px;
432 text-align: left;
433 margin-left: 52px;
434 }
435
436 .table-programe {
437 margin-left: 165px;
438 margin-top: 17px;
439 border: 1px solid rgba(151, 151, 151, 0.58);
440 font-size: 18px;
441 }
442
443 .close {
444 cursor: pointer;
445 }
446
447 >>>input::-webkit-input-placeholder {
448 font-size: 16px;
449 color: rgba(255, 255, 255, 0.78) !important;
450 }
451
452 >>>.el-input__inner {
453 background: rgba(4, 10, 10, 0.58) !important;
454 border: 1px solid rgba(242, 242, 242, 0.4);
455 color: #fff;
456 }
457
458 >>>.el-input__suffix {
459 color: #fff;
460 font-size: 17px;
461 }
462
463 >>>.el-input-number__increase,
464 >>>.el-input-number__decrease {
465 background: rgba(4, 10, 10, 0.58);
466 }
467
468 >>>.el-input-number.is-controls-right .el-input-number__decrease,
469 >>>.el-input-number__increase {
470 border-left: 1px solid rgba(4, 10, 10, 0.58);
471 }
472
473 >>>.el-icon-arrow-up:before,
474 >>>.el-icon-arrow-down:before {
475 color: #fff;
476 }
477
478 >>>.el-input-number.is-controls-right .el-input-number__increase {
479 border-bottom: 1px solid rgba(4, 10, 10, 0.58);
480 }
481
482
483 >>>.el-table th.is-leaf,
484 >>>.el-table {
485 background-color: transparent !important;
486 color: #fff;
487 }
488
489 >>>.el-table tr {
490 background-color: transparent !important;
491 }
492
493 >>>.el-slider__button {
494 background-color: #2FA5FF;
495 border: 2px solid #FFFFFF;
496 box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.20);
497 }
498
499 >>>.el-table__row td {
500 background: transparent !important;
501 }
502 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -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 }
......