Skip to content

P
pptist
Commit 4e1721ca authored by 罗超's avatar 罗超
Browse files
Options

Merge branch '1.2.0' of http://gitlab.oytour.com/viitto/pptist into 1.2.0

parents 949efbbe 8e1443f1
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 113 deletions
src/views/SellTemplate/BrowsingHistory.vue
View file @ 4e1721ca
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="select-btn q-pl-lg pointer q-mt-sm"> <div class="select-btn q-pl-lg pointer q-mt-sm">
<el-icon> <el-icon>
<RefreshRight <RefreshRight
v-if="!datas.RefreshLoading" v-if="!RefreshLoading"
@click="() => refreshHandler()" @click="() => refreshHandler()"
/> />
<Refresh v-else /> <Refresh v-else />
...@@ -48,17 +48,15 @@ ...@@ -48,17 +48,15 @@
</div> </div>
</div> </div>
<div ref="SellTemplateRef" class="col full-width q-ml-md"> <div ref="SellTemplateRef" 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"
:set-file-list="datas.setFileList"
:list="dataList" :list="dataList"
:msg="queryObj" :msg="queryObj"
:navigations="Navigations"
:selected-datas="datas.selectedDatas"
@UpdateData="UpdateData"
@success="success" @success="success"
@refreshHandler="refreshHandler"></journeyAdsList> @refreshHandler="refreshHandler"></journeyAdsList>
</el-scrollbar>
</div> </div>
</div> </div>
...@@ -71,7 +69,7 @@ ...@@ -71,7 +69,7 @@
import ConfigService from "@/services/ConfigService"; import ConfigService from "@/services/ConfigService";
import FolderService from "@/services/FolderService"; import FolderService from "@/services/FolderService";
import { injectKeyTemplate } from "@/types/injectKey"; import { injectKeyTemplate } from "@/types/injectKey";
import { getDaysBetween } from "@/utils/common"; import { } from "@/utils/common";
import { useSellTemplateStore, useScreenStore } from "@/store"; import { useSellTemplateStore, useScreenStore } from "@/store";
import TreeFile from "./components/TreeFile.vue"; import TreeFile from "./components/TreeFile.vue";
import breadPeeling from "./components/breadPeeling.vue"; import breadPeeling from "./components/breadPeeling.vue";
...@@ -87,7 +85,6 @@ ...@@ -87,7 +85,6 @@
}); });
const PopoverVisibleControls = ref(false); const PopoverVisibleControls = ref(false);
const Navigations = ref([] as Array<any>);
const isIndeterminate = ref(false); const isIndeterminate = ref(false);
const dataList = ref([] as Array<any>); const dataList = ref([] as Array<any>);
const NewDataList = ref([] as Array<any>); const NewDataList = ref([] as Array<any>);
...@@ -95,10 +92,10 @@ ...@@ -95,10 +92,10 @@
searchData.value = inject(injectKeyTemplate); searchData.value = inject(injectKeyTemplate);
const deleteLoading = ref<any>(null); const deleteLoading = ref<any>(null);
const removeShareLoading = ref<any>(null); const removeShareLoading = ref<any>(null);
const RefreshLoading = ref(false)
const datas = reactive({ const datas = reactive({
selectedDatas: [] as Array, selectedDatas: [] as Array,
selectAll: false as any, selectAll: false as any,
RefreshLoading: false as Boolean,
setFileList: [] as any, setFileList: [] as any,
}); });
...@@ -173,9 +170,6 @@ ...@@ -173,9 +170,6 @@
x.singleChoice = false; x.singleChoice = false;
x.Id = '' x.Id = ''
x.showSelect = false x.showSelect = false
const date1 = new Date();
const date2 = new Date(x.UpdateTime);
x.Day = getDaysBetween(date1, date2);
}); });
}; };
arrList(pageRes.data.data.pageData); arrList(pageRes.data.data.pageData);
...@@ -184,10 +178,10 @@ ...@@ -184,10 +178,10 @@
queryObj.pageCount = pageRes.data.data.pageCount; queryObj.pageCount = pageRes.data.data.pageCount;
} }
loading.value = false; loading.value = false;
datas.RefreshLoading = false; RefreshLoading.value = false;
} catch (error) { } catch (error) {
loading.value = false; loading.value = false;
datas.RefreshLoading = false; RefreshLoading.value = false;
} }
}; };
const scrollingHandler = () => { const scrollingHandler = () => {
...@@ -212,7 +206,7 @@ ...@@ -212,7 +206,7 @@
if(obj.OrderByType) queryObj.OrderByType = obj.OrderByType if(obj.OrderByType) queryObj.OrderByType = obj.OrderByType
if(obj.FileName) queryObj.FileName = obj.FileName if(obj.FileName) queryObj.FileName = obj.FileName
} }
datas.RefreshLoading = true; RefreshLoading.value = true;
queryObj.pageIndex = 1; queryObj.pageIndex = 1;
querySearchHandler(); querySearchHandler();
}; };
...@@ -228,10 +222,6 @@ ...@@ -228,10 +222,6 @@
} }
); );
watch(() => queryObj.FileId,(n, o) => {
if(!n) Navigations.value = []
}
);
onMounted(() => {}); onMounted(() => {});
......
src/views/SellTemplate/RecycleBin.vue
View file @ 4e1721ca
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="select-btn q-pl-lg pointer q-mt-sm"> <div class="select-btn q-pl-lg pointer q-mt-sm">
<el-icon> <el-icon>
<RefreshRight <RefreshRight
v-if="!datas.journeyAds.RefreshLoading" v-if="!RefreshLoading"
@click="() => refreshHandler()" @click="() => refreshHandler()"
/> />
<Refresh v-else /> <Refresh v-else />
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
</div> </div>
</div> </div>
<div ref="SellTemplateRef" class="col full-width q-ml-md"> <div ref="SellTemplateRef" class="col full-width q-ml-md journeyAdsScrollbar">
<el-scrollbar @scroll="scrollingHandler" style="height: 100%;">
<journeyAdsList <journeyAdsList
:current-menu="currentMenu" :current-menu="currentMenu"
:position="position" :position="position"
...@@ -42,6 +43,7 @@ ...@@ -42,6 +43,7 @@
@UpdateData="UpdateData" @UpdateData="UpdateData"
@success="success" @success="success"
@refreshHandler="refreshHandler"></journeyAdsList> @refreshHandler="refreshHandler"></journeyAdsList>
</el-scrollbar>
</div> </div>
</div> </div>
...@@ -54,7 +56,7 @@ ...@@ -54,7 +56,7 @@
import ConfigService from "@/services/ConfigService"; import ConfigService from "@/services/ConfigService";
import FolderService from "@/services/FolderService"; import FolderService from "@/services/FolderService";
import { injectKeyTemplate } from "@/types/injectKey"; import { injectKeyTemplate } from "@/types/injectKey";
import { getDaysBetween,formatDateTimeToRead } from "@/utils/common"; import { formatDateTimeToRead } from "@/utils/common";
import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store"; import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store";
import { ApiResult } from "@/configs/axios"; import { ApiResult } from "@/configs/axios";
import journeyAdsList from "./components/journeyAdsList.vue"; import journeyAdsList from "./components/journeyAdsList.vue";
...@@ -80,10 +82,10 @@ ...@@ -80,10 +82,10 @@
const NewDataList = ref([] as Array<any>); const NewDataList = ref([] as Array<any>);
const searchData = ref({} as any); const searchData = ref({} as any);
searchData.value = inject(injectKeyTemplate); searchData.value = inject(injectKeyTemplate);
const RefreshLoading = ref(false)
const datas = reactive({ const datas = reactive({
selectedDatas: [] as Array, selectedDatas: [] as Array,
selectAll: false as any, selectAll: false as any,
journeyAds: { RefreshLoading: false } as any,
fileList: [] as any, fileList: [] as any,
setFileList: [] as any, setFileList: [] as any,
}); });
...@@ -150,16 +152,13 @@ ...@@ -150,16 +152,13 @@
try { try {
if (queryObj.pageIndex == 1) dataList.value = []; if (queryObj.pageIndex == 1) dataList.value = [];
let pageRes = await FolderService.GetTripOtherRecycleBinPage(queryObj); let pageRes = await FolderService.GetTripOtherRecycleBinPage(queryObj);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == ApiResult.SUCCESS) {
let arrList = function (list) { let arrList = function (list) {
list.forEach((x) => { list.forEach((x) => {
x.show = false; x.show = false;
x.singleChoice = false; x.singleChoice = false;
x.Id = '' x.Id = ''
x.showSelect = false x.showSelect = false
const date1 = new Date();
const date2 = new Date(x.UpdateTime);
x.Day = getDaysBetween(date1, date2);
}); });
}; };
arrList(pageRes.data.data.pageData); arrList(pageRes.data.data.pageData);
...@@ -168,10 +167,10 @@ ...@@ -168,10 +167,10 @@
queryObj.pageCount = pageRes.data.data.pageCount; queryObj.pageCount = pageRes.data.data.pageCount;
} }
loading.value = false; loading.value = false;
datas.journeyAds.RefreshLoading = false; RefreshLoading.value = false;
} catch (error) { } catch (error) {
loading.value = false; loading.value = false;
datas.journeyAds.RefreshLoading = false; RefreshLoading.value = false;
} }
}; };
const scrollingHandler = () => { const scrollingHandler = () => {
...@@ -198,7 +197,7 @@ ...@@ -198,7 +197,7 @@
if(obj.FileName) queryObj.FileName = obj.FileName if(obj.FileName) queryObj.FileName = obj.FileName
if(obj.Navigations) Navigations.value = obj.Navigations if(obj.Navigations) Navigations.value = obj.Navigations
} }
datas.journeyAds.RefreshLoading = true; RefreshLoading.value = true;
queryObj.pageIndex = 1; queryObj.pageIndex = 1;
querySearchHandler(); querySearchHandler();
}; };
...@@ -257,6 +256,14 @@ ...@@ -257,6 +256,14 @@
position: relative; position: relative;
top: 3px; top: 3px;
} }
.journeyAdsScrollbar {
::v-deep(.el-table__inner-wrapper::before){
width: 0px !important;
height: 0px !important;
left: initial !important;
bottom: initial !important;
}
}
.journeyAds-title { .journeyAds-title {
} }
.journeyAds-TitleCenter { .journeyAds-TitleCenter {
......
src/views/SellTemplate/StarTarget.vue
View file @ 4e1721ca
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="select-btn q-pl-lg pointer q-mt-sm"> <div class="select-btn q-pl-lg pointer q-mt-sm">
<el-icon> <el-icon>
<RefreshRight <RefreshRight
v-if="!datas.journeyAds.RefreshLoading" v-if="!RefreshLoading"
@click="() => refreshHandler()" @click="() => refreshHandler()"
/> />
<Refresh v-else /> <Refresh v-else />
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
</div> </div>
</div> </div>
<div ref="SellTemplateRef" class="col full-width q-ml-md"> <div ref="SellTemplateRef" 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"
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
@UpdateData="UpdateData" @UpdateData="UpdateData"
@success="success" @success="success"
@refreshHandler="refreshHandler"></journeyAdsList> @refreshHandler="refreshHandler"></journeyAdsList>
</el-scrollbar>
</div> </div>
</div> </div>
<Folder <Folder
...@@ -94,7 +96,7 @@ ...@@ -94,7 +96,7 @@
import ConfigService from "@/services/ConfigService"; import ConfigService from "@/services/ConfigService";
import FolderService from "@/services/FolderService"; import FolderService from "@/services/FolderService";
import { injectKeyTemplate } from "@/types/injectKey"; import { injectKeyTemplate } from "@/types/injectKey";
import { getDaysBetween,formatDateTimeToRead } from "@/utils/common"; import { formatDateTimeToRead } from "@/utils/common";
import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store"; import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store";
import ShareForm from "./components/ShareForm.vue"; import ShareForm from "./components/ShareForm.vue";
import Folder from "./components/Folder.vue"; import Folder from "./components/Folder.vue";
...@@ -125,10 +127,10 @@ ...@@ -125,10 +127,10 @@
const NewDataList = ref([] as Array<any>); const NewDataList = ref([] as Array<any>);
const searchData = ref({} as any); const searchData = ref({} as any);
searchData.value = inject(injectKeyTemplate); searchData.value = inject(injectKeyTemplate);
const RefreshLoading = ref(false)
const datas = reactive({ const datas = reactive({
selectedDatas: [] as Array, selectedDatas: [] as Array,
selectAll: false as any, selectAll: false as any,
journeyAds: { RefreshLoading: false } as any,
fileList: [] as any, fileList: [] as any,
setFileList: [] as any, setFileList: [] as any,
}); });
...@@ -222,16 +224,13 @@ ...@@ -222,16 +224,13 @@
try { try {
if (queryObj.pageIndex == 1) dataList.value = []; if (queryObj.pageIndex == 1) dataList.value = [];
let pageRes = await FolderService.GetTripCollectListPage(queryObj); let pageRes = await FolderService.GetTripCollectListPage(queryObj);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == ApiResult.SUCCESS) {
let arrList = function (list) { let arrList = function (list) {
list.forEach((x) => { list.forEach((x) => {
x.show = false; x.show = false;
x.singleChoice = false; x.singleChoice = false;
x.Id = '' x.Id = ''
x.showSelect = false x.showSelect = false
const date1 = new Date();
const date2 = new Date(x.UpdateTime);
x.Day = getDaysBetween(date1, date2);
}); });
}; };
arrList(pageRes.data.data.pageData); arrList(pageRes.data.data.pageData);
...@@ -240,10 +239,10 @@ ...@@ -240,10 +239,10 @@
queryObj.pageCount = pageRes.data.data.pageCount; queryObj.pageCount = pageRes.data.data.pageCount;
} }
loading.value = false; loading.value = false;
datas.journeyAds.RefreshLoading = false; RefreshLoading.value = false;
} catch (error) { } catch (error) {
loading.value = false; loading.value = false;
datas.journeyAds.RefreshLoading = false; RefreshLoading.value = false;
} }
}; };
const scrollingHandler = () => { const scrollingHandler = () => {
...@@ -270,7 +269,7 @@ ...@@ -270,7 +269,7 @@
if(obj.FileName) queryObj.FileName = obj.FileName if(obj.FileName) queryObj.FileName = obj.FileName
if(obj.Navigations) Navigations.value = obj.Navigations if(obj.Navigations) Navigations.value = obj.Navigations
} }
datas.journeyAds.RefreshLoading = true; RefreshLoading.value = true;
queryObj.pageIndex = 1; queryObj.pageIndex = 1;
querySearchHandler(); querySearchHandler();
}; };
......
src/views/SellTemplate/components/CopyFile.vue
View file @ 4e1721ca
...@@ -233,7 +233,7 @@ const getFile = async () => { ...@@ -233,7 +233,7 @@ const getFile = async () => {
FileType: props.details.FolderType, FileType: props.details.FolderType,
}; };
let pageRes = await FolderService.GetMyFolderTree(querys); let pageRes = await FolderService.GetMyFolderTree(querys);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == ApiResult.SUCCESS) {
dataList.value = pageRes.data.data; dataList.value = pageRes.data.data;
recursive(dataList.value); recursive(dataList.value);
} }
......
src/views/SellTemplate/components/TreeFile.vue
View file @ 4e1721ca
...@@ -185,7 +185,7 @@ import FolderService from "@/services/FolderService"; ...@@ -185,7 +185,7 @@ import FolderService from "@/services/FolderService";
text: "正在处理", text: "正在处理",
}); });
let pageRes = await FolderService.UpdateTripOtherFolder(queryMsg); let pageRes = await FolderService.UpdateTripOtherFolder(queryMsg);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == ApiResult.SUCCESS) {
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: `移动文件成功`, message: `移动文件成功`,
...@@ -212,7 +212,7 @@ import FolderService from "@/services/FolderService"; ...@@ -212,7 +212,7 @@ import FolderService from "@/services/FolderService";
FileType: props.fileType FileType: props.fileType
} }
let pageRes = await FolderService.GetMyFolderTree(querys); let pageRes = await FolderService.GetMyFolderTree(querys);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == ApiResult.SUCCESS) {
dataList.value = pageRes.data.data dataList.value = pageRes.data.data
recursive(dataList.value) recursive(dataList.value)
} }
...@@ -222,14 +222,14 @@ import FolderService from "@/services/FolderService"; ...@@ -222,14 +222,14 @@ import FolderService from "@/services/FolderService";
const recursive = (arrs:Array,disabled:any) =>{ const recursive = (arrs:Array,disabled:any) =>{
let isDisableds:Boolean let isDisableds:Boolean
if(arrs.length>0) arrs.forEach(x => { if(arrs.length>0) arrs.forEach(x => {
isDisableds = (props.selectedDatas.indexOf(x.FileId)!=-1&&!props.details)||props.details.FileId==x.FileId||disabled?true:false isDisableds = (props.selectedDatas&&props.selectedDatas.indexOf(x.FileId)!=-1&&!props.details)||props.details.FileId==x.FileId||disabled?true:false
if(props.details.FileType>0&&x.FileId==props.details.FileId) isDisableds = false if(props.details.FileType>0&&x.FileId==props.details.FileId) isDisableds = false
if(!props.details){ if(!props.details){
for(let i =0;i<props.setFileList.length;i++){ for(let i =0;i<props.setFileList.length;i++){
if(props.setFileList[i].FileType&&props.setFileList[i].FileId==x.FileId) isDisableds = false if(props.setFileList[i].FileType&&props.setFileList[i].FileId==x.FileId) isDisableds = false
} }
} }
if((props.details.ParentFileId!=undefined&&props.details&&x.FileId==props.details.ParentFileId)||(props.setFileList.length>0&&props.setFileList[0].ParentFileId==x.FileId)) datas.FolderObj = x if((props.details.ParentFileId!=undefined&&props.details&&x.FileId==props.details.ParentFileId)||(props.setFileList&&props.setFileList[0].ParentFileId==x.FileId)) datas.FolderObj = x
Object.assign(x,{disabled:isDisableds}) Object.assign(x,{disabled:isDisableds})
if(x.ChildList.length>0){ if(x.ChildList.length>0){
recursionChild(x,isDisableds) recursionChild(x,isDisableds)
......
src/views/SellTemplate/components/TreeFileRecover.vue
View file @ 4e1721ca
...@@ -159,7 +159,7 @@ import FolderService from "@/services/FolderService"; ...@@ -159,7 +159,7 @@ import FolderService from "@/services/FolderService";
text: "正在处理", text: "正在处理",
}); });
let pageRes = await FolderService.UpdateTripOtherStatus(queryMsg); let pageRes = await FolderService.UpdateTripOtherStatus(queryMsg);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == ApiResult.SUCCESS) {
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: `恢复文件成功`, message: `恢复文件成功`,
...@@ -186,7 +186,7 @@ import FolderService from "@/services/FolderService"; ...@@ -186,7 +186,7 @@ import FolderService from "@/services/FolderService";
FileType: props.details.FileType FileType: props.details.FileType
} }
let pageRes = await FolderService.GetMyFolderTree(querys); let pageRes = await FolderService.GetMyFolderTree(querys);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == ApiResult.SUCCESS) {
dataList.value = pageRes.data.data dataList.value = pageRes.data.data
} }
} }
......
src/views/SellTemplate/components/journeyAdsList.vue
View file @ 4e1721ca
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<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"/>
<el-table-column className="indentLeft"> <el-table-column className="indentLeft">
<template #header> <template #header>
<div class="row items-center"> <div class="row items-center" @click="OffEdit()">
<span>文档名称</span> <span>文档名称</span>
<el-popover :width="200" trigger="click" @before-enter="()=>filterFileNameStatus=true" @before-leave="()=>filterFileNameStatus=false"> <el-popover :width="200" trigger="click" @before-enter="()=>filterFileNameStatus=true" @before-leave="()=>filterFileNameStatus=false">
<template #reference> <template #reference>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div class="temp-tr col q-ml-md file-name" :class="{'cusor-pointer':scope.row.FileType==0}"> <div class="temp-tr col q-ml-md file-name" :class="{'cusor-pointer':scope.row.FileType==0}">
<el-tooltip v-if="!scope.row.editTitle" effect="dark" :content="scope.row.FileName"> <el-tooltip v-if="!scope.row.editTitle" effect="dark" :content="scope.row.FileName">
<div @click.stop="scope.row.FileType?OffEdit():editDelete(scope.row,2)"> <div @click.stop="scope.row.FileType?OffEdit():editDelete(scope.row,2)">
{{ scope.row.FileName }} {{ scope.row.FileName?scope.row.FileName:'-' }}
</div> </div>
</el-tooltip> </el-tooltip>
<el-input <el-input
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</el-table-column> </el-table-column>
<template #empty> <template #empty>
<el-empty :image-size="150" v-if="(!dataList || dataList.length==0) && !loading" <el-empty :image-size="150" v-if="(!dataList || dataList.length==0) && !loading"
:description="(queryObj.FileId==0?'没有文档':currentMenu!=-1?'文件夹里没有文件':'没有文件')" /> :description="datas.emptyTitle" />
</template> </template>
</el-table> </el-table>
<ShareForm <ShareForm
...@@ -164,7 +164,7 @@ import { ElMessage,ElTree,ElLoading, ElMessageBox } from 'element-plus'; ...@@ -164,7 +164,7 @@ import { ElMessage,ElTree,ElLoading, ElMessageBox } from 'element-plus';
import ConfigService from "@/services/ConfigService"; import ConfigService from "@/services/ConfigService";
import FolderService from "@/services/FolderService"; import FolderService from "@/services/FolderService";
import { injectKeyTemplate } from "@/types/injectKey"; import { injectKeyTemplate } from "@/types/injectKey";
import { getDaysBetween,formatDateTimeToRead } from "@/utils/common"; import { formatDateTimeToRead } from "@/utils/common";
import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store"; import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store";
import { isPC, query } from '@/utils/common' import { isPC, query } from '@/utils/common'
...@@ -215,6 +215,7 @@ import CopyFile from "./CopyFile.vue"; ...@@ -215,6 +215,7 @@ import CopyFile from "./CopyFile.vue";
type: number; type: number;
}>({ id: -1, name: "", parentId: 0, number: 1 }); }>({ id: -1, name: "", parentId: 0, number: 1 });
const datas = reactive({ const datas = reactive({
emptyTitle: '',
Title: '', Title: '',
selectAll: false as any, selectAll: false as any,
journeyAds: { RefreshLoading: false } as any, journeyAds: { RefreshLoading: false } as any,
...@@ -251,10 +252,24 @@ import CopyFile from "./CopyFile.vue"; ...@@ -251,10 +252,24 @@ import CopyFile from "./CopyFile.vue";
const filterFileNameStatus = ref(false) const filterFileNameStatus = ref(false)
const currentRootDom = ref() const currentRootDom = ref()
const showItemId = ref(0) const showItemId = ref(0)
if(props.currentMenu==0)datas.Title = '最近浏览' if(props.currentMenu==0){
else if(props.currentMenu==1) datas.Title = '收藏时间' datas.Title = '最近浏览'
else if(props.currentMenu==3||props.currentMenu==4) datas.Title = '最近修改' datas.emptyTitle = '没有最近浏览文档'
else if(props.currentMenu==-1) datas.Title = '删除时间' }
else if(props.currentMenu==1) {
datas.Title = '收藏时间'
datas.emptyTitle = '没有收藏文档'
}
else if(props.currentMenu==3||props.currentMenu==4) {
datas.Title = '最近修改'
if(queryObj.value.FileId){
datas.emptyTitle = '没有文档'
}else datas.emptyTitle = '文件夹里没有文档'
}
else if(props.currentMenu==-1) {
datas.Title = '删除时间'
datas.emptyTitle = '没有删除文档'
}
const viewTemplate = (row:any) => { const viewTemplate = (row:any) => {
let param = query() let param = query()
...@@ -308,7 +323,7 @@ import CopyFile from "./CopyFile.vue"; ...@@ -308,7 +323,7 @@ import CopyFile from "./CopyFile.vue";
let dataRes = await FolderService.UpdateTripOtherStatus(queryMsg); let dataRes = await FolderService.UpdateTripOtherStatus(queryMsg);
deleteLoading.value.close(); deleteLoading.value.close();
deleteLoading.value = null; deleteLoading.value = null;
if (dataRes.data.resultCode == 1) { if (dataRes.data.resultCode == ApiResult.SUCCESS) {
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: `恢复${row.FileName}成功`, message: `恢复${row.FileName}成功`,
...@@ -340,7 +355,7 @@ import CopyFile from "./CopyFile.vue"; ...@@ -340,7 +355,7 @@ import CopyFile from "./CopyFile.vue";
let dataRes = await FolderService.SetFileCollect(queryMsg); let dataRes = await FolderService.SetFileCollect(queryMsg);
deleteLoading.value.close(); deleteLoading.value.close();
deleteLoading.value = null; deleteLoading.value = null;
if (dataRes.data.resultCode == 1) { if (dataRes.data.resultCode == ApiResult.SUCCESS) {
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: `${queryMsg.IsCollect?'收藏':'取消收藏'}${row.FileName}成功`, message: `${queryMsg.IsCollect?'收藏':'取消收藏'}${row.FileName}成功`,
...@@ -397,7 +412,7 @@ import CopyFile from "./CopyFile.vue"; ...@@ -397,7 +412,7 @@ import CopyFile from "./CopyFile.vue";
Title: editObj.value.FileName, Title: editObj.value.FileName,
}; };
let TemplateRes = await ConfigService.ReNameTripOther(queryMsg); let TemplateRes = await ConfigService.ReNameTripOther(queryMsg);
if (TemplateRes.data.resultCode == 1) { if (TemplateRes.data.resultCode == ApiResult.SUCCESS) {
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: "重命名成功", message: "重命名成功",
...@@ -460,7 +475,7 @@ import CopyFile from "./CopyFile.vue"; ...@@ -460,7 +475,7 @@ import CopyFile from "./CopyFile.vue";
text: "正在处理", text: "正在处理",
}); });
let pageRes = await FolderService.RemoveTripFolder(queryMsg); let pageRes = await FolderService.RemoveTripFolder(queryMsg);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == ApiResult.SUCCESS) {
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: `删除${ message: `删除${
...@@ -501,7 +516,7 @@ import CopyFile from "./CopyFile.vue"; ...@@ -501,7 +516,7 @@ import CopyFile from "./CopyFile.vue";
text: "正在处理", text: "正在处理",
}); });
let pageRes = await ConfigService.sellSetRemoveTemplate(queryMsg); let pageRes = await ConfigService.sellSetRemoveTemplate(queryMsg);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == ApiResult.SUCCESS) {
ElMessage({ ElMessage({
showClose: true, showClose: true,
message: `删除${item.FileType == 2 ? "广告" : "行程"}成功`, message: `删除${item.FileType == 2 ? "广告" : "行程"}成功`,
......
src/views/SellTemplate/journeyAds.vue
View file @ 4e1721ca
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<div class="select-btn q-pl-lg pointer q-mt-sm"> <div class="select-btn q-pl-lg pointer q-mt-sm">
<el-icon> <el-icon>
<RefreshRight <RefreshRight
v-if="!datas.journeyAds.RefreshLoading" v-if="!RefreshLoading"
@click="() => refreshHandler()" @click="() => refreshHandler()"
/> />
<Refresh v-else /> <Refresh v-else />
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
</el-scrollbar> </el-scrollbar>
</div> --> </div> -->
<div ref="SellTemplateRef" class="col full-width q-ml-md"> <div ref="SellTemplateRef" 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"
...@@ -82,6 +83,7 @@ ...@@ -82,6 +83,7 @@
@UpdateData="UpdateData" @UpdateData="UpdateData"
@success="success" @success="success"
@refreshHandler="refreshHandler"></journeyAdsList> @refreshHandler="refreshHandler"></journeyAdsList>
</el-scrollbar>
</div> </div>
</div> </div>
...@@ -113,7 +115,7 @@ import { MoreFilled, Edit, ArrowLeft,CopyDocument,DCaret,CaretTop,CaretBottom } ...@@ -113,7 +115,7 @@ import { MoreFilled, Edit, ArrowLeft,CopyDocument,DCaret,CaretTop,CaretBottom }
import ConfigService from "@/services/ConfigService"; import ConfigService from "@/services/ConfigService";
import FolderService from "@/services/FolderService"; import FolderService from "@/services/FolderService";
import { injectKeyTemplate } from "@/types/injectKey"; import { injectKeyTemplate } from "@/types/injectKey";
import { getDaysBetween,formatDateTimeToRead } from "@/utils/common"; import { formatDateTimeToRead } from "@/utils/common";
import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store"; import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store";
import ShareForm from "./components/ShareForm.vue"; import ShareForm from "./components/ShareForm.vue";
import Folder from "./components/Folder.vue"; import Folder from "./components/Folder.vue";
...@@ -144,10 +146,10 @@ const dataList = ref([] as Array<any>); ...@@ -144,10 +146,10 @@ const dataList = ref([] as Array<any>);
const NewDataList = ref([] as Array<any>); const NewDataList = ref([] as Array<any>);
const searchData = ref({} as any); const searchData = ref({} as any);
searchData.value = inject(injectKeyTemplate); searchData.value = inject(injectKeyTemplate);
const RefreshLoading = ref(false)
const datas = reactive({ const datas = reactive({
selectedDatas: [] as Array, selectedDatas: [] as Array,
selectAll: false as any, selectAll: false as any,
journeyAds: { RefreshLoading: false } as any,
fileList: [] as any, fileList: [] as any,
setFileList: [] as any, setFileList: [] as any,
}); });
...@@ -240,16 +242,13 @@ const querySearchHandler = async () => { ...@@ -240,16 +242,13 @@ const querySearchHandler = async () => {
try { try {
if (queryObj.pageIndex == 1) dataList.value = []; if (queryObj.pageIndex == 1) dataList.value = [];
let pageRes = await FolderService.GetMyTripFolderPage(queryObj); let pageRes = await FolderService.GetMyTripFolderPage(queryObj);
if (pageRes.data.resultCode == 1) { if (pageRes.data.resultCode == ApiResult.SUCCESS) {
let arrList = function (list) { let arrList = function (list) {
list.forEach((x) => { list.forEach((x) => {
x.show = false; x.show = false;
x.singleChoice = false; x.singleChoice = false;
x.Id = '' x.Id = ''
x.showSelect = false x.showSelect = false
const date1 = new Date();
const date2 = new Date(x.UpdateTime);
x.Day = getDaysBetween(date1, date2);
}); });
}; };
arrList(pageRes.data.data.pageData); arrList(pageRes.data.data.pageData);
...@@ -258,10 +257,10 @@ const querySearchHandler = async () => { ...@@ -258,10 +257,10 @@ const querySearchHandler = async () => {
queryObj.pageCount = pageRes.data.data.pageCount; queryObj.pageCount = pageRes.data.data.pageCount;
} }
loading.value = false; loading.value = false;
datas.journeyAds.RefreshLoading = false; RefreshLoading.value = false;
} catch (error) { } catch (error) {
loading.value = false; loading.value = false;
datas.journeyAds.RefreshLoading = false; RefreshLoading.value = false;
} }
}; };
const scrollingHandler = () => { const scrollingHandler = () => {
...@@ -288,7 +287,7 @@ const refreshHandler = (obj:any) => { ...@@ -288,7 +287,7 @@ const refreshHandler = (obj:any) => {
if(obj.FileName==''||obj.FileName) queryObj.FileName = obj.FileName if(obj.FileName==''||obj.FileName) queryObj.FileName = obj.FileName
if(obj.Navigations) Navigations.value = obj.Navigations if(obj.Navigations) Navigations.value = obj.Navigations
} }
datas.journeyAds.RefreshLoading = true; RefreshLoading.value = true;
queryObj.pageIndex = 1; queryObj.pageIndex = 1;
querySearchHandler(); querySearchHandler();
}; };
......
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