From 937ccde780a9d755c0930f2259f52b1ff61db0e5 Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Tue, 28 Jun 2022 14:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/layout/components/Navbar.vue    | 90 +++++++++++++++----
 report-ui/src/views/login.vue                 |  3 +-
 2 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/report-ui/src/views/layout/components/Navbar.vue b/report-ui/src/views/layout/components/Navbar.vue
index e980f7eb..7fd42b9b 100644
--- a/report-ui/src/views/layout/components/Navbar.vue
+++ b/report-ui/src/views/layout/components/Navbar.vue
@@ -7,21 +7,36 @@
         class="hamburger-container"
       />
       <breadcrumb />
-      <el-dropdown class="avatar-container" trigger="click">
-        <div class="avatar-wrapper">
-          <i class="icon iconfont iconyonghu user" />
-          <span class="user-name">{{ operatorText }}</span>
-          <i class="el-icon-caret-bottom" />
+      <div class="right-menu">
+        <div class="item-men">
+          <div class="item" @click="centerDialogVisible = true">说明</div>
+          <div class="item">
+            <a href="https://ajreport.beliefteam.cn/report-doc/" target="blank"
+            >文档</a
+            >
+          </div>
+          <div class="item">
+            <a href="https://gitee.com/anji-plus/report" target="blank">社区</a>
+          </div>
         </div>
-        <el-dropdown-menu slot="dropdown" class="user-dropdown">
-          <el-dropdown-item divided>
-            <span style="display:block;" @click="updatePassword">修改密码</span>
-          </el-dropdown-item>
-          <el-dropdown-item divided>
-            <span style="display:block;" @click="logout">注销登录</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+
+        <el-dropdown class="avatar-container" trigger="click">
+          <div class="avatar-wrapper">
+            <i class="icon iconfont iconyonghu user" />
+            <span class="user-name">{{ operatorText }}</span>
+            <i class="el-icon-caret-bottom" />
+          </div>
+          <el-dropdown-menu slot="dropdown" class="user-dropdown">
+            <el-dropdown-item divided>
+              <span style="display:block;" @click="updatePassword">修改密码</span>
+            </el-dropdown-item>
+            <el-dropdown-item divided>
+              <span style="display:block;" @click="logout">注销登录</span>
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+
     </el-menu>
     <!-- 修改密码弹框 -->
     <el-dialog
@@ -67,6 +82,30 @@
         <el-button type="primary" @click="confrimUpdate">确 定</el-button>
       </span>
     </el-dialog>
+
+    <!--说明弹出框-->
+    <el-dialog
+      title="说明"
+      :visible.sync="centerDialogVisible"
+      width="34%"
+      center
+    >
+      <div style="font-size: 30px; line-height: 50px; margin-bottom: 50px">
+        AJ-Report由<a href="http://www.anji-plus.com/" target="_blank" style="text-decoration: underline"><b>安吉加加信息技术有限公司</b></a
+      >遵循 <a href="http://www.apache.org/licenses/LICENSE-2.0.html" target="_blank" style="word-wrap: break-word"><strong style="color: orangered">Apache2.0开源协议</strong></a
+      >在<a href="https://gitee.com/explore" target="_blank" style="text-decoration: underline; word-wrap: break-word"><b>Gitee平台</b></a
+      >进行开源。
+      </div>
+      <div style="font-size: 30px; line-height: 50px">
+        <strong style="color: orangered">个人/商业使用须遵循Apache2.0开源协议。</strong>
+        <strong style="color: orangered">禁止将AJ-Report产品用于违法违规业务。</strong>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="centerDialogVisible = false"
+        >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -127,7 +166,10 @@ export default {
         confirmPassword: [
           { required: true, validator: validatePass3, trigger: "blur" }
         ]
-      }
+      },
+
+      // 说明
+      centerDialogVisible: false
     };
   },
   components: {
@@ -204,6 +246,8 @@ export default {
   line-height: 50px;
   border-radius: 0px !important;
   background: #fff !important;
+  display: flex;
+  flex-direction: row;
   .hamburger-container {
     line-height: 57px;
     height: 49px;
@@ -217,15 +261,25 @@ export default {
     top: 16px;
     color: red;
   }
+  .right-menu {
+    position: absolute;
+    right: 35px;
+    display: flex;
+    .item-men {
+      display: flex;
+      flex-direction: row;
+      .item {
+        margin-right: 60px;
+        cursor: pointer;
+      }
+    }
+  }
   .avatar-container {
     height: 50px;
     display: inline-block;
-    position: absolute;
-    right: 35px;
     .avatar-wrapper {
       line-height: 50px;
       cursor: pointer;
-      margin-top: 5px;
       position: relative;
       .user-avatar {
         width: 40px;
diff --git a/report-ui/src/views/login.vue b/report-ui/src/views/login.vue
index 3e8e12e3..1eb4fd2d 100644
--- a/report-ui/src/views/login.vue
+++ b/report-ui/src/views/login.vue
@@ -141,6 +141,7 @@
       </div>
       <div style="font-size: 30px; line-height: 50px">
         <strong style="color: orangered">个人/商业使用须遵循Apache2.0开源协议。</strong>
+        <strong style="color: orangered">禁止将AJ-Report产品用于违法违规业务。</strong>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="centerDialogVisible = false"
@@ -392,7 +393,7 @@ export default {
       display: flex;
       flex-direction: row;
       .item {
-        margin-right: 20px;
+        margin-right: 60px;
         cursor: pointer;
       }
     }