Skip to content

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

提交

parent 29e47021
Expand all Hide 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-row>
></el-input> <el-row>
</el-col> <el-form-item label="定时功能启止时间：">
<el-col :span="4"> <el-time-select size="mini" placeholder="起始时间" v-model="formData.startTime"
<el-button :picker-options="{ start: '00:00',step: '00:15',end: '24:00'}">
type="primary" </el-time-select>
size="mini" <span style="padding: 0 10px">至</span>
@click="changeTemperature()" <el-time-select size="mini" placeholder="结束时间" v-model="formData.endTime"
>确定</el-button :picker-options="{ start: '00:00',step: '00:15',end: '24:00',minTime: formData.startTime}">
> </el-time-select>
</el-col> </el-form-item>
</el-row> <el-form-item>
<div class="switch-warp" style="transform: translateY(5px)" >
<el-row :gutter="5"> <div :class="[isOpen == 1 ? 'on' : '']" @click="setSendTime(1)" > 开 </div>
<el-col :span="5"> <div :class="[isOpen == 2 ? 'on' : '']" @click="setSendTime(2)" > 关 </div>
<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-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>
</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> </div>
</div> </el-form-item>
</el-col> </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
This diff is collapsed.
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