Skip to content

E
energyai_vue
Commit 6e176694 authored by xiexingan's avatar xiexingan
Browse files
Options

调整

parent 6b0df6da
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 90 deletions
src/pages/analysis/energy/page.vue
View file @ 6e176694
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<!-- <enTabs :tabList="energyTabList"></enTabs> --> <!-- <enTabs :tabList="energyTabList"></enTabs> -->
<el-tabs class="en-tabs" v-model="activetap"> <el-tabs class="en-tabs" v-model="activetap">
<el-row style="padding-top: 15px"> <el-row style="padding-top: 15px">
<el-col :span="10"> <el-col :span="7">
<span>时间范围：</span> <span>时间范围：</span>
<el-date-picker <el-date-picker
size="mini" size="mini"
...@@ -37,10 +37,11 @@ ...@@ -37,10 +37,11 @@
range-separator="～" range-separator="～"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
v-model="date"
> >
</el-date-picker> </el-date-picker>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="2">
<el-button type="primary" size="mini" icon="el-icon-search" <el-button type="primary" size="mini" icon="el-icon-search"
>查询</el-button >查询</el-button
> >
...@@ -76,6 +77,7 @@ export default { ...@@ -76,6 +77,7 @@ export default {
}, },
data() { data() {
return { return {
date: [],
activeIndex: 1, activeIndex: 1,
activetap: '01', activetap: '01',
dateList: [ dateList: [
......
src/pages/analysis/outdoor/index.vue
View file @ 6e176694
...@@ -4,9 +4,6 @@ card-warp(title="室外气象分析" height='45px' showBackground) ...@@ -4,9 +4,6 @@ card-warp(title="室外气象分析" height='45px' showBackground)
//- router-link.margin-lr-20(:to="{name:'kb-indoor'}") //- router-link.margin-lr-20(:to="{name:'kb-indoor'}")
//- el-button(size='mini' type='primary') 图形 / 列表 //- el-button(size='mini' type='primary') 图形 / 列表
div(slot="content", style="height: 90%") div(slot="content", style="height: 90%")
el-tabs.myTabs(v-model="activeName", @tab-click="tabClick")
el-tab-pane(label="候车室区域", name="1")
el-tab-pane(label="办公区域", name="2")
el-form(:inline='true' size="mini" ) el-form(:inline='true' size="mini" )
el-form-item(label='设备名称：') el-form-item(label='设备名称：')
el-input(type='primary' size='mini') el-input(type='primary' size='mini')
...@@ -107,9 +104,7 @@ export default { ...@@ -107,9 +104,7 @@ export default {
} }
}, },
methods: { methods: {
tabClick(tab, event) {
console.log(tab, event)
},
getDataList() { getDataList() {
} }
...@@ -118,39 +113,14 @@ export default { ...@@ -118,39 +113,14 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.myTabs {
/deep/ .el-tabs__nav-wrap::after {
height: 0;
}
/deep/.el-tabs__nav-wrap {
background: #f2f4f5;
.el-tabs__nav {
// background: #E5E9EC;
border-bottom: 1px solid #e5e9ec;
}
}
/deep/ .el-tabs__header {
border: 1px solid #e5e9ec;
}
/deep/ .el-tabs__item:nth-child(2) {
padding: 0 20px;
}
/deep/ .el-tabs__item:last-child {
padding: 0 20px;
}
/deep/ .el-tabs__item.is-active {
background: #fff;
}
}
.echartsWarp { .echartsWarp {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
height: calc(100vh - 350px); height: calc(100vh - 300px);
> div { > div {
width: 23%; width: 22%;
height: calc(90% / 2); height: calc(85% / 2);
margin: 3px; margin: 3px;
padding: 13px; padding: 13px;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
......
src/pages/eq/hall/page.vue
View file @ 6e176694
...@@ -31,6 +31,12 @@ ...@@ -31,6 +31,12 @@
</span> </span>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="温度设定：">
<el-input v-model="formData.temp" clearable=""></el-input>
</el-form-item>
<el-form-item label="">
<el-button type="primary" size="mini">确定</el-button>
</el-form-item>
<el-form-item label="定时功能启止时间："> <el-form-item label="定时功能启止时间：">
<el-date-picker size="mini" style="width: 200px" type="date" placeholder="" v-model="formData.startTime"> <el-date-picker size="mini" style="width: 200px" type="date" placeholder="" v-model="formData.startTime">
...@@ -39,16 +45,7 @@ ...@@ -39,16 +45,7 @@
<el-date-picker size="mini" style="width: 200px" type="date" placeholder="" v-model="formData.endTime"> <el-date-picker size="mini" style="width: 200px" type="date" placeholder="" v-model="formData.endTime">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="定时设定按钮：">
<el-switch active-color="#47B320" v-model="formData.timing" inactive-color="#ff4949">
</el-switch>
</el-form-item> -->
<el-form-item label="温度设定：">
<el-input ></el-input>
</el-form-item>
<el-form-item label="">
<el-button type="primary" size="mini">确定</el-button>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -181,26 +178,31 @@ export default { ...@@ -181,26 +178,31 @@ export default {
} }
.switch-warp { .switch-warp {
width: 93px;
height: 26px;
font-size: 12px; font-size: 12px;
line-height: 20px; line-height: 25px;
overflow: hidden; overflow: hidden;
border-radius: 13px; border-radius: 13px;
background: #ced1d6; background: #d3d3d3;
border: 1px solid rgba(0, 0, 0, 0.2); border: 1px solid rgba(0, 0, 0, 0.03);
box-shadow: 0px 1px 0px 1px rgba(255, 255, 255, 0.25), box-shadow: 0px 1px 0px 1px rgba(255, 255, 255, 0.25),
0px 2px 4px 0px rgba(0, 0, 0, 0.1); 0px 2px 4px 0px rgba(0, 0, 0, 0.1);
transform: translateY(7px);
div { div {
width: 46px; width: 45px;
height: 20px; height: 24px;
line-height: 24px;
float: left; float: left;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
} }
div.on { div.on {
background: #45b5f8; background: #4CB527;
color: #fff; color: #fff;
border-radius: 13px; border-radius: 13px;
border: 1px solid rgba(23, 41, 71, 0.5); border: 1px solid rgba(23, 41, 71, 0.02);
box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.3), box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.3),
0px 2px 0px 0px rgba(255, 255, 255, 0.15); 0px 2px 0px 0px rgba(255, 255, 255, 0.15);
} }
......
src/pages/home/page.vue
View file @ 6e176694
...@@ -16,14 +16,15 @@ ...@@ -16,14 +16,15 @@
<span v-if="index == 0" v-html="item.cardText"></span> <span v-if="index == 0" v-html="item.cardText"></span>
<span v-else-if="index == 1" v-html="item.cardText"></span> <span v-else-if="index == 1" v-html="item.cardText"></span>
<span v-else>{{ item.cardText }}</span> <span v-else>{{ item.cardText }}</span>
<p>{{ item.state }}</p> <p v-if="item.state==1" style='color:#4ECB74'>开启</p>
<p v-if="item.state==2" style='color:#F2637B'>关闭</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="home-page-content"> <div class="home-page-content">
<el-row :gutter="12" style="height: 100%"> <el-row :gutter="50" style="height: 100%">
<el-col :span="16" style="height: 100%"> <el-col :span="16" style="height: 100%">
<card-list :cardListTitle="cardListLeftTitle"> <card-list :cardListTitle="cardListLeftTitle">
<div slot="right"> <div slot="right">
...@@ -141,19 +142,19 @@ export default { ...@@ -141,19 +142,19 @@ export default {
iconUrl: require('./image/sun_icon.png'), iconUrl: require('./image/sun_icon.png'),
cardDesc: '办公区域供暖模式', cardDesc: '办公区域供暖模式',
cardText: '', cardText: '',
state: '开启' state: 1
}, },
{ {
iconUrl: require('./image/fan_icon.png'), iconUrl: require('./image/fan_icon.png'),
cardDesc: '办公区域机械通风模式', cardDesc: '办公区域机械通风模式',
cardText: '', cardText: '',
state: '开启' state: 2
}, },
{ {
iconUrl: require('./image/nan_fan_icon.png'), iconUrl: require('./image/nan_fan_icon.png'),
cardDesc: '办公区域自然通风模式', cardDesc: '办公区域自然通风模式',
cardText: '', cardText: '',
state: '开启' state: 1
} }
], ],
dateList: [ dateList: [
......
src/pages/kb/outdoor/index.vue
View file @ 6e176694
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
card-warp(title="室外气象数据" height='45px' showBackground ) card-warp(title="室外气象数据" height='45px' showBackground )
div(slot="content", style="height: 90%") div(slot="content", style="height: 90%")
el-tabs.myTabs(v-model="activeName", @tab-click="tabClick")
el-tab-pane(label="候车室区域", name="1")
el-tab-pane(label="办公区域", name="2")
el-form(:inline='true') el-form(:inline='true')
el-form-item(label='设备编号:') el-form-item(label='设备编号:')
el-input(size='mini') el-input(size='mini')
...@@ -108,9 +105,7 @@ export default { ...@@ -108,9 +105,7 @@ export default {
toggle() { toggle() {
this.showList = !this.showList this.showList = !this.showList
}, },
tabClick(tab, event) {
console.log(tab, event)
},
getDataList() { getDataList() {
}, },
...@@ -126,31 +121,6 @@ export default { ...@@ -126,31 +121,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.myTabs {
/deep/ .el-tabs__nav-wrap::after {
height: 0;
}
/deep/.el-tabs__nav-wrap {
background: #f2f4f5;
.el-tabs__nav {
// background: #E5E9EC;
border-bottom: 1px solid #e5e9ec;
}
}
/deep/ .el-tabs__header {
border: 1px solid #e5e9ec;
}
/deep/ .el-tabs__item:nth-child(2) {
padding: 0 20px;
}
/deep/ .el-tabs__item:last-child {
padding: 0 20px;
}
/deep/ .el-tabs__item.is-active {
background: #fff;
}
}
.data-warp{ .data-warp{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -188,7 +158,7 @@ export default { ...@@ -188,7 +158,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
height: calc(100vh - 530px); height: calc(100vh - 480px);
margin-bottom: 90px; margin-bottom: 90px;
// border: 1px solid; // border: 1px solid;
> div { > 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