Skip to content

E
energyai_vue
Commit 16461ac9 authored by xiexingan's avatar xiexingan
Browse files
Options

设备概览 

Signed-off-by: 's avatarxiexingan <748626312@qq.com>
parent 36d0ac57
Show whitespace changes
Inline Side-by-side
Showing with 715 additions and 370 deletions
src/assets/style/public.scss
View file @ 16461ac9
...@@ -129,6 +129,9 @@ $el-bg-color-4: #F2F6FC; ...@@ -129,6 +129,9 @@ $el-bg-color-4: #F2F6FC;
} }
// ~~~
.margin-lr-20 { .margin-lr-20 {
margin: 0 20px; margin: 0 20px;
} }
...@@ -146,3 +149,45 @@ $el-bg-color-4: #F2F6FC; ...@@ -146,3 +149,45 @@ $el-bg-color-4: #F2F6FC;
color: #4ECB74; color: #4ECB74;
} }
// 首页菜单选中
.theme-d2 .d2-theme-container .d2-theme-container-aside .d2-layout-header-aside-menu-side>.el-menu> .el-menu-item:first-child{
background: transparent ;
}
.en-tabs {
.el-tabs__header {
margin: 0;
}
.el-tabs__active-bar{
bottom:-1px ;
}
.el-tabs__nav-wrap::after {
height: 0;
}
.el-tabs__nav-wrap {
background: #f2f4f5;
.el-tabs__nav {
border-bottom: 1px solid #e5e9ec;
}
}
.el-tabs__header {
border: 1px solid #e5e9ec;
}
.el-tabs__item:nth-child(2) {
padding: 0 30px !important;
}
.el-tabs__item:last-child {
padding: 0 30px !important;
}
.el-tabs__item.is-active {
background: #fff;
}
}
src/assets/style/theme/d2/setting.scss
View file @ 16461ac9
...@@ -50,16 +50,19 @@ $theme-header-item-background-color-active: transparent; ...@@ -50,16 +50,19 @@ $theme-header-item-background-color-active: transparent;
// 侧边栏上的文字颜色 // 侧边栏上的文字颜色
$theme-aside-item-color: $color-text-normal; $theme-aside-item-color: $color-text-normal;
$theme-aside-item-background-color: transparent; // $theme-aside-item-background-color: transparent;
$theme-aside-item-background-color: #F2FAFF;
// 侧边栏上的项目在 hover 时 // 侧边栏上的项目在 hover 时
$theme-aside-item-color-hover: #2f74ff; $theme-aside-item-color-hover: rgba(#fff,1);
$theme-aside-item-background-color-hover: rgba(#FFF, .5); $theme-aside-item-background-color-hover: rgba(#21ACFC, .9);
// 侧边栏上的项目在 focus 时 // 侧边栏上的项目在 focus 时
$theme-aside-item-color-focus: #2f74ff; $theme-aside-item-color-focus: #21ACFC;
$theme-aside-item-background-color-focus: rgba(#FFF, .5); $theme-aside-item-background-color-focus: rgba(#FFF, .5);
// 侧边栏上的项目在 active 时 // 侧边栏上的项目在 active 时
$theme-aside-item-color-active: #2f74ff; $theme-aside-item-color-active: #fff;
$theme-aside-item-background-color-active: rgba(#FFF, .5); // $theme-aside-item-background-color-active: rgba(#FFF, .5);
$theme-aside-item-background-color-active: #21ACFC;
// 侧边栏菜单为空的时候显示的元素 // 侧边栏菜单为空的时候显示的元素
$theme-aside-menu-empty-icon-color: $color-text-normal; $theme-aside-menu-empty-icon-color: $color-text-normal;
......
src/assets/style/theme/theme.scss
View file @ 16461ac9
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
} }
&:hover { &:hover {
color: $theme-aside-item-color-hover; color: $theme-aside-item-color-hover;
background: $theme-aside-item-background-color-hover; background: $theme-aside-item-background-color-hover !important;
i { i {
color: $theme-aside-item-color-hover; color: $theme-aside-item-color-hover;
} }
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
} }
&.is-active { &.is-active {
color: $theme-aside-item-color-active; color: $theme-aside-item-color-active;
background: $theme-aside-item-background-color-active; background: $theme-aside-item-background-color-active !important;
i { i {
color: $theme-aside-item-color-active; color: $theme-aside-item-color-active;
} }
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
.el-submenu { .el-submenu {
.el-submenu__title { .el-submenu__title {
color: $theme-aside-item-color; color: $theme-aside-item-color;
background: $theme-aside-item-background-color; background:$theme-aside-item-color-active;
i { i {
color: $theme-aside-item-color; color: $theme-aside-item-color;
} }
......
src/layout/header-aside/components/header-user/index.vue
View file @ 16461ac9
<template> <template>
<div > <div>
<div title="修改密码" class="msg-img user-warp" @click="editPasword" style="display:flex;"> <div title="修改密码" class="msg-img user-warp" @click="editPasword" style="display:flex;">
<img src="../../imgs/user.png" alt="">
<div class="user-info"> <div class="user-info">
<span class="item" style='margin-top:2px;'>{{info.userName}}</span> <span class="item" style='margin-top:2px;'>{{info.userName}}</span>
<span class="item">{{info.name}}</span> <span class="item">{{info.name}}</span>
</div> </div>
<img src="../../imgs/user.png" alt="">
</div> </div>
<!-- <span class="btn-text">你好， {{info.name}}</span> <!-- <span class="btn-text">你好， {{info.name}}</span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
...@@ -19,9 +19,7 @@ ...@@ -19,9 +19,7 @@
注销 注销
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> --> </el-dropdown-menu> -->
<el-dialog title="修改密码" <el-dialog title="修改密码" :visible.sync="editPaswDialog" @close="closeEditPasw" width="50%">
:visible.sync="editPaswDialog" @close="closeEditPasw"
width="50%">
<div slot='title' class="title-bold"> <div slot='title' class="title-bold">
<span>修改密码</span> <span>修改密码</span>
</div> </div>
...@@ -29,13 +27,13 @@ ...@@ -29,13 +27,13 @@
<el-form-item label="用户名" :label-width="formLabelWidth"> <el-form-item label="用户名" :label-width="formLabelWidth">
<el-input v-model="editPasForm.username" disabled></el-input> <el-input v-model="editPasForm.username" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="原密码" prop="oldpsw" :label-width="formLabelWidth" > <el-form-item label="原密码" prop="oldpsw" :label-width="formLabelWidth">
<el-input v-model="editPasForm.oldpsw" autocomplete="off" type='password' placeholder='请输入原密码' @input='e => editPasForm.oldpsw = inputMe(e)'></el-input> <el-input v-model="editPasForm.oldpsw" autocomplete="off" type='password' placeholder='请输入原密码' @input='e => editPasForm.oldpsw = inputMe(e)'></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新密码" prop="newpas" :label-width="formLabelWidth" > <el-form-item label="新密码" prop="newpas" :label-width="formLabelWidth">
<el-input v-model="editPasForm.newpas" autocomplete="off" type='password' placeholder='请输入新密码' @input='e => editPasForm.newpas = inputMe(e)'></el-input> <el-input v-model="editPasForm.newpas" autocomplete="off" type='password' placeholder='请输入新密码' @input='e => editPasForm.newpas = inputMe(e)'></el-input>
</el-form-item> </el-form-item>
<el-form-item label="密码确认" prop="pwd" :label-width="formLabelWidth" > <el-form-item label="密码确认" prop="pwd" :label-width="formLabelWidth">
<el-input v-model="editPasForm.pwd" autocomplete="off" type='password' placeholder='请再次输入新密码' @input='e => editPasForm.pwd = inputMe(e)'></el-input> <el-input v-model="editPasForm.pwd" autocomplete="off" type='password' placeholder='请再次输入新密码' @input='e => editPasForm.pwd = inputMe(e)'></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -79,11 +77,14 @@ export default { ...@@ -79,11 +77,14 @@ export default {
fromrule: { fromrule: {
newpas: [ newpas: [
{ validator: validatePassword, trigger: 'blur' }, { validator: validatePassword, trigger: 'blur' },
{ min: 1, max: 30, message: '长度在 1 到 50 个字符', trigger: 'blur' } {
min: 1,
max: 30,
message: '长度在 1 到 50 个字符',
trigger: 'blur'
}
], ],
pwd: [ pwd: [{ validator: validateComfirmPassword, trigger: 'blur' }]
{ validator: validateComfirmPassword, trigger: 'blur' }
]
} }
} }
}, },
...@@ -91,18 +92,14 @@ export default { ...@@ -91,18 +92,14 @@ export default {
this.editPasForm.username = this.info.name this.editPasForm.username = this.info.name
}, },
computed: { computed: {
...mapState('d2admin/user', [ ...mapState('d2admin/user', ['info'])
'info'
])
}, },
methods: { methods: {
...mapActions('d2admin/account', [ ...mapActions('d2admin/account', ['logout']),
'logout'
]),
/** /**
* @description 登出 * @description 登出
*/ */
logOff () { logOff() {
this.logout({ this.logout({
vm: this, vm: this,
confirm: true confirm: true
...@@ -118,7 +115,7 @@ export default { ...@@ -118,7 +115,7 @@ export default {
}) })
}, },
saveEditPas() { saveEditPas() {
this.$refs.editPasRef.validate(valid => { this.$refs.editPasRef.validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl('/sys/user/password'), url: this.$http.adornUrl('/sys/user/password'),
...@@ -168,29 +165,31 @@ export default { ...@@ -168,29 +165,31 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.user-warp{ .user-warp {
.user-info {
.user-info{ width: 93px;
width: 84px;
height: 36px; height: 36px;
background: url(../../imgs/subwayBg.png); border: 1px solid;
background-size: 100% 100%; border-color: #a0a8b4 #a0a8b4 #a0a8b4 transparent;
text-align:center; border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
transform: translateX(-19px);
text-align: center;
text-indent: 10px;
opacity: 0; opacity: 0;
float: right; float: right;
z-index: -3; z-index: -3;
margin-right:-84px; margin-right:-84px;
transition:all .3s ease; transition: all 0.3s ease;
-webkit-transition: all .3s ease; -webkit-transition: all 0.3s ease;
.item{ .item {
display: block; display: block;
padding-right:10px;
font-size: 12px; font-size: 12px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: rgba(255, 255, 255, 0.75); color: rgba(255, 255, 255, 0.75);
} }
} }
} }
.user-warp:hover .user-info{ .user-warp:hover .user-info{
opacity: 1; opacity: 1;
...@@ -198,5 +197,4 @@ export default { ...@@ -198,5 +197,4 @@ export default {
z-index: 1; z-index: 1;
} }
</style> </style>
src/layout/header-aside/imgs/logo2x.png
View replaced file @ 36d0ac57 View file @ 16461ac9
src/layout/header-aside/imgs/logo2x.png

31.2 KB | W: | H:

src/layout/header-aside/imgs/logo2x.png

8.89 KB | W: | H:

src/layout/header-aside/imgs/logo2x.png
src/layout/header-aside/imgs/logo2x.png
src/layout/header-aside/imgs/logo2x.png
src/layout/header-aside/imgs/logo2x.png
  • 2-up
  • Swipe
  • Onion skin
src/layout/header-aside/layout.vue
View file @ 16461ac9
<template> <template>
<div class="d2-layout-header-aside-group" :style="styleLayoutMainGroup" :class="{ grayMode: grayActive }"> <div
class="d2-layout-header-aside-group"
:style="styleLayoutMainGroup"
:class="{ grayMode: grayActive }"
>
<!-- 半透明遮罩 --> <!-- 半透明遮罩 -->
<div class="d2-layout-header-aside-mask"></div> <div class="d2-layout-header-aside-mask"></div>
<!-- 主体内容 --> <!-- 主体内容 -->
<div class="d2-layout-header-aside-content" flex="dir:top"> <div class="d2-layout-header-aside-content" flex="dir:top">
<!-- 顶栏 --> <!-- 顶栏 -->
<div class="d2-theme-header" flex-box="0" flex> <div class="d2-theme-header" flex-box="0" flex>
<div class="logo-group" :style="{width: asideWidth}" flex-box="0"> <div class="logo-group" flex-box="0" style="margin-left:30px">
<img src="./imgs/logo2x.png"> <img src="./imgs/train.png" style="width:50px;height:50px" />
<img src="./imgs/energy_text.png" />
</div> </div>
<div style='width:100%;'> <div style="width: 100%">
<div flex-box="1"></div> <div flex-box="1"></div>
<!-- 顶栏右侧 --> <!-- 顶栏右侧 -->
<div class="d2-header-right"> <div class="d2-header-right">
<div class="time-container"> <div
class="time-container"
style="padding-right: 26px; text-align: unset"
>
<div class="current-time">{{ time | formatDate }}</div> <div class="current-time">{{ time | formatDate }}</div>
<div class="current-date">{{ time | formatDate2 }}</div> <div class="current-date">{{ time | formatDate2 }}</div>
</div> </div>
<div class="subway-container"> <div class="subway-container" style="margin-right:43px">
<div class="subway-info"> <div class="subway-info" style="transform: rotate(180deg)">
<span :class="station.length < 6 ? 'lineFeed' : ''">{{station }}</span> <!-- <span :class="station.length < 6 ? 'lineFeed' : ''">{{
station
}}</span> -->
</div> </div>
<div class="user-img"><img src="./imgs/subway.png" /></div> <div style="display: flex; position: absolute">
<div
style="
background: #fff;
position: relative;
top: -1px;
left: -17px;
text-align: center;
font-size: 12px;
width: 35px;
height: 35px;
border-radius: 50%;
line-height: 35px;
"
>
室内
</div>
<div
style="
font-size: 12px;
color: #fff;
position: relative;
left: -8px;
"
>
<div>温度:20℃</div>
<div>湿度:60%</div>
</div>
</div>
</div>
<div class="subway-container" >
<div class="subway-info" style="transform: rotate(180deg)">
<!-- <span :class="station.length < 6 ? 'lineFeed' : ''">{{
station
}}</span> -->
</div>
<div style="display: flex; position: absolute">
<div
style="
background: #fff;
position: relative;
top: -1px;
left: -17px;
text-align: center;
font-size: 12px;
width: 35px;
height: 35px;
border-radius: 50%;
line-height: 35px;
"
>
室外
</div>
<div
style="
font-size: 12px;
color: #fff;
position: relative;
left: -8px;
"
>
<div>晴:20℃</div>
<div>湿度:60%</div>
</div> </div>
<d2-header-theme />
<el-badge class="msg-img" :value="countNum == 0 ? '' : countNum > 99 ? '99+' : countNum" type="danger">
<div title="报警中心" style="cursor: pointer" @click="toAlarms">
<img src="./imgs/msg.png" />
</div> </div>
</el-badge>
<d2-header-user />
<div title="退出" class="msg-img" style="cursor: pointer;" @click="logOff">
<img src="./imgs/out.png" />
</div> </div>
</div> </div>
</div> </div>
...@@ -39,10 +103,15 @@ ...@@ -39,10 +103,15 @@
<!-- 下面 主体 --> <!-- 下面 主体 -->
<div class="d2-theme-container" flex-box="1" flex> <div class="d2-theme-container" flex-box="1" flex>
<!-- 主体 侧边栏 --> <!-- 主体 侧边栏 -->
<div flex-box="0" ref="aside" class="d2-theme-container-aside" :style="{ <div
width:asideWidth, flex-box="0"
opacity: this.searchActive ? 0.5 : 1 ref="aside"
}"> class="d2-theme-container-aside"
:style="{
width: asideWidth,
opacity: this.searchActive ? 0.5 : 1,
}"
>
<d2-menu-side /> <d2-menu-side />
</div> </div>
<!-- 主体 --> <!-- 主体 -->
...@@ -51,7 +120,7 @@ ...@@ -51,7 +120,7 @@
<transition name="fade-scale"> <transition name="fade-scale">
<div class="d2-theme-container-main-layer" flex="dir:top"> <div class="d2-theme-container-main-layer" flex="dir:top">
<!-- 页面 --> <!-- 页面 -->
<div class="d2-theme-container-main-body" flex-box="1" > <div class="d2-theme-container-main-body" flex-box="1">
<!-- <bim></bim> --> <!-- <bim></bim> -->
<keep-alive :include="keepAlive"> <keep-alive :include="keepAlive">
<router-view /> <router-view />
...@@ -61,7 +130,7 @@ ...@@ -61,7 +130,7 @@
</transition> </transition>
</div> </div>
</div> </div>
<div style="z-index:9999!important;user-select:none;" class="mfooter"> <div style="z-index: 9999 !important; user-select: none" class="mfooter">
Copyright (C) 2009-2010. XXXXX信息工程有限公司 蜀ICP备1202XXXX号-1 Copyright (C) 2009-2010. XXXXX信息工程有限公司 蜀ICP备1202XXXX号-1
电话：86-028-689XXXX 传真：86-028-6893XXXX 电话：86-028-689XXXX 传真：86-028-6893XXXX
</div> </div>
......
src/pages/analysis/energy/page.vue
View file @ 16461ac9
...@@ -2,27 +2,53 @@ ...@@ -2,27 +2,53 @@
<div class="energy-page"> <div class="energy-page">
<cardList cardListTitle="能耗数据分析"> <cardList cardListTitle="能耗数据分析">
<div slot="right" > <div slot="right" >
<span <!-- <span
:class="activeIndex === index ? 'active-hight-linght' : ''" :class="activeIndex === index ? 'active-hight-linght' : ''"
class="date-text" class="date-text"
@click="activehandle(item, index)" @click="activehandle(item, index)"
v-for="(item, index) in dateList" v-for="(item, index) in dateList"
:key="item.value" :key="item.value"
>{{ item.label }}</span >{{ item.label }}</span
> > -->
<!-- <el-date-picker
size="mini"
type="daterange"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"
> -->
<!-- </el-date-picker> -->
<!-- <i style=" padding-left:20px;padding-right: 20px;color:#21acfc" class="el-icon-s-unfold"></i> -->
<!-- <i class="el-icon-printer" style="color:#21acfc"></i> -->
<el-button size="mini" type="primary" @click="toPowerPage">图形/列表</el-button>
</div>
<div slot="content" >
<div >
<!-- <enTabs :tabList="energyTabList"></enTabs> -->
<el-tabs class="en-tabs" v-model="activetap" >
<el-row style="padding-top:15px">
<el-col :span="10">
<span>时间范围：</span>
<el-date-picker <el-date-picker
size="mini"
type="daterange" type="daterange"
range-separator="～" range-separator="～"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> >
</el-date-picker> </el-date-picker>
<i style=" padding-left:20px;padding-right: 20px;color:#21acfc" class="el-icon-s-unfold"></i> </el-col>
<i class="el-icon-printer" style="color:#21acfc"></i> <el-col :span="4">
</div> <el-button type="primary" size="mini" icon="el-icon-search">查询</el-button>
<div slot="content" style="padding: 24px 28px 20px 23px"> </el-col>
<div style="margin-bottom: 20px"> </el-row>
<enTabs :tabList="energyTabList"></enTabs> <el-tab-pane
:label="item.label"
:name="item.value"
v-for="(item, index) in energyTabList"
:key="index"
></el-tab-pane>
</el-tabs>
</div> </div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
...@@ -35,20 +61,21 @@ ...@@ -35,20 +61,21 @@
</template> </template>
<script> <script>
import cardList from "../../home/compontents/cardList"; import cardList from "../../components/cardList";
import enTabs from '../../eq/hall/components/enTabs' import enTabs from "../../components/enTabs";
// import enTable from '../../eq/hall/components/enTable' // import enTable from '../../eq/hall/components/enTable'
import energyChart from '../../home/compontents/energyTotalCharts' import energyChart from "../../components/energyTotalCharts";
export default { export default {
name: "energypage", name: "energypage",
components: { components: {
cardList, cardList,
enTabs, enTabs,
energyChart energyChart,
}, },
data() { data() {
return { return {
activeIndex: 1, activeIndex: 1,
activetap: "01",
dateList: [ dateList: [
// { // {
// value: "01", // value: "01",
...@@ -71,7 +98,7 @@ export default { ...@@ -71,7 +98,7 @@ export default {
label: "全年", label: "全年",
}, },
], ],
energyTabList:[ energyTabList: [
{ {
value: "01", value: "01",
label: "全部", label: "全部",
...@@ -88,23 +115,27 @@ export default { ...@@ -88,23 +115,27 @@ export default {
value: "04", value: "04",
label: " 多联新风", label: " 多联新风",
}, },
] ],
}; };
}, },
methods: { methods: {
activehandle(item, index) { activehandle(item, index) {
this.activeIndex = index; this.activeIndex = index;
}, },
toPowerPage(){
this.$router.push({
path:'/kb/power'
})
},
}, },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.energy-page{ .energy-page {
padding:10px 10px 40px 10px; height: 100%;
.el-input__inner { padding: 0px 0px 40px 0px;
// height: 30px;
}
.date-text { .date-text {
padding-right: 20px; padding-right: 20px;
font-size: 14px; font-size: 14px;
...@@ -116,5 +147,5 @@ export default { ...@@ -116,5 +147,5 @@ export default {
.active-hight-linght { .active-hight-linght {
color: #21acfc; color: #21acfc;
} }
} }
</style> </style>
src/pages/analysis/fault/index.vue
View file @ 16461ac9
<template lang='pug'> <template lang='pug'>
card-warp(title="故障报警分析") card-warp(title="故障报警分析" height='45px' showBackground)
div(slot="right") div(slot="content")
span 时间范围： el-form(:inline='true' size="mini" )
el-date-picker.margin-lr-20( el-form-item(label='时间范围：')
el-date-picker(
size='mini' size='mini'
v-model="dateValue", v-model="dateValue",
type="daterange", type="daterange",
...@@ -14,7 +15,6 @@ card-warp(title="故障报警分析") ...@@ -14,7 +15,6 @@ card-warp(title="故障报警分析")
:picker-options="pickerOptions" :picker-options="pickerOptions"
) )
el-button(size='mini' type='primary') 查询 el-button(size='mini' type='primary') 查询
div(slot="content")
.echartsWarp(width="100%", flex) .echartsWarp(width="100%", flex)
//- div //- div
//- .title 设备故障统计 //- .title 设备故障统计
...@@ -98,7 +98,7 @@ export default { ...@@ -98,7 +98,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
height: calc(100vh - 260px); height: calc(100vh - 280px);
> div { > div {
width: 47%; width: 47%;
// height: calc(90% / 2); // height: calc(90% / 2);
......
src/pages/analysis/indoor/index.vue
View file @ 16461ac9
<template lang="pug"> <template lang="pug">
card-warp(title="室内气象分析" height='45px' ) card-warp(title="室内气象分析" height='45px' showBackground)
div(slot="right") div(slot="right")
//- span 时间范围： //- span 时间范围：
//- el-date-picker.margin-lr-20( //- el-date-picker.margin-lr-20(
......
src/pages/analysis/outdoor/index.vue
View file @ 16461ac9
<template lang="pug"> <template lang="pug">
card-warp(title="室外气象分析" height='45px' ) card-warp(title="室外气象分析" height='45px' showBackground)
div(slot="right") div(slot="right")
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-tabs.myTabs(v-model="activeName", @tab-click="tabClick")
el-tab-pane(label="候车室区域", name="1") el-tab-pane(label="候车室区域", name="1")
......
src/pages/home/compontents/cardList.vue → src/pages/components/cardList.vue
View file @ 16461ac9
...@@ -6,9 +6,11 @@ ...@@ -6,9 +6,11 @@
<slot name="right" /> <slot name="right" />
</div> </div>
</div> </div>
<div class="card-list-content">
<slot name="content" /> <slot name="content" />
</div> </div>
</div>
</template> </template>
<script> <script>
...@@ -30,6 +32,7 @@ export default { ...@@ -30,6 +32,7 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #fff; background: #fff;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
&-line { &-line {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -60,5 +63,9 @@ export default { ...@@ -60,5 +63,9 @@ export default {
// height: 16px; // height: 16px;
// background: #1890ff; // background: #1890ff;
// } // }
.card-list-content{
padding:20px;
height: calc( 155 - 40px );
}
} }
</style> </style>
src/pages/components/enTable.vue 0 → 100644
View file @ 16461ac9
<template>
<div class="en-table">
<el-table
border
stripe
:data="tableData"
style="width: 100%"
:header-cell-style="{
background: 'rgba(0, 151, 255, 0.08)',
color: '#333333',
}"
>
<el-table-column align="center" label="序号" width="100">
<template slot-scope="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<template v-for="(item, index) in tableColums">
<el-table-column
:key="index"
:prop="item.prop"
:label="item.label"
:width="item.width"
:align="item.align"
>
</el-table-column>
</template>
<el-table-column align="center" label="操作" width="150" >
<template slot-scope="scope" >
<slot name='operation' :scope='scope'></slot>
</template>
</el-table-column>
</el-table>
<div
v-if="isShowPage"
style="
display: flex;
justify-content: flex-end;
align-items: center;
line-height: 3;
"
>
<div class="record-color marg_r_18">共34860条记录</div>
<div class="record-color marg_r_8">共20页</div>
<div class="record-color">每页显示</div>
<!-- background -->
<el-pagination layout="sizes, prev, pager, next" :total="1000">
</el-pagination>
</div>
</div>
</template>
<script >
export default {
name: "enTable",
props: {
// ["", "tableColums",'isShowOp'.toString
tableData:{
type:Array,
},
tableColums:{
type:Array,
},
isShowOp:{
type:Boolean,
defaul:false,
},
isShowPage:{
defaul:true,
},
isEdit:{
defaul:true,
}
},
data() {
return {};
},
methods:{
handleClick(){
this.$emit('handleBtnClick')
}
}
};
</script>
<style lang="scss">
.record-color {
color: #0097ff;
}
.marg_r_18 {
margin-right: 18px;
}
.marg_r_8 {
margin-right: 8px;
}
.en-table{
.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li{
margin: 0 !important;
}
/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
color: #32a5ea !important;
background-color: red !important;
}
}
</style>
src/pages/eq/hall/components/enTabs.vue → src/pages/components/enTabs.vue
View file @ 16461ac9
<template> <template >
<div class="en-tabs"> <div class="en-tabs">
<ul class="ul-wrap"> <ul class="ul-wrap">
<li <li
...@@ -11,24 +11,35 @@ ...@@ -11,24 +11,35 @@
{{ item.label }} {{ item.label }}
</p> </p>
</li> </li>
</ul> </ul>
</div> </div>
</template> </template>
<script lang="ts"> <script >
import { Tabs } from 'element-ui';
export default { export default {
name: "elTabs", name: "elTabs",
props:['tabList'], props: ["tabList"],
data() { data() {
return { return {
isActiveIndex:0, isActiveIndex: 0,
activeName: 'second',
}; };
}, },
methods: { methods: {
tabHandle(item, index) { tabHandle(item, index) {
this.isActiveIndex = index; this.isActiveIndex = index;
this.$emit('tabHandle') // this.$emit("tabHandle");
}, },
}, },
}; };
...@@ -36,40 +47,37 @@ export default { ...@@ -36,40 +47,37 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.en-tabs {
.en-tabs{
.show-bar-border { .show-bar-border {
border-bottom: 2px solid #0097ff; border-bottom: 2px solid #0097ff;
}
.ul-wrap {
list-style: none;
margin: 0;
padding: 0;
display: flex;
color: #666;
background: rgba(229, 233, 236, 0.5);
border: 1px solid #e5e9ec;
font-size: 14px;
li {
position: relative;
padding: 0 71px;
cursor: pointer;
p {
margin: 0;
padding: 0;
padding-bottom: 14px;
padding-top: 15px;
box-sizing: border-box;
}
} }
.isActive {
background: #fff;
color: #0097ff;
}
}
// .ul-wrap {
// list-style: none;
// margin: 0;
// padding: 0;
// display: flex;
// color: #666;
// background: rgba(229, 233, 236, 0.5);
// border: 1px solid #e5e9ec;
// font-size: 14px;
// li {
// position: relative;
// padding: 0 71px;
// cursor: pointer;
// p {
// margin: 0;
// padding: 0;
// padding-bottom: 14px;
// padding-top: 15px;
// box-sizing: border-box;
// }
// }
// .isActive {
// background: #fff;
// color: #0097ff;
// }
// }
} }
......
src/pages/home/compontents/myPies.vue → src/pages/components/myPies.vue
View file @ 16461ac9
...@@ -13,6 +13,7 @@ export default { ...@@ -13,6 +13,7 @@ export default {
}; };
}, },
mounted() { mounted() {
this.initPie(); this.initPie();
}, },
......
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