Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pptist
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
pptist
Commits
ea94561d
Commit
ea94561d
authored
Dec 08, 2023
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
2b07a81b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
App.vue
src/App.vue
+2
-2
index.vue
src/views/Editor/EditorHeader/index.vue
+6
-6
index.vue
src/views/Editor/ExportDialog/index.vue
+3
-3
Index.vue
src/views/Market/Index.vue
+1
-1
No files found.
src/App.vue
View file @
ea94561d
...
...
@@ -61,7 +61,7 @@ const userLoginHandler = async ()=>{
try
{
await
userStore
().
setUserLoginAsync
(
userId
,
ConfigId
)
await
useFontStore
().
loadAllFonts
()
if
(
ConfigId
)
await
GetTripConfig
(
ConfigId
)
if
(
ConfigId
>
0
)
await
GetTripConfig
(
ConfigId
)
}
catch
(
error
)
{}
isFinish
.
value
=
true
if
(
!
ConfigId
&&!
model
)
ElMessageBox
.
confirm
(
...
...
@@ -102,7 +102,7 @@ const GetTripConfig = async (ConfigId) =>{
TempIdStore
.
setTempId
(
dataObj
.
TempId
)
}
}
catch
(
error
)
{
console
.
log
(
"triptemplate_GetTripConfig"
,
error
);
console
.
log
(
"triptemplate_GetTripConfig"
,
error
);
}
}
userLoginHandler
()
...
...
src/views/Editor/EditorHeader/index.vue
View file @
ea94561d
...
...
@@ -55,7 +55,7 @@
<div class="arrow-btn"><IconDown class="arrow" /></div>
</Popover>
</div> -->
<div
class=
"group-menu-item"
v-if=
"userInfo.IsEditTripTemplate==1&&model"
>
<div
class=
"group-menu-item"
v-if=
"userInfo.IsEditTripTemplate==1&&model
==1
"
>
<div
class=
"menu-item"
v-tooltip=
"'导入PSD'"
@
click=
"UploadPsdHandler"
>
<IconUpload
class=
"icon"
/>
</div>
...
...
@@ -67,13 +67,13 @@
size="small" icon="Check" circle :loading="datas.loading"
@click="setTemplate()" style="color: #ffff;"></el-button> setTemplate()-->
<el-button
type=
"danger"
v-if=
"(userInfo.IsEditTripTemplate==1&&model
)||ConfigId>0
"
v-if=
"(userInfo.IsEditTripTemplate==1&&model
==1)||(ConfigId>0&&model!=2)
"
size=
"small"
:loading=
"datas.loading"
@
click=
"setTemplate"
style=
"color: #ffff;margin-left: 10px;"
>
<
template
v-if=
"userInfo.IsEditTripTemplate==1&&model"
>
<
template
v-if=
"userInfo.IsEditTripTemplate==1&&model
==1
"
>
保存模板
</
template
>
<
template
v-if=
"
ConfigId>0
"
>
<
template
v-if=
"
(ConfigId>0&&model!=2)
"
>
保存行程
</
template
>
</el-button>
...
...
@@ -354,7 +354,7 @@ const setTemplate = async () =>{
if
(
dataLoading
.
value
){
dataLoadingStore
.
setDataLoading
(
0
)
}
if
(
model
.
value
&&
userInfo
.
value
.
IsEditTripTemplate
==
1
){
if
(
model
.
value
==
1
&&
userInfo
.
value
.
IsEditTripTemplate
==
1
){
arr
.
forEach
(
x
=>
{
x
.
elements
.
forEach
(
y
=>
{
delete
y
.
TemplateList
...
...
@@ -407,7 +407,7 @@ const setTemplate = async () =>{
// console.log(arr,'-------tttt')
queryObj
.
value
.
TempData
=
JSON
.
stringify
(
arr
)
if
(
model
.
value
&&
userInfo
.
value
.
IsEditTripTemplate
==
1
){
if
(
model
.
value
==
1
&&
userInfo
.
value
.
IsEditTripTemplate
==
1
){
await
SetTripTemplateSlide
()
}
else
if
(
ConfigId
.
value
){
await
SetTripTemplateConfig
()
...
...
src/views/Editor/ExportDialog/index.vue
View file @
ea94561d
...
...
@@ -46,10 +46,10 @@ const tabs: TabItem[] = [
const
currentDialogComponent
=
computed
<
unknown
>
(()
=>
{
const
dialogMap
=
{
'image'
:
ExportImage
,
'json'
:
ExportJSON
,
//
'json': ExportJSON,
'pdf'
:
ExportPDF
,
'pptx'
:
ExportPPTX
,
'pptist'
:
ExportSpecificFile
,
//
'pptx': ExportPPTX,
//
'pptist': ExportSpecificFile,
}
if
(
dialogForExport
.
value
)
return
dialogMap
[
dialogForExport
.
value
]
||
null
return
null
...
...
src/views/Market/Index.vue
View file @
ea94561d
...
...
@@ -13,7 +13,7 @@
</el-input>
</el-col>
<el-col
:span=
"6"
style=
"text-align: right;"
>
<el-button
v-if=
"userInfo.IsEditTripTemplate==1&&model"
<el-button
v-if=
"userInfo.IsEditTripTemplate==1&&model
==1
"
v-tooltip=
"'添加模版'"
type=
"danger"
size=
"small"
icon=
"Plus"
@
click=
"addTemplate()"
style=
"color: #ffff;"
></el-button>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment