yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update - 设备报表

Browse Source
master
yinq 8 months ago
parent ae9b2f6673
commit 6873009709
4 changed files with 362 additions and 292 deletions
Show Stats Download Patch File Download Diff File

66
src/views/base/dnbInstant/index.vue
Unescape Escape View File

@ -28,14 +28,14 @@
</el-col>
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="计量设备编号" prop="monitorId">
<el-input
v-model="queryParams.monitorId"
placeholder="请输入计量设备编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="计量设备编号" prop="monitorId">-->
<!-- <el-input-->
<!-- v-model="queryParams.monitorId"-->
<!-- placeholder="请输入计量设备编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="采集时间">
<el-date-picker
v-model="daterangeCollectTime"
@ -43,8 +43,8 @@
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-form-item label="采集方式" prop="collectType">
@ -112,8 +112,8 @@
<el-table v-loading="loading" :data="dnbInstantList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible"/>
<el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[21].visible"/>
<el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible" width="120"/>
<el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[21].visible" width="150"/>
<el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -157,24 +157,24 @@
</template>
</el-table-column>
<el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[20].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:dnbInstant:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:dnbInstant:remove']"
>删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['base:dnbInstant:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['base:dnbInstant:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@ -271,6 +271,7 @@
<script>
import { listDnbInstant, getDnbInstant, delDnbInstant, addDnbInstant, updateDnbInstant } from "@/api/base/dnbInstant";
import { getMonitorInfoTree } from '@/api/report/pointDnb'
import { parseTime } from '@//utils/ruoyi'
export default {
name: "DnbInstant",
@ -345,7 +346,7 @@ export default {
{ key: 7, label: `B项电流`, visible: true },
{ key: 8, label: `C项电流`, visible: true },
{ key: 9, label: `记录时间`, visible: false },
{ key: 10, label: `功率因数`, visible: true },
{ key: 10, label: `功率因数`, visible: false },
{ key: 11, label: `正向有功`, visible: true },
{ key: 12, label: `有功功率`, visible: false },
{ key: 13, label: `无功功率`, visible: false },
@ -367,6 +368,9 @@ export default {
}
},
created() {
const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
this.getList();
this.getDeptTrees();
},

358
src/views/report/DayDnb/index.vue
Unescape Escape View File

@ -27,39 +27,38 @@
</div>
</el-col>
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="报表日期" prop="reportDate">
<el-input
v-model="queryParams.reportDate"
placeholder="请输入报表日期"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否标识" prop="isFlag">
<el-select v-model="queryParams.isFlag" placeholder="请选择是否标识" clearable>
<el-option
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-input
v-model="queryParams.createdBy"
placeholder="请输入创建人"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px"
>
<el-form-item label="采集日期">
<el-date-picker
v-model="daterangeCollectTime"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="是否标识" prop="isFlag">-->
<!-- <el-select v-model="queryParams.isFlag" placeholder="请选择是否标识" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.is_flag"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="创建人" prop="createdBy">-->
<!-- <el-input-->
<!-- v-model="queryParams.createdBy"-->
<!-- placeholder="请输入创建人"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -67,38 +66,39 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['report:DayDnb:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['report:DayDnb:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['report:DayDnb:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['report:DayDnb:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['report:DayDnb:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['report:DayDnb:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@ -107,20 +107,22 @@
size="mini"
@click="handleExport"
v-hasPermi="['report:DayDnb:export']"
>导出</el-button>
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="DayDnbList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/>
<el-table-column label="仪表值" align="center" prop="instrumentValue" v-if="columns[2].visible"/>
<el-table-column label="耗量" align="center" prop="expend" v-if="columns[3].visible"/>
<el-table-column label="报表日期" align="center" prop="reportDate" v-if="columns[4].visible"/>
<el-table-column label="开始时间" align="center" prop="beginTime" v-if="columns[5].visible"/>
<el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[6].visible"/>
<el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible" width="140"/>
<el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[12].visible" width="320"/>
<el-table-column label="耗量" align="center" prop="expend" v-if="columns[3].visible" width="100"/>
<el-table-column label="报表日期" align="center" prop="reportDate" v-if="columns[4].visible" width="250"/>
<el-table-column label="仪表值(kW·h)" align="center" prop="instrumentValue" v-if="columns[2].visible" width="180"/>
<el-table-column label="开始日期" align="center" prop="beginTime" v-if="columns[5].visible"/>
<el-table-column label="结束日期" align="center" prop="endTime" v-if="columns[6].visible"/>
<el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@ -138,24 +140,26 @@
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['report:DayDnb:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['report:DayDnb:remove']"
>删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['report:DayDnb:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['report:DayDnb:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@ -171,22 +175,22 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="计量设备编号" prop="monitorCode">
<el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />
<el-input v-model="form.monitorCode" placeholder="请输入计量设备编号"/>
</el-form-item>
<el-form-item label="仪表值" prop="instrumentValue">
<el-input v-model="form.instrumentValue" placeholder="请输入仪表值" />
<el-form-item label="仪表值(kW·h)" prop="instrumentValue">
<el-input v-model="form.instrumentValue" placeholder="请输入仪表值(kW·h)"/>
</el-form-item>
<el-form-item label="耗量" prop="expend">
<el-input v-model="form.expend" placeholder="请输入耗量" />
<el-input v-model="form.expend" placeholder="请输入耗量"/>
</el-form-item>
<el-form-item label="报表日期" prop="reportDate">
<el-input v-model="form.reportDate" placeholder="请输入报表日期" />
<el-input v-model="form.reportDate" placeholder="请输入报表日期"/>
</el-form-item>
<el-form-item label="开始时间" prop="beginTime">
<el-input v-model="form.beginTime" placeholder="请输入开始时间" />
<el-form-item label="开始日期" prop="beginTime">
<el-input v-model="form.beginTime" placeholder="请输入开始日期"/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-input v-model="form.endTime" placeholder="请输入结束时间" />
<el-form-item label="结束日期" prop="endTime">
<el-input v-model="form.endTime" placeholder="请输入结束日期"/>
</el-form-item>
<el-form-item label="是否标识" prop="isFlag">
<el-radio-group v-model="form.isFlag">
@ -194,29 +198,32 @@
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-input v-model="form.createdBy" placeholder="请输入创建人" />
<el-input v-model="form.createdBy" placeholder="请输入创建人"/>
</el-form-item>
<el-form-item label="创建时间" prop="createdTime">
<el-date-picker clearable
v-model="form.createdTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
placeholder="请选择创建时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="更新人" prop="updatedBy">
<el-input v-model="form.updatedBy" placeholder="请输入更新人" />
<el-input v-model="form.updatedBy" placeholder="请输入更新人"/>
</el-form-item>
<el-form-item label="更新时间" prop="updatedTime">
<el-date-picker clearable
v-model="form.updatedTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择更新时间">
placeholder="请选择更新时间"
>
</el-date-picker>
</el-form-item>
</el-form>
@ -229,17 +236,18 @@
</template>
<script>
import { listDayDnb, getDayDnb, delDayDnb, addDayDnb, updateDayDnb } from "@/api/report/DayDnb";
import { listDayDnb, getDayDnb, delDayDnb, addDayDnb, updateDayDnb } from '@/api/report/DayDnb'
import { getMonitorInfoTree } from '@/api/report/pointDnb'
import { parseTime } from '@//utils/ruoyi'
export default {
name: "DayDnb",
name: 'DayDnb',
dicts: ['is_flag'],
data() {
return {
// 部门树选项
deptOptions: undefined,
monitorName:undefined,
monitorName: undefined,
// 遮罩层
loading: true,
// 选中数组
@ -254,8 +262,9 @@ export default {
total: 0,
// 电日耗报表格数据
DayDnbList: [],
daterangeCollectTime: [],
// 弹出层标题
title: "",
title: '',
// 是否显示弹出层
open: false,
// 查询参数
@ -277,68 +286,76 @@ export default {
// 表单参数
form: {},
defaultProps: {
children: "children",
label: "label"
children: 'children',
label: 'label'
},
// 表单校验
rules: {
},
rules: {},
columns: [
{ key: 0, label: `主键标识`, visible: true },
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `计量设备编号`, visible: true },
{ key: 2, label: `仪表值`, visible: true },
{ key: 2, label: `仪表值(kW·h)`, visible: true },
{ key: 3, label: `耗量`, visible: true },
{ key: 4, label: `报表日期`, visible: true },
{ key: 5, label: `开始时间`, visible: true },
{ key: 6, label: `结束时间`, visible: true },
{ key: 7, label: `是否标识`, visible: true },
{ key: 8, label: `创建人`, visible: true },
{ key: 9, label: `创建时间`, visible: true },
{ key: 10, label: `更新人`, visible: true },
{ key: 11, label: `更新时间`, visible: true },
{ key: 5, label: `开始日期`, visible: false },
{ key: 6, label: `结束日期`, visible: false },
{ key: 7, label: `是否标识`, visible: false },
{ key: 8, label: `创建人`, visible: false },
{ key: 9, label: `创建时间`, visible: false },
{ key: 10, label: `更新人`, visible: false },
{ key: 11, label: `更新时间`, visible: false },
{ key: 12, label: `计量设备名称`, visible: true }
]
};
}
},
watch: {
// 根据名称筛选部门树
monitorName(val) {
this.$refs.tree.filter(val);
this.$refs.tree.filter(val)
}
},
created() {
this.getList();
this.getDeptTrees();
const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeCollectTime[0] = nowDate
this.daterangeCollectTime[1] = nowDate
this.getList()
this.getDeptTrees()
},
methods: {
/** 查询计量设备下拉树结构 */
getDeptTrees() {
getMonitorInfoTree().then(response => {
this.deptOptions = response.data;
});
this.deptOptions = response.data
})
},
// 筛选节点
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
if (!value) return true
return data.label.indexOf(value) !== -1
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.monitorCode = data.code;
this.handleQuery();
this.queryParams.monitorCode = data.code
this.handleQuery()
},
/** 查询电日耗报列表 */
getList() {
this.loading = true;
this.loading = true
this.queryParams.params = {};
if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
this.queryParams.params["beginCollectTime"] = this.daterangeCollectTime[0];
this.queryParams.params["endCollectTime"] = this.daterangeCollectTime[1];
}
listDayDnb(this.queryParams).then(response => {
this.DayDnbList = response.rows;
this.total = response.total;
this.loading = false;
});
this.DayDnbList = response.rows
this.total = response.total
this.loading = false
})
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
this.open = false
this.reset()
},
// 表单重置
reset() {
@ -355,71 +372,72 @@ export default {
createdTime: null,
updatedBy: null,
updatedTime: null
};
this.resetForm("form");
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams.monitorCode = null;
this.handleQuery();
this.resetForm('queryForm')
this.queryParams.monitorCode = null
this.handleQuery()
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加电日耗报";
this.reset()
this.open = true
this.title = '添加电日耗报'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.reset()
const objId = row.objId || this.ids
getDayDnb(objId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改电日耗报";
});
this.form = response.data
this.open = true
this.title = '修改电日耗报'
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateDayDnb(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addDayDnb(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
});
})
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids;
const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除电日耗报编号为"' + objIds + '"的数据项？').then(function() {
return delDayDnb(objIds);
return delDayDnb(objIds)
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
@ -428,5 +446,5 @@ export default {
}, `DayDnb_${new Date().getTime()}.xlsx`)
}
}
};
}
</script>

86
src/views/report/pointDnb/index.vue
Unescape Escape View File

@ -46,13 +46,16 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="创建时间" prop="createdTime">
<el-date-picker clearable
v-model="queryParams.createdTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
<el-form-item label="采集时间">
<el-date-picker
v-model="daterangeCollectTime"
style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-form-item>
@ -62,27 +65,27 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['report:pointDnb:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['report:pointDnb:edit']"
>修改</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['report:pointDnb:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['report:pointDnb:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="danger"
@ -113,10 +116,10 @@
<el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible" width="120"/>
<el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[12].visible" width="150"/>
<el-table-column label="耗量" align="center" prop="expend" v-if="columns[3].visible"/>
<el-table-column label="仪表值" align="center" prop="instrumentValue" v-if="columns[2].visible"/>
<el-table-column label="开始时间" align="center" prop="beginTime" v-if="columns[5].visible" width="180"/>
<el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[6].visible" width="180"/>
<el-table-column label="记录时间" align="center" prop="recordTime" v-if="columns[4].visible" width="180"/>
<el-table-column label="开始时间" align="center" prop="beginTime" v-if="columns[5].visible" width="170"/>
<el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[6].visible" width="170"/>
<el-table-column label="记录时间" align="center" prop="recordTime" v-if="columns[4].visible" width="170"/>
<el-table-column label="仪表值(kW·h)" align="center" prop="instrumentValue" v-if="columns[2].visible" width="100"/>
<el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@ -169,8 +172,8 @@
<el-form-item label="计量设备编号" prop="monitorCode">
<el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />
</el-form-item>
<el-form-item label="仪表值" prop="instrumentValue">
<el-input v-model="form.instrumentValue" placeholder="请输入仪表值" />
<el-form-item label="仪表值(kW·h)" prop="instrumentValue">
<el-input v-model="form.instrumentValue" placeholder="请输入仪表值(kW·h)" />
</el-form-item>
<el-form-item label="耗量" prop="expend">
<el-input v-model="form.expend" placeholder="请输入耗量" />
@ -212,6 +215,7 @@ import {
getMonitorInfoTree
} from '@/api/report/pointDnb'
import { listMonitorInfo,getMointorListLike} from "@/api/base/monitorInfo";
import { parseTime } from '@//utils/ruoyi'
@ -266,6 +270,7 @@ export default {
},
// 表单参数
form: {},
daterangeCollectTime: [],
defaultProps: {
children: "children",
label: "label"
@ -279,7 +284,7 @@ export default {
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `计量设备编号`, visible: true },
{ key: 2, label: `仪表值`, visible: true },
{ key: 2, label: `仪表值(kW·h)`, visible: true },
{ key: 3, label: `耗量`, visible: true },
{ key: 4, label: `记录时间`, visible: true },
{ key: 5, label: `开始时间`, visible: true },
@ -291,8 +296,6 @@ export default {
{ key: 11, label: `更新时间`, visible: false },
{ key: 12, label: `计量设备名称`, visible: true },
],
};
},
watch: {
@ -303,6 +306,9 @@ export default {
}
},
created() {
const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
this.getList();
this.getDeptTrees();
},
@ -317,6 +323,11 @@ export default {
/** 查询电整点耗量报表列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
this.queryParams.params["beginCollectTime"] = this.daterangeCollectTime[0];
this.queryParams.params["endCollectTime"] = this.daterangeCollectTime[1];
}
listPointDnb(this.queryParams).then(response => {
this.pointDnbList = response.rows;
this.total = response.total;
@ -376,6 +387,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.daterangeCollectTime = [];
this.resetForm("queryForm");
this.queryParams.monitorCode = null;
this.handleQuery();

36
src/views/report/repairRateReport/index.vue
Unescape Escape View File

@ -226,6 +226,15 @@ export default {
},
},
},
label: {
show: true,
position: "top",
textStyle: {
color: "#fff",
fontSize: 16
},
formatter: '{c}%'
},
legend: {
itemWidth: 3 * vw,
data: ['检漏返修率(%)'],
@ -307,6 +316,15 @@ export default {
},
},
},
label: {
show: true,
position: "top",
textStyle: {
color: "#fff",
fontSize: 16
},
formatter: '{c}%'
},
legend: {
itemWidth: 3 * vw,
data: ['发泡返修率(%)'],
@ -388,6 +406,15 @@ export default {
},
},
},
label: {
show: true,
position: "top",
textStyle: {
color: "#fff",
fontSize: 16
},
formatter: '{c}%'
},
legend: {
itemWidth: 3 * vw,
data: ['电检返修率(%)'],
@ -469,6 +496,15 @@ export default {
},
},
},
label: {
show: true,
position: "top",
textStyle: {
color: "#fff",
fontSize: 16
},
formatter: '{c}%'
},
legend: {
itemWidth: 3 * vw,
data: ['总装返修率(%)'],

Write Preview
Loading…
Cancel
Save