|
|
|
@ -28,24 +28,24 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="19" :xs="24">
|
|
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
|
|
<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 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 label="创建时间" prop="createdTime">
|
|
|
|
|
<el-date-picker clearable
|
|
|
|
|
v-model="queryParams.createdTime"
|
|
|
|
@ -110,12 +110,13 @@
|
|
|
|
|
<el-table v-loading="loading" :data="pointDnbList" @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="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="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="recordTime" 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="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="isFlag" v-if="columns[7].visible">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
|
|
|
|
@ -133,24 +134,24 @@
|
|
|
|
|
<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:pointDnb:edit']"
|
|
|
|
|
>修改</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
size="mini"
|
|
|
|
|
type="text"
|
|
|
|
|
icon="el-icon-delete"
|
|
|
|
|
@click="handleDelete(scope.row)"
|
|
|
|
|
v-hasPermi="['report:pointDnb: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:pointDnb:edit']"-->
|
|
|
|
|
<!-- >修改</el-button>-->
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
<!-- size="mini"-->
|
|
|
|
|
<!-- type="text"-->
|
|
|
|
|
<!-- icon="el-icon-delete"-->
|
|
|
|
|
<!-- @click="handleDelete(scope.row)"-->
|
|
|
|
|
<!-- v-hasPermi="['report:pointDnb:remove']"-->
|
|
|
|
|
<!-- >删除</el-button>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
<pagination
|
|
|
|
@ -276,18 +277,19 @@ export default {
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
columns: [
|
|
|
|
|
{ key: 0, label: `主键标识`, visible: true },
|
|
|
|
|
{ key: 0, label: `主键标识`, visible: false },
|
|
|
|
|
{ key: 1, label: `计量设备编号`, visible: true },
|
|
|
|
|
{ key: 2, label: `仪表值`, 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: 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 },
|
|
|
|
|
],
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|