Browse Source

堤防修改

master_tdsql
xzt 1 year ago
parent
commit
a961f419fb
  1. 32
      src/views/dike/safetyManage/floodControlManagement/power.vue
  2. 24
      src/views/dike/safetyManage/floodControlManagement/preplan.vue
  3. 36
      src/views/dike/safetyManage/floodControlManagement/supplies.vue
  4. 22
      src/views/dike/safetyManage/floodControlManagement/tissue.vue
  5. 24
      src/views/dike/safetyManage/safeProduction/components/list.vue

32
src/views/dike/safetyManage/floodControlManagement/power.vue

@ -16,9 +16,9 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="关联堤防" prop="dikeId">
<el-form-item label="关联堤防" prop="dikeCode">
<el-select
v-model="queryParams.data.dikeId"
v-model="queryParams.data.dikeCode"
placeholder="请选择关联堤防"
style="width: 100%"
@change="handleQuery"
@ -27,7 +27,7 @@
v-for="dict in dikeNameOptions"
:key="dict.id"
:label="dict.dikeName"
:value="dict.id"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-form-item>
@ -117,8 +117,8 @@
<el-table-column
label="关联堤防"
align="center"
prop="dikeId"
:formatter="wageIdFormat"
prop="dikeCode"
:formatter="dikeCodeFormat"
min-width="120"
/>
<el-table-column
@ -187,10 +187,10 @@
:close-on-click-modal="false"
>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="关联堤防" prop="dikeId">
<!-- <el-input v-model="form.dikeId" placeholder="请输入堤防id" /> -->
<el-form-item label="关联堤防" prop="dikeCode">
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防id" /> -->
<el-select
v-model="form.dikeId"
v-model="form.dikeCode"
placeholder="请选择关联堤防"
style="width: 100%"
>
@ -198,7 +198,7 @@
v-for="dict in dikeNameOptions"
:key="dict.id"
:label="dict.dikeName"
:value="dict.id"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-form-item>
@ -306,7 +306,7 @@ export default {
pageSize: 10,
ids: null,
data: {
dikeId: null,
dikeCode: null,
powerType: null,
powerModel: null,
dikeName: null,
@ -327,7 +327,7 @@ export default {
form: {},
//
rules: {
dikeId: [
dikeCode: [
{ required: true, message: "请选择关联堤防", trigger: "blur" },
],
powerType: [
@ -364,9 +364,9 @@ export default {
this.loading = false;
});
},
wageIdFormat(row) {
const id = row.dikeId;
let data = this.dikeNameOptions.find((res) => res.id == id);
dikeCodeFormat(row) {
const dikeCode = row.dikeCode;
let data = this.dikeNameOptions.find((res) => res.dikeCode == dikeCode);
if (data) return data.dikeName;
},
//
@ -382,7 +382,7 @@ export default {
reset() {
this.form = {
id: null,
dikeId: null,
dikeCode: null,
powerType: null,
powerModel: null,
dikeName: null,
@ -403,7 +403,7 @@ export default {
pageSize: 10,
data: {
id: null,
dikeId: null,
dikeCode: null,
powerType: null,
powerModel: null,
dikeName: null,

24
src/views/dike/safetyManage/floodControlManagement/preplan.vue

@ -16,9 +16,9 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="关联堤防" prop="dikeId">
<el-form-item label="关联堤防" prop="dikeCode">
<el-input
v-model="queryParams.data.dikeId"
v-model="queryParams.data.dikeCode"
placeholder="请输入堤防id"
clearable
size="small"
@ -114,8 +114,8 @@
<el-table-column
label="关联堤防"
align="center"
prop="dikeId"
:formatter="dikeIdFormat"
prop="dikeCode"
:formatter="dikeCodeFormat"
min-width="120"
/>
<!-- <el-table-column
@ -216,10 +216,10 @@
:close-on-click-modal="false"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="关联堤防" prop="dikeId">
<!-- <el-input v-model="form.dikeId" placeholder="请输入堤防id" /> -->
<el-form-item label="关联堤防" prop="dikeCode">
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防id" /> -->
<el-select
v-model="form.dikeId"
v-model="form.dikeCode"
placeholder="请选择关联堤防"
style="width: 100%"
>
@ -357,7 +357,7 @@ export default {
pageSize: 10,
ids: null,
data: {
dikeId: null,
dikeCode: null,
dikeCode: null,
dikeName: null,
dikeType: null,
@ -402,8 +402,8 @@ export default {
});
},
methods: {
dikeIdFormat(row) {
const id = row.dikeId;
dikeCodeFormat(row) {
const id = row.dikeCode;
let data = this.dikeNameOptions.find((res) => res.id == id);
if (data) return data.dikeName;
},
@ -430,7 +430,7 @@ export default {
this.fileList = [];
this.form = {
id: null,
dikeId: null,
dikeCode: null,
dikeCode: null,
dikeName: null,
dikeType: null,
@ -457,7 +457,7 @@ export default {
pageSize: 10,
data: {
id: null,
dikeId: null,
dikeCode: null,
dikeCode: null,
dikeName: null,
dikeType: null,

36
src/views/dike/safetyManage/floodControlManagement/supplies.vue

@ -16,9 +16,9 @@
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item label="堤防id" prop="dikeId">
<!-- <el-form-item label="堤防id" prop="dikeCode">
<el-input
v-model="queryParams.data.dikeId"
v-model="queryParams.data.dikeCode"
placeholder="请输入堤防id"
clearable
size="small"
@ -34,9 +34,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="关联堤防" prop="dikeId">
<el-form-item label="关联堤防" prop="dikeCode">
<el-select
v-model="queryParams.data.dikeId"
v-model="queryParams.data.dikeCode"
placeholder="请选择关联堤防"
style="width: 100%"
@change="handleQuery"
@ -45,7 +45,7 @@
v-for="dict in dikeNameOptions"
:key="dict.id"
:label="dict.dikeName"
:value="dict.id"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-form-item>
@ -154,8 +154,8 @@
<el-table-column
label="关联堤防"
align="center"
prop="dikeId"
:formatter="wageIdFormat"
prop="dikeCode"
:formatter="dikeCodeFormat"
min-width="120"
/>
<el-table-column
@ -257,10 +257,10 @@
:close-on-click-modal="false"
>
<el-form ref="form" :model="form" :rules="rules" label-width="96px">
<el-form-item label="关联堤防" prop="dikeId">
<!-- <el-input v-model="form.dikeId" placeholder="请输入堤防id" /> -->
<el-form-item label="关联堤防" prop="dikeCode">
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防id" /> -->
<el-select
v-model="form.dikeId"
v-model="form.dikeCode"
placeholder="请选择关联堤防"
style="width: 100%"
>
@ -268,7 +268,7 @@
v-for="dict in dikeNameOptions"
:key="dict.id"
:label="dict.dikeName"
:value="dict.id"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-form-item>
@ -378,7 +378,7 @@ export default {
pageSize: 10,
ids: null,
data: {
dikeId: null,
dikeCode: null,
materialName: null,
dikeName: null,
personName: null,
@ -404,7 +404,7 @@ export default {
form: {},
//
rules: {
dikeId: [
dikeCode: [
{ required: true, message: "请选择关联堤防", trigger: "blur" },
],
materialName: [
@ -451,9 +451,9 @@ export default {
this.loading = false;
});
},
wageIdFormat(row) {
const id = row.dikeId;
let data = this.dikeNameOptions.find((res) => res.id == id);
dikeCodeFormat(row) {
const dikeCode = row.dikeCode;
let data = this.dikeNameOptions.find((res) => res.dikeCode == dikeCode);
if (data) return data.dikeName;
},
//
@ -469,7 +469,7 @@ export default {
reset() {
this.form = {
id: null,
dikeId: null,
dikeCode: null,
materialName: null,
dikeName: null,
personName: null,
@ -495,7 +495,7 @@ export default {
pageSize: 10,
data: {
id: null,
dikeId: null,
dikeCode: null,
materialName: null,
dikeName: null,
personName: null,

22
src/views/dike/safetyManage/floodControlManagement/tissue.vue

@ -135,8 +135,8 @@
<el-table-column
label="堤防名称"
align="center"
prop="dikeId"
:formatter="dikeIdFormat"
prop="dikeCode"
:formatter="dikeCodeFormat"
min-width="120"
/>
<el-table-column
@ -238,9 +238,9 @@
</div>
<el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="96px">
<el-form-item label="堤防名称" prop="dikeId">
<el-form-item label="堤防名称" prop="dikeCode">
<el-select
v-model="form.dikeId"
v-model="form.dikeCode"
placeholder="请选择堤防名称"
style="width: 100%"
>
@ -248,7 +248,7 @@
v-for="dict in dikeNameOptions"
:key="dict.id"
:label="dict.dikeName"
:value="dict.id"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-form-item>
@ -443,7 +443,7 @@ export default {
form: {},
//
rules: {
dikeId: [
dikeCode: [
{ required: true, message: "请选择堤防名称", trigger: "blur" },
],
organizationName: [
@ -524,21 +524,21 @@ export default {
typeFormat(row, column) {
return this.selectDictLabel(this.typeOptions, row.chargePersonType);
},
dikeIdFormat(row) {
const id = row.dikeId;
dikeCodeFormat(row) {
const dikeCode = row.dikeCode;
// const name = await new Promise(function (resolve, reject) {
// getJbxx(id).then((res) => {
// // console.log(111, res);
// resolve(res.data.dikeName);
// });
// });
let data = this.dikeNameOptions.find((res) => res.id == id);
let data = this.dikeNameOptions.find((res) => res.dikeCode == dikeCode);
if (data) return data.dikeName;
},
/** 查询防汛组织列表 */
getList() {
this.loading = true;
// this.queryParams.data.dikeId = this.$route.query.baseDataId;
// this.queryParams.data.dikeCode = this.$route.query.baseDataId;
listFxzz(this.queryParams).then((response) => {
this.fxzzList = response.records;
this.total = response.total;
@ -686,7 +686,7 @@ export default {
if (this.delIdList.length > 0) delFxzzcy(this.delIdList);
} else {
this.form.cy = C0;
// this.form.dikeId = this.$route.query.baseDataId;
// this.form.dikeCode = this.$route.query.baseDataId;
addFxzz(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");

24
src/views/dike/safetyManage/safeProduction/components/list.vue

@ -93,8 +93,8 @@
<el-table-column
label="关联堤防"
align="center"
prop="dikeId"
:formatter="dikeIdFormat"
prop="dikeCode"
:formatter="dikeCodeFormat"
min-width="120"
/>
<el-table-column
@ -211,10 +211,10 @@
:close-on-click-modal="false"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="关联堤防" prop="dikeId">
<!-- <el-input v-model="form.dikeId" placeholder="请输入堤防id" /> -->
<el-form-item label="关联堤防" prop="dikeCode">
<!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防id" /> -->
<el-select
v-model="form.dikeId"
v-model="form.dikeCode"
placeholder="请选择关联堤防"
style="width: 100%"
:disabled="isResolve"
@ -223,7 +223,7 @@
v-for="dict in dikeNameOptions"
:key="dict.id"
:label="dict.dikeName"
:value="dict.id"
:value="dict.dikeCode"
></el-option>
</el-select>
</el-form-item>
@ -379,7 +379,7 @@ export default {
pageSize: 10,
ids: null,
data: {
dikeId: null,
dikeCode: null,
proposer: null,
head: null,
findTime: null,
@ -444,9 +444,9 @@ export default {
this.title = "解决堤防隐患信息";
});
},
dikeIdFormat(row) {
const id = row.dikeId;
let data = this.dikeNameOptions.find((res) => res.id == id);
dikeCodeFormat(row) {
const dikeCode = row.dikeCode;
let data = this.dikeNameOptions.find((res) => res.dikeCode == dikeCode);
if (data) return data.dikeName;
},
/** 查询堤防隐患信息列表 */
@ -475,7 +475,7 @@ export default {
this.fileList = [];
this.form = {
id: null,
dikeId: null,
dikeCode: null,
proposer: null,
head: null,
findTime: null,
@ -508,7 +508,7 @@ export default {
pageSize: 10,
data: {
id: null,
dikeId: null,
dikeCode: null,
proposer: null,
head: null,
findTime: null,

Loading…
Cancel
Save