8aa70952 by jikai

Merge remote-tracking branch 'origin/master'

2 parents cdb1e393 d3b8532c
This file is too large to display.
// 建设项目信息表 弹窗
<template>
<div class="container">
<div class="wrapper">
<div class="box">
</div>
</div>
<div class="mian">
<div class="title-bt">
<span>建设项目信息表</span>
<span @click="closePop" class="close">×</span>
</div>
<div class="main-box">
<div class="basic-msg">
<div class="title-basic">
<div class="vertical-line"></div>
<span>基本信息</span>
</div>
</div>
<div class="project-detail">
<div class="project">
<span class="title-name title-line-1">*项目编号</span>
<el-input v-model="col1" placeholder="请输入项目编号" class="input-one"></el-input>
</div>
<div class="project">
<span class="title-name title-line-2">*规划类型</span>
<el-input v-model="col2" placeholder="请输入规划类型" class="input-one"></el-input>
</div>
<div class="project">
<span class="title-name title-line-3">*规划级别</span>
<el-input v-model="col3" placeholder="请输入规划级别" class="input-one"></el-input>
</div>
<div class="project">
<span class="title-name title-line-4">*行政辖区</span>
<el-input v-model="col4" placeholder="请输入行政辖区" class="input-one"></el-input>
</div>
</div>
<div class="project-detail">
<div class="project">
<span class="title-name title-line-1">*规划名称</span>
<el-input v-model="col5" placeholder="请输入规划名称" class="input-two"></el-input>
</div>
<div class="project">
<span class="title-name title-line-3">*规划范围</span>
<el-input v-model="col6" placeholder="请输入规划类型" class="input-two"></el-input>
</div>
</div>
<div class="project-detail">
<div class="project">
<span class="title-name title-line-1">*规划基准年</span>
<el-input v-model="col7" placeholder="请输入规划基准年" class="input-one"></el-input>
</div>
<div class="project">
<span class="title-name title-line-2">*规划期限(年)</span>
<el-input v-model="col8" placeholder="请输入规划期限(年)" class="input-one"></el-input>
</div>
<div class="project">
<span class="title-name title-line-3">*近期(年)</span>
<el-input v-model="col9" placeholder="请输入近期(年)" class="input-one"></el-input>
</div>
<div class="project">
<span class="title-name title-line-4">*远期(年)</span>
<el-input v-model="col10" placeholder="请输入远期(年)" class="input-one"></el-input>
</div>
</div>
<div class="project-detail">
<div class="project">
<span class="title-name title-line-1">*总面积(平方公里)</span>
<el-input v-model="col8" placeholder="请输入总面积(平方公里)" class="input-one"></el-input>
</div>
<div class="project">
<span class="title-name title-line-2">*规划基准年</span>
<el-input v-model="col9" placeholder="请输入规划基准年" class="input-one"></el-input>
</div>
<div class="project" style="visibility:hidden;">
<span class="title-name title-line-3">*远期(年)</span>
<el-input v-model="col10" placeholder="请输入远期(年)" class="input-one"></el-input>
</div>
<div class="project" style="visibility:hidden;">
<span class="title-name title-line-4">*远期(年)</span>
<el-input v-model="col10" placeholder="请输入远期(年)" class="input-one"></el-input>
</div>
</div>
<div class="basic-msg">
<div class="title-basic">
<div class="vertical-line"></div>
<span>设计方案查询</span>
<el-upload class="upload-demo" action="" :accept='accept' :show-file-list='false'
:before-upload="importantPrograme">
<div class="import-programme">
<img src="../assets/一张图/导入.png" alt=""
style="width: 18px; height: 19px; margin-right: 12px;">
<span>导入方案</span>
</div>
</el-upload>
</div>
</div>
<div style="display: flex;">
<div v-if='isimportan1' style="width: 49%; padding-bottom: 36px;">
<div class="box-programe">
<span class="de-programe">*设计方案一</span>
<div style="margin-left: 12px; cursor: pointer;">
<el-tooltip class="item" effect="dark" content="科技路.doc" placement="top">
<img src="../assets/一张图/doc@2x.png" alt=""
style="width: 19px; height: 26px; margin-right: 12px;"> </el-tooltip>
<el-tooltip class="item" effect="dark" content="科技路.xls" placement="top">
<img src="../assets/一张图/xls@2x.png" alt=""
style="width: 19px; height: 26px; margin-right: 12px;">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="科技路.max" placement="top">
<img src="../assets/一张图/max@2x.png" alt=""
style="width: 19px; height: 26px; margin-right: 12px;">
</el-tooltip>
</div>
</div>
<div class="table-programe">
<div class="table-box">
<span class="fixed-width">项目编号</span>
<span class="fixed-width-2">/</span>
</div>
<div class="table-box">
<span class="fixed-width">项目名称</span>
<span class="fixed-width-2">/</span>
</div>
<div class="table-box">
<span class="fixed-width">项目地址</span>
<span class="fixed-width-2">科技四路以北、科技三路以北、经八路以东、绿带以东</span>
</div>
<div class="table-box">
<span class="fixed-width">用地性质</span>
<span class="fixed-width-2">二类居住用地</span>
</div>
<div class="table-box">
<span class="fixed-width">净用地面积</span>
<span class="fixed-width-2">2.36</span>
</div>
<div class="table-box">
<span class="fixed-width">容积率</span>
<span class="fixed-width-2">≤3.8</span>
</div>
<div class="table-box">
<span class="fixed-width">绿地率</span>
<span class="fixed-width-2">≥23</span>
</div>
<div class="table-box">
<span class="fixed-width">建筑密度</span>
<span class="fixed-width-2">≤21</span>
</div>
<div class="table-box">
<span class="fixed-width">建筑高度</span>
<span class="fixed-width-2">≤110</span>
</div>
</div>
</div>
<div v-if='isimportan2' style="width: 49%; padding-bottom: 36px;">
<div class="box-programe">
<span class="de-programe">*设计方案二</span>
<div style="margin-left: 12px; cursor: pointer;">
<el-tooltip class="item" effect="dark" content="科技路.doc" placement="top">
<img src="../assets/一张图/doc@2x.png" alt=""
style="width: 19px; height: 26px; margin-right: 12px;"> </el-tooltip>
<el-tooltip class="item" effect="dark" content="科技路.xls" placement="top">
<img src="../assets/一张图/xls@2x.png" alt=""
style="width: 19px; height: 26px; margin-right: 12px;">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="科技路.max" placement="top">
<img src="../assets/一张图/max@2x.png" alt=""
style="width: 19px; height: 26px; margin-right: 12px;">
</el-tooltip>
</div>
</div>
<div class="table-programe">
<div class="table-box">
<span class="fixed-width">项目编号</span>
<span class="fixed-width-2">/</span>
</div>
<div class="table-box">
<span class="fixed-width">项目名称</span>
<span class="fixed-width-2">/</span>
</div>
<div class="table-box">
<span class="fixed-width">项目地址</span>
<span class="fixed-width-2">科技四路以南、科技五路以北、经十二路以东、皂河绿带以西</span>
</div>
<div class="table-box">
<span class="fixed-width">用地性质</span>
<span class="fixed-width-2">二类居住用地</span>
</div>
<div class="table-box">
<span class="fixed-width">净用地面积</span>
<span class="fixed-width-2">5.56</span>
</div>
<div class="table-box">
<span class="fixed-width">容积率</span>
<span class="fixed-width-2">≤2.8</span>
</div>
<div class="table-box">
<span class="fixed-width">绿地率</span>
<span class="fixed-width-2">≥35</span>
</div>
<div class="table-box">
<span class="fixed-width">建筑密度</span>
<span class="fixed-width-2">≤25</span>
</div>
<div class="table-box">
<span class="fixed-width">建筑高度</span>
<span class="fixed-width-2">≤120</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'kgAnalusis',
components: {},
data() {
return {
col1: '',
col2: '',
col3: '',
col4: '',
col5: '',
col6: '',
col7: '',
col8: '',
col9: '',
col10: '',
col11: '',
col12: '',
isimportan1: false,
isimportan2: false,
accept: '.zip',
}
},
mounted() {},
methods: {
closePop() {
this.$emit('closeAddProjectMsg')
},
EheightChange() {
},
importantPrograme(e) {
debugger
if (!this.isimportan1) {
this.isimportan1 = true;
} else {
this.isimportan2 = true;
}
}
}
}
</script>
<style scoped>
.container {
position: relative;
color: #fff;
font-size: 16px;
width: 1350px;
/* height: 750px; */
}
.wrapper {
position: absolute;
width: 100%;
height: 100%;
z-index: 1;
border: 1px solid rgba(151, 151, 151, 0.73);
}
.box {
background: rgba(4, 10, 10, 0.73);
box-shadow: 0px 4px 9px 0px rgba(0, 0, 0, 0.5);
/* filter: blur(10px); */
height: 100px;
position: absolute;
width: 100%;
height: 100%;
z-index: 1;
}
.mian {
position: relative;
width: 100%;
height: 100%;
z-index: 1000;
/* overflow-x: hidden; */
}
.main-box {
max-height: 730px;
overflow-y: auto;
}
.title-bt {
display: flex;
justify-content: space-between;
border-bottom: 1px solid rgba(255, 255, 255, 0.15);
padding: 18px 24px;
font-size: 20px;
}
.func-input {
display: flex;
align-items: center;
/* justify-content: space-between; */
padding: 18px 24px 0px 24px;
font-size: 18px;
cursor: pointer;
}
.func {
padding: 18px 24px;
}
.func-btn {
display: flex;
padding: 18px 24px 30px 24px;
align-items: center;
font-size: 18px;
cursor: pointer;
}
.title-basic {
display: flex;
align-items: center;
padding: 20px 31px;
font-size: 18px;
}
.vertical-line {
width: 4px;
height: 15px;
background: rgba(255, 255, 255, 1);
margin-right: 6px;
}
.input-one {
width: 180px;
height: 38px;
margin-left: 12px;
}
.input-two {
width: 508px;
height: 38px;
margin-left: 12px;
}
.project-detail {
display: flex;
justify-content: space-around;
}
.project {
margin-bottom: 24px;
}
.title-line-1 {
display: inline-block;
width: 140px;
text-align: right;
}
.title-line-2 {
display: inline-block;
width: 100px;
text-align: right;
}
.title-line-3 {
display: inline-block;
width: 100px;
text-align: right;
}
.title-line-4 {
display: inline-block;
width: 100px;
text-align: right;
}
.import-programme {
display: flex;
align-items: center;
cursor: pointer;
padding: 10px 38px;
border: 1px solid rgba(151, 151, 151, 0.58);
margin-left: 20px;
background: rgba(4, 10, 10, 0.58);
box-shadow: 0px 4px 9px 0px rgba(0, 0, 0, 0.5);
font-size: 18px;
}
.de-programe {
display: inline-block;
width: 156px;
font-size: 18px;
text-align: right;
}
.box-programe {
display: flex;
align-items: center;
}
.table-box {
padding: 10px 10px;
display: flex;
border: 1px solid #6D7278;
}
.fixed-width {
display: inline-block;
width: 100px;
text-align: right;
}
.fixed-width-2 {
display: inline-block;
width: 322px;
text-align: left;
margin-left: 52px;
}
.table-programe {
margin-left: 165px;
margin-top: 17px;
border: 1px solid rgba(151, 151, 151, 0.58);
font-size: 18px;
}
.close {
cursor: pointer;
}
>>>input::-webkit-input-placeholder {
font-size: 16px;
color: rgba(255, 255, 255, 0.78) !important;
}
>>>.el-input__inner {
background: rgba(4, 10, 10, 0.58) !important;
border: 1px solid rgba(242, 242, 242, 0.4);
color: #fff;
}
>>>.el-input__suffix {
color: #fff;
font-size: 17px;
}
>>>.el-input-number__increase,
>>>.el-input-number__decrease {
background: rgba(4, 10, 10, 0.58);
}
>>>.el-input-number.is-controls-right .el-input-number__decrease,
>>>.el-input-number__increase {
border-left: 1px solid rgba(4, 10, 10, 0.58);
}
>>>.el-icon-arrow-up:before,
>>>.el-icon-arrow-down:before {
color: #fff;
}
>>>.el-input-number.is-controls-right .el-input-number__increase {
border-bottom: 1px solid rgba(4, 10, 10, 0.58);
}
>>>.el-table th.is-leaf,
>>>.el-table {
background-color: transparent !important;
color: #fff;
}
>>>.el-table tr {
background-color: transparent !important;
}
>>>.el-slider__button {
background-color: #2FA5FF;
border: 2px solid #FFFFFF;
box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.20);
}
>>>.el-table__row td {
background: transparent !important;
}
</style>
\ No newline at end of file
......@@ -50,7 +50,8 @@
async:false,
data:{username:'案件查处',password:'123'},
success:(res) => {
window.open(`http://10.6.144.88:10001/frontweb/index.jsp?type=${label}`)
// window.open(`http://10.6.144.88:10001/frontweb/index.jsp?type=${label}`)
window.open(`http://192.168.5.143:80/frontweb/index.jsp?type=${label}`)
},
fail: () => {
......
......@@ -34,7 +34,7 @@
</div>
<div style="margin-top: 16px;">
<auxiliaryReview @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></auxiliaryReview>
<auxiliaryReview @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx' @EAddProject='EAddProject'></auxiliaryReview>
</div>
</div>
</template>
......@@ -84,6 +84,10 @@
EGzfx() {
this.$emit('EGzfx');
},
// 新增项目
EAddProject() {
this.$emit('EAddProject');
},
}
}
</script>
......
......@@ -6,6 +6,6 @@
*/
export default {
url: '',
loginUrl: 'http://10.6.144.88:10001/orup',
loginUrl: 'http://192.168.5.143:80/orup',
mapToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJhMzMwMjAwZS1lODRmLTRhNzQtODBkOS01YjZkM2ZkYzRmOGMiLCJpZCI6MzE3MzEsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1OTU5MDA0Njd9.K5Rnvdzv5vDjlEbBH-2vEPMJYPgBDs__uvQHZz6jXTc'
}
\ No newline at end of file
......
......@@ -54,7 +54,7 @@
<bottomNav></bottomNav>
</div>
<div class="leftAssert">
<leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert>
<leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx' @EAddProject='EAddProject'></leftAssert>
</div>
<!-- <div class="mapPop">
<mapPop></mapPop>
......@@ -87,6 +87,11 @@
<kgAnalusis @closePop='closePop'></kgAnalusis>
</div>
<div class="add-project-msg" v-if='addProjectMsg'>
<addProjectMsg @closeAddProjectMsg='EcloseAddProjectMsg'></addProjectMsg>
</div>
<div id="cesiumContainer">
<div id="vertical-slider" style="display: none;"></div>
<div id="horizontal-slider" style="display: none;"></div>
......@@ -142,7 +147,10 @@
import tjxAnslysis from '../components/tjxAnslysis'; // 天际线分析
import yyAnslysis from '../components/yyAnslysis'; // 阴影分析
import kgAnalusis from '../components/kgAnalusis'; // 控高分析
import visualField from '../components/visualField' //可视域分析
import visualField from '../components/visualField'; //可视域分析
import addProjectMsg from '../components/addProjectMsg'; // 建设项目信息表
import URL_CONFIG from "./../config/urlConfig.vue";
const Cesium = window.Cesium;
......@@ -163,6 +171,8 @@
tjxAnslysis,
yyAnslysis,
kgAnalusis,
addProjectMsg,
},
data() {
return {
......@@ -191,7 +201,9 @@
keepArr: ['isReturn', 'enlarge', 'narrow', 'coordinate', 'distance',
'area', 'marker', 'rollerShutter', 'splitScreen', 'toNorth',
'topSee', 'roundSee', 'horizon', 'allSee', 'ymAnslysis',
'tjxAnslysis', 'yyAnslysis', 'visualField', 'kgAnalusis']
'tjxAnslysis', 'yyAnslysis', 'visualField', 'kgAnalusis'],
addProjectMsg: false, // 建设项目信息表
}
},
mounted() {
......@@ -392,6 +404,9 @@
closePop(val) {
this[val] = false;
},
EcloseAddProjectMsg() {
this.addProjectMsg = false;
},
onlySelect(val) {
this.keepArr.forEach(ele => {
if(val == ele) {
......@@ -412,6 +427,10 @@
// 光照分析
EGzfx() {
},
// 打开新增项目列表
EAddProject() {
this.addProjectMsg = true;
}
}
}
</script>
......@@ -572,6 +591,14 @@
top: 416px;
}
.add-project-msg {
position: absolute;
z-index: 1000;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
.tjx-anslysis {
top: 265px;
}
......