From 748315dab7f1b09febca854e7ebd1d37440c84a2 Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Thu, 5 Dec 2024 15:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=8C=E8=83=BD=E6=BA=90?=
 =?UTF-8?q?=E6=9D=BF=E5=9D=97=E6=8E=A5=E5=8F=A3=E5=92=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hw/dms/domain/DmsPlanInspect.java     |  18 +
 .../java/com/hw/dms/domain/DmsPlanMaint.java  |  18 +
 .../impl/DmsPlanInspectServiceImpl.java       |   8 +-
 .../service/impl/DmsPlanMaintServiceImpl.java |   8 +-
 .../impl/DmsRealtimeStatusServiceImpl.java    |  16 +-
 .../dms/DmsBillsInspectInstanceMapper.xml     |   2 +-
 .../hw-dms/src/main/resources/weixiu.xlsx     | Bin 12719 -> 12714 bytes
 .../views/dms/dmsBaseInspectProject/index.vue |  12 +-
 .../views/dms/dmsBaseInspectRoute/index.vue   |  12 +-
 .../dms/dmsBaseInspectStandard/index.vue      |  12 +-
 .../views/dms/dmsBaseMaintProject/index.vue   |   2 +-
 .../dms/dmsBillsInspectActivity/index.vue     |  26 +-
 .../views/dms/dmsBillsMaintInstance/index.vue |   2 +-
 .../views/dms/dmsInspectRouteDetail/index.vue |   2 +-
 hw-ui/src/views/dms/dmsPlanInspect/index.vue  |  20 +-
 hw-ui/src/views/dms/knowledgeRepair/index.vue |  20 +-
 hw-ui/src/views/dms/konwledgeMaint/index.vue  |  26 +-
 hw-ui/src/views/dms/ledger/index.vue          |  20 +-
 hw-ui/src/views/dms/maint/index.vue           |  18 +-
 hw-ui/src/views/dms/shutDownRecord/index.vue  | 428 ++++++++++++++++++
 hw-ui/src/views/dms/standard/index.vue        |   6 +-
 hw-ui/src/views/dms/station/index.vue         |  22 +-
 .../views/ems/base/exception/rule/index.vue   |   4 +-
 23 files changed, 606 insertions(+), 96 deletions(-)
 create mode 100644 hw-ui/src/views/dms/shutDownRecord/index.vue

diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java
index 249e2393..1c04dff3 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanInspect.java
@@ -71,6 +71,24 @@ public class DmsPlanInspect extends BaseEntity
 
     private Long timeLimitHours;
     private String routeName;
+    private Long hour;
+    private Long week;
+    public Long getHour()
+    {
+        return hour;
+    }
+    public void setHour(Long hour)
+    {
+        this.hour = hour;
+    }
+    public Long getWeek()
+    {
+        return week;
+    }
+    public void setWeek(Long week)
+    {
+        this.week = week;
+    }
     public void setRouteName(String routeName) {
         this.routeName = routeName;
     }
diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaint.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaint.java
index 1d8b1a96..a5188ee5 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaint.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaint.java
@@ -46,6 +46,8 @@ public class DmsPlanMaint extends BaseEntity
 
     @Excel(name = "时限")
     private Long timeLimit;
+    private Long hour;
+    private Long week;
 
 
 
@@ -180,6 +182,22 @@ public class DmsPlanMaint extends BaseEntity
     {
         this.maintStatus = maintStatus;
     }
+    public Long getHour()
+    {
+        return hour;
+    }
+    public void setHour(Long hour)
+    {
+        this.hour = hour;
+    }
+    public Long getWeek()
+    {
+        return week;
+    }
+    public void setWeek(Long week)
+    {
+        this.week = week;
+    }
 
     public Long getMaintStatus()
     {
diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java
index 44a68c3c..1405f0f9 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java
@@ -108,19 +108,21 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService
     @Override
     public int insertDmsPlanInspect(DmsPlanInspect dmsPlanInspect)
     {
+        Long week = dmsPlanInspect.getWeek();
+        week += 1;
         String planInspectCode = Seq.getId(Seq.planInspectSeqType, Seq.planInspectCode);
-
+        String cron = "* * "+dmsPlanInspect.getHour()+" ? * "+week;
         SysJob job = new SysJob();
         job.setJobName("点巡检计划编号" + planInspectCode + "工单任务");
         job.setJobGroup("DEFAULT");
         job.setInvokeTarget("ryTask.getDmsBillsInstance(\"" + planInspectCode + "\")");
-        job.setCronExpression(dmsPlanInspect.getCronExpression());
+        job.setCronExpression(cron);
         job.setMisfirePolicy("1");
         job.setConcurrent("1");
         job.setStatus("1");
         R<Integer> jobIdR = remoteJobService.add(SecurityConstants.INNER, job);
 
-        String time = dmsPlanInspect.getCronExpression();
+        String time = cron;
         //通过cron表达式获取下一次执行时间
         Date nextExecution = CronUtils.getNextExecution(time);
         dmsPlanInspect.setPlanTime(nextExecution);
diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java
index 594186a2..1e076f22 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java
@@ -89,19 +89,21 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService {
     @Transactional
     @Override
     public int insertDmsPlanMaint(DmsPlanMaint dmsPlanMaint) {
+        Long week = dmsPlanMaint.getWeek();
+        week += 1;
         String planMaintCode = Seq.getId(Seq.planMaintSeqType, Seq.planMaintCode);
-
+        String cron = "* * "+dmsPlanMaint.getHour()+" ? * "+week;
         SysJob job = new SysJob();
         job.setJobName("保养计划编号" + planMaintCode + "工单任务");
         job.setJobGroup("DEFAULT");
         job.setInvokeTarget("ryTask.getDmsBillsMaint(\"" + planMaintCode + "\")");
-        job.setCronExpression(dmsPlanMaint.getCronExpression());
+        job.setCronExpression(cron);
         job.setMisfirePolicy("1");
         job.setConcurrent("1");
         job.setStatus("1");
         R<Integer> jobIdR = remoteJobService.add(SecurityConstants.INNER, job);
 
-        String time = dmsPlanMaint.getCronExpression();
+        String time = cron;
         //通过cron表达式获取下一次执行时间
         Date nextExecution = CronUtils.getNextExecution(time);
         dmsPlanMaint.setMaintTime(nextExecution);
diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRealtimeStatusServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRealtimeStatusServiceImpl.java
index 5ef4667b..7858367d 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRealtimeStatusServiceImpl.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRealtimeStatusServiceImpl.java
@@ -1,6 +1,7 @@
 package com.hw.dms.service.impl;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import com.hw.common.core.utils.DateUtils;
 import com.hw.dms.domain.DmsRealtimeStatusHistory;
@@ -80,10 +81,19 @@ public class DmsRealtimeStatusServiceImpl implements IDmsRealtimeStatusService {
     @Override
     public List<DmsRealtimeStatusHistory> history(DmsRealtimeStatusHistory history) {
         List<DmsRealtimeStatusHistory> history1 = dmsRealtimeStatusMapper.history(history);
+        for (DmsRealtimeStatusHistory statusHistory : history1) {
+            if ("True".equals(statusHistory.getStatusCode())){
+                statusHistory.setStatusCode("是");
+            }
+            if ("False".equals(statusHistory.getStatusCode())){
+                statusHistory.setStatusCode("否");
+            }
+        }
         Long count = dmsRealtimeStatusMapper.historyTimeCount(history);
-        int minutes = 1440;
-        long days = count/minutes;
-        history1.get(0).setTimeCount(days+"  day");
+        long days = TimeUnit.MINUTES.toDays(count);
+        long hours = TimeUnit.MINUTES.toHours(count) - TimeUnit.DAYS.toHours(days);
+        long mins = TimeUnit.MINUTES.toMinutes(count) - TimeUnit.HOURS.toMinutes(TimeUnit.MINUTES.toHours(count));
+        history1.get(0).setTimeCount(days+"  天"+hours+"  小时"+mins+"  分钟");
         return history1;
     }
 
diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
index f01b8a62..375779c3 100644
--- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
+++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.inspect_status,
             a.is_flag,
             b.remark,
-            a.create_by,
+            b.create_by,
             a.create_time,
             a.update_by,
             a.update_time,
diff --git a/hw-modules/hw-dms/src/main/resources/weixiu.xlsx b/hw-modules/hw-dms/src/main/resources/weixiu.xlsx
index 3843198e0cfb13477008ae6206f42d744b80e330..167ee73b3d0d5ab5ee883787158065b4e13d12bb 100644
GIT binary patch
delta 8274
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
QUtJ1yxFif*@HN!->d-F@cmMzZ

delta 8279
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
VQ(X^Jw<G{E{5I6~nO=GH)y^<w`!oOm

diff --git a/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue b/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue
index 7c6f4c41..d46e8af9 100644
--- a/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue
+++ b/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue
@@ -165,13 +165,13 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目编号" prop="inspectProjectCode">
-          <el-input v-model="form.inspectProjectCode" placeholder="请输入项目编号" />
+          <el-input v-model="form.inspectProjectCode" placeholder="请输入项目编号,如a001" />
         </el-form-item>
         <el-form-item label="项目名称" prop="inspectProject">
-          <el-input v-model="form.inspectProject" placeholder="请输入巡检项目" />
+          <el-input v-model="form.inspectProject" placeholder="请输入巡检项目,如二楼巡检" />
         </el-form-item>
         <el-form-item label="记录方式" prop="recordMethod">
-          <el-input v-model="form.recordMethod" placeholder="请输入记录方式" />
+          <el-input v-model="form.recordMethod" placeholder="请输入记录方式,如手录" />
         </el-form-item>
         <el-form-item label="检查类型" prop="inspectProjectProperty">
           <el-radio-group v-model="form.inspectProjectProperty">
@@ -183,13 +183,13 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="上限" prop="upLimit">
-          <el-input v-model="form.upLimit" placeholder="请输入上限" />
+          <el-input v-model="form.upLimit" placeholder="定量时请输入上限" />
         </el-form-item>
         <el-form-item label="下限" prop="lowLimit">
-          <el-input v-model="form.lowLimit" placeholder="请输入下限" />
+          <el-input v-model="form.lowLimit" placeholder="定量时请输入下限" />
         </el-form-item>
         <el-form-item label="默认值" prop="defValue">
-          <el-input v-model="form.defValue" placeholder="请输入默认值" />
+          <el-input v-model="form.defValue" placeholder="定量时请输入默认值" />
         </el-form-item>
 <!--        <el-form-item label="是否标识：1-是；0-否" prop="isFlag">-->
 <!--          <el-input v-model="form.isFlag" placeholder="请输入是否标识：1-是；0-否" />-->
diff --git a/hw-ui/src/views/dms/dmsBaseInspectRoute/index.vue b/hw-ui/src/views/dms/dmsBaseInspectRoute/index.vue
index 81d7b210..c5e460bd 100644
--- a/hw-ui/src/views/dms/dmsBaseInspectRoute/index.vue
+++ b/hw-ui/src/views/dms/dmsBaseInspectRoute/index.vue
@@ -145,7 +145,7 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
 <!--      <el-table-column label="是否标识：1-是；0-否" align="center" prop="isFlag" />-->
-      <el-table-column label="备注" align="center" prop="remark" />
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -178,10 +178,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="线路编号" prop="routeCode">
-          <el-input v-model="form.routeCode" placeholder="请输入线路编号" />
+          <el-input v-model="form.routeCode" placeholder="请输入线路编号,如a001" />
         </el-form-item>
         <el-form-item label="线路名称" prop="routeName">
-          <el-input v-model="form.routeName" placeholder="请输入线路名称" />
+          <el-input v-model="form.routeName" placeholder="请输入线路名称,如二楼巡检路线" />
         </el-form-item>
 <!--        <el-form-item label="循环周期" prop="cyclePeriod">-->
 <!--          <el-input v-model="form.cyclePeriod" placeholder="请输入循环周期" />-->
@@ -220,9 +220,9 @@
 <!--        <el-form-item label="是否标识：1-是；0-否" prop="isFlag">-->
 <!--          <el-input v-model="form.isFlag" placeholder="请输入是否标识：1-是；0-否" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+<!--        <el-form-item label="备注" prop="remark">-->
+<!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue b/hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue
index 4aaae277..4046b693 100644
--- a/hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue
+++ b/hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue
@@ -154,13 +154,13 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="标准编号" prop="standardCode">
-          <el-input v-model="form.standardCode" placeholder="请输入标准编号" />
+          <el-input v-model="form.standardCode" placeholder="请输入标准编号,如a001" />
         </el-form-item>
         <el-form-item label="标准名称" prop="standardName">
-          <el-input v-model="form.standardName" placeholder="请输入标准名称" />
+          <el-input v-model="form.standardName" placeholder="请输入标准名称,如巡检标准" />
         </el-form-item>
         <el-form-item label="巡检目的" prop="inspectObjective">
-          <el-input v-model="form.inspectObjective" placeholder="请输入巡检目的" />
+          <el-input v-model="form.inspectObjective" placeholder="请输入巡检目的,如产线安全" />
         </el-form-item>
 <!--        <el-form-item label="巡检项目ID，关联dms_base_inspect_project的inspect_project_id" prop="inspectProjectId">-->
 <!--          <el-input v-model="form.inspectProjectId" placeholder="请输入巡检项目ID，关联dms_base_inspect_project的inspect_project_id" />-->
@@ -175,9 +175,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="检查项总数" prop="inspectItemCount">
-          <el-input v-model="form.inspectItemCount" placeholder="请输入检查项总数" />
-        </el-form-item>
+<!--        <el-form-item label="检查项总数" prop="inspectItemCount">-->
+<!--          <el-input v-model="form.inspectItemCount" placeholder="请输入检查项总数" />-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="是否标识：1-是；0-否" prop="isFlag">-->
 <!--          <el-input v-model="form.isFlag" placeholder="请输入是否标识：1-是；0-否" />-->
 <!--        </el-form-item>-->
diff --git a/hw-ui/src/views/dms/dmsBaseMaintProject/index.vue b/hw-ui/src/views/dms/dmsBaseMaintProject/index.vue
index 49cb1e72..a4e4222a 100644
--- a/hw-ui/src/views/dms/dmsBaseMaintProject/index.vue
+++ b/hw-ui/src/views/dms/dmsBaseMaintProject/index.vue
@@ -98,7 +98,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="项目名称" prop="maintProjectName">
-          <el-input v-model="form.maintProjectName" placeholder="请输入项目名称" />
+          <el-input v-model="form.maintProjectName" placeholder="请输入项目名称,如提升机保养" />
         </el-form-item>
         <el-form-item label="项目描述" prop="maintProjectDesc">
           <el-input v-model="form.maintProjectDesc" type="textarea" placeholder="请输入内容" />
diff --git a/hw-ui/src/views/dms/dmsBillsInspectActivity/index.vue b/hw-ui/src/views/dms/dmsBillsInspectActivity/index.vue
index 8fbfd8c8..b74f035f 100644
--- a/hw-ui/src/views/dms/dmsBillsInspectActivity/index.vue
+++ b/hw-ui/src/views/dms/dmsBillsInspectActivity/index.vue
@@ -20,7 +20,7 @@
         </el-col>
         <el-col :span="8" :offset="2">
           <el-form-item label="创建人" >
-            <el-input v-model="this.dmsBillsInstanceList[0].performer" disabled />
+            <el-input v-model="this.dmsBillsInstanceList[0].createBy" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8" :offset="2">
@@ -170,18 +170,18 @@
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="巡检标准" align="center" prop="standardName" />
 <!--      <el-table-column label="操作描述" align="center" prop="operationDescription" />-->
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            style="float: none"-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-bell"-->
-<!--            @click="getJump(scope.row)"-->
-<!--            v-hasPermi="['dms:dmsInspectRouteDetail:edit']"-->
-<!--          >查看详情</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            style="float: none"
+            size="mini"
+            type="text"
+            icon="el-icon-bell"
+            @click="getJump(scope.row)"
+            v-hasPermi="['dms:dmsInspectRouteDetail:edit']"
+          >查看详情</el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
 
diff --git a/hw-ui/src/views/dms/dmsBillsMaintInstance/index.vue b/hw-ui/src/views/dms/dmsBillsMaintInstance/index.vue
index 212ea21c..33b50128 100644
--- a/hw-ui/src/views/dms/dmsBillsMaintInstance/index.vue
+++ b/hw-ui/src/views/dms/dmsBillsMaintInstance/index.vue
@@ -108,7 +108,7 @@
 <!--      <el-table-column label="保养状态：1-待保养；2-保养中；3-已完成" align="center" prop="maintStatus" />-->
       <el-table-column label="保养状态" align="center" prop="maintStatus" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.dms_maint_status" :value="scope.row.maintStatus-1"/>
+          <dict-tag :options="dict.type.dms_maint_status" :value="scope.row.maintStatus"/>
         </template>
       </el-table-column>
 <!--      <el-table-column label="保养完成率" align="center" prop="maintCompRate" />-->
diff --git a/hw-ui/src/views/dms/dmsInspectRouteDetail/index.vue b/hw-ui/src/views/dms/dmsInspectRouteDetail/index.vue
index 01ff501e..82d2db3b 100644
--- a/hw-ui/src/views/dms/dmsInspectRouteDetail/index.vue
+++ b/hw-ui/src/views/dms/dmsInspectRouteDetail/index.vue
@@ -200,7 +200,7 @@
 <!--          <el-input v-model="form.inspectRouteId" placeholder="请输入线路ID,关联dms_base_inspect_route的inspect_route_id" />-->
 <!--        </el-form-item>-->
         <el-form-item label="巡检步骤" prop="lineStep">
-          <el-input v-model="form.lineStep" placeholder="请输入巡检步骤" />
+          <el-input v-model="form.lineStep" placeholder="巡检步骤请输入数字" />
         </el-form-item>
 <!--        <el-form-item label="巡检设备ID，关联dms_base_device_ledger的device_id" prop="deviceId">-->
 <!--          <el-input v-model="form.deviceId" placeholder="请输入巡检设备ID，关联dms_base_device_ledger的device_id" />-->
diff --git a/hw-ui/src/views/dms/dmsPlanInspect/index.vue b/hw-ui/src/views/dms/dmsPlanInspect/index.vue
index 7927435d..8dffb0c0 100644
--- a/hw-ui/src/views/dms/dmsPlanInspect/index.vue
+++ b/hw-ui/src/views/dms/dmsPlanInspect/index.vue
@@ -211,10 +211,10 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="计划编号" prop="planInspectCode">
-          <el-input v-model="form.planInspectCode" placeholder="请输入计划编号" />
+          <el-input v-model="form.planInspectCode" placeholder="请输入计划编号,如a001" />
         </el-form-item>
         <el-form-item label="计划名称" prop="planInspectName">
-          <el-input v-model="form.planInspectName" placeholder="请输入计划名称" />
+          <el-input v-model="form.planInspectName" placeholder="请输入计划名称,如二楼巡检计划" />
         </el-form-item>
 <!--        <el-form-item label="巡检线路ID，关联dm_base_inspect_route的inspect_route_id" prop="inspectRouteId">-->
 <!--          <el-input v-model="form.inspectRouteId" placeholder="请输入巡检线路ID，关联dm_base_inspect_route的inspect_route_id" />-->
@@ -242,6 +242,16 @@
           <el-input v-model="form.deviceAmount"   placeholder="请输入设备总数" :disabled=true  >
           </el-input>
         </el-form-item>
+        <el-form-item label="时间" prop="week">
+          <!--              <el-input-number v-model="form.hour" placeholder="请输入几点"  :precision="0" :min="0" :max="23"/>月-->
+          <!--              <el-input-number v-model="form.timeLimitHours" placeholder="请输入几日"  :precision="0" :min="0" :max="31"/>日-->
+          <el-input-number v-model="form.week" placeholder="请输入周几"  :precision="0" :min="0" :max="7"/>周
+        </el-form-item>
+        <el-form-item label="时间" prop="hour">
+          <el-input-number v-model="form.hour" placeholder="请输入几点"  :precision="0" :min="0" :max="23"/>时
+          <!--              <el-input-number v-model="form.timeLimitHours" placeholder="请输入几日"  :precision="0" :min="0" :max="31"/>日-->
+          <!--              <el-input-number v-model="form.week" placeholder="请输入周几"  :precision="0" :min="0" :max="7"/>周-->
+        </el-form-item>
         <el-row>
           <el-col :span="12">
             <el-form-item label="时限" prop="timeLimitDays">
@@ -372,6 +382,12 @@ export default {
         cronExpression: [
           { required: true, message: "表达式不能为空", trigger: "blur" }
         ],
+        week: [
+          { required: true, message: "定时计划周不能为空", trigger: "blur" }
+        ],
+        hour: [
+          { required: true, message: "定时计划时不能为空", trigger: "blur" }
+        ],
       }
     };
   },
diff --git a/hw-ui/src/views/dms/knowledgeRepair/index.vue b/hw-ui/src/views/dms/knowledgeRepair/index.vue
index 9742069d..616a6f5c 100644
--- a/hw-ui/src/views/dms/knowledgeRepair/index.vue
+++ b/hw-ui/src/views/dms/knowledgeRepair/index.vue
@@ -130,7 +130,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="经验编号" prop="experienceCode">
-          <el-input v-model="form.experienceCode" placeholder="请输入经验编号" />
+          <el-input v-model="form.experienceCode" placeholder="请输入经验编号,如a001" />
         </el-form-item>
 <!--        <el-form-item label="设备类型ID，关联dm_base_device_type的device_type_id" prop="deviceTypeId">-->
 <!--          <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID，关联dm_base_device_type的device_type_id" />-->
@@ -148,9 +148,9 @@
         <el-form-item label="故障描述" prop="faultDescription">
           <el-input v-model="form.faultDescription" placeholder="请输入故障描述" />
         </el-form-item>
-        <el-form-item label="涉及操作" prop="designOperations">
-          <el-input v-model="form.designOperations" placeholder="请输入涉及操作" />
-        </el-form-item>
+<!--        <el-form-item label="涉及操作" prop="designOperations">-->
+<!--          <el-input v-model="form.designOperations" placeholder="请输入涉及操作" />-->
+<!--        </el-form-item>-->
         <el-form-item label="操作描述" prop="operationsDescription">
           <el-input v-model="form.operationsDescription" placeholder="请输入操作描述" />
         </el-form-item>
@@ -245,15 +245,15 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        deviceTypeId: [
-          { required: true, message: "设备类型ID，关联dm_base_device_type的device_type_id不能为空", trigger: "blur" }
-        ],
+        // deviceTypeId: [
+        //   { required: true, message: "设备类型ID，关联dm_base_device_type的device_type_id不能为空", trigger: "blur" }
+        // ],
         isFlag: [
           { required: true, message: "是否标识：1-是；0-否不能为空", trigger: "blur" }
         ],
-        experienceCode: [
-          { required: true, message: "经验编号不能为空", trigger: "blur" }
-        ],
+        // experienceCode: [
+        //   { required: true, message: "经验编号不能为空", trigger: "blur" }
+        // ],
       }
     };
   },
diff --git a/hw-ui/src/views/dms/konwledgeMaint/index.vue b/hw-ui/src/views/dms/konwledgeMaint/index.vue
index b6989c0f..2cdcf749 100644
--- a/hw-ui/src/views/dms/konwledgeMaint/index.vue
+++ b/hw-ui/src/views/dms/konwledgeMaint/index.vue
@@ -145,7 +145,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="经验编号" prop="experienceCode">
-          <el-input v-model="form.experienceCode" placeholder="请输入经验编号" />
+          <el-input v-model="form.experienceCode" placeholder="请输入经验编号,如a001" />
         </el-form-item>
 <!--        <el-form-item label="设备类型ID，关联dms_base_device_type的device_type_id" prop="deviceTypeId">-->
 <!--          <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID，关联dms_base_device_type的device_type_id" />-->
@@ -282,18 +282,18 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        experienceCode: [
-          { required: true, message: "经验编号不能为空", trigger: "blur" }
-        ],
-        deviceTypeId: [
-          { required: true, message: "设备类型不能为空", trigger: "blur" }
-        ],
-        maintStationId: [
-          { required: true, message: "保养部位不能为空", trigger: "blur" }
-        ],
-        maintProtocol: [
-          { required: true, message: "保养标准不能为空", trigger: "blur" }
-        ],
+        // experienceCode: [
+        //   { required: true, message: "经验编号不能为空", trigger: "blur" }
+        // ],
+        // deviceTypeId: [
+        //   { required: true, message: "设备类型不能为空", trigger: "blur" }
+        // ],
+        // maintStationId: [
+        //   { required: true, message: "保养部位不能为空", trigger: "blur" }
+        // ],
+        // maintProtocol: [
+        //   { required: true, message: "保养标准不能为空", trigger: "blur" }
+        // ],
       }
     };
   },
diff --git a/hw-ui/src/views/dms/ledger/index.vue b/hw-ui/src/views/dms/ledger/index.vue
index d6337d2a..1c1f67d6 100644
--- a/hw-ui/src/views/dms/ledger/index.vue
+++ b/hw-ui/src/views/dms/ledger/index.vue
@@ -169,16 +169,16 @@
         </el-button>
       </el-col>
 
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['dms:ledger:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['dms:ledger:export']"
+        >导出</el-button>
+      </el-col>
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/dms/maint/index.vue b/hw-ui/src/views/dms/maint/index.vue
index ed16794e..38ebd43f 100644
--- a/hw-ui/src/views/dms/maint/index.vue
+++ b/hw-ui/src/views/dms/maint/index.vue
@@ -205,7 +205,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="保养组别" prop="maintGroup">
-          <el-input v-model="form.maintGroup" placeholder="请输入保养组别" />
+          <el-input v-model="form.maintGroup" placeholder="请输入保养组别,如A组" />
         </el-form-item>
         <el-form-item label="保养负责人" prop="maintSupervisor">
           <el-input v-model="form.maintSupervisor" placeholder="请输入保养负责人" />
@@ -230,6 +230,16 @@
                 </el-form-item>
         <el-row>
           <el-col :span="12">
+            <el-form-item label="时间" prop="week">
+<!--              <el-input-number v-model="form.hour" placeholder="请输入几点"  :precision="0" :min="0" :max="23"/>月-->
+<!--              <el-input-number v-model="form.timeLimitHours" placeholder="请输入几日"  :precision="0" :min="0" :max="31"/>日-->
+              <el-input-number v-model="form.week" placeholder="请输入周几"  :precision="0" :min="0" :max="7"/>周
+            </el-form-item>
+            <el-form-item label="时间" prop="hour">
+              <el-input-number v-model="form.hour" placeholder="请输入几点"  :precision="0" :min="0" :max="23"/>时
+              <!--              <el-input-number v-model="form.timeLimitHours" placeholder="请输入几日"  :precision="0" :min="0" :max="31"/>日-->
+<!--              <el-input-number v-model="form.week" placeholder="请输入周几"  :precision="0" :min="0" :max="7"/>周-->
+            </el-form-item>
             <el-form-item label="时限" prop="timeLimitDays">
               <el-input-number v-model="form.timeLimitDays" placeholder="请输入天数"  :precision="0" :min="0" :max="10000"/>天
               <el-input-number v-model="form.timeLimitHours" placeholder="请输入小时"  :precision="0" :min="0" :max="23"/>小时
@@ -349,6 +359,12 @@ export default {
         cronExpression: [
           { required: true, message: "定时计划不能为空", trigger: "blur" }
         ],
+        week: [
+          { required: true, message: "定时计划周不能为空", trigger: "blur" }
+        ],
+        hour: [
+          { required: true, message: "定时计划时不能为空", trigger: "blur" }
+        ],
       }
     };
   },
diff --git a/hw-ui/src/views/dms/shutDownRecord/index.vue b/hw-ui/src/views/dms/shutDownRecord/index.vue
new file mode 100644
index 00000000..3bb1497c
--- /dev/null
+++ b/hw-ui/src/views/dms/shutDownRecord/index.vue
@@ -0,0 +1,428 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备ID" prop="deviceId">
+        <el-input
+          v-model="queryParams.deviceId"
+          placeholder="请输入设备ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="停机原因" prop="shutReason">
+        <el-input
+          v-model="queryParams.shutReason"
+          placeholder="请输入停机原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="停机类型" prop="shutTypeId" >
+        <el-select v-model="queryParams.shutTypeId"
+                   placeholder="请输入设备类型"
+        >
+          <el-option
+            v-for="item in shutTypeList"
+            :key="item.shutTypeId"
+            :label="item.shutTypeName"
+            :value="item.shutTypeId" />
+
+        </el-select>
+      </el-form-item>
+      <el-form-item label="停机时间" prop="shutBeginTime">
+        <el-date-picker clearable
+          v-model="queryParams.shutBeginTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择停机开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item><div>-</div></el-form-item>
+      <el-form-item label="" prop="shutEndTime">
+        <el-date-picker clearable
+          v-model="queryParams.shutEndTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择停机结束时间">
+        </el-date-picker>
+      </el-form-item>
+<!--      <el-form-item label="停机时长" prop="shutTime">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.shutTime"-->
+<!--          placeholder="请输入停机时长"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="是否标识：1-是；2-否" prop="isFlag">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.isFlag"-->
+<!--          placeholder="请输入是否标识：1-是；2-否"-->
+<!--          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-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['dms:shutDown: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="['dms:shutDown: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="['dms:shutDown: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="['dms:shutDown:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+    </el-row>
+
+    <el-table v-loading="loading" :data="shutDownList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="主键标识;scada上报的记录" align="center" prop="recordShutDownId" />-->
+      <el-table-column label="设备ID" align="center" prop="deviceId" />
+<!--      <el-table-column label="设备名称" align="center" prop="deviceId" >-->
+<!--        <template slot-scope="scope">-->
+<!--            <span-->
+<!--              v-for="(item, index) in ledgerList"-->
+<!--              :key="index"-->
+<!--              :value="item.ledgerList"-->
+<!--              v-if="scope.row.deviceId == item.deviceId"-->
+<!--            >-->
+<!--              {{ item.deviceName }}-->
+<!--            </span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="停机类型ID，关联dm_base_shut_type的shut_type_id" align="center" prop="shutType" />-->
+      <el-table-column label="停机类型" align="center" prop="shutType" >
+        <template slot-scope="scope">
+            <span
+              v-for="(item, index) in shutTypeList"
+              :key="index"
+              :value="item.shutTypeList"
+              v-if="scope.row.shutType == item.shutTypeId"
+            >
+              {{ item.shutTypeName }}
+            </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="停机原因" align="center" prop="shutReason" />
+      <el-table-column label="停机开始时间" align="center" prop="shutBeginTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.shutBeginTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="停机结束时间" align="center" prop="shutEndTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.shutEndTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="停机时长" align="center" prop="shutTime" />
+<!--      <el-table-column label="是否标识：1-是；2-否" align="center" prop="isFlag" />-->
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['dms:shutDown:edit']"-->
+<!--          >修改</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['dms:shutDown: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"
+    />
+
+    <!-- 添加或修改停机记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="设备ID，关联dms_base_device_ledger的device_id" prop="deviceId">-->
+<!--          <el-input v-model="form.deviceId" placeholder="请输入设备ID，关联dms_base_device_ledger的device_id" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="设备名称" prop="deviceId" >
+          <el-select v-model="form.deviceId" placeholder="请输入设备类型">
+            <el-option
+              v-for="item in ledgerList"
+              :key="item.deviceId"
+              :label="item.deviceName"
+              :value="item.deviceId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="停机类型" prop="shutType" >
+          <el-select v-model="form.shutType" placeholder="请选择停机类型">
+            <el-option
+              v-for="item in shutTypeList"
+              :key="item.shutTypeId"
+              :label="item.shutTypeName"
+              :value="item.shutTypeId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="停机原因" prop="shutReason">
+          <el-input v-model="form.shutReason" placeholder="请输入停机原因" />
+        </el-form-item>
+        <el-form-item label="停机开始时间" prop="shutBeginTime">
+          <el-date-picker clearable
+            v-model="form.shutBeginTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择停机开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="停机结束时间" prop="shutEndTime">
+          <el-date-picker clearable
+            v-model="form.shutEndTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择停机结束时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="停机时长" prop="shutTime">
+          <el-input v-model="form.shutTime" placeholder="请输入停机时长" />
+        </el-form-item>
+<!--        <el-form-item label="是否标识：1-是；2-否" prop="isFlag">-->
+<!--          <el-input v-model="form.isFlag" placeholder="请输入是否标识：1-是；2-否" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" 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 { listShutDown, getShutDown, delShutDown, addShutDown, updateShutDown } from "@/api/dms/shutDown";
+import { listShutType } from '@/api/dms/shutType'
+import { listLedger } from '@/api/dms/ledger'
+
+export default {
+  name: "ShutDown",
+  data() {
+    return {
+      ledgerList:[],
+      shutTypeList:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 停机记录表格数据
+      shutDownList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceId: null,
+        shutType: null,
+        shutReason: null,
+        shutBeginTime: null,
+        shutEndTime: null,
+        shutTime: null,
+        isFlag: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deviceId: [
+          { required: true, message: "设备ID不能为空", trigger: "blur" }
+        ],
+        isFlag: [
+          { required: true, message: "是否标识：1-是；2-否不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDevice();
+    this.getShutType();
+  },
+  methods: {
+    /** 查询停机类型信息列表 */
+    getShutType() {
+      listShutType(this.queryParams).then(response => {
+        console.log(response)
+        this.shutTypeList = response.rows;
+      });
+    },
+    //查询设备信息
+    getDevice(){
+      listLedger().then(response => {
+        // console.log(response)
+        this.ledgerList = response.rows;
+      })
+    },
+    /** 查询停机记录列表 */
+    getList() {
+      this.loading = true;
+      listShutDown(this.queryParams).then(response => {
+        this.shutDownList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        recordShutDownId: null,
+        deviceId: null,
+        shutType: null,
+        shutReason: null,
+        shutBeginTime: null,
+        shutEndTime: null,
+        shutTime: null,
+        isFlag: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.recordShutDownId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加停机记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const recordShutDownId = row.recordShutDownId || this.ids
+      getShutDown(recordShutDownId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改停机记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.recordShutDownId != null) {
+            updateShutDown(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addShutDown(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recordShutDownIds = row.recordShutDownId || this.ids;
+
+      this.$modal.confirm('是否确认删除停机记录编号为"' + recordShutDownIds + '"的数据项？').then(function() {
+        return delShutDown(recordShutDownIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dms/shutDown/export', {
+        ...this.queryParams
+      }, `shutDown_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/hw-ui/src/views/dms/standard/index.vue b/hw-ui/src/views/dms/standard/index.vue
index e3b30097..a5e8b9e8 100644
--- a/hw-ui/src/views/dms/standard/index.vue
+++ b/hw-ui/src/views/dms/standard/index.vue
@@ -154,7 +154,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标准编号" prop="maintStandardCode">
-          <el-input v-model="form.maintStandardCode" placeholder="请输入标准编号" />
+          <el-input v-model="form.maintStandardCode" placeholder="请输入标准编号,如a001" />
         </el-form-item>
 <!--        <el-form-item label="设备类型ID" prop="deviceTypeId">-->
 <!--          <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID，关联dms_base_device_type的device_type_id" />-->
@@ -170,10 +170,10 @@
 <!--          </el-select>-->
 <!--        </el-form-item>-->
         <el-form-item label="保养标准" prop="maintProtocol">
-          <el-input v-model="form.maintProtocol" placeholder="请输入保养标准" />
+          <el-input v-model="form.maintProtocol" placeholder="请输入保养标准,如保养标准" />
         </el-form-item>
         <el-form-item label="操作描述" prop="operationDescription">
-          <el-input v-model="form.operationDescription" placeholder="请输入操作描述" />
+          <el-input v-model="form.operationDescription" placeholder="请输入操作描述，如保养提升机标准" />
         </el-form-item>
 <!--        <el-form-item label="是否标识：1-是；2-否" prop="isFlag">-->
 <!--          <el-input v-model="form.isFlag" placeholder="请输入是否标识：1-是；2-否" />-->
diff --git a/hw-ui/src/views/dms/station/index.vue b/hw-ui/src/views/dms/station/index.vue
index 6e029cdd..145cf9cc 100644
--- a/hw-ui/src/views/dms/station/index.vue
+++ b/hw-ui/src/views/dms/station/index.vue
@@ -172,18 +172,18 @@
 <!--        <el-form-item label="设备类型ID" prop="deviceTypeId">-->
 <!--          <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="设备类型" prop="deviceTypeId" >
-          <el-select v-model="form.deviceTypeId" placeholder="请输入设备类型">
-            <el-option
-              v-for="item in devicetypeList"
-              :key="item.deviceTypeId"
-              :label="item.typeName"
-              :value="item.deviceTypeId">
-            </el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="设备类型" prop="deviceTypeId" >-->
+<!--          <el-select v-model="form.deviceTypeId" placeholder="请输入设备类型">-->
+<!--            <el-option-->
+<!--              v-for="item in devicetypeList"-->
+<!--              :key="item.deviceTypeId"-->
+<!--              :label="item.typeName"-->
+<!--              :value="item.deviceTypeId">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="部位编号" prop="maintStationCode">
-          <el-input v-model="form.maintStationCode" placeholder="请输入部位编号" />
+          <el-input v-model="form.maintStationCode" placeholder="请输入部位编号,如a001" />
         </el-form-item>
 <!--        <el-form-item label="保养标准" prop="protocolCode">-->
 <!--          <el-input v-model="form.protocolCode" placeholder="请输入保养标准" />-->
diff --git a/hw-ui/src/views/ems/base/exception/rule/index.vue b/hw-ui/src/views/ems/base/exception/rule/index.vue
index 489684b3..7fcfc35a 100644
--- a/hw-ui/src/views/ems/base/exception/rule/index.vue
+++ b/hw-ui/src/views/ems/base/exception/rule/index.vue
@@ -156,7 +156,7 @@
         <el-form-item label="能源类型" prop="energyType">
           <el-radio-group v-model="form.energyType">
             <el-radio
-              v-for="dict in dict.type.energy_type"
+              v-for="dict in dict.type.alarm_energy_type"
               :key="dict.value"
               :label="dict.value*1"
             >{{dict.label}}</el-radio>
@@ -229,7 +229,7 @@ import { listRule, getRule, delRule, addRule, updateRule } from "@/api/ems/base/
 
 export default {
   name: "Rule",
-  dicts: ['energy_type','trigger_rule'],
+  dicts: ['energy_type','trigger_rule','alarm_energy_type'],
   data() {
     return {
       // 遮罩层