From 82cdc29cbf5f73a27f62378759a4298377a5380b Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Thu, 22 Aug 2024 16:21:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AE=B0=E5=BD=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/user/changeRecord.html       | 15 ++++++++++++++-
 .../resources/templates/system/user/user.html     |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/user/changeRecord.html b/ruoyi-admin/src/main/resources/templates/system/user/changeRecord.html
index 43f8eed..734740a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/changeRecord.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/changeRecord.html
@@ -82,6 +82,10 @@
                         <span class="weight">籍贯: </span>
                         <span :class="getDiffClass(item.userarea, 'userarea', index)">{{ item.userarea }}</span>
                     </p>
+                    <p class="leftCard">
+                        <span class="weight">涉密程度: </span>
+                        <span :class="getDiffClass(item.shemichengdu, 'shemichengdu', index)">{{getDictLabel(item.shemichengdu)  }}</span>
+                    </p>
                     <p class="leftCard">
                         <span class="weight">是否具有出入境备案: </span>
                         <span :class="getDiffClass(item.entryexitFiling, 'entryexitFiling', index)">{{ item.entryexitFiling == '1' ? '是' : '否' }}</span>
@@ -119,6 +123,10 @@
                         <span class="weight">籍贯: </span>
                         <span :class="getDiffClass(item.userarea, 'userarea', index)">{{ item.userarea }}</span>
                     </p>
+                    <p class="rightCard">
+                        <span class="weight">涉密程度: </span>
+                        <span :class="getDiffClass(item.shemichengdu, 'shemichengdu', index)">{{getDictLabel(item.shemichengdu)  }}</span>
+                    </p>
                     <p class="rightCard">
                         <span class="weight">是否具有出入境备案: </span>
                         <span :class="getDiffClass(item.entryexitFiling, 'entryexitFiling', index)">{{ item.entryexitFiling == '1' ? '是' : '否' }}</span>
@@ -141,7 +149,8 @@
         data: {
             userAfterList:[],
             userBeforeList:[],
-            diffData: []
+            diffData: [],
+            shemicehngdu:[[${@dict.getType('sys_user_shemi')}]]
         },
         mounted(){
             this.userAfterList = [[${userRecordDTO}]].userAfterList
@@ -149,6 +158,10 @@
             this.findDifferences()
         },
         methods:{
+            getDictLabel(value) {
+                const dictItem = this.shemicehngdu.find(item => item.dictValue === value);
+                return dictItem ? dictItem.dictLabel : '未知';
+            },
             findDifferences() {
                 // 将差异数据初始化为空数组
                 this.diffData = this.userBeforeList.map((beforeItem, index) => {
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html
index 4abdc01..9db7eaa 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -187,7 +187,7 @@
 			                var more = [];
 			                more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
 			                more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-							more.push("<a class='btn btn-default btn-xs " + "' href='javascript:void(0)' onclick='handleDetail(" + row.userId + ")'><i class='fa fa-check-square-o'></i>修改详情</a>");
+							more.push("<a class='btn btn-default btn-xs " + "' href='javascript:void(0)' onclick='handleDetail(" + row.userId + ")'><i class='fa fa-check-square-o'></i>修改记录</a>");
 			                actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
 			                return actions.join('');
 		            	} else {