From a1dd32e5db9e352f63ffa0ba76fe3775e3103363 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 26 八月 2022 09:58:48 +0800
Subject: [PATCH] 图标

---
 src/views/newHome/index.vue |   52 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/views/newHome/index.vue b/src/views/newHome/index.vue
index 17d40d9..5f71b25 100644
--- a/src/views/newHome/index.vue
+++ b/src/views/newHome/index.vue
@@ -14,14 +14,14 @@
                 <span></span>
                 <div class="avator">
                     <img src="../../assets/menu/admin.png" />
-                    <div>admin</div>
+                    <div>{{userName}}</div>
                 </div>
             </div>
         </div>
         <div class="leftCont"></div>
         <div class="topCont">
             <div class="topInfo">
-                <div class="topTit">新疆国泰新华<br />安全风险预警监测系统</div>
+                <div class="topTit">新疆国泰新华<br />安全风险预警监测系统(试运行)</div>
                 <div class="topTime">
                     <div class="time">
                         {{ time }}
@@ -45,8 +45,8 @@
                         <div>
                             <img class="iconImg" src="../../assets/newMenu/icon1.png" />
                             <div>
-                                <div class="itemTit1">安全风险综合预警<br />预报平台</div>
-                                <div class="enTit1">Security risk comprehensive early warning and forecast platform</div>
+                                <div class="itemTit1">智能安全风险综合预警<br />预报平台</div>
+                                <div class="enTit1">Intelligent Security Risk Comprehensive Forewarning and Forecasting Platform</div>
                             </div>
                         </div>
                     </div>
@@ -56,8 +56,8 @@
                     <div class="toplayer">
                         <img class="iconImg" src="../../assets/newMenu/icon2.png" />
                         <div>
-                            <div class="itemTit">双重预防系统</div>
-                            <div class="enTit">Double prevention</div>
+                            <div class="itemTit">智能安全双重预防系统</div>
+                            <div class="enTit">Intelligent Security Dual Prevention System</div>
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-4.png" />
@@ -66,8 +66,8 @@
                     <div class="toplayer">
                         <img class="iconImg" src="../../assets/newMenu/icon3.png" />
                         <div>
-                            <div class="itemTit">智能巡检系统</div>
-                            <div class="enTit">Intelligent inspection system</div>
+                            <div class="itemTit">智能安全巡检系统</div>
+                            <div class="enTit">Intelligent Security Patrol System</div>
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-8.png" />
@@ -76,8 +76,8 @@
                     <div class="toplayer">
                         <img class="iconImg" src="../../assets/newMenu/icon4.png" />
                         <div>
-                            <div class="itemTit">特殊作业系统</div>
-                            <div class="enTit">special work</div>
+                            <div class="itemTit">智能安全特殊作业系统</div>
+                            <div class="enTit">Intelligent Security Special Operating System</div>
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-7.png" />
@@ -86,8 +86,8 @@
                     <div class="toplayer">
                         <img class="iconImg" src="../../assets/newMenu/icon5.png" />
                         <div>
-                            <div class="itemTit">目标责任管理系统</div>
-                            <div class="enTit">Target Responsibility Management</div>
+                            <div class="itemTit">安全目标责任管理系统</div>
+                            <div class="enTit">Security Target Responsibility Management System</div>
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-2.png" />
@@ -97,7 +97,7 @@
                         <img class="iconImg" src="../../assets/newMenu/icon6.png" />
                         <div>
                             <div class="itemTit">安全知识图谱系统</div>
-                            <div class="enTit">Security Knowledge Graph</div>
+                            <div class="enTit">Security Knowledge Graph System</div>
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-3.png" />
@@ -107,7 +107,7 @@
                         <img class="iconImg" src="../../assets/newMenu/icon7.png" />
                         <div>
                             <div class="itemTit">设备综合管控系统</div>
-                            <div class="enTit">Comprehensive equipment control</div>
+                            <div class="enTit">Equipment Integrated Management and Control System</div>
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-9.png" />
@@ -117,7 +117,7 @@
                         <img class="iconImg" src="../../assets/newMenu/icon8.png" />
                         <div>
                             <div class="itemTit">应急管理系统</div>
-                            <div class="enTit">Emergency management</div>
+                            <div class="enTit">Emergency Management System</div>
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-5.png" />
@@ -126,8 +126,8 @@
                     <div class="toplayer">
                         <img class="iconImg" src="../../assets/newMenu/icon9.png" />
                         <div>
-                            <div class="itemTit">危险化学品全生命周期安全管理系统</div>
-                            <div class="enTit">Full life cycle of hazardous chemicals</div>
+                            <div class="itemTit">智能安全危险化学品全生命周期管控系统</div>
+                            <div class="enTit">Intelligent Security Hazardous Chemicals Life Cycle Safety Management System </div>
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-10.png" />
@@ -136,8 +136,8 @@
                     <div class="toplayer">
                         <img class="iconImg" src="../../assets/newMenu/icon10.png" />
                         <div>
-                            <div class="itemTit">事故管理系统</div>
-                            <div class="enTit">Incident Management</div>
+                            <div class="itemTit">安全事故管理系统</div>
+                            <div class="enTit">Security Incident Management System</div>
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-6.png" />
@@ -147,7 +147,7 @@
                         <img class="iconImg" src="../../assets/newMenu/icon11.png" />
                         <div>
                             <div class="itemTit">安全基础信息系统</div>
-                            <div class="enTit">Basic data permissions</div>
+                            <div class="enTit">Basic Security Information System</div>
                         </div>
                     </div>
                     <img class="bgImg" src="../../assets/newMenu/card-11.png" />
@@ -232,6 +232,10 @@
             dayTime: '',
             isScreenfull: false
         });
+
+        const userName = computed(() =>{
+            return userInfos.value.userName
+        })
         // 获取布局配置信息
         const getThemeConfig = computed(() => {
             return themeConfig.value;
@@ -395,6 +399,7 @@
         });
         return {
             render,
+            userName,
             logoMini,
             onLoginOut,
             getDateTime,
@@ -433,11 +438,12 @@
             .itemTit {
                 font-size: 28px;
                 line-height: 34px;
+                margin-bottom: 2px;
                 height: 40%;
                 color: #072270;
             }
             .enTit {
-                font-size: 18px;
+                font-size: 16px;
                 line-height: 20px;
                 color: #072270;
             }
@@ -485,7 +491,7 @@
                 margin-bottom: 12px;
             }
             .enTit1 {
-                font-size: 22px;
+                font-size: 20px;
                 line-height: 24px;
                 color: #072270;
             }
@@ -531,6 +537,7 @@
                 line-height: 30px;
                 height: 40%;
                 color: #072270;
+                margin-bottom: 1px;
                 margin-bottom: 2px;
             }
             .enTit {
@@ -812,7 +819,6 @@
 
             .topTit {
                 font-size: 44px;
-                font-family: 'PingFang SC';
                 font-weight: bolder;
                 text-align: left;
                 color: #fff;

--
Gitblit v1.9.2