From 221d528f32941bc284125fc9c13037b8ac2c4453 Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Fri, 29 Nov 2024 11:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E5=8F=8A?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8E=86=E5=8F=B2=E7=8A=B6=E6=80=81=E5=89=8D?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DmsRealtimeStatusController.java          |   7 +
 .../dms/domain/DmsRealtimeStatusHistory.java  | 137 ++++
 .../dms/mapper/DmsRealtimeStatusMapper.java   |   6 +
 .../service/IDmsRealtimeStatusService.java    |   3 +
 .../impl/DmsRealtimeStatusServiceImpl.java    |  11 +
 .../mapper/dms/DmsRealtimeStatusMapper.xml    |  27 +
 hw-ui/src/api/dms/activity.js                 |   7 +
 hw-ui/src/api/dms/dmsBillsFaultInstance.js    |   7 +
 hw-ui/src/views/dms/deviceStatus/index.vue    | 633 ++++++++++++++++++
 .../views/dms/deviceStatusHistory/index.vue   | 227 +++++++
 10 files changed, 1065 insertions(+)
 create mode 100644 hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsRealtimeStatusHistory.java
 create mode 100644 hw-ui/src/views/dms/deviceStatus/index.vue
 create mode 100644 hw-ui/src/views/dms/deviceStatusHistory/index.vue

diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsRealtimeStatusController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsRealtimeStatusController.java
index 485b94a3..8a4209c2 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsRealtimeStatusController.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsRealtimeStatusController.java
@@ -4,6 +4,7 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.hw.dms.domain.DmsRealtimeStatusHistory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -45,6 +46,12 @@ public class DmsRealtimeStatusController extends BaseController {
         List<DmsRealtimeStatus> list = dmsRealtimeStatusService.selectDmsRealtimeStatusList(dmsRealtimeStatus);
         return getDataTable(list);
     }
+    @GetMapping("/history")
+    public TableDataInfo history(DmsRealtimeStatusHistory history) {
+        startPage();
+        List<DmsRealtimeStatusHistory> list = dmsRealtimeStatusService.history(history);
+        return getDataTable(list);
+    }
 
     /**
      * 导出设备实时状态列表
diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsRealtimeStatusHistory.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsRealtimeStatusHistory.java
new file mode 100644
index 00000000..f0d10159
--- /dev/null
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsRealtimeStatusHistory.java
@@ -0,0 +1,137 @@
+package com.hw.dms.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hw.common.core.annotation.Excel;
+import com.hw.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 设备实时状态对象历史 dms_realtime_status_history
+ *
+ * @author Yinq
+ * @date 2024-09-02
+ */
+@Data
+public class DmsRealtimeStatusHistory extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键标识
+     */
+    private Long historyId;
+    private Long statusId;
+
+    /**
+     * 设备状态编号
+     */
+    @Excel(name = "设备状态编号")
+    private String statusCode;
+
+    /**
+     * 设备状态名称
+     */
+    @Excel(name = "设备状态名称")
+    private String statusName;
+
+    /**
+     * 设备状态值
+     */
+    @Excel(name = "设备状态值")
+    private String statusValue;
+
+    /**
+     * 所属设备id
+     */
+    @Excel(name = "所属设备id")
+    private Long deviceId;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+    private String timeCount;
+
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date creatTime;
+    private Date updateTime;
+    private Date syncTime;
+    private Date realBeginTime;
+    private Date realEndTime;
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public void setStatusId(Long statusId) {
+        this.statusId = statusId;
+    }
+
+    public Long getStatusId() {
+        return statusId;
+    }
+
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public String getStatusCode() {
+        return statusCode;
+    }
+
+    public void setStatusName(String statusName) {
+        this.statusName = statusName;
+    }
+
+    public String getStatusName() {
+        return statusName;
+    }
+
+    public void setStatusValue(String statusValue) {
+        this.statusValue = statusValue;
+    }
+
+    public String getStatusValue() {
+        return statusValue;
+    }
+
+    public void setDeviceId(Long deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("statusId", getStatusId())
+                .append("statusCode", getStatusCode())
+                .append("statusName", getStatusName())
+                .append("statusValue", getStatusValue())
+                .append("deviceId", getDeviceId())
+                .append("creatTime", getCreatTime())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}
diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsRealtimeStatusMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsRealtimeStatusMapper.java
index fb5cff87..a254d5a3 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsRealtimeStatusMapper.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsRealtimeStatusMapper.java
@@ -3,6 +3,8 @@ package com.hw.dms.mapper;
 import java.util.List;
 
 import com.hw.dms.domain.DmsRealtimeStatus;
+import com.hw.dms.domain.DmsRealtimeStatusHistory;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备实时状态Mapper接口
@@ -58,4 +60,8 @@ public interface DmsRealtimeStatusMapper {
      * @return 结果
      */
     public int deleteDmsRealtimeStatusByStatusIds(Long[] statusIds);
+
+    List<DmsRealtimeStatusHistory> history(DmsRealtimeStatusHistory history);
+
+    Long historyTimeCount(DmsRealtimeStatusHistory history);
 }
diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsRealtimeStatusService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsRealtimeStatusService.java
index e078c8b5..e669822a 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsRealtimeStatusService.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsRealtimeStatusService.java
@@ -3,6 +3,7 @@ package com.hw.dms.service;
 import java.util.List;
 
 import com.hw.dms.domain.DmsRealtimeStatus;
+import com.hw.dms.domain.DmsRealtimeStatusHistory;
 
 /**
  * 设备实时状态Service接口
@@ -58,4 +59,6 @@ public interface IDmsRealtimeStatusService {
      * @return 结果
      */
     public int deleteDmsRealtimeStatusByStatusId(Long statusId);
+
+    List<DmsRealtimeStatusHistory> history(DmsRealtimeStatusHistory history);
 }
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 cf3721e6..3fe17db5 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
@@ -3,6 +3,7 @@ package com.hw.dms.service.impl;
 import java.util.List;
 
 import com.hw.common.core.utils.DateUtils;
+import com.hw.dms.domain.DmsRealtimeStatusHistory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hw.dms.mapper.DmsRealtimeStatusMapper;
@@ -76,6 +77,14 @@ public class DmsRealtimeStatusServiceImpl implements IDmsRealtimeStatusService {
         return dmsRealtimeStatusMapper.deleteDmsRealtimeStatusByStatusIds(statusIds);
     }
 
+    @Override
+    public List<DmsRealtimeStatusHistory> history(DmsRealtimeStatusHistory history) {
+        List<DmsRealtimeStatusHistory> history1 = dmsRealtimeStatusMapper.history(history);
+        Long count = dmsRealtimeStatusMapper.historyTimeCount(history);
+        history1.get(0).setTimeCount(count+"min");
+        return history1;
+    }
+
     /**
      * 删除设备实时状态信息
      *
@@ -86,4 +95,6 @@ public class DmsRealtimeStatusServiceImpl implements IDmsRealtimeStatusService {
     public int deleteDmsRealtimeStatusByStatusId(Long statusId) {
         return dmsRealtimeStatusMapper.deleteDmsRealtimeStatusByStatusId(statusId);
     }
+
+
 }
diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsRealtimeStatusMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsRealtimeStatusMapper.xml
index f9a3d3e3..ff6b9137 100644
--- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsRealtimeStatusMapper.xml
+++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsRealtimeStatusMapper.xml
@@ -44,6 +44,33 @@
         <include refid="selectDmsRealtimeStatusVo"/>
         where drs.status_id = #{statusId}
     </select>
+    <select id="history" resultType="com.hw.dms.domain.DmsRealtimeStatusHistory"
+            parameterType="java.lang.Long">
+        select
+        a.*,
+        b.device_name
+        from
+        dms_realtime_status_history a
+        left join dms_base_device_ledger b on
+        a.device_id = b.device_id
+        <where>
+            <if test="realBeginTime != null">and a.sync_time > #{realBeginTime}</if>
+            <if test="statusId != null">and a.status_id = #{statusId}</if>
+            <if test="realEndTime != null ">and a.#{realEndTime} > sync_time</if>
+        </where>
+    </select>
+    <select id="historyTimeCount" resultType="java.lang.Long"
+            parameterType="com.hw.dms.domain.DmsRealtimeStatusHistory">
+        select
+       count(1)  from
+        dms_realtime_status_history
+        <where>
+            status_value = 'True'
+            <if test="realBeginTime != null">and sync_time > #{realBeginTime}</if>
+            <if test="statusId != null">and status_id = #{statusId}</if>
+            <if test="realEndTime != null ">and #{realEndTime} > sync_time</if>
+        </where>
+    </select>
 
     <insert id="insertDmsRealtimeStatus" parameterType="DmsRealtimeStatus" useGeneratedKeys="true"
             keyProperty="statusId">
diff --git a/hw-ui/src/api/dms/activity.js b/hw-ui/src/api/dms/activity.js
index b41d42ec..5715c502 100644
--- a/hw-ui/src/api/dms/activity.js
+++ b/hw-ui/src/api/dms/activity.js
@@ -16,6 +16,13 @@ export function getActivity(instanceActivityId) {
     method: 'get'
   })
 }
+export function history(query) {
+  return request({
+    url: '/dms/dmsRealtimeStatus/history',
+    method: 'get',
+    params: query
+  })
+}
 
 // 新增故障报修工单实例节点
 export function addActivity(data) {
diff --git a/hw-ui/src/api/dms/dmsBillsFaultInstance.js b/hw-ui/src/api/dms/dmsBillsFaultInstance.js
index af9e79c7..87e5cd8f 100644
--- a/hw-ui/src/api/dms/dmsBillsFaultInstance.js
+++ b/hw-ui/src/api/dms/dmsBillsFaultInstance.js
@@ -22,6 +22,13 @@ export function listDmsBillsFaultInstancecompleted(query) {
     params: query
   })
 }
+export function deviceStatusList(query) {
+  return request({
+    url: '/dms/dmsRealtimeStatus/list',
+    method: 'get',
+    params: query
+  })
+}
 // // 检修工单记录导出
 // export function handleFaultExport(repairInstanceId) {
 //   return request({
diff --git a/hw-ui/src/views/dms/deviceStatus/index.vue b/hw-ui/src/views/dms/deviceStatus/index.vue
new file mode 100644
index 00000000..c362a795
--- /dev/null
+++ b/hw-ui/src/views/dms/deviceStatus/index.vue
@@ -0,0 +1,633 @@
+<template>
+  <div class="app-container">
+
+    <el-table v-loading="loading" :data="dmsStatusList" @selection-change="handleSelectionChange">
+      <el-table-column label="设备编号" align="center" prop="statusCode" />
+<!--      <el-table-column label="工单状态：0-待维修，1-维修中，2-维修完成，3-待检修，4-检修中，5-检修完成" align="center" prop="billsStatus" />-->
+      <el-table-column label="设备状态名称" align="center" prop="statusName" />
+      <el-table-column label="设备状态值" align="center" prop="statusValue" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" />
+      <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="getJump(scope.row)"
+            v-hasPermi="['dms:dmsBillsFaultInstance:edit']"
+          >历史详情</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="96px">
+        <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="faultSourceType">
+          <el-select @change="change"  v-model="form.faultSourceType" placeholder="报修来源类型" >
+            <el-option
+              v-for="item in dict.type.dms_fault_source_type"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检修工单编码" prop="faultSourceId" v-if="isShow1">
+          <el-select v-model="form.faultSourceId" placeholder="检修工单编码" >
+            <el-option
+              v-for="item in this.dmsRepairInstanceList"
+              :key="item.repairInstanceId"
+              :label="item.billsRepairCode"
+              :value="item.repairInstanceId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="点检工单编码" prop="faultSourceId" v-if="isShow2">
+          <el-select v-model="form.faultSourceId" placeholder="点检工单编码" >
+            <el-option
+              v-for="item in this.pointList"
+              :key="item.inspectInstanceId"
+              :label="item.billsInspectCode"
+              :value="item.inspectInstanceId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="巡检工单编码" prop="faultSourceId" v-if="isShow3">
+          <el-select v-model="form.faultSourceId" placeholder="巡检工单编码" >
+            <el-option
+              v-for="item in this.inspectInstanceList"
+              :key="item.inspectInstanceId"
+              :label="item.billsInspectCode"
+              :value="item.inspectInstanceId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+<!--        <el-form-item label="报修来源id" prop="faultSourceId">-->
+<!--          <el-input v-model="form.faultSourceId" placeholder="请输入报修来源ID" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="报修工单编号" prop="faultSourceId" v-if="isShow9">
+          <el-input v-model="form.faultSourceId" placeholder="请输入报修工单编号" />
+        </el-form-item>
+<!--        <el-form-item label="工单状态" prop="billsStatus">-->
+<!--          <el-select v-model="form.billsStatus" placeholder="工单状态" >-->
+<!--            <el-option-->
+<!--              v-for="item in dict.type.bills_status"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value"-->
+<!--            >-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--&lt;!&ndash;          <el-radio-group v-model="form.billsStatus">&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-radio&ndash;&gt;-->
+<!--&lt;!&ndash;              v-for="dict in dict.type.bills_status"&ndash;&gt;-->
+<!--&lt;!&ndash;              :key="dict.value"&ndash;&gt;-->
+<!--&lt;!&ndash;              :label="dict.value"&ndash;&gt;-->
+<!--&lt;!&ndash;            >{{dict.label}}</el-radio>&ndash;&gt;-->
+<!--&lt;!&ndash;          </el-radio-group>&ndash;&gt;-->
+<!--        </el-form-item>-->
+
+<!--        <el-form-item label="工单流程ID，关联wf_process的wf_process_id" prop="wfProcessId">-->
+<!--          <el-input v-model="form.wfProcessId" placeholder="请输入工单流程ID，关联wf_process的wf_process_id" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="工单编号" prop="billsFaultCode">-->
+<!--          <el-input v-model="form.billsFaultCode" placeholder="请输入工单编号" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="申请人" prop="applyUser">-->
+<!--        <el-input v-model="form.applyUser" placeholder="请输入申请人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="申请时间" prop="applyTime">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.applyTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="请选择申请时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="工单类型" prop="instanceType">-->
+<!--          <el-select v-model="form.instanceType" placeholder="工单类型" >-->
+<!--            <el-option-->
+<!--              v-for="item in dict.type.dms_instance_type"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value"-->
+<!--            >-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="实际开始时间" prop="realBeginTime">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.realBeginTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="请选择实际开始时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="实际完成时间" prop="realEndTime">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.realEndTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="请选择实际完成时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item label="要求完成时间" prop="requireEndTime">
+          <el-date-picker clearable
+            v-model="form.requireEndTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择要求完成时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+
+
+        <el-divider content-position="center">故障报修工单信息</el-divider>
+
+
+
+        <el-form-item label="故障类别" prop="faultType">
+          <el-select   v-model="form.faultType" placeholder="故障类别" >
+            <el-option
+              v-for="item in dict.type.dms_fault_type"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <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="repairType">
+          <el-radio-group v-model="form.repairType">
+            <el-radio
+              @change="changeOut"
+              v-for="dict in dict.type.dms_fault_repair_type"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="外协单位" prop="outsrcId" v-if="isShowOut">
+          <el-select   v-model="form.outsrcId" placeholder="外协单位" >
+            <el-option
+              v-for="item in dmsInfoList"
+              :key="item.outsrcId"
+              :label="item.outsrcName"
+              :value="item.outsrcId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item   prop="pictureUrl">
+          <el-upload
+            :action="imgUpload.url"
+            :headers="imgUpload.headers"
+            :on-success="handlePictureSuccess"
+            :before-upload="beforePictureUpload"
+            list-type="picture-card"
+            :file-list="fileListShow"
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <!--图片预览的dialog-->
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl">
+          </el-dialog>
+        </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 {
+  listDmsBillsFaultInstance,
+  getDmsBillsFaultInstance,
+  delDmsBillsFaultInstance,
+  addDmsBillsFaultInstance,
+  updateDmsBillsFaultInstance,
+  listDmsBillsFaultInstancecompleted,
+  handleFaultExport, deviceStatusList,
+} from "@/api/dms/dmsBillsFaultInstance";
+import { listDmsRepair } from '@/api/dms/dmsRepair'
+import { listDmsRepairInstance } from '@/api/dms/dmsRepairInstance'
+import {  listPoint,listSelectInspection } from '@/api/dms/dmsBillsInstance'
+import { listLedger } from '@/api/dms/ledger'
+import { listDmsInfo } from '@/api/dms/dmsInfo'
+import { getToken } from '@/utils/auth'
+import app from "@/store/modules/app";
+
+
+export default {
+  name: "DmsBillsFaultInstance",
+  dicts:['bills_status','approve_status','confirm_status','dms_instance_type','dms_fault_source_type','dms_fault_type','dms_repair_type','dms_fault_repair_type'],
+  data() {
+    return {
+      //图片上传判断是否有相同图片
+      isCommonName: true,
+      //修改时此属性用于接收数据库中图片存储list，图片才能正常显示
+      fileListShow: [],
+      //页面上存的暂时图片地址List
+      fileListPut: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      imgUpload: {
+        // 设置上传的请求头部
+        headers: {
+          Authorization: "Bearer " + getToken()
+        },
+        // 图片上传的方法地址:
+        url: process.env.VUE_APP_BASE_API + "/file/upload",
+        url2: process.env.VUE_APP_BASE_API,
+      },
+
+
+
+      isShow1:false,
+      isShow2:false,
+      isShow3:false,
+      isShow9:false,
+      isShowOut:false,
+      imgAddress:[],
+      //外协
+      dmsInfoList:[],
+      //设备
+      ledgerList:[],
+      //巡检工单列表
+      inspectInstanceList:[],
+      //点检工单列表
+      pointList:[],
+      //点巡检工单列表
+      dmsBillsInstanceList:[],
+      //检修工单列表
+      dmsRepairInstanceList:[],
+      dmsRepairList:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 检修工单表格数据
+      dmsBillsFaultInstanceList: [],
+      dmsStatusList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 表单参数
+      form: {},
+      approve: {},
+      // 表单校验
+      rules: {
+        wfProcessId: [
+          { required: true, message: "工单流程ID，关联wf_process的wf_process_id不能为空", trigger: "blur" }
+        ],
+        billsFaultCode: [
+          { required: true, message: "工单编号不能为空", trigger: "blur" }
+        ],
+        billsStatus: [
+          { required: true, message: "工单状态：0-待维修，1-维修中，2-维修完成，3-待检修，4-检修中，5-检修完成不能为空", trigger: "change" }
+        ],
+        instanceType: [
+          { required: true, message: "工单类型不能为空", trigger: "change" }
+        ],
+        isFlag: [
+          { required: true, message: "是否标识：1-是；0-否不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getdmsRepair();
+    this.getBillsFaultInstance();
+    this.getDmsBillsInstancePoint();
+    this.getDmsBillsInstanceInspection();
+    this.getDeviveLedger();
+    this.getoutsrcId();
+  },
+  methods: {
+    //图片上传前的相关判断
+    beforePictureUpload(file){
+      //每次进来初始化 isCommonName 为true
+      this.isCommonName = true;
+      const isJPG = file.type === 'image/jpeg';
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      //判断是否有相同的图片，如何有即提示并添加失败
+      if(this.fileListPut.length > 0){
+        this.fileListPut.forEach((item,index)=>{
+          if(item.name == file.name){
+            this.$message.error('已存在相同的图片！');
+            this.isCommonName = false;
+          }
+        })
+      }
+      if (!isJPG) {
+        this.$message.error('请上传图片格式的文件！');
+      }
+      if (!isLt2M) {
+        this.$message.error('上传的图片不能超过2MB!');
+      }
+      return isJPG && isLt2M && this.isCommonName;
+    },
+    //图片上传删除
+    handleRemove(file, fileList) {
+      //根据传进来删除的file里图片，同时删除保存在fileListPut的相同图片
+      if(this.fileListPut.length > 0){
+        this.fileListPut = this.fileListPut.filter((item, index)=>{
+          return item.name != file.name;
+        })
+      }
+    },
+    //图片预览
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    //图片上传成功后的回调
+    handlePictureSuccess(res, file) {
+      //设置图片访问路径
+      const imgObjectUrl = this.imgUpload.url2 + file.response.imgUrl;
+      //这是每个成功上传图片，以对象的形式保存在一个数组中，进而以JSON格式保存在数据库中某个字段里
+      let currentFile = { name: '', url: '' };
+      currentFile.name = file.name;
+      currentFile.url = imgObjectUrl;
+      this.imgAddress.push(res.data.url);
+      //往此数组中保存当前图片对象
+      this.fileListPut.push(currentFile);
+      console.log(this.fileListPut)
+    },
+
+
+    getJump(row){
+      console.log(row.statusId)
+      // debugger
+      this.$router.push({"path":'/dms/shut/history/',"query": {"statusId":row.statusId}})
+    },
+    getJumpSelect(row){
+      this.$router.push('/dms/activity/index/'+row.repairInstanceId)
+    },
+    getoutsrcId() {
+      listDmsInfo().then(response => {
+        this.dmsInfoList = response.rows;
+      });
+    },
+    /** 查询设备台账信息列表 */
+    getDeviveLedger() {
+      listLedger().then(response => {
+        this.ledgerList = response.rows;
+      });
+    },
+    changeOut(){
+      if (this.form.repairType==2){
+        this.isShowOut=true;}
+      else{
+        this.isShowOut = false;
+      }
+    },
+    change(){
+      if (this.form.faultSourceType == 1)
+      {
+        this.isShow1=true
+        this.isShow2=false
+        this.isShow3=false
+        this.isShow9=false
+        this.form.faultSourceId=null
+      }else if (this.form.faultSourceType==2){
+        this.isShow2=true
+        this.isShow1=false
+        this.isShow3=false
+        this.isShow9=false
+        this.form.faultSourceId=null
+
+      }else if (this.form.faultSourceType==3){
+        this.isShow3=true
+        this.isShow1=false
+        this.isShow2=false
+        this.isShow9=false
+        this.form.faultSourceId=null
+
+      }else if (this.form.faultSourceType==9){
+        this.isShow1=false
+        this.isShow2=false
+        this.isShow3=false
+        this.form.faultSourceId=null
+        this.isShow9=true
+      }
+
+    },
+
+    /** 查询检修计划信息列表 */
+    getdmsRepair() {
+      listDmsRepair(this.queryParams).then(response => {
+        this.dmsRepairList = response.rows;
+      });
+    },
+    /** 查询检修工单列表*/
+    getBillsFaultInstance() {
+      listDmsRepairInstance().then(response => {
+        this.dmsRepairInstanceList = response.rows;
+        console.log(this.dmsRepairInstanceList);
+      })},
+    /** 查询点检工单列表*/
+    getDmsBillsInstancePoint(){
+        listPoint().then(response => {
+          this.pointList = response.rows;
+        })
+        },
+    getDmsBillsInstanceInspection(){
+      listSelectInspection().then(response => {
+        this.inspectInstanceList = response.rows;
+        console.log(this.inspectInstanceList)
+      })
+
+    },
+    /** 查询报修工单列表 */
+    getList() {
+      this.loading = true;
+      deviceStatusList(this.queryParams).then(response => {
+        this.dmsStatusList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        repairInstanceId: null,
+        faultSourceType: null,
+        faultSourceId: null,
+        wfProcessId: null,
+        billsFaultCode: null,
+        billsStatus: null,
+        applyUser: null,
+        applyTime: null,
+        realBeginTime: null,
+        realEndTime: null,
+        requireEndTime: null,
+        instanceType: 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.queryParams.faultSourceType = null;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.repairInstanceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.fileListShow = [];
+      this.isShowOut = false;
+      this.open = true;
+      this.title = "添加报修工单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const repairInstanceId = row.repairInstanceId || this.ids
+      getDmsBillsFaultInstance(repairInstanceId).then(response => {
+        this.form = response.data;
+        this.fileListShow = response.data.dmsInstanceFiles
+        // this.fileListShow = response.data.sysFiles
+        console.log(this.fileListShow)
+        this.open = true;
+        this.title = "修改报修工单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.repairInstanceId != null) {
+            updateDmsBillsFaultInstance(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.wfProcessId = 102;
+            this.form.isFlag = 1;
+            this.form.fileUrls = this.imgAddress;
+            alert(this.imgAddress)
+            addDmsBillsFaultInstance(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const repairInstanceIds = row.repairInstanceId || this.ids;
+      this.$modal.confirm('是否确认删除检修工单编号为"' + repairInstanceIds + '"的数据项？').then(function() {
+        return delDmsBillsFaultInstance(repairInstanceIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 删除按钮操作 */
+    handleUpadateApprove(repairInstanceId,repairConfirm) {
+      console.log(repairConfirm);
+      this.approve.repairInstanceId = repairInstanceId;
+      this.approve.repairConfirm = repairConfirm;
+      console.log(this.approve);
+        updateDmsBillsFaultInstance(this.approve).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("确认成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dms/dmsBillsFaultInstance/export', {
+        ...this.queryParams
+      }, `dmsBillsFaultInstance_${new Date().getTime()}.xlsx`)
+    },
+    /** 导出报修按钮操作 */
+    handleFaultExport(repairInstanceId) {
+      this.download('dms/dmsBillsFaultInstance/faultRecordExport', {
+        repairInstanceId
+      }, `dmsBillsFaultInstance_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/hw-ui/src/views/dms/deviceStatusHistory/index.vue b/hw-ui/src/views/dms/deviceStatusHistory/index.vue
new file mode 100644
index 00000000..02238ebc
--- /dev/null
+++ b/hw-ui/src/views/dms/deviceStatusHistory/index.vue
@@ -0,0 +1,227 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="实际开始时间" prop="realBeginTime">
+        <el-date-picker clearable
+                        v-model="queryParams.realBeginTime"
+                        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="realEndTime">
+        <el-date-picker clearable
+                        v-model="queryParams.realEndTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择实际结束时间">
+        </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 :model="dmsHistoryList" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
+      <el-form-item label="设备运行总时长" prop="timeCount">
+        <el-input
+          v-model="dmsHistoryList[0].timeCount"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+    </el-form>
+
+
+
+    <el-table v-loading="loading" :data="dmsHistoryList" @selection-change="handleSelectionChange">
+      <el-table-column label="设备编号" align="center" prop="statusCode" />
+      <!--      <el-table-column label="工单状态：0-待维修，1-维修中，2-维修完成，3-待检修，4-检修中，5-检修完成" align="center" prop="billsStatus" />-->
+      <el-table-column label="设备状态名称" align="center" prop="statusName" />
+      <el-table-column label="设备状态值" align="center" prop="statusValue" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import {
+  getActivity,
+  delActivity,
+  addActivity,
+  updateActivity,
+  selectUserIdByInspectInstanceId,
+  history
+} from "@/api/dms/activity";
+import {getDmsPartsList, listDmsBillsFaultInstance} from '@/api/dms/dmsBillsFaultInstance'
+import { listWfprocessactivity } from '@/api/system/common/wfprocessactivity'
+import { listAllLedger } from '@/api/dms/ledger'
+import { listDmsInfo } from '@/api/dms/dmsInfo'
+import ViewFile from "@/components/viewFile/index.vue";
+
+export default {
+  name: "Activity",
+  dicts:['dms_fault_type','dms_repair_type','dms_bills_status','dms_inspect_type','dms_fault_source_type'],
+  components: {ViewFile},
+  data() {
+    return {
+      //报修来源类型
+      faultSourceTypeCheck:"",
+      //外协
+      dmsInfoList:[],
+      //设备
+      ledgerList:[],
+      //流程信息
+      wfProcessActivityList:[],
+      //报修工单
+      dmsBillsFaultInstanceList:[],
+      dmsHistoryList:[],
+      dmsPartsList:[],
+      stepsNum:"",
+      ListLength:"",
+      isUpdate:false,
+      nowPorcessStepOrder:"",
+      repairInstanceIdCheck:"",
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 故障报修工单实例节点表格数据
+      activityList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        realBeginTime: null,
+        realEndTime: null
+      },
+      queryParamWfProcessActivity:{
+        wfProcessId:null,
+      },
+      // 表单参数
+      form: {},
+      form1:{},
+      // 表单校验
+      rules: {
+        repairInstanceId: [
+          { required: true, message: "维修工单实例ID，关联dms_bills_repair_instance的repair_instance_id不能为空", trigger: "blur" }
+        ],
+        processHandleStatus: [
+          { required: true, message: "状态(0已结束，1执行中，2、待接取，3、已转发）不能为空", trigger: "change" }
+        ],
+        processStepOrder: [
+          { required: true, message: "工单流程步骤顺序不能为空", trigger: "blur" }
+        ],
+      },
+
+      //显示预览文件
+      showFileDialog: false,
+      //显示预览文件标题
+      thisTitle: "故障图片",
+      //预览文件数据列表
+      fileListData: [],
+    };
+  },
+  created() {
+    console.log(this.$route)
+    const statusId = this.$route.query && this.$route.query.statusId;
+    this.queryParams.statusId = statusId;
+    this.isUpdate = true;
+    this.getList();
+  },
+  methods: {
+    /** 查询历史列表 */
+    getList() {
+      this.loading = true;
+      console.log(this.queryParams)
+      history(this.queryParams).then(response => {
+        this.dmsHistoryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.instanceActivityId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.instanceActivityId != null) {
+            updateActivity(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            for (let i = 0; i < this.wfProcessActivityList.length;i++){
+              if (this.form1.processStepOrder+1 == this.wfProcessActivityList[i].processActivityOrder){
+                this.form1.processActivityId = this.wfProcessActivityList[i].processActivityId;
+                // alert(this.wfProcessActivityList[i].processActivityId)
+              }
+            }
+            this.form1.instanceActivityId =null;
+            //顺序自增
+            this.form1.processStepOrder = this.form1.processStepOrder+1;
+            this.form1.wfLength = this.wfProcessActivityList.length;
+            addActivity(this.form1).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              this.getWfprocessActivity();
+              this.getBillsFaultInstance();
+              this.getDeviveLedger();
+              this.getoutsrcId();
+            });
+          }
+        }
+      });
+    },
+  }
+};
+</script>