diff --git a/src/api/mes/base/baseDeviceLedger.js b/src/api/mes/base/baseDeviceLedger.js
index 25171b1..d664715 100644
--- a/src/api/mes/base/baseDeviceLedger.js
+++ b/src/api/mes/base/baseDeviceLedger.js
@@ -42,3 +42,12 @@ export function delBaseDeviceLedger(objId) {
     method: 'delete'
   })
 }
+
+// 查询设备台账下拉框列表
+export function getDeviceLedger(query) {
+  return request({
+    url: '/mes/base/baseDeviceLedger/getDeviceLedger',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/mes/base/baseTeamMembers.js b/src/api/mes/base/baseTeamMembers.js
index c8b0595..ca9f2b0 100644
--- a/src/api/mes/base/baseTeamMembers.js
+++ b/src/api/mes/base/baseTeamMembers.js
@@ -42,3 +42,12 @@ export function delBaseTeamMembers(objId) {
     method: 'delete'
   })
 }
+
+// 查询班组信息列表
+export function getTeamMembers(query) {
+  return request({
+    url: '/mes/base/baseTeamMembers/getTeamMembers',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/ems/base/baseMonitorWorkUnit/index.vue b/src/views/ems/base/baseMonitorWorkUnit/index.vue
index 83b9e2e..6f43ece 100644
--- a/src/views/ems/base/baseMonitorWorkUnit/index.vue
+++ b/src/views/ems/base/baseMonitorWorkUnit/index.vue
@@ -185,7 +185,7 @@
               <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">
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -330,6 +330,8 @@ export default {
         updatedBy: null,
         updatedTime: null
       },
+      // 左侧树点击时添加默认赋值
+      addWorkUnitCode: null,
       // 表单参数
       form: {},
       workUnitProps: {
@@ -365,15 +367,19 @@ export default {
     }
   },
   created() {
-    this.getList()
     this.getTreeselect()
     this.getDeptTrees()
+    this.getList()
   },
   watch: {
     // 根据名称筛选部门树
     workUnitName(val) {
       this.$refs.tree.filter(val)
-    }
+    },
+    'queryParams.monitorType': function(newVal, oldVal) {
+      // 执行方法，可以在这里调用你的方法
+      this.getTreeselect()
+    },
   },
   methods: {
     /** 查询统计计量信息列表 */
@@ -429,6 +435,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
+      this.form.workUnitCode = this.addWorkUnitCode
       this.open = true
       this.title = '添加统计计量信息'
     },
@@ -482,7 +489,7 @@ export default {
 
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      listBaseMonitorInfo().then(response => {
+      listBaseMonitorInfo({monitorType: this.queryParams.monitorType}).then(response => {
         this.monitorInfoOptions = []
         this.monitorInfoOptions = this.handleTree(response.data, 'objId', 'parentId')
       })
@@ -526,6 +533,7 @@ export default {
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.workUnitCode = data.id
+      this.addWorkUnitCode = data.id
       this.handleQuery()
     }
   }
diff --git a/src/views/mes/base/baseDeviceParam/index.vue b/src/views/mes/base/baseDeviceParam/index.vue
index 989c021..0aa00c5 100644
--- a/src/views/mes/base/baseDeviceParam/index.vue
+++ b/src/views/mes/base/baseDeviceParam/index.vue
@@ -94,6 +94,7 @@
     <el-table v-loading="loading" :data="baseDeviceParamList" @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="deviceName" v-if="columns[6].visible"/>
       <el-table-column label="参数编号" align="center" prop="paramCode" v-if="columns[1].visible"/>
       <el-table-column label="参数名称" align="center" prop="paramName" v-if="columns[2].visible"/>
       <el-table-column label="网络地址" align="center" prop="paramNetwork" v-if="columns[3].visible"/>
@@ -103,7 +104,6 @@
           <dict-tag :options="dict.type.param_type" :value="scope.row.paramType"/>
         </template>
       </el-table-column>
-      <el-table-column label="设备编号" align="center" prop="deviceCode" v-if="columns[6].visible"/>
       <el-table-column label="读取频率(毫秒)" align="center" prop="readFrequency" v-if="columns[7].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
         <template slot-scope="scope">
@@ -155,6 +155,16 @@
     <!-- 添加或修改设备参数对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="设备名称" prop="deviceCode">
+          <el-select v-model="form.deviceCode" placeholder="请选择设备名称">
+            <el-option
+              v-for="item in deviceLedgerList"
+              :key="item.deviceCode"
+              :label="item.deviceName"
+              :value="item.deviceCode"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="参数编号" prop="paramCode">
           <el-input v-model="form.paramCode" placeholder="请输入参数编号"/>
         </el-form-item>
@@ -177,9 +187,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="设备编号" prop="deviceCode">
-          <el-input v-model="form.deviceCode" placeholder="请输入设备编号"/>
-        </el-form-item>
         <el-form-item label="读取频率(毫秒)" prop="readFrequency">
           <el-input v-model="form.readFrequency" placeholder="请输入读取频率(毫秒)"/>
         </el-form-item>
@@ -210,6 +217,8 @@ import {
   addBaseDeviceParam,
   updateBaseDeviceParam
 } from '@/api/mes/base/baseDeviceParam'
+import { getBaseProductLineList } from '@/api/mes/base/baseProductLine'
+import { getDeviceLedger } from '@/api/mes/base/baseDeviceLedger'
 
 export default {
   name: 'BaseDeviceParam',
@@ -273,10 +282,15 @@ export default {
         { key: 10, label: `创建时间`, visible: false },
         { key: 11, label: `更新人`, visible: false },
         { key: 12, label: `更新时间`, visible: false }
-      ]
+      ],
+      // 设备选项
+      deviceLedgerList: []
     }
   },
   created() {
+    getDeviceLedger().then(response => {
+      this.deviceLedgerList = response.data
+    })
     this.getList()
   },
   methods: {
diff --git a/src/views/mes/base/baseMaterialInfo/index.vue b/src/views/mes/base/baseMaterialInfo/index.vue
index 772e2af..600b5a1 100644
--- a/src/views/mes/base/baseMaterialInfo/index.vue
+++ b/src/views/mes/base/baseMaterialInfo/index.vue
@@ -164,16 +164,16 @@
         <el-form-item label="物料型号" prop="materialSpecifications">
           <el-input v-model="form.materialSpecifications" placeholder="请输入物料型号"/>
         </el-form-item>
-        <el-form-item label="生产工位" prop="productLineCode">
-          <el-select v-model="form.productLineCode" placeholder="请选择生产工位">
-            <el-option
-              v-for="item in productLineList"
-              :key="item.productLineCode"
-              :label="item.productLineName"
-              :value="item.productLineCode"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="生产工位" prop="productLineCode">-->
+<!--          <el-select v-model="form.productLineCode" placeholder="请选择生产工位">-->
+<!--            <el-option-->
+<!--              v-for="item in productLineList"-->
+<!--              :key="item.productLineCode"-->
+<!--              :label="item.productLineName"-->
+<!--              :value="item.productLineCode"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="物料小类" prop="materialSubclass">
           <el-radio-group v-model="form.materialSubclass">
             <el-radio
@@ -210,15 +210,15 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="增量日期" prop="incrementDate">
-          <el-date-picker clearable
-                          v-model="form.incrementDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择增量日期"
-          >
-          </el-date-picker>
-        </el-form-item>
+<!--        <el-form-item label="增量日期" prop="incrementDate">-->
+<!--          <el-date-picker clearable-->
+<!--                          v-model="form.incrementDate"-->
+<!--                          type="date"-->
+<!--                          value-format="yyyy-MM-dd"-->
+<!--                          placeholder="请选择增量日期"-->
+<!--          >-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="商品编码" prop="productCode">-->
 <!--          <el-input v-model="form.productCode" placeholder="请输入商品编码"/>-->
 <!--        </el-form-item>-->
@@ -308,13 +308,13 @@ export default {
         { key: 7, label: `单位工资(元)`, visible: true },
         { key: 8, label: `物料型号`, 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 },
         { key: 14, label: `更新人`, visible: false },
         { key: 15, label: `更新时间`, visible: false },
-        { key: 16, label: `增量日期`, visible: true },
+        { key: 16, label: `增量日期`, visible: false },
         { key: 17, label: `商品编码`, visible: false },
         { key: 18, label: `商品名称`, visible: false }
       ],
@@ -323,9 +323,9 @@ export default {
     }
   },
   created() {
-    getBaseProductLineList({ productLineType: 2 }).then(response => {
-      this.productLineList = response.data
-    })
+    // getBaseProductLineList({ productLineType: 2 }).then(response => {
+    //   this.productLineList = response.data
+    // })
     this.getList()
   },
   methods: {
diff --git a/src/views/mes/base/baseStaffInfo/index.vue b/src/views/mes/base/baseStaffInfo/index.vue
index 0cbb4d9..67d1a90 100644
--- a/src/views/mes/base/baseStaffInfo/index.vue
+++ b/src/views/mes/base/baseStaffInfo/index.vue
@@ -112,7 +112,7 @@
         </template>
       </el-table-column>
       <el-table-column label="卡号" align="center" prop="cardId" v-if="columns[4].visible"/>
-      <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[5].visible"/>
+      <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[5].visible"/>
       <el-table-column label="手机号" align="center" prop="phoneNumber" v-if="columns[6].visible"/>
       <el-table-column label="用户性别" align="center" prop="sex" v-if="columns[7].visible">
         <template slot-scope="scope">
@@ -173,8 +173,15 @@
         <el-form-item label="卡号" prop="cardId">
           <el-input v-model="form.cardId" placeholder="请输入卡号"/>
         </el-form-item>
-        <el-form-item label="班组编号" prop="teamCode">
-          <el-input v-model="form.teamCode" placeholder="请输入班组编号"/>
+        <el-form-item label="班组名称" prop="teamCode">
+          <el-select v-model="form.teamCode" placeholder="请选择班组名称">
+            <el-option
+              v-for="item in teamMembersList"
+              :key="item.teamCode"
+              :label="item.teamName"
+              :value="item.teamCode"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="手机号" prop="phoneNumber">
           <el-input v-model="form.phoneNumber" placeholder="请输入手机号"/>
@@ -222,6 +229,7 @@ import {
   addBaseStaffInfo,
   updateBaseStaffInfo
 } from '@/api/mes/base/baseStaffInfo'
+import { getTeamMembers } from '@/api/mes/base/baseTeamMembers'
 
 export default {
   name: 'BaseStaffInfo',
@@ -292,10 +300,15 @@ export default {
         { key: 12, label: `更新者`, visible: false },
         { key: 13, label: `更新时间`, visible: false },
         { key: 14, label: `备注`, visible: false }
-      ]
+      ],
+      // 班组选项
+      teamMembersList: []
     }
   },
   created() {
+    getTeamMembers().then(response => {
+      this.teamMembersList = response.data
+    })
     this.getList()
   },
   methods: {
diff --git a/src/views/mes/base/baseStation/index.vue b/src/views/mes/base/baseStation/index.vue
index ecbfc62..84cd62e 100644
--- a/src/views/mes/base/baseStation/index.vue
+++ b/src/views/mes/base/baseStation/index.vue
@@ -110,8 +110,8 @@
         </template>
       </el-table-column>
       <el-table-column label="执行顺序" align="center" prop="executionSort" v-if="columns[14].visible"/>
-      <el-table-column label="日产能(米)" align="center" prop="capacityDay" v-if="columns[15].visible"/>
-      <el-table-column label="月产能(米)" align="center" prop="capacityMonth" v-if="columns[16].visible"/>
+      <el-table-column label="日产能" align="center" prop="capacityDay" v-if="columns[15].visible"/>
+      <el-table-column label="月产能" align="center" prop="capacityMonth" v-if="columns[16].visible"/>
       <el-table-column label="SAP工作中心编号" align="center" prop="workCenterCode" v-if="columns[12].visible"/>
       <el-table-column label="SAP工作中心描述" align="center" prop="workCenterName" v-if="columns[13].visible"/>
       <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[6].visible"/>
@@ -207,11 +207,11 @@
         <el-form-item label="执行顺序" prop="executionSort">
           <el-input-number v-model="form.executionSort" placeholder="请输入执行顺序"/>
         </el-form-item>
-        <el-form-item label="日产能(米)" prop="capacityDay">
-          <el-input-number v-model="form.capacityDay" placeholder="请输入日产能(米)"/>
+        <el-form-item label="日产能" prop="capacityDay">
+          <el-input-number v-model="form.capacityDay" placeholder="请输入日产能"/>
         </el-form-item>
-        <el-form-item label="月产能(米)" prop="capacityMonth">
-          <el-input-number v-model="form.capacityMonth" placeholder="请输入月产能(米)"/>
+        <el-form-item label="月产能" prop="capacityMonth">
+          <el-input-number v-model="form.capacityMonth" placeholder="请输入月产能"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -299,8 +299,8 @@ export default {
         { key: 12, label: `SAP工作中心编号`, visible: false },
         { key: 13, label: `SAP工作中心描述`, visible: false },
         { key: 14, label: `执行顺序`, visible: true },
-        { key: 15, label: `日产能(米)`, visible: true },
-        { key: 16, label: `月产能(米)`, visible: true }
+        { key: 15, label: `日产能`, visible: true },
+        { key: 16, label: `月产能`, visible: true }
       ],
       // 产线选项
       productLineList: []
diff --git a/src/views/mes/base/baseTeamMembers/index.vue b/src/views/mes/base/baseTeamMembers/index.vue
index 6d8a86e..05eafbe 100644
--- a/src/views/mes/base/baseTeamMembers/index.vue
+++ b/src/views/mes/base/baseTeamMembers/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="teamCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.teamCode"-->
-<!--          placeholder="请输入班组编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="班组编号" prop="teamCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.teamCode"-->
+      <!--          placeholder="请输入班组编号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="班组名称" prop="teamName">
         <el-input
           v-model="queryParams.teamName"
@@ -17,14 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="所属工位" prop="stationCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.stationCode"-->
-<!--          placeholder="请输入所属工位"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="所属工位" prop="stationCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.stationCode"-->
+      <!--          placeholder="请输入所属工位"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="班次" prop="classes">
         <el-select v-model="queryParams.classes" placeholder="请选择班次" clearable>
           <el-option
@@ -45,14 +45,14 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="机台编号" prop="machineCode">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.machineCode"-->
-<!--          placeholder="请输入机台编号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="机台编号" prop="machineCode">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.machineCode"-->
+      <!--          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>
@@ -115,7 +115,7 @@
       <el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[1].visible"/>
       <el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[2].visible"/>
       <el-table-column label="班组负责人" align="center" prop="teamHead" v-if="columns[3].visible"/>
-      <el-table-column label="所属工位" align="center" prop="stationCode" v-if="columns[4].visible"/>
+      <el-table-column label="所属工位" align="center" prop="stationName" v-if="columns[4].visible"/>
       <el-table-column label="班次" align="center" prop="classes" v-if="columns[5].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.classes" :value="scope.row.classes"/>
@@ -124,12 +124,12 @@
       <el-table-column label="上班时间" align="center" prop="startTime" v-if="columns[6].visible"/>
       <el-table-column label="下班时间" align="center" prop="endTime" v-if="columns[7].visible"/>
       <el-table-column label="休息时间" align="center" prop="dineTime" v-if="columns[8].visible"/>
+      <el-table-column label="机台编号" align="center" prop="machineName" v-if="columns[14].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="machineCode" v-if="columns[14].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button
@@ -173,7 +173,14 @@
           <el-input v-model="form.teamHead" placeholder="请输入班组负责人"/>
         </el-form-item>
         <el-form-item label="所属工位" prop="stationCode">
-          <el-input v-model="form.stationCode" placeholder="请输入所属工位"/>
+          <el-select v-model="form.stationCode" placeholder="请选择所属工位">
+            <el-option
+              v-for="item in productLineList"
+              :key="item.productLineCode"
+              :label="item.productLineName"
+              :value="item.productLineCode"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="班次" prop="classes">
           <el-radio-group v-model="form.classes">
@@ -191,8 +198,18 @@
         <el-form-item label="下班时间" prop="endTime">
           <el-input v-model="form.endTime" placeholder="请输入下班时间"/>
         </el-form-item>
-        <el-form-item label="休息时间" prop="dineTime">
-          <el-input v-model="form.dineTime" placeholder="请输入休息时间"/>
+<!--        <el-form-item label="休息时间" prop="dineTime">-->
+<!--          <el-input v-model="form.dineTime" placeholder="请输入休息时间"/>-->
+<!--        </el-form-item>-->
+        <el-form-item label="机台名称" prop="machineCode">
+          <el-select v-model="form.machineCode" placeholder="请选择机台名称">
+            <el-option
+              v-for="item in deviceLedgerList"
+              :key="item.deviceCode"
+              :label="item.deviceName"
+              :value="item.deviceCode"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="启用标识" prop="isFlag">
           <el-radio-group v-model="form.isFlag">
@@ -204,9 +221,6 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="机台编号" prop="machineCode">
-          <el-input v-model="form.machineCode" placeholder="请输入机台编号"/>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -224,6 +238,8 @@ import {
   addBaseTeamMembers,
   updateBaseTeamMembers
 } from '@/api/mes/base/baseTeamMembers'
+import { getBaseProductLineList } from '@/api/mes/base/baseProductLine'
+import { getDeviceLedger } from '@/api/mes/base/baseDeviceLedger'
 
 export default {
   name: 'BaseTeamMembers',
@@ -269,7 +285,19 @@ export default {
       rules: {
         objId: [
           { required: true, message: '主键标识不能为空', trigger: 'blur' }
-        ]
+        ],
+        classes: [
+          { required: true, message: '班次不能为空', trigger: 'blur' }
+        ],
+        teamCode: [
+          { required: true, message: '班组编号不能为空', trigger: 'blur' }
+        ],
+        teamName: [
+          { required: true, message: '班组名称不能为空', trigger: 'blur' }
+        ],
+        stationCode: [
+          { required: true, message: '所属工位不能为空', trigger: 'blur' }
+        ],
       },
       columns: [
         { key: 0, label: `主键标识`, visible: false },
@@ -287,10 +315,20 @@ export default {
         { key: 12, label: `更新人`, visible: false },
         { key: 13, label: `更新时间`, visible: false },
         { key: 14, label: `机台编号`, visible: true }
-      ]
+      ],
+      // 工位选项
+      productLineList: [],
+      // 设备选项
+      deviceLedgerList: []
     }
   },
   created() {
+    getBaseProductLineList({ productLineType: 2 }).then(response => {
+      this.productLineList = response.data
+    })
+    getDeviceLedger().then(response => {
+      this.deviceLedgerList = response.data
+    })
     this.getList()
   },
   methods: {