From b3f92b8d7c06ce9062fa9203673d0a543a3f0307 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 2 Nov 2021 14:02:25 +0800
Subject: [PATCH] commit

---
 src/App.vue                             |  6 ++--
 src/components/navMenu/index.vue        | 42 ++++++++++++-------------
 src/pages/home/components/EnterCard.vue |  5 +--
 src/pages/home2/index.vue               | 18 ++++++-----
 4 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index dcb78047d..fe37bdd6e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,9 +4,9 @@
     <div class="content-box" v-if="isBoolean">
       <nav-menu></nav-menu>
       <div class="sub-container">
-        <div style="background-color: #171E4A; height: 65px; width: 100%">
-          <span style="color: #fff; line-height: 65px; float: left; font-size: 20px;">
-            标准法规管理系统  standard and regulations management system
+        <div style="background-color: #0068B7; height: 65px; width: 100%">
+          <span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
+            标准法规管理系统  Standard and Regulations Management System
           </span>
           <!-- header头部 右侧内容 当前登录人和退出-->
           <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 90a5e4c11..9d33a1b16 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -1,7 +1,7 @@
 <!--左侧导航菜单 liuyan -->
 <template>
   <div class="nav-menu v-class" :class="{'is-collapse': isCollapse}">
-    <div class="nav-menu-header" style="height: 65px; background-color: #171E4A;">
+    <div class="nav-menu-header" style="height: 65px; background-color: #0068B7;">
       <div class="header-left">
         <div class="logo">
           <img :src="logo" height="58" width="149" />
@@ -16,9 +16,9 @@
       <el-menu
           unique-opened
           :default-active="defaultActive"
-          background-color="#5ea9f6"
-          text-color="#000"
-          active-text-color="#ffd04b"
+          background-color="#f00"
+          text-color="#fff"
+          active-text-color="#ff0"
           router
           :collapse="isCollapse"
       >
@@ -105,7 +105,7 @@ export default {
             //   menuId: 'RAFQ4N4ARF'
             // },
             {
-              title: '国内标准法规',
+              title: '国内法规',
               path: '/domesticStandardsAndRegulations',
               menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
             },
@@ -120,12 +120,12 @@ export default {
             //   menuId: ''
             // },
             {
-              title: '海外标准法规',
+              title: '海外法规',
               path: '/foreignStandardsAndRegulations',
               menuId: '18c1e5134ea0cf865e8960b26b81fd8c'
             },
             {
-              title: '标准征求意见',
+              title: '征求意见',
               path: '/standardForComments',
               menuId: '2b25c67f10abbbadf37d60daaaec54d3'
             },
@@ -140,7 +140,7 @@ export default {
             // // //   path: '/demo2One'
             // // // },
             {
-              title: '标准法规清单',
+              title: '法规清单',
               path: '/accessStandardsAndRegulations',
               menuId: '08dbd417864b08426034ca56d1fa3d02'
             },
@@ -157,7 +157,7 @@ export default {
             // // //   path: '/localProductsOrProjectLibrary'
             // // // },
             {
-              title: '企业标准库',
+              title: '企业标准',
               path: '/enterpriseStandardDatabase',
               menuId: '01ed8f752748227777b3572d56ee9ab5'
             },
@@ -176,7 +176,7 @@ export default {
                menuId: '42ce39c9f953be65a3e5643a4a2c786f'
              },*/
             {
-              title: '未符合项整改',
+              title: '未符合项',
               path: '/nonConfomity',
               menuId: '0119abd677e0204e061eb0f0b8cafda0'
             },
@@ -190,7 +190,7 @@ export default {
             //   menuId: 'MQBAGJQMSRZDRX3X5AVR'
             // },
             {
-              title: '标准合规评估结果', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
+              title: '合规评估', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
               path: '/standInvolveProject',
               menuId: '8a9c87fe06244fb9d55e78fb281f625b'
             }
@@ -230,7 +230,7 @@ export default {
             //   path: '/standardWarning'
             // },
             {
-              title: '标准内容自动识别',
+              title: 'OCR识别',
               path: '/standardRecognition',
               menuId: '3db80f62af9d96d6dfc6d429eea4b29b'
             },
@@ -291,7 +291,7 @@ export default {
           menuId: 'adff323',
           children: [
             {
-              title: '标准法规属性管理',
+              title: '属性管理',
               path: '/standLawsAttrManage',
               menuId: '72a24657972d286b8b5d80735cf4eee2'
             },
@@ -350,7 +350,7 @@ export default {
             //       menuId: '3C87BSHJUF'
             //     },
             {
-              title: '标准属性自定义',
+              title: '属性配置',
               path: '/attributeCustom',
               menuId: '9cdb9b40157dd967b664b9af462b960b'
             },
@@ -517,7 +517,7 @@ export default {
   }
   &:not(.is-collapse) {
     width: 212px;
-    background: rgb(255, 255, 255);
+    background: #0068B7;
     background-size: 100% 100%;
     .logo {
       padding: 10px;
@@ -537,7 +537,7 @@ export default {
     align-items: center;
     justify-content: center;
     width: 15px;
-    height: calc(100% - 69px);
+    height: calc(100% - 65px);
     background: #EEE;
     cursor: pointer;
     &:hover{
@@ -556,7 +556,7 @@ export default {
     /*background:url("../../assets/images/shangqi/home/logo3.png");*/
   }
   /deep/:not(.is-collapse) .el-menu-item.is-active{
-    background: #f0f7ff !important;
+    background: #fff !important;
     color: #4091FF !important;
   }
 }
@@ -580,19 +580,18 @@ export default {
 }
 .nav-menu-popper .el-menu .el-menu-item.is-active {
   background-color: #fff !important;
-  color: #5ea9f6 !important;
+  color: #0068B7 !important;
   font-weight: bold;
 }
 .nav-menu-popper .el-menu .el-menu-item:hover {
   background-color: #fff !important;
-  color: #5ea9f6 !important;
+  color: #0068B7 !important;
   font-weight: bold;
 }
 
 .el-menu-item {
   padding: 0 16px !important;
   span {
-    font-weight: normal;
     margin-left: 5px;
   }
   .shangqi-icon {
@@ -659,11 +658,10 @@ export default {
   .el-menu-item {
     padding-left: 29px !important;
     div {
-      font-weight: normal;
     }
   }
   /deep/.el-menu {
-    padding-left: 18px;
+    /*padding-left: 18px;*/
   }
 }
 .el-menu--collapse{
diff --git a/src/pages/home/components/EnterCard.vue b/src/pages/home/components/EnterCard.vue
index b6c30f80c..beb80ab1d 100644
--- a/src/pages/home/components/EnterCard.vue
+++ b/src/pages/home/components/EnterCard.vue
@@ -37,15 +37,16 @@
     cursor: pointer;
     padding-left: 10px;
     & > div {
+      border-radius: 5px;
       width: 100%;
       height: 70px;
-      background-color: #E4E4E4;
+      background-color: #99BEDB;
     }
   }
   .wx-card:hover {
     & > div {
       color: #fff;
-      background-color: #5ea9f6;
+      background-color: #0068B7;
     }
   }
   .wx-card1 {
diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue
index 5887e4cc7..711fd9857 100644
--- a/src/pages/home2/index.vue
+++ b/src/pages/home2/index.vue
@@ -11,11 +11,13 @@
              class="home-tabs"
              @tab-click="handleTabClick"
            >
-             <el-tab-pane  label="标准征求意见" name="solicitOpinions">
-               <solicitOpinions></solicitOpinions>
+             <el-tab-pane name="solicitOpinions">
+                 <span slot="label"><i class="el-icon-s-order"></i> 标准征求意见</span>
+                 <solicitOpinions></solicitOpinions>
              </el-tab-pane>
-             <el-tab-pane label="标准发布" name="release">
-               <release></release>
+             <el-tab-pane name="release">
+                 <span slot="label"><i class="el-icon-s-promotion"></i> 标准发布</span>
+                 <release></release>
              </el-tab-pane>
            </el-tabs>
          </div>
@@ -135,17 +137,17 @@ export default {
             margin: 0 10px;
         }
         ::v-deep.el-tabs__header{
-          margin: 0 10px 15px 10px;
+            margin: 0 10px 15px 10px;
             border-bottom: 1px solid #F4F4F4;
         }
         ::v-deep {
           .el-tabs__item {
             font-size: 16px;
-            font-weight: 500;
-            color: #333333;
+            font-weight: 600;
+            /*color: #333333;*/
           }
           .el-tabs__nav-wrap::after {
-            background-color: transparent;
+            /*background-color: transparent;*/
           }
         }
       }