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

Merge branch 'dev-xiaole' into shenzhen-dev

Browse Source
This commit is contained in:
骆乐 2022-07-30 09:04:30 +08:00
commit aa2c318882
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/enriobottom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
src/assets/images/enrivtop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 64 KiB

2
src/components/account.vue
View File

@ -16,7 +16,7 @@
<p>{{ $store.state.userInfo.companyName }}</p> <p>{{ $store.state.userInfo.companyName }}</p>
<!-- 横琴和鹤洲不需要客服电话--> <!-- 横琴和鹤洲不需要客服电话-->
<p v-if="projectType != 'hengqin'">客服电话：{{$store.state.userInfo.customerServicePhone}}</p> <p v-if="projectType != 'hengqin'">客服电话：{{$store.state.userInfo.customerServicePhone}}</p>
<p v-if="projectType == 'hengqin'">入场码：{{$store.state.currentProDetail.placeCode}}</p> <p v-if="projectType == 'hengqin' && $store.state.currentProDetail != null ">入场码：{{$store.state.currentProDetail.placeCode}}</p>
</div> </div>
</div> </div>
<!-- <div class="flex2" style="margin-top:20px"> <!-- <div class="flex2" style="margin-top:20px">

7
src/views/projectAdmin/dataBoard/index.vue
View File

@ -708,7 +708,9 @@
v-if="COMPANY != 'longguang' && enabledProjectV2 != 3" v-if="COMPANY != 'longguang' && enabledProjectV2 != 3"
class="blockContent" class="blockContent"
> >
<airQulityChart></airQulityChart> <!-- <airQulityChart></airQulityChart> -->
<img style="width:150px;height:150px;margin-left:100px;" src="../../../assets/images/enrivtop.png" />
<img style="width:250px; margin-left:50px;" src="../../../assets/images/enriobottom.png" />
</div> </div>
<div v-else class="blockContent alarmBlockContent"> <div v-else class="blockContent alarmBlockContent">
<vue-scroll> <vue-scroll>
@ -1430,6 +1432,9 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.stageContent{
height:220px;
}
.weatherItem { .weatherItem {
/*float: left;*/ /*float: left;*/
display: inline-block; display: inline-block;

4
src/views/projectAdmin/dataBoard/style.less
View File

@ -273,7 +273,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
.top{ .top{
height: 57%; height: 57%;
// background-image: url('../../../assets/images/dataBoard/centerTopBG.png'); background-image: url('../../../assets/images/dataBoard/centerTopBG.png');
background-size: 100% 100%; background-size: 100% 100%;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -283,7 +283,7 @@ background-image: url('../../../assets/images/dataBoard/blockBG2.png');
.bottom{ .bottom{
margin: 10px 20px; margin: 10px 20px;
height: calc(43% - 20px); height: calc(43% - 20px);
// background-image: url('../../../assets/images/dataBoard/centerBottomBG.png'); background-image: url('../../../assets/images/dataBoard/centerBottomBG.png');
background-size: 100% 100%; background-size: 100% 100%;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;