# Conflicts:
#	src/view/Home2.vue

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,91 +43,89 @@
         </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>
+          <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>
         </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="/accidentManager/accidentBaoGaoLedger/index">
-          <img src="../../public/images/sgbgtz.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-item to="/accidentManager/accidentJuBao/index">
-          <img src="../../public/images/sgjb.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 v-if="true" to="/accidentManager/accidentJuBaoLedger/index">
-          <img src="../../public/images/sgjbtz.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>
     </div>
+
     <div class="card">
       <div class="title">教育培训</div>
       <van-grid :border="false" :column-num="4">
@@ -132,143 +145,27 @@
           <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>
-        </van-grid-item>
-      </van-grid>
-    </div>
-    <div class="card">
-      <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>
-      </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>
-        <van-grid-item to="/projectManage/projectConstructionOperation">
-          <img src="../../public/images/xm.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>
-      <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">
-          <img src="../../public/images/zyqk.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="/keyMatters">
-          <img src="../../public/images/keyMatters.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>
       </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">
@@ -280,13 +177,22 @@
           <img src="../../public/images/aq.png" width="45rpx" />
           <span class="vanicon_text">安全费用预算</span>
         </van-grid-item>
-        <van-grid-item to="/guest-register">
-          <img src="../../public/images/aq.png" width="45rpx" />
-          <span class="vanicon_text">111111111</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/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>
@@ -315,15 +221,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');
@@ -339,25 +236,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)
 });
 
 /**
@@ -368,12 +264,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
     }));
 
@@ -408,78 +304,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];
-};
 
 /**
  * 测试消息