Skip to content

刘远 / 3d_dc

Go to a project
Toggle navigation
Toggle navigation pinning
e3e1f7b6 by 刘远
Options

东川 新增部分功能 和样式

1 parent 1a02e87f
Inline Side-by-side
Showing 16 changed files with 593 additions and 75 deletions
......@@ -12,6 +12,7 @@
height: 100%;
-webkit-user-select:none;
-moz-user-select:none;
overflow: hidden;
}
* {
margin: 0px;
......
No preview for this file type
......@@ -136,7 +136,7 @@
.func-btn {
display: flex;
padding: 18px 24px 44px 24px;
padding: 18px 24px 37px 24px;
align-items: center;
font-size: 18px;
cursor: pointer;
......
// 辅助审查弹窗
<template>
<div class="container">
<div class="serach">
<span>辅助审查</span>
</div>
<div class="tree">
<div class="box">
<div @click="EFadb()">
<div>
<img src="../assets/一张图/icon_方案审查_辅助审查_方案对比.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 class="box">
<div @click="EGzfx()">
<div>
<img src="../assets/一张图/icon_方案审查_辅助审查_光照分析.png" alt="">
<div style="margin-top: 10px; font-size: 14px;">光照分析</div>
</div>
</div>
<!-- css 占位 -->
<div style="visibility:hidden">
<div>
<img src="../assets/一张图/icon_方案审查_辅助审查_控高分析.png" alt="">
<div style="margin-top: 10px; font-size: 14px;">控高分析</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
search: '',
data: [{
id: 1,
label: '一级 1',
}, {
id: 2,
label: '一级 2',
}],
}
},
mounted() {
},
components: {},
methods: {
handleSearch() {
},
foldAssert() {
this.$emit('foldAssert');
},
// 方案对比
EFadb() {
this.$emit('EFadb');
},
// 光照分析
EKgfz() {
this.$emit('EKgfz');
},
// 控高分析
EGzfx() {
this.$emit('EGzfx');
},
}
}
</script>
<style scoped>
.container {
width: 206px;
/* border: 1px solid red; */
}
.serach {
height: 32px;
width: 100%;
background-image: url('../assets/一张图/list_上端.png');
background-size: 100% 100%;
background-repeat: no-repeat;
text-align: center;
padding: 10px 0 0 0;
font-size: 16px;
border-bottom: 1px solid rgba(255, 255, 255, 0.15);
}
.tree {
background-image: url('../assets/一张图/list_中端.png');
background-size: 100% 100%;
background-repeat: no-repeat;
}
.tree .box {
display: flex;
justify-content: space-around;
padding: 10px 0;
cursor: pointer;
}
.tree-main {
margin-top: 26px;
transform: translateX(-24px);
}
.fold {
background-image: url('../assets/一张图/list_下端.png');
background-size: 100% 100%;
background-repeat: no-repeat;
height: 32px;
/* width: 158px; */
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
}
>>>input::-webkit-input-placeholder {
font-size: 16px;
color: rgba(255, 255, 255, 0.78) !important;
}
>>>.el-input__inner {
background: rgba(0, 0, 0, 0.58) !important;
border: 1px solid rgba(0, 0, 0, 0.58);
color: #fff;
}
>>>.el-input__suffix {
/* color: #fff; */
/* font-size: 17px; */
}
>>>.el-tree {
background: transparent;
color: #fff;
}
>>>.el-tree-node__content:hover {
background: transparent;
}
>>>.el-tree-node:focus>.el-tree-node__content {
background-color: transparent;
}
>>>.el-checkbox__inner {
border: 1px solid #000;
background-color: #000;
}
>>>.el-icon-search {
cursor: pointer;
}
</style>
\ No newline at end of file
......@@ -23,8 +23,8 @@
components: {},
data() {
return {
isYZT: false, // 一张图
isCGSC: true, // 成果审查管理
isYZT: true, // 一张图
isCGSC: false, // 成果审查管理
isSSJD: false, // 实施监督预警
isPGJG: false, // 批后监管
flagArr: ['isYZT', 'isCGSC', 'isSSJD', 'isPGJG']
......
......@@ -10,7 +10,6 @@
<span @click="closePop" class="close">×</span>
</div>
<div class="func-input">
<span class="text-right">观察点高度</span>
<el-input-number v-model="sdgc" controls-position="right"
......@@ -60,7 +59,6 @@
<span>清除分析结果</span>
</div>
</div>
</div>
</div>
</template>
......@@ -170,7 +168,7 @@
.func-btn {
display: flex;
padding: 18px 24px 44px 24px;
padding: 18px 24px 37px 24px;
align-items: center;
font-size: 18px;
cursor: pointer;
......
......@@ -9,6 +9,12 @@
<span>控高分析</span>
<span @click="closePop" class="close">×</span>
</div>
<div class="" style="padding: 18px 24px 0px 24px;">
<el-slider v-model="height" :min='0' :max='1000' :format-tooltip="formatTooltip"
@change='EheightChange'></el-slider>
</div>
<div class="func-btn">
<div class="btn-wrapper add-bg" @click="startAnalysis">
<img style="width: 20px; height: 20px; margin: 0 5px 0 44px" src="../assets/icon_开始分析.png" alt="">
......@@ -19,21 +25,17 @@
<span>清除分析结果</span>
</div>
</div>
<div class="kg-img">
<div class="kg-box">
<img :src="src" alt="" style="width: 100%; height: 100%;">
<div class="btn-wrapper2">
<span class="center">左侧立面</span>
</div>
</div>
<div class="kg-box">
<img :src="src" alt="" style="width: 100%; height: 100%;">
<div class="btn-wrapper2">
<span class="center">右侧立面</span>
</div>
</div>
</div>
<div class="table-box" style="padding: 18px 24px 30px 24px;">
<el-table :data="tableData" :highlight-current-row='false' height="242" border style="width: 100%">
<el-table-column prop="name" label="名称" align='center'>
</el-table-column>
<el-table-column prop="height" label="高度(m)" align='center'>
</el-table-column>
<el-table-column prop="superelevation" label="超高度(m)" align='center'>
</el-table-column>
</el-table>
</div>
</div>
</div>
</template>
......@@ -44,7 +46,24 @@
components: {},
data() {
return {
src: 'https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3820738330,1510784229&fm=26&gp=0.jpg'
height: 320,
tableData: [{
name: '1号楼',
height: '34',
superelevation: '4'
}, {
name: '1号楼',
height: '34',
superelevation: '4'
}, {
name: '1号楼',
height: '34',
superelevation: '4'
}, {
name: '1号楼',
height: '34',
superelevation: '4'
}, ]
}
},
mounted() {},
......@@ -58,6 +77,12 @@
stopAnalysis() {
},
formatTooltip(val) {
return val + '米';
},
EheightChange() {
}
}
}
</script>
......@@ -196,18 +221,47 @@
}
.kg-img {
width: 410px;
padding: 0px 24px 0px 24px;
width: 410px;
padding: 0px 24px 0px 24px;
padding-bottom: 10px;
}
.kg-box {
width: 100%;
height: 180px;
position: relative;
width: 100%;
height: 180px;
position: relative;
margin-bottom: 20px;
}
/* >>>.el-table__body-wrapper::-webkit-scrollbar {
width: 16px;
background: #191a37;
height: 14px;
}
>>>.el-table__body-wrapper::-webkit-scrollbar-track,
>>>.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 999px;
width: 20px;
border: 5px solid transparent;
}
>>>.el-table__body-wrapper::-webkit-scrollbar-track {
box-shadow: 1px 1px 5px #191a37 inset;
}
>>>.el-table__body-wrapper::-webkit-scrollbar-thumb {
width: 20px;
min-height: 20px;
background-clip: content-box;
box-shadow: 0 0 0 5px #464f70 inset;
}
>>>.el-table__body-wrapper::-webkit-scrollbar-corner {
background: #191a37;
} */
>>>input::-webkit-input-placeholder {
font-size: 16px;
color: rgba(255, 255, 255, 0.78) !important;
......@@ -242,4 +296,25 @@
>>>.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
......
......@@ -18,7 +18,7 @@
<div class="name">专题分析</div>
</div>
<div style="margin-top: 16px;" v-show='isZTFX'>
<treeSearch @foldAssert="foldAssert('isZTFX')"></treeSearch>
<ztAnslysis @foldAssert="foldAssert('isZTFX')"></ztAnslysis>
</div>
<div class="assert-list" :class="[isFASC?'a-selected':'a-no-selected']" @click="changeSelect('isFASC')"
......@@ -31,18 +31,24 @@
<div style="margin-top: 16px;" v-show='isFASC'>
<treeSearch @foldAssert="foldAssert('isFASC')"></treeSearch>
</div>
<div style="margin-top: 16px;">
<auxiliaryReview @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></auxiliaryReview>
</div>
</div>
</template>
<script>
import treeSearch from './treeSearch';
import ztAnslysis from './ztAnslysis';
import auxiliaryReview from './auxiliaryReview';
export default {
name: 'leftAssert',
components: {
treeSearch
treeSearch,
ztAnslysis,
auxiliaryReview
},
data() {
return {
......@@ -65,6 +71,18 @@
foldAssert(val) {
this[val] = false;
},
// 方案对比
EFadb() {
this.$emit('EFadb');
},
// 光照分析
EKgfz() {
this.$emit('EKgfz');
},
// 控高分析
EGzfx() {
this.$emit('EGzfx');
},
}
}
</script>
......
......@@ -87,12 +87,12 @@
</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="">
</el-tooltip>
</div>
</div> -->
<!--天际线分析 -->
<div class="func-ico" :class="[tjxAnslysis?'selected':'']" @click="handletjxAnslysis('tjxAnslysis')">
......
......@@ -20,6 +20,21 @@
</div>
</div>
<div class="kg-img">
<div class="kg-box">
<img :src="src" alt="" style="width: 100%; height: 100%;">
<div class="btn-wrapper2">
<span class="center">左侧立面</span>
</div>
</div>
<div class="kg-box">
<img :src="src" alt="" style="width: 100%; height: 100%;">
<div class="btn-wrapper2">
<span class="center">右侧立面</span>
</div>
</div>
</div>
</div>
</div>
</template>
......@@ -30,7 +45,7 @@
components: {},
data() {
return {
src: 'https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3820738330,1510784229&fm=26&gp=0.jpg'
}
},
mounted() {},
......@@ -121,7 +136,7 @@
.func-btn {
display: flex;
padding: 18px 24px 44px 24px;
padding: 18px 24px 30px 24px;
align-items: center;
font-size: 18px;
cursor: pointer;
......@@ -144,6 +159,9 @@
.btn-wrapper2 {
position: absolute;
top: 12px;
right: 24px;
display: flex;
align-items: center;
width: 116px;
......@@ -178,6 +196,19 @@
font-size: 18px;
}
.kg-img {
width: 410px;
padding: 0px 24px 0px 24px;
padding-bottom: 10px;
}
.kg-box {
width: 100%;
height: 180px;
position: relative;
margin-bottom: 20px;
}
>>>input::-webkit-input-placeholder {
font-size: 16px;
color: rgba(255, 255, 255, 0.78) !important;
......
<template>
<div class="container">
<div class="serach">
</div>
<div class="tree">
<div class="box">
......@@ -13,10 +12,9 @@
</div>
<div class="tree-main">
<el-tree :data="data" show-checkbox node-key="id" :default-expanded-keys="[2, 3]"
:default-checked-keys="[5]" :props="defaultProps">
:default-checked-keys="[5]" :props="defaultProps">
</el-tree>
</div>
</div>
</div>
<div class="fold" @click="foldAssert()">
......
......@@ -173,7 +173,7 @@
.func-btn {
display: flex;
padding: 18px 24px 44px 24px;
padding: 18px 24px 37px 24px;
align-items: center;
font-size: 18px;
cursor: pointer;
......
......@@ -9,6 +9,44 @@
<span>阴影分析</span>
<span @click="closePop" class="close">×</span>
</div>
<div class="func-input">
<span>分析日期</span>
<el-date-picker v-model="anslysisTime" type="date" style="margin-left: 12px; width: 245px;"
placeholder="选择分析日期">
</el-date-picker>
</div>
<div class="func-input">
<div class="btn-wrapper2" :class="[isCF?'add-bg2': '']" @click="handleIsXmbj('isCF')">
<span class="center">春分</span>
</div>
<div class="btn-wrapper2" :class="[isXZ?'add-bg2': '']" @click="handleIsXmbj('isXZ')">
<span class="center">夏至</span>
</div>
<div class="btn-wrapper2" :class="[isQF?'add-bg2': '']" @click="handleIsXmbj('isQF')">
<span class="center">秋分</span>
</div>
<div class="btn-wrapper2" :class="[isLD?'add-bg2': '']" @click="handleIsXmbj('isLD')">
<span class="center">立冬</span>
</div>
<div class="btn-wrapper2" :class="[isDZ?'add-bg2': '']" @click="handleIsXmbj('isDZ')">
<span class="center">冬至</span>
</div>
</div>
<div class="func-input">
<span>时间间隔 </span>
<el-input-number v-model="timeS" controls-position="right" :min="0" :max="1000"
style="margin:0 12px; width: 245px;"></el-input-number>
<span>分钟</span>
</div>
<div class="" style="padding: 18px 24px 0px 24px;">
<el-slider v-model="time" :min='0' :max='max' :step="timeS" :marks="marks"
:format-tooltip="formatTooltip" @change='EtimeChange'></el-slider>
</div>
<div class="func-btn">
<div class="btn-wrapper add-bg" @click="startAnalysis">
<img style="width: 20px; height: 20px; margin: 0 5px 0 44px" src="../assets/icon_开始分析.png" alt="">
......@@ -19,18 +57,38 @@
<span>清除分析结果</span>
</div>
</div>
</div>
</div>
</template>
<script>
let maxW = 24 * 60 * 60 * 1000 - 1 * 60 * 1000
export default {
name: 'yyAnslysis',
components: {},
data() {
return {
isCF: true, // 春分
isXZ: false, // 夏至
isQF: false, // 秋分
isLD: false, // 立冬
isDZ: false, // 冬至
keepTqArr: ['isCF', 'isXZ', 'isQF', 'isLD', 'isDZ'],
anslysisTime: '',
timeS: 30, // 时间间隔
time: 0 * 60 * 60 * 1000, // 滑块时间
max: (24 * 60 * 60 * 1000 - 1* 60 * 1000),
marks: {
0: '0:00',
[maxW]: '23:59',
// 50: {
// style: {
// color: '#1989FA'
// },
// label: this.$createElement('strong', '50%')
// }
}
}
},
mounted() {},
......@@ -44,6 +102,34 @@
stopAnalysis() {
},
/**
* val 值分别对应
* isCF, // 春分
isXZ, // 夏至
isQF, // 秋分
isLD, // 立冬
isDZ, // 冬至
*/
handleIsXmbj(val) {
let self = this;
this.keepTqArr.forEach(ele => {
if (val == ele) {
self[ele] = true;
} else {
self[ele] = false;
};
})
},
EtimeChange() {
},
formatTooltip(val) {
let nowTime = this.commons.dateZhuan('yyyy-MM-dd 00:00:00', new Date());
let nowSjc = new Date(nowTime).getTime();
nowSjc+=val;
let sfd = this.commons.dateZhuan('hh:mm', new Date(nowSjc));
return sfd;
}
}
}
</script>
......@@ -121,7 +207,7 @@
.func-btn {
display: flex;
padding: 18px 24px 44px 24px;
padding: 40px 24px 37px 24px;
align-items: center;
font-size: 18px;
cursor: pointer;
......@@ -146,14 +232,14 @@
.btn-wrapper2 {
display: flex;
align-items: center;
width: 116px;
width: 70px;
height: 38px;
background-image: url('../assets/一张图/bg_专题分析.png');
background-size: 100% 100%;
background-repeat: no-repeat;
text-align: center;
line-height: 38px;
margin-left: 13px;
margin-right: 13px;
}
.add-bg2 {
......@@ -185,10 +271,14 @@
>>>.el-input__inner {
background: rgba(4, 10, 10, 0.58) !important;
border: 1px solid rgba(23, 34, 38, 0.57);
/* border: 1px solid rgba(23, 34, 38, 0.57); */
color: #fff;
}
>>>.el-input-number .el-input__inner {
text-align: left;
}
>>>.el-input__suffix {
color: #fff;
font-size: 17px;
......@@ -212,4 +302,14 @@
>>>.el-input-number.is-controls-right .el-input-number__increase {
border-bottom: 1px solid rgba(4, 10, 10, 0.58);
}
>>>.el-slider__button {
background-color: #2FA5FF;
border: 2px solid #FFFFFF;
box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.20);
}
>>> .el-slider__marks-text {
color: #fff;
}
</style>
\ No newline at end of file
......
// 专题分析弹窗
<template>
<div class="container">
<div class="serach">
</div>
<div class="tree">
<div class="box">
<div @click="ETdch">
<div>
<img src="../assets/一张图/icon_专题分析_土地处置.png" alt="">
<div style="margin-top: 10px;">土地处置</div>
</div>
</div>
<div @click="EZtfx">
<div>
<img src="../assets/一张图/icon_专题分析_分析统计.png" alt="">
<div style="margin-top: 10px;">分析统计</div>
</div>
</div>
</div>
</div>
<div class="fold" @click="foldAssert()">
<i class="el-icon-arrow-up"></i>
</div>
</div>
</template>
<script>
export default {
data() {
return {
search: '',
data: [{
id: 1,
label: '一级 1',
}, {
id: 2,
label: '一级 2',
}],
}
},
mounted() {
},
components: {},
methods: {
handleSearch() {
},
foldAssert() {
this.$emit('foldAssert');
},
// 土地处理
ETdch() {
},
// 分析统计
EZtfx() {
},
}
}
</script>
<style scoped>
.container {
width: 206px;
/* border: 1px solid red; */
}
.serach {
height: 32px;
width: 100%;
background-image: url('../assets/一张图/list_上端.png');
background-size: 100% 100%;
background-repeat: no-repeat;
}
.tree {
background-image: url('../assets/一张图/list_中端.png');
background-size: 100% 100%;
background-repeat: no-repeat;
}
.tree .box {
display: flex;
justify-content: space-around;
}
.tree-main {
margin-top: 26px;
transform: translateX(-24px);
}
.fold {
background-image: url('../assets/一张图/list_下端.png');
background-size: 100% 100%;
background-repeat: no-repeat;
height: 32px;
/* width: 158px; */
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
}
>>>input::-webkit-input-placeholder {
font-size: 16px;
color: rgba(255, 255, 255, 0.78) !important;
}
>>>.el-input__inner {
background: rgba(0, 0, 0, 0.58) !important;
border: 1px solid rgba(0, 0, 0, 0.58);
color: #fff;
}
>>>.el-input__suffix {
/* color: #fff; */
/* font-size: 17px; */
}
>>>.el-tree {
background: transparent;
color: #fff;
}
>>>.el-tree-node__content:hover {
background: transparent;
}
>>>.el-tree-node:focus>.el-tree-node__content {
background-color: transparent;
}
>>>.el-checkbox__inner {
border: 1px solid #000;
background-color: #000;
}
>>>.el-icon-search {
cursor: pointer;
}
</style>
\ No newline at end of file
西双版纳6日5晚游玩
西安-西双版纳-西安 住星光夜市附近
D1 去酒店放行李 女士休息，男士去取车 [剧场]傣秀 [恰饭] 星光夜市
D2 [游玩] 中科院西双版纳热带植物园 晚上返回酒店 休整后市区转转 恰饭
D3 [游玩] 野象谷，基诺山寨 晚上返回酒店 恰饭
D5 [游玩] 西双版纳热带雨林国家公园望天树景区。
D5 [游玩] 傣族园、 告庄西双景。
D6 想去哪里就去哪里
D7 还车，准备回家
主要费用
机票 西安 - 西双版纳 往返直飞 往返单人3200左右 3200 * 2 6400
住宿 两间 10.1~10.7 400 * 6 2400 * 1 4800
租车费用 400 每天 7 天 预计2800 （看app中每天送100油卡）
大约 两人： 6400 + 4800 + 1400 12600(两人)
\ No newline at end of file
......@@ -53,7 +53,7 @@
<bottomNav></bottomNav>
</div>
<div class="leftAssert">
<leftAssert></leftAssert>
<leftAssert @EFadb='EFadb' @EKgfz='EKgfz' @EGzfx='EGzfx'></leftAssert>
</div>
<div class="mapPop">
<mapPop></mapPop>
......@@ -62,7 +62,7 @@
<allSee @closePop='closePop'></allSee>
</div>
<div class="allSee" v-if='ymAnslysis'>
<div class="allSee " v-if='ymAnslysis' style="top: 315px">
<ymAnslysis @closePop='closePop'></ymAnslysis>
</div>
......@@ -70,14 +70,14 @@
<horizon @closePop='closePop'></horizon>
</div>
<div class="allSee" v-if='tjxAnslysis'>
<div class="allSee tjx-anslysis" v-if='tjxAnslysis'>
<tjxAnslysis @closePop='closePop'></tjxAnslysis>
</div>
<div class="allSee" v-if='yyAnslysis'>
<yyAnslysis @closePop='closePop'></yyAnslysis>
</div>
<div class="allSee kg-anslysis" v-if='kgAnalusis'>
<div class="allSee tjx-anslysis" v-if='kgAnalusis'>
<kgAnalusis @closePop='closePop'></kgAnalusis>
</div>
......@@ -423,7 +423,18 @@
this[ele] = false;
};
})
}
},
// 方案对比
EFadb() {
},
// 控高分析
EKgfz() {
this.kgAnalusis = true;
},
// 光照分析
EGzfx() {
},
}
}
</script>
......@@ -584,7 +595,7 @@
top: 416px;
}
.kg-anslysis {
.tjx-anslysis {
top: 265px;
}
</style>
\ No newline at end of file
......