From 9d503366d5d7b238754f95d68d769f4a92182840 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Tue, 27 Feb 2024 14:34:08 +0800 Subject: [PATCH] up --- src/api/fill/index.js | 49 ++++ src/router/index.js | 6 +- src/views/fill/formindex.vue | 341 ++++++++++++++++++++++++++ src/views/fill/formshow.vue | 120 +++++++++ src/views/fill/index.vue | 2 +- src/views/fill/view.vue | 22 +- src/views/person/component/create.vue | 32 ++- src/views/person/person.vue | 5 +- src/views/system/department.vue | 9 + 9 files changed, 564 insertions(+), 22 deletions(-) create mode 100644 src/api/fill/index.js create mode 100644 src/views/fill/formindex.vue create mode 100644 src/views/fill/formshow.vue diff --git a/src/api/fill/index.js b/src/api/fill/index.js new file mode 100644 index 0000000..f55076b --- /dev/null +++ b/src/api/fill/index.js @@ -0,0 +1,49 @@ +import request from "@/utils/request"; + +export function overview (params,isLoading=false) { + return request({ + method: "get", + url: "/api/admin/statistic/year-overview", + params, + isLoading + }) +} + +export function personOverview (params,isLoading=false) { + return request({ + method: "get", + url: "/api/admin/statistic/person-year-overview", + params, + isLoading + }) +} + +export function personDetail (params,isLoading=false) { + return request({ + method: "get", + url: "/api/admin/statistic/person-year-detail", + params, + isLoading + }) +} + +export function getByCategory (params,isLoading=true) { + return request({ + method: "get", + url: "/api/admin/statistic/get-by-category", + params, + isLoading + }) +} + + + +export function recordShow (params,isLoading=true) { + return request({ + method: "get", + url: "/api/admin/statistic/record-show", + params, + isLoading + }) +} + diff --git a/src/router/index.js b/src/router/index.js index eef0a84..0658ed8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -74,7 +74,11 @@ export const constantRoutes = [{ } }, ] }, - + { + path: '/fill/formindex', + component: () => import('@/views/fill/formindex.vue'), + hidden: true + }, { path: "/h5", name: "h5", diff --git a/src/views/fill/formindex.vue b/src/views/fill/formindex.vue new file mode 100644 index 0000000..7dee146 --- /dev/null +++ b/src/views/fill/formindex.vue @@ -0,0 +1,341 @@ + + + + + + diff --git a/src/views/fill/formshow.vue b/src/views/fill/formshow.vue new file mode 100644 index 0000000..7c63bd2 --- /dev/null +++ b/src/views/fill/formshow.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/views/fill/index.vue b/src/views/fill/index.vue index 7dd5c07..0101131 100644 --- a/src/views/fill/index.vue +++ b/src/views/fill/index.vue @@ -35,7 +35,7 @@ diff --git a/src/views/fill/view.vue b/src/views/fill/view.vue index 691d6e9..3347d02 100644 --- a/src/views/fill/view.vue +++ b/src/views/fill/view.vue @@ -14,23 +14,23 @@
-
5
+
{{viewlist.count_category_type?viewlist.count_category_type:0}}
清单类型
-
5
+
{{viewlist.count_category?viewlist.count_category:0}}
填报清单项
-
5
+
{{viewlist.count_person?viewlist.count_person:0}}
“一把手”和领导班子
-
5
+
{{viewlist.count_record?viewlist.count_record:0}}
条填报记录
-
5
+
{{viewlist.count_record_missed?viewlist.count_record_missed:0}}
超期未报
@@ -38,6 +38,7 @@ diff --git a/src/views/person/component/create.vue b/src/views/person/component/create.vue index b6e71c6..2a3a51e 100644 --- a/src/views/person/component/create.vue +++ b/src/views/person/component/create.vue @@ -1,5 +1,6 @@ diff --git a/src/views/person/person.vue b/src/views/person/person.vue index a07a75c..ce78371 100644 --- a/src/views/person/person.vue +++ b/src/views/person/person.vue @@ -102,7 +102,7 @@ export default { width: 120 }, { - prop: "person.name", + prop: "category_type.title", label: "清单类型", width: 120 }, @@ -123,9 +123,12 @@ export default { customFn: (row) => { return ( { + console.log("asd") } } diff --git a/src/views/system/department.vue b/src/views/system/department.vue index c79aefe..5b219cd 100644 --- a/src/views/system/department.vue +++ b/src/views/system/department.vue @@ -54,6 +54,9 @@ + + + @@ -100,6 +103,7 @@ formLabelWidth: "120px", form: { name: "", + abbr:'', id: "", pid: "0", manager_id: "", @@ -115,6 +119,11 @@ required: true, message: '请输入部门名称', trigger: 'blur' + }], + abbr: [{ + required: true, + message: '请输入部门简称', + trigger: 'blur' }] }, tableHeight: 0,