Browse Source

水闸修改

master_tdsql
xzt 1 year ago
parent
commit
07069cf5c8
  1. 16
      src/views/sluice/safetyManage/confirmDelimitationManage/index.vue
  2. 10
      src/views/sluice/safetyManage/declarationManage/examine/components/listPage/options/managementSystem.vue
  3. 5
      src/views/sluice/safetyManage/declarationManage/examine/components/listPage/options/managementSystemFxzz.vue
  4. 6
      src/views/sluice/safetyManage/declarationManage/examine/components/listPage/options/managementSystemFzr.vue
  5. 30
      src/views/sluice/safetyManage/floodControlManagement/power.vue
  6. 24
      src/views/sluice/safetyManage/floodControlManagement/preplan.vue
  7. 30
      src/views/sluice/safetyManage/floodControlManagement/supplies.vue
  8. 22
      src/views/sluice/safetyManage/floodControlManagement/tissue.vue
  9. 20
      src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
  10. 20
      src/views/sluice/safetyManage/safeProduction/components/list.vue
  11. 8
      src/views/sluice/safetyManage/safetyAppraisal/list.vue
  12. 16
      src/views/sluice/safetyManage/safetyAppraisal/task.vue

16
src/views/sluice/safetyManage/confirmDelimitationManage/index.vue

@ -208,8 +208,8 @@
>
<el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="84px">
<!-- <el-form-item label="水闸id" prop="wagaId">
<el-input v-model="form.wagaId" placeholder="请输入水闸id" />
<!-- <el-form-item label="水闸id" prop="wagaCode">
<el-input v-model="form.wagaCode" placeholder="请输入水闸id" />
</el-form-item> -->
<el-form-item label="工程功能" prop="engineeringFunctions">
<el-input
@ -497,7 +497,7 @@ export default {
wagaName: null,
wagaCode: null,
wagaType: null,
wagaId: null,
wagaCode: null,
createUid: null,
updateUid: null,
owerDept: null,
@ -568,8 +568,8 @@ export default {
this.viewMsg = {};
},
viewInfo(row) {
const id = row.id;
this.conQueryParams.data.wagaId = id;
const wagaCode = row.wagaCode;
this.conQueryParams.data.wagaCode = id;
listQqhj(this.conQueryParams).then((res) => {
console.log(res);
if (res.records[0]) {
@ -581,8 +581,8 @@ export default {
},
comfirm(row) {
this.baseMsg = row;
const id = row.id;
this.conQueryParams.data.wagaId = id;
const wagaCode = row.wagaCode;
this.conQueryParams.data.wagaCode = wagaCode;
listQqhj(this.conQueryParams).then((res) => {
// console.log(res);
if (res.records[0]) {
@ -811,7 +811,7 @@ export default {
}
});
} else {
this.form.wagaId = this.baseMsg.id;
this.form.wagaCode = this.baseMsg.wagaCode;
addQqhj(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");

10
src/views/sluice/safetyManage/declarationManage/examine/components/listPage/options/managementSystem.vue

@ -7,7 +7,11 @@
添加
</span> -->
</div>
<managementSystemFzr ref="managementSystemFzr" :formData="formData" />
<managementSystemFzr
ref="managementSystemFzr"
:formData="formData"
:wagaCode="wagaCode"
/>
<div class="listTitle">
<span>防汛组织</span>
<!-- <span class="addBtn" @click="handleAdd('1')">
@ -15,7 +19,7 @@
添加
</span> -->
</div>
<managementSystemFxzz ref="managementSystemFxzz" />
<managementSystemFxzz ref="managementSystemFxzz" :wagaCode="wagaCode" />
</div>
</template>
<script>
@ -26,7 +30,7 @@ export default {
managementSystemFzr,
managementSystemFxzz,
},
props: ["formData"],
props: ["formData", "wagaCode"],
methods: {
handleAdd(key) {
if (key == "0") this.$refs.managementSystemFzr.handleAdd();

5
src/views/sluice/safetyManage/declarationManage/examine/components/listPage/options/managementSystemFxzz.vue

@ -355,6 +355,7 @@ import msFxzzMember from "./msFxzzMember.vue";
export default {
name: "Fxzz",
props: ["wagaCode"],
components: {
msFxzzMember,
},
@ -505,7 +506,7 @@ export default {
/** 查询防汛组织列表 */
getList() {
this.loading = true;
this.queryParams.data.wagaId = this.$route.query.baseDataId;
this.queryParams.data.wagaCode = this.wagaCode;
listFxzz(this.queryParams).then((response) => {
this.fxzzList = response.records;
this.total = response.total;
@ -653,7 +654,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.wagaCode = this.wagaCode;
addFxzz(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");

6
src/views/sluice/safetyManage/declarationManage/examine/components/listPage/options/managementSystemFzr.vue

@ -244,7 +244,7 @@ import {
export default {
name: "Fzr",
// props: ["formData"],
props: ["formData", "wagaCode"],
data() {
return {
//
@ -348,7 +348,7 @@ export default {
/** 查询水闸负责人列表 */
getList() {
this.loading = true;
this.queryParams.data.wagaId = this.$route.query.baseDataId;
this.queryParams.data.wagaCode = this.wagaCode;
listFzr(this.queryParams).then((response) => {
this.fzrList = response.records;
this.total = response.total;
@ -476,7 +476,7 @@ export default {
}
});
} else {
this.form.wagaId = this.$route.query.baseDataId;
this.form.wagaCode = this.wagaCode;
addFzr(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");

30
src/views/sluice/safetyManage/floodControlManagement/power.vue

@ -16,9 +16,9 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="关联水闸" prop="wagaId">
<el-form-item label="关联水闸" prop="wagaCode">
<el-select
v-model="queryParams.data.wagaId"
v-model="queryParams.data.wagaCode"
placeholder="请选择关联水闸"
style="width: 100%"
@change="handleQuery"
@ -27,7 +27,7 @@
v-for="dict in wagaNameOptions"
:key="dict.id"
:label="dict.wagaName"
:value="dict.id"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-form-item>
@ -117,8 +117,8 @@
<el-table-column
label="关联水闸"
align="center"
prop="wagaId"
:formatter="wagaIdFormat"
prop="wagaCode"
:formatter="wagaCodeFormat"
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="wagaId">
<!-- <el-input v-model="form.wagaId" placeholder="请输入水闸id" /> -->
<el-form-item label="关联水闸" prop="wagaCode">
<!-- <el-input v-model="form.wagaCode" placeholder="请输入水闸id" /> -->
<el-select
v-model="form.wagaId"
v-model="form.wagaCode"
placeholder="请选择关联水闸"
style="width: 100%"
>
@ -306,7 +306,7 @@ export default {
pageSize: 10,
ids: null,
data: {
wagaId: null,
wagaCode: null,
powerType: null,
powerModel: null,
wagaName: null,
@ -327,7 +327,7 @@ export default {
form: {},
//
rules: {
wagaId: [
wagaCode: [
{ required: true, message: "请选择关联水闸", trigger: "blur" },
],
powerType: [
@ -364,9 +364,9 @@ export default {
this.loading = false;
});
},
wagaIdFormat(row) {
const id = row.wagaId;
let data = this.wagaNameOptions.find((res) => res.id == id);
wagaCodeFormat(row) {
const wagaCode = row.wagaCode;
let data = this.wagaNameOptions.find((res) => res.wagaCode == wagaCode);
if (data) return data.wagaName;
},
//
@ -382,7 +382,7 @@ export default {
reset() {
this.form = {
id: null,
wagaId: null,
wagaCode: null,
powerType: null,
powerModel: null,
wagaName: null,
@ -403,7 +403,7 @@ export default {
pageSize: 10,
data: {
id: null,
wagaId: null,
wagaCode: null,
powerType: null,
powerModel: null,
wagaName: null,

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

@ -16,9 +16,9 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="关联水闸" prop="wagaId">
<el-form-item label="关联水闸" prop="wagaCode">
<el-input
v-model="queryParams.data.wagaId"
v-model="queryParams.data.wagaCode"
placeholder="请输入水闸id"
clearable
size="small"
@ -114,7 +114,7 @@
<el-table-column
label="关联水闸"
align="center"
prop="wagaId"
prop="wagaCode"
:formatter="wageIdFormat"
min-width="120"
/>
@ -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="wagaId">
<!-- <el-input v-model="form.wagaId" placeholder="请输入水闸id" /> -->
<el-form-item label="关联水闸" prop="wagaCode">
<!-- <el-input v-model="form.wagaCode" placeholder="请输入水闸id" /> -->
<el-select
v-model="form.wagaId"
v-model="form.wagaCode"
placeholder="请选择关联水闸"
style="width: 100%"
>
@ -227,7 +227,7 @@
v-for="dict in wagaNameOptions"
:key="dict.id"
:label="dict.wagaName"
:value="dict.id"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-form-item>
@ -357,7 +357,7 @@ export default {
pageSize: 10,
ids: null,
data: {
wagaId: null,
wagaCode: null,
wagaCode: null,
wagaName: null,
wagaType: null,
@ -403,8 +403,8 @@ export default {
},
methods: {
wageIdFormat(row) {
const id = row.wagaId;
let data = this.wagaNameOptions.find((res) => res.id == id);
const wagaCode = row.wagaCode;
let data = this.wagaNameOptions.find((res) => res.wagaCode == wagaCode);
if (data) return data.wagaName;
},
//
@ -430,7 +430,7 @@ export default {
this.fileList = [];
this.form = {
id: null,
wagaId: null,
wagaCode: null,
wagaCode: null,
wagaName: null,
wagaType: null,
@ -457,7 +457,7 @@ export default {
pageSize: 10,
data: {
id: null,
wagaId: null,
wagaCode: null,
wagaCode: null,
wagaName: null,
wagaType: null,

30
src/views/sluice/safetyManage/floodControlManagement/supplies.vue

@ -16,9 +16,9 @@
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item label="水闸id" prop="wagaId">
<!-- <el-form-item label="水闸id" prop="wagaCode">
<el-input
v-model="queryParams.data.wagaId"
v-model="queryParams.data.wagaCode"
placeholder="请输入水闸id"
clearable
size="small"
@ -34,9 +34,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="关联水闸" prop="wagaId">
<el-form-item label="关联水闸" prop="wagaCode">
<el-select
v-model="queryParams.data.wagaId"
v-model="queryParams.data.wagaCode"
placeholder="请选择关联水闸"
style="width: 100%"
@change="handleQuery"
@ -45,7 +45,7 @@
v-for="dict in wagaNameOptions"
:key="dict.id"
:label="dict.wagaName"
:value="dict.id"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-form-item>
@ -154,7 +154,7 @@
<el-table-column
label="关联水闸"
align="center"
prop="wagaId"
prop="wagaCode"
:formatter="wageIdFormat"
min-width="120"
/>
@ -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="wagaId">
<!-- <el-input v-model="form.wagaId" placeholder="请输入水闸id" /> -->
<el-form-item label="关联水闸" prop="wagaCode">
<!-- <el-input v-model="form.wagaCode" placeholder="请输入水闸id" /> -->
<el-select
v-model="form.wagaId"
v-model="form.wagaCode"
placeholder="请选择关联水闸"
style="width: 100%"
>
@ -378,7 +378,7 @@ export default {
pageSize: 10,
ids: null,
data: {
wagaId: null,
wagaCode: null,
materialName: null,
wagaName: null,
personName: null,
@ -404,7 +404,7 @@ export default {
form: {},
//
rules: {
wagaId: [
wagaCode: [
{ required: true, message: "请选择关联水闸", trigger: "blur" },
],
materialName: [
@ -452,8 +452,8 @@ export default {
});
},
wageIdFormat(row) {
const id = row.wagaId;
let data = this.wagaNameOptions.find((res) => res.id == id);
const wagaCode = row.wagaCode;
let data = this.wagaNameOptions.find((res) => res.wagaCode == wagaCode);
if (data) return data.wagaName;
},
//
@ -469,7 +469,7 @@ export default {
reset() {
this.form = {
id: null,
wagaId: null,
wagaCode: null,
materialName: null,
wagaName: null,
personName: null,
@ -495,7 +495,7 @@ export default {
pageSize: 10,
data: {
id: null,
wagaId: null,
wagaCode: null,
materialName: null,
wagaName: null,
personName: null,

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

@ -135,8 +135,8 @@
<el-table-column
label="水闸名称"
align="center"
prop="wagaId"
:formatter="wagaIdFormat"
prop="wagaCode"
:formatter="wagaCodeFormat"
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="wagaId">
<el-form-item label="水闸名称" prop="wagaCode">
<el-select
v-model="form.wagaId"
v-model="form.wagaCode"
placeholder="请选择水闸名称"
style="width: 100%"
>
@ -248,7 +248,7 @@
v-for="dict in wagaNameOptions"
:key="dict.id"
:label="dict.wagaName"
:value="dict.id"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-form-item>
@ -443,7 +443,7 @@ export default {
form: {},
//
rules: {
wagaId: [
wagaCode: [
{ required: true, message: "请选择水闸名称", trigger: "blur" },
],
organizationName: [
@ -524,21 +524,21 @@ export default {
typeFormat(row, column) {
return this.selectDictLabel(this.typeOptions, row.chargePersonType);
},
wagaIdFormat(row) {
const id = row.wagaId;
wagaCodeFormat(row) {
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.id == id);
let data = this.wagaNameOptions.find((res) => res.wagaCode == wagaCode);
if (data) return data.wagaName;
},
/** 查询防汛组织列表 */
getList() {
this.loading = true;
// this.queryParams.data.wagaId = this.$route.query.baseDataId;
// this.queryParams.data.wagaCode = 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.wagaId = this.$route.query.baseDataId;
// this.form.wagaCode = this.$route.query.baseDataId;
addFxzz(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");

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

@ -9,7 +9,7 @@
>
<el-form-item label="水闸名称" prop="wageName">
<el-select
v-model="queryParams.data.wagaId"
v-model="queryParams.data.wagaCode"
placeholder="请选择水闸名称"
style="width: 100%"
@change="handleQuery"
@ -113,8 +113,8 @@
<el-table-column
label="水闸名称"
align="center"
prop="wagaId"
:formatter="wagaIdFormat"
prop="wagaCode"
:formatter="wagaCodeFormat"
min-width="120"
>
</el-table-column>
@ -223,9 +223,9 @@
:close-on-click-modal="false"
>
<el-form ref="form" :model="form" :rules="rules" label-width="124px">
<el-form-item label="水闸名称" prop="wagaId">
<el-form-item label="水闸名称" prop="wagaCode">
<el-select
v-model="form.wagaId"
v-model="form.wagaCode"
placeholder="请选择水闸名称"
style="width: 100%"
>
@ -233,7 +233,7 @@
v-for="dict in wagaNameOptions"
:key="dict.id"
:label="dict.wagaName"
:value="dict.id"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-form-item>
@ -392,7 +392,7 @@ export default {
form: {},
//
rules: {
wagaId: [
wagaCode: [
{ required: true, message: "请选择水闸名称", trigger: "blur" },
],
type: [
@ -443,15 +443,15 @@ export default {
this.loading = false;
});
},
wagaIdFormat(row) {
const id = row.wagaId;
wagaCodeFormat(row) {
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.id == id);
let data = this.wagaNameOptions.find((res) => res.wagaCode == wagaCode);
if (data) return data.wagaName;
},
//

20
src/views/sluice/safetyManage/safeProduction/components/list.vue

@ -93,7 +93,7 @@
<el-table-column
label="关联水闸"
align="center"
prop="wagaId"
prop="wagaCode"
:formatter="wageIdFormat"
min-width="120"
/>
@ -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="wagaId">
<!-- <el-input v-model="form.wagaId" placeholder="请输入水闸id" /> -->
<el-form-item label="关联水闸" prop="wagaCode">
<!-- <el-input v-model="form.wagaCode" placeholder="请输入水闸id" /> -->
<el-select
v-model="form.wagaId"
v-model="form.wagaCode"
placeholder="请选择关联水闸"
style="width: 100%"
:disabled="isResolve"
@ -223,7 +223,7 @@
v-for="dict in wagaNameOptions"
:key="dict.id"
:label="dict.wagaName"
:value="dict.id"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-form-item>
@ -379,7 +379,7 @@ export default {
pageSize: 10,
ids: null,
data: {
wagaId: null,
wagaCode: null,
proposer: null,
head: null,
findTime: null,
@ -445,8 +445,8 @@ export default {
});
},
wageIdFormat(row) {
const id = row.wagaId;
let data = this.wagaNameOptions.find((res) => res.id == id);
const wagaCode = row.wagaCode;
let data = this.wagaNameOptions.find((res) => res.wagaCode == wagaCode);
if (data) return data.wagaName;
},
/** 查询水闸隐患信息列表 */
@ -475,7 +475,7 @@ export default {
this.fileList = [];
this.form = {
id: null,
wagaId: null,
wagaCode: null,
proposer: null,
head: null,
findTime: null,
@ -508,7 +508,7 @@ export default {
pageSize: 10,
data: {
id: null,
wagaId: null,
wagaCode: null,
proposer: null,
head: null,
findTime: null,

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

@ -20,7 +20,7 @@
>
<el-form-item label="水闸名称" prop="wagaName">
<el-select
v-model="queryParams.data.wagaId"
v-model="queryParams.data.wagaCode"
placeholder="请选择水闸名称"
style="width: 100%"
filterable
@ -31,7 +31,7 @@
v-for="dict in wagaNameOptions"
:key="dict.id"
:label="dict.wagaName"
:value="dict.id"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-form-item>
@ -373,7 +373,7 @@ export default {
pageSize: 10,
ids: null,
data: {
wagaId: null,
wagaCode: null,
taskId: null,
planTime: null,
completionTime: null,
@ -482,7 +482,7 @@ export default {
pageSize: 10,
data: {
id: null,
wagaId: null,
wagaCode: null,
taskId: null,
planTime: null,
completionTime: null,

16
src/views/sluice/safetyManage/safetyAppraisal/task.vue

@ -128,7 +128,7 @@
<!-- <el-table-column
label="任务水闸id"
align="center"
prop="wagaIds"
prop="wagaCodes"
min-width="120"
/> -->
<el-table-column
@ -237,14 +237,14 @@
<el-form-item label="任务名称" prop="taskName">
<el-input v-model="form.taskName" placeholder="请输入任务名称" />
</el-form-item>
<el-form-item label="任务水闸id" prop="wagaIds">
<el-form-item label="任务水闸Code" prop="wagaCodes">
<!-- <el-input
v-model="form.wagaIds"
v-model="form.wagaCodes"
type="textarea"
placeholder="请输入内容"
/> -->
<el-select
v-model="form.wagaIds"
v-model="form.wagaCodes"
placeholder="请选择水闸名称"
style="width: 100%"
multiple
@ -253,7 +253,7 @@
v-for="dict in wagaNameOptions"
:key="dict.id"
:label="dict.wagaName"
:value="dict.id"
:value="dict.wagaCode"
></el-option>
</el-select>
</el-form-item>
@ -384,7 +384,7 @@ export default {
pageSize: 10,
ids: null,
data: {
wagaIds: null,
wagaCodes: null,
planCompletionTime: null,
taskSluiceNumber: null,
completionNumber: null,
@ -448,7 +448,7 @@ export default {
reset() {
this.form = {
id: null,
wagaIds: null,
wagaCodes: null,
planCompletionTime: null,
taskSluiceNumber: null,
completionNumber: null,
@ -473,7 +473,7 @@ export default {
pageSize: 10,
data: {
id: null,
wagaIds: null,
wagaCodes: null,
planCompletionTime: null,
taskSluiceNumber: null,
completionNumber: null,

Loading…
Cancel
Save