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