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 @@ 数据大屏
- - 新窗口打开 - -
- +
+
+
交付中心实时数据
+ + + + 新窗口打开 + + +
+
+ + +
@@ -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 @@ - 按角色 按部门 + 按角色
@@ -352,7 +352,7 @@ export default { loading: false, isEdit: false, // 编辑部门名称的判断 selectedKeys: ['all'], - menuType: 'role', + menuType: 'group', } }, // 计算属性