diff --git a/package.json b/package.json index 608d663..94ea10e 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "bpmn-js": "^11.4.1", "diagram-js": "^11.9.1", "echarts": "5.4.0", - "element-plus": "2.2.27", + "element-plus": "2.2.28", "file-saver": "2.0.5", "fuse.js": "6.6.2", "highlight.js": "11.7.0", diff --git a/src/api/model/heatSendLog.js b/src/api/model/heatSendLog.js new file mode 100644 index 0000000..fbe2de3 --- /dev/null +++ b/src/api/model/heatSendLog.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询供暖办推送信息日志列表 +export function listHeatapi(query) { + return request({ + url: '/model/dcHeatSendLog/list', + method: 'get', + params: query + }) +} + +// 查询供暖办推送信息日志详细 +export function getHeatapi(id) { + return request({ + url: '/model/dcHeatSendLog/' + id, + method: 'get' + }) +} + +// 新增供暖办推送信息日志 +export function addHeatapi(data) { + return request({ + url: '/model/dcHeatSendLog', + method: 'post', + data: data + }) +} + +// 修改供暖办推送信息日志 +export function updateHeatapi(data) { + return request({ + url: '/model/dcHeatSendLog', + method: 'put', + data: data + }) +} + +// 删除供暖办推送信息日志 +export function delHeatapi(id) { + return request({ + url: '/model/dcHeatSendLog/' + id, + method: 'delete' + }) +} + +// 导出供暖办推送信息日志 +export function exportHeatapi(query) { + return request({ + url: '/${baseUrl}/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/model/heatapiconf.js b/src/api/model/heatapiconf.js new file mode 100644 index 0000000..6464bdf --- /dev/null +++ b/src/api/model/heatapiconf.js @@ -0,0 +1,62 @@ +import request from '@/utils/request' + +// 查询供热办推送接口配置列表 +export function listHeatapiconf(query) { + return request({ + url: '/model/dcHeatStandardValueConf/list', + method: 'get', + params: query + }) +} + +// 查询供热办推送接口配置详细 +export function getHeatapiconf(id) { + return request({ + url: '/model/dcHeatStandardValueConf/' + id, + method: 'get' + }) +} + +// 新增供热办推送接口配置 +export function addHeatapiconf(data) { + return request({ + url: '/model/dcHeatStandardValueConf', + method: 'post', + data: data + }) +} + +// 修改供热办推送接口配置 +export function updateHeatapiconf(data) { + return request({ + url: '/model/dcHeatStandardValueConf', + method: 'put', + data: data + }) +} + +// 删除供热办推送接口配置 +export function delHeatapiconf(id) { + return request({ + url: '/model/dcHeatStandardValueConf/' + id, + method: 'delete' + }) +} + +// 导出供热办推送接口配置 +export function exportHeatapiconf(query) { + return request({ + url: '/${baseUrl}/export', + method: 'get', + params: query + }) +} + +// 查询供热办推送接口配置列表 +export function listNoPage(query) { + return request({ + url: '/model/dcHeatStandardValueConf/listNoPage', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/model/heatparammodel.js b/src/api/model/heatparammodel.js new file mode 100644 index 0000000..5a0ea64 --- /dev/null +++ b/src/api/model/heatparammodel.js @@ -0,0 +1,71 @@ +import request from '@/utils/request' + +// 查询热源推送参数配置列表 +export function listHeatParamModel(query) { + return request({ + url: '/model/dcHeatParamModel/list', + method: 'get', + params: query + }) +} + +// 查询热源推送参数配置详细 +export function getHeatParamModel(id) { + return request({ + url: '/model/dcHeatParamModel/' + id, + method: 'get' + }) +} + +// 新增热源推送参数配置 +export function addHeatParamModel(data) { + return request({ + url: '/model/dcHeatParamModel', + method: 'post', + data: data + }) +} + +// 修改热源推送参数配置 +export function updateHeatParamModel(data) { + return request({ + url: '/model/dcHeatParamModel', + method: 'put', + data: data + }) +} + +// 删除热源推送参数配置 +export function delHeatParamModel(id) { + return request({ + url: '/model/dcHeatParamModel/' + id, + method: 'delete' + }) +} + +// 导出热源推送参数配置 +export function exportHeatParamModel(query) { + return request({ + url: '/${baseUrl}/export', + method: 'get', + params: query + }) +} + +// 新增热源推送参数配置 +export function addBatchHeatParamModel(data) { + return request({ + url: '/model/dcHeatParamModel/addBatch', + method: 'post', + data: data + }) +} + +// 修改热源推送参数配置 +export function updateHeatParamModelNew(data) { + return request({ + url: '/model/dcHeatParamModel/editBatch', + method: 'put', + data: data + }) +} diff --git a/src/views/model/alert/deviceparamalert.vue b/src/views/model/alert/deviceparamalert.vue index ee67983..d62abf8 100644 --- a/src/views/model/alert/deviceparamalert.vue +++ b/src/views/model/alert/deviceparamalert.vue @@ -285,7 +285,7 @@ @@ -450,6 +450,7 @@ function getList() { function cancel() { open.value = false; reset(); + loading.value = false; } // 表单重置 @@ -729,7 +730,6 @@ function getDeviceList(){ } function getParamsListDevice(deviceUuid){ - loading.value = true; form.value.partion = null; queryParamsParam.value.deviceUuid = deviceUuid; if(queryParamsParam.value.partion == null){ @@ -879,6 +879,7 @@ function submitFormPolicy() { function cancelPolicy() { openPolicy.value = false; resetPolicy(); + loading.value = false; } //开关量初始化策略表单 @@ -1136,12 +1137,28 @@ function handleValueChange(row){ } if(selectedRowsNow.length>0){ selectedRowsNow.forEach(item=>{ - if(item.sort < row.sort){ - if(item.value > row.value){ + console.log("item.sort: " + parseFloat(item.sort)); + console.log("row.sort: " + parseFloat(row.sort)); + console.log("item.sort < row.sort"); + console.log(parseFloat(item.sort) < parseFloat(row.sort)); + console.log("item.sort > row.sort"); + console.log(parseFloat(item.sort) > parseFloat(row.sort)); + if(parseFloat(item.sort) < parseFloat(row.sort)){ + console.log("小于符合: 判断大于"); + console.log("item.value: " + parseFloat(item.value)); + console.log("row.value: " + parseFloat(row.value)); + console.log("item.value > row.value"); + console.log(parseFloat(item.value) > parseFloat(row.value)); + if(parseFloat(item.value) > parseFloat(row.value)){ flag = false; } - }else if(item.sort > row.sort){ - if(item.value < row.value){ + }else if(parseFloat(item.sort) > parseFloat(row.sort)){ + console.log("大于符合: 判断小于"); + console.log("item.value: " + parseFloat(item.value)); + console.log("row.value: " + parseFloat(row.value)); + console.log("item.value < row.value"); + console.log(parseFloat(item.value) < parseFloat(row.value)); + if(parseFloat(item.value) < parseFloat(row.value)){ flag = false; } } @@ -1181,12 +1198,12 @@ function handleValueChangeSub(row){ const selectedRowsNow = proxy.$refs.policyTable.getSelectionRows(); if(selectedRowsNow.length>0){ selectedRowsNow.forEach(item=>{ - if(item.sort < row.sort){ - if(item.value > row.value){ + if(parseFloat(item.sort) < parseFloat(row.sort)){ + if(parseFloat(item.value) > parseFloat(row.value)){ flag = false; } - }else if(item.sort > row.sort){ - if(item.value < row.value){ + }else if(parseFloat(item.sort) > parseFloat(row.sort)){ + if(parseFloat(item.value) < parseFloat(row.value)){ flag = false; } } @@ -1209,9 +1226,9 @@ const validateCell = (data) => { } else if (typeof data.value === 'boolean') { return data.value !== undefined && data.value !== null; } else if (Array.isArray(data.value)) { - return data.value.lenght == 0; + return data.value.length == 0; } else if (typeof data.value === 'object') { - return data.value.lenght == 0; + return data.value.length == 0; } else { return data.value !== undefined && data.value !== null; } diff --git a/src/views/model/heatapiconf/heatSendLog.vue b/src/views/model/heatapiconf/heatSendLog.vue new file mode 100644 index 0000000..f4980ad --- /dev/null +++ b/src/views/model/heatapiconf/heatSendLog.vue @@ -0,0 +1,356 @@ + + + diff --git a/src/views/model/heatapiconf/index.vue b/src/views/model/heatapiconf/index.vue new file mode 100644 index 0000000..21fb60d --- /dev/null +++ b/src/views/model/heatapiconf/index.vue @@ -0,0 +1,420 @@ + + + diff --git a/src/views/model/heatapiconf/paramModel.vue b/src/views/model/heatapiconf/paramModel.vue new file mode 100644 index 0000000..067fbe0 --- /dev/null +++ b/src/views/model/heatapiconf/paramModel.vue @@ -0,0 +1,305 @@ + + +