From bf22e639ee174c27a2acc74355cd813818529418 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Wed, 25 Oct 2023 09:33:41 +0800
Subject: [PATCH] 1

---
 src/components/merchantManagement/dataScreen.vue | 61 ++++++++++++++----------
 src/components/merchantManagement/memberInfo.vue |  4 +-
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/components/merchantManagement/dataScreen.vue b/src/components/merchantManagement/dataScreen.vue
index fa219b5..9354b63 100644
--- a/src/components/merchantManagement/dataScreen.vue
+++ b/src/components/merchantManagement/dataScreen.vue
@@ -9,12 +9,23 @@
       <a-breadcrumb-item>数据大屏</a-breadcrumb-item>
     </a-breadcrumb>
     <div class="bodyContainer">
-      <a-button class="newScreen">
-        <router-link target="_blank" to="/largeScreen">新窗口打开</router-link>
-      </a-button>
-      <div class="middleScreen">
-        <largeScreen class="screen"></largeScreen>
+      <div>
+        <div class="fsa pb14 bb1 mb24">
+          <div class="f20 fw500">交付中心实时数据</div>
+          <!-- <button class="addGroup" @click="addGroupShow = true">添加部门</button> -->
+          <!-- <a-button class="addmemeber f14" @click="showDetail('add')">
+            <i class="iconfont icon-fangda mr4"></i> 添加成员
+          </a-button> -->
+          <a-button class="newScreen">
+          <router-link target="_blank" to="/largeScreen">新窗口打开</router-link>
+        </a-button>
+          <!-- <button @click="changepage(1)">下一页</button> -->
+        </div>
+        
       </div>
+      <!-- <div class="middleScreen"> -->
+      <largeScreen class="screen"></largeScreen>
+      <!-- </div> -->
     </div>
   </div>
 </template>
@@ -60,33 +71,33 @@ export default {
   height: 100%;
 }
 .bodyContainer {
-  padding-top: 64px;
+  // padding-top: 64px;
   position: relative;
 }
+.screen {
+  zoom: 0.3;
+  width: 1920px;
+  height: 1080px;
+  min-height: 1080px !important;
+  margin-left: 50%;
+  transform: translateX(-50%);
+  // min-height: 700px;
+  // height: 700px;
+  // position: absolute;
+  // top: 0;
+  // left: 50%;
+
+  // transform: translateX(-50%) scale(0.6);
+}
 .middleScreen {
   position: relative;
   width: 100%;
-  height: 100%;
-  .screen {
-    zoom: 0.4;
-    width: 40%;
-    height:30%;
-    min-height: 30%;
-    margin-left: 50%;
-    transform: translateX(-50%);
-    // min-height: 700px;
-    // height: 700px;
-    // position: absolute;
-    // top: 0;
-    // left: 50%;
-
-    // transform: translateX(-50%) scale(0.6);
-  }
+  height: 100% !important;
 }
 .newScreen {
-  position: absolute;
-  right: 16px;
-  top: 12px;
+  // position: absolute;
+  // right: 16px;
+  // top: 12px;
   font-size: 14px;
   color: #fff;
   background-color: #fff;
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index 7b24348..917a112 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -22,8 +22,8 @@
         </div>
 
         <a-radio-group v-model="menuType" class="pl12 pr12 tac" style="width:100%" :style="{ marginBottom: '8px' }">
-          <a-radio-button value="role" class="changeGroup" style="width:50%">按角色</a-radio-button>
           <a-radio-button value="group" class="changeGroup" style="width:50%">按部门</a-radio-button>
+          <a-radio-button value="role" class="changeGroup" style="width:50%">按角色</a-radio-button>
         </a-radio-group>
         <div v-if="menuType == 'role'">
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
@@ -352,7 +352,7 @@ export default {
       loading: false,
       isEdit: false, // 编辑部门名称的判断
       selectedKeys: ['all'],
-      menuType: 'role',
+      menuType: 'group',
     }
   },
   // 计算属性