Browse Source

分页问题修改

develop
fuguobin 1 year ago
parent
commit
46528bc634
  1. 29
      src/layout/components/Settings/index.vue
  2. 4
      src/views/monitoring/components/menu.vue
  3. 8
      src/views/monitoring/screen/components/main.vue

29
src/layout/components/Settings/index.vue

@ -3,8 +3,15 @@
<h3 class="title">项目配置</h3> <h3 class="title">项目配置</h3>
<el-divider>主题</el-divider> <el-divider>主题</el-divider>
<div class="flex justify-center" @click.stop> <div class="flex justify-center" @click.stop>
<el-switch v-model="isDark" inline-prompt :active-icon="IconEpMoon" :inactive-icon="IconEpSunny" <el-switch
active-color="var(--el-fill-color-dark)" inactive-color="var(--el-color-primary)" @change="toggleDark" /> v-model="isDark"
inline-prompt
:active-icon="IconEpMoon"
:inactive-icon="IconEpSunny"
active-color="var(--el-fill-color-dark)"
inactive-color="var(--el-color-primary)"
@change="toggleDark"
/>
</div> </div>
<el-divider>界面设置</el-divider> <el-divider>界面设置</el-divider>
<div class="flex justify-between items-center settingItem"> <div class="flex justify-between items-center settingItem">
@ -25,8 +32,13 @@
</div> </div>
<el-divider>主题颜色</el-divider> <el-divider>主题颜色</el-divider>
<ul class="flex justify-center themeColor"> <ul class="flex justify-center themeColor">
<li class="colorItem" v-for="(color, index) in themeColors" :key="index" :style="{ background: color }" <li
@click="themeColorClick(color)"></li> class="colorItem"
v-for="(color, index) in themeColors"
:key="index"
:style="{ background: color }"
@click="themeColorClick(color)"
></li>
</ul> </ul>
<!-- <el-divider>导航设置</el-divider> <!-- <el-divider>导航设置</el-divider>
<ul class="layout"> <ul class="layout">
@ -79,14 +91,7 @@ function changeLayout(layout: string) {
} }
// //
const themeColors = ref<string[]>([ const themeColors = ref<string[]>(['#409EFF', '#304156', '#11a983', '#13c2c2', '#6959CD', '#f5222d']);
'#409EFF',
'#304156',
'#11a983',
'#13c2c2',
'#6959CD',
'#f5222d'
]);
function themeColorClick(color: string) { function themeColorClick(color: string) {
document.documentElement.style.setProperty('--el-color-primary', color); document.documentElement.style.setProperty('--el-color-primary', color);

4
src/views/monitoring/components/menu.vue

@ -119,6 +119,10 @@ const renderMenuLabel = (option: MenuOption) => {
function menuUpdateValue(key: string, item: MenuOption) { function menuUpdateValue(key: string, item: MenuOption) {
// //
sessionStorageIns.setUseStorage(props.menuType === '1' ? 'deptId' : 'id', key); sessionStorageIns.setUseStorage(props.menuType === '1' ? 'deptId' : 'id', key);
sessionStorageIns.setUseStorage('currentPage', 1);
if (props.menuType === '1') {
mitt.emit('currentPageEmit', 1);
}
if (props.menuType === '2') { if (props.menuType === '2') {
sessionStorageIns.setUseStorage('deptId', item.parentId); sessionStorageIns.setUseStorage('deptId', item.parentId);
} }

8
src/views/monitoring/screen/components/main.vue

@ -248,16 +248,20 @@ const headerData = ref<HeaderVo[]>();
onMounted(() => { onMounted(() => {
// stationInfo(); // stationInfo();
// tableHeader(); // tableHeader();
console.log('aaaa', sessionStorage.getItem('currentPage'));
tablePage.currentPage = tablePage.currentPage =
sessionStorage.getItem('currentPage') === null ? 1 : Number(sessionStorage.getItem('currentPage')); sessionStorage.getItem('currentPage') === null ? 1 : Number(sessionStorage.getItem('currentPage'));
console.log(Number(sessionStorage.getItem('currentPage')));
tablePage.pageSize = sessionStorage.getItem('pageSize') === null ? 10 : Number(sessionStorage.getItem('pageSize')); tablePage.pageSize = sessionStorage.getItem('pageSize') === null ? 10 : Number(sessionStorage.getItem('pageSize'));
socket.initialize(wsUrl); //websocket http:// socket.initialize(wsUrl); //websocket http://
}); });
mitt.on('currentPageEmit', (res: any) => {
//
tablePage.currentPage = res;
});
mitt.on('menuKey', (res: any) => { mitt.on('menuKey', (res: any) => {
// //
tablePage.currentPage = 1;
sessionStorageIns.setUseStorage('currentPage', 1);
menuKey.value = res; menuKey.value = res;
tableHeader(); tableHeader();
tableDatas(); tableDatas();

Loading…
Cancel
Save