Browse Source

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

fix: 修复bug

See merge request project/water/shuili-vue!102
sy-water-data-board-ui
潘裕艺 12 months ago
parent
commit
5e4e548db3
  1. 14
      src/views/dike/runManage/maintenance/maintenancePlan/index.vue
  2. 4
      src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
  3. 11
      src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
  4. 4
      src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

14
src/views/dike/runManage/maintenance/maintenancePlan/index.vue

@ -128,7 +128,7 @@ export default {
}); });
}, },
addPlan() { addPlan() {
// this.ruleForm.dikeCode = this.$route.query.dikeCode; this.ruleForm.dikeCode = this.$route.query.dikeCode;
this.dialogVisible = true; this.dialogVisible = true;
}, },
// //
@ -241,13 +241,13 @@ export default {
this.searchLevel = 1; this.searchLevel = 1;
this.getTableData(); this.getTableData();
}, },
getEmbData() { getEmbData(dikeName = "") {
listJbxx({ listJbxx({
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 20,
ids: null, ids: null,
data: { data: {
embankmentName: null, embankmentName: dikeName,
endStationNumber: null, endStationNumber: null,
embankmentType: null, embankmentType: null,
}, },
@ -284,7 +284,7 @@ export default {
mounted() { mounted() {
// //
this.getTableData(); this.getTableData();
this.getEmbData(); this.getEmbData(this.$route.query.dikeName);
this.tableHeight = document.documentElement.clientHeight - 256; this.tableHeight = document.documentElement.clientHeight - 256;
}, },
}; };
@ -292,7 +292,9 @@ export default {
<template> <template>
<div class="slider-right"> <div class="slider-right">
<div class="top-title">修养计划管理</div> <div class="top-title">
{{ $router.currentRoute.meta.title }} - {{ $route.query.dikeName }}
</div>
<div class="table-box" ref="containRef"> <div class="table-box" ref="containRef">
<div class="top-search"> <div class="top-search">
<span>计划名称</span> <span>计划名称</span>
@ -426,9 +428,9 @@ export default {
<el-form-item label-width="120px" label="堤防名称" prop="dikeCode"> <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
<el-select <el-select
v-model="ruleForm.dikeCode" v-model="ruleForm.dikeCode"
:disabled="true"
placeholder="请选择" placeholder="请选择"
@change="handleChangeDike" @change="handleChangeDike"
:disabled="prohibitEditing"
> >
<el-option <el-option
v-for="item in embankmentList" v-for="item in embankmentList"

4
src/views/dike/runManage/maintenance/maintenanceRecords/index.vue

@ -365,7 +365,9 @@ export default {
<template> <template>
<div class="slider-right"> <div class="slider-right">
<div class="top-title">维养记录管理</div> <div class="top-title">
{{ $router.currentRoute.meta.title }} - {{ $route.query.dikeName }}
</div>
<div class="table-box"> <div class="table-box">
<div class="top-search"> <div class="top-search">
<div class="flex items-start"> <div class="flex items-start">

11
src/views/sluice/runManage/maintenance/maintenancePlan/index.vue

@ -112,6 +112,7 @@ export default {
}); });
}, },
addPlan() { addPlan() {
this.ruleForm.wagaCode = this.$route.query.wagaCode;
this.dialogVisible = true; this.dialogVisible = true;
}, },
// //
@ -243,14 +244,16 @@ export default {
mounted() { mounted() {
// //
this.getTableData(); this.getTableData();
this.getBaseSluiceData(); this.getBaseSluiceData(this.$route.query.wagaName);
}, },
}; };
</script> </script>
<template> <template>
<div class="slider-right"> <div class="slider-right">
<div class="top-title">{{ $router.currentRoute.meta.title }}</div> <div class="top-title">
{{ $router.currentRoute.meta.title }} - {{ $route.query.wagaName }}
</div>
<div class="table-box"> <div class="table-box">
<div class="top-search"> <div class="top-search">
<span>计划名称</span> <span>计划名称</span>
@ -387,10 +390,8 @@ export default {
remote remote
v-model="ruleForm.wagaCode" v-model="ruleForm.wagaCode"
placeholder="请输入" placeholder="请输入"
:remote-method="remoteGetSluiceListMethod"
:loading="isLoadingSluice"
@change="handleChangeSluice" @change="handleChangeSluice"
:disabled="prohibitEditing" :disabled="true"
> >
<el-option <el-option
v-for="item in sluiceList" v-for="item in sluiceList"

4
src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

@ -362,7 +362,9 @@ export default {
<template> <template>
<div class="slider-right"> <div class="slider-right">
<div class="top-title">{{ $router.currentRoute.meta.title }}</div> <div class="top-title">
{{ $router.currentRoute.meta.title }} - {{ $route.query.dikeName }}
</div>
<div class="table-box"> <div class="table-box">
<div class="top-search"> <div class="top-search">
<div class="flex items-start"> <div class="flex items-start">

Loading…
Cancel
Save