Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart_gov_platform
Commits
18fd1882
Commit
18fd1882
authored
Jan 06, 2023
by
“yiyousong”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:新增应用配置文件上传
parent
3b78c024
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
115 additions
and
11 deletions
+115
-11
base-manager-ui/admin/src/pages/basicset/appmarket/AppMarket.vue
...nager-ui/admin/src/pages/basicset/appmarket/AppMarket.vue
+91
-1
base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
...in/src/pages/basicset/appmarket/components/DataUpdate.vue
+17
-4
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue
...er-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue
+0
-1
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
...r-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
+2
-5
base-manager-ui/admin/src/services/basicsetApi.js
base-manager-ui/admin/src/services/basicsetApi.js
+1
-0
base-manager-ui/admin/src/services/market.js
base-manager-ui/admin/src/services/market.js
+4
-0
No files found.
base-manager-ui/admin/src/pages/basicset/appmarket/AppMarket.vue
View file @
18fd1882
...
@@ -2,6 +2,13 @@
...
@@ -2,6 +2,13 @@
<!-- 应用集市 -->
<!-- 应用集市 -->
<div
class=
"app-market"
>
<div
class=
"app-market"
>
<a-tabs
default-active-key=
"1"
>
<a-tabs
default-active-key=
"1"
>
<a-button
type=
"primary"
v-permission=
"[1]"
slot=
"tabBarExtraContent"
@
click=
"handleUpload"
>
上传配置文件
</a-button
>
<a-tab-pane
key=
"1"
tab=
"终端应用"
>
<a-tab-pane
key=
"1"
tab=
"终端应用"
>
<TerminalApp></TerminalApp>
<TerminalApp></TerminalApp>
</a-tab-pane>
</a-tab-pane>
...
@@ -9,19 +16,62 @@
...
@@ -9,19 +16,62 @@
<MoveApp></MoveApp>
<MoveApp></MoveApp>
</a-tab-pane>
</a-tab-pane>
</a-tabs>
</a-tabs>
<!-- 上传配置文件弹窗 -->
<a-modal
v-model=
"visible"
title=
"配置文件上传"
@
ok=
"handleOk"
@
cancel=
"handleClose"
>
<a-form-model
:model=
"form"
:label-col=
"
{ span: 4 }"
:wrapper-col="{ span: 20 }"
ref="form"
:rules="rules"
>
<a-form-model-item
label=
"上传文件"
prop=
"filePath"
>
<a-upload
name=
"file"
:action=
"api + 'base/file/commonupload'"
:multiple=
"false"
:file-list=
"fileList"
@
change=
"handleChangeFile"
accept=
"application/x-zip-compressed"
>
<a-button
type=
"primary"
>
<a-icon
type=
"upload"
/>
.zip文件
</a-button>
</a-upload>
</a-form-model-item>
</a-form-model>
</a-modal>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
TerminalApp
from
"
./components/TerminalApp.vue
"
;
import
TerminalApp
from
"
./components/TerminalApp.vue
"
;
import
MoveApp
from
"
./components/MoveApp.vue
"
;
import
MoveApp
from
"
./components/MoveApp.vue
"
;
import
{
commonConfig
}
from
"
@/services/market
"
;
export
default
{
export
default
{
components
:
{
components
:
{
TerminalApp
,
TerminalApp
,
MoveApp
,
MoveApp
,
},
},
data
()
{
data
()
{
return
{};
return
{
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
visible
:
false
,
form
:
{
filePath
:
""
,
},
fileList
:
[],
rules
:
{
filePath
:
[
{
required
:
true
,
message
:
"
文件不能为空
"
,
trigger
:
"
change
"
},
],
},
};
},
},
// 进入路有前
// 进入路有前
beforeRouteEnter
(
to
,
from
,
text
)
{
beforeRouteEnter
(
to
,
from
,
text
)
{
...
@@ -32,6 +82,43 @@ export default {
...
@@ -32,6 +82,43 @@ export default {
}
}
text
();
text
();
},
},
methods
:
{
handleUpload
()
{
this
.
visible
=
true
;
},
handleOk
()
{
this
.
$refs
.
form
.
validate
(
async
(
valid
)
=>
{
if
(
valid
)
{
let
res
=
await
commonConfig
(
this
.
form
);
let
{
code
,
msg
}
=
res
.
data
;
if
(
code
===
1
)
{
this
.
$message
.
success
(
msg
);
this
.
handleClose
();
}
}
});
},
handleChangeFile
(
info
)
{
let
fileList
=
[...
info
.
fileList
];
fileList
=
fileList
.
slice
(
-
1
);
fileList
=
fileList
.
map
((
file
)
=>
{
if
(
file
.
response
)
{
file
.
url
=
file
.
response
.
url
;
}
return
file
;
});
this
.
fileList
=
fileList
;
if
(
this
.
fileList
.
length
)
{
this
.
form
.
filePath
=
this
.
fileList
[
0
].
url
;
}
else
{
this
.
form
.
filePath
=
""
;
}
},
handleClose
()
{
this
.
fileList
=
[];
this
.
visible
=
false
;
},
},
};
};
</
script
>
</
script
>
...
@@ -40,6 +127,9 @@ export default {
...
@@ -40,6 +127,9 @@ export default {
width: 100%;
width: 100%;
padding: 15px;
padding: 15px;
}
}
/deep/.ant-form-item {
align-items: flex-start;
}
/deep/.ant-tabs {
/deep/.ant-tabs {
height: 100%;
height: 100%;
background-color: #fff;
background-color: #fff;
...
...
base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
View file @
18fd1882
...
@@ -61,6 +61,11 @@
...
@@ -61,6 +61,11 @@
(
current
-
1
)
*
size
+
index
+
1
(
current
-
1
)
*
size
+
index
+
1
}}
</span>
}}
</span>
<!-- 图片 -->
<template
slot=
"img"
slot-scope=
"text"
>
<img
width=
"40"
:src=
"api + text.img"
/>
</
template
>
<!-- 操作 -->
<!-- 操作 -->
<
template
slot=
"action"
slot-scope=
"text"
>
<
template
slot=
"action"
slot-scope=
"text"
>
<a-space
size=
"middle"
>
<a-space
size=
"middle"
>
...
@@ -100,6 +105,7 @@ export default {
...
@@ -100,6 +105,7 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
appId
:
this
.
$route
.
query
.
id
,
appId
:
this
.
$route
.
query
.
id
,
loading
:
false
,
loading
:
false
,
current
:
1
,
current
:
1
,
...
@@ -134,10 +140,17 @@ export default {
...
@@ -134,10 +140,17 @@ export default {
return
v
.
isList
;
return
v
.
isList
;
})
})
.
map
((
v
)
=>
{
.
map
((
v
)
=>
{
if
(
v
.
fieldCode
===
"
img
"
)
{
return
{
title
:
v
.
fieldName
,
scopedSlots
:
{
customRender
:
"
img
"
},
};
}
else
{
return
{
return
{
title
:
v
.
fieldName
,
title
:
v
.
fieldName
,
dataIndex
:
v
.
fieldCode
,
dataIndex
:
v
.
fieldCode
,
};
};
}
});
});
return
[
index
,
...
arr
,
action
];
return
[
index
,
...
arr
,
action
];
},
},
...
...
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue
View file @
18fd1882
...
@@ -293,7 +293,6 @@ export default {
...
@@ -293,7 +293,6 @@ export default {
},
},
// 上传应用
// 上传应用
handleChangeFile
(
info
)
{
handleChangeFile
(
info
)
{
console
.
log
(
info
);
let
fileList
=
[...
info
.
fileList
];
let
fileList
=
[...
info
.
fileList
];
fileList
=
fileList
.
slice
(
-
1
);
fileList
=
fileList
.
slice
(
-
1
);
fileList
=
fileList
.
map
((
file
)
=>
{
fileList
=
fileList
.
map
((
file
)
=>
{
...
...
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
View file @
18fd1882
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
</div>
</div>
<a-upload
<a-upload
v-else-if=
"v.fieldType == 'upload'"
v-else-if=
"v.fieldType == 'upload'"
:action=
"api
2 + '
file/commonupload'"
:action=
"api
+ 'base/
file/commonupload'"
:multiple=
"false"
:multiple=
"false"
:file-list=
"v.fileList"
:file-list=
"v.fileList"
@
change=
"
@
change=
"
...
@@ -113,10 +113,7 @@ export default {
...
@@ -113,10 +113,7 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
api
:
process
.
env
.
VUE_APP_API_BASE_URL
.
includes
(
"
base
"
)
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
?
process
.
env
.
VUE_APP_API_BASE_URL
.
replace
(
"
base
"
,
""
)
:
process
.
env
.
VUE_APP_API_BASE_URL
,
api2
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
labelCol
:
{
labelCol
:
{
span
:
2
,
span
:
2
,
},
},
...
...
base-manager-ui/admin/src/services/basicsetApi.js
View file @
18fd1882
...
@@ -280,6 +280,7 @@ module.exports = {
...
@@ -280,6 +280,7 @@ module.exports = {
delete
:
`
${
BASE_URL
}
/base/app/delete`
,
delete
:
`
${
BASE_URL
}
/base/app/delete`
,
distribute
:
`
${
BASE_URL
}
/base/app/appDistribute`
,
distribute
:
`
${
BASE_URL
}
/base/app/appDistribute`
,
clone
:
`
${
BASE_URL
}
/base/app/cloneAppsBySites`
,
clone
:
`
${
BASE_URL
}
/base/app/cloneAppsBySites`
,
common
:
`
${
BASE_URL
}
/base/app/appCommonDistribute`
,
},
},
// 应用数据
// 应用数据
dataset
:
{
dataset
:
{
...
...
base-manager-ui/admin/src/services/market.js
View file @
18fd1882
...
@@ -36,6 +36,10 @@ export async function cloneApp(data) {
...
@@ -36,6 +36,10 @@ export async function cloneApp(data) {
export
async
function
deployApp
(
data
)
{
export
async
function
deployApp
(
data
)
{
return
request
(
App
.
distribute
,
METHOD
.
POST
,
data
);
return
request
(
App
.
distribute
,
METHOD
.
POST
,
data
);
}
}
// 基础配置文件部署
export
async
function
commonConfig
(
data
)
{
return
request
(
App
.
common
,
METHOD
.
POST
,
data
);
}
/**
/**
* 应用数据
* 应用数据
...
...
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