From 1d5060b1f4bf6ae3aef1f9ca8c80339beb443f32 Mon Sep 17 00:00:00 2001 From: du <1176658673@qq.com> Date: Mon, 18 Mar 2024 17:34:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/statistic.ts | 17 +- .../base-manage/village/dialog/add-edit.vue | 16 +- src/views/statistic/components/gz.vue | 184 ++++++++---------- src/views/statistic/components/hj.vue | 51 ++++- src/views/statistic/components/rylx.vue | 88 ++++++--- src/views/system/setting/file.vue | 52 ++--- src/views/system/setting/info.vue | 16 +- src/views/system/setting/protocol.vue | 85 ++++---- src/views/system/setting/safe.vue | 17 +- 9 files changed, 304 insertions(+), 222 deletions(-) diff --git a/src/api/statistic.ts b/src/api/statistic.ts index d455a7d..eb7776c 100644 --- a/src/api/statistic.ts +++ b/src/api/statistic.ts @@ -3,19 +3,32 @@ import request from "@/utils/request"; /** *查看人员类型统计 */ -export function personnelTypeStatistic() { +export function personnelTypeStatistic(params) { return request({ url: `/admin/statistic/personnelTypeStatistic`, method: "GET", + params:params }); } /** *查看户籍统计 */ - export function domicileStatistic() { + export function domicileStatistic(params) { return request({ url: `/admin/statistic/domicileStatistic`, method: "GET", + params:params }); } + /** + *查看工作统计 + */ + export function workStatistic(params) { + return request({ + url: `/admin/statistic/workStatistic/`, + method: "GET", + params:params + }); +} + diff --git a/src/views/base-manage/village/dialog/add-edit.vue b/src/views/base-manage/village/dialog/add-edit.vue index c09da86..e503210 100644 --- a/src/views/base-manage/village/dialog/add-edit.vue +++ b/src/views/base-manage/village/dialog/add-edit.vue @@ -23,10 +23,10 @@ v-model="formData.orgname" /> - +
-
+
刷新
+
+ + + + +
+
+ + +
@@ -20,117 +47,76 @@ border > + - - - - - - - - - - - - - - - - - + + - - - -
diff --git a/src/views/system/setting/info.vue b/src/views/system/setting/info.vue index d521bc4..f11fe87 100644 --- a/src/views/system/setting/info.vue +++ b/src/views/system/setting/info.vue @@ -7,17 +7,17 @@ :model="formData" class="center-form" > - + - + - + @@ -38,6 +38,7 @@ const uuid = ref(getUUID()); * 保存 */ const save = () => { + console.log(formData.value,'formData==>'); }; @@ -48,23 +49,26 @@ const save = () => { height: fit-content; background: #fff; border-radius: 0.26042vw; - box-shadow: 0 0 0.41667vw 0 rgba(8, 33, 85, 0.1); + box-shadow: 0 0 0.41667vw 0 rgb(8 33 85 / 10%); padding: 0.83333vw; overflow-y: auto; overflow-x: hidden !important; + /* stylelint-disable-next-line property-no-vendor-prefix */ -moz-box-sizing: border-box; + /* stylelint-disable-next-line property-no-vendor-prefix */ -webkit-box-sizing: border-box; + /* stylelint-disable-next-line property-no-vendor-prefix */ -o-box-sizing: border-box; + /* stylelint-disable-next-line property-no-vendor-prefix */ -ms-box-sizing: border-box; + /* stylelint-disable-next-line indentation */ box-sizing: border-box; position: relative; - .option { bottom: 10px; display: flex; align-items: center; justify-content: center; - .btn { width: 10vw; } diff --git a/src/views/system/setting/protocol.vue b/src/views/system/setting/protocol.vue index 42295d4..34f818a 100644 --- a/src/views/system/setting/protocol.vue +++ b/src/views/system/setting/protocol.vue @@ -40,49 +40,54 @@ const getMsg = (val) => { diff --git a/src/views/system/setting/safe.vue b/src/views/system/setting/safe.vue index 66fcbbd..2d607ca 100644 --- a/src/views/system/setting/safe.vue +++ b/src/views/system/setting/safe.vue @@ -8,17 +8,17 @@ label-width="130" class="center-form" > - + - + - + .content { + /* stylelint-disable-next-line indentation */ width: 100%; height: fit-content; background: #fff; border-radius: 0.26042vw; - box-shadow: 0 0 0.41667vw 0 rgba(8, 33, 85, 0.1); + box-shadow: 0 0 0.41667vw 0 rgb(8 33 85 / 10%); padding: 0.83333vw; overflow-y: auto; + /* stylelint-disable-next-line indentation */ overflow-x: hidden !important; + /* stylelint-disable-next-line property-no-vendor-prefix */ -moz-box-sizing: border-box; + /* stylelint-disable-next-line property-no-vendor-prefix */ -webkit-box-sizing: border-box; + /* stylelint-disable-next-line property-no-vendor-prefix */ -o-box-sizing: border-box; + /* stylelint-disable-next-line property-no-vendor-prefix */ -ms-box-sizing: border-box; + /* stylelint-disable-next-line indentation */ box-sizing: border-box; position: relative; - .option { bottom: 10px; display: flex; align-items: center; justify-content: center; - .btn { width: 10vw; }