diff --git a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
index 53b48a74..10352fdf 100644
--- a/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml
@@ -115,7 +115,7 @@
and businessDeptId=#{deployId}
and businessKey=#{businessKey}
GROUP BY category) b ON a.dict_value=b.category
- LEFT JOIN (SELECT category,COUNT(1) cnt FROM vw_flow_all WHERE finishTime IS NULL
+ LEFT JOIN (SELECT category,COUNT(1) cnt FROM vw_flow_all WHERE finishTime IS NULL AND taskName!='提交申请'
and businessDeptId=#{deployId}
and businessKey=#{businessKey}
GROUP BY category) c ON a.dict_value=c.category
diff --git a/ruoyi-ui/public/images/bg1.png b/ruoyi-ui/public/images/bg1.png
index 15a20ac3..d0bd08db 100644
Binary files a/ruoyi-ui/public/images/bg1.png and b/ruoyi-ui/public/images/bg1.png differ
diff --git a/ruoyi-ui/src/api/base/periodical.js b/ruoyi-ui/src/api/base/periodical.js
new file mode 100644
index 00000000..40044c65
--- /dev/null
+++ b/ruoyi-ui/src/api/base/periodical.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询期刊列表
+export function listPeriodical(query) {
+ return request({
+ url: '/base/periodical/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询期刊详细
+export function getPeriodical(id) {
+ return request({
+ url: '/base/periodical/' + id,
+ method: 'get'
+ })
+}
+
+// 新增期刊
+export function addPeriodical(data) {
+ return request({
+ url: '/base/periodical',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改期刊
+export function updatePeriodical(data) {
+ return request({
+ url: '/base/periodical',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除期刊
+export function delPeriodical(id) {
+ return request({
+ url: '/base/periodical/' + id,
+ method: 'delete'
+ })
+}
diff --git a/ruoyi-ui/src/views/base/periodical/index.vue b/ruoyi-ui/src/views/base/periodical/index.vue
new file mode 100644
index 00000000..71c1f4df
--- /dev/null
+++ b/ruoyi-ui/src/views/base/periodical/index.vue
@@ -0,0 +1,324 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index faf23108..5c9cd8f5 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -169,7 +169,7 @@ export default {