Skip to content

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

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

parents a445702d e143c7dc
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 25 deletions
src/pages/components/enTable.vue
View file @ c86644fd
......@@ -21,6 +21,7 @@
:label="item.label"
:width="item.width"
:align="item.align"
show-overflow-tooltip
>
</el-table-column>
</template>
......
src/pages/eq/hall/config.js
View file @ c86644fd
......@@ -8,7 +8,8 @@
{
align: 'center',
prop: 'deployLocation',
label: '设备位置'
label: '设备位置',
width: 180
},
{
align: 'center',
......
src/pages/eq/hall/page.vue
View file @ c86644fd
......@@ -39,7 +39,13 @@
<!-- <img :src="item.src" alt="" /> -->
{{ item.name }}
</el-button>
<el-button style="margin-left:30px" type="info" size="mini" @click="timingControl">定时温控</el-button>
<el-button
style="margin-left: 30px"
type="primary"
size="mini"
@click="timingControl"
>定时温控</el-button
>
<el-dialog
title="定时温控"
:visible.sync="timingControlDialogVisible"
......@@ -52,20 +58,29 @@
<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-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-button
type="primary"
size="mini"
@click="changeTemperature()"
>确定</el-button
>
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="5">
<el-form-item label="定时功能启止时间："/>
<el-form-item label="定时功能启止时间：" />
</el-col>
<el-col :span="10">
<el-time-select
style="width:40%"
style="width: 40%"
size="mini"
placeholder="起始时间"
v-model="formData.startTime"
......@@ -78,7 +93,7 @@
</el-time-select>
<span style="padding: 0 10px">至</span>
<el-time-select
style="width:40%"
style="width: 40%"
size="mini"
placeholder="结束时间"
v-model="formData.endTime"
......@@ -90,14 +105,27 @@
}"
>
</el-time-select>
</el-col>
</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>
</el-col>
</el-row>
<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-row>
</div>
</el-dialog>
</el-form-item>
......@@ -282,8 +310,7 @@ export default {
}
],
hallModalVisible: false,
timingControlDialogVisible: false,
timingControlDialogVisible: false
}
},
computed: {
......@@ -444,7 +471,6 @@ export default {
}
},
getAllHcdt() {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/equipment/getAllHcdt'),
method: 'get'
......@@ -465,12 +491,24 @@ export default {
this.currentId = null
this.active = false
}
this.formData.temperature = data.sysSystemParams.temperature
}
})
},
getAllDswk() {
this.$http({
url: this.$http.adornUrl('/equipment/getAllDswk'),
method: 'get'
}).then((data) => {
if (data && data.code === 0) {
if (data.timedTask) {
this.formData.temperature = data.timedTask.temperature
this.formData.taskId = data.timedTask.id
this.formData.startTime = data.timedTask.startTime
this.formData.endTime = data.timedTask.endTime
this.isOpen = data.timedTask.status
} else {
this.formData = {}
this.isOpen = 2
}
}
})
......@@ -572,7 +610,7 @@ export default {
this.$message.success('关闭定时任务成功')
}
this.isOpen = type
this.getAllHcdt()
this.getAllDswk()
}
})
},
......@@ -590,13 +628,14 @@ export default {
}).then((data) => {
if (data && data.code === 0) {
this.$message.success('温度设定成功')
this.getAllHcdt()
this.getAllDswk()
}
})
},
// 定时温控
timingControl(){
timingControl() {
this.timingControlDialogVisible = true
this.getAllDswk()
}
}
}
......@@ -653,7 +692,7 @@ export default {
background: #4cb527 !important;
border: 1px solid transparent;
}
.el-table__body-wrapper{
.el-table__body-wrapper {
height: 400px;
}
</style>
src/pages/sys/commandlog/query-detail.vue
View file @ c86644fd
......@@ -16,7 +16,10 @@
<el-input size="medium" v-model='dataForm.type' readonly></el-input>
</el-form-item>
<el-form-item label='资源点状态:' prop='status'>
<el-input size="medium" v-model='dataForm.status' readonly></el-input>
<el-input v-if="dataForm.status==1" value="运行" size="medium" readonly></el-input>
<el-input v-if="dataForm.status==2" value="停止" size="medium" readonly></el-input>
<el-input v-if="dataForm.status==3" value="离线" size="medium" readonly></el-input>
<el-input v-if="dataForm.status==4" value="故障" size="medium" readonly></el-input>
</el-form-item>
</el-form>
</div>
......
src/pages/sys/point/query-detail.vue
View file @ c86644fd
......@@ -42,8 +42,11 @@
el-form-item(label='地图层级:' prop='tierId')
el-input(v-model='dataForm.tierName' readonly)
el-form-item(label='所属区域:' prop='region')
el-select(v-model="dataForm.region" placeholder="请选择所属区域" disabled)
el-select(v-model="dataForm.region" placeholder="" disabled)
el-option(v-for="(item,index) in regionList" :key="index" :label="item.name" :value="item.id" :code="item.id" )
el-form-item(label='人工模式:' prop='modeTypes')
el-checkbox-group(v-model="dataForm.modeTypes" placeholder="" disabled)
el-checkbox(v-for="(item, index) in modeList" :key="index" :label="item.id") {{item.name}}
el-form-item(label='部署位置:' prop='deployLocation')
el-input(v-model='dataForm.deployLocation' readonly)
el-row( class='info-block' style="margin-top: 20px;")
......@@ -121,10 +124,16 @@ export default {
{ id: 2, name: '办公区域' },
{ id: 3, name: '屋顶' }
],
modeList: [
{ id: '1', name: '供暖模式' },
{ id: '2', name: '机械通风' },
{ id: '3', name: '自然通风' }
],
dataForm: {
id: 0,
name: '',
type: 1,
modeTypes: [],
stationId: localStorage.getItem('stationId'),
stationName: '',
tierId: '',
......@@ -337,6 +346,9 @@ export default {
this.dataForm.installDate = data.bean.installDate
this.dataForm.maintenanceDate = data.bean.maintenanceDate
this.dataForm.region = data.bean.region
this.dataForm.modeTypes = data.bean.modeTypes
? data.bean.modeTypes.split(',')
: []
}
})
.then(() => {
......
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