Commit a4ee9fcb authored by zhengke's avatar zhengke

no message

parent a6a686d3
......@@ -3,7 +3,7 @@ import { createPinia } from 'pinia'
import App from './App.vue'
import './registerServiceWorker'
import { ElMessage } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import 'element-plus/dist/index.css'
import '@icon-park/vue-next/styles/index.css'
......
......@@ -28,6 +28,7 @@ export interface SlidesState {
slides: Slide[]
slideIndex: number
viewportRatio: number
layoutSlides: Slide[]
}
export const useSlidesStore = defineStore('slides', {
......@@ -37,6 +38,7 @@ export const useSlidesStore = defineStore('slides', {
slides: slides, // 幻灯片页面数据
slideIndex: 0, // 当前页面索引
viewportRatio: 0.75, // 可视区域比例,默认16:9 0.5625
layoutSlides: slides, // 所有模版数据
}),
getters: {
......@@ -92,10 +94,9 @@ export const useSlidesStore = defineStore('slides', {
fontName,
backgroundColor,
} = state.theme
const subColor = tinycolor(fontColor).isDark() ? 'rgba(230, 230, 230, 0.5)' : 'rgba(180, 180, 180, 0.5)'
const layoutsString = JSON.stringify(layouts)
console.log('layouts,-----')
const layoutsString = JSON.stringify(state.layoutSlides)
.replaceAll('{{themeColor}}', themeColor)
.replaceAll('{{fontColor}}', fontColor)
.replaceAll('{{fontName}}', fontName)
......@@ -123,6 +124,10 @@ export const useSlidesStore = defineStore('slides', {
setSlides(slides: Slide[]) {
this.slides = slides
},
setLayouts(layoutSlides: Slide[]) {
this.layoutSlides = layoutSlides
},
addSlide(slide: Slide | Slide[]) {
const slides = Array.isArray(slide) ? slide : [slide]
......
......@@ -132,6 +132,7 @@ const marketStore = useScreenStore()
const { market, model, ConfigId } = storeToRefs(useScreenStore())
const goBack = () =>{
if(model.value) return marketStore.setMarket(true)
ElMessageBox.confirm(
'退出此页面将清空当前数据,请谨慎操作?',
'提示',
......
......@@ -23,7 +23,6 @@ const emit = defineEmits<{
}>()
const { layouts } = storeToRefs(useSlidesStore())
const selectSlideTemplate = (slide: Slide) => {
emit('select', slide)
}
......
......@@ -66,6 +66,7 @@ import Popover from '@/components/Popover.vue'
import Draggable from 'vuedraggable'
const mainStore = useMainStore()
const slidesStore = useSlidesStore()
const layoutsStore = useSlidesStore()
const keyboardStore = useKeyboardStore()
const { selectedSlidesIndex: _selectedSlidesIndex, thumbnailsFocus } = storeToRefs(mainStore)
const { slides, slideIndex } = storeToRefs(slidesStore)
......@@ -97,18 +98,6 @@ const searchData = ref({} as any)
datas.DataSource = inject(injectKeyDataSource)
searchData.value = inject(injectKeyTemplate)
// 模版市场分页数据
const SearchqueryObj = reactive({
pageIndex: 1,
pageSize: 10,
LineId: 0, //线路Id
Title: '', //模板名称
CountryName: '', //国家名称
SeasonName: '', //季节名称
ColorName: '', //颜色名称
totalCount: 0, //总调试
pageCount: 0, //总页数
})
watch(() => slideIndex.value, () => {
// 清除多选状态的幻灯片
if (selectedSlidesIndex.value.length) {
......@@ -129,23 +118,6 @@ watch(() => slideIndex.value, () => {
queryObj.value = inject(injectKeyDataSource).queryObj
/***
* 获取模板市场分页列表
*/
const queryTemplateBySearchHandler = async () => {
try {
let pageRes = await ConfigService.GetTemplagePageAsync(SearchqueryObj);
console.log("queryTemplateBySearchHandler", pageRes);
if (pageRes.data.resultCode == 1) {
datas.DataSource.dataList = pageRes.data.data.pageData;
SearchqueryObj.totalCount = pageRes.data.data.count;
SearchqueryObj.pageCount = pageRes.data.data.pageCount;
}
} catch (error) {
console.log("queryTemplateBySearchHandler", error);
}
}
// 获取行程团数据
const GetTripFiledData = async () =>{
if(queryObj.value.TempId) return
......@@ -229,12 +201,12 @@ const GetTripTemplate = async () =>{
pageType: 1,
...SlidesData
}
newSlides.push(obj)
slidesStore.setSlides(newSlides)
newSlides.push(obj)
}else if(SlidesData.length>0){
newSlides = SlidesData
}
slidesStore.setSlides(newSlides)
layoutsStore.setLayouts(JSON.parse(JSON.stringify(newSlides)))
queryObj.value.TempId = dataRes.data.data.TempId
queryObj.value.LineId = dataRes.data.data.LineId
queryObj.value.LineName = dataRes.data.data.LineName
......@@ -436,8 +408,6 @@ const contextmenusThumbnailItem = (): ContextmenuItem[] => {
]
}
queryTemplateBySearchHandler()
GetTripTemplate()
</script>
......
......@@ -54,7 +54,6 @@ import ConfigService from '@/services/ConfigService'
const datas = reactive({
DataSource:{
dataList: [],
ConfigId: inject(injectKeyTemplate).ConfigId?inject(injectKeyTemplate).ConfigId:0,
pageType: 1,//1基础 2酒店 3景 4餐
DataSourceOverlay: false,
......
......@@ -116,7 +116,7 @@
const currentPage = ref(1 as Number);
const queryObj = reactive({
pageIndex: 1,
pageSize: 10,
pageSize: 20,
LineId: 0, //线路Id
Title: '', //模板名称
CountryName: '', //国家名称
......
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