diff --git a/src/api/yg/dike/aqjdxx.js b/src/api/yg/dike/aqjdxx.js new file mode 100644 index 0000000..179b862 --- /dev/null +++ b/src/api/yg/dike/aqjdxx.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询水闸安全鉴定信息列表 +export function listAqjdxx(query) { + return request({ + url: '/df/aqjdxx/list', + method: 'post', + data: query + }) +} + +// 查询水闸安全鉴定信息详细 +export function getAqjdxx(id) { + return request({ + url: '/df/aqjdxx/' + id, + method: 'get' + }) +} + +// 新增水闸安全鉴定信息 +export function addAqjdxx(data) { + return request({ + url: '/df/aqjdxx', + method: 'post', + data: data + }) +} + +// 修改水闸安全鉴定信息 +export function updateAqjdxx(data) { + return request({ + url: '/df/aqjdxx', + method: 'put', + data: data + }) +} + +// 删除水闸安全鉴定信息 +export function delAqjdxx(id) { + return request({ + url: '/df/aqjdxx/' + id, + method: 'delete' + }) +} + +// 导出水闸安全鉴定信息 +export function exportAqjdxx(query) { + return request({ + url: '/df/aqjdxx/export', + method: 'get', + params: query + }) +} diff --git a/src/api/yg/dike/gcxy.js b/src/api/yg/dike/gcxy.js new file mode 100644 index 0000000..162bb9f --- /dev/null +++ b/src/api/yg/dike/gcxy.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询工程效益列表 +export function listGcxy(query) { + return request({ + url: '/df/gcxy/list', + method: 'post', + data: query + }) +} + +// 查询工程效益详细 +export function getGcxy(id) { + return request({ + url: '/df/gcxy/' + id, + method: 'get' + }) +} + +// 新增工程效益 +export function addGcxy(data) { + return request({ + url: '/df/gcxy', + method: 'post', + data: data + }) +} + +// 修改工程效益 +export function updateGcxy(data) { + return request({ + url: '/df/gcxy', + method: 'put', + data: data + }) +} + +// 删除工程效益 +export function delGcxy(id) { + return request({ + url: '/df/gcxy/' + id, + method: 'delete' + }) +} + +// 导出工程效益 +export function exportGcxy(query) { + return request({ + url: '/df/gcxy/export', + method: 'get', + params: query + }) +} diff --git a/src/api/yg/dike/swtz.js b/src/api/yg/dike/swtz.js new file mode 100644 index 0000000..b58a67f --- /dev/null +++ b/src/api/yg/dike/swtz.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询水文特征列表 +export function listSwtz(query) { + return request({ + url: '/df/swtz/list', + method: 'post', + data: query + }) +} + +// 查询水文特征详细 +export function getSwtz(id) { + return request({ + url: '/df/swtz/' + id, + method: 'get' + }) +} + +// 新增水文特征 +export function addSwtz(data) { + return request({ + url: '/df/swtz', + method: 'post', + data: data + }) +} + +// 修改水文特征 +export function updateSwtz(data) { + return request({ + url: '/df/swtz', + method: 'put', + data: data + }) +} + +// 删除水文特征 +export function delSwtz(id) { + return request({ + url: '/df/swtz/' + id, + method: 'delete' + }) +} + +// 导出水文特征 +export function exportSwtz(query) { + return request({ + url: '/df/swtz/export', + method: 'get', + params: query + }) +} diff --git a/src/views/dike/safetyManage/confirmDelimitationManage/index.vue b/src/views/dike/safetyManage/confirmDelimitationManage/index.vue index cd6950c..db04455 100644 --- a/src/views/dike/safetyManage/confirmDelimitationManage/index.vue +++ b/src/views/dike/safetyManage/confirmDelimitationManage/index.vue @@ -77,7 +77,7 @@ v-hasPermi="['yg:qqhj:view']" >查看 - --> + 确权划界 - + + + - - + --> + { this.formData = response.data; - // console.log("this.formData", this.formData); + console.log("this.formData", this.formData); }); }, // 切换标签页 diff --git a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/managementSystemFxzz.vue b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/managementSystemFxzz.vue index 8c9df6f..54090e3 100644 --- a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/managementSystemFxzz.vue +++ b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/managementSystemFxzz.vue @@ -217,7 +217,7 @@ import { addFxzz, updateFxzz, exportFxzz, -} from "@/api/yg/fxzz"; +} from "@/api/yg/dike/fxzz"; import { listFxzzcy, getFxzzcy, @@ -226,7 +226,7 @@ import { updateFxzzcy, updataAllFxzzcy, exportFxzzcy, -} from "@/api/yg/fxzzcy"; +} from "@/api/yg/dike/fxzzcy"; import { getAreasData } from "@/api/areas/index"; import msFxzzMember from "./msFxzzMember.vue"; @@ -371,7 +371,7 @@ export default { /** 查询防汛组织列表 */ getList() { this.loading = true; - this.queryParams.data.wagaId = this.$route.query.baseDataId; + this.queryParams.data.dikeId = this.$route.query.baseDataId; listFxzz(this.queryParams).then((response) => { this.fxzzList = response.records; this.total = response.total; @@ -519,7 +519,7 @@ export default { if (this.delIdList.length > 0) delFxzzcy(this.delIdList); } else { this.form.cy = C0; - this.form.wagaId = this.$route.query.baseDataId; + this.form.dikeId = this.$route.query.baseDataId; addFxzz(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("新增成功"); diff --git a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/managementSystemFzr.vue b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/managementSystemFzr.vue index 9cdac69..6d0b0d1 100644 --- a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/managementSystemFzr.vue +++ b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/managementSystemFzr.vue @@ -182,7 +182,7 @@ import { addFzr, updateFzr, exportFzr, -} from "@/api/yg/fzr"; +} from "@/api/yg/dike/fzr"; export default { name: "Fzr", @@ -283,7 +283,7 @@ export default { /** 查询水闸负责人列表 */ getList() { this.loading = true; - this.queryParams.data.wagaId = this.$route.query.baseDataId; + this.queryParams.data.dikeId = this.$route.query.baseDataId; listFzr(this.queryParams).then((response) => { this.fzrList = response.records; this.total = response.total; @@ -412,7 +412,7 @@ export default { } }); } else { - this.form.wagaId = this.$route.query.baseDataId; + this.form.dikeId = this.$route.query.baseDataId; addFzr(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("新增成功"); diff --git a/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/basePage.vue b/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/basePage.vue index 6eeb142..d8121c7 100644 --- a/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/basePage.vue +++ b/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/basePage.vue @@ -12,20 +12,20 @@ :contentStyle="{ minWidth: '350px' }" > - - {{ this.form.wagaName }} + + {{ this.form.dikeName }} - - {{ this.form.wagaCode }} + + {{ this.form.dikeCode }} - + {{ sluiceTypeFormat(this.form) }} - - {{ this.form.wagaUse }} + + {{ this.form.dikeUse }} @@ -36,24 +36,24 @@ {{ projectScaleFormat(this.form) }} - - {{ this.form.wagaLoc }} + + {{ this.form.dikeLoc }} - {{ this.form.wagaStartLong }} + {{ this.form.dikeStartLong }} - {{ this.form.wagaStartLat }} + {{ this.form.dikeStartLat }} - {{ this.form.wagaEndLong }} + {{ this.form.dikeEndLong }} - {{ this.form.wagaEndLat }} + {{ this.form.dikeEndLat }} @@ -105,7 +105,7 @@ {{ this.form.levelDatum }} - + {{ this.form.sluiceOverview }} @@ -133,7 +133,7 @@ import { addJbxx, updateJbxx, exportJbxx, -} from "@/api/yg/jbxx"; +} from "@/api/yg/dike/jbxx"; import { getAreasData } from "@/api/areas/index"; import { regionData, codeToText, TextToCode } from "element-china-area-data"; @@ -158,7 +158,7 @@ export default { showSearch: true, // 总条数 total: 0, - // 水闸安全管理基本信息表格数据 + // 堤防安全管理基本信息表格数据 jbxxList: [], // 弹出层标题 title: "", @@ -166,7 +166,7 @@ export default { open: false, // 工程规模字典 projectScaleOptions: [], - // 水闸类型字典 + // 堤防类型字典 sluiceTypeOptions: [], // 工程等别字典 engineerLevelOptions: [], @@ -188,16 +188,16 @@ export default { pageSize: 10, ids: null, data: { - wagaName: null, - wagaCode: null, + dikeName: null, + dikeCode: null, engScal: null, - wagaStartLong: null, - wagaStartLat: null, - wagaEndLong: null, - wagaEndLat: null, - wagaLoc: null, - wagaType: null, - wagaUse: null, + dikeStartLong: null, + dikeStartLat: null, + dikeEndLong: null, + dikeEndLat: null, + dikeLoc: null, + dikeType: null, + dikeUse: null, engGrad: null, mainBuildGrad: null, desLockDisc: null, @@ -231,13 +231,13 @@ export default { form: {}, // 表单校验 rules: { - wagaName: [ - { required: true, message: "水闸名称不能为空", trigger: "blur" }, + dikeName: [ + { required: true, message: "堤防名称不能为空", trigger: "blur" }, ], - wagaCode: [ - { required: true, message: "水闸编码不能为空", trigger: "blur" }, + dikeCode: [ + { required: true, message: "堤防编码不能为空", trigger: "blur" }, ], - wagaStartLong: [ + dikeStartLong: [ { pattern: /^(\-|\+)?(((\d|[1-9]\d|1[0-7]\d|0{1,3})\.\d{1,15})|(\d|[1-9]\d|1[0-7]\d|0{1,3})|180\.0{1,15}|180)$/, @@ -245,7 +245,7 @@ export default { trigger: "blur", }, ], - wagaEndLong: [ + dikeEndLong: [ { pattern: /^(\-|\+)?(((\d|[1-9]\d|1[0-7]\d|0{1,3})\.\d{1,15})|(\d|[1-9]\d|1[0-7]\d|0{1,3})|180\.0{1,15}|180)$/, @@ -253,7 +253,7 @@ export default { trigger: "blur", }, ], - wagaStartLat: [ + dikeStartLat: [ { pattern: /^(\-|\+)?([0-8]?\d{1}\.\d{1,15}|90\.0{1,15}|[0-8]?\d{1}|90)$/, @@ -261,7 +261,7 @@ export default { trigger: "blur", }, ], - wagaEndLat: [ + dikeEndLat: [ { pattern: /^(\-|\+)?([0-8]?\d{1}\.\d{1,15}|90\.0{1,15}|[0-8]?\d{1}|90)$/, @@ -336,7 +336,7 @@ export default { // return res; }); }, - /** 查询水闸安全管理基本信息列表 */ + /** 查询堤防安全管理基本信息列表 */ getList() { this.loading = true; const id = this.$route.query.baseDataId; @@ -352,9 +352,9 @@ export default { projectScaleFormat(row, column) { return this.selectDictLabel(this.projectScaleOptions, row.engScal); }, - // 水闸类型字典翻译 + // 堤防类型字典翻译 sluiceTypeFormat(row, column) { - return this.selectDictLabel(this.sluiceTypeOptions, row.wagaType); + return this.selectDictLabel(this.sluiceTypeOptions, row.dikeType); }, // 工程等别字典翻译 engineerLevelFormat(row, column) { @@ -410,16 +410,16 @@ export default { reset() { this.form = { id: null, - wagaName: null, - wagaCode: null, + dikeName: null, + dikeCode: null, engScal: null, - wagaStartLong: null, - wagaStartLat: null, - wagaEndLong: null, - wagaEndLat: null, - wagaLoc: null, - wagaType: null, - wagaUse: null, + dikeStartLong: null, + dikeStartLat: null, + dikeEndLong: null, + dikeEndLat: null, + dikeLoc: null, + dikeType: null, + dikeUse: null, engGrad: null, mainBuildGrad: null, desLockDisc: null, diff --git a/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/index.vue b/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/index.vue index dbac624..1dc693e 100644 --- a/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/index.vue +++ b/src/views/dike/safetyManage/declarationManage/examine/components/listPage/options/index.vue @@ -71,22 +71,25 @@ > - - - --> + + + - - + --> + res.id == id); if (data) return data.dikeName; @@ -560,6 +560,7 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); + this.isResolve = false; this.open = true; this.title = "添加堤防隐患信息"; }, diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue index d0fa2db..4412bf5 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue @@ -252,7 +252,7 @@ import { addAqjdxx, updateAqjdxx, exportAqjdxx, -} from "@/api/yg/aqjdxx"; +} from "@/api/yg/dike/aqjdxx"; import { getToken } from "@/utils/auth"; import { getFileStream } from "@/api/system/upload"; diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue index 9744979..61eff78 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue @@ -143,7 +143,7 @@ import { addAqjdxx, updateAqjdxx, exportAqjdxx, -} from "@/api/yg/aqjdxx"; +} from "@/api/yg/dike/aqjdxx"; import { getToken } from "@/utils/auth"; import { getFileStream } from "@/api/system/upload"; diff --git a/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue b/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue index 3ed912e..a95ee70 100644 --- a/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue +++ b/src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue @@ -25,19 +25,19 @@ min-width="120" /> { this.taskStatusOptions = response.data; - console.log(856464, this.taskStatusOptions); }); }, methods: {