Browse Source

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

fix: 修复bug

See merge request project/water/shuili-vue!169
sy-water-data-board-ui
潘裕艺 4 months ago
parent
commit
e2f26eaf18
  1. 13
      src/views/dike/runManage/maintenance/maintenancePlan/index.vue
  2. 23
      src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
  3. 2
      src/views/sluice/runManage/waterRainReport/monitoring/index.vue

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

@ -15,6 +15,7 @@ import { reqCountMixins } from "@/mixins/reqCount";
import { paginationMixins } from "@/mixins/commonPagination"; import { paginationMixins } from "@/mixins/commonPagination";
import { calcTableHeight } from "@/mixins/calcTableHeight"; import { calcTableHeight } from "@/mixins/calcTableHeight";
import { cascaderLazyLoad } from "@/utils/elUtils";
export default { export default {
name: "InspectionItems", name: "InspectionItems",
@ -25,6 +26,12 @@ export default {
mixins: [reqCountMixins, paginationMixins, calcTableHeight], mixins: [reqCountMixins, paginationMixins, calcTableHeight],
data() { data() {
return { return {
areasOptionProps: {
emitPath: false,
checkStrictly: true, //
lazy: true,
lazyLoad: cascaderLazyLoad,
},
paramsData: { paramsData: {
adcd: "", adcd: "",
dikeName: "", dikeName: "",
@ -265,12 +272,8 @@ export default {
<div class="search-item flex items-center"> <div class="search-item flex items-center">
<span class="search-label">行政区划</span> <span class="search-label">行政区划</span>
<el-cascader <el-cascader
:options="areasOptions"
v-model="paramsData.adcd" v-model="paramsData.adcd"
:props="{ :props="areasOptionProps"
emitPath: false,
checkStrictly: true,
}"
placeholder="请选择行政区划" placeholder="请选择行政区划"
clearable clearable
size="small" size="small"

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

@ -107,27 +107,6 @@ export default {
handleSelectionChange(e) { handleSelectionChange(e) {
this.tableCheckData = e || []; this.tableCheckData = e || [];
}, },
//
getTreeData() {
getAreasData().then((items) => {
let res = [];
let getChildren = (res, pid) => {
for (const i of items.data) {
if (i.parentid === pid) {
const newItem = {
label: i.name,
value: i.id,
};
if (i.layer != 3) newItem.children = [];
res.push(newItem);
getChildren(newItem.children, newItem.value);
}
}
};
getChildren(res, items.data[0].parentid);
this.areasOptions = res;
});
},
// //
handleDelAll() { handleDelAll() {
if (this.tableCheckData.length === 0) { if (this.tableCheckData.length === 0) {
@ -279,7 +258,6 @@ export default {
}, },
}, },
created() { created() {
this.getTreeData();
// //
getDicts("xs_yh_record_status").then((res) => { getDicts("xs_yh_record_status").then((res) => {
if (res.data && Array.isArray(res.data)) { if (res.data && Array.isArray(res.data)) {
@ -313,7 +291,6 @@ export default {
<div class="search-item flex items-center"> <div class="search-item flex items-center">
<span class="search-label">行政区划</span> <span class="search-label">行政区划</span>
<el-cascader <el-cascader
:options="areasOptions"
v-model="paramsData.adcd" v-model="paramsData.adcd"
:props="areasOptionProps" :props="areasOptionProps"
placeholder="请选择行政区划" placeholder="请选择行政区划"

2
src/views/sluice/runManage/waterRainReport/monitoring/index.vue

@ -1,6 +1,6 @@
<!-- 水雨情监测页面 --> <!-- 水雨情监测页面 -->
<template> <template>
<div class="patrol-manage-page"> <div class="patrol-manage-page slider-right">
<TopBackTitle title="水雨情监测"></TopBackTitle> <TopBackTitle title="水雨情监测"></TopBackTitle>
<div class="table-box slider-right-body" ref="tableBoxRef"> <div class="table-box slider-right-body" ref="tableBoxRef">
<div class="pb-16" ref="topBoxRef"> <div class="pb-16" ref="topBoxRef">

Loading…
Cancel
Save