Skip to content

E
energyai_vue
Commit ebea3312 authored by 高超凡's avatar 高超凡
Browse files
Options

提交

parent 29e47021
Show whitespace changes
Inline Side-by-side
Showing with 194 additions and 235 deletions
src/assets/style/public.scss
View file @ ebea3312
......@@ -115,7 +115,7 @@ $el-bg-color-4: #F2F6FC;
// 表格大概样式
.hall,.office-area-control,.use-electro-data {
.el-table__row > td {
border: none;
// border: none;
}
th{
background: rgba(0, 151, 255, 0.08);
......
src/pages/eq/hall/page.vue
View file @ ebea3312
......@@ -53,79 +53,33 @@
width="40%"
>
<div v-if="isSaving == 1">
<el-row :gutter="5">
<el-col :span="5">
<el-form-item label="温度设定(℃)："></el-form-item>
</el-col>
<el-col :span="5">
<el-input
size="mini"
v-model="formData.temperature"
clearable=""
></el-input>
</el-col>
<el-col :span="4">
<el-button
type="primary"
size="mini"
@click="changeTemperature()"
>确定</el-button
>
</el-col>
<el-form :inline="true">
<el-row>
<el-form-item label="温度设定(℃)：">
<el-input size="mini" v-model="formData.temperature" clearable="" ></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini" @click="changeTemperature()">确定</el-button>
</el-form-item>
</el-row>
<el-row :gutter="5">
<el-col :span="5">
<el-form-item label="定时功能启止时间：" />
</el-col>
<el-col :span="10">
<el-time-select
style="width: 40%"
size="mini"
placeholder="起始时间"
v-model="formData.startTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '24:00'
}"
>
<el-row>
<el-form-item label="定时功能启止时间：">
<el-time-select size="mini" placeholder="起始时间" v-model="formData.startTime"
:picker-options="{ start: '00:00',step: '00:15',end: '24:00'}">
</el-time-select>
<span style="padding: 0 10px">至</span>
<el-time-select
style="width: 40%"
size="mini"
placeholder="结束时间"
v-model="formData.endTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '24:00',
minTime: formData.startTime
}"
>
<el-time-select size="mini" placeholder="结束时间" v-model="formData.endTime"
:picker-options="{ start: '00:00',step: '00:15',end: '24:00',minTime: formData.startTime}">
</el-time-select>
</el-col>
<el-col :span="4">
<div
class="switch-warp"
style="transform: translateY(5px)"
>
<div
:class="[isOpen == 1 ? 'on' : '']"
@click="setSendTime(1)"
>
开
</div>
<div
:class="[isOpen == 2 ? 'on' : '']"
@click="setSendTime(2)"
>
关
</div>
</el-form-item>
<el-form-item>
<div class="switch-warp" style="transform: translateY(5px)" >
<div :class="[isOpen == 1 ? 'on' : '']" @click="setSendTime(1)" > 开 </div>
<div :class="[isOpen == 2 ? 'on' : '']" @click="setSendTime(2)" > 关 </div>
</div>
</el-col>
</el-form-item>
</el-row>
</el-form>
</div>
</el-dialog>
</el-form-item>
......@@ -148,7 +102,7 @@
</div>
</div>
<!-- table -->
<table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='3' :showStateColor='true' :currentMode='currentId && active ? currentId :null'>
<table-list :tableColums='tableColums' :tableData='tableData' :showOpr='true' :opNum='3' :showStateColor='true' :currentMode='currentId && active ? currentId : null'>
<template v-slot:operation="scope">
<el-button
type="text"
......@@ -751,7 +705,10 @@ export default {
background: #4cb527 !important;
border: 1px solid transparent;
}
// .el-table__body-wrapper {
// height: 400px;
// }
.el-table__body-wrapper {
min-height: 400px;
}
.el-input.el-date-editor{
width: 110px;
}
</style>
src/pages/eq/view/index.vue
View file @ ebea3312
......@@ -189,10 +189,7 @@ export default {
this.initResourceTypeDicList()
},
mounted(){
document.body.addEventListener('click',()=>{
console.log('触发');
this.queryDetailVisible = false;
},false);
},
methods: {
// 初始化地图
......@@ -957,6 +954,10 @@ export default {
this.$nextTick(() => {
this.$refs.queryDetail.init(id, this.checkedData.sId)
})
document.querySelector('canvas').addEventListener('click',()=>{
console.log('触发');
this.queryDetailVisible = false;
},false);
},
closeQueryDetailVisible() {
......
src/pages/kb/indoor/index.vue
View file @ ebea3312
<template lang="pug">
card-warp(title="室内气象数据", height="45px", showBackground)
el-container(style="padding:0px;height:77.6vh;")
card-warp(title="室内气象数据", height="45px", showBackground)
div(slot="right")
router-link(:to="{ name: 'analysis-indoor' }")
el-button(size="mini", type="primary") 综合图形
......@@ -38,103 +39,104 @@ card-warp(title="室内气象数据", height="45px", showBackground)
span.num(v-if="activeName == 1") {{ hcdtSnqx.carbon_dioxide }}
span.num(v-else) {{ currentRow.carbon_dioxide?currentRow.carbon_dioxide:'-- ' }}
span.unit PPM
el-table(
size="mini",
:data="dataList",
stripe,
highlight-current-row,
@current-change="handleCurrentChange",
v-loading="dataListLoading",
style="width: 100%",
:header-cell-style="{ background: '#EEF8FF', color: '#333333' }"
)
el-table-column(
:resizable="false",
type="index",
header-align="center",
align="center",
width="50",
label="序号"
)
el-table-column(
:resizable="false",
prop="deployLocation",
header-align="center",
align="center",
width="240",
label="设备位置"
)
el-table-column(
:resizable="false",
prop="code",
header-align="center",
align="center",
width="240",
label="设备编号"
)
el-table-column(
:resizable="false",
prop="name",
header-align="center",
align="center",
width="240",
label="设备名称"
)
el-table-column(
:resizable="false",
prop="temperature",
header-align="center",
align="center",
width="240",
label="温度(℃)"
)
el-table-column(
:resizable="false",
prop="humidity",
header-align="center",
align="center",
label="湿度(%RH)"
)
el-table-column(
:resizable="false",
prop="carbon_dioxide",
header-align="center",
align="center"
)
span(slot="header")
span CO
sub 2
span ( PPM )
el-table-column(
:resizable="false",
prop="statusName",
header-align="center",
align="center",
label="设备状态"
)
el-table-column(
:resizable="false",
header-align="center",
align="center",
width="180",
label="操作"
)
template(slot-scope="scope")
el-button(
type="text",
size="small",
@click="showParams(scope.row, 1)"
) 历史数据
el-button(
type="text",
size="small",
@click="showParams(scope.row, 2)"
) 统计图表
tablePagination(
:pageSize="pageSize",
:totalSize="totalPage",
@parentMethod="getDataList"
)
table-list(:tableColums='tableHeader' :tableData='dataList' :isShowOp="true" :opNum='4')
template(#operation='data')
el-button(type='text' size='small' @click="showParams(scope.row, 1)") 历史数据
el-button(type='text' size='small' @click="showParams(scope.row, 2)") 统计图表
//- el-table(
//- size="mini",
//- :data="dataList",
//- stripe,
//- highlight-current-row,
//- @current-change="handleCurrentChange",
//- v-loading="dataListLoading",
//- style="width: 100%",
//- :header-cell-style="{ background: '#EEF8FF', color: '#333333' }"
//- )
//- el-table-column(
//- :resizable="false",
//- type="index",
//- header-align="center",
//- align="center",
//- width="50",
//- label="序号"
//- )
//- el-table-column(
//- :resizable="false",
//- prop="deployLocation",
//- header-align="center",
//- align="center",
//- width="240",
//- label="设备位置"
//- )
//- el-table-column(
//- :resizable="false",
//- prop="code",
//- header-align="center",
//- align="center",
//- width="240",
//- label="设备编号"
//- )
//- el-table-column(
//- :resizable="false",
//- prop="name",
//- header-align="center",
//- align="center",
//- width="240",
//- label="设备名称"
//- )
//- el-table-column(
//- :resizable="false",
//- prop="temperature",
//- header-align="center",
//- align="center",
//- width="240",
//- label="温度(℃)"
//- )
//- el-table-column(
//- :resizable="false",
//- prop="humidity",
//- header-align="center",
//- align="center",
//- label="湿度(%RH)"
//- )
//- el-table-column(
//- :resizable="false",
//- prop="carbon_dioxide",
//- header-align="center",
//- align="center"
//- )
//- span(slot="header")
//- span CO
//- sub 2
//- span ( PPM )
//- el-table-column(
//- :resizable="false",
//- prop="statusName",
//- header-align="center",
//- align="center",
//- label="设备状态"
//- )
//- el-table-column(
//- :resizable="false",
//- header-align="center",
//- align="center",
//- width="180",
//- label="操作"
//- )
//- template(slot-scope="scope")
//- el-button(
//- type="text",
//- size="small",
//- @click="showParams(scope.row, 1)"
//- ) 历史数据
//- el-button(
//- type="text",
//- size="small",
//- @click="showParams(scope.row, 2)"
//- ) 统计图表
el-footer.box_footer
tablePagination( :pageSize="pageSize" :totalSize="totalPage" @parentMethod="getDataList" )
history(
v-if="historyVisible",
ref="history",
......@@ -145,11 +147,13 @@ card-warp(title="室内气象数据", height="45px", showBackground)
<script>
import tablePagination from '@/pages/components/tablePagination'
import history from './history'
import tableList from '@/pages/components/tableList'
export default {
components: {
tablePagination,
history
history,
tableList,
},
data() {
return {
......@@ -161,7 +165,16 @@ export default {
dataListLoading: false,
pageSize: 10,
pageIndex: 1,
totalPage: 0
totalPage: 0,
tableHeader: [
{ label: '设备位置', prop: 'deployLocation', format: true },
{ label: '设备编号', prop: 'code', format: true },
{ label: '设备名称', prop: 'name', format: true },
{ label: '温度(℃)', prop: 'temperature', format: true },
{ label: '湿度(%RH)', prop: 'humidity', format: true },
{ label: 'CO₂(PPM)', prop: 'carbon_dioxide', format: true },
{ label: '设备状态', prop: 'statusName', format: true },
]
}
},
computed: {
......@@ -338,7 +351,4 @@ export default {
}
}
}
.el-table{
height: 350px;
}
</style>
src/pages/kb/power/page.vue
View file @ ebea3312
......@@ -86,11 +86,10 @@
</enTable> -->
</div>
</cardList>
<tablePagination
:pageSize="pageSize"
:totalSize="totalSize"
@parentMethod="getDataList"
></tablePagination>
<el-footer class="box_footer">
<tablePagination :pageSize="pageSize" :totalSize="totalSize" @parentMethod="getDataList">
</tablePagination></el-footer>
<history-data-modal
:historyDataModalVisible="historyDataModalVisible"
ref="historyDataModal"
......@@ -342,12 +341,4 @@ export default {
margin-top: 15px;
}
}
.box_main
/deep/.el-table
.el-table--fit
.el-table--striped
.el-table--enable-row-hover
.el-table--enable-row-transition {
border: 1px solid !important;
}
</style>
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