From 42e7814f816bedba1a0ef8e8f8fb3df1f495c9db Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 05 Dec 2025 09:27:58 +0800
Subject: [PATCH] Merge branch 'feature/v8.0/8.0.4' into feature/v9.0/9.0.1
---
src/views/resource/components/spotDetails.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/resource/components/spotDetails.vue b/src/views/resource/components/spotDetails.vue
index dd0f1eb..1a923a1 100644
--- a/src/views/resource/components/spotDetails.vue
+++ b/src/views/resource/components/spotDetails.vue
@@ -30,6 +30,7 @@
v-model="item.value"
placeholder="请选择图斑类型"
style="width: 102%"
+ :disabled="item.value ==='综合类'"
>
<el-option
v-for="opt in spotTypeOptions"
@@ -60,7 +61,14 @@
<div class="table-overlay">
<div class="table-content">
<div class="tabname">图斑列表</div>
- <el-table
+ <div class="tabBoxLoading"
+ v-loading="tableLoading"
+ element-loading-text="加载中..."
+ element-loading-background="rgba(0, 0, 0, 0.1)"
+ >
+ <el-table
+ v-if="tableData.length > 0"
+
ref="polygonTableEle"
highlight-current-row
:row-class-name="tableRowClassName"
@@ -108,6 +116,7 @@
</template>
</el-table-column>
</el-table>
+ </div>
</div>
</div>
@@ -160,6 +169,7 @@
const homeViewer = shallowRef(null);
let tbJwdList = [];
const loading = ref(false);
+const tableLoading = ref(true);
const tableData = ref([]);
const AlltableData = ref([]);
let total = ref(0);
@@ -260,9 +270,9 @@
const isInit = ref(true);
// 图斑管理表格
const getTableList = () => {
+ tableLoading.value = true;
const requestParams = {
patchesInfoId: props.detailid,
-
};
AlltableMapListApi(requestParams).then(res => {
tableData.value = res.data.data?.map(item => ({
@@ -277,6 +287,8 @@
} else {
entitiesAddSpot();
}
+ }).finally(() => {
+ tableLoading.value = false;
});
};
@@ -640,7 +652,7 @@
getspotManagementTableApi();
}, 0);
} else {
-
+ tableLoading.value = false;
tableData.value = [];
isEditing.value = false;
handleUpDateDrawState(false);
@@ -907,9 +919,15 @@
z-index: 9999 !important;
max-width: 300px;
}
+.tabBoxLoading {
+height: 100%;
+
+}
+
.el-table {
- flex: 1;
- overflow: auto;
+height: 98%;
+overflow: auto;
+
}
.btnGroups {
position: absolute;
--
Gitblit v1.9.3