|
|
@@ -20,14 +20,14 @@
|
|
|
|
|
|
<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="deviceCode">
|
|
|
+ <el-form-item label="设备编号" prop="deviceCode">
|
|
|
<el-input v-model="queryParams.deviceCode" placeholder="请输入设备代码" clearable @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="设备名称" prop="deviceName">
|
|
|
<el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="计量标签" prop="objTag">
|
|
|
- <el-select v-model="queryParams.objTag" placeholder="请选择计量标签" clearable>
|
|
|
+ <el-form-item label="表计标签" prop="objTag">
|
|
|
+ <el-select v-model="queryParams.objTag" placeholder="请选择表计标签" clearable>
|
|
|
<el-option v-for="item in objTagOptions" :key="item.code" :label="item.name" :value="item.code">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
@@ -110,10 +110,13 @@
|
|
|
<el-form-item label="设备名称" prop="deviceName">
|
|
|
<el-input v-model="form.deviceName" placeholder="请输入设备代码" />
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="设备分组" prop="group">
|
|
|
+ <el-input v-model="form.group" placeholder="请输入设备分组" />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="安装位置" prop="location">
|
|
|
<el-input v-model="form.location" placeholder="请输入设备安装位置" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="计量标签" prop="objTag">
|
|
|
+ <el-form-item label="表计标签" prop="objTag">
|
|
|
<el-radio-group v-model="form.objTag" size="medium">
|
|
|
<el-radio v-for="(item, index) in objTagOptions" :key="index" :label="item.code" :disabled="item.disabled">{{item.name}}
|
|
|
</el-radio>
|
|
|
@@ -127,12 +130,8 @@
|
|
|
</el-form-item>
|
|
|
|
|
|
<!-- 周期时长 -->
|
|
|
- <el-form-item v-if="form.colMode !== 1" label="周期时长" prop="colCycle">
|
|
|
- <template v-if="form.colMode === 0">
|
|
|
- <el-input v-model="form.colCycle" :min="1" :max="86400" placeholder="请输入周期时长（秒）" />
|
|
|
- </template>
|
|
|
- <template v-else>
|
|
|
- </template>
|
|
|
+ <el-form-item v-if="form.colMode === 0" label="周期时长" prop="colCycle">
|
|
|
+ <el-input v-model="form.colCycle" :min="1" :max="86400" placeholder="请输入周期时长（秒）" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="倍率" prop="magnification">
|
|
|
<el-input-number v-model="form.magnification" :min="0" :max="99" ></el-input-number>
|
|
|
@@ -198,8 +197,9 @@ export default {
|
|
|
{ code: 70, name: '水表' }
|
|
|
],
|
|
|
objTagOptions: [
|
|
|
- { code: 0, name: '公摊表' },
|
|
|
- { code: 1, name: '个户表' }
|
|
|
+ { code: 0, name: '无标签' },
|
|
|
+ { code: 1, name: '个户表' },
|
|
|
+ { code: 2, name: '公摊表' },
|
|
|
],
|
|
|
colCycleOptions: [
|
|
|
{ code: 0, name: '实时' },
|
