From 19e0b728e8cd41f9ddcd62eea6c15ebf769d9977 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 18:04:10 +0800
Subject: [PATCH] +解决和冲突合并，加上适应1366*768分辨率
---
src/views/system/topmenu.vue | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue
index ef9cd18..9fecd8a 100644
--- a/src/views/system/topmenu.vue
+++ b/src/views/system/topmenu.vue
@@ -1,6 +1,12 @@
<template>
- <basic-container>
+ <basic-container
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : '',
+ ]"
+ >
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -106,6 +112,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
+ ...this.$store.state.control.changePageSize,
},
selectionList: [],
menuGrantList: [],
@@ -123,6 +130,7 @@
selection: true,
dialogWidth: 900,
dialogClickModal: false,
+ ...this.$store.state.control.clearOtherBut,
column: [
{
label: "菜单名",
@@ -204,6 +212,9 @@
});
return ids;
},
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
submit() {
@@ -356,6 +367,7 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading = false;
this.selectionClear();
});
--
Gitblit v1.9.3