diff --git a/src/utils/enum.js b/src/utils/enum.js
index 9a840e9b..a3808f28 100644
--- a/src/utils/enum.js
+++ b/src/utils/enum.js
@@ -97,4 +97,10 @@ export const valTypeEnum = new EnumFactory({
 export const boolEnum = new EnumFactory({
   true: '是',
   false: '否',
+})
+
+export const iMEnum = new EnumFactory({
+  10: '单开为开/单停为停',
+  20: '单开为开/都停为停',
+  30: '都开为开/单停为停',
 })
\ No newline at end of file
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 1e84815d..96d5d30d 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -24,7 +24,6 @@
     <el-main class="nopadding">
       <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" @selection-change="selectionChange">
         <el-table-column type="selection" width="50" />
-        <el-table-column type="index" width="50" />
         <el-table-column label="设备名称" prop="name" width="200" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="设备编号" prop="number">
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 1b4d0a9d..d805ecdb 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -2,8 +2,7 @@
   <el-drawer :title="titleMap[mode]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
     <el-container v-loading="loading">
       <el-main style="padding: 0 20px 20px 20px">
-        <el-form ref="dialogForm" :model="form" :rules="rules" :disabled="mode == 'show'" label-width="100px"
-          v-if="form.type == 10 || form.type == 30">
+        <el-form ref="dialogForm" :model="form" :rules="rules" :disabled="mode == 'show'" label-width="100px">
           <el-row>
             <el-col :md="12" :sm="24">
               <el-form-item label="所属部门">
@@ -29,14 +28,23 @@
                 <el-input v-model="form.number" placeholder="设备编号" />
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24">
+            <el-col :md="12" :sm="24" v-if="form.type == 10">
               <el-form-item
-								label="是否工段核心设备"
+								label="表明工段运行的方式"
 								label-width="160"
 							>
-								<el-switch
-									v-model="form.is_core_for_mgroup"
-								/>
+              <el-select
+									v-model="form.indicate_mgroup_running"
+									style="width: 100%"
+                  clearable
+								>
+									<el-option
+										v-for="e in iMEnum.values"
+										:key="e.key"
+										:value="e.key"
+										:label="e.text"
+									></el-option>
+								</el-select>
 							</el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
@@ -72,6 +80,11 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="出厂编号">
+                <el-input placeholder="出厂编号" v-model="form.number_factory"/>
+              </el-form-item>
+            </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="购置日期">
                 <el-date-picker v-model="form.buy_date" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
@@ -79,6 +92,13 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="启用日期">
+                <el-date-picker v-model="form.use_date" type="date" placeholder="启用日期" value-format="YYYY-MM-DD"
+                  style="width:100%">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="用电功率">
                 <el-input-number v-model="form.power_kw" :precision="2" :min="0" controls-position="right"
@@ -103,16 +123,45 @@
           <el-row>
             <el-col :md="12" :sm="24">
               <el-form-item label="简要技术参数">
-                <el-input type="textarea" :rows="4" v-model="form.parameter" placeholder="技术参数" />
+                <el-input type="textarea" :rows="3" v-model="form.parameter" placeholder="技术参数" />
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="备注">
-                <el-input type="textarea" :rows="4" v-model="form.description" placeholder="备注" />
+                <el-input type="textarea" :rows="3" v-model="form.description" placeholder="备注" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-divider/>
+          <el-row v-if="form.type==20">
+            <el-col :md="12" :sm="24">
+              <el-form-item label="仪表类型">
+                <el-input v-model="form.meter_type" placeholder="仪表类型" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="量程范围">
+                <el-input v-model="form.measurement_range" placeholder="量范" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="管理等级">
+                <el-input v-model="form.management_level" placeholder="管理等级" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="精度等级">
+                <el-input v-model="form.accuracy_level" placeholder="精度等级" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="检定周期(月)">
+                <el-input-number v-model="form.cycle" :precision="1" :min="0" controls-position="right"
+                  style="width: 100%;" placeholder="检定周期（月）" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider v-if="form.type==20"/>
           <el-row>
             <el-col>
               <el-form-item label="技术参数">
@@ -136,96 +185,6 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-form ref="dialogForm" :model="form" :rules="rules" :disabled="mode == 'show'" label-width="120px"
-          v-if="form.type == 20">
-          <el-row>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="所属部门">
-                <el-cascader v-model="form.belong_dept" :options="group" :props="groupsProps" clearable
-                  :show-all-levels="false" style="width: 100%">
-                </el-cascader>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :md="12" :sm="24">
-              <el-form-item label="所属部门" prop="belong_dept">
-                <el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%">
-                  <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <el-col :md="12" :sm="24">
-              <el-form-item label="计量编号" prop="number">
-                <el-input v-model="form.number" placeholder="设备编号" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="设备名称" prop="name">
-                <el-input v-model="form.name" placeholder="设备名称" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="规格型号">
-                <el-input v-model="form.model" placeholder="规格型号" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="仪表类型">
-                <el-input v-model="form.meter_type" placeholder="仪表类型" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="量范">
-                <el-input v-model="form.measurement_range" placeholder="量范" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="启用日期">
-                <el-date-picker v-model="form.use_date" type="date" placeholder="启用日期" value-format="YYYY-MM-DD"
-                  style="width:100%">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="出厂编号">
-                <el-input placeholder="出厂编号" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="测量介质">
-                <el-input placeholder="测量介质" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="管理等级">
-                <el-input v-model="form.management_level" placeholder="管理等级" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="精度等级">
-                <el-input v-model="form.accuracy_level" placeholder="精度等级" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="生产厂家">
-                <el-input v-model="form.factory" placeholder="生产厂家" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="安装位置">
-                <el-input v-model="form.place" placeholder="安装位置" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="检定周期(月)">
-                <el-input-number v-model="form.cycle" :precision="1" :min="0" controls-position="right"
-                  style="width: 100%;" placeholder="检定周期（月）" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="备注">
-            <el-input type="textarea" :rows="4" v-model="form.description" placeholder="备注" />
-          </el-form-item>
-        </el-form>
       </el-main>
       <el-footer>
         <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
@@ -236,10 +195,12 @@
 </template>
 <script>
 import { genTree } from "@/utils/verificate";
+import { iMEnum } from "@/utils/enum";
 export default {
   emits: ["success", "closed"],
   data() {
     return {
+      iMEnum,
       cateOptions:[],
       loading: false,
       mode: "add",
diff --git a/src/views/em/equipmentjc.vue b/src/views/em/equipmentjc.vue
index ae3a9b6e..16369e08 100644
--- a/src/views/em/equipmentjc.vue
+++ b/src/views/em/equipmentjc.vue
@@ -24,7 +24,6 @@
     <el-main class="nopadding">
       <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" @selection-change="selectionChange">
         <el-table-column type="selection" width="50" />
-        <el-table-column type="index" width="50" />
         <el-table-column label="设备名称" prop="name" width="200" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="设备编号" prop="number">
diff --git a/src/views/em/equipmentjk.vue b/src/views/em/equipmentjk.vue
index e3bb632c..805a4d26 100644
--- a/src/views/em/equipmentjk.vue
+++ b/src/views/em/equipmentjk.vue
@@ -3,36 +3,40 @@
     <el-header>
       <div class="left-panel">
         <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
+        <el-button type="primary" @click="echeckrecord" v-auth="'echeckrecord.create'">批量巡检</el-button>
+        <!-- <el-select v-model="query.belong_dept" placeholder="所在车间" clearable style="margin-left: 2px;"
+        @change="handleQuery">
+          <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select> -->
       </div>
       <div class="right-panel">
-        <el-input v-model="query.search" placeholder="名称" clearable style="margin-right: 5px;"></el-input>
+        <el-cascader v-model="query.belong_dept" :options="group" :props="groupsProps" clearable placeholder="所在车间"
+          :show-all-levels="false" @change="handleQuery">
+        </el-cascader>
+        <!-- <el-select v-model="query.state" placeholder="设备状态" clearable>
+          <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
+          @change="handleQuery"></el-option>
+        </el-select> -->
+        <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
-        <el-table-column type="index" width="50" />
-        <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
+      <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" @selection-change="selectionChange">
+        <el-table-column type="selection" width="50" />
+        <el-table-column label="设备名称" prop="name" width="200" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="计量编号" prop="number">
+        <el-table-column label="设备编号" prop="number">
         </el-table-column>
         <el-table-column label="型号规格" prop="model">
         </el-table-column>
-        <el-table-column label="仪表类型" prop="model">
+        <el-table-column label="生产厂" prop="factory" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="量范" prop="model">
+        <el-table-column label="生产日期" prop="production_date">
         </el-table-column>
-        <el-table-column label="出厂编号" prop="model">
+        <el-table-column label="购置日期" prop="buy_date">
         </el-table-column>
-        <el-table-column label="启用日期" prop="model">
-        </el-table-column>
-        <el-table-column label="测量介质" prop="model">
-        </el-table-column>
-        <el-table-column label="生产厂家" prop="factory" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column label="检定周期/月" prop="cycle" width="100">
-        </el-table-column>
-        <el-table-column label="检定日期" prop="check_date" width="100">
+        <el-table-column label="状态">
           <template #default="scope">
             <el-tag v-if="scope.row.state === 10" type="success">
               {{ state_[scope.row.state] }}
@@ -48,137 +52,202 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="下次检定日期" prop="next_check_date" width="100">
+        <el-table-column label="运行状态">
+          <template #default="scope">
+              <el-tag :type="runningStateEnum[scope.row.running_state]?.type">{{
+          runningStateEnum[scope.row.running_state]?.text }}</el-tag>
+          </template>
         </el-table-column>
-        <el-table-column label="精度等级" prop="accuracy_level" show-overflow-tooltip>
+        <el-table-column label="所在车间" show-overflow-tooltip>
+          <template #default="scope">{{ scope.row.belong_dept_name }}</template>
         </el-table-column>
-        <el-table-column label="安装位置" prop="place" show-overflow-tooltip>
+        <el-table-column label="所在工段" show-overflow-tooltip>
+          <template #default="scope">{{ scope.row.mgroup_name }}</template>
+        </el-table-column>
+        <el-table-column label="保管人">
+          <template #default="scope">{{ scope.row.keeper_name }}</template>
+        </el-table-column>
+        <el-table-column label="存放位置" show-overflow-tooltip>
+          <template #default="scope">{{ scope.row.place }}</template>
         </el-table-column>
         <el-table-column label="备注" show-overflow-tooltip>
           <template #default="scope">{{ scope.row.description }}</template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="170px">
+        <el-table-column label="操作" fixed="right" align="left" width="180">
           <template #default="scope">
-            <el-button link type="primary" v-if="scope.row.cycle !== null" @click="table_record(scope.row)"
-              v-auth="'einspect.create'">
-              检定记录
+            <el-button link type="primary" @click="table_record(scope.row)" v-auth="'echeckrecord.create'">
+              巡检
             </el-button>
-            <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'equipment.update'">
+            <el-button link type="warning" @click="table_edit(scope.row)" v-auth="'equipment.update'">
               编辑
             </el-button>
-            <el-button link type="danger" @click="table_del(scope.row)" v-auth="'equipment.delete'">
-              删除
-            </el-button>
+            <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row)" v-auth="'equipment.delete'">
+              <template #reference>
+                <el-button link type="danger">删除</el-button>
+              </template>
+            </el-popconfirm>
           </template>
         </el-table-column>
       </scTable>
-      <el-dialog title="计量器具检验" v-model="visible">
-        <el-form ref="dialogForm" :rules="rules" label-width="100px" :model="form">
-          <el-row>
-            <el-col :md="12" :sm="24" prop="check_date">
-              <el-form-item label="检定时间">
-                <el-date-picker v-model="form.check_date" type="date" placeholder="检定时间" value-format="YYYY-MM-DD"
-                  style="width:100%">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="检定单位" prop="check_organization">
-                <el-input v-model="form.check_organization" placeholder="检定单位" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="检定结果" prop="result">
-                <el-select style="width: 100%" v-model="form.result" placeholder="检定结果">
-                  <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="备注">
-                <el-input v-model="form.note" placeholder="备注" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <el-footer>
-          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-          <el-button @click="visible = false">取消</el-button>
-        </el-footer>
-      </el-dialog>
-      <el-drawer title="检定记录" v-model="visibleRecord" :size="1000" destroy-on-close @closed="visibleRecord = false">
-        <el-container v-loading="loading">
-          <el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'equipment'"
-            style="position: absolute;z-index: 10;left: 110px;top: 16px;"></el-button>
-          <el-main style="padding: 0 20px 20px 20px">
-            <scTable ref="drawer_table" :apiObj="apiObj2" row-key="id" stripe :params="query2">
-              <el-table-column type="index" width="50" />
-              <el-table-column label="设备名称" prop="equipment_name" show-overflow-tooltip>
-              </el-table-column>
-              <el-table-column label="检定日期" prop="check_date">
-              </el-table-column>
-              <el-table-column label="检定结果" prop="result">
-                <template #default="scope">
-                  <span>{{ state_[scope.row.result] }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="检定单位" prop="check_organization">
-              </el-table-column>
-              <el-table-column label="操作" fixed="right" align="center" width="160px">
-                <template #default="scope">
-                  <el-link type="danger" @click="record_del(scope.row)" v-auth="'equipment.delete'">
-                    删除
-                  </el-link>
-                </template>
-              </el-table-column>
-            </scTable>
-          </el-main>
-        </el-container>
-      </el-drawer>
     </el-main>
   </el-container>
   <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
     @closed="dialog.save = false"></save-dialog>
+  <check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
+    @closed="dialog.save = false"></check-dialog>
+  <el-drawer title="巡检记录" v-model="visibleRecord" :size="1000" destroy-on-close @closed="visibleRecord = false">
+    <el-container v-loading="loading">
+      <el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'equipment'"
+        style="position: absolute;z-index: 10;left: 110px;top: 16px;">新增</el-button>
+      <el-button type="primary" icon="el-icon-download" @click="exportExcel"
+        style="position: absolute;z-index: 10;left:200px;top: 16px;">导出</el-button>
+      <el-main style="padding: 0 20px 20px 20px">
+        <scTable ref="drawer_table" :apiObj="apiObj2" row-key="id" stripe :params="query2">
+          <el-table-column type="index" width="50" />
+          <el-table-column label="设备名称" prop="equipment_name" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column label="巡检时间" prop="inspect_time">
+          </el-table-column>
+          <el-table-column label="巡检结果" prop="result">
+            <template #default="scope">
+              <span>{{ results_[scope.row.result] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="巡检人" prop="inspect_user_name">
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" align="center" width="160px">
+            <template #default="scope">
+              <el-link type="danger" @click="record_del(scope.row)" v-auth="'equipment.delete'">
+                删除
+              </el-link>
+            </template>
+          </el-table-column>
+        </scTable>
+        <scTable ref="drawer_table" :apiObj="apiObj2" row-key="id" stripe :params="query2" id="myTable"
+          style="display: none;">
+          <el-table-column type="index" width="50" />
+          <el-table-column label="设备名称" prop="equipment_name" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column label="巡检时间" prop="inspect_time">
+          </el-table-column>
+          <el-table-column label="巡检结果" prop="result">
+            <template #default="scope">
+              <span>{{ results_[scope.row.result] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="巡检人" prop="inspect_user_name">
+          </el-table-column>
+        </scTable>
+      </el-main>
+    </el-container>
+  </el-drawer>
+  <el-dialog title="设备巡检" v-model="visible">
+    <el-form ref="dialogForm" :rules="rules" label-width="100px" :model="form">
+      <el-row>
+        <el-col :md="12" :sm="24" prop="inspect_time">
+          <el-form-item label="巡检时间">
+            <el-date-picker v-model="form.inspect_time" type="datetime" placeholder="巡检时间"
+              value-format="YYYY-MM-DD HH:mm:ss" style="width:100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="巡检人" prop="inspect_user">
+            <span style="display:flex">
+              <el-input readonly v-model="form.inspect_user_name"></el-input>
+              <ehsUserSelect :multiple="false" @submit="getReceptionist" />
+            </span>
+          </el-form-item>
+          <!-- <el-form-item label="巡检人" prop="inspect_user">
+                <el-select 
+                  v-model="form.inspect_user"
+                  placeholder="巡检人"
+                  clearable
+                  style="width:100%"
+                >
+                  <el-option
+                  v-for="item in userList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  />
+                </el-select>
+              </el-form-item> -->
+        </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="巡检结果" prop="result">
+            <el-select style="width: 100%" v-model="form.result" placeholder="巡检结果">
+              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="备注">
+            <el-input v-model="form.note" placeholder="备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-footer>
+      <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
+      <el-button @click="visible = false">取消</el-button>
+    </el-footer>
+  </el-dialog>
 </template>
 <script>
+import { runningStateEnum } from "@/utils/enum.js";
+import checkDialog from "./equipment_check.vue";
 import saveDialog from "./equipment_form.vue";
+import { genTree } from "@/utils/verificate";
 export default {
-  name: "监控设备-摄像头",
+  name: "生产设备",
   components: {
     saveDialog,
+    checkDialog
   },
   data() {
     return {
+      runningStateEnum,
+      deptOptions: [],
       dialog: {
         save: false,
-        permission: false,
+        check: false,
       },
       apiObj: this.$API.em.equipment.list,
-      query: {
-        page: 1,
-        page_size: 20,
-        type: 50,
-      },
-      apiObj2: this.$API.em.echeckrecord.list,
+      paramsEquipment: { type: 50 },
+      query: { type: 50 },
+      apiObj2: this.$API.em.einspect.list,
       query2: {
-        page: 1,
-        page_size: 20,
         equipment: ''
       },
-      visible: false,
-      isSaveing: false,
-      visibleRecord: false,
-      selection: [],
+      group: [],
+      selectiones: [],
       state_: {
         10: '完好',
         20: '限用',
         30: '在修',
         40: '禁用',
       },
+      groupsProps: {
+        // value: "id",
+        multiple: false,
+        emitPath: false,
+        checkStrictly: true,
+      },
+      // stateOptions: [
+      //   { label: '完好', value: 10 },
+      //   { label: '限用', value: 20 },
+      //   { label: '在修', value: 30 },
+      //   { label: '禁用', value: 40 },
+      // ],
+      results_: {
+        'pass': '正常',
+        'fail': '异常',
+      },
       options: [
-        { id: 10, name: '正常' },
-        { id: 20, name: '异常' }
+        { id: 'pass', name: '正常' },
+        { id: 'fail', name: '异常' }
       ],
       form: {},
       rules: {
@@ -186,36 +255,88 @@ export default {
         check_organization: [{ required: true, message: "请填写检定机构" }],
       },
       item: {},
+      visible: false,
+      visibleRecord: false,
+      excelName: ''
     };
   },
+  mounted() {
+    this.getDept()
+  },
   methods: {
-    table_record(row) {
-      this.item = row;
-      this.form.equipment = row.id;
-      this.query2.equipment = row.id;
-      this.$nextTick(() => {
-        this.visibleRecord = true;
-      })
+    //表格选择后回调事件
+    selectionChange(selection) {
+      this.selectiones = selection;
+    },
+    echeckrecord() {
+      if (this.selectiones.length > 0) {
+        this.dialog.check = true;
+        this.$nextTick(() => {
+          this.$refs.checkDialog.open();
+        });
+      } else {
+        this.$message.warning("请选择要巡检的设备");
+      }
+    },
+    getDept() {
+      let that = this;
+      that.$API.system.dept.list.req({ page: 0 }).then(res => {
+        that.group = genTree(res);
+      });
+
+    },
+    getReceptionist(data) {
+      this.form.inspect_user = data.id;
+      this.form.inspect_user_name = data.name;
     },
     //添加
     add() {
       this.dialog.save = true;
       this.$nextTick(() => {
-        this.$refs.saveDialog.open("add", 20);
+        this.$refs.saveDialog.open("add", 50);
       });
     },
     //编辑
     table_edit(row) {
       this.dialog.save = true;
       this.$nextTick(() => {
-        this.$refs.saveDialog.open("edit", 20).setData(row);
+        this.$refs.saveDialog.open("edit", 50).setData(row);
       });
     },
     //查看
     table_show(row) {
       this.dialog.save = true;
       this.$nextTick(() => {
-        this.$refs.saveDialog.open("show", 20).setData(row);
+        this.$refs.saveDialog.open("show", 50).setData(row);
+      });
+    },
+    table_record(row) {
+      this.item = row;
+      this.form.equipment = row.id;
+      this.query2.equipment = row.id;
+      this.excelName = row.name;
+      this.$nextTick(() => {
+        this.visibleRecord = true;
+      })
+    },
+    //新增检验
+    record_create() {
+      this.visible = true;
+    },
+    //提交巡检记录
+    submit() {
+      this.$refs.dialogForm.validate(async (valid) => {
+        if (valid) {
+          this.isSaveing = true;
+          this.$API.em.einspect.create.req(this.form).then(res => {
+            this.visible = false;
+            this.isSaveing = false;
+            this.$message.success("操作成功");
+            this.$refs.drawer_table.refresh();
+          }).catch(() => {
+            this.isSaveing = false;
+          })
+        }
       });
     },
     //删除
@@ -224,43 +345,13 @@ export default {
         .req(row.id)
         .then((res) => {
           this.$message.success("删除成功");
-          this.$refs.table.refresh();
+          return res;
         })
         .catch((err) => {
           return err;
         });
     },
-    //新增检验
-    record_create() {
-      this.visible = true;
-    },
-    //提交检验
-    submit() {
-      this.$refs.dialogForm.validate(async (valid) => {
-        if (valid) {
-          this.isSaveing = true;
-          this.$API.em.echeckrecord.create.req(this.form).then(res => {
-            this.visible = false;
-            this.isSaveing = false;
-            this.$message.success("操作成功");
-            this.$refs.drawer_table.refresh();
-            this.$refs.table.refresh();
-          }).catch(() => {
-            this.isSaveing = false;
-          })
-        }
-      });
-    },
-    //删除检验
-    record_del(row) {
-      this.$API.em.echeckrecord.delete.req(row.id).then((res) => {
-        this.$message.success("删除成功");
-        this.$refs.drawer_table.refresh();
-        this.$refs.table.refresh();
-      }).catch((err) => {
-        return err;
-      });
-    },
+
     //本地更新数据
     handleSaveSuccess(data, mode) {
       if (mode == "add") {
@@ -269,12 +360,18 @@ export default {
         this.$refs.table.refresh();
       }
     },
+    handleCheckSuccess() { },
     handleQuery() {
       this.$refs.table.queryData(this.query)
     },
     resetQuery() {
       this.query = {};
     },
+    exportExcel() {
+      this.exportLoading = true;
+      this.$XLSX('#myTable', this.excelName)
+      this.exportLoading = false;
+    },
   },
 };
 </script>
\ No newline at end of file
diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue
index b6d4681e..89af9e4d 100644
--- a/src/views/em/equipmentjl.vue
+++ b/src/views/em/equipmentjl.vue
@@ -11,7 +11,7 @@
     </el-header>
     <el-main class="nopadding">
       <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
-        <el-table-column type="index" width="50" />
+        <el-table-column type="selection" width="50" />
         <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="计量编号" prop="number">
@@ -158,7 +158,7 @@ export default {
       query: {
         page: 1,
         page_size: 20,
-        type: 40,
+        type: 20,
       },
       apiObj2: this.$API.em.echeckrecord.list,
       query2: {
diff --git a/src/views/em/equipmentzl.vue b/src/views/em/equipmentzl.vue
index fd57bf0e..24e051fa 100644
--- a/src/views/em/equipmentzl.vue
+++ b/src/views/em/equipmentzl.vue
@@ -104,7 +104,7 @@
         style="position: absolute;z-index: 10;left:200px;top: 16px;">导出</el-button>
       <el-main style="padding: 0 20px 20px 20px">
         <scTable ref="drawer_table" :apiObj="apiObj2" row-key="id" stripe :params="query2">
-          <el-table-column type="index" width="50" />
+          <el-table-column type="selection" width="50" />
           <el-table-column label="设备名称" prop="equipment_name" show-overflow-tooltip>
           </el-table-column>
           <el-table-column label="巡检时间" prop="inspect_time">