From 475f24a93ecf47ccafa306da5e0399cfe447596b Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sun, 28 Apr 2024 17:25:57 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=B7=A5+=E5=88=87?=
 =?UTF-8?q?=E7=BA=BF=E6=8A=A5=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index ba3f779..1997e24 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -377,6 +377,7 @@
 									@change="handleEdit(scope.$index, scope.row)"></el-input>
 							</template>
 						</el-table-column>
+            <el-table-column label="报工单编号" align="center" prop="reportCode" width="120" />
 						<el-table-column label="创建时间" align="center" prop="createTime" width="150" />
 					</el-table>
 
@@ -434,6 +435,7 @@
 								</el-select>
 							</template>
 						</el-table-column>
+            <el-table-column label="报工单编号" align="center" prop="reportCode" width="120" />
 						<el-table-column label="创建时间" align="center" prop="createTime" width="150" />
 						<el-table-column fixed="right" label="操作" width="90">
 							<template slot-scope="scope">
@@ -995,6 +997,8 @@ export default {
         updateBy: null,
         endReport: "0"
       };
+      this.queryParams.workorderCode = "";
+      this.queryParams.machineCode = "";
       this.resetForm("form");
       this.libTabs = [];
       this.libConsumeTabs = [];
@@ -1264,6 +1268,8 @@ export default {
       submitReportPS(this.reportRows).then((response) => {
         this.$modal.msgSuccess("报工信息修改成功");
         this.openReport = false;
+        this.queryParams.workorderCode = "";
+        this.queryParams.machineCode = "";
         this.getList();
       });
     },
@@ -1309,9 +1315,10 @@ export default {
         this.openConsume = true;
         this.titleConsume = "工单报工物料损耗详情";
         this.queryParams.workorderCode = "";
+        this.queryParams.machineCode = "";
       });
 
-      this.queryParams.workorderCode = sr.workorderCode;
+      //this.queryParams.workorderCode = sr.workorderCode;
       //查询母工单BOM记录列表
       //this.queryParams.parentOrder = '0';
       //getBomList(this.queryParams).then(response => {

From 1cacb861cbe64c2e3082d51dfda8dfaa2db47780 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 29 Apr 2024 11:34:50 +0800
Subject: [PATCH 02/16] =?UTF-8?q?2024-4-29=20=E4=BF=9D=E5=85=BB=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=A1=86+?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/maintenanceWork/index.vue | 109 ++++++++++++---------
 1 file changed, 60 insertions(+), 49 deletions(-)

diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index cfe7805..dd8f6c1 100644
--- a/src/views/device/maintenanceWork/index.vue
+++ b/src/views/device/maintenanceWork/index.vue
@@ -9,6 +9,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="保养工单号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入保养工单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="检验状态" prop="orderInspect">
+        <el-select v-model="queryParams.orderInspect" placeholder="请选择保养类型" clearable>
+          <el-option
+            v-for="dict in dict.type.device_inspect_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="计划编码" prop="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -17,10 +35,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单号" prop="orderCode">
+      <el-form-item label="计划名称" prop="planName">
         <el-input
-          v-model="queryParams.orderCode"
-          placeholder="请输入工单号"
+          v-model="queryParams.planName"
+          placeholder="请输入计划名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -35,6 +53,22 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="设备编码" prop="equipmentCode">
+        <el-input
+          v-model="queryParams.equipmentCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="equipmentName">
+        <el-input
+          v-model="queryParams.equipmentName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item v-if="false" label="产线" prop="planProdLine">
         <el-input
           v-model="queryParams.planProdLine"
@@ -43,7 +77,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="循环周期" prop="planLoop">
+      <el-form-item label="循环周期" prop="planLoopType">
         <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
           <el-option
             v-for="dict in dict.type.device_loop_type"
@@ -93,22 +127,6 @@
                         placeholder="请选择实际结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="设备编码" prop="equipmentCode">
-        <el-input
-          v-model="queryParams.equipmentCode"
-          placeholder="请输入设备编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentCode">
-        <el-input
-          v-model="queryParams.equipmentName"
-          placeholder="请输入设备名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item v-if="false" label="工单费用" prop="orderCost">
         <el-input
           v-model="queryParams.orderCost"
@@ -120,7 +138,7 @@
       <el-form-item label="保养人" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
-          placeholder="请输入点检人"
+          placeholder="请输入保养人"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -275,16 +293,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="检验状态" prop="orderInspect">
-        <el-select v-model="queryParams.orderInspect" placeholder="请选择保养类型" clearable>
-          <el-option
-            v-for="dict in dict.type.device_inspect_status"
-            :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>
@@ -342,9 +350,6 @@
       <!-- 序号 -->
       <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" fixed/>
       <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 width="150" label="计划名称" align="center" prop="planName" />
-      <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
       <el-table-column width="150" label="保养单号" align="center" prop="orderCode" fixed>
         <template slot-scope="scope">
           <el-button
@@ -354,8 +359,18 @@
           >
         </template>
       </el-table-column>
+      <el-table-column label="检验状态" align="center" prop="orderInspect">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.device_inspect_status" :value="scope.row.orderInspect"/>
+        </template>
+      </el-table-column>
+      <el-table-column width="150" label="计划编码" align="center" prop="planCode" />
+      <el-table-column width="150" label="计划名称" align="center" prop="planName" />
+      <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
       <el-table-column label="车间编码" align="center" prop="planWorkshop" />
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
+      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
       <el-table-column label="循环周期" align="center" prop="planLoop" />
       <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
@@ -373,18 +388,16 @@
           <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="保养开始时间" align="center" prop="orderStart">
+      <!-- <el-table-column width="120" label="保养开始时间" align="center" prop="orderStart">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column width="120" label="保养结束时间" align="center" prop="orderEnd">
+      </el-table-column> -->
+      <el-table-column width="150" label="保养时间" align="center" prop="orderEnd">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column width="80" label="保养类型" align="center" prop="upkeep" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
@@ -395,11 +408,6 @@
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="检验状态" align="center" prop="orderInspect">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_inspect_status" :value="scope.row.orderInspect"/>
-        </template>
-      </el-table-column>
       <el-table-column width="120" label="工单费用(元)" align="center" prop="orderCost"/>
       <el-table-column label="保养人" align="center" prop="planPerson"/>
       <el-table-column width="120" label="工单用时(min)" align="center" prop="orderCostTime"/>
@@ -460,8 +468,7 @@
           <el-descriptions title="" border :column="2" :contentStyle="CS" :label-style="LS">
             <el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
             <el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
-            <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
-            </el-descriptions-item>
+            <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}</el-descriptions-item>
             <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
             <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
             <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
@@ -708,6 +715,7 @@ export default {
         pageSize: 10,
         planId: null,
         planCode: null,
+        planName:null,
         planType: "maintenance",
         orderCode: null,
         planWorkshop: null,
@@ -848,7 +856,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.equipmentName = null;
+      this.queryParams.loopEndArray = null;
+      this.queryParams.loopStartArray = null;
+      this.queryParams.orderEndArray = null;
+      this.queryParams.orderStartArray = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },

From 76b8686172874bb595cd12cd221de27685ad2829 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 29 Apr 2024 14:07:04 +0800
Subject: [PATCH 03/16] =?UTF-8?q?2024-4-29=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E7=82=B9=E6=A3=80=E6=8A=A5=E8=A1=A8-=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/spotInspectionWork/index.vue | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 7d59fbf..a49d059 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="点检工单号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入点检工单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="计划编码" prop="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -17,10 +25,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单号" prop="orderCode">
+      <el-form-item label="计划名称" prop="planName">
         <el-input
-          v-model="queryParams.orderCode"
-          placeholder="请输入工单号"
+          v-model="queryParams.planName"
+          placeholder="请输入计划名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -43,16 +51,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="循环周期" prop="planLoop">
-        <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 v-if="false" label="循环周期" prop="planLoop">
         <el-input
           v-model="queryParams.planLoop"
@@ -101,7 +100,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentCode">
+      <el-form-item label="设备名称" prop="equipmentName">
         <el-input
           v-model="queryParams.equipmentName"
           placeholder="请输入设备名称"
@@ -220,6 +219,16 @@
                         value-format="yyyy-MM-dd"
                         placeholder="请选择更新时间">
         </el-date-picker>
+      </el-form-item>
+            <el-form-item label="循环周期" prop="planLoopType">
+        <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-date-picker
@@ -318,7 +327,7 @@
       <el-table-column v-if="false" label="主键" align="center" prop="orderId" />
       <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 width="150" label="计划名称" align="center" prop="planName" />
+      <el-table-column width="200" label="计划名称" align="center" prop="planName" />
       <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
       <el-table-column width="150" label="点检单号" align="center" prop="orderCode" fixed>
         <template slot-scope="scope">
@@ -331,7 +340,10 @@
       </el-table-column>
       <el-table-column label="车间编码" align="center" prop="planWorkshop" />
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
+      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column width="150" label="点检时间" align="center" prop="orderStart"/>
+      <el-table-column label="点检人" align="center" prop="planPerson" />
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
       <el-table-column label="循环周期" align="center" prop="planLoop" />
       <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
@@ -359,15 +371,12 @@
           <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <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 label="点检人" align="center" prop="planPerson" />
       <el-table-column v-if="false" label="工单用时" align="center" prop="orderCostTime" />
       <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson" />
       <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode" />
@@ -624,6 +633,7 @@ export default {
         pageSize: 10,
         planId: null,
         planCode: null,
+        planName: null,
         planType: "spotInspection",
         orderCode: null,
         planWorkshop: null,

From bb629448b55a305d0d84ab61ff2b35788a69b00c Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 29 Apr 2024 14:57:30 +0800
Subject: [PATCH 04/16] =?UTF-8?q?2024-4-29=20=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=B7=A1=E6=A3=80=E6=8A=A5=E8=A1=A8-=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/inspectionWork/index.vue | 748 ++++++++++++++--------
 1 file changed, 493 insertions(+), 255 deletions(-)

diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue
index c2afe43..038ee01 100644
--- a/src/views/device/inspectionWork/index.vue
+++ b/src/views/device/inspectionWork/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
@@ -9,6 +16,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="巡检工单号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入巡检工单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="计划编码" prop="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -17,16 +32,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单号" prop="orderCode">
+      <el-form-item label="计划名称" prop="planName">
         <el-input
-          v-model="queryParams.orderCode"
-          placeholder="请输入工单号"
+          v-model="queryParams.planName"
+          placeholder="请输入计划名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="车间编码" prop="planWorkshop">
-        <el-select v-model="queryParams.planWorkshop" placeholder="请选择车间" clearable>
+        <el-select
+          v-model="queryParams.planWorkshop"
+          placeholder="请选择车间"
+          clearable
+        >
           <el-option
             v-for="work in workCenterList"
             :key="work.factoryCode"
@@ -43,16 +62,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="循环周期" prop="planLoop">
-        <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 v-if="false" label="循环周期" prop="planLoop">
         <el-input
           v-model="queryParams.planLoop"
@@ -62,35 +71,43 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
-        <el-date-picker clearable
-                        v-model="queryParams.planLoopStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择循环执行时间开始">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间开始"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.planLoopEnd"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择循环执行时间结束">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间结束"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="实际开始时间" prop="orderStart">
-        <el-date-picker clearable
-                        v-model="queryParams.orderStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择实际开始时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际开始时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="实际结束时间" prop="orderEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.orderEnd"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择实际结束时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际结束时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="设备编码" prop="equipmentCode">
@@ -112,17 +129,19 @@
       <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="orderStart">
-        <el-date-picker clearable
-                        v-model="queryParams.orderStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择点检时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择点检时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="工单用时" prop="orderCostTime">
@@ -190,11 +209,13 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="创建时间" prop="createTime">
-        <el-date-picker clearable
-                        v-model="queryParams.createTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择创建时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.createTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择创建时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="更新人" prop="updateBy">
@@ -206,13 +227,29 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="更新时间" prop="updateTime">
-        <el-date-picker clearable
-                        v-model="queryParams.updateTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择更新时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.updateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择更新时间"
+        >
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="循环周期" prop="planLoopType">
+        <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-date-picker
           v-model="queryParams.loopStartArray"
@@ -223,7 +260,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="循环范围结束" prop="planLoopEnd">
@@ -236,7 +274,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="执行开始时间" prop="orderStart">
@@ -249,7 +288,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="执行结束时间" prop="orderEnd">
@@ -262,12 +302,21 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </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-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>
 
@@ -280,7 +329,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['device:inspectionWork:add']"
-        >新增
+          >新增
         </el-button>
       </el-col>
       <el-col v-if="false" :span="1.5">
@@ -292,7 +341,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['device:inspectionWork:edit']"
-        >修改
+          >修改
         </el-button>
       </el-col>
       <el-col v-if="false" :span="1.5">
@@ -304,7 +353,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['device:inspectionWork:remove']"
-        >删除
+          >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -315,87 +364,247 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['device:inspectionWork:export']"
-        >导出
+          >导出
         </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="inspectionWorkList">
-      <el-table-column v-if="false" label="主键" align="center" prop="orderId" />
+      <el-table-column
+        v-if="false"
+        label="主键"
+        align="center"
+        prop="orderId"
+      />
       <!-- 序号 -->
-      <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" fixed/>
-      <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 width="150" label="计划名称" align="center" prop="planName" />
-      <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
-      <el-table-column width="150" label="巡检单号" align="center" prop="orderCode" fixed>
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+        fixed
+      />
+      <el-table-column
+        width="150"
+        label="巡检工单号"
+        align="center"
+        prop="orderCode"
+        fixed
+      >
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="showWork(scope.row)"
-          >{{ scope.row.orderCode }}</el-button
-          >
+          <el-button type="text" @click="showWork(scope.row)">{{
+            scope.row.orderCode
+          }}</el-button>
         </template>
       </el-table-column>
+
+      <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
+        width="200"
+        label="计划名称"
+        align="center"
+        prop="planName"
+      />
+      <el-table-column
+        v-if="false"
+        label="计划类型"
+        align="center"
+        prop="planType"
+      />
       <el-table-column label="车间编码" align="center" prop="planWorkshop" />
-      <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
-      <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
-      <el-table-column label="循环周期" align="center" prop="planLoop" />
-      <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
+      <el-table-column
+        width="150"
+        label="车间"
+        align="center"
+        prop="workCenterName"
+      />
+      <el-table-column
+        width="100"
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+      />
+      <el-table-column
+        width="120"
+        label="设备名称"
+        align="center"
+        prop="equipmentName"
+      />
+      <el-table-column
+        width="150"
+        label="巡检时间"
+        align="center"
+        prop="orderEnd"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
+          <span>{{
+            parseTime(scope.row.orderEnd, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="循环范围开始" align="center" prop="planLoopStart">
+      <el-table-column label="巡检人" align="center" prop="planPerson" />
+      <el-table-column
+        v-if="false"
+        label="产线"
+        align="center"
+        prop="planProdLine"
+      />
+      <el-table-column label="循环周期" align="center" prop="planLoopType" />
+      <el-table-column
+        width="120"
+        label="循环周期类型"
+        align="center"
+        prop="planLoopType"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
+          <dict-tag
+            :options="dict.type.device_loop_type"
+            :value="scope.row.planLoopType"
+          />
         </template>
       </el-table-column>
-      <el-table-column width="120" label="循环范围结束" align="center" prop="planLoopEnd">
+      <el-table-column
+        width="120"
+        label="循环范围开始"
+        align="center"
+        prop="planLoopStart"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planLoopStart, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" width="120" label="执行开始时间" align="center" prop="orderStart">
+      <el-table-column
+        width="120"
+        label="循环范围结束"
+        align="center"
+        prop="planLoopEnd"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planLoopEnd, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" width="120" label="执行结束时间" align="center" prop="orderEnd">
+      <el-table-column
+        v-if="false"
+        width="120"
+        label="执行开始时间"
+        align="center"
+        prop="orderStart"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.orderStart, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="工单状态" align="center" prop="orderStatus" >
+      <el-table-column
+        v-if="false"
+        width="120"
+        label="执行结束时间"
+        align="center"
+        prop="orderEnd"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
+          <span>{{ parseTime(scope.row.orderEnd, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" label="工单费用" align="center" prop="orderCost" />
-      <el-table-column label="巡检人" align="center" prop="planPerson" />
-      <el-table-column v-if="false" label="工单用时" align="center" prop="orderCostTime" />
-      <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson" />
-      <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode" />
-      <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="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="orderCostTime"
+      />
+      <el-table-column
+        v-if="false"
+        label="签字"
+        align="center"
+        prop="orderSignPerson"
+      />
+      <el-table-column
+        v-if="false"
+        label="工厂"
+        align="center"
+        prop="factoryCode"
+      />
+      <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">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        v-if="false"
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -403,7 +612,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['device:inspectionWork:edit']"
-          >修改
+            >修改
           </el-button>
           <el-button
             size="mini"
@@ -411,119 +620,135 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['device:inspectionWork:remove']"
-          >删除
+            >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
 
-    <el-dialog
-      title="巡检详情"
-      :visible.sync="workDetail"
-      width="1000px"
-    >
+    <el-dialog title="巡检详情" :visible.sync="workDetail" width="1000px">
       <el-tabs type="border-card">
         <el-tab-pane label="巡检信息">
           <el-descriptions title="" border :column="2">
-            <el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
-            <el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
-            <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
+            <el-descriptions-item label="计划编码">{{
+              workVO.order.planCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="计划名称">{{
+              workVO.order.planName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环周期"
+              >{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
             </el-descriptions-item>
-            <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
-            <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
-            <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
-            <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
-            <el-descriptions-item v-if="false" label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
-            <el-descriptions-item v-if="false" label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
-            <el-descriptions-item label="巡检人">{{ workVO.order.planPerson }}</el-descriptions-item>
-            <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
+            <el-descriptions-item label="工单编码">{{
+              workVO.order.orderCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="车间编码">{{
+              workVO.order.planWorkshop
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环开始时间">{{
+              workVO.order.planLoopStart
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环结束时间">{{
+              workVO.order.planLoopEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行开始时间">{{
+              workVO.order.orderStart
+            }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行结束时间">{{
+              workVO.order.orderEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item label="巡检人">{{
+              workVO.order.planPerson
+            }}</el-descriptions-item>
+            <el-descriptions-item label="报修单号">{{
+              workVO.order.repairCode
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="设备信息">
           <el-descriptions class="my-margin-top" title="" :column="2" border>
-            <el-descriptions-item label="设备编码">{{ workVO.equ.equipmentCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备名称">{{ workVO.equ.equipmentName }}</el-descriptions-item>
-            <el-descriptions-item label="设备位置">{{ workVO.equ.equipmentLocation }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型编码">{{ workVO.equ.equipmentTypeCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型名称">{{ workVO.equ.equipmentTypeName }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心编码">{{ workVO.equ.workshopCode }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心名称">{{ workVO.equ.workshopName }}</el-descriptions-item>
+            <el-descriptions-item label="设备编码">{{
+              workVO.equ.equipmentCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备名称">{{
+              workVO.equ.equipmentName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备位置">{{
+              workVO.equ.equipmentLocation
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型编码">{{
+              workVO.equ.equipmentTypeCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型名称">{{
+              workVO.equ.equipmentTypeName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心编码">{{
+              workVO.equ.workshopCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心名称">{{
+              workVO.equ.workshopName
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="检查项信息">
-            <el-table
-              :data="standardListVo"
-              border
-              style="width: 100%">
-              <el-table-column
-                prop="itemName"
-                label="检查项"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardName"
-                label="标准名称"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardTypeName"
-                label="标准类型"
-                width="80">
-              </el-table-column>
-              <el-table-column
-                prop="detailReach"
-                label="是否达标">
-              </el-table-column>
-              <el-table-column
-                prop="actualValue"
-                label="实际值">
-              </el-table-column>
-              <el-table-column
-                prop="detailUpLimit"
-                label="上限">
-              </el-table-column>
-              <el-table-column
-                prop="detailDownLimit"
-                label="下限">
-              </el-table-column>
-              <el-table-column
-                prop="detailUnit"
-                label="单位">
-              </el-table-column>
-              <el-table-column
-                prop="picturePath"
-                label="图片">
-                <template slot-scope="scope">
-                  <el-popover
-                    placement="right"
-                    width="300"
-                    trigger="hover">
-                    <div class="demo-image__lazy">
-                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
-                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
-                        <el-image
-                          :src="url"
-                        ></el-image>
-                      </div>
+          <el-table :data="standardListVo" border style="width: 100%">
+            <el-table-column prop="itemName" label="检查项" width="180">
+            </el-table-column>
+            <el-table-column prop="standardName" label="标准名称" width="180">
+            </el-table-column>
+            <el-table-column
+              prop="standardTypeName"
+              label="标准类型"
+              width="80"
+            >
+            </el-table-column>
+            <el-table-column prop="detailReach" label="是否达标">
+            </el-table-column>
+            <el-table-column prop="actualValue" label="实际值">
+            </el-table-column>
+            <el-table-column prop="detailUpLimit" label="上限">
+            </el-table-column>
+            <el-table-column prop="detailDownLimit" label="下限">
+            </el-table-column>
+            <el-table-column prop="detailUnit" label="单位"> </el-table-column>
+            <el-table-column prop="picturePath" label="图片">
+              <template slot-scope="scope">
+                <el-popover placement="right" width="300" trigger="hover">
+                  <div class="demo-image__lazy">
+                    <el-empty
+                      :image-size="200"
+                      v-if="scope.row.checkPictrueList.length == 0"
+                    ></el-empty>
+                    <div
+                      v-for="(url, index) in scope.row.checkPictrueList"
+                      :key="index"
+                    >
+                      <el-image :src="url"></el-image>
                     </div>
-                    <el-button slot="reference" type="primary" icon="el-icon-picture" circle></el-button>
-                  </el-popover>
-                </template>
-              </el-table-column>
-            </el-table>
+                  </div>
+                  <el-button
+                    slot="reference"
+                    type="primary"
+                    icon="el-icon-picture"
+                    circle
+                  ></el-button>
+                </el-popover>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="workDetail = false">关 闭</el-button>
-  </span>
+        <el-button @click="workDetail = false">关 闭</el-button>
+      </span>
     </el-dialog>
 
     <!-- 添加或修改巡检记录对话框 -->
@@ -542,46 +767,50 @@ import {
   getInspectionWork,
   delInspectionWork,
   addInspectionWork,
-  updateInspectionWork
+  updateInspectionWork,
 } from "@/api/device/inspectionWork";
-import {listDeviceOrder} from "@/api/device/deviceOrder";
-import {getWorkCenter} from "@/api/device/plan";
+import { listDeviceOrder } from "@/api/device/deviceOrder";
+import { getWorkCenter } from "@/api/device/plan";
 
 export default {
   name: "InspectionWork",
-  dicts: ['device_order_status', 'device_loop_type'],
+  dicts: ["device_order_status", "device_loop_type"],
   data() {
     return {
-      standardListVo:[],
+      standardListVo: [],
       workCenterList: [],
       test: false,
       // 日期范围选择快捷
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
       // 初始化VO
       workVO: {
@@ -597,7 +826,8 @@ export default {
           orderStart: null,
           orderEnd: null,
           planPerson: null,
-        }, equ: {
+        },
+        equ: {
           equipmentCode: null,
           equipmentName: null,
           equipmentLocation: null,
@@ -605,7 +835,8 @@ export default {
           equipmentTypeName: null,
           workshopCode: null,
           workshopName: null,
-        }, detailList: []
+        },
+        detailList: [],
       },
       // 工单详情弹窗
       workDetail: false,
@@ -633,6 +864,7 @@ export default {
         pageSize: 10,
         planId: null,
         planCode: null,
+        planName: null,
         planType: "inspection",
         orderCode: null,
         planWorkshop: null,
@@ -644,7 +876,7 @@ export default {
         orderStart: null,
         orderEnd: null,
         equipmentCode: null,
-        orderStatus: '1',
+        orderStatus: "1",
         orderCost: null,
         planPerson: null,
         orderCostTime: null,
@@ -666,7 +898,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {},
     };
   },
   created() {
@@ -680,20 +912,20 @@ export default {
     },
     // 获取工作中心
     setWorkCenter() {
-      getWorkCenter().then(response => {
+      getWorkCenter().then((response) => {
         this.workCenterList = response.data;
-      })
+      });
     },
     // 展示
     showWork(row) {
       this.loading = true;
       this.reset();
       this.standardListVo = [];
-      const orderId = row.orderId || this.ids
-      getInspectionWork(orderId).then(response => {
+      const orderId = row.orderId || this.ids;
+      getInspectionWork(orderId).then((response) => {
         this.workVO = response.data;
         for (let i = 0; i < this.workVO.detailList.length; i++) {
-          for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
+          for (let j = 0;j < this.workVO.detailList[i].standardList.length;j++) {
             this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
             this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
           }
@@ -701,12 +933,11 @@ export default {
         this.loading = false;
         this.workDetail = true;
       });
-
     },
     /** 查询巡检记录列表 */
     getList() {
       this.loading = true;
-      listDeviceOrder(this.queryParams).then(response => {
+      listDeviceOrder(this.queryParams).then((response) => {
         this.inspectionWorkList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -734,7 +965,7 @@ export default {
         orderStart: null,
         orderEnd: null,
         equipmentCode: null,
-        orderStatus: '1',
+        orderStatus: "1",
         orderCost: null,
         planPerson: null,
         orderCostTime: null,
@@ -771,9 +1002,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.orderId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.orderId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -784,8 +1015,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const orderId = row.orderId || this.ids
-      getInspectionWork(orderId).then(response => {
+      const orderId = row.orderId || this.ids;
+      getInspectionWork(orderId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改巡检记录";
@@ -793,16 +1024,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.orderId != null) {
-            updateInspectionWork(this.form).then(response => {
+            updateInspectionWork(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addInspectionWork(this.form).then(response => {
+            addInspectionWork(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -814,25 +1045,32 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const orderIds = row.orderId || this.ids;
-      this.$modal.confirm('是否确认删除巡检记录编号为"' + orderIds + '"的数据项？').then(function () {
-        return delInspectionWork(orderIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
+      this.$modal
+        .confirm('是否确认删除巡检记录编号为"' + orderIds + '"的数据项？')
+        .then(function () {
+          return delInspectionWork(orderIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('device/inspectionWork/export', {
-        ...this.queryParams
-      }, `inspectionWork_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "device/inspectionWork/export",
+        {
+          ...this.queryParams,
+        },
+        `inspectionWork_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
 <style>
-.demo-image__lazy{
+.demo-image__lazy {
   height: 400px;
   overflow-y: auto;
 }

From f67405d77f7b27359266489b90ecae7ea154836d Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 29 Apr 2024 16:47:02 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkTypeProject/selectProject.vue        |  2 +-
 src/views/quality/qcProjectType/data.vue      | 28 +++++++++++++++++++
 src/views/quality/qcWarehousing/index.vue     |  4 +--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue
index d24b451..8f99aea 100644
--- a/src/views/quality/checkTypeProject/selectProject.vue
+++ b/src/views/quality/checkTypeProject/selectProject.vue
@@ -66,7 +66,7 @@
           </el-table-column>
           <el-table-column label="测量单位"  align="left" prop="unitCode" width="90"/>
           <el-table-column label="抽样方案"  align="left" prop="samplePlan" width="100" :show-overflow-tooltip="true"/>
-          <el-table-column label="合格判定"  align="left" prop="judge" width="100" />
+          <el-table-column label="合格判定"  align="left" prop="judge" width="100" :show-overflow-tooltip="true"/>
           <el-table-column label="缺陷等级"  align="left" prop="defectLevel" width="90"/>
           <el-table-column label="检验方式"  align="left" prop="checkMode" width="90" :show-overflow-tooltip="true"/>
           <el-table-column label="检验工具"  align="left" prop="checkTool" width="90"/>
diff --git a/src/views/quality/qcProjectType/data.vue b/src/views/quality/qcProjectType/data.vue
index 00abfa8..fde9384 100644
--- a/src/views/quality/qcProjectType/data.vue
+++ b/src/views/quality/qcProjectType/data.vue
@@ -120,6 +120,8 @@
 			</el-table-column>
 			<el-table-column label="抽样方案" align="center" prop="samplePlan" :show-overflow-tooltip="true" width="200"/>
 			<el-table-column label="合格判定" align="center" prop="judge" :show-overflow-tooltip="true" width="200"/>
+			<el-table-column label="检测项分类" align="center" prop="itemType" width="100" :formatter="itemTypeFormat" />
+			<el-table-column label="合格判定比例" align="center" prop="judgeRate"  width="150"/>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
 				<template slot-scope="scope">
 					<el-button
@@ -244,6 +246,21 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
+				<el-row>
+					<el-col>
+						<el-form-item label="检测项分类" prop="itemType">
+							<el-radio v-model="form.itemType" label="1">包装</el-radio>
+  							<el-radio v-model="form.itemType" label="0">内容物</el-radio>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col>
+						<el-form-item label="合格判定比例" prop="judgeRate">
+							<el-input type='number' v-model="form.judgeRate" placeholder="合格判定比例" />
+						</el-form-item>
+					</el-col>
+				</el-row>
 
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -365,6 +382,17 @@ export default {
 		this.getProjectTypeList();
 	},
 	methods: {
+        //检测项类型格式化
+		itemTypeFormat(row, column, cellValue) {
+			if (cellValue != null) {
+				if(cellValue=='1'){
+                   return '包装';
+				}else if(cellValue=='0'){
+					return '内容物';
+				}
+			}
+		},
+
 		/** 查询检验项目维护列表 */
 		getList() {
 			this.loading = true;
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 2abe4b3..cf5dbb9 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -166,8 +166,8 @@
           }}</el-button>
         </template>
       </el-table-column>
-			<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="200" :show-overflow-tooltip="true"/>
-			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
+		<!--<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="200" :show-overflow-tooltip="true"/>-->
+			<el-table-column label="订单号" align="center" prop="orderNo" width="130"/>
 			<el-table-column label="物料号" align="center" prop="materialCode" width="170" />
 			<el-table-column label="物料名称" align="center" prop="materialName" width="250" :show-overflow-tooltip="true"/>
 			<el-table-column label="数量" align="center" prop="quality" />

From ffac3edab43a2953f4b17297207af950762f004d Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 29 Apr 2024 17:09:44 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkTypeProject/selectProject.vue        | 138 ++++++++++--------
 1 file changed, 80 insertions(+), 58 deletions(-)

diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue
index 8f99aea..1a9b0a3 100644
--- a/src/views/quality/checkTypeProject/selectProject.vue
+++ b/src/views/quality/checkTypeProject/selectProject.vue
@@ -3,10 +3,9 @@
     v-if="showFlag"
     :visible.sync="showFlag"
     :modal= false
-    width="1000px"
+    width="1100px"
   >
     <el-row :gutter="20">
-
       <el-col :span="24" :xs="24">
         <el-form :model="queryParams" ref="queryProjectForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
           <el-form-item label="检测项目名称" prop="ruleName">
@@ -18,16 +17,13 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-
-          <el-form-item label="检测方案名称" prop="projectType">
-            <el-select v-model="queryParams.projectType" filterable clearable placeholder="请选择检测方案">
-              <el-option
-              v-for="(item,index) in projectTypeOptions"
-              :key="index"
-              :label="item.projectTypeName"
-              :value="item.projectTypeCode">
-              </el-option>
-            </el-select>
+          <el-form-item v-show="false" label="检测项目名称" prop="projectType">
+            <el-input
+              v-model="queryParams.projectType"
+              placeholder="检测方案代码"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
 
           <el-form-item>
@@ -35,49 +31,63 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
-          <el-table-column width="50" align="center" type="selection">
-          </el-table-column>
-          <!-- 序号 -->
-          <el-table-column label="检测项目Id"  align="left" key="id" prop="id" v-if="false" />
-          <el-table-column label="检测项目编号"  align="left" key="orderNum" prop="orderNum" width="110"/>
-          <el-table-column label="检测项目名称"  align="left" key="ruleName" prop="ruleName" width="250" :show-overflow-tooltip="true" />
-          <el-table-column label="规则属性"  align="left"  prop="propertyCode">
-            <template slot-scope="scope">
-              <dict-tag
-              :options="dict.type.qc_rule_prop"
-              :value="scope.row.propertyCode"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="检测标准"  align="left" prop="checkStandard" width="250" :show-overflow-tooltip="true"/>
-          <el-table-column label="上差值" align="center" prop="upperDiff" width="100">
-            <template slot-scope="scope">
-                <el-input type="number" size="small" v-model="scope.row.upperDiff" @change="handleEdit(scope.$index,scope.row)"
-                :disabled='scope.row.propertyCode=="0"'></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column label="下差值" align="center" prop="downDiff" width="100">
-            <template slot-scope="scope">
-                <el-input type="number" size="small" v-model="scope.row.downDiff" @change="handleEdit(scope.$index,scope.row)"
-                :disabled='scope.row.propertyCode=="0"'
-                ></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column label="测量单位"  align="left" prop="unitCode" width="90"/>
-          <el-table-column label="抽样方案"  align="left" prop="samplePlan" width="100" :show-overflow-tooltip="true"/>
-          <el-table-column label="合格判定"  align="left" prop="judge" width="100" :show-overflow-tooltip="true"/>
-          <el-table-column label="缺陷等级"  align="left" prop="defectLevel" width="90"/>
-          <el-table-column label="检验方式"  align="left" prop="checkMode" width="90" :show-overflow-tooltip="true"/>
-          <el-table-column label="检验工具"  align="left" prop="checkTool" width="90"/>
-        </el-table>
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <el-row :gutter="20">
+          <el-col :span="5" :xs="24">
+            <el-tabs v-model="editTabsValue" @tab-click="handleClick" :tab-position="'right'" style="height: 600px;">
+              <el-tab-pane
+              v-for="(item) in projectTypeOptions"
+              :key="item.projectTypeCode"
+              :label="item.projectTypeName"
+              :name="item.projectTypeCode"
+              >{{ item.projectTypeName }}</el-tab-pane>
+            </el-tabs>
+          </el-col>
+          <el-col :span="19" :xs="24">
+            <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
+              <el-table-column width="50" align="center" type="selection">
+              </el-table-column>
+              <!-- 序号 -->
+              <el-table-column label="检测项目Id"  align="left" key="id" prop="id" v-if="false" />
+              <el-table-column label="检测项目编号"  align="left" key="orderNum" prop="orderNum" width="110"/>
+              <el-table-column label="检测项目名称"  align="left" key="ruleName" prop="ruleName" width="250" :show-overflow-tooltip="true" />
+              <el-table-column label="规则属性"  align="left"  prop="propertyCode">
+                <template slot-scope="scope">
+                  <dict-tag
+                  :options="dict.type.qc_rule_prop"
+                  :value="scope.row.propertyCode"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column label="检测标准"  align="left" prop="checkStandard" width="250" :show-overflow-tooltip="true"/>
+              <el-table-column label="上差值" align="center" prop="upperDiff" width="100">
+                <template slot-scope="scope">
+                    <el-input type="number" size="small" v-model="scope.row.upperDiff" @change="handleEdit(scope.$index,scope.row)"
+                    :disabled='scope.row.propertyCode=="0"'></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="下差值" align="center" prop="downDiff" width="100">
+                <template slot-scope="scope">
+                    <el-input type="number" size="small" v-model="scope.row.downDiff" @change="handleEdit(scope.$index,scope.row)"
+                    :disabled='scope.row.propertyCode=="0"'
+                    ></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="测量单位"  align="left" prop="unitCode" width="90"/>
+              <el-table-column label="抽样方案"  align="left" prop="samplePlan" width="100" :show-overflow-tooltip="true"/>
+              <el-table-column label="合格判定"  align="left" prop="judge" width="100" />
+              <el-table-column label="缺陷等级"  align="left" prop="defectLevel" width="90"/>
+              <el-table-column label="检验方式"  align="left" prop="checkMode" width="90" :show-overflow-tooltip="true"/>
+              <el-table-column label="检验工具"  align="left" prop="checkTool" width="90"/>
+            </el-table>
+            <pagination
+              v-show="total>0"
+              :total="total"
+              :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize"
+              @pagination="getList"
+            />
+          </el-col>
+        </el-row>
       </el-col>
     </el-row>
     <div slot="footer" class="dialog-footer">
@@ -109,6 +119,8 @@ export default {
       itemList: null,
       ruleName: null,
       projectType:null,
+      editTabsValue: '',
+      tabIndex: null,
       //树名称
       bomCode: undefined,
       defaultProps: {
@@ -120,6 +132,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        ruleName: null,
+        projectType: null,
         groupId:null,
         materialCode:null,
         typeCode:null
@@ -136,6 +150,7 @@ export default {
     getProjectList() {
       getProjectOptions(this.queryParams).then(response => {
           this.projectTypeOptions = response;
+          this.tabIndex = response.length;
       });
     },
 
@@ -166,13 +181,15 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryProjectForm");
+      this.queryParams.projectType = '';
+      this.editTabsValue = '';
       this.handleQuery();
     },
 
     // 多选框选中数据
-	handleBomSelectionChange(selection) {
-		this.selectionRows = selection
-	},
+    handleBomSelectionChange(selection) {
+      this.selectionRows = selection
+    },
     handleEdit(index, row) {
      console.log('row:',index, row);
     },
@@ -187,6 +204,11 @@ export default {
       this.ruleName = '';
       this.projectType = '';
     },
+    handleClick(tab,event) {
+      this.queryParams.projectType = tab.name;
+      this.getList();
+    }
+
   }
 };
 </script>

From dd3e71a02dd25d53bf11579656d7861ea6e38fb1 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 29 Apr 2024 17:58:09 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=A4=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/checkTypeProject/selectProject.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue
index 1a9b0a3..19636b4 100644
--- a/src/views/quality/checkTypeProject/selectProject.vue
+++ b/src/views/quality/checkTypeProject/selectProject.vue
@@ -78,6 +78,8 @@
               <el-table-column label="缺陷等级"  align="left" prop="defectLevel" width="90"/>
               <el-table-column label="检验方式"  align="left" prop="checkMode" width="90" :show-overflow-tooltip="true"/>
               <el-table-column label="检验工具"  align="left" prop="checkTool" width="90"/>
+              <el-table-column label="检测项分类" align="center" prop="itemType" width="100" :formatter="itemTypeFormat" />
+			        <el-table-column label="合格判定比例" align="center" prop="judgeRate"  width="150"/>
             </el-table>
             <pagination
               v-show="total>0"
@@ -146,6 +148,16 @@ export default {
   },
 
   methods: {
+    //检测项类型格式化
+		itemTypeFormat(row, column, cellValue) {
+			if (cellValue != null) {
+				if(cellValue=='1'){
+                   return '包装';
+				}else if(cellValue=='0'){
+					return '内容物';
+				}
+			}
+		},
     //获取方案下拉数据
     getProjectList() {
       getProjectOptions(this.queryParams).then(response => {

From d8d71f0652e522d5ce4d0ae100c3885550113a88 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 6 May 2024 10:50:11 +0800
Subject: [PATCH 08/16] =?UTF-8?q?2024-5-6=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E7=82=B9=E6=A3=80=E5=B7=A5=E5=8D=95-=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=EF=BC=88=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E3=80=81=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E3=80=81=E5=88=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AD=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/spotInspectionOrder/index.vue      | 1790 ++++++++++-------
 1 file changed, 1048 insertions(+), 742 deletions(-)

diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index 0b7d4b9..2adb332 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -1,50 +1,35 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-			<el-form-item v-if="false" label="计划id" prop="planId">
-				<el-input
-					v-model="queryParams.planId"
-					placeholder="请输入计划id"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="计划编码" prop="planCode">
-				<el-input
-					v-model="queryParams.planCode"
-					placeholder="请输入计划编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="工单号" prop="orderCode">
-				<el-input
-					v-model="queryParams.orderCode"
-					placeholder="请输入工单号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="车间编码" prop="planWorkshop">
-        <el-select v-model="queryParams.planWorkshop" placeholder="请选择车间" clearable>
-          <el-option
-            v-for="work in workCenterList"
-            :key="work.factoryCode"
-            :label="work.factoryName"
-            :value="work.factoryCode"
-          />
-        </el-select>
-			</el-form-item>
-			<el-form-item v-if="false" label="产线" prop="planProdLine">
-				<el-input
-					v-model="queryParams.planProdLine"
-					placeholder="请输入产线"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="工单状态" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <el-form-item v-if="false" label="计划id" prop="planId">
+        <el-input
+          v-model="queryParams.planId"
+          placeholder="请输入计划id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="点检工单号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入点检工单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工单状态" prop="orderStatus">
+        <el-select
+          v-model="queryParams.orderStatus"
+          placeholder="请选择工单状态"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.device_order_status"
             :key="dict.value"
@@ -52,65 +37,101 @@
             :value="dict.value"
           />
         </el-select>
-			</el-form-item>
-      <el-form-item label="循环周期" prop="planLoop">
-        <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
+      </el-form-item>
+      <el-form-item label="计划编码" prop="planCode">
+        <el-input
+          v-model="queryParams.planCode"
+          placeholder="请输入计划编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划名称" prop="planName">
+        <el-input
+          v-model="queryParams.planName"
+          placeholder="请输入计划名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车间编码" prop="planWorkshop">
+        <el-select
+          v-model="queryParams.planWorkshop"
+          placeholder="请选择车间"
+          clearable
+        >
           <el-option
-            v-for="dict in dict.type.device_loop_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+            v-for="work in workCenterList"
+            :key="work.factoryCode"
+            :label="work.factoryName"
+            :value="work.factoryCode"
           />
         </el-select>
       </el-form-item>
-			<el-form-item v-if="false" label="循环周期" prop="planLoop">
-				<el-input
-					v-model="queryParams.planLoop"
-					placeholder="请输入循环周期"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
-				<el-date-picker clearable
-					v-model="queryParams.planLoopStart"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择循环执行时间开始">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
-				<el-date-picker clearable
-					v-model="queryParams.planLoopEnd"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择循环执行时间结束">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item v-if="false" label="实际开始时间" prop="orderStart">
-				<el-date-picker clearable
-					v-model="queryParams.orderStart"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择实际开始时间">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item v-if="false" label="实际结束时间" prop="orderEnd">
-				<el-date-picker clearable
-					v-model="queryParams.orderEnd"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择实际结束时间">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item label="设备编码" prop="equipmentCode">
-				<el-input
-					v-model="queryParams.equipmentCode"
-					placeholder="请输入设备编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+      <el-form-item v-if="false" label="产线" prop="planProdLine">
+        <el-input
+          v-model="queryParams.planProdLine"
+          placeholder="请输入产线"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="循环周期" prop="planLoop">
+        <el-input
+          v-model="queryParams.planLoop"
+          placeholder="请输入循环周期"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间开始"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间结束"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item v-if="false" label="实际开始时间" prop="orderStart">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际开始时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item v-if="false" label="实际结束时间" prop="orderEnd">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际结束时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="设备编码" prop="equipmentCode">
+        <el-input
+          v-model="queryParams.equipmentCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="设备名称" prop="equipmentName">
         <el-input
           v-model="queryParams.equipmentName"
@@ -119,118 +140,138 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-			<el-form-item v-if="false" label="工单费用" prop="orderCost">
-				<el-input
-					v-model="queryParams.orderCost"
-					placeholder="请输入工单费用"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="点检人" prop="planPerson">
-				<el-input
-					v-model="queryParams.planPerson"
-					placeholder="请输入点检人"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="点检时间" prop="orderStart">
-        <el-date-picker clearable
-                        v-model="queryParams.orderStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择点检时间">
+      <el-form-item label="点检人" prop="planPerson">
+        <el-input
+          v-model="queryParams.planPerson"
+          placeholder="请输入点检人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="点检开始时间" prop="orderStart">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择点检时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item v-if="false" label="工单费用" prop="orderCost">
+        <el-input
+          v-model="queryParams.orderCost"
+          placeholder="请输入工单费用"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="工单用时" prop="orderCostTime">
+        <el-input
+          v-model="queryParams.orderCostTime"
+          placeholder="请输入工单用时"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="签字" prop="orderSignPerson">
+        <el-input
+          v-model="queryParams.orderSignPerson"
+          placeholder="请输入签字"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="工厂" prop="factoryCode">
+        <el-input
+          v-model="queryParams.factoryCode"
+          placeholder="请输入工厂"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="备用字段1" prop="attr1">
+        <el-input
+          v-model="queryParams.attr1"
+          placeholder="请输入备用字段1"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="备用字段2" prop="attr2">
+        <el-input
+          v-model="queryParams.attr2"
+          placeholder="请输入备用字段2"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="备用字段3" prop="attr3">
+        <el-input
+          v-model="queryParams.attr3"
+          placeholder="请输入备用字段3"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="删除标志" prop="delFlag">
+        <el-input
+          v-model="queryParams.delFlag"
+          placeholder="请输入删除标志"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="创建人" prop="createBy">
+        <el-input
+          v-model="queryParams.createBy"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="创建时间" prop="createTime">
+        <el-date-picker
+          clearable
+          v-model="queryParams.createTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择创建时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item v-if="false" label="更新人" prop="updateBy">
+        <el-input
+          v-model="queryParams.updateBy"
+          placeholder="请输入更新人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="更新时间" prop="updateTime">
+        <el-date-picker
+          clearable
+          v-model="queryParams.updateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择更新时间"
+        >
         </el-date-picker>
-			</el-form-item>
-			<el-form-item v-if="false" label="工单用时" prop="orderCostTime">
-				<el-input
-					v-model="queryParams.orderCostTime"
-					placeholder="请输入工单用时"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="签字" prop="orderSignPerson">
-				<el-input
-					v-model="queryParams.orderSignPerson"
-					placeholder="请输入签字"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="工厂" prop="factoryCode">
-				<el-input
-					v-model="queryParams.factoryCode"
-					placeholder="请输入工厂"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="备用字段1" prop="attr1">
-				<el-input
-					v-model="queryParams.attr1"
-					placeholder="请输入备用字段1"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="备用字段2" prop="attr2">
-				<el-input
-					v-model="queryParams.attr2"
-					placeholder="请输入备用字段2"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="备用字段3" prop="attr3">
-				<el-input
-					v-model="queryParams.attr3"
-					placeholder="请输入备用字段3"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="删除标志" prop="delFlag">
-				<el-input
-					v-model="queryParams.delFlag"
-					placeholder="请输入删除标志"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="创建人" prop="createBy">
-				<el-input
-					v-model="queryParams.createBy"
-					placeholder="请输入创建人"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="创建时间" prop="createTime">
-				<el-date-picker clearable
-					v-model="queryParams.createTime"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择创建时间">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item v-if="false" label="更新人" prop="updateBy">
-				<el-input
-					v-model="queryParams.updateBy"
-					placeholder="请输入更新人"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="更新时间" prop="updateTime">
-				<el-date-picker clearable
-					v-model="queryParams.updateTime"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择更新时间">
-				</el-date-picker>
-			</el-form-item>
+      </el-form-item>
+      <el-form-item label="循环周期" prop="planLoop">
+        <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-date-picker
           v-model="queryParams.loopStartArray"
@@ -241,10 +282,16 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
-      <el-form-item v-if="false" label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item
+        v-if="false"
+        label-width="100px"
+        label="执行开始时间"
+        prop="orderStart"
+      >
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -254,10 +301,16 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
-      <el-form-item v-if="false" label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item
+        v-if="false"
+        label-width="100px"
+        label="执行结束时间"
+        prop="orderEnd"
+      >
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"
@@ -267,237 +320,410 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </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-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 v-if="false" :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['device:spotInspectionOrder:add']"
-				>新增</el-button>
-			</el-col>
-			<el-col v-if="false" :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['device:spotInspectionOrder: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="['device:spotInspectionOrder: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="['device:spotInspectionOrder:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col v-if="false" :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['device:spotInspectionOrder:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col v-if="false" :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['device:spotInspectionOrder: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="['device:spotInspectionOrder: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="['device:spotInspectionOrder:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-		<el-table v-loading="loading" :data="spotInspectionOrderList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column v-if="false" label="主键" align="center" prop="orderId" />
-			<el-table-column v-if="false" label="计划id" align="center" prop="planId" />
-      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
-			<el-table-column width="150" label="计划编码" align="center" prop="planCode" />
-			<el-table-column width="150" label="计划名称" align="center" prop="planName" />
-			<el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
-			<el-table-column width="150" label="点检单号" align="center" prop="orderCode" fixed>
+    <el-table
+      v-loading="loading"
+      :data="spotInspectionOrderList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        v-if="false"
+        label="主键"
+        align="center"
+        prop="orderId"
+      />
+      <el-table-column
+        v-if="false"
+        label="计划id"
+        align="center"
+        prop="planId"
+      />
+      <el-table-column
+        width="150"
+        label="点检工单号"
+        align="center"
+        prop="orderCode"
+        fixed
+      >
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="showWork(scope.row)"
-          >{{ scope.row.orderCode }}</el-button
-          >
+          <el-button type="text" @click="showWork(scope.row)">{{
+            scope.row.orderCode
+          }}</el-button>
+        </template>
+      </el-table-column>
+      <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
+        width="150"
+        label="计划编码"
+        align="center"
+        prop="planCode"
+      />
+      <el-table-column
+        width="200"
+        label="计划名称"
+        align="center"
+        prop="planName"
+      />
+
+      <el-table-column
+        v-if="false"
+        label="计划类型"
+        align="center"
+        prop="planType"
+      />
+      <el-table-column label="车间编码" align="center" prop="planWorkshop" />
+      <el-table-column
+        width="150"
+        label="车间"
+        align="center"
+        prop="workCenterName"
+      />
+      <el-table-column
+        width="100"
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+      />
+      <el-table-column
+        width="200"
+        label="设备名称"
+        align="center"
+        prop="equipmentName"
+      />
+      <el-table-column
+        width="150"
+        label="点检开始时间"
+        align="center"
+        prop="orderStart"
+      />
+      <el-table-column
+        width="150"
+        label="点检结束时间"
+        align="center"
+        prop="orderEnd"
+      />
+      <el-table-column label="点检人" align="center" prop="planPerson" />
+      <el-table-column
+        v-if="false"
+        label="产线"
+        align="center"
+        prop="planProdLine"
+      />
+      <el-table-column label="循环周期" align="center" prop="planLoop" />
+      <el-table-column
+        width="120"
+        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
+        width="120"
+        label="循环开始时间"
+        align="center"
+        prop="planLoopStart"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.planLoopStart, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="false"
+        width="120"
+        label="循环范围结束"
+        align="center"
+        prop="planLoopEnd"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.planLoopEnd, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="false"
+        width="120"
+        label="执行开始时间"
+        align="center"
+        prop="orderStart"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.orderStart, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="false"
+        width="120"
+        label="执行结束时间"
+        align="center"
+        prop="orderEnd"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.orderEnd, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-			<el-table-column label="车间编码" align="center" prop="planWorkshop" />
-      <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
-      <el-table-column width="150" label="点检时间" align="center" prop="orderStart"/>
-			<el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
-			<el-table-column label="循环周期" align="center" prop="planLoop" />
-			<el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
+      <el-table-column
+        v-if="false"
+        label="工单费用"
+        align="center"
+        prop="orderCost"
+      />
+      <el-table-column
+        v-if="false"
+        label="工单用时"
+        align="center"
+        prop="orderCostTime"
+      />
+      <el-table-column
+        v-if="false"
+        label="签字"
+        align="center"
+        prop="orderSignPerson"
+      />
+      <el-table-column
+        v-if="false"
+        label="工厂"
+        align="center"
+        prop="factoryCode"
+      />
+      <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">
-          <dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-			<el-table-column width="120" label="循环开始时间" align="center" prop="planLoopStart">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column v-if="false" width="120" label="循环范围结束" align="center" prop="planLoopEnd">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column  v-if="false" width="120" label="执行开始时间" align="center" prop="orderStart">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column v-if="false" width="120" label="执行结束时间" align="center" prop="orderEnd">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="工单状态" align="center" prop="orderStatus" >
+      <el-table-column label="更新人" align="center" prop="updateBy" />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
+          <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-			<el-table-column v-if="false" label="工单费用" align="center" prop="orderCost" />
-			<el-table-column label="点检人" align="center" prop="planPerson" />
-			<el-table-column v-if="false" label="工单用时" align="center" prop="orderCostTime" />
-			<el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson" />
-			<el-table-column v-if="false" label="工厂" align="center" prop="factoryCode" />
-			<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">
-					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="更新人" align="center" prop="updateBy" />
-			<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column width="180" label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['device:spotInspectionOrder:edit']"
-					>填写记录</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['device:spotInspectionOrder:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+      <el-table-column
+        width="180"
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['device:spotInspectionOrder:edit']"
+            >填写记录</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['device:spotInspectionOrder: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-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <!-- 添加或修改点检工单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-tabs type="border-card">
           <el-tab-pane label="基础信息">
             <el-descriptions title="" border>
-              <el-descriptions-item label="计划编码">{{ this.form.planCode }}</el-descriptions-item>
-              <el-descriptions-item label="计划名称">{{ this.form.planName }}</el-descriptions-item>
-              <el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }}</el-descriptions-item>
-              <el-descriptions-item label="工单编码">{{ this.form.orderCode }}</el-descriptions-item>
-              <el-descriptions-item label="车间编码">{{ this.form.planWorkshop }}</el-descriptions-item>
-              <el-descriptions-item label="工作中心">{{ this.form.workCenterName }}</el-descriptions-item>
-              <el-descriptions-item v-if="this.form.repairCode != null && this.form.repairCode != '' " label="报修单">{{ this.form.repairCode }}</el-descriptions-item>
+              <el-descriptions-item label="计划编码">{{
+                this.form.planCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="计划名称">{{
+                this.form.planName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="循环周期"
+                >{{ this.form.planLoop
+                }}{{ this.form.planLoopType }}</el-descriptions-item
+              >
+              <el-descriptions-item label="工单编码">{{
+                this.form.orderCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="车间编码">{{
+                this.form.planWorkshop
+              }}</el-descriptions-item>
+              <el-descriptions-item label="工作中心">{{
+                this.form.workCenterName
+              }}</el-descriptions-item>
+              <el-descriptions-item
+                v-if="
+                  this.form.repairCode != null && this.form.repairCode != ''
+                "
+                label="报修单"
+                >{{ this.form.repairCode }}</el-descriptions-item
+              >
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="记录">
-            <el-table
-              :data="recordList"
-              border
-              style="width: 100%">
-              <el-table-column
-                width="180"
-                prop="itemName"
-                label="检查项"
-              >
+            <el-table :data="recordList" border style="width: 100%">
+              <el-table-column width="180" prop="itemName" label="检查项">
               </el-table-column>
-              <el-table-column
-                width="170"
-                prop="standardName"
-                label="标准名称"
-              >
+              <el-table-column width="170" prop="standardName" label="标准名称">
               </el-table-column>
-              <el-table-column
-                width="110"
-                prop="detailReach"
-                label="是否达标">
+              <el-table-column width="110" prop="detailReach" label="是否达标">
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.detailReach" placeholder="请选择">
+                  <el-select
+                    v-model="scope.row.detailReach"
+                    placeholder="请选择"
+                  >
                     <el-option
                       v-for="item in dict.type.device_reach_standard"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value">
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column
-                width="80"
-                prop="detailUpLimit"
-                label="上限">
+              <el-table-column width="80" prop="detailUpLimit" label="上限">
               </el-table-column>
-              <el-table-column
-                width="80"
-                prop="detailDownLimit"
-                label="下限">
+              <el-table-column width="80" prop="detailDownLimit" label="下限">
               </el-table-column>
-              <el-table-column
-                width="120"
-                prop="actualValue"
-                label="实际值">
+              <el-table-column width="120" prop="actualValue" label="实际值">
                 <template slot-scope="scope">
-                  <el-input-number style="width: 90px;" v-if="scope.row.standardType == 'quantify'" size="small" v-model="scope.row.actualValue" controls-position="right"></el-input-number>
+                  <el-input-number
+                    style="width: 90px"
+                    v-if="scope.row.standardType == 'quantify'"
+                    size="small"
+                    v-model="scope.row.actualValue"
+                    controls-position="right"
+                  ></el-input-number>
                 </template>
               </el-table-column>
-              <el-table-column
-                width="60"
-                prop="detailUnit"
-                label="单位">
+              <el-table-column width="60" prop="detailUnit" label="单位">
               </el-table-column>
-              <el-table-column
-                width="350"
-                prop="detailUnit"
-                label="图片上传">
+              <el-table-column width="350" prop="picturePath" label="图片上传">
                 <template slot-scope="scope">
                   <FileUpload v-model="scope.row.picturePath" />
                 </template>
@@ -513,13 +739,18 @@
                     type="datetimerange"
                     range-separator="至"
                     start-placeholder="开始时间"
-                    end-placeholder="结束时间">
+                    end-placeholder="结束时间"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="工单状态">
-                  <el-select v-model="form.orderStatus" placeholder="计划状态" clearable>
+                  <el-select
+                    v-model="form.orderStatus"
+                    placeholder="计划状态"
+                    clearable
+                  >
                     <el-option
                       v-for="dict in dict.type.device_order_status"
                       :key="dict.value"
@@ -532,182 +763,214 @@
             </el-row>
           </el-tab-pane>
         </el-tabs>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
 
     <!-- 点检详情 -->
-    <el-dialog
-      title="点检详情"
-      :visible.sync="workDetail"
-      width="1000px"
-    >
+    <el-dialog title="点检详情" :visible.sync="workDetail" width="1000px">
       <el-tabs type="border-card">
         <el-tab-pane label="点检信息">
           <el-descriptions title="" border :column="2">
-            <el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
-            <el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
-            <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
+            <el-descriptions-item label="计划编码">{{
+              workVO.order.planCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="计划名称">{{
+              workVO.order.planName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环周期"
+              >{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
             </el-descriptions-item>
-            <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
-            <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
-            <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
-            <el-descriptions-item v-if="false" label="点检执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
-            <el-descriptions-item v-if="false" label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
-            <el-descriptions-item v-if="false" label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
-            <el-descriptions-item label="点检人">{{ workVO.order.planPerson }}</el-descriptions-item>
-            <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
+            <el-descriptions-item label="工单编码">{{
+              workVO.order.orderCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="车间编码">{{
+              workVO.order.planWorkshop
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环开始时间">{{
+              workVO.order.planLoopStart
+            }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="点检执行结束时间">{{
+              workVO.order.planLoopEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行开始时间">{{
+              workVO.order.orderStart
+            }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行结束时间">{{
+              workVO.order.orderEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item label="点检人">{{
+              workVO.order.planPerson
+            }}</el-descriptions-item>
+            <el-descriptions-item label="报修单号">{{
+              workVO.order.repairCode
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="设备信息">
           <el-descriptions class="my-margin-top" title="" :column="2" border>
-            <el-descriptions-item label="设备编码">{{ workVO.equ.equipmentCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备名称">{{ workVO.equ.equipmentName }}</el-descriptions-item>
-            <el-descriptions-item label="设备位置">{{ workVO.equ.equipmentLocation }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型编码">{{ workVO.equ.equipmentTypeCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型名称">{{ workVO.equ.equipmentTypeName }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心编码">{{ workVO.equ.workshopCode }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心名称">{{ workVO.equ.workshopName }}</el-descriptions-item>
+            <el-descriptions-item label="设备编码">{{
+              workVO.equ.equipmentCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备名称">{{
+              workVO.equ.equipmentName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备位置">{{
+              workVO.equ.equipmentLocation
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型编码">{{
+              workVO.equ.equipmentTypeCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型名称">{{
+              workVO.equ.equipmentTypeName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心编码">{{
+              workVO.equ.workshopCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心名称">{{
+              workVO.equ.workshopName
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="检查项信息">
-            <el-table
-              :data="standardListVo"
-              border
-              style="width: 100%">
-              <el-table-column
-                prop="itemName"
-                label="检查项"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardName"
-                label="标准名称"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardTypeName"
-                label="标准类型"
-                width="80">
-              </el-table-column>
-              <el-table-column
-                prop="detailReach"
-                label="是否达标">
-              </el-table-column>
-              <el-table-column
-                prop="actualValue"
-                label="实际值">
-              </el-table-column>
-              <el-table-column
-                prop="detailUpLimit"
-                label="上限">
-              </el-table-column>
-              <el-table-column
-                prop="detailDownLimit"
-                label="下限">
-              </el-table-column>
-              <el-table-column
-                prop="detailUnit"
-                label="单位">
-              </el-table-column>
-              <el-table-column
-                prop="picturePath"
-                label="图片">
-                <template slot-scope="scope">
-                  <el-popover
-                    placement="right"
-                    width="300"
-                    trigger="hover">
-                    <div class="demo-image__lazy">
-                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
-                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
-                        <el-image
-                          :src="url"
-                        ></el-image>
-                      </div>
+          <el-table :data="standardListVo" border style="width: 100%">
+            <el-table-column prop="itemName" label="检查项" width="180">
+            </el-table-column>
+            <el-table-column prop="standardName" label="标准名称" width="180">
+            </el-table-column>
+            <el-table-column
+              prop="standardTypeName"
+              label="标准类型"
+              width="80"
+            >
+            </el-table-column>
+            <el-table-column prop="detailReach" label="是否达标">
+            </el-table-column>
+            <el-table-column prop="actualValue" label="实际值">
+            </el-table-column>
+            <el-table-column prop="detailUpLimit" label="上限">
+            </el-table-column>
+            <el-table-column prop="detailDownLimit" label="下限">
+            </el-table-column>
+            <el-table-column prop="detailUnit" label="单位"> </el-table-column>
+            <el-table-column prop="picturePath" label="图片">
+              <template slot-scope="scope">
+                <el-popover placement="right" width="300" trigger="hover">
+                  <div class="demo-image__lazy">
+                    <el-empty
+                      :image-size="200"
+                      v-if="scope.row.checkPictrueList.length == 0"
+                    ></el-empty>
+                    <div
+                      v-for="(url, index) in scope.row.checkPictrueList"
+                      :key="index"
+                    >
+                      <el-image :src="url"></el-image>
                     </div>
-                    <el-button slot="reference" type="primary" icon="el-icon-picture" circle></el-button>
-                  </el-popover>
-                </template>
-              </el-table-column>
-            </el-table>
+                  </div>
+                  <el-button
+                    slot="reference"
+                    type="primary"
+                    icon="el-icon-picture"
+                    circle
+                  ></el-button>
+                </el-popover>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="workDetail = false">关 闭</el-button>
-  </span>
+        <el-button @click="workDetail = false">关 闭</el-button>
+      </span>
     </el-dialog>
-
-	</div>
+  </div>
 </template>
 
 <script>
-import { listSpotInspectionOrder, getSpotInspectionOrder, delSpotInspectionOrder, addSpotInspectionOrder, updateSpotInspectionOrder } from "@/api/device/spotInspectionOrder";
-import {delDeviceOrder, getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder";
-import {getWorkCenter} from "@/api/device/plan";
-import {getInspectionWork} from "@/api/device/inspectionWork";
+import {
+  listSpotInspectionOrder,
+  getSpotInspectionOrder,
+  delSpotInspectionOrder,
+  addSpotInspectionOrder,
+  updateSpotInspectionOrder,
+} from "@/api/device/spotInspectionOrder";
+import {
+  delDeviceOrder,
+  getDeviceOrder,
+  listDeviceOrder,
+  updateDeviceOrder,
+} from "@/api/device/deviceOrder";
+import { getWorkCenter } from "@/api/device/plan";
+import { getInspectionWork } from "@/api/device/inspectionWork";
 
 export default {
-	name: "SpotInspectionOrder",
-  dicts: ['device_order_status', 'device_loop_type','device_reach_standard'],
-	data() {
-		return {
+  name: "SpotInspectionOrder",
+  dicts: ["device_order_status", "device_loop_type", "device_reach_standard"],
+  data() {
+    return {
       standardListVo: [],
-      workDetail:false,
+      workDetail: false,
       // 初始化VO
       workVO: {
         order: {
-          planCode:null,
-          planName:null,
-          planLoop:null,
-          planLoopType:null,
-          orderCode:null,
-          planWorkShop:null,
-          planLoopStart:null,
-          planLoopEnd:null,
-          orderStart:null,
-          orderEnd:null,
-          planPerson:null,
-        },equ: {
-          equipmentCode:null,
+          planCode: null,
+          planName: null,
+          planLoop: null,
+          planLoopType: null,
+          orderCode: null,
+          planWorkShop: null,
+          planLoopStart: null,
+          planLoopEnd: null,
+          orderStart: null,
+          orderEnd: null,
+          planPerson: null,
+        },
+        equ: {
+          equipmentCode: null,
           equipmentName: null,
-          equipmentLocation:null,
-          equipmentTypeCode:null,
-          equipmentTypeName:null,
-          workshopCode:null,
-          workshopName:null,
-        },detailList:[]
+          equipmentLocation: null,
+          equipmentTypeCode: null,
+          equipmentTypeName: null,
+          workshopCode: null,
+          workshopName: null,
+        },
+        detailList: [],
       },
       // 日期范围选择快捷
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
       // 记录
       recordList: [],
@@ -715,75 +978,75 @@ export default {
       // 上传图片弹出层
       imgDialog: false,
       // 工作中心
-      workCenterList:[],
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 点检工单表格数据
-			spotInspectionOrderList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				planId: null,
-				planCode: null,
-        planType: 'spotInspection',
-				orderCode: null,
-				planWorkshop: null,
-				planProdLine: null,
-				planLoop: null,
-				planLoopType: null,
-				planLoopStart: null,
-				planLoopEnd: null,
-				orderStart: null,
-				orderEnd: null,
-				equipmentCode: null,
+      workCenterList: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 点检工单表格数据
+      spotInspectionOrderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        planId: null,
+        planCode: null,
+        planName: null,
+        planType: "spotInspection",
+        orderCode: null,
+        planWorkshop: null,
+        planProdLine: null,
+        planLoop: null,
+        planLoopType: null,
+        planLoopStart: null,
+        planLoopEnd: null,
+        orderStart: null,
+        orderEnd: null,
+        equipmentCode: null,
         equipmentName: null,
-				orderStatus: null,
-				orderCost: null,
-				planPerson: null,
-				orderCostTime: null,
-				orderSignPerson: null,
-				factoryCode: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				delFlag: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
+        orderStatus: null,
+        orderCost: null,
+        planPerson: null,
+        orderCostTime: null,
+        orderSignPerson: null,
+        factoryCode: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
-			},
-			// 表单参数
-			form: {
-        equ: {equipmentName: null},
       },
-			// 表单校验
-			rules: {
-			}
-		};
-	},
-	created() {
-		this.getList();
+      // 表单参数
+      form: {
+        equ: { equipmentName: null },
+      },
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
     this.setWorkCenter();
-	},
-	methods: {
+  },
+  methods: {
     // test
     handleRemove(file) {
       console.log(file);
@@ -797,122 +1060,141 @@ export default {
       this.loading = true;
       this.reset();
       this.standardListVo = [];
-      const orderId = row.orderId || this.ids
-      getInspectionWork(orderId).then(response => {
+      const orderId = row.orderId || this.ids;
+      getInspectionWork(orderId).then((response) => {
         this.workVO = response.data;
-        console.log(this.workVO)
+        console.log(this.workVO);
         for (let i = 0; i < this.workVO.detailList.length; i++) {
-          for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
-            this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
+          for (
+            let j = 0;
+            j < this.workVO.detailList[i].standardList.length;
+            j++
+          ) {
+            this.workVO.detailList[i].standardList[j].itemName =
+              this.workVO.detailList[i].itemName;
             this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
           }
         }
         this.loading = false;
         this.workDetail = true;
       });
-
     },
     handleDownload(file) {
       console.log(file);
     },
     // 获取工作中心
     setWorkCenter() {
-      getWorkCenter().then(response => {
+      getWorkCenter().then((response) => {
         this.workCenterList = response.data;
-      })
+      });
     },
-		/** 查询点检工单列表 */
-		getList() {
-			this.loading = true;
-      listDeviceOrder(this.queryParams).then(response => {
+    /** 查询点检工单列表 */
+    getList() {
+      this.loading = true;
+      listDeviceOrder(this.queryParams).then((response) => {
         this.spotInspectionOrderList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				orderId: null,
-				planId: null,
-				planCode: null,
-        planType: 'spotInspection',
-				orderCode: null,
-				planWorkshop: null,
-				planProdLine: null,
-				planLoop: null,
-				planLoopType: null,
-				planLoopStart: null,
-				planLoopEnd: null,
-				orderStart: null,
-				orderEnd: null,
-				equipmentCode: null,
-				equipmentName: null,
-				orderStatus: null,
-				orderCost: null,
-				planPerson: null,
-				orderCostTime: null,
-				orderSignPerson: null,
-				factoryCode: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				delFlag: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
-        equ: {equipmentName: null},
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        orderId: null,
+        planId: null,
+        planCode: null,
+        planName: null,
+        planType: "spotInspection",
+        orderCode: null,
+        planWorkshop: null,
+        planProdLine: null,
+        planLoop: null,
+        planLoopType: null,
+        planLoopStart: null,
+        planLoopEnd: null,
+        orderStart: null,
+        orderEnd: null,
+        equipmentCode: null,
+        equipmentName: null,
+        orderStatus: null,
+        orderCost: null,
+        planPerson: null,
+        orderCostTime: null,
+        orderSignPerson: null,
+        factoryCode: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        equ: { equipmentName: null },
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
       this.queryParams.loopStartArray = [];
       this.queryParams.orderStartArray = [];
       this.queryParams.orderEndArray = [];
-			this.resetForm("queryForm");
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.orderId)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加点检工单";
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
+      this.queryParams.planLoopType = null;
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.orderId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加点检工单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
       this.loading = true;
       this.reset();
       this.recordList = [];
-      const orderCode = row.orderCode || this.ids
-      getDeviceOrder(orderCode).then(response => {
+      const orderCode = row.orderCode || this.ids;
+      getDeviceOrder(orderCode).then((response) => {
         this.form = response.data;
         if (response.data.timeArray[0] == null) {
           response.data.timeArray = [];
         }
         for (let i = 0; i < this.form.detailList.length; i++) {
-          for (let j = 0; j < this.form.detailList[i].standardList.length; j++) {
-            this.form.detailList[i].standardList[j].itemName = this.form.detailList[i].itemName;
+          for (let j = 0;j < this.form.detailList[i].standardList.length;j++) {
+            this.form.detailList[i].standardList[j].itemName =
+              this.form.detailList[i].itemName;
+            //显示已经传入的图片
+            if (response.data.detailList[i].standardList[j].picturePaths != null) {
+              var newFiles = [];
+              response.data.detailList[i].standardList[j].picturePaths.forEach((item) => {
+                  var newFile = {};
+                  newFile.name = item.fileName;
+                  newFile.url = item.fileAddress;
+                  newFiles.push(newFile);
+                }
+              );
+              this.form.detailList[i].standardList[j].picturePath = newFiles;
+            }
             this.recordList.push(this.form.detailList[i].standardList[j]);
           }
         }
@@ -920,44 +1202,61 @@ export default {
         this.open = true;
         this.title = "填写记录";
       });
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.orderId != null) {
-            updateDeviceOrder(this.form).then(response => {
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+		    for (let i = 0; i < this.form.detailList.length; i++) {
+          for (let j = 0;j < this.form.detailList[i].standardList.length;j++) {
+            if(Array.isArray(this.form.detailList[i].standardList[j].picturePath)) {
+              this.form.detailList[i].standardList[j].picturePath = this.listToString(this.form.detailList[i].standardList[j].picturePath);
+            }
+          }
+        }
+        if (valid) {
+          if (this.form.orderId != null) {
+            updateDeviceOrder(this.form).then((response) => {
               if (response.code != 500) {
                 this.$modal.msgSuccess("提交成功");
                 this.open = false;
                 this.getList();
               }
             });
-					} else {
-						addSpotInspectionOrder(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const orderIds = row.orderId || this.ids;
+          } else {
+            addSpotInspectionOrder(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+	// 对象转成指定字符串分隔
+	listToString(list, separator) {
+      let strs = "";
+      separator = separator || ",";
+      for (let i in list) {
+        strs += list[i].url + separator;
+      }
+      return strs != "" ? strs.substr(0, strs.length - 1) : "";
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const orderIds = row.orderId || this.ids;
 
-      var orderCodes = '';
+      var orderCodes = "";
       // 处理信息
       for (let i = 0; i < this.spotInspectionOrderList.length; i++) {
         for (let j = 0; j < orderIds.length; j++) {
           if (orderIds[j] == this.spotInspectionOrderList[i].orderId) {
-            orderCodes = orderCodes + this.spotInspectionOrderList[i].orderCode + ',';
+            orderCodes =
+              orderCodes + this.spotInspectionOrderList[i].orderCode + ",";
           }
         }
       }
 
-      if (orderCodes == '') {
+      if (orderCodes == "") {
         for (let i = 0; i < this.spotInspectionOrderList.length; i++) {
           if (orderIds == this.spotInspectionOrderList[i].orderId) {
             orderCodes = this.spotInspectionOrderList[i].orderCode;
@@ -965,27 +1264,34 @@ export default {
         }
       }
 
-			this.$modal.confirm('是否确认删除点检工单编号为"' + orderCodes + '"的数据项？').then(function () {
-        return delDeviceOrder(orderIds);
-      }).then(response => {
-        if (response.code != 500) {
-          this.$modal.msgSuccess("删除成功");
-          this.getList();
-        }
-      }).catch(() => {
-      });
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('device/spotInspectionOrder/export', {
-				...this.queryParams
-			}, `spotInspectionOrder_${new Date().getTime()}.xlsx`)
-		}
-	}
+      this.$modal
+        .confirm('是否确认删除点检工单编号为"' + orderCodes + '"的数据项？')
+        .then(function () {
+          return delDeviceOrder(orderIds);
+        })
+        .then((response) => {
+          if (response.code != 500) {
+            this.$modal.msgSuccess("删除成功");
+            this.getList();
+          }
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "device/spotInspectionOrder/export",
+        {
+          ...this.queryParams,
+        },
+        `spotInspectionOrder_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
 <style>
-.demo-image__lazy{
+.demo-image__lazy {
   height: 400px;
   overflow-y: auto;
 }

From 049df4813810673cfd6d7c2f2b45a38f59544df0 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 6 May 2024 11:10:16 +0800
Subject: [PATCH 09/16] =?UTF-8?q?2024-5-6=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E5=B7=A1=E6=A3=80=E5=B7=A5=E5=8D=95-=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=EF=BC=88=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E3=80=81=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E3=80=81=E5=88=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AD=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/deviceOrder/index.vue | 966 ++++++++++++++++---------
 1 file changed, 618 insertions(+), 348 deletions(-)

diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index e3af903..a02ec13 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
@@ -9,24 +16,42 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="计划编码" prop="planCode">
+      <el-form-item label="工单号" prop="orderCode">
         <el-input
-          v-model="queryParams.planCode"
-          placeholder="请输入计划编码"
+          v-model="queryParams.orderCode"
+          placeholder="请输入工单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单号" prop="orderCode">
+      <el-form-item label="工单状态" prop="orderStatus">
+        <el-select
+          v-model="queryParams.orderStatus"
+          placeholder="请选择工单状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.device_order_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="计划编码" prop="planCode">
         <el-input
-          v-model="queryParams.orderCode"
-          placeholder="请输入工单号"
+          v-model="queryParams.planCode"
+          placeholder="请输入计划编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="车间编码" prop="planWorkshop">
-        <el-select v-model="queryParams.planWorkshop" placeholder="请选择车间" clearable>
+        <el-select
+          v-model="queryParams.planWorkshop"
+          placeholder="请选择车间"
+          clearable
+        >
           <el-option
             v-for="work in workCenterList"
             :key="work.factoryCode"
@@ -43,18 +68,46 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单状态" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
-          <el-option
-            v-for="dict in dict.type.device_order_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+      <el-form-item label="设备编码" prop="equipmentCode">
+        <el-input
+          v-model="queryParams.equipmentCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="equipmentName">
+        <el-input
+          v-model="queryParams.equipmentName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="巡检人" prop="planPerson">
+        <el-input
+          v-model="queryParams.planPerson"
+          placeholder="请输入巡检人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="巡检开始时间" prop="orderStart">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择巡检开始时间"
+        >
+        </el-date-picker>
       </el-form-item>
       <el-form-item label="循环周期" prop="planLoop">
-        <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
+        <el-select
+          v-model="queryParams.planLoopType"
+          placeholder="请选择循环周期"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.device_loop_type"
             :key="dict.value"
@@ -72,35 +125,43 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
-        <el-date-picker clearable
-                        v-model="queryParams.planLoopStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择循环执行时间开始">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间开始"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.planLoopEnd"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择循环执行时间结束">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间结束"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="实际开始时间" prop="orderStart">
-        <el-date-picker clearable
-                        v-model="queryParams.orderStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择实际开始时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际开始时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="实际结束时间" prop="orderEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.orderEnd"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择实际结束时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际结束时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="工单费用" prop="orderCost">
@@ -176,11 +237,13 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="创建时间" prop="createTime">
-        <el-date-picker clearable
-                        v-model="queryParams.createTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择创建时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.createTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择创建时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="更新人" prop="updateBy">
@@ -192,11 +255,13 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="更新时间" prop="updateTime">
-        <el-date-picker clearable
-                        v-model="queryParams.updateTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择更新时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.updateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择更新时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="循环范围开始" prop="planLoopStart">
@@ -209,7 +274,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="循环范围结束" prop="planLoopEnd">
@@ -222,10 +288,16 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
-      <el-form-item v-if="false" label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item
+        v-if="false"
+        label-width="100px"
+        label="执行开始时间"
+        prop="orderStart"
+      >
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -235,10 +307,16 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
-      <el-form-item v-if="false" label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item
+        v-if="false"
+        label-width="100px"
+        label="执行结束时间"
+        prop="orderEnd"
+      >
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"
@@ -248,44 +326,22 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="巡检人" prop="planPerson">
-        <el-input
-          v-model="queryParams.planPerson"
-          placeholder="请输入点检人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="巡检时间" prop="orderStart">
-        <el-date-picker clearable
-                        v-model="queryParams.orderStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择点检时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="设备编码" prop="equipmentCode">
-        <el-input
-          v-model="queryParams.equipmentCode"
-          placeholder="请输入设备编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentName">
-        <el-input
-          v-model="queryParams.equipmentName"
-          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>
+        <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>
 
@@ -298,7 +354,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['device:deviceOrder:add']"
-        >新增
+          >新增
         </el-button>
       </el-col>
       <el-col v-if="false" :span="1.5">
@@ -310,7 +366,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['device:deviceOrder:edit']"
-        >修改
+          >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -322,7 +378,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['device:deviceOrder:remove']"
-        >删除
+          >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -333,87 +389,243 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['device:deviceOrder:export']"
-        >导出
+          >导出
         </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="deviceOrderList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="deviceOrderList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column v-if="false" label="主键" align="center" prop="orderId" />
-      <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 width="150" label="计划名称" align="center" prop="planName" />
-      <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
-      <el-table-column width="150" label="巡检单号" align="center" prop="orderCode" fixed>
+      <el-table-column
+        v-if="false"
+        label="主键"
+        align="center"
+        prop="orderId"
+      />
+      <el-table-column
+        width="150"
+        label="巡检工单号"
+        align="center"
+        prop="orderCode"
+        fixed
+      >
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="showWork(scope.row)"
-          >{{ scope.row.orderCode }}</el-button
-          >
+          <el-button type="text" @click="showWork(scope.row)">{{
+            scope.row.orderCode
+          }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="车间编码" align="center" prop="planWorkshop" />
-      <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
-      <el-table-column width="150" label="巡检时间" align="center" prop="orderStart"/>
-      <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
-      <el-table-column label="循环周期" align="center" prop="planLoop" />
-      <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
+      <el-table-column
+        v-if="false"
+        label="计划id"
+        align="center"
+        prop="planId"
+      />
+      <el-table-column label="工单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
+          <dict-tag
+            :options="dict.type.device_order_status"
+            :value="scope.row.orderStatus"
+          />
         </template>
       </el-table-column>
-      <el-table-column width="120" label="循环范围开始" align="center" prop="planLoopStart">
+      <el-table-column
+        width="150"
+        label="计划编码"
+        align="center"
+        prop="planCode"
+      />
+      <el-table-column
+        width="200"
+        label="计划名称"
+        align="center"
+        prop="planName"
+      />
+      <el-table-column
+        v-if="false"
+        label="计划类型"
+        align="center"
+        prop="planType"
+      />
+      <el-table-column label="车间编码" align="center" prop="planWorkshop" />
+      <el-table-column
+        width="150"
+        label="车间"
+        align="center"
+        prop="workCenterName"
+      />
+      <el-table-column
+        width="100"
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+      />
+      <el-table-column
+        width="200"
+        label="设备名称"
+        align="center"
+        prop="equipmentName"
+      />
+      <el-table-column
+        width="150"
+        label="巡检开始时间"
+        align="center"
+        prop="orderStart"
+      />
+      <el-table-column
+        width="150"
+        label="巡检结束时间"
+        align="center"
+        prop="orderEnd"
+      />
+      <el-table-column label="巡检人" align="center" prop="planPerson" />
+      <el-table-column
+        v-if="false"
+        label="产线"
+        align="center"
+        prop="planProdLine"
+      />
+      <el-table-column label="循环周期" align="center" prop="planLoop" />
+      <el-table-column
+        width="120"
+        label="循环周期类型"
+        align="center"
+        prop="planLoopType"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
+          <dict-tag
+            :options="dict.type.device_loop_type"
+            :value="scope.row.planLoopType"
+          />
         </template>
       </el-table-column>
-      <el-table-column width="120" label="循环范围结束" align="center" prop="planLoopEnd">
+      <el-table-column
+        width="120"
+        label="循环范围开始"
+        align="center"
+        prop="planLoopStart"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planLoopStart, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" width="120" label="执行开始时间" align="center" prop="orderStart">
+      <el-table-column
+        width="120"
+        label="循环范围结束"
+        align="center"
+        prop="planLoopEnd"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planLoopEnd, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" width="120" label="执行结束时间" align="center" prop="orderEnd">
+      <el-table-column
+        v-if="false"
+        width="120"
+        label="执行开始时间"
+        align="center"
+        prop="orderStart"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.orderStart, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="工单状态" align="center" prop="orderStatus" >
+      <el-table-column
+        v-if="false"
+        width="120"
+        label="执行结束时间"
+        align="center"
+        prop="orderEnd"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
+          <span>{{ parseTime(scope.row.orderEnd, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" label="工单费用" align="center" prop="orderCost" />
-      <el-table-column label="巡检人" align="center" prop="planPerson" />
-      <el-table-column v-if="false" label="工单用时" align="center" prop="orderCostTime" />
-      <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson" />
-      <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode" />
-      <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
+        v-if="false"
+        label="工单费用"
+        align="center"
+        prop="orderCost"
+      />
+      <el-table-column
+        v-if="false"
+        label="工单用时"
+        align="center"
+        prop="orderCostTime"
+      />
+      <el-table-column
+        v-if="false"
+        label="签字"
+        align="center"
+        prop="orderSignPerson"
+      />
+      <el-table-column
+        v-if="false"
+        label="工厂"
+        align="center"
+        prop="factoryCode"
+      />
+      <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">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="180" 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"
@@ -421,20 +633,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['device:spotInspectionOrder:edit']"
-          >填写记录</el-button>
+            >填写记录</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['device:spotInspectionOrder:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -447,74 +661,66 @@
         <el-tabs type="border-card">
           <el-tab-pane label="基础信息">
             <el-descriptions title="" border>
-              <el-descriptions-item label="计划编码">{{ this.form.planCode }}</el-descriptions-item>
-              <el-descriptions-item label="计划名称">{{ this.form.planName }}</el-descriptions-item>
-              <el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }}
+              <el-descriptions-item label="计划编码">{{
+                this.form.planCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="计划名称">{{
+                this.form.planName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="循环周期"
+                >{{ this.form.planLoop }}{{ this.form.planLoopType }}
               </el-descriptions-item>
-              <el-descriptions-item label="工单编码">{{ this.form.orderCode }}</el-descriptions-item>
-              <el-descriptions-item label="车间编码">{{ this.form.planWorkshop }}</el-descriptions-item>
-              <el-descriptions-item label="工作中心">{{ this.form.workCenterName }}</el-descriptions-item>
+              <el-descriptions-item label="工单编码">{{
+                this.form.orderCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="车间编码">{{
+                this.form.planWorkshop
+              }}</el-descriptions-item>
+              <el-descriptions-item label="工作中心">{{
+                this.form.workCenterName
+              }}</el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="记录">
-            <el-table
-              :data="recordList"
-              border
-              style="width: 100%">
-              <el-table-column
-                width="180"
-                prop="itemName"
-                label="检查项"
-              >
+            <el-table :data="recordList" border style="width: 100%">
+              <el-table-column width="180" prop="itemName" label="检查项">
               </el-table-column>
-              <el-table-column
-                width="170"
-                prop="standardName"
-                label="标准名称"
-              >
+              <el-table-column width="170" prop="standardName" label="标准名称">
               </el-table-column>
-              <el-table-column
-                width="110"
-                prop="detailReach"
-                label="是否达标">
+              <el-table-column width="110" prop="detailReach" label="是否达标">
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.detailReach" placeholder="请选择">
+                  <el-select
+                    v-model="scope.row.detailReach"
+                    placeholder="请选择"
+                  >
                     <el-option
                       v-for="item in dict.type.device_reach_standard"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value">
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column
-                width="80"
-                prop="detailUpLimit"
-                label="上限">
+              <el-table-column width="80" prop="detailUpLimit" label="上限">
               </el-table-column>
-              <el-table-column
-                width="80"
-                prop="detailDownLimit"
-                label="下限">
+              <el-table-column width="80" prop="detailDownLimit" label="下限">
               </el-table-column>
-              <el-table-column
-                width="120"
-                prop="actualValue"
-                label="实际值">
+              <el-table-column width="120" prop="actualValue" label="实际值">
                 <template slot-scope="scope">
-                  <el-input-number style="width: 90px;" v-if="scope.row.standardType == 'quantify'" size="small" v-model="scope.row.actualValue" controls-position="right"></el-input-number>
+                  <el-input-number
+                    style="width: 90px"
+                    v-if="scope.row.standardType == 'quantify'"
+                    size="small"
+                    v-model="scope.row.actualValue"
+                    controls-position="right"
+                  ></el-input-number>
                 </template>
               </el-table-column>
-              <el-table-column
-                width="60"
-                prop="detailUnit"
-                label="单位">
+              <el-table-column width="60" prop="detailUnit" label="单位">
               </el-table-column>
-              <el-table-column
-                width="350"
-                prop="detailUnit"
-                label="图片上传">
+              <el-table-column width="350" prop="picturePath" label="图片上传">
                 <template slot-scope="scope">
                   <FileUpload v-model="scope.row.picturePath" />
                 </template>
@@ -530,13 +736,18 @@
                     type="datetimerange"
                     range-separator="至"
                     start-placeholder="开始时间"
-                    end-placeholder="结束时间">
+                    end-placeholder="结束时间"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="工单状态">
-                  <el-select v-model="form.orderStatus" placeholder="计划状态" clearable>
+                  <el-select
+                    v-model="form.orderStatus"
+                    placeholder="计划状态"
+                    clearable
+                  >
                     <el-option
                       v-for="dict in dict.type.device_order_status"
                       :key="dict.value"
@@ -557,105 +768,121 @@
     </el-dialog>
 
     <!-- 巡检详情 -->
-    <el-dialog
-      title="巡检详情"
-      :visible.sync="workDetail"
-      width="1000px"
-    >
+    <el-dialog title="巡检详情" :visible.sync="workDetail" width="1000px">
       <el-tabs type="border-card">
         <el-tab-pane label="巡检信息">
           <el-descriptions title="" border :column="2">
-            <el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
-            <el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
-            <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
+            <el-descriptions-item label="计划编码">{{
+              workVO.order.planCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="计划名称">{{
+              workVO.order.planName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环周期"
+              >{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
             </el-descriptions-item>
-            <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
-            <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
-            <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
-            <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
-            <el-descriptions-item v-if="false" label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
-            <el-descriptions-item v-if="false" label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
-            <el-descriptions-item label="巡检人">{{ workVO.order.planPerson }}</el-descriptions-item>
-            <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
+            <el-descriptions-item label="工单编码">{{
+              workVO.order.orderCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="车间编码">{{
+              workVO.order.planWorkshop
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环开始时间">{{
+              workVO.order.planLoopStart
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环结束时间">{{
+              workVO.order.planLoopEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行开始时间">{{
+              workVO.order.orderStart
+            }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行结束时间">{{
+              workVO.order.orderEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item label="巡检人">{{
+              workVO.order.planPerson
+            }}</el-descriptions-item>
+            <el-descriptions-item label="报修单号">{{
+              workVO.order.repairCode
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="设备信息">
           <el-descriptions class="my-margin-top" title="" :column="2" border>
-            <el-descriptions-item label="设备编码">{{ workVO.equ.equipmentCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备名称">{{ workVO.equ.equipmentName }}</el-descriptions-item>
-            <el-descriptions-item label="设备位置">{{ workVO.equ.equipmentLocation }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型编码">{{ workVO.equ.equipmentTypeCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型名称">{{ workVO.equ.equipmentTypeName }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心编码">{{ workVO.equ.workshopCode }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心名称">{{ workVO.equ.workshopName }}</el-descriptions-item>
+            <el-descriptions-item label="设备编码">{{
+              workVO.equ.equipmentCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备名称">{{
+              workVO.equ.equipmentName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备位置">{{
+              workVO.equ.equipmentLocation
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型编码">{{
+              workVO.equ.equipmentTypeCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型名称">{{
+              workVO.equ.equipmentTypeName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心编码">{{
+              workVO.equ.workshopCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心名称">{{
+              workVO.equ.workshopName
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="检查项信息">
-            <el-table
-              :data="standardListVo"
-              border
-              style="width: 100%">
-              <el-table-column
-                prop="itemName"
-                label="检查项"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardName"
-                label="标准名称"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardTypeName"
-                label="标准类型"
-                width="80">
-              </el-table-column>
-              <el-table-column
-                prop="detailReach"
-                label="是否达标">
-              </el-table-column>
-              <el-table-column
-                prop="actualValue"
-                label="实际值">
-              </el-table-column>
-              <el-table-column
-                prop="detailUpLimit"
-                label="上限">
-              </el-table-column>
-              <el-table-column
-                prop="detailDownLimit"
-                label="下限">
-              </el-table-column>
-              <el-table-column
-                prop="detailUnit"
-                label="单位">
-              </el-table-column>
-              <el-table-column
-                prop="picturePath"
-                label="图片">
-                <template slot-scope="scope">
-                  <el-popover
-                    placement="right"
-                    width="300"
-                    trigger="hover">
-                    <div class="demo-image__lazy">
-                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
-                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
-                        <el-image
-                          :src="url"
-                        ></el-image>
-                      </div>
+          <el-table :data="standardListVo" border style="width: 100%">
+            <el-table-column prop="itemName" label="检查项" width="180">
+            </el-table-column>
+            <el-table-column prop="standardName" label="标准名称" width="180">
+            </el-table-column>
+            <el-table-column
+              prop="standardTypeName"
+              label="标准类型"
+              width="80"
+            >
+            </el-table-column>
+            <el-table-column prop="detailReach" label="是否达标">
+            </el-table-column>
+            <el-table-column prop="actualValue" label="实际值">
+            </el-table-column>
+            <el-table-column prop="detailUpLimit" label="上限">
+            </el-table-column>
+            <el-table-column prop="detailDownLimit" label="下限">
+            </el-table-column>
+            <el-table-column prop="detailUnit" label="单位"> </el-table-column>
+            <el-table-column prop="picturePath" label="图片">
+              <template slot-scope="scope">
+                <el-popover placement="right" width="300" trigger="hover">
+                  <div class="demo-image__lazy">
+                    <el-empty
+                      :image-size="200"
+                      v-if="scope.row.checkPictrueList.length == 0"
+                    ></el-empty>
+                    <div
+                      v-for="(url, index) in scope.row.checkPictrueList"
+                      :key="index"
+                    >
+                      <el-image :src="url"></el-image>
                     </div>
-                    <el-button slot="reference" type="primary" icon="el-icon-picture" circle></el-button>
-                  </el-popover>
-                </template>
-              </el-table-column>
-            </el-table>
+                  </div>
+                  <el-button
+                    slot="reference"
+                    type="primary"
+                    icon="el-icon-picture"
+                    circle
+                  ></el-button>
+                </el-popover>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="workDetail = false">关 闭</el-button>
-  </span>
+        <el-button @click="workDetail = false">关 闭</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -666,17 +893,17 @@ import {
   getDeviceOrder,
   delDeviceOrder,
   addDeviceOrder,
-  updateDeviceOrder
+  updateDeviceOrder,
 } from "@/api/device/deviceOrder";
-import {getWorkCenter} from "@/api/device/plan";
-import {getInspectionWork} from "@/api/device/inspectionWork";
+import { getWorkCenter } from "@/api/device/plan";
+import { getInspectionWork } from "@/api/device/inspectionWork";
 
 export default {
   name: "DeviceOrder",
-  dicts: ['device_order_status', 'device_loop_type','device_reach_standard'],
+  dicts: ["device_order_status", "device_loop_type", "device_reach_standard"],
   data() {
     return {
-      standardListVo:[],
+      standardListVo: [],
       // 初始化VO
       workVO: {
         order: {
@@ -691,7 +918,8 @@ export default {
           orderStart: null,
           orderEnd: null,
           planPerson: null,
-        }, equ: {
+        },
+        equ: {
           equipmentCode: null,
           equipmentName: null,
           equipmentLocation: null,
@@ -699,40 +927,45 @@ export default {
           equipmentTypeName: null,
           workshopCode: null,
           workshopName: null,
-        }, detailList: []
+        },
+        detailList: [],
       },
       // 工单详情弹窗
       workDetail: false,
       // 日期范围选择快捷
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
       // 工作中心
-      workCenterList:[],
+      workCenterList: [],
       // 记录
       recordList: [],
       // 遮罩层
@@ -759,7 +992,7 @@ export default {
         pageSize: 10,
         planId: null,
         planCode: null,
-        planType: 'inspection',
+        planType: "inspection",
         orderCode: null,
         planWorkshop: null,
         planProdLine: null,
@@ -770,6 +1003,7 @@ export default {
         orderStart: null,
         orderEnd: null,
         equipmentCode: null,
+        equipmentName: null,
         orderStatus: null,
         orderCost: null,
         planPerson: null,
@@ -791,10 +1025,10 @@ export default {
       },
       // 表单参数
       form: {
-        equ: {equipmentName: null},
+        equ: { equipmentName: null },
       },
       // 表单校验
-      rules: {}
+      rules: {},
     };
   },
   created() {
@@ -807,30 +1041,29 @@ export default {
       this.loading = true;
       this.reset();
       this.standardListVo = [];
-      const orderId = row.orderId || this.ids
-      getInspectionWork(orderId).then(response => {
+      const orderId = row.orderId || this.ids;
+      getInspectionWork(orderId).then((response) => {
         this.workVO = response.data;
         for (let i = 0; i < this.workVO.detailList.length; i++) {
-          for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
-            this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
+          for (let j = 0;j < this.workVO.detailList[i].standardList.length;j++) {
+            this.workVO.detailList[i].standardList[j].itemName =this.workVO.detailList[i].itemName;
             this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
           }
         }
         this.loading = false;
         this.workDetail = true;
       });
-
     },
     // 获取工作中心
     setWorkCenter() {
-      getWorkCenter().then(response => {
+      getWorkCenter().then((response) => {
         this.workCenterList = response.data;
-      })
+      });
     },
     /** 查询计划工单列表 */
     getList() {
       this.loading = true;
-      listDeviceOrder(this.queryParams).then(response => {
+      listDeviceOrder(this.queryParams).then((response) => {
         this.deviceOrderList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -847,7 +1080,7 @@ export default {
         orderId: null,
         planId: null,
         planCode: null,
-        planType: 'inspection',
+        planType: "inspection",
         orderCode: null,
         planWorkshop: null,
         planProdLine: null,
@@ -858,6 +1091,7 @@ export default {
         orderStart: null,
         orderEnd: null,
         equipmentCode: null,
+        equipmentName: null,
         orderStatus: null,
         orderCost: null,
         planPerson: null,
@@ -872,11 +1106,11 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        equ: {equipmentName: null},
+        equ: { equipmentName: null },
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
-        loopEndArray: []
+        loopEndArray: [],
       };
       this.resetForm("form");
     },
@@ -891,14 +1125,15 @@ export default {
       this.queryParams.orderStartArray = [];
       this.queryParams.orderEndArray = [];
       this.queryParams.loopEndArray = [];
+      this.queryParams.planLoopType = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.orderId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.orderId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -911,15 +1146,26 @@ export default {
       this.loading = true;
       this.reset();
       this.recordList = [];
-      const orderCode = row.orderCode || this.ids
-      getDeviceOrder(orderCode).then(response => {
+      const orderCode = row.orderCode || this.ids;
+      getDeviceOrder(orderCode).then((response) => {
         this.form = response.data;
         if (response.data.timeArray[0] == null) {
           response.data.timeArray = [];
         }
         for (let i = 0; i < this.form.detailList.length; i++) {
-          for (let j = 0; j < this.form.detailList[i].standardList.length; j++) {
+          for (let j = 0;j < this.form.detailList[i].standardList.length;j++) {
             this.form.detailList[i].standardList[j].itemName = this.form.detailList[i].itemName;
+            //显示已经传入的图片
+            if (response.data.detailList[i].standardList[j].picturePaths != null) {
+                  var newFiles = [];
+                  response.data.detailList[i].standardList[j].picturePaths.forEach((item) => {
+                    var newFile = {};
+                    newFile.name = item.fileName;
+                    newFile.url = item.fileAddress;
+                    newFiles.push(newFile);
+                  });
+                  this.form.detailList[i].standardList[j].picturePath = newFiles;
+                }
             this.recordList.push(this.form.detailList[i].standardList[j]);
           }
         }
@@ -930,16 +1176,24 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
+        for (let i = 0; i < this.form.detailList.length; i++) {
+          for (let j = 0;j < this.form.detailList[i].standardList.length;j++) {
+            if (Array.isArray(this.form.detailList[i].standardList[j].picturePath)) {
+              this.form.detailList[i].standardList[j].picturePath = this.listToString(this.form.detailList[i].standardList[j].picturePath);
+            }
+          }
+        }
+
         if (valid) {
           if (this.form.orderId != null) {
-            updateDeviceOrder(this.form).then(response => {
+            updateDeviceOrder(this.form).then((response) => {
               this.$modal.msgSuccess("提交成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addDeviceOrder(this.form).then(response => {
+            addDeviceOrder(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -948,21 +1202,30 @@ export default {
         }
       });
     },
+    // 对象转成指定字符串分隔
+	  listToString(list, separator) {
+      let strs = "";
+      separator = separator || ",";
+      for (let i in list) {
+        strs += list[i].url + separator;
+      }
+      return strs != "" ? strs.substr(0, strs.length - 1) : "";
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const orderIds = row.orderId || this.ids;
 
-      var orderCodes = '';
+      var orderCodes = "";
       // 处理信息
       for (let i = 0; i < this.deviceOrderList.length; i++) {
         for (let j = 0; j < orderIds.length; j++) {
           if (orderIds[j] == this.deviceOrderList[i].orderId) {
-            orderCodes = orderCodes + this.deviceOrderList[i].orderCode + ',';
+            orderCodes = orderCodes + this.deviceOrderList[i].orderCode + ",";
           }
         }
       }
 
-      if (orderCodes == '') {
+      if (orderCodes == "") {
         for (let i = 0; i < this.deviceOrderList.length; i++) {
           if (orderIds == this.deviceOrderList[i].orderId) {
             orderCodes = this.deviceOrderList[i].orderCode;
@@ -970,27 +1233,34 @@ export default {
         }
       }
 
-      this.$modal.confirm('是否确认删除计划工单编号为"' + orderCodes + '"的数据项？').then(function () {
-        return delDeviceOrder(orderIds);
-      }).then(response => {
-        if (response.code != 500) {
-          this.$modal.msgSuccess("删除成功");
-          this.getList();
-        }
-      }).catch(() => {
-      });
+      this.$modal
+        .confirm('是否确认删除计划工单编号为"' + orderCodes + '"的数据项？')
+        .then(function () {
+          return delDeviceOrder(orderIds);
+        })
+        .then((response) => {
+          if (response.code != 500) {
+            this.$modal.msgSuccess("删除成功");
+            this.getList();
+          }
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('device/deviceOrder/export', {
-        ...this.queryParams
-      }, `deviceOrder_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "device/deviceOrder/export",
+        {
+          ...this.queryParams,
+        },
+        `deviceOrder_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
 <style>
-.demo-image__lazy{
+.demo-image__lazy {
   height: 400px;
   overflow-y: auto;
 }

From 3ab5d6299cc102e37ba5bb7d3f1dc8b970fe6670 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 6 May 2024 11:14:16 +0800
Subject: [PATCH 10/16] =?UTF-8?q?2024-5-6=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E4=BF=9D=E5=85=BB=E8=AE=A1=E5=88=92-=E5=8D=95?=
 =?UTF-8?q?=E6=AC=A1=E4=BF=9D=E5=85=BB=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/upkeepPlan/index.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index a4bf18a..a35971d 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -306,6 +306,11 @@
       <el-table-column v-if="false" label="主键" align="center" prop="planId"/>
       <el-table-column width="150" label="计划编码" align="center" prop="planCode" fixed/>
       <el-table-column width="150" label="计划名称" align="center" prop="planName"/>
+      <el-table-column width="150" label="生成规则" align="center" prop="calculationRule">
+      <template slot-scope="scope">
+          {{ scope.row.calculationRule == "0" ? "按照固定周期" : scope.row.one == "1" ? "按照上次保养时间" : "单次" }}
+        </template>
+      </el-table-column> 
       <el-table-column label="车间编码" align="center" prop="planWorkshop"/>
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine"/>
@@ -468,6 +473,7 @@
                     <el-date-picker
                       v-model="form.planLoopStart"
                       type="date"
+                      value-format="yyyy-MM-dd"
                       placeholder="选择日期">
                     </el-date-picker>
                   </el-form-item>
@@ -1461,7 +1467,7 @@ export default {
       // 获取设备组线信息
       getGroupLine().then(response => {
         this.groupLineList = response.data;
-        this.equipmentQuery.groupLine = response.data[0].equipmentCode;
+        // this.equipmentQuery.groupLine = response.data[0].equipmentCode;
         this.getEquList();
       })
 
@@ -1696,6 +1702,10 @@ export default {
               return
             }
           }
+          if(this.form.calculationRule == "2"){
+            this.form.planTimeArray = null;
+            this.form.planLoopEnd = this.form.planLoopStart;
+          }
           this.planLoading = true;
           if (this.form.planId != null) {
             this.form.personList = this.selectPersonList.map(item => {

From d772579e96fbe49f7f49a56928847a33468432fe Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 6 May 2024 11:45:32 +0800
Subject: [PATCH 11/16] =?UTF-8?q?2024-5-6=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E4=BF=9D=E5=85=BB=E5=B7=A5=E5=8D=95-=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=EF=BC=88=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=E3=80=81=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E3=80=81=E5=88=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AD=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/upkeepOrder/index.vue | 1734 ++++++++++++++----------
 1 file changed, 1041 insertions(+), 693 deletions(-)

diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 08007b6..77d729b 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
@@ -9,6 +16,28 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="工单号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入工单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工单状态" prop="orderStatus">
+        <el-select
+          v-model="queryParams.orderStatus"
+          placeholder="请选择工单状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.device_order_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="计划编码" prop="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -17,16 +46,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单号" prop="orderCode">
+      <el-form-item v-if="false" label="计划编码" prop="planName">
         <el-input
-          v-model="queryParams.orderCode"
-          placeholder="请输入工单号"
+          v-model="queryParams.planName"
+          placeholder="请输入计划编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="车间编码" prop="planWorkshop">
-        <el-select v-model="queryParams.planWorkshop" placeholder="请选择车间" clearable>
+        <el-select
+          v-model="queryParams.planWorkshop"
+          placeholder="请选择车间"
+          clearable
+        >
           <el-option
             v-for="work in workCenterList"
             :key="work.factoryCode"
@@ -43,18 +76,28 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单状态" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
-          <el-option
-            v-for="dict in dict.type.device_order_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+      <el-form-item label="设备编码" prop="equipmentCode">
+        <el-input
+          v-model="queryParams.equipmentCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="equipmentName">
+        <el-input
+          v-model="queryParams.equipmentName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="循环周期" prop="planLoopType">
-        <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
+        <el-select
+          v-model="queryParams.planLoopType"
+          placeholder="请选择循环周期"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.device_loop_type"
             :key="dict.value"
@@ -72,53 +115,46 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
-        <el-date-picker clearable
-                        v-model="queryParams.planLoopStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择循环执行时间开始">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间开始"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.planLoopEnd"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择循环执行时间结束">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间结束"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="实际开始时间" prop="orderStart">
-        <el-date-picker clearable
-                        v-model="queryParams.orderStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择实际开始时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际开始时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="实际结束时间" prop="orderEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.orderEnd"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择实际结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="设备编码" prop="equipmentCode">
-        <el-input
-          v-model="queryParams.equipmentCode"
-          placeholder="请输入设备编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentName">
-        <el-input
-          v-model="queryParams.equipmentName"
-          placeholder="请输入设备名称"
+        <el-date-picker
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          v-model="queryParams.orderEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际结束时间"
+        >
+        </el-date-picker>
       </el-form-item>
+
       <el-form-item v-if="false" label="工单费用" prop="orderCost">
         <el-input
           v-model="queryParams.orderCost"
@@ -130,7 +166,7 @@
       <el-form-item label="保养人" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
-          placeholder="请输入点检人"
+          placeholder="请输入保养人"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -200,11 +236,13 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="创建时间" prop="createTime">
-        <el-date-picker clearable
-                        v-model="queryParams.createTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择创建时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.createTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择创建时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="更新人" prop="updateBy">
@@ -216,11 +254,13 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="更新时间" prop="updateTime">
-        <el-date-picker clearable
-                        v-model="queryParams.updateTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择更新时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.updateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择更新时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="循环范围开始" prop="planLoopStart">
@@ -233,7 +273,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="循环范围结束" prop="planLoopEnd">
@@ -246,9 +287,24 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="保养类型" prop="upkeep">
+        <el-select
+          v-model="queryParams.upkeep"
+          placeholder="请选择保养类型"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.device_upkeep_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="保养开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
@@ -259,7 +315,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="保养结束时间" prop="orderEnd">
@@ -272,21 +329,16 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="保养类型" prop="upkeep">
-        <el-select v-model="queryParams.upkeep" placeholder="请选择保养类型" clearable>
-          <el-option
-            v-for="dict in dict.type.device_upkeep_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="检验状态" prop="orderInspect">
-        <el-select v-model="queryParams.orderInspect" placeholder="请选择保养类型" clearable>
+        <el-select
+          v-model="queryParams.orderInspect"
+          placeholder="请选择检验状态"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.device_inspect_status"
             :key="dict.value"
@@ -296,8 +348,16 @@
         </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-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>
 
@@ -310,7 +370,7 @@
           size="mini"
           @click="cilckFastWork"
           v-hasPermi="['device:upkeepOrder:add']"
-        >快速工单
+          >快速工单
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -321,7 +381,7 @@
           size="mini"
           @click="clickInspect"
           v-hasPermi="['device:upkeepOrder:edit']"
-        >结果检验
+          >结果检验
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -333,7 +393,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['device:upkeepOrder:remove']"
-        >删除
+          >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -344,106 +404,260 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['device:upkeepOrder:export']"
-        >导出
+          >导出
         </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="upkeepOrderList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="upkeepOrderList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column width="60" align="center" label="序号" type="index" fixed/>
-      <el-table-column v-if="false" label="主键" align="center" prop="orderId" />
-      <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 width="150" label="计划名称" align="center" prop="planName" />
-      <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
-      <el-table-column width="150" label="保养单号" align="center" prop="orderCode" fixed>
+      <el-table-column
+        width="60"
+        align="center"
+        label="序号"
+        type="index"
+        fixed
+      />
+      <el-table-column
+        width="150"
+        label="保养单号"
+        align="center"
+        prop="orderCode"
+        fixed
+      >
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="showWork(scope.row)"
-          >{{ scope.row.orderCode }}</el-button
-          >
+          <el-button type="text" @click="showWork(scope.row)">{{
+            scope.row.orderCode
+          }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="车间编码" align="center" prop="planWorkshop" />
-      <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
-      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
-      <el-table-column label="循环周期" align="center" prop="planLoop" />
-      <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
+      <el-table-column label="工单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
+          <dict-tag
+            :options="dict.type.device_order_status"
+            :value="scope.row.orderStatus"
+          />
         </template>
       </el-table-column>
-      <el-table-column width="120" label="循环范围开始" align="center" prop="planLoopStart">
+      <el-table-column
+        v-if="false"
+        label="主键"
+        align="center"
+        prop="orderId"
+      />
+      <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
+        width="150"
+        label="计划名称"
+        align="center"
+        prop="planName"
+      />
+      <el-table-column
+        v-if="false"
+        label="计划类型"
+        align="center"
+        prop="planType"
+      />
+      <el-table-column label="车间编码" align="center" prop="planWorkshop" />
+      <el-table-column
+        width="150"
+        label="车间"
+        align="center"
+        prop="workCenterName"
+      />
+      <el-table-column
+        width="100"
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+      />
+      <el-table-column
+        width="200"
+        label="设备名称"
+        align="center"
+        prop="equipmentName"
+      />
+      <el-table-column
+        v-if="false"
+        label="产线"
+        align="center"
+        prop="planProdLine"
+      />
+      <el-table-column label="循环周期" align="center" prop="planLoop" />
+      <el-table-column
+        width="120"
+        label="循环周期类型"
+        align="center"
+        prop="planLoopType"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
+          <dict-tag
+            :options="dict.type.device_loop_type"
+            :value="scope.row.planLoopType"
+          />
         </template>
       </el-table-column>
-      <el-table-column width="120" label="循环范围结束" align="center" prop="planLoopEnd">
+      <el-table-column
+        width="120"
+        label="循环范围开始"
+        align="center"
+        prop="planLoopStart"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planLoopStart, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="保养开始时间" align="center" prop="orderStart">
+      <el-table-column
+        width="120"
+        label="循环范围结束"
+        align="center"
+        prop="planLoopEnd"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planLoopEnd, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="保养结束时间" align="center" prop="orderEnd">
+      <el-table-column
+        width="150"
+        label="保养开始时间"
+        align="center"
+        prop="orderStart"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{
+            parseTime(scope.row.orderStart, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="80" label="保养类型" align="center" prop="upkeep" >
+      <el-table-column
+        width="150"
+        label="保养结束时间"
+        align="center"
+        prop="orderEnd"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
+          <span>{{
+            parseTime(scope.row.orderEnd, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="工单状态" align="center" prop="orderStatus" >
+      <el-table-column width="80" label="保养类型" align="center" prop="upkeep">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
+          <dict-tag
+            :options="dict.type.device_upkeep_type"
+            :value="scope.row.upkeep"
+          />
         </template>
       </el-table-column>
       <el-table-column label="检验状态" align="center" prop="orderInspect">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_inspect_status" :value="scope.row.orderInspect"/>
+          <dict-tag
+            :options="dict.type.device_inspect_status"
+            :value="scope.row.orderInspect"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="工单费用" align="center" prop="orderCost"/>
-      <el-table-column label="保养人" align="center" prop="planPerson"/>
-      <el-table-column width="120" label="工单用时(min)" align="center" prop="orderCostTime"/>
-      <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson"/>
-      <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode"/>
-      <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">
+      <el-table-column label="工单费用" align="center" prop="orderCost" />
+      <el-table-column label="保养人" align="center" prop="planPerson" />
+      <el-table-column
+        width="120"
+        label="工单用时(min)"
+        align="center"
+        prop="orderCostTime"
+      />
+      <el-table-column
+        v-if="false"
+        label="签字"
+        align="center"
+        prop="orderSignPerson"
+      />
+      <el-table-column
+        v-if="false"
+        label="工厂"
+        align="center"
+        prop="factoryCode"
+      />
+      <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">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updateBy"/>
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+      <el-table-column label="更新人" align="center" prop="updateBy" />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="180" 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
-            v-if="scope.row.upkeep != '1' "
+            v-if="scope.row.upkeep != '1'"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['device:upkeepOrder:edit']"
-          >填写记录
+            >填写记录
           </el-button>
           <el-button
             size="mini"
@@ -451,14 +665,14 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['device:upkeepOrder:remove']"
-          >删除
+            >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -466,45 +680,47 @@
     />
 
     <!-- 结果检验 -->
-    <el-dialog
-      title="保养结果检验"
-      :visible.sync="inspectDialog"
-      width="30%">
+    <el-dialog title="保养结果检验" :visible.sync="inspectDialog" width="30%">
       <el-radio v-model="inspect" label="waiting">待检验</el-radio>
       <el-radio v-model="inspect" label="noPass">未通过</el-radio>
       <el-radio v-model="inspect" label="pass">通过</el-radio>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="inspectDialog = false">取 消</el-button>
-    <el-button type="primary" @click="subInspect">确 定</el-button>
-  </span>
+        <el-button @click="inspectDialog = false">取 消</el-button>
+        <el-button type="primary" @click="subInspect">确 定</el-button>
+      </span>
     </el-dialog>
 
     <!-- 快速工单弹出框 -->
-    <el-dialog
-      title="快速工单"
-      :visible.sync="orderDialog"
-      width="800px"
-    >
+    <el-dialog title="快速工单" :visible.sync="orderDialog" width="800px">
       <el-tabs type="border-card">
         <el-tab-pane label="工单基本信息">
           <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <el-row>
               <el-col :span="7">
                 <el-form-item label="车间:">
-                  <el-select v-model="form.planWorkshop" placeholder="车间" clearable>
+                  <el-select
+                    v-model="form.planWorkshop"
+                    placeholder="车间"
+                    clearable
+                  >
                     <el-option
                       v-for="item in workCenterList"
                       :key="item.factoryCode"
                       :label="item.factoryName"
-                      :value="item.factoryCode">
+                      :value="item.factoryCode"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :offset="1" :span=12>
+              <el-col :offset="1" :span="12">
                 <el-form-item label-width="110px" label="是否停机保养:">
-                  <el-radio v-model="form.shutDown" label="1">停机保养</el-radio>
-                  <el-radio v-model="form.shutDown" label="0">开机保养</el-radio>
+                  <el-radio v-model="form.shutDown" label="1"
+                    >停机保养</el-radio
+                  >
+                  <el-radio v-model="form.shutDown" label="0"
+                    >开机保养</el-radio
+                  >
                 </el-form-item>
               </el-col>
               <el-col v-if="false" :span="10" :offset="1">
@@ -515,7 +731,8 @@
                     type="datetimerange"
                     range-separator="至"
                     start-placeholder="开始时间"
-                    end-placeholder="结束时间">
+                    end-placeholder="结束时间"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -525,44 +742,39 @@
         <el-tab-pane label="设备、保养项、备件">
           <el-row>
             <el-col class="my-step-mar" :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                size="mini"
-                @click="selectEquBtn">
+              <el-button type="primary" plain size="mini" @click="selectEquBtn">
                 选择设备
               </el-button>
             </el-col>
           </el-row>
-          <el-table
-            :data="form.equipmentItem"
-            stripe
-            style="width: 100%">
-            <el-table-column type="selection" width="55" align="center"/>
-            <el-table-column
-              prop="equipmentCode"
-              label="设备编码"
-              width="180">
+          <el-table :data="form.equipmentItem" stripe style="width: 100%">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column prop="equipmentCode" label="设备编码" width="180">
             </el-table-column>
-            <el-table-column
-              prop="equipmentName"
-              label="设备名称"
-              width="180">
+            <el-table-column prop="equipmentName" label="设备名称" width="180">
             </el-table-column>
-            <el-table-column
-              prop="itemTempName"
-              label="巡检项"
-              width="300">
+            <el-table-column prop="itemTempName" label="巡检项" width="300">
             </el-table-column>
-            <el-table-column
-              width="150"
-              fixed="right"
-              label="操作"
-            >
+            <el-table-column width="150" fixed="right" label="操作">
               <template slot-scope="scope">
-                <el-button @click="editorTheItem(scope.row)" type="text" size="small">标准</el-button>
-                <el-button @click="selectSpareBtn(scope.row)" type="text" size="small">备件</el-button>
-                <el-button @click="delTheEquItem(scope.row)" type="text" size="small">删除</el-button>
+                <el-button
+                  @click="editorTheItem(scope.row)"
+                  type="text"
+                  size="small"
+                  >标准</el-button
+                >
+                <el-button
+                  @click="selectSpareBtn(scope.row)"
+                  type="text"
+                  size="small"
+                  >备件</el-button
+                >
+                <el-button
+                  @click="delTheEquItem(scope.row)"
+                  type="text"
+                  size="small"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -579,40 +791,30 @@
               v-loading="detailLoading"
               stripe
               @selection-change="selectChangeEqu"
-              style="width: 100%">
-              <el-table-column
-                prop="itemName"
-                label="部位">
-              </el-table-column>
-              <el-table-column
-                prop="itemMethod"
-                label="方法">
-              </el-table-column>
-              <el-table-column
-                prop="itemTools"
-                label="工具">
+              style="width: 100%"
+            >
+              <el-table-column prop="itemName" label="部位"> </el-table-column>
+              <el-table-column prop="itemMethod" label="方法">
               </el-table-column>
-              <el-table-column
-                width="200"
-                prop="standardName"
-                label="检查标准">
+              <el-table-column prop="itemTools" label="工具"> </el-table-column>
+              <el-table-column width="200" prop="standardName" label="检查标准">
               </el-table-column>
-              <el-table-column
-                prop="standardTypeName"
-                label="标准类型">
+              <el-table-column prop="standardTypeName" label="标准类型">
               </el-table-column>
-              <el-table-column
-                fixed="right"
-                label="操作"
-              >
+              <el-table-column fixed="right" label="操作">
                 <template slot-scope="scope">
-                  <el-button @click="delStandard(scope.row)" type="text" size="small">删除</el-button>
+                  <el-button
+                    @click="delStandard(scope.row)"
+                    type="text"
+                    size="small"
+                    >删除</el-button
+                  >
                 </template>
               </el-table-column>
             </el-table>
             <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="standardBtn">确 定</el-button>
-              </span>
+              <el-button type="primary" @click="standardBtn">确 定</el-button>
+            </span>
           </el-dialog>
           <!-- 选择设备弹窗 -->
           <el-dialog
@@ -621,10 +823,19 @@
             width="1100px"
             append-to-body
           >
-            <el-form :model="equipmentQuery" ref="queryBPForm" size="small" :inline="true" v-show="showSearch"
-                     label-width="68px">
+            <el-form
+              :model="equipmentQuery"
+              ref="queryBPForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="68px"
+            >
               <el-form-item label="组线" prop="groupLine">
-                <el-select v-model="equipmentQuery.groupLine" placeholder="请选择组线">
+                <el-select
+                  v-model="equipmentQuery.groupLine"
+                  placeholder="请选择组线"
+                >
                   <el-option
                     v-for="group in groupLineList"
                     :key="group.equipmentCode"
@@ -655,8 +866,16 @@
                 />
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="getEquList">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetEqu">重置</el-button>
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="getEquList"
+                  >搜索</el-button
+                >
+                <el-button icon="el-icon-refresh" size="mini" @click="resetEqu"
+                  >重置</el-button
+                >
               </el-form-item>
             </el-form>
             <!-- 搜索-设备列表 -->
@@ -665,28 +884,21 @@
               v-loading="equLoading"
               stripe
               @selection-change="selectChangeEqu"
-              style="width: 100%">
-              <el-table-column type="selection" width="55" align="center"/>
-              <el-table-column
-                prop="equipmentCode"
-                label="设备编码">
+              style="width: 100%"
+            >
+              <el-table-column type="selection" width="55" align="center" />
+              <el-table-column prop="equipmentCode" label="设备编码">
               </el-table-column>
-              <el-table-column
-                prop="equipmentName"
-                label="设备名称">
+              <el-table-column prop="equipmentName" label="设备名称">
               </el-table-column>
-              <el-table-column
-                prop="equipmentTypeName"
-                label="设备类型">
+              <el-table-column prop="equipmentTypeName" label="设备类型">
               </el-table-column>
-              <el-table-column
-                prop="workshopName"
-                label="工作中心">
+              <el-table-column prop="workshopName" label="工作中心">
               </el-table-column>
             </el-table>
 
             <pagination
-              v-show="equTotal>0"
+              v-show="equTotal > 0"
               :total="equTotal"
               :page.sync="equipmentQuery.pageNum"
               :limit.sync="equipmentQuery.pageSize"
@@ -694,9 +906,11 @@
             />
 
             <span slot="footer" class="dialog-footer">
-                <el-button @click="selectEqu = false">取 消</el-button>
-                <el-button type="primary" @click="confirmSelectEquBtn">确 定</el-button>
-              </span>
+              <el-button @click="selectEqu = false">取 消</el-button>
+              <el-button type="primary" @click="confirmSelectEquBtn"
+                >确 定</el-button
+              >
+            </span>
           </el-dialog>
 
           <!-- 选择备件弹窗 -->
@@ -713,7 +927,8 @@
                   type="primary"
                   plain
                   size="mini"
-                  @click="choseSpareBtn">
+                  @click="choseSpareBtn"
+                >
                   选择备件
                 </el-button>
               </el-col>
@@ -723,29 +938,24 @@
               :data="chooseSpareList"
               v-loading="spareLoading"
               stripe
-              style="width: 100%">
-              <el-table-column
-                prop="materialCode"
-                label="备件号">
+              style="width: 100%"
+            >
+              <el-table-column prop="materialCode" label="备件号">
               </el-table-column>
-              <el-table-column
-                prop="materialDesc"
-                label="备件名称">
+              <el-table-column prop="materialDesc" label="备件名称">
               </el-table-column>
-              <el-table-column
-                prop="spareType"
-                label="备件类型">
+              <el-table-column prop="spareType" label="备件类型">
               </el-table-column>
-              <el-table-column
-                prop="applyNum"
-                label="领用数量">
+              <el-table-column prop="applyNum" label="领用数量">
               </el-table-column>
-              <el-table-column
-                fixed="right"
-                label="操作"
-              >
+              <el-table-column fixed="right" label="操作">
                 <template slot-scope="scope">
-                  <el-button @click="delSpareList(scope.row)" type="text" size="small">删除</el-button>
+                  <el-button
+                    @click="delSpareList(scope.row)"
+                    type="text"
+                    size="small"
+                    >删除</el-button
+                  >
                 </template>
               </el-table-column>
             </el-table>
@@ -757,8 +967,14 @@
               width="60%"
               append-to-body
             >
-              <el-form :model="spareQuery" ref="queryBPForm" size="small" :inline="true" v-show="showSearch"
-                       label-width="68px">
+              <el-form
+                :model="spareQuery"
+                ref="queryBPForm"
+                size="small"
+                :inline="true"
+                v-show="showSearch"
+                label-width="68px"
+              >
                 <el-form-item label="备件编码">
                   <el-input
                     v-model="spareQuery.materialCode"
@@ -781,8 +997,19 @@
                   />
                 </el-form-item>
                 <el-form-item>
-                  <el-button type="primary" icon="el-icon-search" size="mini" @click="getSpareList">搜索</el-button>
-                  <el-button icon="el-icon-refresh" size="mini" @click="resetSpare">重置</el-button>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="getSpareList"
+                    >搜索</el-button
+                  >
+                  <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetSpare"
+                    >重置</el-button
+                  >
                 </el-form-item>
               </el-form>
               <!-- 搜索-备件列表 -->
@@ -791,39 +1018,32 @@
                 v-loading="spareLoading"
                 stripe
                 @selection-change="selectChangeSpare"
-                style="width: 100%">
-                <el-table-column type="selection" width="55" align="center"/>
-                <el-table-column
-                  prop="materialCode"
-                  label="备件号">
+                style="width: 100%"
+              >
+                <el-table-column type="selection" width="55" align="center" />
+                <el-table-column prop="materialCode" label="备件号">
                 </el-table-column>
-                <el-table-column
-                  prop="materialDesc"
-                  label="备件名称">
+                <el-table-column prop="materialDesc" label="备件名称">
                 </el-table-column>
-                <el-table-column
-                  prop="spareType"
-                  label="备件类型">
+                <el-table-column prop="spareType" label="备件类型">
                 </el-table-column>
-                <el-table-column
-                  prop="amount"
-                  label="库存数量">
+                <el-table-column prop="amount" label="库存数量">
                 </el-table-column>
-                <el-table-column
-                  prop="storageAmount"
-                  label="冻结数量">
+                <el-table-column prop="storageAmount" label="冻结数量">
                 </el-table-column>
-                <el-table-column
-                  prop="applyNum"
-                  label="领用数量">
+                <el-table-column prop="applyNum" label="领用数量">
                   <template slot-scope="scope">
-                    <el-input size="small" v-model="scope.row.applyNum" @change="handleEdit(scope.$index,scope.row)"></el-input>
+                    <el-input
+                      size="small"
+                      v-model="scope.row.applyNum"
+                      @change="handleEdit(scope.$index, scope.row)"
+                    ></el-input>
                   </template>
                 </el-table-column>
               </el-table>
 
               <pagination
-                v-show="spareTotal>0"
+                v-show="spareTotal > 0"
                 :total="spareTotal"
                 :page.sync="spareQuery.pageNum"
                 :limit.sync="spareQuery.pageSize"
@@ -832,31 +1052,33 @@
 
               <span slot="footer" class="dialog-footer">
                 <el-button @click="selectSpareDialog = false">取 消</el-button>
-                <el-button type="primary" @click="confirmSelectSpareBtn">确 定</el-button>
+                <el-button type="primary" @click="confirmSelectSpareBtn"
+                  >确 定</el-button
+                >
               </span>
             </el-dialog>
-
           </el-dialog>
         </el-tab-pane>
         <el-tab-pane label="保养人员">
           <el-row>
             <el-col :span="24" :offset="1">
               <el-transfer
-                :titles="['人员','已选择人员']"
+                :titles="['人员', '已选择人员']"
                 filterable
                 :filter-method="filterMethod"
                 filter-placeholder="请输入人员名称"
                 v-model="selectPersonList"
-                :data="personList">
+                :data="personList"
+              >
               </el-transfer>
             </el-col>
           </el-row>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="orderDialog = false">取 消</el-button>
-    <el-button type="primary" @click="subOrder">确 定</el-button>
-  </span>
+        <el-button @click="orderDialog = false">取 消</el-button>
+        <el-button type="primary" @click="subOrder">确 定</el-button>
+      </span>
     </el-dialog>
 
     <!-- 添加或修改保养工单对话框 -->
@@ -865,74 +1087,66 @@
         <el-tabs type="border-card">
           <el-tab-pane label="基础信息">
             <el-descriptions title="" border>
-              <el-descriptions-item label="计划编码">{{ this.form.planCode }}</el-descriptions-item>
-              <el-descriptions-item label="计划名称">{{ this.form.planName }}</el-descriptions-item>
-              <el-descriptions-item label="循环周期">{{ this.form.planLoop }}{{ this.form.planLoopType }}
+              <el-descriptions-item label="计划编码">{{
+                this.form.planCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="计划名称">{{
+                this.form.planName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="循环周期"
+                >{{ this.form.planLoop }}{{ this.form.planLoopType }}
               </el-descriptions-item>
-              <el-descriptions-item label="工单编码">{{ this.form.orderCode }}</el-descriptions-item>
-              <el-descriptions-item label="车间编码">{{ this.form.planWorkshop }}</el-descriptions-item>
-              <el-descriptions-item label="工作中心">{{ this.form.workCenterName }}</el-descriptions-item>
+              <el-descriptions-item label="工单编码">{{
+                this.form.orderCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="车间编码">{{
+                this.form.planWorkshop
+              }}</el-descriptions-item>
+              <el-descriptions-item label="工作中心">{{
+                this.form.workCenterName
+              }}</el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="记录">
-            <el-table
-              :data="recordList"
-              border
-              style="width: 100%">
-              <el-table-column
-                width="180"
-                prop="itemName"
-                label="检查项"
-              >
+            <el-table :data="recordList" border style="width: 100%">
+              <el-table-column width="180" prop="itemName" label="检查项">
               </el-table-column>
-              <el-table-column
-                width="170"
-                prop="standardName"
-                label="标准名称"
-              >
+              <el-table-column width="170" prop="standardName" label="标准名称">
               </el-table-column>
-              <el-table-column
-                width="110"
-                prop="detailReach"
-                label="是否达标">
+              <el-table-column width="110" prop="detailReach" label="是否达标">
                 <template slot-scope="scope">
-                  <el-select v-model="scope.row.detailReach" placeholder="请选择">
+                  <el-select
+                    v-model="scope.row.detailReach"
+                    placeholder="请选择"
+                  >
                     <el-option
                       v-for="item in dict.type.device_reach_standard"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value">
+                      :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column
-                width="80"
-                prop="detailUpLimit"
-                label="上限">
+              <el-table-column width="80" prop="detailUpLimit" label="上限">
               </el-table-column>
-              <el-table-column
-                width="80"
-                prop="detailDownLimit"
-                label="下限">
+              <el-table-column width="80" prop="detailDownLimit" label="下限">
               </el-table-column>
-              <el-table-column
-                width="120"
-                prop="actualValue"
-                label="实际值">
+              <el-table-column width="120" prop="actualValue" label="实际值">
                 <template slot-scope="scope">
-                  <el-input-number style="width: 90px;" v-if="scope.row.standardType == 'quantify'" size="small" v-model="scope.row.actualValue" controls-position="right"></el-input-number>
+                  <el-input-number
+                    style="width: 90px"
+                    v-if="scope.row.standardType == 'quantify'"
+                    size="small"
+                    v-model="scope.row.actualValue"
+                    controls-position="right"
+                  ></el-input-number>
                 </template>
               </el-table-column>
-              <el-table-column
-                width="60"
-                prop="detailUnit"
-                label="单位">
+              <el-table-column width="60" prop="detailUnit" label="单位">
               </el-table-column>
-              <el-table-column
-                width="350"
-                prop="detailUnit"
-                label="图片上传">
+              <el-table-column width="350" prop="picturePath" label="图片上传">
                 <template slot-scope="scope">
                   <FileUpload v-model="scope.row.picturePath" />
                 </template>
@@ -940,36 +1154,18 @@
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="备件">
-            <el-table
-              :data="form.spareList"
-              stripe
-              style="width: 100%">
-              <el-table-column
-                prop="applyCode"
-                label="申领单号">
+            <el-table :data="form.spareList" stripe style="width: 100%">
+              <el-table-column prop="applyCode" label="申领单号">
               </el-table-column>
-              <el-table-column
-                prop="spareCode"
-                label="备件编码"
-              >
+              <el-table-column prop="spareCode" label="备件编码">
               </el-table-column>
-              <el-table-column
-                prop="spareName"
-                label="备件名称"
-              >
+              <el-table-column prop="spareName" label="备件名称">
               </el-table-column>
-              <el-table-column
-                prop="spareQuantity"
-                label="申领数量">
+              <el-table-column prop="spareQuantity" label="申领数量">
               </el-table-column>
-              <el-table-column
-                prop="spareModel"
-                label="备件类型">
+              <el-table-column prop="spareModel" label="备件类型">
               </el-table-column>
-              <el-table-column
-                prop="applyTime"
-                label="申领时间"
-                width="180">
+              <el-table-column prop="applyTime" label="申领时间" width="180">
               </el-table-column>
             </el-table>
           </el-tab-pane>
@@ -977,7 +1173,11 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="工单状态">
-                  <el-select v-model="form.orderStatus" placeholder="计划状态" clearable>
+                  <el-select
+                    v-model="form.orderStatus"
+                    placeholder="计划状态"
+                    clearable
+                  >
                     <el-option
                       v-for="dict in dict.type.device_order_status"
                       :key="dict.value"
@@ -994,7 +1194,8 @@
                     type="datetimerange"
                     range-separator="至"
                     start-placeholder="开始时间"
-                    end-placeholder="结束时间">
+                    end-placeholder="结束时间"
+                  >
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -1002,13 +1203,16 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="保养费用">
-                  <el-input v-model="form.orderCost" placeholder="请输入费用"></el-input>
+                  <el-input
+                    v-model="form.orderCost"
+                    placeholder="请输入费用"
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="16">
-                <el-form-item label="保养图片">
+                <el-form-item label="保养图片" prop="picturePath">
                   <FileUpload v-model="form.picturePath" />
                 </el-form-item>
               </el-col>
@@ -1023,35 +1227,58 @@
     </el-dialog>
 
     <!-- 保养详情 -->
-    <el-dialog
-      title="保养详情"
-      :visible.sync="workDetail"
-      width="1000px"
-    >
+    <el-dialog title="保养详情" :visible.sync="workDetail" width="1000px">
       <el-tabs type="border-card">
         <el-tab-pane label="保养信息">
           <el-descriptions title="" border :column="2">
-            <el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
-            <el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
-            <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
+            <el-descriptions-item label="计划编码">{{
+              workVO.order.planCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="计划名称">{{
+              workVO.order.planName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环周期"
+              >{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
             </el-descriptions-item>
-            <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
-            <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
-            <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
-            <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
-            <el-descriptions-item label="保养开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
-            <el-descriptions-item label="保养结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
-            <el-descriptions-item label="保养类型">{{ workVO.order.upkeep }}</el-descriptions-item>
-            <el-descriptions-item label="是否停机保养">{{ workVO.order.shutDown }}</el-descriptions-item>
-            <el-descriptions-item label="保养人">{{ workVO.order.planPerson }}</el-descriptions-item>
-<!--            <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>-->
+            <el-descriptions-item label="工单编码">{{
+              workVO.order.orderCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="车间编码">{{
+              workVO.order.planWorkshop
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环开始时间">{{
+              workVO.order.planLoopStart
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环结束时间">{{
+              workVO.order.planLoopEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item label="保养开始时间">{{
+              workVO.order.orderStart
+            }}</el-descriptions-item>
+            <el-descriptions-item label="保养结束时间">{{
+              workVO.order.orderEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item label="保养类型">{{
+              workVO.order.upkeep
+            }}</el-descriptions-item>
+            <el-descriptions-item label="是否停机保养">{{
+              workVO.order.shutDown
+            }}</el-descriptions-item>
+            <el-descriptions-item label="保养人">{{
+              workVO.order.planPerson
+            }}</el-descriptions-item>
+            <!--            <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>-->
             <el-descriptions-item label="保养图片">
               <div class="demo-image__lazy">
-                <el-empty :image-size="200" v-if="workVO.order.upkeepPictures.length == 0"></el-empty>
-                <div v-for="(url, index) in workVO.order.upkeepPictures" :key="index">
-                  <el-image
-                    :src="url"
-                  ></el-image>
+                <el-empty
+                  :image-size="200"
+                  v-if="workVO.order.upkeepPictures.length == 0"
+                ></el-empty>
+                <div
+                  v-for="(url, index) in workVO.order.upkeepPictures"
+                  :key="index"
+                >
+                  <el-image :src="url"></el-image>
                 </div>
               </div>
             </el-descriptions-item>
@@ -1059,115 +1286,96 @@
         </el-tab-pane>
         <el-tab-pane label="设备信息">
           <el-descriptions class="my-margin-top" title="" :column="2" border>
-            <el-descriptions-item label="设备编码">{{ workVO.equ.equipmentCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备名称">{{ workVO.equ.equipmentName }}</el-descriptions-item>
-            <el-descriptions-item label="设备位置">{{ workVO.equ.equipmentLocation }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型编码">{{ workVO.equ.equipmentTypeCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型名称">{{ workVO.equ.equipmentTypeName }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心编码">{{ workVO.equ.workshopCode }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心名称">{{ workVO.equ.workshopName }}</el-descriptions-item>
+            <el-descriptions-item label="设备编码">{{
+              workVO.equ.equipmentCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备名称">{{
+              workVO.equ.equipmentName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备位置">{{
+              workVO.equ.equipmentLocation
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型编码">{{
+              workVO.equ.equipmentTypeCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型名称">{{
+              workVO.equ.equipmentTypeName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心编码">{{
+              workVO.equ.workshopCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心名称">{{
+              workVO.equ.workshopName
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="备件信息">
-          <el-table
-            :data="workVO.spareList"
-            border
-            style="width: 100%">
-            <el-table-column
-              prop="applyCode"
-              label="申领单号">
+          <el-table :data="workVO.spareList" border style="width: 100%">
+            <el-table-column prop="applyCode" label="申领单号">
             </el-table-column>
-            <el-table-column
-              prop="spareCode"
-              label="备件编码"
-              >
+            <el-table-column prop="spareCode" label="备件编码">
             </el-table-column>
-            <el-table-column
-              prop="spareName"
-              label="备件名称"
-              >
+            <el-table-column prop="spareName" label="备件名称">
             </el-table-column>
-            <el-table-column
-              prop="spareQuantity"
-              label="申领数量">
+            <el-table-column prop="spareQuantity" label="申领数量">
             </el-table-column>
-            <el-table-column
-              prop="spareModel"
-              label="备件类型">
+            <el-table-column prop="spareModel" label="备件类型">
             </el-table-column>
-            <el-table-column
-              prop="applyTime"
-              label="申领时间"
-              width="180">
+            <el-table-column prop="applyTime" label="申领时间" width="180">
             </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="检查项信息">
-            <el-table
-              :data="standardListVo"
-              border
-              style="width: 100%">
-              <el-table-column
-                prop="itemName"
-                label="检查项"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardName"
-                label="标准名称"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardTypeName"
-                label="标准类型"
-                width="80">
-              </el-table-column>
-              <el-table-column
-                prop="detailReach"
-                label="是否达标">
-              </el-table-column>
-              <el-table-column
-                prop="actualValue"
-                label="实际值">
-              </el-table-column>
-              <el-table-column
-                prop="detailUpLimit"
-                label="上限">
-              </el-table-column>
-              <el-table-column
-                prop="detailDownLimit"
-                label="下限">
-              </el-table-column>
-              <el-table-column
-                prop="detailUnit"
-                label="单位">
-              </el-table-column>
-              <el-table-column
-                prop="picturePath"
-                label="图片">
-                <template slot-scope="scope">
-                  <el-popover
-                    placement="right"
-                    width="300"
-                    trigger="hover">
-                    <div class="demo-image__lazy">
-                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
-                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
-                        <el-image
-                          :src="url"
-                        ></el-image>
-                      </div>
+          <el-table :data="standardListVo" border style="width: 100%">
+            <el-table-column prop="itemName" label="检查项" width="180">
+            </el-table-column>
+            <el-table-column prop="standardName" label="标准名称" width="180">
+            </el-table-column>
+            <el-table-column
+              prop="standardTypeName"
+              label="标准类型"
+              width="80"
+            >
+            </el-table-column>
+            <el-table-column prop="detailReach" label="是否达标">
+            </el-table-column>
+            <el-table-column prop="actualValue" label="实际值">
+            </el-table-column>
+            <el-table-column prop="detailUpLimit" label="上限">
+            </el-table-column>
+            <el-table-column prop="detailDownLimit" label="下限">
+            </el-table-column>
+            <el-table-column prop="detailUnit" label="单位"> </el-table-column>
+            <el-table-column prop="picturePath" label="图片">
+              <template slot-scope="scope">
+                <el-popover placement="right" width="300" trigger="hover">
+                  <div class="demo-image__lazy">
+                    <el-empty
+                      :image-size="200"
+                      v-if="scope.row.checkPictrueList.length == 0"
+                    ></el-empty>
+                    <div
+                      v-for="(url, index) in scope.row.checkPictrueList"
+                      :key="index"
+                    >
+                      <el-image :src="url"></el-image>
                     </div>
-                    <el-button slot="reference" type="primary" icon="el-icon-picture" circle></el-button>
-                  </el-popover>
-                </template>
-              </el-table-column>
-            </el-table>
+                  </div>
+                  <el-button
+                    slot="reference"
+                    type="primary"
+                    icon="el-icon-picture"
+                    circle
+                  ></el-button>
+                </el-popover>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="workDetail = false">关 闭</el-button>
-  </span>
+        <el-button @click="workDetail = false">关 闭</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -1178,85 +1386,114 @@ import {
   getUpkeepOrder,
   delUpkeepOrder,
   addUpkeepOrder,
-  updateUpkeepOrder, subInspect
+  updateUpkeepOrder,
+  subInspect,
 } from "@/api/device/upkeepOrder";
-import {formatEquItem, formatEquItemNoCondition, querySpareList} from "@/api/device/upkeepPlan";
-import {getEquList, getGroupLine, getPersonList, getWorkCenter} from "@/api/device/plan";
-import {delDeviceOrder, getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder";
-import {getInspectionWork, updateInspectionWork} from "@/api/device/inspectionWork";
+import {
+  formatEquItem,
+  formatEquItemNoCondition,
+  querySpareList,
+} from "@/api/device/upkeepPlan";
+import {
+  getEquList,
+  getGroupLine,
+  getPersonList,
+  getWorkCenter,
+} from "@/api/device/plan";
+import {
+  delDeviceOrder,
+  getDeviceOrder,
+  listDeviceOrder,
+  updateDeviceOrder,
+} from "@/api/device/deviceOrder";
+import {
+  getInspectionWork,
+  updateInspectionWork,
+} from "@/api/device/inspectionWork";
 
 export default {
   name: "UpkeepOrder",
-  dicts: ['device_order_status', 'device_loop_type','device_reach_standard','device_upkeep_type','device_inspect_status'],
+  dicts: [
+    "device_order_status",
+    "device_loop_type",
+    "device_reach_standard",
+    "device_upkeep_type",
+    "device_inspect_status",
+  ],
   data() {
     return {
       // 设备组线
-      groupLineList:[],
+      groupLineList: [],
       // 备件选择list
-      spareOnList:[],
+      spareOnList: [],
       // 备件选择
-      selectSpareDialog:false,
-      standardListVo:[],
-      workDetail:false,
+      selectSpareDialog: false,
+      standardListVo: [],
+      workDetail: false,
       // 初始化VO
       workVO: {
         order: {
-          planCode:null,
-          planName:null,
-          planLoop:null,
-          planLoopType:null,
-          orderCode:null,
-          planWorkShop:null,
-          planLoopStart:null,
-          planLoopEnd:null,
-          orderStart:null,
-          orderEnd:null,
-          planPerson:null,
-          upkeepPictures:[],
-        },equ: {
-          equipmentCode:null,
+          planCode: null,
+          planName: null,
+          planLoop: null,
+          planLoopType: null,
+          orderCode: null,
+          planWorkShop: null,
+          planLoopStart: null,
+          planLoopEnd: null,
+          orderStart: null,
+          orderEnd: null,
+          planPerson: null,
+          upkeepPictures: [],
+        },
+        equ: {
+          equipmentCode: null,
           equipmentName: null,
-          equipmentLocation:null,
-          equipmentTypeCode:null,
-          equipmentTypeName:null,
-          workshopCode:null,
-          workshopName:null,
+          equipmentLocation: null,
+          equipmentTypeCode: null,
+          equipmentTypeName: null,
+          workshopCode: null,
+          workshopName: null,
         },
-        detailList:[],
-        spareList:[],
+        detailList: [],
+        spareList: [],
       },
       // 日期范围选择快捷
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
       // 记录
       recordList: [],
       // 检验结果
-      inspect: '0',
+      inspect: "0",
       // 结果检验弹窗
       inspectDialog: false,
       // 选中的备件
@@ -1304,7 +1541,7 @@ export default {
         equipmentCode: null,
         equipmentName: null,
         workshopCode: null,
-        groupLine:null,
+        groupLine: null,
         pageNum: 1,
         pageSize: 10,
       },
@@ -1334,11 +1571,12 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        orderInspect:null,
+        orderInspect: null,
         pageNum: 1,
         pageSize: 10,
         planId: null,
         planCode: null,
+        planName: null,
         planType: "maintenance",
         orderCode: null,
         planWorkshop: null,
@@ -1350,6 +1588,7 @@ export default {
         orderStart: null,
         orderEnd: null,
         equipmentCode: null,
+        equipmentName: null,
         orderStatus: null,
         orderCost: null,
         planPerson: null,
@@ -1364,7 +1603,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        equ: {equipmentName: null},
+        equ: { equipmentName: null },
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -1372,23 +1611,24 @@ export default {
       },
       // 表单参数
       form: {
-        equ: {equipmentName: null},
+        equ: { equipmentName: null },
         selectSpareList: [],
         equipmentItem: [],
-        shutDown: '0',
-        calculationRule: '0',
-        planLoopType: 'day',
+        shutDown: "0",
+        calculationRule: "0",
+        planLoopType: "day",
         planLoop: null,
-        upkeep: '1',
+        upkeep: "1",
         planName: null,
         planWorkshop: null,
-        personList:[],
-        planTimeArray:[],
-        timeArray:[],
-        picturePath: null,
+        personList: [],
+        planTimeArray: [],
+        timeArray: [],
+        picturePath: [],
       },
+      // picturePath:[],
       // 表单校验
-      rules: {}
+      rules: {},
     };
   },
   created() {
@@ -1398,14 +1638,14 @@ export default {
   methods: {
     // 获取备件信息
     setSpareList() {
-      querySpareList(this.spareQuery).then(response => {
+      querySpareList(this.spareQuery).then((response) => {
         this.spareTotal = response.total;
         this.spareList = response.rows;
         this.spareLoading = false;
-      })
+      });
     },
     // 备件选择btn
-    choseSpareBtn(){
+    choseSpareBtn() {
       // 清理缓存
       this.spareOnList = [];
       // 打开选择备件弹窗
@@ -1414,12 +1654,17 @@ export default {
     // 备件数量
     handleEdit(index, row) {
       // 库存数量-冻结数量
-      if ((Number(row.amount)-Number(row.storageAmount)) < Number(row.applyNum)) {
+      if (
+        Number(row.amount) - Number(row.storageAmount) <
+        Number(row.applyNum)
+      ) {
         this.$message({
-          message: '领用最大数量为:'+(Number(row.amount)-Number(row.storageAmount)),
-          type: 'warning'
-        })
-        row.applyNum = (Number(row.amount)-Number(row.storageAmount));
+          message:
+            "领用最大数量为:" +
+            (Number(row.amount) - Number(row.storageAmount)),
+          type: "warning",
+        });
+        row.applyNum = Number(row.amount) - Number(row.storageAmount);
       }
     },
     // 重置设备搜索
@@ -1428,7 +1673,7 @@ export default {
         equipmentCode: null,
         equipmentName: null,
         workshopCode: null,
-        groupLine:this.groupLineList[0].equipmentCode,
+        groupLine: this.groupLineList[0].equipmentCode,
         pageNum: 1,
         pageSize: 10,
       };
@@ -1436,13 +1681,13 @@ export default {
     },
     // 删除备件-备件数量
     delSpareList(e) {
-      for (let i = 0; i < this.chooseSpareList.length; i++){
+      for (let i = 0; i < this.chooseSpareList.length; i++) {
         if (this.chooseSpareList[i].materialCode == e.materialCode) {
-          this.chooseSpareList.splice(i,1);
+          this.chooseSpareList.splice(i, 1);
           this.$message({
-            message: '删除成功！',
-            type: 'success'
-          })
+            message: "删除成功！",
+            type: "success",
+          });
         }
       }
     },
@@ -1451,37 +1696,41 @@ export default {
       this.loading = true;
       this.reset();
       this.standardListVo = [];
-      const orderId = row.orderId || this.ids
-      getInspectionWork(orderId).then(response => {
+      const orderId = row.orderId || this.ids;
+      getInspectionWork(orderId).then((response) => {
         this.workVO = response.data;
         if (this.workVO.order.upkeep == 0) {
-          this.workVO.order.upkeep = '内部';
-        }else {
-          this.workVO.order.upkeep = '委外';
+          this.workVO.order.upkeep = "内部";
+        } else {
+          this.workVO.order.upkeep = "委外";
         }
         if (this.workVO.order.shutDown == 0) {
-          this.workVO.order.shutDown = '开机保养';
-        }else {
-          this.workVO.order.shutDown = '停机保养';
+          this.workVO.order.shutDown = "开机保养";
+        } else {
+          this.workVO.order.shutDown = "停机保养";
         }
         for (let i = 0; i < this.workVO.detailList.length; i++) {
-          for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
-            this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
+          for (
+            let j = 0;
+            j < this.workVO.detailList[i].standardList.length;
+            j++
+          ) {
+            this.workVO.detailList[i].standardList[j].itemName =
+              this.workVO.detailList[i].itemName;
             this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
           }
         }
         this.loading = false;
         this.workDetail = true;
       });
-
     },
     // 点击结果检验按钮
     clickInspect() {
       if (this.ids.length == 0 || this.ids == null) {
         this.$message({
-          message: '请勾选工单！',
-          type: 'warning'
-        })
+          message: "请勾选工单！",
+          type: "warning",
+        });
         return;
       }
       this.inspect = "0";
@@ -1490,31 +1739,31 @@ export default {
     // 提交检验信息
     subInspect() {
       const data = {
-        ids : this.ids,
-        inspect : this.inspect,
-      }
+        ids: this.ids,
+        inspect: this.inspect,
+      };
 
-      subInspect(data).then(response => {
+      subInspect(data).then((response) => {
         this.getList();
         this.inspectDialog = false;
         this.$message({
-          message: '提交成功！',
-          type: 'success'
-        })
-      })
+          message: "提交成功！",
+          type: "success",
+        });
+      });
     },
     // 获取工作中心
     setWorkCenter() {
-      getWorkCenter().then(response => {
+      getWorkCenter().then((response) => {
         this.workCenterList = response.data;
-      })
+      });
     },
     // 点击快速工单按钮
-    cilckFastWork(){
+    cilckFastWork() {
       this.reset();
       this.selectPersonList = [];
       this.personList = [];
-      this.form.shutDown = "0"
+      this.form.shutDown = "0";
       this.setPerson();
       this.setWorkCenter();
       this.orderDialog = true;
@@ -1529,26 +1778,26 @@ export default {
       if (this.form.planWorkshop == null) {
         this.$message({
           message: "请选择车间！",
-          type: "warning"
-        })
-        return
+          type: "warning",
+        });
+        return;
       }
       if (this.form.equipmentItem.length == 0) {
         this.$message({
           message: "请选择设备！",
-          type: "warning"
-        })
-        return
+          type: "warning",
+        });
+        return;
       }
       if (this.selectPersonList.length == 0) {
         this.$message({
           message: "请选择人员！",
-          type: "warning"
-        })
-        return
+          type: "warning",
+        });
+        return;
       }
       this.form.personList = this.selectPersonList;
-      addUpkeepOrder(this.form).then(response => {
+      addUpkeepOrder(this.form).then((response) => {
         this.$modal.msgSuccess("新增成功");
         this.orderDialog = false;
         this.getList();
@@ -1560,12 +1809,13 @@ export default {
     },
     // 获取人员List-置入穿梭框信息
     setPerson() {
-      getPersonList().then(response => {
+      getPersonList().then((response) => {
         for (let i = 0; i < response.data.length; i++) {
           this.personList.push({
-            label: response.data[i].nickName + '(' + response.data[i].userName + ')',
+            label:
+              response.data[i].nickName + "(" + response.data[i].userName + ")",
             key: response.data[i].userId,
-          })
+          });
         }
       });
     },
@@ -1581,52 +1831,74 @@ export default {
     },
     // 点击编辑设备-保养项目
     editorTheItem(e) {
-
       // 清除缓存
       this.itemDetailList = [];
 
       let qw = 1;
 
       for (let i = 0; i < this.form.equipmentItem.length; i++) {
-
         if (e.equipmentCode == this.form.equipmentItem[i].equipmentCode) {
-
-          for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
-
+          for (
+            let j = 0;
+            j < this.form.equipmentItem[i].equPlanDetailList.length;
+            j++
+          ) {
             // 部位
-            var itemName = this.form.equipmentItem[i].equPlanDetailList[j].itemName;
+            var itemName =
+              this.form.equipmentItem[i].equPlanDetailList[j].itemName;
             // 方法
-            var itemMethod = this.form.equipmentItem[i].equPlanDetailList[j].itemMethod;
+            var itemMethod =
+              this.form.equipmentItem[i].equPlanDetailList[j].itemMethod;
             // 工具
-            var itemTools = this.form.equipmentItem[i].equPlanDetailList[j].itemTools;
+            var itemTools =
+              this.form.equipmentItem[i].equPlanDetailList[j].itemTools;
             // // 周期
             // var itemLoop = this.form.equipmentItem[i].equPlanDetailList[j].itemLoop;
             // var itemLoopType = this.form.equipmentItem[i].equPlanDetailList[j].itemLoopType;
 
-            for (let k = 0; k < this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList.length; k++) {
-
-              if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].showFlag == true) {
-
-                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemName = itemName;
-                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemMethod = itemMethod;
-                this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemTools = itemTools;
+            for (
+              let k = 0;
+              k <
+              this.form.equipmentItem[i].equPlanDetailList[j]
+                .equPlanStandardList.length;
+              k++
+            ) {
+              if (
+                this.form.equipmentItem[i].equPlanDetailList[j]
+                  .equPlanStandardList[k].showFlag == true
+              ) {
+                this.form.equipmentItem[i].equPlanDetailList[
+                  j
+                ].equPlanStandardList[k].itemName = itemName;
+                this.form.equipmentItem[i].equPlanDetailList[
+                  j
+                ].equPlanStandardList[k].itemMethod = itemMethod;
+                this.form.equipmentItem[i].equPlanDetailList[
+                  j
+                ].equPlanStandardList[k].itemTools = itemTools;
                 // this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemLoop = itemLoop;
                 // this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].itemLoopType = itemLoopType;
 
-
-                if (this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardType == "qualitative") {
-                  this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定性";
+                if (
+                  this.form.equipmentItem[i].equPlanDetailList[j]
+                    .equPlanStandardList[k].standardType == "qualitative"
+                ) {
+                  this.form.equipmentItem[i].equPlanDetailList[
+                    j
+                  ].equPlanStandardList[k].standardTypeName = "定性";
                 } else {
-                  this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k].standardTypeName = "定量";
+                  this.form.equipmentItem[i].equPlanDetailList[
+                    j
+                  ].equPlanStandardList[k].standardTypeName = "定量";
                 }
-                this.itemDetailList.push(this.form.equipmentItem[i].equPlanDetailList[j].equPlanStandardList[k]);
+                this.itemDetailList.push(
+                  this.form.equipmentItem[i].equPlanDetailList[j]
+                    .equPlanStandardList[k]
+                );
               }
-
             }
           }
-
         }
-
       }
 
       this.editorItem = true;
@@ -1641,26 +1913,23 @@ export default {
     },
     // 选择设备确认按钮
     confirmSelectEquBtn() {
-
       if (this.selectEquList.length > 1) {
         this.$message({
           message: "只能选择一个设备！",
-          type: "warning"
-        })
-        return
+          type: "warning",
+        });
+        return;
       }
 
       this.form.equipmentItem = [];
       // 处理信息
-      formatEquItemNoCondition(this.selectEquList).then(response => {
-
+      formatEquItemNoCondition(this.selectEquList).then((response) => {
         for (let i = 0; i < response.data.length; i++) {
           this.form.equipmentItem.push(response.data[i]);
         }
 
         this.selectEqu = false;
-      })
-
+      });
     },
     // 选择设备多选操作
     selectChangeEqu(e) {
@@ -1670,11 +1939,11 @@ export default {
     getEquList() {
       this.equLoading = true;
       this.equipmentQuery.workshopCode = this.form.planWorkshop;
-      getEquList(this.equipmentQuery).then(response => {
+      getEquList(this.equipmentQuery).then((response) => {
         this.equTotal = response.total;
         this.queryEquipment = response.rows;
         this.equLoading = false;
-      })
+      });
     },
     // 点击选择设备按钮
     selectEquBtn() {
@@ -1682,16 +1951,16 @@ export default {
         equipmentCode: null,
         equipmentName: null,
         workshopCode: null,
-        groupLine:null,
+        groupLine: null,
         pageNum: 1,
         pageSize: 10,
       };
       // 获取设备组线信息
-      getGroupLine().then(response => {
+      getGroupLine().then((response) => {
         this.groupLineList = response.data;
         this.equipmentQuery.groupLine = response.data[0].equipmentCode;
         this.getEquList();
-      })
+      });
 
       this.selectEqu = true;
     },
@@ -1710,33 +1979,36 @@ export default {
       if (this.spareOnList.length == 0) {
         this.$message({
           message: "请勾选要申领的备件！",
-          type: "warning"
-        })
-        return
+          type: "warning",
+        });
+        return;
       }
 
-      for (let i = 0; i < this.chooseSpareList.length; i++){
+      for (let i = 0; i < this.chooseSpareList.length; i++) {
         for (let j = 0; j < this.spareOnList.length; j++) {
-          if (this.chooseSpareList[i].materialCode == this.spareOnList[j].materialCode) {
+          if (
+            this.chooseSpareList[i].materialCode ==
+            this.spareOnList[j].materialCode
+          ) {
             this.$message({
-              message: '不可重复添加！',
-              type: 'warning'
-            })
+              message: "不可重复添加！",
+              type: "warning",
+            });
             return;
           }
         }
       }
       for (let j = 0; j < this.spareOnList.length; j++) {
         if (this.spareOnList[j].applyNum == null) {
-          this.spareOnList[j].applyNum=1;
+          this.spareOnList[j].applyNum = 1;
         }
         this.chooseSpareList.push(this.spareOnList[j]);
       }
 
       this.$message({
-        message: '添加成功！',
-        type: 'success'
-      })
+        message: "添加成功！",
+        type: "success",
+      });
 
       // 关闭备件选择弹窗
       this.selectSpareDialog = false;
@@ -1750,24 +2022,23 @@ export default {
     },
     // 选择备件-添加备件
     addSpareList(e) {
-      for (let i = 0; i < this.chooseSpareList.length; i++){
+      for (let i = 0; i < this.chooseSpareList.length; i++) {
         if (this.chooseSpareList[i].materialCode == e.materialCode) {
           this.$message({
-            message: '不可重复添加！',
-            type: 'warning'
-          })
+            message: "不可重复添加！",
+            type: "warning",
+          });
           return;
         }
       }
       this.chooseSpareList.push(e);
       this.$message({
-        message: '添加成功！',
-        type: 'success'
-      })
+        message: "添加成功！",
+        type: "success",
+      });
     },
     // 改变巡检周期事件
-    changeArray(e) {
-    },
+    changeArray(e) {},
     // 备件搜索重置按钮
     resetSpare() {
       this.spareQuery = {
@@ -1780,7 +2051,7 @@ export default {
     },
     // 搜索备件按钮
     getSpareList() {
-      this.setSpareList()
+      this.setSpareList();
     },
     // 选择备件按钮操作
     selectSpareBtn(e) {
@@ -1794,7 +2065,7 @@ export default {
     /** 查询保养工单列表 */
     getList() {
       this.loading = true;
-      listDeviceOrder(this.queryParams).then(response => {
+      listDeviceOrder(this.queryParams).then((response) => {
         this.upkeepOrderList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1808,12 +2079,14 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        queryParams:null,
+        queryParams: null,
         orderId: null,
         planId: null,
         planCode: null,
+        planName: null,
         planType: "maintenance",
         orderCode: null,
+        picturePath: null,
         planWorkshop: null,
         planProdLine: null,
         planLoop: null,
@@ -1823,6 +2096,7 @@ export default {
         orderStart: null,
         orderEnd: null,
         equipmentCode: null,
+        equipmentName: null,
         orderStatus: null,
         orderCost: null,
         planPerson: null,
@@ -1837,8 +2111,8 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        equ: {equipmentName: null},
-        timeArray:[],
+        equ: { equipmentName: null },
+        timeArray: [],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -1862,9 +2136,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.orderId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.orderId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 快速工单按钮操作 */
     handleAdd() {
@@ -1877,29 +2151,87 @@ export default {
       this.loading = true;
       this.reset();
       this.recordList = [];
-      const orderCode = row.orderCode || this.ids
-      getDeviceOrder(orderCode).then(response => {
+      const orderCode = row.orderCode || this.ids;
+      getDeviceOrder(orderCode).then((response) => {
         this.form = response.data;
         if (response.data.timeArray[0] == null) {
-          response.data.timeArray = []
+          response.data.timeArray = [];
         }
+        //每个检查项照片
         for (let i = 0; i < this.form.detailList.length; i++) {
-          for (let j = 0; j < this.form.detailList[i].standardList.length; j++) {
-            this.form.detailList[i].standardList[j].itemName = this.form.detailList[i].itemName;
+          for (
+            let j = 0;
+            j < this.form.detailList[i].standardList.length;
+            j++
+          ) {
+            this.form.detailList[i].standardList[j].itemName =
+              this.form.detailList[i].itemName;
+            //显示已经传入的图片
+            if (
+              response.data.detailList[i].standardList[j].picturePaths != null
+            ) {
+              var newFiles = [];
+              response.data.detailList[i].standardList[j].picturePaths.forEach(
+                (item) => {
+                  var newFile = {};
+                  newFile.name = item.fileName;
+                  newFile.url = item.fileAddress;
+                  newFiles.push(newFile);
+                }
+              );
+              this.form.detailList[i].standardList[j].picturePath = newFiles;
+            }
             this.recordList.push(this.form.detailList[i].standardList[j]);
           }
         }
+
+        //保养照片
+        if (response.data.picturePaths != null) {
+          var newFiles = [];
+          response.data.picturePaths.forEach((item) => {
+            var newFile = {};
+            newFile.name = item.fileName;
+            newFile.url = item.fileAddress;
+            newFiles.push(newFile);
+          });
+          this.form.picturePath = newFiles;
+        }
+
         this.loading = false;
         this.open = true;
         this.title = "填写记录";
       });
     },
+
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
+        // //每个检查项照片
+        for (let i = 0; i < this.form.detailList.length; i++) {
+          for (
+            let j = 0;
+            j < this.form.detailList[i].standardList.length;
+            j++
+          ) {
+            if (
+              Array.isArray(this.form.detailList[i].standardList[j].picturePath)
+            ) {
+              this.form.detailList[i].standardList[j].picturePath =
+                this.listToString(
+                  this.form.detailList[i].standardList[j].picturePath
+                );
+            }
+          }
+        }
+
+        //保养照片
+        if (Array.isArray(this.form.picturePath)) {
+          this.form.picturePath = this.listToString(this.form.picturePath);
+        }
+
         if (valid) {
           if (this.form.orderId != null) {
-            updateDeviceOrder(this.form).then(response => {
+            updateDeviceOrder(this.form).then((response) => {
               this.$modal.msgSuccess("提交成功");
               this.open = false;
               this.getList();
@@ -1914,21 +2246,30 @@ export default {
         }
       });
     },
+    // 对象转成指定字符串分隔
+    listToString(list, separator) {
+      let strs = "";
+      separator = separator || ",";
+      for (let i in list) {
+        strs += list[i].url + separator;
+      }
+      return strs != "" ? strs.substr(0, strs.length - 1) : "";
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const orderIds = row.orderId || this.ids;
 
-      var orderCodes = '';
+      var orderCodes = "";
       // 处理信息
       for (let i = 0; i < this.upkeepOrderList.length; i++) {
         for (let j = 0; j < orderIds.length; j++) {
           if (orderIds[j] == this.upkeepOrderList[i].orderId) {
-            orderCodes = orderCodes + this.upkeepOrderList[i].orderCode + ',';
+            orderCodes = orderCodes + this.upkeepOrderList[i].orderCode + ",";
           }
         }
       }
 
-      if (orderCodes == '') {
+      if (orderCodes == "") {
         for (let i = 0; i < this.upkeepOrderList.length; i++) {
           if (orderIds == this.upkeepOrderList[i].orderId) {
             orderCodes = this.upkeepOrderList[i].orderCode;
@@ -1936,24 +2277,31 @@ export default {
         }
       }
 
-      this.$modal.confirm('是否确认删除保养工单编号为"' + orderCodes + '"的数据项？').then(function () {
-        return delDeviceOrder(orderIds);
-      }).then(response => {
-        if (response.code != 500) {
-          this.$modal.msgSuccess("删除成功");
-          this.getList();
-        }
-      }).catch(() => {
-      });
+      this.$modal
+        .confirm('是否确认删除保养工单编号为"' + orderCodes + '"的数据项？')
+        .then(function () {
+          return delDeviceOrder(orderIds);
+        })
+        .then((response) => {
+          if (response.code != 500) {
+            this.$modal.msgSuccess("删除成功");
+            this.getList();
+          }
+        })
+        .catch(() => {});
       this.getList();
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('device/upkeepOrder/export', {
-        ...this.queryParams
-      }, `upkeepOrder_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "device/upkeepOrder/export",
+        {
+          ...this.queryParams,
+        },
+        `upkeepOrder_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
 <style>
@@ -1969,7 +2317,7 @@ export default {
 .el-transfer-panel {
   width: 250px;
 }
-.demo-image__lazy{
+.demo-image__lazy {
   height: 350px;
   overflow-y: auto;
 }

From 599eaa2925f61e6e91b33cb1daced7c4ad468163 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 6 May 2024 13:34:54 +0800
Subject: [PATCH 12/16] =?UTF-8?q?2024-5-6=20=E8=AE=BE=E5=A4=87-=E4=BF=9D?=
 =?UTF-8?q?=E5=85=BB=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?+=E8=AE=BE=E5=A4=87=E5=AE=8C=E5=A5=BD=E7=8E=87=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/maintenanceWork/index.vue |  878 +++++++++-----
 src/views/device/operation/index.vue       | 1231 ++++++++++++--------
 2 files changed, 1286 insertions(+), 823 deletions(-)

diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index dd8f6c1..cb41d48 100644
--- a/src/views/device/maintenanceWork/index.vue
+++ b/src/views/device/maintenanceWork/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
@@ -18,7 +25,11 @@
         />
       </el-form-item>
       <el-form-item label="检验状态" prop="orderInspect">
-        <el-select v-model="queryParams.orderInspect" placeholder="请选择保养类型" clearable>
+        <el-select
+          v-model="queryParams.orderInspect"
+          placeholder="请选择检验状态"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.device_inspect_status"
             :key="dict.value"
@@ -44,7 +55,11 @@
         />
       </el-form-item>
       <el-form-item label="车间编码" prop="planWorkshop">
-        <el-select v-model="queryParams.planWorkshop" placeholder="请选择车间" clearable>
+        <el-select
+          v-model="queryParams.planWorkshop"
+          placeholder="请选择车间"
+          clearable
+        >
           <el-option
             v-for="work in workCenterList"
             :key="work.factoryCode"
@@ -78,7 +93,11 @@
         />
       </el-form-item>
       <el-form-item label="循环周期" prop="planLoopType">
-        <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
+        <el-select
+          v-model="queryParams.planLoopType"
+          placeholder="请选择循环周期"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.device_loop_type"
             :key="dict.value"
@@ -96,35 +115,43 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
-        <el-date-picker clearable
-                        v-model="queryParams.planLoopStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择循环执行时间开始">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间开始"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.planLoopEnd"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择循环执行时间结束">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间结束"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="实际开始时间" prop="orderStart">
-        <el-date-picker clearable
-                        v-model="queryParams.orderStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择实际开始时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际开始时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="实际结束时间" prop="orderEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.orderEnd"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择实际结束时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际结束时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="工单费用" prop="orderCost">
@@ -208,11 +235,13 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="创建时间" prop="createTime">
-        <el-date-picker clearable
-                        v-model="queryParams.createTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择创建时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.createTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择创建时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="更新人" prop="updateBy">
@@ -224,11 +253,13 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="更新时间" prop="updateTime">
-        <el-date-picker clearable
-                        v-model="queryParams.updateTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择更新时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.updateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择更新时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="循环范围开始" prop="planLoopStart">
@@ -241,7 +272,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="循环范围结束" prop="planLoopEnd">
@@ -254,7 +286,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="保养开始时间" prop="orderStart">
@@ -267,7 +300,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="保养结束时间" prop="orderEnd">
@@ -280,11 +314,16 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="保养类型" prop="upkeep">
-        <el-select v-model="queryParams.upkeep" placeholder="请选择保养类型" clearable>
+        <el-select
+          v-model="queryParams.upkeep"
+          placeholder="请选择保养类型"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.device_upkeep_type"
             :key="dict.value"
@@ -294,8 +333,16 @@
         </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-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>
 
@@ -308,7 +355,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['device:inspectionWork:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col v-if="false" :span="1.5">
         <el-button
@@ -319,7 +367,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['device:inspectionWork:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col v-if="false" :span="1.5">
         <el-button
@@ -330,7 +379,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['device:inspectionWork:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -340,52 +390,158 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['device:inspectionWork:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="inspectionWorkList">
-      <el-table-column v-if="false" label="主键" align="center" prop="orderId" />
+      <el-table-column
+        v-if="false"
+        label="主键"
+        align="center"
+        prop="orderId"
+      />
       <!-- 序号 -->
-      <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" fixed/>
-      <el-table-column v-if="false" label="计划id" align="center" prop="planId" />
-      <el-table-column width="150" label="保养单号" align="center" prop="orderCode" fixed>
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+        fixed
+      />
+      <el-table-column
+        v-if="false"
+        label="计划id"
+        align="center"
+        prop="planId"
+      />
+      <el-table-column
+        width="150"
+        label="保养工单号"
+        align="center"
+        prop="orderCode"
+        fixed
+      >
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="showWork(scope.row)"
-          >{{ scope.row.orderCode }}</el-button
-          >
+          <el-button type="text" @click="showWork(scope.row)">{{
+            scope.row.orderCode
+          }}</el-button>
         </template>
       </el-table-column>
       <el-table-column label="检验状态" align="center" prop="orderInspect">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_inspect_status" :value="scope.row.orderInspect"/>
+          <dict-tag
+            :options="dict.type.device_inspect_status"
+            :value="scope.row.orderInspect"
+          />
         </template>
       </el-table-column>
-      <el-table-column width="150" label="计划编码" align="center" prop="planCode" />
-      <el-table-column width="150" label="计划名称" align="center" prop="planName" />
-      <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
+      <el-table-column
+        width="150"
+        label="计划编码"
+        align="center"
+        prop="planCode"
+      />
+      <el-table-column
+        width="150"
+        label="计划名称"
+        align="center"
+        prop="planName"
+      />
+      <el-table-column
+        v-if="false"
+        label="计划类型"
+        align="center"
+        prop="planType"
+      />
       <el-table-column label="车间编码" align="center" prop="planWorkshop" />
-      <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
-      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
+      <el-table-column
+        width="150"
+        label="车间"
+        align="center"
+        prop="workCenterName"
+      />
+      <el-table-column
+        width="100"
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+      />
+      <el-table-column
+        width="200"
+        label="设备名称"
+        align="center"
+        prop="equipmentName"
+      />
+      <el-table-column
+        width="150"
+        label="保养开始时间"
+        align="center"
+        prop="orderStart"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.orderStart, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        width="150"
+        label="保养结束时间"
+        align="center"
+        prop="orderEnd"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.orderEnd, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="保养人" align="center" prop="planPerson" />
+      <el-table-column
+        v-if="false"
+        label="产线"
+        align="center"
+        prop="planProdLine"
+      />
       <el-table-column label="循环周期" align="center" prop="planLoop" />
-      <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
+      <el-table-column
+        width="120"
+        label="循环周期类型"
+        align="center"
+        prop="planLoopType"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
+          <dict-tag
+            :options="dict.type.device_loop_type"
+            :value="scope.row.planLoopType"
+          />
         </template>
       </el-table-column>
-      <el-table-column width="120" label="循环范围开始" align="center" prop="planLoopStart">
+      <el-table-column
+        width="120"
+        label="循环范围开始"
+        align="center"
+        prop="planLoopStart"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planLoopStart, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="循环范围结束" align="center" prop="planLoopEnd">
+      <el-table-column
+        width="120"
+        label="循环范围结束"
+        align="center"
+        prop="planLoopEnd"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planLoopEnd, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column width="120" label="保养开始时间" align="center" prop="orderStart">
@@ -393,43 +549,98 @@
           <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column width="150" label="保养时间" align="center" prop="orderEnd">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column width="80" label="保养类型" align="center" prop="upkeep" >
+      <el-table-column width="80" label="保养类型" align="center" prop="upkeep">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
+          <dict-tag
+            :options="dict.type.device_upkeep_type"
+            :value="scope.row.upkeep"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="工单状态" align="center" prop="orderStatus" >
+      <el-table-column label="工单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
+          <dict-tag
+            :options="dict.type.device_order_status"
+            :value="scope.row.orderStatus"
+          />
         </template>
       </el-table-column>
-      <el-table-column width="120" label="工单费用(元)" align="center" prop="orderCost"/>
-      <el-table-column label="保养人" align="center" prop="planPerson"/>
-      <el-table-column width="120" label="工单用时(min)" align="center" prop="orderCostTime"/>
-      <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson"/>
-      <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode"/>
-      <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">
+      <el-table-column
+        width="120"
+        label="工单费用(元)"
+        align="center"
+        prop="orderCost"
+      />
+      <el-table-column
+        width="120"
+        label="工单用时(min)"
+        align="center"
+        prop="orderCostTime"
+      />
+      <el-table-column
+        v-if="false"
+        label="签字"
+        align="center"
+        prop="orderSignPerson"
+      />
+      <el-table-column
+        v-if="false"
+        label="工厂"
+        align="center"
+        prop="factoryCode"
+      />
+      <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">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updateBy"/>
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+      <el-table-column label="更新人" align="center" prop="updateBy" />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        v-if="false"
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -437,20 +648,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['device:inspectionWork:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['device:inspectionWork:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -458,153 +671,171 @@
     />
 
     <!-- 保养详情 -->
-    <el-dialog
-      title="保养详情"
-      :visible.sync="workDetail"
-      width="1000px"
-    >
+    <el-dialog title="保养详情" :visible.sync="workDetail" width="1000px">
       <el-tabs type="border-card">
         <el-tab-pane label="保养信息">
-          <el-descriptions title="" border :column="2" :contentStyle="CS" :label-style="LS">
-            <el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
-            <el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
-            <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}</el-descriptions-item>
-            <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
-            <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
-            <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
-            <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
-            <el-descriptions-item label="保养开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
-            <el-descriptions-item label="保养结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
-            <el-descriptions-item label="保养类型">{{ workVO.order.upkeep }}</el-descriptions-item>
-            <el-descriptions-item label="是否停机保养">{{ workVO.order.shutDown }}</el-descriptions-item>
-            <el-descriptions-item label="保养人">{{ workVO.order.planPerson }}</el-descriptions-item>
-<!--            <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>-->
+          <el-descriptions
+            title=""
+            border
+            :column="2"
+            :contentStyle="CS"
+            :label-style="LS"
+          >
+            <el-descriptions-item label="计划编码">{{
+              workVO.order.planCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="计划名称">{{
+              workVO.order.planName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环周期"
+              >{{ workVO.order.planLoop
+              }}{{ workVO.order.planLoopType }}</el-descriptions-item
+            >
+            <el-descriptions-item label="工单编码">{{
+              workVO.order.orderCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="车间编码">{{
+              workVO.order.planWorkshop
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环开始时间">{{
+              workVO.order.planLoopStart
+            }}</el-descriptions-item>
+            <el-descriptions-item label="循环结束时间">{{
+              workVO.order.planLoopEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item label="保养开始时间">{{
+              workVO.order.orderStart
+            }}</el-descriptions-item>
+            <el-descriptions-item label="保养结束时间">{{
+              workVO.order.orderEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item label="保养类型">{{
+              workVO.order.upkeep
+            }}</el-descriptions-item>
+            <el-descriptions-item label="是否停机保养">{{
+              workVO.order.shutDown
+            }}</el-descriptions-item>
+            <el-descriptions-item label="保养人">{{
+              workVO.order.planPerson
+            }}</el-descriptions-item>
+            <!--            <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>-->
             <el-descriptions-item label="保养图片">
               <div class="demo-image__lazy">
-                <el-empty :image-size="200" v-if="workVO.order.upkeepPictures.length == 0"></el-empty>
-                <div v-for="(url, index) in workVO.order.upkeepPictures" :key="index">
-                  <el-image
-                    :src="url"
-                  ></el-image>
+                <el-empty
+                  :image-size="200"
+                  v-if="workVO.order.upkeepPictures.length == 0"
+                ></el-empty>
+                <div
+                  v-for="(url, index) in workVO.order.upkeepPictures"
+                  :key="index"
+                >
+                  <el-image :src="url"></el-image>
                 </div>
               </div>
             </el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="设备信息">
-          <el-descriptions class="my-margin-top" title="" :column="2" border :contentStyle="CS" :label-style="LS">
-            <el-descriptions-item label="设备编码">{{ workVO.equ.equipmentCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备名称">{{ workVO.equ.equipmentName }}</el-descriptions-item>
-            <el-descriptions-item label="设备位置">{{ workVO.equ.equipmentLocation }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型编码">{{ workVO.equ.equipmentTypeCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型名称">{{ workVO.equ.equipmentTypeName }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心编码">{{ workVO.equ.workshopCode }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心名称">{{ workVO.equ.workshopName }}</el-descriptions-item>
+          <el-descriptions
+            class="my-margin-top"
+            title=""
+            :column="2"
+            border
+            :contentStyle="CS"
+            :label-style="LS"
+          >
+            <el-descriptions-item label="设备编码">{{
+              workVO.equ.equipmentCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备名称">{{
+              workVO.equ.equipmentName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备位置">{{
+              workVO.equ.equipmentLocation
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型编码">{{
+              workVO.equ.equipmentTypeCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型名称">{{
+              workVO.equ.equipmentTypeName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心编码">{{
+              workVO.equ.workshopCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心名称">{{
+              workVO.equ.workshopName
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="备件信息">
-          <el-table
-            :data="workVO.spareList"
-            border
-            style="width: 100%">
-            <el-table-column
-              prop="applyCode"
-              label="申领单号">
+          <el-table :data="workVO.spareList" border style="width: 100%">
+            <el-table-column prop="applyCode" label="申领单号">
             </el-table-column>
-            <el-table-column
-              prop="spareCode"
-              label="备件编码"
-            >
+            <el-table-column prop="spareCode" label="备件编码">
             </el-table-column>
-            <el-table-column
-              prop="spareName"
-              label="备件名称"
-            >
+            <el-table-column prop="spareName" label="备件名称">
             </el-table-column>
-            <el-table-column
-              prop="spareQuantity"
-              label="申领数量">
+            <el-table-column prop="spareQuantity" label="申领数量">
             </el-table-column>
-            <el-table-column
-              prop="spareModel"
-              label="备件类型">
+            <el-table-column prop="spareModel" label="备件类型">
             </el-table-column>
-            <el-table-column
-              prop="applyTime"
-              label="申领时间"
-              width="180">
+            <el-table-column prop="applyTime" label="申领时间" width="180">
             </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="检查项信息">
-            <el-table
-              :data="standardListVo"
-              border
-              style="width: 100%">
-              <el-table-column
-                prop="itemName"
-                label="检查项"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardName"
-                label="标准名称"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardTypeName"
-                label="标准类型"
-                width="80">
-              </el-table-column>
-              <el-table-column
-                prop="detailReach"
-                label="是否达标">
-              </el-table-column>
-              <el-table-column
-                prop="actualValue"
-                label="实际值">
-              </el-table-column>
-              <el-table-column
-                prop="detailUpLimit"
-                label="上限">
-              </el-table-column>
-              <el-table-column
-                prop="detailDownLimit"
-                label="下限">
-              </el-table-column>
-              <el-table-column
-                prop="detailUnit"
-                label="单位">
-              </el-table-column>
-              <el-table-column
-                prop="picturePath"
-                label="图片">
-                <template slot-scope="scope">
-                  <el-popover
-                    placement="right"
-                    width="300"
-                    trigger="hover">
-                    <div class="demo-image__lazy">
-                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
-                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
-                        <el-image
-                          :src="url"
-                        ></el-image>
-                      </div>
+          <el-table :data="standardListVo" border style="width: 100%">
+            <el-table-column prop="itemName" label="检查项" width="180">
+            </el-table-column>
+            <el-table-column prop="standardName" label="标准名称" width="180">
+            </el-table-column>
+            <el-table-column
+              prop="standardTypeName"
+              label="标准类型"
+              width="80"
+            >
+            </el-table-column>
+            <el-table-column prop="detailReach" label="是否达标">
+            </el-table-column>
+            <el-table-column prop="actualValue" label="实际值">
+            </el-table-column>
+            <el-table-column prop="detailUpLimit" label="上限">
+            </el-table-column>
+            <el-table-column prop="detailDownLimit" label="下限">
+            </el-table-column>
+            <el-table-column prop="detailUnit" label="单位"> </el-table-column>
+            <el-table-column prop="picturePath" label="图片">
+              <template slot-scope="scope">
+                <el-popover placement="right" width="300" trigger="hover">
+                  <div class="demo-image__lazy">
+                    <el-empty
+                      :image-size="200"
+                      v-if="scope.row.checkPictrueList.length == 0"
+                    ></el-empty>
+                    <div
+                      v-for="(url, index) in scope.row.checkPictrueList"
+                      :key="index"
+                    >
+                      <el-image :src="url"></el-image>
                     </div>
-                    <el-button slot="reference" type="primary" icon="el-icon-picture" circle></el-button>
-                  </el-popover>
-                </template>
-              </el-table-column>
-            </el-table>
+                  </div>
+                  <el-button
+                    slot="reference"
+                    type="primary"
+                    icon="el-icon-picture"
+                    circle
+                  ></el-button>
+                </el-popover>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="workDetail = false">关 闭</el-button>
-  </span>
+        <el-button @click="workDetail = false">关 闭</el-button>
+      </span>
     </el-dialog>
 
-
     <!-- 添加或修改保养记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <div slot="footer" class="dialog-footer">
@@ -616,13 +847,24 @@
 </template>
 
 <script>
-import { listInspectionWork, getInspectionWork, delInspectionWork, addInspectionWork, updateInspectionWork } from "@/api/device/inspectionWork";
-import {listDeviceOrder} from "@/api/device/deviceOrder";
-import {getWorkCenter} from "@/api/device/plan";
+import {
+  listInspectionWork,
+  getInspectionWork,
+  delInspectionWork,
+  addInspectionWork,
+  updateInspectionWork,
+} from "@/api/device/inspectionWork";
+import { listDeviceOrder } from "@/api/device/deviceOrder";
+import { getWorkCenter } from "@/api/device/plan";
 
 export default {
   name: "InspectionWork",
-  dicts: ['device_order_status', 'device_loop_type','device_upkeep_type','device_inspect_status'],
+  dicts: [
+    "device_order_status",
+    "device_loop_type",
+    "device_upkeep_type",
+    "device_inspect_status",
+  ],
   data() {
     return {
       //表格样式
@@ -632,62 +874,67 @@ export default {
       LS: {
         width: "200px",
       },
-      standardListVo:[],
-      workCenterList:[],
+      standardListVo: [],
+      workCenterList: [],
       // 日期范围选择快捷
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
       // 初始化VO
       workVO: {
         order: {
-          planCode:null,
-          planName:null,
-          planLoop:null,
-          planLoopType:null,
-          orderCode:null,
-          planWorkShop:null,
-          planLoopStart:null,
-          planLoopEnd:null,
-          orderStart:null,
-          orderEnd:null,
-          planPerson:null,
-          upkeepPictures:[],
-        },equ: {
-          equipmentCode:null,
+          planCode: null,
+          planName: null,
+          planLoop: null,
+          planLoopType: null,
+          orderCode: null,
+          planWorkShop: null,
+          planLoopStart: null,
+          planLoopEnd: null,
+          orderStart: null,
+          orderEnd: null,
+          planPerson: null,
+          upkeepPictures: [],
+        },
+        equ: {
+          equipmentCode: null,
           equipmentName: null,
-          equipmentLocation:null,
-          equipmentTypeCode:null,
-          equipmentTypeName:null,
-          workshopCode:null,
-          workshopName:null,
+          equipmentLocation: null,
+          equipmentTypeCode: null,
+          equipmentTypeName: null,
+          workshopCode: null,
+          workshopName: null,
         },
-        detailList:[],
-        spareList:[],
+        detailList: [],
+        spareList: [],
       },
       // 工单详情抽屉
       workDetail: false,
@@ -715,7 +962,7 @@ export default {
         pageSize: 10,
         planId: null,
         planCode: null,
-        planName:null,
+        planName: null,
         planType: "maintenance",
         orderCode: null,
         planWorkshop: null,
@@ -727,7 +974,8 @@ export default {
         orderStart: null,
         orderEnd: null,
         equipmentCode: null,
-        orderStatus: '1',
+        equipmentName: null,
+        orderStatus: "1",
         orderCost: null,
         planPerson: null,
         orderCostTime: null,
@@ -749,8 +997,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
     };
   },
   created() {
@@ -764,43 +1011,47 @@ export default {
     },
     // 获取工作中心
     setWorkCenter() {
-      getWorkCenter().then(response => {
+      getWorkCenter().then((response) => {
         this.workCenterList = response.data;
-      })
+      });
     },
     // 展示
     showWork(row) {
       this.loading = true;
       this.reset();
       this.standardListVo = [];
-      const orderId = row.orderId || this.ids
-      getInspectionWork(orderId).then(response => {
+      const orderId = row.orderId || this.ids;
+      getInspectionWork(orderId).then((response) => {
         this.workVO = response.data;
         if (this.workVO.order.upkeep == 0) {
-          this.workVO.order.upkeep = '内部';
-        }else {
-          this.workVO.order.upkeep = '委外';
+          this.workVO.order.upkeep = "内部";
+        } else {
+          this.workVO.order.upkeep = "委外";
         }
         if (this.workVO.order.shutDown == 0) {
-          this.workVO.order.shutDown = '开机保养';
-        }else {
-          this.workVO.order.shutDown = '停机保养';
+          this.workVO.order.shutDown = "开机保养";
+        } else {
+          this.workVO.order.shutDown = "停机保养";
         }
         for (let i = 0; i < this.workVO.detailList.length; i++) {
-          for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
-            this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
+          for (
+            let j = 0;
+            j < this.workVO.detailList[i].standardList.length;
+            j++
+          ) {
+            this.workVO.detailList[i].standardList[j].itemName =
+              this.workVO.detailList[i].itemName;
             this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
           }
         }
         this.loading = false;
         this.workDetail = true;
       });
-
     },
     /** 查询保养记录列表 */
     getList() {
       this.loading = true;
-      listDeviceOrder(this.queryParams).then(response => {
+      listDeviceOrder(this.queryParams).then((response) => {
         this.inspectionWorkList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -828,7 +1079,8 @@ export default {
         orderStart: null,
         orderEnd: null,
         equipmentCode: null,
-        orderStatus: '1',
+        equipmentName: null,
+        orderStatus: "1",
         orderCost: null,
         planPerson: null,
         orderCostTime: null,
@@ -865,9 +1117,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.orderId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.orderId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -878,8 +1130,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const orderId = row.orderId || this.ids
-      getInspectionWork(orderId).then(response => {
+      const orderId = row.orderId || this.ids;
+      getInspectionWork(orderId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改保养记录";
@@ -887,16 +1139,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.orderId != null) {
-            updateInspectionWork(this.form).then(response => {
+            updateInspectionWork(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addInspectionWork(this.form).then(response => {
+            addInspectionWork(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -908,31 +1160,39 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const orderIds = row.orderId || this.ids;
-      this.$modal.confirm('是否确认删除保养记录编号为"' + orderIds + '"的数据项？').then(function() {
-        return delInspectionWork(orderIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除保养记录编号为"' + orderIds + '"的数据项？')
+        .then(function () {
+          return delInspectionWork(orderIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('device/inspectionWork/export', {
-        ...this.queryParams
-      }, `inspectionWork_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "device/inspectionWork/export",
+        {
+          ...this.queryParams,
+        },
+        `inspectionWork_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
 <style>
-.my-margin-lr{
+.my-margin-lr {
   margin-right: 20px;
   margin-left: 20px;
 }
-.my-margin-top{
+.my-margin-top {
   margin-top: 10px;
 }
-.demo-image__lazy{
+.demo-image__lazy {
   height: 350px;
   overflow-y: auto;
 }
diff --git a/src/views/device/operation/index.vue b/src/views/device/operation/index.vue
index 42429ea..d9dc7b4 100644
--- a/src/views/device/operation/index.vue
+++ b/src/views/device/operation/index.vue
@@ -1,150 +1,161 @@
 <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="车间" prop="workshop">
-				<el-input
-					v-model="queryParams.workshop"
-					placeholder="请输入车间"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="组线" prop="groupLine">
-				<el-input
-					v-model="queryParams.groupLine"
-					placeholder="请输入组线"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="设备" prop="equipmentName">
-				<el-input
-					v-model="queryParams.equipmentName"
-					placeholder="请输入设备"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="设备编码" prop="equipmentCode">
-				<el-input
-					v-model="queryParams.equipmentCode"
-					placeholder="请输入设备编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="故障时间" prop="faultTime">
-				<el-input
-					v-model="queryParams.faultTime"
-					placeholder="请输入故障时间"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="实际运行时间;运行时间-故障时间" prop="actualOperationTime">
-				<el-input
-					v-model="queryParams.actualOperationTime"
-					placeholder="请输入实际运行时间;运行时间-故障时间"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="运行时间" prop="operationTime">
-				<el-input
-					v-model="queryParams.operationTime"
-					placeholder="请输入运行时间"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="故障率" prop="failureRate">
-				<el-input
-					v-model="queryParams.failureRate"
-					placeholder="请输入故障率"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="故障描述" prop="failureDescription">
-				<el-input
-					v-model="queryParams.failureDescription"
-					placeholder="请输入故障描述"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="原因分析" prop="reasonAnalyze">
-				<el-input
-					v-model="queryParams.reasonAnalyze"
-					placeholder="请输入原因分析"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="处理方式" prop="handlingMethod">
-				<el-input
-					v-model="queryParams.handlingMethod"
-					placeholder="请输入处理方式"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="维修人" prop="repairPerson">
-				<el-input
-					v-model="queryParams.repairPerson"
-					placeholder="请输入维修人"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="设备状态描述" prop="equStatusDes">
-				<el-input
-					v-model="queryParams.equStatusDes"
-					placeholder="请输入设备状态描述"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="更换备件" prop="replaceSpare">
-				<el-input
-					v-model="queryParams.replaceSpare"
-					placeholder="请输入更换备件"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="工厂" prop="factoryCode">
-				<el-input
-					v-model="queryParams.factoryCode"
-					placeholder="请输入工厂"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="备用字段1" prop="attr1">
-				<el-input
-					v-model="queryParams.attr1"
-					placeholder="请输入备用字段1"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="备用字段2" prop="attr2">
-				<el-input
-					v-model="queryParams.attr2"
-					placeholder="请输入备用字段2"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="备用字段3" prop="attr3">
-				<el-input
-					v-model="queryParams.attr3"
-					placeholder="请输入备用字段3"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="车间" prop="workshop">
+        <el-input
+          v-model="queryParams.workshop"
+          placeholder="请输入车间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="组线" prop="groupLine">
+        <el-input
+          v-model="queryParams.groupLine"
+          placeholder="请输入组线"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备" prop="equipmentName">
+        <el-input
+          v-model="queryParams.equipmentName"
+          placeholder="请输入设备"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备编码" prop="equipmentCode">
+        <el-input
+          v-model="queryParams.equipmentCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="故障时间" prop="faultTime">
+        <el-input
+          v-model="queryParams.faultTime"
+          placeholder="请输入故障时间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="false"
+        label="实际运行时间;运行时间-故障时间"
+        prop="actualOperationTime"
+      >
+        <el-input
+          v-model="queryParams.actualOperationTime"
+          placeholder="请输入实际运行时间;运行时间-故障时间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="运行时间" prop="operationTime">
+        <el-input
+          v-model="queryParams.operationTime"
+          placeholder="请输入运行时间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="故障率" prop="failureRate">
+        <el-input
+          v-model="queryParams.failureRate"
+          placeholder="请输入故障率"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="故障描述" prop="failureDescription">
+        <el-input
+          v-model="queryParams.failureDescription"
+          placeholder="请输入故障描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="原因分析" prop="reasonAnalyze">
+        <el-input
+          v-model="queryParams.reasonAnalyze"
+          placeholder="请输入原因分析"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="处理方式" prop="handlingMethod">
+        <el-input
+          v-model="queryParams.handlingMethod"
+          placeholder="请输入处理方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="维修人" prop="repairPerson">
+        <el-input
+          v-model="queryParams.repairPerson"
+          placeholder="请输入维修人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="设备状态描述" prop="equStatusDes">
+        <el-input
+          v-model="queryParams.equStatusDes"
+          placeholder="请输入设备状态描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="更换备件" prop="replaceSpare">
+        <el-input
+          v-model="queryParams.replaceSpare"
+          placeholder="请输入更换备件"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="工厂" prop="factoryCode">
+        <el-input
+          v-model="queryParams.factoryCode"
+          placeholder="请输入工厂"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="备用字段1" prop="attr1">
+        <el-input
+          v-model="queryParams.attr1"
+          placeholder="请输入备用字段1"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="备用字段2" prop="attr2">
+        <el-input
+          v-model="queryParams.attr2"
+          placeholder="请输入备用字段2"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="备用字段3" prop="attr3">
+        <el-input
+          v-model="queryParams.attr3"
+          placeholder="请输入备用字段3"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="日期" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTimeArray"
@@ -155,395 +166,587 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </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-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 v-if="false" :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['device:operation: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="['device:operation: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="['device:operation: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="['device:operation:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+    <el-row v-if="false" :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['device:operation: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="['device:operation: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="['device:operation: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="['device:operation:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-		<el-table v-loading="loading" :data="operationList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column v-if="false" label="主键" align="center" prop="id" />
-      <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
-      <el-table-column v-if="false" width="100" label="工厂" align="center" prop="factoryCode" />
-      <el-table-column width="120" label="日期" align="center" prop="createTime" >
+    <el-table
+      v-loading="loading"
+      :data="operationList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column v-if="false" label="主键" align="center" prop="id" />
+      <el-table-column
+        width="60"
+        align="center"
+        label="序号"
+        type="index"
+      ></el-table-column>
+      <el-table-column
+        v-if="false"
+        width="100"
+        label="工厂"
+        align="center"
+        prop="factoryCode"
+      />
+      <el-table-column
+        width="120"
+        label="日期"
+        align="center"
+        prop="createTime"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-			<el-table-column width="120" label="车间" align="center" prop="workshop" />
-			<el-table-column width="120" label="组线" align="center" prop="groupLine" />
-			<el-table-column width="300" label="设备名称" align="left" prop="equipmentName" />
-			<el-table-column width="120" label="设备编码" align="center" prop="equipmentCode" />
-			<el-table-column width="100" label="故障停机时间" align="center" prop="faultTime" />
-			<el-table-column width="100" label="实际运行时间" align="center" prop="actualOperationTime" />
-			<el-table-column width="100" label="运行时间" align="center" prop="operationTime" />
-			<el-table-column width="100" label="故障率" align="center" prop="failureRate" />
-			<el-table-column width="100" label="故障次数" align="center" prop="failureTimes" />
-			<el-table-column width="100" label="停机次数" align="center" prop="shutdownTimes" />
-			<el-table-column width="200" label="故障描述" align="center" prop="failureDescription" />
-			<el-table-column width="200" label="原因分析" align="center" prop="reasonAnalyze" />
-      <el-table-column width="200" label="设备状态描述" align="center" prop="equStatusDes" />
-			<el-table-column width="200" label="处理方式" align="center" prop="handlingMethod" />
-			<el-table-column width="200" label="更换备件" align="center" prop="replaceSpare" />
-      <el-table-column width="100" label="维修人" align="center" prop="repairPerson" />
-			<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 width="120" label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['device:operation:edit']"
-					>修改</el-button>
-					<el-button
+      <el-table-column
+        width="120"
+        label="车间"
+        align="center"
+        prop="workshop"
+      />
+      <el-table-column
+        width="120"
+        label="组线"
+        align="center"
+        prop="groupLine"
+      />
+      <el-table-column
+        width="300"
+        label="设备名称"
+        align="left"
+        prop="equipmentName"
+      />
+      <el-table-column
+        width="120"
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+      />
+      <el-table-column
+        width="100"
+        label="故障停机时间"
+        align="center"
+        prop="faultTime"
+      />
+      <el-table-column
+        width="100"
+        label="实际运行时间"
+        align="center"
+        prop="actualOperationTime"
+      />
+      <el-table-column
+        width="100"
+        label="运行时间"
+        align="center"
+        prop="operationTime"
+      />
+      <el-table-column
+        width="100"
+        label="故障率"
+        align="center"
+        prop="failureRate"
+      />
+      <el-table-column
+        width="100"
+        label="故障次数"
+        align="center"
+        prop="failureTimes"
+      />
+      <el-table-column
+        width="100"
+        label="停机次数"
+        align="center"
+        prop="shutdownTimes"
+      />
+      <el-table-column
+        width="200"
+        label="故障描述"
+        align="left"
+        prop="failureDescription"
+      />
+      <el-table-column
+        width="200"
+        label="原因分析"
+        align="left"
+        prop="reasonAnalyze"
+      />
+      <el-table-column
+        width="200"
+        label="设备状态描述"
+        align="left"
+        prop="equStatusDes"
+      />
+      <el-table-column
+        width="200"
+        label="处理方式"
+        align="left"
+        prop="handlingMethod"
+      />
+      <el-table-column
+        width="200"
+        label="更换备件"
+        align="left"
+        prop="replaceSpare"
+      />
+      <el-table-column
+        width="100"
+        label="维修人"
+        align="left"
+        prop="repairPerson"
+      />
+      <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
+        width="120"
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['device:operation:edit']"
+            >修改</el-button
+          >
+          <el-button
             v-if="false"
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['device:operation:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['device:operation: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-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 v-if="false" label="车间" prop="workshop">
-					<el-input v-model="form.workshop" placeholder="请输入车间" />
-				</el-form-item>
-				<el-form-item v-if="false" label="组线" prop="groupLine">
-					<el-input v-model="form.groupLine" placeholder="请输入组线" />
-				</el-form-item>
-				<el-form-item label="设备" prop="equipmentName">
-					<el-input v-model="form.equipmentName" placeholder="请输入设备" :disabled="true"/>
-				</el-form-item>
-				<el-form-item v-if="false" label="设备编码" prop="equipmentCode">
-					<el-input v-model="form.equipmentCode" placeholder="请输入设备编码" />
-				</el-form-item>
-				<el-form-item label="故障时间" prop="faultTime">
-					<el-input v-model="form.faultTime" placeholder="请输入故障时间" />
-				</el-form-item>
-				<el-form-item label="实际运行时间" prop="actualOperationTime">
-					<el-input v-model="form.actualOperationTime" placeholder="请输入实际运行时间;运行时间-故障时间" />
-				</el-form-item>
-				<el-form-item label="运行时间" prop="operationTime">
-					<el-input v-model="form.operationTime" placeholder="请输入运行时间" />
-				</el-form-item>
-				<el-form-item v-if="false" label="故障率" prop="failureRate">
-					<el-input v-model="form.failureRate" placeholder="请输入故障率" :disabled="true"/>
-				</el-form-item>
-				<el-form-item label="故障描述" prop="failureDescription">
-					<el-input v-model="form.failureDescription" placeholder="请输入故障描述" :disabled="true"/>
-				</el-form-item>
-				<el-form-item label="原因分析" prop="reasonAnalyze">
-					<el-input v-model="form.reasonAnalyze" placeholder="请输入原因分析" :disabled="true"/>
-				</el-form-item>
-				<el-form-item label="处理方式" prop="handlingMethod">
-					<el-input v-model="form.handlingMethod" placeholder="请输入处理方式" :disabled="true"/>
-				</el-form-item>
-				<el-form-item label="维修人" prop="repairPerson">
-					<el-input v-model="form.repairPerson" placeholder="请输入维修人" :disabled="true"/>
-				</el-form-item>
-				<el-form-item label="设备状态描述" prop="equStatusDes">
-					<el-input v-model="form.equStatusDes" placeholder="请输入设备状态描述" :disabled="true"/>
-				</el-form-item>
-				<el-form-item label="更换备件" prop="replaceSpare">
-					<el-input v-model="form.replaceSpare" placeholder="请输入更换备件" :disabled="true"/>
-				</el-form-item>
-				<el-form-item v-if="false" label="工厂" prop="factoryCode">
-					<el-input v-model="form.factoryCode" placeholder="请输入工厂" />
-				</el-form-item>
-				<el-form-item v-if="false" label="备用字段1" prop="attr1">
-					<el-input v-model="form.attr1" placeholder="请输入备用字段1" />
-				</el-form-item>
-				<el-form-item v-if="false" label="备用字段2" prop="attr2">
-					<el-input v-model="form.attr2" placeholder="请输入备用字段2" />
-				</el-form-item>
-				<el-form-item v-if="false" label="备用字段3" prop="attr3">
-					<el-input v-model="form.attr3" placeholder="请输入备用字段3" />
-				</el-form-item>
-				<el-form-item v-if="false" label="删除标识" prop="delFlag">
-					<el-input v-model="form.delFlag" placeholder="请输入删除标识" />
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
-	</div>
+    <!-- 添加或修改设备运行记录对话框 -->
+    <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 v-if="false" label="车间" prop="workshop">
+          <el-input v-model="form.workshop" placeholder="请输入车间" />
+        </el-form-item>
+        <el-form-item v-if="false" label="组线" prop="groupLine">
+          <el-input v-model="form.groupLine" placeholder="请输入组线" />
+        </el-form-item>
+        <el-form-item label="设备" prop="equipmentName">
+          <el-input
+            v-model="form.equipmentName"
+            placeholder="请输入设备"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item v-if="false" label="设备编码" prop="equipmentCode">
+          <el-input v-model="form.equipmentCode" placeholder="请输入设备编码" />
+        </el-form-item>
+        <el-form-item label="故障时间" prop="faultTime">
+          <el-input v-model="form.faultTime" placeholder="请输入故障时间" />
+        </el-form-item>
+        <el-form-item label="实际运行时间" prop="actualOperationTime">
+          <el-input
+            v-model="form.actualOperationTime"
+            placeholder="请输入实际运行时间;运行时间-故障时间"
+          />
+        </el-form-item>
+        <el-form-item label="运行时间" prop="operationTime">
+          <el-input v-model="form.operationTime" placeholder="请输入运行时间" />
+        </el-form-item>
+        <el-form-item v-if="false" label="故障率" prop="failureRate">
+          <el-input
+            v-model="form.failureRate"
+            placeholder="请输入故障率"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="故障描述" prop="failureDescription">
+          <el-input
+            v-model="form.failureDescription"
+            placeholder="请输入故障描述"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="原因分析" prop="reasonAnalyze">
+          <el-input
+            v-model="form.reasonAnalyze"
+            placeholder="请输入原因分析"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="处理方式" prop="handlingMethod">
+          <el-input
+            v-model="form.handlingMethod"
+            placeholder="请输入处理方式"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="维修人" prop="repairPerson">
+          <el-input
+            v-model="form.repairPerson"
+            placeholder="请输入维修人"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="设备状态描述" prop="equStatusDes">
+          <el-input
+            v-model="form.equStatusDes"
+            placeholder="请输入设备状态描述"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item label="更换备件" prop="replaceSpare">
+          <el-input
+            v-model="form.replaceSpare"
+            placeholder="请输入更换备件"
+            :disabled="true"
+          />
+        </el-form-item>
+        <el-form-item v-if="false" label="工厂" prop="factoryCode">
+          <el-input v-model="form.factoryCode" placeholder="请输入工厂" />
+        </el-form-item>
+        <el-form-item v-if="false" label="备用字段1" prop="attr1">
+          <el-input v-model="form.attr1" placeholder="请输入备用字段1" />
+        </el-form-item>
+        <el-form-item v-if="false" label="备用字段2" prop="attr2">
+          <el-input v-model="form.attr2" placeholder="请输入备用字段2" />
+        </el-form-item>
+        <el-form-item v-if="false" label="备用字段3" prop="attr3">
+          <el-input v-model="form.attr3" placeholder="请输入备用字段3" />
+        </el-form-item>
+        <el-form-item v-if="false" label="删除标识" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { listOperation, getOperation, delOperation, addOperation, updateOperation } from "@/api/device/operation";
-import {parseTime} from "../../../utils/ruoyi";
+import {
+  listOperation,
+  getOperation,
+  delOperation,
+  addOperation,
+  updateOperation,
+} from "@/api/device/operation";
+import { parseTime } from "../../../utils/ruoyi";
 
 export default {
-	name: "Operation",
-	data() {
-		return {
+  name: "Operation",
+  data() {
+    return {
       // 日期范围选择快捷
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 设备运行记录表格数据
-			operationList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				workshop: null,
-				groupLine: null,
-				equipmentName: null,
-				equipmentCode: null,
-				faultTime: null,
-				actualOperationTime: null,
-				operationTime: null,
-				failureRate: null,
-				failureDescription: null,
-				reasonAnalyze: null,
-				handlingMethod: null,
-				repairPerson: null,
-				equStatusDes: null,
-				replaceSpare: null,
-				factoryCode: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备运行记录表格数据
+      operationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        workshop: null,
+        groupLine: null,
+        equipmentName: null,
+        equipmentCode: null,
+        faultTime: null,
+        actualOperationTime: null,
+        operationTime: null,
+        failureRate: null,
+        failureDescription: null,
+        reasonAnalyze: null,
+        handlingMethod: null,
+        repairPerson: null,
+        equStatusDes: null,
+        replaceSpare: null,
+        factoryCode: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
         createTimeArray: [],
-			},
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {
-				delFlag: [
-					{ required: true, message: "删除标识不能为空", trigger: "blur" }
-				],
-			}
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
     parseTime,
-		/** 查询设备运行记录列表 */
-		getList() {
-			this.loading = true;
-			listOperation(this.queryParams).then(response => {
-				this.operationList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				id: null,
-				workshop: null,
-				groupLine: null,
-				equipmentName: null,
-				equipmentCode: null,
-				faultTime: null,
-				actualOperationTime: null,
-				operationTime: null,
-				failureRate: null,
-				failureDescription: null,
-				reasonAnalyze: null,
-				handlingMethod: null,
-				repairPerson: null,
-				equStatusDes: null,
-				replaceSpare: null,
-				factoryCode: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				delFlag: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
+    /** 查询设备运行记录列表 */
+    getList() {
+      this.loading = true;
+      listOperation(this.queryParams).then((response) => {
+        this.operationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        workshop: null,
+        groupLine: null,
+        equipmentName: null,
+        equipmentCode: null,
+        faultTime: null,
+        actualOperationTime: null,
+        operationTime: null,
+        failureRate: null,
+        failureDescription: null,
+        reasonAnalyze: null,
+        handlingMethod: null,
+        repairPerson: null,
+        equStatusDes: null,
+        replaceSpare: null,
+        factoryCode: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
       // 重置日期范围
       this.queryParams.createTimeArray = [];
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.id)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加设备运行记录";
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const id = row.id || this.ids
-			getOperation(id).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改设备运行记录";
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.id != null) {
-						updateOperation(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addOperation(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const ids = row.id || this.ids;
-			this.$modal.confirm('是否确认删除设备运行记录编号为"' + ids + '"的数据项？').then(function() {
-				return delOperation(ids);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('device/operation/export', {
-				...this.queryParams
-			}, `operation_${new Date().getTime()}.xlsx`)
-		}
-	}
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加设备运行记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getOperation(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备运行记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOperation(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOperation(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除设备运行记录编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delOperation(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "device/operation/export",
+        {
+          ...this.queryParams,
+        },
+        `operation_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>

From e982acce9997dfe2f183becfd46e3d15de387ed1 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Tue, 7 May 2024 15:14:03 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E6=88=90=E5=9E=8B=E6=9C=BA=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/machineProduction/index.vue | 25 +++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/mes/machineProduction/index.vue b/src/views/mes/machineProduction/index.vue
index 779f76d..3748bb7 100644
--- a/src/views/mes/machineProduction/index.vue
+++ b/src/views/mes/machineProduction/index.vue
@@ -11,14 +11,24 @@
       <el-form-item label="生产时间" prop="productDateArray">
         <el-date-picker
           v-model="queryParams.productDateArray"
-          format="yyyy-MM-dd"
-          type="daterange"
+          format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
         >
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="班次" prop="shiftId">
+        <el-select v-model="queryParams.shiftId" default-first-option clearable>
+          <el-option
+            v-for="item in shiftList"
+            :key="item.shiftId"
+            :label="item.shiftDesc"
+            :value="item.shiftId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="产品编号" prop="productCode">
         <el-input
           v-model="queryParams.productCode"
@@ -111,7 +121,7 @@ export default {
       machineProList: [],
       //产品列表
       products: [],
-
+      shiftList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -125,6 +135,7 @@ export default {
         workorderName: null,
         parentOrder: null,
         orderId: null,
+        shiftId: null,
         orderCode: null,
         productId: null,
         productCode: null,
@@ -140,7 +151,9 @@ export default {
   created() {
     this.getDate();
     this.getList();
-
+    getProShifts().then(response => {
+			this.shiftList = response.data
+		})
   },
   methods: {
     /**获取默认查询时间段**/
@@ -163,10 +176,10 @@ export default {
       if (this.queryParams.productDateArray != null) {
         this.queryParams.productDateStart = moment(
           this.queryParams.productDateArray[0]
-        ).format("YYYY-MM-DD");
+        ).format("YYYY-MM-DD HH:mm:ss");
         this.queryParams.productDateEnd = moment(
           this.queryParams.productDateArray[1]
-        ).format("YYYY-MM-DD");
+        ).format("YYYY-MM-DD HH:mm:ss");
       }
 
       this.loading = true;

From a17259ba39677f5fffb3c0246ec5304ede811fae Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Wed, 8 May 2024 09:11:02 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=83=98=E6=88=BF?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9B=91=E6=8E=A7=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/bg1.jpg                | Bin 0 -> 69331 bytes
 src/assets/images/bg2.png                | Bin 0 -> 2689 bytes
 src/assets/images/bg3.png                | Bin 0 -> 899 bytes
 src/router/index.js                      |  12 +
 src/views/kanban/Dryingprocess/index.vue | 739 ++++++++++++++++++++
 src/views/kanban/exceptionnew/index.vue  | 824 +++++++++++++++++++++++
 6 files changed, 1575 insertions(+)
 create mode 100644 src/assets/images/bg1.jpg
 create mode 100644 src/assets/images/bg2.png
 create mode 100644 src/assets/images/bg3.png
 create mode 100644 src/views/kanban/Dryingprocess/index.vue
 create mode 100644 src/views/kanban/exceptionnew/index.vue

diff --git a/src/assets/images/bg1.jpg b/src/assets/images/bg1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..92106f019e2a6dbbb9c19cd30d3886e3ad6afd86
GIT binary patch
literal 69331
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%0AG3}fi+rE7QGwE
zH_-0~5S=f{!_8xHXVKUe=5B?+0FM>UfdRgzL?0r_Ie<t20LU)HZ(%ExiA)SbU<{VL
zA^P84f9gPz*AE-2i1L4gSo*vDxamsg>=j_=?DhlIN<7ia%Z?Zvfb}=Cv$R;)<YQO>
z|3J*>?n~OE@8#jPpea^z<;@nrKmqgwqN{TtvgydUn@9>+hJ51!_(yVP7dJy+FJICU
z<+79c8<;L4U>$Gp^?`NG7~ty%wyXV#OLz5{yukL~U!W{5$adjh;LM<j-G3%W`jr%1
z5X1t$RJtQboZR2okvNLHPe%hELLvsuu7>1-=^+|%;K5xb4}8H69O@MWm0SmKMu-m_
z*-?)4C`WpfBR$HI9(g<w0b>LNZ315~rhtPqNFO3VzK{z<goGh$$Q{H3z}Fv%`2h;9
z-%tpH30?twm0_0TGRP|fdT><%oVTN(xgK|Z_kaLDO?i1Ae>rFPii8~A*IPc=*-u_k
zPC*{h(hc@=#_uEs2)hu$tf-Ct_~$jWum?dKy-CGV!P3u==<Z>*heWj9v%wC(XD42R
zfY#L!)(X}P_V)881~>}`dwco#YX)nh5$2j84uj><!U##gPHi-Di9vX?rM0l3FNr9u
zA*U#dS5QzCRs%6*RgAiZhKw+{ouMSJpem11k;N!zDky5Is0hzHG$@WlaMi>anamdk
zQrhVGS_K6K$ptCN`I6k^6*V+8<P|XT7>q2Sko6Do32+XU_3;;7;9x}b$CEseqd;Mp
zBRJ*?4A4dcQOR}i_FH7Ttg;pe3HU`iKQK2Vg%j}dL@%N@(I>zkC{_`!{{mA>%SG~K
z*?M~~Qu_xO?*<b6U5oj{Q>HwQ=<gdy!V`^mgAzp-3iA)Z5x=Wu*}{Iz4#*cX`z_p@
zS-$*5G-5Y!iGG@fB%(7oF|-4xg$vF6{owk?`!`E65Wxu}Q5y|k$dOf0mQ~cSQ&iJb
z(9pyvtyNIhR8Sz3S^_H~fTPGCi7_g63%7TEAoeAAxQ6_elz`WC^(A>b0~LFCJG&9(
zJ^hGoNO6{ynphwI0B0XO5o@H429=ZZ@E~X^DFGn~s%o;X7#9Uubwy=oS#?(xMUW&Y
ztGKu-DycZDE#x=y#RtOe59cTM1%fXg@K{uwCSDoiN>o;JkyTX2E6A!40XG*F0zsCj
z<l^Guj8Ro1g5Cuy7Dz*0kUD!U<qAth030zcYR+md%1W}TL^Xn}1|INnRwF3Lx;QJS
zC@W!HRn-+V(8Ax#MHW<+z679jCAcq;OEB~B2W=NJ-@9yyyXIqF9>RzjYC7ZLLvw93
z9&TkKkc<rWSVm9(Od@jrAaK<Cx2;bm^Y?WP2y!M7_1%C@e`{UxzY^ZxdH3IouA+fa
zcOkgoWic*9S6NjxWuh!dy2v^!5b-JmWetooUTLA~%ZZKwV-;q>7XKrn&#M*h?(E}6
z1mmte`afP7Jg^K`f|8P~0#Su1t4>tbkafo66=fCi8m@{8t_m0hm0wh5nU3|}Tp7Ht
z5B$#Xy><MYN#N>80FmUcjdmsZdJ8-I`GI#cXV?nmcl!|Lr>{l377p+gUeb+!sWk$T
z<gvsEmKL)pgYbW4fxor6e>SWv*IoWwn@Jv?6v+dD{Lf<qIc-E%r3u_R$Yi6r+-UGm
ztq{yUnqZ7v95w&l_(m?D{4)Qa7$;$~Su`n4`0d!jIRx0?{D5NM?Dl<V`A&z>z&D+=
z(L)E04#r*^ioZA*v47}T%HW|>Lpce9$H6M<Cvuqg-;gh{-=8urE$8*M!>{ub2alY4
z6O;V0F8gl_`I+{2B@85=`vpH3^Sj*e#Ql@t<QfCS@A8s$_&TO+AiiX<B!8eT`5)GB
z*&M$s?f-T?2jdd{Wj&YA@&Dg?Dk%QS78L)XE&L)s*--u=53(iwEvI>s-)WL;nZMvP
zkNh1Evgm^~r31Cazu@!($?y27D9K@jd!r8gg4ZJYcYNMtmJGxtk^9>(c>O@~JASgV
zzu*E8zsuWy?f78g{=v+PZ;t$G{QQCBcl?wv!rmS}zmR7h`8ysITPFWOh2~%8Jc=#D
z3nuWs^wYFQp09r})SpSnGvf~=zq3P%E&tUHDdY0@q5F6CLm8Lhb^X${^e^TG${J%)
zPm7C)<;Sl@^zUr%hXus)ynZ109Y2aKQ*3$hU3z{Q@;jSZG}h(qZxQ`FK0g@h^1OZ^
z`5ixsEmLfnV$0g-9~Q&Q_p2XBe%G%k>t)J%8T=mr@@p&keTy<KFP!l%)e6|)_+4L`
zUlK3hD=F(`%6fUpw%zY+i83xz#%0R5{C&+!*<b!^fB4}b<nLx3%DW%stmLof637Yi
z-|p^F&i&9oEQXiwV?U7mZeIW2wvRy`gMK+WFQR{^mtS(Ath*^^;s3+V4;PJo`SD^A
zP3aTJq(t6zpxh6c--IEby;0_gpF0m(FO+$L@*aTv=hCHnbD*>QZY=#_Q~YPs`oDC~
zWN{)`UY<qt@9IYB6O=wd=@Scw7?gS9S9k5m0}ACn;{UY!h>H^eWuEw9jZC@M`2X&`
zMoORfc`zW)dz3yw=@Wmur~eQ3Qz`Egl=lhB`vm2E;&=NFl=lhBzSB>C)J5J&`v-Fj
z*>?VRruyxk-n{)$&auItxBjlL{%}bB^U{%W?{ohD6Z~@Jv-rC4J3arB1Eo(;&ao-y
z*b9p)$~=MmKNQMdEM+hDr(3?1d4e)eQ058BJn_Td;8W%a$~-}tCw~0D6qG(e=@XPb
zLFp4D^1CGE4&d^;dX)DG%KOCs;`a&Uzwwg){jB`=vj})dK>oG>{s*-P$&&wSzW@UN
zDj$w6{*!*4h5w~b2`L(&Xn>*tiUueeplIO#Aq{;0nIEDL_>GAm@FPBR!;lE_(>xGC
z5B~iiYKV=Rih9W}3qsJ`Qz#0eqM`zD8Y(IpS{iB^S~^<b=osi>$H2^pIOciBvYbOv
zQ&ZE^(66AUU%|R!#R^u|mB6vGBBb*H3pur1ZUCFR0kJdCsMAMKqu3!Tb`&)`YVH>F
z4*a|k_-QR__?MLC9SVp~L(4$F@FSB8a8Nl=0XkYXhzdmLX+R!okQX?16cq;>H75-h
zEjJxKpRfoIuYw+fqP0GH$1CvTZ=kjebTrJgwDhzvHHwN|gqlY2-Vr)gHhoNInsPd=
zu#IyHN2<auB^AAq{q<-APA+a9`uqY>L%j9*9vA-|INJka0TQoBkvGJ7Ie;cn)F@gS
zdU|SFL^PCQ3Wi;uDxXb+gIdYYW<RH}^^Ote`g;m`yUwExxL)<(4v!Xy(#&;3EI?i=
zc53(s>Aq6Gon1TVC}hf78amzH>aZ`ZF&kpqMk_2`2)-zNGoQOB%V=d1yrQWhAX+9S
z&z6mP@r-(#nY@eAL3UbNJ&5OUS)^Q=S9b}hld&((I1j}HL1sKf*d6;3xgZ`6^=_aX
z9;%FX$y1sJ*;Pys6W2u%Jw0XaRkc-E>FRE_uEPn3*KU;JST9`MPnDO?$kv?Y&(`YV
zU_!j*qW)=@0BLlfQC^^K%P!Z^MnT`5eS>e-ecm<rZPr2a>e=D#x<Z3KLWUoFbxYPw
zzifV{lgp$=$jHmPU~6BlY<9Q$u!>7WHJ35OjdF)n>}k0!xG0la`_ypINvSosPFx2p
zC6%=YM2#({RlQS+()X&St$aX31?nYB!&Xj(lcEu0lr1t~fKcKQDC)IGQY*L~xH#OV
zt-A9r@qykE!gj3G)^q1@ROt^g&CTpjvh3b^WJhWO`boKpo|&Gl`N_%-F8v+od=B)G
z3Ws8L1~KPZ3#LIP(RE1Gb<#>Vv-snKzPl4TTH4$n-fBz?Z)%=uw`%#?p8Row`R424
zm%3xQti`L;c5E!)C=LHwCk>Y@N}t)F<3Z#BYjYIDY%k)zrYm2sES)WnDvw<cioit{
zS9Gu4&4%^P?#i<+l13TZSyM%znq9ffAO?sg-as}M$8;WL#t7MBhE!2&>I;Qww=`ca
zm)*~|of-UkA<m?HTe^K7x9YJq&Bxaa(w1dccId4zK1XfuMO7iZ)r>1eJPYg3sfKBN
zHjwjda8N13-#_8m^sG<eHLEza$HAlHlV|s92IqXnk86KfH$3gMe{AOJgR^SG&%-$f
z<-$$frFU>daG~_fs%5ucv_`ocp^ZjI7OcYY<YV;>I>e=*5^3AD2E3_*d3;-B%hF5r
zt)V=X9S=|DL3tO~>^D>p7Yz_eOReV>S3bO+Rvi3lnKycWVc_k<IAL~1DJr9FM2IVb
zr$vvJVY41pM?q<z?A8?~_v~fPRdiEb@GnDAQH`U}85eeJW27xPLS$z=Cf<s5^&z!+
z-EH$B-Evb?zjCvE=-sOEV9tHtGUd0vdAD8ZSY*eHeE9Jvj^Q^yef#6Sqt&C&U!An^
zlX}*xPNK|rK-OE&6Dn<}uD3;R4D^nSNUv6oKv_ey^idD;aYv-BQ9HLrFv^}=fAT!L
zr*X9&&c=-0({^jbR-9~#t97+(Mv=k#Smuq_IVvugSv<&y#^E|rMC>@kc#PQ4O?NM1
zy$|E^i8Q{r!%WdsQd|)tmc!e%9#ZeBmMNgJX8JR#0G&YCR>N^4(^{M@UUt7s0!}!C
znB^}=YP}3<q~xEW<e%x@(|Gp9i_`aCkcN8hPMxwC98%L3gC;YR3y;SHUbX7H@U^SD
zd{yObaf2JtMn&hPK-aJaKNu&XPn*9!g2|w`;z`;_$Twk>=M$c&3!d)LTf|E`A!#N(
z9986F+*W(pRF#6ma#>N8vXNb4cvaUX)V8jR%p0RKXttK~sGKaovE@b63z{7kW0Z+y
zqP2$dy-;gzQAMzoW$Kr0`Y=5QN!Z%trSLp-VY4eI&}>$YXv*M7&qOPFMH?TqXgQiO
zh^c8wsvv?P;E|v&7zXNaqizmc>TDekPJBLe^zPuTQP;sOZB^+X*l6ie>@E<tny=!p
zmZq|1_KtPu$~TTSxGn`z9f3MY4g+8qP}{QKdQEnhofNG(s6cG~#?ZKy$BK8|xNSAA
zo_zFZd(+0aQu9(?qjR_i`8$(bE%F)p?iNHx+t@?V_7`MTq&<&G!@sV}A%=B93%23A
zFAJkyIiAS6zj4r*W-Es^tr%2Jl$9bH-@9xKNsHk1%J$nD<04R=+$2vCcLuBn+8k$&
z1}$_<$zRT2=@{rjL#o8Yx5UIJ$8sE66nd(+-b=$8uZf2;A}eTVBad0g#;144?&pc9
zrizS!)?_q+mWeKl7Cvciw7xQ<I$N)dqf^A{u~X*D7s4up%xiVJ;xCKe`rlt^+^6qp
z@@{K(SJt_QQFbK-#$x(xon?=?_6u+Ge6C+)e@>q(l|k4(Lu8GJ`1$M)Rd+u(?8ASG
zd9BZ6s(1Bell)tmJhl{11}>_{Wd`wVtpyLOxoR`@&WUd>=Qz0@rMFd_TiR2KhKY?P
z!$7Q(8Pj^XMZ?vhC+D4po2u)Ong%dGuRC~0xznkKqeaZDt(om!oaA9*))Ub;V&aMx
z-+Yk?wLbm)`pAeiv5>S`HIMA(e0^F&duwYC>FVetJDxSBX_DQK`uA<iHGOkDdQD(s
zVRQ%^>7#Nq&o=ctR9&eBv=Oxyr)kVCcH5uyG~d|TP|<nDMw~+$CElNQt_@;!ANtJo
z^<})%w%!XU@w`G@wnz$JI-^|0gV>8}BBTsD4wmJuDqqiFjXSyKF>d{NW@|f0T6T?;
zo=g<hpO%<Ka8){nY4af-y_~6G@yxaLNv5RiH^DtqEzd_!LeVsNNA$rwM{N&L$)cZp
z5)vwU6Y@EJecr|js*dQqb9&aeyu6cZ42@`2BO|2f(u?2s9br1+5`VayP!{q@$n4#S
zcJbG#7u&c#ZXFG?Nj}??z3SQXcC>rOR`hKg*U5Y)9M=(CS2RkG<_JdxgMr@R%&S`A
zmRCayt$bG{wlrK*Ykx5+m)b8QvOc@Yokrnub`!L^^5h!hh?C|UZ!vGJOknn+TEp#`
zkzrFLcR0eRY`4tFOkw7LE2hSQ-$70^$*+zys&X4lshClfoANA=Sn4z$(Ewk`f&UQ=
z@Rb}ifFJy(zi+$tLvARKk(i!N%d;MLhe6uTAeL6efD2+u=Zd#H;Btosy2n&hd51^&
z0(zCPHB)4IX&#P?+6F4sXF65;uDx^Do58oi8dt!mSvdJcNdD6lx^rX2i{5Rn@0pd)
z(?CUK99@;AB6iW@I0Ftl``B%AxI4OD`*f?1eht?(y{U4W>XtNJhA{NNW+P2SnglK~
zo!gV^qU%-$52_0iWzRacspv7F^vbt#<*j01iO|<GlZh3lRuoSyR20v$c-Ddjv#e1D
zu{kN^@s;q*^$|FTi2>!AaXT`C)&^x}cV3Sfm+xiGaKvbR9z?VC;43fVG8yB%$_Q(7
zZYl9j8d`%p=62DRkGG~cA8oC>@Z@9W=hL&BAFL41Z;GIMrEh%>`KeyW;4tJGp{v^d
zIzZz?Yf0*0taJ$&KZWxWII83}to8O-V@se)zjOEk?fU99OrCc*^=u$6d#IYGns&c+
zyqJ3vJC9M6af&$kIh@!c-hX?nay+LNFrn(uL)lB^8$eJ&L@8AlQ(m-)9%PL&;G)4v
zNtJUk<w17V1$V%jOB&)vN9f@WqwH1ORF27}n3ZAmP&@J<T46}q`tl)(JYg}G2A=g&
zae5gQ2B{Sc7jLaEN;kMAu5XYLAq+9$@~o{PYo>^;+~6n2nT%xhq}lZ%jO_F|Y`{-$
z>dQnVxsJ8GJ6{_etw*l%R)~r#9xMuBmlus<()U2=L9}_`S4OEISrkfNm<vM5+KMY1
zy`TE@HF0h94nPN1i29Ip+ku-qE84Lr8<a2?lgxU92nK7gm}O&N;(}<QXoxBm7ikTx
ziKTiB*0p*lGw^%nQXG&G6(Fx3Ol!!7*-%j(2DFeK(9fa+y%BM64#d%lz&&)q2`@yJ
zgj^7#84dzV5fLO0vWSO@mJm>)6b(=`K+yn20~8HVG(gb+MFSKKP&7c%07U~74Nx>d
z(EvpQ6b(=`K+yn20~8HVG(gb+MFSKKP&7c%07U~74Nx>d(EvpQ6b(=`K+yn20~8HV
zG(gb+MFao)G=KtsQN@6wf>5+jxobg5M_xx>Qm$ML94`Mnf2}O_>ql+RiWdih@}8Hd
zd9LU_5V#Q8-J<4Iwct5a0l2#w5|Hjbl6hWv_bKeXoR5ty#@t0+TT)fO)3?BxTGY0#
z0GW`S{{`NCndg|h_hp`q-ECj+lG>%7jU~a!@7{MTIX0gS$qT$61o|oYkA-Y{LPD4$
zr8YeVr6Y2Xz4?-0n)$+#GNs5`z$D$5NlKGRN|t&KqQHv<d0WJuk&+svo>eBbNIfH2
zHiBgAW0D#2NrF=_97ZN3NLbzkY1qS%V;~!n7xs?F0J6Bp@CVKT3-uh+`~=n+xpcVo
zj%R~L&xv2b#MqqISzOv#lv9Q+5Q{&ZU0TbKZsBR#V|?=D$pTr4)Xq-fY6DqWwkR34
z^9F2DA`JWY@Usn?Y+$H9cdj~??HZApOJqmXR^ZU0TrxZin`JgKI97`=fc%vrJh2AT
z%=fvjSuoScudfF<>)1rz0+HBL-Ga>b1$)P}Tv9uAHE$S4^@ycKrDBzWQ^aviQC8n9
zH{K1XlTNp1cW{X^!br>VmWg&m$MYys0ReWL!%LVaz%I6&W~;II$%2{JTs#@Eu`cYo
z#R*0t%(Ri9q_a29A7zU|-(#i`VH066GA-S6LY`50KXXU?4*cysyk}mT3-ubXqi<ku
zV8^lIwqYlu?J*+Gx^Jb*I%{cgZ?a2j&Q(`mq7h*Lb(Z0gGA=SbnMi1Au!u{eLNl8)
zGYf;-J5@)2;bAb~do?j_=Cq%A+!|<S4x$m+CqHg5t@t`I{3Wh_N|eS}42RZ^N&Xhk
zdqyO8m_vklRNiQ+C>1M~T6^Yb@#ECm*pv93va-_0)|VK7I-9da$FqBQc(_N&8}P8+
zV^<g9NulDMrjiAYohu_FBi6V;7R}q2jGOkVsj1nQF2h?43K1{rl#yk3kJ`W~ly^mb
zqyoK*h*6g?!SvK~vk*cP{Tv(=Z=JXiC%~)k_bP6GeE_dMw|)rlkq<ANRzc#NcJQ;3
z@u<K`#?;zp_btzh2c~z%-7vbs%9rjWKDJ%FbGw*5@WlHcCK+1ST{SPdYTjRKUIacQ
z4Za4&MEs%`tT@XT*?EsAHg;V19`U9qZBhXnFcq|d!HvB(Ux2Vi`>^|gX&CU9It#{4
zo6{c3VbA1n&sK1+FQiKnBXoign@<<Dx{kf7(`WqH6^W17)!Gv8u(h2&)yGaRiRi<S
z)d&RVlYZ<p-5dQ{YY;gp@dgV=5Y(SIpRQvU0FOUAH?(8(u^L?2%IWvHQY~UZV`PO#
zClV5a3xs2NWa0$aMfYEygParbHzXf%IKWQ#PP>Z)qhkp!lu032i+`721ICTVB2AQU
zbo2Q{{OuG`LHUu&UeEE$-rnBVa*-0+RvnG+fGV^E*d2Ja+&Wqk8l%jbN^1UO_1fH+
zm?kR7N~f4irzL^SHEQD&OA|}A=n+e-xoV!!(n2=w6418AT27^jB%pE!N5nbN4h;0$
zHBv|RBr_k}PAw>dA3vW+ynT~@7vlV$u+!ADwO|wZ{SYRxC3wE3lK6vKjxxa_d)&Ct
zqBQd6a(s;k_!?>KfI&31k5^x$rP{C0%mbS3c48b~1EwbtU!Td#%gb(;nVHF}AN+U(
zp9-oZNr&;2L+2;r<s?iL6Kg=lFg<BvP0gtULNmr9F-roQN~jgfZ5YMNp$mF@0T;gh
znwt28goBu#DeLISX_??USjw=>%#<y#uzoW@0YLWKt;E(Wq0(0k7*Gn5uQ|0R5zd(q
zS5lLm5DWBxq+(MNvl9*~zG|esDF>W{iPq-EC_9h~lm&C<=H+F<*QbaA>x1RzWvPiz
z2}s$(4J2tQ+fh@4=f_}r-}5!6fHrHeAX_Pr9plDwV{d|#OkQQ=9p>-B{i0tzm8o~k
zrDYb;<=vYbfO$BA2W}*w)kM6|0ML(vgOfyliKD%e#S2GIUZ6}+ac-8Hn!3u9WuDmw
zhyw!yH-SRqks9I;Jf7g%^Gxuj0Lz2`3m9mCYHrFI-@es?G_Btc-3l;QOlAfOf^`EY
zGI>*MfCfUiS?MtS4i5HNimM)wAI{@8XP0?S+rUrx{8K7Xl$}cM+MDds#GT%atG(Hu
zNYX%;%8M#oU126KC&#}lfR`ma=@p{5mIS!7*VG~IN@ivnP99wew>Vi!pba4XEjx#%
zw)8u8iSa4AQw?HqsbZiR50Xa*&^|~L!Oa95rwuSyfQpk;$ZkFjtPXaF!ffCXDhwW^
zGJ#3Nmhz@-2?+tV0~Z7<CWIW7Lu{^hZ0w6XUklJn0^)%HSP(FwgoALS@HK3-8VUxn
zebH}-o#g%mH&-SLKxqle5X^uO^OD0I-q^Sgt`KMo2TV_<9xyw;JD$}K)3#dTH$PCZ
zG_>wgSz*xI`w0oh#$fC19Ro5Tjtqur7*E432_(eI@q;k~m@Bz{z*u1$0TLi)1Nzjw
zt0RYX-^2MB3<ps-1+pq0!Rj7K48FFlKADcJRiptjf!!}Syioo;SC}3~lY0w10JNOL
z!>zhYg#}S0(ByX)q5=ztGzsx0U&}#q)*f;_Kvh6CxCKDpy*&WFi*8_m90isQqKH2a
zf#Ek{8B&eod6-A?;aOFL!D-Y2&)4|nC@kAFV)Q9CA%Ej``OV9M2n0q?B-EO(8yPsS
zT-bsT$3le5UgF@k06CKH>1OS_!8-@Bz@`7d0wf#1yqu=~8Tb?795fT9i>$?|;kEda
ziTBSBDB&!zYr8+y_;_nfnt)E_iADMr98_didSc7P2Aj#z=5n~xd4ix~fvl38`n#ZW
zC-$^Nb@qJcUIizSo(%f3#Ay?_2!!F%;Izs2ry~2pD)@o(ll=#)J}>vIzHKsUQ)lPP
zJs;WGMSd0m^O5DomS4dZB>f)3G6Sj8jw40Ea)9El{QS8741pzE5a@@{ZYKiw<vs?)
z-*Of_bsOP?D@fSXZQS{A2{lan!{gaC|JZrjA<dTATq@@J;Fwx-SX!37|AqI}AC$ee
z*>C&9b+@HPSO4IH8|86e$pB_e{EVyORPm;1Q8_t5d3YiPv)M?nVlsV#(8+nznw9}w
z7B=3j`d2en^i#fFbI_~4RmJ|rM`I&vi!T=(Enaa6e`;spj;EeY72T?PcE_u3FSxqe
zQ3fyck!;}86^mBdI}$9y0gp^`(CTU5u{x)dy)!JpXcPEG@O-1W<};1o<UiTl4c=A0
zt+2_V^`4O}pOWumkM7q!Pxsn&-91Yz^elAge)qUMyrw~Mwvewu_eO(aiYQpqjD+t`
zbgH~&IU6+#x&|}{^{zd$Gg~TN_)L{t0-iA^IEFQ;?8G0pBrdByk3W9qkkG{kRgX%s
z-=A{q@=xg!I61zMXL<Ucp&*YL=zsez!s<PpDzkYG8r<CYg>MepgiHIICw0pFjeO)6
z`2)BW>p`sOYU&p_x#S}k307-Ae*{*tv^JNKUdIc!p5_nPJ<D`)&ziF<s+?Q8`}&@0
zjDE=ZGSL<m>ZYT8I4o57%Y^>u^nt#w^o<k#ecv=jXL7#GwuOZ+fse5!6NH4CbaW5H
z;MoOo0Pg==Fo^|WJGN5)Fo+%|2pn+Jpwn-{tTe33i4pGCpciS<SgGGc(zXDtKlR$_
zO!U`B)8V4c8WPxM%m!>K$s#S4kdrCae_2wzSwjxnOxj?XO7coeBjg+t>;Eb#*{q?1
zZ5}&hl}<`5OeYEyN)7OvO5f4gU~`9b$TppnQ<y#=P%bsF#dPf*4M&?hV}~|nkXoxU
z268UR3|w}TYth)frDd$mDZ__rbu?X{{$*>QfYryr+IzLEgrkE^qAlyF3|n;Mc>cal
z9tNZ9x6qxPo%fg@M#*=yc1yLW)m4SHsI`(kdDWboGxf9aY}Yv0V)rvRoptoqaGlKX
z4O#GrL-(_EE3Yx}o@8(;IA<^;bsL#Pm^;Blg3Kncw=ceaN0bP7=L4l7@1$F|B3MzM
z9%b*qFkh)JFKkBZ3j4B58^#i6Qm=AvY`$Py-4SJ>$Y3C$Ewx#GYyGU`yYM8yG3l)5
zDc3@`Cp&vDO#4fH8MGN~CFe_uiMm&5A3xpX6bHzzNEyHq<$;$(<}vxEbFdW5pDN(#
z4T(;Gm(U#sYzam{kh0h^)x`KO8(mG=?%X{UdPl9U5cUeP;tM=vWhH1tm`Bh+^o81N
zdt)$OP#TX91)72hD+<^7-nny16n%AVmWhK6c<*K~kYziEyr`4QyM|$leh1_M0`T@0
z9XRgorrF&Vcp>NAPK}2T{ZCg6ZQIgzvFbk#ZbO)?+j7or)A4kqhS$*Kk`v60zoMOb
zHxCj`2v!#T&7;p^Msw2oG)x;vNogKuqX%v6?D^20c>eti20SwO&!H!Vt_t?0y#)3V
z<sG`)v4!0voI5v(D8zq9M=3qbP3lngoyf$JmIQMnP)iA#t?*U?TU;bCAlQZ$bOdV4
z240g@v){H9hPSCr_w8#_dk=fh`u4V|wf2SGRcpNuyt@0LchxHH?`c)bxf#-`mUuI`
zRplLc%0)G+HWny(ied_J1z+V;<BQk3?)3@>4O_n>dP>TG4QWrLG+<Zop2o?7`KFbz
zj@n>nQE=9Iwd?H-4@_=XZ@T&JMdjTgnHMCo*C+D=)7*`L6Ygp`RUs{8FR?1PMQy3)
zcmM$6SHR?V2N&b+0MrYo7D)2|8qkmcO-PICu-qy9t2BrE7PjonG%~#T%;O!=k>K6>
zyY(P3AfyO$XY`b{>Faz3gK0CMt)D1F7&en3E&xN0qVMfUI*Tv#Jk|Haw6QWdc_3G)
zMMpOyEL^6a-%YqhgKkR`rcFPCBv5sDAm_kxz!;f+4L6Y%jg?!PNNtAmluLk^c_8uU
z>|Qy#@~%Keo{TiU9|gTe1&a<Epa5(|{fHtbW!SDTGtAI}M&n_gMJ*V}cT%_|(XPUN
z>H>m|=ijRftfZ$u|2`Cs|KObin<IbC{GH9;#=vF}+ZDwFw`Wb~pc_EQdgf6P=2a8x
zcOGvzK+1deT1|6B+X4T787Wa)!=$>^Jst4leV-3ndujdUaZ6Kx1SI!ZN68z3^}zgk
zHF*vynQ!-NU#fwvFc{216P!ZG(iH_SUEi)8{yYZ-)(Ff&#zBsfO;_Korr%TBcjfrH
z3*mY}{?2V<^0kdAdmm~g44?0J3QR_Ss|ewKj&C~iPS9v_^O$7qsTA!8T5-dr{Z@hN
z!wc4x+qI8d1?B-nV~X~}15GCoy5!eq-Zle@WOQhS6~Ke=G!0zhW`KFeKEwXpw&~DY
zLBmPwF`?R+ls~$(Vu$nlO#@lc>q<h{pBn<?38NspF;P(59}fVs6d<k8>&gHU&bbsB
zGh8av@%(|-!Qp(Njw@YSQGk<VAgc)A#Q0pPX~UZn20_+ioV78BkHg5Ue))iQk#)tU
z<GO(ivoU~J4G{lX60!mm>jPv0#H#`E^Dda<Qslk`f!z+z+}DZ$oZy__ipe?OoFM0P
zJACE7Ry2$R#e^0E8AO|O-U#YXnvJp6njYTUsdZpDrC%r@S@>H~2>o{?GeB<d)Y?BB
zr`w@@4-WfT1FVEY3qq)$b2bUSKA|^hG)7-5dH5GdGk_GEgUD0}t4L4|?_bLKTOs~}
zv>F!*h?_kCsv`+k=M?=y?O-K>+A#wSI|2=ZhMZSg^l-k_xO~817^r~|T$9M*{ctEX
z8!;TZOa*9>+BE}`j-vogfB26Mt%%|M{qzA0ALk(d_G{mAC0{;o*O?s-nfwS~AN`v@
z4*9oV{dQvSw`YAHUkv5$n^ZqB2L-8ro4kDL<?%M1Z^IswFa24s{&{ro<g;d-sbPnd
zmnR0AC$Eu`uY612`{7yPN1y)O&>*pIPcKWpINqf5X;^<Ub60y^=%Kwm&+x;;y}7$5
z*}h$>iFtnfmd?9jf!x3#mT#wOOrQTzuQNEzI4SQZc4GANc-jlOE2*LNkD?|+&-9-d
z4!o!R<XxO(?Q<`yK+T8P;g~I0?Y4J}l9#t{7n>9+7dz4O*)Hwb%97MQpGpZQYTjyy
zR@5e7{A)Ag$7fr#w>0#hDCtw-cW{dxX+4zuc2>M&+Um@dVN8%@v;b$)hbtPFcD>-d
zIS1vb>-boPaOZPch+$_lnu_8j%vzN1c*Gl_oBWL|EZN0u-7^H|pe!aMBX)}n9(H}t
z2Hh^=z=LCU%=bS=a>a)mGaQ&1zoqY7yjd?whAZA2c4pD>DOmR+Fm#B4afK`1tuqgv
z|G>8XHt|YJj5OP+M;^}L@!}#p$Wl$S$f)ehwtK{L=f)Gs$D56qa4Df8LPKCX6|LZy
z5ndT(#4>psBl<8pQuMy)xQv8xR9d7Y4OZ+`v72ktoi|=dh3>80RVxw*Ej^dFxjxFe
zIM^CGF6l5T_;PeZUx56Iw})08%6jW4+9_aOuIYPlvOG#U4rheHG`B>OUd7AKaH~tB
z1zM5u56gy@mX(o>YyxYl6i#;Cc;V{mcyl9gLScjfYX_c;jO%%hEi|DioBoUyG0UsY
zCICi{xj2d(k0k1|zuhdtAEGiC3+gSidE}@IThuKPo;FUF&7o;D*Q4Zj?!bY?CC=8~
z&Jw7i$l!)3mjye`w>`ZyV)}gY=4`Pyr2R~<a?+Ug#f^tYwU=^I@o>mU@=G$_bbf-V
z4HEV0{<Qo38};2cGb;zYzwLH?c}%SFO6Bf%XD4Q#kID^B4DIONEvv4nR34mcu*<RT
zb=&G^ZQShdb(_v@7QuSBr?5%iw#dk+=ZdE>66)dn0%m>qtiVU7H*H$?%?5T0o_elZ
zJZbBXMoP=bL_X$3D{QV{cQ1-NDj@jy>{fQWRwGPSnQLj8Vwo#CzAT5|J`iVXSLW)*
znAITRXHbt{k<Vb%+G=xbqa9c`T*0gteaSjCzJYnHa9XH98*G-m>gb4#em4j0WiT>P
zN(@clew#JkES8GBslLyOzNvThz97!_w1a-{Yu$StOqF5>o5ey6`JZm+_uh`WIB9tC
zsoKgWP3ALSGJR`K?V4hZ3G`htur1`y#ZO1Pht@o8v%i#c%2#6pILfLSSiS3xYG1l{
zqx925wwD9|c;gGw={lHtci$234wz)!E)Y-u(75L5p-q<r%6&98J|ms383+Xo0m+c`
z)3}~>0Xc;}8Ya(3$7?shY<ytu$Lkie&T~h=r!SL^*9>gih2*|vD}J)%BC}bM<I%{@
z8=a43(W&>07|o4t3EsM%7iE;H7aL{7%=(F8T!fiXLLrui!Ssuz@$HUKwkudB<9K%V
zNOXp!)TPx%x1!K~DV!_@N4aue$L`;8G{HFPzH%GmD|nht9#7P8?Izu=9{AIvMfHA$
z_bHjD!UM;=1gg9=d;t91z%l0*)tedKsif!U2L2=n{OP5!`!VUmxq+t+IUw#sj&EtX
zSe5DRCfD7z{X%`qM3rB6^JCQ-wG|c5R6#uU@$SN1-ARp}YO*EIE~f65Edsu(cCo~6
z%L1^Kk@sxkKtQ`Bp<T^kY&ZCL^}?Sp@VOr~Qg=K?GJcoVuxzd*b5Hu9?QQkrVTKB+
z*okqk=jOL2Ht@$72hk@@%t7vB+fK*MX1sF=Ke^{|@*BsCqEnkrTZ!-K7~53QF0R=z
zW_8+ZHtn5<R@ys!v(5z&*f#4_Yo)(aYTi%<QijbN;FRG45a80@8R!;G!8xtOkbqUJ
z7EZA)q`m{q0TAF81BTgDz)G%K3l3IRYaIrqA%S7j>;=&&-P2AfGwvZm58YCp<9$<R
z+~ONVGMc@>CpOu|IZc#@@m47Nhc}Mbg880sn6UHZGvLs88WUzZ3vfsw7B_Ch{*j3>
zN=Ca$^jR!gcn&Ji9x<CB)GN|lFWM~PtS-$pmHFBTJ1i3x{q|Fn<5{gJ5a^sqYmz&g
z8lE>*i=Ey7_O<8~eff?t`f@Co&o=2#&OsY<!vj4gKW=QE9NH+fFVK1N<wl{sAZWMG
z4GY{d*=R2m8fcfh=QDQllwEEJ2r}(*g9G&^!|kw>;kIcn+Dddjyu}Z<6{iiK0N;Hl
zbq3#JCF`!3?QQHL?Y#-U*SbufUNID#^equP@qYBHWbLy(*x^%xsiFCegcC!%E=yhx
z^T7_A@=Mm#xnPG`c~kd%OTcOe-WDrA{Us;ID#2T88^(=kqN023Tq-tGo*`XbfZa~7
z=eD&I(`$(x@p)OXDY>s2%tj4#Tk*VK&^Gkvn)o@?(fO4Uv`lLkHeBQ)v){zUP3(FT
z7uj>Y*OdM|XUt6aiClNxchjrYgEovh${!iom!G;v=upF^8=4U(V&8K1{9&|9ZpEdM
zJ*5Q|H>X#vEhY`re>e~+?sAVCls}UrUE-A$xi@Y?!j&-#ZKB>FN~hS=k^oMN5{2V*
z>rdR5O#?GuvhyKfKdXzJwsPYmFIHR{jlas-MSo*Y#1~WRT*kN5J=%J^Rvz!o5tS(`
z9~!IRYfzUHl!;r-*U?cdA;_}tpkj)mC|@5#N{_k?r`;U%H1ajy2%(w8uawxPB$lRb
z(SzB*8P%rfpkGeoYLwY&Lcj*Bq^I8h3cPWc7c-RYxLPok@D_bJa_p-L(@xj?5>I{p
z!%j4tXgjvkcBl*W<M{)M!NwL?vTqk9-o8(>Ne;Y=!XFjk#GBSNr0rsM;4q^l?hN6>
z%RM#MyeAlDE8cFAoT@5~g(F(!Z*gbewiWHwe(11zYW2a-nP$5LqkDr`?sh9Fm4g!l
z__U^$Q(_}a)@pw01Jl}Z=@vI9a=1*^KKOvXLCc=NACSp{*KW#6NzC=)_Zz4xm{N-i
ze984z?%b<u?O|*0oH?mg_SW{!)glm>4s62xar2`o&#=z*k>p)zV&BXK(hi_a-~%gg
zuz>8YYw<P4d^-R(B>72TPn0FTm=4s=_*PQ`I73W<&k9o#@e+PnH{4bg?1&@ePV$An
zVAJOmzb|I5U}>uu1~y(d(QM*yGOwklj$Oq!vMYYv=$2kTP{Sq#ur(_-h~)=6>l(%R
zrGU!VM*Q~3cIy4TGwW&T&lS@u9+2ec=QewSNyxcxSI^BZ)~e5a%ko8=n4eL7sK9E$
zr^j!8s&y*~RvVY3>U&=G){*v7*xHi3FQzuwkrM?voL%PbO>K{>TrRLXV8hlFOJ`;0
z*h{y>$CvRniZur$3H4WkW1a~I$GD2R?4~p32?@>MjH#|J{>d(mMr!fv0~VEUBy3ca
zT$}GcRochfC3&MZ>dPh@tTuO-wVzLSpsv8vJqJqE<v%^5db;~VVcZ9nU?6<`EI4kx
z6PG1Hs5KRTeU-5y=Y|rRIiV;%_Gsj5bdj;){`y@U@D?q677c6$^BSDuMuM|na8}Eb
z1;6PL!O0;ws=^TPU=vuZDWSakb+Ocx<i(hK+SNMoA4<oqyv2~@c5-r)w^hNPo_o2U
z8ooZ$Eo3~=F|`)Z?yc5I_>e!o$(yy{oBI;vq1(GV4&9#UI@GYco3(JA=U)D&wy)c|
z(;l~V=bG&9no_%1v|H`sxxIfp-LfvGzQ)ZmaAiJ!Mb`lwLu=$0bS+_5l=Qf~?J9I>
z<X083#O6Jf7qE9#c66!icyM6j3Nv(xzy_A!P?uypChkt@A-eEx?U6}=Lud!~k6KFc
z-VVH;Ex^q8NZpw|`cCF~@}1dYtut?3bjznQBr9sSMFmYpeps#Q)0l(lRdQh{TO)v-
z&FvXBN>dc?P=v>rS*z(Z53WwB^<vgi-11Mt`zOGNAbI}%Gr`6$QYnX+ubh!HZo14X
zI2NGh6a2{OgNpZY{^`$^4`w!XxgEJ;X7xD;$2qgTt2pSho9!l3_TEra-fq`x9<8=v
zYjbM$r-*kHRNFe$ZQ^9Nm7C0NE@MbZ;$_FFh;^wjzq-1@VC=O3eA<bH57@%sBPo`e
zy7+`Vf*m+jOzvn)?fH|JzxU;qaS!e4*S(=T@7<bsTG;%d(TwxynH0%O$HlCC_iSMN
zFbA#I*G6^T8W%FJ*JixWX5TTRL^Ez>S+C81|K#>R?sr(3`B9xodu46kS+|m@79V*e
z;3a+Jnd3cd_Se<zxc%h#X&rcD^fxi|3^=THjy$vaeElZYCk#(8n0HSrD@$8qPlgZN
zGK#0Aue9DqRRn)8rgod}sALufpX%z1!WU`TLYY7Z%Zn|tOL>nG!%H&q4KkEj8hlMv
z61$Qeeap@W9LWZ-?25T4G^lb<BTxoy6PDsoUy1>zUf`&!$Q8?7&wVQ~I}aXc>aoLy
zsS@TzlLBcN!e>d2Cttify+Zi;Kkd5rN8qh*A-AR`Pu4gE2XDGn^JY{|-O6nAey>Bo
zp|rkprr6OZ$#J_nHLVWmk2<PxjykGem2T)7KealXvkw<$l_bQ`XEdI>Dsqo`QZ7fI
z>8&qMMs-xftPTlr^&Jk|l$6WUmkI~meT0BZ0tb4Zd40JgVAJ``hw;rm4awUzPySfj
z@aoH{)jE>k<twevFU&mYTHI)*rd3k&sE%@&ZITc-%;(S_)KARXTizX-CXReKwr<@z
zk27WOQs02v7Wkub0>v5vDLNzlaYxZ&85-j8+u$n~{IiJ!>>OkXZdPmwYYwXqOUrH<
z1j7gHT98X0$V~_Ma5vJG75{hwTr1K}#y_P~7uW&%H@^P*2%#@+&6R>vmbyc|xrX@t
ziFiTQhhRU-Iy$DNee&L{OQYx{K2;1acl2nw1Gq(U5M(1*2;MTnGWq2?ziLT1+6b=i
zfH4-_Cvj5bZRO2uWzXK=qJnKDJW^u0)4jIoP|`ae@s6jysoHv`<H^>7W}{=eMe5Th
zOm}^18rCu$_Z3QOx~dhz+n9|0GTQGXsFl#ym=YE|CZ8;5Jlgj!P(#b)`nt$4Y&nLS
zjhD4{o-WI7DK_!^_I6cbPLqmo{NqMG#p|yo_!?qFZ<zO@%RmK9TvS$=!6&?jz@&p*
zO9FcBQemioZ!6T))S3fb!&huzox|Zl2i=_@n0E&iGg;{rvv6f?rT5uF<E_H9+x=g%
z`ahc#0QVvI8sBaHc47z|nk9x8UD;q_ln<`MfMY$(;C69v-60_>02_2+;HHtC;`Ihy
zSH(m0Yz~$LJ6k1(+csk6{2%FxQk29sG#(fcz3DPSTs`22%N6T`MBs#vv+MkG>Zr#c
zk1LOBhU==3lUdPO2TwSkIwo;2L_?#)-o%@|#B)`uqvLk**6ft9G`n_i%3o`Vl~)m~
z=}H3!(DG?G^Zxk$tAxvmcrkG72w&D%{KOY6+zzM#myP<bn!{Qky977@dRgiY0?Xr@
z;aZ<_CugfPTa+~KY4C~-cABHV9)@>9d3*3eul60(0JaF<7eH<|puvTlg))e@w`5x0
zvNJYwt$!$B7()pA6fdOJ8}<1tN7mO<96BDilCyV-4(6EsDiMZY+-@ajjdH?dxg0tm
z0p|%bg7diDihZ|1++rGGd+_;#Z{h4s<g&Amg3As)U|9oCj_~0tQY)l70Py|75R3*l
zA(nCAwgy~za8-bbxPj={G{1+6Yyd~Ufm6)08^rfjAsl}4ZYPFE&p|igliR7y^K1}a
zz?*|)TEGS@8~N@46&0N>^g!HbjnSHQHK)V(GsW5&6mYYZL>sLUvH1rHlQr`hZrj8c
za+|D4wC5{Rv~wx>N6D1<B9~IWGLtp)5k<R1dr@w)+c-F~1WqRSXFUIv0RM=1Uc$l!
z!R93-*YVn4YdtUjVnx131eFtmI~DrOZYGJYR8CZ%j{>Orz2sFUS{|Uvz#A=cZb%`g
zM~m<cDKV=|1U&e5!O$P0fOZ#5u!Qy}g_7HY+>nKrWf_b_jZ#X>K0L5`sJXXz_?t+<
zq366l#pP9Yo>wYg{~6$9ZvV7wqOm~v{k?rR;b^q(wJ*WhyWOvx@*NMFdH3h+F%EET
zbeWH2(1UK>r(Z5ktvY*AL7#?g>Bsba?vuMZLgC4TIp~^C`HV*{`PK?-d0!nveG?jw
z&01ZWgYaQ>S2s9?M`xcZ3wK(kjAaY{mq2r|40G|+W<uo_nST-?SM|h`b;q!QAMPoR
z3<-fd4?^w9?*~3kuM=8nZr7eU81&Uw(D7q^_F1oPsb}|g2ip|9A0d6w_1A6uH1sVb
zym_~dz{Ap9(Y8IK!DG|87oAx7o@dLovvL}bYsp_O**6%Ltovtb%p4^C_=|t?z?Z`5
za2?%CnOF9{dny!@d>fE5<(?Yu&;OR3HaO|;^mX6bs`{2!lNPWXN0MbPqwNd+KY7kx
z!kp%)I6^2F-?FB8<N8Yb)L$gTIpP-31vXMg2*68U4>wcpsh+;keSOAH3UVKx@eV54
zTN@HD`oh<B;=k@QIWZKfR`s9%`1^<FKYx1mNs@+g;*qSin2m&r<}EX_x@W^nPflAb
zLQe7Ij!bO0O!B?#j#yRIV94I-pgAbK`Gk({#MH;emYy%?zn*Xl;ub2Heu7wBJ1@`Y
zomRwJo$>apfyt53eO6;G{g=hh)-`WQtrB-#f7foWQ#rZ3)bnFunL#yQbH3F`&F~K1
z<s~_}UeQS$pHjO2y4|W!`@bxDyFL5fl|U!n&rkcBJ+ov+zMQxgeh+k#s)3Lz(+;{p
zz1NgIubzIC_Hok3a}GKc^Wvoe(tQ$=1^X{feHiP#;Hu4^Y=Xacbo_^iq2NJnmOXsq
zim&k<hoS;R^XJEfy}6G*PJRp;*V4Mm`m8-|u&-)zpYF}C{PTK7^w7Gf<o|ebBt-k;
z%PAqHIVk__%*(T{-LK>ahlB~f{wF<uDNSzYpEJXIi|<UlET5UQpFQ7AKDtDK@oU}a
z)UMFW?@y_v9yD&fY$52(FLpy#9V<HfcJGd+j~9AGCHaLElPeUj^i<>DQN`?*_th8(
zYCm$r3+t{l>RjN>D2qX>Wev5Zy;tN|zx(S8b(<ckd+f}E?9EskoQb1I(#I8rLYwiS
zH{BZ_^1T@8R{VTWtxh#@uk$Yu-UwnflA{61VRHe=;k~21ZSr7e5-iI5IcOZela70`
zPBq<o$G4Bc-h5N_lQ8!S2R_1*?xdQ7?t+q6Z&v$+NKWq*deg&%EJ68-wQ!E^o2wmH
zo2Z`KI|1bJ-tn^S(ZPF36@TnK3ul7`2E}*7EDx&I@gxGd$cUXVf@S){5)KWIB0)~Y
z3vj_K-ajB<mj5|K{bcvZ)@6lQln#gwq@#t!Mx^@*fz)SbJzSrM2rHF3o+yyRmz<;C
z9q0v=!H!fEMx3S1hgl&Aat@#YG6F7R8^Vg5W04h{10Vn^kOQz<9s%kB5Q&}*i|E2t
z=V3v}{yg&vgj0pk?9O0WzV7<m<MN24<Z>6Q09Tq^g@1%lCO0CILv!i{GidpSOGvw&
zeg(H1Qr68?j!O_H|BA@`YmUFLqJR011cDXu@2c=$m4m$;F@%5OliLds^QRWxulj=$
zzw2shUWv2fpX<adG&K@EH-D^9B;!5c23=4xS(o#O_74ETkLc2E$Q(AL71M9pKQI7l
z|8EAMt#W4Ju5?PbT68D<OPz4on%i^X-l;S+0c<nz>kJT3?NcsHz~Tn8tA7Lt*e@K=
z)%b*P2%GIl+T0K}1^m5ZLl5Chmp{X`lH1z|xHabP8oh8(k&Fm|5lWwuwW~!pD#k41
z_w~VW*bgWBT7A6_6~q7H2Wj;cJQNDOJS4<(J|X1gA3ymT2t?x%3`hL<uW%grs~7#t
z?QlE<_~*XeZwr2WA<?Eyo$NPVh<UNkx521F=ac_FjJR`5NXR9Aj&t9d@7B~DNi@A1
zTyrGmg`CIjTNOGZpEj%!cb+_uHEOe#b?8}3+;->b$)lrdD|C;4S}7hF^C@dq1o&~o
zu<!A__8m>sC+q{MyHQSFRUVTEj3yPbl3MX6o9u}E2G}9BPN7!Ui8~d#M=gb>AFy8i
z#NQm<uqAvYM*;tIvG9wP#%%Wl*=NK~BpSJ`Ptf3VdYk*E6=M-_Eqko%jiF;;QG%-f
zyHjE-gPQScXx`U0`}K;wFxiq^k*wjyd}Y#QmH645M9jD8R0mr|`7?(u4r(=yTPfHv
zG%FkFXWJd&WJydqXtF)TtZC}$lcQ?qf~I?(Z1(YUFAA*V+0d4Ez4d0rI`y3~JHk)7
zZi*+VtBH~%xYSBbjEo*?&Fsi}y?sQjKis%C#Y%q;qCF)_!u^qwHD$T7<>`oI@(9;#
z>j^%Br%i{Ee*F`(ma0KIyDAN9!BMNt&XfIk!=!@4_jRTdXQxk`Nz)eBa58fa$Db?J
zL|L^JWwsV%jyMZ-$xkL%uW`{#vf=So(u%&T5vSsG=U_nA=cDSQcgu7iZ#UAhJ`~d2
z)k(tZZ;aaPw%*R^S;+p`@_pHow_AGobHVB0UJdtao2SJ;Z?g)aJG?(wg9U#;17*3s
zN~-Fl@o~wV$T`U7jDT4E&{(tlZ4Hu#O^Qce)g{HDychL77>vzomc*k3qS@Y+{7pAo
zXSQsA%`$a0+-!>a#1^O5TVC^p%!uovd`x2K4_)tg)%UtidCwK<z5MAIkD?@#wt}LW
zwPRO$vR0?*=D9m}2;KJ^6>dH9Q2z?u!K{NZ10EfG&iT1?JFC{|>d&Yi4Aa)?%N9GL
zS_#%v5h2%F&nACh%Ff;tkG@+RNSNM~#XHjSB=3#Qfn>fJ<D&`Xl8qIsS1})L4qvrF
zZDjD|k$fIO5+=VQ??$+-?uO(KKGXNU6ka!fu$FB+wgt28`P*i?kukpF*pa*O`mc@j
zJEJp5x}!`pb~9=*Jx9&Io|4;;qn@}Y)%fMC%Lf*<Y3{E=9fhK-qF1Rt8a_|Y*4?3V
z{$10n>-U2LQT@&z#y<*=t&o@ke^Rjbj1aa#(8w5^!K22_692T!RoG`$V5z%}z7s8P
zb7@fKbc`j}`I~Rp*{7a<Vl6UqEc7uY?$zM$4B=GLEx@X3fFHd(mtmpi+Vs)rK5L<9
z>A2i@TT{Dv_vnL>pfHxpAJxt6d@~~gO6H&!I_=5UcF(%AF9fl>qTe@vIfV(RRkl6u
zs&mgrUxRTCLuJ*PI`?nwlG*ZA$J1@^v(xoqM1x`z>I|<1ahs|Hp1PW9DX$Uuhm?~I
zkLx`XBmb)#&T<5ZUf&qyPBxpw@R@Dn&2*Rfil2PtN^>#4J=NGF|MXGOmWDS<=i{uO
zOYBx$v%09QLEJDP>+zZVT8sCaVBp#kpR{${U253l@oxe8cHoLmH<#LjAkTKgfTIYZ
z7fh(SNSK5WHi+xTNGmQwRJ9uBh7dKt-0(2B1;V`cS_{A~tY{h3O9VAv5@51=atq+X
z@~z^pwE4BIuu!f*D7E1<xImb6HB3pj_aP|pz`n&Im(cpaq(ZRN+l4m!VrL}#L-kia
zOJ|~HP%Kn;UVYO_v{GGN`RV;2{Vb<@e!DjX<fhC<_teku1e{o<BgfhlQY-g*)rQm{
z^Gn6Ehu#ShY7Z{!ft!B=a(Q1je=PiBUZS~Gr#Wy%_ku^acQN{pfb=b<Pvr9dT=4Q<
z{@DPh8|S^e_QhyEz?^}-G5`cV68+hGFY5KcdV>9;XGti-Qx!YysO{NhEZ-RZoR89k
zJ9D>(so1f!v23~qSiE=n%56QN7#3d=%6G!pPCL;GT_$)(GR2;i$k|jDQyJH9Z}{Za
z*dK;Z&fW=Rb-gB?+!*o%!({cv`q0t%&w;d-7RT;3W3B&BY1bLnRJyHkG7~zHHb4*%
z0))^Zp-KxKL<m(FK@A`hQ9wX?Q344_521u2T@X+yj);PS0Spj&pFt6Yp&XSWB1FpF
zLC?AOoafwM^JhJ4z3ctnwRWED?7foxd?BqW66x@vP6h5Y#;b93_k282@)xuanmC*h
zx_H+UmP_w4wQR6FxJ}M&UeIi7ZfNQ*erDe%^2#D!Q9F5q>gIDLvR^GtM_ITI8WgSO
zf?9auS#Kbn$K_0XaGD@b&4W_~z5cLT?{*EbGWfyKuLRN=I2j;gYX@+q01kFTddIUq
zipdcl1;C!75-#U79U$b|=xsTe{;sZH37|yff6M<U3#`WV0%gXs=WjPwGpjPS|5xVk
z(}>^I2+#$fme#9(mguZ`*Gu}t)aqNK-kmW&_g9gBpa8<dQNuR<vf>DYK>F}HJ#~wV
zn=X-+V4QKYrD|prH&P^g`I`Q%t;N7tbK&rh0;5Jr$%ic3zLi=?-(E|D2eS`%{6P4p
z(4Zn67u2G5P(7|MaM3mLUtZ9^yem2KRM-LfJ4^rn@Yfez$8zTT8mkqkIbODBF9I*7
z$1Q*s`pZA@2H<!ebksrI0Rs(s_EWvS17K9A6n-S2L4W=P6#l@`Sf$h;-<kEmZEhG?
z@)%${{K;33JAKs}$TR}b^DaQ(8vylx03ek{dFljUddL6{apKN$5w8)Is>d142zptA
zX?0MHrkQJG>4)2mRjl65#9AIYeuC4-#QIk{e(+a%qH0@$c;Md63fqTWI9ciBF0*Mj
zN5v}2ODhT~CWhYt_`h7+QdB6bw{Pk3%jjFJIDtJxYTui@Q59a**-4-4dxZ5NqtRWH
zp>itE@|VnT?C<x(cRT5u_q4}Ulh1>k<b29yczGMEiU}sKvr~b`a*cA`pN6~-C!1$9
zII=5VZ#iW{r)*~282I3%Kc#udvRtFJ-uu+>ZQT<o3C-LT`Ri;0GJ@a|UO~lxkF4`B
zr1hDj%dx3(o+|GbP$I8vjv&HbL?n{7`J&1Q_mu-=QHR(D`JY{=DE)9>#dMgeUaH>(
zm9Q*ZV83hk^QHV#zrTNcv-<|?7tqIL`z*|^O}$%=iIfIe8rr5*R$o@}Iyg!O^1U0a
zCd^m&H{IyH2LYa?lyn?i{5L+brFD7fsCflUlRx;$CUh`cv!pbx3>yj8J_RSF_6WP}
zD=?I4rfD!ORn>zFL{-KR+_zdrD$CZ6$3MkPvIoKC>lX<*c@3+Y$g`~7dE3&#m?W@w
ztQgGDwdl=CjkQ=b=y=b)^2mH)_RjgAUF|E1Zk%vw>B3pN+R(ewM(tXi(*_-x=E%eJ
zkJok<crUUmX`*s0!c&4DCZMc?m(R;J)tQGHc5@BsU>?PI?@JBMr_fsa^wjvaOl5aG
zPcA#y=}4TVMF<CQq^UN$n~6GA71|6vVkqjZ#Tr+4m(;2Hn_nJ;>QdQI286v<u|gPR
z66yw>8hw+((5HxtmOLCqDtrcCKDi325%abcGnRlY)Lfa`DmT?<vxG&C$CynN%^C|1
zwXTn7489BZq{~aTAF`ZB<OY|qG493To;onQKROtuAzE8CkJnNcrN8C4;(K@7gpZe@
z)9q>Vye(Z;s2uos1!OfWJeY{VEs2#Cd%)A@@Y@8TyZ+`mhCDdJc1DKp&Nd|D;x6a_
zMI;iUg8_eMo3&U6>RD9Wj&8-X?SmqH%<Tq-s}<A@OCyA#*aYnJ^ej8G`(nEuITZHi
z4Ga)Z(R}B9u^9X#-8@KT0JknklyqXN$PAqyU+%7*q=}G+;Y5U;C)&l?gbJL&f$y?-
zp_DyZ-2T{Sw%NN{D*353^6O+v%z&kvkGeV?JNqEmyX;eI`)xdD&frxt)cwKL*T79R
zIw(7Hf<sRu+$AxKl*C9)zq#H+$n=DC*}xmgc>_k8qm$943_P-A5E>)<tHqZ#Ed|Ea
ztv5~K0q5{%5=<V69FJIH%OMk<G`<s&VMB}DvlusZBE$-5HDbaP3d6R@z!|i*B8OaW
zZ6_s&J1h13NOq+@grv)J%b_njkVAO+>9J1FtW5`&3ed_Z6O~GH@8y(LE5nWq@=El1
ztf8R2k7vykpVUCDL+Tso@E&;)o*C#B6uJ4t;S_6)W6u1HXbG&zaX)^2Es<B4A>Elg
z(%o5){H&|}L?hKUU76d9zaj<i+O_=d?WEfO2g3e?Lx{a>Ap~wblJX3>9_S}re8L^t
z1Gf<R`QJlu!yJ7jV1E`$eP|s11jb(tl<H<<mSTni@RWEp<NwkKTt{Y>f*AAweR$rd
zqolC0GcRe)u)5x8t-j0Z8{u7{Bsremv1b1EZRa#pWVv`57rw4Yqu*J|-fRoy06k4S
z)+LdxeGxwp;dBXIc(aN5c7Qqo->D{4IgotHrC?_hO~(d95<iDWKlX6Ikn{agfjv9q
zo!ODsWX0f!+1j2Z_-t)wc;zBj!8TtV`wK197<k>tf`Ecy5k91CdqesK`xsj--v<u<
z&@yvEh4FBcx`PdKkn@Im+{`z?j(5CNFV&-*IW|riMh~gvqxzM8x;4#RX_PcQj|Phf
z9$T<j<-Q>mAMV9zfGynS;M@jlqmuA5n_yl&3=+)C)tUbDRaw?za7V|+=>x1~AkK%Y
zcZ1HsDwEI~^35$j;SxIp`$G55B)?5e!aX5myMoCX^C3~!zY6>KqBvI!bwH@zK3>#p
zw~GW^?t)aEXi;@g9T!5!cF{#3Kd1?3UrEb&S%Gcr>1mHwQUA;Sthm4KptNh9<~?h@
zr41~`R?Nfg6zfHt!+epRV^(Kt6n<Y&=NzfTbj^6pOr<}fD=05J`Ta(>24A#+0K)Wh
zFg=O*JSBiDYVlOK*Bs(cs`#!_o7!5!$6@{TbKa1s+!@fD#m7crno3Qe)_d17^;ZEj
z^4E!Dv-HO`JbzvK-6%|5sTS0le2q_x&gq-EviXO!ZusM5o?@kPlj_rhnJZ17D|N57
zt?(46=&;%xY_QtIZm?SHzvD^!)+HwNHA#BDD_~SgE0ZDb*RSmd5|-n>Sjww5B*3Ar
z5r5056eB0Vq3gr}Y;VEzAtzULC1fqU{jb}ahk^NPD&QYQh=by9fd^|k0w*f7)eYS)
zU1Z)xn_Db|0^=o^a@&%B`h-}{tu3||e}R`{{V+3|aMD5?+MdtGI`t{7$sExepZ85$
z!CkX-Vmn1P9GfktaicH^^-`xr;T+jYZdf4BSP>Zo`JF5#&Cj@XJz8dfl)*^ikuk;U
zb105*u9i%~BimnVG^x%}?-m}A@U0<}H0mzXaOT;3NR4`W8TfG8Ehgc2qk9io`Y^bl
zmGaA5<03oJV{+Tp;-3lv80Op;h-a1#+?K>YQNHYxnvVy}k4ew1)EMTSQJd>m`?QjK
z$WmGQ>4L`0o{V19Q`{lTsMhhX(UZMKl>Wck;{g4Y`vt^jcbkD9rC&X}8)^-Hb3vmS
z^EG5}z~uGVIT_ZV-TM?mtQfLM^^=GC&{nF}`bu#Yp+uQ7BMgve)YExqt^%F<`Cv<k
zHqHAQkT9DM%ntj{9kQ?k5{ic`mee>1WhNi!J{Pq@04f4o54DDj*zZ-)0pirzCX7Na
zgLu5M^@>5s>+y#_<+`O^VN}LA<tx-N&av~6Fi9g{D=SHBD{#%Y%78%|&J6WtV2g`;
ze)bd!WeKS|Av!&jS+o2CW)jq*z(&*PEGMaMhY=~@mXYnLoLw<e=CEl*(FJ9fg)sC%
zR<W)=h-Sae_a)c(fO<n89O5=|5x0n242(nX!!Z)Mxg3#7Ty&`L32a$U=YeGFJ~oZk
zjX^9o=)LR{$(A}fd^byC1PKfF)#9f~AQ$S!?BW$=+Ijg4yF3V+davJy=6-Va3eDYL
z?fIxQTTA8m&Fy)Wi&ljHqKkwQ0Q9UWeVZWmpAM66eD?QE>=&TaQN6!yel&d4^?w>>
z&l#+!+g3TU&`b0Dl8<VTicA0K|A)kUPUl>U!f9AjDDhIP#X>z&JM3fMA<IoiQc=c=
z;amUyccDQ$2yn=~Uc2(RZLb(uq)3z6tvO|jHf=qmLZULQ;|<=#sw1=DOoE$eZqXfS
z$t$oyE2PRax`a8c;bWPD8#t!m&qJ0+s}RBq#JGOJUNt62Xi=Bge1W_wJ`n3z6Q!|h
zTlQh<ze0p~fIbW`p`4q=CTM`|tMYy9OZ(;fDz#ET6$J<$QA3Wj$|Hag(jIci5??DW
zWAdAW+kmXu{%a01gS?h9%Sy+raaLmbFm;DN?lI?n(wDtcT|JRa6hT&7Q>*?0g8^<Y
zhiefn^^TCf8@I8$whca42!|}2+;Xw#DhLfhT!30`rX2-+sIuK(<bGtB0hnwkHwq9i
zdw6RJG7iSX%*lo)M=i)Wlg%{g2xb72G1+A5Hrf~>CWYYYzTY$&(vsD+L?ao>JE!8N
RM-N#p0ViL*h2i1M{{Yg`t=j+q

literal 0
HcmV?d00001

diff --git a/src/assets/images/bg2.png b/src/assets/images/bg2.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc41a648005963749eb3752e7876f300bd8844e3
GIT binary patch
literal 2689
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
PLg3t4SG&5?LCOCGprzM?

literal 0
HcmV?d00001

diff --git a/src/assets/images/bg3.png b/src/assets/images/bg3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b56cfe4181232eb6259a81efb3cae49155b3bbc2
GIT binary patch
literal 899
zcmeAS@N?(olHy`uVBq!ia0y~yV3Y>3pL4JQNj<Jl-+>fofk$L90|U1(2s1Lwnj^u$
zz-;R2;uumf=k2Y7xrZ18To1Aa@|=D0piZaN<BEf{Ohz-)9p05n=O-BlADlPuU!wo#
zA9vUu^v9;9tvmla`@M6+<6G0dzTWd)@W6isGY6-fhL#%)oEsU1l9*MFuz7UwP7sh*
zP#l#Qi9zzn#`ym2P5ZW|*1oUhDTtYdlopPprqw~yPx5BuG*ctM%y}9q-5g>!oUmcg
lDCoRwW4C>8KSSSp@e4whOAEfwnGeiW44$rjF6*2UngAP56*&L^

literal 0
HcmV?d00001

diff --git a/src/router/index.js b/src/router/index.js
index 5ce0f2d..4fd5343 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -138,6 +138,18 @@ export const constantRoutes = [
     component: () => import("@/views/kanban/Packagingline/index2"),
     hidden: true,
   },
+  // 烘房状态监控看板
+  {
+    path: "/kanban/exceptionnew",
+    component: () => import("@/views/kanban/exceptionnew/index"),
+    hidden: true,
+  },
+  // 烘房状态监控看板
+  {
+    path: "/kanban/Dryingprocess",
+    component: () => import("@/views/kanban/Dryingprocess/index"),
+    hidden: true,
+  },
 
 ]
 
diff --git a/src/views/kanban/Dryingprocess/index.vue b/src/views/kanban/Dryingprocess/index.vue
new file mode 100644
index 0000000..b4a03ce
--- /dev/null
+++ b/src/views/kanban/Dryingprocess/index.vue
@@ -0,0 +1,739 @@
+<template>
+  <v-scale-screen width="1920" height="1080" :fullScreen="false">
+    <div class="app-container home" style="">
+      <div class="head">
+        <div class="head-content">
+          <div class="title">烘房生产监控看板</div>
+        </div>
+      </div>
+      <div class="content">
+        <div class="itemtop">
+          <div class="left">
+            <div class="box">
+              <div class="name name1">当天烘房情况</div>
+            </div>
+            <div class="cards">
+              <div
+                class="card-item"
+                :class="[[index + 1] % 7 == 0 ? 'isactive' : 'active1']"
+              >
+                <div class="card-header">
+                  <span class="card-header-left"
+                    >生产总数:<span class="color1">80</span>车</span
+                  >
+                </div>
+                <div
+                  class="card-box"
+                  v-for="(card, index) in dataPropceshidata"
+                  :key="index"
+                ></div>
+              </div>
+            </div>
+          </div>
+          <div class="left left1">
+            <div class="cards">
+              <div
+                class="card-item card-item1"
+                :class="[[index + 1] % 7 == 0 ? 'isactive' : 'active1']"
+              >
+                <div class="card-header">
+                  <span class="card-header-left">烘房</span>
+                </div>
+                <div
+                  class="card-box"
+                  v-for="(card, index) in dataPropceshidata"
+                  :key="index"
+                ></div>
+              </div>
+            </div>
+          </div>
+          <div class="left">
+            <div class="box">
+              <div class="name name1">当天质量情况</div>
+            </div>
+            <div class="cards">
+              <div
+                class="card-item"
+                :class="[[index + 1] % 7 == 0 ? 'isactive' : 'active1']"
+              >
+                <div class="card-header">
+                  <span class="card-header-left"
+                    >车不合格异常数量: <span class="color2">04</span> 车</span
+                  >
+                </div>
+                <div class="card-box">
+                  <div class="list1">
+                    <div class="listitem1">烘房</div>
+                    <div class="listitem1">产量</div>
+                    <div class="listitem1">标准产能</div>
+                  </div>
+                </div>
+                <div
+                  class="card-box card-box1"
+                >
+                  <div class="list" v-for="(card, index) in dataPropceshidata"
+                  :key="index">
+                    <div class="listitem1">烘房</div>
+                    <div class="listitem1">产量</div>
+                    <div class="listitem1">标准产能</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="itembottom">
+          <div class="left"></div>
+        </div>
+      </div>
+      <!-- <div class="item"></div> -->
+      <!-- <div class="item"></div> -->
+    </div>
+  </v-scale-screen>
+</template>
+  
+  <script>
+import {
+  getBoardFactory,
+  getMesBoardEquProductionToday,
+  getBoardShifts,
+  getRepairWorkOrder,
+  getEquipmentInfo,
+  getRepairQuantity,
+  equipmentIntactRate,
+  equipmentStability,
+  getDeviceRefreshTime,
+  getdictlist,
+} from "@/api/kanban/equipment";
+import { dryRoomDataCarousel } from "@/api/kanban/dryingroom";
+import * as echarts from "echarts";
+import moment from "moment";
+// import Echarts3D from "./echarts3d.vue";
+// import Echarts3D2 from "./echarts3d2.vue";
+export default {
+  name: "Index",
+  components: {},
+  data() {
+    return {
+      gettimedata: "",
+      selectxt: null,
+      selectxtclasses: null,
+      getLineList: [],
+      classesList: [],
+      number1: 0,
+      number2: 0,
+      number3: 0,
+      number4: 0,
+      nameList: [
+        "成型机一",
+        "成型机二",
+        "成型机三",
+        "成型机四",
+        "成型机五",
+        "成型机六",
+        "成型机五",
+        "成型机六",
+      ],
+      valueList: [1639, 1422, 1306, 1131, 1040, 732, 1040, 732],
+      optionDatalist1: [],
+      optionDatalist2: [],
+      optionDatalist3: [],
+      optionDatalist4: [],
+      colorlist: ["#005aff", "#f8b551"],
+      datetime: null,
+      time1: null,
+      getlist: [],
+      repairlist: [],
+      equipmentlist: [],
+      equipmentrepairlist: [],
+      equipmentstabilizelist: [],
+      equipmentinfo: [],
+      RefreshTime: null,
+      dictlist: [],
+      StartArray: [],
+      dataPropceshidata: [{}, {}, {}, {}, {}, {}],
+      dataPropdata: [],
+      cards: {
+        data1: [],
+        data2: [],
+      },
+      cardss: [],
+    };
+  },
+  created() {},
+  destroyed() {
+    clearInterval(this.time1);
+    this.time1 = null;
+  },
+  mounted() {
+    // this.datetime = moment().subtract(2, "day").format("yyyy-MM-DD");
+    //console.log('zhuanhuahou',this.dateRangeone)
+    const { createData } = this;
+    createData();
+    this.gettime();
+  },
+  methods: {
+    back() {
+      this.$router.push({ path: "/index" });
+    },
+    getTagText(value) {
+      // 根据值返回要显示的文字
+      if (value === "0") {
+        return "无车";
+      } else if (value === "1") {
+        return "有车";
+      }
+    },
+
+    getTextColor(value) {
+      if (value === "0") {
+        return "#26fcd8";
+      } else if (value === "1") {
+        return "#ea6027";
+      }
+    },
+
+    getTagModel(value) {
+      // 根据值返回要显示的文字
+      if (value === "0") {
+        return "手动";
+      } else if (value === "1") {
+        return "自动";
+      }
+    },
+    gettime() {
+      this.gettimedata = moment().format("YYYY-MM-DD HH:mm:ss ");
+      setInterval(() => {
+        this.gettimedata = moment().format("YYYY-MM-DD HH:mm:ss ");
+      }, 1000);
+    },
+    selectline() {
+      const _this = this;
+      this.optionDatalist1 = [];
+      this.optionDatalist2 = [];
+      this.optionDatalist3 = [];
+      this.optionDatalist4 = [];
+    },
+    createData() {
+      this.cards.data1 = new Array(8).fill(0).map((foo, i) => ({
+        i: i + 1,
+      }));
+      this.cards.data2 = new Array(8).fill(0).map((foo, i) => ({
+        i: i + 9,
+      }));
+      this.cards.data3 = new Array(5).fill(0).map((foo, i) => ({
+        i: i === 0 ? 17 : i === 1 ? 18 : i === 2 ? 61 : i === 3 ? 62 : 63,
+      }));
+      // console.log(this.cards.data1)
+      dryRoomDataCarousel({ factory: 999 }).then((response) => {
+        if (response.data) {
+          this.dataPropdata = response.data.dryingroomList;
+          //  console.log(response);
+          this.cards.data1 = this.cards.data1.map((card) => {
+            const matchingIndex = response.data.dryingroomList.find(
+              (index) => index.i === card.i
+            );
+            if (matchingIndex) {
+              return {
+                ...card,
+                title: "烘房" + matchingIndex.i,
+                model: matchingIndex.status,
+                dollyNumber: matchingIndex.dollyNumber,
+                waitmin: matchingIndex.waitmin,
+                temperature: matchingIndex.temperature,
+              };
+            } else {
+              return card;
+            }
+          });
+          this.cards.data2 = this.cards.data2.map((card) => {
+            const matchingIndex = response.data.dryingroomList.find(
+              (index) => index.i === card.i
+            );
+            if (matchingIndex) {
+              return {
+                ...card,
+                title: "烘房" + matchingIndex.i,
+                model: matchingIndex.status,
+                dollyNumber: matchingIndex.dollyNumber,
+                waitmin: matchingIndex.waitmin,
+                temperature: matchingIndex.temperature,
+              };
+            } else {
+              return card;
+            }
+          });
+          this.cards.data3 = this.cards.data3.map((card) => {
+            const matchingIndex = response.data.dryingroomList.find(
+              (index) => index.i === card.i
+            );
+            if (matchingIndex) {
+              return {
+                ...card,
+                title: "烘房" + matchingIndex.i,
+                model: matchingIndex.status,
+                dollyNumber: matchingIndex.dollyNumber,
+                waitmin: matchingIndex.waitmin,
+                temperature: matchingIndex.temperature,
+              };
+            } else {
+              return card;
+            }
+          });
+          this.cardss = this.cardss.map((card) => {
+            const matchingIndex = response.data.dryingroomList.find(
+              (index) => index.i === card.i
+            );
+            if (matchingIndex) {
+              return {
+                ...card,
+                title: "烘房" + matchingIndex.i,
+                model: matchingIndex.status,
+                dollyNumber: matchingIndex.dollyNumber,
+                waitmin: matchingIndex.waitmin,
+                temperature: matchingIndex.temperature,
+              };
+            } else {
+              return card;
+            }
+          });
+          console.log(this.cardss, this.cards, "wwwwwwww", this.dataPropdata);
+        }
+      });
+    },
+
+    handleScroll(event) {
+      //请求烘房数据接口
+      this.createData();
+      // if (event==0){
+      //   const that = this;
+      //
+      // }
+      // 获取滚动事件的相关信息
+
+      // console.log(scrollTop);
+      // 根据需要处理滚动事件的逻辑
+      // ...
+    },
+    //左侧第一个选择类型下拉框 回调函数
+  },
+};
+</script>
+  <style lang="scss" scoped>
+.app-container {
+  padding: 0px 24px;
+}
+
+.home {
+  width: 100%;
+  background: url("../../../assets/images/bg1.jpg") no-repeat;
+  background-size: 100% 100%;
+  background-color: #050711;
+
+  .head {
+    width: 100%;
+    height: 74px;
+    position: relative;
+
+    .head-content {
+      height: 74px;
+      background-image: url("../../../assets/images/bg-head.png");
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+
+      .title {
+        font-size: 42px;
+        font-weight: 400;
+        color: #ffffff;
+      }
+    }
+
+    .head-logo {
+      position: absolute;
+      left: 0px;
+      top: 1px;
+
+      img {
+        height: 38px;
+        // width: ;
+      }
+    }
+
+    .back {
+      position: absolute;
+      right: 0px;
+      top: 5px;
+    }
+  }
+
+  .content {
+    margin-top: 63px;
+
+    .itemtop {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .left {
+        .box {
+          width: 525px;
+          height: 62px;
+          background: url("../../../assets/images/bg2.png") no-repeat;
+          background-size: 100% 100%;
+          padding: 0px 21px 0px 25px;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          background-color: #1f3668;
+          .name {
+            min-width: 300px;
+            letter-spacing: 4px;
+            color: #ffffff;
+            font-size: 22px;
+          }
+          .number {
+            min-width: 120px;
+            height: 50px;
+            border: 2px solid #274583;
+            border-radius: 5px;
+            padding: 1px;
+            box-sizing: border-box;
+            .number1 {
+              text-align: center;
+              height: 100%;
+              line-height: 43px;
+              color: #ffa95b;
+              border-radius: 7px;
+              font-size: 32px;
+              letter-spacing: 3px;
+              background-color: #294584;
+            }
+          }
+          .unit {
+            color: #b7b9c1;
+            margin-left: 30px;
+            font-size: 24px;
+          }
+        }
+        .cards {
+          width: 525px;
+          .card-item {
+            width: 525px;
+            height: 387px;
+            background: url("../../../assets/images/bg3.png") no-repeat;
+            background-size: 100% 100%;
+            padding: 10px;
+            background-color: #192c56;
+            // display: flex;
+            // flex-direction: column;
+          }
+          .card-item1 {
+            width: 750px;
+            height: 450px;
+            background: url("../../../assets/images/bg3.png") no-repeat;
+            background-size: 100% 100%;
+            padding: 10px;
+            background-color: #0e1d3a;
+            // display: flex;
+            // flex-direction: column;
+          }
+          .card-header {
+            width: 450px;
+            height: 13%;
+            margin: auto;
+            align-items: center;
+            text-align: center;
+            color: #f6f3f9;
+            font-size: 26px;
+            margin-top: 10px;
+            .card-header-left {
+              display: inline-block;
+              min-width: 100px;
+              padding: 16px 26px;
+              letter-spacing: 8px;
+              background: linear-gradient(to right, #192c56, #11518f, #192c56);
+              .color1 {
+                color: #0195fd;
+              }
+              .color2 {
+                color: #fb0102;
+              }
+            }
+          }
+          .card-box {
+            margin-top: 35px;
+            position: relative;
+            .list1 {
+              background-color: #0d61aa;
+              color: #ffffff;
+              border-radius: 10px;
+              display: flex;
+              justify-content: space-around;
+              align-items: center;
+              font-size: 22px;
+              min-height: 60px;
+            }
+            .list1::before {
+              content: "";
+              position: absolute;
+              bottom: 40px;
+              left: 3%;
+              transform: translateX(-50%);
+              border-width: 10px;
+              border-style: solid;
+              border-color: transparent transparent #0496FD transparent;
+              transform: rotate(315deg);
+            }
+            .list {
+              background-color: #114881;
+              color: #46AFF7;
+              border-radius: 10px;
+              display: flex;
+              justify-content: space-around;
+              align-items: center;
+              font-size: 22px;
+              min-height: 60px;
+              margin-bottom: 5px;
+            }
+            .list::before {
+              content: "";
+              position: absolute;
+              bottom: 40px;
+              left: 3%;
+              transform: translateX(-50%);
+              border-width: 10px;
+              border-style: solid;
+              border-color: transparent transparent #0496FD transparent;
+              transform: rotate(315deg);
+            }
+          }
+          .card-box1{
+            margin-top: 5px;
+          }
+
+          .ring-charts {
+            height: 55%;
+          }
+        }
+      }
+      .left1 {
+        width: 750px;
+      }
+    }
+
+    .itembottom {
+      margin-top: 19px;
+      display: flex;
+      justify-content: space-around;
+
+      .left {
+        // width: 100%;
+        // justify-content: space-between;
+        // display: flex;
+      }
+    }
+  }
+}
+
+.titlebox {
+  width: 431px;
+  height: 38px;
+  background: url("../../../assets/images/bg-title.png") no-repeat;
+  background-size: 100% 100%;
+  //   text-align: center;
+  font-size: 20px;
+  font-weight: bold;
+  color: #ffffff;
+  line-height: 38px;
+  letter-spacing: 2px;
+  text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
+  padding-left: 60px;
+  //   .titlename{
+  //     position: relative;
+  //     left: 24px;
+  //   }
+}
+
+.factory {
+  display: flex;
+  align-items: center;
+  // justify-content: space-around;
+}
+
+.selectborder {
+  background-color: transparent;
+  border-radius: 4px;
+  // border: 2px solid #27408c;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 350px;
+  margin-left: 50px;
+}
+
+.selectborder1 {
+  background-color: transparent;
+  border-radius: 4px;
+  // border: 2px solid #27408c;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 88px;
+  margin-left: 25px;
+}
+
+.selectborder select {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 100%;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  font-size: 25px;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 42px;
+}
+
+.selectborder option {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 100%;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  padding-left: 20px;
+  font-size: 25px;
+  font-weight: 500;
+  color: #3fa2ff;
+  border-radius: 0%;
+}
+
+.selectborder1 option {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 200px;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  padding-left: 20px;
+  font-size: 25px;
+  font-weight: 500;
+  color: #3fa2ff;
+  border-radius: 0%;
+}
+
+.selectborder:after {
+  content: "";
+  width: 24px;
+  height: 24px;
+  background: url(../../../assets/images/xiala.png) no-repeat center;
+  /*通过定位将图标放在合适的位置*/
+  position: absolute;
+  right: 0px;
+  top: 25%;
+  /*给自定义的图标实现点击下来功能*/
+  pointer-events: none;
+}
+
+.selectborder1:after {
+  content: "";
+  width: 24px;
+  height: 24px;
+  background: url(../../../assets/images/xiala.png) no-repeat center;
+  /*通过定位将图标放在合适的位置*/
+  position: absolute;
+  right: 0px;
+  top: 25%;
+  /*给自定义的图标实现点击下来功能*/
+  pointer-events: none;
+}
+
+::v-deep .el-button--primary {
+  color: #ffffff;
+  background-color: #325e82;
+  border-color: #0a0f19;
+}
+
+.active1 {
+  background-color: #0d1b2f;
+}
+
+.active2 {
+  // background-color: #04060E;
+}
+
+::-webkit-scrollbar {
+  width: 3px;
+  height: 0px;
+  background-color: #0c0642;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  border-radius: 8px;
+  background-color: #07356a;
+}
+
+/*定义滑块 内阴影+圆角*/
+::-webkit-scrollbar-thumb {
+  border-radius: 8px;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  background-color: #0091ff;
+}
+::v-deep .el-date-editor .el-range-input {
+  background-color: #142944;
+  color: #ffffff;
+}
+::v-deep .el-range-input::placeholder {
+  color: #ffffff; /* 设置 placeholder 文本的颜色 */
+}
+::v-deep .el-range-separator {
+  color: #ffffff; /* 设置 placeholder 文本的颜色 */
+}
+::v-deep .el-range-editor--medium .el-range-separator {
+  line-height: 35px;
+}
+::v-deep .el-input__icon .el-range__icon .el-icon-date {
+  color: #ffffff; /* 设置 placeholder 文本的颜色 */
+}
+.fleft {
+  float: left;
+}
+
+.fright {
+  float: right;
+}
+
+.clearfix::after {
+  content: "";
+  display: block;
+  clear: both;
+}
+#cards .isactive {
+  margin-right: 0px;
+}
+</style> 
+  
\ No newline at end of file
diff --git a/src/views/kanban/exceptionnew/index.vue b/src/views/kanban/exceptionnew/index.vue
new file mode 100644
index 0000000..a174b32
--- /dev/null
+++ b/src/views/kanban/exceptionnew/index.vue
@@ -0,0 +1,824 @@
+<template>
+  <v-scale-screen width="1920" height="1080" :fullScreen="false">
+    <div class="app-container home" style="">
+      <div class="head">
+        <div class="head-content">
+          <div class="title">烘房状态监控看板</div>
+        </div>
+      </div>
+      <div class="content">
+        <div class="itemtop">
+          <div class="left">
+            <!-- <div class="box">
+              <div class="name name1">烘房运行数量:</div>
+              <div class="number">
+                <div class="number1">00</div>
+              </div>
+              <div class="unit">台</div>
+            </div>
+            <div class="box">
+              <div class="name">烘房自动模式数量:</div>
+              <div class="number">
+                <div class="number1">00</div>
+              </div>
+              <div class="unit">台</div>
+            </div> -->
+            <div class="box" :key="item.title" v-for="item in digitalFlopData">
+              <div class="name">{{ item.title }}:</div>
+              <div class="number">
+                <div class="number1">{{ item.number.number }}</div>
+              </div>
+              <div class="unit">{{ item.unit }}</div>
+            </div>
+          </div>
+        </div>
+        <div class="itembottom">
+          <div class="left">
+            <div id="cards">
+              <div
+                class="card-item fleft clearfix"
+                v-for="(card, index) in dataPropdata"
+                :key="index"
+                :class="[[index + 1] % 7 == 0 ? 'isactive' : 'active1']"
+              >
+                <div class="card-header">
+                  <span class="card-header-left">烘房{{ card.i }}</span>
+                </div>
+                <div class="card-box"></div>
+                <div class="card-footer">
+                  <div class="card-footer-item">
+                    <div class="footer-detail">
+                      <span
+                        :style="{
+                          fontSize: '22px',
+                          fontWeight: 'bold',
+                          color: '#FDA45D',
+                          textAlign: 'right',
+                        }"
+                      >
+                        {{ getTagModel(card.status) }}
+                      </span>
+                    </div>
+                    <div class="footer-title">烘房模式</div>
+                  </div>
+                  <div class="card-footer-item">
+                    <div class="footer-detail">
+                      <span
+                        :style="{
+                          fontSize: '22px',
+                          fontWeight: 'bold',
+                          color: '#93FE66',
+                          textAlign: 'right',
+                        }"
+                      >
+                        {{ getTagText(card.dollyNumber) }}
+                      </span>
+                    </div>
+                    <div class="footer-title">门前数量</div>
+                  </div>
+                </div>
+                <div class="card-footer">
+                  <div class="card-footer-item">
+                    <div class="footer-detail">
+                      <span
+                        style="
+                          font-size: 22px;
+                          font-weight: bold;
+                          color: #fda45d;
+                          text-align: right;
+                        "
+                        >{{ card.temperature }}
+                        <span
+                          style="
+                            font-weight: normal;
+                            font-size: 18px;
+                            color: #ffffff;
+                          "
+                          >℃</span
+                        ></span
+                      >
+                    </div>
+                    <div class="footer-title">烘房温度</div>
+                  </div>
+                  <div class="card-footer-item">
+                    <div class="footer-detail">
+                      <span
+                        style="
+                          font-size: 22px;
+                          font-weight: bold;
+                          color: #93fe66;
+                          text-align: right;
+                        "
+                        >{{ card.waitmin
+                        }}<span
+                          style="
+                            font-weight: normal;
+                            font-size: 18px;
+                            color: #ffffff;
+                          "
+                          >min</span
+                        ></span
+                      >
+                    </div>
+                    <div class="footer-title">保持时长</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- <div class="item"></div> -->
+      <!-- <div class="item"></div> -->
+    </div>
+  </v-scale-screen>
+</template>
+  
+  <script>
+import {
+  dryRoomDataCarousel,
+  getDryingRoomList,
+} from "@/api/kanban/dryingroom";
+import * as echarts from "echarts";
+import moment from "moment";
+// import Echarts3D from "./echarts3d.vue";
+// import Echarts3D2 from "./echarts3d2.vue";
+export default {
+  name: "Index",
+  components: {},
+  data() {
+    return {
+      gettimedata: "",
+      selectxt: null,
+      selectxtclasses: null,
+      getLineList: [],
+      classesList: [],
+      number1: 0,
+      number2: 0,
+      number3: 0,
+      number4: 0,
+      nameList: [
+        "成型机一",
+        "成型机二",
+        "成型机三",
+        "成型机四",
+        "成型机五",
+        "成型机六",
+        "成型机五",
+        "成型机六",
+      ],
+      valueList: [1639, 1422, 1306, 1131, 1040, 732, 1040, 732],
+      optionDatalist1: [],
+      optionDatalist2: [],
+      optionDatalist3: [],
+      optionDatalist4: [],
+      colorlist: ["#005aff", "#f8b551"],
+      datetime: null,
+      time1: null,
+      time2: null,
+      getlist: [],
+      repairlist: [],
+      equipmentlist: [],
+      equipmentrepairlist: [],
+      equipmentstabilizelist: [],
+      equipmentinfo: [],
+      RefreshTime: null,
+      dictlist: [],
+      StartArray: [],
+      dataPropceshidata: [],
+      dataPropdata: [],
+      cards: {
+        data1: [],
+        data2: [],
+      },
+      cardss: [],
+      digitalFlopData: [],
+      dryingRoomList: [],
+      cxjZCNumber: 0,
+    };
+  },
+  created() {},
+  destroyed() {
+    clearInterval(this.time1);
+    this.time1 = null;
+    clearInterval(this.time2);
+    this.time2 = null;
+  },
+  mounted() {
+    // this.datetime = moment().subtract(2, "day").format("yyyy-MM-DD");
+    //console.log('zhuanhuahou',this.dateRangeone)
+    const { createData } = this;
+    createData();
+    this.createData1();
+    this.time2 = setInterval(() => {
+      this.createData1();
+    }, 5000);
+    this.gettime();
+  },
+  methods: {
+    back() {
+      this.$router.push({ path: "/index" });
+    },
+    getTagText(value) {
+      // 根据值返回要显示的文字
+      if (value === "0") {
+        return "无车";
+      } else if (value === "1") {
+        return "有车";
+      }
+    },
+
+    getTextColor(value) {
+      if (value === "0") {
+        return "#26fcd8";
+      } else if (value === "1") {
+        return "#ea6027";
+      }
+    },
+
+    getTagModel(value) {
+      // 根据值返回要显示的文字
+      if (value === "0") {
+        return "手动";
+      } else if (value === "1") {
+        return "自动";
+      }
+    },
+    gettime() {
+      this.gettimedata = moment().format("YYYY-MM-DD HH:mm:ss ");
+      this.time1 = setInterval(() => {
+        this.gettimedata = moment().format("YYYY-MM-DD HH:mm:ss ");
+      }, 1000);
+    },
+    selectline() {
+      const _this = this;
+      this.optionDatalist1 = [];
+      this.optionDatalist2 = [];
+      this.optionDatalist3 = [];
+      this.optionDatalist4 = [];
+    },
+    createData() {
+      this.cards.data1 = new Array(8).fill(0).map((foo, i) => ({
+        i: i + 1,
+      }));
+      this.cards.data2 = new Array(8).fill(0).map((foo, i) => ({
+        i: i + 9,
+      }));
+      this.cards.data3 = new Array(5).fill(0).map((foo, i) => ({
+        i: i === 0 ? 17 : i === 1 ? 18 : i === 2 ? 61 : i === 3 ? 62 : 63,
+      }));
+      // console.log(this.cards.data1)
+      dryRoomDataCarousel({ factory: 999 }).then((response) => {
+        if (response.data) {
+          this.dataPropdata = response.data.dryingroomList;
+          //  console.log(response);
+          this.cards.data1 = this.cards.data1.map((card) => {
+            const matchingIndex = response.data.dryingroomList.find(
+              (index) => index.i === card.i
+            );
+            if (matchingIndex) {
+              return {
+                ...card,
+                title: "烘房" + matchingIndex.i,
+                model: matchingIndex.status,
+                dollyNumber: matchingIndex.dollyNumber,
+                waitmin: matchingIndex.waitmin,
+                temperature: matchingIndex.temperature,
+              };
+            } else {
+              return card;
+            }
+          });
+          this.cards.data2 = this.cards.data2.map((card) => {
+            const matchingIndex = response.data.dryingroomList.find(
+              (index) => index.i === card.i
+            );
+            if (matchingIndex) {
+              return {
+                ...card,
+                title: "烘房" + matchingIndex.i,
+                model: matchingIndex.status,
+                dollyNumber: matchingIndex.dollyNumber,
+                waitmin: matchingIndex.waitmin,
+                temperature: matchingIndex.temperature,
+              };
+            } else {
+              return card;
+            }
+          });
+          this.cards.data3 = this.cards.data3.map((card) => {
+            const matchingIndex = response.data.dryingroomList.find(
+              (index) => index.i === card.i
+            );
+            if (matchingIndex) {
+              return {
+                ...card,
+                title: "烘房" + matchingIndex.i,
+                model: matchingIndex.status,
+                dollyNumber: matchingIndex.dollyNumber,
+                waitmin: matchingIndex.waitmin,
+                temperature: matchingIndex.temperature,
+              };
+            } else {
+              return card;
+            }
+          });
+          this.cardss = this.cardss.map((card) => {
+            const matchingIndex = response.data.dryingroomList.find(
+              (index) => index.i === card.i
+            );
+            if (matchingIndex) {
+              return {
+                ...card,
+                title: "烘房" + matchingIndex.i,
+                model: matchingIndex.status,
+                dollyNumber: matchingIndex.dollyNumber,
+                waitmin: matchingIndex.waitmin,
+                temperature: matchingIndex.temperature,
+              };
+            } else {
+              return card;
+            }
+          });
+          console.log(this.cardss, this.cards, "wwwwwwww", this.dataPropdata);
+        }
+      });
+    },
+    createData1() {
+      const that = this;
+      getDryingRoomList({
+        factory: 999,
+      }).then((response) => {
+        if (response.data) {
+          // console.log(response)
+          this.cxjZCNumber = response.data.cxzc;
+          this.cxjYCNumber = response.data.cxyc;
+          this.dryingRoomList = response.data.result;
+          this.digitalFlopData = [
+            {
+              title: "成型机运行",
+              number: {
+                number: this.cxjZCNumber,
+                content: "{nt}",
+                textAlign: "right",
+                style: {
+                  fill: "#4d99fc",
+                  fontWeight: "bold",
+                },
+              },
+
+              unit: "台",
+            },
+            {
+              title: "烘房运行(自动)",
+              number: {
+                number: response.data.hfauto,
+                content: "{nt}",
+                textAlign: "right",
+                style: {
+                  fill: "#4d99fc",
+                  fontWeight: "bold",
+                },
+              },
+
+              unit: "座",
+            },
+            {
+              title: "收坯机台运行",
+              number: {
+                number: response.data.spzc,
+                content: "{nt}",
+                textAlign: "right",
+                style: {
+                  fill: "#4d99fc",
+                  fontWeight: "bold",
+                },
+              },
+              unit: "台",
+            },
+            {
+              title: "成型缓存区数量",
+              number: {
+                number: response.data.hcnumber,
+                content: "{nt}",
+                textAlign: "right",
+                style: {
+                  fill: "#4d99fc",
+                  fontWeight: "bold",
+                },
+              },
+              unit: "个",
+            },
+          ];
+        }
+      });
+    },
+
+    handleScroll(event) {
+      //请求烘房数据接口
+      this.createData();
+      // if (event==0){
+      //   const that = this;
+      //
+      // }
+      // 获取滚动事件的相关信息
+
+      // console.log(scrollTop);
+      // 根据需要处理滚动事件的逻辑
+      // ...
+    },
+    //左侧第一个选择类型下拉框 回调函数
+  },
+};
+</script>
+  <style lang="scss" scoped>
+.app-container {
+  padding: 0px 24px;
+}
+
+.home {
+  width: 100%;
+  background: url("../../../assets/images/bg1.jpg") no-repeat;
+  background-size: 100% 100%;
+  background-color: #050711;
+
+  .head {
+    width: 100%;
+    height: 74px;
+    position: relative;
+
+    .head-content {
+      height: 74px;
+      background-image: url("../../../assets/images/bg-head.png");
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+
+      .title {
+        font-size: 42px;
+        font-weight: 400;
+        color: #ffffff;
+      }
+    }
+
+    .head-logo {
+      position: absolute;
+      left: 0px;
+      top: 1px;
+
+      img {
+        height: 38px;
+        // width: ;
+      }
+    }
+
+    .back {
+      position: absolute;
+      right: 0px;
+      top: 5px;
+    }
+  }
+
+  .content {
+    margin-top: 63px;
+
+    .itemtop {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .left {
+        width: 100%;
+        justify-content: space-between;
+        display: flex;
+        .box {
+          width: 437px;
+          height: 92px;
+          background: url("../../../assets/images/bg2.png") no-repeat;
+          background-size: 100% 100%;
+          padding: 0px 21px 0px 25px;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          .name {
+            min-width: 225px;
+            letter-spacing: 0px;
+            color: #ffffff;
+            font-size: 26px;
+          }
+          .name1 {
+            min-width: 220px;
+            letter-spacing: 25px;
+          }
+          .number {
+            min-width: 120px;
+            height: 50px;
+            border: 2px solid #274583;
+            border-radius: 5px;
+            padding: 1px;
+            box-sizing: border-box;
+            .number1 {
+              text-align: center;
+              height: 100%;
+              line-height: 43px;
+              color: #ffa95b;
+              border-radius: 7px;
+              font-size: 32px;
+              letter-spacing: 3px;
+              background-color: #294584;
+            }
+          }
+          .unit {
+            color: #b7b9c1;
+            margin-left: 20px;
+            font-size: 24px;
+          }
+        }
+      }
+    }
+
+    .itembottom {
+      margin-top: 19px;
+      display: flex;
+      justify-content: space-around;
+
+      .left {
+        // width: 100%;
+        // justify-content: space-between;
+        // display: flex;
+      }
+    }
+  }
+}
+
+.titlebox {
+  width: 431px;
+  height: 38px;
+  background: url("../../../assets/images/bg-title.png") no-repeat;
+  background-size: 100% 100%;
+  //   text-align: center;
+  font-size: 20px;
+  font-weight: bold;
+  color: #ffffff;
+  line-height: 38px;
+  letter-spacing: 2px;
+  text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
+  padding-left: 60px;
+  //   .titlename{
+  //     position: relative;
+  //     left: 24px;
+  //   }
+}
+
+.factory {
+  display: flex;
+  align-items: center;
+  // justify-content: space-around;
+}
+
+.selectborder {
+  background-color: transparent;
+  border-radius: 4px;
+  // border: 2px solid #27408c;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 350px;
+  margin-left: 50px;
+}
+
+.selectborder1 {
+  background-color: transparent;
+  border-radius: 4px;
+  // border: 2px solid #27408c;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 88px;
+  margin-left: 25px;
+}
+
+.selectborder select {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 100%;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  font-size: 25px;
+  font-weight: 400;
+  color: #ffffff;
+  line-height: 42px;
+}
+
+.selectborder option {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 100%;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  padding-left: 20px;
+  font-size: 25px;
+  font-weight: 500;
+  color: #3fa2ff;
+  border-radius: 0%;
+}
+
+.selectborder1 option {
+  /*清除select的边框样式*/
+  border: none;
+  /*清除select聚焦时候的边框颜色*/
+  outline: none;
+  background-color: transparent;
+  /*将select的宽高等于div的宽高*/
+  width: 200px;
+  height: 50px;
+  /*隐藏select的下拉图标*/
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  padding-left: 20px;
+  font-size: 25px;
+  font-weight: 500;
+  color: #3fa2ff;
+  border-radius: 0%;
+}
+
+.selectborder:after {
+  content: "";
+  width: 24px;
+  height: 24px;
+  background: url(../../../assets/images/xiala.png) no-repeat center;
+  /*通过定位将图标放在合适的位置*/
+  position: absolute;
+  right: 0px;
+  top: 25%;
+  /*给自定义的图标实现点击下来功能*/
+  pointer-events: none;
+}
+
+.selectborder1:after {
+  content: "";
+  width: 24px;
+  height: 24px;
+  background: url(../../../assets/images/xiala.png) no-repeat center;
+  /*通过定位将图标放在合适的位置*/
+  position: absolute;
+  right: 0px;
+  top: 25%;
+  /*给自定义的图标实现点击下来功能*/
+  pointer-events: none;
+}
+
+::v-deep .el-button--primary {
+  color: #ffffff;
+  background-color: #325e82;
+  border-color: #0a0f19;
+}
+
+.active1 {
+  background-color: #0d1b2f;
+}
+
+.active2 {
+  // background-color: #04060E;
+}
+
+::-webkit-scrollbar {
+  width: 3px;
+  height: 0px;
+  background-color: #0c0642;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  border-radius: 8px;
+  background-color: #07356a;
+}
+
+/*定义滑块 内阴影+圆角*/
+::-webkit-scrollbar-thumb {
+  border-radius: 8px;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  background-color: #0091ff;
+}
+#cards {
+  .card-item {
+    width: 254px;
+    height: 262px;
+    background: url("../../../assets/images/bg3.png") no-repeat;
+    background-size: 100% 100%;
+    padding: 10px;
+    margin-right: 15px;
+    margin-bottom: 20px;
+    // display: flex;
+    // flex-direction: column;
+  }
+
+  .card-header {
+    width: 180px;
+    height: 20%;
+    margin: auto;
+    align-items: center;
+    text-align: center;
+    color: #f6f3f9;
+    font-size: 24px;
+    margin-top: 10px;
+
+    .card-header-left {
+      display: inline-block;
+      min-width: 100px;
+      background-color: #0b3765;
+      box-shadow: 0px 3px 18px 12px #0b3765;
+    }
+  }
+
+  .ring-charts {
+    height: 55%;
+  }
+
+  .card-footer {
+    height: 25%;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    margin-top: 25px;
+  }
+
+  .card-footer-item {
+    box-sizing: border-box;
+    width: 40%;
+    text-align: center;
+    .footer-title {
+      font-size: 22px;
+      margin-bottom: 5px;
+      color: #0593fd;
+    }
+
+    .footer-detail {
+      min-height: 46px;
+      text-align: center;
+      font-size: 20px;
+      color: #192c57;
+      font-size: 18px;
+      padding: 10px 10px 10px 10px;
+      box-sizing: border-box;
+      width: 100%;
+      background-color: #192c57;
+      border-radius: 3px;
+      .dv-digital-flop {
+        margin-right: 5px;
+      }
+    }
+  }
+}
+::v-deep .el-date-editor .el-range-input {
+  background-color: #142944;
+  color: #ffffff;
+}
+::v-deep .el-range-input::placeholder {
+  color: #ffffff; /* 设置 placeholder 文本的颜色 */
+}
+::v-deep .el-range-separator {
+  color: #ffffff; /* 设置 placeholder 文本的颜色 */
+}
+::v-deep .el-range-editor--medium .el-range-separator {
+  line-height: 35px;
+}
+::v-deep .el-input__icon .el-range__icon .el-icon-date {
+  color: #ffffff; /* 设置 placeholder 文本的颜色 */
+}
+.fleft {
+  float: left;
+}
+
+.fright {
+  float: right;
+}
+
+.clearfix::after {
+  content: "";
+  display: block;
+  clear: both;
+}
+#cards .isactive {
+  margin-right: 0px;
+}
+</style> 
+  
\ No newline at end of file

From 3cb23bc4d18c4b3bf604b593385658e94e6241f2 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 8 May 2024 17:33:15 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A+=E6=A0=87=E5=87=86=E4=BA=A7=E8=83=BD(?=
 =?UTF-8?q?=E6=97=B6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/productReport/index.vue | 236 ++++++++++++----------
 src/views/quality/qcWarehousing/index.vue |   3 -
 src/views/wms/equipment/index.vue         |  10 +-
 3 files changed, 130 insertions(+), 119 deletions(-)

diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index 5d0b65f..679dcfe 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -138,134 +138,106 @@
 							<h2>成品检验报告</h2>
 						</el-col>
 					</el-row>
-					<el-row>
-						<el-col :span="16">
-							<el-form-item label="产品名称" prop="materialName">
-								<el-input v-model="form.materialName" disabled />
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="产品编码" prop="materialCode">
-								<el-input v-model="form.materialCode" disabled />
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="8">	
-							<el-form-item label="生产数量" prop="quality">
-								<el-input type="number" v-model="form.quality" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="单位" prop="unit" >
-								<el-input v-model="form.unit" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="检验编号" prop="checkNo">
-								<el-input v-model="form.checkNo" disabled/>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row>
-						<el-col :span="8">
-							<el-form-item label="生产批号" prop="incomeBatchNo">
-								<el-input v-model="form.incomeBatchNo" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="抽样地点" prop="checkLoc">
-								<el-input v-model="form.checkLoc" disabled/>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="检验依据" prop="standardNo">
-								<el-input v-model="form.standardNo" disabled/>
-							</el-form-item>
+					<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
+						<el-descriptions-item label="产品名称" class="my-description-item1">{{form.materialName}}</el-descriptions-item>
+						<el-descriptions-item label="生产数量" class="my-description-item2">{{form.quality}}</el-descriptions-item>
+						<el-descriptions-item label="检验编码" class="my-description-item3">{{form.checkNo}}</el-descriptions-item>
+
+						<el-descriptions-item label="产品编码" class="my-description-item1">{{form.materialCode}}</el-descriptions-item>
+						<el-descriptions-item label="抽样地点" class="my-description-item2">{{form.checkLoc}}</el-descriptions-item>
+						<el-descriptions-item label="报检日期" class="my-description-item3">{{form.createTime}}</el-descriptions-item>
+
+						<el-descriptions-item label="生产批号" class="my-description-item1">{{form.incomeBatchNo}}</el-descriptions-item>
+						<el-descriptions-item label="检验依据" class="my-description-item2">{{form.standardNo}}</el-descriptions-item>
+						<el-descriptions-item label="检验日期" class="my-description-item3">{{form.checkTime}}</el-descriptions-item>
+					</el-descriptions>
+					<el-row class="border-row">
+						<el-col :span="24">	
+							包装检验项目
+						</el-col>	
+						<el-col :span="24">	
+							<!-- 检验项目明细 -->
+							<el-table v-loading="loading" :data="checkProjectList" border>
+									<el-table-column label="序号" align="center" type="index" width="50"/>
+									<el-table-column label="检验项目" align="center" prop="ruleName" width="100"/>
+									<el-table-column label="标准要求" align="center" prop="checkStandard"/>
+									<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/>
+									<!--<el-table-column label="单位" align="center" prop="unitCode" width="50"/>-->
+									<el-table-column label="实测结果及判定" align="center">
+									    <el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
+										<el-table-column label="判定" align="center" prop="status" width="110"/>
+									</el-table-column>
+									<!--
+									<el-table-column label="不良类型" align="center" prop="defectCode" width="80">
+										<template slot-scope="scope">
+											<span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span>
+										</template>
+									</el-table-column>
+									<el-table-column label="不良数量" align="center" prop="defectQuality" width="50"/>
+									<el-table-column label="附件" align="center" prop="files" width="120">
+										<template slot-scope="scope">
+											<el-image v-for="(item,index) in scope.row.files" :key="index"
+											:src="item.fileAddress" 
+											style="width: 100px; height: 100px" 
+											:fit="fit" />
+										</template>
+									</el-table-column>
+									-->
+							</el-table>
 						</el-col>
 					</el-row>
-					<el-row>
-						<el-col :span="8">
-							<el-form-item label="报检日期" prop="createTime">
-								<el-input v-model="form.checkTime" placeholder="请输入报检日期" disabled>
-									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-								</el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="检验日期" prop="checkTime">
-								<el-input v-model="form.checkTime" placeholder="请输入检验日期" disabled>
-									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-								</el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="产品提报人" prop="checkManName">
-								<el-input v-model="form.checkManName" placeholder="请输入OEM产品提报人" disabled/>
-							</el-form-item>
-						</el-col>
-					</el-row>	
-					<el-row>
+					<el-row class="border-row">
+						<el-col :span="24">	
+							内容物分析项目
+						</el-col>	
 						<el-col :span="24">	
 							<!-- 检验项目明细 -->
-							<el-table v-loading="loading" :data="checkProjectList" >
-								<el-table-column type="selection" width="50" align="center" />
+							<el-table v-loading="loading" :data="checkProjectList0" border>
 								<el-table-column label="序号" align="center" type="index" width="50"/>
-								<el-table-column label="检验项目" align="center" prop="ruleName" />
-								<el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/>
-								<el-table-column label="抽检数" align="center" prop="sampleNum" width="60"/>
-								<el-table-column label="单位" align="center" prop="unitCode" width="50"/>
-								<el-table-column label="实测结果" align="center" prop="actualValue" width="160"/>
-								<el-table-column label="判定" align="center" prop="status" width="70">
-									<template slot-scope="scope">
-										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
-									</template>
-								</el-table-column>
-								<el-table-column label="不良类型" align="center" prop="defectCode" width="80">
-									<template slot-scope="scope">
-										<span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span>
-									</template>
-								</el-table-column>
-								<el-table-column label="不良数量" align="center" prop="defectQuality" width="50"/>
-								<el-table-column label="附件" align="center" prop="files" width="120">
-									<template slot-scope="scope">
-									    <el-image v-for="(item,index) in scope.row.files" :key="index"
-										:src="item.fileAddress" 
-										style="width: 100px; height: 100px" 
-										:fit="fit" />
-									</template>
+								<el-table-column label="检验项目" align="center" prop="ruleName" width="100"/>
+								<el-table-column label="标准要求" align="center" prop="checkStandard"/>
+								<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/>
+								<el-table-column label="实测结果及判定" align="center">
+									<el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
+									<el-table-column label="判定" align="center" prop="status" width="110"/>
 								</el-table-column>
 							</el-table>
 						</el-col>
 					</el-row>
-					<el-row>
-						<el-col>
-							<el-form-item label="综合检验结论" label-width="100px">
-								<el-col offset="6" span="6">
-									<el-checkbox disabled>合格</el-checkbox>
-								</el-col>
-								<el-col offset="3" span="6">
-									<el-checkbox disabled>不合格</el-checkbox>
-								</el-col>
-							</el-form-item>
-						</el-col>
-					</el-row>
+					<el-descriptions title="" border :column="1">
+						<el-descriptions-item label="综合检验结论">
+						
+						    <el-col offset="1" span="6">
+								<el-checkbox-group v-model="form.checkedValues">
+									<el-checkbox label="Y">合格</el-checkbox>
+									<el-checkbox label="N">不合格</el-checkbox>
+								</el-checkbox-group>
+							</el-col>
+							<el-col span="8">
+								判定合格打“√”，不合格打“×”
+							</el-col>
+				
+							
+							
+						</el-descriptions-item>
+					</el-descriptions>
+					<!--
 					<el-row>
 						<el-col :span="20">
 							<el-form-item label="备注：" label-width="100px">
 								<el-input type="textarea" disabled/>
 							</el-form-item>
 						</el-col>
-					</el-row>
+					</el-row>-->
 					<el-row>
-						<el-col :span="20">
+						<el-col :span="10">
 							<el-form-item label="品检主管：" label-width="100px">
-								<el-input disabled/>
+								
 							</el-form-item>
 						</el-col>
-						<el-col :span="20">
-							<el-form-item label="品管员：" >
-								<el-input  disabled/>
+						<el-col :span="10">
+							<el-form-item label="检验员：" >
+								{{form.checkManName}}
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -358,13 +330,27 @@ export default {
 				factoryCode: null,
 			},
 			// 表单参数
-			form: {},
+			form: {checkedValues:[]},
 			checkTypes:[],
 			// 表单校验
 			rules: {
 				/* incomeBatchNo: [
 					{ required: true, message: "来料批次号不能为空", trigger: "blur" }
 				], */
+			},
+			content_style: {
+				'text-align': 'center',
+				'min-width': '200px',
+				'word-break': 'break-all'
+			},
+			label_style: {
+				'color': '#000',
+				'text-align': 'center',
+				'font-weight': '600',
+				'height': '40px',
+				'background-color': '#d6dbe1',
+				'min-width': '100px',
+				'word-break': 'keep-all'
 			}
 		};
 	},
@@ -481,6 +467,9 @@ export default {
 			this.queryParams.recordId = recordId;
 			getProduct(recordId).then(response => {
 				this.form = response.data;
+				let checkedValues0 =[];
+				checkedValues0.push(response.data.checkResult)
+				this.form.checkedValues = ['Y'];
 				this.form.printable = 'printFrom'; //打印时需要
 				this.form.ignore = ['no-print'];//打印时需要
 				this.open = true;
@@ -529,7 +518,18 @@ export default {
 		getCheckedProjectList(){
 			this.loading = true;
 			getCkeckProjectList(this.queryParams).then((response) => {
-				this.checkProjectList = response.rows;
+                const itemType1s=[];
+				const itemType0s=[];
+				response.rows.forEach(item=>{
+                  if (item.itemType == '1') {
+                    itemType1s.push(item);
+                  }else if(item.itemType == '0'){
+					itemType0s.push(item);
+				  }
+                })
+
+				this.checkProjectList  = itemType1s;
+				this.checkProjectList0  = itemType0s;
 				this.total = response.total;
 				this.loading = false;
 				this.form.standardNo = this.checkProjectList[0].standardNo;
@@ -576,4 +576,18 @@ export default {
 	margin-left: 15px;
     height: 38px;
 }
+.my-description-item1 {
+  width: 280px; /* 或者你想要的任何宽度 */
+}
+.my-description-item2 {
+  width: 120px; /* 或者你想要的任何宽度 */
+}
+.my-description-item3 {
+  width: 80px; /* 或者你想要的任何宽度 */
+}
+.border-row {
+  border: 1px solid #d3dce6; /* 边框颜色可以根据需要自定义 */
+  text-align:center;
+}
+
 </style>
\ No newline at end of file
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index cf5dbb9..dd8ab06 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -458,9 +458,6 @@ export default {
 			form: {},
 			// 表单校验
 			rules: {
-				incomeBatchNo: [
-					{ required: true, message: "批次号不能为空", trigger: "blur" }
-				],
 				orderNo: [
 					{ required: true, message: "订单号不能为空", trigger: "blur" }
 				],
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index dd799af..dce9e9a 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -189,7 +189,7 @@
         label="设备编码"
         align="center"
         prop="equipmentCode"
-        width="150"
+        width="100"
         fixed="left"
       >
         <template slot-scope="scope">
@@ -205,7 +205,7 @@
         label="设备名称"
         align="center"
         prop="equipmentName"
-        width="300"
+        width="200"
       />
       <el-table-column
         label="是否启用"
@@ -315,7 +315,7 @@
         width="100"
       />
       <el-table-column
-        label="单台能力工时"
+        label="标准产能(时)"
         align="center"
         prop="unitWorkingHours"
         width="100"
@@ -566,7 +566,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="单台能力工时" prop="unitWorkingHours">
+              <el-form-item label="标准产能(时)" prop="unitWorkingHours">
                 <el-input-number
                   :min="0"
                   :step="1"
@@ -939,7 +939,7 @@
               <el-descriptions-item label="工段">{{
                 form.workshopSection
               }}</el-descriptions-item>
-              <el-descriptions-item label="单台能力工时">{{
+              <el-descriptions-item label="标准产能(时)">{{
                 form.unitWorkingHours
               }}</el-descriptions-item>
               <el-descriptions-item label="工时单价">{{

From 558ad7d16186650e5f69791b1182896b175e8db0 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 9 May 2024 14:15:12 +0800
Subject: [PATCH 16/16] =?UTF-8?q?2024-5-9=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E8=AE=BE=E5=A4=87-=E6=9F=A5=E7=9C=8B=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=AF=A6=E6=83=85-=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/equipment/index.vue | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index dce9e9a..d854ee3 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -951,9 +951,12 @@
               <el-descriptions-item label="sap线体名称">{{
                 form.sapName
               }}</el-descriptions-item>
-              <el-descriptions-item label="设备类别">{{
-                form.equipmentCategory
-              }}</el-descriptions-item>
+              <el-descriptions-item label="设备类别">
+                <dict-tag
+                  :options="dict.type.equipment_category"
+                  :value="form.equipmentCategory"
+                />
+              </el-descriptions-item>
               <el-descriptions-item label="工厂车间">{{
                 form.factoryWorkshop
               }}</el-descriptions-item>
@@ -966,9 +969,12 @@
               :contentStyle="CS"
               :label-style="LS"
             >
-              <el-descriptions-item label="设备状态">{{
-                form.status
-              }}</el-descriptions-item>
+              <el-descriptions-item label="设备状态">
+                  <dict-tag
+                    :options="dict.type.equipment_status"
+                    :value="form.equipmentStatus"
+                  />
+              </el-descriptions-item>
               <el-descriptions-item label="使用部门">{{
                 form.department
               }}</el-descriptions-item>