修复因字典节流加载导致的异步正常结束异常

This commit is contained in:
aixianling
2022-09-26 09:41:56 +08:00
parent 45432afb6f
commit 7ef87ef44f

View File

@@ -2,50 +2,55 @@
<section class="AppPetitionManage"> <section class="AppPetitionManage">
<ai-detail> <ai-detail>
<!-- 标题 --> <!-- 标题 -->
<ai-title slot="title" title="楼栋管理" isShowBottomBorder /> <ai-title slot="title" title="楼栋管理" isShowBottomBorder/>
<template #content> <template #content>
<ai-tree-menu title="楼栋管理" @search="(v) => $refs.gridTree.filter(v)"> <ai-tree-menu title="楼栋管理" @search="(v) => $refs.gridTree.filter(v)">
<el-tree :data="treeData" ref="gridTree" :filter-node-method="handleTreeFilter" @node-click="handleSelectGrid" highlight-current node-key="id" :props="{ label: 'name', children: 'children' }" :default-expanded-keys="[defaultShowNodes]" /> <el-tree :data="treeData" ref="gridTree" :filter-node-method="handleTreeFilter" @node-click="handleSelectGrid" highlight-current node-key="id"
:props="{ label: 'name', children: 'children' }" :default-expanded-keys="[defaultShowNodes]"/>
</ai-tree-menu> </ai-tree-menu>
<div class="flex"> <div class="flex">
<ai-search-bar bottomBorder> <ai-search-bar bottomBorder>
<template slot="left"> <template slot="left">
<!-- 定位状态 --> <!-- 定位状态 -->
<ai-select v-model="search.locationStatus" placeholder="定位状态" clearable :selectList="$dict.getDict('BuildLocationStatus')" @change=";(page.current = 1), getList()"></ai-select> <ai-select v-model="search.locationStatus" placeholder="定位状态" clearable :selectList="dict.getDict('BuildLocationStatus')"
@change=";(page.current = 1), getList()"></ai-select>
</template> </template>
<!-- 搜索 --> <!-- 搜索 -->
<template slot="right"> <template slot="right">
<el-input <el-input
v-model="search.managerName" v-model="search.managerName"
size="small" size="small"
placeholder="楼栋号/楼长/联系方式" placeholder="楼栋号/楼长/联系方式"
clearable clearable
v-throttle="() => {page.current = 1, getList()}" v-throttle="() => {page.current = 1, getList()}"
@clear=";(page.current = 1), (search.managerName = ''), getList()" @clear=";(page.current = 1), (search.managerName = ''), getList()"
suffix-icon="iconfont iconSearch" /> suffix-icon="iconfont iconSearch"/>
</template> </template>
</ai-search-bar> </ai-search-bar>
<ai-search-bar class="ai-search-ba"> <ai-search-bar class="ai-search-ba">
<template slot="left"> <template slot="left">
<el-button icon="iconfont iconAdd" type="primary" size="small" @click="onAdd('')" :disabled="!isAdd">添加 </el-button> <el-button icon="iconfont iconAdd" type="primary" size="small" @click="onAdd('')" :disabled="!isAdd">添加</el-button>
<el-button icon="iconfont iconDelete" size="small" @click="removeAll" :disabled="ids.length == 0">删除 </el-button> <el-button icon="iconfont iconDelete" size="small" @click="removeAll" :disabled="ids.length == 0">删除</el-button>
</template> </template>
<!-- 导入导出 --> <!-- 导入导出 -->
<template #right> <template #right>
<ai-import :instance="instance" :dict="dict" type="appcommunitybuildinginfo" :importParams="{ areaId: user.info && user.info.areaId }" name="楼栋管理" @success="getList()"> <ai-import :instance="instance" :dict="dict" type="appcommunitybuildinginfo" :importParams="{ areaId: userArea}" name="楼栋管理"
@success="getList()">
<el-button icon="iconfont iconImport">导入</el-button> <el-button icon="iconfont iconImport">导入</el-button>
</ai-import> </ai-import>
<ai-download :instance="instance" url="/app/appcommunitybuildinginfo/listExport" :params="param" fileName="楼栋管理模板" :disabled="tableData.length == 0"> <ai-download :instance="instance" url="/app/appcommunitybuildinginfo/listExport" :params="param" fileName="楼栋管理模板"
:disabled="tableData.length == 0">
<el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button> <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
</ai-download> </ai-download>
</template> </template>
</ai-search-bar> </ai-search-bar>
<ai-table :tableData="tableData" :col-configs="colConfigs" :total="total" ref="aitableex" style="margin-top: 20px;" :current.sync="page.current" :size.sync="page.size" @getList="getList" @selection-change="(v) => (ids = v.map((e) => e.id))"> <ai-table :tableData="tableData" :col-configs="colConfigs" :total="total" ref="aitableex" style="margin-top: 20px;" :current.sync="page.current"
:size.sync="page.size" @getList="getList" @selection-change="(v) => (ids = v.map((e) => e.id))">
<el-table-column slot="locationStatus" label="定位状态" align="center"> <el-table-column slot="locationStatus" label="定位状态" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span style="color:red" v-if="row.locationStatus == 0">{{ dict.getLabel('BuildLocationStatus', row.locationStatus) }}</span> <span style="color:red" v-if="row.locationStatus == 0">{{ dict.getLabel('BuildLocationStatus', row.locationStatus) }}</span>
@@ -58,7 +63,8 @@
<el-button type="text" @click="onAdd(row.id)">编辑</el-button> <el-button type="text" @click="onAdd(row.id)">编辑</el-button>
<el-button type="text" @click="remove(row.id)">删除</el-button> <el-button type="text" @click="remove(row.id)">删除</el-button>
<el-button type="text" @click="toBuildMsg(row)">房屋信息</el-button> <el-button type="text" @click="toBuildMsg(row)">房屋信息</el-button>
<el-button type="text" @click="$router.push({ name: '63', query: { communityId: row.communityId, buildingId: row.id, unitNum: 1, buildingNumber: row.buildingNumber } })"> <el-button type="text"
@click="$router.push({ name: '63', query: { communityId: row.communityId, buildingId: row.id, unitNum: 1, buildingNumber: row.buildingNumber } })">
楼栋模型 楼栋模型
</el-button> </el-button>
</div> </div>
@@ -71,7 +77,7 @@
</template> </template>
<script> <script>
import { mapState } from 'vuex' import {mapState} from 'vuex'
export default { export default {
name: 'List', name: 'List',
@@ -96,7 +102,7 @@ export default {
id: '', id: '',
ids: [], ids: [],
colConfigs: [ colConfigs: [
{ type: 'selection' }, {type: 'selection'},
{ {
prop: 'communityName', prop: 'communityName',
label: '小区名称', label: '小区名称',
@@ -106,26 +112,26 @@ export default {
label: '楼栋号', label: '楼栋号',
align: 'center', align: 'center',
}, },
{ prop: 'unitNumber', label: '单元数', align: 'center' }, {prop: 'unitNumber', label: '单元数', align: 'center'},
{ {
prop: 'layerNumber', prop: 'layerNumber',
label: '最高层数', label: '最高层数',
align: 'center', align: 'center',
}, },
{ prop: 'householdNumber', label: '每层户数', align: 'center' }, {prop: 'householdNumber', label: '每层户数', align: 'center'},
{ {
prop: 'houseNum', prop: 'houseNum',
label: '实有户数', label: '实有户数',
align: 'center', align: 'center',
}, },
{ prop: 'residentNum', label: '实有人口', align: 'center' }, {prop: 'residentNum', label: '实有人口', align: 'center'},
{ {
prop: 'managerName', prop: 'managerName',
label: '楼栋长名', label: '楼栋长名',
align: 'center', align: 'center',
}, },
{ prop: 'managerPhone', label: '楼栋长联系方式', align: 'center', width: '150' }, {prop: 'managerPhone', label: '楼栋长联系方式', align: 'center', width: '150'},
{ slot: 'locationStatus' }, {slot: 'locationStatus'},
{ {
slot: 'options', slot: 'options',
label: '操作', label: '操作',
@@ -145,12 +151,12 @@ export default {
computed: { computed: {
...mapState(['user']), ...mapState(['user']),
userArea: v => v.user?.info?.areaId,
param() { param() {
return { return {
...this.search, ...this.search,
communityId: this.communityId, communityId: this.communityId,
areaId: this.user.info?.areaId, areaId: this.userArea,
ids: this.ids, ids: this.ids,
} }
}, },
@@ -162,13 +168,10 @@ export default {
this.getListinfo() this.getListinfo()
}) })
}, },
mounted() {},
methods: { methods: {
getListinfo() { getListinfo() {
return this.instance.post(`/app/appcommunityinfo/queryCommunityTree?id=${this.user.info?.areaId}`).then((res) => { return this.instance.post(`/app/appcommunityinfo/queryCommunityTree?id=${this.userArea}`).then((res) => {
if (res.data) { if (res?.data) {
this.treeData = [res.data] this.treeData = [res.data]
this.$nextTick(() => { this.$nextTick(() => {
this.defaultShowNodes = this.treeData[0].id this.defaultShowNodes = this.treeData[0].id
@@ -178,21 +181,20 @@ export default {
}, },
getList() { getList() {
this.instance this.instance.post(`/app/appcommunitybuildinginfo/list`, null, {
.post(`/app/appcommunitybuildinginfo/list`, null, { params: {
params: { ...this.page,
...this.page, ...this.search,
...this.search, communityId: this.communityId,
communityId: this.communityId, areaId: this.areaId,
areaId: this.areaId, },
}, })
}) .then((res) => {
.then((res) => { if (res?.data) {
if (res.code == 0) { this.tableData = res.data.records
this.tableData = res.data.records this.total = res.data.total
this.total = res.data.total }
} })
})
}, },
// 添加 // 添加
@@ -316,9 +318,10 @@ export default {
} }
} }
} }
::v-deep .is-current>.el-tree-node__content{
width: 100%!important; ::v-deep .is-current > .el-tree-node__content {
padding-right: 16px!important; width: 100% !important;
padding-right: 16px !important;
} }
} }
</style> </style>