Browse Source

Merge branch 'master' into release-sy-v1.0.0

release-sy-v1.0.0
panyuyi 2 weeks ago
parent
commit
20ab7b2054
  1. 53
      src/api/yg/criteria.js
  2. 53
      src/api/yg/dike/dfbydy.js
  3. 336
      src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue
  4. 12
      src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue
  5. 6
      src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue
  6. 10
      src/views/dike/managementGuarantee/fundGuarantee/index.vue
  7. 58
      src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue
  8. 8
      src/views/dike/managementTeamManagement/index.vue
  9. 4
      src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/historyOverflowsRecords.vue
  10. 2
      src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/index.vue
  11. 9
      src/views/dike/safetyManage/floodControlManagement/components/powerList.vue
  12. 2
      src/views/dike/safetyManage/floodControlManagement/components/powerRecords.vue
  13. 6
      src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue
  14. 4
      src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue
  15. 10
      src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
  16. 6
      src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue
  17. 11
      src/views/dike/safetyManage/safetyAppraisal/list.vue
  18. 23
      src/views/sluice/engineeringCondition/sluiceBaseInfo/options/accidentRecord.vue
  19. 3
      src/views/sluice/engineeringCondition/sluiceBaseInfo/options/dischargeCapacity2.vue
  20. 55
      src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue
  21. 4
      src/views/sluice/engineeringCondition/sluiceBaseInfo/options/index.vue
  22. 4
      src/views/sluice/managementGuarantee/fundGuarantee/index.vue
  23. 60
      src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue
  24. 4
      src/views/sluice/managementTeamManagement/index.vue
  25. 10
      src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
  26. 4
      src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue
  27. 9
      src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
  28. 6
      src/views/sluice/safetyManage/safetyAppraisal/components/statisticsThree.vue
  29. 12
      src/views/sluice/safetyManage/safetyAppraisal/list.vue
  30. 2
      vue.config.js

53
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
})
}

53
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
})
}

336
src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue

@ -212,174 +212,174 @@
prop="intrCh" prop="intrCh"
min-width="120" min-width="120"
/> />
<el-table-column <!-- <el-table-column-->
label="至起始断面距离" <!-- label="至起始断面距离"-->
align="center" <!-- align="center"-->
prop="tointrDs" <!-- prop="tointrDs"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="起测点位置" <!-- label="起测点位置"-->
align="center" <!-- align="center"-->
prop="jmsrpnPl" <!-- prop="jmsrpnPl"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="起测点高程" <!-- label="起测点高程"-->
align="center" <!-- align="center"-->
prop="jmsrpneLev" <!-- prop="jmsrpneLev"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="堤身土质" <!-- label="堤身土质"-->
align="center" <!-- align="center"-->
prop="bnbdSlch" <!-- prop="bnbdSlch"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="堤身防渗形式" <!-- label="堤身防渗形式"-->
align="center" <!-- align="center"-->
prop="bnbdAntp" <!-- prop="bnbdAntp"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="堤基地质" <!-- label="堤基地质"-->
align="center" <!-- align="center"-->
prop="bnbsGl" <!-- prop="bnbsGl"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="堤基防渗形式" <!-- label="堤基防渗形式"-->
align="center" <!-- align="center"-->
prop="bnbsAntp" <!-- prop="bnbsAntp"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="堤身净高度" <!-- label="堤身净高度"-->
align="center" <!-- align="center"-->
prop="bnbdHigh" <!-- prop="bnbdHigh"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="堤顶高程" <!-- label="堤顶高程"-->
align="center" <!-- align="center"-->
prop="bntpeLev" <!-- prop="bntpeLev"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="堤顶超高" <!-- label="堤顶超高"-->
align="center" <!-- align="center"-->
prop="bntpFr" <!-- prop="bntpFr"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="堤顶宽度" <!-- label="堤顶宽度"-->
align="center" <!-- align="center"-->
prop="bntpWd" <!-- prop="bntpWd"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="迎河面堤脚高程" <!-- label="迎河面堤脚高程"-->
align="center" <!-- align="center"-->
prop="upbnToel" <!-- prop="upbnToel"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="背河面堤脚高程" <!-- label="背河面堤脚高程"-->
align="center" <!-- align="center"-->
prop="dwbnToel" <!-- prop="dwbnToel"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="迎河坡坡比" <!-- label="迎河坡坡比"-->
align="center" <!-- align="center"-->
prop="upslSlrt" <!-- prop="upslSlrt"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="背河坡坡比" <!-- label="背河坡坡比"-->
align="center" <!-- align="center"-->
prop="dwslSlrt" <!-- prop="dwslSlrt"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="迎河坡坡比" <!-- label="迎河坡坡比"-->
align="center" <!-- align="center"-->
prop="upslSlrt" <!-- prop="upslSlrt"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="迎河坡护坡情况" <!-- label="迎河坡护坡情况"-->
align="center" <!-- align="center"-->
prop="uspsIn" <!-- prop="uspsIn"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="背河坡护坡情况" <!-- label="背河坡护坡情况"-->
align="center" <!-- align="center"-->
prop="dspsIn" <!-- prop="dspsIn"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="迎河面滩地宽度" <!-- label="迎河面滩地宽度"-->
align="center" <!-- align="center"-->
prop="upbtWide" <!-- prop="upbtWide"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="迎河面滩地宽度" <!-- label="迎河面滩地宽度"-->
align="center" <!-- align="center"-->
prop="upbtWide" <!-- prop="upbtWide"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="迎河面平台(前戗)顶高程" <!-- label="迎河面平台(前戗)顶高程"-->
align="center" <!-- align="center"-->
prop="ufrteLev" <!-- prop="ufrteLev"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="迎河面平台(前戗)顶宽" <!-- label="迎河面平台(前戗)顶宽"-->
align="center" <!-- align="center"-->
prop="ufrtWide" <!-- prop="ufrtWide"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="迎河面平台(前戗)坡度" <!-- label="迎河面平台(前戗)坡度"-->
align="center" <!-- align="center"-->
prop="upflRfsl" <!-- prop="upflRfsl"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="背河面平台(后戗)顶高程" <!-- label="背河面平台(后戗)顶高程"-->
align="center" <!-- align="center"-->
prop="dfrtEl" <!-- prop="dfrtEl"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="背河面平台(后戗)顶高程" <!-- label="背河面平台(后戗)顶高程"-->
align="center" <!-- align="center"-->
prop="dfrtEl" <!-- prop="dfrtEl"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="背河面平台(后戗)顶宽" <!-- label="背河面平台(后戗)顶宽"-->
align="center" <!-- align="center"-->
prop="dfrtWide" <!-- prop="dfrtWide"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="背河面平台(后戗)坡度" <!-- label="背河面平台(后戗)坡度"-->
align="center" <!-- align="center"-->
prop="dwflRfsl" <!-- prop="dwflRfsl"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
label="备注" <!-- label="备注"-->
align="center" <!-- align="center"-->
prop="note" <!-- prop="note"-->
min-width="120" <!-- min-width="120"-->
/> <!-- />-->
<!-- <el-table-column <!-- <el-table-column
label="责任人类型" label="责任人类型"
align="center" align="center"

12
src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue

@ -122,7 +122,11 @@
align="center" align="center"
prop="dikeName" prop="dikeName"
min-width="120" min-width="120"
/> >
<template>
{{ this.formData.dikeName}}
</template>
</el-table-column>
<el-table-column <el-table-column
label="记录更新时间" label="记录更新时间"
align="center" align="center"
@ -210,7 +214,7 @@ import {
export default { export default {
name: "Jyjl", name: "Jyjl",
props: ["dikeCode"], props: ["dikeCode","formData"],
data() { data() {
return { return {
// //
@ -281,11 +285,13 @@ export default {
}, },
/** 查询决溢记录列表 */ /** 查询决溢记录列表 */
getList() { getList() {
this.loading=true
this.queryParams.data.dikeCode = this.dikeCode; this.queryParams.data.dikeCode = this.dikeCode;
listJyjl(this.queryParams).then((response) => { listJyjl(this.queryParams).then((response) => {
if (response.records[0]) { if (response.records[0]) {
this.form = response.records[0]; this.form = response.records[0];
this.tableData=response.record; this.tableData=response.records;
console.log(this.tableData)
this.loading=false this.loading=false
} }
}); });

6
src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue

@ -73,7 +73,11 @@
:disabled="!routeList[1].isEdit" :disabled="!routeList[1].isEdit"
:lazy="true" :lazy="true"
> >
<historyOverflowsRecords :dikeCode="this.formData.dikeCode" /> <historyOverflowsRecords
v-if="activeName === 'historyOverflowsRecords'"
:dikeCode="this.formData.dikeCode"
:form-data="formData"
/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane
label="主要效益指标" label="主要效益指标"

10
src/views/dike/managementGuarantee/fundGuarantee/index.vue

@ -34,7 +34,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="堤防主管部门" prop="unit"> <!-- <el-form-item label="堤防主管部门" prop="unit">
<el-input <el-input
v-model="queryParams.data.unit" v-model="queryParams.data.unit"
placeholder="请输入堤防主管部门" placeholder="请输入堤防主管部门"
@ -50,7 +50,7 @@
@click="handleQuery" @click="handleQuery"
></el-button> ></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>-->
<!-- <!--
<el-form-item label="单位名称" prop="unitName"> <el-form-item label="单位名称" prop="unitName">
<el-input <el-input
@ -193,12 +193,12 @@
:formatter="projectScaleFormat" :formatter="projectScaleFormat"
min-width="120" min-width="120"
/> --> /> -->
<el-table-column <!-- <el-table-column
label="堤防主管部门" label="堤防主管部门"
align="center" align="center"
prop="unit" prop="unit"
min-width="120" min-width="120"`
/> />-->
<el-table-column <el-table-column
label="所在行政区划" label="所在行政区划"
align="center" align="center"

58
src/views/dike/managementGuarantee/standardizationConstruction/listPage/index.vue

@ -309,7 +309,7 @@
style="width: 400px" style="width: 400px"
> >
<span> <span>
广东省价标准<br /> 广东省价标准<br />
(: 900分以上前四类85%:: 800分以上,前四类75%: : (: 900分以上前四类85%:: 800分以上,前四类75%: :
700分以上,前四65%:不达标 700分以下前四类65%) 700分以上,前四65%:不达标 700分以下前四类65%)
</span> </span>
@ -667,12 +667,12 @@
width="600px" width="600px"
center center
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" @close="handleClose"
> >
<div class="score-dialog-content"> <div class="score-dialog-content">
<!-- 广东省司价标准 --> <!-- 广东省司价标准 -->
<div class="score-table"> <div class="score-table">
<div class="score-header">广东省价标准</div> <div class="score-header">广东省价标准</div>
<div class="score-content"> <div class="score-content">
(: 900 分以上, 前四类 85%; : 800 分以上,前四类 75%; : 700 分以上,前四类 65%; (: 900 分以上, 前四类 85%; : 800 分以上,前四类 75%; : 700 分以上,前四类 65%;
不达标 700 分以下, 前四类 65%) 不达标 700 分以下, 前四类 65%)
@ -690,7 +690,7 @@
<div class="grid-header">奖励机制</div> <div class="grid-header">奖励机制</div>
<div class="grid-content"> <div class="grid-content">
<el-input <el-input
v-model="jlForm.jljz" placeholder="请输入奖励机制" v-model="jlForm.rewardSystem" placeholder="请输入奖励机制"
> >
</el-input> </el-input>
@ -698,7 +698,7 @@
<div class="grid-header">惩处措施</div> <div class="grid-header">惩处措施</div>
<div class="grid-content"> <div class="grid-content">
<el-input <el-input
v-model="jlForm.cccs" placeholder="请输入惩处措施" v-model="jlForm.punishmentMeasures" placeholder="请输入惩处措施"
> >
</el-input> </el-input>
@ -708,7 +708,7 @@
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" class="submit-btn" @click="dialogVisible = false">提交</el-button> <el-button type="primary" class="submit-btn" @click="handleSubmit">提交</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@ -726,6 +726,7 @@ import {
updateBzhjs, updateBzhjs,
exportBzhjs, exportBzhjs,
} from "@/api/yg/dike/bzhjs"; } from "@/api/yg/dike/bzhjs";
import {listCriteria,addCriteria,updateCriteria} from "@/api/yg/criteria"
import { listJbxx } from "@/api/yg/dike/jbxx"; import { listJbxx } from "@/api/yg/dike/jbxx";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload"; import { getFileStream } from "@/api/system/upload";
@ -752,7 +753,9 @@ export default {
total: 0, total: 0,
// //
bzhjsList: [], bzhjsList: [],
jlForm:{}, jlForm:{
type: '2',
},
// //
title: "", title: "",
// //
@ -784,6 +787,13 @@ export default {
sortBy: "desc", sortBy: "desc",
}, },
}, },
criteriaQueryParams:{
pageNum: 1,
pageSize: 10,
data: {
type: '2',
}
},
// //
form: { form: {
// status: "0", // // status: "0", //
@ -833,6 +843,36 @@ export default {
}); });
}, },
methods: { 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){ getScore(row){
if (row.score) { if (row.score) {
const evalForm = JSON.parse(row.score); const evalForm = JSON.parse(row.score);
@ -857,7 +897,7 @@ export default {
return '一级' return '一级'
}, },
handleIncentive(){ handleIncentive(){
console.log(111) this.handleQueryCriteria();
this.dialogVisible = true; this.dialogVisible = true;
}, },
@ -1053,7 +1093,7 @@ export default {
if (this.form.score) { if (this.form.score) {
this.evalForm = JSON.parse(this.form.score); this.evalForm = JSON.parse(this.form.score);
const value = Object.values(this.evalForm.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); return a + Number(b);
}, 0); }, 0);

8
src/views/dike/managementTeamManagement/index.vue

@ -10,8 +10,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="人员类型" prop="personType"> <el-form-item label="单位类型" prop="personType">
<el-select v-model="queryParams.data.personType" placeholder="请选择人员类型" clearable size="small"> <el-select v-model="queryParams.data.personType" placeholder="请选择单位类型" clearable size="small">
<el-option <el-option
v-for="dict in personTypeOptions" v-for="dict in personTypeOptions"
:key="dict.dictValue" :key="dict.dictValue"
@ -136,8 +136,8 @@
<el-form-item label="人员名称" prop="personName"> <el-form-item label="人员名称" prop="personName">
<el-input v-model="form.personName" placeholder="请输入人员名称" /> <el-input v-model="form.personName" placeholder="请输入人员名称" />
</el-form-item> </el-form-item>
<el-form-item label="人员类型" prop="personType"> <el-form-item label="单位类型" prop="personType">
<el-select v-model="form.personType" placeholder="请选择人员类型" style="width:100%"> <el-select v-model="form.personType" placeholder="请选择单位类型" style="width:100%">
<el-option <el-option
v-for="dict in personTypeOptions" v-for="dict in personTypeOptions"
:key="dict.dictValue" :key="dict.dictValue"

4
src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/historyOverflowsRecords.vue

@ -140,8 +140,8 @@ export default {
getList() { getList() {
this.queryParams.data.dikeCode = this.dikeCode; this.queryParams.data.dikeCode = this.dikeCode;
listJyjl(this.queryParams).then((response) => { listJyjl(this.queryParams).then((response) => {
if (response.records[0]) { if (response.records) {
this.form = response.records[0]; this.form = response.records;
} }
}); });
}, },

2
src/views/dike/safetyManage/declarationManage/declare/components/listPage/options/index.vue

@ -81,7 +81,7 @@
:disabled="!routeList[1].isEdit" :disabled="!routeList[1].isEdit"
:lazy="true" :lazy="true"
> >
<historyOverflowsRecords :dikeCode="this.formData.dikeCode" /> <historyOverflowsRecords v-if="activeName === 'historyOverflowsRecords'" :dikeCode="this.formData.dikeCode" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane
label="主要效益指标" label="主要效益指标"

9
src/views/dike/safetyManage/floodControlManagement/components/powerList.vue

@ -170,14 +170,7 @@
</template> </template>
<script> <script>
import { import { listBydy,getBydy,delBydy,addBydy,updateBydy} from "@/api/yg/dike/dfbydy"
listBydy,
getBydy,
delBydy,
addBydy,
updateBydy,
exportBydy,
} from "@/api/yg/bydy";
export default { export default {
name: "Bydy", name: "Bydy",

2
src/views/dike/safetyManage/floodControlManagement/components/powerRecords.vue

@ -122,7 +122,7 @@ import {
addBydy, addBydy,
updateBydy, updateBydy,
exportBydy, exportBydy,
} from "@/api/yg/bydy"; } from "@/api/yg/dike/dfbydy";
import pRTable from "./pRTable.vue"; import pRTable from "./pRTable.vue";
export default { export default {

6
src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue

@ -3,7 +3,7 @@
<el-row :gutter="15"> <el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="152px"> <el-form ref="form" :model="form" :rules="rules" label-width="152px">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="堤防名称"> <el-form-item label="堤防名称1">
<el-input v-model="dikeName" disabled /> <el-input v-model="dikeName" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -258,7 +258,7 @@ import { getFileStream } from "@/api/system/upload";
export default { export default {
name: "Aqjdxx", name: "Aqjdxx",
props: ["dikeName", "dfrwId"], props: ["dikeName", "dfrwId","dikeCode"],
data() { data() {
return { return {
// //
@ -519,6 +519,8 @@ export default {
}); });
} else { } else {
this.form.dfrwId = this.dfrwId; this.form.dfrwId = this.dfrwId;
console.log(this.dikeCode,'dikkkkkk')
this.form.remark=this.dikeCode
addAqjdxx(this.form).then((response) => { addAqjdxx(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");

4
src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo_em.vue

@ -12,7 +12,7 @@
:contentStyle="{ minWidth: '350px' }" :contentStyle="{ minWidth: '350px' }"
> >
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 堤防名称 </template> <template slot="label"> 堤防名称1 </template>
{{ this.dikeName }} {{ this.dikeName }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
@ -149,7 +149,7 @@ import { getFileStream } from "@/api/system/upload";
export default { export default {
name: "Aqjdxx", name: "Aqjdxx",
props: ["dikeName", "dfrwId"], props: ["dikeName", "dfrwId","dikeCode"],
data() { data() {
return { return {
// //

10
src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue

@ -227,6 +227,13 @@ export default {
fileList1: [], fileList1: [],
fileList2: [], fileList2: [],
}; };
},
watch: {
// message
dfrwId(newVal, oldVal) {
console.log('message changed:', oldVal, '→', newVal)
this.getList();
}
}, },
created() { created() {
this.getList(); this.getList();
@ -260,7 +267,10 @@ export default {
if (this.form.calculationResults) { if (this.form.calculationResults) {
this.fileList2 = JSON.parse(this.form.calculationResults); this.fileList2 = JSON.parse(this.form.calculationResults);
} }
}else{
this.reset();
} }
// this.total = response.total; // this.total = response.total;
// this.loading = false; // this.loading = false;
}); });

6
src/views/dike/safetyManage/safetyAppraisal/components/statisticsThree.vue

@ -151,19 +151,19 @@ export default {
series: [ series: [
{ {
name: "一堤防", name: "一堤防",
type: "bar", type: "bar",
data: this.barChartData.value1, data: this.barChartData.value1,
barMaxWidth: "10%", barMaxWidth: "10%",
}, },
{ {
name: "二堤防", name: "二堤防",
type: "bar", type: "bar",
data: this.barChartData.value2, data: this.barChartData.value2,
barMaxWidth: "10%", barMaxWidth: "10%",
}, },
{ {
name: "三堤防", name: "三堤防",
type: "bar", type: "bar",
data: this.barChartData.value3, data: this.barChartData.value3,
barMaxWidth: "10%", barMaxWidth: "10%",

11
src/views/dike/safetyManage/safetyAppraisal/list.vue

@ -20,7 +20,7 @@
> >
<el-form-item label="堤防名称" prop="dikeName"> <el-form-item label="堤防名称" prop="dikeName">
<el-select <el-select
v-model="queryParams.data.dikeId" v-model="queryParams.data.dikeCode"
placeholder="请选择堤防名称" placeholder="请选择堤防名称"
style="width: 100%" style="width: 100%"
filterable filterable
@ -181,6 +181,7 @@
>查看报告</el-button> >查看报告</el-button>
<el-button <el-button
size="mini" size="mini"
v-if="scope.row.status != '3'"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="fillOut(scope.row)" @click="fillOut(scope.row)"
@ -196,6 +197,7 @@
</el-button> </el-button>
<el-button <el-button
size="mini" size="mini"
v-if="scope.row.status != '3'"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="examine(scope.row)" @click="examine(scope.row)"
@ -256,6 +258,7 @@
<listBaseInfo <listBaseInfo
ref="listBaseInfo" ref="listBaseInfo"
:dfrwId="dfrwId" :dfrwId="dfrwId"
:dikeCode="dikeCode"
@closeParentTabs="closeTabs" @closeParentTabs="closeTabs"
@cancelParent="cancel" @cancelParent="cancel"
/> />
@ -290,6 +293,7 @@
ref="listBaseInfoEm" ref="listBaseInfoEm"
:dfrwId="dfrwId" :dfrwId="dfrwId"
:dikeName="dikeName" :dikeName="dikeName"
:dikeCode="dikeCode"
@cancelParent="cancel" @cancelParent="cancel"
/> />
</el-tab-pane> </el-tab-pane>
@ -415,6 +419,7 @@ export default {
pageSize: 10, pageSize: 10,
ids: null, ids: null,
data: { data: {
dikeCode:null,
dikeId: null, dikeId: null,
taskId: null, taskId: null,
planTime: null, planTime: null,
@ -438,6 +443,7 @@ export default {
rules: {}, rules: {},
dfrwId: "", dfrwId: "",
dikeName:'', dikeName:'',
dikeCode:'',
visible: false, visible: false,
remark: "", remark: "",
}; };
@ -528,6 +534,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
data: { data: {
dikeCode:null,
id: null, id: null,
dikeId: null, dikeId: null,
taskId: null, taskId: null,
@ -567,6 +574,8 @@ export default {
this.form = row; this.form = row;
this.dfrwId = row.id; this.dfrwId = row.id;
this.dikeName = row.dikeName; this.dikeName = row.dikeName;
this.dikeCode=row.dikeCode
this.open = true; this.open = true;
this.title = "填报安全鉴定信息"; this.title = "填报安全鉴定信息";
// getSzrw(id).then((response) => { // getSzrw(id).then((response) => {

23
src/views/sluice/engineeringCondition/sluiceBaseInfo/options/accidentRecord.vue

@ -12,23 +12,6 @@
}" }"
:contentStyle="{ minWidth: '350px' }" :contentStyle="{ minWidth: '350px' }"
> >
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 发现时间 </template>-->
<!-- {{ this.form.fntm }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label">险情级别 </template>-->
<!-- {{ dnstgrFormat(this.form) }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 险情名称 </template>-->
<!-- {{ this.form.dnsttm }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 险情部位 </template>-->
<!-- {{ this.form.dnstps }}-->
<!-- </el-descriptions-item>-->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 水闸名称 </template> <template slot="label"> 水闸名称 </template>
{{ wagaName }} {{ wagaName }}
@ -49,12 +32,6 @@
<template slot="label"> 水闸险情类别 </template> <template slot="label"> 水闸险情类别 </template>
{{ dnstgrFormat(this.form) }} {{ dnstgrFormat(this.form) }}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 除险措施 </template>-->
<!-- {{ this.form.rhms }}-->
<!-- </el-descriptions-item>-->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 备注 </template> <template slot="label"> 备注 </template>
{{ this.form.note }} {{ this.form.note }}

3
src/views/sluice/engineeringCondition/sluiceBaseInfo/options/dischargeCapacity2.vue

@ -57,7 +57,7 @@ import {
export default { export default {
name: "Xlnl", name: "Xlnl",
props: ["wagaName"], props: ["wagaName","wagaCode"],
data() { data() {
return { return {
// //
@ -94,6 +94,7 @@ export default {
updateUid: null, updateUid: null,
proCode: null, proCode: null,
proNo: null, proNo: null,
wagaCode:null,
owerDept: null, owerDept: null,
relation: null, relation: null,
}, },

55
src/views/sluice/engineeringCondition/sluiceBaseInfo/options/engineeringStructure.vue

@ -78,22 +78,12 @@
<template slot="label"> 启闭机数量 </template> <template slot="label"> 启闭机数量 </template>
{{ this.form.hsgram }} {{ this.form.hsgram }}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 闸身总宽m </template>-->
<!-- {{ this.form.gtttwd }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 闸身总长m </template>-->
<!-- {{ this.form.gtttlen }}-->
<!-- </el-descriptions-item>-->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 闸门顶高程m </template> <template slot="label"> 闸门顶高程m </template>
{{ this.form.gttpel }} {{ this.form.gttpel }}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 闸底板高程m </template>-->
<!-- {{ this.form.gtflel }}-->
<!-- </el-descriptions-item>-->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 消能型式 </template> <template slot="label"> 消能型式 </template>
{{ endsstFormat(this.form) }} {{ endsstFormat(this.form) }}
@ -102,46 +92,7 @@
<template slot="label"> 闸门型式 </template> <template slot="label"> 闸门型式 </template>
{{ gtstFormat(this.form) }} {{ gtstFormat(this.form) }}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 闸门尺寸m </template>-->
<!-- {{ this.form.note }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 闸门自重t </template>-->
<!-- {{ this.form.gtddld }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 闸基防渗措施 </template>-->
<!-- {{ gtbsasmsFormat(this.form) }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 工作桥面宽度m </template>-->
<!-- {{ this.form.srbrwd }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 工作桥面高程m </template>-->
<!-- {{ this.form.srbrel }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 检修桥面宽度m </template>-->
<!-- {{ this.form.embrwd }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 检修桥面高程m </template>-->
<!-- {{ this.form.embrel }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 交通桥标准 </template>-->
<!-- {{ acbrstFormat(this.form) }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 交通桥面宽度m </template>-->
<!-- {{ this.form.acbrwd }}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"> 交通桥面高程m </template>-->
<!-- {{ this.form.acbrel }}-->
<!-- </el-descriptions-item>-->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 备注 </template> <template slot="label"> 备注 </template>
{{ this.form.note }} {{ this.form.note }}

4
src/views/sluice/engineeringCondition/sluiceBaseInfo/options/index.vue

@ -46,7 +46,9 @@
:disabled="!routeList[1].isEdit" :disabled="!routeList[1].isEdit"
:lazy="true" :lazy="true"
> >
<dischargeCapacity2 :wagaName="formData.wagaName" :wagaCode="formData.wagaCode"/> <dischargeCapacity2
v-if="activeName === 'dischargeCapacity2'"
:wagaName="formData.wagaName" :wagaCode="formData.wagaCode"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane

4
src/views/sluice/managementGuarantee/fundGuarantee/index.vue

@ -34,7 +34,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="水闸主管部门" prop="unit"> <!-- <el-form-item label="水闸主管部门" prop="unit">
<el-input <el-input
v-model="queryParams.data.unit" v-model="queryParams.data.unit"
placeholder="请输入水闸主管部门" placeholder="请输入水闸主管部门"
@ -50,7 +50,7 @@
@click="handleQuery" @click="handleQuery"
></el-button> ></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>-->
<!-- <el-form-item label="单位名称" prop="unitName"> <!-- <el-form-item label="单位名称" prop="unitName">
<el-input <el-input
v-model="queryParams.data.unitName" v-model="queryParams.data.unitName"

60
src/views/sluice/managementGuarantee/standardizationConstruction/listPage/index.vue

@ -206,12 +206,12 @@
width="600px" width="600px"
center center
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" @close="handleClose"
> >
<div class="score-dialog-content"> <div class="score-dialog-content">
<!-- 广东省价标准 --> <!-- 广东省价标准 -->
<div class="score-table"> <div class="score-table">
<div class="score-header">广东省价标准</div> <div class="score-header">广东省价标准</div>
<div class="score-content"> <div class="score-content">
(: 900 分以上, 前四类 85%; : 800 分以上,前四类 75%; : 700 分以上,前四类 65%; (: 900 分以上, 前四类 85%; : 800 分以上,前四类 75%; : 700 分以上,前四类 65%;
不达标 700 分以下, 前四类 65%) 不达标 700 分以下, 前四类 65%)
@ -229,7 +229,7 @@
<div class="grid-header">奖励机制</div> <div class="grid-header">奖励机制</div>
<div class="grid-content"> <div class="grid-content">
<el-input <el-input
v-model="jlForm.jljz" placeholder="请输入奖励机制" v-model="jlForm.rewardSystem" placeholder="请输入奖励机制"
> >
</el-input> </el-input>
@ -237,7 +237,7 @@
<div class="grid-header">惩处措施</div> <div class="grid-header">惩处措施</div>
<div class="grid-content"> <div class="grid-content">
<el-input <el-input
v-model="jlForm.cccs" placeholder="请输入惩处措施" v-model="jlForm.punishmentMeasures" placeholder="请输入惩处措施"
> >
</el-input> </el-input>
@ -247,7 +247,7 @@
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button type="primary" class="submit-btn" @click="dialogVisible = false">提交</el-button> <el-button type="primary" class="submit-btn" @click="handleSubmit">提交</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@ -361,7 +361,7 @@
style="width: 400px" style="width: 400px"
> >
<span> <span>
广东省价标准<br /> 广东省价标准<br />
(: 900分以上前四类85%:: 800分以上,前四类75%: : (: 900分以上前四类85%:: 800分以上,前四类75%: :
700分以上,前四65%:不达标 700分以下前四类65%) 700分以上,前四65%:不达标 700分以下前四类65%)
</span> </span>
@ -728,6 +728,7 @@ import { listJbxx } from "@/api/yg/jbxx";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload"; import { getFileStream } from "@/api/system/upload";
import linkSluice from "@/components/linkNameSelect/linkSluice.vue"; import linkSluice from "@/components/linkNameSelect/linkSluice.vue";
import {addCriteria, listCriteria, updateCriteria} from "@/api/yg/criteria";
export default { export default {
name: "Bzhjs", name: "Bzhjs",
@ -747,7 +748,9 @@ export default {
multiple: true, multiple: true,
// //
showSearch: true, showSearch: true,
jlForm:{}, jlForm:{
type: '1',
},
// //
total: 0, total: 0,
// //
@ -810,6 +813,13 @@ export default {
3: "审核通过", 3: "审核通过",
4: "已备案", 4: "已备案",
}, },
criteriaQueryParams:{
pageNum: 1,
pageSize: 10,
data: {
type: '1'
}
},
}; };
}, },
created() { created() {
@ -828,8 +838,38 @@ export default {
}); });
}, },
methods: { 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 = {};
},
handleIncentive(){ handleIncentive(){
console.log(111) this.handleQueryCriteria();
this.dialogVisible = true; this.dialogVisible = true;
}, },
getScore(row){ getScore(row){
@ -1047,7 +1087,7 @@ export default {
if (this.form.score) { if (this.form.score) {
this.evalForm = JSON.parse(this.form.score); this.evalForm = JSON.parse(this.form.score);
const value = Object.values(this.evalForm.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); return a + Number(b);
}, 0); }, 0);

4
src/views/sluice/managementTeamManagement/index.vue

@ -10,7 +10,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="人员类型" prop="personType"> <el-form-item label="单位类型" prop="personType">
<el-select v-model="queryParams.data.personType" placeholder="请选择人员类型" clearable size="small"> <el-select v-model="queryParams.data.personType" placeholder="请选择人员类型" clearable size="small">
<el-option <el-option
v-for="dict in personTypeOptions" v-for="dict in personTypeOptions"
@ -136,7 +136,7 @@
<el-form-item label="人员名称" prop="personName"> <el-form-item label="人员名称" prop="personName">
<el-input v-model="form.personName" placeholder="请输入人员名称" /> <el-input v-model="form.personName" placeholder="请输入人员名称" />
</el-form-item> </el-form-item>
<el-form-item label="人员类型" prop="personType"> <el-form-item label="单位类型" prop="personType">
<el-select v-model="form.personType" placeholder="请选择人员类型" style="width:100%"> <el-select v-model="form.personType" placeholder="请选择人员类型" style="width:100%">
<el-option <el-option
v-for="dict in personTypeOptions" v-for="dict in personTypeOptions"

10
src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue

@ -130,8 +130,7 @@
<el-table-column <el-table-column
label="水闸名称" label="水闸名称"
align="center" align="center"
prop="wagaCode" prop="wagaName"
:formatter="wagaCodeFormat"
min-width="120" min-width="120"
> >
</el-table-column> </el-table-column>
@ -509,12 +508,7 @@ export default {
}, },
wagaCodeFormat(row) { wagaCodeFormat(row) {
const wagaCode = row.wagaCode; const wagaCode = row.wagaCode;
// const name = await new Promise(function (resolve, reject) {
// getJbxx(id).then((res) => {
// // console.log(111, res);
// resolve(res.data.wagaName);
// });
// });
let data = this.wagaNameOptions.find((res) => res.wagaCode == wagaCode); let data = this.wagaNameOptions.find((res) => res.wagaCode == wagaCode);
if (data) return data.wagaName; if (data) return data.wagaName;
}, },

4
src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue

@ -258,7 +258,7 @@ import { getFileStream } from "@/api/system/upload";
export default { export default {
name: "Aqjdxx", name: "Aqjdxx",
props: ["wagaName", "szrwId"], props: ["wagaName", "szrwId","wagaCode"],
data() { data() {
return { return {
// //
@ -500,6 +500,7 @@ export default {
this.form.safetyEvaluationReport = JSON.stringify(this.fileList1); this.form.safetyEvaluationReport = JSON.stringify(this.fileList1);
this.form.safetyAppraisalReport = JSON.stringify(this.fileList2); this.form.safetyAppraisalReport = JSON.stringify(this.fileList2);
this.form.safetyAppraisalOpinion = JSON.stringify(this.fileList3); this.form.safetyAppraisalOpinion = JSON.stringify(this.fileList3);
console.log(this.wagaCode,'waaaaaa')
if (this.form.id != null) { if (this.form.id != null) {
updateAqjdxx(this.form).then((response) => { updateAqjdxx(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
@ -511,6 +512,7 @@ export default {
}); });
} else { } else {
this.form.szrwId = this.szrwId; this.form.szrwId = this.szrwId;
this.form.remark=this.wagaCode;
addAqjdxx(this.form).then((response) => { addAqjdxx(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");

9
src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue

@ -227,6 +227,13 @@ export default {
fileList1: [], fileList1: [],
fileList2: [], fileList2: [],
}; };
},
watch: {
// message
szrwId(newVal, oldVal) {
console.log('message changed:', oldVal, '→', newVal)
this.getList();
}
}, },
created() { created() {
this.getList(); this.getList();
@ -260,6 +267,8 @@ export default {
if (this.form.calculationResults) { if (this.form.calculationResults) {
this.fileList2 = JSON.parse(this.form.calculationResults); this.fileList2 = JSON.parse(this.form.calculationResults);
} }
}else{
this.reset();
} }
// this.total = response.total; // this.total = response.total;
// this.loading = false; // this.loading = false;

6
src/views/sluice/safetyManage/safetyAppraisal/components/statisticsThree.vue

@ -150,19 +150,19 @@ export default {
series: [ series: [
{ {
name: "一水闸", name: "一水闸",
type: "bar", type: "bar",
data: this.barChartData.value1, data: this.barChartData.value1,
barMaxWidth: "10%", barMaxWidth: "10%",
}, },
{ {
name: "二水闸", name: "二水闸",
type: "bar", type: "bar",
data: this.barChartData.value2, data: this.barChartData.value2,
barMaxWidth: "10%", barMaxWidth: "10%",
}, },
{ {
name: "三水闸", name: "三水闸",
type: "bar", type: "bar",
data: this.barChartData.value3, data: this.barChartData.value3,
barMaxWidth: "10%", barMaxWidth: "10%",

12
src/views/sluice/safetyManage/safetyAppraisal/list.vue

@ -175,6 +175,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
v-if="scope.row.status != '3'"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="fillOut(scope.row)" @click="fillOut(scope.row)"
@ -196,20 +197,21 @@
>查看报告</el-button> >查看报告</el-button>
<el-button <el-button
size="mini" size="mini"
v-if="scope.row.status != '3'"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="examine(scope.row)" @click="examine(scope.row)"
v-hasPermi="['sz:szrw:examine']" v-hasPermi="['sz:szrw:examine']"
>审核</el-button >审核</el-button
> >
<el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['sz:szrw:remove']" v-hasPermi="['sz:szrw:remove']"
>删除</el-button >删除</el-button
> >-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -257,6 +259,7 @@
<listBaseInfo <listBaseInfo
ref="listBaseInfo" ref="listBaseInfo"
:szrwId="szrwId" :szrwId="szrwId"
:wagaCode="wagaCode"
:wagaName="wagaName" :wagaName="wagaName"
@cancelParent="cancel" @cancelParent="cancel"
/> />
@ -383,6 +386,7 @@ export default {
multiple: true, multiple: true,
// //
showSearch: true, showSearch: true,
wagaName:'',
// //
total: 0, total: 0,
// //
@ -429,6 +433,7 @@ export default {
szrwId: "", szrwId: "",
visible: false, visible: false,
remark: "", remark: "",
wagaCode:"",
}; };
}, },
created() { created() {
@ -449,7 +454,7 @@ export default {
handleDetial(row){ handleDetial(row){
this.openDetial = true; this.openDetial = true;
this.szrwId = row.id; this.szrwId = row.id;
this.wagaName = row.wageName; this.wagaName = row.wagaName;
this.detailDsable = true; this.detailDsable = true;
}, },
@ -563,6 +568,7 @@ export default {
this.form = row; this.form = row;
this.szrwId = row.id; this.szrwId = row.id;
this.wagaName = row.wagaName; this.wagaName = row.wagaName;
this.wagaCode=row.wagaCode;
this.open = true; this.open = true;
this.title = "填报安全鉴定信息"; this.title = "填报安全鉴定信息";
// getSzrw(id).then((response) => { // getSzrw(id).then((response) => {

2
vue.config.js

@ -81,7 +81,7 @@ module.exports = {
}, },
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: "http://shuili.product.dev.com:30115/", target: "http://shuili.product.dev.com:30115/",
// target: "http://192.168.2.107:18082/", // target: "http://127.0.0.1:18082/",
// target: "http://172.16.34.80:18082/", // target: "http://172.16.34.80:18082/",
// target: 'http://172.16.32.62:18888/', // target: 'http://172.16.32.62:18888/',
// target: "http://172.16.34.27:18082", // target: "http://172.16.34.27:18082",

Loading…
Cancel
Save