Browse Source

修改

master_tdsql
xzt 1 year ago
parent
commit
cdb052dd33
  1. 9
      src/views/dike/engineeringCondition/dikeCompare/components/basePage.vue
  2. 111
      src/views/sluice/engineeringCondition/sluiceBaseInfo/options/basePage.vue
  3. 61
      src/views/sluice/engineeringCondition/sluiceCompare/components/basePage.vue

9
src/views/dike/engineeringCondition/dikeCompare/components/basePage.vue

@ -133,7 +133,7 @@
:contentClassName="isDiff('recentComplianceReinforcementStatus')"
>
<template slot="label"> 最近达标加固完工状态 </template>
{{ this.form.recentComplianceReinforcementStatus }}
{{ recentComplianceReinforcementStatusFormat(this.form) }}
</el-descriptions-item>
<el-descriptions-item
:contentClassName="isDiff('recentComplianceReinforcementTime')"
@ -354,6 +354,13 @@ export default {
row.crossBorderSituation
);
},
//
recentComplianceReinforcementStatusFormat(row, column) {
return this.selectDictLabel(
this.recentComplianceReinforcementStatusOptions,
row.recentComplianceReinforcementStatus
);
},
//
embankmentTyperFormat(data) {
let res = "";

111
src/views/sluice/engineeringCondition/sluiceBaseInfo/options/basePage.vue

@ -73,12 +73,12 @@
</el-form-item>
</el-col>
<el-col :span="8" v-if="form.acceptanceStatus == 0">
<el-form-item label="建成时间" prop="compDate">
<el-form-item label="建成时间" prop="completionTime">
<el-date-picker
clearable
size="small"
style="width: 100%"
v-model="form.compDate"
v-model="form.completionTime"
type="month"
format="yyyy-MM"
value-format="yyyy-MM-dd"
@ -227,19 +227,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设计过闸流量" prop="designGateFlow">
<el-input
v-model="form.designGateFlow"
placeholder="请输入设计过闸流量"
/>
<el-form-item label="设计过闸流量" prop="dslcfl">
<el-input v-model="form.dslcfl" placeholder="请输入设计过闸流量" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="校核过闸流量" prop="verifiedGateFlow">
<el-input
v-model="form.verifiedGateFlow"
placeholder="请输入校核过闸流量"
/>
<el-form-item label="校核过闸流量" prop="chlcfl">
<el-input v-model="form.chlcfl" placeholder="请输入校核过闸流量" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -259,14 +253,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="建筑物级别" prop="buildingLevel">
<el-form-item label="建筑物级别" prop="mainBuildGrad">
<el-select
v-model="form.buildingLevel"
v-model="form.mainBuildGrad"
placeholder="请选择建筑物级别"
style="width: 100%"
>
<el-option
v-for="dict in buildingLevelOptions"
v-for="dict in mainBuildGradOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
@ -327,17 +321,14 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="闸孔数量" prop="gateHolesNumber">
<el-input
v-model="form.gateHolesNumber"
placeholder="请输入闸孔数量"
/>
<el-form-item label="闸孔数量" prop="gaorNum">
<el-input v-model="form.gaorNum" placeholder="请输入闸孔数量" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="闸孔总净宽(m)" prop="gateHoleWidth">
<el-form-item label="闸孔总净宽(m)" prop="gaorTotNetWid">
<el-input
v-model="form.gateHoleWidth"
v-model="form.gaorTotNetWid"
placeholder="请输入闸孔总净宽(m)"
/>
</el-form-item>
@ -388,10 +379,10 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="闸门型式(可多选)" prop="gateType">
<el-checkbox-group v-model="form.gateType">
<el-form-item label="闸门型式(可多选)" prop="gtst">
<el-checkbox-group v-model="form.gtst">
<el-checkbox
v-for="dict in gateTypeOptions"
v-for="dict in gtstOptions"
:key="dict.dictValue"
:label="dict.dictValue"
>
@ -400,6 +391,7 @@
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="启闭机形式(可多选)" prop="machineForm">
<el-checkbox-group v-model="form.machineForm">
@ -414,13 +406,10 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="消能方式(可多选)"
prop="energyDissipationMethod"
>
<el-checkbox-group v-model="form.energyDissipationMethod">
<el-form-item label="消能方式(可多选)" prop="endsst">
<el-checkbox-group v-model="form.endsst">
<el-checkbox
v-for="dict in energyDissipationMethodOptions"
v-for="dict in endsstOptions"
:key="dict.dictValue"
:label="dict.dictValue"
>
@ -512,9 +501,9 @@ export default {
//
projectScaleOptions: [],
//
buildingLevelOptions: [],
mainBuildGradOptions: [],
//
gateTypeOptions: [],
gtstOptions: [],
//
observationProjectOptions: [],
//
@ -522,7 +511,7 @@ export default {
//
machineFormOptions: [],
//
energyDissipationMethodOptions: [],
endsstOptions: [],
//
automationControlOptions: [],
//
@ -544,23 +533,23 @@ export default {
isGateStation: null,
isSetGateProject: null,
wagaType: null,
designGateFlow: null,
verifiedGateFlow: null,
dslcfl: null,
chlcfl: null,
engScal: null,
buildingLevel: null,
mainBuildGrad: null,
dsrcin: null,
chrcin: null,
historicalMaximumGate: null,
historicalMaximumDate: null,
designSeismicIntensity: null,
gateHolesNumber: null,
gateHoleWidth: null,
gateType: null,
gaorNum: null,
gaorTotNetWid: null,
gtst: null,
hoistsNumber: null,
observationProject: null,
lockChamberStructure: null,
machineForm: null,
energyDissipationMethod: null,
endsst: null,
automationControl: null,
createUid: null,
updateUid: null,
@ -569,7 +558,7 @@ export default {
proNo: null,
proCode: null,
relation: null,
compDate: null,
completionTime: null,
completionAcceptanceTime: null,
recentCompletionTime: null,
hubBuildings: null,
@ -617,10 +606,10 @@ export default {
this.projectScaleOptions = response.data;
});
this.getDicts("building_level").then((response) => {
this.buildingLevelOptions = response.data;
this.mainBuildGradOptions = response.data;
});
this.getDicts("gate_type").then((response) => {
this.gateTypeOptions = response.data;
this.gtstOptions = response.data;
});
this.getDicts("observation_project").then((response) => {
this.observationProjectOptions = response.data;
@ -632,7 +621,7 @@ export default {
this.machineFormOptions = response.data;
});
this.getDicts("energy_dissipation_method").then((response) => {
this.energyDissipationMethodOptions = response.data;
this.endsstOptions = response.data;
});
this.getDicts("automation_control").then((response) => {
this.automationControlOptions = response.data;
@ -681,7 +670,9 @@ export default {
getList() {
const id = this.$route.query.baseDataId;
getSluiceInfo(id).then((response) => {
// Object.assign({}, this.form, response.data);
this.form = response.data;
console.log(999999, this.form);
if (this.form.wagaLoc)
this.form.wagaLoc = JSON.parse(this.form.wagaLoc);
if (this.form.wagaType)
@ -696,14 +687,10 @@ export default {
this.form.lockChamberStructure = JSON.parse(
this.form.lockChamberStructure
);
if (this.form.gateType)
this.form.gateType = JSON.parse(this.form.gateType);
if (this.form.gtst) this.form.gtst = JSON.parse(this.form.gtst);
if (this.form.machineForm)
this.form.machineForm = JSON.parse(this.form.machineForm);
if (this.form.energyDissipationMethod)
this.form.energyDissipationMethod = JSON.parse(
this.form.energyDissipationMethod
);
if (this.form.endsst) this.form.endsst = JSON.parse(this.form.endsst);
if (this.form.automationControl)
this.form.automationControl = JSON.parse(this.form.automationControl);
@ -731,11 +718,9 @@ export default {
this.form.lockChamberStructure
);
//
this.form.gateType = JSON.stringify(this.form.gateType);
this.form.gtst = JSON.stringify(this.form.gtst);
this.form.machineForm = JSON.stringify(this.form.machineForm);
this.form.energyDissipationMethod = JSON.stringify(
this.form.energyDissipationMethod
);
this.form.endsst = JSON.stringify(this.form.endsst);
this.form.automationControl = JSON.stringify(
this.form.automationControl
);
@ -764,23 +749,23 @@ export default {
isGateStation: null,
isSetGateProject: null,
wagaType: null,
designGateFlow: null,
verifiedGateFlow: null,
dslcfl: null,
chlcfl: null,
engScal: null,
buildingLevel: null,
mainBuildGrad: null,
dsrcin: null,
chrcin: null,
historicalMaximumGate: null,
historicalMaximumDate: null,
designSeismicIntensity: null,
gateHolesNumber: null,
gateHoleWidth: null,
gateType: [],
gaorNum: null,
gaorTotNetWid: null,
gtst: [],
hoistsNumber: null,
observationProject: null,
lockChamberStructure: null,
machineForm: [],
energyDissipationMethod: [],
endsst: [],
automationControl: [],
createUid: null,
updateUid: null,
@ -789,7 +774,7 @@ export default {
proNo: null,
proCode: null,
relation: null,
compDate: null,
completionTime: null,
completionAcceptanceTime: null,
recentCompletionTime: null,
hubBuildings: null,

61
src/views/sluice/engineeringCondition/sluiceCompare/components/basePage.vue

@ -51,9 +51,9 @@
<template slot="label"> 验收情况 </template>
{{ acceptanceStatusFormat(this.form) }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('compDate')">
<el-descriptions-item :contentClassName="isDiff('completionTime')">
<template slot="label"> 建成时间 </template>
{{ this.form.compDate }}
{{ this.form.completionTime }}
</el-descriptions-item>
<el-descriptions-item
:contentClassName="isDiff('completionAcceptanceTime')"
@ -99,21 +99,21 @@
<template slot="label"> 水闸类型 </template>
{{ sluiceTypeFormat(this.form.wagaType) }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('designGateFlow')">
<el-descriptions-item :contentClassName="isDiff('dslcfl')">
<template slot="label"> 设计过闸流量 </template>
{{ this.form.designGateFlow }}
{{ this.form.dslcfl }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('verifiedGateFlow')">
<el-descriptions-item :contentClassName="isDiff('chlcfl')">
<template slot="label"> 校核过闸流量 </template>
{{ this.form.verifiedGateFlow }}
{{ this.form.chlcfl }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('engScal')">
<template slot="label"> 工程规模 </template>
{{ projectScaleFormat(this.form) }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('buildingLevel')">
<el-descriptions-item :contentClassName="isDiff('mainBuildGrad')">
<template slot="label"> 建筑物级别 </template>
{{ buildingLevelFormat(this.form) }}
{{ mainBuildGradFormat(this.form) }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('dsrcin')">
<template slot="label"> 设计标准[重现期] </template>
@ -137,13 +137,13 @@
<template slot="label"> 设计地震烈度 </template>
{{ this.form.designSeismicIntensity }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('gateHolesNumber')">
<el-descriptions-item :contentClassName="isDiff('gaorNum')">
<template slot="label"> 闸孔数量 </template>
{{ this.form.gateHolesNumber }}
{{ this.form.gaorNum }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('gateHoleWidth')">
<el-descriptions-item :contentClassName="isDiff('gaorTotNetWid')">
<template slot="label"> 闸孔总净宽(m) </template>
{{ this.form.gateHoleWidth }}
{{ this.form.gaorTotNetWid }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('hoistsNumber')">
<template slot="label"> 启闭机数量 </template>
@ -157,19 +157,17 @@
<template slot="label"> 闸室结构 </template>
{{ lockChamberStructureFormat(this.form.lockChamberStructure) }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('gateType')">
<el-descriptions-item :contentClassName="isDiff('gtst')">
<template slot="label"> 闸门型式 </template>
{{ gateTypeFormat(this.form.gateType) }}
{{ gtstFormat(this.form.gtst) }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('machineForm')">
<template slot="label"> 启闭机形式 </template>
{{ machineFormFormat(this.form.machineForm) }}
</el-descriptions-item>
<el-descriptions-item
:contentClassName="isDiff('energyDissipationMethod')"
>
<el-descriptions-item :contentClassName="isDiff('endsst')">
<template slot="label"> 消能方式 </template>
{{ energyDissipationMethodFormat(this.form.energyDissipationMethod) }}
{{ endsstFormat(this.form.endsst) }}
</el-descriptions-item>
<el-descriptions-item :contentClassName="isDiff('automationControl')">
<template slot="label"> 自动化控制 </template>
@ -211,9 +209,9 @@ export default {
//
projectScaleOptions: [],
//
buildingLevelOptions: [],
mainBuildGradOptions: [],
//
gateTypeOptions: [],
gtstOptions: [],
//
observationProjectOptions: [],
//
@ -221,7 +219,7 @@ export default {
//
machineFormOptions: [],
//
energyDissipationMethodOptions: [],
endsstOptions: [],
//
automationControlOptions: [],
//
@ -274,10 +272,10 @@ export default {
this.projectScaleOptions = response.data;
});
this.getDicts("building_level").then((response) => {
this.buildingLevelOptions = response.data;
this.mainBuildGradOptions = response.data;
});
this.getDicts("gate_type").then((response) => {
this.gateTypeOptions = response.data;
this.gtstOptions = response.data;
});
this.getDicts("observation_project").then((response) => {
this.observationProjectOptions = response.data;
@ -289,7 +287,7 @@ export default {
this.machineFormOptions = response.data;
});
this.getDicts("energy_dissipation_method").then((response) => {
this.energyDissipationMethodOptions = response.data;
this.endsstOptions = response.data;
});
this.getDicts("automation_control").then((response) => {
this.automationControlOptions = response.data;
@ -432,16 +430,16 @@ export default {
return this.selectDictLabel(this.projectScaleOptions, row.engScal);
},
//
buildingLevelFormat(row, column) {
return this.selectDictLabel(this.buildingLevelOptions, row.buildingLevel);
mainBuildGradFormat(row, column) {
return this.selectDictLabel(this.mainBuildGradOptions, row.mainBuildGrad);
},
//
gateTypeFormat(data) {
gtstFormat(data) {
let res = "";
let arr = data ? JSON.parse(data) : [];
if (arr) {
arr.forEach((item) => {
res = res + "+" + this.selectDictLabel(this.gateTypeOptions, item);
res = res + "+" + this.selectDictLabel(this.gtstOptions, item);
});
return res.slice(1);
}
@ -487,15 +485,12 @@ export default {
}
},
//
energyDissipationMethodFormat(data) {
endsstFormat(data) {
let res = "";
let arr = data ? JSON.parse(data) : [];
if (arr) {
arr.forEach((item) => {
res =
res +
"+" +
this.selectDictLabel(this.energyDissipationMethodOptions, item);
res = res + "+" + this.selectDictLabel(this.endsstOptions, item);
});
return res.slice(1);
}

Loading…
Cancel
Save