feat(ems): 统一API返回类型并优化前端组件

- 为所有新增、修改、删除接口函数添加 AxiosPromise<any> 返回类型
- 将 Vue 组件中的 slot="footer" 替换为 #footer 语法
- 统一日期时间格式化字符串由 "yyyy-MM-dd HH:mm:ss" 更改为 "YYYY-MM-DD HH:mm:ss"- 在图表组件中增加数据存在性判断和空状态展示
-修复部分组件中字典数据引用错误的问题
- 调整图表容器底部边距以改善视觉效果
master
zangch@mesnac.com 4 months ago
parent 463bd95b33
commit ad3e168124

@ -26,7 +26,7 @@ export function getBaseCollectDeviceInfo(objId: string | number): AxiosPromise<B
/** /**
* *
*/ */
export function addBaseCollectDeviceInfo(data: BaseCollectDeviceInfoForm) { export function addBaseCollectDeviceInfo(data: BaseCollectDeviceInfoForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseCollectDeviceInfo', url: '/ems/base/baseCollectDeviceInfo',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addBaseCollectDeviceInfo(data: BaseCollectDeviceInfoForm) {
/** /**
* *
*/ */
export function updateBaseCollectDeviceInfo(data: BaseCollectDeviceInfoForm) { export function updateBaseCollectDeviceInfo(data: BaseCollectDeviceInfoForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseCollectDeviceInfo', url: '/ems/base/baseCollectDeviceInfo',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateBaseCollectDeviceInfo(data: BaseCollectDeviceInfoForm) {
/** /**
* *
*/ */
export function delBaseCollectDeviceInfo(objId: string | number | Array<string | number>) { export function delBaseCollectDeviceInfo(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseCollectDeviceInfo/' + objId, url: '/ems/base/baseCollectDeviceInfo/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getBaseEnergyPrice(objId: string | number): AxiosPromise<BaseEne
/** /**
* *
*/ */
export function addBaseEnergyPrice(data: BaseEnergyPriceForm) { export function addBaseEnergyPrice(data: BaseEnergyPriceForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseEnergyPrice', url: '/ems/base/baseEnergyPrice',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addBaseEnergyPrice(data: BaseEnergyPriceForm) {
/** /**
* *
*/ */
export function updateBaseEnergyPrice(data: BaseEnergyPriceForm) { export function updateBaseEnergyPrice(data: BaseEnergyPriceForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseEnergyPrice', url: '/ems/base/baseEnergyPrice',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateBaseEnergyPrice(data: BaseEnergyPriceForm) {
/** /**
* *
*/ */
export function delBaseEnergyPrice(objId: string | number | Array<string | number>) { export function delBaseEnergyPrice(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseEnergyPrice/' + objId, url: '/ems/base/baseEnergyPrice/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getBaseEnergyType(objId: string | number): AxiosPromise<BaseEner
/** /**
* *
*/ */
export function addBaseEnergyType(data: BaseEnergyTypeForm) { export function addBaseEnergyType(data: BaseEnergyTypeForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseEnergyType', url: '/ems/base/baseEnergyType',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addBaseEnergyType(data: BaseEnergyTypeForm) {
/** /**
* *
*/ */
export function updateBaseEnergyType(data: BaseEnergyTypeForm) { export function updateBaseEnergyType(data: BaseEnergyTypeForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseEnergyType', url: '/ems/base/baseEnergyType',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateBaseEnergyType(data: BaseEnergyTypeForm) {
/** /**
* *
*/ */
export function delBaseEnergyType(objId: string | number | Array<string | number>) { export function delBaseEnergyType(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseEnergyType/' + objId, url: '/ems/base/baseEnergyType/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getBaseMonitorInfo(objId: string | number): AxiosPromise<BaseMon
/** /**
* *
*/ */
export function addBaseMonitorInfo(data: BaseMonitorInfoForm) { export function addBaseMonitorInfo(data: BaseMonitorInfoForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseMonitorInfo', url: '/ems/base/baseMonitorInfo',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addBaseMonitorInfo(data: BaseMonitorInfoForm) {
/** /**
* *
*/ */
export function updateBaseMonitorInfo(data: BaseMonitorInfoForm) { export function updateBaseMonitorInfo(data: BaseMonitorInfoForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseMonitorInfo', url: '/ems/base/baseMonitorInfo',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateBaseMonitorInfo(data: BaseMonitorInfoForm) {
/** /**
* *
*/ */
export function delBaseMonitorInfo(objId: string | number | Array<string | number>) { export function delBaseMonitorInfo(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseMonitorInfo/' + objId, url: '/ems/base/baseMonitorInfo/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getBaseMonitorThreshold(objId: string | number): AxiosPromise<Ba
/** /**
* *
*/ */
export function addBaseMonitorThreshold(data: BaseMonitorThresholdForm) { export function addBaseMonitorThreshold(data: BaseMonitorThresholdForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseMonitorThreshold', url: '/ems/base/baseMonitorThreshold',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addBaseMonitorThreshold(data: BaseMonitorThresholdForm) {
/** /**
* *
*/ */
export function updateBaseMonitorThreshold(data: BaseMonitorThresholdForm) { export function updateBaseMonitorThreshold(data: BaseMonitorThresholdForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseMonitorThreshold', url: '/ems/base/baseMonitorThreshold',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateBaseMonitorThreshold(data: BaseMonitorThresholdForm) {
/** /**
* *
*/ */
export function delBaseMonitorThreshold(objId: string | number | Array<string | number>) { export function delBaseMonitorThreshold(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseMonitorThreshold/' + objId, url: '/ems/base/baseMonitorThreshold/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getBaseMonitorWorkUnit(objId: string | number): AxiosPromise<Bas
/** /**
* *
*/ */
export function addBaseMonitorWorkUnit(data: BaseMonitorWorkUnitForm) { export function addBaseMonitorWorkUnit(data: BaseMonitorWorkUnitForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseMonitorWorkUnit', url: '/ems/base/baseMonitorWorkUnit',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addBaseMonitorWorkUnit(data: BaseMonitorWorkUnitForm) {
/** /**
* *
*/ */
export function updateBaseMonitorWorkUnit(data: BaseMonitorWorkUnitForm) { export function updateBaseMonitorWorkUnit(data: BaseMonitorWorkUnitForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseMonitorWorkUnit', url: '/ems/base/baseMonitorWorkUnit',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateBaseMonitorWorkUnit(data: BaseMonitorWorkUnitForm) {
/** /**
* *
*/ */
export function delBaseMonitorWorkUnit(objId: string | number | Array<string | number>) { export function delBaseMonitorWorkUnit(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseMonitorWorkUnit/' + objId, url: '/ems/base/baseMonitorWorkUnit/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getBaseSharePrice(objId: string | number): AxiosPromise<BaseShar
/** /**
* *
*/ */
export function addBaseSharePrice(data: BaseSharePriceForm) { export function addBaseSharePrice(data: BaseSharePriceForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseSharePrice', url: '/ems/base/baseSharePrice',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addBaseSharePrice(data: BaseSharePriceForm) {
/** /**
* *
*/ */
export function updateBaseSharePrice(data: BaseSharePriceForm) { export function updateBaseSharePrice(data: BaseSharePriceForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseSharePrice', url: '/ems/base/baseSharePrice',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateBaseSharePrice(data: BaseSharePriceForm) {
/** /**
* *
*/ */
export function delBaseSharePrice(objId: string | number | Array<string | number>) { export function delBaseSharePrice(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseSharePrice/' + objId, url: '/ems/base/baseSharePrice/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getBaseWorkUnit(objId: string | number): AxiosPromise<BaseWorkUn
/** /**
* *
*/ */
export function addBaseWorkUnit(data: BaseWorkUnitForm) { export function addBaseWorkUnit(data: BaseWorkUnitForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseWorkUnit', url: '/ems/base/baseWorkUnit',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addBaseWorkUnit(data: BaseWorkUnitForm) {
/** /**
* *
*/ */
export function updateBaseWorkUnit(data: BaseWorkUnitForm) { export function updateBaseWorkUnit(data: BaseWorkUnitForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseWorkUnit', url: '/ems/base/baseWorkUnit',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateBaseWorkUnit(data: BaseWorkUnitForm) {
/** /**
* *
*/ */
export function delBaseWorkUnit(objId: string | number | Array<string | number>) { export function delBaseWorkUnit(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/base/baseWorkUnit/' + objId, url: '/ems/base/baseWorkUnit/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getRecordAlarmData(objId: string | number): AxiosPromise<RecordA
/** /**
* *
*/ */
export function addRecordAlarmData(data: RecordAlarmDataForm) { export function addRecordAlarmData(data: RecordAlarmDataForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordAlarmData', url: '/ems/record/recordAlarmData',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addRecordAlarmData(data: RecordAlarmDataForm) {
/** /**
* *
*/ */
export function updateRecordAlarmData(data: RecordAlarmDataForm) { export function updateRecordAlarmData(data: RecordAlarmDataForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordAlarmData', url: '/ems/record/recordAlarmData',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateRecordAlarmData(data: RecordAlarmDataForm) {
/** /**
* *
*/ */
export function delRecordAlarmData(objId: string | number | Array<string | number>) { export function delRecordAlarmData(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordAlarmData/' + objId, url: '/ems/record/recordAlarmData/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getRecordAlarmRule(objId: string | number): AxiosPromise<RecordA
/** /**
* *
*/ */
export function addRecordAlarmRule(data: RecordAlarmRuleForm) { export function addRecordAlarmRule(data: RecordAlarmRuleForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordAlarmRule', url: '/ems/record/recordAlarmRule',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addRecordAlarmRule(data: RecordAlarmRuleForm) {
/** /**
* *
*/ */
export function updateRecordAlarmRule(data: RecordAlarmRuleForm) { export function updateRecordAlarmRule(data: RecordAlarmRuleForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordAlarmRule', url: '/ems/record/recordAlarmRule',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateRecordAlarmRule(data: RecordAlarmRuleForm) {
/** /**
* *
*/ */
export function delRecordAlarmRule(objId: string | number | Array<string | number>) { export function delRecordAlarmRule(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordAlarmRule/' + objId, url: '/ems/record/recordAlarmRule/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getRecordDnbInstant(objId: string | number): AxiosPromise<Record
/** /**
* DNB * DNB
*/ */
export function addRecordDnbInstant(data: RecordDnbInstantForm) { export function addRecordDnbInstant(data: RecordDnbInstantForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordDnbInstant', url: '/ems/record/recordDnbInstant',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addRecordDnbInstant(data: RecordDnbInstantForm) {
/** /**
* DNB * DNB
*/ */
export function updateRecordDnbInstant(data: RecordDnbInstantForm) { export function updateRecordDnbInstant(data: RecordDnbInstantForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordDnbInstant', url: '/ems/record/recordDnbInstant',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateRecordDnbInstant(data: RecordDnbInstantForm) {
/** /**
* DNB * DNB
*/ */
export function delRecordDnbInstant(objId: string | number | Array<string | number>) { export function delRecordDnbInstant(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordDnbInstant/' + objId, url: '/ems/record/recordDnbInstant/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getRecordIOTInstant(objId: string | number): AxiosPromise<Record
/** /**
* IOT * IOT
*/ */
export function addRecordIOTInstant(data: RecordIOTInstantForm) { export function addRecordIOTInstant(data: RecordIOTInstantForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordIOTInstant', url: '/ems/record/recordIOTInstant',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addRecordIOTInstant(data: RecordIOTInstantForm) {
/** /**
* IOT * IOT
*/ */
export function updateRecordIOTInstant(data: RecordIOTInstantForm) { export function updateRecordIOTInstant(data: RecordIOTInstantForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordIOTInstant', url: '/ems/record/recordIOTInstant',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateRecordIOTInstant(data: RecordIOTInstantForm) {
/** /**
* IOT * IOT
*/ */
export function delRecordIOTInstant(objId: string | number | Array<string | number>) { export function delRecordIOTInstant(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordIOTInstant/' + objId, url: '/ems/record/recordIOTInstant/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getRecordSteamInstant(objId: string | number): AxiosPromise<Reco
/** /**
* *
*/ */
export function addRecordSteamInstant(data: RecordSteamInstantForm) { export function addRecordSteamInstant(data: RecordSteamInstantForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordSteamInstant', url: '/ems/record/recordSteamInstant',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addRecordSteamInstant(data: RecordSteamInstantForm) {
/** /**
* *
*/ */
export function updateRecordSteamInstant(data: RecordSteamInstantForm) { export function updateRecordSteamInstant(data: RecordSteamInstantForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordSteamInstant', url: '/ems/record/recordSteamInstant',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateRecordSteamInstant(data: RecordSteamInstantForm) {
/** /**
* *
*/ */
export function delRecordSteamInstant(objId: string | number | Array<string | number>) { export function delRecordSteamInstant(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordSteamInstant/' + objId, url: '/ems/record/recordSteamInstant/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getRecordVibrationInstant(objId: string | number): AxiosPromise<
/** /**
* *
*/ */
export function addRecordVibrationInstant(data: RecordVibrationInstantForm) { export function addRecordVibrationInstant(data: RecordVibrationInstantForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordVibrationInstant', url: '/ems/record/recordVibrationInstant',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addRecordVibrationInstant(data: RecordVibrationInstantForm) {
/** /**
* *
*/ */
export function updateRecordVibrationInstant(data: RecordVibrationInstantForm) { export function updateRecordVibrationInstant(data: RecordVibrationInstantForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordVibrationInstant', url: '/ems/record/recordVibrationInstant',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateRecordVibrationInstant(data: RecordVibrationInstantForm) {
/** /**
* *
*/ */
export function delRecordVibrationInstant(objId: string | number | Array<string | number>) { export function delRecordVibrationInstant(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordVibrationInstant/' + objId, url: '/ems/record/recordVibrationInstant/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getRecordWaterInstant(objId: string | number): AxiosPromise<Reco
/** /**
* *
*/ */
export function addRecordWaterInstant(data: RecordWaterInstantForm) { export function addRecordWaterInstant(data: RecordWaterInstantForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordWaterInstant', url: '/ems/record/recordWaterInstant',
method: 'post', method: 'post',
@ -37,7 +37,7 @@ export function addRecordWaterInstant(data: RecordWaterInstantForm) {
/** /**
* *
*/ */
export function updateRecordWaterInstant(data: RecordWaterInstantForm) { export function updateRecordWaterInstant(data: RecordWaterInstantForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordWaterInstant', url: '/ems/record/recordWaterInstant',
method: 'put', method: 'put',
@ -48,7 +48,7 @@ export function updateRecordWaterInstant(data: RecordWaterInstantForm) {
/** /**
* *
*/ */
export function delRecordWaterInstant(objId: string | number | Array<string | number>) { export function delRecordWaterInstant(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/record/recordWaterInstant/' + objId, url: '/ems/record/recordWaterInstant/' + objId,
method: 'delete' method: 'delete'

@ -26,7 +26,7 @@ export function getTemperatureHumidity(objId: string | number): AxiosPromise<Tem
/** /**
* 湿 * 湿
*/ */
export function addTemperatureHumidity(data: TemperatureHumidityForm) { export function addTemperatureHumidity(data: TemperatureHumidityForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/report/temperatureHumidity', url: '/ems/report/temperatureHumidity',
method: 'post', method: 'post',

@ -37,7 +37,7 @@ export function generateReportPointDnb(data: ReportPointDnbForm) {
/** /**
* DNB * DNB
*/ */
export function addReportPointDnb(data: ReportPointDnbForm) { export function addReportPointDnb(data: ReportPointDnbForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/report/reportPointDnb', url: '/ems/report/reportPointDnb',
method: 'post', method: 'post',
@ -48,7 +48,7 @@ export function addReportPointDnb(data: ReportPointDnbForm) {
/** /**
* DNB * DNB
*/ */
export function updateReportPointDnb(data: ReportPointDnbForm) { export function updateReportPointDnb(data: ReportPointDnbForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/report/reportPointDnb', url: '/ems/report/reportPointDnb',
method: 'put', method: 'put',
@ -59,7 +59,7 @@ export function updateReportPointDnb(data: ReportPointDnbForm) {
/** /**
* DNB * DNB
*/ */
export function delReportPointDnb(objId: string | number | Array<string | number>) { export function delReportPointDnb(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/report/reportPointDnb/' + objId, url: '/ems/report/reportPointDnb/' + objId,
method: 'delete' method: 'delete'

@ -56,27 +56,27 @@ export function pointSteamInstantList(query) {
} }
// 新增蒸汽整点数据 // 新增蒸汽整点数据
export function addReportPointSteam(data) { export function addReportPointSteam(data: ReportPointSteamForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/report/reportPointSteam', url: '/ems/report/reportPointSteam',
method: 'post', method: 'post',
data: data data: data
}) });
} }
// 修改蒸汽整点数据 // 修改蒸汽整点数据
export function updateReportPointSteam(data) { export function updateReportPointSteam(data: ReportPointSteamForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/report/reportPointSteam', url: '/ems/report/reportPointSteam',
method: 'put', method: 'put',
data: data data: data
}) });
} }
// 删除蒸汽整点数据 // 删除蒸汽整点数据
export function delReportPointSteam(objId) { export function delReportPointSteam(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/report/reportPointSteam/' + objId, url: '/ems/report/reportPointSteam/' + objId,
method: 'delete' method: 'delete'
}) });
} }

@ -37,7 +37,7 @@ export function generateReportPointWater(data: ReportPointWaterForm) {
/** /**
* *
*/ */
export function addReportPointWater(data: ReportPointWaterForm) { export function addReportPointWater(data: ReportPointWaterForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/report/reportPointWater', url: '/ems/report/reportPointWater',
method: 'post', method: 'post',
@ -48,7 +48,7 @@ export function addReportPointWater(data: ReportPointWaterForm) {
/** /**
* *
*/ */
export function updateReportPointWater(data: ReportPointWaterForm) { export function updateReportPointWater(data: ReportPointWaterForm): AxiosPromise<any> {
return request({ return request({
url: '/ems/report/reportPointWater', url: '/ems/report/reportPointWater',
method: 'put', method: 'put',
@ -59,7 +59,7 @@ export function updateReportPointWater(data: ReportPointWaterForm) {
/** /**
* *
*/ */
export function delReportPointWater(objId: string | number | Array<string | number>) { export function delReportPointWater(objId: string | number | Array<string | number>): AxiosPromise<any> {
return request({ return request({
url: '/ems/report/reportPointWater/' + objId, url: '/ems/report/reportPointWater/' + objId,
method: 'delete' method: 'delete'

@ -217,10 +217,12 @@
<el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" /> <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</template>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

@ -46,7 +46,7 @@
<el-form-item label="是否虚拟" prop="isAmmeter"> <el-form-item label="是否虚拟" prop="isAmmeter">
<el-select v-model="queryParams.isAmmeter" placeholder="请选择是否虚拟" clearable> <el-select v-model="queryParams.isAmmeter" placeholder="请选择是否虚拟" clearable>
<el-option <el-option
v-for="dict in dict.type.is_ammeter" v-for="dict in is_ammeter"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -191,7 +191,7 @@
<el-form-item label="是否虚拟" prop="isAmmeter"> <el-form-item label="是否虚拟" prop="isAmmeter">
<el-radio-group v-model="form.isAmmeter"> <el-radio-group v-model="form.isAmmeter">
<el-radio <el-radio
v-for="dict in dict.type.is_ammeter" v-for="dict in is_ammeter"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>

@ -183,7 +183,7 @@
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择记录时间" placeholder="请选择记录时间"
> >
</el-date-picker> </el-date-picker>
@ -230,10 +230,12 @@
<!-- <el-input v-model="form.notifyUser" placeholder="请输入通知用户"/>--> <!-- <el-input v-model="form.notifyUser" placeholder="请输入通知用户"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</template>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

@ -42,7 +42,7 @@
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -53,7 +53,7 @@
<el-date-picker <el-date-picker
v-model="daterangeRecordTime" v-model="daterangeRecordTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -201,7 +201,7 @@
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择采集时间" placeholder="请选择采集时间"
> >
</el-date-picker> </el-date-picker>
@ -228,7 +228,7 @@
<!-- <el-date-picker clearable--> <!-- <el-date-picker clearable-->
<!-- v-model="form.recordTime"--> <!-- v-model="form.recordTime"-->
<!-- type="datetime"--> <!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"--> <!-- value-format="YYYY-MM-DD HH:mm:ss"-->
<!-- placeholder="请选择记录时间"--> <!-- placeholder="请选择记录时间"-->
<!-- >--> <!-- >-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->

@ -40,7 +40,7 @@
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -91,7 +91,7 @@
<el-date-picker <el-date-picker
v-model="daterangeRecordTime" v-model="daterangeRecordTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"

@ -44,7 +44,7 @@
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -55,7 +55,7 @@
<el-date-picker <el-date-picker
v-model="daterangeRecordTime" v-model="daterangeRecordTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -188,7 +188,7 @@
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择采集时间" placeholder="请选择采集时间"
> >
</el-date-picker> </el-date-picker>
@ -221,7 +221,7 @@
<el-date-picker clearable <el-date-picker clearable
v-model="form.recordTime" v-model="form.recordTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择记录时间" placeholder="请选择记录时间"
> >
</el-date-picker> </el-date-picker>

@ -42,7 +42,7 @@
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -213,7 +213,7 @@
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择采集时间" placeholder="请选择采集时间"
> >
</el-date-picker> </el-date-picker>
@ -246,7 +246,7 @@
<el-date-picker clearable <el-date-picker clearable
v-model="form.recordTime" v-model="form.recordTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择记录时间" placeholder="请选择记录时间"
> >
</el-date-picker> </el-date-picker>

@ -34,7 +34,7 @@
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -45,7 +45,7 @@
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -96,7 +96,7 @@
<el-date-picker <el-date-picker
v-model="daterangeRecodeTime" v-model="daterangeRecodeTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -107,7 +107,7 @@
<el-date-picker <el-date-picker
v-model="daterangeRecodeTime" v-model="daterangeRecodeTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -228,7 +228,7 @@
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
type="date" type="date"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择采集时间"> placeholder="请选择采集时间">
</el-date-picker> </el-date-picker>
</el-form-item>--> </el-form-item>-->
@ -236,7 +236,7 @@
<el-date-picker <el-date-picker
v-model="form.collectTime" v-model="form.collectTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择采集时间"> placeholder="请选择采集时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -259,7 +259,7 @@
<el-date-picker clearable <el-date-picker clearable
v-model="form.recodeTime" v-model="form.recodeTime"
type="date" type="date"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择记录时间"> placeholder="请选择记录时间">
</el-date-picker> </el-date-picker>
</el-form-item>--> </el-form-item>-->
@ -267,7 +267,7 @@
<el-date-picker <el-date-picker
v-model="form.recodeTime" v-model="form.recodeTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择记录时间"> placeholder="请选择记录时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

@ -35,7 +35,7 @@
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -46,7 +46,7 @@
<el-date-picker <el-date-picker
v-model="daterangeRecordTime" v-model="daterangeRecordTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -184,7 +184,7 @@
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择采集时间" placeholder="请选择采集时间"
> >
</el-date-picker> </el-date-picker>
@ -199,7 +199,7 @@
<!-- <el-date-picker clearable--> <!-- <el-date-picker clearable-->
<!-- v-model="form.recordTime"--> <!-- v-model="form.recordTime"-->
<!-- type="datetime"--> <!-- type="datetime"-->
<!-- value-format="yyyy-MM-dd HH:mm:ss"--> <!-- value-format="YYYY-MM-DD HH:mm:ss"-->
<!-- placeholder="请选择采集时间">--> <!-- placeholder="请选择采集时间">-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->

@ -42,7 +42,7 @@
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"
@ -188,7 +188,7 @@ async function getChart() {
}, },
grid: { grid: {
top: '40', top: '40',
bottom: '10%', bottom: '15%',
left: '3%', left: '3%',
right: '3%' right: '3%'
}, },

@ -76,11 +76,12 @@
</el-card> </el-card>
<!-- 图表区域 --> <!-- 图表区域 -->
<div class="charts-container"> <div v-if="hasChartData" class="charts-container">
<Chart ref="Chart1" class="chart1"/> <Chart ref="Chart1" class="chart1"/>
<Chart ref="Chart2" class="chart2"/> <Chart ref="Chart2" class="chart2"/>
<Chart ref="Chart3" class="chart3"/> <Chart ref="Chart3" class="chart3"/>
</div> </div>
<el-empty v-else description="暂无数据"></el-empty>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -147,6 +148,8 @@ export default {
title: '', title: '',
// //
open: false, open: false,
//
hasChartData: false,
// //
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -752,6 +755,17 @@ export default {
try { try {
const {data} = await steamInstantList(query) const {data} = await steamInstantList(query)
// hasChartData
this.hasChartData = data && data.length > 0;
if (!this.hasChartData) {
//
this.$refs.Chart1.setData({});
this.$refs.Chart2.setData({});
this.$refs.Chart3.setData({});
return;
}
// //
const fluxFlowResult = this.processDataBreaks(data, 'fluxFlow') const fluxFlowResult = this.processDataBreaks(data, 'fluxFlow')
// //

@ -42,7 +42,7 @@
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"

@ -38,14 +38,14 @@
style="width: 200px" style="width: 200px"
type="datetime" type="datetime"
placeholder="选择日期时间" placeholder="选择日期时间"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label-width="auto">-</el-form-item> <el-form-item label-width="auto">-</el-form-item>
<el-form-item> <el-form-item>
<el-date-picker <el-date-picker
v-model="queryParams.endTime" v-model="queryParams.endTime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
style="width: 200px" style="width: 200px"
type="datetime" type="datetime"
placeholder="选择日期时间" placeholder="选择日期时间"

@ -57,7 +57,7 @@
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"

@ -79,7 +79,12 @@
<el-button icon="Refresh" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div v-if="hasChartData">
<Chart ref="Chart1" class="chart1"/> <Chart ref="Chart1" class="chart1"/>
</div>
<div v-else>
<el-empty description="暂无数据"></el-empty>
</div>
<!-- <Chart ref="Chart2" class="chart2"/> <!-- <Chart ref="Chart2" class="chart2"/>
<Chart ref="Chart3" class="chart3"/> <Chart ref="Chart3" class="chart3"/>
<Chart ref="Chart4" class="chart4"/>--> <Chart ref="Chart4" class="chart4"/>-->
@ -192,6 +197,7 @@ export default {
}, },
monthBeforeYear: false monthBeforeYear: false
}, },
hasChartData: false,
} }
}, },
created() { created() {
@ -320,6 +326,17 @@ export default {
async getChart() { async getChart() {
let query = JSON.parse(JSON.stringify(this.queryParams)) let query = JSON.parse(JSON.stringify(this.queryParams))
const {data} = await pointSteamInstantList(query) const {data} = await pointSteamInstantList(query)
if (!data || data.length === 0) {
this.hasChartData = false;
// Clear existing charts if no data
if (this.$refs.Chart1) {
this.$refs.Chart1.setData({});
}
return;
}
this.hasChartData = true;
let option1 = { let option1 = {
title: { title: {
text: this.selectMonitorName + ' 耗量', text: this.selectMonitorName + ' 耗量',

@ -42,7 +42,7 @@
<el-date-picker <el-date-picker
v-model="daterangeBeginTime" v-model="daterangeBeginTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="-" range-separator="-"
start-placeholder="开始时间" start-placeholder="开始时间"

Loading…
Cancel
Save