From f7ee226d6e067993b028b3ac25889600b640a4e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Sat, 16 Jul 2022 09:03:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A2=E5=B7=9E=E7=89=88=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E7=89=88=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/config.js                   |   4 +-
 src/assets/js/http.js                 |   2 +-
 src/router/index.js                   | 471 ++++++++++++++++++++++++++
 src/views/projectQu/noData.vue        |  22 +-
 src/views/projectThree/homePage.vue   | 213 ++++++++----
 src/views/projectThree/noDataPage.vue |  25 ++
 6 files changed, 652 insertions(+), 85 deletions(-)
 create mode 100644 src/views/projectThree/noDataPage.vue

diff --git a/public/js/config.js b/public/js/config.js
index e72a412c..5128235d 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -1,7 +1,7 @@
-// var COMPANY = ''; //通用
+var COMPANY = ''; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
-var COMPANY='nanchang'; //南昌地铁、衢州
+// var COMPANY='nanchang'; //南昌地铁、衢州
 // var COMPANY='longguang'; //龙光地产
 // var COMPANY='zhengwu'
 // var COMPANY='shenbai'; //沈白高铁
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index ffdc9d63..5835a51a 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -42,7 +42,7 @@ if (process.env.NODE_ENV == 'development') {
     // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
     // tag: 本地
     // axios.defaults.baseURL = 'http://192.168.34.148:6023/'  // 老大本地
-    axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //杨意本地 http/1.1
+    axios.defaults.baseURL = 'http://192.168.34.125:6043/'; //杨意本地 http/1.1
     // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/';
     // axios.defaults.baseURL = 'http://139.9.66.234:8/'; 
diff --git a/src/router/index.js b/src/router/index.js
index 63365003..061f2477 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1762,6 +1762,183 @@ const routes2 = [
                 component: () => import('@/views/projectQu/projectManage/materialManagement/index.vue')
             },
             // 原来有的路由重新配置
+            //劳务管理--人员管理
+            {
+                path: '/projectQu/labor/personManage',
+                name: '劳务管理_人员管理',
+                component: () => import('@/views/projectFront/laborManage/personManage.vue'),
+            },
+            // 劳务管理--人员下发记录
+            {
+                path: '/projectQu/labor/personnelRecords',
+                name: '劳务管理_人员下发记录',
+                component: () => import('@/views/projectFront/laborManage/personnelRecords.vue'),
+            },
+            // tag: luck 劳务管理--工资发放
+            {
+                path: '/projectQu/labor/payoff',
+                name: '劳务管理_工资发放',
+                component: () => import('@/views/projectFront/laborManage/Payoff'),
+            },
+            // tag: luck 劳务管理--防疫管理
+            {
+                path: '/projectQu/labor/epidemicPrevention',
+                name: '劳务管理_防疫管理',
+                component: () => import('@/views/projectFront/laborManage/EpidemicPrevention'),
+            },
+            // 劳务管理--人员审批
+            {
+                path: '/projectQu/labor/personAudit',
+                name: '劳务管理_人员审核',
+                component: () => import('@/views/projectFront/laborManage/personAudit.vue'),
+            },
+            //劳务管理--人员详情
+            {
+                path: '/projectQu/labor/personDetails',
+                name: '劳务管理_人员信息详情',
+                component: () => import('@/views/projectFront/laborManage/personDetails.vue'),
+            },
+            //劳务管理--人员考勤
+            {
+                path: '/projectQu/labor/attendanceManage',
+                name: '劳务管理_人员考勤',
+                component: () => import('@/views/projectFront/laborManage/attendanceManage/attendanceManage.vue'),
+            },
+            //劳务管理--工种管理
+            {
+                path: '/projectQu/labor/workTypeManage',
+                name: '劳务管理_工种管理',
+                component: () => import('@/views/projectFront/laborManage/workTypeManage.vue'),
+            },
+            //劳务管理--考勤规则
+            {
+                path: '/projectQu/labor/attendanceRules',
+                name: '劳务管理_考勤规则',
+                component: () => import('@/views/projectFront/laborManage/attendanceManage/attendanceRules.vue'),
+            },
+            {
+                path: '/projectQu/labor/safetyTrainManage',
+                name: '劳务管理_安全培训管理',
+                component: () => import('@/views/projectFront/laborManage/safetyTrainManage.vue'),
+            },
+            {
+                path: '/projectQu/labor/safeeducation',
+                name: '劳务管理_人员安全培训记录',
+                component: () => import('@/views/projectFront/laborManage/safeeducation/index.vue'),
+            },
+            {
+                path: '/projectQu/labor/blackList',
+                name: '劳务管理_黑名单管理',
+                component: () => import('@/views/projectFront/laborManage/blackList.vue'),
+            },
+            //劳务管理--人员总览
+            {
+                path: '/projectQu/labor/personnelOverview',
+                name: '劳务管理_人员总览',
+                component: () => import('@/views/projectFront/laborManage/personnelOverview.vue'),
+            },
+            //劳务管理--报表中心
+            {
+                path: '/projectQu/labor/reportCenter',
+                name: '劳务管理_报表中心',
+                component: () => import('@/views/projectFront/laborManage/reportCenter.vue'),
+            },
+            //劳务管理--评价中心
+            {
+                path: '/projectQu/labor/assessmentCentent',
+                name: '劳务管理_评价中心',
+                component: () => import('@/views/projectFront/laborManage/assessmentCentent.vue'),
+            },
+            //劳务管理--电子围栏
+            {
+                path: '/projectQu/labor/electronicFence',
+                name: '劳务管理_电子围栏',
+                component: () => import('@/views/projectFront/laborManage/electronicFence.vue'),
+            },
+            //劳务管理--处罚单
+            {
+                path: '/projectQu/labor/penalize',
+                name: '劳务管理_处罚单',
+                component: () => import('@/views/projectFront/laborManage/penalize.vue'),
+            },
+            {
+                path: '/projectQu/labor/addLED',
+                name: '劳务管理_人员审核',
+                component: () => import('@/views/projectFront/laborManage/LEDBigScreen/addLED.vue'),
+            },
+            //劳务管理--花名册
+            {
+                path: '/projectQu/labor/roster',
+                name: '劳务管理_花名册',
+                component: () => import('@/views/projectFront/laborManage/roster.vue'),
+            },
+            //劳务管理--宿舍管理
+            {
+                path: '/projectQu/labor/dormitory',
+                name: '劳务管理_宿舍管理',
+                component: () => import('@/views/projectFront/laborManage/dormitory.vue'),
+            },
+            
+            //劳务管理--人员统计分析
+            {
+                path: '/projectQu/labor/personnelAnalysis',
+                name: '劳务管理_人员统计分析',
+                component: () => import('@/views/projectFront/laborManage/personnelAnalysis.vue'),
+            },
+            //核酸超时人员列表
+            {
+                path: '/projectQu/labor/nucleicAcidOvertimePersonnel',
+                name: '核酸超时人员列表',
+                component: () => import('@/views/projectFront/nucleicAcidOvertimePersonnel/index.vue'),
+            },
+            // 劳务管理--访客管理
+            {
+                path: '/projectQu/labor/visitorsManage',
+                name: '劳务管理_访客管理',
+                component: () => import('@/views/projectFront/laborManage/visitorsManage.vue'),
+            },
+            //安全管理安全管理
+            {
+                path: '/projectQu/safeManage/addSafeRecord',
+                name: '安全管理_新增安全检查',
+                component: () => import('@/views/projectFront/safeManage/addSafeRecord.vue'),
+            },
+            {
+                path: '/projectQu/safeManage/checkItemList',
+                name: '安全管理_检查项管理',
+                component: () => import('@/views/projectFront/safeManage/checkItemList.vue'),
+            },
+            {
+                path: '/projectQu/safeManage/safeRocordList',
+                name: '安全管理_安全检查记录',
+                component: () => import('@/views/projectFront/safeManage/safeRocordList.vue'),
+            },
+            {
+                path: '/projectQu/safeManage/checkStandingBook',
+                name: '安全管理_检查台账',
+                component: () => import('@/views/projectFront/safeManage/v2/checkStandingBook.vue'),
+            },
+            {
+                path: '/projectQu/safeManage/projectSelfInspection',
+                name: '安全管理_项目自检',
+                component: () => import('@/views/projectFront/safeManage/v2/projectSelfInspection.vue'),
+            },
+            {
+                path: '/projectQu/safeManage/subTasklist',
+                name: '安全管理_项目自检子任务',
+                component: () => import('@/views/projectFront/safeManage/v2/subTasklist.vue'),
+            },
+            {
+                path: '/projectQu/safeManage/hiddenDangerLibrary',
+                name: '安全管理_隐患库',
+                component: () => import('@/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue'),
+            },
+            {
+                path: '/projectQu/safeManage/hazardAssess',
+                name: '安全管理_隐患考核',
+                component: () => import('@/views/projectFront/safeManage/v2/hazardAssess.vue'),
+            },
+            //塔吊管理塔吊管理
             {
                 path: '/projectQu/towerCrane/home', //塔吊管理  首页
                 name: '塔吊管理_首页',
@@ -1953,6 +2130,294 @@ const routes2 = [
                 name: '深基坑监测系统_基坑配置',
                 component: () => import('@/views/projectFront/deepFoundationPitManage/dataConfig.vue')
             },
+            // 衢州2  默认没有内容的跳到noData
+            {
+                path: '/projectQu/home',
+                name: '首页',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            //个人中心
+            {
+                path: '/projectQu/personalCenter/messageCenter',
+                name: '消息中心',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/taskCenter',
+                name: '任务中心',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/userCenter',
+                name: '用户中心',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+             // 用户中心
+            {
+                path: '/projectQu/personalCenter/Mobile',
+                name: '手机绑定',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/changePass',
+                name: '修改密码',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/basicInfor',
+                name: '基本资料',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/Read',
+                name: '已读',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/Unread',
+                name: '未读',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/all',
+                name: '全部',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/entrust',
+                name: '委托',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/already',
+                name: '已办',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/dealtWith',
+                name: '待办',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/oA',
+                name: 'OA',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/homepagePreview',
+                name: '首页预览',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/personalCenter/myDocuments',
+                name: '我的文档',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            // 管控中心
+            {
+                path: '/projectQu/controlCenter/basicDataManagement',
+                name: '基础数据管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/docManage',
+                name: '文档管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/integratedManagement',
+                name: '集成管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/startWorkApply',
+                name: '开工许可证办理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/review',
+                name: '图审',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/incognizance',
+                name: '不认识的字',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/patrol',
+                name: '巡察',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/environment',
+                name: '环境',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/inspectionCompletion',
+                name: '验峻',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/acceptanceTest',
+                name: '验收检测',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/finance',
+                name: '财务',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/contract',
+                name: '合同',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/laborEmployment',
+                name: '劳务用工',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/controlCenter/coordination/projectOverview',
+                name: '项目概览',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            // 业务中心
+            {
+                path: '/projectQu/business/overview',
+                name: '项目概览',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/personnelManage',
+                name: '人员管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/securityManage',
+                name: '安全管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/projectGS',
+                name: '项目GS',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/dataManage',
+                name: '资料管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/materialManage',
+                name: '物料管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/project',
+                name: '项目',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/qualityManage',
+                name: '质量管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/projectObjectivesManage',
+                name: '项目目标管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/costManage',
+                name: '成本管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/environmentManage',
+                name: '环境管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/mechanicsManage',
+                name: '机械管理',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            // 生产管理
+            {
+                path: '/projectQu/business/organization',
+                name: '组织',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/control',
+                name: '控制',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/coordinate',
+                name: '协调',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/business/plan',
+                name: '计划',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            // 
+            {
+                path: '/projectQu/taskCollaboration/environmentalMonitoring',
+                name: '环境监测',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/taskCollaboration/constructionPermit',
+                name: '开工许可',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/taskCollaboration/laborEmployment',
+                name: '劳动用工',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/taskCollaboration/financial',
+                name: '财务收支',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/taskCollaboration/messageNotification',
+                name: '消息通知',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/taskCollaboration/checkBeforeAcceptance',
+                name: '验收',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/taskCollaboration/patrol',
+                name: '巡查',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/taskCollaboration/nationalAudit',
+                name: '国审',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/taskCollaboration/projectSupervisionReport',
+                name: '项目报监',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+            {
+                path: '/projectQu/taskCollaboration/inspectionDetection',
+                name: '检验检测',
+                component: () => import('@/views/projectQu/noData.vue')
+            },
+           
         ]
     },
 
@@ -2093,5 +2558,11 @@ const router = new VueRouter({
     base: process.env.BASE_URL,
     routes
 })
+// 解决跳转重复路由
+const VueRouterPush = VueRouter.prototype.push
+VueRouter.prototype.push = function push (to) {
+  return VueRouterPush.call(this, to).catch(err => err)
+}
+
 
 export default router
diff --git a/src/views/projectQu/noData.vue b/src/views/projectQu/noData.vue
index 7d713b55..325658b6 100644
--- a/src/views/projectQu/noData.vue
+++ b/src/views/projectQu/noData.vue
@@ -1,25 +1,33 @@
 <!-- 省级标准 -->
 <template>
-<div class="content">
-<img class="noData" src='@/assets/images/menu/noData.png'>
-<p class="pnoData">暂无数据</p>
-</img>
+<div class="content flex">
+    <div>
+        <img class="noData" src='@/assets/images/menu/noData.png'></img>
+        <p class="pnoData">暂无数据</p>
+    </div>
+
 
 </div>
 </template>
 <script>
 </script>
 <style lang="less" scoped>
+.flex{
+    display:flex;
+    justify-content:center;
+    align-items:center;
+}
 .content{
+    width:100%;
+    height:100%;
     .noData{
         width:152px;
         height:115px;
-        margin-top:200px;
-        margin-left:500px;
+
     }
     .pnoData{
+        text-align:center;
         margin-top:10px;
-        margin-left:550px;
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/projectThree/homePage.vue b/src/views/projectThree/homePage.vue
index 34651778..d4a1e1cc 100644
--- a/src/views/projectThree/homePage.vue
+++ b/src/views/projectThree/homePage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="maxBox">
     <div class=" flex topfirst">
-    <div class="title">工地监管服务平台</div>
+    <div class="title">数字项目管理平台</div>
       <div class="tabs flex">
       <div
         class="menuLsitItem"
@@ -20,8 +20,8 @@
         <span @click="toBack()">退出</span>
       </div>
     </div>
-    <div class="flex contentBox">
-      <div class="left">
+    <div class="flex contentBox" :style="{height:screenHeight+'px'}">
+      <div class="left" v-if="menuTwo.length > 0">
         <!-- :default-active="menuTwo[0].path"      :default-active="activeName"-->
         <el-menu
           class="el-menu-vertical-demo"
@@ -31,42 +31,45 @@
         >
           <div v-for="(item, index) in menuTwo" :key="index">
           <!-- 没有三级菜单 -->
-            <el-menu-item v-if="item.menuList == ''" :index="item.menuId" @click="selectEvent(item.menuId,item)">
-              <!-- <i class="el-icon-menu"></i> -->
+            <el-menu-item v-if="item.menuList == '' " :index="item.menuId" @click="selectEvent(0,item.menuId,item,0)">
               <div :class="item.menuId == showmenuId ? 'heightShow' : ''">
-                <img style="width:20px;height:20px;margin-right:10px;" :src="require('@/assets/images/menu/' + item.icon + '.png')" class="icon" /> 
-                <span slot="title">{{ item.menuName }}</span> 
+                <!-- <img v-if="item.menuId == showmenuId" style="width:20px;height:20px;margin-right:10px;padding-left:10px;" :src="require('@/assets/images/menu/un' + item.icon + '.png')" class="icon" />
+                <img v-else style="width:20px;height:20px; margin-right:10px;" :src="require('@/assets/images/menu/' + item.icon + '.png')" class="icon" />   -->
+                <span class="padding20" slot="title">{{ item.menuName }}</span> 
               </div>
             </el-menu-item>
             <!-- 有三级菜单 -->
             <el-submenu v-else :index="item.menuId">
               <template slot="title">
                 <!-- <i class="el-icon-location"></i> -->
-                <div :class="item.menuId == showmenuId ? 'heightShow' : ''">
-                  <img style="width:20px;height:20px; margin-right:10px;" :src="require('@/assets/images/menu/' + item.icon + '.png')" class="icon" /> 
-                  <!-- <img v-else style="width:20px;height:20px; margin-right:10px;" :src="require('@/assets/images/menu/un' + item.icon + '.png')" class="icon" />  -->
-                 <span>{{ item.menuName }}</span>
+                <div :class="item.menuId == showmenuId ? 'heightShow' : ''"  @click="selectEvent(5,item.menuId,item,1,'noPath')">
+                  <!-- <img v-if="item.menuId == showmenuId" style="width:20px;height:20px; margin-right:10px;padding-left:10px;" :src="require('@/assets/images/menu/un' + item.icon + '.png')" class="icon" /> 
+                  <img v-else style="width:20px;height:20px; margin-right:10px;" :src="require('@/assets/images/menu/' + item.icon + '.png')" class="icon" />  -->
+                 <span class="padding20">{{ item.menuName }}</span>
                 </div>
               </template>
+
               <div v-if="menuTwo[index].menuList != ''">
                 <div v-for="(item, index) in menuTwo[index].menuList">
-                  <el-menu-item v-if="item.menuList == ''" :index="item.menuId" @click="selectEvent(item.menuId,item)">
-                    <div :class="item.menuId == showmenuId ? 'heightShow' : ''" >
-                    <!-- :class="item.menuId == parentId ? 'textShow' : ''" -->
-                    <!-- <img style="width:20px;height:20px; margin-right:10px;" :src="require('@/assets/images/menu/' + item.icon + '.png')" class="icon" />  -->
+                  <el-menu-item v-if="item.menuList == ''" :index="item.menuId" @click="selectEvent(1,item.menuId,item,0)">
+                  <!-- 质检安检 -->
+                    <div @click="selectEvent(0,item.menuId,item) " :class="item.menuId == showmenuId ? 'heightShow' : ''">
                       <span slot="title">{{ item.menuName }}</span>
                     </div>
                   </el-menu-item>
+
+                  <!-- 有四级的 -->
                   <el-submenu v-else :index="item.menuId">
-                    <template slot="title">{{ item.menuName }}</template>
-                    <div v-if="item.menuList != ''" :class="item.menuId == showmenuId ? 'heightShow' : ''">
+                      <template slot="title">
+                         <div>{{ item.menuName }}</div>
+                      </template>
+                    <div v-if="item.menuList != ''">
                       <el-menu-item
-                      @click="selectEvent2(item2.menuName,item2)"
+                      @click="selectEvent2(4,item2.parentId,item2.menuName,item2)"
                         v-for="(item2, index) in item.menuList"
                         :key="index"
                         :index="item2.menuId"
                         >
-                        <!-- <img style="width:20px;height:20px; margin-right:10px;" :src="require('@/assets/images/menu/' + item2.icon + '.png')" class="icon" />  -->
                        <span>{{ item2.menuName }}</span>
                         </el-menu-item
                       >
@@ -79,16 +82,19 @@
         </el-menu>
       </div>
       <div class="right">
-        <router-view v-show="isShow"></router-view>
+        <router-view>
+          <noData></noData>
+        </router-view>
       </div>
     </div>
   </div>
 </template>
 <script>
+import noData from './noDataPage.vue'
 export default {
+  components:{noData},
   data() {
     return {
-      // defaultActive:'1544872925246009346', // tab栏默认显示
       defaultActive:"",
       activeName: "",
       userInfo: "", //返回的信息
@@ -96,24 +102,20 @@ export default {
       menuTwo: [], //第二级
       menuThree: [], //第三级
       menuId: "",
-      noChildren: false,
-      isShow: true,
-      isMap:false,
       heightShow:false,
       showmenuId:'',
       parentId:'',
-      textShow:false,
+      isShow:false,
+      screenHeight:0
     };
   },
   watch: {
     "$route.path"(toPath, fromPath) {
       localStorage.setItem('path',toPath) //存储当前地址
     },
-    activeName(newValue,old){
-      console.log('new',newValue)
-    }
   },
   created() {
+    this.screenHeight = document.body.scrollHeight-120;
     this.userInfo = this.$store.state.userInfo;
     this.menuData = this.userInfo.menuAuthority.moduleList;
     // this.$router.push({path:this.menuData[1].modulePath})
@@ -131,32 +133,27 @@ export default {
    
     //  默认进来的时候
     if(!defaultActive ){
-       this.handleClick(0, this.menuData[0].moduleId)
        this.defaultActive=this.menuData[0].moduleId;
        if(this.menuData[0].menuList.length > 0){
+         console.log('默认进来的时候',this.menuTwo )
         this.menuTwo = this.menuData[0].menuList;
-        console.log('默认进来的时候',this.menuTwo )
+       
         // this.activeName = this.menuTwo[0].menuId
-        this.showmenuId = this.menuTwo[0].menuId
+         this.handleClick(0, this.menuData[0].moduleId)
+       }else{
+         this.$router.push({ path: this.menuData[0].modulePath })
        }
     }else{
     // 刷新进来的时候
       this.defaultActive = localStorage.getItem('active');
       let dres= this.menuData.find(item=>item.moduleId==defaultActive);
       if(dres){
-        this.menuTwo=dres.menuList
         console.log('this.menuTwo',this.menuTwo)
         // this.activeName = this.menuTwo[0].menuId
-        this.showmenuId = this.menuTwo[0].menuId
-      }
-    }
-  },
-  computed: {
-    activeName() {
-      if (this.menuTwo[0].menuList.length > 0) {
-        this.activeName = this.menuList[0].menuId;
-      } else {
-        this.activeName = this.menuData[0].menuId;
+        if(dres.menuList.length > 0){
+          this.menuTwo=dres.menuList
+          this.showmenuId = this.menuTwo[0].menuId
+        }
       }
     }
   },
@@ -183,17 +180,20 @@ export default {
       this.menuId = id;
       this.defaultActive = id;  // tab栏点击
       localStorage.setItem('active',this.defaultActive)
-
-      this.menuTwo = this.menuData[val].menuList;
-      console.log("二级路由内容", this.menuTwo);
-      // this.activeName = this.menuTwo[0].menuId;
-      this.showmenuId = this.menuTwo[0].menuId;
-      if(this.menuTwo[0].menuList == ''){
-        this.$router.push({ path: this.menuTwo[0].path})
+      if(this.menuData[val].menuList.length > 0){
+        this.menuTwo = this.menuData[val].menuList;
+        console.log("二级路由内容", this.menuTwo);
+        // this.activeName = this.menuTwo[0].menuId;
+        this.showmenuId = this.menuTwo[0].menuId;
+        if(this.menuTwo[0].menuList == ''){
+          this.$router.push({ path: this.menuTwo[0].path})
+        }else{
+          this.$router.push({ path: this.menuTwo[0].menuList[0].path})
+        } 
       }else{
-        this.$router.push({ path: this.menuTwo[0].menuList[0].path})
+        this.$router.push({ path: this.menuData[val].modulePath })
+        this.menuTwo = []
       }
-      
     },
     handleOpen(key, keyPath) {
       console.log(key, keyPath);
@@ -201,45 +201,84 @@ export default {
     handleClose(key, keyPath) {
       console.log(key, keyPath);
     },
-    selectEvent(index,val){
-      console.log('index',index)
+    selectEvent(type,index,val,max,noPath){
+      console.log('当前点击',index)
       console.log('val',val)
-        if(index == val.menuId){
-          console.log('准备跳转')
-          this.showmenuId = index
-          this.heightShow = true
-          this.$router.push({ path: val.path })
-        }
-        this.parentId = val.parentId
-        if(index == val.menuId){
-          this.showmenuId = val.parentId
-          this.textShow = true
+     
+      if(index == val.menuId){
+         if(!noPath ){
+        this.$router.push({ path: val.path })
+      } 
+      }
+      // 如果没有子项
+      if(val.menuList == ''){
+        if(!noPath ){
+        this.$router.push({ path: val.path })
+       }
+      }else{
+        this.showmenuId == val.menuId
+      }
+      if(type == 0){
+        this.showmenuId = index
+      }
+      //如果有四级 存储父级的index
+      if(val.menuList != ''){
+        let arr = val.menuList
+        console.log('下级',arr)
+        let arr2 = arr.filter((item)=>{
+          return item.menuList != ""
+        })
+        if(arr2 != null){
+          localStorage.setItem('maxId',index)
+          console.log('存储',localStorage.getItem('maxId'))
         }
+      }
+      if(type == 1){
+        this.showmenuId = val.parentId
+      }
     },
-    selectEvent2(index,val){
-      console.log(index,val)
-      // this.activeName = val.moduleId
+    selectEvent2(type,menuId,index,val){
       if(index == val.menuName) {
          this.$router.push({ path: val.path })
        }
+      if(type == 4){
+        let maxId = localStorage.getItem('maxId')
+        console.log('父级',maxId)
+        this.showmenuId = maxId
+      }
     }
   },
 };
 </script>
 <style lang="less" scoped>
+.maxBox{
+  font-family: Emoji !important;
+  src: local('Apple Color Emojiji'), local('Segoe UI Emoji'),
+    local('Segoe UI Symbol'), local('Noto Color Emoji');
+  unicode-range: U+1F000-1F644, U+203C-3299;
+}
+.padding20{
+  padding-left:20px;
+}
+.four{
+  color:red;
+}
 .heightShow{
   background-color: #396df7;
   border-radius: 14px;
   color: #fff;
-  width: 220px;
+  width: 210px;
   margin-right:20px;
   height: 45px;
   line-height: 45px;
-  margin-top:10px;
-  box-shadow:0px 3px 10px rgba(57, 109, 247, 0.4);
+  margin-top:15px;
+  margin-right:1px;
+  box-shadow:0px 3px 5px rgba(57, 109, 247, 0.4);
 }
-.textShow{
-  color: #396df7;
+::v-deep .heightShow+ .el-submenu__icon-arrow{
+   color: #fff!important;
+   margin-top: -12px;
+
 }
 .title{
     flex:1.5;
@@ -265,7 +304,7 @@ export default {
   }
   .this_class::before {
     content: '';
-    width: 30px;
+    width: 48%;
     background: #396df7;
     height: 4px;
     position: absolute;
@@ -294,28 +333,36 @@ export default {
   border-radius:10px;
 }
 .contentBox{
+ 
   padding:20px 20px 20px 0px ;
+  box-sizing:box-sizing;
 }
 .flex {
   display: flex;
   align-items: center;
   .left {
     // margin-top:30px;
-    margin-right: 20px;
+    // margin-right: 20px;
     flex: 1.2;
-    height: 900px;
+    height: 100%;
     overflow-y: auto;
     overflow-x: auto;
     background-color:rgb(255, 255, 255);
     box-shadow:0px 3px 10px rgba(57, 109, 247, 0.4);
     border-radius:10px;
   }
+  ::-webkit-scrollbar { 
+        width: 2px;
+      } 
   .right {
     flex: 8;
-    height: 900px;
+    height: 100%;
+    margin-left:20px;
     background-color:rgb(255, 255, 255);
     box-shadow: 0px 2px 10px 0px rgba(52, 104, 246, 0.2);
     border-radius:10px;
+    padding:25px;
+    box-sizing:border-box;
     overflow:auto;
     .noData{
         width:300px;
@@ -326,6 +373,15 @@ export default {
     }
   }
 }
+.el-menu--inline .el-menu-item.is-active span::before{
+  content: "";
+  width: 4px;
+  height:4px;
+  background: #396df7;
+  position: absolute;
+  left: 30px;
+  top: 25px;
+}
 ::v-deep .el-tabs__item {
   font-size: 18px;
 //   color:rgb(146, 146, 146);
@@ -360,5 +416,12 @@ export default {
 //      border-right: none; 
 //      text-decoration: none; 
 // }
+@font-face {
+  font-family: Emoji !important;
+  src: local('Apple Color Emojiji'), local('Segoe UI Emoji'),
+    local('Segoe UI Symbol'), local('Noto Color Emoji');
+  unicode-range: U+1F000-1F644, U+203C-3299;
+}
+
 </style>
 
diff --git a/src/views/projectThree/noDataPage.vue b/src/views/projectThree/noDataPage.vue
new file mode 100644
index 00000000..7d713b55
--- /dev/null
+++ b/src/views/projectThree/noDataPage.vue
@@ -0,0 +1,25 @@
+<!-- 省级标准 -->
+<template>
+<div class="content">
+<img class="noData" src='@/assets/images/menu/noData.png'>
+<p class="pnoData">暂无数据</p>
+</img>
+
+</div>
+</template>
+<script>
+</script>
+<style lang="less" scoped>
+.content{
+    .noData{
+        width:152px;
+        height:115px;
+        margin-top:200px;
+        margin-left:500px;
+    }
+    .pnoData{
+        margin-top:10px;
+        margin-left:550px;
+    }
+}
+</style>
\ No newline at end of file