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

Merge branch 'dev-xiaole' into 'master'

Browse Source 
Dev xiaole

See merge request !11
This commit is contained in:
杜海鹏 2022-06-15 18:12:59 +08:00
commit e1849cbd81
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/dataBoard/box.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
src/assets/images/dataBoardTwo/box.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

5
src/views/projectAdmin/dataBoardTwo/dataBoard.vue
View File

@ -6,11 +6,12 @@
<img v-if="headerLogo" style="width: auto;height: 30px;margin-right: 16px;" :src="headerLogo" /> <img v-if="headerLogo" style="width: auto;height: 30px;margin-right: 16px;" :src="headerLogo" />
<span v-if="company != 'longguang'"> <span v-if="company != 'longguang'">
<!-- 智慧工地云平台 --> <!-- 智慧工地云平台 -->
{{$t('message.dataBoard.headerTitle')}} <!-- {{$t('message.dataBoard.headerTitle')}} -->
中建科创数字建造管控平台
</span> </span>
<span v-else style="color:#fff;margin-top:15px"> <span v-else style="color:#fff;margin-top:15px">
<!-- 龙光智慧工地平台 --> <!-- 龙光智慧工地平台 -->
{{$t('message.dataBoard.headerTitle2')}} <!-- {{$t('message.dataBoard.headerTitle2')}} -->
</span> </span>
<!-- {{ $t("message.carOverview.vehicleStatistics") }} --> <!-- {{ $t("message.carOverview.vehicleStatistics") }} -->
</h1> </h1>

8
src/views/projectAdmin/dataBoardTwo/style.less
View File

@ -187,7 +187,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
.greenBtn{ .greenBtn{
font-size: 12px; font-size: 12px;
color: rgba(255, 255, 254, 1); color: rgba(255, 255, 254, 1);
background-color: rgba(25, 59, 67, 1); // background-color: rgba(25, 59, 67, 1);
position: relative; position: relative;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;
@ -197,7 +197,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
cursor: pointer; cursor: pointer;
&.active{ &.active{
color: rgba(247, 211, 0, 100); color: rgba(247, 211, 0, 100);
background-color: rgba(40, 35, 5, 1); // background-color: rgba(40, 35, 5, 1);
// .arrow{ // .arrow{
// opacity: 1; // opacity: 1;
// } // }
@ -723,13 +723,13 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
background-image: url('../../../assets/images/dataBoard/blueTheme2/word_bg.png'); background-image: url('../../../assets/images/dataBoard/blueTheme2/word_bg.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
color: rgba(255, 255, 254, 0.7); // color: rgba(255, 255, 254, 0.7);
&.active{ &.active{
// background-color: #276BD9; // background-color: #276BD9;
background-image: url('../../../assets/images/dataBoard/blueTheme2/word_bg_active.png'); background-image: url('../../../assets/images/dataBoard/blueTheme2/word_bg_active.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
color: rgba(255, 255, 254, 1); color: white;
} }
} }
.bg1{ .bg1{