From c6d8d08f3553a523738ee5ce36abe341edc3db19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Tue, 23 Sep 2025 18:58:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9B=B8=E5=85=B3=E7=BB=84=E4=BB=B6=E3=80=81API?=
 =?UTF-8?q?=E5=8F=8A=E6=95=B0=E6=8D=AE=E5=8F=AF=E8=A7=86=E5=8C=96=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增设备台账、设备类型、设备检查项等基础组件
- 添加设备维修、点检、巡检等业务功能组件
- 实现设备数据可视化分析功能，包括折线图、柱状图、饼图等图表组件
- 新增设备管理相关API接口，包括设备台账、维修记录、点检计划等
- 实现设备状态看板、任务分析、人员响应分析等功能页面
- 添加设备操作弹窗及相关业务逻辑
- 完善设备管理模块的样式和交互逻辑
---
 src/api/deviceManagement/dataAnalysis.js      |  94 +++
 src/api/deviceManagement/deviceaccount.js     | 150 +++++
 src/api/deviceManagement/deviceformconfig.js  |  57 ++
 src/api/deviceManagement/deviceinspect.js     | 107 ++++
 .../devicemaintenancerecord.js                |  57 ++
 .../devicepointinspectionplan.js              |  57 ++
 src/api/deviceManagement/devicerepair.js      |  57 ++
 .../devicerouteinspectionplan.js              |  57 ++
 src/api/deviceManagement/devicetaskexecute.js | 173 ++++++
 .../devicetaskexecuteresult1.js               |  57 ++
 src/api/deviceManagement/devicetype.js        |  53 ++
 .../BaseDeviceAccountTreeSelect/index.vue     |  44 ++
 .../BaseDeviceAccountView/index.vue           |  50 ++
 .../components/BaseDeviceTypeTree/index.vue   |  38 ++
 .../BaseDeviceTypeTreeSelect/index.vue        |  35 ++
 .../components/deviceInspect/index.vue        |  14 +
 .../components/devicelist/index.vue           | 394 ++++++++++++
 .../components/devicelist_point/index.vue     | 385 ++++++++++++
 .../components/devicelist_route/index.vue     | 392 ++++++++++++
 .../deviceManagement/datascreen/DemoChart.vue |  12 +
 .../datascreen/components/barChart1.vue       | 137 +++++
 .../datascreen/components/barChart2.vue       | 137 +++++
 .../datascreen/components/lineChart1.vue      | 137 +++++
 .../datascreen/components/lineChart2.vue      | 139 +++++
 .../datascreen/components/lineChart3.vue      | 139 +++++
 .../datascreen/components/lineChart4.vue      | 138 +++++
 .../datascreen/components/pieChart1.vue       | 131 ++++
 .../datascreen/components/pieChart2.vue       | 133 +++++
 .../datascreen/components/table1.vue          | 190 ++++++
 .../datascreen/components/table2.vue          | 194 ++++++
 .../datascreen/dayTaskAnalysis/index.vue      |  74 +++
 .../datascreen/dayTaskAnalysis/table1.vue     | 186 ++++++
 .../datascreen/dayTaskAnalysis/table2.vue     | 190 ++++++
 .../datascreen/deviceAnalysis/DemoChart.vue   | 291 +++++++++
 .../datascreen/deviceAnalysis/barChart1.vue   | 162 +++++
 .../datascreen/deviceAnalysis/barChart2.vue   | 169 ++++++
 .../datascreen/deviceAnalysis/index.vue       | 195 ++++++
 .../datascreen/deviceAnalysis/lineChart1.vue  | 167 ++++++
 .../datascreen/deviceAnalysis/pieChart1.vue   | 146 +++++
 .../datascreen/deviceAnalysis/pieChart2.vue   | 148 +++++
 .../datascreen/deviceAnalysis/pieChart3.vue   | 148 +++++
 .../deviceManagement/datascreen/index.vue     | 340 +++++++++++
 .../datascreen/personAnalysis/index.vue       | 137 +++++
 .../datascreen/personAnalysis/lineChart1.vue  | 350 +++++++++++
 .../datascreen/personAnalysis/lineChart2.vue  | 325 ++++++++++
 .../datascreen/taskAnalysis/index.vue         | 134 +++++
 .../datascreen/taskAnalysis/lineChart1.vue    | 162 +++++
 .../datascreen/taskAnalysis/table1.vue        | 185 ++++++
 .../datascreen/theme/essos.json               | 399 +++++++++++++
 .../datascreen/theme/shine.json               | 395 ++++++++++++
 .../deviceMaintenanceRecord/index.vue         | 287 +++++++++
 .../devicePointInspectionPlan/index.vue       | 370 ++++++++++++
 .../TheDeviceMaintenanceDialog.vue            |  43 ++
 .../TheDeviceMaintenanceHistoryTable.vue      | 331 +++++++++++
 .../deviceManagement/deviceRepair/index.vue   | 460 ++++++++++++++
 .../deviceRouteInspectionPlan/index.vue       | 463 +++++++++++++++
 .../deviceStatusBoard/index.vue               | 304 ++++++++++
 .../TheTaskExecuteDeviceItemStep.vue          | 416 +++++++++++++
 .../TheTaskExecuteDialog.vue                  | 134 +++++
 .../TheTaskExecuteFormDialog.vue              | 136 +++++
 .../deviceTaskExecute/TheTaskExecuteTable.vue | 116 ++++
 .../deviceTaskExecute/TheTaskExecuteView.vue  | 157 +++++
 .../deviceTaskExecute/index.vue               | 484 +++++++++++++++
 .../deviceTaskExecuteResult/index.vue         | 561 ++++++++++++++++++
 .../deviceaccount/TheChouseDeviceInspect.vue  | 181 ++++++
 .../deviceaccount/TheDeviceActionDialog.vue   |  56 ++
 .../deviceaccount/TheDeviceInspectTable.vue   | 378 ++++++++++++
 .../deviceManagement/deviceaccount/index.vue  | 561 ++++++++++++++++++
 .../deviceformconfig/index.vue                | 285 +++++++++
 .../deviceManagement/deviceinspect/index.vue  | 383 ++++++++++++
 .../deviceManagement/devicetype/index.vue     | 199 +++++++
 71 files changed, 14366 insertions(+)
 create mode 100644 src/api/deviceManagement/dataAnalysis.js
 create mode 100644 src/api/deviceManagement/deviceaccount.js
 create mode 100644 src/api/deviceManagement/deviceformconfig.js
 create mode 100644 src/api/deviceManagement/deviceinspect.js
 create mode 100644 src/api/deviceManagement/devicemaintenancerecord.js
 create mode 100644 src/api/deviceManagement/devicepointinspectionplan.js
 create mode 100644 src/api/deviceManagement/devicerepair.js
 create mode 100644 src/api/deviceManagement/devicerouteinspectionplan.js
 create mode 100644 src/api/deviceManagement/devicetaskexecute.js
 create mode 100644 src/api/deviceManagement/devicetaskexecuteresult1.js
 create mode 100644 src/api/deviceManagement/devicetype.js
 create mode 100644 src/views/deviceManagement/components/BaseDeviceAccountTreeSelect/index.vue
 create mode 100644 src/views/deviceManagement/components/BaseDeviceAccountView/index.vue
 create mode 100644 src/views/deviceManagement/components/BaseDeviceTypeTree/index.vue
 create mode 100644 src/views/deviceManagement/components/BaseDeviceTypeTreeSelect/index.vue
 create mode 100644 src/views/deviceManagement/components/deviceInspect/index.vue
 create mode 100644 src/views/deviceManagement/components/devicelist/index.vue
 create mode 100644 src/views/deviceManagement/components/devicelist_point/index.vue
 create mode 100644 src/views/deviceManagement/components/devicelist_route/index.vue
 create mode 100644 src/views/deviceManagement/datascreen/DemoChart.vue
 create mode 100644 src/views/deviceManagement/datascreen/components/barChart1.vue
 create mode 100644 src/views/deviceManagement/datascreen/components/barChart2.vue
 create mode 100644 src/views/deviceManagement/datascreen/components/lineChart1.vue
 create mode 100644 src/views/deviceManagement/datascreen/components/lineChart2.vue
 create mode 100644 src/views/deviceManagement/datascreen/components/lineChart3.vue
 create mode 100644 src/views/deviceManagement/datascreen/components/lineChart4.vue
 create mode 100644 src/views/deviceManagement/datascreen/components/pieChart1.vue
 create mode 100644 src/views/deviceManagement/datascreen/components/pieChart2.vue
 create mode 100644 src/views/deviceManagement/datascreen/components/table1.vue
 create mode 100644 src/views/deviceManagement/datascreen/components/table2.vue
 create mode 100644 src/views/deviceManagement/datascreen/dayTaskAnalysis/index.vue
 create mode 100644 src/views/deviceManagement/datascreen/dayTaskAnalysis/table1.vue
 create mode 100644 src/views/deviceManagement/datascreen/dayTaskAnalysis/table2.vue
 create mode 100644 src/views/deviceManagement/datascreen/deviceAnalysis/DemoChart.vue
 create mode 100644 src/views/deviceManagement/datascreen/deviceAnalysis/barChart1.vue
 create mode 100644 src/views/deviceManagement/datascreen/deviceAnalysis/barChart2.vue
 create mode 100644 src/views/deviceManagement/datascreen/deviceAnalysis/index.vue
 create mode 100644 src/views/deviceManagement/datascreen/deviceAnalysis/lineChart1.vue
 create mode 100644 src/views/deviceManagement/datascreen/deviceAnalysis/pieChart1.vue
 create mode 100644 src/views/deviceManagement/datascreen/deviceAnalysis/pieChart2.vue
 create mode 100644 src/views/deviceManagement/datascreen/deviceAnalysis/pieChart3.vue
 create mode 100644 src/views/deviceManagement/datascreen/index.vue
 create mode 100644 src/views/deviceManagement/datascreen/personAnalysis/index.vue
 create mode 100644 src/views/deviceManagement/datascreen/personAnalysis/lineChart1.vue
 create mode 100644 src/views/deviceManagement/datascreen/personAnalysis/lineChart2.vue
 create mode 100644 src/views/deviceManagement/datascreen/taskAnalysis/index.vue
 create mode 100644 src/views/deviceManagement/datascreen/taskAnalysis/lineChart1.vue
 create mode 100644 src/views/deviceManagement/datascreen/taskAnalysis/table1.vue
 create mode 100644 src/views/deviceManagement/datascreen/theme/essos.json
 create mode 100644 src/views/deviceManagement/datascreen/theme/shine.json
 create mode 100644 src/views/deviceManagement/deviceMaintenanceRecord/index.vue
 create mode 100644 src/views/deviceManagement/devicePointInspectionPlan/index.vue
 create mode 100644 src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceDialog.vue
 create mode 100644 src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceHistoryTable.vue
 create mode 100644 src/views/deviceManagement/deviceRepair/index.vue
 create mode 100644 src/views/deviceManagement/deviceRouteInspectionPlan/index.vue
 create mode 100644 src/views/deviceManagement/deviceStatusBoard/index.vue
 create mode 100644 src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDeviceItemStep.vue
 create mode 100644 src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDialog.vue
 create mode 100644 src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteFormDialog.vue
 create mode 100644 src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteTable.vue
 create mode 100644 src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteView.vue
 create mode 100644 src/views/deviceManagement/deviceTaskExecute/index.vue
 create mode 100644 src/views/deviceManagement/deviceTaskExecuteResult/index.vue
 create mode 100644 src/views/deviceManagement/deviceaccount/TheChouseDeviceInspect.vue
 create mode 100644 src/views/deviceManagement/deviceaccount/TheDeviceActionDialog.vue
 create mode 100644 src/views/deviceManagement/deviceaccount/TheDeviceInspectTable.vue
 create mode 100644 src/views/deviceManagement/deviceaccount/index.vue
 create mode 100644 src/views/deviceManagement/deviceformconfig/index.vue
 create mode 100644 src/views/deviceManagement/deviceinspect/index.vue
 create mode 100644 src/views/deviceManagement/devicetype/index.vue

diff --git a/src/api/deviceManagement/dataAnalysis.js b/src/api/deviceManagement/dataAnalysis.js
new file mode 100644
index 0000000..1eaf6a5
--- /dev/null
+++ b/src/api/deviceManagement/dataAnalysis.js
@@ -0,0 +1,94 @@
+import request from '@/utils/request'
+/**
+ * 设备报修饼图
+ * @param {*} data
+ * @returns
+ */
+export function defaultTypePie(data) {
+  return request({
+    url: 'mes/deviceManagement/dataAnalysis/defaultTypePie',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 每日故障数量
+ * @param {*} data
+ * @returns
+ */
+export function FaultTypeBar(data) {
+  return request({
+    url: 'mes/deviceManagement/dataAnalysis/faultTypeBar',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 获取设备故障类别累计次数折线图
+ * @param {*} data
+ * @returns
+ */
+export function FaultTypeLine(data) {
+  return request({
+    url: 'mes/deviceManagement/dataAnalysis/faultTypeLine',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 获取设备故障类别累计次数折线图
+ * @param {*} data
+ * @returns
+ */
+export function FaultTypeBarByDay(data) {
+  return request({
+    url: 'mes/deviceManagement/dataAnalysis/faultTypeBarByDay',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 获取每日点检巡检总数折线图
+ * @param {*} data
+ * @returns
+ */
+export function TaskLinebyDay(data) {
+  return request({
+    url: 'mes/deviceManagement/dataAnalysis/taskLinebyDay',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+/**
+ * 获取人员响应折线图
+ * @param {*} data
+ * @returns
+ */
+export function PersonResponse(data) {
+  return request({
+    url: 'mes/deviceManagement/dataAnalysis/personResponseLine',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+/**
+ * 获取大屏总数
+ * @param {*} data
+ * @returns
+ */
+export function GetAllTotal(data) {
+  return request({
+    url: 'mes/deviceManagement/dataAnalysis/getAllTotal',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/api/deviceManagement/deviceaccount.js b/src/api/deviceManagement/deviceaccount.js
new file mode 100644
index 0000000..072556d
--- /dev/null
+++ b/src/api/deviceManagement/deviceaccount.js
@@ -0,0 +1,150 @@
+import request from '@/utils/request'
+
+/**
+ * 设备台账分页查询
+ * @param {查询条件} data
+ */
+export function listDeviceAccount(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listDeviceAccount_route(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/list_route_inspect',
+    method: 'get',
+    params: query
+  })
+}
+
+/**
+ * 新增设备台账
+ * @param data
+ */
+export function addDeviceAccount(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 修改设备台账
+ * @param data
+ */
+export function updateDeviceAccount(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount',
+    method: 'PUT',
+    data: data
+  })
+}
+/**
+ * 获取设备台账详情
+ * @param {Id}
+ */
+export function getDeviceAccount(id) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/' + id,
+    method: 'get'
+  })
+}
+
+/**
+ * 删除设备台账
+ * @param {主键} pid
+ */
+export function delDeviceAccount(pid) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/' + pid,
+    method: 'delete'
+  })
+}
+
+/**
+ * 获取设备下拉树数据
+ * @param {查询条件} data ：DeviceName
+ */
+export function getSelectTree(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/getSelectTree',
+    method: 'get',
+    params: query
+  })
+}
+//******************************巡检************************************ */
+/**
+ *  添加绑定关系  巡检计划和设备台账
+ * @param {*} data
+ * @returns
+ */
+export function AddRelation(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/AddRelation',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 删除巡检计划和设备台账的关系
+ * @param {主键} pid
+ */
+export function delDeviceAccount_relation(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/remove_relation',
+    method: 'get',
+    params: query
+  })
+}
+//******************************点检************************************ */
+export function listDeviceAccount_point(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/list_point_inspect',
+    method: 'get',
+    params: query
+  })
+}
+
+/**
+ *  添加绑定关系  点检计划和设备台账
+ * @param {*} data
+ * @returns
+ */
+export function AddRelation_point_account(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/AddRelation_point_account',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 删除巡检计划和设备台账的关系
+ * @param {主键} pid
+ */
+export function delDeviceAccount_relation_point_account(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/remove_relation_point_account',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+// 
+/**
+ * 获取设备状态  设备看板用
+ * @param {主键} devicetype_id 设备类别id
+ */
+export function getDeviceStatusBoardData(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceAccount/getDeviceStatusBoardData',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/api/deviceManagement/deviceformconfig.js b/src/api/deviceManagement/deviceformconfig.js
new file mode 100644
index 0000000..db6f032
--- /dev/null
+++ b/src/api/deviceManagement/deviceformconfig.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+ * 设备检查项表单配置表分页查询
+ * @param {查询条件} data
+ */
+export function listDeviceFormConfig(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceFormConfig/list',
+    method: 'get',
+    params: query
+  })
+}
+
+/**
+ * 新增设备检查项表单配置表
+ * @param data
+ */
+export function addDeviceFormConfig(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceFormConfig',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 修改设备检查项表单配置表
+ * @param data
+ */
+export function updateDeviceFormConfig(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceFormConfig',
+    method: 'PUT',
+    data: data
+  })
+}
+/**
+ * 获取设备检查项表单配置表详情
+ * @param {Id}
+ */
+export function getDeviceFormConfig(id) {
+  return request({
+    url: 'mes/deviceManagement/DeviceFormConfig/' + id,
+    method: 'get'
+  })
+}
+
+/**
+ * 删除设备检查项表单配置表
+ * @param {主键} pid
+ */
+export function delDeviceFormConfig(pid) {
+  return request({
+    url: 'mes/deviceManagement/DeviceFormConfig/' + pid,
+    method: 'delete'
+  })
+}
diff --git a/src/api/deviceManagement/deviceinspect.js b/src/api/deviceManagement/deviceinspect.js
new file mode 100644
index 0000000..582110a
--- /dev/null
+++ b/src/api/deviceManagement/deviceinspect.js
@@ -0,0 +1,107 @@
+import request from '@/utils/request'
+
+/**
+ * 设备检查项分页查询
+ * @param {查询条件} data
+ */
+export function listDeviceInspect(query) {
+	return request({
+		url: 'mes/deviceManagement/DeviceInspect/list',
+		method: 'get',
+		params: query
+	})
+}
+
+/**
+ * 新增设备检查项
+ * @param data
+ */
+export function addDeviceInspect(data) {
+	return request({
+		url: 'mes/deviceManagement/DeviceInspect',
+		method: 'post',
+		data: data
+	})
+}
+/**
+ * 修改设备检查项
+ * @param data
+ */
+export function updateDeviceInspect(data) {
+	return request({
+		url: 'mes/deviceManagement/DeviceInspect',
+		method: 'PUT',
+		data: data
+	})
+}
+/**
+ * 获取设备检查项详情
+ * @param {Id}
+ */
+export function getDeviceInspect(id) {
+	return request({
+		url: 'mes/deviceManagement/DeviceInspect/' + id,
+		method: 'get'
+	})
+}
+
+/**
+ * 删除设备检查项
+ * @param {主键} pid
+ */
+export function delDeviceInspect(pid) {
+	return request({
+		url: 'mes/deviceManagement/DeviceInspect/' + pid,
+		method: 'delete'
+	})
+}
+
+
+/**
+ * 查看设备已绑定 Isbind = 1，未绑定 Isbind = 0 的检查项
+ * @param {查询条件} data
+ */
+export function listDeviceInspect2(query) {
+	return request({
+		url: 'mes/deviceManagement/DeviceInspect/list2',
+		method: 'get',
+		params: query
+	})
+}
+
+
+/**
+ * 添加设备与检查项的关联
+ * @param {查询条件} data
+ */
+export function addBind(data) {
+	return request({
+		url: 'mes/deviceManagement/DeviceInspect/addbind',
+		method: 'post',
+		data: data
+	})
+}
+
+/**
+ * 取消设备与检查项的关联
+ * @param {查询条件} data
+ */
+export function removeBind(query) {
+	return request({
+		url: 'mes/deviceManagement/DeviceInspect/removebind',
+		method: 'get',
+		params: query
+	})
+}
+
+/**
+ * 检查项排序
+ * @param {查询条件} data
+ */
+export function sortDeviceInspect(data) {
+	return request({
+		url: 'mes/deviceManagement/DeviceInspect/sort',
+		method: 'post',
+		data: data
+	})
+}
\ No newline at end of file
diff --git a/src/api/deviceManagement/devicemaintenancerecord.js b/src/api/deviceManagement/devicemaintenancerecord.js
new file mode 100644
index 0000000..3798494
--- /dev/null
+++ b/src/api/deviceManagement/devicemaintenancerecord.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+* 维修记录分页查询
+* @param {查询条件} data
+*/
+export function listDeviceMaintenanceRecord(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceMaintenanceRecord/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+/**
+* 新增维修记录
+* @param data
+*/
+export function addDeviceMaintenanceRecord(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceMaintenanceRecord',
+    method: 'post',
+    data: data,
+  })
+}
+/**
+* 修改维修记录
+* @param data
+*/
+export function updateDeviceMaintenanceRecord(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceMaintenanceRecord',
+    method: 'PUT',
+    data: data,
+  })
+}
+/**
+* 获取维修记录详情
+* @param {Id}
+*/
+export function getDeviceMaintenanceRecord(id) {
+  return request({
+    url: 'mes/deviceManagement/DeviceMaintenanceRecord/' + id,
+    method: 'get'
+  })
+}
+
+/**
+* 删除维修记录
+* @param {主键} pid
+*/
+export function delDeviceMaintenanceRecord(pid) {
+  return request({
+    url: 'mes/deviceManagement/DeviceMaintenanceRecord/' + pid,
+    method: 'delete'
+  })
+}
diff --git a/src/api/deviceManagement/devicepointinspectionplan.js b/src/api/deviceManagement/devicepointinspectionplan.js
new file mode 100644
index 0000000..dbf6f0b
--- /dev/null
+++ b/src/api/deviceManagement/devicepointinspectionplan.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+* 点检任务分页查询
+* @param {查询条件} data
+*/
+export function listDevicePointInspectionPlan(query) {
+  return request({
+    url: 'mes/deviceManagement/DevicePointInspectionPlan/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+/**
+* 新增点检任务
+* @param data
+*/
+export function addDevicePointInspectionPlan(data) {
+  return request({
+    url: 'mes/deviceManagement/DevicePointInspectionPlan',
+    method: 'post',
+    data: data,
+  })
+}
+/**
+* 修改点检任务
+* @param data
+*/
+export function updateDevicePointInspectionPlan(data) {
+  return request({
+    url: 'mes/deviceManagement/DevicePointInspectionPlan',
+    method: 'PUT',
+    data: data,
+  })
+}
+/**
+* 获取点检任务详情
+* @param {Id}
+*/
+export function getDevicePointInspectionPlan(id) {
+  return request({
+    url: 'mes/deviceManagement/DevicePointInspectionPlan/' + id,
+    method: 'get'
+  })
+}
+
+/**
+* 删除点检任务
+* @param {主键} pid
+*/
+export function delDevicePointInspectionPlan(pid) {
+  return request({
+    url: 'mes/deviceManagement/DevicePointInspectionPlan/' + pid,
+    method: 'delete'
+  })
+}
diff --git a/src/api/deviceManagement/devicerepair.js b/src/api/deviceManagement/devicerepair.js
new file mode 100644
index 0000000..e73206a
--- /dev/null
+++ b/src/api/deviceManagement/devicerepair.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+ * 报修单分页查询
+ * @param {查询条件} data
+ */
+export function listDeviceRepair(query) {
+	return request({
+		url: 'business/DeviceRepair/list',
+		method: 'post',
+		data: query,
+	})
+}
+
+/**
+ * 新增报修单
+ * @param data
+ */
+export function addDeviceRepair(data) {
+	return request({
+		url: 'business/DeviceRepair',
+		method: 'post',
+		data: data,
+	})
+}
+/**
+ * 修改报修单
+ * @param data
+ */
+export function updateDeviceRepair(data) {
+	return request({
+		url: 'business/DeviceRepair',
+		method: 'PUT',
+		data: data,
+	})
+}
+/**
+ * 获取报修单详情
+ * @param {Id}
+ */
+export function getDeviceRepair(id) {
+	return request({
+		url: 'business/DeviceRepair/' + id,
+		method: 'get'
+	})
+}
+
+/**
+ * 删除报修单
+ * @param {主键} pid
+ */
+export function delDeviceRepair(pid) {
+	return request({
+		url: 'business/DeviceRepair/' + pid,
+		method: 'delete'
+	})
+}
\ No newline at end of file
diff --git a/src/api/deviceManagement/devicerouteinspectionplan.js b/src/api/deviceManagement/devicerouteinspectionplan.js
new file mode 100644
index 0000000..ef1c796
--- /dev/null
+++ b/src/api/deviceManagement/devicerouteinspectionplan.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+* 巡检计划分页查询
+* @param {查询条件} data
+*/
+export function listDeviceRouteInspectionPlan(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceRouteInspectionPlan/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+/**
+* 新增巡检计划
+* @param data
+*/
+export function addDeviceRouteInspectionPlan(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceRouteInspectionPlan',
+    method: 'post',
+    data: data,
+  })
+}
+/**
+* 修改巡检计划
+* @param data
+*/
+export function updateDeviceRouteInspectionPlan(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceRouteInspectionPlan',
+    method: 'PUT',
+    data: data,
+  })
+}
+/**
+* 获取巡检计划详情
+* @param {Id}
+*/
+export function getDeviceRouteInspectionPlan(id) {
+  return request({
+    url: 'mes/deviceManagement/DeviceRouteInspectionPlan/' + id,
+    method: 'get'
+  })
+}
+
+/**
+* 删除巡检计划
+* @param {主键} pid
+*/
+export function delDeviceRouteInspectionPlan(pid) {
+  return request({
+    url: 'mes/deviceManagement/DeviceRouteInspectionPlan/' + pid,
+    method: 'delete'
+  })
+}
diff --git a/src/api/deviceManagement/devicetaskexecute.js b/src/api/deviceManagement/devicetaskexecute.js
new file mode 100644
index 0000000..4dc6fe4
--- /dev/null
+++ b/src/api/deviceManagement/devicetaskexecute.js
@@ -0,0 +1,173 @@
+import request from '@/utils/request'
+import { downFile } from '@/utils/request'
+
+/**
+ * 任务执行分页查询
+ * @param {查询条件} data
+ */
+export function listDeviceTaskExecute(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/list',
+    method: 'post',
+    data: query
+  })
+}
+
+/**
+ * 新增任务执行
+ * @param data
+ */
+export function addDeviceTaskExecute(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 修改任务执行
+ * @param data
+ */
+export function updateDeviceTaskExecute(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute',
+    method: 'PUT',
+    data: data
+  })
+}
+/**
+ * 获取任务执行详情
+ * @param {Id}
+ */
+export function getDeviceTaskExecute(id) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/' + id,
+    method: 'get'
+  })
+}
+
+/**
+ * 删除任务执行
+ * @param {主键} pid
+ */
+export function delDeviceTaskExecute(pid) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/' + pid,
+    method: 'delete'
+  })
+}
+// 清空任务执行
+export function clearDeviceTaskExecute() {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/clean',
+    method: 'delete'
+  })
+}
+// 导出任务执行
+export async function exportDeviceTaskExecute(query) {
+  await downFile('mes/deviceManagement/DeviceTaskExecute/export', { ...query })
+}
+/**
+ * 检查派发任务
+ * @param {Id} 设备id
+ */
+export function taskdispatch(id) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/dispatch/' + id,
+    method: 'get'
+  })
+}
+
+/**
+ * 根据任务id获取绑定设备
+ * @param {Id} 设备id
+ */
+export function AchieveTaskbindDevice(id) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/get_bind_device/' + id,
+    method: 'get'
+  })
+}
+
+/**
+ * 根据任务绑定设备id 获取检查项
+ * @param {Id}
+ */
+export function AchieveDevicebindInspect(params) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/get_bind_inspect',
+    method: 'get',
+    params: params
+  })
+}
+
+/**
+ * 根据检查项id 获取绑定的表单
+ * @param {Id}
+ */
+export function AchieveInspectbindForm(id) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/bind_form/' + id,
+    method: 'get'
+  })
+}
+
+/**
+ * 根据检查项id 获取绑定的表单
+ * @param {PlanType,FkPlanId,FkDeviceId,FkInspectId}
+ */
+export function getAchieveInspectbindFormResult(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/get_form_result',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 根据检查项id 修改绑定的值
+ * @param {id,value}
+ */
+export function setAchieveInspectbindFormResult(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/update_form_result',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 修改任务值
+ * @param {id,status}
+ */
+export function updateTaskStatus(params) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/update_task_status',
+    method: 'get',
+    params: params
+  })
+}
+
+/**
+ * 设置任务开始时间（仅生效第一次）
+ * @param {id}
+ */
+export function setTaskStartTime(params) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/add_task_start',
+    method: 'get',
+    params: params
+  })
+}
+
+/**
+ * 设置任务结束时间（多次生效）
+ * @param {id}
+ */
+export function setTaskEndTime(params) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecute/add_task_finally',
+    method: 'get',
+    params: params
+  })
+}
diff --git a/src/api/deviceManagement/devicetaskexecuteresult1.js b/src/api/deviceManagement/devicetaskexecuteresult1.js
new file mode 100644
index 0000000..677a883
--- /dev/null
+++ b/src/api/deviceManagement/devicetaskexecuteresult1.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+ * 巡检/点检任务结果表分页查询
+ * @param {查询条件} data
+ */
+export function listDeviceTaskExecuteResult1(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecuteResult/list',
+    method: 'get',
+    params: query
+  })
+}
+
+/**
+ * 新增巡检/点检任务结果表
+ * @param data
+ */
+export function addDeviceTaskExecuteResult1(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecuteResult',
+    method: 'post',
+    data: data
+  })
+}
+/**
+ * 修改巡检/点检任务结果表
+ * @param data
+ */
+export function updateDeviceTaskExecuteResult1(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecuteResult',
+    method: 'PUT',
+    data: data
+  })
+}
+/**
+ * 获取巡检/点检任务结果表详情
+ * @param {Id}
+ */
+export function getDeviceTaskExecuteResult1(id) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecuteResult/' + id,
+    method: 'get'
+  })
+}
+
+/**
+ * 删除巡检/点检任务结果表
+ * @param {主键} pid
+ */
+export function delDeviceTaskExecuteResult1(pid) {
+  return request({
+    url: 'mes/deviceManagement/DeviceTaskExecuteResult/' + pid,
+    method: 'delete'
+  })
+}
diff --git a/src/api/deviceManagement/devicetype.js b/src/api/deviceManagement/devicetype.js
new file mode 100644
index 0000000..1202a1c
--- /dev/null
+++ b/src/api/deviceManagement/devicetype.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+/**
+ * 查询
+ * @param {查询条件} data
+ */
+export function getList(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceType/list',
+    method: 'get',
+    params: query
+  })
+}
+export function getTree(query) {
+  return request({
+    url: 'mes/deviceManagement/DeviceType/tree',
+    method: 'get',
+    params: query
+  })
+}
+
+/**
+ * 更改
+ * @param {*} data
+ * @returns
+ */
+export function updateDevicetype(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceType/update',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 新增
+ * @param {*} data
+ * @returns
+ */
+export function addDevicetype(data) {
+  return request({
+    url: 'mes/deviceManagement/DeviceType/insert',
+    method: 'post',
+    data: data
+  })
+}
+
+export function deleteDevicetype(id) {
+  return request({
+    url: 'mes/deviceManagement/DeviceType/delete/' + id,
+    method: 'get'
+  })
+}
diff --git a/src/views/deviceManagement/components/BaseDeviceAccountTreeSelect/index.vue b/src/views/deviceManagement/components/BaseDeviceAccountTreeSelect/index.vue
new file mode 100644
index 0000000..c44fdda
--- /dev/null
+++ b/src/views/deviceManagement/components/BaseDeviceAccountTreeSelect/index.vue
@@ -0,0 +1,44 @@
+<template>
+  <div>
+    <el-tree-select
+      style="width: 240px"
+      v-bind="$attrs"
+      highlight-current
+      filterable
+      :data="deptOptions"
+      :props="{ label: 'label', children: 'children' }"
+      node-key="value"
+      placeholder="请选择设备"
+      :render-after-expand="false"
+      clearable />
+  </div>
+</template>
+
+<script>
+import * as deviceAccountApi from '@/api/deviceManagement/deviceaccount'
+
+export default {
+  name: 'BaseDeviceTypeTreeSelect',
+  data() {
+    return {
+      deptOptions: []
+    }
+  },
+  mounted() {
+    this.getlist()
+  },
+  methods: {
+    getlist() {
+      this.deptOptions = []
+      deviceAccountApi.getSelectTree().then((res) => {
+        if (res.code == 200) {
+          console.log(res.data)
+          this.deptOptions = this.handleTree(res.data, 'id', 'parentId', 'children')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/deviceManagement/components/BaseDeviceAccountView/index.vue b/src/views/deviceManagement/components/BaseDeviceAccountView/index.vue
new file mode 100644
index 0000000..313f774
--- /dev/null
+++ b/src/views/deviceManagement/components/BaseDeviceAccountView/index.vue
@@ -0,0 +1,50 @@
+<template>
+	<div>
+		<span>{{text}}</span>
+	</div>
+</template>
+
+<script>
+import * as deviceAccountApi from '@/api/deviceManagement/deviceaccount'
+
+export default {
+  name: 'BaseDeviceTypeTreeSelect',
+  props: {
+    deviceId: {
+      type: [Number, String]
+    }
+  },
+  data() {
+    return {
+      text: ''
+    }
+  },
+  watch: {
+    deviceId: {
+      handler(newValue, oldValue) {
+        this.getData();
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    getData() {
+      const id = this.deviceId;
+      if (id === null || id === undefined || id === '' || id < 0) {
+        this.text = '未选择设备';
+        return;
+      }
+      deviceAccountApi.getDeviceAccount(id).then((res) => {
+        const { code, data } = res
+        if (code == 200 && data != null) {
+          this.text = data.deviceName + ' ' + data.deviceCode;
+        } else {
+          this.text = '设备编号异常';
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/components/BaseDeviceTypeTree/index.vue b/src/views/deviceManagement/components/BaseDeviceTypeTree/index.vue
new file mode 100644
index 0000000..7caa76f
--- /dev/null
+++ b/src/views/deviceManagement/components/BaseDeviceTypeTree/index.vue
@@ -0,0 +1,38 @@
+<template>
+	<div>
+		<el-tree :data="deptOptions" :props="{ label: 'name', children: 'children' }" :expand-on-click-node="false" ref="deptTreeRef" node-key="id" highlight-current default-expand-all @node-click="handleNodeClick" />
+	</div>
+</template>
+
+<script>
+import * as API_devicetype from '@/api/deviceManagement/devicetype'
+
+export default {
+  name: 'BaseDeviceTypeTree',
+  data() {
+    return {
+      deptOptions: [],
+      queryParams: {
+        status: 1
+      }
+    }
+  },
+  mounted() {
+    this.getlist()
+  },
+  methods: {
+    getlist() {
+      API_devicetype.getList(this.queryParams).then((res) => {
+        if (res.code == 200) {
+          this.deptOptions = this.handleTree(res.data, 'id', 'parentId', 'children')
+        }
+      })
+    },
+    handleNodeClick(data) {
+      this.$emit('selected', data.id)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/components/BaseDeviceTypeTreeSelect/index.vue b/src/views/deviceManagement/components/BaseDeviceTypeTreeSelect/index.vue
new file mode 100644
index 0000000..9116d6c
--- /dev/null
+++ b/src/views/deviceManagement/components/BaseDeviceTypeTreeSelect/index.vue
@@ -0,0 +1,35 @@
+<template>
+	<div>
+		<el-tree-select v-bind="$attrs" style="width: 240px" :data="deptOptions" :props="{ label: 'name', children: 'children' }" node-key="id" check-strictly placeholder="请选择设备类型" :render-after-expand="false" />
+	</div>
+</template>
+
+<script>
+	import * as API_devicetype from '@/api/deviceManagement/devicetype'
+
+export default {
+	name: 'BaseDeviceTypeTreeSelect',
+	data() {
+		return {
+			deptOptions: [],
+			queryParams: {
+				status: 1
+			}
+		}
+	},
+	mounted() {
+		this.getlist()
+	},
+	methods: {
+		getlist() {
+			API_devicetype.getList(this.queryParams).then((res) => {
+				if (res.code == 200) {
+					this.deptOptions = this.handleTree(res.data, 'id', 'parentId', 'children');
+				}
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/components/deviceInspect/index.vue b/src/views/deviceManagement/components/deviceInspect/index.vue
new file mode 100644
index 0000000..22746ea
--- /dev/null
+++ b/src/views/deviceManagement/components/deviceInspect/index.vue
@@ -0,0 +1,14 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  name: 'DeviceInspect',
+  mounted() {
+    // 使用this代替proxy
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/deviceManagement/components/devicelist/index.vue b/src/views/deviceManagement/components/devicelist/index.vue
new file mode 100644
index 0000000..15583bd
--- /dev/null
+++ b/src/views/deviceManagement/components/devicelist/index.vue
@@ -0,0 +1,394 @@
+<template>
+  <div>
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" v-hasPermi="['deviceManagement:deviceaccount:add']" plain icon="plus" @click="handleAdd">
+          {{ $t('btn.add') }}
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table
+      :data="dataList"
+      v-loading="loading"
+      ref="table"
+      border
+      header-cell-class-name="el-table-header-cell"
+      highlight-current-row
+      @sort-change="sortChange">
+      <el-table-column prop="id" label="设备台账id" align="center" v-if="columns.showColumn('id')" />
+      <el-table-column prop="fkDeviceType" label="设备类型" align="center" v-if="columns.showColumn('fkDeviceType')">
+        <template #default="scope">
+          <dict-tag :options="options.fkDeviceTypeOptions" :value="scope.row.fkDeviceType" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
+      <el-table-column prop="workshop" label="所属车间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
+      <el-table-column prop="workline" label="所属产线" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
+      <el-table-column prop="purchaseTime" label="购买时间" :show-overflow-tooltip="true" v-if="columns.showColumn('purchaseTime')" />
+      <el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplier')" />
+      <el-table-column prop="status" label="设备状态" align="center" v-if="columns.showColumn('status')">
+        <template #default="scope">
+          <dict-tag :options="options.statusOptions" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
+        <template #default="scope">
+          <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column prop="deviceFile" label="设备文件" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceFile')" />
+      <el-table-column
+        prop="deviceSpecification"
+        label="设备规格"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('deviceSpecification')" />
+      <el-table-column
+        prop="responsiblePerson"
+        label="设备负责人"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('responsiblePerson')" />
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
+      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
+      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+      <el-table-column label="操作">
+        <template #default="scope">
+          <el-button type="danger" size="small" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 选择设备台账 -->
+    <el-dialog title="选择设备台账" :lock-scroll="false" v-model="open" width="900">
+      <el-form :model="queryParams2" label-position="right" inline ref="queryRef2" v-show="showSearch2" @submit.prevent>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model.trim="queryParams2.deviceName" placeholder="请输入设备名称" clearable />
+        </el-form-item>
+        <el-form-item label="设备规格" prop="deviceSpecification">
+          <el-input v-model.trim="queryParams2.deviceSpecification" placeholder="请输入设备规格" clearable />
+        </el-form-item>
+        <el-form-item label="设备状态222" prop="status">
+          <el-radio-group v-model="queryParams2.status" @click="handleQuery2">
+            <el-radio-button :value="-1">全部</el-radio-button>
+            <el-radio-button :value="1">启用</el-radio-button>
+            <el-radio-button :value="0">停用</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="search" type="primary" @click="handleQuery2">{{ $t('btn.search') }}</el-button>
+          <el-button icon="refresh" @click="resetQuery2">{{ $t('btn.reset') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <!-- 工具区域 -->
+      <el-row :gutter="15" class="mb10">
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="plus" @click="handleBind">
+            {{ $t('btn.add') }}
+          </el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch2" @queryTable="getList" :columns="columns"></right-toolbar>
+      </el-row>
+
+      <el-table
+        :data="dataList_NO_bind"
+        v-loading="loading"
+        ref="table"
+        border
+        header-cell-class-name="el-table-header-cell"
+        highlight-current-row
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="id" label="设备台账id" align="center" v-if="columns.showColumn('id')" />
+        <el-table-column prop="fkDeviceType" label="设备类型" align="center" v-if="columns.showColumn('fkDeviceType')">
+          <template #default="scope">
+            <dict-tag :options="options.fkDeviceTypeOptions" :value="scope.row.fkDeviceType" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
+        <el-table-column
+          prop="deviceCode"
+          label="设备编号（二维码）"
+          align="center"
+          :show-overflow-tooltip="true"
+          v-if="columns.showColumn('deviceCode')" />
+        <el-table-column prop="workshop" label="所属车间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
+        <el-table-column prop="workline" label="所属产线" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
+        <el-table-column prop="purchaseTime" label="购买时间" :show-overflow-tooltip="true" v-if="columns.showColumn('purchaseTime')" />
+        <el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplier')" />
+        <el-table-column prop="status" label="设备状态" align="center" v-if="columns.showColumn('status')">
+          <template #default="scope">
+            <dict-tag :options="options.statusOptions" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
+          <template #default="scope">
+            <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deviceFile" label="设备文件" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceFile')" />
+        <el-table-column
+          prop="deviceSpecification"
+          label="设备规格"
+          align="center"
+          :show-overflow-tooltip="true"
+          v-if="columns.showColumn('deviceSpecification')" />
+        <el-table-column
+          prop="responsiblePerson"
+          label="设备负责人"
+          align="center"
+          :show-overflow-tooltip="true"
+          v-if="columns.showColumn('responsiblePerson')" />
+        <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+        <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
+        <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+        <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
+        <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+      </el-table>
+      <pagination :total="total2" v-model:page="queryParams2.pageNum" v-model:limit="queryParams2.pageSize" @pagination="getList_nobind" />
+
+      <template #footer v-if="opertype != 3">
+        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listDeviceAccount,
+  listDeviceAccount_route,
+  addDeviceAccount,
+  updateDeviceAccount,
+  getDeviceAccount,
+  AddRelation,
+  delDeviceAccount_relation
+} from '@/api/deviceManagement/deviceaccount.js'
+
+export default {
+  name: 'deivelist',
+  props: {
+    message: {
+      type: String
+    },
+    flag: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: true,
+      showSearch2: true,
+      queryParams: {
+        fkRouteInspectionPlanId: '',
+        pageNum: 1,
+        pageSize: 10,
+        sort: 'Id',
+        sortType: 'asc'
+      },
+      status: -1,
+      queryParams2: {
+        fkRouteInspectionPlanId: '',
+        deviceName: '',
+        deviceSpecification: '',
+        status: -1,
+        pageNum: 1,
+        pageSize: 10,
+        sort: 'Id',
+        sortType: 'asc'
+      },
+      columns: [
+        { visible: true, prop: 'id', label: '设备台账id' },
+        { visible: true, prop: 'fkDeviceType', label: '设备类型' },
+        { visible: true, prop: 'deviceName', label: '设备名称' },
+        { visible: true, prop: 'deviceCode', label: '设备编号（二维码）' },
+        { visible: true, prop: 'workshop', label: '所属车间' },
+        { visible: true, prop: 'workline', label: '所属产线' },
+        { visible: true, prop: 'purchaseTime', label: '购买时间' },
+        { visible: true, prop: 'supplier', label: '设备厂商' },
+        { visible: false, prop: 'status', label: '设备状态' },
+        { visible: false, prop: 'deviceImage', label: '设备图片' },
+        { visible: false, prop: 'deviceFile', label: '设备文件' },
+        { visible: false, prop: 'deviceSpecification', label: '设备规格' },
+        { visible: false, prop: 'responsiblePerson', label: '设备负责人' },
+        { visible: false, prop: 'remark', label: '备注' },
+        { visible: false, prop: 'createdBy', label: '创建人' },
+        { visible: false, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' }
+      ],
+      total: 0,
+      total2: 0,
+      dataList: [],
+      dataList_NO_bind: [],
+      queryRef: null,
+      defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)],
+      dictParams: [],
+      formRef: null,
+      title: '',
+      opertype: 0,
+      open: false,
+      state: {
+        single: true,
+        multiple: true,
+        form: {},
+        rules: {},
+        options: {
+          fkDeviceTypeOptions: [],
+          statusOptions: [
+            { dictLabel: '启用', dictValue: 1, listClass: 'success' },
+            { dictLabel: '停用', dictValue: 0, listClass: 'info' }
+          ]
+        }
+      },
+      multipleSelection: []
+    }
+  },
+  computed: {
+    form() {
+      return this.state.form
+    },
+    rules() {
+      return this.state.rules
+    },
+    options() {
+      return this.state.options
+    },
+    single() {
+      return this.state.single
+    },
+    multiple() {
+      return this.state.multiple
+    }
+  },
+  watch: {
+    message: {
+      handler() {
+        this.handleQuery()
+      },
+      immediate: true
+    }
+  },
+  mounted() {
+    this.handleQuery()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      this.queryParams.fkRouteInspectionPlanId = this.message
+      this.queryParams.flag = 1
+      listDeviceAccount_route(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+    getList_nobind() {
+      this.loading = true
+      this.queryParams2.fkRouteInspectionPlanId = this.message
+      this.queryParams2.flag = 0
+      listDeviceAccount_route(this.queryParams2).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList_NO_bind = data.result
+          this.total2 = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+    handleQuery2() {
+      this.queryParams2.pageNum = 1
+      this.getList_nobind()
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.$refs.queryRef && this.$refs.queryRef.resetFields()
+      this.handleQuery()
+    },
+    resetQuery2() {
+      this.$refs.queryRef2 && this.$refs.queryRef2.resetFields()
+      this.handleQuery2()
+    },
+    sortChange(column) {
+      var sort = undefined
+      var sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+    cancel() {
+      this.open = false
+    },
+    handleAdd() {
+      this.open = true
+      this.title = '添加设备台账'
+      this.opertype = 1
+      this.loading = false
+
+      this.getList_nobind()
+    },
+    handleBind() {
+      let query = {}
+      query.FkRouteInspectionPlanId = this.message
+      query.FkDeviceAccountIdList = this.multipleSelection
+      AddRelation(query).then((res) => {
+        if (res.code == 200) {
+          this.$modal.msgSuccess('添加成功' + res.data + '条')
+          this.getList_nobind()
+        }
+      })
+    },
+    submitForm() {
+      if (this.multipleSelection.length > 0) {
+        this.handleBind()
+      }
+      this.open = false
+    },
+    handleDelete(row) {
+      const Ids = row.id || this.ids
+
+      this
+        .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(() => {
+          const query = {
+            FkRouteInspectionPlanId: this.message,
+            FkDeviceAccountId: row.id
+          }
+          return delDeviceAccount_relation(query)
+        })
+        .then((res) => {
+          if (res.code == 200 && res.data > 0) {
+            this.getList()
+            this.$modal.msgSuccess('删除成功')
+          }
+        })
+    },
+    handleSelectionChange(rows) {
+      this.multipleSelection = rows.map((it) => it.id)
+
+      console.log('multipleSelection', this.multipleSelection)
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManagement/components/devicelist_point/index.vue b/src/views/deviceManagement/components/devicelist_point/index.vue
new file mode 100644
index 0000000..939f9e3
--- /dev/null
+++ b/src/views/deviceManagement/components/devicelist_point/index.vue
@@ -0,0 +1,385 @@
+<template>
+  <div>
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="plus" @click="handleAdd">
+          {{ $t('btn.add') }}
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table
+      :data="dataList"
+      v-loading="loading"
+      ref="table"
+      border
+      header-cell-class-name="el-table-header-cell"
+      highlight-current-row
+      @sort-change="sortChange">
+      <el-table-column prop="id" label="设备台账id" align="center" v-if="columns.showColumn('id')" />
+      <el-table-column prop="fkDeviceType" label="设备类型" align="center" v-if="columns.showColumn('fkDeviceType')">
+        <template #default="scope">
+          <dict-tag :options="options.fkDeviceTypeOptions" :value="scope.row.fkDeviceType" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
+      <el-table-column prop="workshop" label="所属车间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
+      <el-table-column prop="workline" label="所属产线" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
+      <el-table-column prop="purchaseTime" label="购买时间" :show-overflow-tooltip="true" v-if="columns.showColumn('purchaseTime')" />
+      <el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplier')" />
+      <el-table-column prop="status" label="设备状态" align="center" v-if="columns.showColumn('status')">
+        <template #default="scope">
+          <dict-tag :options="options.statusOptions" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
+        <template #default="scope">
+          <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column prop="deviceFile" label="设备文件" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceFile')" />
+      <el-table-column
+        prop="deviceSpecification"
+        label="设备规格"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('deviceSpecification')" />
+      <el-table-column
+        prop="responsiblePerson"
+        label="设备负责人"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('responsiblePerson')" />
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
+      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
+      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+      <el-table-column label="操作">
+        <template #default="scope">
+          <el-button type="danger" size="small" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 选择设备台账 -->
+    <el-dialog title="选择设备台账" :lock-scroll="false" v-model="open" width="900">
+      <el-form :model="queryParams2" label-position="right" inline ref="queryRef2" v-show="showSearch2" @submit.prevent>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model.trim="queryParams2.deviceName" placeholder="请输入设备名称" clearable />
+        </el-form-item>
+        <el-form-item label="设备规格" prop="deviceSpecification">
+          <el-input v-model.trim="queryParams2.deviceSpecification" placeholder="请输入设备规格" clearable />
+        </el-form-item>
+        <el-form-item label="设备状态" prop="status">
+          <el-radio-group v-model="queryParams2.status" @click="handleQuery2">
+            <el-radio-button :value="-1">全部</el-radio-button>
+            <el-radio-button :value="1">启用</el-radio-button>
+            <el-radio-button :value="0">停用</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="search" type="primary" @click="handleQuery2">{{ $t('btn.search') }}</el-button>
+          <el-button icon="refresh" @click="resetQuery2">{{ $t('btn.reset') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <!-- 工具区域 -->
+      <el-row :gutter="15" class="mb10">
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="plus" @click="handleBind">
+            {{ $t('btn.add') }}
+          </el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch2" @queryTable="getList" :columns="columns"></right-toolbar>
+      </el-row>
+
+      <el-table
+        :data="dataList_NO_bind"
+        v-loading="loading"
+        ref="table"
+        border
+        header-cell-class-name="el-table-header-cell"
+        highlight-current-row
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="id" label="设备台账id" align="center" v-if="columns.showColumn('id')" />
+        <el-table-column prop="fkDeviceType" label="设备类型" align="center" v-if="columns.showColumn('fkDeviceType')">
+          <template #default="scope">
+            <dict-tag :options="options.fkDeviceTypeOptions" :value="scope.row.fkDeviceType" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
+        <el-table-column
+          prop="deviceCode"
+          label="设备编号（二维码）"
+          align="center"
+          :show-overflow-tooltip="true"
+          v-if="columns.showColumn('deviceCode')" />
+        <el-table-column prop="workshop" label="所属车间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
+        <el-table-column prop="workline" label="所属产线" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
+        <el-table-column prop="purchaseTime" label="购买时间" :show-overflow-tooltip="true" v-if="columns.showColumn('purchaseTime')" />
+        <el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplier')" />
+        <el-table-column prop="status" label="设备状态" align="center" v-if="columns.showColumn('status')">
+          <template #default="scope">
+            <dict-tag :options="options.statusOptions" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
+          <template #default="scope">
+            <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deviceFile" label="设备文件" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceFile')" />
+        <el-table-column
+          prop="deviceSpecification"
+          label="设备规格"
+          align="center"
+          :show-overflow-tooltip="true"
+          v-if="columns.showColumn('deviceSpecification')" />
+        <el-table-column
+          prop="responsiblePerson"
+          label="设备负责人"
+          align="center"
+          :show-overflow-tooltip="true"
+          v-if="columns.showColumn('responsiblePerson')" />
+        <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+        <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
+        <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+        <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
+        <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+      </el-table>
+      <pagination :total="total2" v-model:page="queryParams2.pageNum" v-model:limit="queryParams2.pageSize" @pagination="getList_nobind" />
+
+      <template #footer v-if="opertype != 3">
+        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listDeviceAccount_point,
+  AddRelation_point_account,
+  delDeviceAccount_relation_point_account
+} from '@/api/deviceManagement/deviceaccount.js'
+
+export default {
+  name: 'devicelistPoint',
+  props: {
+    message: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: true,
+      showSearch2: true,
+      queryParams: {
+        fkRouteInspectionPlanId: '',
+        pageNum: 1,
+        pageSize: 10,
+        sort: 'Id',
+        sortType: 'asc'
+      },
+      status: -1,
+      queryParams2: {
+        fkRouteInspectionPlanId: '',
+        deviceName: '',
+        deviceSpecification: '',
+        status: -1,
+        pageNum: 1,
+        pageSize: 10,
+        sort: 'Id',
+        sortType: 'asc'
+      },
+      columns: [
+        { visible: true, prop: 'id', label: '设备台账id' },
+        { visible: true, prop: 'fkDeviceType', label: '设备类型' },
+        { visible: true, prop: 'deviceName', label: '设备名称' },
+        { visible: true, prop: 'deviceCode', label: '设备编号（二维码）' },
+        { visible: true, prop: 'workshop', label: '所属车间' },
+        { visible: true, prop: 'workline', label: '所属产线' },
+        { visible: true, prop: 'purchaseTime', label: '购买时间' },
+        { visible: true, prop: 'supplier', label: '设备厂商' },
+        { visible: false, prop: 'status', label: '设备状态' },
+        { visible: false, prop: 'deviceImage', label: '设备图片' },
+        { visible: false, prop: 'deviceFile', label: '设备文件' },
+        { visible: false, prop: 'deviceSpecification', label: '设备规格' },
+        { visible: false, prop: 'responsiblePerson', label: '设备负责人' },
+        { visible: false, prop: 'remark', label: '备注' },
+        { visible: false, prop: 'createdBy', label: '创建人' },
+        { visible: false, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' }
+      ],
+      total: 0,
+      total2: 0,
+      dataList: [],
+      dataList_NO_bind: [],
+      defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)],
+      dictParams: [],
+      title: '',
+      opertype: 0,
+      open: false,
+      multipleSelection: [],
+      // state 对象的属性展开到 data 中
+      single: true,
+      multiple: true,
+      form: {},
+      rules: {},
+      options: {
+        // 设备类型 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+        fkDeviceTypeOptions: [],
+        // 设备状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+        statusOptions: [
+          { dictLabel: '启用', dictValue: 1, listClass: 'success' },
+          { dictLabel: '停用', dictValue: 0, listClass: 'info' }
+        ]
+      }
+    }
+  },
+  watch: {
+    message: {
+      handler() {
+        this.handleQuery()
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      this.queryParams.FkPointInspectionPlanId = this.message
+      this.queryParams.flag = 1
+      listDeviceAccount_point(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+
+    getList_nobind() {
+      this.loading = true
+      this.queryParams2.FkPointInspectionPlanId = this.message
+      this.queryParams2.flag = 0
+      listDeviceAccount_point(this.queryParams2).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList_NO_bind = data.result
+          this.total2 = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+
+    // 查询2
+    handleQuery2() {
+      this.queryParams2.pageNum = 1
+      this.getList_nobind()
+    },
+    // 查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+
+    // 重置查询操作
+    resetQuery() {
+      this.$refs.queryRef && this.$refs.queryRef.resetFields()
+      this.handleQuery()
+    },
+
+    resetQuery2() {
+      this.$refs.queryRef2 && this.$refs.queryRef2.resetFields()
+      this.handleQuery2()
+    },
+    // 自定义排序
+    sortChange(column) {
+      var sort = undefined
+      var sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+
+    // 关闭dialog
+    cancel() {
+      this.open = false
+    },
+
+    // 添加按钮操作
+    handleAdd() {
+      this.open = true
+      this.title = '添加设备台账'
+      this.opertype = 1
+      this.loading = false
+
+      this.getList_nobind()
+    },
+
+    // 绑定
+    handleBind() {
+      let query = {}
+      query.FkPointInspectionPlanId = this.message
+      query.FkDeviceAccountIdList = this.multipleSelection
+      AddRelation_point_account(query).then((res) => {
+        if (res.code == 200) {
+          this.$modal.msgSuccess('添加成功' + res.data + '条')
+          this.getList_nobind()
+        }
+      })
+    },
+
+    // 表单提交
+    submitForm() {
+      if (this.multipleSelection.length > 0) {
+        this.handleBind()
+      }
+      // 刷新数据
+      this.getList()
+      this.open = false
+    },
+
+    // 删除按钮操作
+    handleDelete(row) {
+      const Ids = row.id || this.ids
+
+      this.$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(() => {
+          const query = {
+            FkPointInspectionPlanId: this.message,
+            FkDeviceAccountId: row.id
+          }
+          return delDeviceAccount_relation_point_account(query)
+        })
+        .then((res) => {
+          if (res.code == 200 && res.data > 0) {
+            this.getList()
+            this.$modal.msgSuccess('删除成功')
+          }
+        })
+    },
+
+    // 表格多选
+    handleSelectionChange(rows) {
+      this.multipleSelection = rows.map((it) => it.id)
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManagement/components/devicelist_route/index.vue b/src/views/deviceManagement/components/devicelist_route/index.vue
new file mode 100644
index 0000000..16875df
--- /dev/null
+++ b/src/views/deviceManagement/components/devicelist_route/index.vue
@@ -0,0 +1,392 @@
+<template>
+  <div>
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="plus" @click="handleAdd">
+          {{ $t('btn.add') }}
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table
+      :data="dataList"
+      v-loading="loading"
+      ref="table"
+      border
+      header-cell-class-name="el-table-header-cell"
+      highlight-current-row
+      @sort-change="sortChange">
+      <el-table-column prop="id" label="设备台账id" align="center" v-if="columns.showColumn('id')" />
+      <el-table-column prop="fkDeviceType" label="设备类型" align="center" v-if="columns.showColumn('fkDeviceType')">
+        <template #default="scope">
+          <dict-tag :options="options.fkDeviceTypeOptions" :value="scope.row.fkDeviceType" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
+      <el-table-column prop="workshop" label="所属车间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
+      <el-table-column prop="workline" label="所属产线" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
+      <el-table-column prop="purchaseTime" label="购买时间" :show-overflow-tooltip="true" v-if="columns.showColumn('purchaseTime')" />
+      <el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplier')" />
+      <el-table-column prop="status" label="设备状态" align="center" v-if="columns.showColumn('status')">
+        <template #default="scope">
+          <dict-tag :options="options.statusOptions" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
+        <template #default="scope">
+          <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column prop="deviceFile" label="设备文件" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceFile')" />
+      <el-table-column
+        prop="deviceSpecification"
+        label="设备规格"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('deviceSpecification')" />
+      <el-table-column
+        prop="responsiblePerson"
+        label="设备负责人"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('responsiblePerson')" />
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
+      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
+      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+      <el-table-column label="操作">
+        <template #default="scope">
+          <el-button type="danger" size="small" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 选择设备台账 -->
+    <el-dialog title="选择设备台账" :lock-scroll="false" v-model="open" width="900">
+      <el-form :model="queryParams2" label-position="right" inline ref="queryRef2" v-show="showSearch2" @submit.prevent>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model.trim="queryParams2.deviceName" placeholder="请输入设备名称" clearable />
+        </el-form-item>
+        <el-form-item label="设备规格" prop="deviceSpecification">
+          <el-input v-model.trim="queryParams2.deviceSpecification" placeholder="请输入设备规格" clearable />
+        </el-form-item>
+        <el-form-item label="设备状态" prop="status">
+          <el-radio-group v-model="queryParams2.status" @click="handleQuery2">
+            <el-radio-button :value="-1">全部</el-radio-button>
+            <el-radio-button :value="1">启用</el-radio-button>
+            <el-radio-button :value="0">停用</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="search" type="primary" @click="handleQuery2">{{ $t('btn.search') }}</el-button>
+          <el-button icon="refresh" @click="resetQuery2">{{ $t('btn.reset') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <!-- 工具区域 -->
+      <el-row :gutter="15" class="mb10">
+        <el-col :span="1.5">
+          <el-button type="success" plain icon="plus" @click="handleBind">
+            {{ $t('btn.add') }}
+          </el-button>
+        </el-col>
+        <right-toolbar v-model:showSearch="showSearch2" @queryTable="getList" :columns="columns"></right-toolbar>
+      </el-row>
+
+      <el-table
+        :data="dataList_NO_bind"
+        v-loading="loading"
+        ref="table"
+        border
+        header-cell-class-name="el-table-header-cell"
+        highlight-current-row
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="id" label="设备台账id" align="center" v-if="columns.showColumn('id')" />
+
+        <el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
+        <el-table-column
+          prop="deviceCode"
+          label="设备编号（二维码）"
+          align="center"
+          :show-overflow-tooltip="true"
+          v-if="columns.showColumn('deviceCode')" />
+        <el-table-column prop="workshop" label="所属车间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
+        <el-table-column prop="workline" label="所属产线" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
+        <el-table-column prop="purchaseTime" label="购买时间" :show-overflow-tooltip="true" v-if="columns.showColumn('purchaseTime')" />
+        <el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplier')" />
+        <el-table-column prop="status" label="设备状态" align="center" v-if="columns.showColumn('status')">
+          <template #default="scope">
+            <dict-tag :options="options.statusOptions" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
+          <template #default="scope">
+            <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deviceFile" label="设备文件" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceFile')" />
+        <el-table-column
+          prop="deviceSpecification"
+          label="设备规格"
+          align="center"
+          :show-overflow-tooltip="true"
+          v-if="columns.showColumn('deviceSpecification')" />
+        <el-table-column
+          prop="responsiblePerson"
+          label="设备负责人"
+          align="center"
+          :show-overflow-tooltip="true"
+          v-if="columns.showColumn('responsiblePerson')" />
+        <el-table-column prop="fkDeviceType" label="设备类型" align="center" v-if="columns.showColumn('fkDeviceType')">
+          <template #default="scope">
+            <dict-tag :options="options.fkDeviceTypeOptions" :value="scope.row.fkDeviceType" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+        <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
+        <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+        <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
+        <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+      </el-table>
+      <pagination :total="total2" v-model:page="queryParams2.pageNum" v-model:limit="queryParams2.pageSize" @pagination="getList_nobind" />
+
+      <template #footer v-if="opertype != 3">
+        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listDeviceAccount,
+  listDeviceAccount_route,
+  addDeviceAccount,
+  updateDeviceAccount,
+  getDeviceAccount,
+  AddRelation,
+  delDeviceAccount_relation
+} from '@/api/deviceManagement/deviceaccount.js'
+
+export default {
+  name: 'devicelistRoute',
+  props: {
+    message: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: true,
+      showSearch2: true,
+      queryParams: {
+        fkRouteInspectionPlanId: '',
+        pageNum: 1,
+        pageSize: 10,
+        sort: 'Id',
+        sortType: 'asc'
+      },
+      status: -1,
+      queryParams2: {
+        fkRouteInspectionPlanId: '',
+        deviceName: '',
+        deviceSpecification: '',
+        status: -1,
+        pageNum: 1,
+        pageSize: 10,
+        sort: 'Id',
+        sortType: 'asc'
+      },
+      columns: [
+        { visible: true, prop: 'id', label: '设备台账id' },
+        { visible: true, prop: 'fkDeviceType', label: '设备类型' },
+        { visible: true, prop: 'deviceName', label: '设备名称' },
+        { visible: true, prop: 'deviceCode', label: '设备编号（二维码）' },
+        { visible: true, prop: 'workshop', label: '所属车间' },
+        { visible: true, prop: 'workline', label: '所属产线' },
+        { visible: true, prop: 'purchaseTime', label: '购买时间' },
+        { visible: true, prop: 'supplier', label: '设备厂商' },
+        { visible: false, prop: 'status', label: '设备状态' },
+        { visible: false, prop: 'deviceImage', label: '设备图片' },
+        { visible: false, prop: 'deviceFile', label: '设备文件' },
+        { visible: false, prop: 'deviceSpecification', label: '设备规格' },
+        { visible: false, prop: 'responsiblePerson', label: '设备负责人' },
+        { visible: false, prop: 'remark', label: '备注' },
+        { visible: false, prop: 'createdBy', label: '创建人' },
+        { visible: false, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' }
+      ],
+      total: 0,
+      total2: 0,
+      dataList: [],
+      dataList_NO_bind: [],
+      defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)],
+      dictParams: [],
+      title: '',
+      opertype: 0,
+      open: false,
+      multipleSelection: [],
+      // state 对象的属性展开到 data 中
+      single: true,
+      multiple: true,
+      form: {},
+      rules: {},
+      options: {
+        // 设备类型 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+        fkDeviceTypeOptions: [],
+        // 设备状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+        statusOptions: [
+          { dictLabel: '启用', dictValue: 1, listClass: 'success' },
+          { dictLabel: '停用', dictValue: 0, listClass: 'info' }
+        ]
+      }
+    }
+  },
+  watch: {
+    message: {
+      handler() {
+        this.handleQuery()
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      this.queryParams.fkRouteInspectionPlanId = this.message
+      this.queryParams.flag = 1
+      listDeviceAccount_route(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+
+    getList_nobind() {
+      this.loading = true
+      this.queryParams2.fkRouteInspectionPlanId = this.message
+      this.queryParams2.flag = 0
+      listDeviceAccount_route(this.queryParams2).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList_NO_bind = data.result
+          this.total2 = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+
+    // 查询2
+    handleQuery2() {
+      this.queryParams2.pageNum = 1
+      this.getList_nobind()
+    },
+    // 查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+
+    // 重置查询操作
+    resetQuery() {
+      this.$refs.queryRef && this.$refs.queryRef.resetFields()
+      this.handleQuery()
+    },
+
+    resetQuery2() {
+      this.$refs.queryRef2 && this.$refs.queryRef2.resetFields()
+      this.handleQuery2()
+    },
+    // 自定义排序
+    sortChange(column) {
+      var sort = undefined
+      var sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+
+    // 关闭dialog
+    cancel() {
+      this.open = false
+    },
+
+    // 添加按钮操作
+    handleAdd() {
+      this.open = true
+      this.title = '添加设备台账'
+      this.opertype = 1
+      this.loading = false
+
+      this.getList_nobind()
+    },
+
+    // 绑定
+    handleBind() {
+      let query = {}
+      query.FkRouteInspectionPlanId = this.message
+      query.FkDeviceAccountIdList = this.multipleSelection
+      AddRelation(query).then((res) => {
+        if (res.code == 200) {
+          this.$modal.msgSuccess('添加成功' + res.data + '条')
+          this.getList_nobind()
+        }
+      })
+    },
+
+    // 表单提交
+    submitForm() {
+      if (this.multipleSelection.length > 0) {
+        this.handleBind()
+      }
+      // 刷新数据
+      this.getList()
+      this.open = false
+    },
+
+    // 删除按钮操作
+    handleDelete(row) {
+      const Ids = row.id || this.ids
+
+      this.$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(() => {
+          const query = {
+            FkRouteInspectionPlanId: this.message,
+            FkDeviceAccountId: row.id
+          }
+          return delDeviceAccount_relation(query)
+        })
+        .then((res) => {
+          if (res.code == 200 && res.data > 0) {
+            this.getList()
+            this.$modal.msgSuccess('删除成功')
+          }
+        })
+    },
+
+    // 表格多选
+    handleSelectionChange(rows) {
+      this.multipleSelection = rows.map((it) => it.id)
+
+      console.log('multipleSelection', this.multipleSelection)
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManagement/datascreen/DemoChart.vue b/src/views/deviceManagement/datascreen/DemoChart.vue
new file mode 100644
index 0000000..8c6a9d2
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/DemoChart.vue
@@ -0,0 +1,12 @@
+<template>
+	<div>
+		
+	</div>
+</template>
+
+<script setup>
+
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/components/barChart1.vue b/src/views/deviceManagement/datascreen/components/barChart1.vue
new file mode 100644
index 0000000..0a2c6f3
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/components/barChart1.vue
@@ -0,0 +1,137 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef"></div>
+	</div>
+</template>
+
+<script>
+	import echarts from 'echarts';
+	import theme from '../theme/essos.json';
+	import {
+		FaultTypeBar
+	} from '@/api/deviceManagement/dataAnalysis.js'
+
+export default {
+  name: 'barChart1',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        devicetTypeId: 1,
+        deviceName: "",
+        deviceCode: "",
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      startDate: "",
+      endDate: "",
+      chartWidth: '100%',
+      chartHeight: '500px',
+      chart: null,
+      xData: [],
+      seriesData: [],
+      options: {
+        // 数据示例
+        legend: {
+          type:'scroll',
+          top: 'top',
+          width:'70%',
+          left:'20%'
+        },
+        xAxis: [
+        {
+          type: 'category',
+          axisPointer: {
+            type: 'shadow'
+          },
+          data: []
+        }],
+        yAxis: [
+        {
+          type: 'value',
+        }],
+        // 数据
+        series: []
+      }
+    }
+  },
+  watch: {
+    xData: function(newXData, oldXData) {
+      if (this.chart != null && newXData != oldXData) {
+        this.chart.setOption({ xAxis: [{ data: newXData }] });
+      }
+    },
+    seriesData: function(newSeriesData, oldSeriesData) {
+      if (this.chart != null && newSeriesData != oldSeriesData) {
+        this.chart.setOption({ series: newSeriesData });
+      }
+    }
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      queryData.searchTime = [this.$dayjs().startOf('month'), this.$dayjs().endOf('month')];
+      FaultTypeBar(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.xData = data.xData;
+          this.seriesData = data.seriesData;
+        }
+      })
+    },
+
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = echarts.init(this.$refs.chartRef, 'theme');
+      this.chart && this.chart.setOption(this.options);
+      
+      // 监听窗口大小变化
+      const handleResize = () => {
+        if (this.chart) {
+          this.chart.resize();
+        }
+      };
+      window.addEventListener('resize', handleResize);
+      
+      // 组件销毁时移除监听
+      this.$once('hook:beforeDestroy', () => {
+        window.removeEventListener('resize', handleResize);
+      });
+    }
+  },
+  
+  mounted() {
+    // 组件挂载后初始化图表
+    this.initChart();
+  },
+  
+  beforeDestroy() {
+    // 组件销毁时释放图表资源
+    if (this.chart) {
+      this.chart.dispose();
+      this.chart = null;
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 240px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/components/barChart2.vue b/src/views/deviceManagement/datascreen/components/barChart2.vue
new file mode 100644
index 0000000..2a84278
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/components/barChart2.vue
@@ -0,0 +1,137 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef"></div>
+	</div>
+</template>
+
+<script>
+	// Vue 2.0 引入 ECharts 的方式
+	import echarts from 'echarts';
+	import theme from '../theme/shine.json';
+	import {
+		FaultTypeBarByDay
+	} from '@/api/deviceManagement/dataAnalysis.js';
+
+export default {
+	name: 'barChart2',
+	props: {
+		queryParams: {
+			type: Object,
+			default: {
+				devicetTypeId: 1,
+				deviceName: "",
+				deviceCode: "",
+				searchTime: []
+			}
+		}
+	},
+	data() {
+		return {
+			loading: false,
+			startDate: "",
+			endDate: "",
+			chartWidth: '100%',
+			chartHeight: '500px',
+			chart: null,
+			xData: [],
+			seriesData: [],
+			options: {
+				// 数据示例
+				legend: {
+					type: 'scroll',
+					top: 'top',
+					width: '70%',
+					left: '20%'
+				},
+				xAxis: [
+				{
+					type: 'category',
+					axisPointer: {
+						type: 'shadow'
+					},
+					data: []
+				}],
+				yAxis: [
+				{
+					type: 'value',
+				}],
+				// 数据
+				series: []
+			}
+		};
+	},
+	watch: {
+		// 监听 xData 变化
+		xData: {
+			handler(newXData) {
+				if (this.chart != null) {
+					this.chart.setOption({ xAxis: [{ data: newXData }] });
+				}
+			},
+			deep: true
+		},
+		// 监听 seriesData 变化
+		seriesData: {
+			handler(newSeriesData) {
+				if (this.chart != null) {
+					this.chart.setOption({ series: newSeriesData });
+				}
+			},
+			deep: true
+		}
+	},
+	methods: {
+		getData() {
+			this.loading = true;
+			let queryData = JSON.parse(JSON.stringify(this.queryParams));
+			queryData.searchTime = [this.dayjs().startOf('month'), this.dayjs().endOf('month')];
+			FaultTypeBarByDay(queryData).then(res => {
+				const { code, data } = res;
+				if (code === 200 && data != null && data != undefined) {
+					this.loading = false;
+					this.xData = data.xData;
+					this.seriesData = data.seriesData;
+				}
+			});
+		},
+
+		// 初始化数据
+		init() {
+			if (this.chart === null || this.chart === undefined) {
+				this.initChart();
+			}
+			this.getData();
+		},
+
+		initChart() {
+			echarts.registerTheme('theme', theme);
+			this.chart = echarts.init(this.$refs.chartRef, 'theme');
+			this.chart && this.chart.setOption(this.options);
+			
+			// 处理窗口大小变化
+			this.handleResize = () => {
+				this.chart && this.chart.resize();
+			};
+			window.addEventListener('resize', this.handleResize);
+		}
+	},
+	beforeDestroy() {
+		// 清理事件监听器
+		if (this.handleResize) {
+			window.removeEventListener('resize', this.handleResize);
+		}
+		// 销毁图表实例
+		if (this.chart) {
+			this.chart.dispose();
+			this.chart = null;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 240px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/components/lineChart1.vue b/src/views/deviceManagement/datascreen/components/lineChart1.vue
new file mode 100644
index 0000000..c5c93bd
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/components/lineChart1.vue
@@ -0,0 +1,137 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef"></div>
+	</div>
+</template>
+
+<script>
+	import echarts from 'echarts';
+	import theme from '../theme/shine.json';
+	import {
+		TaskLinebyDay
+	} from '@/api/deviceManagement/dataAnalysis.js'
+
+export default {
+  name: 'lineChart1',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        devicetTypeId: 1,
+        deviceName: "",
+        deviceCode: "",
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      startDate: "",
+      endDate: "",
+      chartWidth: '100%',
+      chartHeight: '500px',
+      chart: null,
+      xData: [],
+      seriesData: [],
+      options: {
+        xAxis: [
+        {
+          type: 'category',
+          data: []
+        }],
+        yAxis: [
+        {
+          type: 'value'
+        }],
+        // 横向指示线
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        // 数据
+        series: []
+      }
+    }
+  },
+  watch: {
+    xData: function(newXData, oldXData) {
+      if (this.chart != null && newXData != oldXData) {
+        this.chart.setOption({ xAxis: [{ data: newXData }] });
+      }
+    },
+    seriesData: function(newSeriesData, oldSeriesData) {
+      if (this.chart != null && newSeriesData != oldSeriesData) {
+        this.chart.setOption({ series: newSeriesData });
+      }
+    }
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      queryData.searchTime = [this.$dayjs().startOf('month'), this.$dayjs().endOf('month')];
+      TaskLinebyDay(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.xData = data.xData;
+          this.seriesData = data.seriesData;
+        }
+      })
+    },
+
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = echarts.init(this.$refs.chartRef, 'theme');
+      this.chart && this.chart.setOption(this.options);
+      
+      // 监听窗口大小变化
+      const handleResize = () => {
+        if (this.chart) {
+          this.chart.resize();
+        }
+      };
+      window.addEventListener('resize', handleResize);
+      
+      // 组件销毁时移除监听
+      this.$once('hook:beforeDestroy', () => {
+        window.removeEventListener('resize', handleResize);
+      });
+    }
+  },
+  
+  mounted() {
+    // 组件挂载后初始化图表
+    this.initChart();
+  },
+  
+  beforeDestroy() {
+    // 组件销毁时释放图表资源
+    if (this.chart) {
+      this.chart.dispose();
+      this.chart = null;
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 240px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/components/lineChart2.vue b/src/views/deviceManagement/datascreen/components/lineChart2.vue
new file mode 100644
index 0000000..4937b6c
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/components/lineChart2.vue
@@ -0,0 +1,139 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef"></div>
+	</div>
+</template>
+
+<script>
+import echarts from 'echarts'
+import theme from '../theme/shine.json';
+import {
+  PersonResponse
+}
+from '@/api/deviceManagement/dataAnalysis.js'
+
+export default {
+  name: 'lineChart2',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        searchType: 1,
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      startDate: "",
+      endDate: "",
+      chartWidth: '100%',
+      chartHeight: '500px',
+      chart: null,
+      xData: [],
+      seriesData: [],
+      options: {
+        xAxis: [
+          {
+            type: 'category',
+            data: []
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+          }
+        ],
+        // 横向指示线
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        // 数据
+        series: []
+      }
+    }
+  },
+  watch: {
+    xData: {
+      handler(newXData) {
+        if (this.chart != null) {
+          this.chart.setOption({ xAxis: [{ data: newXData }] });
+        }
+      },
+      deep: true
+    },
+    seriesData: {
+      handler(newSeriesData) {
+        if (this.chart != null) {
+          this.chart.setOption({ series: newSeriesData });
+        }
+      },
+      deep: true
+    }
+  },
+  mounted() {
+    // 组件挂载时初始化图表
+    this.initChart();
+    // 添加窗口大小调整监听
+    window.addEventListener('resize', this.handleResize);
+  },
+  beforeDestroy() {
+    // 清理事件监听器和图表实例
+    window.removeEventListener('resize', this.handleResize);
+    if (this.chart) {
+      this.chart.dispose();
+      this.chart = null;
+    }
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      queryData.searchTime = [this.dayjs().startOf('month'), this.dayjs().endOf('month')];
+      PersonResponse(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.xData = data.xData;
+          this.seriesData = data.seriesData;
+        }
+      })
+    },
+
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = echarts.init(this.$refs.chartRef, 'theme');
+      this.chart && this.chart.setOption(this.options);
+    },
+
+    // 处理窗口大小调整
+    handleResize() {
+      if (this.chart) {
+        this.chart.resize();
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 240px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/components/lineChart3.vue b/src/views/deviceManagement/datascreen/components/lineChart3.vue
new file mode 100644
index 0000000..7b06e64
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/components/lineChart3.vue
@@ -0,0 +1,139 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef"></div>
+	</div>
+</template>
+
+<script>
+import echarts from 'echarts'
+import theme from '../theme/shine.json';
+import {
+  PersonResponse
+}
+from '@/api/deviceManagement/dataAnalysis.js'
+
+export default {
+  name: 'lineChart3',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        searchType: 2,
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      startDate: "",
+      endDate: "",
+      chartWidth: '100%',
+      chartHeight: '500px',
+      chart: null,
+      xData: [],
+      seriesData: [],
+      options: {
+        xAxis: [
+          {
+            type: 'category',
+            data: []
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+          }
+        ],
+        // 横向指示线
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        // 数据
+        series: []
+      }
+    }
+  },
+  watch: {
+    xData: {
+      handler(newXData) {
+        if (this.chart != null) {
+          this.chart.setOption({ xAxis: [{ data: newXData }] });
+        }
+      },
+      deep: true
+    },
+    seriesData: {
+      handler(newSeriesData) {
+        if (this.chart != null) {
+          this.chart.setOption({ series: newSeriesData });
+        }
+      },
+      deep: true
+    }
+  },
+  mounted() {
+    // 组件挂载时初始化图表
+    this.initChart();
+    // 添加窗口大小调整监听
+    window.addEventListener('resize', this.handleResize);
+  },
+  beforeDestroy() {
+    // 清理事件监听器和图表实例
+    window.removeEventListener('resize', this.handleResize);
+    if (this.chart) {
+      this.chart.dispose();
+      this.chart = null;
+    }
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      queryData.searchTime = [this.dayjs().startOf('month'), this.dayjs().endOf('month')];
+      PersonResponse(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.xData = data.xData;
+          this.seriesData = data.seriesData;
+        }
+      })
+    },
+
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = echarts.init(this.$refs.chartRef, 'theme');
+      this.chart && this.chart.setOption(this.options);
+    },
+
+    // 处理窗口大小调整
+    handleResize() {
+      if (this.chart) {
+        this.chart.resize();
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 240px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/components/lineChart4.vue b/src/views/deviceManagement/datascreen/components/lineChart4.vue
new file mode 100644
index 0000000..fcdd156
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/components/lineChart4.vue
@@ -0,0 +1,138 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef"></div>
+	</div>
+</template>
+
+<script>
+import echarts from 'echarts'
+import theme from '../theme/shine.json';
+import {
+  FaultTypeLine
+}
+from '@/api/deviceManagement/dataAnalysis.js'
+
+export default {
+  name: 'lineChart4',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        devicetTypeId: 1,
+        deviceName: "",
+        deviceCode: "",
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      startDate: "",
+      endDate: "",
+      chartWidth: '100%',
+      chartHeight: '500px',
+      chart: null,
+      xData: [],
+      seriesData: [],
+      options: {
+        // 数据示例
+        legend: {
+          type: 'scroll',
+          top: 'top',
+          width: '70%',
+          left: '20%'
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: []
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value'
+          }
+        ],
+        // 数据
+        series: []
+      }
+    }
+  },
+  watch: {
+    xData: {
+      handler(newXData) {
+        if (this.chart != null) {
+          this.chart.setOption({ xAxis: [{ data: newXData }] });
+        }
+      },
+      deep: true
+    },
+    seriesData: {
+      handler(newSeriesData) {
+        if (this.chart != null) {
+          this.chart.setOption({ series: newSeriesData });
+        }
+      },
+      deep: true
+    }
+  },
+  mounted() {
+    // 组件挂载时初始化图表
+    this.initChart();
+    // 添加窗口大小调整监听
+    window.addEventListener('resize', this.handleResize);
+  },
+  beforeDestroy() {
+    // 清理事件监听器和图表实例
+    window.removeEventListener('resize', this.handleResize);
+    if (this.chart) {
+      this.chart.dispose();
+      this.chart = null;
+    }
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      queryData.searchTime = [this.dayjs().startOf('month'), this.dayjs().endOf('month')];
+      FaultTypeLine(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.xData = data.xData;
+          this.seriesData = data.seriesData;
+        }
+      })
+    },
+
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = echarts.init(this.$refs.chartRef, 'theme');
+      this.chart && this.chart.setOption(this.options);
+    },
+
+    // 处理窗口大小调整
+    handleResize() {
+      if (this.chart) {
+        this.chart.resize();
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 240px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/components/pieChart1.vue b/src/views/deviceManagement/datascreen/components/pieChart1.vue
new file mode 100644
index 0000000..854ab2d
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/components/pieChart1.vue
@@ -0,0 +1,131 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef1"></div>
+	</div>
+</template>
+
+<script>
+	import echarts from 'echarts'
+	import theme from '../theme/essos.json'
+	import {
+		defaultTypePie
+	}
+	from '@/api/deviceManagement/dataAnalysis.js'
+
+export default {
+  name: 'PieChart1',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        devicetTypeId: 1,
+        deviceName: "",
+        deviceCode: "",
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      chart: null,
+      seriesData: [],
+      chartWidth: '100%',
+      chartHeight: '500px',
+      startDate: '',
+      endDate: ''
+    }
+  },
+  watch: {
+    seriesData: {
+      handler: function(newSeriesData, oldSeriesData) {
+        if (this.chart != null && newSeriesData != oldSeriesData) {
+          this.chart.setOption({ series: [{ data: newSeriesData }] });
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      queryData.searchTime = [this.$dayjs().startOf('day'), this.$dayjs().endOf('day')];
+      defaultTypePie(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.seriesData = data;
+        }
+      })
+    },
+
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = echarts.init(this.$refs.chartRef1, 'theme');
+      
+      const options = {
+        // 数据示例
+        legend: {
+          type: 'scroll',
+          height: '20%',
+          orient: 'vertical',
+          left: 'left',
+        },
+        // 横向指示线
+        tooltip: {
+          trigger: 'item',
+        },
+        // 数据
+        series: [
+        {
+          data: [],
+          // 数据标识
+          type: 'pie',
+          roseType: 'area',
+          itemStyle: {
+            borderRadius: 5
+          },
+          emphasis: {
+            itemStyle: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: 'rgba(0, 0, 0, 0.5)'
+            }
+          }
+        }]
+      }
+      
+      this.chart && this.chart.setOption(options);
+      
+      const resizeHandler = () => {
+        setTimeout(() => {
+          this.chart && this.chart.resize();
+        }, 100)
+      }
+      
+      window.addEventListener('resize', resizeHandler);
+      
+      // 在组件销毁时移除事件监听
+      this.$once('hook:beforeDestroy', () => {
+        window.removeEventListener('resize', resizeHandler);
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 200px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/components/pieChart2.vue b/src/views/deviceManagement/datascreen/components/pieChart2.vue
new file mode 100644
index 0000000..a521013
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/components/pieChart2.vue
@@ -0,0 +1,133 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef1"></div>
+	</div>
+</template>
+
+<script>
+	import theme from '../theme/essos.json';
+	import {
+		defaultTypePie
+	} from '@/api/deviceManagement/dataAnalysis.js';
+	export default {
+		name: 'pieChart2',
+		props: {
+			queryParams: {
+				type: Object,
+				default: {
+					devicetTypeId: 1,
+					deviceName: "",
+					deviceCode: "",
+					searchTime: []
+				}
+			}
+		},
+		data() {
+			return {
+				loading: false,
+				startDate: "",
+				endDate: "",
+				chartWidth: '100%',
+				chartHeight: '500px',
+				chart: null,
+				seriesData: [],
+				options: {
+					// 数据示例
+					legend: {
+						type: 'scroll',
+						height: '20%',
+						orient: 'vertical',
+						left: 'left'
+					},
+					// 横向指示线
+					tooltip: {
+						trigger: 'item'
+					},
+					// 数据
+					series: [
+						{
+							data: [],
+							// 数据标识
+							type: 'pie',
+							roseType: 'area',
+							itemStyle: {
+								borderRadius: 5
+							},
+							emphasis: {
+								itemStyle: {
+									shadowBlur: 10,
+									shadowOffsetX: 0,
+									shadowColor: 'rgba(0, 0, 0, 0.5)'
+								}
+							}
+						}
+					]
+				}
+			};
+		},
+		watch: {
+			seriesData: {
+				handler(newSeriesData, oldSeriesData) {
+					if (this.chart != null) {
+						if (newSeriesData != oldSeriesData) {
+							this.chart.setOption({ series: [{ data: newSeriesData }] });
+						}
+					}
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			this.init();
+		},
+		beforeDestroy() {
+			if (this.chart) {
+				this.chart.dispose();
+			}
+			window.removeEventListener('resize', this.handleResize);
+		},
+		methods: {
+			getData() {
+				this.loading = true;
+				let queryData = JSON.parse(JSON.stringify(this.queryParams));
+				queryData.searchTime = [this.$dayjs().startOf('month'), this.$dayjs().endOf('month')];
+				defaultTypePie(queryData).then(res => {
+					const { code, data } = res;
+					if (code === 200 && data != null && data != undefined) {
+						this.loading = false;
+						this.seriesData = data;
+					}
+				});
+			},
+
+			// 初始化数据
+			init() {
+				if (this.chart === null || this.chart === undefined) {
+					this.initChart();
+				}
+				this.getData();
+			},
+
+			initChart() {
+				const echarts = require('echarts');
+			echarts.registerTheme('theme', theme);
+				this.chart = echarts.init(this.$refs.chartRef1, 'theme');
+				this.chart && this.chart.setOption(this.options);
+				window.addEventListener('resize', this.handleResize);
+			},
+
+			handleResize() {
+				setTimeout(() => {
+					this.chart && this.chart.resize();
+				}, 100);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 200px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/components/table1.vue b/src/views/deviceManagement/datascreen/components/table1.vue
new file mode 100644
index 0000000..0d22e61
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/components/table1.vue
@@ -0,0 +1,190 @@
+<!--
+ * @Descripttion: (任务执行/device_task_execute)
+ * @Author: (许前浩)
+ * @Date: (2024-05-31)
+-->
+<template>
+	<div>
+		<el-table :data="dataList" v-loading="loading" ref="tableRef" border header-cell-class-name="el-table-header-cell" height="200" highlight-current-row @sort-change="sortChange" @mouseover.native="clearScroll" @mouseleave.native="createScroll">
+			<el-table-column type="index" width="50" align="center" />
+			<el-table-column prop="id" label="数据库编号" align="center" v-if="showColumn('id')" />
+			<el-table-column prop="taskId" label="任务编号" align="center" :show-overflow-tooltip="true" v-if="showColumn('taskId')" />
+			<el-table-column prop="taskName" label="任务名称" align="center" width="200" :show-overflow-tooltip="true" v-if="showColumn('taskName')" />
+			<el-table-column prop="type" label="任务类型" align="center" v-if="showColumn('type')">
+				<template #default="scope">
+					<dict-tag :options="options.typeOptions" :value="scope.row.type" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="distributedTime" label="任务派发时间" align="center" :show-overflow-tooltip="true" v-if="showColumn('distributedTime')" />
+			<el-table-column prop="startTime" label="任务开始时间" align="center" :show-overflow-tooltip="true" v-if="showColumn('startTime')" />
+			<el-table-column prop="endTime" label="任务结束时间" align="center" :show-overflow-tooltip="true" v-if="showColumn('endTime')" />
+			<el-table-column prop="status" label="状态" align="center" v-if="showColumn('status')">
+				<template #default="scope">
+					<dict-tag :options="options.statusOptions" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="showColumn('remark')" />
+			<el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="showColumn('createdBy')" />
+			<el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="showColumn('createdTime')" />
+			<el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="showColumn('updatedBy')" />
+			<el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="showColumn('updatedTime')" />
+		</el-table>
+	</div>
+</template>
+
+<script>
+	import {
+		listDeviceTaskExecute,
+	} from '@/api/deviceManagement/devicetaskexecute.js'
+
+export default {
+  name: 'table1',
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+        timeRange: null,
+        timeStart: null,
+        timeEnd: null,
+        type: -1,
+        status: -1,
+        sort: 'Id',
+        sortType: 'asc'
+      },
+      columns: [
+        { visible: false, prop: 'id', label: '主键' },
+        { visible: false, prop: 'taskId', label: '任务id' },
+        { visible: true, prop: 'taskName', label: '任务名称' },
+        { visible: true, prop: 'type', label: '任务类型（1是巡检，2是点检）' },
+        { visible: false, prop: 'distributedTime', label: '任务派发时间' },
+        { visible: false, prop: 'startTime', label: '任务执行——开始时间' },
+        { visible: false, prop: 'endTime', label: '任务执行——结束时间' },
+        { visible: false, prop: 'status', label: '状态' },
+        { visible: false, prop: 'remark', label: '备注' },
+        { visible: false, prop: 'createdBy', label: '创建人' },
+        { visible: false, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' }
+      ],
+      total: 0,
+      dataList: [],
+      defaultTimeRange: [],
+      options: {
+        // 任务类型（1是巡检，2是点检） 选项列表
+        typeOptions: [
+          { dictLabel: '巡检', dictValue: 1, listClass: 'primary' },
+          { dictLabel: '点检', dictValue: 2, listClass: 'warning' },
+        ],
+        // 0-未执行 1-执行中 2-已完成 3-超时
+        statusOptions: [
+          { dictLabel: '未执行', dictValue: 0, listClass: 'info' },
+          { dictLabel: '执行中', dictValue: 1, listClass: 'primary' },
+          { dictLabel: '已完成', dictValue: 2, listClass: 'success' },
+          { dictLabel: '超时', dictValue: 3, listClass: 'danger' },
+        ]
+      },
+      dictParams: [],
+      timer1: null,
+      timer2: null
+    }
+  },
+  methods: {
+    getList() {
+      listDeviceTaskExecute(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+        }
+      })
+    },
+
+    // 查询
+    handleQuery() {
+      this.queryParams.timeRange = this.defaultTimeRange;
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+
+    // 重置查询操作
+    resetQuery() {
+      this.$resetForm('queryRef')
+      this.handleQuery()
+    },
+    
+    // 自定义排序
+    sortChange(column) {
+      var sort = undefined
+      var sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+    
+    // 自动获取数据
+    clearSearchTimer() {
+      clearInterval(this.timer1)
+      this.timer1 = null
+    },
+    
+    createSearchTimer() {
+      this.clearSearchTimer()
+      this.timer1 = setInterval(() => {
+        this.handleQuery()
+      }, 10000)
+    },
+
+    // 自动滚动
+    clearScroll() {
+      clearInterval(this.timer2)
+      this.timer2 = null
+    },
+    
+    createScroll() {
+      this.clearScroll()
+      // 拿到 table
+      const _table = this.$refs.tableRef.layout.table.refs;
+      // 拿到可以滚动的元素
+      const tableWrapper = _table.bodyWrapper.firstElementChild.firstElementChild;
+      this.timer2 = setInterval(() => {
+        tableWrapper.scrollTop += 1
+        // 判断是否滚动到底部，如果到底部了置为0（可视高度+距离顶部=整个高度）
+        if (tableWrapper.clientHeight + tableWrapper.scrollTop >= tableWrapper.scrollHeight) {
+          tableWrapper.scrollTop = 0
+        }
+      }, 100)
+    },
+    
+    // 列显示控制方法
+    showColumn(prop) {
+      const column = this.columns.find(col => col.prop === prop)
+      return column ? column.visible : false
+    }
+  },
+  
+  mounted() {
+    // 初始化时间
+    this.queryParams.timeStart = this.$dayjs().startOf('day')
+    this.queryParams.timeEnd = this.$dayjs().endOf('day')
+    this.defaultTimeRange = [this.$dayjs().startOf('day'), this.$dayjs().endOf('day')]
+    
+    this.createSearchTimer();
+    this.createScroll()
+    this.handleQuery()
+  },
+  
+  beforeDestroy() {
+    this.clearScroll()
+    this.clearSearchTimer();
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/components/table2.vue b/src/views/deviceManagement/datascreen/components/table2.vue
new file mode 100644
index 0000000..f9e5794
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/components/table2.vue
@@ -0,0 +1,194 @@
+<!--
+ * @Descripttion: (任务执行/device_task_execute)
+ * @Author: (许前浩)
+ * @Date: (2024-05-31)
+-->
+<template>
+	<div>
+		<el-table :data="dataList" v-loading="loading" ref="tableRef" border height="200" highlight-current-row @sort-change="sortChange" @mouseover.native="clearScroll" @mouseleave.native="createScroll">
+			<el-table-column type="index" width="50" align="center" />
+			<el-table-column prop="id" label="数据库主键" align="center" :show-overflow-tooltip="true" v-if="showColumn('id')" />
+			<el-table-column prop="repairOrder" label="维修单号" align="center" :show-overflow-tooltip="true" v-if="showColumn('repairOrder')" width="120" />
+			<el-table-column prop="type" label="类型" align="center" v-if="showColumn('type')">
+				<template #default="scope">
+					<dict-tag :options="options.typeOptions" :value="scope.row.type" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="repairPeron" label="报修人" align="center" :show-overflow-tooltip="true" v-if="showColumn('repairPeron')" />
+			<el-table-column prop="phone" label="手机号" align="center" :show-overflow-tooltip="true" v-if="showColumn('phone')" />
+			<el-table-column prop="faultDescription" label="故障描述" align="center" :show-overflow-tooltip="true" v-if="showColumn('faultDescription')" />
+			<el-table-column prop="status" label="状态" align="center" v-if="showColumn('status')">
+				<template #default="scope">
+					<dict-tag :options="options.statusOptions" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="showColumn('createdBy')" />
+			<el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="showColumn('createdTime')" />
+			<el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="showColumn('updatedBy')" />
+			<el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="showColumn('updatedTime')" />
+		</el-table>
+	</div>
+</template>
+
+<script>
+	import {
+		listDeviceRepair,
+	} from '@/api/deviceManagement/devicerepair.js'
+
+export default {
+  name: 'table2',
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+        timeRange: null,
+        timeStart: null,
+        timeEnd: null,
+        type: -1,
+        status: -1,
+        sort: 'Id',
+        sortType: 'asc'
+      },
+      columns: [
+        { visible: false, prop: 'id', label: '雪花id' },
+        { visible: true, prop: 'repairOrder', label: '维修单号' },
+        { visible: false, prop: 'fkDeviceId', label: '设备id' },
+        { visible: true, prop: 'type', label: '报修类型' },
+        { visible: true, prop: 'repairPeron', label: '报修人' },
+        { visible: false, prop: 'phone', label: '手机号' },
+        { visible: false, prop: 'faultDescription', label: '故障描述' },
+        { visible: false, prop: 'file', label: '拍照描述' },
+        { visible: false, prop: 'status', label: '状态（启用，关闭 维修中）' },
+        { visible: false, prop: 'createdBy', label: '创建人' },
+        { visible: false, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' },
+      ],
+      total: 0,
+      dataList: [],
+      defaultTimeRange: [],
+      options: {
+        // 报修类型 选项列表
+        typeOptions: [],
+        // 状态（启用，停用 维修中） 选项列表
+        statusOptions: [
+          { dictLabel: '未接单', dictValue: 0, listClass: 'danger' },
+          { dictLabel: '维修中', dictValue: 1, listClass: 'info' },
+          { dictLabel: '已结单', dictValue: 2, listClass: 'success' },
+        ],
+      },
+      dictParams: [],
+      timer1: null,
+      timer2: null
+    }
+  },
+  methods: {
+    getList() {
+      listDeviceRepair(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+        }
+      })
+    },
+
+    getDict() {
+      this.$getDicts("mes_device_fault_type").then(res => {
+        const { code, data } = res
+        if (code == 200) {
+          this.options.typeOptions = data;
+        }
+      })
+    },
+
+    // 查询
+    handleQuery() {
+      this.queryParams.timeRange = this.defaultTimeRange;
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+
+    // 重置查询操作
+    resetQuery() {
+      this.$resetForm('queryRef')
+      this.handleQuery()
+    },
+    
+    // 自定义排序
+    sortChange(column) {
+      var sort = undefined
+      var sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+    
+    // 自动获取数据
+    clearSearchTimer() {
+      clearInterval(this.timer1)
+      this.timer1 = null
+    },
+    
+    createSearchTimer() {
+      this.clearSearchTimer()
+      this.timer1 = setInterval(() => {
+        this.handleQuery()
+      }, 10000)
+    },
+
+    // 自动滚动
+    clearScroll() {
+      clearInterval(this.timer2)
+      this.timer2 = null
+    },
+    
+    createScroll() {
+      this.clearScroll()
+      // 拿到 table
+      const _table = this.$refs.tableRef.layout.table.refs;
+      // 拿到可以滚动的元素
+      const tableWrapper = _table.bodyWrapper.firstElementChild.firstElementChild;
+      this.timer2 = setInterval(() => {
+        tableWrapper.scrollTop += 1
+        // 判断是否滚动到底部，如果到底部了置为0（可视高度+距离顶部=整个高度）
+        if (tableWrapper.clientHeight + tableWrapper.scrollTop >= tableWrapper.scrollHeight) {
+          tableWrapper.scrollTop = 0
+        }
+      }, 100)
+    },
+    
+    // 列显示控制方法
+    showColumn(prop) {
+      const column = this.columns.find(col => col.prop === prop)
+      return column ? column.visible : false
+    }
+  },
+  
+  mounted() {
+    // 初始化时间
+    this.queryParams.timeStart = this.$dayjs().startOf('day')
+    this.queryParams.timeEnd = this.$dayjs().endOf('day')
+    this.defaultTimeRange = [this.$dayjs().startOf('day'), this.$dayjs().endOf('day')]
+    
+    this.createSearchTimer();
+    this.createScroll()
+    this.getDict()
+    this.handleQuery()
+  },
+  
+  beforeDestroy() {
+    this.clearScroll()
+    this.clearSearchTimer();
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/dayTaskAnalysis/index.vue b/src/views/deviceManagement/datascreen/dayTaskAnalysis/index.vue
new file mode 100644
index 0000000..15669ca
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/dayTaskAnalysis/index.vue
@@ -0,0 +1,74 @@
+<template>
+	<div>
+		<el-card class="card-box">
+			<div class="table-title-text">今日巡检/点检任务</div>
+			<table1 class="chart1"></table1>
+		</el-card>
+		<el-card class="card-box">
+			<div class="table-title-text">今日维修任务</div>
+			<table2 class="chart1"></table2>
+		</el-card>
+		<BaseFullScreen></BaseFullScreen>
+	</div>
+</template>
+
+<script>
+	import { MessageBox } from 'element-ui'
+	import BaseFullScreen from '@/components/BaseFullScreen'
+	import table1 from './table1'
+	import table2 from './table2'
+
+export default {
+  name: 'dayTaskAnalysis',
+  components: {
+    BaseFullScreen,
+    table1,
+    table2
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.border {
+		border: 1px solid #ffffff;
+	}
+
+	.chart1 {
+		width: 100%;
+		height: 240px;
+	}
+
+	.chart2 {
+		width: 100%;
+		height: 270px;
+	}
+
+	.pie-right {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.header-card {
+		margin-bottom: 10px;
+	}
+
+	.card-box {
+		margin-top: 10px;
+	}
+
+	.table-title-text {
+		font-size: 20px;
+		font-weight: 600;
+		margin-bottom: 10px;
+	}
+
+	.fixed-element {
+		position: fixed;
+		top: 140;
+		right: 20;
+		z-index: 9999;
+		display: block;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/dayTaskAnalysis/table1.vue b/src/views/deviceManagement/datascreen/dayTaskAnalysis/table1.vue
new file mode 100644
index 0000000..9f6df9a
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/dayTaskAnalysis/table1.vue
@@ -0,0 +1,186 @@
+<!--
+ * @Descripttion: (任务执行/device_task_execute)
+ * @Author: (许前浩)
+ * @Date: (2024-05-31)
+-->
+<template>
+	<div>
+		<el-table :data="dataList" v-loading="loading" ref="tableRef" border header-cell-class-name="el-table-header-cell" height="240" highlight-current-row @sort-change="sortChange" @mouseover.native="clearScroll" @mouseleave.native="createScroll">
+			<el-table-column type="index" width="50" align="center" />
+			<el-table-column prop="id" label="数据库编号" align="center" v-if="showColumn('id')" />
+			<el-table-column prop="taskId" label="任务编号" align="center" :show-overflow-tooltip="true" v-if="showColumn('taskId')" />
+			<el-table-column prop="taskName" label="任务名称" align="center" width="200" :show-overflow-tooltip="true" v-if="showColumn('taskName')" />
+			<el-table-column prop="type" label="任务类型" align="center" v-if="showColumn('type')">
+				<template slot-scope="scope">
+					<dict-tag :options="options.typeOptions" :value="scope.row.type" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="distributedTime" label="任务派发时间" align="center" :show-overflow-tooltip="true" v-if="showColumn('distributedTime')" />
+			<el-table-column prop="startTime" label="任务开始时间" align="center" :show-overflow-tooltip="true" v-if="showColumn('startTime')" />
+			<el-table-column prop="endTime" label="任务结束时间" align="center" :show-overflow-tooltip="true" v-if="showColumn('endTime')" />
+			<el-table-column prop="status" label="状态" align="center" v-if="showColumn('status')">
+				<template slot-scope="scope">
+					<dict-tag :options="options.statusOptions" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="showColumn('remark')" />
+			<el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="showColumn('createdBy')" />
+			<el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="showColumn('createdTime')" />
+			<el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="showColumn('updatedBy')" />
+			<el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="showColumn('updatedTime')" />
+		</el-table>
+	</div>
+</template>
+
+<script>
+	import {
+		listDeviceTaskExecute,
+	} from '@/api/deviceManagement/devicetaskexecute.js'
+
+export default {
+  name: 'devicetaskexecute',
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+        timeRange: null,
+        timeStart: this.$dayjs().startOf('day'),
+        timeEnd: this.$dayjs().endOf('day'),
+        type: -1,
+        status: -1,
+        sort: 'Id',
+        sortType: 'asc'
+      },
+      columns: [
+        { visible: false, prop: 'id', label: '主键' },
+        { visible: false, prop: 'taskId', label: '任务id' },
+        { visible: true, prop: 'taskName', label: '任务名称' },
+        { visible: true, prop: 'type', label: '任务类型（1是巡检，2是点检）' },
+        { visible: true, prop: 'distributedTime', label: '任务派发时间' },
+        { visible: false, prop: 'startTime', label: '任务执行——开始时间' },
+        { visible: false, prop: 'endTime', label: '任务执行——结束时间' },
+        { visible: true, prop: 'status', label: '状态' },
+        { visible: true, prop: 'remark', label: '备注' },
+        { visible: false, prop: 'createdBy', label: '创建人' },
+        { visible: false, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' }
+      ],
+      total: 0,
+      dataList: [],
+      queryRef: null,
+      defaultTimeRange: null,
+      options: {
+        // 任务类型（1是巡检，2是点检） 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+        typeOptions: [
+          { dictLabel: '巡检', dictValue: 1, listClass: 'primary' },
+          { dictLabel: '点检', dictValue: 2, listClass: 'warning' },
+        ],
+        // 0-未执行 1-执行中 2-已完成 3-超时
+        // 状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+        statusOptions: [
+          { dictLabel: '未执行', dictValue: 0, listClass: 'info' },
+          { dictLabel: '执行中', dictValue: 1, listClass: 'primary' },
+          { dictLabel: '已完成', dictValue: 2, listClass: 'success' },
+          { dictLabel: '超时', dictValue: 3, listClass: 'danger' },
+        ]
+      },
+      dictParams: [],
+      timer1: null,
+      timer2: null
+    }
+  },
+  methods: {
+    getList() {
+      // this.loading = true
+      listDeviceTaskExecute(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          // this.loading = false
+        }
+      })
+    },
+
+    // 查询
+    handleQuery() {
+      this.queryParams.timeRange = this.defaultTimeRange;
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+
+    // 重置查询操作
+    resetQuery() {
+      this.$refs.queryRef.resetFields()
+      this.handleQuery()
+    },
+    // 自定义排序
+    sortChange(column) {
+      var sort = undefined
+      var sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+    // 自动获取数据
+    clearSearchTimer() {
+      clearInterval(this.timer1)
+      this.timer1 = null
+    },
+    createSearchTimer() {
+      this.clearSearchTimer()
+      this.timer1 = setInterval(() => {
+        this.handleQuery()
+      }, 10000)
+    },
+
+    // 自动滚动
+    clearScroll() {
+      clearInterval(this.timer2)
+      this.timer2 = null
+    },
+    createScroll() {
+      this.clearScroll()
+      // 拿到 table
+      const _table = this.$refs.tableRef;
+      // 拿到可以滚动的元素
+      const tableWrapper = _table.bodyWrapper;
+      this.timer2 = setInterval(() => {
+        tableWrapper.scrollTop += 1
+        // 判断是否滚动到底部，如果到底部了置为0（可视高度+距离顶部=整个高度）
+        if (tableWrapper.clientHeight + tableWrapper.scrollTop >= tableWrapper.scrollHeight) {
+          tableWrapper.scrollTop = 0
+        }
+      }, 100)
+    },
+    
+    // 控制列显示
+    showColumn(prop) {
+      const column = this.columns.find(col => col.prop === prop)
+      return column ? column.visible : false
+    }
+  },
+  
+  mounted() {
+    this.defaultTimeRange = [this.$dayjs().startOf('day'), this.$dayjs().endOf('day')]
+    this.createSearchTimer()
+    this.createScroll()
+    this.handleQuery()
+  },
+  
+  beforeDestroy() {
+    this.clearScroll()
+    this.clearSearchTimer()
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/dayTaskAnalysis/table2.vue b/src/views/deviceManagement/datascreen/dayTaskAnalysis/table2.vue
new file mode 100644
index 0000000..58fc5d2
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/dayTaskAnalysis/table2.vue
@@ -0,0 +1,190 @@
+<!--
+ * @Descripttion: (任务执行/device_task_execute)
+ * @Author: (许前浩)
+ * @Date: (2024-05-31)
+-->
+<template>
+	<div>
+		<el-table :data="dataList" v-loading="loading" ref="tableRef" border header-cell-class-name="el-table-header-cell" highlight-current-row @sort-change="sortChange" @mouseover.native="clearScroll" @mouseleave.native="createScroll">
+			<el-table-column type="index" width="50" align="center" />
+			<el-table-column prop="id" label="数据库主键" align="center" :show-overflow-tooltip="true" v-if="showColumn('id')" />
+			<el-table-column prop="repairOrder" label="维修单号" align="center" :show-overflow-tooltip="true" v-if="showColumn('repairOrder')" width="180" />
+			<el-table-column prop="type" label="报修类型" align="center" v-if="showColumn('type')">
+				<template slot-scope="scope">
+					<dict-tag :options="options.typeOptions" :value="scope.row.type" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="repairPeron" label="报修人" align="center" :show-overflow-tooltip="true" v-if="showColumn('repairPeron')" />
+			<el-table-column prop="phone" label="手机号" align="center" :show-overflow-tooltip="true" v-if="showColumn('phone')" />
+			<el-table-column prop="faultDescription" label="故障描述" align="center" :show-overflow-tooltip="true" v-if="showColumn('faultDescription')" />
+			<el-table-column prop="status" label="状态" align="center" v-if="showColumn('status')">
+				<template slot-scope="scope">
+					<dict-tag :options="options.statusOptions" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="showColumn('createdBy')" />
+			<el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="showColumn('createdTime')" />
+			<el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="showColumn('updatedBy')" />
+			<el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="showColumn('updatedTime')" />
+		</el-table>
+	</div>
+</template>
+
+<script>
+	import {
+		listDeviceRepair,
+	} from '@/api/deviceManagement/devicerepair.js'
+
+export default {
+  name: 'devicetaskexecute',
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+        timeRange: null,
+        timeStart: this.$dayjs().startOf('day'),
+        timeEnd: this.$dayjs().endOf('day'),
+        type: -1,
+        status: -1,
+        sort: 'Id',
+        sortType: 'asc'
+      },
+      columns: [
+        { visible: false, prop: 'id', label: '雪花id' },
+        { visible: true, prop: 'repairOrder', label: '维修单号' },
+        { visible: false, prop: 'fkDeviceId', label: '设备id' },
+        { visible: true, prop: 'type', label: '报修类型' },
+        { visible: true, prop: 'repairPeron', label: '报修人' },
+        { visible: true, prop: 'phone', label: '手机号' },
+        { visible: true, prop: 'faultDescription', label: '故障描述' },
+        { visible: false, prop: 'file', label: '拍照描述' },
+        { visible: true, prop: 'status', label: '状态（启用，关闭 维修中）' },
+        { visible: false, prop: 'createdBy', label: '创建人' },
+        { visible: false, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' },
+      ],
+      total: 0,
+      dataList: [],
+      queryRef: null,
+      defaultTimeRange: null,
+      options: {
+        // 报修类型 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+        typeOptions: [],
+        // 状态（启用，停用 维修中） 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+        statusOptions: [
+          { dictLabel: '未接单', dictValue: 0, listClass: 'danger' },
+          { dictLabel: '维修中', dictValue: 1, listClass: 'info' },
+          { dictLabel: '已结单', dictValue: 2, listClass: 'success' },
+        ],
+      },
+      dictParams: [],
+      timer1: null,
+      timer2: null
+    }
+  },
+  methods: {
+    getList() {
+      // this.loading = true
+      listDeviceRepair(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          // this.loading = false
+        }
+      })
+    },
+
+    getDict() {
+      this.$getDicts("mes_device_fault_type").then(res => {
+        const { code, data } = res
+        if (code == 200) {
+          this.options.typeOptions = data;
+        }
+      })
+    },
+
+    // 查询
+    handleQuery() {
+      this.queryParams.timeRange = this.defaultTimeRange;
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+
+    // 重置查询操作
+    resetQuery() {
+      this.$refs.queryRef.resetFields()
+      this.handleQuery()
+    },
+    // 自定义排序
+    sortChange(column) {
+      var sort = undefined
+      var sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+
+    // 自动获取数据
+    clearSearchTimer() {
+      clearInterval(this.timer1)
+      this.timer1 = null
+    },
+    createSearchTimer() {
+      this.clearSearchTimer()
+      this.timer1 = setInterval(() => {
+        this.handleQuery()
+      }, 10000)
+    },
+
+    // 自动滚动
+    clearScroll() {
+      clearInterval(this.timer2)
+      this.timer2 = null
+    },
+    createScroll() {
+      this.clearScroll()
+      // 拿到 table
+      const _table = this.$refs.tableRef;
+      // 拿到可以滚动的元素
+      const tableWrapper = _table.bodyWrapper;
+      this.timer2 = setInterval(() => {
+        tableWrapper.scrollTop += 1
+        // 判断是否滚动到底部，如果到底部了置为0（可视高度+距离顶部=整个高度）
+        if (tableWrapper.clientHeight + tableWrapper.scrollTop >= tableWrapper.scrollHeight) {
+          tableWrapper.scrollTop = 0
+        }
+      }, 100)
+    },
+    
+    // 控制列显示
+    showColumn(prop) {
+      const column = this.columns.find(col => col.prop === prop)
+      return column ? column.visible : false
+    }
+  },
+  
+  mounted() {
+    this.defaultTimeRange = [this.$dayjs().startOf('day'), this.$dayjs().endOf('day')]
+    this.createSearchTimer()
+    this.createScroll()
+    this.getDict()
+    this.handleQuery()
+  },
+  
+  beforeDestroy() {
+    this.clearScroll()
+    this.clearSearchTimer()
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/deviceAnalysis/DemoChart.vue b/src/views/deviceManagement/datascreen/deviceAnalysis/DemoChart.vue
new file mode 100644
index 0000000..5e58a9f
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/deviceAnalysis/DemoChart.vue
@@ -0,0 +1,291 @@
+<template>
+	<div>
+		<el-card class="header-card">
+			<el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+				<el-form-item label="设备类型" prop="fkDeviceType">
+					<TypeTreeSelect v-model="queryParams.devicetTypeId" @change="handleQuery"></TypeTreeSelect>
+				</el-form-item>
+				<el-form-item label="设备编号" prop="deviceCode">
+					<el-input v-model.trim="queryParams.deviceCode" placeholder="请输入设备编号" clearable />
+				</el-form-item>
+				<el-form-item label="设备名称" prop="deviceName">
+					<el-input v-model.trim="queryParams.deviceName" placeholder="请输入设备名称" clearable />
+				</el-form-item>
+				<el-form-item label="图表类别" prop="deviceName">
+					<el-select v-model="chartType" @change="chartTypeChange">
+						<el-option label="设备故障类型分析图" :value="1" />
+						<el-option label="设备运行分析统计图" :value="2" />
+
+					</el-select>
+				</el-form-item>
+				<el-form-item label="搜索时间" prop="searchTime">
+					<el-date-picker v-model="queryParams.searchTime" type="daterange" unlink-panels range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" />
+				</el-form-item>
+
+				<el-form-item>
+					<el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+					<el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+				</el-form-item>
+			</el-form>
+		</el-card>
+		<el-card>
+			<div v-loading="loading">
+				<div class="chart" ref="chartRef"></div>
+			</div>
+		</el-card>
+	</div>
+</template>
+
+<script>
+	import { 
+		defaultTypePie 
+	} from '@/api/deviceManagement/dataAnalysis.js';
+	import TypeTreeSelect from '@/views/deviceManagement/components/BaseDeviceTypeTreeSelect';
+	export default {
+		name: 'DemoChart',
+		components: {
+			TypeTreeSelect
+		},
+		data() {
+			return {
+				loading: false,
+				showSearch: true,
+				chartWidth: '100%',
+				chartHeight: '500px',
+				chart: null,
+				chartType: 1,
+				xData: [],
+				seriesData: [],
+				queryParams: {
+					devicetTypeId: 1,
+					deviceName: "",
+					deviceCode: "",
+					searchTime: []
+				},
+				shortcuts: [
+					{
+						text: '前一周',
+						value: function() {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+							return [start, end];
+						}
+					},
+					{
+						text: '前一月',
+						value: function() {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+							return [start, end];
+						}
+					},
+					{
+						text: '前三月',
+						value: function() {
+							const end = new Date();
+							const start = new Date();
+							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+							return [start, end];
+						}
+					}
+				],
+				options: {
+					title: {
+						text: '设备运行分析统计图',
+						left: 10
+					},
+					// 数据示例
+					legend: {
+						orient: 'vertical',
+						left: 'left'
+					},
+					xAxis: [
+						{
+							type: 'category',
+							axisPointer: {
+								type: 'shadow'
+							},
+							data: []
+						}
+					],
+					yAxis: [
+						{
+							type: 'value',
+							name: '设备报修数'
+						}
+					],
+					// 横向指示线
+					tooltip: {
+						trigger: 'axis',
+						axisPointer: {
+							type: 'cross',
+							crossStyle: {
+								color: '#999'
+							}
+						}
+					},
+					// 右上角工具栏
+					toolbox: {
+						feature: {
+							// 原始数据（数据视图）
+							dataView: { show: true, readOnly: true },
+							// 切换图例
+							magicType: { show: true, type: ['line', 'bar'] },
+							// 保存图片
+							saveAsImage: { show: true }
+						}
+					},
+					// 缩放
+					dataZoom: [
+						{
+							type: 'inside'
+						},
+						{
+							type: 'slider'
+						}
+					],
+					// 数据
+					series: [
+						{
+							data: [],
+							// 数据标识
+							name: '设备报修数',
+							type: 'bar',
+							showBackground: true,
+							// 背景色
+							itemStyle: {
+								color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+									{ offset: 0, color: "rgba(255, 170, 0, 0.5)" },
+									{ offset: 0.5, color: "rgba(255, 170, 0, 0.9)" },
+									{ offset: 1, color: "rgba(255, 170, 0, 1)" }
+								])
+							},
+							// 选中背景色
+							emphasis: {
+								itemStyle: {
+									color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+										{ offset: 0, color: "rgba(255, 170, 0, 1)" },
+										{ offset: 0.7, color: "rgba(255, 170, 0, 0.9)" },
+										{ offset: 1, color: "rgba(255, 170, 0, 0.7)" }
+									])
+								}
+							}
+						}
+					]
+				}
+			};
+		},
+		watch: {
+			'xData': {
+				handler(newXData, oldXData) {
+					if (this.chart != null) {
+						if (newXData != oldXData) {
+							this.chart.setOption({ xAxis: [{ data: newXData }] });
+						}
+					}
+				},
+				deep: true
+			},
+			'seriesData': {
+				handler(newSeriesData, oldSeriesData) {
+					if (this.chart != null) {
+						if (newSeriesData != oldSeriesData) {
+							this.chart.setOption({ series: [{ data: newSeriesData }] });
+						}
+					}
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			this.queryParams.searchTime = [this.$dayjs().startOf('month'), this.$dayjs().endOf('month')];
+			this.handleQuery();
+			this.initChart();
+			window.addEventListener('resize', this.handleResize);
+		},
+		beforeDestroy() {
+			if (this.chart) {
+				this.chart.dispose();
+			}
+			window.removeEventListener('resize', this.handleResize);
+		},
+		methods: {
+			getData() {
+				this.loading = true;
+				defaultTypePie(this.queryParams).then(res => {
+					const { code, data } = res;
+					if (code === 200) {
+						console.log(data);
+						this.loading = false;
+						this.xData = [
+							"2024/06/11",
+							"2024/06/12",
+							"2024/06/13",
+							"2024/06/14"
+						];
+						// this.seriesData = [10, 11, 12, 20];
+					}
+				});
+			},
+
+			// 查询
+			handleQuery() {
+				this.getData();
+			},
+
+			// 重置查询操作
+			resetQuery() {
+				this.$refs.queryRef.resetFields();
+				this.handleQuery();
+			},
+
+			chartTypeChange(type) {
+				if (this.chart) {
+					if (type === 1) {
+						this.chart.setOption({ series: [{ type: "bar" }] });
+					}
+					if (type === 2) {
+						this.chart.setOption({ series: [{ type: "pie" }] });
+					}
+				}
+			},
+
+			initChart() {
+				const echarts = require('echarts');
+				this.chart = echarts.init(this.$refs.chartRef, 'macarons');
+				this.chart.setOption(this.options);
+				// const zoomSize = 6;
+				// this.chart.on('click', (params) => {
+				// 	console.log(this.xData[Math.max(params.dataIndex - zoomSize / 2, 0)]);
+				// 	this.chart.dispatchAction({
+				// 		type: 'dataZoom',
+				// 		startValue: this.xData[Math.max(params.dataIndex - zoomSize / 2, 0)],
+				// 		endValue: this.xData[Math.min(params.dataIndex + zoomSize / 2, this.seriesData.length - 1)]
+				// 	});
+				// });
+			},
+
+			handleResize() {
+				setTimeout(() => {
+					this.chart && this.chart.resize();
+				}, 100);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.border {
+		border: 1px solid #ffffff;
+	}
+
+	.chart {
+		height: 500px;
+	}
+
+	.header-card {
+		margin-bottom: 10px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/deviceAnalysis/barChart1.vue b/src/views/deviceManagement/datascreen/deviceAnalysis/barChart1.vue
new file mode 100644
index 0000000..ec8dcbf
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/deviceAnalysis/barChart1.vue
@@ -0,0 +1,162 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef"></div>
+	</div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import theme from '../theme/essos.json'
+import { FaultTypeBar } from '@/api/deviceManagement/dataAnalysis.js'
+import { markRaw } from 'vue'
+
+export default {
+  name: 'BarChart1',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        devicetTypeId: 1,
+        deviceName: "",
+        deviceCode: "",
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      startDate: "",
+      endDate: "",
+      chartWidth: '100%',
+      chartHeight: '500px',
+      chart: null,
+      xData: [],
+      seriesData: [],
+      options: {
+        title: {
+          text: '每日设备故障统计图',
+          left: 10
+        },
+        // 数据示例
+        legend: {
+          type:'scroll',
+          top: 'top',
+          width:'70%',
+          left:'20%'
+        },
+        xAxis: [
+          {
+            type: 'category',
+            axisPointer: {
+              type: 'shadow'
+            },
+            data: []
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+          }
+        ],
+        // 横向指示线
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        // 右上角工具栏
+        toolbox: {
+          feature: {
+            // 保存图片
+            saveAsImage: { show: true }
+          }
+        },
+        // 缩放
+        dataZoom: [
+          {
+            type: 'inside'
+          },
+          {
+            type: 'slider'
+          }
+        ],
+        // 数据
+        series: []
+      }
+    }
+  },
+  watch: {
+    xData: {
+      handler(newXData, oldXData) {
+        if (this.chart && newXData !== oldXData) {
+          this.chart.setOption({ xAxis: [{ data: newXData }] });
+        }
+      },
+      deep: true
+    },
+    seriesData: {
+      handler(newSeriesData, oldSeriesData) {
+        if (this.chart && newSeriesData !== oldSeriesData) {
+          this.chart.setOption({ series: newSeriesData });
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      this.startDate = this.dayjs(queryData.searchTime[0]).format('YYYY-MM-DD');
+      this.endDate = this.dayjs(queryData.searchTime[1]).format('YYYY-MM-DD');
+      FaultTypeBar(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.xData = data.xData;
+          this.seriesData = data.seriesData;
+        }
+      })
+    },
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = markRaw(echarts.init(this.$refs.chartRef, 'theme'));
+      this.chart && this.chart.setOption(this.options);
+      window.addEventListener('resize', this.handleResize);
+    },
+    handleResize() {
+      this.chart && this.chart.resize();
+    },
+    // 清理资源
+    clearChart() {
+      if (this.chart) {
+        this.chart.dispose();
+        this.chart = null;
+      }
+      window.removeEventListener('resize', this.handleResize);
+    }
+  },
+  beforeDestroy() {
+    this.clearChart();
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/deviceAnalysis/barChart2.vue b/src/views/deviceManagement/datascreen/deviceAnalysis/barChart2.vue
new file mode 100644
index 0000000..a7fc4ea
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/deviceAnalysis/barChart2.vue
@@ -0,0 +1,169 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef"></div>
+	</div>
+</template>
+
+<script>
+	import theme from '../theme/shine.json';
+	import {
+		FaultTypeBarByDay
+	} from '@/api/deviceManagement/dataAnalysis.js';
+	export default {
+		name: 'barChart2',
+		props: {
+			queryParams: {
+				type: Object,
+				default: {
+					devicetTypeId: 1,
+					deviceName: "",
+					deviceCode: "",
+					searchTime: []
+				}
+			}
+		},
+		data() {
+			return {
+				loading: false,
+				startDate: "",
+				endDate: "",
+				chartWidth: '100%',
+				chartHeight: '500px',
+				chart: null,
+				xData: [],
+				seriesData: [],
+				options: {
+					title: {
+						text: '每日设备维修统计图',
+						left: 10
+					},
+					// 数据示例
+					legend: {
+						type: 'scroll',
+						top: 'top',
+						width: '70%',
+						left: '20%'
+					},
+					xAxis: [
+						{
+							type: 'category',
+							axisPointer: {
+								type: 'shadow'
+							},
+							data: []
+						}
+					],
+					yAxis: [
+						{
+							type: 'value'
+						}
+					],
+					// 横向指示线
+					tooltip: {
+						trigger: 'axis',
+						axisPointer: {
+							type: 'cross',
+							crossStyle: {
+								color: '#999'
+							}
+						}
+					},
+					// 右上角工具栏
+					toolbox: {
+						feature: {
+							// 保存图片
+							saveAsImage: { show: true }
+						}
+					},
+					// 缩放
+					dataZoom: [
+						{
+							type: 'inside'
+						},
+						{
+							type: 'slider'
+						}
+					],
+					// 数据
+					series: []
+				}
+			};
+		},
+		watch: {
+			'xData': {
+				handler(newXData, oldXData) {
+					if (this.chart != null) {
+						if (newXData != oldXData) {
+							this.chart.setOption({ xAxis: [{ data: newXData }] });
+						}
+					}
+				},
+				deep: true
+			},
+			'seriesData': {
+				handler(newSeriesData, oldSeriesData) {
+					if (this.chart != null) {
+						if (newSeriesData != oldSeriesData) {
+							this.chart.setOption({ series: newSeriesData });
+						}
+					}
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			this.init();
+			window.addEventListener('resize', this.handleResize);
+		},
+		beforeDestroy() {
+			if (this.chart) {
+				this.chart.dispose();
+			}
+			window.removeEventListener('resize', this.handleResize);
+		},
+		methods: {
+			getData() {
+				this.loading = true;
+				let queryData = JSON.parse(JSON.stringify(this.queryParams));
+				this.startDate = this.$dayjs(queryData.searchTime[0]).format('YYYY-MM-DD');
+				this.endDate = this.$dayjs(queryData.searchTime[1]).format('YYYY-MM-DD');
+				FaultTypeBarByDay(queryData).then(res => {
+					const { code, data } = res;
+					if (code === 200 && data != null && data != undefined) {
+						this.loading = false;
+						this.xData = data.xData;
+						this.seriesData = data.seriesData;
+					}
+				});
+			},
+
+			// 初始化数据
+			init() {
+				if (this.chart === null || this.chart === undefined) {
+					this.initChart();
+				}
+				this.getData();
+			},
+
+			initChart() {
+				const echarts = require('echarts');
+			echarts.registerTheme('theme', theme);
+				this.chart = echarts.init(this.$refs.chartRef, 'theme');
+				this.chart && this.chart.setOption(this.options);
+			},
+
+			handleResize() {
+				setTimeout(() => {
+					this.chart && this.chart.resize();
+				}, 100);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/deviceAnalysis/index.vue b/src/views/deviceManagement/datascreen/deviceAnalysis/index.vue
new file mode 100644
index 0000000..5c4db8a
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/deviceAnalysis/index.vue
@@ -0,0 +1,195 @@
+<template>
+	<div>
+		<el-card class="header-card">
+			<el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+				<el-form-item label="设备类型" prop="fkDeviceType">
+					<TypeTreeSelect v-model="queryParams.devicetTypeId" @change="handleQuery"></TypeTreeSelect>
+				</el-form-item>
+				<el-form-item label="设备编号" prop="deviceCode">
+					<el-input v-model.trim="queryParams.deviceCode" placeholder="请输入设备编号" clearable />
+				</el-form-item>
+				<el-form-item label="设备名称" prop="deviceName">
+					<el-input v-model.trim="queryParams.deviceName" placeholder="请输入设备名称" clearable />
+				</el-form-item>
+				<!-- <el-form-item label="图表类别" prop="deviceName">
+					<el-select v-model="chartType" @change="chartTypeChange">
+						<el-option label="设备故障类型分析图" :value="1" />
+						<el-option label="设备运行分析统计图" :value="2" />
+
+					</el-select>
+				</el-form-item> -->
+				<el-form-item label="搜索时间" prop="searchTime">
+					<el-date-picker v-model="queryParams.searchTime" type="daterange" :clearable="false" unlink-panels range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" />
+				</el-form-item>
+
+				<el-form-item>
+					<el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+					<el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+				</el-form-item>
+			</el-form>
+		</el-card>
+		<el-card>
+			<el-row :gutter="20">
+				<el-col :span="14">
+					<el-card>
+						<pieChart1 class="chart1" :queryParams="queryParams" ref="pieChartRef1"></pieChart1>
+					</el-card>
+				</el-col>
+				<el-col :span="10">
+					<div class="pie-right">
+						<pieChart2 class="chart2" :queryParams="queryParams" ref="pieChartRef2"></pieChart2>
+						<pieChart3 class="chart2" :queryParams="queryParams" ref="pieChartRef3"></pieChart3>
+					</div>
+				</el-col>
+			</el-row>
+		</el-card>
+		<el-card class="card-box">
+			<barChart1 class="chart1" :queryParams="queryParams" ref="barChartRef1"></barChart1>
+		</el-card>
+		<el-card class="card-box">
+			<lineChart1 class="chart1" :queryParams="queryParams" ref="lineChartRef1"></lineChart1>
+		</el-card>
+		<el-card class="card-box">
+			<barChart2 class="chart1" :queryParams="queryParams" ref="barChartRef2"></barChart2>
+		</el-card>
+	</div>
+</template>
+
+<script>
+import TypeTreeSelect from '@/views/deviceManagement/components/BaseDeviceTypeTreeSelect'
+import pieChart1 from './pieChart1'
+import pieChart2 from './pieChart2'
+import pieChart3 from './pieChart3'
+import barChart1 from './barChart1'
+import barChart2 from './barChart2'
+import lineChart1 from './lineChart1'
+import { MessageBox } from 'element-ui'
+
+export default {
+  name: 'DeviceAnalysis',
+  components: {
+    TypeTreeSelect,
+    pieChart1,
+    pieChart2,
+    pieChart3,
+    barChart1,
+    barChart2,
+    lineChart1
+  },
+  data() {
+    return {
+      showSearch: true,
+      queryParams: {
+        devicetTypeId: 1,
+        deviceName: "",
+        deviceCode: "",
+        searchTime: []
+      },
+      shortcuts: [
+        {
+          text: '前一周',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            return [start, end]
+          }
+        },
+        {
+          text: '前一月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            return [start, end]
+          }
+        },
+        {
+          text: '前三月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            return [start, end]
+          }
+        }
+      ],
+      chartType: 1
+    }
+  },
+  mounted() {
+    this.queryParams.searchTime = [this.dayjs().startOf('month'), this.dayjs().endOf('month')];
+    this.handleQuery();
+  },
+  methods: {
+    getData() {
+      setTimeout(() => {
+        this.$refs.pieChartRef1 && this.$refs.pieChartRef1.init();
+      }, 100)
+      setTimeout(() => {
+        this.$refs.pieChartRef2 && this.$refs.pieChartRef2.init();
+      }, 200)
+      setTimeout(() => {
+        this.$refs.pieChartRef3 && this.$refs.pieChartRef3.init();
+      }, 300)
+      setTimeout(() => {
+        this.$refs.barChartRef1 && this.$refs.barChartRef1.init();
+      }, 400)
+      setTimeout(() => {
+        this.$refs.lineChartRef1 && this.$refs.lineChartRef1.init();
+      }, 500)
+      setTimeout(() => {
+        this.$refs.barChartRef2 && this.$refs.barChartRef2.init();
+      }, 600)
+    },
+    // 查询
+    handleQuery() {
+      this.getData();
+    },
+    chartTypeChange(type) {
+      this.handleQuery();
+    },
+    // 重置查询操作
+    resetQuery() {
+      this.resetForm("queryRef")
+      this.handleQuery()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.border {
+		border: 1px solid #ffffff;
+	}
+
+	.chart1 {
+		width: 100%;
+		height: 500px;
+	}
+
+	.chart2 {
+		width: 100%;
+		height: 270px;
+	}
+
+	.pie-right {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	// .echarts {
+	// 	margin: 0 auto;
+	// 	width: 100%;
+	// 	height: 500px;
+	// }
+
+	.header-card {
+		margin-bottom: 10px;
+	}
+	.card-box{
+		margin-top: 10px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/deviceAnalysis/lineChart1.vue b/src/views/deviceManagement/datascreen/deviceAnalysis/lineChart1.vue
new file mode 100644
index 0000000..c7d59ad
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/deviceAnalysis/lineChart1.vue
@@ -0,0 +1,167 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef"></div>
+	</div>
+</template>
+
+<script>
+	import { 
+		FaultTypeLine 
+	} from '@/api/deviceManagement/dataAnalysis.js';
+	export default {
+		name: 'lineChart1',
+		props: {
+			queryParams: {
+				type: Object,
+				default: function() {
+					return {
+						devicetTypeId: 1,
+						deviceName: "",
+						deviceCode: "",
+						searchTime: []
+					};
+				}
+			}
+		},
+		data() {
+			return {
+				loading: false,
+				chartWidth: '100%',
+				chartHeight: '500px',
+				chart: null,
+				xData: [],
+				seriesData: [],
+				startDate: "",
+				endDate: "",
+				options: {
+					title: {
+						text: '设备故障累计趋势图',
+						left: 10
+					},
+					// 数据示例
+					legend: {
+						type: 'scroll',
+						top: 'top',
+						width: '70%',
+						left: '20%'
+					},
+					xAxis: [
+						{
+							type: 'category',
+							data: []
+						}
+					],
+					yAxis: [
+						{
+							type: 'value'
+						}
+					],
+					// 横向指示线
+					tooltip: {
+						trigger: 'axis',
+						axisPointer: {
+							type: 'cross',
+							crossStyle: {
+								color: '#999'
+							}
+						}
+					},
+					// 右上角工具栏
+					toolbox: {
+						feature: {
+							// 保存图片
+							saveAsImage: { show: true }
+						}
+					},
+					// 缩放
+					dataZoom: [
+						{
+							type: 'inside'
+						},
+						{
+							type: 'slider'
+						}
+					],
+					// 数据
+					series: []
+				}
+			};
+		},
+		watch: {
+			'xData': {
+				handler(newXData, oldXData) {
+					if (this.chart != null) {
+						if (newXData != oldXData) {
+							this.chart.setOption({ xAxis: [{ data: newXData }] });
+						}
+					}
+				},
+				deep: true
+			},
+			'seriesData': {
+				handler(newSeriesData, oldSeriesData) {
+					if (this.chart != null) {
+						if (newSeriesData != oldSeriesData) {
+							this.chart.setOption({ series: newSeriesData });
+						}
+					}
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			window.addEventListener('resize', this.handleResize);
+		},
+		beforeDestroy() {
+			if (this.chart) {
+				this.chart.dispose();
+			}
+			window.removeEventListener('resize', this.handleResize);
+		},
+		methods: {
+			getData() {
+				this.loading = true;
+				let queryData = JSON.parse(JSON.stringify(this.queryParams));
+				this.startDate = this.$dayjs(queryData.searchTime[0]).format('YYYY-MM-DD');
+				this.endDate = this.$dayjs(queryData.searchTime[1]).format('YYYY-MM-DD');
+				FaultTypeLine(queryData).then(res => {
+					const { code, data } = res;
+					if (code === 200 && data != null && data != undefined) {
+						this.loading = false;
+						this.xData = data.xData;
+						this.seriesData = data.seriesData;
+					}
+				});
+			},
+
+			// 初始化数据
+			init() {
+				if (this.chart === null || this.chart === undefined) {
+					this.initChart();
+				}
+				this.getData();
+			},
+
+			initChart() {
+				const echarts = require('echarts');
+				const theme = require('../theme/shine.json');
+				echarts.registerTheme('theme', theme);
+				this.chart = echarts.init(this.$refs.chartRef, 'theme');
+				this.chart && this.chart.setOption(this.options);
+			},
+
+			handleResize() {
+				setTimeout(() => {
+					this.chart && this.chart.resize();
+				}, 100);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/deviceAnalysis/pieChart1.vue b/src/views/deviceManagement/datascreen/deviceAnalysis/pieChart1.vue
new file mode 100644
index 0000000..242f165
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/deviceAnalysis/pieChart1.vue
@@ -0,0 +1,146 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef1"></div>
+	</div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import theme from '../theme/essos.json'
+import {
+  defaultTypePie
+} from '@/api/deviceManagement/dataAnalysis.js'
+import { markRaw } from 'vue'
+
+export default {
+  name: 'PieChart1',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        devicetTypeId: 1,
+        deviceName: "",
+        deviceCode: "",
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      startDate: "",
+      endDate: "",
+      chartWidth: '100%',
+      chartHeight: '500px',
+      chart: null,
+      seriesData: [],
+      options: {
+        title: {
+          text: '设备故障类型分析图',
+          subtext: "",
+          left: 'center'
+        },
+        // 数据示例
+        legend: {
+          type:'scroll',
+          height:'20%',
+          orient: 'vertical',
+          left: 'left',
+        },
+        toolbox: {
+          show: true,
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        // 横向指示线
+        tooltip: {
+          trigger: 'item',
+        },
+        // 数据
+        series: [
+        {
+          data: [],
+          // 数据标识
+          type: 'pie',
+          roseType: 'area',
+          itemStyle: {
+            borderRadius: 5
+          },
+          emphasis: {
+            itemStyle: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: 'rgba(0, 0, 0, 0.5)'
+            }
+          }
+        } ]
+      }
+    }
+  },
+  watch: {
+    seriesData: {
+      handler(newSeriesData, oldSeriesData) {
+        if (this.chart) {
+          this.chart.setOption({ title: { subtext: `${this.startDate} 到 ${this.endDate}` } });
+          if (newSeriesData !== oldSeriesData) {
+            this.chart.setOption({ series: [{ data: newSeriesData }] });
+          }
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      this.startDate = this.dayjs(queryData.searchTime[0]).format('YYYY-MM-DD');
+      this.endDate = this.dayjs(queryData.searchTime[1]).format('YYYY-MM-DD');
+      defaultTypePie(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.seriesData = data;
+        }
+      })
+    },
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = markRaw(echarts.init(this.$refs.chartRef1, 'theme'));
+      this.chart && this.chart.setOption(this.options);
+      window.addEventListener('resize', this.handleResize);
+    },
+    handleResize() {
+      setTimeout(() => {
+        this.chart && this.chart.resize();
+      }, 100)
+    },
+    // 清理资源
+    clearChart() {
+      if (this.chart) {
+        this.chart.dispose();
+        this.chart = null;
+      }
+      window.removeEventListener('resize', this.handleResize);
+    }
+  },
+  beforeDestroy() {
+    this.clearChart();
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/deviceAnalysis/pieChart2.vue b/src/views/deviceManagement/datascreen/deviceAnalysis/pieChart2.vue
new file mode 100644
index 0000000..eecdd2a
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/deviceAnalysis/pieChart2.vue
@@ -0,0 +1,148 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef2"></div>
+	</div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import theme from '../theme/essos.json'
+import {
+  defaultTypePie
+} from '@/api/deviceManagement/dataAnalysis.js'
+import { markRaw } from 'vue'
+
+export default {
+  name: 'PieChart2',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        devicetTypeId: 1,
+        deviceName: "",
+        deviceCode: "",
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      startDate: "",
+      endDate: "",
+      chartWidth: '100%',
+      chartHeight: '500px',
+      chart: null,
+      seriesData: [],
+      options: {
+        title: {
+          text: '本周设备故障类型',
+          subtext: "",
+          right: 'right',
+          bottom: '10%'
+        },
+        // 数据示例
+        legend: {
+          type: 'scroll',
+          height: '20%',
+          orient: 'vertical',
+          left: 'left',
+        },
+        toolbox: {
+          show: true,
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        // 横向指示线
+        tooltip: {
+          trigger: 'item',
+        },
+        // 数据
+        series: [
+        {
+          data: [],
+          // 数据标识
+          type: 'pie',
+          roseType: 'area',
+          itemStyle: {
+            borderRadius: 5
+          },
+          emphasis: {
+            itemStyle: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: 'rgba(0, 0, 0, 0.5)'
+            }
+          }
+        } ]
+      }
+    }
+  },
+  watch: {
+    seriesData: {
+      handler(newSeriesData, oldSeriesData) {
+        if (this.chart) {
+          this.chart.setOption({ title: { subtext: `${this.startDate} 到 ${this.endDate}` } });
+          if (newSeriesData !== oldSeriesData) {
+            this.chart.setOption({ series: [{ data: newSeriesData }] });
+          }
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      queryData.searchTime = [this.dayjs().startOf('week'), this.dayjs().endOf('week')];
+      this.startDate = this.dayjs(queryData.searchTime[0]).format('YYYY-MM-DD');
+      this.endDate = this.dayjs(queryData.searchTime[1]).format('YYYY-MM-DD');
+      defaultTypePie(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.seriesData = data;
+        }
+      })
+    },
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = markRaw(echarts.init(this.$refs.chartRef2, 'theme'));
+      this.chart && this.chart.setOption(this.options);
+      window.addEventListener('resize', this.handleResize);
+    },
+    handleResize() {
+      setTimeout(() => {
+        this.chart && this.chart.resize();
+      }, 100)
+    },
+    // 清理资源
+    clearChart() {
+      if (this.chart) {
+        this.chart.dispose();
+        this.chart = null;
+      }
+      window.removeEventListener('resize', this.handleResize);
+    }
+  },
+  beforeDestroy() {
+    this.clearChart();
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/deviceAnalysis/pieChart3.vue b/src/views/deviceManagement/datascreen/deviceAnalysis/pieChart3.vue
new file mode 100644
index 0000000..3f84a84
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/deviceAnalysis/pieChart3.vue
@@ -0,0 +1,148 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef3"></div>
+	</div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import theme from '../theme/essos.json'
+import {
+  defaultTypePie
+} from '@/api/deviceManagement/dataAnalysis.js'
+import { markRaw } from 'vue'
+
+export default {
+  name: 'PieChart3',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        devicetTypeId: 1,
+        deviceName: "",
+        deviceCode: "",
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      startDate: "",
+      endDate: "",
+      chartWidth: '100%',
+      chartHeight: '500px',
+      chart: null,
+      seriesData: [],
+      options: {
+        title: {
+          text: '本月设备故障类型',
+          subtext: "",
+          right: 'right',
+          bottom: '10%'
+        },
+        // 数据示例
+        legend: {
+          type: 'scroll',
+          height: '20%',
+          orient: 'vertical',
+          left: 'left',
+        },
+        toolbox: {
+          show: true,
+          feature: {
+            saveAsImage: { show: true }
+          }
+        },
+        // 横向指示线
+        tooltip: {
+          trigger: 'item',
+        },
+        // 数据
+        series: [
+        {
+          data: [],
+          // 数据标识
+          type: 'pie',
+          roseType: 'area',
+          itemStyle: {
+            borderRadius: 5
+          },
+          emphasis: {
+            itemStyle: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: 'rgba(0, 0, 0, 0.5)'
+            }
+          }
+        } ]
+      }
+    }
+  },
+  watch: {
+    seriesData: {
+      handler(newSeriesData, oldSeriesData) {
+        if (this.chart) {
+          this.chart.setOption({ title: { subtext: `${this.startDate} 到 ${this.endDate}` } });
+          if (newSeriesData !== oldSeriesData) {
+            this.chart.setOption({ series: [{ data: newSeriesData }] });
+          }
+        }
+      },
+      deep: true
+    }
+  },
+  methods: {
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      queryData.searchTime = [this.dayjs().startOf('month'), this.dayjs().endOf('month')];
+      this.startDate = this.dayjs(queryData.searchTime[0]).format('YYYY-MM-DD');
+      this.endDate = this.dayjs(queryData.searchTime[1]).format('YYYY-MM-DD');
+      defaultTypePie(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.seriesData = data;
+        }
+      })
+    },
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = markRaw(echarts.init(this.$refs.chartRef3, 'theme'));
+      this.chart && this.chart.setOption(this.options);
+      window.addEventListener('resize', this.handleResize);
+    },
+    handleResize() {
+      setTimeout(() => {
+        this.chart && this.chart.resize();
+      }, 100)
+    },
+    // 清理资源
+    clearChart() {
+      if (this.chart) {
+        this.chart.dispose();
+        this.chart = null;
+      }
+      window.removeEventListener('resize', this.handleResize);
+    }
+  },
+  beforeDestroy() {
+    this.clearChart();
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/index.vue b/src/views/deviceManagement/datascreen/index.vue
new file mode 100644
index 0000000..14c37f1
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/index.vue
@@ -0,0 +1,340 @@
+<template>
+	<div>
+
+		<el-row :gutter="2">
+			<el-col :span="8">
+				<el-card class="data-screen-card-1">
+					<div class="table-title-text">今日巡检/点检任务</div>
+					<table1></table1>
+				</el-card>
+			</el-col>
+			<el-col :span="8">
+				<el-card class="data-screen-card-1">
+					<el-row :gutter="10" style="margin-bottom: 2px">
+						<el-col :span="24">
+							<div class="total-box">
+								<el-text type="info" class="board-title-text">TPM实时看板</el-text>
+							</div>
+						</el-col>
+					</el-row>
+					<el-row :gutter="10" style="margin-bottom: 2px">
+						<el-col :span="12">
+							<div class="total-box">
+								<el-text type="info">启用设备</el-text>
+								<el-text class="total-text" type="success">{{ useDeviceTotal }}</el-text>
+							</div>
+						</el-col>
+						<el-col :span="12">
+							<div class="total-box">
+								<el-text type="info">停用设备</el-text>
+								<el-text class="total-text">{{ unUseDeviceTotal }}</el-text>
+							</div>
+						</el-col>
+					</el-row>
+					<el-row :gutter="10" style="margin-bottom: 2px">
+						<el-col :span="12">
+							<div class="total-box">
+								<el-text type="info">总任务数</el-text>
+								<el-text class="total-text" type="primary">{{ taskTotal }}</el-text>
+							</div>
+						</el-col>
+						<el-col :span="12">
+							<div class="total-box">
+								<el-text type="info">任务完成数</el-text>
+								<el-text class="total-text" type="success">{{ finishTaskTotal }}</el-text>
+							</div>
+						</el-col>
+					</el-row>
+					<el-row :gutter="10">
+						<el-col :span="12">
+							<div class="total-box">
+								<el-text type="info">总报修数</el-text>
+								<el-text class="total-text" type="warning">{{ repairTotal }}</el-text>
+							</div>
+						</el-col>
+						<el-col :span="12">
+							<div class="total-box">
+								<el-text type="info">报修完成数</el-text>
+								<el-text class="total-text" type="success">{{ finishRepairTotal }}</el-text>
+							</div>
+						</el-col>
+					</el-row>
+				</el-card>
+			</el-col>
+			<el-col :span="8">
+				<el-card class="data-screen-card-1">
+					<div class="table-title-text">今日维修任务</div>
+					<table2></table2>
+				</el-card>
+			</el-col>
+		</el-row>
+		<el-row :gutter="2">
+			<el-col :span="6">
+				<el-card class="data-screen-card-2">
+					<div class="table-title-text">本月任务统计</div>
+					<lineChart1 ref="lineChartRef1"></lineChart1>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card class="data-screen-card-2">
+					<div class="table-title-text">本月故障趋势</div>
+					<lineChart4 ref="lineChartRef4"></lineChart4>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card class="data-screen-card-2">
+					<div class="table-title-text">本月报修种类</div>
+					<pieChart2 ref="pieChartRef2"></pieChart2>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card class="data-screen-card-2">
+					<div class="table-title-text">今日报修种类</div>
+					<pieChart1 ref="pieChartRef1"></pieChart1>
+				</el-card>
+			</el-col>
+		</el-row>
+		<el-row :gutter="2">
+			<el-col :span="6">
+				<el-card class="data-screen-card-2">
+					<div class="table-title-text">本月任务完成时间统计</div>
+					<lineChart3 ref="lineChartRef3"></lineChart3>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card class="data-screen-card-2">
+					<div class="table-title-text">本月人员响应时间统计</div>
+					<lineChart2 ref="lineChartRef2"></lineChart2>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card class="data-screen-card-2">
+					<div class="table-title-text">本月故障类型统计</div>
+					<barChart1 ref="barChartRef1"></barChart1>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card class="data-screen-card-2">
+					<div class="table-title-text">本月设备维修统计</div>
+					<barChart2 ref="barChartRef2"></barChart2>
+				</el-card>
+			</el-col>
+		</el-row>
+		<BaseFullScreen @click="pushShow()"></BaseFullScreen>
+	</div>
+</template>
+
+<script>
+import BaseFullScreen from '@/components/BaseFullScreen'
+import DemoChart from './DemoChart'
+import table1 from './components/table1'
+import table2 from './components/table2'
+import pieChart1 from './components/pieChart1'
+import pieChart2 from './components/pieChart2'
+import lineChart1 from './components/lineChart1'
+import lineChart2 from './components/lineChart2'
+import lineChart3 from './components/lineChart3'
+import lineChart4 from './components/lineChart4'
+import barChart1 from './components/barChart1'
+import barChart2 from './components/barChart2'
+import { GetAllTotal } from '@/api/deviceManagement/dataAnalysis.js'
+
+export default {
+  name: 'DataScreen',
+  components: {
+    BaseFullScreen,
+    DemoChart,
+    table1,
+    table2,
+    pieChart1,
+    pieChart2,
+    lineChart1,
+    lineChart2,
+    lineChart3,
+    lineChart4,
+    barChart1,
+    barChart2
+  },
+  data() {
+    return {
+      loading: false,
+      useDeviceTotal: 0,
+      unUseDeviceTotal: 0,
+      taskTotal: 0,
+      finishTaskTotal: 0,
+      repairTotal: 0,
+      finishRepairTotal: 0,
+      flag: true,
+      timer1: null
+    }
+  },
+  methods: {
+    doLoading() {
+      this.loading = true
+      setTimeout(() => {
+        this.loading = false
+      }, 1000)
+    },
+    
+    pushShow() {
+      if (this.flag) {
+        this.$router.push({ name: 'Fullscreen' })
+      } else {
+        this.$router.back()
+      }
+      this.flag = !this.flag
+    },
+    
+    getData() {
+      setTimeout(() => {
+        this.$refs.pieChartRef1 && this.$refs.pieChartRef1.init()
+      }, 100)
+      setTimeout(() => {
+        this.$refs.lineChartRef1 && this.$refs.lineChartRef1.init()
+      }, 100)
+      setTimeout(() => {
+        this.$refs.lineChartRef2 && this.$refs.lineChartRef2.init()
+      }, 200)
+      setTimeout(() => {
+        this.$refs.lineChartRef3 && this.$refs.lineChartRef3.init()
+      }, 200)
+      setTimeout(() => {
+        this.$refs.lineChartRef4 && this.$refs.lineChartRef4.init()
+      }, 300)
+      setTimeout(() => {
+        this.$refs.barChartRef1 && this.$refs.barChartRef1.init()
+      }, 300)
+      setTimeout(() => {
+        this.$refs.barChartRef2 && this.$refs.barChartRef2.init()
+      }, 400)
+      setTimeout(() => {
+        this.$refs.pieChartRef2 && this.$refs.pieChartRef2.init()
+      }, 400)
+      GetAllTotal().then((res) => {
+        const { code, data } = res
+        if (code === 200) {
+          this.useDeviceTotal = data.useDeviceTotal
+          this.unUseDeviceTotal = data.unUseDeviceTotal
+          this.taskTotal = data.taskTotal
+          this.finishTaskTotal = data.finishTaskTotal
+          this.repairTotal = data.repairTotal
+          this.finishRepairTotal = data.finishRepairTotal
+        }
+      })
+    },
+    
+    // 自动获取数据
+    clearTimer() {
+      clearInterval(this.timer1)
+      this.timer1 = null
+    },
+    
+    createTimer() {
+      this.clearTimer()
+      this.timer1 = setInterval(() => {
+        this.getData()
+      }, 60000)
+    }
+  },
+  
+  mounted() {
+    this.getData()
+    this.createTimer()
+  },
+  
+  beforeDestroy() {
+    this.clearTimer()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.border {
+	border: 1px solid #ffffff;
+}
+
+.screen-title-font {
+	font-size: 18px;
+	font-weight: 600;
+	color: white;
+}
+
+.screen-title2-font {
+	font-size: 16px;
+	font-weight: 600;
+	color: white;
+}
+
+.screen-text-font {
+	font-size: 14px;
+	font-weight: 600;
+	color: white;
+}
+
+.screen-title-offset {
+	height: 40px;
+	margin-top: 20px;
+}
+
+.background {
+	width: 100%;
+	height: 100%;
+	background-color: #282c34;
+}
+
+.screen-header {
+	width: 100%;
+	height: 60px;
+}
+
+.screen-body {
+	padding: 10px;
+}
+
+.card {
+	width: 100%;
+	height: 200px;
+}
+
+.grid-content {
+	background-color: #282c34;
+}
+
+.data-screen-card-1 {
+	margin-top: 2px;
+	width: 100%;
+	height: 280px;
+}
+
+.data-screen-card-2 {
+	margin-top: 2px;
+	width: 100%;
+	height: 260px;
+}
+
+.board-title-text {
+	font-size: 24px;
+	font-weight: 700;
+	color: black;
+}
+
+.table-title-text {
+	font-size: 16px;
+	font-weight: 600;
+	margin-bottom: 5px;
+}
+
+.total-box {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 10px;
+	box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.12);
+}
+
+.total-text {
+	font-size: 24px;
+	font-weight: 600;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/personAnalysis/index.vue b/src/views/deviceManagement/datascreen/personAnalysis/index.vue
new file mode 100644
index 0000000..f56ec6b
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/personAnalysis/index.vue
@@ -0,0 +1,137 @@
+<template>
+	<div>
+		<el-card class="header-card">
+			<el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+				<el-form-item label="搜索时间" prop="searchTime">
+					<el-date-picker v-model="queryParams.searchTime" type="daterange" :clearable="false" unlink-panels range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" />
+				</el-form-item>
+				<!-- <el-form-item label="图表类别" prop="deviceName">
+					<el-select v-model="chartType" @change="chartTypeChange">
+						<el-option label="人员响应时间趋势图" :value="1" />
+						<el-option label="任务完成时间趋势图" :value="2" />
+					</el-select>
+				</el-form-item> -->
+				<el-form-item>
+					<el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+					<el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+				</el-form-item>
+			</el-form>
+		</el-card>
+		<el-card>
+			<lineChart1 class="chart1" :queryParams="queryParams" ref="lineChartRef1"></lineChart1>
+		</el-card>
+		<el-card>
+			<lineChart2 class="chart1" :queryParams="queryParams" ref="lineChartRef2"></lineChart2>
+		</el-card>
+	</div>
+</template>
+
+<script>
+	import lineChart1 from './lineChart1'
+	import lineChart2 from './lineChart2'
+
+export default {
+  name: 'personAnalysis',
+  components: {
+    lineChart1,
+    lineChart2
+  },
+  data() {
+    return {
+      showSearch: true,
+      queryParams: {
+        searchType: 1,
+        searchTime: []
+      },
+      shortcuts: [
+        {
+          text: '前一周',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            return [start, end]
+          },
+        },
+        {
+          text: '前一月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            return [start, end]
+          },
+        },
+        {
+          text: '前三月',
+          value: () => {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            return [start, end]
+          },
+        },
+      ],
+      chartType: 1
+    }
+  },
+  mounted() {
+    this.queryParams.searchTime = [this.dayjs().startOf('month'), this.dayjs().endOf('month')];
+    this.handleQuery();
+  },
+  methods: {
+    getData() {
+      setTimeout(() => {
+        this.$refs.lineChartRef1 && this.$refs.lineChartRef1.init();
+      }, 100)
+      setTimeout(() => {
+        this.$refs.lineChartRef2 && this.$refs.lineChartRef2.init();
+      }, 200)
+    },
+    // 查询
+    handleQuery() {
+      this.getData();
+    },
+    chartTypeChange(type) {
+      this.handleQuery();
+    },
+    // 重置查询操作
+    resetQuery() {
+      this.$refs.queryRef.resetFields()
+      this.handleQuery()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.border {
+		border: 1px solid #ffffff;
+	}
+
+	.chart1 {
+		width: 100%;
+		height: 100%;
+		margin-top: 10px;
+	}
+
+	.chart2 {
+		width: 100%;
+		height: 270px;
+	}
+
+	.pie-right {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.header-card {
+		margin-bottom: 10px;
+	}
+
+	.card-box {
+		margin-top: 10px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/personAnalysis/lineChart1.vue b/src/views/deviceManagement/datascreen/personAnalysis/lineChart1.vue
new file mode 100644
index 0000000..69f582d
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/personAnalysis/lineChart1.vue
@@ -0,0 +1,350 @@
+<template>
+	<div>
+		<el-row :gutter="20">
+			<el-col :span="6">
+				<el-card>
+					<div class="statistic-card">
+						<div>
+							<el-text type="info" class="el-statistic-title-text">总任务数</el-text>
+						</div>
+						<div>
+							<el-text type="info" class="el-statistic-body-text">{{taskTotal}}个</el-text>
+						</div>
+						<div class="statistic-footer">
+							<div class="footer-item">
+								<span>相较上周</span>
+								<span v-if="lastTotalPer>=0" class="green">
+									{{lastTotalPer}}%
+									<i class="el-icon-caret-top"></i>
+								</span>
+								<span v-if="lastTotalPer<0" class="red">
+									{{lastTotalPer}}%
+									<i class="el-icon-caret-bottom"></i>
+								</span>
+							</div>
+						</div>
+					</div>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card>
+					<div class="statistic-card">
+						<div>
+							<el-text type="success" class="el-statistic-title-text">最快响应时间</el-text>
+						</div>
+						<div>
+							<el-text type="success" class="el-statistic-body-text">{{taskMin}}</el-text>
+						</div>
+						<div class="statistic-footer">
+							<div class="footer-item">
+								<span>相较上周</span>
+								<span v-if="lastMinPer>=0" class="green">
+									{{lastMinPer}}%
+									<i class="el-icon-caret-top"></i>
+								</span>
+								<span v-if="lastMinPer<0" class="red">
+									{{lastMinPer}}%
+									<i class="el-icon-caret-bottom"></i>
+								</span>
+							</div>
+						</div>
+					</div>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card>
+					<div class="statistic-card">
+						<div>
+							<el-text type="warning" class="el-statistic-title-text">最慢响应时间</el-text>
+						</div>
+						<div>
+							<el-text type="warning" class="el-statistic-body-text">{{taskMax}}</el-text>
+						</div>
+						<div class="statistic-footer">
+							<div class="footer-item">
+								<span>相较上周</span>
+								<span v-if="lastMaxPer>=0" class="green">
+									{{lastMaxPer}}%
+									<i class="el-icon-caret-top"></i>
+								</span>
+								<span v-if="lastMaxPer<0" class="red">
+									{{lastMaxPer}}%
+									<i class="el-icon-caret-bottom"></i>
+								</span>
+							</div>
+						</div>
+					</div>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card>
+					<div class="statistic-card">
+						<div>
+							<el-text type="primary" class="el-statistic-title-text">平均响应时间</el-text>
+						</div>
+						<div>
+							<el-text type="primary" class="el-statistic-body-text">{{taskAvg}}</el-text>
+						</div>
+						<div class="statistic-footer">
+							<div class="footer-item">
+								<span>相较上周</span>
+								<span v-if="lastAvgPer>=0" class="green">
+									{{lastAvgPer}}%
+									<i class="el-icon-caret-top"></i>
+								</span>
+								<span v-if="lastAvgPer<0" class="red">
+									{{lastAvgPer}}%
+									<i class="el-icon-caret-bottom"></i>
+								</span>
+							</div>
+						</div>
+					</div>
+				</el-card>
+			</el-col>
+		</el-row>
+		<el-card class="chart">
+			<div v-loading="loading" class="chart" ref="chartRef"></div>
+		</el-card>
+
+	</div>
+</template>
+
+<script>
+	import echarts from 'echarts';
+	import theme from '../theme/shine.json';
+	import {
+		PersonResponse
+	}
+	from '@/api/deviceManagement/dataAnalysis.js';
+
+export default {
+  name: 'lineChart1',
+  props: {
+    queryParams: {
+      type: Object,
+      default: {
+        searchType: 1,
+        searchTime: []
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      startDate: '',
+      endDate: '',
+      taskTotal: '',
+      taskMax: '',
+      taskMin: '',
+      taskAvg: '',
+      lastTotalPer: 0,
+      lastMaxPer: 0,
+      lastMinPer: 0,
+      lastAvgPer: 0,
+      chartWidth: '100%',
+      chartHeight: '500px',
+      chart: null,
+      xData: [],
+      seriesData: [],
+      options: {
+        title: {
+          text: '人员响应时间趋势图',
+          left: 10
+        },
+        // 数据示例
+        legend: {
+          type: 'scroll',
+          top: 'top',
+          width: '70%',
+          left: '20%'
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: []
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            axisLabel: {
+              formatter: '{value} 分钟'
+            }
+          }
+        ],
+        // 横向指示线
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        // 右上角工具栏
+        toolbox: {
+          feature: {
+            // 保存图片
+            saveAsImage: { show: true }
+          }
+        },
+        // 数据
+        series: []
+      }
+    };
+  },
+  watch: {
+    xData: {
+      handler(newXData) {
+        if (this.chart != null) {
+          this.chart.setOption({ xAxis: [{ data: newXData }] });
+        }
+      },
+      deep: true
+    },
+    seriesData: {
+      handler(newSeriesData) {
+        if (this.chart != null) {
+          this.chart.setOption({ series: newSeriesData });
+        }
+      },
+      deep: true
+    }
+  },
+  mounted() {
+    this.init();
+    window.addEventListener('resize', this.handleResize);
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.handleResize);
+    if (this.chart) {
+      this.chart.dispose();
+      this.chart = null;
+    }
+  },
+  methods: {
+    handleResize() {
+      if (this.chart) {
+        this.chart.resize();
+      }
+    },
+    getData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      queryData.searchType = 1;
+      this.startDate = this.dayjs(queryData.searchTime[0]).format('YYYY-MM-DD');
+      this.endDate = this.dayjs(queryData.searchTime[1]).format('YYYY-MM-DD');
+      PersonResponse(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.xData = data.xData;
+          this.seriesData = data.seriesData;
+          this.taskTotal = data.taskTotal;
+          this.taskMax = data.taskMax;
+          this.taskMin = data.taskMin;
+          this.taskAvg = data.taskAvg;
+          
+          this.lastTotalPer = data.lastTotalPer;
+          this.lastMaxPer = data.lastMaxPer;
+          this.lastMinPer = data.lastMinPer;
+          this.lastAvgPer = data.lastAvgPer;
+        }
+      })
+    },
+    getLastData() {
+      this.loading = true;
+      let queryData = JSON.parse(JSON.stringify(this.queryParams));
+      queryData.searchType = 1;
+      this.startDate = this.dayjs(queryData.searchTime[0]).format('YYYY-MM-DD');
+      this.endDate = this.dayjs(queryData.searchTime[1]).format('YYYY-MM-DD');
+      PersonResponse(queryData).then(res => {
+        const { code, data } = res;
+        if (code === 200 && data != null && data != undefined) {
+          this.loading = false;
+          this.xData = data.xData;
+          this.seriesData = data.seriesData;
+          this.taskTotal = data.taskTotal;
+          this.taskMax = data.taskMax;
+          this.taskMin = data.taskMin;
+          this.taskAvg = data.taskAvg;
+        }
+      })
+    },
+    // 初始化数据
+    init() {
+      if (this.chart === null || this.chart === undefined) {
+        this.initChart();
+      }
+      this.getData();
+    },
+    initChart() {
+      echarts.registerTheme('theme', theme);
+      this.chart = echarts.init(this.$refs.chartRef, 'theme');
+      this.chart && this.chart.setOption(this.options);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		margin-top: 10px;
+		width: 100%;
+		height: 400px;
+	}
+
+	.el-statistic {
+		--el-statistic-content-font-size: 28px;
+	}
+
+	.statistic-card {
+		height: 100%;
+		padding: 20px;
+		border-radius: 4px;
+		background-color: var(--el-bg-color-overlay);
+	}
+
+	.statistic-footer {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		flex-wrap: wrap;
+		font-size: 12px;
+		color: var(--el-text-color-regular);
+		margin-top: 16px;
+	}
+
+	.statistic-footer .footer-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 16px;
+		font-weight: 600;
+	}
+
+	.statistic-footer .footer-item span:last-child {
+		display: inline-flex;
+		align-items: center;
+		margin-left: 4px;
+	}
+
+	.green {
+		color: var(--el-color-success);
+	}
+
+	.red {
+		color: var(--el-color-error);
+	}
+
+	.el-statistic-title-text {
+		font-size: 20px;
+		font-weight: 600;
+	}
+
+	.el-statistic-body-text {
+		font-size: 36px;
+		font-weight: 600;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/personAnalysis/lineChart2.vue b/src/views/deviceManagement/datascreen/personAnalysis/lineChart2.vue
new file mode 100644
index 0000000..974a4d3
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/personAnalysis/lineChart2.vue
@@ -0,0 +1,325 @@
+<template>
+	<div>
+		<el-row :gutter="20">
+			<el-col :span="6">
+				<el-card>
+					<div class="statistic-card">
+						<div>
+							<el-text type="info" class="el-statistic-title-text">总任务数</el-text>
+						</div>
+						<div>
+							<el-text type="info" class="el-statistic-body-text">{{taskTotal}}个</el-text>
+						</div>
+						<div class="statistic-footer">
+							<div class="footer-item">
+								<span>相较上周</span>
+								<span v-if="lastTotalPer>=0" class="green">
+									{{lastTotalPer}}%
+									<i class="el-icon-caret-top"></i>
+								</span>
+								<span v-if="lastTotalPer<0" class="red">
+									{{lastTotalPer}}%
+									<i class="el-icon-caret-bottom"></i>
+								</span>
+							</div>
+						</div>
+					</div>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card>
+					<div class="statistic-card">
+						<div>
+							<el-text type="success" class="el-statistic-title-text">最快完成时间</el-text>
+						</div>
+						<div>
+							<el-text type="success" class="el-statistic-body-text">{{taskMin}}</el-text>
+						</div>
+						<div class="statistic-footer">
+							<div class="footer-item">
+								<span>相较上周</span>
+								<span v-if="lastMinPer>=0" class="green">
+									{{lastMinPer}}%
+									<i class="el-icon-caret-top"></i>
+								</span>
+								<span v-if="lastMinPer<0" class="red">
+									{{lastMinPer}}%
+									<i class="el-icon-caret-bottom"></i>
+								</span>
+							</div>
+						</div>
+					</div>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card>
+					<div class="statistic-card">
+						<div>
+							<el-text type="warning" class="el-statistic-title-text">最慢完成时间</el-text>
+						</div>
+						<div>
+							<el-text type="warning" class="el-statistic-body-text">{{taskMax}}</el-text>
+						</div>
+						<div class="statistic-footer">
+							<div class="footer-item">
+								<span>相较上周</span>
+								<span v-if="lastMaxPer>=0" class="green">
+									{{lastMaxPer}}%
+									<i class="el-icon-caret-top"></i>
+								</span>
+								<span v-if="lastMaxPer<0" class="red">
+									{{lastMaxPer}}%
+									<i class="el-icon-caret-bottom"></i>
+								</span>
+							</div>
+						</div>
+					</div>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card>
+					<div class="statistic-card">
+						<div>
+							<el-text type="primary" class="el-statistic-title-text">平均完成时间</el-text>
+						</div>
+						<div>
+							<el-text type="primary" class="el-statistic-body-text">{{taskAvg}}</el-text>
+						</div>
+						<div class="statistic-footer">
+							<div class="footer-item">
+								<span>相较上周</span>
+								<span v-if="lastAvgPer>=0" class="green">
+									{{lastAvgPer}}%
+									<i class="el-icon-caret-top"></i>
+								</span>
+								<span v-if="lastAvgPer<0" class="red">
+									{{lastAvgPer}}%
+									<i class="el-icon-caret-bottom"></i>
+								</span>
+							</div>
+						</div>
+					</div>
+				</el-card>
+			</el-col>
+		</el-row>
+		<el-card class="chart">
+			<div v-loading="loading" class="chart" ref="chartRef"></div>
+		</el-card>
+
+	</div>
+</template>
+
+<script>
+	import echarts from 'echarts';
+	import theme from '../theme/shine.json';
+	import {
+		PersonResponse
+	} from '@/api/deviceManagement/dataAnalysis.js';
+
+	export default {
+		name: 'LineChart2',
+		props: {
+			queryParams: {
+				type: Object,
+				default: {
+					searchType: 2,
+					searchTime: []
+				}
+			},
+		},
+		data() {
+			return {
+				loading: false,
+				startDate: '',
+				endDate: '',
+				taskTotal: '',
+				taskMax: '',
+				taskMin: '',
+				taskAvg: '',
+				lastTotalPer: 0,
+				lastMaxPer: 0,
+				lastMinPer: 0,
+				lastAvgPer: 0,
+				chartWidth: '100%',
+				chartHeight: '500px',
+				chart: null,
+				xData: [],
+				seriesData: [],
+				options: {
+					title: {
+						text: '任务完成时间趋势图',
+						left: 10
+					},
+					legend: {
+						type: 'scroll',
+						top: 'top',
+						width: '70%',
+						left: '20%'
+					},
+					xAxis: [
+					{
+						type: 'category',
+						data: []
+					}],
+					yAxis: [
+					{
+						type: 'value',
+						axisLabel: {
+							formatter: '{value} 分钟'
+						}
+					}, ],
+					tooltip: {
+						trigger: 'axis',
+						axisPointer: {
+							type: 'cross',
+							crossStyle: {
+								color: '#999'
+							}
+						}
+					},
+					toolbox: {
+						feature: {
+							saveAsImage: { show: true }
+						}
+					},
+					series: []
+				}
+			};
+		},
+		watch: {
+			xData: {
+				handler(newXData) {
+					if (this.chart) {
+						this.chart.setOption({ xAxis: [{ data: newXData }] });
+					}
+				},
+				deep: true
+			},
+			seriesData: {
+				handler(newSeriesData) {
+					if (this.chart) {
+						this.chart.setOption({ series: newSeriesData });
+					}
+				},
+				deep: true
+			}
+		},
+		mounted() {
+			window.addEventListener('resize', this.handleResize);
+		},
+		beforeDestroy() {
+			window.removeEventListener('resize', this.handleResize);
+			if (this.chart) {
+				this.chart.dispose();
+			}
+		},
+		methods: {
+			getData() {
+				this.loading = true;
+				let queryData = JSON.parse(JSON.stringify(this.queryParams));
+				queryData.searchType = 2;
+				this.startDate = this.$dayjs(queryData.searchTime[0]).format('YYYY-MM-DD');
+				this.endDate = this.$dayjs(queryData.searchTime[1]).format('YYYY-MM-DD');
+				PersonResponse(queryData).then(res => {
+					const { code, data } = res;
+					if (code === 200 && data != null && data != undefined) {
+						this.loading = false;
+						this.xData = data.xData;
+						this.seriesData = data.seriesData;
+						this.taskTotal = data.taskTotal;
+						this.taskMax = data.taskMax;
+						this.taskMin = data.taskMin;
+						this.taskAvg = data.taskAvg;
+
+						this.lastTotalPer = data.lastTotalPer;
+						this.lastMaxPer = data.lastMaxPer;
+						this.lastMinPer = data.lastMinPer;
+						this.lastAvgPer = data.lastAvgPer;
+					}
+				});
+			},
+
+			init() {
+				if (!this.chart) {
+					this.initChart();
+				}
+				this.getData();
+			},
+
+			initChart() {
+				echarts.registerTheme('theme', theme);
+				this.chart = echarts.init(this.$refs.chartRef, 'theme');
+				if (this.chart) {
+					this.chart.setOption(this.options);
+				}
+			},
+
+			handleResize() {
+				if (this.chart) {
+					this.chart.resize();
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		margin-top: 10px;
+		width: 100%;
+		height: 400px;
+	}
+
+	.el-statistic {
+		--el-statistic-content-font-size: 28px;
+	}
+
+	.statistic-card {
+		height: 100%;
+		padding: 20px;
+		border-radius: 4px;
+		background-color: var(--el-bg-color-overlay);
+	}
+
+	.statistic-footer {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		flex-wrap: wrap;
+		font-size: 12px;
+		color: var(--el-text-color-regular);
+		margin-top: 16px;
+	}
+
+	.statistic-footer .footer-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 16px;
+		font-weight: 600;
+	}
+
+	.statistic-footer .footer-item span:last-child {
+		display: inline-flex;
+		align-items: center;
+		margin-left: 4px;
+	}
+
+	.green {
+		color: var(--el-color-success);
+	}
+
+	.red {
+		color: var(--el-color-error);
+	}
+
+	.el-statistic-title-text {
+		font-size: 20px;
+		font-weight: 600;
+	}
+
+	.el-statistic-body-text {
+		font-size: 36px;
+		font-weight: 600;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/taskAnalysis/index.vue b/src/views/deviceManagement/datascreen/taskAnalysis/index.vue
new file mode 100644
index 0000000..72518a2
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/taskAnalysis/index.vue
@@ -0,0 +1,134 @@
+<template>
+	<div>
+		<el-card class="header-card">
+			<el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+				<el-form-item label="搜索时间" prop="searchTime">
+					<el-date-picker v-model="queryParams.searchTime" type="daterange" :clearable="false" unlink-panels range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" />
+				</el-form-item>
+				<el-form-item>
+					<el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+					<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+				</el-form-item>
+			</el-form>
+		</el-card>
+		<el-card class="card-box">
+			<lineChart1 class="chart1" :query-params="queryParams" ref="lineChartRef1"></lineChart1>
+		</el-card>
+		<!-- <el-card class="card-box">
+			<table1 class="chart1" ref="barChartRef1"></table1>
+		</el-card> -->
+	</div>
+</template>
+
+<script>
+	import lineChart1 from './lineChart1';
+	import table1 from './table1';
+
+	export default {
+		name: 'TaskAnalysisIndex',
+		components: {
+			lineChart1,
+			table1
+		},
+		data() {
+			return {
+				showSearch: true,
+				queryParams: {
+					devicetTypeId: 1,
+					deviceName: "",
+					deviceCode: "",
+					searchTime: []
+				},
+				chartType: 1,
+				shortcuts: [
+				{
+					text: '前一周',
+					value: () => {
+						const end = new Date()
+						const start = new Date()
+						start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+						return [start, end]
+					},
+				},
+				{
+					text: '前一月',
+					value: () => {
+						const end = new Date()
+						const start = new Date()
+						start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+						return [start, end]
+					},
+				},
+				{
+					text: '前三月',
+					value: () => {
+						const end = new Date()
+						const start = new Date()
+						start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+						return [start, end]
+					},
+				}
+				]
+			};
+		},
+		mounted() {
+			this.queryParams.searchTime = [this.$dayjs().startOf('month'), this.$dayjs().endOf('month')];
+			this.handleQuery();
+		},
+		methods: {
+			getData() {
+				setTimeout(() => {
+					if (this.$refs.lineChartRef1) {
+						this.$refs.lineChartRef1.init();
+					}
+				}, 100);
+			},
+			
+			handleQuery() {
+				this.getData();
+			},
+			
+			chartTypeChange(type) {
+				this.handleQuery();
+			},
+			
+			resetQuery() {
+				if (this.$refs.queryRef) {
+					this.$refs.queryRef.resetFields();
+				}
+				this.handleQuery();
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.border {
+		border: 1px solid #ffffff;
+	}
+
+	.chart1 {
+		width: 100%;
+		height: 500px;
+	}
+
+	.chart2 {
+		width: 100%;
+		height: 270px;
+	}
+
+	.pie-right {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.header-card {
+		margin-bottom: 10px;
+	}
+
+	.card-box {
+		margin-top: 10px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/taskAnalysis/lineChart1.vue b/src/views/deviceManagement/datascreen/taskAnalysis/lineChart1.vue
new file mode 100644
index 0000000..439f53c
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/taskAnalysis/lineChart1.vue
@@ -0,0 +1,162 @@
+<template>
+	<div>
+		<div v-loading="loading" class="chart" ref="chartRef"></div>
+	</div>
+</template>
+
+<script>
+	import * as echarts from 'echarts';
+	import theme from '../theme/shine.json';
+	import {
+		TaskLinebyDay
+	}
+	from '@/api/deviceManagement/dataAnalysis.js'
+
+export default {
+	name: 'LineChart1',
+	props: {
+		queryParams: {
+			type: Object,
+			default: {
+				devicetTypeId: 1,
+				deviceName: "",
+				deviceCode: "",
+				searchTime: []
+			}
+		},
+	},
+	data() {
+		return {
+			loading: false,
+			startDate: "",
+			endDate: "",
+			chartWidth: '100%',
+			chartHeight: '500px',
+			chart: null,
+			xData: [],
+			seriesData: [],
+			options: {
+				title: {
+					text: '点检巡检任务图',
+					left: 10
+				},
+				// 数据示例
+				legend: {
+					type: 'scroll',
+					top: 'top',
+					width: '70%',
+					left: '20%'
+				},
+				xAxis: [
+				{
+					type: 'category',
+					data: []
+				}],
+				yAxis: [
+				{
+					type: 'value'
+				}, ],
+				// 横向指示线
+				tooltip: {
+					trigger: 'axis',
+					axisPointer: {
+						type: 'cross',
+						crossStyle: {
+							color: '#999'
+						}
+					}
+				},
+				// 右上角工具栏
+				toolbox: {
+					feature: {
+						// 保存图片
+						saveAsImage: { show: true }
+					}
+				},
+				// 缩放
+				dataZoom: [
+				{
+					type: 'inside'
+				},
+				{
+					type: 'slider'
+				}],
+				// 数据
+				series: []
+			}
+		};
+	},
+	watch: {
+		xData: {
+			handler(newXData, oldXData) {
+				if (this.chart != null && newXData != oldXData) {
+					this.chart.setOption({ xAxis: [{ data: newXData }] });
+				}
+			},
+			deep: true
+		},
+		seriesData: {
+			handler(newSeriesData, oldSeriesData) {
+				if (this.chart != null && newSeriesData != oldSeriesData) {
+					this.chart.setOption({ series: newSeriesData });
+				}
+			},
+			deep: true
+		}
+	},
+	mounted() {
+		this.handleResize = this.handleResize.bind(this);
+		window.addEventListener('resize', this.handleResize);
+	},
+	beforeDestroy() {
+		if (this.chart) {
+			this.chart.dispose();
+			this.chart = null;
+		}
+		window.removeEventListener('resize', this.handleResize);
+	},
+	methods: {
+		getData() {
+			this.loading = true;
+			let queryData = JSON.parse(JSON.stringify(this.queryParams));
+			this.startDate = this.$dayjs(queryData.searchTime[0]).format('YYYY-MM-DD');
+			this.endDate = this.$dayjs(queryData.searchTime[1]).format('YYYY-MM-DD');
+			TaskLinebyDay(queryData).then(res => {
+				const { code, data } = res;
+				if (code === 200 && data != null && data != undefined) {
+					this.loading = false;
+					this.xData = data.xData;
+					this.seriesData = data.seriesData;
+				}
+			})
+		},
+		
+		// 初始化数据
+		init() {
+			if (this.chart === null || this.chart === undefined) {
+				this.initChart();
+			}
+			this.getData();
+		},
+		
+		initChart() {
+			echarts.registerTheme('theme', theme);
+			this.chart = echarts.init(this.$refs.chartRef, 'theme');
+			this.chart && this.chart.setOption(this.options);
+		},
+		
+		handleResize() {
+			if (this.chart) {
+				this.chart.resize();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.chart {
+		width: 100%;
+		height: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/taskAnalysis/table1.vue b/src/views/deviceManagement/datascreen/taskAnalysis/table1.vue
new file mode 100644
index 0000000..a90b81f
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/taskAnalysis/table1.vue
@@ -0,0 +1,185 @@
+<!--
+ * @Descripttion: (任务执行/device_task_execute)
+ * @Author: (许前浩)
+ * @Date: (2024-05-31)
+-->
+<template>
+	<div>
+		<el-table :data="dataList" v-loading="loading" ref="tableRef" border header-cell-class-name="el-table-header-cell" max-height="500" highlight-current-row @sort-change="sortChange" @mouseover.native="clearScroll" @mouseleave.native="createScroll">
+			<el-table-column type="index" width="50" align="center" />
+			<el-table-column prop="id" label="数据库编号" align="center" v-if="columns.showColumn('id')" />
+			<el-table-column prop="taskId" label="任务编号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('taskId')" />
+			<el-table-column prop="taskName" label="任务名称" align="center" width="200" :show-overflow-tooltip="true" v-if="columns.showColumn('taskName')" />
+			<el-table-column prop="type" label="任务类型" align="center" v-if="columns.showColumn('type')">
+				<template slot-scope="scope">
+					<dict-tag :options="options.typeOptions" :value="scope.row.type" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="distributedTime" label="任务派发时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('distributedTime')" />
+			<el-table-column prop="startTime" label="任务开始时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('startTime')" />
+			<el-table-column prop="endTime" label="任务结束时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('endTime')" />
+			<el-table-column prop="status" label="状态" align="center" v-if="columns.showColumn('status')">
+				<template slot-scope="scope">
+					<dict-tag :options="options.statusOptions" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+			<el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
+			<el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+			<el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
+			<el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+		</el-table>
+		<pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+	</div>
+</template>
+
+<script>
+	import {
+		listDeviceTaskExecute,
+	} from '@/api/deviceManagement/devicetaskexecute.js'
+
+export default {
+	name: 'devicetaskexecute',
+	data() {
+		return {
+			ids: [],
+			loading: false,
+			showSearch: true,
+			queryParams: {
+				pageNum: 1,
+				pageSize: 1000,
+				timeRange: null,
+				timeStart: this.$dayjs().startOf('day'),
+				timeEnd: this.$dayjs().endOf('day'),
+				type: 1,
+				status: -1,
+				sort: 'Id',
+				sortType: 'asc'
+			},
+			columns: [
+				{ visible: false, prop: 'id', label: '主键' },
+				{ visible: false, prop: 'taskId', label: '任务id' },
+				{ visible: true, prop: 'taskName', label: '任务名称' },
+				{ visible: true, prop: 'type', label: '任务类型（1是巡检，2是点检）' },
+				{ visible: true, prop: 'distributedTime', label: '任务派发时间' },
+				{ visible: false, prop: 'startTime', label: '任务执行——开始时间' },
+				{ visible: false, prop: 'endTime', label: '任务执行——结束时间' },
+				{ visible: true, prop: 'status', label: '状态' },
+				{ visible: true, prop: 'remark', label: '备注' },
+				{ visible: false, prop: 'createdBy', label: '创建人' },
+				{ visible: false, prop: 'createdTime', label: '创建时间' },
+				{ visible: false, prop: 'updatedBy', label: '更新人' },
+				{ visible: false, prop: 'updatedTime', label: '更新时间' }
+			],
+			total: 0,
+			dataList: [],
+			defaultTimeRange: [this.$dayjs().startOf('day'), this.$dayjs().endOf('day')],
+			options: {
+				// 任务类型（1是巡检，2是点检） 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+				typeOptions: [
+					{ dictLabel: '巡检', dictValue: 1, listClass: 'primary' },
+					{ dictLabel: '点检', dictValue: 2, listClass: 'warning' },
+				],
+				// 0-未执行 1-执行中 2-已完成 3-超时
+				// 状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+				statusOptions: [
+					{ dictLabel: '未执行', dictValue: 0, listClass: 'info' },
+					{ dictLabel: '执行中', dictValue: 1, listClass: 'primary' },
+					{ dictLabel: '已完成', dictValue: 2, listClass: 'success' },
+					{ dictLabel: '超时', dictValue: 3, listClass: 'danger' },
+				]
+			},
+			dictParams: [],
+			timer1: null,
+			timer2: null
+		};
+	},
+	mounted() {
+		this.createSearchTimer();
+		this.createScroll();
+		this.handleQuery();
+	},
+	beforeDestroy() {
+		this.clearScroll();
+		this.clearSearchTimer();
+	},
+	methods: {
+		// 检查列是否显示
+		columns_showColumn(prop) {
+			const column = this.columns.find(col => col.prop === prop);
+			return column && column.visible;
+		},
+		
+		getList() {
+			this.loading = true;
+			listDeviceTaskExecute(this.queryParams).then((res) => {
+				const { code, data } = res;
+				if (code == 200) {
+					this.dataList = data.result;
+					this.total = data.totalNum;
+					this.loading = false;
+				}
+			});
+		},
+
+		// 查询
+		handleQuery() {
+			this.queryParams.timeRange = this.defaultTimeRange;
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+
+		// 重置查询操作
+		resetQuery() {
+			this.$refs.queryRef && this.$refs.queryRef.resetFields();
+			this.handleQuery();
+		},
+		
+		// 自定义排序
+		sortChange(column) {
+			var sort = undefined;
+			var sortType = undefined;
+
+			if (column.prop != null && column.order != null) {
+				sort = column.prop;
+				sortType = column.order;
+			}
+			this.queryParams.sort = sort;
+			this.queryParams.sortType = sortType;
+			this.handleQuery();
+		},
+		
+		// 自动获取数据
+		clearSearchTimer() {
+			clearInterval(this.timer1);
+			this.timer1 = null;
+		},
+		createSearchTimer() {
+			this.clearSearchTimer();
+			this.timer1 = setInterval(() => {
+				this.handleQuery();
+			}, 10000);
+		},
+		
+		// 自动滚动
+		clearScroll() {
+			clearInterval(this.timer2);
+			this.timer2 = null;
+		},
+		createScroll() {
+			this.clearScroll();
+			// 拿到 table
+			const _table = this.$refs.tableRef.layout.table.refs;
+			// 拿到可以滚动的元素
+			const tableWrapper = _table.bodyWrapper.firstElementChild.firstElementChild;
+			this.timer2 = setInterval(() => {
+				tableWrapper.scrollTop += 1;
+				// 判断是否滚动到底部，如果到底部了置为0（可视高度+距离顶部=整个高度）
+				if (tableWrapper.clientHeight + tableWrapper.scrollTop >= tableWrapper.scrollHeight) {
+					tableWrapper.scrollTop = 0;
+				}
+			}, 100);
+		}
+	}
+};
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/theme/essos.json b/src/views/deviceManagement/datascreen/theme/essos.json
new file mode 100644
index 0000000..5da4694
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/theme/essos.json
@@ -0,0 +1,399 @@
+{
+	"color": [
+		"#893448",
+		"#df0000",
+		"#d95850",
+		"#eb8146",
+		"#ffb248",
+		"#f2d643",
+		"#ebdba4",
+		"#c8c800",
+		"#8e00d5",
+		"#ba00ba"
+	],
+	"backgroundColor": "rgba(242,234,191,0.0)",
+	"textStyle": {},
+	"title": {
+		"textStyle": {
+			"color": "#000000"
+		},
+		"subtextStyle": {
+			"color": "#000000"
+		}
+	},
+	"line": {
+		"itemStyle": {
+			"borderWidth": "2"
+		},
+		"lineStyle": {
+			"width": "2"
+		},
+		"symbolSize": "6",
+		"symbol": "emptyCircle",
+		"smooth": true
+	},
+	"radar": {
+		"itemStyle": {
+			"borderWidth": "2"
+		},
+		"lineStyle": {
+			"width": "2"
+		},
+		"symbolSize": "6",
+		"symbol": "emptyCircle",
+		"smooth": true
+	},
+	"bar": {
+		"itemStyle": {
+			"barBorderWidth": 0,
+			"barBorderColor": "#ccc"
+		}
+	},
+	"pie": {
+		"itemStyle": {
+			"borderWidth": 0,
+			"borderColor": "#ccc"
+		}
+	},
+	"scatter": {
+		"itemStyle": {
+			"borderWidth": 0,
+			"borderColor": "#ccc"
+		}
+	},
+	"boxplot": {
+		"itemStyle": {
+			"borderWidth": 0,
+			"borderColor": "#ccc"
+		}
+	},
+	"parallel": {
+		"itemStyle": {
+			"borderWidth": 0,
+			"borderColor": "#ccc"
+		}
+	},
+	"sankey": {
+		"itemStyle": {
+			"borderWidth": 0,
+			"borderColor": "#ccc"
+		}
+	},
+	"funnel": {
+		"itemStyle": {
+			"borderWidth": 0,
+			"borderColor": "#ccc"
+		}
+	},
+	"gauge": {
+		"itemStyle": {
+			"borderWidth": 0,
+			"borderColor": "#ccc"
+		}
+	},
+	"candlestick": {
+		"itemStyle": {
+			"color": "#eb8146",
+			"color0": "transparent",
+			"borderColor": "#d95850",
+			"borderColor0": "#58c470",
+			"borderWidth": "2"
+		}
+	},
+	"graph": {
+		"itemStyle": {
+			"borderWidth": 0,
+			"borderColor": "#ccc"
+		},
+		"lineStyle": {
+			"width": 1,
+			"color": "#aaa"
+		},
+		"symbolSize": "6",
+		"symbol": "emptyCircle",
+		"smooth": true,
+		"color": [
+			"#893448",
+			"#d95850",
+			"#eb8146",
+			"#ffb248",
+			"#f2d643",
+			"#ebdba4"
+		],
+		"label": {
+			"color": "#ffffff"
+		}
+	},
+	"map": {
+		"itemStyle": {
+			"areaColor": "#f3f3f3",
+			"borderColor": "#999999",
+			"borderWidth": 0.5
+		},
+		"label": {
+			"color": "#893448"
+		},
+		"emphasis": {
+			"itemStyle": {
+				"areaColor": "#ffb248",
+				"borderColor": "#eb8146",
+				"borderWidth": 1
+			},
+			"label": {
+				"color": "#893448"
+			}
+		}
+	},
+	"geo": {
+		"itemStyle": {
+			"areaColor": "#f3f3f3",
+			"borderColor": "#999999",
+			"borderWidth": 0.5
+		},
+		"label": {
+			"color": "#893448"
+		},
+		"emphasis": {
+			"itemStyle": {
+				"areaColor": "#ffb248",
+				"borderColor": "#eb8146",
+				"borderWidth": 1
+			},
+			"label": {
+				"color": "#893448"
+			}
+		}
+	},
+	"categoryAxis": {
+		"axisLine": {
+			"show": true,
+			"lineStyle": {
+				"color": "#aaaaaa"
+			}
+		},
+		"axisTick": {
+			"show": false,
+			"lineStyle": {
+				"color": "#333"
+			}
+		},
+		"axisLabel": {
+			"show": true,
+			"color": "#999999"
+		},
+		"splitLine": {
+			"show": true,
+			"lineStyle": {
+				"color": [
+					"#e6e6e6"
+				]
+			}
+		},
+		"splitArea": {
+			"show": false,
+			"areaStyle": {
+				"color": [
+					"rgba(250,250,250,0.05)",
+					"rgba(200,200,200,0.02)"
+				]
+			}
+		}
+	},
+	"valueAxis": {
+		"axisLine": {
+			"show": true,
+			"lineStyle": {
+				"color": "#aaaaaa"
+			}
+		},
+		"axisTick": {
+			"show": false,
+			"lineStyle": {
+				"color": "#333"
+			}
+		},
+		"axisLabel": {
+			"show": true,
+			"color": "#999999"
+		},
+		"splitLine": {
+			"show": true,
+			"lineStyle": {
+				"color": [
+					"#e6e6e6"
+				]
+			}
+		},
+		"splitArea": {
+			"show": false,
+			"areaStyle": {
+				"color": [
+					"rgba(250,250,250,0.05)",
+					"rgba(200,200,200,0.02)"
+				]
+			}
+		}
+	},
+	"logAxis": {
+		"axisLine": {
+			"show": true,
+			"lineStyle": {
+				"color": "#aaaaaa"
+			}
+		},
+		"axisTick": {
+			"show": false,
+			"lineStyle": {
+				"color": "#333"
+			}
+		},
+		"axisLabel": {
+			"show": true,
+			"color": "#999999"
+		},
+		"splitLine": {
+			"show": true,
+			"lineStyle": {
+				"color": [
+					"#e6e6e6"
+				]
+			}
+		},
+		"splitArea": {
+			"show": false,
+			"areaStyle": {
+				"color": [
+					"rgba(250,250,250,0.05)",
+					"rgba(200,200,200,0.02)"
+				]
+			}
+		}
+	},
+	"timeAxis": {
+		"axisLine": {
+			"show": true,
+			"lineStyle": {
+				"color": "#aaaaaa"
+			}
+		},
+		"axisTick": {
+			"show": false,
+			"lineStyle": {
+				"color": "#333"
+			}
+		},
+		"axisLabel": {
+			"show": true,
+			"color": "#999999"
+		},
+		"splitLine": {
+			"show": true,
+			"lineStyle": {
+				"color": [
+					"#e6e6e6"
+				]
+			}
+		},
+		"splitArea": {
+			"show": false,
+			"areaStyle": {
+				"color": [
+					"rgba(250,250,250,0.05)",
+					"rgba(200,200,200,0.02)"
+				]
+			}
+		}
+	},
+	"toolbox": {
+		"iconStyle": {
+			"borderColor": "#999999"
+		},
+		"emphasis": {
+			"iconStyle": {
+				"borderColor": "#666666"
+			}
+		}
+	},
+	"legend": {
+		"textStyle": {
+			"color": "#000000"
+		}
+	},
+	"tooltip": {
+		"axisPointer": {
+			"lineStyle": {
+				"color": "#cccccc",
+				"width": 1
+			},
+			"crossStyle": {
+				"color": "#cccccc",
+				"width": 1
+			}
+		}
+	},
+	"timeline": {
+		"lineStyle": {
+			"color": "#893448",
+			"width": 1
+		},
+		"itemStyle": {
+			"color": "#893448",
+			"borderWidth": 1
+		},
+		"controlStyle": {
+			"color": "#893448",
+			"borderColor": "#893448",
+			"borderWidth": 0.5
+		},
+		"checkpointStyle": {
+			"color": "#eb8146",
+			"borderColor": "#ffb248"
+		},
+		"label": {
+			"color": "#893448"
+		},
+		"emphasis": {
+			"itemStyle": {
+				"color": "#ffb248"
+			},
+			"controlStyle": {
+				"color": "#893448",
+				"borderColor": "#893448",
+				"borderWidth": 0.5
+			},
+			"label": {
+				"color": "#893448"
+			}
+		}
+	},
+	"visualMap": {
+		"color": [
+			"#893448",
+			"#d95850",
+			"#eb8146",
+			"#ffb248",
+			"#f2d643",
+			"rgb(247,238,173)"
+		]
+	},
+	"dataZoom": {
+		"backgroundColor": "rgba(255,255,255,0)",
+		"dataBackgroundColor": "rgba(255,178,72,0.5)",
+		"fillerColor": "rgba(255,178,72,0.15)",
+		"handleColor": "#ffb248",
+		"handleSize": "100%",
+		"textStyle": {
+			"color": "#333"
+		}
+	},
+	"markPoint": {
+		"label": {
+			"color": "#ffffff"
+		},
+		"emphasis": {
+			"label": {
+				"color": "#ffffff"
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/views/deviceManagement/datascreen/theme/shine.json b/src/views/deviceManagement/datascreen/theme/shine.json
new file mode 100644
index 0000000..5774817
--- /dev/null
+++ b/src/views/deviceManagement/datascreen/theme/shine.json
@@ -0,0 +1,395 @@
+{
+    "color": [
+        "#c12e34",
+        "#e6b600",
+        "#0098d9",
+        "#2b821d",
+        "#005eaa",
+        "#339ca8",
+        "#cda819",
+        "#32a487"
+    ],
+    "backgroundColor": "rgba(0,0,0,0)",
+    "textStyle": {},
+    "title": {
+        "textStyle": {
+            "color": "#333333"
+        },
+        "subtextStyle": {
+            "color": "#aaaaaa"
+        }
+    },
+    "line": {
+        "itemStyle": {
+            "borderWidth": 1
+        },
+        "lineStyle": {
+            "width": 2
+        },
+        "symbolSize": 4,
+        "symbol": "emptyCircle",
+        "smooth": false
+    },
+    "radar": {
+        "itemStyle": {
+            "borderWidth": 1
+        },
+        "lineStyle": {
+            "width": 2
+        },
+        "symbolSize": 4,
+        "symbol": "emptyCircle",
+        "smooth": false
+    },
+    "bar": {
+        "itemStyle": {
+            "barBorderWidth": 0,
+            "barBorderColor": "#ccc"
+        }
+    },
+    "pie": {
+        "itemStyle": {
+            "borderWidth": 0,
+            "borderColor": "#ccc"
+        }
+    },
+    "scatter": {
+        "itemStyle": {
+            "borderWidth": 0,
+            "borderColor": "#ccc"
+        }
+    },
+    "boxplot": {
+        "itemStyle": {
+            "borderWidth": 0,
+            "borderColor": "#ccc"
+        }
+    },
+    "parallel": {
+        "itemStyle": {
+            "borderWidth": 0,
+            "borderColor": "#ccc"
+        }
+    },
+    "sankey": {
+        "itemStyle": {
+            "borderWidth": 0,
+            "borderColor": "#ccc"
+        }
+    },
+    "funnel": {
+        "itemStyle": {
+            "borderWidth": 0,
+            "borderColor": "#ccc"
+        }
+    },
+    "gauge": {
+        "itemStyle": {
+            "borderWidth": 0,
+            "borderColor": "#ccc"
+        }
+    },
+    "candlestick": {
+        "itemStyle": {
+            "color": "#c12e34",
+            "color0": "#2b821d",
+            "borderColor": "#c12e34",
+            "borderColor0": "#2b821d",
+            "borderWidth": 1
+        }
+    },
+    "graph": {
+        "itemStyle": {
+            "borderWidth": 0,
+            "borderColor": "#ccc"
+        },
+        "lineStyle": {
+            "width": 1,
+            "color": "#aaa"
+        },
+        "symbolSize": 4,
+        "symbol": "emptyCircle",
+        "smooth": false,
+        "color": [
+            "#c12e34",
+            "#e6b600",
+            "#0098d9",
+            "#2b821d",
+            "#005eaa",
+            "#339ca8",
+            "#cda819",
+            "#32a487"
+        ],
+        "label": {
+            "color": "#eeeeee"
+        }
+    },
+    "map": {
+        "itemStyle": {
+            "areaColor": "#ddd",
+            "borderColor": "#eee",
+            "borderWidth": 0.5
+        },
+        "label": {
+            "color": "#c12e34"
+        },
+        "emphasis": {
+            "itemStyle": {
+                "areaColor": "#e6b600",
+                "borderColor": "#ddd",
+                "borderWidth": 1
+            },
+            "label": {
+                "color": "#c12e34"
+            }
+        }
+    },
+    "geo": {
+        "itemStyle": {
+            "areaColor": "#ddd",
+            "borderColor": "#eee",
+            "borderWidth": 0.5
+        },
+        "label": {
+            "color": "#c12e34"
+        },
+        "emphasis": {
+            "itemStyle": {
+                "areaColor": "#e6b600",
+                "borderColor": "#ddd",
+                "borderWidth": 1
+            },
+            "label": {
+                "color": "#c12e34"
+            }
+        }
+    },
+    "categoryAxis": {
+        "axisLine": {
+            "show": true,
+            "lineStyle": {
+                "color": "#333"
+            }
+        },
+        "axisTick": {
+            "show": true,
+            "lineStyle": {
+                "color": "#333"
+            }
+        },
+        "axisLabel": {
+            "show": true,
+            "color": "#333"
+        },
+        "splitLine": {
+            "show": false,
+            "lineStyle": {
+                "color": [
+                    "#ccc"
+                ]
+            }
+        },
+        "splitArea": {
+            "show": false,
+            "areaStyle": {
+                "color": [
+                    "rgba(250,250,250,0.3)",
+                    "rgba(200,200,200,0.3)"
+                ]
+            }
+        }
+    },
+    "valueAxis": {
+        "axisLine": {
+            "show": true,
+            "lineStyle": {
+                "color": "#333"
+            }
+        },
+        "axisTick": {
+            "show": true,
+            "lineStyle": {
+                "color": "#333"
+            }
+        },
+        "axisLabel": {
+            "show": true,
+            "color": "#333"
+        },
+        "splitLine": {
+            "show": true,
+            "lineStyle": {
+                "color": [
+                    "#ccc"
+                ]
+            }
+        },
+        "splitArea": {
+            "show": false,
+            "areaStyle": {
+                "color": [
+                    "rgba(250,250,250,0.3)",
+                    "rgba(200,200,200,0.3)"
+                ]
+            }
+        }
+    },
+    "logAxis": {
+        "axisLine": {
+            "show": true,
+            "lineStyle": {
+                "color": "#333"
+            }
+        },
+        "axisTick": {
+            "show": true,
+            "lineStyle": {
+                "color": "#333"
+            }
+        },
+        "axisLabel": {
+            "show": true,
+            "color": "#333"
+        },
+        "splitLine": {
+            "show": true,
+            "lineStyle": {
+                "color": [
+                    "#ccc"
+                ]
+            }
+        },
+        "splitArea": {
+            "show": false,
+            "areaStyle": {
+                "color": [
+                    "rgba(250,250,250,0.3)",
+                    "rgba(200,200,200,0.3)"
+                ]
+            }
+        }
+    },
+    "timeAxis": {
+        "axisLine": {
+            "show": true,
+            "lineStyle": {
+                "color": "#333"
+            }
+        },
+        "axisTick": {
+            "show": true,
+            "lineStyle": {
+                "color": "#333"
+            }
+        },
+        "axisLabel": {
+            "show": true,
+            "color": "#333"
+        },
+        "splitLine": {
+            "show": true,
+            "lineStyle": {
+                "color": [
+                    "#ccc"
+                ]
+            }
+        },
+        "splitArea": {
+            "show": false,
+            "areaStyle": {
+                "color": [
+                    "rgba(250,250,250,0.3)",
+                    "rgba(200,200,200,0.3)"
+                ]
+            }
+        }
+    },
+    "toolbox": {
+        "iconStyle": {
+            "borderColor": "#06467c"
+        },
+        "emphasis": {
+            "iconStyle": {
+                "borderColor": "#4187c2"
+            }
+        }
+    },
+    "legend": {
+        "textStyle": {
+            "color": "#333333"
+        }
+    },
+    "tooltip": {
+        "axisPointer": {
+            "lineStyle": {
+                "color": "#cccccc",
+                "width": 1
+            },
+            "crossStyle": {
+                "color": "#cccccc",
+                "width": 1
+            }
+        }
+    },
+    "timeline": {
+        "lineStyle": {
+            "color": "#005eaa",
+            "width": 1
+        },
+        "itemStyle": {
+            "color": "#005eaa",
+            "borderWidth": 1
+        },
+        "controlStyle": {
+            "color": "#005eaa",
+            "borderColor": "#005eaa",
+            "borderWidth": 0.5
+        },
+        "checkpointStyle": {
+            "color": "#005eaa",
+            "borderColor": "#316bc2"
+        },
+        "label": {
+            "color": "#005eaa"
+        },
+        "emphasis": {
+            "itemStyle": {
+                "color": "#005eaa"
+            },
+            "controlStyle": {
+                "color": "#005eaa",
+                "borderColor": "#005eaa",
+                "borderWidth": 0.5
+            },
+            "label": {
+                "color": "#005eaa"
+            }
+        }
+    },
+    "visualMap": {
+        "color": [
+            "#1790cf",
+            "#a2d4e6"
+        ]
+    },
+    "dataZoom": {
+        "backgroundColor": "rgba(47,69,84,0)",
+        "dataBackgroundColor": "rgba(47,69,84,0.3)",
+        "fillerColor": "rgba(167,183,204,0.4)",
+        "handleColor": "#a7b7cc",
+        "handleSize": "100%",
+        "textStyle": {
+            "color": "#333333"
+        }
+    },
+    "markPoint": {
+        "label": {
+            "color": "#eeeeee"
+        },
+        "emphasis": {
+            "label": {
+                "color": "#eeeeee"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/views/deviceManagement/deviceMaintenanceRecord/index.vue b/src/views/deviceManagement/deviceMaintenanceRecord/index.vue
new file mode 100644
index 0000000..cf2c81f
--- /dev/null
+++ b/src/views/deviceManagement/deviceMaintenanceRecord/index.vue
@@ -0,0 +1,287 @@
+<template>
+  <div>
+    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+      <el-form-item>
+        <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" v-hasPermi="['business:devicemaintenancerecord:add']" plain icon="el-icon-plus" @click="handleAdd">
+          {{ $t('btn.add') }}
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table
+      :data="dataList"
+      v-loading="loading"
+      ref="table"
+      border
+      header-cell-class-name="el-table-header-cell"
+      highlight-current-row
+      @sort-change="sortChange">
+      <el-table-column prop="id" label="id" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('id')" />
+      <el-table-column prop="fkRepairId" label="维修单编号" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('fkRepairId')" />
+      <el-table-column
+        prop="maintanancePerson"
+        label="维修人"
+        align="center"
+        :show-overflow-tooltip="true"
+        v-if="columns_showColumn('maintanancePerson')" />
+      <el-table-column prop="phone" label="手机号" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('phone')" />
+      <el-table-column prop="result" label="维修结果" align="center" v-if="columns_showColumn('result')" />
+      <el-table-column prop="maintenanceTime" label="维修时间" :show-overflow-tooltip="true" v-if="columns_showColumn('maintenanceTime')" />
+      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('createdBy')" />
+      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns_showColumn('createdTime')" />
+      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('updatedBy')" />
+      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns_showColumn('updatedTime')" />
+      <el-table-column label="操作" width="160">
+        <template slot-scope="scope">
+          <el-button
+            type="success"
+            size="small"
+            icon="el-icon-edit"
+            title="编辑"
+            v-hasPermi="['business:devicemaintenancerecord:edit']"
+            @click="handleUpdate(scope.row)"></el-button>
+          <el-button
+            type="danger"
+            size="small"
+            icon="el-icon-delete"
+            title="删除"
+            v-hasPermi="['business:devicemaintenancerecord:delete']"
+            @click="handleDelete(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改维修记录对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" v-model="open">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <!-- 					<el-col :lg="12">
+						<el-form-item label="维修单编号" prop="fkRepairId">
+							<el-input v-model="form.fkRepairId" placeholder="请输入维修单编号" />
+						</el-form-item>
+					</el-col> -->
+
+          <el-col :lg="12">
+            <el-form-item label="维修人" prop="maintanancePerson">
+              <el-input v-model="form.maintanancePerson" placeholder="请输入维修人" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入手机号" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="维修结果" prop="result">
+              <el-input v-model.number="form.result" placeholder="请输入维修结果" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="维修时间" prop="maintenanceTime">
+              <el-date-picker v-model="form.maintenanceTime" type="datetime" :teleported="false" placeholder="选择日期时间"></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template slot="footer" v-if="opertype != 3">
+        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listDeviceMaintenanceRecord,
+  addDeviceMaintenanceRecord,
+  delDeviceMaintenanceRecord,
+  updateDeviceMaintenanceRecord,
+  getDeviceMaintenanceRecord
+} from '@/api/deviceManagement/devicemaintenancerecord.js'
+
+export default {
+  name: 'devicemaintenancerecord',
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sort: '',
+        sortType: 'asc'
+      },
+      columns: [
+        { visible: false, prop: 'id', label: 'id雪花' },
+        { visible: true, prop: 'fkRepairId', label: '维修单编号' },
+        { visible: true, prop: 'maintanancePerson', label: '维修人' },
+        { visible: true, prop: 'phone', label: '手机号' },
+        { visible: true, prop: 'result', label: '维修结果' },
+        { visible: true, prop: 'maintenanceTime', label: '维修时间' },
+        { visible: true, prop: 'createdBy', label: '创建人' },
+        { visible: true, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' }
+      ],
+      total: 0,
+      dataList: [],
+      defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)],
+      formRef: null,
+      title: '',
+      opertype: 0,
+      open: false,
+      form: {
+        id: null,
+        fkRepairId: null,
+        maintanancePerson: null,
+        phone: null,
+        result: null,
+        maintenanceTime: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      rules: {
+        // id: [{ required: true, message: "id雪花不能为空", trigger: "blur" }],
+      },
+      options: {},
+      dictParams: []
+    }
+  },
+  mounted() {
+    this.handleQuery()
+  },
+  methods: {
+    columns_showColumn(prop) {
+      return this.columns.some(column => column.prop === prop && column.visible)
+    },
+    getList() {
+      this.loading = true
+      listDeviceMaintenanceRecord(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+    // 查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    // 重置查询操作
+    resetQuery() {
+      this.resetForm('queryRef')
+      this.handleQuery()
+    },
+    // 自定义排序
+    sortChange(column) {
+      var sort = undefined
+      var sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+    // 关闭dialog
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 重置表单
+    reset() {
+      this.form = {
+        id: null,
+        fkRepairId: null,
+        maintanancePerson: null,
+        phone: null,
+        result: null,
+        maintenanceTime: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      }
+      this.resetForm('formRef')
+    },
+    // 添加按钮操作
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加维修记录'
+      this.opertype = 1
+    },
+    // 修改按钮操作
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getDeviceMaintenanceRecord(id).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.open = true
+          this.title = '修改维修记录'
+          this.opertype = 2
+          this.form = {
+            ...data
+          }
+        }
+      })
+    },
+    // 添加&修改 表单提交
+    submitForm() {
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined && this.opertype === 2) {
+            updateDeviceMaintenanceRecord(this.form).then((res) => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addDeviceMaintenanceRecord(this.form).then((res) => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    // 删除按钮操作
+    handleDelete(row) {
+      const Ids = row.id || this.ids
+
+      this
+        .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(function () {
+          return delDeviceMaintenanceRecord(Ids)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManagement/devicePointInspectionPlan/index.vue b/src/views/deviceManagement/devicePointInspectionPlan/index.vue
new file mode 100644
index 0000000..9d9541c
--- /dev/null
+++ b/src/views/deviceManagement/devicePointInspectionPlan/index.vue
@@ -0,0 +1,370 @@
+<template>
+	<div>
+		<el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+			<el-form-item label="点检名称" prop="deviceName">
+				<el-input v-model.trim="queryParams.name" placeholder="请输入点检名称" clearable />
+			</el-form-item>
+			<el-form-item label="点检状态" prop="status">
+				<el-radio-group v-model="queryParams.status" @change="handleQuery">
+					<el-radio-button label="全部" :value="-1" />
+					<el-radio-button label="停用" :value="0" />
+					<el-radio-button label="启用" :value="1" />
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item label="类别" prop="innerType">
+				<el-radio-group v-model="queryParams.innerType" @change="handleQuery">
+					<el-radio-button label="全部" :value="-1" />
+					<el-radio-button label="检查" :value="1" />
+					<el-radio-button label="保养" :value="2" />
+				</el-radio-group>
+			</el-form-item>
+
+			<el-form-item label="开始时间" prop="starttime">
+				<el-date-picker v-model="queryParams.starttime" type="datetime" placeholder="请输入开始时间" />
+			</el-form-item>
+
+			<el-form-item label="结束时间" prop="endtime">
+				<el-date-picker v-model="queryParams.endtime" type="datetime" placeholder="请输入开始时间" />
+			</el-form-item>
+
+			<el-form-item>
+				<el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+				<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- 工具区域 -->
+		<el-row :gutter="15" class="mb10">
+			<el-col :span="1.5">
+				<el-button type="primary" v-hasPermi="['deviceManagement:devicepointinspectionplan:add']" plain icon="el-icon-plus" @click="handleAdd">
+					{{ $t('btn.add') }}
+				</el-button>
+			</el-col>
+			<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell" highlight-current-row @sort-change="sortChange">
+			<el-table-column prop="name" label="点检检名称" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('name')" />
+			<el-table-column prop="innerType" label="类别" align="center" v-if="columns_showColumn('innerType')">
+				<template slot-scope="scope">
+					<dict-tag :options="options.innerTypeOptions" :value="scope.row.innerType" />
+				</template>
+			</el-table-column>
+			<el-table-column label="添加设备" align="center">
+				<template slot-scope="scope">
+					<el-button type="primary" size="small" icon="el-icon-message-box" title="添加设备" @click="AddDevice(scope.row)"></el-button>
+				</template>
+			</el-table-column>
+			<el-table-column label="立刻派发" align="center">
+				<template slot-scope="scope">
+					<el-button type="success" size="small" icon="el-icon-promotion" @click="dispatch(scope.row)"></el-button>
+				</template>
+			</el-table-column>
+			<el-table-column prop="fkPersonId" label="执行人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('fkPersonId')" />
+			
+			<el-table-column prop="status" label="点检状态" align="center" v-if="columns_showColumn('status')">
+				<template slot-scope="scope">
+					<dict-tag :options="options.statusOptions" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('remark')" />
+
+			<el-table-column label="操作" width="160">
+				<template slot-scope="scope">
+					<el-button type="success" size="small" icon="el-icon-edit" title="编辑" v-hasPermi="['deviceManagement:devicepointinspectionplan:edit']" @click="handleUpdate(scope.row)"></el-button>
+					<el-button type="danger" size="small" icon="el-icon-delete" title="删除" v-hasPermi="['deviceManagement:devicepointinspectionplan:delete']" @click="handleDelete(scope.row)"></el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改点检任务对话框 -->
+		<el-dialog :title="title" :lock-scroll="false" v-model="open">
+			<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+				<el-row :gutter="20">
+					<el-col :lg="12">
+						<el-form-item label="点检检名称" prop="name">
+							<el-input v-model="form.name" placeholder="请输入点检检名称" />
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="12">
+						<el-form-item label="执行人" prop="fkPersonId">
+							<el-input v-model="form.fkPersonId" placeholder="请输入执行人" />
+						</el-form-item>
+					</el-col>
+					<el-col :lg="12">
+						<el-form-item label="类别" prop="innerType">
+							<el-radio-group v-model="form.innerType">
+								<el-radio v-for="item in options.innerTypeOptions" :key="item.dictValue" :value="parseInt(item.dictValue)" :label="item.dictLabel">
+								</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+					<el-col :lg="12">
+						<el-form-item label="点检状态" prop="status">
+							<el-radio-group v-model="form.status">
+								<el-radio v-for="item in options.statusOptions" :key="item.dictValue" :value="parseInt(item.dictValue)" :label="item.dictLabel">
+								</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="12">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="form.remark" placeholder="请输入备注" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template slot="footer" v-if="opertype != 3">
+				<el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+				<el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+			</template>
+		</el-dialog>
+
+		<el-dialog title="添加设备" :lock-scroll="false" v-model="open_device">
+			<Devicelist :message="messageFromParent" :flag="point"></Devicelist>
+			<template slot="footer">
+				<el-button text @click="open_device = false">{{ $t('btn.cancel') }}</el-button>
+				<el-button type="primary" @click="open_device = false">{{ $t('btn.submit') }}</el-button>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import {
+	listDevicePointInspectionPlan,
+	addDevicePointInspectionPlan,
+	delDevicePointInspectionPlan,
+	updateDevicePointInspectionPlan,
+	getDevicePointInspectionPlan
+} from '@/api/deviceManagement/devicepointinspectionplan.js'
+import { taskdispatch } from '@/api/deviceManagement/devicetaskexecute.js'
+import Devicelist from '@/views/deviceManagement/components/devicelist_point/index.vue'
+
+export default {
+	name: 'devicepointinspectionplan',
+	components: {
+		Devicelist
+	},
+	data() {
+		return {
+			ids: [],
+			loading: false,
+			showSearch: true,
+			open_device: false,
+			queryParams: {
+				name: '',
+				status: -1,
+				innerType: -1,
+				starttime: null,
+				endtime: null,
+				pageNum: 1,
+				pageSize: 10,
+				sort: 'createdTime',
+				sortType: 'desc'
+			},
+			columns: [
+				{ visible: false, prop: 'id', label: 'id(雪花)' },
+				{ visible: true, prop: 'name', label: '点检检名称' },
+				{ visible: true, prop: 'fkPersonId', label: '执行人' },
+				{ visible: true, prop: 'innerType', label: '类别' },
+				{ visible: true, prop: 'status', label: '点检状态' },
+				{ visible: true, prop: 'type', label: '类型(内部)' },
+				{ visible: true, prop: 'remark', label: '备注' },
+				{ visible: true, prop: 'createdBy', label: '创建人' },
+				{ visible: true, prop: 'createdTime', label: '创建时间' },
+				{ visible: false, prop: 'updatedBy', label: '更新人' },
+				{ visible: false, prop: 'updatedTime', label: '更新时间' }
+			],
+			total: 0,
+			dataList: [],
+			queryRef: null,
+			defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)],
+			dictParams: [],
+			formRef: null,
+			title: '',
+			opertype: 0,
+			open: false,
+			form: {
+				id: null,
+				name: null,
+				fkPersonId: null,
+				status: 1,
+				innerType: 1,
+				type: null,
+				remark: null,
+				createdBy: null,
+				createdTime: null,
+				updatedBy: null,
+				updatedTime: null
+			},
+			rules: {
+				// id: [{ required: true, message: "id(雪花)不能为空", trigger: "blur" }],
+			},
+			options: {
+				// 点检状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+				statusOptions: [
+					{ dictLabel: '启用', dictValue: 1, listClass: 'success' },
+					{ dictLabel: '停用', dictValue: 0, listClass: 'danger' }
+				],
+				// 类型(内部) 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+				typeOptions: [],
+				innerTypeOptions: [
+					{ dictLabel: '检查', dictValue: 1, listClass: 'primary' },
+					{ dictLabel: '保养', dictValue: 2, listClass: 'warning' }
+				]
+			},
+			point: '',
+			messageFromParent: ''
+		}
+	},
+	mounted() {
+		this.handleQuery()
+	},
+	methods: {
+		columns_showColumn(prop) {
+			return this.columns.some(column => column.prop === prop && column.visible)
+		},
+		getList() {
+			this.loading = true
+			listDevicePointInspectionPlan(this.queryParams).then((res) => {
+				const { code, data } = res
+				if (code == 200) {
+					this.dataList = data.result
+					this.total = data.totalNum
+					this.loading = false
+				}
+			})
+		},
+		// 查询
+		handleQuery() {
+			this.queryParams.pageNum = 1
+			this.getList()
+		},
+		// 重置查询操作
+		resetQuery() {
+			this.queryParams.name = ''
+			this.queryParams.status = -1
+			this.queryParams.starttime = null
+			this.queryParams.endtime = null
+
+			this.resetForm('queryRef')
+
+			this.handleQuery()
+		},
+		// 自定义排序
+		sortChange(column) {
+			var sort = undefined
+			var sortType = undefined
+
+			if (column.prop != null && column.order != null) {
+				sort = column.prop
+				sortType = column.order
+			}
+			this.queryParams.sort = sort
+			this.queryParams.sortType = sortType
+			this.handleQuery()
+		},
+		// 关闭dialog
+		cancel() {
+			this.open = false
+			this.reset()
+		},
+		// 重置表单
+		reset() {
+			this.form = {
+				id: null,
+				name: null,
+				fkPersonId: null,
+				status: 1,
+				innerType: 1,
+				type: null,
+				remark: null,
+				createdBy: null,
+				createdTime: null,
+				updatedBy: null,
+				updatedTime: null
+			}
+			this.resetForm('formRef')
+		},
+		// 添加按钮操作
+		handleAdd() {
+			this.reset()
+			this.open = true
+			this.title = '添加点检任务'
+			this.opertype = 1
+		},
+		// 修改按钮操作
+		handleUpdate(row) {
+			this.reset()
+			const id = row.id || this.ids
+			getDevicePointInspectionPlan(id).then((res) => {
+				const { code, data } = res
+				if (code == 200) {
+					this.open = true
+					this.title = '修改点检任务'
+					this.opertype = 2
+
+					this.form = {
+						...data
+					}
+				}
+			})
+		},
+		// 添加&修改 表单提交
+		submitForm() {
+			this.$refs['formRef'].validate((valid) => {
+				if (valid) {
+					if (this.form.id != undefined && this.opertype === 2) {
+						updateDevicePointInspectionPlan(this.form).then((res) => {
+							this.$modal.msgSuccess('修改成功')
+							this.open = false
+							this.getList()
+						})
+					} else {
+						addDevicePointInspectionPlan(this.form).then((res) => {
+							this.$modal.msgSuccess('新增成功')
+							this.open = false
+							this.getList()
+						})
+					}
+				}
+			})
+		},
+		// 删除按钮操作
+		handleDelete(row) {
+			const Ids = row.id || this.ids
+
+			this
+				.$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+				.then(function () {
+					return delDevicePointInspectionPlan(Ids)
+				})
+				.then(() => {
+					this.getList()
+					this.$modal.msgSuccess('删除成功')
+				})
+		},
+		AddDevice(row) {
+			this.open_device = true
+			this.messageFromParent = row.id
+			this.point = 'point'
+		},
+		// 任务派发
+		dispatch(row) {
+			this
+				.$confirm('是否派发任务' + row.name)
+				.then(function () {
+					return taskdispatch(row.id)
+				})
+				.then((res) => {
+					if (res.code == 200 && res.data > 0) {
+						this.$modal.msgSuccess('任务派发成功')
+					}
+				})
+		}
+	}
+}
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceDialog.vue b/src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceDialog.vue
new file mode 100644
index 0000000..d690830
--- /dev/null
+++ b/src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceDialog.vue
@@ -0,0 +1,43 @@
+<template>
+	<div>
+		<!-- 设备操作弹框 -->
+		<el-dialog v-bind="$attrs" @open="onOpen" @close="onClose" :close-on-click-modal="false" title="设备操作" width="900">
+			<el-tabs v-model="activeName" type="border-card">
+				<el-tab-pane label="维修历史" name="first">
+					<TheDeviceMaintenanceHistoryTable :actionDialogId="actionDialogId"></TheDeviceMaintenanceHistoryTable>
+				</el-tab-pane>
+			</el-tabs>
+			<template #footer>
+				<div class="dialog-footer">
+					<!-- <el-button text @click="close">{{ $t('btn.cancel') }}</el-button> -->
+					<!-- <el-button v-if="activeName === 'first'" type="primary" @click="save(1)">{{ $t('btn.save') }}</el-button> -->
+				</div>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup>
+	import { ref } from 'vue'
+	import { ElMessageBox } from 'element-plus'
+	import { default as TheDeviceMaintenanceHistoryTable } from './TheDeviceMaintenanceHistoryTable'
+	const emit = defineEmits()
+	const props = defineProps({
+		actionDialogId: {
+			type: Number
+		}
+	})
+
+	function onOpen() {
+		console.log(props.actionDialogId);
+	}
+
+	function onClose() {
+
+	}
+
+	function close() {
+		emit('update:modelValue', false)
+	}
+	const activeName = ref('first')
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceHistoryTable.vue b/src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceHistoryTable.vue
new file mode 100644
index 0000000..a3061dc
--- /dev/null
+++ b/src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceHistoryTable.vue
@@ -0,0 +1,331 @@
+<template>
+	<div>
+		<!-- 工具区域 -->
+		<el-row :gutter="15" class="mb10">
+			<!-- <el-col :span="1.5">
+				<el-button type="primary" v-hasPermi="['deviceManagement:deviceinspect:add']" plain icon="plus" @click="handleAdd">
+					{{ $t('btn.add') }}
+				</el-button>
+			</el-col> -->
+			<el-col :span="1.5">
+				<el-button type="success" plain icon="plus" @click="handleAdd">
+					添加维修记录
+				</el-button>
+			</el-col>
+			<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell" highlight-current-row>
+			<el-table-column type="index" align="center" />
+			<el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('name')" />
+			<el-table-column prop="image" label="图片" align="center" v-if="columns.showColumn('image')">
+				<template #default="scope">
+					<ImagePreview :src="scope.row.image"></ImagePreview>
+				</template>
+			</el-table-column>
+			<el-table-column prop="descride" label="描述" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('descride')" />
+			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+			<el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
+			<el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+			<el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
+			<el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+			<el-table-column label="操作" width="160">
+				<template #default="scope">
+					<el-button type="danger" size="small" icon="delete" title="取消关联" v-hasPermi="['deviceManagement:deviceinspect:delete']" @click="handleRemoveBind(scope.row.id)"></el-button>
+					<el-button type="primary" size="small" icon="arrowUpBold" title="上移" @click="handleSortUp(scope.row.id,scope.$index)"></el-button>
+					<el-button type="primary" size="small" icon="arrowDownBold" title="下移" @click="handleSortDown(scope.row.id,scope.$index)"></el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+		<!-- 添加或修改设备检查项对话框 -->
+		<el-dialog :title="title" :lock-scroll="false" v-model="open">
+			<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+				<el-row :gutter="20">
+					<el-col :lg="12">
+						<el-form-item label="检查项名称" prop="name">
+							<el-input v-model="form.name" placeholder="请输入检查项名称" />
+						</el-form-item>
+					</el-col>
+					<el-col :lg="24">
+						<el-form-item label="图片" prop="image">
+							<UploadImage v-model="form.image" :data="{ uploadType: 1 }" />
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="12">
+						<el-form-item label="检查顺序" prop="sort">
+							<el-input v-model.number="form.sort" placeholder="请输入检查顺序" />
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="12">
+						<el-form-item label="检查项类型" prop="type">
+							<el-select v-model="form.type" placeholder="请选择检查项类型">
+								<el-option v-for="item in options.typeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :lg="24">
+						<el-form-item label="描述" prop="descride">
+							<el-input type="textarea" :minlength="2" v-model="form.descride" placeholder="请输入描述" />
+						</el-form-item>
+					</el-col>
+					<el-col :lg="24">
+						<el-form-item label="备注" prop="remark">
+							<el-input type="textarea" :minlength="2" v-model="form.remark" placeholder="请输入备注" />
+						</el-form-item>
+					</el-col>
+
+				</el-row>
+			</el-form>
+			<template #footer v-if="opertype != 3">
+				<el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+				<el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+			</template>
+		</el-dialog>
+		<!-- <TheChouseDeviceInspect v-model="TheChouseDeviceInspectShow" :actionDialogId="actionDialogId" @refresh="getList()"></TheChouseDeviceInspect> -->
+	</div>
+</template>
+
+<script setup name="TheDeviceInspectTable">
+	// import { default as TheChouseDeviceInspect } from './TheChouseDeviceInspect'
+	// import { listDeviceInspect2, removeBind,sortDeviceInspect } from '@/api/deviceManagement/deviceinspect'
+	const { proxy } = getCurrentInstance()
+	const props = defineProps({
+		actionDialogId: {
+			type: Number
+		}
+	})
+	watch(() => props.actionDialogId, (newValue, oldValue) => {
+		getList();
+	});
+	const ids = ref([])
+	const loading = ref(false)
+	const showSearch = ref(true)
+	const queryParams = reactive({
+		pageNum: 1,
+		pageSize: 10,
+		name: '',
+		Isbind: 1,
+		fkAccountId: -1
+	})
+	const columns = ref([
+		{ visible: true, prop: 'name', label: '名称' },
+		{ visible: true, prop: 'image', label: '图片' },
+		{ visible: true, prop: 'descride', label: '描述' },
+		{ visible: true, prop: 'remark', label: '备注' },
+		{ visible: true, prop: 'sort', label: '顺序' },
+		{ visible: false, prop: 'createdBy', label: '创建人' },
+		{ visible: false, prop: 'createdTime', label: '创建时间' },
+		{ visible: false, prop: 'updatedBy', label: '更新人' },
+		{ visible: false, prop: 'updatedTime', label: '更新时间' }
+	])
+	const total = ref(0)
+	const dataList = ref([])
+	const queryRef = ref()
+	const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+	var dictParams = []
+
+	function getList() {
+		loading.value = true
+		queryParams.fkAccountId = props.actionDialogId;
+		listDeviceInspect2(queryParams).then((res) => {
+			const { code, data } = res
+			if (code == 200) {
+				dataList.value = data.result
+				total.value = data.totalNum
+				loading.value = false
+			}
+		})
+	}
+	// 查询
+	function handleQuery() {
+		queryParams.pageNum = 1
+		getList()
+	}
+
+	// 重置查询操作
+	function resetQuery() {
+		proxy.resetForm('queryRef')
+		handleQuery()
+	}
+	// 取消绑定按钮
+	function handleRemoveBind(inspect_id) {
+
+		const data = {
+			account_id: props.actionDialogId,
+			inspect_id
+		}
+		proxy
+			.$confirm('是否确认取消关联？')
+			.then(function () {
+				return removeBind(data)
+			})
+			.then(() => {
+				getList()
+				proxy.$modal.msgSuccess('取消成功！')
+			})
+			.catch(() => {
+
+			})
+	}
+
+	/*************** form操作 ***************/
+	const formRef = ref()
+	const title = ref('')
+	// 操作类型 1、add 2、edit 3、view
+	const opertype = ref(0)
+	const open = ref(false)
+	const state = reactive({
+		single: true,
+		multiple: true,
+		form: {},
+		rules: {
+			name: [{ required: true, message: "检查项名称不能为空", trigger: "change" }],
+			image: [{ required: true, message: "检查图片不能为空", trigger: "change" }],
+		},
+		options: {
+			// 检查项类别 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+			typeOptions: [
+				{ dictLabel: '文本', dictValue: 1, listClass: 'success' },
+				{ dictLabel: '多选', dictValue: 2, listClass: 'warning' },
+				{ dictLabel: '文件', dictValue: 3, listClass: 'info' },
+			],
+			// 检查项状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+			statusOptions: []
+		}
+	})
+
+	const { form, rules, options, single, multiple } = toRefs(state)
+
+	// 关闭dialog
+	function cancel() {
+		open.value = false
+		reset()
+	}
+
+	// 重置表单
+	function reset() {
+		form.value = {
+			id: null,
+			fkDeviceId: null,
+			image: null,
+			sort: null,
+			type: null,
+			remark: null,
+			status: null,
+			descride: null,
+			name: null,
+			createdBy: null,
+			createdTime: null,
+			updatedBy: null,
+			updatedTime: null
+		}
+		proxy.resetForm('formRef')
+	}
+	// 添加按钮操作
+	function handleAdd() {
+		reset()
+		open.value = true
+		title.value = '添加设备检查项'
+		opertype.value = 1
+	}
+
+	const TheChouseDeviceInspectShow = ref(false)
+	// 选择已有记录
+	// function handleAdd() {
+	// 	TheChouseDeviceInspectShow.value = true;
+	// }
+
+	// 修改按钮操作
+	function handleUpdate(row) {
+		reset()
+		const id = row.id || ids.value
+		getDeviceInspect(id).then((res) => {
+			const { code, data } = res
+			if (code == 200) {
+				open.value = true
+				title.value = '修改设备检查项'
+				opertype.value = 2
+
+				form.value = {
+					...data
+				}
+			}
+		})
+	}
+
+	// 添加&修改 表单提交
+	function submitForm() {
+		proxy.$refs['formRef'].validate((valid) => {
+			if (valid) {
+				if (form.value.id != undefined && opertype.value === 2) {
+					updateDeviceInspect(form.value).then((res) => {
+						proxy.$modal.msgSuccess('修改成功')
+						open.value = false
+						getList()
+					})
+				} else {
+					addDeviceInspect(form.value).then((res) => {
+						proxy.$modal.msgSuccess('新增成功')
+						open.value = false
+						getList()
+					})
+				}
+			}
+		})
+	}
+
+	/*************** 检查项排序 ***************/
+
+	function handleSortUp(id, index) {
+		let newList = [];
+		const lastSort = index + 1;
+		if (lastSort === 1) {
+			proxy.$modal.msgWarning('已是第一个!')
+			return;
+		}
+		const list = dataList.value.map((item, index) => {
+			return {
+				fkInspectId: item.id,
+				fkAccountId: props.actionDialogId,
+				sort: index + 1
+			}
+		});
+		// 执行交换排序
+		let upSort = list[index - 1].sort;
+		list[index - 1].sort = list[index].sort;
+		list[index].sort = upSort;
+		sortDeviceInspect(list).then(()=>{
+			getList()
+		})
+		
+	}
+
+	function handleSortDown(id, index) {
+		const lastSort = index + 1;
+		const lastList = dataList.value;
+		if (lastSort === lastList.length) {
+			proxy.$modal.msgWarning('已是最后一个!')
+			return;
+		}
+		const list = dataList.value.map((item, index) => {
+			return {
+				fkInspectId: item.id,
+				fkAccountId: props.actionDialogId,
+				sort: index + 1
+			}
+		});
+		// 执行交换排序
+		let upSort = list[index + 1].sort;
+		list[index + 1].sort = list[index].sort;
+		list[index].sort = upSort;
+		sortDeviceInspect(list).then(()=>{
+			getList()
+		})
+	}
+
+	function handleChangeSort() {}
+	handleQuery()
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/deviceRepair/index.vue b/src/views/deviceManagement/deviceRepair/index.vue
new file mode 100644
index 0000000..0e04c24
--- /dev/null
+++ b/src/views/deviceManagement/deviceRepair/index.vue
@@ -0,0 +1,460 @@
+<!--
+ * @Descripttion: (报修单/device_repair)
+ * @Author: (admin)
+ * @Date: (2024-05-28)
+-->
+<template>
+    <div>
+        <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+            <el-form-item label="维修单号" prop="repairOrder">
+                <el-input v-model.trim="queryParams.repairOrder" placeholder="请输入维修单号" clearable />
+            </el-form-item>
+            <el-form-item label="设备" prop="fkDeviceId">
+                <BaseDeviceAccountTreeSelect v-model="queryParams.fkDeviceId"></BaseDeviceAccountTreeSelect>
+            </el-form-item>
+            <el-form-item label="报修人" prop="repairPeron">
+                <el-input v-model.trim="queryParams.repairPeron" placeholder="请输入报修人" clearable />
+            </el-form-item>
+            <el-form-item label="手机号" prop="phone">
+                <el-input v-model.trim="queryParams.phone" placeholder="请输入联系手机号" />
+            </el-form-item>
+            <el-form-item label="报修时间" prop="timeRange">
+                <el-date-picker
+                    v-model="queryParams.timeRange"
+                    type="daterange"
+                    :clearable="false"
+                    unlink-panels
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    :shortcuts="shortcuts"
+                />
+            </el-form-item>
+            <el-form-item label="报修类型" prop="type">
+                <el-select style="width: 196px" v-model="queryParams.type" placeholder="全部" @change="handleQuery">
+                    <el-option label="全部" :value="''"></el-option>
+                    <el-option v-for="item in options.typeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+                <el-radio-group v-model="queryParams.status" @change="handleQuery">
+                    <el-radio-button :value="-1">全部</el-radio-button>
+                    <el-radio-button v-for="item in options.statusOptions" :key="item.dictValue" :value="parseInt(item.dictValue)">
+                        {{ item.dictLabel }}
+                    </el-radio-button>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label=" ">
+                <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+                <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+            </el-form-item>
+        </el-form>
+        <!-- 工具区域 -->
+        <el-row :gutter="15" class="mb10">
+            <el-col :span="1.5">
+                <el-button type="primary" v-hasPermi="['deviceManagement:devicerepair:add']" plain icon="el-icon-plus" @click="handleAdd">
+                    {{ $t('btn.add') }}
+                </el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell" highlight-current-row @sort-change="sortChange">
+            <el-table-column prop="id" label="数据库主键" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('id')" />
+            <el-table-column prop="repairOrder" label="维修单号" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('repairOrder')" width="180" />
+            <el-table-column prop="fkDeviceId" label="设备" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('fkDeviceId')" width="300">
+                <template slot-scope="scope">
+                    {{ scope.row.deviceName + ' ' + scope.row.deviceCode }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="type" label="报修类型" align="center" v-if="columns_showColumn('type')">
+                <template slot-scope="scope">
+                    <dict-tag :options="options.typeOptions" :value="scope.row.type" />
+                </template>
+            </el-table-column>
+            <el-table-column prop="repairPeron" label="报修人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('repairPeron')" />
+            <el-table-column prop="phone" label="手机号" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('phone')" />
+            <el-table-column prop="faultDescription" label="故障描述" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('faultDescription')" />
+            <el-table-column prop="file" label="拍照描述" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('file')">
+                <template slot-scope="scope">
+                    <ImagePreview :src="scope.row.file"></ImagePreview>
+                </template>
+            </el-table-column>
+            <el-table-column prop="status" label="状态" align="center" v-if="columns_showColumn('status')">
+                <template slot-scope="scope">
+                    <dict-tag :options="options.statusOptions" :value="scope.row.status" />
+                </template>
+            </el-table-column>
+            <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('createdBy')" />
+            <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns_showColumn('createdTime')" />
+            <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('updatedBy')" />
+            <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns_showColumn('updatedTime')" />
+            <!-- 			<el-table-column label="维修操作" width="100" fixed="right">
+				<template slot-scope="scope">
+					<el-button type="info" size="small" icon="el-icon-edit-pen" @click="handleMaintenance(scope.row)">维修</el-button>
+				</template>
+			</el-table-column> -->
+            <el-table-column label="工单信息操作" width="160" fixed="right">
+                <template slot-scope="scope">
+                    <el-button type="success" size="small" icon="el-icon-edit" title="编辑" v-hasPermi="['deviceManagement:devicerepair:edit']" @click="handleUpdate(scope.row)"></el-button>
+                    <el-button type="danger" size="small" icon="el-icon-delete" title="删除" v-hasPermi="['deviceManagement:devicerepair:delete']" @click="handleDelete(scope.row)"></el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改报修单对话框 -->
+        <el-dialog :title="title" :lock-scroll="false" v-model="open">
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+                <el-row :gutter="20">
+                    <el-col :lg="12" v-if="opertype != 1">
+                        <el-form-item label="维修单号" prop="repairOrder">
+                            <el-input disabled v-model.trim="form.repairOrder" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="设备" prop="fkDeviceId">
+                            <BaseDeviceAccountTreeSelect v-model="form.fkDeviceId"></BaseDeviceAccountTreeSelect>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="报修类型" prop="type">
+                            <el-select v-model="form.type" placeholder="请选择报修类型">
+                                <el-option v-for="item in options.typeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label=" " prop="type">
+                            <el-text type="danger">{{ pourText }}</el-text>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :lg="12">
+                        <el-form-item label="报修人" prop="repairPeron">
+                            <el-input v-model.trim="form.repairPeron" placeholder="请输入报修人" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="手机号" prop="phone">
+                            <el-input v-model.trim="form.phone" placeholder="请输入联系手机号" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="24">
+                        <el-form-item label="故障描述" prop="faultDescription">
+                            <el-input type="textarea" :minlength="2" v-model.trim="form.faultDescription" placeholder="请输入故障描述" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="拍照描述" prop="file">
+                            <UploadImage v-model="form.file" :data="{ uploadType: 1, filePath: 'device/repair/file' }" :limit="1" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12" v-if="opertype != 1">
+                        <el-form-item label="状态" prop="status">
+                            <el-select v-model="form.status" placeholder="请选择工单状态">
+                                <el-option v-for="item in options.statusOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="创建人" prop="createdBy">
+                            <el-input v-model="form.createdBy"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :lg="12">
+                        <el-form-item label="创建时间" prop="createdBy">
+                            <el-input v-model="form.createdTime"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template slot="footer" v-if="opertype != 3">
+                <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { listDeviceRepair, addDeviceRepair, delDeviceRepair, updateDeviceRepair, getDeviceRepair } from '@/api/deviceManagement/devicerepair.js'
+import BaseDeviceAccountTreeSelect from '../components/BaseDeviceAccountTreeSelect'
+
+export default {
+    name: 'devicerepair',
+    components: {
+        BaseDeviceAccountTreeSelect
+    },
+    data() {
+        return {
+            ids: [],
+            loading: false,
+            showSearch: true,
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                status: 1,
+                timeRange: [],
+                type: '',
+                sort: '',
+                sortType: 'asc'
+            },
+            columns: [
+                { visible: false, prop: 'id', label: '雪花id' },
+                { visible: true, prop: 'repairOrder', label: '维修单号' },
+                { visible: true, prop: 'fkDeviceId', label: '设备id' },
+                { visible: true, prop: 'type', label: '报修类型' },
+                { visible: true, prop: 'repairPeron', label: '报修人' },
+                { visible: true, prop: 'phone', label: '手机号' },
+                { visible: true, prop: 'faultDescription', label: '故障描述' },
+                { visible: true, prop: 'file', label: '拍照描述' },
+                { visible: true, prop: 'status', label: '状态（启用，关闭 维修中）' },
+                { visible: false, prop: 'createdBy', label: '创建人' },
+                { visible: false, prop: 'createdTime', label: '创建时间' },
+                { visible: false, prop: 'updatedBy', label: '更新人' },
+                { visible: false, prop: 'updatedTime', label: '更新时间' }
+            ],
+            total: 0,
+            dataList: [],
+            queryRef: null,
+            dictParams: [],
+            formRef: null,
+            title: '',
+            opertype: 0,
+            open: false,
+            form: {
+                id: null,
+                repairOrder: null,
+                fkDeviceId: null,
+                type: null,
+                repairPeron: null,
+                phone: null,
+                faultDescription: null,
+                file: null,
+                status: 1,
+                createdBy: null,
+                createdTime: null,
+                updatedBy: null,
+                updatedTime: null
+            },
+            rules: {
+                id: [{ required: true, message: '雪花id不能为空', trigger: 'blur' }]
+            },
+            options: {
+                // 报修类型 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+                typeOptions: [],
+                // 状态（启用，停用 维修中） 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+                statusOptions: [
+                    { dictLabel: '未接单', dictValue: 0, listClass: 'danger' },
+                    { dictLabel: '维修中', dictValue: 1, listClass: 'info' },
+                    { dictLabel: '已完成', dictValue: 2, listClass: 'success' }
+                ]
+            },
+            pourText: '',
+            shortcuts: [
+                {
+                    text: '前一周',
+                    value: () => {
+                        const end = new Date()
+                        const start = new Date()
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+                        return [start, end]
+                    }
+                },
+                {
+                    text: '前一月',
+                    value: () => {
+                        const end = new Date()
+                        const start = new Date()
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+                        return [start, end]
+                    }
+                },
+                {
+                    text: '前三月',
+                    value: () => {
+                        const end = new Date()
+                        const start = new Date()
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+                        return [start, end]
+                    }
+                }
+            ]
+        }
+    },
+    mounted() {
+        this.init()
+    },
+    methods: {
+        columns_showColumn(prop) {
+            return this.columns.some(column => column.prop === prop && column.visible)
+        },
+        init() {
+            this.handleQuery()
+            this.getDict()
+        },
+        getList() {
+            this.loading = true
+            listDeviceRepair(this.queryParams).then((res) => {
+                const { code, data } = res
+                if (code == 200) {
+                    this.dataList = data.result
+                    this.total = data.totalNum
+                    this.loading = false
+                }
+            })
+        },
+        // 查询
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        // 重置查询操作
+        resetQuery() {
+            this.resetForm('queryRef')
+            this.handleQuery()
+        },
+        // 自定义排序
+        sortChange(column) {
+            var sort = undefined
+            var sortType = undefined
+
+            if (column.prop != null && column.order != null) {
+                sort = column.prop
+                sortType = column.order
+            }
+            this.queryParams.sort = sort
+            this.queryParams.sortType = sortType
+            this.handleQuery()
+        },
+        getDict() {
+            this.getDicts('mes_device_fault_type').then((res) => {
+                const { code, data } = res
+                if (code == 200) {
+                    this.options.typeOptions = data
+                    // 更新pourText
+                    this.updatePourText()
+                }
+            })
+        },
+        updatePourText() {
+            if (this.form.type) {
+                for (let item of this.options.typeOptions) {
+                    if (this.form.type === item.dictValue) {
+                        this.pourText = item.remark
+                        return
+                    }
+                }
+            }
+            this.pourText = ''
+        },
+        // 关闭dialog
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 重置表单
+        reset() {
+            this.form = {
+                id: null,
+                repairOrder: null,
+                fkDeviceId: null,
+                type: null,
+                repairPeron: null,
+                phone: null,
+                faultDescription: null,
+                file: null,
+                status: 1,
+                createdBy: null,
+                createdTime: null,
+                updatedBy: null,
+                updatedTime: null
+            }
+            this.pourText = ''
+            this.resetForm('formRef')
+        },
+        // 添加按钮操作
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加报修单'
+            this.opertype = 1
+        },
+        // 修改按钮操作
+        handleUpdate(row) {
+            this.reset()
+            const id = row.id || this.ids
+            getDeviceRepair(id).then((res) => {
+                const { code, data } = res
+                if (code == 200) {
+                    this.open = true
+                    this.title = '修改报修单'
+                    this.opertype = 2
+                    data.fkDeviceId = data.fkDeviceId + ''
+                    this.form = {
+                        ...data
+                    }
+                    // 更新pourText
+                    this.updatePourText()
+                }
+            })
+        },
+        // 添加&修改 表单提交
+        submitForm() {
+            this.$refs['formRef'].validate((valid) => {
+                if (valid) {
+                    if (this.form.id != undefined && this.opertype === 2) {
+                        updateDeviceRepair(this.form).then((res) => {
+                            this.$modal.msgSuccess('修改成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    } else {
+                        addDeviceRepair(this.form).then((res) => {
+                            this.$modal.msgSuccess('新增成功')
+                            this.open = false
+                            this.getList()
+                        })
+                    }
+                }
+            })
+        },
+        // 删除按钮操作
+        handleDelete(row) {
+            const Ids = row.id || this.ids
+
+            this
+                .$confirm('是否确认删除数据项？')
+                .then(function () {
+                    return delDeviceRepair(Ids)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+        },
+        // 树选择
+        handleAccountTreeSelectCurrentChange(key, node) {
+            console.log(key, node)
+        },
+        // 工单维修====================
+        handleMaintenance(row) {
+            this.key2 = row.id
+            this.open2 = true
+        }
+    },
+    watch: {
+        'form.type': function() {
+            this.updatePourText()
+        }
+    }
+}
+</script>
diff --git a/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue b/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue
new file mode 100644
index 0000000..1efb65b
--- /dev/null
+++ b/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue
@@ -0,0 +1,463 @@
+<template>
+	<div>
+		<el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+			<el-form-item label="巡检名称" prop="name">
+				<el-input v-model="queryParams.name" placeholder="请输入巡检名称" clearable />
+			</el-form-item>
+
+			<el-form-item label="开始时间" prop="lifeCycleStart">
+				<el-date-picker v-model="queryParams.lifeCycleStart" type="datetime" placeholder="请输入开始时间" />
+			</el-form-item>
+
+			<el-form-item label="结束时间" prop="lifeCycleEnd">
+				<el-date-picker v-model="queryParams.lifeCycleEnd" type="datetime" placeholder="请输入结束时间" />
+			</el-form-item>
+			<el-form-item label="类别" prop="innerType">
+				<el-radio-group v-model="queryParams.innerType" @change="handleQuery">
+					<el-radio-button label="全部" :value="-1" />
+					<el-radio-button label="检查" :value="1" />
+					<el-radio-button label="保养" :value="2" />
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item label="巡检类型" prop="excuteCycleType">
+				<el-select v-model="queryParams.excuteCycleType" placeholder="请选择巡检类型" @change="handleQuery">
+					<el-option v-for="item in options.excuteCycleTypeOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="巡检状态" prop="status">
+				<el-radio-group v-model="queryParams.status" @change="handleQuery">
+					<el-radio-button label="全部" :value="-1" />
+					<el-radio-button label="停用" :value="0" />
+					<el-radio-button label="启用" :value="1" />
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item>
+				<el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+				<el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+			</el-form-item>
+		</el-form>
+		<!-- 工具区域 -->
+		<el-row :gutter="15" class="mb10">
+			<el-col :span="1.5">
+				<el-button type="primary" v-hasPermi="['deviceManagement:devicerouteinspectionplan:add']" plain icon="plus" @click="handleAdd">
+					{{ $t('btn.add') }}
+				</el-button>
+			</el-col>
+			<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+		</el-row>
+
+		<el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell" highlight-current-row @sort-change="sortChange">
+			<el-table-column prop="id" label="id" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('id')" />
+			<el-table-column prop="name" label="巡检名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('name')" />
+			<el-table-column prop="innerType" label="类别"  align="center" v-if="columns.showColumn('innerType')">
+				<template #default="scope">
+					<dict-tag :options="options.innerTypeOptions" :value="scope.row.innerType" />
+				</template>
+			</el-table-column>
+			<!-- <el-table-column prop="fkPersonId" label="执行人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('fkPersonId')" /> -->
+			<el-table-column label="添加设备" align="center">
+				<template #default="scope">
+					<el-button type="primary" size="small" icon="MessageBox" title="添加设备" @click="AddDevice(scope.row)"></el-button>
+				</template>
+			</el-table-column>
+			<el-table-column prop="excuteCycleType" label="执行周期类型" align="center" v-if="columns.showColumn('excuteCycleType')">
+				<template #default="scope">
+					<dict-tag :options="options.excuteCycleTypeOptions" :value="scope.row.excuteCycleType" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="dayNum" label="每第几天" align="center" v-if="columns.showColumn('dayNum')" />
+			<el-table-column prop="weekList" label="每周几" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('weekList')">
+				<template #default="scope">
+					<el-tag size="small" v-for="(item, index) in scope.row.weekList" :key="index" effect="dark" round> {{ item }}</el-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="monthDayList" label="每月几" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('monthDayList')" />
+			<el-table-column prop="lifeCycleStart" label="开始时间" :show-overflow-tooltip="true" v-if="columns.showColumn('lifeCycleStart')" />
+			<el-table-column prop="lifeCycleEnd" label="结束时间" :show-overflow-tooltip="true" v-if="columns.showColumn('lifeCycleEnd')" />
+
+			<!-- <el-table-column
+        prop="excuteDayStartTime"
+        label="执行开始时间"
+        :show-overflow-tooltip="true"
+        v-if="columns.showColumn('excuteDayStartTime')" />
+      <el-table-column prop="excuteDayEndTime" label="执行结束时间" :show-overflow-tooltip="true" v-if="columns.showColumn('excuteDayEndTime')" /> -->
+			<el-table-column prop="status" label="巡检状态" align="center" v-if="columns.showColumn('status')">
+				<template #default="scope">
+					<dict-tag :options="options.statusOptions" :value="scope.row.status" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+
+			<el-table-column label="操作" width="160">
+				<template #default="scope">
+					<el-button type="success" size="small" icon="edit" title="编辑" v-hasPermi="['deviceManagement:devicerouteinspectionplan:edit']" @click="handleUpdate(scope.row)"></el-button>
+					<el-button type="danger" size="small" icon="delete" title="删除" v-hasPermi="['deviceManagement:devicerouteinspectionplan:delete']" @click="handleDelete(scope.row)"></el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+		<!-- 添加或修改巡检计划对话框 -->
+		<el-dialog :title="title" :lock-scroll="false" :close-on-click-modal="false" v-model="open">
+			<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+				<el-row :gutter="20">
+					<el-col :lg="12">
+						<el-form-item label="巡检名称" prop="name">
+							<el-input v-model="form.name" placeholder="请输入巡检名称" />
+						</el-form-item>
+					</el-col>
+					<el-col :lg="12">
+						<el-form-item label="类别" prop="innerType">
+							<el-radio-group v-model="form.innerType">
+								<el-radio v-for="item in options.innerTypeOptions" :key="item.dictValue" :value="parseInt(item.dictValue)" :label="item.dictLabel">
+								</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="12">
+						<el-form-item label="执行人" prop="fkPersonId">
+							<el-input v-model="form.fkPersonId" placeholder="请输入执行人" />
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="12">
+						<el-form-item label="生命周期开始" prop="lifeCycleStart">
+							<el-date-picker v-model="form.lifeCycleStart" type="datetime" :teleported="false" placeholder="选择日期时间"></el-date-picker>
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="12">
+						<el-form-item label="生命周期结束" prop="lifeCycleEnd">
+							<el-date-picker v-model="form.lifeCycleEnd" type="datetime" :teleported="false" placeholder="选择日期时间"></el-date-picker>
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="24">
+						<el-form-item label="执行周期类型" prop="excuteCycleType">
+							<el-select v-model="form.excuteCycleType" placeholder="请选择执行周期类型">
+								<el-option v-for="item in options.excuteCycleTypeOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="24" v-show="form.excuteCycleType == 1">
+						<el-form-item label="每第几天" prop="dayNum">
+							<el-input-number v-model="form.dayNum" :min="1" :max="365" />
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="24" v-show="form.excuteCycleType == 2">
+						<el-form-item label="每周几" prop="weekList">
+							<el-select v-model="form.weekList" multiple placeholder="请选择">
+								<el-option v-for="item in options.weekList_options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="24" v-show="form.excuteCycleType == 3">
+						<el-form-item label="每月几" prop="monthDayList">
+							<el-input-number v-model="form.monthDayList" :min="1" :max="32" />
+						</el-form-item>
+					</el-col>
+
+					<el-col :lg="12">
+						<el-form-item label="巡检状态" prop="status">
+							<el-radio-group v-model="form.status">
+								<el-radio v-for="item in options.statusOptions" :key="item.dictValue" :value="parseInt(item.dictValue)">
+									{{ item.dictLabel }}
+								</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+					<el-col :lg="12">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="form.remark" placeholder="请输入备注" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer v-if="opertype != 3">
+				<el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+				<el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+			</template>
+		</el-dialog>
+
+		<el-dialog title="添加设备" :lock-scroll="false" v-model="open_device">
+			<Devicelist :message="messageFromParent"></Devicelist>
+			<template #footer>
+				<el-button text @click="open_device = false">{{ $t('btn.cancel') }}</el-button>
+				<el-button type="primary" @click="open_device = false">{{ $t('btn.submit') }}</el-button>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup name="devicerouteinspectionplan">
+	import {
+		listDeviceRouteInspectionPlan,
+		addDeviceRouteInspectionPlan,
+		delDeviceRouteInspectionPlan,
+		updateDeviceRouteInspectionPlan,
+		getDeviceRouteInspectionPlan
+	} from '@/api/deviceManagement/devicerouteinspectionplan.js'
+
+	import { default as Devicelist } from '@/views/deviceManagement/components/devicelist_route/index.vue'
+	const { proxy } = getCurrentInstance()
+	const ids = ref([])
+	const loading = ref(false)
+	const showSearch = ref(true)
+	const queryParams = reactive({
+		name: '',
+		lifeCycleStart: null,
+		lifeCycleEnd: null,
+		excuteCycleType:0,
+		type: 0,
+		innerType: -1,
+		status: -1,
+		pageNum: 1,
+		pageSize: 10,
+		sort: 'createdTime',
+		sortType: 'desc'
+	})
+	const columns = ref([
+		{ visible: false, prop: 'id', label: 'id(雪花)' },
+		{ visible: true, prop: 'name', label: '巡检名称' },
+		{ visible: true, prop: 'fkPersonId', label: '执行人' },
+		{ visible: true, prop: 'status', label: '巡检状态' },
+		{ visible: true, prop: 'innerType', label: '类别' },
+		{ visible: true, prop: 'lifeCycleStart', label: '生命周期开始' },
+		{ visible: true, prop: 'lifeCycleEnd', label: '生命周期结束' },
+		{ visible: true, prop: 'excuteCycleType', label: '执行周期类型' },
+		{ visible: true, prop: 'dayNum', label: '每第几天' },
+		{ visible: true, prop: 'weekList', label: '每周几' },
+		{ visible: true, prop: 'monthDayList', label: '每月几' },
+		{ visible: true, prop: 'excuteDayStartTime', label: '执行开始时间' },
+		{ visible: true, prop: 'excuteDayEndTime', label: '执行结束时间' },
+		{ visible: true, prop: 'remark', label: '备注' }
+	])
+	const total = ref(0)
+	const dataList = ref([])
+	const queryRef = ref()
+	const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+
+	var dictParams = []
+
+	function getList() {
+		loading.value = true
+		listDeviceRouteInspectionPlan(queryParams).then((res) => {
+			const { code, data } = res
+			if (code == 200) {
+				data.result.forEach((e) => {
+					if (e.weekList != '' && e.weekList != null) {
+						e.weekList = e.weekList.split(',').map((it) => parseInt(it))
+					} else {
+						e.weekList = null
+					}
+
+					data.monthDayList = parseInt(data.monthDayList)
+				})
+				dataList.value = data.result
+
+				total.value = data.totalNum
+				loading.value = false
+			}
+		})
+	}
+
+	// 查询
+	function handleQuery() {
+		queryParams.pageNum = 1
+		getList()
+	}
+
+	// 重置查询操作
+	function resetQuery() {
+		proxy.resetForm('queryRef')
+		handleQuery()
+	}
+	// 自定义排序
+	function sortChange(column) {
+		var sort = undefined
+		var sortType = undefined
+
+		if (column.prop != null && column.order != null) {
+			sort = column.prop
+			sortType = column.order
+		}
+		queryParams.sort = sort
+		queryParams.sortType = sortType
+		handleQuery()
+	}
+
+	/*************** form操作 ***************/
+	const formRef = ref()
+	const title = ref('')
+	// 操作类型 1、add 2、edit 3、view
+	const opertype = ref(0)
+	const open = ref(false)
+	const open_device = ref(false)
+	const state = reactive({
+		single: true,
+		multiple: true,
+		form: {
+			status: 1,
+			innerType: 1,
+			excuteCycleType: 0,
+			dayNum: 1,
+			weekList: [],
+			monthDayList: 1
+		},
+		rules: {
+			// id: [{ required: true, message: "id(雪花)不能为空", trigger: "blur" }],
+		},
+		options: {
+			// 巡检状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+			statusOptions: [
+				{ dictLabel: '启用', dictValue: 1, listClass: 'success' },
+				{ dictLabel: '停用', dictValue: 0, listClass: 'danger' },
+
+			],
+			// 类型(内部) 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+			typeOptions: [],
+			// 执行周期类型（1 按天，2按周 3按月） 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+			excuteCycleTypeOptions: [
+				{ dictLabel: '按天', dictValue: 1, listClass: 'primary' },
+				{ dictLabel: '按周', dictValue: 2, listClass: 'warning' },
+				{ dictLabel: '按月', dictValue: 3, listClass: 'success' },
+				{ dictLabel: '全部', dictValue: 0 }
+			],
+			weekList_options: [
+				{ dictLabel: '周一', dictValue: 1 },
+				{ dictLabel: '周二', dictValue: 2 },
+				{ dictLabel: '周三', dictValue: 3 },
+				{ dictLabel: '周四', dictValue: 4 },
+				{ dictLabel: '周五', dictValue: 5 },
+				{ dictLabel: '周六', dictValue: 6 },
+				{ dictLabel: '周日', dictValue: 7 }
+			],
+			innerTypeOptions: [
+				{ dictLabel: '检查', dictValue: 1, listClass: 'primary' },
+				{ dictLabel: '保养', dictValue: 2, listClass: 'warning' }
+			]
+		}
+	})
+	const messageFromParent = ref('')
+	const { form, rules, options, single, multiple } = toRefs(state)
+
+	// 关闭dialog
+	function cancel() {
+		open.value = false
+		reset()
+	}
+
+	// 重置表单
+	function reset() {
+		form.value = {
+			id: null,
+			name: null,
+			fkPersonId: null,
+			innerType: 1,
+			status: 1,
+			type: null,
+			lifeCycleStart: null,
+			lifeCycleEnd: null,
+			excuteCycleType: 0,
+			dayNum: 1,
+			weekList: [],
+			monthDayList: 1,
+			excuteDayStartTime: null,
+			excuteDayEndTime: null,
+			remark: null,
+			createdBy: null,
+			createdTime: null,
+			updatedBy: null,
+			updatedTime: null
+		}
+		proxy.resetForm('formRef')
+	}
+	// 添加按钮操作
+	function handleAdd() {
+		reset()
+		open.value = true
+		title.value = '添加巡检计划'
+		opertype.value = 1
+	}
+
+	// 添加设备
+	function AddDevice(row) {
+		open_device.value = true
+		messageFromParent.value = row.id
+	}
+	// 修改按钮操作
+	function handleUpdate(row) {
+		reset()
+		const id = row.id || ids.value
+		getDeviceRouteInspectionPlan(id).then((res) => {
+			const { code, data } = res
+			if (code == 200) {
+				open.value = true
+				title.value = '修改巡检计划'
+				opertype.value = 2
+				if (data.weekList != '' && data.weekList != null) {
+					data.weekList = data.weekList.split(',').map((it) => parseInt(it))
+				} else {
+					data.weekList = null
+				}
+				data.monthDayList = parseInt(data.monthDayList)
+
+				form.value = {
+					...data
+				}
+			}
+		})
+	}
+
+	// 添加&修改 表单提交
+	function submitForm() {
+		proxy.$refs['formRef'].validate((valid) => {
+			if (valid) {
+				debugger
+				if (form.value.weekList != null && form.value.weekList != '') {
+					console.log(form.value.weekList != null)
+					console.log(form.value.weekList != '')
+					form.value.weekList = form.value.weekList.join(',')
+				} else {
+					form.value.weekList = ''
+				}
+
+				if (form.value.id != undefined && opertype.value === 2) {
+					updateDeviceRouteInspectionPlan(form.value).then((res) => {
+						proxy.$modal.msgSuccess('修改成功')
+						open.value = false
+						getList()
+					})
+				} else {
+					addDeviceRouteInspectionPlan(form.value).then((res) => {
+						proxy.$modal.msgSuccess('新增成功')
+						open.value = false
+						getList()
+					})
+				}
+			}
+		})
+	}
+
+	// 删除按钮操作
+	function handleDelete(row) {
+		const Ids = row.id || ids.value
+
+		proxy
+			.$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+			.then(function () {
+				return delDeviceRouteInspectionPlan(Ids)
+			})
+			.then(() => {
+				getList()
+				proxy.$modal.msgSuccess('删除成功')
+			})
+	}
+
+	handleQuery()
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/deviceStatusBoard/index.vue b/src/views/deviceManagement/deviceStatusBoard/index.vue
new file mode 100644
index 0000000..2a08c3b
--- /dev/null
+++ b/src/views/deviceManagement/deviceStatusBoard/index.vue
@@ -0,0 +1,304 @@
+<template>
+	<div class="box">
+		<div class="data-status-board-header">
+			<el-card shadow="always">
+				<el-row :gutter="20">
+					<el-col :span="6">
+						<el-form-item label="设备类型" prop="fkDeviceType">
+							<TypeTreeSelect v-model="queryParams.devicetype_id" @change="handleQuery"></TypeTreeSelect>
+						</el-form-item>
+					</el-col>
+					<el-col :span="18">
+						<div class="right-tool-box">
+							<el-button icon="Refresh" circle @click="handleQuery" />
+							<div class="right-flex">
+								<el-tag class="tag-show-box" v-for="(item,index) in options.statusOptions" :key="index" :type="item.listClass" size="large" effect="dark">
+									<span style="font-weight: 600;">{{ item.dictLabel }}</span>
+									<span> : </span>
+									<span v-if="item.dictValue === 1">{{allTotal}}</span>
+									<span v-if="item.dictValue === 2">{{normalTotal}}</span>
+									<span v-if="item.dictValue === 3">{{unmaintainedTotal}}</span>
+									<span v-if="item.dictValue === 4">{{damageTotal}}</span>
+									<span v-if="item.dictValue === 5">{{noUseTotal}}</span>
+								</el-tag>
+							</div>
+						</div>
+
+					</el-col>
+				</el-row>
+			</el-card>
+		</div>
+		<div v-loading="loading">
+			<el-card style="margin-top: 10px;" v-for="(item,index) in dataList" :key="index">
+				<template #header>
+					<span class="card-title">车间:{{item.workshop}} </span>
+					<span class="card-title">产线:{{item.workline}} </span>
+					<span class="card-title">设备总数:{{item.total}} </span>
+				</template>
+
+				<div class="data-status-board-box">
+					<div v-for="(item2,index) in item.children" :key="index">
+						<el-card :class="chouseClass(item2.deviceStatus)">
+							<div class="data-status-card-header">
+								<span>{{item2.deviceName}}</span>
+								<span>{{item2.deviceCode}}</span>
+							</div>
+							<!-- <div class="data-status-card-body">
+								<span>{{item.workshop}}</span>
+								<span>{{item.workline}}</span>
+							</div> -->
+						</el-card>
+					</div>
+				</div>
+			</el-card>
+		</div>
+	</div>
+</template>
+
+<script setup name="devicestatusboard">
+	import { default as TypeTreeSelect } from '@/views/deviceManagement/components/BaseDeviceTypeTreeSelect'
+	import {
+		listDeviceAccount,
+		getDeviceAccount,
+		getDeviceStatusBoardData
+	}
+	from '@/api/deviceManagement/deviceaccount.js'
+	const { proxy } = getCurrentInstance()
+	const state = reactive({
+		form: {
+			status: 1,
+			deviceCode: '',
+		},
+		options: {
+			// 设备状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+			statusOptions: [
+				{ dictLabel: '设备总数', dictValue: 1, listClass: 'primary' },
+				{ dictLabel: '正常设备', dictValue: 2, listClass: 'success' },
+				{ dictLabel: '保养中', dictValue: 3, listClass: 'warning' },
+				{ dictLabel: '报修中', dictValue: 4, listClass: 'danger' },
+				{ dictLabel: '停用设备', dictValue: 5, listClass: 'info' },
+			],
+		}
+	})
+	const { form, options } = toRefs(state)
+	const dataList = ref([]);
+
+	const total = ref(0)
+	const queryParams = reactive({
+		devicetype_id: 1,
+	})
+	// 查询
+	function handleQuery() {
+		queryParams.pageNum = 1
+		getData()
+	}
+	const loading = ref(false)
+	const allTotal = ref(0)
+	const normalTotal = ref(0)
+	const unmaintainedTotal = ref(0)
+	const damageTotal = ref(0)
+	const noUseTotal = ref(0)
+	// {
+	// 	// 设备总数- 存在设备
+	// 	"allTotal": 100,
+	// 	// 正常设备 - 使用中 status = 1 type = 1
+	// 	"normalTotal": 80,
+	// 	// 有巡检点检未执行，没有维护 type = 2
+	// 	"unmaintainedTotal": 5,
+	// 	// 有报修未完成 type = 3
+	// 	"damageTotal": 5,
+	// 	// 停止使用的设备 status = 0 type = 0
+	// 	"noUseTotal": 0,
+	// 	// 数据渲染列表
+	// 	"list": [
+	// 	{
+	// 		workshop: '装配车间',
+	// 		workline: '一号线',
+	// 		total: 5,
+	// 		children: [
+	// 			{ id: 1, deviceName: '打螺钉防错设备', deviceCode: 'SY/LDFC-51', type: 1 },
+	// 			{ id: 2, deviceName: '打螺钉防错设备', deviceCode: 'SY/LDFC-51', type: 2 },
+	// 			{ id: 3, deviceName: '打螺钉防错设备', deviceCode: 'SY/LDFC-51', type: 3 },
+	// 			{ id: 4, deviceName: '打螺钉防错设备', deviceCode: 'SY/LDFC-51', type: 3 },
+	// 			{ id: 5, deviceName: '打螺钉防错设备', deviceCode: 'SY/LDFC-51', type: 0 },
+	// 		]
+	// 	},
+	// 	{
+	// 		workshop: '装配车间',
+	// 		workline: '二号线',
+	// 		total: 3,
+	// 		children: [
+	// 			{ id: 6, deviceName: '打螺钉防错设备', deviceCode: 'SY/LDFC-51', status: 1 },
+	// 			{ id: 7, deviceName: '打螺钉防错设备', deviceCode: 'SY/LDFC-51', status: 1 },
+	// 			{ id: 8, deviceName: '打螺钉防错设备', deviceCode: 'SY/LDFC-51', status: 1 },
+	// 		]
+	// 	}, ]
+	// }
+	function getData() {
+		loading.value = true
+		getDeviceStatusBoardData(queryParams).then(res => {
+			const { code, data } = res
+			console.log(data);
+			if (code == 200) {
+				allTotal.value = data.allTotal;
+				normalTotal.value = data.normalTotal;
+				unmaintainedTotal.value = data.unmaintainedTotal;
+				damageTotal.value = data.damageTotal;
+				noUseTotal.value = data.noUseTotal;
+				dataList.value = data.lineDetailList;
+				loading.value = false
+			}
+		})
+		// listDeviceAccount(queryParams).then(res => {
+		// 	const { code, data } = res
+		// 	if (code == 200) {
+		// 		dataList.value = data.result
+		// 		total.value = data.totalNum
+		// 		loading.value = false
+		// 	}
+		// })
+		// getAllList();
+	}
+	const dataAllList = ref([]);
+
+	function getAllList() {
+		const allData = {
+			pageNum: 1,
+			pageSize: 1000,
+			fkDeviceType: 0,
+		}
+		listDeviceAccount(allData).then(res => {
+			const { code, data } = res
+			if (code == 200) {
+				dataAllList.value = data.result
+			}
+		})
+	}
+	// 统计总数
+	// const statusSuccessTotal = computed(() => {
+	// 	return dataAllList.value.filter(item => item.status === 1).length
+	// })
+	// const statusWarningTotal = computed(() => {
+	// 	return dataAllList.value.filter(item => item.status === 2).length
+	// })
+	// const statusDangerTotal = computed(() => {
+	// 	return dataAllList.value.filter(item => item.status === 3).length
+	// })
+	// const statusInfoTotal = computed(() => {
+	// 	return dataAllList.value.filter(item => item.status === 4).length
+	// })
+
+	function chouseClass(state) {
+		let className = 'data-status-board-card-1 ';
+		switch (state) {
+		case 1:
+			className += 'background-color-green';
+			break;
+		case 2:
+			className += 'background-color-orange';
+			break;
+		case 3:
+			className += 'background-color-red';
+			break;
+		case 4:
+			className += 'background-color-gary';
+			break;
+		default:
+			break;
+		}
+		return className;
+	}
+
+
+
+
+	onMounted(() => {
+		handleQuery();
+	})
+</script>
+
+<style lang="scss" scoped>
+	.border {
+		border: 1px solid #ffffff;
+	}
+
+	.background-color-green {
+		background-color: #67C23A;
+	}
+
+	.background-color-orange {
+		background-color: #E6A23C;
+	}
+
+	.background-color-red {
+		background-color: #F56C6C;
+	}
+
+	.background-color-gary {
+		background-color: #909399;
+	}
+
+	.data-status-board-box {
+		// background-color: #00007f;
+		// display: grid;
+		// grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+		// grid-template-columns: repeat(3,1fr);
+		// grid-template-columns: repeat(6, 1fr);
+		// grid-auto-rows: minmax(180px, auto);
+		// grid-auto-flow: row dense;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+	}
+
+	.data-status-board-card-1 {
+		// margin: 10px;
+		margin: 5px;
+
+		width: 160px;
+		height: 100px;
+	}
+
+	.card-title {
+		font-size: 18px;
+		font-weight: 600;
+		margin-right: 20px;
+	}
+
+	.data-status-card-header {
+		color: white;
+		font-weight: 600;
+		font-size: 14px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.data-status-card-body {
+		color: white;
+		font-weight: 600;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-around;
+		font-size: 12px;
+	}
+
+	.tag-show-box {
+		margin-right: 10px;
+	}
+
+	.right-tool-box {
+		display: flex;
+		flex-direction: row;
+		// justify-content: space-around;
+	}
+
+	.right-flex {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-end;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDeviceItemStep.vue b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDeviceItemStep.vue
new file mode 100644
index 0000000..3422159
--- /dev/null
+++ b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDeviceItemStep.vue
@@ -0,0 +1,416 @@
+<template>
+  <div>
+    <el-form v-if="deviceItem" class="form-box" :model="deviceItem" label-width="100px">
+      <el-row :gutter="20">
+        <el-col :span="10" :xs="6">
+          <el-form-item label="设备所属">
+            <el-input type="input" v-model="deviceItem.workshop" readonly />
+          </el-form-item>
+          <el-form-item label="设备产线">
+            <el-input type="input" v-model="deviceItem.workline" readonly />
+          </el-form-item>
+          <el-form-item label="设备名称">
+            <el-input type="input" v-model="deviceItem.deviceName" readonly />
+          </el-form-item>
+          <el-form-item label="设备编号">
+            <el-input type="input" v-model="deviceItem.deviceCode" readonly />
+          </el-form-item>
+        </el-col>
+        <el-col :span="14" :xs="6">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="设备图片">
+                <ImagePreview style="width: 150px; height: 150px" :src="deviceItem.deviceImage"></ImagePreview>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="设备认证">
+                <el-button type="warning" :disabled="IsIdentification" @click="handlerIdentification">扫码解锁</el-button>
+                <el-button type="danger" @click="IsIdentification = true"
+                  v-hasPermi="['deviceManagement:saoma:no']">权限解锁</el-button>
+              </el-form-item>
+              <el-form-item label="认证结果">
+                <el-tag v-if="IsIdentification" type="success" effect="dark"> 已认证 </el-tag>
+                <el-tag v-else type="danger" effect="dark"> 未认证 </el-tag>
+              </el-form-item>
+              <el-form-item label=" ">
+                <el-text type="danger" style="font-weight: 700" size="large">需要扫码认证后才可修改点检结果</el-text>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-card>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-steps :active="inspectStepsActive" direction="vertical" finish-status="success">
+            <el-step v-for="(item, index) in inspectStepsList" :title="item.name" :key="index" />
+          </el-steps>
+        </el-col>
+        <el-col :span="18">
+          <el-form v-if="deviceItem" class="form-box" ref="formRef" :model="inspectStepData" label-width="100px">
+            <el-row :gutter="20">
+              <el-col :span="12" :xs="12" v-if="inspectStepData && inspectStepData.image">
+                <el-form-item label="检查项图片">
+                  <ImagePreview :src="inspectStepData.image"></ImagePreview>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" :xs="12" v-if="inspectStepData">
+                <el-form-item label="检查项描述">
+                  <el-input type="textarea" v-model="inspectStepData.descride" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" :xs="12" v-if="inspectStepData">
+                <el-form-item label="检查项备注">
+                  <el-input type="textarea" v-model="inspectStepData.remark" disabled />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" :xs="24" :key="index" v-for="(item, index) in formGenerateDataList">
+                <el-form-item :label="item.title">
+                  <el-radio-group :disabled="!IsIdentification" v-if="item.type === 1" v-model="item.value"
+                    @change="saveAchieveInspectbindForm($event, item.type, item.id)">
+                    <el-radio v-for="(item, index) in item.children" :key="index" :label="item" :value="item"
+                      border></el-radio>
+                  </el-radio-group>
+                  <el-checkbox-group :disabled="!IsIdentification" v-if="item.type === 2" multiple v-model="item.value"
+                    @change="saveAchieveInspectbindForm($event, item.type, item.id)">
+                    <el-checkbox v-for="(item, index) in item.children" :key="index" :label="item" :value="item"
+                      border></el-checkbox>
+                  </el-checkbox-group>
+                  <UploadImage :disabled="!IsIdentification" v-if="item.type === 3" v-model="item.value" drag
+                    :data="{ uploadType: 1, filePath: 'device/task/execute/img' }" :limit="1"
+                    @change="saveAchieveInspectbindForm($event, item.type, item.id, item.value)"></UploadImage>
+                  <el-input :disabled="!IsIdentification" v-if="item.type === 4" type="textarea" :maxlength="200"
+                    :show-word-limit="true" v-model="item.value" placeholder="请输入"
+                    @change="saveAchieveInspectbindForm($event, item.type, item.id)" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <div class="tool-box">
+            <el-button class="tool-item" size="large" icon="Close" @click="close" circle></el-button>
+            <el-button class="tool-item" size="large" type="success" icon="Check" @click="over" circle></el-button>
+            <el-button class="tool-item" size="large" type="info" icon="DArrowLeft" @click="doDeviceStepsBack"
+              circle></el-button>
+            <el-button class="tool-item" size="large" type="primary" icon="DArrowRight" @click="doDeviceStepsNext"
+              circle></el-button>
+          </div>
+        </el-col>
+      </el-row>
+      <template #footer>
+        <div class="dialog-footer-right">
+          <el-button v-if="inspectStepsActive > 0" type="info" @click="doDeviceStepsBack">上一项</el-button>
+          <el-button v-if="inspectStepsActive < inspectStepsList.length" type="primary"
+            @click="doDeviceStepsNext">下一项</el-button>
+        </div>
+      </template>
+    </el-card>
+    <!-- 添加或修改任务执行对话框 -->
+    <el-dialog title="扫码认证" :lock-scroll="false" v-model="IdentificationShow" :destroy-on-close="true">
+      <qr-stream @decode="getDeviceCode"></qr-stream>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import {
+  AchieveDevicebindInspect,
+  AchieveInspectbindForm,
+  getAchieveInspectbindFormResult,
+  setAchieveInspectbindFormResult,
+  updateTaskStatus,
+  setTaskEndTime
+} from '@/api/deviceManagement/devicetaskexecute.js'
+import { ref, watch } from 'vue'
+import { ElMessageBox } from 'element-plus'
+import { QrStream } from 'vue3-qr-reader'
+const emit = defineEmits()
+const props = defineProps({
+  // 设备信息
+  deviceItem: {
+    type: Object,
+    default: null
+  },
+  // 任务id
+  executeKey: {
+    type: String,
+    default: ''
+  },
+  fkPlanId: {
+    type: String,
+    default: ''
+  },
+  planType: {
+    type: [String, Number],
+    default: ''
+  },
+  innerType: {
+    type: [String, Number],
+    default: ''
+  }
+})
+const { proxy } = getCurrentInstance()
+watch(
+  () => props.deviceItem,
+  (newValue, oldValue) => {
+    if (newValue != null) {
+      init()
+      getStepsData()
+    } else {
+      inspectStepsList.value = []
+      formGenerateDataList.value = []
+      proxy.$message.success('无更多设备！请点击绿色完成按钮完成任务！')
+    }
+  }
+)
+
+function close() {
+  emit('doClose', false)
+}
+
+function over() {
+  proxy
+    .$confirm('是否确认此任务已完成?', '警告', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+    .then(async () => {
+      const data = {
+        id: props.executeKey,
+        status: 2
+      }
+      updateTaskStatus(data).then((res) => {
+        const { code, data } = res
+        if (code === 200) {
+          setTaskEndTime({ id: props.executeKey })
+          proxy.$message.success('已完成当前任务！1秒后关闭页面')
+          setTimeout(() => {
+            close()
+          }, 1000)
+        }
+      })
+    })
+    .catch(() => { })
+}
+
+function init() {
+  IsIdentification.value = false
+  inspectStepsActive.value = 0
+  inspectStepsList.value = []
+  formGenerateDataList.value = []
+}
+const inspectStepsList = ref([])
+const inspectStepsActive = ref(0)
+// 获取设备步进
+function getStepsData() {
+  if (props.deviceItem === null) {
+    proxy.$message.error('设备信息异常！')
+    return
+  }
+  // 获取设备绑定检查项
+  const id = props.deviceItem.id
+  const query = {
+    fk_account_id: props.deviceItem.id,
+    fkPlanId: props.fkPlanId,
+    planType: props.planType,
+    innerType: props.innerType
+  }
+  AchieveDevicebindInspect(query).then((res) => {
+    const { code, data } = res
+    if (code === 200) {
+      inspectStepsList.value = data
+    }
+  })
+}
+// 计算当前选择检查项
+const inspectStepData = computed(() => {
+  try {
+    return inspectStepsList.value[inspectStepsActive.value]
+  } catch (e) {
+    return null
+  }
+})
+
+// 设备Steps前进
+function doDeviceStepsNext() {
+  if (inspectStepsActive.value >= inspectStepsList.value.length) {
+    return
+  }
+  inspectStepsActive.value += 1
+}
+// 设备Steps后退
+function doDeviceStepsBack() {
+  if (inspectStepsActive.value <= 0) {
+    return
+  }
+  inspectStepsActive.value -= 1
+}
+
+// 根据检查项获取表单=====
+watch(
+  () => inspectStepData.value,
+  (newValue, oldValue) => {
+    getAchieveInspectbindForm()
+  }
+)
+// 根据检查项获取对应表单
+const formConfigList = ref([])
+const formGenerateDataList = ref([])
+
+function getAchieveInspectbindForm() {
+  if (inspectStepData.value === null) {
+    return
+  }
+  // 调用生成表单接口
+  resultAchieveInspectbindFormResult()
+}
+// 获取或生成表单数据
+function resultAchieveInspectbindFormResult() {
+  formGenerateDataList.value = []
+  if (inspectStepData.value === null || inspectStepData.value === undefined) {
+    return
+  }
+  const postData = {
+    planType: props.planType,
+    fkTaskId: props.executeKey,
+    fkPlanId: props.fkPlanId,
+    fkDeviceId: props.deviceItem.id,
+    fkInspectId: inspectStepData.value.id
+  }
+
+  // return;
+  getAchieveInspectbindFormResult(postData).then((res) => {
+    const { code, data } = res
+    if (code === 200) {
+      const list = data
+      let _list = []
+      for (let item of list) {
+        // 多选数组转换
+        if (item.type === 2) {
+          item.value = doStringToList(item.value)
+        }
+        _list.push(item)
+      }
+      formGenerateDataList.value = _list
+    }
+  })
+}
+
+// 数组字符串转换
+function doListToString(list) {
+  try {
+    return list.join(',')
+  } catch (e) {
+    return ''
+  }
+}
+
+function doStringToList(str) {
+  try {
+    if (str === '') {
+      return []
+    }
+    return str.trim().split(',')
+  } catch (e) {
+    return []
+  }
+}
+
+// 保存检查项
+function saveAchieveInspectbindForm(value, type, id, newImage) {
+  let saveData = {
+    id,
+    formName: value
+  }
+  if (type === 2) {
+    saveData.formName = doListToString(value)
+  }
+  if (type === 3) {
+    if (newImage === null || newImage === '' || newImage === undefined) {
+      return
+    }
+    saveData.formName = newImage
+  }
+  setAchieveInspectbindFormResult(saveData).then((res) => {
+    const { code, data, msg } = res
+    if (code === 200) {
+      proxy.$message.success('修改成功')
+    }
+  })
+}
+
+// 扫码解锁
+const IdentificationShow = ref(false)
+// 是否认证
+const IsIdentification = ref(false)
+
+function handlerIdentification() {
+  if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
+    // 浏览器支持getUserMedia
+    IdentificationShow.value = true
+  } else {
+    // 浏览器不支持getUserMedia
+    proxy.$message.error('当前浏览器不支持打开摄像头！请更换浏览器或设置摄像头权限！')
+  }
+}
+
+function getDeviceCode(code) {
+  console.log('getDeviceCode', code)
+  try {
+    if (code === proxy.deviceItem.deviceCode) {
+      proxy.$message.success('设备认证成功！')
+      IsIdentification.value = true
+      setTimeout(() => {
+        IdentificationShow.value = false
+      }, 500)
+    } else {
+      proxy.$message.warning('设备二维码与当前设备不符！')
+      IsIdentification.value = false
+    }
+  } catch (err) {
+    proxy.$message.error('设备认证失败！' + err)
+    IsIdentification.value = false
+  }
+}
+
+defineExpose({ init, getStepsData })
+</script>
+
+<style scoped>
+.dialog-footer-right {
+  /* width: 100%; */
+  margin-top: 20px;
+  text-align: right;
+}
+
+.form-box {
+  margin-top: 20px;
+}
+
+.check-form-box {
+  width: 100%;
+  min-height: 400px;
+  border: 1px solid;
+}
+
+.tool-box {
+  /* width: 100px;
+		height: 200px; */
+  /* padding: 10px; */
+  position: fixed;
+  right: 20px;
+  bottom: 35%;
+  /* border: 1px solid #000000; */
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.tool-item {
+  margin: 10px;
+}
+</style>
diff --git a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDialog.vue b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDialog.vue
new file mode 100644
index 0000000..cac2a81
--- /dev/null
+++ b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDialog.vue
@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <!-- 设备操作弹框 -->
+    <el-dialog v-bind="$attrs" @open="onOpen" @close="onClose" :close-on-click-modal="false" title="任务列表" width="95%" :fullscreen="true">
+      <el-row :gutter="20">
+        <el-col :span="2">
+          <el-steps direction="vertical" :active="deviceStepsActive" finish-status="success">
+            <el-step v-for="(item, index) in deviceStepsList" :title="`设备${index + 1}`" :key="index" />
+          </el-steps>
+        </el-col>
+        <el-col :span="22">
+          <TheTaskExecuteDeviceItemStep
+            v-loading="loading"
+            :taskId="executeKey"
+            :deviceItem="deviceStepData"
+            :fkPlanId="fkPlanId"
+            :planType="planType"
+            @doClose="close"></TheTaskExecuteDeviceItemStep>
+        </el-col>
+      </el-row>
+      <!-- <TheTaskExecuteTable :executeKey="executeKey"></TheTaskExecuteTable> -->
+      <template #footer>
+        <div class="dialog-footer-left">
+          <el-button v-if="deviceStepsActive > 0" type="info" @click="doDeviceStepsBack">上一个设备</el-button>
+          <el-button v-if="deviceStepsActive < deviceStepsList.length" type="primary" @click="doDeviceStepsNext">下一个设备</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { ElMessageBox } from 'element-plus'
+import { AchieveTaskbindDevice } from '@/api/deviceManagement/devicetaskexecute.js'
+import { default as TheTaskExecuteDeviceItemStep } from './TheTaskExecuteDeviceItemStep'
+// import { default as TheTaskExecuteTable } from './TheTaskExecuteTable' 暂不使用
+
+const emit = defineEmits()
+const props = defineProps({
+  executeKey: {
+    type: [Number, String],
+    default: -1
+  },
+  fkPlanId: {
+    type: [Number, String],
+    default: -1
+  },
+  planType: {
+    type: Number,
+    default: 1
+  }
+})
+const { proxy } = getCurrentInstance()
+// const form = reactive({})
+function init() {
+  deviceStepsActive.value = 0
+  deviceStepsList.value = []
+}
+
+function onOpen() {
+  init()
+  getDeviceStepsData()
+}
+
+function onClose() {}
+
+function close() {
+  emit('update:modelValue', false)
+}
+const deviceStepsList = ref([])
+const deviceStepsActive = ref(0)
+// 获取设备步进
+function getDeviceStepsData() {
+  // deviceStepsList.value = [1, 2, 3, 4, 5];
+  // return;
+  AchieveTaskbindDevice(props.executeKey).then((res) => {
+    const { code, data } = res
+    if (code === 200) {
+      deviceStepsList.value = data
+    }
+  })
+}
+// 计算当前选择设备
+const deviceStepData = computed(() => {
+  try {
+    return deviceStepsList.value[deviceStepsActive.value]
+  } catch (e) {
+    return null
+  }
+})
+
+// 设备Steps前进
+function doDeviceStepsNext() {
+  if (deviceStepsActive.value >= deviceStepsList.value.length) {
+    return
+  }
+  deviceStepsActive.value += 1
+  doLoading()
+}
+// 设备Steps后退
+function doDeviceStepsBack() {
+  if (deviceStepsActive.value <= 0) {
+    return
+  }
+  deviceStepsActive.value -= 1
+  doLoading()
+}
+// loading缓冲
+const loading = ref(false)
+
+function doLoading() {
+  loading.value = true
+  setTimeout(() => {
+    loading.value = false
+  }, 500)
+}
+// function close() {
+// 	emit('update:modelValue', false)
+// }
+// const executeFormRef = ref(null)
+
+// function save() {
+// 	const form = executeFormRef.value.getFormData();
+// 	proxy.$modal.msgSuccess('保存成功！');
+// 	console.log(form);
+// }
+</script>
+
+<style scoped>
+.dialog-footer-left {
+  text-align: left;
+}
+</style>
diff --git a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteFormDialog.vue b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteFormDialog.vue
new file mode 100644
index 0000000..6effead
--- /dev/null
+++ b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteFormDialog.vue
@@ -0,0 +1,136 @@
+<template>
+	<div>
+		<el-dialog v-bind="$attrs" @open="onOpen" @close="onClose" :close-on-click-modal="false" title="检查结果" width="60%">
+			<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+				<el-row :gutter="20">
+					<el-col :lg="12" :key="index" v-for="(item,index) in formGenerateDataList">
+						<el-form-item :label="item.content">
+							<el-select v-if="item.type === 1" v-model="form['result'+ index]" placeholder="请选择">
+								<el-option v-for="(item,index) in item.options" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
+							</el-select>
+							<el-select v-if="item.type === 2" multiple v-model="form['result'+ index]" placeholder="请选择">
+								<el-option v-for="(item,index) in item.options" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
+							</el-select>
+							<UploadImage v-if="item.type === 3" v-model="form['result'+ index]" drag :data="{ uploadType: 1, filePath: 'device/task/execute/img' }" :limit="1"></UploadImage>
+							<el-input v-if="item.type === 4" type="textarea" :maxlength="200" :show-word-limit="true" v-model="form['result'+ index]" placeholder="请输入" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button text @click="close">{{ $t('btn.cancel') }}</el-button>
+					<el-button type="primary" @click="save()">{{ $t('btn.save') }}</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup>
+	import { ref, watch } from 'vue'
+	import { ElMessageBox } from 'element-plus'
+	const emit = defineEmits()
+	const props = defineProps({
+		rowId: {
+			type: [Number, String],
+			default: -1
+		}
+	})
+	const { proxy } = getCurrentInstance()
+	watch(() => props.rowId, (newValue, oldValue) => {
+		reset();
+		// generateForm();
+	});
+
+	function onOpen() {
+		console.log(1);
+		generateForm();
+		// console.log(props.executeKey);
+	}
+
+	function onClose() {
+
+	}
+
+	function close() {
+		emit('update:modelValue', false)
+	}
+	const executeFormRef = ref(null)
+
+	function save() {
+		console.log(form.value);
+		proxy.$modal.msgSuccess('保存成功！');
+		emit('refresh')
+
+	}
+	/*************** form操作 ***************/
+	const formRef = ref()
+	const title = ref('')
+	// 操作类型 1、add 2、edit 3、view
+	const opertype = ref(0)
+	const open = ref(false)
+	const state = reactive({
+		single: true,
+		multiple: true,
+		form: {},
+		rules: {
+			notnull: [{ required: true, message: '不能为空', trigger: 'change' }]
+		},
+		options: {
+			// 任务类型（1是巡检，2是点检） 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+			typeOptions: [
+				{ dictLabel: '巡检', dictValue: 1, listClass: 'primary' },
+				{ dictLabel: '点检', dictValue: 2, listClass: 'warning' },
+			],
+			// 0-未执行 1-执行中 2-已完成 3-超时
+			// 状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+			statusOptions: [
+				{ dictLabel: '未执行', dictValue: 0, listClass: 'info' },
+				{ dictLabel: '执行中', dictValue: 1, listClass: 'primary' },
+				{ dictLabel: '已完成', dictValue: 2, listClass: 'success' },
+				{ dictLabel: '超时', dictValue: 3, listClass: 'danger' },
+			]
+		}
+	})
+
+	const { form, rules, options, single, multiple } = toRefs(state)
+
+	// 关闭dialog
+	function cancel() {
+		open.value = false
+		reset()
+	}
+
+	// 重置表单
+	function reset() {
+		form.value = {
+			id: null,
+			content: null,
+			type: 1,
+			result1: null
+		}
+		proxy.resetForm('formRef')
+	}
+	const formGenerateDataList = ref([])
+	// 表单生成
+	function generateForm() {
+		const key = props.rowId;
+		if (key === -1 || key === null) {
+			return;
+		}
+		formGenerateDataList.value = [
+			{ type: 1, content: '单选', options: [] },
+			{ type: 2, content: '多选', options: [] },
+			{ type: 3, content: '文件', options: [] },
+			{ type: 4, content: '描述', options: [] },
+		];
+	}
+	// 获取参数
+	function getFormData() {
+		return form.value;
+	}
+	defineExpose({
+		getFormData
+	})
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteTable.vue b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteTable.vue
new file mode 100644
index 0000000..d2e2dd5
--- /dev/null
+++ b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteTable.vue
@@ -0,0 +1,116 @@
+<template>
+	<div>
+		<el-button style="margin-bottom: 10px;" icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+		<el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell" highlight-current-row>
+			<el-table-column type="index" align="center" />
+			<el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
+			<el-table-column prop="deviceSpecification" label="设备规格" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceSpecification')" />
+			<el-table-column prop="workshop" label="所属车间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
+			<el-table-column prop="workline" label="所属产线" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
+			<el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
+				<template #default="scope">
+					<ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+				</template>
+			</el-table-column>
+			<el-table-column prop="responsiblePerson" label="设备负责人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('responsiblePerson')" />
+			<el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplier')" />
+			<el-table-column prop="purchaseTime" label="购买时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('purchaseTime')" />
+			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+			<el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
+			<el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+			<el-table-column prop="updatedBy" label="修改人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
+			<el-table-column prop="updatedTime" label="修改时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+			<el-table-column label="操作" width="160">
+				<template #default="scope">
+					<el-button type="success" size="small" icon="EditPen" @click="handleOpenCheckForm(scope.row.id)">
+						填写检查结果
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+		<TheTaskExecuteFormDialog v-model="open" @refresh="getList" :rowId="rowId"></TheTaskExecuteFormDialog>
+	</div>
+</template>
+
+<script setup name="TheDeviceInspectTable">
+	import { default as TheTaskExecuteFormDialog } from './TheTaskExecuteFormDialog'
+	import { listDeviceInspect2, removeBind, sortDeviceInspect } from '@/api/deviceManagement/deviceinspect'
+	const { proxy } = getCurrentInstance()
+	const props = defineProps({
+		actionDialogId: {
+			type: Number
+		}
+	})
+	watch(() => props.actionDialogId, (newValue, oldValue) => {
+		getList();
+	});
+	const ids = ref([])
+	const loading = ref(false)
+	const showSearch = ref(true)
+	const queryParams = reactive({
+		pageNum: 1,
+		pageSize: 10,
+		name: '',
+		Isbind: 1,
+		fkAccountId: -1
+	})
+	const columns = ref([
+		{ visible: false, prop: 'id', label: '设备数据库编号' },
+		{ visible: false, prop: 'fkDeviceType', label: '设备类型' },
+		{ visible: true, prop: 'deviceName', label: '设备名称' },
+		{ visible: true, prop: 'deviceSpecification', label: '设备规格' },
+		{ visible: true, prop: 'workshop', label: '所属车间' },
+		{ visible: true, prop: 'workline', label: '所属产线' },
+		{ visible: true, prop: 'deviceImage', label: '设备图片' },
+		{ visible: false, prop: 'responsiblePerson', label: '设备负责人' },
+		{ visible: false, prop: 'supplier', label: '设备厂商' },
+		{ visible: false, prop: 'purchaseTime', label: '购买时间' },
+		{ visible: false, prop: 'remark', label: '备注' },
+		{ visible: false, prop: 'createdBy', label: '创建人' },
+		{ visible: false, prop: 'createdTime', label: '创建时间' },
+		{ visible: false, prop: 'updatedBy', label: '更新人' },
+		{ visible: false, prop: 'updatedTime', label: '更新时间' },
+	])
+	const total = ref(0)
+	const dataList = ref([])
+	const queryRef = ref()
+	const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+	var dictParams = []
+
+	function getList() {
+		dataList.value = [{ id: 1 }]
+		// loading.value = true
+		// queryParams.fkAccountId = props.actionDialogId;
+		// listDeviceInspect2(queryParams).then((res) => {
+		// 	const { code, data } = res
+		// 	if (code == 200) {
+		// 		dataList.value = data.result
+		// 		total.value = data.totalNum
+		// 		loading.value = false
+		// 	}
+		// })
+	}
+	// 查询
+	function handleQuery() {
+		queryParams.pageNum = 1
+		getList()
+	}
+
+	// 重置查询操作
+	function resetQuery() {
+		proxy.resetForm('queryRef')
+		handleQuery()
+	}
+	const rowId = ref(-1)
+	const open = ref(false)
+	const type = ref(1)
+	// 检查按钮
+	function handleOpenCheckForm(id) {
+		rowId.value = id;
+		open.value = true;
+	}
+
+
+	handleQuery()
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteView.vue b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteView.vue
new file mode 100644
index 0000000..8538f15
--- /dev/null
+++ b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteView.vue
@@ -0,0 +1,157 @@
+<template>
+    <div class="main-box">
+        <el-row :gutter="20">
+            <el-col :span="18">
+                <!-- 添加 steps-wrapper 容器 -->
+                <div ref="stepsWrapperRef" class="steps-wrapper">
+                    <el-steps direction="horizontal" :active="deviceStepsActive" finish-status="success" class="custom-steps">
+                        <el-step v-for="(item, index) in deviceStepsList" :title="item.deviceName" :key="index" class="custom-step" />
+                    </el-steps>
+                </div>
+            </el-col>
+            <el-col :span="6">
+                <div>
+                    <el-button v-if="deviceStepsActive > 0" type="info" @click="doDeviceStepsBack">上一个设备</el-button>
+                    <el-button v-if="deviceStepsActive < deviceStepsList.length" type="primary" @click="doDeviceStepsNext">下一个设备</el-button>
+                </div>
+            </el-col>
+        </el-row>
+        <TheTaskExecuteDeviceItemStep
+            ref="ItemStepRef"
+            v-loading="loading"
+            :deviceItem="deviceStepData"
+            :fkPlanId="fkPlanId"
+            :planType="planType"
+            :innerType="innerType"
+            :executeKey="executeKey"
+            @doClose="close">
+        </TheTaskExecuteDeviceItemStep>
+    </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted, getCurrentInstance, nextTick } from 'vue'
+import { ElMessageBox } from 'element-plus'
+import { AchieveTaskbindDevice } from '@/api/deviceManagement/devicetaskexecute.js'
+import { default as TheTaskExecuteDeviceItemStep } from './TheTaskExecuteDeviceItemStep'
+
+const emit = defineEmits()
+const { proxy } = getCurrentInstance()
+const stepsWrapperRef = ref(null)
+
+const fkPlanId = ref('')
+const executeKey = ref('')
+// 1-检查 2-保养
+const innerType = ref(null)
+// 1-巡检 2-点检
+const planType = ref(null)
+
+function init() {
+    planType.value = proxy.$route.query.planType
+    innerType.value = proxy.$route.query.innerType
+    fkPlanId.value = proxy.$route.query.fkPlanId
+    executeKey.value = proxy.$route.query.executeKey
+
+    deviceStepsActive.value = 0
+    deviceStepsList.value = []
+    getDeviceStepsData()
+}
+
+function close() {
+    proxy.$router.back()
+}
+const deviceStepsList = ref([])
+const deviceStepsActive = ref(0)
+// 获取设备步进
+function getDeviceStepsData() {
+    AchieveTaskbindDevice(executeKey.value).then((res) => {
+        const { code, data } = res
+        if (code === 200) {
+            deviceStepsList.value = data
+        }
+    })
+}
+// 计算当前选择设备
+const deviceStepData = computed(() => {
+    try {
+        return deviceStepsList.value[deviceStepsActive.value]
+    } catch (e) {
+        return null
+    }
+})
+
+// 设备Steps前进
+function doDeviceStepsNext() {
+    if (deviceStepsActive.value >= deviceStepsList.value.length) {
+        return
+    }
+    deviceStepsActive.value += 1
+    doLoading()
+    scrollToActiveStep()
+}
+// 设备Steps后退
+function doDeviceStepsBack() {
+    if (deviceStepsActive.value <= 0) {
+        return
+    }
+    deviceStepsActive.value -= 1
+    doLoading()
+    scrollToActiveStep()
+}
+
+// 滚动到激活的步骤
+function scrollToActiveStep() {
+    nextTick(() => {
+        const stepsWrapper = stepsWrapperRef.value
+        const activeStep = stepsWrapper.querySelector(`.custom-step:nth-child(${deviceStepsActive.value + 1})`)
+        if (activeStep) {
+            const wrapperRect = stepsWrapper.getBoundingClientRect()
+            const stepRect = activeStep.getBoundingClientRect()
+            const offset = stepRect.left - wrapperRect.left
+            if (offset < 0 || offset + stepRect.width > wrapperRect.width) {
+                stepsWrapper.scrollLeft += offset - (wrapperRect.width - stepRect.width) / 2
+            }
+        }
+    })
+}
+
+// loading缓冲
+const loading = ref(false)
+
+function doLoading() {
+    loading.value = true
+    setTimeout(() => {
+        loading.value = false
+    }, 500)
+}
+const ItemStepRef = ref(null)
+onMounted(() => {
+    init()
+})
+</script>
+
+<style scoped>
+.dialog-footer-left {
+    text-align: left;
+}
+
+.main-box {
+    padding: 10px;
+}
+/* 步骤容器：允许横向滚动，禁止换行 */
+.steps-wrapper {
+    overflow-x: auto;
+    white-space: nowrap;
+    padding: 10px 0;
+}
+
+/* 自定义 el-steps 样式：取消弹性收缩，避免步骤被压缩 */
+.custom-steps {
+    display: inline-flex;
+    width: max-content;
+}
+
+.custom-step {
+    flex-shrink: 0;
+}
+</style>
diff --git a/src/views/deviceManagement/deviceTaskExecute/index.vue b/src/views/deviceManagement/deviceTaskExecute/index.vue
new file mode 100644
index 0000000..e3cb098
--- /dev/null
+++ b/src/views/deviceManagement/deviceTaskExecute/index.vue
@@ -0,0 +1,484 @@
+<!--
+ * @Descripttion: (任务执行/device_task_execute)
+ * @Author: (许前浩)
+ * @Date: (2024-05-31)
+-->
+<template>
+  <div>
+    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+      <el-form-item label="任务名称" prop="taskName">
+        <el-input clearable v-model.trim="queryParams.taskName" placeholder="请输入任务名称" />
+      </el-form-item>
+      <el-form-item label="任务派发时间" prop="timeRange">
+        <el-date-picker :clearable="true" v-model="queryParams.timeRange" type="daterange"
+          placeholder="选择日期时间区间"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="任务类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择任务类型" @change="handleQuery">
+          <el-option label="全部" :value="-1"></el-option>
+          <el-option v-for="item in options.typeOptions" :key="item.dictValue" :label="item.dictLabel"
+            :value="parseInt(item.dictValue)"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="queryParams.status" @change="handleQuery">
+          <el-radio-button :value="-1"> 全部 </el-radio-button>
+          <el-radio-button v-for="item in options.statusOptions" :key="item.dictValue"
+            :value="parseInt(item.dictValue)">
+            {{ item.dictLabel }}
+          </el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+        <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" v-hasPermi="['deviceManagement:devicetaskexecute:add']" plain icon="RefreshRight"
+          @click="handleSynchronize">
+          {{ $t('btn.synchronize') }}
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" v-hasPermi="['deviceManagement:devicetaskexecute:delete']" plain icon="delete"
+          @click="handleClear">
+          {{ $t('btn.clean') }}
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="download" @click="handleExport"
+          v-hasPermi="['deviceManagement:devicetaskexecute:export']">
+          {{ $t('btn.export') }}
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell"
+      highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column prop="id" label="数据库编号" align="center" v-if="columns.showColumn('id')" />
+      <el-table-column prop="taskId" label="任务编号" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('taskId')" />
+      <el-table-column prop="taskName" label="任务名称" align="center" min-width="120" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('taskName')" />
+      <el-table-column prop="person" label="执行人" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('person')" />
+      <el-table-column prop="type" label="任务类型" align="center" v-if="columns.showColumn('type')">
+        <template #default="scope">
+          <dict-tag :options="options.typeOptions" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="distributedTime" label="任务派发时间" align="center" min-width="140"
+        :show-overflow-tooltip="true" v-if="columns.showColumn('distributedTime')" />
+      <el-table-column prop="startTime" label="任务开始时间" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('startTime')" />
+      <el-table-column prop="endTime" label="任务结束时间" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('endTime')" />
+      <el-table-column prop="consumeTime" label="耗时（min）" align="center">
+        <template #default="scope">
+          <span style="color: red; font-size: larger">{{ scope.row.consumeTime }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="状态" align="center" v-if="columns.showColumn('status')">
+        <template #default="scope">
+          <dict-tag :options="options.statusOptions" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('remark')" />
+      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('createdBy')" />
+      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('createdTime')" />
+      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('updatedBy')" />
+      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('updatedTime')" />
+      <el-table-column label="任务执行" width="100" fixed="right">
+        <template #default="scope">
+          <el-button type="info" size="small" icon="EditPen" @click="handleExecute(scope.row)">执行</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="160" fixed="right">
+        <template #default="scope">
+          <el-button type="primary" size="small" icon="view" title="详情" @click="handlePreview(scope.row)"></el-button>
+          <el-button type="success" size="small" icon="edit" title="编辑"
+            v-hasPermi="['deviceManagement:devicetaskexecute:edit']" @click="handleUpdate(scope.row)"></el-button>
+          <el-button type="danger" size="small" icon="delete" title="删除"
+            v-hasPermi="['deviceManagement:devicetaskexecute:delete']" @click="handleDelete(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改任务执行对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" v-model="open">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :lg="24">
+            <el-form-item label="任务名称" prop="taskName">
+              <el-input disabled v-model="form.taskName" placeholder="请输入任务名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="12">
+            <el-form-item label="任务类型" prop="type">
+              <el-select disabled v-model="form.type" placeholder="请选择任务类型">
+                <el-option v-for="item in options.typeOptions" :key="item.dictValue" :label="item.dictLabel"
+                  :value="parseInt(item.dictValue)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="12">
+            <el-form-item label="任务派发时间" prop="distributedTime">
+              <el-date-picker disabled v-model="form.distributedTime" type="datetime" :teleported="false"
+                placeholder="选择日期时间"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="12">
+            <el-form-item label="任务开始时间" prop="startTime">
+              <el-date-picker :disabled="opertype === 3" v-model="form.startTime" type="datetime" :teleported="false"
+                placeholder="选择日期时间"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="任务结束时间" prop="endTime">
+              <el-date-picker :disabled="opertype === 3" v-model="form.endTime" type="datetime" :teleported="false"
+                placeholder="选择日期时间"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="24">
+            <el-form-item label="状态" prop="status">
+              <el-radio-group :disabled="opertype === 3" v-model="form.status">
+                <el-radio-button v-for="item in options.statusOptions" :key="item.dictValue"
+                  :value="parseInt(item.dictValue)">
+                  {{ item.dictLabel }}
+                </el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input :disabled="opertype === 3" type="textarea" :maxlength="200" :show-word-limit="true"
+                v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer v-if="opertype != 3">
+        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </template>
+    </el-dialog>
+    <TheTaskExecuteDialog v-model="open2" :executeKey="executeKey" :fkPlanId="fkPlanId" :planType="planType">
+    </TheTaskExecuteDialog>
+  </div>
+</template>
+
+<script setup name="devicetaskexecute">
+import {
+  listDeviceTaskExecute,
+  addDeviceTaskExecute,
+  delDeviceTaskExecute,
+  updateDeviceTaskExecute,
+  getDeviceTaskExecute,
+  clearDeviceTaskExecute,
+  setTaskStartTime
+} from '@/api/deviceManagement/devicetaskexecute.js'
+import { default as TheTaskExecuteDialog } from './TheTaskExecuteDialog'
+import importData from '@/components/ImportData'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const defaultTimeRange = ref(null)
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  timeRange: defaultTimeRange,
+  timeStart: null,
+  timeEnd: null,
+  type: -1,
+  status: -1,
+  sort: 'createdTime',
+  sortType: 'desc'
+})
+const columns = ref([
+  { visible: false, prop: 'id', label: '主键' },
+  { visible: false, prop: 'taskId', label: '任务id' },
+  { visible: true, prop: 'taskName', label: '任务名称' },
+  { visible: true, prop: 'person', label: '执行人' },
+  { visible: true, prop: 'type', label: '任务类型' },
+  { visible: true, prop: 'distributedTime', label: '任务派发时间' },
+  { visible: true, prop: 'startTime', label: '任务执行——开始时间' },
+  { visible: true, prop: 'endTime', label: '任务执行——结束时间' },
+  { visible: true, prop: 'status', label: '状态' },
+  { visible: true, prop: 'remark', label: '备注' },
+  { visible: false, prop: 'createdBy', label: '创建人' },
+  { visible: false, prop: 'createdTime', label: '创建时间' },
+  { visible: false, prop: 'updatedBy', label: '更新人' },
+  { visible: false, prop: 'updatedTime', label: '更新时间' }
+])
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+
+var dictParams = []
+
+function getList() {
+  loading.value = true
+  listDeviceTaskExecute(queryParams).then((res) => {
+    const { code, data } = res
+    if (code == 200) {
+      dataList.value = data.result
+      total.value = data.totalNum
+      loading.value = false
+    }
+  })
+}
+
+const consume_time = computed((date1, date2) => {
+  var milliseconds1 = date1.getTime()
+  var milliseconds2 = date2.getTime()
+
+  // 计算毫秒级的时间差
+  var millisecondsDiff = Math.abs(milliseconds2 - milliseconds1)
+
+  var minutesDiff = millisecondsDiff / (1000 * 60)
+  return minutesDiff
+})
+// 查询
+function handleQuery() {
+  queryParams.pageNum = 1
+  getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+// 自定义排序
+function sortChange(column) {
+  var sort = undefined
+  var sortType = undefined
+
+  if (column.prop != null && column.order != null) {
+    sort = column.prop
+    sortType = column.order
+  }
+  queryParams.sort = sort
+  queryParams.sortType = sortType
+  handleQuery()
+}
+
+// 任务手动同步
+function handleSynchronize() {
+  proxy.$modal.msgSuccess('同步成功！')
+}
+// 任务执行弹窗
+const open2 = ref(false)
+const executeKey = ref('')
+const fkPlanId = ref('')
+const planType = ref(1)
+// 执行任务，填写表单
+function handleExecute(row) {
+  // 1-巡检 2-点检
+  planType.value = row.type
+  // 1-检查 2-保养
+  const innerType = row.innerType
+  fkPlanId.value = row.planId
+  executeKey.value = row.id
+  setTaskStartTime({ id: executeKey.value })
+  // open2.value = true;
+  proxy.$router.push({ name: 'TheTaskExecuteView', query: { planType: row.type, fkPlanId: row.planId, executeKey: row.id, innerType } })
+  // proxy.$router.push({ path: '/deviceManagement/deviceTaskExecute', query: { planType: row.type, fkPlanId: row.taskId, executeKey: row.id } });
+}
+
+/*************** form操作 ***************/
+const formRef = ref()
+const title = ref('')
+// 操作类型 1、add 2、edit 3、view
+const opertype = ref(0)
+const open = ref(false)
+
+const state = reactive({
+  single: true,
+  multiple: true,
+  form: {},
+  rules: {
+    // type: [{ required: true, message: '任务类型（1是巡检，2是点检）不能为空', trigger: 'change', type: 'number' }]
+  },
+  options: {
+    // 任务类型（1是巡检，2是点检） 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+    typeOptions: [
+      { dictLabel: '巡检', dictValue: 1, listClass: 'primary' },
+      { dictLabel: '点检', dictValue: 2, listClass: 'warning' }
+    ],
+    // 0-未执行 1-执行中 2-已完成 3-超时
+    // 状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+    statusOptions: [
+      { dictLabel: '未执行', dictValue: 0, listClass: 'info' },
+      { dictLabel: '执行中', dictValue: 1, listClass: 'primary' },
+      { dictLabel: '已完成', dictValue: 2, listClass: 'success' },
+      { dictLabel: '超时', dictValue: 3, listClass: 'danger' }
+    ]
+  }
+})
+
+const { form, rules, options, single, multiple } = toRefs(state)
+
+// 关闭dialog
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 重置表单
+function reset() {
+  form.value = {
+    id: null,
+    taskName: null,
+    taskId: null,
+    type: 1,
+    distributedTime: null,
+    startTime: null,
+    endTime: null,
+    status: 0,
+    remark: null,
+    createdBy: null,
+    createdTime: null,
+    updatedBy: null,
+    updatedTime: null
+  }
+  proxy.resetForm('formRef')
+}
+// 添加按钮操作
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = '添加任务执行'
+  opertype.value = 1
+}
+// 修改按钮操作
+function handleUpdate(row) {
+  reset()
+  const id = row.id || ids.value
+  getDeviceTaskExecute(id).then((res) => {
+    const { code, data } = res
+    if (code == 200) {
+      open.value = true
+      title.value = '修改任务执行'
+      opertype.value = 2
+
+      form.value = {
+        ...data
+      }
+    }
+  })
+}
+
+// 添加&修改 表单提交
+function submitForm() {
+  proxy.$refs['formRef'].validate((valid) => {
+    if (valid) {
+      if (form.value.id != undefined && opertype.value === 2) {
+        updateDeviceTaskExecute(form.value).then((res) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addDeviceTaskExecute(form.value).then((res) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+// 删除按钮操作
+function handleDelete(row) {
+  const Ids = row.id || ids.value
+
+  proxy
+    .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+    .then(function () {
+      return delDeviceTaskExecute(Ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+}
+
+// 清空
+function handleClear() {
+  proxy
+    .$confirm('是否确认清空所有数据项?清空后不可恢复！', '警告', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+    .then(function () {
+      return clearDeviceTaskExecute()
+    })
+    .then(() => {
+      handleQuery()
+      proxy.$modal.msgSuccess('清空成功')
+    })
+}
+
+/**
+ * 查看
+ * @param {*} row
+ */
+function handlePreview(row) {
+  reset()
+  open.value = true
+  title.value = '查看'
+  opertype.value = 3
+  form.value = { ...row }
+}
+
+// 导入数据成功处理
+const handleFileSuccess = (response) => {
+  const { item1, item2 } = response.data
+  var error = ''
+  item2.forEach((item) => {
+    error += item.storageMessage + ','
+  })
+  proxy.$alert(item1 + '<p>' + error + '</p>', '导入结果', {
+    dangerouslyUseHTMLString: true
+  })
+  getList()
+}
+
+// 导出按钮操作
+function handleExport() {
+  proxy
+    .$confirm('是否确认导出任务执行数据项?', '警告', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+    .then(async () => {
+      await proxy.downFile('/dev/DeviceTaskExecute/export', { ...queryParams })
+    })
+}
+
+handleQuery()
+</script>
diff --git a/src/views/deviceManagement/deviceTaskExecuteResult/index.vue b/src/views/deviceManagement/deviceTaskExecuteResult/index.vue
new file mode 100644
index 0000000..c2090a6
--- /dev/null
+++ b/src/views/deviceManagement/deviceTaskExecuteResult/index.vue
@@ -0,0 +1,561 @@
+<template>
+  <div>
+    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+      <el-form-item label="计划类型" prop="planType">
+        <el-select v-model="queryParams.planType" placeholder="请选择计划类型">
+          <el-option
+            v-for="item in options.planTypeOptions"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="parseInt(item.dictValue)"></el-option>
+          <el-option label="全部" :value="-1"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="巡/点检计划名称" prop="planName">
+        <el-input v-model="queryParams.planName" placeholder="请输入巡检计划名称" />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" />
+      </el-form-item>
+
+      <el-form-item label="开始时间" prop="starttime">
+        <el-date-picker v-model="queryParams.starttime" type="datetime" placeholder="选择开始时间" />
+      </el-form-item>
+
+      <el-form-item label="结束时间" prop="endtime">
+        <el-date-picker v-model="queryParams.endtime" type="datetime" placeholder="选择结束时间" />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+        <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 工具区域 -->
+    <!-- <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" v-hasPermi="['deviceManagement:devicetaskexecuteresult1:add']" plain icon="plus" @click="handleAdd">
+          {{ $t('btn.add') }}
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row> -->
+
+    <el-table
+      :data="dataList"
+      v-loading="loading"
+      ref="table"
+      border
+      header-cell-class-name="el-table-header-cell"
+      highlight-current-row
+      :span-method="objectSpanMethod"
+      @sort-change="sortChange">
+      <el-table-column prop="planType" label="计划类型" align="center" v-if="columns.showColumn('planType')">
+        <template #default="scope">
+          <dict-tag :options="options.planTypeOptions" :value="scope.row.planType" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="planName" label="巡/点检计划名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('planName')" />
+      <el-table-column prop="innerType" label="内部类型" align="center" :show-overflow-tooltip="true">
+        <template #default="scope">
+          <el-tag v-if="scope.row.innerType == 1">检查</el-tag>
+          <el-tag v-if="scope.row.innerType == 2">保养</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="excuteCycleType" label="执行周期" align="center" :show-overflow-tooltip="true">
+        <template #default="scope">
+          <dict-tag :options="options.excuteCycleTypeOptions" :value="scope.row.excuteCycleType" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
+      <el-table-column prop="inspectName" label="检查项名称" :show-overflow-tooltip="true" width="240" v-if="columns.showColumn('inspectName')" />
+      <el-table-column prop="formType" label="表单类型" align="center" v-if="columns.showColumn('formType')">
+        <template #default="scope">
+          <dict-tag :options="options.formTypeOptions" :value="scope.row.formType" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="formTitle" label="表单标题" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('formTitle')" />
+      <el-table-column prop="formName" label="结果" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('formName')">
+        <template #default="scope">
+          <el-tag v-if="scope.row.formName == '是'" type="success">{{ scope.row.formName }}</el-tag>
+          <el-tag v-else-if="scope.row.formName == '否'" type="danger">{{ scope.row.formName }}</el-tag>
+          <ImagePreview v-else-if="scope.row.formType == 3" :src="scope.row.formName"></ImagePreview>
+          <span v-else>{{ scope.row.formName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="person" label="巡检人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('person')" />
+      <el-table-column prop="updatedTime" label="时间" align="center" :show-overflow-tooltip="true" />
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
+
+      <!-- <el-table-column label="操作" width="160">
+        <template #default="scope">
+          <el-button
+            type="success"
+            size="small"
+            icon="edit"
+            title="编辑"
+            v-hasPermi="['business:devicetaskexecuteresult1:edit']"
+            @click="handleUpdate(scope.row)"></el-button>
+          <el-button
+            type="danger"
+            size="small"
+            icon="delete"
+            title="删除"
+            v-hasPermi="['business:devicetaskexecuteresult1:delete']"
+            @click="handleDelete(scope.row)"></el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改巡检/点检任务结果表对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" v-model="open">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :lg="12">
+            <el-form-item label="id 雪花" prop="id">
+              <el-input v-model="form.id" placeholder="请输入id 雪花" :disabled="opertype != 1" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="计划类型（1是巡检，2是点检）" prop="planType">
+              <el-select v-model="form.planType" placeholder="请选择计划类型（1是巡检，2是点检）">
+                <el-option
+                  v-for="item in options.planTypeOptions"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="parseInt(item.dictValue)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="计划id" prop="fkPlanId">
+              <el-input v-model="form.fkPlanId" placeholder="请输入计划id" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="巡/点检计划名称" prop="planName">
+              <el-input v-model="form.planName" placeholder="请输入巡检计划名称" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="设备id" prop="fkDeviceId">
+              <el-input v-model.number="form.fkDeviceId" placeholder="请输入设备id" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="设备检查项id" prop="fkInspectId">
+              <el-input v-model.number="form.fkInspectId" placeholder="请输入设备检查项id" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="检查项名称" prop="inspectName">
+              <el-input v-model="form.inspectName" placeholder="请输入检查项名称" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="表单id" prop="fkFormId">
+              <el-input v-model="form.fkFormId" placeholder="请输入表单id" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="表单类型" prop="formType">
+              <el-select v-model="form.formType" placeholder="请选择表单类型">
+                <el-option
+                  v-for="item in options.formTypeOptions"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="parseInt(item.dictValue)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="24">
+            <el-form-item label="表单标题" prop="formTitle">
+              <el-input type="textarea" v-model="form.formTitle" placeholder="请输入表单标题" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="表单名称" prop="formName">
+              <el-input v-model="form.formName" placeholder="请输入表单名称" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="巡检人" prop="person">
+              <el-input v-model="form.person" placeholder="请输入巡检人" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer v-if="opertype != 3">
+        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="deviceTaskExecuteResult">
+import {
+  listDeviceTaskExecuteResult1,
+  addDeviceTaskExecuteResult1,
+  delDeviceTaskExecuteResult1,
+  updateDeviceTaskExecuteResult1,
+  getDeviceTaskExecuteResult1
+} from '@/api/deviceManagement/devicetaskexecuteresult1.js'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const queryParams = reactive({
+  planType: -1,
+  planName: '',
+  deviceName: '',
+  starttime: null,
+  endtime: null,
+  pageNum: 1,
+  pageSize: 100,
+  sort: 'updatedTime',
+  sortType: 'desc'
+})
+const columns = ref([
+  { visible: true, prop: 'id', label: 'id 雪花' },
+  { visible: true, prop: 'planType', label: '计划类型（1是巡检，2是点检）' },
+  { visible: true, prop: 'fkPlanId', label: '计划id' },
+  { visible: true, prop: 'planName', label: '巡检计划名称' },
+  { visible: true, prop: 'fkDeviceId', label: '设备id' },
+  { visible: true, prop: 'deviceName', label: '设备名称' },
+  { visible: true, prop: 'fkInspectId', label: '设备检查项id' },
+  { visible: true, prop: 'inspectName', label: '检查项名称' },
+
+  { visible: true, prop: 'formType', label: '表单类型' },
+  { visible: true, prop: 'formTitle', label: '表单标题' },
+  { visible: true, prop: 'formName', label: '表单名称' },
+  { visible: true, prop: 'person', label: '巡检人' },
+  { visible: false, prop: 'remark', label: '备注' }
+])
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+
+var dictParams = []
+
+function getList() {
+  loading.value = true
+  listDeviceTaskExecuteResult1(queryParams).then((res) => {
+    const { code, data } = res
+    if (code == 200) {
+      dataList.value = data.result
+      getSpanArr(dataList.value)
+      getSpanArr2(dataList.value)
+      getSpanArr3(dataList.value)
+
+      total.value = data.totalNum
+      loading.value = false
+    }
+  })
+}
+
+// 查询
+function handleQuery() {
+  queryParams.pageNum = 1
+  getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+// 自定义排序
+function sortChange(column) {
+  var sort = undefined
+  var sortType = undefined
+
+  if (column.prop != null && column.order != null) {
+    sort = column.prop
+    sortType = column.order
+  }
+  queryParams.sort = sort
+  queryParams.sortType = sortType
+  handleQuery()
+}
+
+/*************** form操作 ***************/
+const formRef = ref()
+const title = ref('')
+// 操作类型 1、add 2、edit 3、view
+const opertype = ref(0)
+const open = ref(false)
+const state = reactive({
+  single: true,
+  multiple: true,
+  form: {},
+  rules: {
+    id: [{ required: true, message: 'id 雪花不能为空', trigger: 'blur' }],
+    fkPlanId: [{ required: true, message: '计划id不能为空', trigger: 'blur' }],
+    fkInspectId: [{ required: true, message: '设备检查项id不能为空', trigger: 'blur', type: 'number' }]
+  },
+  options: {
+    // 计划类型（1是巡检，2是点检） 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+    planTypeOptions: [
+      { dictLabel: '巡检', dictValue: 1 },
+      { dictLabel: '点检', dictValue: 2 }
+    ],
+    // 表单类型 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+    formTypeOptions: [],
+    // 执行周期类型（1 按天，2按周 3按月） 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+    excuteCycleTypeOptions: [
+      { dictLabel: '按天', dictValue: 1, listClass: 'primary' },
+      { dictLabel: '按周', dictValue: 2, listClass: 'warning' },
+      { dictLabel: '按月', dictValue: 3, listClass: 'success' },
+      { dictLabel: '全部', dictValue: 0 }
+    ]
+  }
+})
+
+// 使用字典
+var dictParams = [{ dictType: 'mes_device_inspect_form_config', columnName: 'formTypeOptions' }]
+
+proxy.getDicts(dictParams).then((response) => {
+  response.data.forEach((element) => {
+    state.options[element.columnName] = element.list
+    state.options[element.columnName].forEach((item) => {
+      item.dictValue = parseInt(item.dictValue)
+    })
+  })
+})
+
+const { form, rules, options, single, multiple } = toRefs(state)
+
+// 关闭dialog
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 重置表单
+function reset() {
+  form.value = {
+    id: null,
+    planType: null,
+    fkPlanId: null,
+    planName: null,
+    fkDeviceId: null,
+    deviceName: null,
+    fkInspectId: null,
+    inspectName: null,
+    fkFormId: null,
+    formType: null,
+    formTitle: null,
+    formName: null,
+    person: null,
+    remark: null,
+    createdBy: null,
+    createdTime: null,
+    updatedBy: null,
+    updatedTime: null
+  }
+  proxy.resetForm('formRef')
+}
+// 添加按钮操作
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = '添加巡检/点检任务结果表'
+  opertype.value = 1
+}
+// 修改按钮操作
+function handleUpdate(row) {
+  reset()
+  const id = row.id || ids.value
+  getDeviceTaskExecuteResult1(id).then((res) => {
+    const { code, data } = res
+    if (code == 200) {
+      open.value = true
+      title.value = '修改巡检/点检任务结果表'
+      opertype.value = 2
+
+      form.value = {
+        ...data
+      }
+    }
+  })
+}
+
+// 添加&修改 表单提交
+function submitForm() {
+  proxy.$refs['formRef'].validate((valid) => {
+    if (valid) {
+      if (form.value.id != undefined && opertype.value === 2) {
+        updateDeviceTaskExecuteResult1(form.value).then((res) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addDeviceTaskExecuteResult1(form.value).then((res) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+// 删除按钮操作
+function handleDelete(row) {
+  const Ids = row.id || ids.value
+
+  proxy
+    .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+    .then(function () {
+      return delDeviceTaskExecuteResult1(Ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+}
+
+// 合并单元格需要的数据
+const spanArr = ref([]) //遍历数据时，根据相同的标识去存储记录
+const pos = ref(0)
+const spanArr2 = ref([]) //遍历数据时，根据相同的标识去存储记录
+const pos2 = ref(0)
+const spanArr3 = ref([]) //遍历数据时，根据相同的标识去存储记录
+const pos3 = ref(0)
+// 列表数据处理函数
+function getSpanArr(data) {
+  //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+  spanArr.value = []
+  pos.value = 0
+  //遍历数据
+  data.forEach((item, index) => {
+    //判断是否是第一项
+    if (index === 0) {
+      spanArr.value.push(1)
+      pos.value = 0
+    } else {
+      //不是第一项时，就根据标识去存储
+      if (data[index].fkTaskId === data[index - 1].fkTaskId) {
+        // 查找到符合条件的数据时每次要把之前存储的数据+1
+        spanArr.value[pos.value] += 1
+        spanArr.value.push(0)
+      } else {
+        // 没有符合的数据时，要记住当前的index
+        spanArr.value.push(1)
+        pos.value = index
+      }
+    }
+  })
+}
+// 列表数据处理函数
+function getSpanArr2(data) {
+  //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+  spanArr2.value = []
+  pos2.value = 0
+  //遍历数据
+  data.forEach((item, index) => {
+    //判断是否是第一项
+    if (index === 0) {
+      spanArr2.value.push(1)
+      pos2.value = 0
+    } else {
+      //不是第一项时，就根据标识去存储
+      if (data[index].deviceName === data[index - 1].deviceName && data[index].fkTaskId === data[index - 1].fkTaskId) {
+        // 查找到符合条件的数据时每次要把之前存储的数据+1
+        spanArr2.value[pos2.value] += 1
+        spanArr2.value.push(0)
+      } else {
+        // 没有符合的数据时，要记住当前的index
+        spanArr2.value.push(1)
+        pos2.value = index
+      }
+    }
+  })
+}
+// 列表数据处理函数
+function getSpanArr3(data) {
+  //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+  spanArr3.value = []
+  pos3.value = 0
+  //遍历数据
+  data.forEach((item, index) => {
+    //判断是否是第一项
+    if (index === 0) {
+      spanArr3.value.push(1)
+      pos3.value = 0
+    } else {
+      //不是第一项时，就根据标识去存储
+      if (data[index].inspectName === data[index - 1].inspectName && data[index].fkTaskId === data[index - 1].fkTaskId) {
+        // 查找到符合条件的数据时每次要把之前存储的数据+1
+        spanArr3.value[pos3.value] += 1
+        spanArr3.value.push(0)
+      } else {
+        // 没有符合的数据时，要记住当前的index
+        spanArr3.value.push(1)
+        pos3.value = index
+      }
+    }
+  })
+}
+// 指定合并的单元格函数
+function objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+  // 页面列表上 表格合并行 -> 第几列(从0开始)
+  // 需要合并多个单元格时 依次增加判断条件即可
+  if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2 || columnIndex === 3) {
+    // 二维数组存储的数据 取出
+    const _row = spanArr.value[rowIndex]
+    const _col = _row > 0 ? 1 : 0
+    return {
+      rowspan: _row,
+      colspan: _col
+    }
+    //不可以return {rowspan：0， colspan: 0} 会造成数据不渲染， 也可以不写else，eslint过不了的话就返回false
+  } else if (columnIndex === 4) {
+    const _row = spanArr2.value[rowIndex]
+    const _col = _row > 0 ? 1 : 0
+    return {
+      rowspan: _row,
+      colspan: _col
+    }
+  } else if (columnIndex === 5) {
+    const _row = spanArr3.value[rowIndex]
+    const _col = _row > 0 ? 1 : 0
+    return {
+      rowspan: _row,
+      colspan: _col
+    }
+  } else {
+    return false
+  }
+}
+
+handleQuery()
+</script>
diff --git a/src/views/deviceManagement/deviceaccount/TheChouseDeviceInspect.vue b/src/views/deviceManagement/deviceaccount/TheChouseDeviceInspect.vue
new file mode 100644
index 0000000..0714da6
--- /dev/null
+++ b/src/views/deviceManagement/deviceaccount/TheChouseDeviceInspect.vue
@@ -0,0 +1,181 @@
+<template>
+  <div>
+    <el-dialog v-bind="$attrs" @open="onOpen" @close="onClose" :close-on-click-modal="false" title="绑定检查项" width="800">
+      <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+        <el-form-item label="检查项名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入检查项名称" clearable />
+        </el-form-item>
+        <el-form-item label="检查项类型" prop="name">
+          <el-select v-model="queryParams.type" placeholder="选择" clearable>
+            <el-option v-for="status in checkType" :key="status.value" :label="status.label" :value="status.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        @selection-change="handleSelectionChange"
+        :data="dataList"
+        v-loading="loading"
+        ref="table"
+        border
+        header-cell-class-name="el-table-header-cell"
+        highlight-current-row>
+        <el-table-column type="selection" align="center" width="55" />
+        <el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('name')" />
+        <el-table-column prop="type" label="检查类型" align="center" v-if="columns_showColumn('type')">
+          <template slot-scope="scope">
+            <dict-tag :options="options.typeOptions" :value="scope.row.type" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="image" label="图片" align="center" v-if="columns_showColumn('image')">
+          <template slot-scope="scope">
+            <ImagePreview :src="scope.row.image"></ImagePreview>
+          </template>
+        </el-table-column>
+        <el-table-column prop="descride" label="描述" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('descride')" />
+        <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('remark')" />
+      </el-table>
+      <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="close">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="save">{{ $t('btn.save') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDeviceInspect2, addBind } from '@/api/deviceManagement/deviceinspect'
+
+export default {
+  name: 'TheChouseDeviceInspect',
+  props: {
+    actionDialogId: {
+      type: Number
+    },
+    modelValue: {
+      type: Boolean
+    }
+  },
+  data() {
+    return {
+      checkType: [
+        {
+          label: '检查',
+          value: 1
+        },
+        {
+          label: '保养',
+          value: 2
+        }
+      ],
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: '',
+        type: 1,
+        Isbind: 0,
+        fkAccountId: -1
+      },
+      columns: [
+        { visible: true, prop: 'name', label: '名称' },
+        { visible: true, prop: 'type', label: '检查时输入类型' },
+        { visible: true, prop: 'image', label: '图片' },
+        { visible: true, prop: 'descride', label: '描述' },
+        { visible: true, prop: 'remark', label: '备注' }
+      ],
+      total: 0,
+      dataList: [],
+      defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)],
+      dictParams: [],
+      selectList: [],
+      options: {
+        typeOptions: [
+          { dictLabel: '文本', dictValue: 1, listClass: 'success' },
+          { dictLabel: '多选', dictValue: 2, listClass: 'warning' },
+          { dictLabel: '文件', dictValue: 3, listClass: 'info' }
+        ],
+        statusOptions: []
+      }
+    }
+  },
+  methods: {
+    onOpen() {
+      this.getList()
+    },
+    
+    onClose() {}
+    ,
+    
+    close() {
+      this.$emit('update:modelValue', false)
+    },
+    
+    save() {
+      const data = {
+        account_id: this.actionDialogId,
+        inspect_ids: this.selectList
+      }
+      
+      this.$confirm('是否确认保存所选项？')
+        .then(() => {
+          return addBind(data)
+        })
+        .then(() => {
+          this.getList()
+          this.emitRefresh()
+          this.$modal.msgSuccess('保存成功！')
+        })
+        .catch(() => {})
+    },
+    
+    emitRefresh() {
+      this.$emit('refresh')
+    },
+    
+    getList() {
+      this.loading = true
+      this.queryParams.fkAccountId = this.actionDialogId
+      listDeviceInspect2(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+    
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    
+    resetQuery() {
+      this.resetFields('queryRef')
+      this.handleQuery()
+    },
+    
+    handleSelectionChange(list) {
+      let _list = list.map((item, index) => {
+        return item.id
+      })
+      this.selectList = _list
+    },
+    
+    columns_showColumn(prop) {
+      const column = this.columns.find(item => item.prop === prop)
+      return column ? column.visible : false
+    }
+  },
+  
+  mounted() {
+    this.handleQuery()
+  }
+}
+</script>
diff --git a/src/views/deviceManagement/deviceaccount/TheDeviceActionDialog.vue b/src/views/deviceManagement/deviceaccount/TheDeviceActionDialog.vue
new file mode 100644
index 0000000..4104937
--- /dev/null
+++ b/src/views/deviceManagement/deviceaccount/TheDeviceActionDialog.vue
@@ -0,0 +1,56 @@
+<template>
+	<div>
+		<!-- 设备操作弹框 -->
+		<el-dialog v-bind="$attrs" @open="onOpen" @close="onClose" :close-on-click-modal="false" title="设备操作" width="900">
+			<el-tabs v-model="activeName" type="border-card">
+				<el-tab-pane label="设备检查项" name="first">
+					<TheDeviceInspectTable :actionDialogId="actionDialogId"></TheDeviceInspectTable>
+				</el-tab-pane>
+				<el-tab-pane label="设备巡检" name="second">Config</el-tab-pane>
+				<el-tab-pane label="设备点检" name="third">Role</el-tab-pane>
+				<el-tab-pane label="设备维修" name="fourth">Task</el-tab-pane>
+			</el-tabs>
+			<div slot="footer" class="dialog-footer">
+				<!-- <el-button text @click="close">{{ $t('btn.cancel') }}</el-button> -->
+				<!-- <el-button v-if="activeName === 'first'" type="primary" @click="save(1)">{{ $t('btn.save') }}</el-button> -->
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { ElMessageBox } from 'element-plus'
+import { default as TheDeviceInspectTable } from './TheDeviceInspectTable'
+
+export default {
+  name: 'TheDeviceActionDialog',
+  components: {
+    TheDeviceInspectTable
+  },
+  props: {
+    actionDialogId: {
+      type: Number
+    },
+    modelValue: {
+      type: Boolean
+    }
+  },
+  data() {
+    return {
+      activeName: 'first'
+    }
+  },
+  methods: {
+    onOpen() {
+      console.log(this.actionDialogId)
+    },
+    
+    onClose() {}
+    ,
+    
+    close() {
+      this.$emit('update:modelValue', false)
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/deviceManagement/deviceaccount/TheDeviceInspectTable.vue b/src/views/deviceManagement/deviceaccount/TheDeviceInspectTable.vue
new file mode 100644
index 0000000..200d1cc
--- /dev/null
+++ b/src/views/deviceManagement/deviceaccount/TheDeviceInspectTable.vue
@@ -0,0 +1,378 @@
+<template>
+  <div>
+    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+      <el-form-item label="检查项名称" prop="name">
+        <el-input v-model.trim="queryParams.name" placeholder="请输入检查项名称" clearable />
+      </el-form-item>
+      <el-form-item label="检查项类型" prop="name">
+        <el-select v-model="queryParams.type" placeholder="选择" clearable>
+          <el-option v-for="status in checkType" :key="status.value" :label="status.label" :value="status.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <!-- <el-col :span="1.5">
+		<el-button type="primary" v-hasPermi="['deviceManagement:deviceinspect:add']" plain icon="plus" @click="handleAdd">
+			{{ $t('btn.add') }}
+		</el-button>
+	</el-col> -->
+      <el-col :span="1.5">
+        <el-button type="success" v-hasPermi="['deviceManagement:deviceinspect:add']" plain icon="el-icon-plus" @click="handleChouse">
+          绑定检查项
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell" highlight-current-row>
+      <el-table-column type="index" align="center" />
+      <el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('name')" />
+      <el-table-column prop="image" label="图片" align="center" v-if="columns_showColumn('image')">
+        <template slot-scope="scope">
+          <ImagePreview :src="scope.row.image"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column prop="descride" label="描述" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('descride')" />
+      <el-table-column prop="type" label="类别" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('type')">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.type == 1">检查</el-tag>
+          <el-tag type="primary" v-else-if="scope.row.type == 2">保养</el-tag>
+          <el-tag type="danger" v-else>异常</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('remark')" />
+      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('createdBy')" />
+      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns_showColumn('createdTime')" />
+      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('updatedBy')" />
+      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns_showColumn('updatedTime')" />
+      <el-table-column label="操作" width="160">
+        <template slot-scope="scope">
+          <el-button
+            type="danger"
+            size="small"
+            icon="el-icon-delete"
+            title="取消关联"
+            v-hasPermi="['deviceManagement:deviceinspect:delete']"
+            @click="handleRemoveBind(scope.row.id)"></el-button>
+          <el-button type="primary" size="small" icon="el-icon-arrow-up" title="上移" @click="handleSortUp(scope.row.id, scope.$index)"></el-button>
+          <el-button type="primary" size="small" icon="el-icon-arrow-down" title="下移" @click="handleSortDown(scope.row.id, scope.$index)"></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    <!-- 添加或修改设备检查项对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :lg="12">
+            <el-form-item label="检查项名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入检查项名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="24">
+            <el-form-item label="图片" prop="image">
+              <UploadImage v-model="form.image" :data="{ uploadType: 1 }" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="检查顺序" prop="sort">
+              <el-input v-model.number="form.sort" placeholder="请输入检查顺序" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="检查项类型" prop="type">
+              <el-select v-model="form.type" placeholder="请选择检查项类型">
+                <el-option v-for="item in options.typeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="24">
+            <el-form-item label="描述" prop="descride">
+              <el-input type="textarea" :minlength="2" v-model="form.descride" placeholder="请输入描述" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" :minlength="2" v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" v-if="opertype != 3">
+        <el-button @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </div>
+    </el-dialog>
+    <TheChouseDeviceInspect v-model="TheChouseDeviceInspectShow" :actionDialogId="actionDialogId" @refresh="getList()"></TheChouseDeviceInspect>
+  </div>
+</template>
+
+<script>
+import { default as TheChouseDeviceInspect } from './TheChouseDeviceInspect'
+import { listDeviceInspect2, removeBind, sortDeviceInspect } from '@/api/deviceManagement/deviceinspect'
+
+export default {
+  name: 'TheDeviceInspectTable',
+  components: {
+    TheChouseDeviceInspect
+  },
+  props: {
+    actionDialogId: {
+      type: Number
+    }
+  },
+  watch: {
+    actionDialogId: {
+      handler(newValue, oldValue) {
+        this.getList()
+      },
+      immediate: true
+    }
+  },
+  data() {
+    return {
+      checkType: [
+        {
+          label: '检查',
+          value: 1
+        },
+        {
+          label: '保养',
+          value: 2
+        }
+      ],
+      ids: [],
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: '',
+        Isbind: 1,
+        fkAccountId: -1
+      },
+      columns: [
+        { visible: true, prop: 'name', label: '名称' },
+        { visible: true, prop: 'image', label: '图片' },
+        { visible: true, prop: 'descride', label: '描述' },
+        { visible: true, prop: 'remark', label: '备注' },
+        { visible: true, prop: 'sort', label: '顺序' },
+        { visible: false, prop: 'createdBy', label: '创建人' },
+        { visible: false, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' }
+      ],
+      total: 0,
+      dataList: [],
+      defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)],
+      dictParams: [],
+      formRef: null,
+      title: '',
+      opertype: 0,
+      open: false,
+      form: {
+        id: null,
+        fkDeviceId: null,
+        image: null,
+        sort: null,
+        type: null,
+        remark: null,
+        status: null,
+        descride: null,
+        name: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      rules: {
+        name: [{ required: true, message: '检查项名称不能为空', trigger: 'change' }],
+        image: [{ required: true, message: '检查图片不能为空', trigger: 'change' }]
+      },
+      options: {
+        typeOptions: [
+          { dictLabel: '文本', dictValue: 1, listClass: 'success' },
+          { dictLabel: '多选', dictValue: 2, listClass: 'warning' },
+          { dictLabel: '文件', dictValue: 3, listClass: 'info' }
+        ],
+        statusOptions: []
+      },
+      TheChouseDeviceInspectShow: false
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      this.queryParams.fkAccountId = this.actionDialogId
+      listDeviceInspect2(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+    
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    
+    resetQuery() {
+      this.resetFields('queryRef')
+      this.handleQuery()
+    },
+    
+    handleRemoveBind(inspect_id) {
+      const data = {
+        account_id: this.actionDialogId,
+        inspect_id
+      }
+      
+      this.$confirm('是否确认取消关联？')
+        .then(() => {
+          return removeBind(data)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('取消成功！')
+        })
+        .catch(() => {})
+    },
+    
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    
+    reset() {
+      this.form = {
+        id: null,
+        fkDeviceId: null,
+        image: null,
+        sort: null,
+        type: null,
+        remark: null,
+        status: null,
+        descride: null,
+        name: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      }
+      this.resetFields('formRef')
+    },
+    
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加设备检查项'
+      this.opertype = 1
+    },
+    
+    handleChouse() {
+      this.TheChouseDeviceInspectShow = true
+    },
+    
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getDeviceInspect(id).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.open = true
+          this.title = '修改设备检查项'
+          this.opertype = 2
+          this.form = { ...data }
+        }
+      })
+    },
+    
+    submitForm() {
+      this.$refs.formRef.validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined && this.opertype === 2) {
+            updateDeviceInspect(this.form).then((res) => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addDeviceInspect(this.form).then((res) => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    
+    handleSortUp(id, index) {
+      let newList = []
+      const lastSort = index + 1
+      if (lastSort === 1) {
+        this.$modal.msgWarning('已是第一个!')
+        return
+      }
+      const list = this.dataList.map((item, index) => {
+        return {
+          fkInspectId: item.id,
+          fkAccountId: this.actionDialogId,
+          sort: index + 1
+        }
+      })
+      
+      let upSort = list[index - 1].sort
+      list[index - 1].sort = list[index].sort
+      list[index].sort = upSort
+      sortDeviceInspect(list).then(() => {
+        this.getList()
+      })
+    },
+    
+    handleSortDown(id, index) {
+      const lastSort = index + 1
+      const lastList = this.dataList
+      if (lastSort === lastList.length) {
+        this.$modal.msgWarning('已是最后一个!')
+        return
+      }
+      const list = this.dataList.map((item, index) => {
+        return {
+          fkInspectId: item.id,
+          fkAccountId: this.actionDialogId,
+          sort: index + 1
+        }
+      })
+      
+      let upSort = list[index + 1].sort
+      list[index + 1].sort = list[index].sort
+      list[index].sort = upSort
+      sortDeviceInspect(list).then(() => {
+        this.getList()
+      })
+    },
+    
+    handleChangeSort() {},
+    
+    columns_showColumn(prop) {
+      const column = this.columns.find(item => item.prop === prop)
+      return column ? column.visible : false
+    }
+  },
+  
+  mounted() {
+    this.handleQuery()
+  }
+}
+</script>
diff --git a/src/views/deviceManagement/deviceaccount/index.vue b/src/views/deviceManagement/deviceaccount/index.vue
new file mode 100644
index 0000000..81b5887
--- /dev/null
+++ b/src/views/deviceManagement/deviceaccount/index.vue
@@ -0,0 +1,561 @@
+<!--
+ * @Descripttion: (设备台账/device_account)
+ * @Author: (admin)
+ * @Date: (2024-05-20)
+-->
+<template>
+  <div>
+    <el-row>
+      <el-col :span="4">
+        <div style="margin-right: 10px">
+          <Typetree @selected="handlerTreeSelected"></Typetree>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <div>
+          <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input v-model.trim="queryParams.deviceName" placeholder="请输入设备名称" clearable />
+            </el-form-item>
+            <el-form-item label="设备规格" prop="deviceSpecification">
+              <el-input v-model.trim="queryParams.deviceSpecification" placeholder="请输入设备规格" clearable />
+            </el-form-item>
+            <el-form-item label="设备状态" prop="status">
+              <el-radio-group v-model="queryParams.status" @change="handleQuery">
+                <el-radio-button :value="-1"> 全部 </el-radio-button>
+                <el-radio-button v-for="item in options.statusOptions" :key="item.dictValue" :value="parseInt(item.dictValue)">
+                  {{ item.dictLabel }}
+                </el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item>
+              <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+              <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+            </el-form-item>
+          </el-form>
+          <!-- 工具区域 -->
+          <el-row :gutter="15" class="mb10">
+            <el-col :span="1.5">
+              <el-button type="primary" v-hasPermi="['deviceManagement:deviceaccount:add']" plain icon="el-icon-plus" @click="handleAdd">
+                {{ $t('btn.add') }}
+              </el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          </el-row>
+
+          <el-table
+            :data="dataList"
+            v-loading="loading"
+            ref="table"
+            border
+            header-cell-class-name="el-table-header-cell"
+            highlight-current-row
+            @sort-change="sortChange">
+            <el-table-column
+              prop="deviceName"
+              label="设备名称"
+              align="center"
+              min-width="120px"
+              :show-overflow-tooltip="true"
+              v-if="columns_showColumn('deviceName')" />
+            <el-table-column
+              prop="deviceCode"
+              label="设备编号"
+              align="center"
+              min-width="140px"
+              :show-overflow-tooltip="true"
+              v-if="columns_showColumn('deviceSpecification')" />
+            <el-table-column prop="deviceCode" label="设备二维码" align="center" width="80px" v-if="columns_showColumn('deviceCode')">
+              <template slot-scope="scope">
+                <qrcode-vue
+                  style="width: 36px; height: 36px"
+                  :id="scope.row.deviceCode"
+                  :value="scope.row.deviceCode"
+                  @click="downloadQrCode(scope.row.deviceCode)"></qrcode-vue>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="workshop"
+              label="所属车间"
+              align="center"
+              min-width="100px"
+              :show-overflow-tooltip="true"
+              v-if="columns_showColumn('workshop')" />
+            <el-table-column
+              prop="workline"
+              label="所属产线"
+              align="center"
+              min-width="100px"
+              :show-overflow-tooltip="true"
+              v-if="columns_showColumn('workline')" />
+            <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns_showColumn('deviceImage')">
+              <template slot-scope="scope">
+                <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="deviceFile"
+              label="设备文件"
+              align="center"
+              :show-overflow-tooltip="true"
+              v-if="columns_showColumn('deviceFile')">
+              <template slot-scope="scope">
+                <el-button type="success" size="small" :disabled="!scope.row.deviceFile" @click="handlerDownloadFile(scope.row.deviceFile)"
+                  >下载文件</el-button
+                >
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="responsiblePerson"
+              label="设备负责人"
+              align="center"
+              :show-overflow-tooltip="true"
+              v-if="columns_showColumn('responsiblePerson')" />
+            <el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('supplier')" />
+            <el-table-column
+              prop="purchaseTime"
+              label="购买时间"
+              align="center"
+              :show-overflow-tooltip="true"
+              v-if="columns_showColumn('purchaseTime')" />
+            <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('remark')" />
+            <el-table-column prop="status" label="设备状态" align="center" v-if="columns_showColumn('status')">
+              <template slot-scope="scope">
+                <dict-tag :options="options.statusOptions" :value="scope.row.status" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('createdBy')" />
+            <el-table-column
+              prop="createdTime"
+              label="创建时间"
+              align="center"
+              :show-overflow-tooltip="true"
+              v-if="columns_showColumn('createdTime')" />
+            <el-table-column prop="updatedBy" label="修改人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('updatedBy')" />
+            <el-table-column
+              prop="updatedTime"
+              label="修改时间"
+              align="center"
+              :show-overflow-tooltip="true"
+              v-if="columns_showColumn('updatedTime')" />
+            <el-table-column
+              prop="deviceSpecification"
+              label="设备规格"
+              align="center"
+              :show-overflow-tooltip="true"
+              v-if="columns_showColumn('deviceSpecification')" />
+            <el-table-column label="操作" width="240" fixed="right">
+              <template slot-scope="scope">
+                <el-button
+                  type="success"
+                  size="small"
+                  icon="el-icon-edit"
+                  title="编辑"
+                  v-hasPermi="['deviceManagement:deviceaccount:edit']"
+                  @click="handleUpdate(scope.row)"></el-button>
+                <el-button
+                  type="danger"
+                  size="small"
+                  icon="el-icon-delete"
+                  title="删除"
+                  v-hasPermi="['deviceManagement:deviceaccount:delete']"
+                  @click="handleDelete(scope.row)"></el-button>
+                <el-button type="warning" size="small" icon="el-icon-tickets" title="设备操作" @click="openTheDeviceActionDialog(scope.row.id)"
+                  >设备操作</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </div>
+      </el-col>
+    </el-row>
+    <!-- 添加或修改设备台账对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" v-model="open" :close-on-click-modal="false">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+        <!-- 按步骤填写数据 -->
+        <el-steps style="margin-bottom: 10px" :active="stepsActive" process-status="process" finish-status="success" :simple="true">
+          <el-step :title="$t('steps.000')" />
+          <el-step :title="$t('steps.001')" />
+          <!-- <el-step :title="$t('steps.002')" /> -->
+        </el-steps>
+        <el-row :gutter="20">
+          <!-- 步骤1填写 -->
+          <template v-if="stepsActive === 0">
+            <el-col :lg="12">
+              <el-form-item label="设备名称" prop="deviceName">
+                <el-input v-model.trim="form.deviceName" placeholder="请输入设备名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :lg="12">
+              <el-form-item label="设备编号" prop="deviceCode">
+                <el-input v-model="form.deviceCode" placeholder="设备编号（二维码）">
+                  <!-- <template slot="append">
+							<el-button type="primary" icon="el-icon-refresh" @click="handlerGenerateQRCode">
+								生成二维码
+							</el-button>
+						</template> -->
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :lg="12">
+              <el-form-item label="设备规格" prop="deviceSpecification">
+                <el-input v-model.trim="form.deviceSpecification" placeholder="请输入设备规格" />
+              </el-form-item>
+            </el-col>
+            <el-col :lg="12">
+              <el-form-item label="设备负责人" prop="responsiblePerson">
+                <el-input v-model.trim="form.responsiblePerson" placeholder="请输入设备负责人" />
+              </el-form-item>
+            </el-col>
+            <el-col :lg="12">
+              <el-form-item label="设备状态" prop="status">
+                <el-radio-group v-model="form.status">
+                  <el-radio v-for="item in options.statusOptions" :key="item.dictValue" :value="parseInt(item.dictValue)">
+                    {{ item.dictLabel }}
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+
+            <el-col :lg="12">
+              <el-form-item label="所属车间" prop="workshop">
+                <el-input v-model.trim="form.workshop" placeholder="请输入所属车间" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :lg="12">
+              <el-form-item label="所属产线" prop="workline">
+                <el-input v-model.trim="form.workline" placeholder="请输入所属产线" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :lg="12">
+              <el-form-item label="设备厂商" prop="supplier">
+                <el-input v-model.trim="form.supplier" placeholder="请输入设备厂商" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :lg="12">
+              <el-form-item label="购买时间" prop="purchaseTime">
+                <el-date-picker v-model="form.purchaseTime" type="datetime" placeholder="选择购买时间"></el-date-picker>
+              </el-form-item>
+            </el-col>
+
+            <el-col :lg="12">
+              <el-form-item label="设备类型" prop="fkDeviceType">
+                <TypeTreeSelect v-model="form.fkDeviceType" @selected="handlerDeviceTypeSelected"></TypeTreeSelect>
+              </el-form-item>
+            </el-col>
+            <el-col :lg="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input type="textarea" :minlength="2" v-model="form.remark" placeholder="请输入备注" />
+              </el-form-item>
+            </el-col>
+          </template>
+          <!-- 步骤2填写 -->
+          <template v-if="stepsActive === 1">
+            <el-col :lg="24">
+              <el-form-item label="设备图片" prop="deviceImage">
+                <UploadImage v-model="form.deviceImage" :data="{ uploadType: 1, filePath: 'device/account/image' }" :limit="1" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :lg="24">
+              <el-form-item label="设备文件" prop="deviceFile">
+                <UploadFile v-model="form.deviceFile" drag :data="{ uploadType: 1, filePath: 'device/account/file' }" :limit="1"></UploadFile>
+              </el-form-item>
+            </el-col>
+          </template>
+        </el-row>
+      </el-form>
+      <div slot="footer" v-if="opertype != 3">
+        <el-button @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button @click="stepsBack(0)" v-if="stepsActive > 0">{{ $t('btn.back') }}</el-button>
+        <el-button type="primary" @click="stepsNext(1)" v-if="stepsActive < 1">{{ $t('btn.next') }}</el-button>
+        <el-button type="primary" @click="submitForm" v-if="stepsActive == 1">{{ $t('btn.submit') }}</el-button>
+      </div>
+    </el-dialog>
+    <TheDeviceActionDialog v-model="open2" :actionDialogId="actionDialogId"></TheDeviceActionDialog>
+  </div>
+</template>
+
+<script>
+import {
+  listDeviceAccount,
+  addDeviceAccount,
+  delDeviceAccount,
+  updateDeviceAccount,
+  getDeviceAccount
+} from '@/api/deviceManagement/deviceaccount.js'
+import Typetree from '@/views/deviceManagement/components/BaseDeviceTypeTree'
+import TypeTreeSelect from '@/views/deviceManagement/components/BaseDeviceTypeTreeSelect'
+import TheDeviceActionDialog from './TheDeviceActionDialog'
+
+export default {
+  name: 'deviceaccount',
+  components: {
+    Typetree,
+    TypeTreeSelect,
+    TheDeviceActionDialog
+  },
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        status: -1,
+        fkDeviceType: 0
+      },
+      columns: [
+        { visible: false, prop: 'id', label: '设备台账id' },
+        { visible: true, prop: 'fkDeviceType', label: '设备类型' },
+        { visible: true, prop: 'deviceName', label: '设备名称' },
+        { visible: true, prop: 'deviceCode', label: '设备二维码编号' },
+        { visible: true, prop: 'workshop', label: '所属车间' },
+        { visible: true, prop: 'workline', label: '所属产线' },
+        { visible: true, prop: 'status', label: '设备状态' },
+        { visible: true, prop: 'deviceImage', label: '设备图片' },
+        { visible: false, prop: 'deviceFile', label: '设备文件' },
+        { visible: true, prop: 'deviceSpecification', label: '设备规格' },
+        { visible: true, prop: 'responsiblePerson', label: '设备负责人' },
+        { visible: false, prop: 'supplier', label: '设备厂商' },
+        { visible: false, prop: 'purchaseTime', label: '购买时间' },
+        { visible: false, prop: 'remark', label: '备注' },
+        { visible: false, prop: 'createdBy', label: '创建人' },
+        { visible: false, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' }
+      ],
+      total: 0,
+      dataList: [],
+      defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)],
+      dictParams: [],
+      title: '',
+      opertype: 0,
+      open: false,
+      form: {
+        id: null,
+        fkDeviceType: null,
+        deviceName: null,
+        deviceCode: null,
+        workshop: null,
+        workline: null,
+        status: 1,
+        deviceImage: null,
+        deviceFile: null,
+        deviceSpecification: null,
+        responsiblePerson: null,
+        supplier: null,
+        purchaseTime: null,
+        remark: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      rules: {
+        deviceImage: [{ required: true, message: '设备图片不能为空', trigger: 'change' }],
+        deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'change' }]
+      },
+      options: {
+        statusOptions: [
+          { dictLabel: '启用', dictValue: 1, listClass: 'success' },
+          { dictLabel: '停用', dictValue: 0, listClass: 'info' }
+        ]
+      },
+      stepsActive: 0,
+      loadingGenerateQRCode: false,
+      open2: false,
+      actionDialogId: 0
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      listDeviceAccount(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+    
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    
+    resetQuery() {
+      this.resetFields('queryRef')
+      this.queryParams.fkDeviceType = 0
+      this.handleQuery()
+    },
+    
+    sortChange(column) {
+      let sort = undefined
+      let sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+    
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    
+    reset() {
+      this.form = {
+        id: null,
+        fkDeviceType: null,
+        deviceName: null,
+        deviceCode: null,
+        workshop: null,
+        workline: null,
+        status: 1,
+        deviceImage: null,
+        deviceFile: null,
+        deviceSpecification: null,
+        responsiblePerson: null,
+        supplier: null,
+        purchaseTime: null,
+        remark: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      }
+      this.stepsActive = 0
+      this.resetFields('formRef')
+    },
+    
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加设备台账'
+      this.opertype = 1
+    },
+    
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getDeviceAccount(id).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.open = true
+          this.title = '修改设备台账'
+          this.opertype = 2
+          this.form = {
+            ...data
+          }
+        }
+      })
+    },
+    
+    FileUploadSuccess(fileList) {
+      console.log(fileList)
+    },
+    
+    submitForm() {
+      this.$refs.formRef.validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined && this.opertype === 2) {
+            updateDeviceAccount(this.form).then((res) => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addDeviceAccount(this.form).then((res) => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    
+    handleDelete(row) {
+      const Ids = row.id || this.ids
+
+      this.$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(() => {
+          return delDeviceAccount(Ids)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
+    },
+    
+    stepsNext(max = 2) {
+      if (this.stepsActive++ > max) this.stepsActive = max
+    },
+    
+    stepsBack(min = 0) {
+      if (this.stepsActive-- < min) this.stepsActive = min
+    },
+    
+    handlerGenerateQRCode() {
+      const id = this.form.id || '0'
+      const title = 'DEV-' + id + '-'
+      const str = title + Date.now()
+      this.form.deviceCode = str
+    },
+    
+    downloadQrCode(QRCode) {
+      this.$confirm('是否下载此二维码？')
+        .then(() => {
+          console.log(QRCode)
+          const canvas = document.getElementById(QRCode)
+          const link = document.createElement('a')
+          link.href = canvas.toDataURL('image/png')
+          link.download = '二维码' + QRCode
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link)
+        })
+        .catch(() => {})
+    },
+    
+    handlerDownloadFile(url) {
+      this.download(url)
+    },
+    
+    handlerTreeSelected(id) {
+      this.queryParams.fkDeviceType = id
+      this.handleQuery()
+    },
+    
+    handlerDeviceTypeSelected(id) {
+      this.form.fkDeviceType = id
+    },
+    
+    openTheDeviceActionDialog(id) {
+      this.open2 = true
+      this.actionDialogId = id
+    },
+    
+    columns_showColumn(prop) {
+      const column = this.columns.find(item => item.prop === prop)
+      return column ? column.visible : false
+    }
+  },
+  
+  mounted() {
+    this.handleQuery()
+  }
+}
+</script>
diff --git a/src/views/deviceManagement/deviceformconfig/index.vue b/src/views/deviceManagement/deviceformconfig/index.vue
new file mode 100644
index 0000000..e5bace1
--- /dev/null
+++ b/src/views/deviceManagement/deviceformconfig/index.vue
@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+      <el-form-item>
+        <el-button icon="el-icon-search" type="primary" @click="handleQuery" size="small">{{ $t('btn.search') }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery" size="small">{{ $t('btn.reset') }}</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" v-hasPermi="['deviceManagement:deviceformconfig:add']" plain icon="el-icon-plus"
+          @click="handleAdd">
+          {{ $t('btn.add') }}
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell"
+      highlight-current-row @sort-change="sortChange">
+      <el-table-column prop="type" label="表单类型" align="center" v-if="columns_showColumn('type')">
+        <template slot-scope="scope">
+          <dict-tag :options="options.typeOptions" :value="scope.row.type + ''" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="title" label="表单标题" align="center" :show-overflow-tooltip="true"
+        v-if="columns_showColumn('title')" />
+      <el-table-column prop="content" label="表单选项内容" align="center" :show-overflow-tooltip="true"
+        v-if="columns_showColumn('content')" />
+
+      <el-table-column label="操作" width="160">
+        <template slot-scope="scope">
+          <el-button type="success" size="small" icon="el-icon-edit" title="编辑"
+            v-hasPermi="['deviceManagement:deviceformconfig:edit']" @click="handleUpdate(scope.row)"></el-button>
+          <el-button type="danger" size="small" icon="el-icon-delete" title="删除"
+            v-hasPermi="['deviceManagement:deviceformconfig:delete']" @click="handleDelete(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改设备检查项表单配置表对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :lg="12">
+            <el-form-item label="表单类型" prop="type">
+              <el-select v-model="form.type" placeholder="请选择表单类型">
+                <el-option v-for="item in options.typeOptions" :key="item.dictValue" :label="item.dictLabel"
+                  :value="parseInt(item.dictValue)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="12">
+            <el-form-item label="表单标题" prop="content">
+              <el-input v-model="form.title" placeholder="请输入表单选项内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="12">
+            <el-form-item label="表单选项内容" prop="content">
+              <el-input v-model="form.content" placeholder="请输入表单选项内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" v-if="opertype != 3">
+        <el-button @click="cancel">{{ $t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getOneDict } from '@/utils/dict.js'
+import { listDeviceFormConfig, addDeviceFormConfig, delDeviceFormConfig, updateDeviceFormConfig, getDeviceFormConfig } from '@/api/deviceManagement/deviceformconfig.js'
+
+export default {
+  name: 'deviceformconfig',
+  props: {
+    message: {
+      type: Number
+    }
+  },
+  watch: {
+    message: {
+      handler(val) {
+        this.handleQuery()
+      },
+      immediate: true
+    }
+  },
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: false,
+      queryParams: {
+        fkDeviceInspectId: 0,
+        pageNum: 1,
+        pageSize: 10,
+        sort: '',
+        sortType: 'asc'
+      },
+      columns: [
+        { visible: true, prop: 'type', label: '表单类型' },
+        { visible: true, prop: 'title', label: '表单' },
+        { visible: true, prop: 'content', label: '表单选项内容' }
+      ],
+      total: 0,
+      dataList: [],
+      defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)],
+      dictParams: [],
+      formRef: null,
+      title: '',
+      opertype: 0,
+      open: false,
+      form: {
+        id: null,
+        fkDeviceInspectId: null,
+        type: null,
+        title: null,
+        content: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      rules: {
+        //id: [{ required: true, message: 'id 雪花不能为空', trigger: 'blur' }]
+      },
+      options: {
+        typeOptions: []
+      }
+    }
+  },
+  methods: {
+    getList() {
+      this.queryParams.fkDeviceInspectId = this.message
+
+      this.loading = true
+      listDeviceFormConfig(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+    
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    
+    resetQuery() {
+      this.resetFields('queryRef')
+      this.handleQuery()
+    },
+    
+    sortChange(column) {
+      var sort = undefined
+      var sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+    
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    
+    reset() {
+      this.form = {
+        id: null,
+        fkDeviceInspectId: null,
+        type: null,
+        title: null,
+        content: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      }
+      this.resetFields('formRef')
+    },
+    
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加设备检查项表单配置表'
+      this.opertype = 1
+      this.initDict()
+    },
+    
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getDeviceFormConfig(id).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.open = true
+          this.title = '修改设备检查项表单配置表'
+          this.opertype = 2
+          this.initDict()
+          this.form = { ...data }
+        }
+      })
+    },
+    
+    submitForm() {
+      this.$refs.formRef.validate((valid) => {
+        this.form.fkDeviceInspectId = this.message
+        console.log('form.value.fkDeviceInspectId', this.form.fkDeviceInspectId)
+        if (valid) {
+          if (this.form.id != undefined && this.opertype === 2) {
+            updateDeviceFormConfig(this.form).then((res) => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addDeviceFormConfig(this.form).then((res) => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    
+    handleDelete(row) {
+      const Ids = row.id || this.ids
+
+      this.$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(() => {
+          return delDeviceFormConfig(Ids)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
+    },
+    
+    initDict() {
+      const dictSelectList = ['mes_device_inspect_form_config']
+      getOneDict(dictSelectList[0]).then((statusRes) => {
+        if (statusRes.code === 200) {
+          this.options.typeOptions = statusRes.data[0].list
+        }
+      })
+    },
+    
+    columns_showColumn(prop) {
+      const column = this.columns.find(item => item.prop === prop)
+      return column ? column.visible : false
+    }
+  },
+  
+  mounted() {
+    var dictParams = [{ dictType: 'mes_device_inspect_form_config', columnName: 'typeOptions' }]
+    this.getDicts(dictParams).then((response) => {
+      console.log(response)
+      response.data.forEach((element) => {
+        this.options[element.columnName] = element.list.map((item) => {
+          item.dictValue = parseInt(item.dictValue)
+          return item
+        })
+      })
+    })
+    
+    this.handleQuery()
+  }
+}
+</script>
diff --git a/src/views/deviceManagement/deviceinspect/index.vue b/src/views/deviceManagement/deviceinspect/index.vue
new file mode 100644
index 0000000..b4d96ed
--- /dev/null
+++ b/src/views/deviceManagement/deviceinspect/index.vue
@@ -0,0 +1,383 @@
+<template>
+  <div>
+    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+      <el-form-item label="检查项名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入设备类型名称" clearable />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="status">
+        <el-select style="width: 200px" v-model="queryParams.status" placeholder="选择" clearable>
+          <el-option v-for="status in statusList" :key="status.value" :label="status.label" :value="status.value" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="检查类型" prop="status">
+        <el-select style="width: 200px" v-model="queryParams.type" placeholder="选择" clearable>
+          <el-option v-for="status in checkType" :key="status.value" :label="status.label" :value="status.value" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" v-hasPermi="['deviceManagement:deviceinspect:add']" plain icon="el-icon-plus" @click="handleAdd">
+          {{ $t('btn.add') }}
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table
+      :data="dataList"
+      v-loading="loading"
+      ref="table"
+      border
+      header-cell-class-name="el-table-header-cell"
+      highlight-current-row
+      @sort-change="sortChange">
+      <el-table-column type="index" width="50" label="#" />
+      <el-table-column prop="name" label="名称" width="480" v-if="columns_showColumn('id')" />
+      <el-table-column prop="image" label="图片" align="center" v-if="columns_showColumn('image')">
+        <template slot-scope="scope">
+          <ImagePreview :src="scope.row.image"></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column prop="type" label="类别" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('type')">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.type == 1">检查</el-tag>
+          <el-tag type="primary" v-else-if="scope.row.type == 2">保养</el-tag>
+          <el-tag type="danger" v-else>异常</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('remark')" />
+      <el-table-column prop="status" label="检查项状态" align="center" v-if="columns_showColumn('status')">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.status == 1">启用</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == 0">停用</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="descride" label="描述" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('descride')" />
+      <el-table-column prop="name" label="检查项名称" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('name')" />
+
+      <el-table-column label="操作" width="160">
+        <template slot-scope="scope">
+          <el-button
+            type="success"
+            size="small"
+            icon="el-icon-edit"
+            title="编辑"
+            v-hasPermi="['deviceManagement:deviceinspect:edit']"
+            @click="handleUpdate(scope.row)"></el-button>
+          <el-button
+            type="danger"
+            size="small"
+            icon="el-icon-delete"
+            title="删除"
+            v-hasPermi="['deviceManagement:deviceinspect:delete']"
+            @click="handleDelete(scope.row)"></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改设备检查项对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" v-model="open">
+      <!-- 基本信息 -->
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :lg="12">
+            <el-form-item label="检查项名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入检查项名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :lg="24">
+            <el-form-item label="描述" prop="descride">
+              <el-input v-model="form.descride" placeholder="请输入描述" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="24">
+            <el-form-item label="图片" prop="image">
+              <UploadImage v-model="form.image" :data="{ uploadType: 1, filePath: 'device/inspect' }" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="类型" prop="status">
+              <el-select v-model="form.type" placeholder="选择" clearable>
+                <el-option v-for="status in checkType" :key="status.value" :label="status.label" :value="status.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="检查项状态" prop="status">
+              <el-select v-model="form.status" placeholder="选择" clearable>
+                <el-option v-for="status in statusList" :key="status.value" :label="status.label" :value="status.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12">
+            <el-form-item label="检查表单" prop="type" v-show="opertype == 2">
+              <el-button type="primary" @click="open_form_dialog">配置表单</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template slot="footer" v-if="opertype != 3">
+        <el-button text @click="cancel">取消</el-button>
+        <el-button type="success" @click="submitForm">完成</el-button>
+      </template>
+    </el-dialog>
+    <el-dialog title="检查项表单配置" :lock-scroll="false" v-model="open_form">
+      <formconfig v-bind:message="parentMessage"></formconfig>
+      <template slot="footer">
+        <el-button type="success" @click="open_form = false">完成</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDeviceInspect, addDeviceInspect, delDeviceInspect, updateDeviceInspect, getDeviceInspect } from '@/api/deviceManagement/deviceinspect'
+import formconfig from '@/views/deviceManagement/deviceformconfig/index'
+
+export default {
+  name: 'deviceinspect',
+  components: {
+    formconfig
+  },
+  data() {
+    return {
+      ids: [],
+      loading: false,
+      showSearch: true,
+      queryParams: {
+        name: '',
+        status: 1,
+        type: 1,
+        pageNum: 1,
+        pageSize: 10,
+        sort: '',
+        sortType: 'asc'
+      },
+      columns: [
+        { visible: true, prop: 'id', label: 'id' },
+        { visible: true, prop: 'fkDeviceId', label: '设备id' },
+        { visible: true, prop: 'image', label: '图片' },
+        { visible: true, prop: 'sort', label: '检查顺序' },
+        { visible: true, prop: 'type', label: '检查项类型（重点）' },
+        { visible: true, prop: 'remark', label: '备注' },
+        { visible: true, prop: 'status', label: '检查项状态' },
+        { visible: true, prop: 'descride', label: '描述' },
+        { visible: false, prop: 'name', label: '检查项名称' },
+        { visible: false, prop: 'createdBy', label: '创建人' },
+        { visible: false, prop: 'createdTime', label: '创建时间' },
+        { visible: false, prop: 'updatedBy', label: '更新人' },
+        { visible: false, prop: 'updatedTime', label: '更新时间' }
+      ],
+      total: 0,
+      dataList: [],
+      defaultTime: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)],
+      open_form: false,
+      parentMessage: 0,
+      statusList: [
+        {
+          label: '启用',
+          value: 1
+        },
+        {
+          label: '停用',
+          value: 0
+        },
+        {
+          label: ' ',
+          value: -1
+        }
+      ],
+      checkType: [
+        {
+          label: '检查',
+          value: 1
+        },
+        {
+          label: '保养',
+          value: 2
+        }
+      ],
+      title: '',
+      opertype: 0,
+      open: false,
+      form: {
+        id: null,
+        fkDeviceId: null,
+        image: null,
+        sort: null,
+        type: 1,
+        remark: null,
+        status: 1,
+        descride: null,
+        name: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      },
+      rules: {},
+      options: {
+        typeOptions: [],
+        statusOptions: []
+      }
+    }
+  },
+  mounted() {
+    this.handleQuery()
+    // 使用字典
+    var dictParams = [{ dictType: 'mes_device_inspect_form_config', columnName: 'typeOptions' }]
+    this.getDicts(dictParams).then((response) => {
+      response.data.forEach((element) => {
+        this.options[element.columnName] = element.list
+      })
+    })
+  },
+  methods: {
+    columns_showColumn(prop) {
+      return this.columns.some(column => column.prop === prop && column.visible)
+    },
+    getList() {
+      this.loading = true
+      listDeviceInspect(this.queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.dataList = data.result
+          this.total = data.totalNum
+          this.loading = false
+        }
+      })
+    },
+    // 查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    // 重置查询操作
+    resetQuery() {
+      this.resetForm('queryRef')
+      this.handleQuery()
+    },
+    // 自定义排序
+    sortChange(column) {
+      var sort = undefined
+      var sortType = undefined
+
+      if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+      }
+      this.queryParams.sort = sort
+      this.queryParams.sortType = sortType
+      this.handleQuery()
+    },
+    // 关闭dialog
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 重置表单
+    reset() {
+      this.form = {
+        id: null,
+        fkDeviceId: null,
+        image: null,
+        sort: null,
+        type: 1,
+        remark: null,
+        status: 1,
+        descride: null,
+        name: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      }
+      this.resetForm('formRef')
+    },
+    // 添加按钮操作
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加设备检查项'
+      this.opertype = 1
+    },
+    // 修改按钮操作
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getDeviceInspect(id).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+          this.open = true
+          this.title = '修改设备检查项'
+          this.opertype = 2
+          this.form = {
+            ...data
+          }
+        }
+      })
+    },
+    // 添加&修改 表单提交
+    submitForm() {
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined && this.opertype === 2) {
+            updateDeviceInspect(this.form).then((res) => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addDeviceInspect(this.form).then((res) => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    // 删除按钮操作
+    handleDelete(row) {
+      const Ids = row.id || this.ids
+
+      this
+        .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(function () {
+          return delDeviceInspect(Ids)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
+    },
+    // 打开表单
+    open_form_dialog() {
+      if (this.form.id != undefined && this.opertype === 2) {
+        this.open_form = true
+        // 父组件向子组件传值
+        this.parentMessage = this.form.id
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManagement/devicetype/index.vue b/src/views/deviceManagement/devicetype/index.vue
new file mode 100644
index 0000000..1ff9d20
--- /dev/null
+++ b/src/views/deviceManagement/devicetype/index.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="app-container">
+    <!-- 功能区 -->
+    <div>
+      <el-form :model="queryParams" ref="queryForm" size="large" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="类型名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入设备类型名称" clearable />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select style="width:200px;" v-model="queryParams.status" placeholder="选择" clearable>
+            <el-option v-for="status in statusList" :key="status.value" :label="status.label" :value="status.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="large" @click="SearchQuery">搜索</el-button>
+          <el-button size="large" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div>
+      <vxe-table
+        border="inner"
+        ref="tableRef"
+        :column-config="{ resizable: true }"
+        :tree-config="{ transform: true, rowField: 'id', parentField: 'parentId', expandAll: true }"
+        :data="tableData">
+        <!-- <vxe-column field="id" title="id"></vxe-column>
+        <vxe-column field="parentId" title="父id"></vxe-column> -->
+        <vxe-column field="name" title="名称" tree-node></vxe-column>
+        <vxe-column field="status" title="状态">
+          <template #default="{ row }">
+            <el-tag type="success" v-if="row.status == 1">启动</el-tag>
+            <el-tag type="danger" v-if="row.status == 0">停止</el-tag>
+          </template></vxe-column
+        >
+        <vxe-column field="remark" title="备注"></vxe-column>
+        <vxe-column title="操作">
+          <template #default="scope">
+            <el-button-group>
+              <el-button text size="small" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button text size="small" icon="Plus" @click="handleAdd(scope.row)"></el-button>
+              <el-button text size="small" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+            </el-button-group>
+          </template>
+        </vxe-column>
+      </vxe-table>
+    </div>
+
+    <el-dialog :title="title" v-model="open" width="720px" append-to-body>
+      <el-form ref="menuRef" :model="form" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="名称"><el-input v-model="form.name" placeholder="请输入设备类型名称" clearable /> </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-select v-model="form.status" placeholder="选择" clearable>
+                <el-option v-for="status in statusList" :key="status.value" :label="status.label" :value="status.value" />
+              </el-select> </el-form-item
+          ></el-col>
+        </el-row>
+        <el-row>
+          <el-col :lg="24"
+            ><el-form-item label="备注"><el-input v-model="form.remark" placeholder="请输入设备类型名称" clearable /> </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button text @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="devicetype">
+import * as API_devicetype from '@/api/deviceManagement/devicetype'
+const { proxy } = getCurrentInstance()
+const queryParams = reactive({
+  name: '',
+  status: 1
+})
+const tableData = ref([])
+const showSearch = ref(true)
+const statusList = reactive([
+  {
+    label: '启用',
+    value: 1
+  },
+  {
+    label: '停用',
+    value: 0
+  },
+  {
+    label: '全部',
+    value: -1
+  }
+])
+
+const title = ref('')
+const open = ref(false)
+const form = ref({
+  name: '',
+  status: 1,
+  remark: ''
+})
+
+// *********************function*****************************onMounted
+onMounted(() => {
+  getList()
+})
+function getList() {
+  API_devicetype.getList(queryParams).then((res) => {
+    if (res.code == 200) {
+      tableData.value = res.data
+    }
+  })
+}
+
+function SearchQuery() {
+  getList()
+}
+function resetQuery() {
+  ;(queryParams.name = ''), (queryParams.status = -1)
+}
+
+function handleUpdate(row) {
+  try {
+    title.value = '修改'
+    open.value = true
+    form.value = row
+  } catch (error) {
+    console.log('error', error)
+  }
+}
+
+function handleAdd(row) {
+  ;(title.value = '增加'), (open.value = true)
+  let temp = row.id
+  reset()
+  form.value.parentId = temp
+}
+
+function handleDelete(row) {
+  proxy.$modal
+    .confirm('是否确认删除名称为"' + row.name + '"的数据项?')
+    .then(function () {
+      return API_devicetype.deleteDevicetype(row.id)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+function cancel() {
+  open.value = false
+  reset()
+}
+
+function submitForm() {
+  if (form.value.id >= 0) {
+    const query = { ...form.value }
+    //修改
+    API_devicetype.updateDevicetype(query).then((res) => {
+      if (res.code == 200) {
+        getList()
+        open.value = false
+      }
+    })
+  } else {
+    const query = { ...form.value }
+    // 增加
+    API_devicetype.addDevicetype(query).then((res) => {
+      if (res.code == 200) {
+        getList()
+        open.value = false
+      }
+    })
+  }
+}
+
+function reset() {
+  form.value = {
+    id: -10000,
+    parentId: 0,
+    name: '',
+    status: 1,
+    remark: ''
+  }
+}
+
+function handleCustomEvent(data) {
+  console.log('data', data)
+}
+</script>
+
+<style lang="scss" scoped></style>