Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
study-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
赵啸非
study-platform
Commits
78d9a1a2
Commit
78d9a1a2
authored
Mar 14, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加附件显示
parent
31ab834b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
18 deletions
+9
-18
study-manager-ui/admin/src/views/notice/dialogshow.vue
study-manager-ui/admin/src/views/notice/dialogshow.vue
+1
-1
study-manager-ui/admin/src/views/project/dialogshow.vue
study-manager-ui/admin/src/views/project/dialogshow.vue
+1
-1
study-manager/src/main/java/com/mortals/xhx/base/system/upload/service/UploadService.java
...mortals/xhx/base/system/upload/service/UploadService.java
+2
-14
study-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java
.../mortals/xhx/base/system/upload/web/UploadController.java
+3
-0
study-manager/target/classes/application.yml
study-manager/target/classes/application.yml
+2
-2
No files found.
study-manager-ui/admin/src/views/notice/dialogshow.vue
View file @
78d9a1a2
...
...
@@ -117,7 +117,7 @@
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-row>
<Field
:span=
"22"
label=
"标题"
prop=
"title"
v-model=
"form.title"
type=
"textarea"
placeholder=
"请输入标题"
/>
<Field
:span=
"22"
label=
"标题"
prop=
"title"
v-model=
"form.title"
placeholder=
"请输入标题"
/>
<Field
:span=
"22"
label=
"公告类型"
prop=
"noticeType"
v-model=
"form.noticeType"
type=
"radio"
:enumData=
"dict.noticeType"
placeholder=
"请选择公告类型"
/>
<Field
:span=
"22"
label=
"发布部门"
prop=
"pubDeptId"
v-model=
"form.pubDeptId"
type=
"select"
:enumData=
"dict.pubDeptId"
placeholder=
"请选择发布部门"
/>
<Field
:span=
"22"
label=
"查看人员"
prop=
"viewPersion"
v-model=
"form.viewPersion"
type=
"radio"
:enumData=
"
{0:'全部人员',1:'部分人员'}" placeholder="请选择查看人员"/>
...
...
study-manager-ui/admin/src/views/project/dialogshow.vue
View file @
78d9a1a2
...
...
@@ -113,7 +113,7 @@
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-row>
<Field
:span=
"22"
label=
"标题"
prop=
"title"
v-model=
"form.title"
type=
"textarea"
placeholder=
"请输入标题"
/>
<Field
:span=
"22"
label=
"标题"
prop=
"title"
v-model=
"form.title"
placeholder=
"请输入标题"
/>
<Field
:span=
"22"
label=
"项目类型"
prop=
"projectType"
v-model=
"form.projectType"
type=
"radio"
:enumData=
"dict.projectType"
placeholder=
"请选择项目类型"
/>
<Field
:span=
"22"
label=
"开始时间"
prop=
"projectStartTime"
v-model=
"form.projectStartTime"
type=
"datetime"
/>
<Field
:span=
"22"
label=
"结束时间"
prop=
"projectEndTime"
v-model=
"form.projectEndTime"
type=
"datetime"
/>
...
...
study-manager/src/main/java/com/mortals/xhx/base/system/upload/service/UploadService.java
View file @
78d9a1a2
...
...
@@ -46,24 +46,12 @@ public interface UploadService extends IService {
*/
void
fileDownload
(
String
fileName
,
Boolean
delete
,
HttpServletResponse
response
);
/**
* 预览
* @param fileName
* @param response
*/
void
preview
(
String
fileName
,
HttpServletResponse
response
);
/**
* 上传
* @param fileName
* @param response
*/
void
uploadDownload
(
String
fileName
,
HttpServletResponse
response
);
/**
* 刪除
* @param fileName
*/
void
deleteFile
(
String
fileName
);
}
\ No newline at end of file
study-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java
View file @
78d9a1a2
...
...
@@ -2,6 +2,7 @@ package com.mortals.xhx.base.system.upload.web;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.web.BaseController
;
import
com.mortals.xhx.base.system.upload.service.UploadService
;
...
...
@@ -28,6 +29,7 @@ public class UploadController extends BaseController {
private
UploadService
uploadService
;
@RequestMapping
(
value
=
"upload"
)
@UnAuth
public
String
doFileUpload
(
HttpServletRequest
request
,
UploadForm
form
)
{
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
String
jsonStr
=
""
;
...
...
@@ -52,6 +54,7 @@ public class UploadController extends BaseController {
@RequestMapping
(
value
=
"commonupload"
)
@UnAuth
public
String
doFileUpload
(
MultipartFile
file
,
@RequestParam
(
value
=
"prePath"
,
defaultValue
=
"file/fileupload"
)
String
prePath
)
{
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
String
jsonStr
=
""
;
...
...
study-manager/target/classes/application.yml
View file @
78d9a1a2
...
...
@@ -3,7 +3,7 @@ spring:
allow-bean-definition-overriding
:
true
application
:
log
:
level
:
INFO
path
:
/
home/
mortals/app/logs
level
:
info
path
:
/mortals/app/logs
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