From a382d27081754fddeb47cdf38ce4e4a865572d96 Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Wed, 18 Feb 2026 11:00:20 +0800
Subject: [PATCH] 新增设备查看会话记录功能，扩展相关实体和接口，更新文档以支持内容名称和设备名称的解析，优化前端页面以展示新字段。

---
 uniapp_jiju/pages/myDevice/detail.vue                                                             |   3 +++
 uniapp_jiju/pages/new/bjzc/detail.vue                                                             |   3 +++
 uniapp_jiju/pages/new/gzpc/detail.vue                                                             |   3 +++
 uniapp_jiju/pages/new/pxzs/detail.vue                                                             |   3 +++
 uniapp_jiju/pages/new/zlgl/detail.vue                                                             |   4 ++++
 uniapp_jiju/pages/new/zsk/detail.vue                                                              |   3 +++
 机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/SbRecordsListOutput.cs |  12 +++++++++++-
 机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/SbRecordsEntity.cs  |  12 ++++++++++++
 机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ISbRecordsService.cs    |   8 +++++---
 机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend/SbRecordsService.cs                | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 机具（管理端）/src/views/sbRecords/index.vue                                               |  13 ++++++++-----
 11 files changed, 183 insertions(+), 19 deletions(-)

diff --git a/uniapp_jiju/pages/myDevice/detail.vue b/uniapp_jiju/pages/myDevice/detail.vue
index b89074e..60d6c06 100644
--- a/uniapp_jiju/pages/myDevice/detail.vue
+++ b/uniapp_jiju/pages/myDevice/detail.vue
@@ -85,7 +85,9 @@
 </template>
 
 <script>
+import viewRecordMixin from '@/common/mixins/viewRecordMixin.js'
 export default {
+  mixins: [viewRecordMixin],
   data() {
     return {
       detail: {},
@@ -141,6 +143,7 @@ export default {
         if (res && res.code === 200 && res.data) {
           this.detail = res.data || {}
           console.log('设备详情数据详情', this.detail)
+          this.startViewTracking(deviceId, '我的设备', this.detail.sbmc, this.detail.sbmc)
           
           // 设备图片：KhsbInfoOutput 中 sbtp 是 List<FileControlsModel>
           // FileControlsModel: { name, fileId, url }
diff --git a/uniapp_jiju/pages/new/bjzc/detail.vue b/uniapp_jiju/pages/new/bjzc/detail.vue
index 9e91728..6ee3d5d 100644
--- a/uniapp_jiju/pages/new/bjzc/detail.vue
+++ b/uniapp_jiju/pages/new/bjzc/detail.vue
@@ -185,7 +185,9 @@
 </template>
 
 <script>
+	import viewRecordMixin from '@/common/mixins/viewRecordMixin.js'
 	export default {
+		mixins: [viewRecordMixin],
 		data() {
 			return {
 				list: ['基础资料', '随机工具',"一年备件",'两年备件'],
@@ -253,6 +255,7 @@
 						}
 					}
 					this.info = resData
+					this.startViewTracking(this.info.id || data.id, '备件支持', this.info.mc, this.info.glcpmc)
 				}).catch(err => {
 					uni.showToast({ title: err.msg || err.message || '无权限查看或加载失败', icon: 'none' })
 					setTimeout(() => uni.navigateBack(), 1500)
diff --git a/uniapp_jiju/pages/new/gzpc/detail.vue b/uniapp_jiju/pages/new/gzpc/detail.vue
index b865c51..9d7c987 100644
--- a/uniapp_jiju/pages/new/gzpc/detail.vue
+++ b/uniapp_jiju/pages/new/gzpc/detail.vue
@@ -145,7 +145,9 @@
 </template>
 
 <script>
+	import viewRecordMixin from '@/common/mixins/viewRecordMixin.js'
 	export default {
+		mixins: [viewRecordMixin],
 		data() {
 			return {
 				list: ['故障信息', '故障排查'],
@@ -184,6 +186,7 @@
 							}
 						}
 						this.info = res.data
+						this.startViewTracking(this.info.id || data.id, '故障排查', this.info.code, this.info.sbmc)
 					}
 				}).catch(err => {
 					uni.showToast({ title: err.msg || err.message || '无权限查看或加载失败', icon: 'none' })
diff --git a/uniapp_jiju/pages/new/pxzs/detail.vue b/uniapp_jiju/pages/new/pxzs/detail.vue
index ae56e85..c2a4ff4 100644
--- a/uniapp_jiju/pages/new/pxzs/detail.vue
+++ b/uniapp_jiju/pages/new/pxzs/detail.vue
@@ -74,7 +74,9 @@
 </template>
 
 <script>
+	import viewRecordMixin from '@/common/mixins/viewRecordMixin.js'
 	export default {
+		mixins: [viewRecordMixin],
 		data() {
 			return {
 				list: ['基础资料', '相关资料'],
@@ -111,6 +113,7 @@
 							)
 						}
 						this.info = res.data
+						this.startViewTracking(this.info.id || data.id, '培训展示', this.info.pxmc, this.info.sbmc)
 					}
 				}).catch(err => {
 					uni.showToast({ title: err.msg || err.message || '无权限查看或加载失败', icon: 'none' })
diff --git a/uniapp_jiju/pages/new/zlgl/detail.vue b/uniapp_jiju/pages/new/zlgl/detail.vue
index 638ea19..b213f4f 100644
--- a/uniapp_jiju/pages/new/zlgl/detail.vue
+++ b/uniapp_jiju/pages/new/zlgl/detail.vue
@@ -250,7 +250,9 @@
 </template>
 
 <script>
+	import viewRecordMixin from '@/common/mixins/viewRecordMixin.js'
 	export default {
+		mixins: [viewRecordMixin],
 		data() {
 			return {
 				list: ['基础资料','技术资料', '质量资料','其他资料'],
@@ -272,6 +274,7 @@
 						this.info = res.data
 						// 处理附件字段
 						this.processAttachments()
+						this.startViewTracking(this.info.id, '资料管理', this.info.zlm, this.info.zlm)
 					}
 				}).catch(err => {
 					console.error('获取资料管理详情失败:', err)
@@ -281,6 +284,7 @@
 			} else {
 				// 如果没有 id，直接处理存储的数据
 				this.processAttachments()
+				if (this.info.id) this.startViewTracking(this.info.id, '资料管理', this.info.zlm, this.info.zlm)
 			}
 		},
 		methods: {
diff --git a/uniapp_jiju/pages/new/zsk/detail.vue b/uniapp_jiju/pages/new/zsk/detail.vue
index b9961ae..4099451 100644
--- a/uniapp_jiju/pages/new/zsk/detail.vue
+++ b/uniapp_jiju/pages/new/zsk/detail.vue
@@ -136,7 +136,9 @@
 
 <script>
 import service from '@/service/service.js'
+import viewRecordMixin from '@/common/mixins/viewRecordMixin.js'
 export default {
+	mixins: [viewRecordMixin],
 	data() {
 		return {
 			list: ['基础资料', '相关资料'],
@@ -183,6 +185,7 @@ methods: {
 			this.API.zskxq({ id: this.id, n: Date.now() }).then(res=>{
 				console.log("知识详情数据:", res);
 				this.detail = res.data || { sbm: '', gg: '', gy: '', sbjs: '', fl: '', fj1: [], fj2: [] }
+				this.startViewTracking(this.detail.id || this.id, '知识库', this.detail.sbm)
 				
 				// 确保附件字段是数组
 				if (!Array.isArray(this.detail.fj1)) {
diff --git a/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/SbRecordsListOutput.cs b/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/SbRecordsListOutput.cs
index f8651a7..a3ba5ba 100644
--- a/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/SbRecordsListOutput.cs
+++ b/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/SbRecordsListOutput.cs
@@ -48,7 +48,17 @@ namespace NCC.Extend.Entitys.Dto.SbRecords
         public string type { get; set; }
 
         /// <summary>
-        /// 关联设备（原关联记录，展示设备名称）
+        /// 查看内容（故障代码、知识名、资料名、备件名、培训名等）
+        /// </summary>
+        public string contentName { get; set; }
+
+        /// <summary>
+        /// 设备名称（所属设备、关联产品名；优先 F_DeviceName，无则根据 reId 查表）
+        /// </summary>
+        public string deviceName { get; set; }
+
+        /// <summary>
+        /// 关联设备（兼容旧逻辑，展示设备名称；优先使用 deviceName）
         /// </summary>
         public string equipmentName { get; set; }
 
diff --git a/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/SbRecordsEntity.cs b/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/SbRecordsEntity.cs
index e419647..0b5268a 100644
--- a/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/SbRecordsEntity.cs
+++ b/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Entity/SbRecordsEntity.cs
@@ -70,6 +70,18 @@ namespace NCC.Extend.Entitys
         /// </summary>
         [SugarColumn(ColumnName = "F_Type")]        
         public string Type { get; set; }
+
+        /// <summary>
+        /// 查看内容（故障代码、知识名、资料名、备件名、培训名等）
+        /// </summary>
+        [SugarColumn(ColumnName = "F_ContentName")]
+        public string ContentName { get; set; }
+
+        /// <summary>
+        /// 设备名称（所属设备、关联产品名，便于「记录类型+设备名称+查看内容」三字段定位）
+        /// </summary>
+        [SugarColumn(ColumnName = "F_DeviceName")]
+        public string DeviceName { get; set; }
         
     }
 }
\ No newline at end of file
diff --git a/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ISbRecordsService.cs b/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ISbRecordsService.cs
index eaebcad..8c95505 100644
--- a/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ISbRecordsService.cs
+++ b/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend.Interfaces/ISbRecordsService.cs
@@ -7,12 +7,14 @@ namespace NCC.Extend.Interfaces.SbRecords
         /// <summary>
         /// 开始一条设备查看会话记录（进入页面时调用）。
         /// </summary>
-        /// <param name="reId">关联记录 Id，一般为设备 Id。</param>
-        /// <param name="type">记录类型，例如“查看设备”。</param>
+        /// <param name="reId">关联记录 Id，对应不同 type 下的业务表主键。</param>
+        /// <param name="type">记录类型，如：故障排查、知识库、我的设备、资料管理、备件支持、培训展示、查看设备。</param>
+        /// <param name="contentName">查看内容（故障代码、知识名、资料名等；可选）；未传时根据 type+reId 从对应表自动查询。</param>
+        /// <param name="deviceName">设备名称（所属设备、关联产品名；可选）；未传时根据 type+reId 从对应表自动查询。</param>
         /// <param name="item1">备用字段1，可选。</param>
         /// <param name="item2">备用字段2，可选。</param>
         /// <returns>返回新建记录的 Id（后续结束会话时使用）。</returns>
-        Task<string> StartViewRecordAsync(string reId, string type, string item1 = null, string item2 = null);
+        Task<string> StartViewRecordAsync(string reId, string type, string contentName = null, string deviceName = null, string item1 = null, string item2 = null);
 
         /// <summary>
         /// 结束一条设备查看会话记录（离开页面时调用），并计算停留时长。
diff --git a/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend/SbRecordsService.cs b/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend/SbRecordsService.cs
index 3600689..0bcea7b 100644
--- a/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend/SbRecordsService.cs
+++ b/机具（服务端）/netcore/src/Modularity/Extend/NCC.Extend/SbRecordsService.cs
@@ -52,15 +52,20 @@ namespace NCC.Extend.SbRecords
         /// <summary>
         /// 开始一条设备查看会话记录（进入页面时调用）。
         /// </summary>
-        /// <param name="reId">关联记录 Id，一般为设备 Id。</param>
-        /// <param name="type">记录类型，例如“查看设备”。</param>
+        /// <param name="reId">关联记录 Id，对应不同 type 下的业务表主键。</param>
+        /// <param name="type">记录类型，如：故障排查、知识库、我的设备、资料管理、备件支持、培训展示、查看设备。</param>
+        /// <param name="contentName">查看内容（故障代码、知识名、资料名等；可选）；未传时根据 type+reId 从对应表自动查询。</param>
+        /// <param name="deviceName">设备名称（所属设备、关联产品名；可选）；未传时根据 type+reId 从对应表自动查询。</param>
         /// <param name="item1">备用字段1，可选。</param>
         /// <param name="item2">备用字段2，可选。</param>
         /// <returns>返回新建记录的 Id（后续结束会话时使用）。</returns>
         [HttpPost("Actions/StartViewRecord")]
-        public async Task<string> StartViewRecordAsync(string reId, string type, string item1 = null, string item2 = null)
+        public async Task<string> StartViewRecordAsync([FromForm] string reId, [FromForm] string type, [FromForm] string contentName = null, [FromForm] string deviceName = null, [FromForm] string item1 = null, [FromForm] string item2 = null)
         {
             var now = DateTime.Now;
+            var resolvedContentName = !string.IsNullOrWhiteSpace(contentName) ? contentName : await ResolveContentNameAsync(type, reId);
+            var resolvedDeviceName = !string.IsNullOrWhiteSpace(deviceName) ? deviceName : await ResolveDeviceNameAsync(type, reId);
+
             var entity = new SbRecordsEntity
             {
                 Id = YitIdHelper.NextId().ToString(),
@@ -72,7 +77,9 @@ namespace NCC.Extend.SbRecords
                 Enable = true,
                 Item1 = item1,
                 Item2 = item2,
-                Type = type
+                Type = type,
+                ContentName = resolvedContentName,
+                DeviceName = resolvedDeviceName
             };
 
             var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
@@ -82,12 +89,119 @@ namespace NCC.Extend.SbRecords
         }
 
         /// <summary>
+        /// 根据 type 和 reId 从对应业务表解析内容名称。
+        /// </summary>
+        private async Task<string> ResolveContentNameAsync(string type, string reId)
+        {
+            if (string.IsNullOrWhiteSpace(reId)) return null;
+            var t = (type ?? "").Trim();
+
+            if (t.Contains("故障排查") || t.Contains("故障查询"))
+            {
+                var gz = await _db.Queryable<GzcxEntity>().Where(x => x.Id == reId).Select(x => x.Code).FirstAsync();
+                return gz;
+            }
+            if (t.Contains("知识库"))
+            {
+                var z = await _db.Queryable<ZskEntity>().Where(x => x.Id == reId).Select(x => x.Sbm).FirstAsync();
+                return z;
+            }
+            if (t.Contains("我的设备"))
+            {
+                var k = await _db.Queryable<KhsbEntity>().Where(x => x.Id == reId).Select(x => x.Sbmc).FirstAsync();
+                return k;
+            }
+            if (t.Contains("资料管理"))
+            {
+                var zl = await _db.Queryable<ZlglEntity>().Where(x => x.Id == reId).Select(x => x.Zlm).FirstAsync();
+                return zl;
+            }
+            if (t.Contains("备件支持"))
+            {
+                var b = await _db.Queryable<BjxxEntity>().Where(x => x.Id == reId).Select(x => x.Mc).FirstAsync();
+                return b;
+            }
+            if (t.Contains("培训展示"))
+            {
+                var p = await _db.Queryable<PxzsEntity>().Where(x => x.Id == reId).Select(x => x.Pxmc ?? x.Sbmc).FirstAsync();
+                return p;
+            }
+            if (t.Contains("查看设备"))
+            {
+                var zs = await _db.Queryable<ZsbtzEntity>().Where(x => x.Id == reId).Select(x => x.Sbmc).FirstAsync();
+                if (!string.IsNullOrEmpty(zs)) return zs;
+                var kh = await _db.Queryable<KhsbEntity>().Where(x => x.Id == reId).Select(x => x.Sbmc).FirstAsync();
+                return kh;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 根据 type 和 reId 从对应业务表解析设备名称（所属设备、关联产品名）。
+        /// </summary>
+        private async Task<string> ResolveDeviceNameAsync(string type, string reId)
+        {
+            if (string.IsNullOrWhiteSpace(reId)) return null;
+            var t = (type ?? "").Trim();
+
+            if (t.Contains("故障排查") || t.Contains("故障查询"))
+            {
+                var gz = await _db.Queryable<GzcxEntity>().Where(x => x.Id == reId).Select(x => x.Sbmc).FirstAsync();
+                return gz;
+            }
+            if (t.Contains("知识库"))
+            {
+                var z = await _db.Queryable<ZskEntity>().Where(x => x.Id == reId).Select(x => x.Sssb).FirstAsync();
+                if (string.IsNullOrEmpty(z)) return null;
+                var cp = await _db.Queryable<CpglEntity>().Where(c => c.Id == z || c.Cpid == z).Select(c => c.Cpmc).FirstAsync();
+                return cp;
+            }
+            if (t.Contains("我的设备"))
+            {
+                var k = await _db.Queryable<KhsbEntity>().Where(x => x.Id == reId).Select(x => x.Sbmc).FirstAsync();
+                return k;
+            }
+            if (t.Contains("资料管理"))
+            {
+                var zl = await _db.Queryable<ZlglEntity>().Where(x => x.Id == reId).Select(x => x.Zlm).FirstAsync();
+                return zl;
+            }
+            if (t.Contains("备件支持"))
+            {
+                var b = await _db.Queryable<BjxxEntity>().Where(x => x.Id == reId).Select(x => x.Sssb).FirstAsync();
+                if (string.IsNullOrEmpty(b)) return null;
+                var cp = await _db.Queryable<CpglEntity>().Where(c => c.Id == b || c.Cpid == b).Select(c => c.Cpmc).FirstAsync();
+                if (!string.IsNullOrEmpty(cp)) return cp;
+                var zl = await _db.Queryable<ZlglEntity>().Where(z => z.Id == b).Select(z => new { z.Zlm, z.Fl }).FirstAsync();
+                if (zl != null && !string.IsNullOrEmpty(zl.Fl))
+                {
+                    var cpmc = await _db.Queryable<CpglEntity>().Where(c => c.Id == zl.Fl).Select(c => c.Cpmc).FirstAsync();
+                    if (!string.IsNullOrEmpty(cpmc)) return cpmc;
+                }
+                return zl?.Zlm;
+            }
+            if (t.Contains("培训展示"))
+            {
+                var p = await _db.Queryable<PxzsEntity>().Where(x => x.Id == reId).Select(x => x.Sbmc).FirstAsync();
+                return p;
+            }
+            if (t.Contains("查看设备"))
+            {
+                var zs = await _db.Queryable<ZsbtzEntity>().Where(x => x.Id == reId).Select(x => x.Sbmc).FirstAsync();
+                if (!string.IsNullOrEmpty(zs)) return zs;
+                var kh = await _db.Queryable<KhsbEntity>().Where(x => x.Id == reId).Select(x => x.Sbmc).FirstAsync();
+                return kh;
+            }
+            return null;
+        }
+
+        /// <summary>
         /// 结束一条设备查看会话记录（离开页面时调用），并计算停留时长。
         /// </summary>
         /// <param name="recordId">开始会话时返回的记录 Id。</param>
         /// <returns>返回是否更新成功。</returns>
         [HttpPost("Actions/EndViewRecord")]
-        public async Task<bool> EndViewRecordAsync(string recordId)
+        public async Task<bool> EndViewRecordAsync([FromForm] string recordId)
         {
             var now = DateTime.Now;
 
@@ -268,8 +382,10 @@ namespace NCC.Extend.SbRecords
                 .Select(it => new SbRecordsListOutput
                 {
                     id = it.Id,
-                    reId = SqlFunc.Subqueryable<ZsbtzEntity>().Where(t => t.Id == it.ReId).Select(t => t.Sbmc),
-                    equipmentName = SqlFunc.IsNull(SqlFunc.Subqueryable<KhsbEntity>().Where(k => k.Id == it.ReId).Select(k => k.Sbmc), SqlFunc.Subqueryable<ZsbtzEntity>().Where(t => t.Id == it.ReId).Select(t => t.Sbmc)),
+                    reId = it.ReId,
+                    contentName = it.ContentName,
+                    deviceName = it.DeviceName,
+                    equipmentName = SqlFunc.IsNull(it.DeviceName, SqlFunc.IsNull(SqlFunc.Subqueryable<KhsbEntity>().Where(k => k.Id == it.ReId).Select(k => k.Sbmc), SqlFunc.Subqueryable<ZsbtzEntity>().Where(t => t.Id == it.ReId).Select(t => t.Sbmc))),
                     customerName = SqlFunc.Subqueryable<KhsbEntity>().Where(k => k.Id == it.ReId).Select(k => k.Sskh),
                     addTime = it.AddTime,
                     addUser = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.AddUser).Select(u => u.RealName),
@@ -320,8 +436,10 @@ namespace NCC.Extend.SbRecords
                 .Select(it => new SbRecordsListOutput
                 {
                     id = it.Id,
-                    reId = SqlFunc.Subqueryable<ZsbtzEntity>().Where(t => t.Id == it.ReId).Select(t => t.Sbmc),
-                    equipmentName = SqlFunc.IsNull(SqlFunc.Subqueryable<KhsbEntity>().Where(k => k.Id == it.ReId).Select(k => k.Sbmc), SqlFunc.Subqueryable<ZsbtzEntity>().Where(t => t.Id == it.ReId).Select(t => t.Sbmc)),
+                    reId = it.ReId,
+                    contentName = it.ContentName,
+                    deviceName = it.DeviceName,
+                    equipmentName = SqlFunc.IsNull(it.DeviceName, SqlFunc.IsNull(SqlFunc.Subqueryable<KhsbEntity>().Where(k => k.Id == it.ReId).Select(k => k.Sbmc), SqlFunc.Subqueryable<ZsbtzEntity>().Where(t => t.Id == it.ReId).Select(t => t.Sbmc))),
                     customerName = SqlFunc.Subqueryable<KhsbEntity>().Where(k => k.Id == it.ReId).Select(k => k.Sskh),
                     addTime = it.AddTime,
                     addUser = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == it.AddUser).Select(u => u.RealName),
@@ -357,7 +475,7 @@ namespace NCC.Extend.SbRecords
                 exportData[i].index = i + 1;
                 exportData[i].countNum = i + 1;
             }
-            List<ParamsModel> paramList = "[{\"value\":\"序号\",\"field\":\"index\"},{\"value\":\"客户\",\"field\":\"customerName\"},{\"value\":\"用户\",\"field\":\"addUser\"},{\"value\":\"设备\",\"field\":\"equipmentName\"},{\"value\":\"时间\",\"field\":\"addTime\"},{\"value\":\"次数\",\"field\":\"countNum\"},{\"value\":\"记录类型\",\"field\":\"type\"},{\"value\":\"关联设备\",\"field\":\"reId\"},{\"value\":\"有效状态\",\"field\":\"enable\"}]".ToList<ParamsModel>();           
+            List<ParamsModel> paramList = "[{\"value\":\"序号\",\"field\":\"index\"},{\"value\":\"客户\",\"field\":\"customerName\"},{\"value\":\"用户\",\"field\":\"addUser\"},{\"value\":\"记录类型\",\"field\":\"type\"},{\"value\":\"设备名称\",\"field\":\"deviceName\"},{\"value\":\"查看内容\",\"field\":\"contentName\"},{\"value\":\"设备\",\"field\":\"equipmentName\"},{\"value\":\"时间\",\"field\":\"addTime\"},{\"value\":\"次数\",\"field\":\"countNum\"},{\"value\":\"关联记录\",\"field\":\"reId\"},{\"value\":\"有效状态\",\"field\":\"enable\"}]".ToList<ParamsModel>();           
             ExcelConfig excelconfig = new ExcelConfig();
             excelconfig.FileName = "查看历史记录.xls";
             excelconfig.HeadFont = "微软雅黑";
diff --git a/机具（管理端）/src/views/sbRecords/index.vue b/机具（管理端）/src/views/sbRecords/index.vue
index 2bcebaa..5769c2f 100644
--- a/机具（管理端）/src/views/sbRecords/index.vue
+++ b/机具（管理端）/src/views/sbRecords/index.vue
@@ -92,13 +92,14 @@
 				</div>
 				<NCC-table v-loading="listLoading" :data="list" has-c @selection-change="handleSelectionChange">
 					<el-table-column type="index" label="序号" width="60" align="center" :index="indexMethod" />
-					<el-table-column label="关联设备" align="left" min-width="120">
-						<template slot-scope="scope">{{ scope.row.equipmentName || scope.row.reId || '-' }}</template>
+					<el-table-column prop="type" label="记录类型" align="left" width="100" />
+					<el-table-column label="设备名称" align="left" min-width="120" show-overflow-tooltip>
+						<template slot-scope="scope">{{ scope.row.deviceName || scope.row.equipmentName || scope.row.reId || '-' }}</template>
 					</el-table-column>
+					<el-table-column prop="contentName" label="查看内容" align="left" min-width="120" show-overflow-tooltip />
 					<el-table-column prop="customerName" label="查看客户" align="left" min-width="100" show-overflow-tooltip />
 					<el-table-column prop="addUser" label="查看用户" align="left" min-width="100" />
 					<el-table-column prop="addTime" label="记录时间" align="left" width="160" :formatter="ncc.tableDateFormat" />
-					<el-table-column prop="type" label="记录类型" align="left" width="100" />
 					<el-table-column label="操作" fixed="right" width="100">
 						<template slot-scope="scope">
 							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除</el-button>
@@ -155,10 +156,12 @@ export default {
 				{ prop: 'index', label: '序号' },
 				{ prop: 'customerName', label: '客户' },
 				{ prop: 'addUser', label: '用户' },
+				{ prop: 'type', label: '记录类型' },
+				{ prop: 'deviceName', label: '设备名称' },
+				{ prop: 'contentName', label: '查看内容' },
 				{ prop: 'equipmentName', label: '设备' },
 				{ prop: 'addTime', label: '时间' },
-				{ prop: 'countNum', label: '次数' },
-				{ prop: 'type', label: '记录类型' }
+				{ prop: 'countNum', label: '次数' }
 			],
 			reIdOptions: []
 		}
--
libgit2 0.21.4