xieshen
/
des
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#修改了乔木灌木草本调查点展示页面，主页，headernew#

This commit is contained in:
yang 2020-07-09 16:42:48 +08:00
parent 6dc47699f2
commit cc715d17ce
6 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Headernew.vue
View File

@ -323,7 +323,7 @@ export default {
/*line-height: 50px;*/ /*line-height: 50px;*/
position: absolute; position: absolute;
top: 30px; top: 30px;
left: 8px; left: 0px;
transform: scale(0.7); transform: scale(0.7);
font-size: 16px; font-size: 16px;
font-family: "微软雅黑 Regular"; font-family: "微软雅黑 Regular";

7
src/views/index/Index2.vue
View File

@ -37,7 +37,7 @@
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g1" class="gisclick" @click.native="Diaochaquhuafen()"><span class="gisblue" v-show="gis1"></span>荒漠植被调查区域和地带</el-col>--> <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g1" class="gisclick" @click.native="Diaochaquhuafen()"><span class="gisblue" v-show="gis1"></span>荒漠植被调查区域和地带</el-col>-->
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g2" class="gisclick" @click.native="Diaochadianbushe()"><span class="gisblue" v-show="gis2"></span>调查点布设</el-col>--> <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g2" class="gisclick" @click.native="Diaochadianbushe()"><span class="gisblue" v-show="gis2"></span>调查点布设</el-col>-->
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g3" class="gisclick" @click.native="Zhibei()"><span class="gisblue" v-show="gis3"></span>荒漠植被</el-col>--> <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g3" class="gisclick" @click.native="Zhibei()"><span class="gisblue" v-show="gis3"></span>荒漠植被</el-col>-->
<el-tabs :tab-position="tabPosition" style="height: 535px;width: 100%;margin-top: 50px" @tab-click="tabClick"> <el-tabs :tab-position="tabPosition" style="height: 524px;width: 100%;margin-top: 50px" @tab-click="tabClick">
<el-tab-pane style="text-align: right" name="first" label="课题组调查范围"></el-tab-pane> <el-tab-pane style="text-align: right" name="first" label="课题组调查范围"></el-tab-pane>
<el-tab-pane style="text-align: right" name="second" label="荒漠植被区域与地带"></el-tab-pane> <el-tab-pane style="text-align: right" name="second" label="荒漠植被区域与地带"></el-tab-pane>
<el-tab-pane style="text-align: right" name="third" label="荒漠植被数据"></el-tab-pane> <el-tab-pane style="text-align: right" name="third" label="荒漠植被数据"></el-tab-pane>
@ -917,8 +917,11 @@ export default {
} }
.gisleft { .gisleft {
height: 590px; height: 590px;
/*margin-top: 8px;*/
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #EBECF1; /*border: 1px solid #EBECF1;*/
border-top: 8px solid #E9F3FD;
border-bottom: 8px solid #E9F3FD;
} }
#g1 { #g1 {
margin-top: 40px; margin-top: 40px;

3
src/views/reveal/FindingsList.vue
View File

@ -752,7 +752,8 @@ export default {
font-weight: bold; font-weight: bold;
} }
.gisleft { .gisleft {
height: 590px; height: 574px;
margin-top: 8px;
background-color: #ffffff; background-color: #ffffff;
} }
#g1 { #g1 {

26
src/views/reveal/SamplebushReveal.vue
View File

@ -20,7 +20,7 @@
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g3" class="gisclick" @click.native="g3()"><span class="gisblue" v-show="gis3"></span>数据密度</el-col>--> <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g3" class="gisclick" @click.native="g3()"><span class="gisblue" v-show="gis3"></span>数据密度</el-col>-->
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g4" class="gisclick" @click.native="g4()"><span class="gisblue" v-show="gis4"></span>物种丰富程度</el-col>--> <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g4" class="gisclick" @click.native="g4()"><span class="gisblue" v-show="gis4"></span>物种丰富程度</el-col>-->
<el-col :xs="23" :sm="23" :md="23" :lg="23" :xl="23" offset="1" class="gisleft"> <el-col :xs="23" :sm="23" :md="23" :lg="23" :xl="23" offset="1" class="gisleft">
<el-tabs :tab-position="tabPosition" style="height: 535px;width: 100%;margin-top: 50px" @tab-click="tabClick"> <el-tabs :tab-position="tabPosition" style="height: 524px;width: 100%;margin-top: 50px" @tab-click="tabClick">
<el-tab-pane style="text-align: right" name="first" label="课题组调查范围"></el-tab-pane> <el-tab-pane style="text-align: right" name="first" label="课题组调查范围"></el-tab-pane>
<el-tab-pane style="text-align: right" name="second" label="荒漠植被区域与地带"></el-tab-pane> <el-tab-pane style="text-align: right" name="second" label="荒漠植被区域与地带"></el-tab-pane>
<el-tab-pane style="text-align: right" name="third" label="荒漠植被数据"></el-tab-pane> <el-tab-pane style="text-align: right" name="third" label="荒漠植被数据"></el-tab-pane>
@ -51,12 +51,12 @@
</el-col> </el-col>
<el-col :xs="16" :sm="16" :md="16" :lg="16" :xl="16" :offset="4" class="echarts"> <el-col :xs="16" :sm="16" :md="16" :lg="16" :xl="16" :offset="4" class="echarts">
<div class="echarttitle"><p class="ecshujv">调查区分布和物种分布</p></div> <div class="echarttitle"><p class="ecshujv">调查区分布和物种分布</p></div>
<el-col :xs="21" :sm="21" :md="21" :lg="21" :xl="21" class="realechart"> <el-col :xs="22" :sm="22" :md="22" :lg="22" :xl="22" offset="1" class="realechart">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" style="background-color: #ffffff;position: relative"> <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" style="background-color: #ffffff;position: relative">
<!-- <img style="position: absolute;z-index: 100;top: 0px;right: 0" src="../../../public/static/image/echBG.jpg">--> <!-- <img style="position: absolute;z-index: 100;top: 0px;right: 0" src="../../../public/static/image/echBG.jpg">-->
<div class="middleshape"></div> <div class="middleshape"></div>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8" class="echarts1" id="findingsEcharts"></el-col> <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8" class="echarts1" id="findingsEcharts"></el-col>
<el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" class="echarts2" id="typicalspecies"></el-col> <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" offset="4" class="echarts2" id="typicalspecies"></el-col>
</el-col> </el-col>
</el-col> </el-col>
</el-col> </el-col>
@ -812,13 +812,14 @@ export default {
color: #979797; color: #979797;
} }
.realechart { .realechart {
position: absolute; /*position: absolute;*/
left: 100px; /*left: 100px;*/
top: 120px; /*top: 120px;*/
/*width: 1200px;*/ /*width: 1200px;*/
height: 540px; height: 540px;
/*border: 1px solid;*/ /*border: 1px solid;*/
background-color: #ffffff; background-color: #ffffff;
margin-top: 120px;
} }
.echarts1 { .echarts1 {
/*width: 500px;*/ /*width: 500px;*/
@ -830,9 +831,9 @@ export default {
.echarts2 { .echarts2 {
/*width: 600px;*/ /*width: 600px;*/
height: 500px; height: 500px;
position: absolute; /*position: absolute;*/
top: 0; /*top: 0;*/
right: 0; /*right: 0;*/
z-index: 99; z-index: 99;
background-color: #ffffff; background-color: #ffffff;
display: inline-block; display: inline-block;
@ -855,7 +856,7 @@ export default {
height: 540px; height: 540px;
background-color: #f3f6fb; background-color: #f3f6fb;
position: absolute; position: absolute;
left: 545px; left: 500px;
bottom: 0; bottom: 0;
z-index: 99; z-index: 99;
} }
@ -870,8 +871,11 @@ export default {
font-weight: bold; font-weight: bold;
} }
.gisleft { .gisleft {
height: 590px; height: 600px;
/*margin-top: 8px;*/
background-color: #ffffff; background-color: #ffffff;
border-top: 8px solid #E9F3FD;
border-bottom: 8px solid #E9F3FD;
} }
#g1 { #g1 {
margin-top: 40px; margin-top: 40px;

24
src/views/reveal/SampleherbalReveal.vue
View File

@ -20,7 +20,7 @@
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g3" class="gisclick" @click.native="g3()"><span class="gisblue" v-show="gis3"></span>数据密度</el-col>--> <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g3" class="gisclick" @click.native="g3()"><span class="gisblue" v-show="gis3"></span>数据密度</el-col>-->
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g4" class="gisclick" @click.native="g4()"><span class="gisblue" v-show="gis4"></span>物种丰富程度</el-col>--> <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g4" class="gisclick" @click.native="g4()"><span class="gisblue" v-show="gis4"></span>物种丰富程度</el-col>-->
<el-col :xs="23" :sm="23" :md="23" :lg="23" :xl="23" offset="1" class="gisleft"> <el-col :xs="23" :sm="23" :md="23" :lg="23" :xl="23" offset="1" class="gisleft">
<el-tabs :tab-position="tabPosition" style="height: 535px;width: 100%;margin-top: 50px" @tab-click="tabClick"> <el-tabs :tab-position="tabPosition" style="height: 524px;width: 100%;margin-top: 50px" @tab-click="tabClick">
<el-tab-pane style="text-align: right" name="first" label="课题组调查范围"></el-tab-pane> <el-tab-pane style="text-align: right" name="first" label="课题组调查范围"></el-tab-pane>
<el-tab-pane style="text-align: right" name="second" label="荒漠植被区域与地带"></el-tab-pane> <el-tab-pane style="text-align: right" name="second" label="荒漠植被区域与地带"></el-tab-pane>
<el-tab-pane style="text-align: right" name="third" label="荒漠植被数据"></el-tab-pane> <el-tab-pane style="text-align: right" name="third" label="荒漠植被数据"></el-tab-pane>
@ -51,12 +51,12 @@
</el-col> </el-col>
<el-col :xs="16" :sm="16" :md="16" :lg="16" :xl="16" :offset="4" class="echarts"> <el-col :xs="16" :sm="16" :md="16" :lg="16" :xl="16" :offset="4" class="echarts">
<div class="echarttitle"><p class="ecshujv">调查区分布和物种分布</p></div> <div class="echarttitle"><p class="ecshujv">调查区分布和物种分布</p></div>
<el-col :xs="21" :sm="21" :md="21" :lg="21" :xl="21" class="realechart"> <el-col :xs="22" :sm="22" :md="22" :lg="22" :xl="22" offset="1" class="realechart">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" style="background-color: #ffffff;position: relative"> <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" style="background-color: #ffffff;position: relative">
<!-- <img style="position: absolute;z-index: 100;top: 0px;right: 0" src="../../../public/static/image/echBG.jpg">--> <!-- <img style="position: absolute;z-index: 100;top: 0px;right: 0" src="../../../public/static/image/echBG.jpg">-->
<div class="middleshape"></div> <div class="middleshape"></div>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8" class="echarts1" id="findingsEcharts"></el-col> <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8" class="echarts1" id="findingsEcharts"></el-col>
<el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" class="echarts2" id="typicalspecies"></el-col> <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" offset="4" class="echarts2" id="typicalspecies"></el-col>
</el-col> </el-col>
</el-col> </el-col>
</el-col> </el-col>
@ -809,13 +809,14 @@ export default {
color: #979797; color: #979797;
} }
.realechart { .realechart {
position: absolute; /*position: absolute;*/
left: 100px; /*left: 100px;*/
top: 120px; /*top: 120px;*/
/*width: 1200px;*/ /*width: 1200px;*/
height: 540px; height: 540px;
/*border: 1px solid;*/ /*border: 1px solid;*/
background-color: #ffffff; background-color: #ffffff;
margin-top: 120px;
} }
.echarts1 { .echarts1 {
/*width: 500px;*/ /*width: 500px;*/
@ -827,9 +828,9 @@ export default {
.echarts2 { .echarts2 {
/*width: 600px;*/ /*width: 600px;*/
height: 500px; height: 500px;
position: absolute; /*position: absolute;*/
top: 0; /*top: 0;*/
right: 0; /*right: 0;*/
z-index: 99; z-index: 99;
background-color: #ffffff; background-color: #ffffff;
display: inline-block; display: inline-block;
@ -852,7 +853,7 @@ export default {
height: 540px; height: 540px;
background-color: #f3f6fb; background-color: #f3f6fb;
position: absolute; position: absolute;
left: 545px; left: 500px;
bottom: 0; bottom: 0;
z-index: 99; z-index: 99;
} }
@ -868,7 +869,10 @@ export default {
} }
.gisleft { .gisleft {
height: 590px; height: 590px;
/*margin-top: 8px;*/
background-color: #ffffff; background-color: #ffffff;
border-top: 8px solid #E9F3FD;
border-bottom: 8px solid #E9F3FD;
} }
#g1 { #g1 {
margin-top: 40px; margin-top: 40px;

26
src/views/reveal/SampletreesReveal.vue
View File

@ -21,8 +21,8 @@
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g2" class="gisclick" @click.native="g2()"><span class="gisblue" v-show="gis2"></span>数据分布</el-col>--> <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g2" class="gisclick" @click.native="g2()"><span class="gisblue" v-show="gis2"></span>数据分布</el-col>-->
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g3" class="gisclick" @click.native="g3()"><span class="gisblue" v-show="gis3"></span>数据密度</el-col>--> <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g3" class="gisclick" @click.native="g3()"><span class="gisblue" v-show="gis3"></span>数据密度</el-col>-->
<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g4" class="gisclick" @click.native="g4()"><span class="gisblue" v-show="gis4"></span>物种丰富程度</el-col>--> <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" id="g4" class="gisclick" @click.native="g4()"><span class="gisblue" v-show="gis4"></span>物种丰富程度</el-col>-->
<el-col :xs="23" :sm="23" :md="23" :lg="23" :xl="23" offset="1" class="gisleft"> <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" offset="1" class="gisleft">
<el-tabs :tab-position="tabPosition" style="height: 535px;width: 100%;margin-top: 50px" @tab-click="tabClick"> <el-tabs :tab-position="tabPosition" style="height: 524px;width: 100%;margin-top: 50px" @tab-click="tabClick">
<el-tab-pane style="text-align: right" name="first" label="课题组调查范围"></el-tab-pane> <el-tab-pane style="text-align: right" name="first" label="课题组调查范围"></el-tab-pane>
<el-tab-pane style="text-align: right" name="second" label="荒漠植被区域与地带"></el-tab-pane> <el-tab-pane style="text-align: right" name="second" label="荒漠植被区域与地带"></el-tab-pane>
<el-tab-pane style="text-align: right" name="third" label="荒漠植被数据"></el-tab-pane> <el-tab-pane style="text-align: right" name="third" label="荒漠植被数据"></el-tab-pane>
@ -64,7 +64,7 @@
<!-- <div class="echdata">Distribution of arbor investigation area</div>--> <!-- <div class="echdata">Distribution of arbor investigation area</div>-->
<!-- <div class="echarttitle2"><p class="ecshujv">乔木物种分布</p></div>--> <!-- <div class="echarttitle2"><p class="ecshujv">乔木物种分布</p></div>-->
<!-- <div class="echdata2">Tree species distribution</div>--> <!-- <div class="echdata2">Tree species distribution</div>-->
<el-col :xs="21" :sm="21" :md="21" :lg="21" :xl="21" class="realechart"> <el-col :xs="22" :sm="22" :md="22" :lg="22" :xl="22" offset="1" class="realechart">
<el-col class="backimg" :xs="24" :sm="24" :md="24" :lg="24" :xl="24" style="background-color: #ffffff;position: relative"> <el-col class="backimg" :xs="24" :sm="24" :md="24" :lg="24" :xl="24" style="background-color: #ffffff;position: relative">
<!-- <img style="position: absolute;z-index: 100;top: 0px;right: 0" src="../../../public/static/image/echBG.jpg">--> <!-- <img style="position: absolute;z-index: 100;top: 0px;right: 0" src="../../../public/static/image/echBG.jpg">-->
<!-- <div class="middleshape"></div>--> <!-- <div class="middleshape"></div>-->
@ -72,7 +72,7 @@
<!-- <div class="middleshapeit"></div>--> <!-- <div class="middleshapeit"></div>-->
</el-col> </el-col>
<div class="middleshapeit"></div> <div class="middleshapeit"></div>
<el-col :xs="11" :sm="11" :md="11" :lg="11" :xl="11" class="echarts2" id="typicalspecies"> <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" offset="4" class="echarts2" id="typicalspecies">
</el-col> </el-col>
</el-col> </el-col>
</el-col> </el-col>
@ -831,10 +831,11 @@ export default {
color: #979797; color: #979797;
} }
.realechart { .realechart {
position: absolute; /*position: absolute;*/
left: 100px; /*left: 100px;*/
top: 120px; /*top: 120px;*/
/*width: 1200px;*/ /*width: 1200px;*/
margin-top: 120px;
height: 540px; height: 540px;
/*border: 1px solid;*/ /*border: 1px solid;*/
background-color: #ffffff; background-color: #ffffff;
@ -849,9 +850,9 @@ export default {
.echarts2 { .echarts2 {
/*width: 600px;*/ /*width: 600px;*/
height: 500px; height: 500px;
position: absolute; /*position: absolute;*/
top: 0px; /*top: 0px;*/
right: 0px; /*right: 0px;*/
z-index: 99; z-index: 99;
background-color: #ffffff; background-color: #ffffff;
display: inline-block; display: inline-block;
@ -900,8 +901,11 @@ export default {
} }
.gisleft { .gisleft {
height: 590px; height: 590px;
/*margin-top: 8px;*/
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #EBECF1; /*border: 1px solid #EBECF1;*/
border-top: 8px solid #E9F3FD;
border-bottom: 8px solid #E9F3FD;
} }
.gisblue { .gisblue {
width: 8px; width: 8px;