admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
骆乐 2022-08-23 13:42:01 +08:00
commit 25a99dc10e
14 changed files with 85 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

BIN
src/assets/images/projectImg/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
src/assets/images/projectImg/title2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

21
src/views/projectAdmin/jlw/CIM/index.vue
View File

@ -96,6 +96,7 @@ export default {
.container {
width: 100%;
height: 100%;
<<<<<<< HEAD
display: flex;
justify-content: space-between;
.charts {
@ -107,6 +108,26 @@ export default {
.chart {
height: 32%;
}
=======
background-color: #07162b;
background-image: url('~@/assets/images/projectImg/Bimbgc.png');
}
.topBox {
height: 20%;
}
.leftBox {
position: relative;
width: 25%;
height: 100%;
margin-right: 15px;
.leftTop {
height: 33%;
margin-bottom: 15px;
}
.leftCenter {
height: 33%;
margin-bottom: 15px;
>>>>>>> dev-xiaole
}
.bim {
padding: 8px;

1
src/views/projectAdmin/jlw/digitalSite/index.vue
View File

@ -222,7 +222,6 @@ export default {
width: 25%;
height: 100%;
margin-right: 15px;
margin-left: 15px;
.leftTop {
height: 35%;
margin-bottom: 15px;

1
src/views/projectAdmin/jlw/envirManage/index.vue
View File

@ -86,7 +86,6 @@ export default {
width: 25%;
height: 100%;
margin-right: 15px;
margin-left: 15px;
.leftTop {
height: 35%;
margin-bottom: 15px;

35
src/views/projectAdmin/jlw/index.vue
View File

@ -2,26 +2,30 @@
<div class="dataBoardPage">
<div class="headerBox">
<div class="topTit">
<div class="time">
<span>{{currentDate}}</span>
<span>{{currentWeek}}</span>
<span>{{currentTime}}</span>
<div class="leftmodel">
<img class="wetherImg" src="../../../assets/images/projectImg/sun.png" alt />
<div class="wether">多云 32℃</div>
<img class="logo" src="../../../assets/images/projectImg/logo.png" alt />
</div>
<div class="title">
<div class="centermodel">
<h1 class="title">{{'金林湾项目监管平台'}}</h1>
</div>
<div>
<img class="wetherImg" src="../../../assets/images/projectImg/sun.png" alt />
<span>多云 32℃</span>
<img
class="backImg"
@click="toBack()"
src="../../../assets/images/projectImg/back.png"
alt
/>
<div class="rightmodel">
<div class="time">
<span>{{currentDate}}</span>
<span>{{currentWeek}}</span>
<span>{{currentTime}}</span>
<img
class="backImg"
@click="toBack()"
src="../../../assets/images/projectImg/back.png"
alt
/>
</div>
</div>
</div>
<div style="height: 40px" class="menuBox">
<div class="menuBox">
<ul class="left">
<li
v-for="(item, index) in menuList"
@ -143,5 +147,4 @@ export default {
<style lang="less" scoped>
@import url("./style.less");
</style>

1
src/views/projectAdmin/jlw/laborManage/index.vue
View File

@ -129,7 +129,6 @@ export default {
width: 25%;
height: 100%;
margin-right: 15px;
margin-left: 15px;
.leftTop {
height: 35%;
margin-bottom: 15px;

1
src/views/projectAdmin/jlw/planProgress/index.vue
View File

@ -50,7 +50,6 @@ export default {
width: 25%;
height: 100%;
margin-right: 15px;
margin-left: 15px;
.leftTop {
height: 35%;
margin-bottom: 15px;

2
src/views/projectAdmin/jlw/projectHuli/generalView.vue
View File

@ -202,7 +202,7 @@ export default {
}
}
.manager-persons {
height: 60%;
height: 65%;
display: flex;
// margin-left: 20px;
.person {

1
src/views/projectAdmin/jlw/projectHuli/index.vue
View File

@ -109,7 +109,6 @@ export default {
width: 25%;
height: 100%;
margin-right: 15px;
margin-left: 15px;
.leftTop {
height: 35%;
margin-bottom: 15px;

1
src/views/projectAdmin/jlw/qualityManage/index.vue
View File

@ -54,7 +54,6 @@ export default {
width: 25%;
height: 100%;
margin-right: 15px;
margin-left: 15px;
.leftTop {
height: 35%;
margin-bottom: 15px;

1
src/views/projectAdmin/jlw/safeManage/index.vue
View File

@ -54,7 +54,6 @@ export default {
width: 25%;
height: 100%;
margin-right: 15px;
margin-left: 15px;
.leftTop {
height: 35%;
margin-bottom: 15px;

69
src/views/projectAdmin/jlw/style.less
View File

@ -7,53 +7,72 @@
}
.headerBox{
background-image: url('../../../assets/images/projectImg/title.png');
background-image: url('../../../assets/images/projectImg/title2.png');
background-position: bottom center;
background-repeat: no-repeat;
height: 100px;
position: relative;
background-size: 100% auto;
margin: 0 6px;
.topTit{
display: flex;
.time{
span{
padding: 20px;
line-height: 40px;
margin-top: 5px;
}
}
.title{
justify-content: center;
align-items: center;
.leftmodel{
flex: 1;
margin-top: 8px;
margin-right: 50px;
.wetherImg{
margin-left:10px;
}
.wether{
display: inline-block;
margin: 10px;
font-size: 14px;
}
.logo{
margin-top: 10px;
margin-left: 10px;
}
}
.wetherImg,.backImg{
margin:10px 20px 0px 20px ;
width: 20px;
height: 20px;
.centermodel{
flex: 1;
.title{
margin-top: 25px;
color: #fcfcfc;
margin-left: 40px;
}
}
.rightmodel{
.time{
span{
padding: 20px;
line-height: 30px;
margin-top: 5px;
}
}
.backImg{
display: inline-block;
margin:10px 20px 0px 20px ;
width: 20px;
height: 20px;
}
}
}
.title{
color: #fcfcfc;
font-size: 31px;
text-align: center;
// padding-top: 15px;
}
}
.menuBox{
li{
display: inline-block;
color: #ffffff;
font-size: 18px;
font-size: 20px;
width: 130px;
height: 40px;
text-align: center;
line-height: 15px;
font-weight: bold;
// font-weight: bold;
cursor: pointer;
position: relative;
z-index: 2;