diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index 86dda295..ff14620a 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="计划id" prop="planId">
+      <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
           placeholder="请输入计划id"
@@ -17,23 +17,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="单号" prop="orderCode">
+      <el-form-item label="工单号" prop="orderCode">
         <el-input
           v-model="queryParams.orderCode"
-          placeholder="请输入单号"
+          placeholder="请输入工单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="车间" prop="planWorkshop">
+      <el-form-item label="车间编码" prop="planWorkshop">
         <el-input
           v-model="queryParams.planWorkshop"
-          placeholder="请输入车间"
+          placeholder="请输入车间编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="产线" prop="planProdLine">
+      <el-form-item v-if="false" label="产线" prop="planProdLine">
         <el-input
           v-model="queryParams.planProdLine"
           placeholder="请输入产线"
@@ -42,14 +42,16 @@
         />
       </el-form-item>
       <el-form-item label="循环周期" prop="planLoop">
-        <el-input
-          v-model="queryParams.planLoop"
-          placeholder="请输入循环周期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
+          <el-option
+            v-for="dict in dict.type.device_loop_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="循环执行时间开始" prop="planLoopStart">
+      <el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
         <el-date-picker clearable
                         v-model="queryParams.planLoopStart"
                         type="date"
@@ -57,7 +59,7 @@
                         placeholder="请选择循环执行时间开始">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="循环执行时间结束" prop="planLoopEnd">
+      <el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
         <el-date-picker clearable
                         v-model="queryParams.planLoopEnd"
                         type="date"
@@ -65,7 +67,7 @@
                         placeholder="请选择循环执行时间结束">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="实际开始时间" prop="orderStart">
+      <el-form-item v-if="false" label="实际开始时间" prop="orderStart">
         <el-date-picker clearable
                         v-model="queryParams.orderStart"
                         type="date"
@@ -73,7 +75,7 @@
                         placeholder="请选择实际开始时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="实际结束时间" prop="orderEnd">
+      <el-form-item v-if="false" label="实际结束时间" prop="orderEnd">
         <el-date-picker clearable
                         v-model="queryParams.orderEnd"
                         type="date"
@@ -81,7 +83,7 @@
                         placeholder="请选择实际结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="设备编码" prop="equipmentCode">
+      <el-form-item v-if="false" label="设备编码" prop="equipmentCode">
         <el-input
           v-model="queryParams.equipmentCode"
           placeholder="请输入设备编码"
@@ -89,7 +91,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单费用" prop="orderCost">
+      <el-form-item v-if="false" label="工单费用" prop="orderCost">
         <el-input
           v-model="queryParams.orderCost"
           placeholder="请输入工单费用"
@@ -97,15 +99,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="责任人" prop="planPerson">
+      <el-form-item label="巡检人" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
-          placeholder="请输入责任人"
+          placeholder="请输入巡检人"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单用时" prop="orderCostTime">
+      <el-form-item v-if="false" label="工单用时" prop="orderCostTime">
         <el-input
           v-model="queryParams.orderCostTime"
           placeholder="请输入工单用时"
@@ -113,7 +115,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="签字" prop="orderSignPerson">
+      <el-form-item v-if="false" label="签字" prop="orderSignPerson">
         <el-input
           v-model="queryParams.orderSignPerson"
           placeholder="请输入签字"
@@ -121,7 +123,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工厂" prop="factoryCode">
+      <el-form-item v-if="false" label="工厂" prop="factoryCode">
         <el-input
           v-model="queryParams.factoryCode"
           placeholder="请输入工厂"
@@ -129,7 +131,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="备用字段1" prop="attr1">
+      <el-form-item v-if="false" label="备用字段1" prop="attr1">
         <el-input
           v-model="queryParams.attr1"
           placeholder="请输入备用字段1"
@@ -137,7 +139,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="备用字段2" prop="attr2">
+      <el-form-item v-if="false" label="备用字段2" prop="attr2">
         <el-input
           v-model="queryParams.attr2"
           placeholder="请输入备用字段2"
@@ -145,7 +147,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="备用字段3" prop="attr3">
+      <el-form-item v-if="false" label="备用字段3" prop="attr3">
         <el-input
           v-model="queryParams.attr3"
           placeholder="请输入备用字段3"
@@ -153,7 +155,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="删除标志" prop="delFlag">
+      <el-form-item v-if="false" label="删除标志" prop="delFlag">
         <el-input
           v-model="queryParams.delFlag"
           placeholder="请输入删除标志"
@@ -251,15 +253,18 @@
 
     <el-table v-loading="loading" :data="deviceOrderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="主键" align="center" prop="orderId"/>
-      <el-table-column label="计划id" align="center" prop="planId"/>
-      <el-table-column label="计划编码" align="center" prop="planCode"/>
-      <el-table-column label="计划类型" align="center" prop="planType"/>
-      <el-table-column label="单号" align="center" prop="orderCode"/>
-      <el-table-column label="车间" align="center" prop="planWorkshop"/>
-      <el-table-column label="产线" align="center" prop="planProdLine"/>
+      <el-table-column v-if="false" label="计划id" align="center" prop="planId"/>
+      <el-table-column width="150" label="计划编码" align="center" prop="planCode"/>
+      <el-table-column v-if="false" label="计划类型" align="center" prop="planType"/>
+      <el-table-column width="150" label="工单号" align="center" prop="orderCode"/>
+      <el-table-column label="车间编码" align="center" prop="planWorkshop"/>
+      <el-table-column v-if="false" label="产线" align="center" prop="planProdLine"/>
       <el-table-column label="循环周期" align="center" prop="planLoop"/>
-      <el-table-column label="循环周期类型" align="center" prop="planLoopType"/>
+      <el-table-column width="100" label="循环周期类型" align="center" prop="planLoopType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
@@ -281,16 +286,20 @@
         </template>
       </el-table-column>
       <el-table-column label="设备编码" align="center" prop="equipmentCode"/>
-      <el-table-column label="工单状态" align="center" prop="orderStatus"/>
-      <el-table-column label="工单费用" align="center" prop="orderCost"/>
-      <el-table-column label="责任人" align="center" prop="planPerson"/>
+      <el-table-column label="工单状态" align="center" prop="orderStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="false" label="工单费用" align="center" prop="orderCost"/>
+      <el-table-column v-if="false" label="巡检人" align="center" prop="planPerson"/>
       <el-table-column label="工单用时" align="center" prop="orderCostTime"/>
-      <el-table-column label="签字" align="center" prop="orderSignPerson"/>
+      <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson"/>
       <el-table-column label="工厂" align="center" prop="factoryCode"/>
-      <el-table-column label="备用字段1" align="center" prop="attr1"/>
-      <el-table-column label="备用字段2" align="center" prop="attr2"/>
-      <el-table-column label="备用字段3" align="center" prop="attr3"/>
-      <el-table-column label="删除标志" align="center" prop="delFlag"/>
+      <el-table-column v-if="false" label="备用字段1" align="center" prop="attr1"/>
+      <el-table-column v-if="false" label="备用字段2" align="center" prop="attr2"/>
+      <el-table-column v-if="false" label="备用字段3" align="center" prop="attr3"/>
+      <el-table-column v-if="false" label="删除标志" align="center" prop="delFlag"/>
       <el-table-column label="创建人" align="center" prop="createBy"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
@@ -303,7 +312,7 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column  width="180" label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -376,8 +385,8 @@
                     </el-col>
                     <el-row>
                       <el-form-item label="是否达标">
-                        <el-radio v-model="standard.reach" label="0">达标</el-radio>
-                        <el-radio v-model="standard.reach" label="1">未达标</el-radio>
+                        <el-radio v-model="standard.detailReach" label="0">达标</el-radio>
+                        <el-radio v-model="standard.detailReach" label="1">未达标</el-radio>
                       </el-form-item>
                     </el-row>
                   </el-row>
@@ -461,7 +470,7 @@ import {
 
 export default {
   name: "DeviceOrder",
-  dicts: ['device_order_status'],
+  dicts: ['device_order_status','device_loop_type'],
   data() {
     return {
       // 遮罩层
@@ -488,7 +497,7 @@ export default {
         pageSize: 10,
         planId: null,
         planCode: null,
-        planType: null,
+        planType: 'inspection',
         orderCode: null,
         planWorkshop: null,
         planProdLine: null,
@@ -544,7 +553,7 @@ export default {
         orderId: null,
         planId: null,
         planCode: null,
-        planType: null,
+        planType: 'inspection',
         orderCode: null,
         planWorkshop: null,
         planProdLine: null,