Commit 38258d82 authored by zhengke's avatar zhengke

星标

parent cf6bba9e
......@@ -93,7 +93,7 @@ const userLoginHandler = async ()=>{
if(param.ViewSlideshow) {
searchData.value.ViewSlideshow = param.ViewSlideshow
try {
await sellHistoryTripTemplate(param.sellId)
await sellHistoryTripTemplate(param.sellId,param.LogId)
} catch (error) {}
}
if(!ConfigId&&!model&&(param.SalesTripId&&param.SalesTripId=='')) ElMessageBox.confirm(
......@@ -115,16 +115,17 @@ onMounted(async () => {
})
// 销售历史版本模版数据
const sellHistoryTripTemplate = async (sellId:any) => {
const sellHistoryTripTemplate = async (sellId:any,LogId:any) => {
const loadingObj = ElLoading.service({
text:'正在渲染数据',
lock:true
})
try {
let queryMsg = {
Id: sellId
LogId: LogId,
FileId: sellId,
}
let dataRes = await ConfigService.sellGetTemplateDetails(queryMsg);
let dataRes = await ConfigService.GetHistoryInfo(queryMsg);
if (dataRes.data.resultCode==ApiResult.SUCCESS) {
loadingObj.close()
loading.value = false
......
......@@ -5,27 +5,6 @@ import Api,{ HttpResponse, Result } from './../utils/request';
*/
class ConfigService{
/**
* 我的回收站
*/
static async GetTripOtherRecycleBinPage(params : any):Promise<HttpResponse>{
return Api.Post("triptemplate_GetTripOtherRecycleBinPage",params)
}
/**
* 共享给我的文件
*/
static async GetShareMyFile(params : any):Promise<HttpResponse>{
return Api.Post("triptemplate_GetShareMyFile",params)
}
/**
* 获取我的收藏
*/
static async GetTripCollectListPage(params : any):Promise<HttpResponse>{
return Api.Post("triptemplate_GetTripCollectListPage",params)
}
/**
* 获取行程广告最近版本
*/
......@@ -40,6 +19,13 @@ class ConfigService{
return Api.Post("triptemplate_SetTripBrowse",params)
}
/**
* 历史版本详情
*/
static async GetHistoryInfo(params : any):Promise<HttpResponse>{
return Api.Post("triptemplate_GetHistoryInfo",params)
}
/**
* 历史版本另存、替换
*/
......
......@@ -2,6 +2,21 @@ import Api,{ HttpResponse, Result } from './../utils/request';
class FolderService{
/**
* 我的回收站
*/
static async GetTripOtherRecycleBinPage(params : any):Promise<HttpResponse>{
return Api.Post("triptemplate_GetTripOtherRecycleBinPage",params)
}
/**
* 获取我的收藏
*/
static async GetTripCollectListPage(params : any):Promise<HttpResponse>{
return Api.Post("triptemplate_GetTripCollectListPage",params)
}
/**
* 复制文件夹、文件到指定目录
*/
......
......@@ -77,6 +77,7 @@
</div>
<div class="col">
<BrowsingHistory :current-menu="currentMenu" v-if="currentMenu==0"></BrowsingHistory>
<StarTarget :current-menu="currentMenu" v-if="currentMenu==1"></StarTarget>
<journeyAds :position="position" :current-menu="currentMenu" v-if="currentMenu==3||currentMenu==4" @destroy-position="()=>position=null"></journeyAds>
<ShareList v-if="currentMenu==2"></ShareList>
</div>
......@@ -90,6 +91,7 @@ import { storeToRefs } from 'pinia';
import { ref,reactive,provide,inject } from 'vue';
import SearchDocument from './components/SearchDocument.vue'
import BrowsingHistory from './components/BrowsingHistory.vue'
import StarTarget from './components/StarTarget.vue'
import ShareList from './Share.vue';
import journeyAds from './components/journeyAds.vue'
import { Plus,ArrowDown,Clock,Star,Share,Picture,Management,Delete,RefreshRight,Refresh,Loading } from '@element-plus/icons-vue';
......
......@@ -144,7 +144,7 @@ import CopyFile from "./CopyFile.vue";
isCopyTo.value = true
}else {
let param = query()
const url = `${process.env.VUE_APP_SHARE_URL}/?uid=${param.uid}&sellId=${row.FileId}&ViewSlideshow=1`
const url = `${process.env.VUE_APP_SHARE_URL}/?uid=${param.uid}&sellId=${row.FileId}&LogId=${row.LogId}&ViewSlideshow=1`
window.open(url);
}
}
......
This diff is collapsed.
......@@ -140,13 +140,6 @@ import FolderService from "@/services/FolderService";
// 树目前的选中状态对象,包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性
if (checkObj.checkedKeys.length != 0) {
datas.FolderObj = data
// if (checkObj.checkedKeys.length == 2) {
// datas.FolderId = data.FileId
// treeRef.value.setCheckedKeys([data.FileId]);
// }else{
// datas.FolderId = data.FileId
// treeRef.value.setCheckedKeys([data.FileId]);
// }
}
}
const filterNode = (value: string, data: Tree) => {
......@@ -226,7 +219,6 @@ import FolderService from "@/services/FolderService";
const recursive = (arrs:Array,disabled:any) =>{
console.log(props.setFileList[0],'=====')
let isDisableds:Boolean
if(arrs.length>0) arrs.forEach(x => {
isDisableds = (props.selectedDatas.indexOf(x.FileId)!=-1&&!props.details)||props.details.FileId==x.FileId||disabled?true:false
......
......@@ -177,6 +177,10 @@ import CopyFile from "./CopyFile.vue";
type:Object,
required:{}
},
setFileList:{
type:Array,
required:[]
},
selectedDatas:{
type:Array,
required:[]
......@@ -278,25 +282,10 @@ import CopyFile from "./CopyFile.vue";
}
// 移动到文件夹
const MoveFile = (item:any) => {
if(item) journeyAdsDetails.value = item
else {
datas.setFileList = []
for(let i=0;i<dataList.value.length;i++){
for(let j=0;j<datas.selectedDatas.length;j++){
if(dataList.value[i].FileId==datas.selectedDatas[j]){
datas.setFileList.push(
{
FileId: dataList.value[i].FileId,
FileType: dataList.value[i].FileType,
ParentFileId: dataList.value[i].ParentFileId
}
)
}
}
}
}
journeyAdsDetails.value = item
isTreeFile.value = true
}
// 历史版本
const history = (row: any) => {
journeyAdsDetails.value = row;
......@@ -412,12 +401,13 @@ import CopyFile from "./CopyFile.vue";
emit('UpdateData',obj)
};
const getSelectBox = () => {
isIndeterminate.value = false;
let checkedCount = datas.selectedDatas.length;
let datasList = dataList.value.length;
if (checkedCount > 0 && datasList == checkedCount) {
datas.selectAll = true
};
if (checkedCount > 0 && (datasList > checkedCount||datasList < checkedCount)) {
if (checkedCount > 0&& (datasList > checkedCount||datasList < checkedCount)) {
datas.selectAll = ""
isIndeterminate.value = true;
}
......@@ -573,27 +563,17 @@ import CopyFile from "./CopyFile.vue";
shareFileType.value=item.FileType
shareId.value =item.FileId
}
watch(() => props.list, (n,o) => {
if (props.list) {
nextTick(() => {
dataList.value = props.list
for (let index = 0; index < dataList.value.length; index++) {
const element = dataList.value[index];
if (datas.selectAll) {
element.singleChoice = true;
datas.selectedDatas.push(element.FileId);
} else if (
datas.selectedDatas.length > 0 &&
datas.selectedDatas.indexOf(element.FileId) != -1
) element.singleChoice = true;
}
datas.selectAll = false
isIndeterminate.value = false
datas.selectedDatas = []
})
}
})
watch(() => props.selectedDatas, (n,o) => {
datas.selectedDatas = props.selectedDatas
getSelectBox()
})
watch(() => props.navigations, (n,o) => {
Navigations.value = n
......
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