From 096f866c132efe0c9b7a87e76049585babb33db3 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Tue, 16 Jan 2024 17:07:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E5=A0=A4=E5=9D=9D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=BAdike=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8dyke?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/management/{dyke.js => dike.js} | 0 src/api/management/index.js | 2 +- src/api/system/upload.js | 10 ++++- src/api/yg/{dykeCompare.js => dikeCompare.js} | 0 src/api/yg/{dykeInfo.js => dikeInfo.js} | 12 +++--- src/api/yg/{dykeMark.js => dikeMark.js} | 14 +++---- src/assets/styles/index.scss | 2 + src/layout/components/Navbar.vue | 2 +- src/store/modules/permission.js | 6 +-- .../dikeBaseInfo}/index.vue | 24 ++++++------ .../dikeBaseInfo}/options/basePage.vue | 4 +- .../dikeBaseInfo}/options/index.vue | 2 +- .../options/projectManagement.vue | 0 .../dikeCompare}/components/basePage.vue | 2 +- .../dikeCompare}/components/comparePart.vue | 0 .../components/projectManagement.vue | 2 +- .../dikeCompare}/index.vue | 4 +- .../components/markForm.vue | 0 .../identificationPlate/index.vue | 20 +++++----- .../engineeringCondition/index.vue | 0 .../enginerring/components/Drawer.vue | 0 .../enginerring/components/GaoDeMap.vue | 0 .../runManage/enginerring/index.vue | 0 .../enginerring/inspectionItems/index.vue | 0 .../enginerring/inspectionPlan/index.vue | 37 ++++++++++++++++++- .../enginerring/inspectionRecords/index.vue | 0 .../enginerring/patrolRouteSettings/index.vue | 0 src/views/{dyke => dike}/runManage/index.vue | 0 .../runManage/maintenance/index.vue | 0 .../maintenance/maintenancePlan/index.vue | 14 +++---- .../maintenance/maintenanceRecords/index.vue | 4 +- .../governanceRecords/index.vue | 10 ++--- .../runManage/pestAnimalControl/index.vue | 0 .../planManagement/index.vue | 32 +++++++++------- .../engineering/inspectionPlan/Dike.vue | 6 +-- .../maintenance/maintenancePlan/Dike.vue | 14 +++---- .../maintenance/maintenancePlan/Sluice.vue | 14 +++---- .../maintenance/maintenanceRecords/Dike.vue | 4 +- .../maintenance/maintenanceRecords/Sluice.vue | 4 +- .../governanceRecords/Dike.vue | 10 ++--- .../pestAnimalControl/planManagement/Dike.vue | 20 +++++----- .../enginerring/inspectionPlan/index.vue | 31 ++++++++++++++++ .../maintenance/maintenancePlan/index.vue | 14 +++---- .../maintenance/maintenanceRecords/index.vue | 4 +- src/views/yg/dikeInfo/index.vue | 20 +++++----- src/views/yg/dikeMark/index.vue | 20 +++++----- 46 files changed, 221 insertions(+), 143 deletions(-) rename src/api/management/{dyke.js => dike.js} (100%) rename src/api/yg/{dykeCompare.js => dikeCompare.js} (100%) rename src/api/yg/{dykeInfo.js => dikeInfo.js} (81%) rename src/api/yg/{dykeMark.js => dikeMark.js} (80%) rename src/views/{dyke/engineeringCondition/dykeBaseInfo => dike/engineeringCondition/dikeBaseInfo}/index.vue (98%) rename src/views/{dyke/engineeringCondition/dykeBaseInfo => dike/engineeringCondition/dikeBaseInfo}/options/basePage.vue (99%) rename src/views/{dyke/engineeringCondition/dykeBaseInfo => dike/engineeringCondition/dikeBaseInfo}/options/index.vue (97%) rename src/views/{dyke/engineeringCondition/dykeBaseInfo => dike/engineeringCondition/dikeBaseInfo}/options/projectManagement.vue (100%) rename src/views/{dyke/engineeringCondition/dykeCompare => dike/engineeringCondition/dikeCompare}/components/basePage.vue (99%) rename src/views/{dyke/engineeringCondition/dykeCompare => dike/engineeringCondition/dikeCompare}/components/comparePart.vue (100%) rename src/views/{dyke/engineeringCondition/dykeCompare => dike/engineeringCondition/dikeCompare}/components/projectManagement.vue (99%) rename src/views/{dyke/engineeringCondition/dykeCompare => dike/engineeringCondition/dikeCompare}/index.vue (97%) rename src/views/{dyke => dike}/engineeringCondition/identificationPlate/components/markForm.vue (100%) rename src/views/{dyke => dike}/engineeringCondition/identificationPlate/index.vue (98%) rename src/views/{dyke => dike}/engineeringCondition/index.vue (100%) rename src/views/{dyke => dike}/runManage/enginerring/components/Drawer.vue (100%) rename src/views/{dyke => dike}/runManage/enginerring/components/GaoDeMap.vue (100%) rename src/views/{dyke => dike}/runManage/enginerring/index.vue (100%) rename src/views/{dyke => dike}/runManage/enginerring/inspectionItems/index.vue (100%) rename src/views/{dyke => dike}/runManage/enginerring/inspectionPlan/index.vue (91%) rename src/views/{dyke => dike}/runManage/enginerring/inspectionRecords/index.vue (100%) rename src/views/{dyke => dike}/runManage/enginerring/patrolRouteSettings/index.vue (100%) rename src/views/{dyke => dike}/runManage/index.vue (100%) rename src/views/{dyke => dike}/runManage/maintenance/index.vue (100%) rename src/views/{dyke => dike}/runManage/maintenance/maintenancePlan/index.vue (97%) rename src/views/{dyke => dike}/runManage/maintenance/maintenanceRecords/index.vue (99%) rename src/views/{dyke => dike}/runManage/pestAnimalControl/governanceRecords/index.vue (99%) rename src/views/{dyke => dike}/runManage/pestAnimalControl/index.vue (100%) rename src/views/{dyke => dike}/runManage/pestAnimalControl/planManagement/index.vue (96%) diff --git a/src/api/management/dyke.js b/src/api/management/dike.js similarity index 100% rename from src/api/management/dyke.js rename to src/api/management/dike.js diff --git a/src/api/management/index.js b/src/api/management/index.js index af57d6a..607a206 100644 --- a/src/api/management/index.js +++ b/src/api/management/index.js @@ -1,4 +1,4 @@ -export * from './dyke' +export * from './dike' export * from './reservoir' export * from './sluice' export { getDicts } from '../system/dict/data' diff --git a/src/api/system/upload.js b/src/api/system/upload.js index d139a66..7821d5a 100644 --- a/src/api/system/upload.js +++ b/src/api/system/upload.js @@ -36,6 +36,7 @@ export function getPercent(data) { data: data }) } + //重置上传进度 前端调用进度之前调用此接口 export function resetPercent(data) { return request({ @@ -110,6 +111,13 @@ export function downloadFileStreamFastDFS(query) { }) } - +// 上传-路径未定义 +export function uploadApi(data){ + return request({ + url:'/', + method: 'post', + data + }) +} diff --git a/src/api/yg/dykeCompare.js b/src/api/yg/dikeCompare.js similarity index 100% rename from src/api/yg/dykeCompare.js rename to src/api/yg/dikeCompare.js diff --git a/src/api/yg/dykeInfo.js b/src/api/yg/dikeInfo.js similarity index 81% rename from src/api/yg/dykeInfo.js rename to src/api/yg/dikeInfo.js index 14cac0c..3cec892 100644 --- a/src/api/yg/dykeInfo.js +++ b/src/api/yg/dikeInfo.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询堤防基本信息列表 export function listDikeInfo(query) { return request({ - url: '/yg/dykeInfo/list', + url: '/yg/dikeInfo/list', method: 'post', data: query }) @@ -12,7 +12,7 @@ export function listDikeInfo(query) { // 查询堤防基本信息详细 export function getDikeInfo(id) { return request({ - url: '/yg/dykeInfo/' + id, + url: '/yg/dikeInfo/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getDikeInfo(id) { // 新增堤防基本信息 export function addDikeInfo(data) { return request({ - url: '/yg/dykeInfo', + url: '/yg/dikeInfo', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addDikeInfo(data) { // 修改堤防基本信息 export function updateDikeInfo(data) { return request({ - url: '/yg/dykeInfo', + url: '/yg/dikeInfo', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateDikeInfo(data) { // 删除堤防基本信息 export function delDikeInfo(id) { return request({ - url: '/yg/dykeInfo/' + id, + url: '/yg/dikeInfo/' + id, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delDikeInfo(id) { // 导出堤防基本信息 export function exportDikeInfo(query) { return request({ - url: '/yg/dykeInfo/export', + url: '/yg/dikeInfo/export', method: 'get', params: query }) diff --git a/src/api/yg/dykeMark.js b/src/api/yg/dikeMark.js similarity index 80% rename from src/api/yg/dykeMark.js rename to src/api/yg/dikeMark.js index 35df206..658f476 100644 --- a/src/api/yg/dykeMark.js +++ b/src/api/yg/dikeMark.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询堤防标识标牌列表 export function listDikeMark(query) { return request({ - url: '/df/dykeMark/list', + url: '/df/dikeMark/list', method: 'post', data: query }) @@ -12,7 +12,7 @@ export function listDikeMark(query) { // 查询堤防标识标牌详细 export function getDikeMark(id) { return request({ - url: '/df/dykeMark/' + id, + url: '/df/dikeMark/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getDikeMark(id) { // 新增堤防标识标牌 export function addDikeMark(data) { return request({ - url: '/df/dykeMark', + url: '/df/dikeMark', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addDikeMark(data) { // 修改堤防标识标牌 export function updateDikeMark(data) { return request({ - url: '/df/dykeMark', + url: '/df/dikeMark', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateDikeMark(data) { // 删除整个水闸标识标牌 export function delDikeMarkAll(embankmentCode) { return request({ - url: '/df/dykeMark/del/' + embankmentCode, + url: '/df/dikeMark/del/' + embankmentCode, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delDikeMarkAll(embankmentCode) { // 删除堤防标识标牌 export function delDikeMark(id) { return request({ - url: '/df/dykeMark/' + id, + url: '/df/dikeMark/' + id, method: 'delete' }) } @@ -54,7 +54,7 @@ export function delDikeMark(id) { // 导出堤防标识标牌 export function exportDikeMark(query) { return request({ - url: '/df/dykeMark/export', + url: '/df/dikeMark/export', method: 'get', params: query }) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index fc92a1f..f0096ac 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -143,6 +143,8 @@ aside { //main-container全局样式 .app-container { padding: 20px; + height: 100%; + overflow: auto; // background-color: #eef3ff; background-color: #f4f9f7; // min-height: calc(100vh - 56px); diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 1b4b7b6..d71f8c5 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -15,7 +15,7 @@
{{ item.label }}
+
堤防运行管理
-->
@@ -788,7 +788,7 @@ import { addDikeInfo, updateDikeInfo, exportDikeInfo, -} from "@/api/yg/dykeInfo"; +} from "@/api/yg/dikeInfo"; import { getAreasData } from "@/api/areas/index"; import { regionData, codeToText, TextToCode } from "element-china-area-data"; @@ -814,7 +814,7 @@ export default { // 总条数 total: 0, // 堤防基本信息表格数据 - dykeInfoList: [], + dikeInfoList: [], // 弹出层标题 title: "", // 是否显示弹出层 @@ -867,7 +867,7 @@ export default { // 面包屑，路由信息 routeList: [ { - path: "/dyke/engineeringCondition/dykeBaseInfo", + path: "/dike/engineeringCondition/dikeBaseInfo", routeName: "堤防基本信息列表", }, ], @@ -964,7 +964,7 @@ export default { getList() { this.loading = true; listDikeInfo(this.queryParams).then((response) => { - this.dykeInfoList = response.records; + this.dikeInfoList = response.records; this.total = response.total; this.loading = false; }); @@ -1158,7 +1158,7 @@ export default { this.reset(); const id = row.id || this.ids; this.routeList.push({ - path: "/dyke/engineeringCondition/dykeBaseInfo/options", + path: "/dike/engineeringCondition/dikeBaseInfo/options", routeName: "堤防基本信息", isEdit: true, }); @@ -1168,7 +1168,7 @@ export default { // 跳转到选项卡页面 this.$router.push({ path: - "/dyke/engineeringCondition/dykeBaseInfo/options?baseDataId=" + id, + "/dike/engineeringCondition/dikeBaseInfo/options?baseDataId=" + id, }); }, /** 提交按钮 */ diff --git a/src/views/dyke/engineeringCondition/dykeBaseInfo/options/basePage.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue similarity index 99% rename from src/views/dyke/engineeringCondition/dykeBaseInfo/options/basePage.vue rename to src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue index 2f5bc7e..ac2d3fc 100644 --- a/src/views/dyke/engineeringCondition/dykeBaseInfo/options/basePage.vue +++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/basePage.vue @@ -388,12 +388,12 @@ import { addDikeInfo, updateDikeInfo, exportDikeInfo, -} from "@/api/yg/dykeInfo"; +} from "@/api/yg/dikeInfo"; import { getAreasData } from "@/api/areas/index"; import { regionData, codeToText, TextToCode } from "element-china-area-data"; export default { - name: "dykeInfo", + name: "dikeInfo", data() { return { areasOptionProps: { diff --git a/src/views/dyke/engineeringCondition/dykeBaseInfo/options/index.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue similarity index 97% rename from src/views/dyke/engineeringCondition/dykeBaseInfo/options/index.vue rename to src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue index 852f232..66e9047 100644 --- a/src/views/dyke/engineeringCondition/dykeBaseInfo/options/index.vue +++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue @@ -67,7 +67,7 @@ export default { goCompare() { this.$router.push({ path: - "/dyke/engineeringCondition/dykeCompare?embankmentCode=" + + "/dike/engineeringCondition/dikeCompare?embankmentCode=" + this.$refs.basePage.copyForm.embankmentCode, }); }, diff --git a/src/views/dyke/engineeringCondition/dykeBaseInfo/options/projectManagement.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/projectManagement.vue similarity index 100% rename from src/views/dyke/engineeringCondition/dykeBaseInfo/options/projectManagement.vue rename to src/views/dike/engineeringCondition/dikeBaseInfo/options/projectManagement.vue diff --git a/src/views/dyke/engineeringCondition/dykeCompare/components/basePage.vue b/src/views/dike/engineeringCondition/dikeCompare/components/basePage.vue similarity index 99% rename from src/views/dyke/engineeringCondition/dykeCompare/components/basePage.vue rename to src/views/dike/engineeringCondition/dikeCompare/components/basePage.vue index 43ea674..a1f633d 100644 --- a/src/views/dyke/engineeringCondition/dykeCompare/components/basePage.vue +++ b/src/views/dike/engineeringCondition/dikeCompare/components/basePage.vue @@ -190,7 +190,7 @@