From 610eb22301a8a29a8a8747eeb871e5cb81aca5de Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Mon, 20 Mar 2023 16:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=A4=A7=E5=B1=8F=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E9=A6=96=E9=A1=B5=E7=9A=84=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=81=9A=E7=9B=B8=E5=85=B3=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/router.config.js      | 12 ++++++------
 src/permission.js                |  3 ++-
 src/views/dashboard/Analysis.vue | 26 +++++++++++++++++---------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/config/router.config.js b/src/config/router.config.js
index eb6c656..a061f32 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -64,10 +64,10 @@ export const constantRouterMap = [
     component: SignUpPage,
     hidden: true,
   },
-  {
-    path: "/screen",
-    name: 'HomePage',
-    component: () => import(/* webpackChunkName: "user" */ "@/views/screen/HomePage"),
-    hidden: true,
-  },
+  // {
+  //   path: "/screen",
+  //   name: 'HomePage',
+  //   component: () => import(/* webpackChunkName: "user" */ "@/views/screen/HomePage"),
+  //   hidden: true,
+  // },
 ];
diff --git a/src/permission.js b/src/permission.js
index 87e7570..7ef073a 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -75,7 +75,8 @@ router.beforeEach(async (to, from, next) => {
           console.log('redirect--------', redirect)
           console.log('to.path--------', to.path)
             // const redirect = decodeURIComponent(from.query.redirect || to.path)
-            if (to.path === redirect || to.path === '/screen') {
+            // 大屏的路由跳转 to.path === redirect || to.path === '/screen'
+            if (to.path === redirect) {
               // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
               next({ ...to, replace: true })
             } else {
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 550c156..6e3df24 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -16,19 +16,19 @@
       </a-dropdown>
 
     </div>
-    <div class="screen-btn">
-      <!-- v-has="'dashboard:screen'"-->
-      <a-button type="primary" @click="goScreen">大屏</a-button>
-    </div>
+    <!--<div class="screen-btn">-->
+    <!--  &lt;!&ndash; v-has="'dashboard:screen'"&ndash;&gt;-->
+    <!--  <a-button type="primary" @click="goScreen">大屏</a-button>-->
+    <!--</div>-->
     <!--只是单纯的用于定位-->
     <div id="income"></div>
     <!-- 其他人展示消息-->
     <template v-if="roleCoe">
       <user-announcement-list :is-show-seach="true"></user-announcement-list>
-      <div class="download">
-        点击下载<span class="primary-color" @click="downloadManual">管理端使用手册</span>
-        <span style="margin-left: 10px">技术支持电话：022-84379290</span>
-      </div>
+      <!--<div class="download">-->
+      <!--  点击下载<span class="primary-color" @click="downloadManual">管理端使用手册</span>-->
+      <!--  <span style="margin-left: 10px">技术支持电话：022-84379290</span>-->
+      <!--</div>-->
     </template>
     <!--    所领导 部门领导展示统计图 -->
     <template v-else>
@@ -92,6 +92,14 @@
         <w-p-screen></w-p-screen>
       </template>
     </template>
+
+    <!-- 其他人展示消息-->
+    <template v-if="roleCoe">
+      <div class="download">
+        点击下载<span class="primary-color" @click="downloadManual">管理端使用手册</span>
+        <span style="margin-left: 10px">技术支持电话：022-84379290</span>
+      </div>
+    </template>
   </div>
 </template>
 
@@ -219,7 +227,7 @@ export default {
 }
 
 .download {
-  margin-top: 8px;
+  margin: 8px 0 12px;
   font-size: 16px;
   text-align: center;
 }