From cd8650217cbe82af7e451273a6803f18866501f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Sat, 2 Nov 2024 17:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=BA=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=92=8C=E5=AF=BC=E5=87=BA=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scExport/index.vue                  | 11 +++++++----
 .../setting/advanced/components/addRegion.vue      |  1 -
 src/views/setting/advanced/setup/region.vue        | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/components/scExport/index.vue b/src/components/scExport/index.vue
index 510551e..1aebc30 100644
--- a/src/components/scExport/index.vue
+++ b/src/components/scExport/index.vue
@@ -9,7 +9,7 @@
 				<div v-for="item in list" :key="item">
 					<div v-if="list.length>0 && type == item.type">
 						<div class="exportHeader">
-							<div class="name">{{item.type_desc}}</div>
+							<div class="exportName">{{item.type_desc}}</div>
 							<div class="status" v-if="item.status==0">{{item.msg}}</div>
 							<div class="finish" v-if="item.status==1"><i class="icon"><sc-icon-Finish/></i> 文件生成完成</div>
 						</div>
@@ -119,8 +119,8 @@ export default {
 		font-size: 12px;
 		display: flex;align-items: center;justify-content: space-around;
 		margin-bottom: 6px;
-		.name{width: 50%;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
-		.status{width: 50%;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
+		.exportName{flex: 1;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding: 0;}
+		.status{flex: 1;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
 		.finish{
 			display: flex;align-items: center;justify-content: flex-end;color: var(--el-color-success);
 			.icon{width: 14px;height: 14px;margin-right: 4px;}
@@ -135,6 +135,9 @@ export default {
 	.customerPopover{
 		position: relative;
 		height: auto;
+		.btnBox{
+			margin-left: 12px;
+		}
 		.contentPopover{
 			width: 300px;
 			padding: 12px;
@@ -151,7 +154,7 @@ export default {
 			position: relative;
 			.arrow{
 				position: absolute;
-				right: 0;
+				right: 10px;
 				top: -18px;
 				width: 8px;height: 8px;z-index: 10;
 			}
diff --git a/src/views/setting/advanced/components/addRegion.vue b/src/views/setting/advanced/components/addRegion.vue
index f2b49e3..e289588 100644
--- a/src/views/setting/advanced/components/addRegion.vue
+++ b/src/views/setting/advanced/components/addRegion.vue
@@ -2,7 +2,6 @@
 	<el-dialog :title="titleMap[mode]" v-model="visible" :width="500" destroy-on-close @closed="$emit('closed')">
 		<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="100px">
 			<el-form-item label="区域名称" prop="region_name">
-<!--				<el-input v-model="form.region_name" placeholder="请输入区域位置" clearable></el-input>-->
 				<el-select v-model="form.region_name" placeholder="请输入区域位置" clearable>
 					<el-option v-for="(item,index) in setMap.regionList" :key="index" :label="item.label" :value="item.value"></el-option>
 				</el-select>
diff --git a/src/views/setting/advanced/setup/region.vue b/src/views/setting/advanced/setup/region.vue
index acba0ad..41c26f3 100644
--- a/src/views/setting/advanced/setup/region.vue
+++ b/src/views/setting/advanced/setup/region.vue
@@ -13,6 +13,11 @@
 			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow :hideDo="true" @selection-change="selectionChange">
 				<el-table-column type="selection" align="center" width="40"></el-table-column>
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
+				<template #region_name="scope">
+					<span v-for="(item,index) in setMap.regionList" :key="index">
+						<span v-if="item.value == scope.row.region_name">{{item.label}}</span>
+					</span>
+				</template>
 				<template #data_source="scope">
 					<span v-for="(item,index) in setMap.sourceList" :key="index">
 						<span v-if="item.value === scope.row.data_source">{{item.label}}</span>
@@ -51,7 +56,7 @@ export default {
 			size:'small',
 			setMap:{
 				sourceList:[],
-				regionalList:[],
+				regionList:[],
 			},
 			list:{
 				apiObj: this.$API.setup.regional.list,
@@ -67,6 +72,7 @@ export default {
 	},
 	mounted() {
 		this.getRegion();
+		this.getRoom();
 	},
 	methods:{
 		async getRegion() {
@@ -75,6 +81,12 @@ export default {
 				this.setMap.sourceList = res.data;
 			}
 		},
+		async getRoom() {
+			const res = await this.$API.setup.regional.regionalList.post();
+			if (res.code == 200) {
+				this.setMap.regionList = res.data;
+			}
+		},
 
 		add(){
 			this.dialog.save = true