From 723cb7f801f7e5a4406198a53680db14c938f500 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Wed, 24 Jan 2024 18:18:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .prettierignore | 10 + prettierrc.conf.js | 19 + src/api/dike/index.js | 9 + src/assets/styles/index.scss | 1 + src/assets/styles/space.scss | 71 ++++ .../enginerring/inspectionRecords/index.vue | 104 +++-- .../enginerring/patrolManage/index.vue | 178 +++++++++ .../maintenancePlan/DetailsDialog.vue | 354 +++++++++++++++++- .../maintenance/maintenancePlan/index.vue | 32 +- .../planManagement/index.vue | 50 ++- 10 files changed, 771 insertions(+), 57 deletions(-) create mode 100644 .prettierignore create mode 100644 prettierrc.conf.js create mode 100644 src/assets/styles/space.scss create mode 100644 src/views/dike/runManage/enginerring/patrolManage/index.vue diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..15cf071 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,10 @@ +/node_modules/** +/dist/ +/dist* +/public/* +/docs/* +/vite.config.ts +/src/types/env.d.ts +/docs/**/* +/plop/**/* +CHANGELOG diff --git a/prettierrc.conf.js b/prettierrc.conf.js new file mode 100644 index 0000000..b46239f --- /dev/null +++ b/prettierrc.conf.js @@ -0,0 +1,19 @@ +module.exports = { + printWidth: 100, + tabWidth: 2, + useTabs: false, + semi: false, + vueIndentScriptAndStyle: false, + singleQuote: true, + quoteProps: 'as-needed', + bracketSpacing: true, + trailingComma: 'none', + jsxSingleQuote: false, + arrowParens: 'always', + insertPragma: false, + requirePragma: false, + proseWrap: 'never', + htmlWhitespaceSensitivity: 'strict', + endOfLine: 'auto', + rangeStart: 0 +} diff --git a/src/api/dike/index.js b/src/api/dike/index.js index 14c387d..7d6ad7f 100644 --- a/src/api/dike/index.js +++ b/src/api/dike/index.js @@ -1,6 +1,15 @@ // 堤防相关接口 import request from '@/utils/request' +// 获取巡查堤防列表 +export function getDikeProjectList(data) { + return request({ + url: `/run/df/project/list`, + method: 'post', + data + }) +} + // 巡查记录-巡查记录详情 export function getDikePatrolDetails(id) { return request({ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 33f9d38..a422b06 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -4,6 +4,7 @@ @import './element-ui.scss'; @import './sidebar.scss'; @import './btn.scss'; +@import './space.scss'; body { height: 100%; diff --git a/src/assets/styles/space.scss b/src/assets/styles/space.scss new file mode 100644 index 0000000..75d6f49 --- /dev/null +++ b/src/assets/styles/space.scss @@ -0,0 +1,71 @@ +/** + 懒得弄windcss,手写一些常用的 +*/ + +/***** margin ******/ +@for $i from 1 through 32 { + .m-#{$i}{ + margin: #{$i}px; + } + .ml-#{$i}{ + margin-left: #{$i}px; + } + .mr-#{$i}{ + margin-right: #{$i}px; + } + .mt-#{$i}{ + margin-top: #{$i}px; + } + .mb-#{$i}{ + margin-bottom: #{$i}px; + } + .\!m-#{$i}{ + margin: #{$i}px !important; + } + .\!ml-#{$i}{ + margin-left: #{$i}px !important; + } + .\!mr-#{$i}{ + margin-right: #{$i}px !important; + } + .\!mt-#{$i}{ + margin-top: #{$i}px !important; + } + .\!mb-#{$i}{ + margin-bottom: #{$i}px !important; + } +} + +/***** padding ******/ +@for $i from 1 through 32 { + .p-#{$i}{ + margin: #{$i}px; + } + .pl-#{$i}{ + padding-left: #{$i}px; + } + .pr-#{$i}{ + padding-right: #{$i}px; + } + .pt-#{$i}{ + padding-top: #{$i}px; + } + .pb-#{$i}{ + padding-bottom: #{$i}px; + } + .\!p-#{$i}{ + margin: #{$i}px !important; + } + .\!pl-#{$i}{ + padding-left: #{$i}px !important; + } + .\!pr-#{$i}{ + padding-right: #{$i}px !important; + } + .\!pt-#{$i}{ + padding-top: #{$i}px !important; + } + .\!pb-#{$i}{ + padding-bottom: #{$i}px !important; + } +} diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue index 534eeca..437d9a1 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue @@ -1,77 +1,91 @@ diff --git a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue index 7ec32d6..e003d50 100644 --- a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue +++ b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue @@ -1,6 +1,12 @@