Commit 594578d5 authored by xiexingan's avatar xiexingan

bug

parent bcb53928
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</template> </template>
</table-list> </table-list>
<el-dialog title="空调设置" :visible.sync="jfktDialogVisible" append-to-body width="28%"> <el-dialog title="空调设置" :visible.sync="jfktDialogVisible" append-to-body width="28%">
<el-form label-position="" :inline="true" :model="formData" label-width="100" :rules="dataRule" ref="dataForm"> <el-form label-position="" :inline="true" :model="formData" label-width="150px" :rules="dataRule" ref="dataForm">
<!-- <el-row> <!-- <el-row>
<el-form-item label="启停控制:" prop="temperature"> <el-form-item label="启停控制:" prop="temperature">
<el-switch v-model="newObject.state" active-text="开" inactive-text="关"></el-switch> <el-switch v-model="newObject.state" active-text="开" inactive-text="关"></el-switch>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="选择模式:" prop="xzms"> <el-form-item label="选择模式:" prop="xzms">
<el-select v-model="formData.xzms" placeholder="请选择"> <el-select v-model="formData.xzms" placeholder="请选择" size="mini">
<el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-form-item label="选择风速:" prop="xzfs"> <el-form-item label="选择风速:" prop="xzfs">
<el-select v-model="formData.xzfs" placeholder="请选择"> <el-select v-model="formData.xzfs" placeholder="请选择" size="mini">
<el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -74,7 +74,7 @@ export default { ...@@ -74,7 +74,7 @@ export default {
}, },
data() { data() {
let validateNumber = (rule, value, callback) => { let validateNumber = (rule, value, callback) => {
console.log("value:"+value) console.log('value:' + value)
if (value < 0) { if (value < 0) {
callback(new Error('只能输入正整数')) callback(new Error('只能输入正整数'))
} else if (value >= 17 && value <= 30) { } else if (value >= 17 && value <= 30) {
...@@ -113,21 +113,21 @@ export default { ...@@ -113,21 +113,21 @@ export default {
label: '多联新风处理机室内机' label: '多联新风处理机室内机'
} }
], ],
activeName:'first', activeName: 'first',
newObject: {}, newObject: {},
jfktDialogVisible: false, jfktDialogVisible: false,
formData: {}, formData: {},
dataRule: { dataRule: {
temperature: [ temperature: [
{ required: true, message: '温度需要是17-30之间的整数'}, { required: true, message: '温度需要是17-30之间的整数' },
{ type: 'number', message: '温度必须为数字' }, { type: 'number', message: '温度必须为数字' },
{validator: validateNumber, trigger: ['blur', 'change']} { validator: validateNumber, trigger: ['blur', 'change'] }
], ],
xzms: [ xzms: [
{ required: true, message: '请选择模式'}, { required: true, message: '请选择模式' }
], ],
xzfs: [ xzfs: [
{ required: true, message: '请选择风速'}, { required: true, message: '请选择风速' }
] ]
}, },
options1: [ options1: [
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
}, },
{ value: '16', { value: '16',
label: '制热模式' label: '制热模式'
}, }
], ],
options2: [ options2: [
{ value: '2', { value: '2',
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
}, },
{ value: '8', { value: '8',
label: '低风' label: '低风'
}, }
] ]
} }
}, },
...@@ -358,79 +358,78 @@ export default { ...@@ -358,79 +358,78 @@ export default {
data: { data: {
id: row.id, id: row.id,
status: status, status: status,
actionName: row.name + status==1?'开启':'关闭', actionName: row.name + status == 1 ? '开启' : '关闭',
actionType: 1 actionType: 1
} }
}).then((data) => { }).then((data) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message.success(data.msg) this.$message.success(data.msg)
}else{ } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}, },
// 看起设置空调温度窗口 // 看起设置空调温度窗口
settingJfkt(row, status){ settingJfkt(row, status) {
this.newObject = row this.newObject = row
this.jfktDialogVisible = true this.jfktDialogVisible = true
}, },
// 关闭设置窗口 // 关闭设置窗口
closeTemperature(){ closeTemperature() {
this.jfktDialogVisible = false this.jfktDialogVisible = false
}, },
// 启停空调,1=开启,2=关闭 // 启停空调,1=开启,2=关闭
changeTemperature1(val){ changeTemperature1(val) {
this.$http({ this.$http({
url: this.$http.adornUrl('/equipment/onOrOff'), url: this.$http.adornUrl('/equipment/onOrOff'),
method: 'post', method: 'post',
data: { data: {
id: this.newObject.id, id: this.newObject.id,
status: val, status: val,
actionName: this.newObject.name + val?'开启':'关闭', actionName: this.newObject.name + val ? '开启' : '关闭',
actionType: 1 actionType: 1
} }
}).then((data) => { }).then((data) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message.success(data.msg) this.$message.success(data.msg)
}else{ } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}, },
// 确定设置温度 // 确定设置温度
changeTemperature2(){ changeTemperature2() {
this.$http({ this.$http({
url: this.$http.adornUrl('/equipment/onOrOff'), url: this.$http.adornUrl('/equipment/onOrOff'),
method: 'post', method: 'post',
data: { data: {
id: this.newObject.id, id: this.newObject.id,
status: this.formData.temperature, status: this.formData.temperature,
actionName: this.newObject.name + '设定温度控制为:'+temperature, actionName: this.newObject.name + '设定温度控制为:' + temperature,
actionType: 2 actionType: 2
} }
}).then((data) => { }).then((data) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message.success(data.msg) this.$message.success(data.msg)
}else{ } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}, },
// 设定模式控制 // 设定模式控制
changeTemperature3(){ changeTemperature3() {
let com = "" let com = ''
if(this.formData.xzms == 1){ if (this.formData.xzms == 1) {
com = "设置模式为:自动模式" com = '设置模式为:自动模式'
}else if(this.formData.xzms == 2){ } else if (this.formData.xzms == 2) {
com = "设置模式为:制冷模式" com = '设置模式为:制冷模式'
}else if(this.formData.xzms == 4){ } else if (this.formData.xzms == 4) {
com = "设置模式为:除湿模式" com = '设置模式为:除湿模式'
}else if(this.formData.xzms == 8){ } else if (this.formData.xzms == 8) {
com = "设置模式为:送风模式" com = '设置模式为:送风模式'
}else if(this.formData.xzms == 16){ } else if (this.formData.xzms == 16) {
com = "设置模式为:制热模式" com = '设置模式为:制热模式'
} }
this.$http({ this.$http({
url: this.$http.adornUrl('/equipment/onOrOff'), url: this.$http.adornUrl('/equipment/onOrOff'),
method: 'post', method: 'post',
...@@ -443,19 +442,19 @@ export default { ...@@ -443,19 +442,19 @@ export default {
}).then((data) => { }).then((data) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message.success(data.msg) this.$message.success(data.msg)
}else{ } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}, },
changeTemperature4(){ changeTemperature4() {
let com = "" let com = ''
if(this.formData.xzfs == 1){ if (this.formData.xzfs == 1) {
com = "设置风速为:高风" com = '设置风速为:高风'
}else if(this.formData.xzfs == 2){ } else if (this.formData.xzfs == 2) {
com = "设置风速为:中风" com = '设置风速为:中风'
}else if(this.formData.xzfs == 4){ } else if (this.formData.xzfs == 4) {
com = "设置风速为:低风" com = '设置风速为:低风'
} }
this.$http({ this.$http({
url: this.$http.adornUrl('/equipment/onOrOff'), url: this.$http.adornUrl('/equipment/onOrOff'),
...@@ -469,7 +468,7 @@ export default { ...@@ -469,7 +468,7 @@ export default {
}).then((data) => { }).then((data) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message.success(data.msg) this.$message.success(data.msg)
}else{ } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
...@@ -478,12 +477,12 @@ export default { ...@@ -478,12 +477,12 @@ export default {
} }
</script> </script>
<style scoped> <style scoped>
/deep/ .el-input__inner{ /* /deep/ .el-input__inner{
height: 28px !important; height: 28px !important;
line-height: 28px !important; line-height: 28px !important;
width: 200px !important; width: 200px !important;
} }
/deep/ .el-form-item__label{ /deep/ .el-form-item__label{
width: 150px; width: 150px;
} } */
</style> </style>
\ No newline at end of file
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