From 3e2cadeebd694f18a43c1c11505db2c033e0754a Mon Sep 17 00:00:00 2001 From: panyuyi Date: Mon, 27 May 2024 17:35:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=200607=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 6 +- public/index.html | 40 +- src/App.vue | 3 + src/assets/styles/index.scss | 10 +- src/assets/styles/space.scss | 21 + src/components/TopBackTitle/index.vue | 57 +++ src/layout/components/AppMain.vue | 4 +- src/layout/index.vue | 7 + src/main.js | 2 +- src/mixins/commonPagination.js | 22 ++ src/utils/index.js | 24 ++ .../layerManage/resource/LayerDetails.vue | 363 ++++++++++++------ .../enginerring/inspectionItems/index.vue | 14 +- .../inspectionItems/inspectionItemDetails.vue | 7 +- .../inspectionPlan/components/planDetail.vue | 291 ++++++++++++++ .../enginerring/inspectionPlan/index.vue | 5 +- .../enginerring/inspectionRecords/index.vue | 5 +- .../components/RouteDetail.vue | 217 +++++++++++ .../inspectionRouteManage/index.vue | 204 ++++++++++ .../enginerring/patrolManage/index.vue | 5 +- .../maintenance/maintenanceManage/index.vue | 5 +- .../maintenance/maintenancePlan/index.vue | 7 +- .../maintenance/maintenanceRecords/index.vue | 5 +- .../pestAnimalControl/controlManage/index.vue | 9 +- .../governanceRecords/index.vue | 5 +- .../planManagement/index.vue | 5 +- .../methodsManage/details.vue | 2 +- .../methodsManage/index.vue | 9 +- .../methodsManage/itemsList.vue | 2 +- .../waterRainReport/monitoring/index.vue | 5 +- .../testReportManage/index.vue | 5 +- .../maintenance/maintenanceManage/index.vue | 9 +- .../maintenance/maintenancePlan/index.vue | 5 +- .../maintenance/maintenanceRecords/index.vue | 5 +- .../statisticAnalysis/index.vue | 2 +- 35 files changed, 1204 insertions(+), 183 deletions(-) create mode 100644 src/components/TopBackTitle/index.vue create mode 100644 src/mixins/commonPagination.js create mode 100644 src/views/dike/runManage/enginerring/inspectionPlan/components/planDetail.vue create mode 100644 src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue create mode 100644 src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue diff --git a/package.json b/package.json index 04fcb3e..6f6571c 100644 --- a/package.json +++ b/package.json @@ -63,10 +63,7 @@ "jspdf": "^2.5.1", "jsplumb": "^2.15.6", "jszip": "^3.0.0", - "less": "^4.1.1", - "less-loader": "^7.0.0", "node-jsencrypt": "^1.0.0", - "node-sass": "^6.0.1", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", @@ -113,7 +110,10 @@ "eslint-plugin-vue": "6.2.2", "html-webpack-plugin": "3.2.0", "husky": "1.3.1", + "less": "^4.1.1", + "less-loader": "^7.0.0", "lint-staged": "8.1.5", + "node-sass": "^6.0.1", "plop": "2.3.0", "runjs": "4.3.2", "sass-loader": "^10.2.0", diff --git a/public/index.html b/public/index.html index 778bf66..edc201f 100644 --- a/public/index.html +++ b/public/index.html @@ -7,15 +7,10 @@ - + - - - + <%= webpackConfig.name %> diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 7ad0160..b381ec9 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -33,8 +33,8 @@ export default { diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue index dc6033a..432d5b6 100644 --- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue @@ -351,7 +351,7 @@ export default { >添加 - + @@ -627,9 +627,10 @@ export default { } .table-box { - height: calc(100% - 50px - 24px); + // height: calc(100% - 50px - 24px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue index 7787b97..179d06b 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue @@ -104,7 +104,7 @@ export default { > 重置 - + @@ -165,9 +165,10 @@ export default { } .table-box { - height: calc(100% - 24px); + // height: calc(100% - 24px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue new file mode 100644 index 0000000..69f312c --- /dev/null +++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue @@ -0,0 +1,217 @@ + + + diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue new file mode 100644 index 0000000..77e95df --- /dev/null +++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue @@ -0,0 +1,204 @@ + + + diff --git a/src/views/dike/runManage/enginerring/patrolManage/index.vue b/src/views/dike/runManage/enginerring/patrolManage/index.vue index 2d759db..ee74dcd 100644 --- a/src/views/dike/runManage/enginerring/patrolManage/index.vue +++ b/src/views/dike/runManage/enginerring/patrolManage/index.vue @@ -28,7 +28,7 @@ > 重置 - + @@ -392,9 +392,10 @@ export default { .table-box { width: 100%; - min-height: calc(100vh - 56px - 64px); + // min-height: calc(100vh - 56px - 64px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/dike/runManage/maintenance/maintenanceManage/index.vue b/src/views/dike/runManage/maintenance/maintenanceManage/index.vue index b758e6a..f8cceeb 100644 --- a/src/views/dike/runManage/maintenance/maintenanceManage/index.vue +++ b/src/views/dike/runManage/maintenance/maintenanceManage/index.vue @@ -32,7 +32,7 @@ > 重置 - + @@ -211,9 +211,10 @@ export default { .table-box { width: 100%; - min-height: calc(100vh - 56px - 64px); + // min-height: calc(100vh - 56px - 64px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue index 192a415..556dd44 100644 --- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue +++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue @@ -264,11 +264,13 @@ export default { }, handleChangeDike(value) { let res = this.embankmentList.find((v) => v.dikeCode === value); + console.log("res >>>>> ", res); this.baseInfoDialog.id = res?.id || ""; this.baseInfoDialog.code = this.ruleForm.dikeCode; }, // 打开堤防详情 handleOpenDetails() { + console.log("this.baseInfoDialog >>>>> ", this.baseInfoDialog); if (this.baseInfoDialog.id) { this.baseInfoDialog.show = true; } else { @@ -317,7 +319,7 @@ export default { > - + @@ -567,9 +569,10 @@ export default { } .table-box { - height: calc(100% - 16px); + // height: calc(100% - 16px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue index 488c3c9..3961a4d 100644 --- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue +++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue @@ -433,7 +433,7 @@ export default { >添加 - + @@ -770,9 +770,10 @@ export default { .table-box { width: 100%; - height: calc(100% - 16px); + // height: calc(100% - 16px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/dike/runManage/pestAnimalControl/controlManage/index.vue b/src/views/dike/runManage/pestAnimalControl/controlManage/index.vue index a6d4bcf..c0a5daa 100644 --- a/src/views/dike/runManage/pestAnimalControl/controlManage/index.vue +++ b/src/views/dike/runManage/pestAnimalControl/controlManage/index.vue @@ -25,7 +25,7 @@ > 重置 - + @@ -361,9 +361,10 @@ export default { .table-box { width: 100%; - min-height: calc(100vh - 56px - 64px); + // min-height: calc(100vh - 56px - 64px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { @@ -374,10 +375,6 @@ export default { margin-right: 10px; } } - - .table { - height: calc(680px - 34px); - } } } diff --git a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue index cbae9c3..a0bea60 100644 --- a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue +++ b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue @@ -472,7 +472,7 @@ export default { >添加 - + @@ -1072,9 +1072,10 @@ export default { .table-box { width: 100%; - min-height: calc(100vh - 56px - 64px); + // min-height: calc(100vh - 56px - 64px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue index 589c455..b2b3354 100644 --- a/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue +++ b/src/views/dike/runManage/pestAnimalControl/planManagement/index.vue @@ -425,7 +425,7 @@ export default { >新增 - + @@ -847,9 +847,10 @@ export default { .table-box { width: 100%; - min-height: calc(100vh - 56px - 64px - 28px); + // min-height: calc(100vh - 56px - 64px - 28px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue b/src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue index 9b2f2a4..3c4e1a3 100644 --- a/src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue +++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue @@ -164,7 +164,7 @@ export default { margin-top: 20px; background-color: #fff; padding: 20px; - height: calc(100% - 56px); + height: calc(100% - 60px); .pdf-preview { height: calc(100% - 50px); margin-top: 20px; diff --git a/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue index 328d07c..0c06d2f 100644 --- a/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue +++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue @@ -149,7 +149,7 @@ export default { v-hasPermi="['df:run:sup:meth:add']" >添加 - + 重置 - + 重置 - + @@ -252,9 +252,10 @@ export default { .table-box { width: 100%; - min-height: calc(100vh - 56px - 64px); + // min-height: calc(100vh - 56px - 64px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/sluice/runManage/maintenance/maintenanceManage/index.vue b/src/views/sluice/runManage/maintenance/maintenanceManage/index.vue index b7cdcf5..3fca85f 100644 --- a/src/views/sluice/runManage/maintenance/maintenanceManage/index.vue +++ b/src/views/sluice/runManage/maintenance/maintenanceManage/index.vue @@ -32,7 +32,7 @@ > 重置 - + @@ -193,9 +193,10 @@ export default { .table-box { width: 100%; - min-height: calc(100vh - 56px - 64px); + // min-height: calc(100vh - 56px - 64px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { @@ -206,10 +207,6 @@ export default { margin-right: 10px; } } - - .table { - height: calc(680px - 34px); - } } } diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue index 1b87fd9..089e51a 100644 --- a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue +++ b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue @@ -276,7 +276,7 @@ export default { > - + @@ -528,9 +528,10 @@ export default { } .table-box { - height: calc(100% - 24px); + // height: calc(100% - 24px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue index 894342a..1a093e9 100644 --- a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue +++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue @@ -430,7 +430,7 @@ export default { >添加 - + @@ -767,9 +767,10 @@ export default { .table-box { width: 100%; - height: calc(100% - 18px); + // height: calc(100% - 18px); margin-top: 24px; padding: 16px; + padding-bottom: 60px; background-color: white; .top-search { diff --git a/src/views/sluice/runManage/supervisionInspetion/statisticAnalysis/index.vue b/src/views/sluice/runManage/supervisionInspetion/statisticAnalysis/index.vue index e072735..2af1832 100644 --- a/src/views/sluice/runManage/supervisionInspetion/statisticAnalysis/index.vue +++ b/src/views/sluice/runManage/supervisionInspetion/statisticAnalysis/index.vue @@ -297,7 +297,7 @@ export default { .table-box { width: 100%; - min-height: calc(100vh - 56px - 64px); + // min-height: calc(100% - 60px); margin-top: 24px; background-color: white; .title-box {