Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zhengyuan-danger-chemistry-manage
Project
Project
Details
Activity
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
耿迪迪
zhengyuan-danger-chemistry-manage
Commits
133d6f6e
Commit
133d6f6e
authored
Dec 24, 2022
by
王晓倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
安全承诺公告新增验证,详情页布局
parent
42bf5575
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
248 additions
and
139 deletions
+248
-139
TSafetyCommitmentAnnouncementController.java
...tyManagement/TSafetyCommitmentAnnouncementController.java
+27
-1
announcement.js
danger-manage-web/src/api/safetyManagement/announcement.js
+9
-0
assessmentLevel.png
danger-manage-web/src/assets/images/assessmentLevel.png
+0
-0
index.vue
...age-web/src/views/safetyManagement/announcement/index.vue
+212
-138
No files found.
danger-manage-admin/src/main/java/com/zehong/web/controller/safetyManagement/TSafetyCommitmentAnnouncementController.java
View file @
133d6f6e
package
com
.
zehong
.
web
.
controller
.
safetyManagement
;
import
java.util.List
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
...
...
@@ -45,6 +48,29 @@ public class TSafetyCommitmentAnnouncementController extends BaseController
return
getDataTable
(
list
);
}
/**
* 新增安全承诺公告验证
*/
@GetMapping
(
"/getCurrent"
)
public
AjaxResult
getCurrent
(
TSafetyCommitmentAnnouncement
tSafetyCommitmentAnnouncement
)
{
Calendar
calender
=
Calendar
.
getInstance
();
calender
.
setTime
(
new
Date
());
String
endTime
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
).
format
(
calender
.
getTime
());
calender
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
calender
.
set
(
Calendar
.
MINUTE
,
0
);
calender
.
set
(
Calendar
.
SECOND
,
0
);
String
beginTime
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
).
format
(
calender
.
getTime
());
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"beginTime"
,
beginTime
);
map
.
put
(
"endTime"
,
endTime
);
tSafetyCommitmentAnnouncement
.
setParams
(
map
);
List
<
TSafetyCommitmentAnnouncement
>
list
=
tSafetyCommitmentAnnouncementService
.
selectTSafetyCommitmentAnnouncementList
(
tSafetyCommitmentAnnouncement
);
return
AjaxResult
.
success
(
list
);
}
/**
* 导出安全承诺公告列表
*/
...
...
danger-manage-web/src/api/safetyManagement/announcement.js
View file @
133d6f6e
...
...
@@ -9,6 +9,15 @@ export function listAnnouncement(query) {
})
}
// 查询安全承诺公告详细
export
function
getCurrent
(
query
)
{
return
request
({
url
:
'/safetyManagement/announcement/getCurrent'
,
method
:
'get'
,
params
:
query
})
}
// 查询安全承诺公告详细
export
function
getAnnouncement
(
id
)
{
return
request
({
...
...
danger-manage-web/src/assets/images/assessmentLevel.png
0 → 100644
View file @
133d6f6e
2.01 KB
danger-manage-web/src/views/safetyManagement/announcement/index.vue
View file @
133d6f6e
This diff is collapsed.
Click to expand it.
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