diff --git a/src/views/base/monitorWorkUnit/index.vue b/src/views/base/monitorWorkUnit/index.vue
index 4a36490..c05861f 100644
--- a/src/views/base/monitorWorkUnit/index.vue
+++ b/src/views/base/monitorWorkUnit/index.vue
@@ -2,206 +2,216 @@
 
   <div class="app-container">
     <el-row :gutter="20">
-    <el-col :span="5" :xs="24">
-      <div class="head-container">
-        <el-input
-          v-model="workUnitName"
-          placeholder="请输入统计单元名称"
-          clearable
-          size="small"
-          prefix-icon="el-icon-search"
-          style="margin-bottom: 20px"
-        />
-      </div>
-      <div class="head-container">
-        <el-tree
-          :data="workUnitOptions"
-          :props="workUnitProps"
-          :expand-on-click-node="false"
-          :filter-node-method="filterNode"
-          ref="tree"
-          node-key="id"
-          default-expand-all
-          highlight-current
-          @node-click="handleNodeClick"
-        />
-      </div>
-    </el-col>
-
-      <el-col :span="19" :xs="24">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="计量设备状态" prop="monitorStatus">
-        <el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable>
-          <el-option
-            v-for="dict in dict.type.is_flag"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+      <el-col :span="5" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="workUnitName"
+            placeholder="请输入统计单元名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
           />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="计量设备类型" prop="monitorType">-->
-<!--        <el-select v-model="queryParams.monitorType" placeholder="请选择计量设备类型" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.monitor_type"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-      <el-form-item label="计算方式" prop="formulaMode">
-        <el-select v-model="queryParams.formulaMode" placeholder="请选择计算方式" clearable>
-          <el-option
-            v-for="dict in dict.type.formula_mode"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="workUnitOptions"
+            :props="workUnitProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
           />
-        </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="['base:monitorWorkUnit: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="['base:monitorWorkUnit:edit']"
-        >修改</el-button>
+        </div>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['base:monitorWorkUnit: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="['base:monitorWorkUnit:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-    </el-row>
 
-    <el-table v-loading="loading" :data="monitorWorkUnitList" @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="workUnitCode" v-if="columns[2].visible"/>
-      <el-table-column label="计量设备类型" align="center" prop="monitorType" v-if="columns[4].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.monitor_type" :value="scope.row.monitorType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="计算方式" align="center" prop="formulaMode" v-if="columns[5].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.formula_mode" :value="scope.row.formulaMode"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="比率" align="center" prop="proportion" v-if="columns[6].visible"/>
-      <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[3].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_flag" :value="scope.row.monitorStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
-      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].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="createdBy" v-if="columns[9].visible"/>
-      <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[10].visible">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="修改人" align="center" prop="updatedBy" v-if="columns[11].visible"/>
-      <el-table-column label="修改时间" align="center" prop="updatedTime" width="180" v-if="columns[12].visible">
-        <template slot-scope="scope">
-          <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="['base:monitorWorkUnit:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['base:monitorWorkUnit:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <el-col :span="19" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="100px">
+          <el-form-item label="计量设备状态" prop="monitorStatus">
+            <el-select v-model="queryParams.monitorStatus" 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="monitorType">-->
+          <!--        <el-select v-model="queryParams.monitorType" placeholder="请选择计量设备类型" clearable>-->
+          <!--          <el-option-->
+          <!--            v-for="dict in dict.type.monitor_type"-->
+          <!--            :key="dict.value"-->
+          <!--            :label="dict.label"-->
+          <!--            :value="dict.value"-->
+          <!--          />-->
+          <!--        </el-select>-->
+          <!--      </el-form-item>-->
+          <el-form-item label="计算方式" prop="formulaMode">
+            <el-select v-model="queryParams.formulaMode" placeholder="请选择计算方式" clearable>
+              <el-option
+                v-for="dict in dict.type.formula_mode"
+                :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="['base:monitorWorkUnit: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="['base:monitorWorkUnit: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="['base:monitorWorkUnit: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="['base:monitorWorkUnit:export']"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="monitorWorkUnitList" @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="workUnitCode" v-if="columns[2].visible"/>
+          <el-table-column label="计量设备类型" align="center" prop="monitorType" v-if="columns[4].visible">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.monitor_type" :value="scope.row.monitorType"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="计算方式" align="center" prop="formulaMode" v-if="columns[5].visible">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.formula_mode" :value="scope.row.formulaMode"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="比率" align="center" prop="proportion" v-if="columns[6].visible"/>
+          <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[3].visible">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.is_flag" :value="scope.row.monitorStatus"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
+          <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].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="createdBy" v-if="columns[9].visible"/>
+          <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[10].visible">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="修改人" align="center" prop="updatedBy" v-if="columns[11].visible"/>
+          <el-table-column label="修改时间" align="center" prop="updatedTime" width="180" v-if="columns[12].visible">
+            <template slot-scope="scope">
+              <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="['base:monitorWorkUnit:edit']"
+              >修改
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['base:monitorWorkUnit: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"
-    />
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
     <!-- 添加或修改统计计量信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="计量设备名称" prop="monitorCode">
-          <treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer" placeholder="请选择计量设备" />
+          <treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer"
+                      placeholder="请选择计量设备"/>
         </el-form-item>
         <el-form-item label="统计单元编号" prop="workUnitCode">
-          <treeselect v-model="form.workUnitCode" :options="workUnitOptions" :normalizer="workUnitOptionsNormalizer" placeholder="请选择父级编号" />
+          <treeselect v-model="form.workUnitCode" :options="workUnitOptions" :normalizer="workUnitOptionsNormalizer"
+                      placeholder="请选择父级编号"/>
         </el-form-item>
-<!--        <el-form-item label="计量设备编号" prop="monitorCode">-->
-<!--          <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="统计单元编号" prop="workUnitCode">-->
-<!--          <el-input v-model="form.workUnitCode" placeholder="请输入统计单元编号" />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="计量设备编号" prop="monitorCode">-->
+        <!--          <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="统计单元编号" prop="workUnitCode">-->
+        <!--          <el-input v-model="form.workUnitCode" placeholder="请输入统计单元编号" />-->
+        <!--        </el-form-item>-->
         <el-form-item label="计量设备类型" prop="monitorType">
           <el-radio-group v-model="form.monitorType">
             <el-radio
               v-for="dict in dict.type.monitor_type"
               :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="formulaMode">
@@ -210,14 +220,15 @@
               v-for="dict in dict.type.formula_mode"
               :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="proportion">
-          <el-input v-model="form.proportion" placeholder="请输入比率" />
+          <el-input v-model="form.proportion" placeholder="请输入比率"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.remark" placeholder="请输入备注"/>
         </el-form-item>
         <el-form-item label="计量设备状态" prop="monitorStatus">
           <el-radio-group v-model="form.monitorStatus">
@@ -225,7 +236,8 @@
               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="isFlag">
@@ -234,7 +246,8 @@
               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>
@@ -247,9 +260,15 @@
 </template>
 
 <script>
-import { listMonitorWorkUnit, getMonitorWorkUnit, delMonitorWorkUnit, addMonitorWorkUnit, updateMonitorWorkUnit } from "@/api/base/monitorWorkUnit";
+import {
+  listMonitorWorkUnit,
+  getMonitorWorkUnit,
+  delMonitorWorkUnit,
+  addMonitorWorkUnit,
+  updateMonitorWorkUnit
+} from "@/api/base/monitorWorkUnit";
 import {getWorkUnitTrees} from '@/api/base/workUnit'
-import { listMonitorInfo } from '@/api/base/monitorInfo'
+import {listMonitorInfo} from '@/api/base/monitorInfo'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -258,11 +277,11 @@ export default {
   dicts: ['monitor_type', 'formula_mode', 'is_flag'],
   components: {
     Treeselect
-  },data() {
+  }, data() {
     return {
-      monitorInfoOptions:[],
-      workUnitOptions:[],
-      workUnitName:undefined,
+      monitorInfoOptions: [],
+      workUnitOptions: [],
+      workUnitName: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -307,27 +326,27 @@ export default {
       // 表单校验
       rules: {
         objId: [
-          { required: true, message: "主键标识不能为空", trigger: "blur" }
+          {required: true, message: "主键标识不能为空", trigger: "blur"}
         ],
         monitorCode: [
-          { required: true, message: "计量设备编号不能为空", trigger: "blur" }
+          {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: false },
-            { key: 9, label: `创建人`, visible: false },
-            { key: 10, label: `创建时间`, visible: false },
-            { key: 11, label: `修改人`, visible: false },
-            { key: 12, label: `修改时间`, visible: false },
-        ]
+        {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: false},
+        {key: 9, label: `创建人`, visible: false},
+        {key: 10, label: `创建时间`, visible: false},
+        {key: 11, label: `修改人`, visible: false},
+        {key: 12, label: `修改时间`, visible: false},
+      ]
     };
   },
   created() {
@@ -347,9 +366,11 @@ export default {
     getTreeselect() {
       listMonitorInfo().then(response => {
         this.monitorInfoOptions = [];
-        const data = { objId: 0, monitorName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "objId", "parentId");
-        this.monitorInfoOptions.push(data);
+        // const data = { objId: 0, monitorName: '顶级节点', children: [] };
+        this.monitorInfoOptions = this.handleTree(response.data, "objId", "parentId");
+        // data.children = this.handleTree(response.data, "objId", "parentId");
+        console.log('data', data)
+        // this.monitorInfoOptions  = data;
       });
     },
     /** 转换计量设备信息数据结构 */
@@ -365,6 +386,7 @@ export default {
     },
     /** 转换统计单元信息数据结构 */
     workUnitOptionsNormalizer(node) {
+      console.log('node', node)
       if (node.children && !node.children.length) {
         delete node.children;
       }
@@ -378,8 +400,9 @@ export default {
     /** 查询计量设备下拉树结构 */
     getDeptTrees() {
       getWorkUnitTrees().then(response => {
-        this.workUnitOptions = response.data;
-        console.log(this.workUnitOptions)
+        this.workUnitOptions = [];
+        this.workUnitOptions = JSON.parse(JSON.stringify(response.data).replaceAll('id','id2').replaceAll('code','id'));
+        console.log('this.workUnitOptions',this.workUnitOptions)
       });
     },
     // 筛选节点
@@ -409,7 +432,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        parentIds:null,
+        parentIds: null,
         parentId: null,
         objId: null,
         monitorCode: null,
@@ -441,7 +464,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.objId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -464,7 +487,6 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
-        console.log(this.form.monitorCode)
         if (valid) {
           if (this.form.objId != null) {
             updateMonitorWorkUnit(this.form).then(response => {
@@ -485,12 +507,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const objIds = row.objId || this.ids;
-      this.$modal.confirm('是否确认删除统计计量信息编号为"' + objIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除统计计量信息编号为"' + objIds + '"的数据项？').then(function () {
         return delMonitorWorkUnit(objIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {