Merge branch 'develop' of http://123.206.9.27:3000/ShinSoft_Xxhsyb/Proj_SafePlat_Vue_Sgh5 into develop

src/router/index.ts

@@ -705,7 +705,12 @@ const router = createRouter({
 			component: () => import('@/view/dati/examCheck/fcbkdatistart.vue')
 		},
 
-
+		{
+			path: '/guest-register',
+			name: '游客模式（答题）',
+			component: () => import('@/view/login/Register.vue'),
+			meta: { guestMode: true }
+		}
 	]
 })
 function isInWeCom(): boolean {
@@ -714,17 +719,20 @@ function isInWeCom(): boolean {
 // 路由守卫
 router.beforeEach(async (to, from, next) => {
 
-	/*
-		const requiresWeCom = to.matched.some(record => record.meta.requiresWeCom);
-
-		if (requiresWeCom && typeof wx === 'undefined') {
-			console.warn('该页面需在企业微信内打开');
-			// 可以跳转提示页或者 Toast 提示
-			return next(false);
+	const token1 = localStorage.getItem('token');
+	const isWeCom = isInWeCom();
+	if (to.path === '/fcbkdatistart') {
+		// 如果不在企微中，且没有有效 token，且不是已经在游客页
+		if (!isWeCom && (!token1 || !isTokenValid(token1)) && from.path !== '/guest-register') {
+			console.log('【游客模式】非企微访问 fcbkdatistart，跳转游客注册');
+			// ✅ 关键修复：保留 to.query（即 examId 等参数）
+			return next({
+				path: '/guest-register',
+				query: to.query
+			});
 		}
 
-		wxReady((requestSignature().data))
-	*/
+	}
 	function isTokenValid(token : string) : boolean {
 		try {
 			// 检查 token 是否为合法 JWT 格式（3段）
@@ -787,21 +795,8 @@ router.beforeEach(async (to, from, next) => {
 		return null; // 或者抛出错误，根据你的业务需求
 	}
 	console.log(to);
-	if (to.path == '/Home1'||to.path=='/yinhuan/todo_detail/index'|| to.path == '/lz-rcd-detail'||to.path == '/emergencyResources'||to.path == '/cardManager/specialWork'||to.path == '/cardManager/equipment'||to.path == '/cardManager/engineer') {
-		console.log("++++++判断一下是不是企微或者掌上山钢扫码:"+isInWeCom());
-		/*const token = localStorage.getItem('token');
-		// 判断是否已经初始化过用户信息
-		const hasUserInfo = !!localStorage.getItem('userId');
-		if (hasUserInfo) {
-			// @ts-ignore
-			if (token && isTokenValid(token)) {
-				next();
-				return;
-			}
-		}*/
-
-		// const userId=ref('3E4C4009430211B28E367D90704E23CA')
-
+	if (to.path == '/Home1'||to.path=='/yinhuan/todo_detail/index'|| to.path == '/lz-rcd-detail'||to.path == '/emergencyResources'||to.path == '/cardManager/specialWork'
+		||to.path == '/cardManager/equipment'||to.path == '/cardManager/engineer') {
 		const userId=ref(import.meta.env.VITE_USER_ID)
 		console.log(userId.value);
 		console.log("当前环境：");

src/view/Home1.vue

@@ -466,12 +466,12 @@ const coincideNotList = ref([]);
 const queryMenuRecently = () => {
   const url = '/sgsafe/MenuRecentlyUsed/queryRecentlyUsed';
   const param = {
-    userCode: localStorage.getItem('userCode')
+    applicationId: 'c77da6a732d34400b24374e2cea811ee'
   };
   proxy.$axios.get(url, param).then(res => {
     functionList.value = res.data.data.map(item => ({
       title: item.menuName,
-      img: item.menuIcon,
+      img: 'images/' + item.menuIcon,
       jumpPath: item.jumpPath
     }));
 
@@ -488,12 +488,11 @@ const queryMenuRecently = () => {
       title: '查看更多',
       img: 'images/gd.png',
       jumpPath: '/home2',
-	  //jumpPath: '/homeRole'
+      //jumpPath: '/homeRole'
     })
   });
 
 };
-
 /**
  * 默认页面
  */

src/view/Home2.vue

@@ -11,6 +11,21 @@
         </van-grid-item>
       </van-grid>
     </div>
+
+    <div class="card">
+      <div class="title">通知公告</div>
+      <van-grid :border="false" :column-num="4">
+        <van-grid-item to="/annex">
+          <img src="../../public/images/zyqk.png" width="45rpx" />
+          <span class="vanicon_text">文件发布</span>
+        </van-grid-item>
+        <van-grid-item to="/notice" v-if="showCheckTakeN">
+          <img src="../../public/images/yj.png" width="45rpx" />
+          <span class="vanicon_text">通知公告</span>
+        </van-grid-item>
+      </van-grid>
+    </div>
+
     <div class="card">
       <div class="title">制度管理</div>
       <van-grid :border="false" :column-num="4">
@@ -28,247 +43,125 @@
         </van-grid-item>
       </van-grid>
     </div>
+
     <div class="card">
-      <div class="title">安全责任履职</div>
+      <div class="title">计划管理</div>
       <van-grid :border="false" :column-num="4">
-        <van-grid-item to="/lvzhi">
-          <img src="../../public/images/lz.png" width="45rpx" />
-          <span class="vanicon_text">履职记录</span>
-        </van-grid-item>
-        <van-grid-item to="/lvzhicx">
-          <img src="../../public/images/lzcx.png" width="45rpx" />
-          <span class="vanicon_text">履职查询</span>
+        <van-grid-item to="/keyMatters">
+          <img src="../../public/images/keyMatters.png" width="45rpx" />
+          <span class="vanicon_text">重点事项</span>
         </van-grid-item>
-        <van-grid-item v-if='false'>
-          <img src="../../public/images/zj.png" width="45rpx" @click="handleClick" />
-          <span class="vanicon_text">站内信推送</span>
+        <van-grid-item to="/planManagement">
+          <img src="../../public/images/planManagement.png" width="45rpx" />
+          <span class="vanicon_text">计划任务</span>
         </van-grid-item>
       </van-grid>
     </div>
+
     <div class="card">
-      <div class="title">风险分级管理</div>
+      <div class="title">考核评价</div>
       <van-grid :border="false" :column-num="4">
-        <van-grid-item to="/institution/riskList">
-          <img src="../../public/images/fx.png" width="45rpx" />
-          <span class="vanicon_text">风险分级管控记录</span>
+        <van-grid-item to="/performanceReview/units">
+          <img src="../../public/images/unitsPerformance.png" width="45rpx" />
+          <span class="vanicon_text">单位考核</span>
         </van-grid-item>
       </van-grid>
     </div>
+
     <div class="card">
-      <div class="title">隐患排查治理</div>
-      <van-grid :border="false" :column-num="4">
-        <van-grid-item to="/yinhuan/registration">
-          <img src="../../public/images/yhdj.png" width="45rpx" />
-          <span class="vanicon_text">隐患登记</span>
-        </van-grid-item>
-        <van-grid-item to="/yinhuan/todo">
-          <img src="../../public/images/yhdb.png" width="45rpx" />
-          <span class="vanicon_text">隐患待办</span>
-        </van-grid-item>
-        <van-grid-item to="/yinhuan/hdLedger">
-          <img src="../../public/images/yh.png" width="45rpx" />
-          <span class="vanicon_text">隐患台账</span>
-        </van-grid-item>
-        <van-grid-item to="/yinhuan/riskChecklist">
-          <img src="../../public/images/riskChecklist.png" width="45rpx" />
-          <span class="vanicon_text">隐患排查清单</span>
+      <div class="title">知识共享</div>
+      <van-grid :border="false" :column-num="4" v-if="showCheckTakeN">
+        <van-grid-item to="/knowledge/accident">
+          <img src="../../public/images/zd.png" width="45rpx" />
+          <span class="vanicon_text">事故案例</span>
         </van-grid-item>
-        <van-grid-item to="/yinhuan/riskChecklistRecords">
-          <img src="../../public/images/riskChecklistRecords.png" width="45rpx" />
-          <span class="vanicon_text">隐患排查记录</span>
+        <van-grid-item to="/knowledge/manager">
+          <img src="../../public/images/zd.png" width="45rpx" />
+          <span class="vanicon_text">管理案例</span>
         </van-grid-item>
-        <van-grid-item to="/yinhuan/hdRwardReporting">
-          <img src="../../public/images/yhdb.png" width="45rpx" />
-          <span class="vanicon_text">隐患有奖举报</span>
+        <van-grid-item to="/knowledge/Culture">
+          <img src="../../public/images/zd.png" width="45rpx" />
+          <span class="vanicon_text">安全环保文化</span>
         </van-grid-item>
-        <van-grid-item to="/yinhuan/hdLedgerJuBao">
-          <img src="../../public/images/yh.png" width="45rpx" />
-          <span class="vanicon_text">隐患有奖举报台账</span>
+        <van-grid-item to="/knowledge/project">
+          <img src="../../public/images/zd.png" width="45rpx" />
+          <span class="vanicon_text">项目案例库</span>
         </van-grid-item>
       </van-grid>
     </div>
+
     <div class="card">
       <div class="title">安全检查</div>
       <van-grid :border="false" :column-num="4">
         <van-grid-item to="/safeCheck/task">
           <img src="../../public/images/aq.png" width="45rpx" />
-          <span class="vanicon_text">安全检查任务</span>
-        </van-grid-item>
-      </van-grid>
-    </div>
-    <div class="card">
-      <div class="title">事故管理</div>
-      <van-grid :border="false" :column-num="4">
-        <van-grid-item to="/accidentManager/accidentBaoGaoLedger/index">
-          <img src="../../public/images/sgbgtz.png" width="45rpx" />
-          <span class="vanicon_text">事故报告台账</span>
-        </van-grid-item>
-        <van-grid-item to="/accidentManager/accidentJuBao/index">
-          <img src="../../public/images/sgjb.png" width="45rpx" />
-          <span class="vanicon_text">事故举报</span>
-        </van-grid-item>
-        <van-grid-item v-if="true" to="/accidentManager/accidentJuBaoLedger/index">
-          <img src="../../public/images/sgjbtz.png" width="45rpx" />
-          <span class="vanicon_text">事故举报台账</span>
-        </van-grid-item>
-      </van-grid>
-    </div>
-    <div class="card">
-      <div class="title">教育培训</div>
-      <van-grid :border="false" :column-num="4">
-        <van-grid-item to="/dailyproblem">
-          <img src="../../public/images/dt.png" width="45rpx" />
-          <span class="vanicon_text">每日答题</span>
-        </van-grid-item>
-        <van-grid-item to="/cardManager">
-          <img src="../../public/images/zj.png" width="45rpx" />
-          <span class="vanicon_text">证件管理</span>
-        </van-grid-item>
-        <van-grid-item to="/checkTake">
-          <img src="../../public/images/dt.png" width="45rpx" />
-          <span class="vanicon_text">逢查必考</span>
+          <span class="vanicon_text">检查任务</span>
         </van-grid-item>
         <van-grid-item to="/examtask" v-if="showCheckTake">
           <img src="../../public/images/zyqk.png" width="45rpx" />
-          <span class="vanicon_text">考试任务</span>
-        </van-grid-item>
-        <van-grid-item to="/class2" v-if="showCheckTake">
-          <img src="../../public/images/zyqk.png" width="45rpx" />
-          <span class="vanicon_text">学习课程管理</span>
-        </van-grid-item>
-
-
-        <van-grid-item to="/courseManagement" v-if="showCheckTake">
-          <img src="../../public/images/zyqk.png" width="45rpx" />
-          <span class="vanicon_text">课程管理</span>
+          <span class="vanicon_text">逢查必考</span>
         </van-grid-item>
       </van-grid>
     </div>
+
     <div class="card">
-      <div class="title">应急管理</div>
+      <div class="title">安全监督</div>
       <van-grid :border="false" :column-num="4">
-        <van-grid-item to="/institution/emergencyPlan">
-          <img src="../../public/images/yjya.png" width="45rpx" />
-          <span class="vanicon_text">应急预案</span>
-        </van-grid-item>
-        <van-grid-item to="/emergencyResources">
-          <img src="../../public/images/yj.png" width="45rpx" />
-          <span class="vanicon_text">应急物资</span>
-        </van-grid-item>
-        <van-grid-item to="/emergencyDrillPlan">
-          <img src="../../public/images/yjyl.png" width="45rpx" />
-          <span class="vanicon_text">应急演练</span>
-        </van-grid-item>
-        <van-grid-item to="/drillProcess">
-          <img src="../../public/images/drillProcess.png" width="45rpx" />
-          <span class="vanicon_text">掌上演练</span>
+        <van-grid-item to="/institution/riskList">
+          <img src="../../public/images/fx.png" width="45rpx" />
+          <span class="vanicon_text">风险分级管控记录</span>
         </van-grid-item>
-      </van-grid>
-    </div>
-    <div class="card">
-      <div class="title">项目管理</div>
-      <van-grid :border="false" :column-num="4">
-        <van-grid-item to="/projectManage/taiZhang">
-          <img src="../../public/images/xm.png" width="45rpx" />
-          <span class="vanicon_text">项目台账</span>
+        <van-grid-item to="/lvzhicx">
+          <img src="../../public/images/lzcx.png" width="45rpx" />
+          <span class="vanicon_text">履职查询</span>
         </van-grid-item>
-        <van-grid-item to="/projectManage/projectConstructionOperation">
-          <img src="../../public/images/xm.png" width="45rpx" />
-          <span class="vanicon_text">项目施工作业管理</span>
+        <van-grid-item to="/yinhuan/hdLedger">
+          <img src="../../public/images/yh.png" width="45rpx" />
+          <span class="vanicon_text">隐患台账</span>
         </van-grid-item>
         <van-grid-item to="/projectManage/projectWorkLedger">
           <img src="../../public/images/xm.png" width="45rpx" />
           <span class="vanicon_text">项目作业台账</span>
         </van-grid-item>
-        <van-grid-item to="/projectManage/todo">
-          <img src="../../public/images/yhdb.png" width="45rpx" />
-          <span class="vanicon_text">项目作业待办</span>
-        </van-grid-item>
       </van-grid>
     </div>
+
     <div class="card">
-      <div class="title">作业现场管控</div>
+      <div class="title">教育培训</div>
       <van-grid :border="false" :column-num="4">
-        <van-grid-item to="/safeClient">
-          <img src="../../public/images/zdgl.png" width="45rpx" />
-          <span class="vanicon_text">终端管理</span>
-        </van-grid-item>
-        <van-grid-item to="/jobCondition">
+        <van-grid-item to="/courseManagement" v-if="showCheckTake">
           <img src="../../public/images/zyqk.png" width="45rpx" />
-          <span class="vanicon_text">作业情况</span>
+          <span class="vanicon_text">课程管理</span>
         </van-grid-item>
-      </van-grid>
-    </div>
-    <div class="card">
-      <div class="title">事务汇报</div>
-      <van-grid :border="false" :column-num="4">
-        <van-grid-item to="/keyMatters">
-          <img src="../../public/images/keyMatters.png" width="45rpx" />
-          <span class="vanicon_text">重点事项</span>
+        <van-grid-item to="/class2" v-if="showCheckTake">
+          <img src="../../public/images/zyqk.png" width="45rpx" />
+          <span class="vanicon_text">在线学习考试</span>
         </van-grid-item>
-        <van-grid-item to="/planManagement">
-          <img src="../../public/images/planManagement.png" width="45rpx" />
-          <span class="vanicon_text">计划任务</span>
+        <van-grid-item to="/cardManager">
+          <img src="../../public/images/zj.png" width="45rpx" />
+          <span class="vanicon_text">证件管理</span>
         </van-grid-item>
       </van-grid>
     </div>
+
     <div class="card">
-      <div class="title">考核评价</div>
+      <div class="title">事故管理</div>
       <van-grid :border="false" :column-num="4">
-        <van-grid-item to="/performanceReview/units">
-          <img src="../../public/images/unitsPerformance.png" width="45rpx" />
-          <span class="vanicon_text">单位考核</span>
-        </van-grid-item>
-      </van-grid>
-    </div>
-    <div class="card">
-      <div class="title">考核管理</div>
-      <van-grid :border="false" :column-num="4" v-if="showCheckTakeN">
-        <van-grid-item to="/assRec">
-          <img src="../../public/images/zdgl.png" width="45rpx" />
-          <span class="vanicon_text">考核登记</span>
-        </van-grid-item>
-        <van-grid-item to="/assRecN" v-if="showCheckTakeN">
-          <img src="../../public/images/lzcx.png" width="45rpx" />
-          <span class="vanicon_text">考核记录</span>
+        <van-grid-item to="/accidentManager/accidentBaoGaoLedger/index">
+          <img src="../../public/images/sgbgtz.png" width="45rpx" />
+          <span class="vanicon_text">事故报告台账</span>
         </van-grid-item>
-      </van-grid>
-    </div>
-    <div class="card">
-      <div class="title">通知公告</div>
-      <van-grid :border="false" :column-num="4" v-if="showCheckTakeN">
-        <van-grid-item to="/annex">
-          <img src="../../public/images/zyqk.png" width="45rpx" />
-          <span class="vanicon_text">文件发布</span>
+        <van-grid-item to="/accidentManager/accidentJuBao/index">
+          <img src="../../public/images/sgjb.png" width="45rpx" />
+          <span class="vanicon_text">事故举报</span>
         </van-grid-item>
-        <van-grid-item to="/notice" v-if="showCheckTakeN">
-          <img src="../../public/images/yj.png" width="45rpx" />
-          <span class="vanicon_text">通知公告</span>
+        <van-grid-item v-if="true" to="/accidentManager/accidentJuBaoLedger/index">
+          <img src="../../public/images/sgjbtz.png" width="45rpx" />
+          <span class="vanicon_text">事故举报台账</span>
         </van-grid-item>
       </van-grid>
     </div>
-    <div class="card">
-      <div class="title">知识共享库</div>
-      <van-grid :border="false" :column-num="4" v-if="showCheckTakeN">
-        <van-grid-item to="/knowledge/accident">
-          <img src="../../public/images/zd.png" width="45rpx" />
-          <span class="vanicon_text">事故案例</span>
-        </van-grid-item>
 
-        <van-grid-item to="/knowledge/manager">
-          <img src="../../public/images/zd.png" width="45rpx" />
-          <span class="vanicon_text">管理案例</span>
-        </van-grid-item>
-        <van-grid-item to="/knowledge/Culture">
-          <img src="../../public/images/zd.png" width="45rpx" />
-          <span class="vanicon_text">安全环保文化</span>
-        </van-grid-item>
-        <van-grid-item to="/knowledge/project">
-          <img src="../../public/images/zd.png" width="45rpx" />
-          <span class="vanicon_text">项目案例</span>
-        </van-grid-item>
-      </van-grid>
-    </div>
     <div class="card">
       <div class="title">安环费用管理</div>
       <van-grid :border="false" :column-num="4" v-if="showCheckTakeN">
@@ -283,6 +176,19 @@
       </van-grid>
     </div>
 
+    <div class="card">
+      <div class="title">隐患有奖举报</div>
+      <van-grid :border="false" :column-num="4">
+        <van-grid-item to="/yinhuan/hdRwardReporting">
+          <img src="../../public/images/yhdb.png" width="45rpx" />
+          <span class="vanicon_text">隐患有奖举报</span>
+        </van-grid-item>
+        <van-grid-item to="/yinhuan/hdLedgerJuBao">
+          <img src="../../public/images/yh.png" width="45rpx" />
+          <span class="vanicon_text">隐患有奖举报台账</span>
+        </van-grid-item>
+      </van-grid>
+    </div>
   </div>
 
 </template>
@@ -311,15 +217,6 @@ if (userDesc == '贾俊臣' || userDesc == '张瑞楠' || userDesc == '刘焯')
   showCheckTakeN.value=true
 }
 
-/**
- * 修改最近使用的页面记录
- */
-const recentlyUsed = ref({
-  userCode: localStorage.getItem('userCode'),
-  menuIcon: '',
-  menuName: '',
-  jumpPath: ''
-});
 const userCode = localStorage.getItem('userCode');
 const handleClick = () => {
   console.log('111');
@@ -335,25 +232,24 @@ const handleClick = () => {
     }
   }, 500);
 };
-const getRecentlyUsed = () => {
-  const url = '/sgsafe/MenuRecentlyUsedMobile/updateMenuRecentlyUsedStatus';
+
+/**
+ * 修改最近使用的页面记录
+ */
+const getRecentlyUsed = (jumpPath) => {
+  const url = '/sgsafe/MenuRecentlyUsed/updateMenuRecentlyUsedStatus'
   const param = {
-    json: JSON.stringify(recentlyUsed.value)
-  };
-  proxy.$axios.post(url, param).then(res => {
+    jumpPath
+  }
+  proxy.$axios.post(url,param).then(res => {
     if (res.data.code !== 0) {
-      console.log('执行失败');
+      console.log('执行失败！' + res.data.msg)
     }
-  });
-};
+  })
+}
 
 onBeforeRouteLeave((to, from) => {
-  recentlyUsed.value.jumpPath = to.path;
-  recentlyUsed.value.menuIcon = getPicPathByPath(to.path);
-  recentlyUsed.value.menuName = getNameByPath(to.path);
-  if (recentlyUsed.value.menuIcon) {
-    getRecentlyUsed();
-  }
+  getRecentlyUsed(to.path)
 });
 
 /**
@@ -364,12 +260,12 @@ const coincideNotList = ref([]);
 const queryMenuRecently = () => {
   const url = '/sgsafe/MenuRecentlyUsed/queryRecentlyUsed';
   const param = {
-    userCode: localStorage.getItem('userCode')
+    applicationId: 'c77da6a732d34400b24374e2cea811ee'
   };
   proxy.$axios.get(url, param).then(res => {
     functionList.value = res.data.data.map(item => ({
       title: item.menuName,
-      img: item.menuIcon,
+      img: 'images/' + item.menuIcon,
       jumpPath: item.jumpPath
     }));
 
@@ -404,78 +300,6 @@ const defaultPageList = ref([
   { title: '隐患待办', img: 'images/yhdb.png', jumpPath: '/yinhuan/todo' }
 ]);
 
-/**
- * 根据路由获取名称
- */
-const getNameByPath = (path) => {
-  const recentlyUsedMapping = {
-    '/institution/law': '法律法规',
-    '/institution/institutionRegime': '安全制度管理',
-    '/institution/institutionRule': '安全操作规程',
-    '/lvzhi': '履职记录',
-    '/lvzhicx': '履职查询',
-    '/institution/riskList': '风险分级管控记录',
-    '/yinhuan/registration': '隐患登记',
-    '/yinhuan/todo': '隐患待办',
-    '/yinhuan/hdLedger': '隐患台账',
-    '/safeCheck/task': '安全检查任务',
-    '/dailyproblem': '每日答题',
-    '/cardManager': '证件管理',
-    '/institution/emergencyPlan': '应急预案',
-    '/emergencyResources': '应急物资',
-    '/emergencyDrillPlan': '应急演练',
-    '/projectManage/taiZhang': '项目台账',
-    '/safeClient': '终端管理',
-    '/jobCondition': '作业情况',
-    '/yinhuan/riskChecklist': '隐患排查清单',
-    '/yinhuan/riskChecklistRecords': '隐患排查记录',
-    '/drillProcess': '掌上演练',
-    '/checkTake': '逢查必考',
-    '/projectManage/projectConstructionOperation': '项目施工作业管理',
-    '/projectManage/projectWorkLedger': '项目作业台账',
-    '/keyMatters': '重点事项',
-    '/planManagement': '计划任务',
-    '/performanceReview/units': '单位考核'
-
-  };
-  return recentlyUsedMapping[path];
-};
-
-/**
- * 根据路由获取图片路径
- */
-const getPicPathByPath = (path) => {
-  const recentlyUsedMapping = {
-    '/institution/law': 'images/fl.png',
-    '/institution/institutionRegime': 'images/aqzd.png',
-    '/institution/institutionRule': 'images/zd.png',
-    '/lvzhi': 'images/lz.png',
-    '/lvzhicx': 'images/lzcx.png',
-    '/institution/riskList': 'images/fx.png',
-    '/yinhuan/registration': 'images/yhdj.png',
-    '/yinhuan/todo': 'images/yhdb.png',
-    '/yinhuan/hdLedger': 'images/yh.png',
-    '/safeCheck/task': 'images/aq.png',
-    '/dailyproblem': 'images/dt.png',
-    '/cardManager': 'images/zj.png',
-    '/institution/emergencyPlan': 'images/yjya.png',
-    '/emergencyResources': 'images/yj.png',
-    '/emergencyDrillPlan': 'images/yjyl.png',
-    '/projectManage/taiZhang': 'images/xm.png',
-    '/safeClient': 'images/zdgl.png',
-    '/jobCondition': 'images/zyqk.png',
-    '/yinhuan/riskChecklist': 'images/riskChecklist.png',
-    '/yinhuan/riskChecklistRecords': 'images/riskChecklistRecords.png',
-    '/drillProcess': 'images/drillProcess.png',
-    '/checkTake': 'images/dt.png',
-    '/projectManage/projectConstructionOperation': 'images/xm.png',
-    '/projectManage/projectWorkLedger': 'images/xm.png',
-    '/keyMatters': 'images/keyMatters.png',
-    '/planManagement': 'images/planManagement.png',
-    '/performanceReview/units': 'images/unitsPerformance.png'
-  };
-  return recentlyUsedMapping[path];
-};
 
 /**
  * 测试消息

src/view/dati/examCheck/addPeo.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="h5-container">
-    <van-nav-bar title="添加人员" @click-left="onClickLeft" @click-right="handleDepartmentLeaderName">
-      <template #right>
-        <van-icon name="add" size="25" color="#000" />
-      </template>
+    <van-nav-bar title="查看结果" @click-left="onClickLeft" @click-right="handleDepartmentLeaderName">
+
     </van-nav-bar>
 
     <!-- 项目列表 -->

src/view/dati/examCheck/fcbkdatistart.vue

@@ -227,6 +227,7 @@ const getExamContext = () => ({
   testType: route.query.testType || '',
   addId: route.query.addId || '',
   userDesc: userDesc,
+  userName:localStorage.getItem('userDesc')
 
 });
 
@@ -255,7 +256,7 @@ const handData = ref({});
 const saveChecUser = async () => {
   const examContext = getExamContext();
   console.log("接到的参数：",examContext);
-  var url = '/sgsafe/ExamHead/saveChecUser';
+  var url = '/sgsafe/ExamHead/showsaveChecUser';
   var param = {
     params: JSON.stringify(examContext)
   };
@@ -270,8 +271,9 @@ const saveChecUser = async () => {
 }
 //获取试卷
 const getForm = async () => {
+  console.log("后端返回的参数为：",handData.value);
   console.log("headId为",handData.value.id);
-  var url = '/sgsafe/ExamLine/query'
+  var url = '/sgsafe/ExamLine/showquery'
   const query1 = ref({
     headId:   handData.value.id
   })
@@ -361,7 +363,7 @@ const submitForm = async () => {
   try {
     let answers = getUserAnswers();
     //console.log('answers.value', answers)
-    var url = '/sgsafe/ExamLine/appSaveMyScore'
+    var url = '/sgsafe/ExamLine/showappSaveMyScore'
     var param = {
       json: JSON.stringify(
         answers
@@ -384,7 +386,7 @@ const submitForm = async () => {
     const day = String(today.getDate()).padStart(2, '0');
     const todayStr = `${year}-${month}-${day}`;// ✅ 来自 saveChecUser 返回
     //开始判卷
-    var url2 = '/sgsafe/Package/doProc'
+    var url2 = '/sgsafe/Package/showdoProc'
     var param2 = {
       procName: 'safeplat.sxsp_grade_exam_p',
       param: JSON.stringify([courseId])
@@ -403,7 +405,7 @@ const submitForm = async () => {
     overlayloading.value = false;
 
     //查询本日答题次数和分数
-    var url3 = '/sgsafe/DailyExam/appQueryMyScore'
+    var url3 = '/sgsafe/DailyExam/showappQueryMyScore'
     const query3 = ref({
       userId: userId,
       examDate: todayStr,
@@ -416,7 +418,7 @@ const submitForm = async () => {
     if (res3.data.code === 0) {
       console.log(res3.data)
       if (res3.data.data.dailyExamList.length==0){
-        var url4='/sgsafe/ExamHead/queryByheadId'
+        var url4='/sgsafe/ExamHead/showqueryByheadId'
         var param4 = {
           headId: courseId
         }

src/view/dati/examCheck/index.vue

@@ -40,7 +40,9 @@
 
             <template #right>
               <van-button  square class="delete-button" text="删除" @click="handleDelete(item)" />
-              <van-button  square class="submit-button" text="添加人员" @click="goaddPeo(item)" />
+              <van-button  square class="submit-button" text="查看结果" @click="goaddPeo1(item)" />
+              <van-button square class="submit-button" text="二维码_" @click="goaddPeo(item)" />
+
             </template>
           </van-swipe-cell>
         </div>
@@ -178,7 +180,14 @@ const goaddPeo = async (item) => {
     Toast('二维码生成失败，请重试');
   }
 };
-
+const goaddPeo1 = (item) => {
+  router.push({
+    path: '/addPeo',
+    query: {
+      data: JSON.stringify(item)
+    }
+  })
+}
 const edits = (row) => {
   kz.value = true;
   form.value = { ...row };
@@ -881,8 +890,16 @@ const closeSwipe = (idx) => {
   background-image: url('@/assets/img/sub.png');
   background-size: auto 100%;
   background-repeat: no-repeat;
-}
 
+}
+.edit-button {
+  height: 100%;
+  border: none;
+  color: #F9CC9D;
+  background-image: url('@/assets/img/edit.png');
+  background-size: auto 100%;
+  background-repeat: no-repeat;
+}
 .subsuccess {
   height: 100%;
   border: none;

src/view/login/Register.vue

@@ -0,0 +1,242 @@
+<template>
+  <div class="login-container">
+    <div class="login-content">
+      <div class="login-box">
+        <div class="login-header">
+          <img src="../../assets/logo.png" alt="logo" class="logo" />
+          <h2>请填写您的信息</h2>
+          <p class="subtitle">用于记录考试参与情况</p>
+        </div>
+
+        <van-form @submit="onSubmit" class="login-form">
+          <van-cell-group inset>
+            <van-field
+              v-model="formData.userCode"
+              name="userCode"
+              placeholder="请输入您的工号"
+              :rules="[{ required: true, message: '请输入工号' }]"
+            >
+              <template #left-icon>
+                <van-icon name="idcard-o" />
+              </template>
+            </van-field>
+            <van-field
+              v-model="formData.userName"
+              name="userName"
+              placeholder="请输入您的姓名"
+              :rules="[{ required: true, message: '请输入姓名' }]"
+            >
+              <template #left-icon>
+                <van-icon name="contact" />
+              </template>
+            </van-field>
+          </van-cell-group>
+          <div class="submit-btn">
+            <van-button
+              round
+              block
+              type="primary"
+              native-type="submit"
+              :loading="isLoading"
+            >
+              确认进入
+            </van-button>
+          </div>
+        </van-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
+import { showToast } from 'vant'
+import axios from '@/axios'
+const router = useRouter()
+const route = useRoute()
+const isLoading = ref(false)
+
+const formData = ref({
+  userCode: '',
+  userName: ''
+})
+
+async function onSubmit() {
+  if (!formData.value.userCode.trim() || !formData.value.userName.trim()) {
+    showToast('请完整填写工号和姓名')
+    return
+  }
+
+  try {
+    isLoading.value = true
+   /* const userId=ref('C19810FBCBD111B2B2FA58EA818C71F9')
+
+    var url = 'framework/SysLogin/queryPublicKeyToken'
+    // var url = 'framework/SysLogin/queryPublicKey'
+    var param = {
+      param: userId.value
+    }
+    await axios.post(url, param).then(response => {
+
+      localStorage.setItem('publicKey', response.data.data.publicKey)
+      localStorage.setItem('userId', response.data.data.id)
+      localStorage.setItem('userCode', formData.value.userCode.trim())
+      localStorage.setItem('userName', response.data.data.userName)
+      localStorage.setItem('userDesc', formData.value.userName.trim())
+      localStorage.setItem('userType', response.data.data.userType)
+      localStorage.setItem('token', response.data.data.token)
+      localStorage.setItem('belongId', response.data.data.belongId)
+    })*/
+
+    localStorage.setItem('userDesc', formData.value.userName.trim())
+    localStorage.setItem('userCode', formData.value.userCode.trim())
+    showToast({
+      type: 'success',
+      message: '信息提交成功'
+    })
+
+    // 跳回原扫码页面（/fcbkdatistart），保留原始 query 参数
+    // 注意：route.query 中应包含 examId, testRole 等参数（如果从该页跳转而来）
+    // 如果不是从 fcbkdatistart 进来的，可默认跳首页或提示
+
+    const targetPath = '/fcbkdatistart'
+    const originalQuery = route.query // 如果是从 fcbkdatistart 跳过来的，query 会保留
+    console.log("携带参数：",originalQuery);
+
+    // 更健壮的方式：检查是否有必要参数，否则跳首页
+    if (originalQuery.examId) {
+
+      await router.replace({ path: targetPath, query: originalQuery })
+    } else {
+      await router.push('/Home1')
+    }
+  } catch (error) {
+    console.error('游客信息提交失败:', error)
+    showToast('提交失败，请重试')
+  } finally {
+    isLoading.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+/* 样式保持不变，仅微调标题 */
+.login-container {
+  height: 100vh;
+  width: 100vw;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(135deg, #1890ff 0%, #1d39c4 100%);
+  position: relative;
+  overflow: hidden;
+
+  &::before {
+    content: '';
+    position: absolute;
+    width: 200%;
+    height: 200%;
+    top: -50%;
+    left: -50%;
+    background: url('@/assets/login-bg.svg') repeat;
+    opacity: 0.1;
+    animation: move 10s linear infinite;
+  }
+}
+
+.login-content {
+  position: relative;
+  z-index: 1;
+  width: 100%;
+  padding: 20px;
+}
+
+.login-box {
+  width: 100%;
+  max-width: 400px;
+  margin: 0 auto;
+  padding: 30px 24px;
+  background: rgba(255, 255, 255, 0.9);
+  backdrop-filter: blur(10px);
+  border-radius: 16px;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.1);
+
+  .login-header {
+    text-align: center;
+    margin-bottom: 32px;
+
+    .logo {
+      width: 64px;
+      height: 64px;
+      margin-bottom: 16px;
+    }
+
+    h2 {
+      font-size: 24px;
+      color: #1a1a1a;
+      margin: 0 0 8px;
+      font-weight: 600;
+    }
+
+    .subtitle {
+      font-size: 14px;
+      color: #666;
+      margin: 0;
+    }
+  }
+
+  :deep(.van-cell-group) {
+    background: transparent;
+
+    .van-field {
+      background: rgba(255, 255, 255, 0.8);
+      border-radius: 8px;
+      margin-bottom: 16px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      .van-field__left-icon {
+        margin-right: 8px;
+        color: #666;
+      }
+    }
+  }
+
+  .submit-btn {
+    margin-top: 24px;
+
+    .van-button {
+      height: 44px;
+      font-size: 16px;
+      background: linear-gradient(135deg, #1890ff 0%, #1d39c4 100%);
+      border: none;
+
+      &--loading {
+        opacity: 0.8;
+      }
+    }
+  }
+}
+
+@keyframes move {
+  0% {
+    transform: translate(0, 0);
+  }
+  100% {
+    transform: translate(-50%, -50%);
+  }
+}
+
+@media screen and (max-width: 480px) {
+  .login-box {
+    padding: 24px 16px;
+
+    .login-header h2 {
+      font-size: 20px;
+    }
+  }
+}
+</style>