Merge branch 'ETA1.2.9'

src/views/dataEntry_manage/databaseList.vue

@@ -243,10 +243,10 @@
 							<el-button v-if="EdbData.EdbType===2&&isEdbBtnShow('toSource')"
 								type="text" @click="isLookHistory=true;lookEdbId=selected_edbid">指标溯源</el-button>
 							<el-popover 
-								placement="left" 
+								placement="bottom" 
 								trigger="hover"
 								popper-class="edb-tool-popover"
-								width="320" style="display: inline-block;">
+								width="80" style="display: inline-block;">
 								<div class="edb-tool-wrap">
 									<el-button v-if="isEdbBtnShow('setEn')"
 										type="text" @click="openEnNameDia">设置英文名称</el-button>
@@ -2402,10 +2402,14 @@ export default {
 	.edb-tool-wrap{
 		display: flex;
 		flex-wrap: wrap;
-		gap:0 10px;
+		gap:10px;
 		.el-button + .el-button{
 			margin-left: 0;
 		}
+		.el-button{
+			width:100%;
+			text-align: left;
+		}
 	}
 }
 </style>

src/views/predictEdb_manage/predictEdb.vue

@@ -195,10 +195,10 @@
 							<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_edbSource"
 								type="text" @click="isLookHistory=true;lookEdbId=select_id">指标溯源</el-button>
 							<el-popover 
-								placement="left" 
+								placement="bottom" 
 								trigger="hover"
 								popper-class="edb-tool-popover"
-								width="320" style="display: inline-block;">
+								width="80" style="display: inline-block;">
 								<div class="edb-tool-wrap">
 									<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_enNameSetting"
 										type="text" @click="clickEdbNameHandle" v-if="currentLang==='ch'||!edb_nameEn">
@@ -1858,4 +1858,18 @@ $mini-font: 12px; $normal-font: 14px;
 		}
 	}	
 }
+.edb-tool-popover{
+	.edb-tool-wrap{
+		display: flex;
+		flex-wrap: wrap;
+		gap:10px;
+		.el-button + .el-button{
+			margin-left: 0;
+		}
+		.el-button{
+			width:100%;
+			text-align: left;
+		}
+	}
+}
 </style>