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

Merge branch 'dev-xiaomi' into shenzhen-dev

Browse Source
This commit is contained in:
Luck-Xiaomi 2022-09-09 11:51:16 +08:00
commit ca59c94859
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/projectAdmin/zjsj/index.vue
View File

@ -1,5 +1,4 @@
<template> <template>
<vue-scroll>
<div class="zjsj-large-screen"> <div class="zjsj-large-screen">
<div class="header"> <div class="header">
<div class="info"> <div class="info">
@ -9,12 +8,19 @@
<div class="time">15:32:39</div> <div class="time">15:32:39</div>
<div class="week">星期二</div> <div class="week">星期二</div>
</div> </div>
<<<<<<< HEAD
<div class="title">中建四局数字建造平台</div>
<div class="between">
<div class="company"></div>
<div class="exit" @click="$router.push('/projectIndex')"></div>
=======
<div class="weather-date"> <div class="weather-date">
<div class="weather">多云 32℃</div> <div class="weather">多云 32℃</div>
<div class="date">2022-09-09</div> <div class="date">2022-09-09</div>
>>>>>>> dev-xiaomi
</div> </div>
</div> </div>
<div class="title">中建四局数字建造平台</div> <div class="title">中建四局数字建造管控平台</div>
<div class="between"> <div class="between">
<div class="company"></div> <div class="company"></div>
<div class="exit" @click="$router.push('/projectIndex')"></div> <div class="exit" @click="$router.push('/projectIndex')"></div>
@ -36,7 +42,6 @@
<router-view></router-view> <router-view></router-view>
</div> </div>
</div> </div>
</vue-scroll>
</template> </template>
<script> <script>
@ -59,10 +64,9 @@ export default {
@import url("./style.less"); @import url("./style.less");
.zjsj-large-screen { .zjsj-large-screen {
width: 100%; width: 100%;
// height: 100%; height: 100%;
color: #fff; color: #fff;
background-color: #182337; background-color: #182337;
overflow-y: scroll;
.header { .header {
width: 100%; width: 100%;
height: 110px; height: 110px;
@ -160,7 +164,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding: 12px 20px; padding: 12px 20px;
width: 100%; width: 100%;
height: calc(1080px - 110px); height: calc(100% - 110px);
} }
} }