Commit 10664568 authored by xiexingan's avatar xiexingan

Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

parents 16461ac9 ffc8e0e8
<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="100" v-if="isShowOp">
<template slot-scope="scope">
<el-button type="text" size="small">编辑</el-button>
</template>
</el-table-column>
</el-table>
<div
style="
display: flex;
justify-content: flex-end;
align-items: center;
line-height: 3;
"
>
<div style=" ;" class="record-color marg_r_18">共34860条记录</div>
<div class="record-color marg_r_8">共20页</div>
<div class="record-color">每页显示</div>
<el-pagination layout="sizes, prev, pager, next" background :total="1000">
</el-pagination>
</div>
</div>
</template>
<script >
export default {
name: "enTable",
props: ["tableData", "tableColums",'isShowOp'],
data() {
return {};
},
};
</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;
}
}
</style>
<template>
<el-dialog title="编辑" :visible.sync="hallModalVisible" :append-to-body="true">
<el-form >
<el-form-item label="设定频率:" :label-width="formLabelWidth">
<el-input size="mini" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="启动控制:" :label-width="formLabelWidth">
<el-switch ></el-switch>
</el-form-item>
</el-form>
<div slot="footer" >
<el-button @click="cancelhandle">取 消</el-button>
<el-button type="primary" @click="cancelhandle">确 定</el-button>
</div>
</el-dialog>
</template>
<script lang="ts">
export default {
name: "hallModal",
props: ["hallModalVisible"],
data() {
return {
formLabelWidth:'120px',
};
},
methods:{
cancelhandle(){
this.$emit('cancelhandle')
}
}
};
</script>
<template>
<div class="hall full-height">
<cardList cardListTitle="候车大厅控制">
<div slot="content" style="padding: 24px 28px 20px 23px">
<div slot="content" >
<div>
<el-row>
<el-form :inline="true" :model="formData" label-width="100">
<el-col :md="14" :lg="13">
<el-row>
<el-col :span="12">
<el-form-item label="定时功能启止时间:">
<el-date-picker
size="mini"
style="width: 200px"
type="date"
placeholder=""
......@@ -15,6 +17,7 @@
</el-date-picker>
<span style="padding: 0 10px"></span>
<el-date-picker
size="mini"
style="width: 200px"
type="date"
placeholder=""
......@@ -22,14 +25,13 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :md="12" :lg="4">
<el-col :span="4">
<el-form-item label="定时设定按钮:">
<el-switch active-color="#0097FF" inactive-color="#ff4949">
</el-switch>
</el-form-item>
</el-col>
<el-col :md="12" :lg="5">
<el-col :span="5">
<el-form-item label="温度设定:">
<el-input
style="width: 124px"
......@@ -40,7 +42,10 @@
<!-- <el-button type="primary" >查询</el-button> -->
</el-form-item>
</el-col>
<el-col :md="12" :lg="4">
</el-row>
<el-row>
<el-col :md="12" :lg="4">
<el-form-item label="节能模式:">
<el-switch
active-color="#13ce66"
......@@ -51,41 +56,60 @@
<el-col :md="12" :lg="10">
<el-form-item label="">
<el-button type="" size="small">编辑</el-button>
<el-button type="" size="small">自然通风</el-button>
<el-button type="" size="small">机械通风</el-button>
<el-button type="" size="small">供暖</el-button>
<el-button type="primary" size="mini">编辑</el-button>
<el-button type="primary" size="mini">自然通风</el-button>
<el-button type="primary" size="mini">机械通风</el-button>
<el-button type="primary" size="mini">供暖</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-row>
</div>
<!-- tabs -->
<div style="margin-bottom: 20px">
<en-tabs :tabList="tabList"></en-tabs>
<!-- <en-tabs :tabList="tabList"></en-tabs> -->
<div>
<el-tabs class="en-tabs" v-model="activeTab" >
<el-tab-pane
:label="item.label"
:name="item.value"
v-for="(item, index) in tabList"
:key="index"
></el-tab-pane>
</el-tabs>
</div>
</div>
<!-- table -->
<enTable :tableData="tableData" :tableColums="tableColums" isShowOp="true"></enTable>
<enTable v-on:handleBtnClick="handleBtnClick" :tableData="tableData" :tableColums="tableColums" :isShowOp="true" isShowPage="true">
<template v-slot:operation='scope'>
<el-button type="text" @click="hallModalVisible=true">编辑</el-button>
</template>
</enTable>
</div>
</cardList>
<hall-modal v-on:cancelhandle="cancelhandle" :hallModalVisible="hallModalVisible"></hall-modal>
hallModalVisible
</div>
</template>
<script>
import cardList from "../../home/compontents/cardList";
import enTable from "./components/enTable";
import enTabs from './components/enTabs'
import cardList from "../../components/cardList";
import enTable from "../../components/enTable";
import enTabs from '../../components/enTabs'
import hallModal from './components/hallModal'
const tableColums = [
{
align: "center",
prop: "A",
label: "设备名称",
width: 132,
width: 112,
},
{
align: "center",
prop: "B",
label: "设备描述",
width: 112,
// width: 112,
},
{
align: "center",
......@@ -224,12 +248,13 @@ export default {
cardList,
enTable,
enTabs,
hallModal,
},
data() {
return {
tableColums,
tableData,
activeTab:'01',
formData: {},
tabList: [
{
......@@ -249,21 +274,32 @@ export default {
label: " 水泵",
},
],
hallModalVisible:false,
};
},
methods: {
cancelhandle(){
this.$nextTick(()=>{
this.hallModalVisible = false
})
},
handleBtnClick(){
this.hallModalVisible = true
}
},
};
</script>
<style lang="scss" >
.hall {
height: 100%;
padding:10px 10px 40px 10px;
padding:0px 0 40px 0px;
.el-input__inner {
height: 30px;
}
.el-form-item{
margin-bottom: 10px;
}
.el-form-item__label {
padding: 0;
}
......
export const tableColumsOne = [
{
align: "center",
prop: "A",
label: "设备名称",
width: 132,
},
{
align: "center",
prop: "B",
label: "设备位置",
// width: 112,
},
{
align: "center",
prop: "C",
label: "控制方式",
width: 132,
},
{
align: "center",
prop: "D",
label: "能耗统计",
width: 182,
},
{
align: "center",
prop: "E",
label: "设备编号",
width: 132,
},
];
export const tableDataOne = [
{
A: "多联空调A1",
B: "左侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: "多联空调A2",
B: "左侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: "多联空调A3",
B: "左侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: "多联空调A4",
B: "左侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: "多联空调A5",
B: "左侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: " 多联空调A4",
B: "左侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: " 多联空调A4",
B: "左侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: " 多联空调A4",
B: "右侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: " 多联空调A4",
B: "右侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: "多联空调A10",
B: "右侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: "多联空调A",
B: "左侧办公房屋",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
];
export const tableDataTwo = [
{
A: "多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLX-1'
},
{
A: "多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLX-1'
},
{
A: "多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLX-1'
},
{
A: "多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLX-1'
},
{
A: "多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLX-1'
},
{
A: " 多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLW-A1'
},
{
A: " 多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLX-1'
},
{
A: " 多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLX-1'
},
{
A: " 多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLX-1'
},
{
A: "多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLX-1'
},
{
A: "多联新风",
B: "屋面",
C: "开/关/设定温度",
D: "今日用电量/本月用电量",
E:'DLX-1'
},
];
export const tableDataThree = [
{
A: "机房空调",
B: "通信机械室",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: "机房空调",
B: "通信机械室",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: "机房空调",
B: "通信机械室",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: "机房空调",
B: "通信机械室",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: "机房空调",
B: "通信机械室",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: " 机房空调",
B: "通信机械室",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: " 机房空调",
B: "通信机械室",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: " 机房空调",
B: "通信机械室",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: " 机房空调",
B: "右侧办公房屋",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: "信息机房",
B: "右侧办公房屋",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: "信息机房",
B: "左侧办公房屋",
C: "显示状态",
D: "今日用电量/本月用电量",
E:'JK-1'
},
];
export const tableDataFour = [
{
A: "排风机",
B: "售票厅",
C: "开/关",
D: "今日用电量/本月用电量",
E:'PF-B5'
},
{
A: "排风机",
B: "消防泵房",
C: "开/关",
D: "今日用电量/本月用电量",
E:'PF-B4'
},
{
A: "排风机",
B: "车站备品间",
C: "开/关",
D: "今日用电量/本月用电量",
E:'厕所排风机1#'
},
{
A: "排风机",
B: "候车厅公共卫生间",
C: "开/关",
D: "今日用电量/本月用电量",
E:'厕所排风机2#'
},
{
A: "排风机",
B: "出站通道公共卫生间",
C: "开/关",
D: "今日用电量/本月用电量",
E:'厕所排风机3#'
},
{
A: " 换气扇",
B: "吸氧间",
C: "开/关",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: " 换气扇",
B: "吸氧间",
C: "开/关",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: " 换气扇",
B: "吸氧间",
C: "开/关",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: " 换气扇",
B: "吸氧间",
C: "开/关",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: "换气扇",
B: "站长室",
C: "开/关",
D: "今日用电量/本月用电量",
E:'JK-1'
},
{
A: "换气扇",
B: "VIP候车室",
C: "开/关",
D: "今日用电量/本月用电量",
E:'JK-1'
},
];
\ No newline at end of file
<template>
<div class="office-area-control" style=" padding:10px 10px 40px 10px;">
<div class="office-area-control" style="padding:0 0 40px 0">
<cardList cardListTitle="办公区域控制">
<div slot="content" style="padding: 24px 28px 20px 23px">
<enTabs :tabList="officeTabList"></enTabs>
<div slot="content" >
<!-- <enTabs :tabList="officeTabList"></enTabs> -->
<el-tabs class="en-tabs" v-model="activeTab" >
<el-tab-pane
:label="item.label"
:name="item.value"
v-for="(item, index) in officeTabList"
:key="index"
></el-tab-pane>
</el-tabs>
<div style="margin-top: 20px"></div>
<en-table :tableData="tableData" :tableColums="tableColums" isShowOp="true"> </en-table>
<en-table :tableData="tableData" :tableColums="tableColums" :isShowOp="true" isShowPage="true">
<template v-slot:operation='scope'>
<el-button type="text">编辑</el-button>
</template>
</en-table>
</div>
</cardList>
</div>
</template>
<script >
const tableColums = [
{
align: "center",
prop: "A",
label: "设备名称",
width: 132,
},
{
align: "center",
prop: "B",
label: "设备描述",
width: 112,
},
{
align: "center",
prop: "C",
label: "运行状态",
width: 132,
},
{
align: "center",
prop: "D",
label: "当前频率",
width: 132,
},
{
align: "center",
prop: "E",
label: "故障报警",
width: 132,
},
{
align: "center",
prop: "F",
label: "说明",
width: 132,
},
{
align: "center",
prop: "G",
label: "设备编号",
width: 132,
},
];
const tableData = [
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
{
A: "A",
B: "YA01254N51",
C: "正常",
D: "110Hz",
E: "",
F: "说明",
G: "QY0001",
},
];
import cardList from "../../home/compontents/cardList";
import enTabs from "../hall/components/enTabs";
import enTable from "../hall/components/enTable";
// const tableColums = [
// {
// align: "center",
// prop: "A",
// label: "设备名称",
// width: 132,
// },
// {
// align: "center",
// prop: "B",
// label: "设备位置",
// // width: 112,
// },
// {
// align: "center",
// prop: "C",
// label: "控制方式",
// width: 132,
// },
// {
// align: "center",
// prop: "D",
// label: "能耗统计",
// width: 132,
// },
// // {
// // align: "center",
// // prop: "E",
// // label: "故障报警",
// // width: 132,
// // },
// // {
// // align: "center",
// // prop: "F",
// // label: "说明",
// // width: 132,
// // },
// {
// align: "center",
// prop: "G",
// label: "设备编号",
// width: 132,
// },
// ];
// const tableData = [
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// {
// A: "A",
// B: "YA01254N51",
// C: "正常",
// D: "110Hz",
// E: "",
// F: "说明",
// G: "QY0001",
// },
// ];
import cardList from "../../components/cardList";
import enTabs from "../../components/enTabs";
import enTable from "../../components/enTable";
import { tableDataOne,tableColumsOne ,tableDataTwo,tableDataThree,tableDataFour} from './config'
export default {
name: "officeAreaControl",
components: {
......@@ -165,10 +179,12 @@ export default {
enTabs,
enTable,
},
data() {
return {
tableData,
tableColums,
activeTab:'01',
tableData:tableDataOne,
tableColums:tableColumsOne,
officeTabList: [
{
value: "01",
......@@ -189,5 +205,27 @@ export default {
],
};
},
watch:{
activeTab(val){
switch (val){
case '01':
this.tableColums = tableColumsOne
this.tableData = tableDataOne
break;
case '02':
this.tableColums = tableColumsOne
this.tableData = tableDataTwo
break;
case '03':
this.tableColums = tableColumsOne
this.tableData = tableDataThree
break;
case '04':
this.tableColums = tableColumsOne
this.tableData = tableDataFour
break;
}
}
}
};
</script>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -22,7 +22,7 @@
</div>
</div>
<div class="home-page-content" >
<el-row :gutter="14" >
<el-row :gutter="12" >
<el-col :span="16" >
<card-list :cardListTitle="cardListLeftTitle">
<div slot="right">
......@@ -107,7 +107,7 @@
</div>
</card-list>
</el-col>
<el-col :span="8">
<el-col :span="8" style="padding-left:0">
<card-list :cardListTitle="cardListRightTitle" >
<div slot="content">
<my-pies></my-pies>
......@@ -120,9 +120,9 @@
</template>
<script>
import cardList from "./compontents/cardList";
import energyTotalCharts from "./compontents/energyTotalCharts";
import myPies from "./compontents/myPies";
import cardList from "../components/cardList";
import energyTotalCharts from "../components/energyTotalCharts";
import myPies from "../components/myPies";
// import CardList from './compontents/cardList.vue';
export default {
name: "home",
......@@ -194,29 +194,30 @@ export default {
},
};
</script>
<style lang="scss" scoped>
@import "~@/assets/style/public.scss";
.home-page {
height: 100%;
width: 100%;
padding:10px 10px 40px 10px;
padding:0px 0px 40px 0px;
// overflow: auto;
&-top {
margin: 20px;
margin-bottom: 24px;
.f-group {
width: 100%;
display: flex;
.f-item {
box-sizing: border-box;
width: calc(20% - 19px);
width: calc(20% - 18px);
height: 216px;
margin-right: 24px;
padding-top: 40px;
background-color: #fff;
text-align: center;
box-shadow: 4px 0px 4px 0px rgba(0, 0, 0, 0.05);
// box-shadow: 4px 0px 4px 0px rgba(0, 0, 0, 0.05);
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
img {
width: 50px;
height: 50px;
......@@ -246,6 +247,7 @@ export default {
}
.home-page-content {
margin: 20px;
.date-text {
padding-right: 20px;
font-size: 14px;
......@@ -259,6 +261,7 @@ export default {
}
.content-wrap {
// margin: 20px;
.energy-save-mode-wrap {
// width: ;
box-sizing: border-box;
......
......@@ -14,18 +14,18 @@ card-warp(title="室内气象数据" height='45px' showBackground )
el-button(type='primary' size='mini') 查询
.data-warp
div.data-item
p.type 温度
p.color-blue
div.type 温度
div.color-blue
span.num 37
span.unit ℃
div.data-item
p.type 湿度
p.color-cyan
div.type 湿度
div.color-cyan
span.num 25
span.unit %RH
div.data-item()
p.type CO2
p.color-green
div.type CO2
div.color-green
span.num 17
span.unit PPM
el-table(size="mini" :data='dataList' stripe v-loading='dataListLoading' style='width: 100%;' :header-cell-style="{ background: '#EEF8FF', color: '#333333' }")
......@@ -113,21 +113,19 @@ components: {
border: 1px solid #ECECEC;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.08);
.type{
height: 19px;
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #333333;
line-height: 60px;
padding-top: 38px;
}
.num{
height: 28px;
font-size: 36px;
font-family: PingFang SC;
font-weight: 600;
color: #21ACFC;
line-height: 60px;
padding-top: 12px;
}
.unit{
height: 15px;
......
......@@ -12,9 +12,9 @@ card-warp(title="室外气象数据" height='45px' showBackground )
el-button(type='primary' size='mini') 查询
.data-warp
div.data-item(v-for='item in typeList')
p.type {{item.type}}
p.color-blue
span.num mock
div.type {{item.type}}
div.color-blue
span.num sss
span.unit 11
div.clearfix
el-button(size='mini' type='primary' style='float:right;margin-bottom:10px;' @click='toggle') 图形 / 列表
......@@ -149,28 +149,25 @@ export default {
border: 1px solid #ECECEC;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.08);
.type{
height: 19px;
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #333333;
line-height: 60px;
padding-top: 38px;
}
.num{
height: 28px;
font-size: 36px;
font-family: PingFang SC;
font-weight: 600;
color: #21ACFC;
line-height: 60px;
}
.unit{
height: 15px;
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: 400;
}
.num{
font-size: 36px;
font-family: PingFang SC;
font-weight: 600;
color: #21ACFC;
// padding-top: 26px;
}
.unit{
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: 400;
}
}
}
.echartsWarp {
......
<template>
<el-dialog
title="历史数据"
:visible.sync="historyDataModalVisible"
:append-to-body="true"
>
<el-form :inline="true">
<el-form-item label="设备名称:" :label-width="formLabelWidth">
<el-input size="mini" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="设备编号:" :label-width="formLabelWidth">
<el-input size="mini" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="数据起止阶段:" :label-width="formLabelWidth">
<el-date-picker style="width:157px" size="mini" type="date" placeholder="">
</el-date-picker>
<span style="padding:0 10px"></span>
<el-date-picker style="width:157px" size="mini" type="date" placeholder="">
</el-date-picker>
</el-form-item>
<el-form-item >
<el-button size='mini' type="primary" icon="el-icon-search" >查询</el-button>
<el-button size='mini' type="primary" icon="el-icon-download">导出</el-button>
</el-form-item>
</el-form>
<enTable :tableData="historyData" :tableColums="tableColums"></enTable>
<div slot="footer">
<el-button @click="cancelhandle">取 消</el-button>
<el-button type="primary" @click="cancelhandle">确 定</el-button>
</div>
</el-dialog>
</template>
<script >
import enTable from '../../../components/enTable'
const historyData = [
]
const tableColums = [
{
label:'功率',
prop:'qq',
width:200,
align:'center'
},
{
label:'设备状态',
prop:'ww',
width:200,
align:'center'
},
{
label:'采集时间',
prop:'ee',
// width:200,
align:'center'
}
]
export default {
name: "historyDataModal",
props: ["historyDataModalVisible"],
components:{
enTable
},
data() {
return {
formLabelWidth: "110px",
historyData,
tableColums,
};
},
methods: {
cancelhandle() {
this.$emit("cancelhandle");
},
},
};
</script>
<template>
<el-dialog
title="统计图表"
:visible.sync="statisticModalVisible"
:append-to-body="true"
>
<el-form :inline="true">
<el-form-item label="设备名称:" label-width="formLabelWidth">
<el-input size="mini" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="设备编号:" label-width="formLabelWidth">
<el-input size="mini" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="数据起止阶段:" label-width="formLabelWidth">
<el-date-picker
style="width: 157px"
size="mini"
type="date"
placeholder=""
>
</el-date-picker>
<span style="padding: 0 10px"></span>
<el-date-picker
style="width: 157px"
size="mini"
type="date"
placeholder=""
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button size="mini" type="primary" icon="el-icon-search"
>查询</el-button
>
</el-form-item>
</el-form>
<div id="categoryId" style="height: 200px"></div>
<div slot="footer">
<el-button @click="cancelhandlePic">取 消</el-button>
<el-button type="primary" @click.stop="cancelhandlePic">确 定</el-button>
</div>
</el-dialog>
</template>
<script lang="ts">
export default {
name: "statisticPicTableModal",
props: ["statisticModalVisible"],
data() {
return {
formLabelWidth: "120px",
category: null,
};
},
// watch: {
// statisticModalVisible(value) {
// if (value) {
// }
// },
// },
mounted() {
setTimeout(() => {
this.initCategory();
}, 3000);
},
methods: {
cancelhandlePic() {
this.$emit("cancelhandlePic");
},
initCategory() {
let gId = document.getElementById("categoryId");
this.category = this.$echarts.init(gId);
const option = {
xAxis: {
type: "category",
data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
},
yAxis: {
type: "value",
},
series: [
{
data: [150, 230, 224, 218, 135, 147, 260],
type: "line",
},
],
};
this.category.setOption(option);
},
},
};
</script>
......@@ -2,26 +2,37 @@
<div class="use-electro-data">
<cardList cardListTitle="用电数据">
<div slot="right">
<i class="el-icon-menu"></i>
<!-- <i class="el-icon-menu"></i> -->
<el-button size="mini" @click="toEnergyPage" type="primary">综合图形</el-button>
</div>
<div slot="content" style="padding: 24px 28px 20px 23px">
<enTabs :tabList="electroTabList" ></enTabs>
<div style="margin-top:15px">
<el-form :inline="true" :model="formInline" style="text-align:center">
<div slot="content">
<!-- <enTabs ></enTabs> -->
<div>
<el-tabs class="en-tabs" v-model="activeTab" >
<el-tab-pane
:label="item.label"
:name="item.value"
v-for="(item, index) in electroTabList"
:key="index"
></el-tab-pane>
</el-tabs>
</div>
<div>
<el-form :inline="true">
<el-row>
<el-col :span="7">
<el-form-item label="设备名称:">
<el-input size="mini" placeholder=""></el-input>
<el-input size="mini" placeholder=""></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="设备编号:">
<el-input size="mini" placeholder=""></el-input>
<el-input size="mini" placeholder=""></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="运行状态:">
<el-select size="mini" placeholder="">
<el-select size="mini" placeholder="">
<el-option label="正常" value="shanghai"></el-option>
<el-option label="不正常" value="beijing"></el-option>
</el-select>
......@@ -29,23 +40,44 @@
</el-col>
<el-col :span="3">
<el-form-item>
<el-button icon="el-icon-search" size="mini" type="primary" @click="onSubmit">查询</el-button>
<el-button icon="el-icon-search" size="mini" type="primary"
>查询</el-button
>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<enTable :tableColums="tableColums" :tableData="tableData" isShowOp="true"></enTable>
<enTable
:tableColums="tableColums"
:tableData="tableData"
:isShowOp="true"
isShowPage="true"
>
<template v-slot:operation='scope'>
<el-button type="text" @click="openHistoryHandle">历史数据</el-button>
<el-button type="text" @click="openPicTHandle">统计图表</el-button>
</template>
</enTable>
</div>
</cardList>
<history-data-modal
:historyDataModalVisible="historyDataModalVisible"
v-on:cancelhandle="cancelhandle"
></history-data-modal>
<statistic-pic-table-modal
:statisticModalVisible="statisticModalVisible"
v-on:cancelhandlePic="cancelhandlePic"
></statistic-pic-table-modal>
</div>
</template>
<script >
import cardList from "../../home/compontents/cardList";
import enTabs from "../../eq/hall/components/enTabs";
import enTable from "../../eq/hall/components/enTable";
import cardList from "../../components/cardList";
import enTabs from "../../components/enTabs";
import enTable from "../../components/enTable";
import historyDataModal from "./components/historyDataModal";
import statisticPicTableModal from "./components/statisticPicTableModal";
const tableColums = [
{
align: "center",
......@@ -82,9 +114,6 @@ const tableColums = [
prop: "E",
label: "设备状态",
},
];
const tableData = [
{
......@@ -193,9 +222,14 @@ export default {
cardList,
enTabs,
enTable,
historyDataModal,
statisticPicTableModal,
},
data() {
return {
activeTab: "01",
historyDataModalVisible: false,
statisticModalVisible: false,
tableColums,
tableData,
electroTabList: [
......@@ -218,15 +252,43 @@ export default {
],
};
},
methods: {
cancelhandle() {
this.$nextTick(() => {
this.historyDataModalVisible = false;
});
},
cancelhandlePic() {
this.$nextTick(() => {
this.statisticModalVisible = false;
});
},
openHistoryHandle(){
this.historyDataModalVisible = true;
},
openPicTHandle(){
this.$nextTick(()=>{
this.statisticModalVisible = true;
})
},
toEnergyPage(){
this.$router.push({
path:'/analysis/energy'
})
},
},
};
</script>
<style lang="scss">
.use-electro-data{
padding:10px 10px 40px 10px;
.el-form-item{
margin-bottom: 15px;
.use-electro-data {
padding: 0px 0 40px 0px;
.el-form-item {
margin-bottom: 15px;
margin-top: 15px;
}
}
}
</style>
\ No newline at end of file
......@@ -42,7 +42,8 @@ const frameIn = [
component: layoutHeaderAside,
children: (pre => [
{ path: 'hall', name: `${pre}hall`, component: () => import('@/pages/eq/hall'), meta: { ...meta, title: '候车大厅控制' } },
{ path: 'office', name: `${pre}office`, component: () => import('@/pages/eq/office'), meta: { ...meta, title: '办公区域控制' } }
{ path: 'office', name: `${pre}office`, component: () => import('@/pages/eq/office'), meta: { ...meta, title: '办公区域控制' } },
{ path: 'view', name: `${pre}view`, component: () => import('@/pages/eq/view'), meta: { ...meta, title: '设备概览' } }
])('eq-')
},
......
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