diff --git a/src/api/yg/criteria.js b/src/api/yg/criteria.js new file mode 100644 index 0000000..15aa878 --- /dev/null +++ b/src/api/yg/criteria.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询奖惩管理列表 +export function listCriteria(query) { + return request({ + url: '/system/criteria/list', + method: 'post', + data: query + }) +} + +// 查询奖惩管理详细 +export function getCriteria(id) { + return request({ + url: '/system/criteria/' + id, + method: 'get' + }) +} + +// 新增奖惩管理 +export function addCriteria(data) { + return request({ + url: '/system/criteria', + method: 'post', + data: data + }) +} + +// 修改奖惩管理 +export function updateCriteria(data) { + return request({ + url: '/system/criteria', + method: 'put', + data: data + }) +} + +// 删除奖惩管理 +export function delCriteria(id) { + return request({ + url: '/system/criteria/' + id, + method: 'delete' + }) +} + +// 导出奖惩管理 +export function exportCriteria(query) { + return request({ + url: '/system/criteria/export', + method: 'get', + params: query + }) +} diff --git a/src/api/yg/dike/dfbydy.js b/src/api/yg/dike/dfbydy.js new file mode 100644 index 0000000..b5a43eb --- /dev/null +++ b/src/api/yg/dike/dfbydy.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询水闸备用电源信息列表 +export function listBydy(query) { + return request({ + url: '/df/bydy/list', + method: 'post', + data: query + }) +} + +// 查询水闸备用电源信息详细 +export function getBydy(id) { + return request({ + url: '/df/bydy/' + id, + method: 'get' + }) +} + +// 新增水闸备用电源信息 +export function addBydy(data) { + return request({ + url: '/df/bydy', + method: 'post', + data: data + }) +} + +// 修改水闸备用电源信息 +export function updateBydy(data) { + return request({ + url: '/df/bydy', + method: 'put', + data: data + }) +} + +// 删除水闸备用电源信息 +export function delBydy(id) { + return request({ + url: '/df/bydy/' + id, + method: 'delete' + }) +} + +// 导出水闸备用电源信息 +export function exportBydy(query) { + return request({ + url: '/df/bydy/export', + method: 'get', + params: query + }) +} diff --git a/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue b/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue index f5cb0b1..2835874 100644 --- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue +++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue @@ -212,174 +212,174 @@ prop="intrCh" min-width="120" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + min-width="120"` + />--> - 广东省司价标准
+ 广东省评价标准
(一: 900分以上，前四类85%:二: 800分以上,前四类75%: 三: 700分以上,前四65%:不达标 700分以下，前四类65%) @@ -667,12 +667,12 @@ width="600px" center :close-on-click-modal="false" - :close-on-press-escape="false" + @close="handleClose" >
-
广东省司价标准
+
广东省评价标准
(一: 900 分以上, 前四类 85%; 二: 800 分以上,前四类 75%; 三: 700 分以上,前四类 65%; 不达标 700 分以下, 前四类 65%) @@ -690,7 +690,7 @@
奖励机制
@@ -698,7 +698,7 @@
惩处措施
@@ -708,7 +708,7 @@ @@ -726,6 +726,7 @@ import { updateBzhjs, exportBzhjs, } from "@/api/yg/dike/bzhjs"; +import {listCriteria,addCriteria,updateCriteria} from "@/api/yg/criteria" import { listJbxx } from "@/api/yg/dike/jbxx"; import { getToken } from "@/utils/auth"; import { getFileStream } from "@/api/system/upload"; @@ -752,7 +753,9 @@ export default { total: 0, // 堤防标准化建设表格数据 bzhjsList: [], - jlForm:{}, + jlForm:{ + type: '2', + }, // 弹出层标题 title: "", // 是否显示弹出层 @@ -784,6 +787,13 @@ export default { sortBy: "desc", }, }, + criteriaQueryParams:{ + pageNum: 1, + pageSize: 10, + data: { + type: '2', + } + }, // 表单参数 form: { // status: "0", //新增 @@ -833,6 +843,36 @@ export default { }); }, methods: { + handleQueryCriteria(){ + listCriteria(this.criteriaQueryParams).then(res =>{ + if (res.records.length){ + this.jlForm = res.records[0]; + } + }) + }, + handleSubmit(){ + if (this.jlForm.id != null){ + updateCriteria(this.jlForm).then(res =>{ + if (res.code === 200) { + this.msgSuccess("修改成功"); + this.dialogVisible = false; + } + }) + }else { + addCriteria(this.jlForm).then(res =>{ + if (res.code === 200) { + this.msgSuccess("新增成功"); + this.dialogVisible = false; + } + }) + } + }, + + handleClose(){ + this.dialogVisible = false; + this.jlForm = {}; + }, + getScore(row){ if (row.score) { const evalForm = JSON.parse(row.score); @@ -857,7 +897,7 @@ export default { return '一级' }, handleIncentive(){ - console.log(111) + this.handleQueryCriteria(); this.dialogVisible = true; }, @@ -1053,7 +1093,7 @@ export default { if (this.form.score) { this.evalForm = JSON.parse(this.form.score); const value = Object.values(this.evalForm.score); - this.sum=this.sum-value.reduce((a, b) => { + this.sum=1050-value.reduce((a, b) => { // 确保每个值都是数字 return a + Number(b); }, 0); diff --git a/src/views/dike/managementTeamManagement/index.vue b/src/views/dike/managementTeamManagement/index.vue index 2afab00..fad5fa7 100644 --- a/src/views/dike/managementTeamManagement/index.vue +++ b/src/views/dike/managementTeamManagement/index.vue @@ -10,8 +10,8 @@ @keyup.enter.native="handleQuery" /> - - + + - - + + { - if (response.records[0]) { - this.form = response.records[0]; + if (response.records) { + this.form = response.records; } }); }, diff --git a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/index.vue b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/index.vue index fe1e3d4..1c2f0ec 100644 --- a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/index.vue +++ b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/index.vue @@ -81,7 +81,7 @@ :disabled="!routeList[1].isEdit" :lazy="true" > - +