Skip to content

W
web-project
Commit 38c3255e authored by 王亚晖's avatar 王亚晖
Browse files
Options

Merge branch 'master' of https://gitee.com/tj-wang-yahui/AMS_HeatSys_Vue_V10

parents 93fef193 452209b4
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 26 deletions
public/imgs/home/time.png
View replaced file @ 93fef193 View file @ 38c3255e
public/imgs/home/time.png

7.96 KB | W: | H:

public/imgs/home/time.png

3.58 KB | W: | H:

public/imgs/home/time.png
public/imgs/home/time.png
public/imgs/home/time.png
public/imgs/home/time.png
  • 2-up
  • Swipe
  • Onion skin
src/style/index.less
View file @ 38c3255e
......@@ -185,17 +185,20 @@ html {
/* 气象信息文本--小文本 */
.div-contain-text-small {
font-size: 8pt;
font-size: 14px;
width: 100px;
// text-align:center;
vertical-align: top;
width: 100px;
//width: 100px;
}
/* 气象信息文本--大文本 */
.div-contain-text-big {
font-size: 14px;
font-size: 20px;
font-weight: bold;
}
.ams-header .user {
......
src/views/RemotePage/TransferPumpPage.vue
View file @ 38c3255e
......@@ -18,6 +18,11 @@
</el-row>
</div>
</template>
<el-row>
<el-col :span="24">
<div class="radius" style="width: 100%;height: 0px;"></div>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="grid-content">近N小时室外平均温度（℃）</div>
......@@ -41,6 +46,11 @@
<div class="grid-content">结束时间</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="radius" style="width: 100%;height: 0px;"></div>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="grid-content"></div>
......@@ -68,6 +78,11 @@
<div class="grid-content"></div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="radius" style="width: 100%;height: 0px;"></div>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="grid-content"></div>
......@@ -95,9 +110,14 @@
<div class="grid-content"></div>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="radius" style="width: 100%;height: 0px;"></div>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="grid-content">30</div>
<div class="grid-content"><div style="font-size: 20px;font-weight: 500;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;30.5</div></div>
</el-col>
<el-col :span="3">
<div class="grid-content"><el-input-number v-model="num" size="mx-4" /></div>
......@@ -123,61 +143,70 @@
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="grid-content"></div>
<el-col :span="24">
<div class="radius" style="width: 100%;height: 0px;"></div>
</el-col>
<el-col :span="3">
</el-row>
<el-row>
<el-col :span="3" :push=4>
<div class="grid-content"><el-input-number v-model="num" size="mx-4" /></div>
</el-col>
<el-col :span="3">
<el-col :span="3" :push=4>
<div class="grid-content"><el-input v-model="input" style="width: 70px" /></div>
</el-col>
<el-col :span="3">
<el-col :span="3" :push=4>
<div class="grid-content"><el-input v-model="input" style="width: 70px" /></div>
</el-col>
<el-col :span="3">
<el-col :span="3" :push=4>
<div class="grid-content">
<el-select v-model="value" style="width: 120px">
<el-option v-for="item in yns" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
</el-col>
<el-col :span="4">
<el-col :span="4" :push=4>
<div class="grid-content"></div>
</el-col>
<el-col :span="4">
<el-col :span="4" :push=4>
<div class="grid-content"></div>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<div class="grid-content"></div>
<el-col :span="24">
<div class="radius" style="width: 100%;height: 0px;"></div>
</el-col>
<el-col :span="3">
</el-row>
<el-row>
<el-col :span="3" :push=4>
<div class="grid-content"><el-input-number v-model="num" size="mx-4" /></div>
</el-col>
<el-col :span="3">
<el-col :span="3" :push=4>
<div class="grid-content"><el-input v-model="input" style="width: 70px" /></div>
</el-col>
<el-col :span="3">
<el-col :span="3" :push=4>
<div class="grid-content"><el-input v-model="input" style="width: 70px" /></div>
</el-col>
<el-col :span="3">
<el-col :span="3" :push=4>
<div class="grid-content">
<el-select v-model="value" style="width: 120px">
<el-option v-for="item in yns" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
</el-col>
<el-col :span="4">
<el-col :span="4" :push=4>
<div class="grid-content"></div>
</el-col>
<el-col :span="4">
<el-col :span="4" :push=4>
<div class="grid-content"></div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="radius" style="width: 100%;height: 0px;"></div>
</el-col>
</el-row>
<!-- <template #footer>换热站群控列表：
<template v-for="item in unitlist"><span style="width: 380px;">{{ item }}</span></template>
<template v-for="item in unitlist"><span style="width: 380px;">{{ item }}</span>&nbsp;</template>
</template> -->
</el-card>
</template>
......@@ -281,4 +310,7 @@ onUnmounted(() => {
border-radius: 4px;
min-height: 36px;
}
.radius {
border: 1px solid #e4e7ed;
}
</style>
\ No newline at end of file
src/views/home.vue
View file @ 38c3255e
......@@ -35,21 +35,21 @@
</el-dropdown>
</div>
<div class="header-weather" id="">
<el-row style="left: 37%;widows: 60px;width: 63%;">
<el-row style="left: 27%;widows: 60px;width: 73%;">
<el-col :span="4" style="">
<div class="div-contain-titleAndText">
<el-image style="padding-top:20px ;width: 30px;height: 30px;margin-right: 3px;" src="/imgs/home/wendu.png"
:fit="'fill'" />
<div>
<div class="div-contain-title"> 温度 ℃</div>
<div class="div-contain-text-big">{{ showWeatherData.weatherData.temperature }}
<div class="div-contain-title"> 室外温度</div>
<div class="div-contain-text-big">{{ showWeatherData.weatherData.temperature +'℃'}}
</div>
</div>
</div>
</el-col>
<el-col :span="5">
<div class="div-contain-titleAndText">
<div class="div-contain-titleAndText" style="padding-left: 15px;">
<el-image style="padding-top:20px ;width: 30px;height: 30px;margin-right: 3px;" src="/imgs/home/guang.png"
:fit="'fill'" />
<div>
......@@ -85,7 +85,7 @@
<el-image style="padding-top:20px ;width: 30px;height: 30px;margin-right: 3px;" src="/imgs/home/time.png"
:fit="'scale-down'" />
<div>
<div class="div-contain-title" style="width: 100px;">气象时间</div>
<div class="div-contain-title" style="">气象时间</div>
<div class="div-contain-text-small" style="line-height: 15px;">{{
showWeatherData.weatherData.gatherTime
}}</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment