Commit 66d66bba authored by co_dengxiongwen's avatar co_dengxiongwen

页面调整

parent 3fa4701d
...@@ -382,7 +382,7 @@ export default { ...@@ -382,7 +382,7 @@ export default {
this.pfjList.forEach((e) => { this.pfjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy) this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(this.tableData[i], 'status', e.status) // this.$set(this.tableData[i], 'status', e.status)
} }
}) })
} else if ( } else if (
...@@ -392,7 +392,7 @@ export default { ...@@ -392,7 +392,7 @@ export default {
this.jfktpList.forEach((e) => { this.jfktpList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy) this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(this.tableData[i], 'status', e.status) // this.$set(this.tableData[i], 'status', e.status)
} }
}) })
} else if ( } else if (
...@@ -402,7 +402,7 @@ export default { ...@@ -402,7 +402,7 @@ export default {
this.dlswjList.forEach((e) => { this.dlswjList.forEach((e) => {
if (this.tableData[i].id === e.resource_id) { if (this.tableData[i].id === e.resource_id) {
this.$set(this.tableData[i], 'electric_energy', e.electric_energy) this.$set(this.tableData[i], 'electric_energy', e.electric_energy)
this.$set(this.tableData[i], 'status', e.status) // this.$set(this.tableData[i], 'status', e.status)
} }
}) })
} else if ( } else if (
...@@ -422,7 +422,7 @@ export default { ...@@ -422,7 +422,7 @@ export default {
'setting_wind_speed', 'setting_wind_speed',
e.setting_wind_speed e.setting_wind_speed
) )
this.$set(this.tableData[i], 'status', e.status) // this.$set(this.tableData[i], 'status', e.status)
} }
}) })
} else if ( } else if (
...@@ -442,7 +442,7 @@ export default { ...@@ -442,7 +442,7 @@ export default {
'setting_wind_speed', 'setting_wind_speed',
e.setting_wind_speed e.setting_wind_speed
) )
this.$set(this.tableData[i], 'status', e.status) // this.$set(this.tableData[i], 'status', e.status)
} }
}) })
} }
......
...@@ -26,52 +26,52 @@ ...@@ -26,52 +26,52 @@
p.leftP 安装日期:   {{ dataForm.installDate }} p.leftP 安装日期:   {{ dataForm.installDate }}
.info-form(style="border-bottom: 1px solid #c0c0c0") .info-form(style="border-bottom: 1px solid #c0c0c0")
//- el-row.text-size(v-if="openOrClose.indexOf(dataForm.type)>-1") //- el-row.text-size(v-if="openOrClose.indexOf(dataForm.type)>-1")
el-row.text-size(v-if="dataForm.type=='b6af764f2a6e454490a6b1b3c9057e57'||dataForm.type=='ece0b8b2db27411886254e81134988a3'||dataForm.type=='8f5530fee2484e8eb107c0ca672132b2'|| dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'") el-row.text-size(v-if="dataForm.type=='b6af764f2a6e454490a6b1b3c9057e57'||dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'")
el-col(:span='10') 当前已 el-col(:span='10') 当前已
span(v-if="dataForm.status == 1") 运行 span(v-if="dataForm.status == 1") 运行
span(v-else-if="dataForm.status == 2") 停止 span(v-else-if="dataForm.status == 2") 停止
span(v-else-if="dataForm.status == 3") 离线 span(v-else-if="dataForm.status == 3") 离线
span(v-else) 故障 span(v-else) 故障
el-col(:span='10') el-col(:span='10' v-if="dataForm.status != 3&&dataForm.status !=4")
.switch-warp .switch-warp
div(:class="[state == 1 ? 'on' : '']", @click="handleSwitch(1)") 打开 div(:class="[dataForm.status == 1 ? 'on' : '']", @click="handleSwitch(1)" ) 打开
div(:class="[state == 2 ? 'on' : '']", @click="handleSwitch(2)") 关闭 div(:class="[dataForm.status == 2 ? 'on' : '']", @click="handleSwitch(0)" ) 关闭
el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='ece0b8b2db27411886254e81134988a3'||dataForm.type=='8f5530fee2484e8eb107c0ca672132b2'|| dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'") el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'")
el-col(:span="16" ) el-col(:span="16" )
span 温度设定: span 温度设定:
el-input(size="mini", style="width: 80px", v-model="temperature") el-input(size="mini", style="width: 80px", v-model="temperature")
span  (℃) span  (℃)
el-button(type="primary", size="mini", style="margin-left: 3px",@click="handleSwitch2(1)") 设定 el-button(type="primary", size="mini", style="margin-left: 3px",@click="handleSwitch2(1)") 设定
el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='ece0b8b2db27411886254e81134988a3'||dataForm.type=='8f5530fee2484e8eb107c0ca672132b2'|| dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'") el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'")
el-col(:span="16" ) el-col(:span="16" )
span 选择模式: span 选择模式:
el-select(size="mini" v-model="speed" placeholder="请选择数据库类型" style="width: 106px") el-select(size="mini" v-model="speed" placeholder="请选择模式类型" style="width: 106px")
el-option(label="自动模式" value="1") el-option(label="自动模式" value="1")
el-option(label="制冷模式" value="2") el-option(label="制冷模式" value="2")
el-option(label="除湿模式" value="4") el-option(label="除湿模式" value="4")
el-option(label="送风模式" value="8") el-option(label="送风模式" value="8")
el-option(label="制热模式" value="16") el-option(label="制热模式" value="16")
el-button(type="primary", size="mini", style="margin-left: 3px",@click="handleSwitch2(2)") 设定 el-button(type="primary", size="mini", style="margin-left: 3px",@click="handleSwitch2(2)") 设定
el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='ece0b8b2db27411886254e81134988a3'||dataForm.type=='8f5530fee2484e8eb107c0ca672132b2'|| dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'") el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'")
el-col(:span="16" ) el-col(:span="16" )
span 选择风速: span 选择风速:
el-select(size="mini" v-model="models" placeholder="请选择数据库类型" style="width: 106px") el-select(size="mini" v-model="models" placeholder="请选择风速类型" style="width: 106px")
el-option(label="高风" value="2") el-option(label="高风" value="2")
el-option(label="中风" value="4") el-option(label="中风" value="4")
el-option(label="低风" value="8") el-option(label="低风" value="8")
el-button(type="primary", size="mini", style="margin-left: 3px") 设定 el-button(type="primary", size="mini", style="margin-left: 3px") 设定
el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='303310efddb34a2e9bf269bdff8a7dc5'||dataForm.type=='f4c840711eae4bcb9536a890cdfda493'") //- el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='303310efddb34a2e9bf269bdff8a7dc5'||dataForm.type=='f4c840711eae4bcb9536a890cdfda493'")
el-col(:span="16" ) //- el-col(:span="16" )
span 频率设置: //- span 频率设置:
el-input(size="mini", style="width: 80px", v-model="windSpeed",@click="handleSwitch2(3)") //- el-input(size="mini", style="width: 80px", v-model="windSpeed",@click="handleSwitch2(3)")
span  转/分 //- span  转/分
el-button(type="primary", size="mini", style="margin-left: 3px") 设定 //- el-button(type="primary", size="mini", style="margin-left: 3px") 设定
//- 卷帘门 //- 卷帘门
el-row el-row
el-col(v-if="dataForm.type=='c788ce98c1f248f590434394da485ce4'") el-col(v-if="dataForm.type=='c788ce98c1f248f590434394da485ce4'")
el-button(type="primary", size="mini", style="margin-left: 10px") 上升 el-button(type="primary", size="mini", style="margin-left: 10px" disabled) 上升
el-button(type="primary", size="mini", style="margin-left: 10px") 下降 el-button(type="primary", size="mini", style="margin-left: 10px" disabled) 下降
el-button(type="primary", size="mini", style="margin-left: 10px") 停止 el-button(type="primary", size="mini", style="margin-left: 10px" disabled) 停止
.info-state(v-if="this.params && this.params.length > 0") .info-state(v-if="this.params && this.params.length > 0")
span(style="font-weight: bold") 设备运行状态 span(style="font-weight: bold") 设备运行状态
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
span.value(v-if='params[0].setting_mode==0') 无 span.value(v-if='params[0].setting_mode==0') 无
span.value(v-if='params[0].setting_mode==2') 制冷模式 span.value(v-if='params[0].setting_mode==2') 制冷模式
span.value(v-if='params[0].setting_mode==4') 除湿模式 span.value(v-if='params[0].setting_mode==4') 除湿模式
span.value(v-if='params[0].setting_mode==8') 送模式 span.value(v-if='params[0].setting_mode==8') 送模式
span.value(v-if='params[0].setting_mode==16') 制热模式 span.value(v-if='params[0].setting_mode==16') 制热模式
div(v-if="this.params.length && this.params[0].setting_wind_speed") div(v-if="this.params.length && this.params[0].setting_wind_speed")
span.type 设定风速(m/s): span.type 设定风速(m/s):
...@@ -208,6 +208,7 @@ export default { ...@@ -208,6 +208,7 @@ export default {
console.log('---data:', data) console.log('---data:', data)
console.log('当前资源点id', data.id) console.log('当前资源点id', data.id)
console.log('类型', data.type) console.log('类型', data.type)
this.state = data.status == 1 ? 1 : 2
this.params = [] this.params = []
switch (data.type) { switch (data.type) {
case '173466a2cf9a42a6a17b2bdfbeae36d5': //多联室内机 case '173466a2cf9a42a6a17b2bdfbeae36d5': //多联室内机
...@@ -248,7 +249,7 @@ export default { ...@@ -248,7 +249,7 @@ export default {
}, },
// 控制开/关 // 控制开/关
handleSwitch(state) { handleSwitch(state) {
this.state = state this.dataForm.status = state == 1 ? 1 : 2
this.$http({ this.$http({
url: this.$http.adornUrl('/equipment/onOrOff'), url: this.$http.adornUrl('/equipment/onOrOff'),
method: 'post', method: 'post',
...@@ -276,18 +277,19 @@ export default { ...@@ -276,18 +277,19 @@ export default {
com = '设定温度控制为:' + this.temperature com = '设定温度控制为:' + this.temperature
state = this.temperature state = this.temperature
if (this.temperature) { if (this.temperature) {
if (!(/(^[1-9]\d*$)/.test(this.temperature))) { if (!/(^[1-9]\d*$)/.test(this.temperature)) {
this.$message.warning('温度需要是17-30之间的整数1') this.$message.warning('温度需要是17-30之间的整数1')
return return
     } else if (this.temperature * 1 < 17 || this.temperature * 1 > 30) { } else if (this.temperature * 1 < 17 || this.temperature * 1 > 30) {
this.$message.warning('温度需要是17-30之间的整数2') this.$message.warning('温度需要是17-30之间的整数2')
return return
     } }
} else { } else {
this.$message.warning('温度需要是17-30之间的整数3') this.$message.warning('温度需要是17-30之间的整数3')
return return
} }
} else if (val == 2) { // 设定模式 models } else if (val == 2) {
// 设定模式 models
actionType = 3 actionType = 3
state = this.models state = this.models
if (this.models == 1) { if (this.models == 1) {
...@@ -305,7 +307,8 @@ export default { ...@@ -305,7 +307,8 @@ export default {
this.$message.warning('请选择设定模式') this.$message.warning('请选择设定模式')
return return
} }
} else { // 设定风速 windSpeed } else {
// 设定风速 windSpeed
actionType = 4 actionType = 4
state = this.windSpeed state = this.windSpeed
if (windSpeed == 1) { if (windSpeed == 1) {
......
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