Skip to content

E
energyai_vue
Commit 3fbbfd1d authored by coffee's avatar coffee
Browse files
Options

.

parent 6b6f94fd
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 97 deletions
public/config.js
View file @ 3fbbfd1d
......@@ -7,9 +7,11 @@ CONFIG.TITLE = '拉林线-山南站AI节能系统'
// CONFIG.requestPath = 'http://localhost:8046'
CONFIG.requestPath = 'http://10.20.2.33:8046'
CONFIG.requestPath = 'http://47.94.207.62:8047'
// CONFIG.requestPath = 'http://10.20.2.33:8046'
// CONFIG.requestPath = 'http://59.110.43.122:8046'
// 文件上传
CONFIG.urlPath = 'http://10.20.2.33/'
CONFIG.urlPath = 'http://47.94.207.62:8088'
// CONFIG.urlPath = 'http://10.20.2.33/'
// CONFIG.urlPath = 'http://59.110.43.122/'
public/index.html
View file @ 3fbbfd1d
......@@ -19,10 +19,10 @@
<title>拉林线-山南站AI节能系统</title>
<script>
//禁用所有控制台输出
var console = {}
console.log = function () {}
console.warn = function () {}
console.error = function () {}
// var console = {}
// console.log = function () {}
// console.warn = function () {}
// console.error = function () {}
</script>
<script src="./config.js"></script>
<style>
......
src/pages/eq/hall/components/hallModal.vue
View file @ 3fbbfd1d
......@@ -7,14 +7,7 @@
>
<el-form :model="dataForm" :rules="dataRule" ref="dataForm">
<el-form-item label="设置频率：" :label-width="formLabelWidth" prop="set_frequency">
<el-input-number
:controls='false'
:min="35"
:max="45"
size="mini"
autocomplete="off"
v-model="dataForm.set_frequency"
></el-input-number>
<el-input-number v-model="dataForm.set_frequency" size="mini" :controls='false' :precision='0' autocomplete="off" ></el-input-number>
</el-form-item>
</el-form>
<div slot="footer">
......@@ -34,7 +27,8 @@ export default {
dataForm: {},
dataRule: {
set_frequency: [
{ required: true, message: '设定频率必填' }
{ required: true, message: '请输入频率' },
{ pattern:/^(3[5-9])|4[0-5]$/, message: '频率范围为35-45的整数' }
// { type: 'number', message: '温度必须为数字' },
// { validator: validateNumber, trigger: ['blur', 'change'] }
]
......
src/pages/eq/hall/components/settingFlrb.vue
View file @ 3fbbfd1d
......@@ -53,52 +53,52 @@
</el-row>
<el-row>
<el-form-item label="制热启动温度：" :label-width="formLabelWidth" prop="heating_start_temperature">
<el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_start_temperature" :controls='false' :min='0' :max='100' :precision='0' ></el-input-number>
<el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_start_temperature" :controls='false' :precision='0' ></el-input-number>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="mini"
@click="changeTemperature()"
@click="changeTemperature(1,dataForm.heating_start_temperature)"
>确定</el-button
>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="制热停止温度：" :label-width="formLabelWidth" prop="heating_stop_temperature">
<el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_stop_temperature" :controls='false' :min='0' :max='100' :precision='0' ></el-input-number>
<el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.heating_stop_temperature" :controls='false' :precision='0' ></el-input-number>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="mini"
@click="changeTemperature2()"
@click="changeTemperature(2,dataForm.heating_stop_temperature)"
>确定</el-button
>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="热风启动温度：" :label-width="formLabelWidth" prop="hot_air_start_temperature">
<el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_start_temperature" :controls='false' :min='0' :max='100' :precision='0' ></el-input-number>
<el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_start_temperature" :controls='false' :precision='0' ></el-input-number>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="mini"
@click="changeTemperature3()"
@click="changeTemperature(3,dataForm.hot_air_start_temperature)"
>确定</el-button
>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="热风停止温度：" :label-width="formLabelWidth" prop="hot_air_stop_temperature">
<el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_stop_temperature" :controls='false' :min='0' :max='100' :precision='0' ></el-input-number>
<el-input-number size="mini" autocomplete="off" style="width: 120px" v-model="dataForm.hot_air_stop_temperature" :controls='false' :precision='0' ></el-input-number>
</el-form-item>
<el-form-item>
<el-button
type="primary"
size="mini"
@click="changeTemperature4()"
@click="changeTemperature(4,dataForm.hot_air_stop_temperature)"
>确定</el-button
>
</el-form-item>
......@@ -186,79 +186,46 @@ export default {
}
})
},
changeTemperature() {
// 设置温度
changeTemperature(type,val){
if(val < 0 || val > 100){
this.$message.error('温度范围为0-100的整数')
return
}
if(type==1){
var params = this.dataForm.heating_start_temperature
var actionName = '设置制热启动温度为：'
var actionType = 6
}else if(type==2){
var params = this.dataForm.heating_stop_temperature
var actionName = '设置制热停止温度为：'
var actionType = 7
}else if(type==3){
var params = this.dataForm.hot_air_start_temperature
var actionName = '设置热风启动温度为：'
var actionType = 8
}else if(type==4){
var params = this.dataForm.hot_air_stop_temperature
var actionName = '设置热风停止温度为：'
var actionType = 9
}
this.$http({
url: this.$http.adornUrl('/equipment/onOrOff'),
method: 'post',
data: {
id: this.dataForm.id,
params: this.dataForm.heating_start_temperature,
actionName: this.dataForm.name + '设置制热启动温度为：' + this.dataForm.heating_start_temperature,
actionType: 6
params,
actionName: this.dataForm.name + actionName + params,
actionType
}
}).then((data) => {
if (data && data.code === 0) {
this.$message.success(data.msg)
this.getDataList()
} else {
this.$message.error(data.msg)
}
})
},
changeTemperature2() {
this.$http({
url: this.$http.adornUrl('/equipment/onOrOff'),
method: 'post',
data: {
id: this.dataForm.id,
params: this.dataForm.heating_stop_temperature,
actionName: this.dataForm.name + '设置制热停止温度为：' + this.dataForm.heating_stop_temperature,
actionType: 7
}
}).then((data) => {
if (data && data.code === 0) {
this.$message.success(data.msg)
} else {
this.$message.error(data.msg)
}
})
},
changeTemperature3() {
this.$http({
url: this.$http.adornUrl('/equipment/onOrOff'),
method: 'post',
data: {
id: this.dataForm.id,
params: this.dataForm.hot_air_start_temperature,
actionName: this.dataForm.name + '设置热风启动温度为：' + this.dataForm.hot_air_start_temperature,
actionType: 8
}
}).then((data) => {
if (data && data.code === 0) {
this.$message.success(data.msg)
} else {
this.$message.error(data.msg)
}
})
},
changeTemperature4() {
this.$http({
url: this.$http.adornUrl('/equipment/onOrOff'),
method: 'post',
data: {
id: this.dataForm.id,
params: this.dataForm.hot_air_stop_temperature,
actionName: this.dataForm.name + '设置热风停止温度为：' + this.dataForm.hot_air_stop_temperature,
actionType: 9
}
}).then((data) => {
if (data && data.code === 0) {
this.$message.success(data.msg)
} else {
this.$message.error(data.msg)
}
})
}
}
}
</script>
......
src/pages/eq/view/query-detail.vue
View file @ 3fbbfd1d
......@@ -71,18 +71,18 @@
el-switch(v-model="modelType" @change="changeHandle($event)" active-text="风水模式" inactive-text="热水模式" inactive-color="#ff4949" style="margin-bottom: 5px;")
el-row
span 制热启停温度(℃)：
el-input-number(v-model="heatingStart" @blur='changeTemperature(1)' size="mini" :controls='false' :min='0' :max='100' :precision='0' style="width: 65px")
el-input-number(v-model="heatingStart" @blur='changeTemperature(1,$event)' size="mini" :controls='false' :precision='0' style="width: 65px")
span(style="margin:0 10px") -
el-input-number(v-model="heatingEnd" @blur='changeTemperature(2)' size="mini" :controls='false' :min='0' :max='100' :precision='0' style="width: 65px")
el-input-number(v-model="heatingEnd" @blur='changeTemperature(2,$event)' size="mini" :controls='false' :precision='0' style="width: 65px")
el-row
span 热风启停温度(℃)：
el-input-number(v-model="hotWindStart" @blur='changeTemperature(3)' size="mini" :controls='false' :min='0' :max='100' :precision='0' style="width: 65px")
el-input-number(v-model="hotWindStart" @blur='changeTemperature(3,$event)' size="mini" :controls='false' :precision='0' style="width: 65px")
span(style="margin:0 10px") -
el-input-number(v-model="hotWindEnd" @blur='changeTemperature(4)' size="mini" :controls='false' :min='0' :max='100' :precision='0' style="width: 65px")
el-input-number(v-model="hotWindEnd" @blur='changeTemperature(4,$event)' size="mini" :controls='false' :precision='0' style="width: 65px")
//- 水泵
el-row.text-size(v-if="dataForm.type=='f4c840711eae4bcb9536a890cdfda493'")
span 设置频率：
el-input-number(v-model="frequency" @blur='changeFrequency()' :controls='false' :min="35" :max="45" size="mini" autocomplete="off")
el-input-number(v-model="frequency" @blur='changeFrequency($event)' size="mini" :controls='false' :precision='0' autocomplete="off")
//- el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='303310efddb34a2e9bf269bdff8a7dc5'||dataForm.type=='f4c840711eae4bcb9536a890cdfda493'")
//- el-col(:span="16" )
//- span 频率设置：
......@@ -312,7 +312,11 @@ watch: {
})
},
// 设置频率
changeFrequency(){
changeFrequency(e){
if(e.target.value < 35 || e.target.value > 45){
this.$message.error('频率范围为35-45的整数')
return
}
this.$http({
url: this.$http.adornUrl('/equipment/onOrOff'),
method: 'post',
......@@ -401,22 +405,26 @@ watch: {
})
},
// 设置温度
changeTemperature(type){
changeTemperature(type,e){
if(e.target.value < 0 || e.target.value > 100){
this.$message.error('温度范围为0-100的整数')
return
}
if(type==1){
var params = this.heatingStart
var actionName = '设置制热启动温度为：'
var actionType = 6
}else if(type==2){
var params = this.heatingEnd
var actionName = '设置制热启动温度为：'
var actionName = '设置制热停止温度为：'
var actionType = 7
}else if(type==3){
var params = this.hotWindStart
var actionName = '设置制热启动温度为：'
var actionName = '设置热风启动温度为：'
var actionType = 8
}else if(type==4){
var params = this.hotWindEnd
var actionName = '设置制热启动温度为：'
var actionName = '设置热风停止温度为：'
var actionType = 9
}
this.$http({
......
src/pages/sys/commandlog/index.vue
View file @ 3fbbfd1d
......@@ -25,6 +25,9 @@
font(v-if='data.scope.comType == 2') 人工
template(#operation="data")
el-button(type="text" size="mini" @click="queryHandle(data.scope.id)") 详情
template(#result="data")
font(v-if='data.scope.result == 1') 成功
font(v-if='data.scope.result == 2') 失败
el-footer.box_footer
el-pagination(@size-change="sizeChangeHandle" background @current-change="currentChangeHandle" :current-page="pageIndex" :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage" layout="total, sizes, prev, pager, next, jumper")
query-detail(v-if="queryDetailVisible" ref="queryView" @refreshdatalist="getDataList")
......@@ -48,12 +51,13 @@ export default {
return {
checkList: [], //筛选数据
tableHeader: [
{ label: '操作员', prop: 'createUserName' }, //是否插槽
{ label: '来源', prop: 'comSource', slot: true },
{ label: '指令类型', prop: 'comType', slot: true },
{ label: '操作员', prop: 'createUserName', width: 150 }, //是否插槽
{ label: '来源', prop: 'comSource', slot: true, width: 80 },
{ label: '指令类型', prop: 'comType', slot: true, width: 80 },
{ label: '指令结果', prop: 'result', slot: true, width: 80 },
{ label: '被控设备', prop: 'resourceName' },
{ label: '操作时间', prop: 'createTime' },
{ label: '指令内容', prop: 'comMark', showOverflowTooltip: true }
{ label: '操作时间', prop: 'createTime', width: 150 },
{ label: '指令内容', prop: 'comMark', showOverflowTooltip: true}
],
tableOption: {
border: false, //是否边框
......
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