ljf
/
shuili-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

运管立项

sy-water-data-board-ui
zth 1 month ago
parent
8bf2f1b15f
commit
8465dc0db2
25 changed files with 311 additions and 150 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/layout/components/Navbar.vue
  2. 2
      src/layout/components/Sidebar/index.vue
  3. 40
      src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue
  4. 14
      src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue
  5. 2
      src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystem.vue
  6. 38
      src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemFxzz.vue
  7. 105
      src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemFzr.vue
  8. 63
      src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemMan.vue
  9. 5
      src/views/dike/engineeringCondition/identificationPlate/index.vue
  10. 4
      src/views/dike/safetyManage/floodControlManagement/power.vue
  11. 36
      src/views/dike/safetyManage/responsiblePersonManage/components/list.vue
  12. 12
      src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue
  13. 2
      src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
  14. 14
      src/views/dike/safetyManage/safetyAppraisal/list.vue
  15. 6
      src/views/res/engineeringCondition/resBaseInfo/index.vue
  16. 4
      src/views/res/safetyManage/floodControlManagement/power.vue
  17. 4
      src/views/safetyManage/floodControlManagement/sluice/power.vue
  18. 22
      src/views/sluice/engineeringCondition/sluiceBaseInfo/options/index.vue
  19. 2
      src/views/sluice/engineeringCondition/sluiceBaseInfo/options/managementSystem.vue
  20. 29
      src/views/sluice/engineeringCondition/sluiceBaseInfo/options/managementSystemFzr.vue
  21. 4
      src/views/sluice/safetyManage/floodControlManagement/power.vue
  22. 31
      src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
  23. 2
      src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue
  24. 2
      src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
  25. 7
      src/views/sluice/safetyManage/safetyAppraisal/list.vue

11
src/layout/components/Navbar.vue
View File

@ -168,7 +168,16 @@ export default {
timestamp: new Date().getTime(), timestamp: new Date().getTime(),
}, },
}); });
} else { }else if(e.value==="reservoir"){
this.$router.replace({
path: "/reservoir/engineeringCondition/resBaseInfo",
query: {
timestamp: new Date().getTime(),
},
});
}
else {
this.$router.replace({ this.$router.replace({
path: "/", path: "/",
query: { query: {

2
src/layout/components/Sidebar/index.vue
View File

@ -60,6 +60,8 @@ export default {
newPath = "/dike/safetyManage/declare"; newPath = "/dike/safetyManage/declare";
} else if (path.includes("/dike/safetyManage/examine/")) { } else if (path.includes("/dike/safetyManage/examine/")) {
newPath = "/dike/safetyManage/examine"; newPath = "/dike/safetyManage/examine";
} else if (path.includes("/reservoir/engineeringCondition/resBaseInfo/")){
newPath ="/reservoir/engineeringCondition/resBaseInfo"
} }
// if set path, the sidebar will highlight the path you set // if set path, the sidebar will highlight the path you set
if (meta.activeMenu) { if (meta.activeMenu) {

40
src/views/dike/engineeringCondition/dikeBaseInfo/options/dikeCrossSectionTrait.vue
View File

@ -9,24 +9,24 @@
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-dialog <el-dialog
:title="viewTitle" :title="viewTitle"
@ -657,8 +657,8 @@ export default {
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
// this.reset(); this.open = false;
this.$router.back(); this.reset();
}, },
// 表单重置 // 表单重置
reset() { reset() {

14
src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue
View File

@ -10,13 +10,13 @@
> >
</el-breadcrumb> </el-breadcrumb>
<div class="pageTop"> <!-- <div class="pageTop">-->
<el-page-header @back="goBack" :content="routeList[1].routeName"> <!-- <el-page-header @back="goBack" :content="routeList[1].routeName">-->
</el-page-header> <!-- </el-page-header>-->
<el-button type="primary" @click="goCompare" v-loading="goCompareStatus" <!-- <el-button type="primary" @click="goCompare" v-loading="goCompareStatus"-->
>对比修改记录</el-button <!-- >对比修改记录</el-button-->
> <!-- >-->
</div> <!-- </div>-->
<el-tabs <el-tabs
v-model="activeName" v-model="activeName"

2
src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystem.vue
View File

@ -18,7 +18,7 @@
<managementSystemFxzz ref="managementSystemFxzz" :dikeCode="dikeCode" /> <managementSystemFxzz ref="managementSystemFxzz" :dikeCode="dikeCode" />
<div class="listTitle"> <div class="listTitle">
<span>执行/管理团队管理</span> <span>工程单位管理</span>
</div> </div>
<management-system-man ref="managementSystemMan" :dikeCode="dikeCode" :dikeName="formData.dikeName"/> <management-system-man ref="managementSystemMan" :dikeCode="dikeCode" :dikeName="formData.dikeName"/>
</div> </div>

38
src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemFxzz.vue
View File

@ -9,31 +9,31 @@
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="fxzzList" :data="fxzzList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" fixed /> <!-- <el-table-column type="selection" width="55" align="center" fixed />-->
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"

105
src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemFzr.vue
View File

@ -9,31 +9,31 @@
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="fzrList" :data="fzrList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" fixed /> <!-- <el-table-column type="selection" width="55" align="center" fixed />-->
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
@ -42,32 +42,43 @@
fixed fixed
/> />
<el-table-column <el-table-column
label="责任人部门类型" label="防汛负责人/安全负责人类型"
align="center" align="center"
prop="type" prop="type"
:formatter="typeFormat"
min-width="120" min-width="120"
/> >
<template slot-scope="scope" >
<span v-if="scope.row.type === '0'">
{{ personResponsibleTypeFormat(scope.row) }}
</span>
<span v-else-if="scope.row.type === '1'">
{{ typePersonFormat(scope.row) }}
</span>
<span v-else>
未知类型
</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="责任人名称" label="名称"
align="center" align="center"
prop="name" prop="name"
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"
prop="duties" prop="duties"
min-width="120" min-width="120"
/> />
<el-table-column <el-table-column
label="责任人手机号" label="手机号"
align="center" align="center"
prop="phone" prop="phone"
min-width="120" min-width="120"
@ -140,7 +151,7 @@
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="dict in typeOptions" v-for="dict in typePersonOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue" :value="dict.dictValue"
@ -168,8 +179,12 @@
<el-input v-model="form.phone" placeholder="请输入责任人手机号" /> <el-input v-model="form.phone" placeholder="请输入责任人手机号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="form.type == '0'"> <el-col :span="12" >
<el-form-item label="责任人类型" prop="personResponsibleType"> <el-form-item
label="防汛负责人"
prop="personResponsibleType"
v-if="form.type == '0'"
>
<el-select <el-select
v-model="form.personResponsibleType" v-model="form.personResponsibleType"
placeholder="请选择责任人类型" placeholder="请选择责任人类型"
@ -183,6 +198,24 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
label="安全负责人"
prop="safetyType"
v-if="form.type == '1'"
>
<el-select
v-model="form.safetyType"
placeholder="请选择责任人类型"
style="width: 100%"
>
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="form.type == '2'"> <el-col :span="12" v-if="form.type == '2'">
<el-form-item label="生效日期" prop="effectiveDate"> <el-form-item label="生效日期" prop="effectiveDate">
@ -225,7 +258,7 @@
:contentStyle="{ minWidth: '350px' }" :contentStyle="{ minWidth: '350px' }"
> >
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 责任人部门类型 </template> <template slot="label"> 防汛负责人/安全负责人类型 </template>
{{ typeFormat(this.fzrInfo) }} {{ typeFormat(this.fzrInfo) }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
@ -297,6 +330,7 @@ export default {
personResponsibleTypeOptions: [], personResponsibleTypeOptions: [],
// 类型字典 // 类型字典
typeOptions: [], typeOptions: [],
typePersonOptions:[],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -364,6 +398,9 @@ export default {
this.getDicts("person_dept").then((response) => { this.getDicts("person_dept").then((response) => {
this.typeOptions = response.data; this.typeOptions = response.data;
}); });
this.getDicts("type_person").then((response) => {
this.typePersonOptions = response.data;
});
}, },
methods: { methods: {
viewInFo(row) { viewInFo(row) {
@ -381,8 +418,9 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
// 责任人类型字典翻译 // 防汛责任人类型字典翻译
personResponsibleTypeFormat(row, column) { personResponsibleTypeFormat(row, column) {
console.log(row,9999)
return this.selectDictLabel( return this.selectDictLabel(
this.personResponsibleTypeOptions, this.personResponsibleTypeOptions,
row.personResponsibleType row.personResponsibleType
@ -390,7 +428,10 @@ export default {
}, },
// 责任人部门类型字典翻译 // 责任人部门类型字典翻译
typeFormat(row, column) { typeFormat(row, column) {
return this.selectDictLabel(this.typeOptions, row.type); return this.selectDictLabel(this.typePersonOptions, row.type);
},
typePersonFormat(row, column) {
return this.selectDictLabel(this.typeOptions, row.safetyType);
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {

63
src/views/dike/engineeringCondition/dikeBaseInfo/options/managementSystemMan.vue
View File

@ -10,24 +10,24 @@
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="warning"--> <!-- type="warning"-->
@ -41,15 +41,15 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="manateamList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="manateamList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" fixed/> <!-- <el-table-column type="selection" width="55" align="center" fixed/>-->
<el-table-column label="序号" type="index" width="50" align="center" fixed/> <el-table-column label="序号" type="index" width="50" align="center" fixed/>
<el-table-column label="堤防名称" align="center" prop="dikeName" min-width="120"/> <el-table-column label="堤防名称" align="center" prop="dikeName" min-width="120"/>
<el-table-column label="堤防代码" align="center" prop="dikeCode" min-width="120"/> <!-- <el-table-column label="堤防代码" align="center" prop="dikeCode" min-width="120"/>-->
<el-table-column label="账户或或手机号" align="center" prop="phone" min-width="120"/> <el-table-column label="账户或或手机号" align="center" prop="phone" min-width="120"/>
<el-table-column label="部门" align="center" prop="department" min-width="120"/> <el-table-column label="单位" align="center" prop="department" min-width="120"/>
<el-table-column label="人员名称" align="center" prop="personName" min-width="120"/> <el-table-column label="人员名称" align="center" prop="personName" min-width="120"/>
<el-table-column label="人员类型" align="center" prop="personType" :formatter="personTypeFormat" min-width="120"/> <el-table-column label="单位类型" align="center" prop="personType" :formatter="personTypeFormat" min-width="120"/>
<el-table-column label="身份证号" align="center" prop="idNo" min-width="120"/> <el-table-column label="身份证号" align="center" prop="idNo" min-width="120"/>
<el-table-column label="职务" align="center" prop="post" min-width="120"/> <el-table-column label="职务" align="center" prop="post" min-width="120"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
@ -81,20 +81,20 @@
<!-- 添加或修改管理团队管理对话框 --> <!-- 添加或修改管理团队管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false"> <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="堤防代码" prop="dikeCode"> <!-- <el-form-item label="堤防代码" prop="dikeCode">-->
<el-input v-model="form.dikeCode" placeholder="请输入堤防代码" disabled/> <!-- <el-input v-model="form.dikeCode" placeholder="请输入堤防代码" disabled/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="账户或或手机号" prop="phone"> <el-form-item label="账户或或手机号" prop="phone">
<line-user :form="form" v-if="open" /> <line-user :form="form" v-if="open" />
</el-form-item> </el-form-item>
<el-form-item label="部门" prop="department"> <el-form-item label="单位" prop="department">
<el-input v-model="form.department" placeholder="请输入部门" /> <el-input v-model="form.department" placeholder="请输入单位" />
</el-form-item> </el-form-item>
<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"
@ -282,7 +282,7 @@ export default {
this.open = true; this.open = true;
this.form.dikeCode=this.dikeCode this.form.dikeCode=this.dikeCode
this.form.dikeName=this.dikeName this.form.dikeName=this.dikeName
this.title = "添加管理团队管理"; this.title = "添加工程单位管理";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -293,13 +293,14 @@ export default {
getManateam(id).then(response => { getManateam(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改管理团队管理"; this.title = "修改工程单位管理";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
this.form.dikeCode=this.dikeCode
if (this.form.id != null) { if (this.form.id != null) {
updateManateam(this.form).then(response => { updateManateam(this.form).then(response => {
if (response.code === 200) { if (response.code === 200) {

5
src/views/dike/engineeringCondition/identificationPlate/index.vue
View File

@ -650,6 +650,7 @@ export default {
}, },
handleClick() { handleClick() {
this.search = ""; this.search = "";
this.rowIsEdit=false
this.$refs.markForm.resetForm(); this.$refs.markForm.resetForm();
}, },
formatAdcd(row) { formatAdcd(row) {
@ -805,6 +806,7 @@ export default {
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.rowIsEdit=false
this.open = false; this.open = false;
this.reset(); this.reset();
}, },
@ -959,7 +961,7 @@ export default {
this.reset(); this.reset();
this.isEdit = false; this.isEdit = false;
this.open = true; this.open = true;
this.title = "添加堤防标识标牌11111"; this.title = "添加堤防标识标牌";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -1057,6 +1059,7 @@ export default {
} }
} }
}); });
this.rowIsEdit=false
}, },
submitForm() { submitForm() {
// console.log(1111111111, this.$refs.noticeForm0[0].$refs.form); // console.log(1111111111, this.$refs.noticeForm0[0].$refs.form);

4
src/views/dike/safetyManage/floodControlManagement/power.vue
View File

@ -145,9 +145,9 @@
min-width="120" min-width="120"
/> --> /> -->
<el-table-column <el-table-column
label="备用电源数量（字段未有）" label="备用电源数量"
align="center" align="center"
prop="powerNumber" prop="total"
min-width="120" min-width="120"
/> />
<el-table-column <el-table-column

36
src/views/dike/safetyManage/responsiblePersonManage/components/list.vue
View File

@ -142,13 +142,13 @@
> --> > -->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="责任人名称" label="名称"
align="center" align="center"
prop="name" prop="name"
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"
@ -261,14 +261,14 @@
></el-option> ></el-option>
</el-select> --> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="责任人部门类型" prop="type"> <el-form-item label="责任人类型" prop="type">
<el-select <el-select
v-model="form.type" v-model="form.type"
placeholder="请选择责任人部门类型" placeholder="请选择责任人类型"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="dict in typeOptions" v-for="dict in typePersonOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue" :value="dict.dictValue"
@ -303,7 +303,7 @@
<el-input v-model="form.phone" placeholder="请输入手机号" /> <el-input v-model="form.phone" placeholder="请输入手机号" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="责任人类型" label="防汛负责人"
prop="personResponsibleType" prop="personResponsibleType"
v-if="form.type == '0'" v-if="form.type == '0'"
> >
@ -320,6 +320,24 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
label="安全负责人"
prop="safetyType"
v-if="form.type == '1'"
>
<el-select
v-model="form.safetyType"
placeholder="请选择责任人类型"
style="width: 100%"
>
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item <el-form-item
label="生效日期" label="生效日期"
prop="effectiveDate" prop="effectiveDate"
@ -400,6 +418,7 @@ export default {
personResponsibleTypeOptions: [], personResponsibleTypeOptions: [],
// 类型字典 // 类型字典
typeOptions: [], typeOptions: [],
typePersonOptions:[],
// 堤防项目 // 堤防项目
dikeNameOptions: [], dikeNameOptions: [],
// 查询参数 // 查询参数
@ -476,6 +495,9 @@ export default {
this.getDicts("person_dept").then((response) => { this.getDicts("person_dept").then((response) => {
this.typeOptions = response.data; this.typeOptions = response.data;
}); });
this.getDicts("type_person").then((response) => {
this.typePersonOptions = response.data;
});
this.getDicts("flood_person_type").then((response) => { this.getDicts("flood_person_type").then((response) => {
this.personTpyeOptions = response.data; this.personTpyeOptions = response.data;
}); });
@ -510,7 +532,7 @@ export default {
}, },
// 类型字典翻译 // 类型字典翻译
typeFormat(row, column) { typeFormat(row, column) {
return this.selectDictLabel(this.typeOptions, row.type); return this.selectDictLabel(this.typePersonOptions, row.type);
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {

12
src/views/dike/safetyManage/safetyAppraisal/components/listBaseInfo.vue
View File

@ -278,7 +278,7 @@ export default {
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: this.openL,
// 审定部门级别字典 // 审定部门级别字典
approvalDepartmentLevelOptions: [], approvalDepartmentLevelOptions: [],
// 安全类别字典 // 安全类别字典
@ -344,6 +344,14 @@ export default {
this.securityCategoryOptions = response.data; this.securityCategoryOptions = response.data;
}); });
}, },
watch: {
open(newVal) {
if (!newVal) {
// 当 openL 变为 false 时，触发自定义事件通知父组件
this.$emit('closeParentTabs');
}
}
},
methods: { methods: {
/** 查询堤防安全鉴定信息列表 */ /** 查询堤防安全鉴定信息列表 */
getList() { getList() {
@ -502,8 +510,10 @@ export default {
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) {
console.log(this.openL,'111111')
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
console.log(this.openL,'111111')
this.getList(); this.getList();
} }
}); });

2
src/views/dike/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
View File

@ -368,6 +368,7 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
this.cancel()
} }
}); });
} else { } else {
@ -377,6 +378,7 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
this.cancel()
} }
}); });
} }

14
src/views/dike/safetyManage/safetyAppraisal/list.vue
View File

@ -109,7 +109,12 @@
align="center" align="center"
fixed fixed
/> />
<el-table-column
label="任务名称"
align="center"
prop="taskName"
min-width="120"
/>
<el-table-column <el-table-column
label="堤防名称" label="堤防名称"
align="center" align="center"
@ -229,7 +234,7 @@
<listBaseInfo <listBaseInfo
ref="listBaseInfo" ref="listBaseInfo"
:dfrwId="dfrwId" :dfrwId="dfrwId"
:dikeName="dikeName" @closeParentTabs="closeTabs"
@cancelParent="cancel" @cancelParent="cancel"
/> />
</el-tab-pane> </el-tab-pane>
@ -237,6 +242,7 @@
<listSafetyDetection <listSafetyDetection
:dfrwId="dfrwId" :dfrwId="dfrwId"
:dikeName="dikeName" :dikeName="dikeName"
@closeParentTabs="closeTabs"
@cancelParent="cancel" @cancelParent="cancel"
/> />
</el-tab-pane> </el-tab-pane>
@ -425,6 +431,10 @@ export default {
}); });
}, },
methods: { methods: {
closeTabs() {
// 当接收到子组件的关闭通知时，将 open 设置为 false
this.open = false;
},
pass() { pass() {
this.form.status = "3"; this.form.status = "3";
updateSzrw(this.form).then((response) => { updateSzrw(this.form).then((response) => {

6
src/views/res/engineeringCondition/resBaseInfo/index.vue
View File

@ -236,6 +236,12 @@ export default {
name: "Base", name: "Base",
data() { data() {
return { return {
routeList: [
{
path: "/dike/engineeringCondition/dikeBaseInfo",
routeName: "堤防基本信息列表",
},
],
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组

4
src/views/res/safetyManage/floodControlManagement/power.vue
View File

@ -145,9 +145,9 @@
min-width="120" min-width="120"
/> --> /> -->
<el-table-column <el-table-column
label="备用电源数量（字段未有）" label="备用电源数量"
align="center" align="center"
prop="powerNumber" prop="total"
min-width="120" min-width="120"
/> />
<el-table-column <el-table-column

4
src/views/safetyManage/floodControlManagement/sluice/power.vue
View File

@ -113,9 +113,9 @@
min-width="120" min-width="120"
/> />
<el-table-column <el-table-column
label="备用电源数量（字段未有）" label="备用电源数量"
align="center" align="center"
prop="powerNumber" prop="total"
min-width="120" min-width="120"
/> />
<el-table-column <el-table-column

22
src/views/sluice/engineeringCondition/sluiceBaseInfo/options/index.vue
View File

@ -10,17 +10,17 @@
> >
</el-breadcrumb> </el-breadcrumb>
<div class="pageTop"> <!-- <div class="pageTop">-->
<el-page-header @back="goBack" :content="routeList[1].routeName"> <!-- <el-page-header @back="goBack" :content="routeList[1].routeName">-->
</el-page-header> <!-- </el-page-header>-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
@click="goCompare" <!-- @click="goCompare"-->
v-loading="goCompareStatus" <!-- v-loading="goCompareStatus"-->
v-hasPermi="['sluice:compare:page']" <!-- v-hasPermi="['sluice:compare:page']"-->
>对比修改记录</el-button <!-- >对比修改记录</el-button-->
> <!-- >-->
</div> <!-- </div>-->
<el-tabs <el-tabs
v-model="activeName" v-model="activeName"

2
src/views/sluice/engineeringCondition/sluiceBaseInfo/options/managementSystem.vue
View File

@ -35,6 +35,8 @@ export default {
handleAdd(key) { handleAdd(key) {
if (key == "0") this.$refs.managementSystemFzr.handleAdd(); if (key == "0") this.$refs.managementSystemFzr.handleAdd();
if (key == "1") this.$refs.managementSystemFxzz.handleAdd(); if (key == "1") this.$refs.managementSystemFxzz.handleAdd();
// if (key == "2") this.$refs.managementSystemMan.handleAdd();
}, },
}, },
}; };

29
src/views/sluice/engineeringCondition/sluiceBaseInfo/options/managementSystemFzr.vue
View File

@ -14,12 +14,23 @@
fixed fixed
/> />
<el-table-column <el-table-column
label="责任人部门类型" label="防汛负责人/安全负责人类型"
align="center" align="center"
prop="type" prop="type"
:formatter="typeFormat"
min-width="120" min-width="120"
/> >
<template slot-scope="scope" >
<span v-if="scope.row.type === '0'">
{{ personResponsibleTypeFormat(scope.row) }}
</span>
<span v-else-if="scope.row.type === '1'">
{{ typePersonFormat(scope.row) }}
</span>
<span v-else>
未知类型
</span>
</template>
</el-table-column>
<el-table-column <el-table-column
label="责任人名称" label="责任人名称"
align="center" align="center"
@ -271,6 +282,8 @@ export default {
personResponsibleTypeOptions: [], personResponsibleTypeOptions: [],
// 类型字典 // 类型字典
typeOptions: [], typeOptions: [],
typePersonOptions:[],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -338,6 +351,9 @@ export default {
this.getDicts("person_dept").then((response) => { this.getDicts("person_dept").then((response) => {
this.typeOptions = response.data; this.typeOptions = response.data;
}); });
this.getDicts("type_person").then((response) => {
this.typePersonOptions = response.data;
});
}, },
methods: { methods: {
viewInFo(row) { viewInFo(row) {
@ -349,6 +365,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
this.queryParams.data.wagaCode = this.wagaCode; this.queryParams.data.wagaCode = this.wagaCode;
console.log(this.wagaCode,"codecodecode")
listFzr(this.queryParams).then((response) => { listFzr(this.queryParams).then((response) => {
this.fzrList = response.records; this.fzrList = response.records;
this.total = response.total; this.total = response.total;
@ -357,6 +374,7 @@ export default {
}, },
// 责任人类型字典翻译 // 责任人类型字典翻译
personResponsibleTypeFormat(row, column) { personResponsibleTypeFormat(row, column) {
console.log(row,9999)
return this.selectDictLabel( return this.selectDictLabel(
this.personResponsibleTypeOptions, this.personResponsibleTypeOptions,
row.personResponsibleType row.personResponsibleType
@ -364,7 +382,10 @@ export default {
}, },
// 责任人部门类型字典翻译 // 责任人部门类型字典翻译
typeFormat(row, column) { typeFormat(row, column) {
return this.selectDictLabel(this.typeOptions, row.type); return this.selectDictLabel(this.typePersonOptions, row.type);
},
typePersonFormat(row, column) {
return this.selectDictLabel(this.typeOptions, row.safetyType);
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {

4
src/views/sluice/safetyManage/floodControlManagement/power.vue
View File

@ -145,9 +145,9 @@
min-width="120" min-width="120"
/> --> /> -->
<el-table-column <el-table-column
label="备用电源数量（字段未有）" label="备用电源数量"
align="center" align="center"
prop="powerNumber" prop="total"
min-width="120" min-width="120"
/> />
<el-table-column <el-table-column

31
src/views/sluice/safetyManage/responsiblePersonManage/components/list.vue
View File

@ -255,14 +255,14 @@
></el-option> ></el-option>
</el-select> --> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="责任人部门类型" prop="type"> <el-form-item label="责任人类型" prop="type">
<el-select <el-select
v-model="form.type" v-model="form.type"
placeholder="请选择责任人部门类型" placeholder="请选择责任人部门类型"
style="width: 100%" style="width: 100%"
> >
<el-option <el-option
v-for="dict in typeOptions" v-for="dict in typePersonOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue" :value="dict.dictValue"
@ -297,7 +297,7 @@
<el-input v-model="form.phone" placeholder="请输入手机号" /> <el-input v-model="form.phone" placeholder="请输入手机号" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="责任人类型" label="防汛负责人"
prop="personResponsibleType" prop="personResponsibleType"
v-if="form.type == '0'" v-if="form.type == '0'"
> >
@ -314,6 +314,24 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
label="安全负责人"
prop="safetyType"
v-if="form.type == '1'"
>
<el-select
v-model="form.safetyType"
placeholder="请选择责任人类型"
style="width: 100%"
>
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item <el-form-item
label="生效日期" label="生效日期"
prop="effectiveDate" prop="effectiveDate"
@ -392,6 +410,8 @@ export default {
personResponsibleTypeOptions: [], personResponsibleTypeOptions: [],
// 类型字典 // 类型字典
typeOptions: [], typeOptions: [],
typePersonOptions:[],
personTpyeOptions:[], personTpyeOptions:[],
// 水闸项目 // 水闸项目
wagaNameOptions: [], wagaNameOptions: [],
@ -469,6 +489,9 @@ export default {
this.getDicts("person_dept").then((response) => { this.getDicts("person_dept").then((response) => {
this.typeOptions = response.data; this.typeOptions = response.data;
}); });
this.getDicts("type_person").then((response) => {
this.typePersonOptions = response.data;
});
this.getDicts("flood_person_type").then((response) => { this.getDicts("flood_person_type").then((response) => {
this.personTpyeOptions = response.data; this.personTpyeOptions = response.data;
@ -504,7 +527,7 @@ export default {
}, },
// 类型字典翻译 // 类型字典翻译
typeFormat(row, column) { typeFormat(row, column) {
return this.selectDictLabel(this.typeOptions, row.type); return this.selectDictLabel(this.typePersonOptions, row.type);
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {

2
src/views/sluice/safetyManage/safetyAppraisal/components/listBaseInfo.vue
View File

@ -506,6 +506,7 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
this.cancel()
} }
}); });
} else { } else {
@ -515,6 +516,7 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
this.cancel()
} }
}); });
} }

2
src/views/sluice/safetyManage/safetyAppraisal/components/listSafetyDetection.vue
View File

@ -369,6 +369,7 @@ export default {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
this.cancel()
} }
}); });
} else { } else {
@ -378,6 +379,7 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
this.cancel()
} }
}); });
} }

7
src/views/sluice/safetyManage/safetyAppraisal/list.vue
View File

@ -109,7 +109,12 @@
align="center" align="center"
fixed fixed
/> />
<el-table-column
label="任务名称"
align="center"
prop="taskName"
min-width="120"
/>
<el-table-column <el-table-column
label="水闸名称" label="水闸名称"
align="center" align="center"

Write Preview
Loading…
Cancel
Save