From ca8f7a2b237729c033094e3aafe1d00aede3821c Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 20 May 2024 18:13:22 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20add=E9=87=87=E9=9B=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/base/baseCollectDeviceInfo.js     |  53 +++
 .../ems/base/baseCollectDeviceInfo/index.vue  | 403 ++++++++++++++++++
 src/views/ems/base/baseMonitorInfo/index.vue  | 106 ++---
 .../ems/base/baseMonitorWorkUnit/index.vue    |   2 +-
 4 files changed, 502 insertions(+), 62 deletions(-)
 create mode 100644 src/api/ems/base/baseCollectDeviceInfo.js
 create mode 100644 src/views/ems/base/baseCollectDeviceInfo/index.vue

diff --git a/src/api/ems/base/baseCollectDeviceInfo.js b/src/api/ems/base/baseCollectDeviceInfo.js
new file mode 100644
index 0000000..160d29c
--- /dev/null
+++ b/src/api/ems/base/baseCollectDeviceInfo.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询采集设备信息列表
+export function listBaseCollectDeviceInfo(query) {
+  return request({
+    url: '/ems/base/baseCollectDeviceInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询采集设备信息详细
+export function getBaseCollectDeviceInfo(objId) {
+  return request({
+    url: '/ems/base/baseCollectDeviceInfo/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增采集设备信息
+export function addBaseCollectDeviceInfo(data) {
+  return request({
+    url: '/ems/base/baseCollectDeviceInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改采集设备信息
+export function updateBaseCollectDeviceInfo(data) {
+  return request({
+    url: '/ems/base/baseCollectDeviceInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除采集设备信息
+export function delBaseCollectDeviceInfo(objId) {
+  return request({
+    url: '/ems/base/baseCollectDeviceInfo/' + objId,
+    method: 'delete'
+  })
+}
+
+// 查询采集设备信息列表
+export function getCollectDeviceInfo(query) {
+  return request({
+    url: '/ems/base/baseCollectDeviceInfo/getCollectDeviceInfo',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/ems/base/baseCollectDeviceInfo/index.vue b/src/views/ems/base/baseCollectDeviceInfo/index.vue
new file mode 100644
index 0000000..8daff49
--- /dev/null
+++ b/src/views/ems/base/baseCollectDeviceInfo/index.vue
@@ -0,0 +1,403 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <!--      <el-form-item label="采集设备编号" prop="collectDeviceId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.collectDeviceId"-->
+      <!--          placeholder="请输入采集设备编号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="采集设备名称" prop="collectDeviceName">
+        <el-input
+          v-model="queryParams.collectDeviceName"
+          placeholder="请输入采集设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="能源类型" prop="energyTypeId">
+        <el-select v-model="queryParams.energyTypeId" placeholder="请选择能源类型">
+          <el-option
+            v-for="item in energyTypeList"
+            :key="item.energyTypeId"
+            :label="item.energyName"
+            :value="item.energyTypeId"
+          ></el-option>
+        </el-select>
+      </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>
+        <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>
+      </el-form-item>
+    </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="['ems/base:baseCollectDeviceInfo: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="['ems/base:baseCollectDeviceInfo: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="['ems/base:baseCollectDeviceInfo:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['ems/base:baseCollectDeviceInfo:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="baseCollectDeviceInfoList" @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="collectDeviceId" v-if="columns[1].visible"/>
+      <el-table-column label="采集设备名称" align="center" prop="collectDeviceName" v-if="columns[2].visible"/>
+      <el-table-column label="能源类型" align="center" prop="energyTypeName" v-if="columns[3].visible"/>
+      <el-table-column label="型号" align="center" prop="model" v-if="columns[4].visible"/>
+      <el-table-column label="生产厂家" align="center" prop="manufacturer" v-if="columns[5].visible"/>
+      <el-table-column label="通讯地址" align="center" prop="ipAddress" v-if="columns[6].visible"/>
+      <el-table-column label="生产日期" align="center" prop="produceDate" width="180" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.produceDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="安装地址" align="center" prop="settingAddress" v-if="columns[8].visible"/>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ems/base:baseCollectDeviceInfo:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems/base:baseCollectDeviceInfo:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改采集设备信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="采集设备编号" prop="collectDeviceId">
+          <el-input v-model="form.collectDeviceId" placeholder="请输入采集设备编号"/>
+        </el-form-item>
+        <el-form-item label="采集设备名称" prop="collectDeviceName">
+          <el-input v-model="form.collectDeviceName" placeholder="请输入采集设备名称"/>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="energyTypeId">
+          <el-select v-model="form.energyTypeId" placeholder="请选择能源类型编号">
+            <el-option
+              v-for="item in energyTypeList"
+              :key="item.energyTypeId"
+              :label="item.energyName"
+              :value="item.energyTypeId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="型号" prop="model">
+          <el-input v-model="form.model" placeholder="请输入型号"/>
+        </el-form-item>
+        <el-form-item label="生产厂家" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入生产厂家"/>
+        </el-form-item>
+        <el-form-item label="通讯地址" prop="ipAddress">
+          <el-input v-model="form.ipAddress" placeholder="请输入通讯地址"/>
+        </el-form-item>
+        <el-form-item label="生产日期" prop="produceDate">
+          <el-date-picker clearable
+                          v-model="form.produceDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择生产日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="安装地址" prop="settingAddress">
+          <el-input v-model="form.settingAddress" placeholder="请输入安装地址"/>
+        </el-form-item>
+        <el-form-item label="启用标识" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.is_flag"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listBaseCollectDeviceInfo,
+  getBaseCollectDeviceInfo,
+  delBaseCollectDeviceInfo,
+  addBaseCollectDeviceInfo,
+  updateBaseCollectDeviceInfo
+} from '@/api/ems/base/baseCollectDeviceInfo'
+import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
+
+export default {
+  name: 'BaseCollectDeviceInfo',
+  dicts: ['is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 采集设备信息表格数据
+      baseCollectDeviceInfoList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        collectDeviceId: null,
+        collectDeviceName: null,
+        energyTypeId: null,
+        model: null,
+        manufacturer: null,
+        ipAddress: null,
+        produceDate: null,
+        settingAddress: null,
+        isFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '自增标识不能为空', trigger: 'blur' }
+        ],
+        collectDeviceId: [
+          { required: true, message: '采集设备编号不能为空', trigger: 'blur' }
+        ],
+        collectDeviceName: [
+          { required: true, message: '采集设备名称不能为空', trigger: 'blur' }
+        ],
+        energyTypeId: [
+          { required: true, message: '能源类型不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { 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 }
+      ],
+      // 能源类型选项
+      energyTypeList: []
+    }
+  },
+  created() {
+    getBaseEnergyTypeList({}).then(response => {
+      this.energyTypeList = response.data
+    })
+    this.getList()
+  },
+  methods: {
+    /** 查询采集设备信息列表 */
+    getList() {
+      this.loading = true
+      listBaseCollectDeviceInfo(this.queryParams).then(response => {
+        this.baseCollectDeviceInfoList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        collectDeviceId: null,
+        collectDeviceName: null,
+        energyTypeId: null,
+        model: null,
+        manufacturer: null,
+        ipAddress: null,
+        produceDate: null,
+        settingAddress: null,
+        isFlag: '0',
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加采集设备信息'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getBaseCollectDeviceInfo(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改采集设备信息'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateBaseCollectDeviceInfo(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addBaseCollectDeviceInfo(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除采集设备信息编号为"' + objIds + '"的数据项？').then(function() {
+        return delBaseCollectDeviceInfo(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/base/baseCollectDeviceInfo/export', {
+        ...this.queryParams
+      }, `baseCollectDeviceInfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/src/views/ems/base/baseMonitorInfo/index.vue b/src/views/ems/base/baseMonitorInfo/index.vue
index f0583dd..41cf94a 100644
--- a/src/views/ems/base/baseMonitorInfo/index.vue
+++ b/src/views/ems/base/baseMonitorInfo/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="计量设备编号" prop="monitorCode">
-        <el-input
-          v-model="queryParams.monitorCode"
-          placeholder="请输入计量设备编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="计量设备编号" prop="monitorCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.monitorCode"-->
+<!--          placeholder="请输入计量设备编号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="计量设备名称" prop="monitorName">
         <el-input
           v-model="queryParams.monitorName"
@@ -17,14 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="计量设备位置" prop="monitorAddr">
-        <el-input
-          v-model="queryParams.monitorAddr"
-          placeholder="请输入计量设备位置"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="计量设备状态" prop="monitorStatus">
         <el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable>
           <el-option
@@ -35,14 +27,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="采集设备编号" prop="collectDeviceId">
-        <el-input
-          v-model="queryParams.collectDeviceId"
-          placeholder="请输入采集设备编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="是否虚拟" prop="isAmmeter">
         <el-select v-model="queryParams.isAmmeter" placeholder="请选择是否虚拟" clearable>
           <el-option
@@ -94,24 +78,24 @@
       <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[2].visible" />
       <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[3].visible" />
       <el-table-column label="计量设备位置" align="center" prop="monitorAddr" v-if="columns[4].visible" />
-      <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[6].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus"/>
-        </template>
-      </el-table-column>
       <el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[7].visible" />
       <el-table-column label="等级" align="center" prop="grade" v-if="columns[9].visible" />
       <el-table-column label="传感器仪表" align="center" prop="meterTypeId" v-if="columns[10].visible" />
       <el-table-column label="修正值" align="center" prop="correctValue" v-if="columns[11].visible" />
-      <el-table-column label="PT值" align="center" prop="pt" v-if="columns[12].visible" />
-      <el-table-column label="CT值" align="center" prop="ct" v-if="columns[13].visible" />
-      <el-table-column label="是否虚拟" align="center" prop="isAmmeter" v-if="columns[14].visible">
+      <el-table-column label="PT值" align="center" prop="pt" v-if="columns[12].visible" width="60"/>
+      <el-table-column label="CT值" align="center" prop="ct" v-if="columns[13].visible" width="60"/>
+      <el-table-column label="是否虚拟" align="center" prop="isAmmeter" v-if="columns[14].visible" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.is_ammeter" :value="scope.row.isAmmeter"/>
         </template>
       </el-table-column>
       <el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[15].visible" />
       <el-table-column label="是否断路" align="center" prop="isCircuit" v-if="columns[16].visible" />
+      <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[6].visible" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus"/>
+        </template>
+      </el-table-column>
       <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[17].visible" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[18].visible">
         <template slot-scope="scope">
@@ -177,23 +161,23 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="采集设备编号" prop="collectDeviceId">
+        <el-form-item label="采集设备" prop="collectDeviceId">
           <el-input v-model="form.collectDeviceId" placeholder="请输入采集设备编号" />
         </el-form-item>
-        <el-form-item label="等级" prop="grade">
-          <el-input v-model="form.grade" placeholder="请输入等级" />
-        </el-form-item>
-        <el-form-item label="传感器仪表" prop="meterTypeId">
-          <el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表" />
-        </el-form-item>
-        <el-form-item label="修正值" prop="correctValue">
-          <el-input v-model="form.correctValue" placeholder="请输入修正值" />
-        </el-form-item>
+<!--        <el-form-item label="等级" prop="grade">-->
+<!--          <el-input v-model="form.grade" placeholder="请输入等级" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="传感器仪表" prop="meterTypeId">-->
+<!--          <el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="修正值" prop="correctValue">-->
+<!--          <el-input v-model="form.correctValue" placeholder="请输入修正值" />-->
+<!--        </el-form-item>-->
         <el-form-item label="PT值" prop="pt">
-          <el-input v-model="form.pt" placeholder="请输入PT值" />
+          <el-input-number v-model="form.pt" placeholder="请输入PT值" />
         </el-form-item>
         <el-form-item label="CT值" prop="ct">
-          <el-input v-model="form.ct" placeholder="请输入CT值" />
+          <el-input-number v-model="form.ct" placeholder="请输入CT值" />
         </el-form-item>
         <el-form-item label="是否虚拟" prop="isAmmeter">
           <el-radio-group v-model="form.isAmmeter">
@@ -204,18 +188,18 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="通断复位" prop="isKeyMonitor">
-          <el-input v-model="form.isKeyMonitor" placeholder="请输入通断复位" />
-        </el-form-item>
-        <el-form-item label="是否断路" prop="isCircuit">
-          <el-input v-model="form.isCircuit" placeholder="请输入是否断路" />
-        </el-form-item>
-        <el-form-item label="公摊表类型" prop="publicShareType">
-          <el-input v-model="form.publicShareType" placeholder="请输入公摊表类型" />
-        </el-form-item>
-        <el-form-item label="表具层级" prop="monitorHierarchy">
-          <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" />
-        </el-form-item>
+<!--        <el-form-item label="通断复位" prop="isKeyMonitor">-->
+<!--          <el-input v-model="form.isKeyMonitor" placeholder="请输入通断复位" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="是否断路" prop="isCircuit">-->
+<!--          <el-input v-model="form.isCircuit" placeholder="请输入是否断路" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="公摊表类型" prop="publicShareType">-->
+<!--          <el-input v-model="form.publicShareType" placeholder="请输入公摊表类型" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="表具层级" prop="monitorHierarchy">-->
+<!--          <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" />-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -362,16 +346,16 @@ export default {
         monitorCode: null,
         monitorName: null,
         monitorAddr: null,
-        monitorType: 2,
-        monitorStatus: null,
+        monitorType: '2',
+        monitorStatus: 0,
         collectDeviceId: null,
         ancestors: null,
         grade: null,
         meterTypeId: null,
         correctValue: null,
-        pt: null,
-        ct: null,
-        isAmmeter: null,
+        pt: 1,
+        ct: 1,
+        isAmmeter: '1',
         isKeyMonitor: null,
         isCircuit: null,
         createBy: null,
diff --git a/src/views/ems/base/baseMonitorWorkUnit/index.vue b/src/views/ems/base/baseMonitorWorkUnit/index.vue
index 267c710..83b9e2e 100644
--- a/src/views/ems/base/baseMonitorWorkUnit/index.vue
+++ b/src/views/ems/base/baseMonitorWorkUnit/index.vue
@@ -321,7 +321,7 @@ export default {
         monitorCode: null,
         workUnitCode: null,
         monitorStatus: null,
-        monitorType: 2,
+        monitorType: '2',
         formulaMode: null,
         proportion: null,
         isFlag: null,