Commit 1b9d2737 authored by zhengke's avatar zhengke

修复翻页bug

parent 6c986f0b
...@@ -47,8 +47,7 @@ ...@@ -47,8 +47,7 @@
</el-dropdown> --> </el-dropdown> -->
</div> </div>
</div> </div>
<div ref="SellTemplateRef" class="col full-width q-ml-md journeyAdsScrollbar"> <div class="col full-width q-ml-md">
<el-scrollbar @scroll="scrollingHandler" style="height: 100%;">
<journeyAdsList <journeyAdsList
:current-menu="currentMenu" :current-menu="currentMenu"
:position="position" :position="position"
...@@ -56,7 +55,6 @@ ...@@ -56,7 +55,6 @@
:msg="queryObj" :msg="queryObj"
@success="success" @success="success"
@refreshHandler="refreshHandler"></journeyAdsList> @refreshHandler="refreshHandler"></journeyAdsList>
</el-scrollbar>
</div> </div>
</div> </div>
...@@ -209,7 +207,7 @@ ...@@ -209,7 +207,7 @@
if(obj.FileName==''||obj.FileName) queryObj.FileName = obj.FileName if(obj.FileName==''||obj.FileName) queryObj.FileName = obj.FileName
} }
RefreshLoading.value = true; RefreshLoading.value = true;
queryObj.pageIndex = 1; queryObj.pageIndex = obj&&obj.pageIndex?obj.pageIndex:1;
querySearchHandler(); querySearchHandler();
}; };
......
...@@ -32,8 +32,7 @@ ...@@ -32,8 +32,7 @@
</div> </div>
</div> </div>
<div ref="SellTemplateRef" class="col full-width q-ml-md journeyAdsScrollbar"> <div class="col full-width q-ml-md">
<el-scrollbar @scroll="scrollingHandler" style="height: 100%;">
<journeyAdsList <journeyAdsList
:current-menu="currentMenu" :current-menu="currentMenu"
:position="position" :position="position"
...@@ -45,7 +44,6 @@ ...@@ -45,7 +44,6 @@
@UpdateData="UpdateData" @UpdateData="UpdateData"
@success="success" @success="success"
@refreshHandler="refreshHandler"></journeyAdsList> @refreshHandler="refreshHandler"></journeyAdsList>
</el-scrollbar>
</div> </div>
</div> </div>
...@@ -204,7 +202,7 @@ ...@@ -204,7 +202,7 @@
if(obj.Navigations) Navigations.value = obj.Navigations if(obj.Navigations) Navigations.value = obj.Navigations
} }
RefreshLoading.value = true; RefreshLoading.value = true;
queryObj.pageIndex = 1; queryObj.pageIndex = obj&&obj.pageIndex?obj.pageIndex:1;
querySearchHandler(); querySearchHandler();
}; };
const operaFolder = (id: number, name: string) => { const operaFolder = (id: number, name: string) => {
......
...@@ -52,8 +52,7 @@ ...@@ -52,8 +52,7 @@
</el-dropdown> --> </el-dropdown> -->
</div> </div>
</div> </div>
<div ref="SellTemplateRef" class="col full-width q-ml-md journeyAdsScrollbar"> <div class="col full-width q-ml-md">
<el-scrollbar @scroll="scrollingHandler" style="height: 100%;">
<journeyAdsList <journeyAdsList
:current-menu="currentMenu" :current-menu="currentMenu"
:position="position" :position="position"
...@@ -65,7 +64,6 @@ ...@@ -65,7 +64,6 @@
@UpdateData="UpdateData" @UpdateData="UpdateData"
@success="success" @success="success"
@refreshHandler="refreshHandler"></journeyAdsList> @refreshHandler="refreshHandler"></journeyAdsList>
</el-scrollbar>
</div> </div>
</div> </div>
<Folder <Folder
...@@ -272,7 +270,7 @@ ...@@ -272,7 +270,7 @@
if(obj.Navigations) Navigations.value = obj.Navigations if(obj.Navigations) Navigations.value = obj.Navigations
} }
RefreshLoading.value = true; RefreshLoading.value = true;
queryObj.pageIndex = 1; queryObj.pageIndex = obj&&obj.pageIndex?obj.pageIndex:1;
querySearchHandler(); querySearchHandler();
}; };
const operaFolder = (id: number, name: string) => { const operaFolder = (id: number, name: string) => {
......
<template> <template>
<el-table class="sample-table" :data="dataList" style="width: 100%" <el-table ref="dataTableRef" highlight-current-row class="sample-table" v-load-more="tableScrollHandler" :data="dataList" style="width: 100%"
@sort-change="sortHandler" :default-sort="{ prop: 'CreateTime', order: 'descending' }" @sort-change="sortHandler" :default-sort="{ prop: 'CreateTime', order: 'descending' }"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column type="selection" width="20" v-if="currentMenu==3||currentMenu==4"/> <el-table-column type="selection" width="20" v-if="currentMenu==3||currentMenu==4"/>
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
</template> </template>
<div v-else class="file-name" v-html="queryObj.FileName!=''?(scope.row.FileName.replaceAll(queryObj.FileName,`<span class='text-waring'>${queryObj.FileName}</span>`)):scope.row.FileName" <div v-else class="file-name" v-html="queryObj.FileName!=''?(scope.row.FileName.replaceAll(queryObj.FileName,`<span class='text-waring'>${queryObj.FileName}</span>`)):scope.row.FileName"
@click.stop="scope.row.FileType?OffEdit():editDelete(scope.row,2)"></div> @click.stop="scope.row.FileType?OffEdit():editDelete(scope.row,2)"></div>
</el-tooltip> </el-tooltip>
<el-input <el-input
class="journeyAds-Input" class="journeyAds-Input"
...@@ -582,14 +581,22 @@ import CopyFile from "./CopyFile.vue"; ...@@ -582,14 +581,22 @@ import CopyFile from "./CopyFile.vue";
const operaFolder = (id: number, name: string) => { const operaFolder = (id: number, name: string) => {
folderObj.value.id = id; folderObj.value.id = id;
folderObj.value.name = name; folderObj.value.name = name;
folderObj.value.type = queryObj.FileType; folderObj.value.type = queryObj.value.FileType;
}; };
const setFileShareHandler=(item:any)=>{ const setFileShareHandler=(item:any)=>{
shareFileType.value=item.FileType shareFileType.value=item.FileType
shareId.value =item.FileId shareId.value =item.FileId
} }
const tableScrollHandler = ()=>{
if(queryObj.value.pageCount>queryObj.value.pageIndex){
queryObj.value.pageIndex++
let obj = {
pageIndex: queryObj.value.pageIndex
}
emit('refreshHandler',obj)
}
}
watch(() => props.list, (n,o) => { watch(() => props.list, (n,o) => {
if (props.list) { if (props.list) {
nextTick(() => { nextTick(() => {
......
...@@ -70,8 +70,7 @@ ...@@ -70,8 +70,7 @@
<el-scrollbar @scroll="scrollingHandler" class="q-px-md" style="height: 100%;"> <el-scrollbar @scroll="scrollingHandler" class="q-px-md" style="height: 100%;">
</el-scrollbar> </el-scrollbar>
</div> --> </div> -->
<div ref="SellTemplateRef" class="col full-width q-ml-md journeyAdsScrollbar"> <div class="col full-width q-ml-md">
<el-scrollbar @scroll="scrollingHandler" style="height: 100%;">
<journeyAdsList <journeyAdsList
:current-menu="currentMenu" :current-menu="currentMenu"
:set-file-list="datas.setFileList" :set-file-list="datas.setFileList"
...@@ -82,7 +81,6 @@ ...@@ -82,7 +81,6 @@
@UpdateData="UpdateData" @UpdateData="UpdateData"
@success="success" @success="success"
@refreshHandler="refreshHandler"></journeyAdsList> @refreshHandler="refreshHandler"></journeyAdsList>
</el-scrollbar>
</div> </div>
</div> </div>
...@@ -292,7 +290,7 @@ const refreshHandler = (obj:any) => { ...@@ -292,7 +290,7 @@ const refreshHandler = (obj:any) => {
if(obj.Navigations) Navigations.value = obj.Navigations if(obj.Navigations) Navigations.value = obj.Navigations
} }
RefreshLoading.value = true; RefreshLoading.value = true;
queryObj.pageIndex = 1; queryObj.pageIndex = obj&&obj.pageIndex?obj.pageIndex:1;
querySearchHandler(); querySearchHandler();
}; };
const operaFolder = (id: number, name: string) => { const operaFolder = (id: number, name: string) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment