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

解决冲突

Browse Source
This commit is contained in:
Luck-Xiaomi 2022-09-09 11:52:11 +08:00
parent ca59c94859
commit 471191d259
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,19 +8,12 @@
<div class="time">15:32:39</div>
<div class="week">星期二</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">多云 32℃</div>
<div class="date">2022-09-09</div>
>>>>>>> dev-xiaomi
</div>
</div>
<div class="title">中建四局数字建造管控平台</div>
<div class="title">中建四局数字建造平台</div>
<div class="between">
<div class="company"></div>
<div class="exit" @click="$router.push('/projectIndex')"></div>