logo替换

src/views/Home.vue

@@ -7,7 +7,7 @@
           <img
             class="logo"
             v-if="!isCollapse"
-            :src="$setting.g_logo"
+            :src="logoLarge"
           />
           <!-- 折叠侧边栏logo尺寸 -->
           <img
@@ -347,14 +347,7 @@ export default {
     isHaveAside() {
       return this.$route.path !== "/mychartdetail";
     },
-    /* wrapper style */
-    dynamicContStyle() {
-      if (this.isHaveAside) {
-        return this.isCollapse ? "left:70px" : "left:200px";
-      } else {
-        return "left:0;padding-top:0;height:calc(100vh - 68px)";
-      }
-    },
+
     //帮助文档是否展示
     isHelpDocShow(){
         return this.permissionBtn.checkPermissionBtn(
@@ -370,7 +363,11 @@ export default {
 		// 是否是eta试用
     isTrail(){
 			return this.$store.state.hasTrialUserPermisson
-		}
+		},
+
+    logoLarge() {
+      return this.$i18n.locale == 'en' ? require('@/assets/img/en/logo.png') : this.$setting.g_logo
+    }
   },
   data() {
     return {

src/views/predictEdb_manage/predictEdb.vue

@@ -13,7 +13,7 @@
 						<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_addEdb"
 							type="primary" @click="addEdbHandle"><!-- 添加指标 -->{{$t('EtaBasePage.add_edb_btn')}}</el-button>
 						<el-button v-permission="permissionBtn.predictEdbPermission.edbPreData_calcuEdb"
-							type="primary" @click="addComputedHandler" style="margin-right:10px;"><!-- 计算指标 -->{{$t('EtaBasePage.calculation_edb_btn')}}</el-button>
+							type="primary" @click="addComputedHandler" style="margin-left:0;"><!-- 计算指标 -->{{$t('EtaBasePage.calculation_edb_btn')}}</el-button>
 						<change-lang 
 							v-permission="permissionBtn.predictEdbPermission.edbPreData_switchEn"
 							:lang="currentLang" 
@@ -1570,6 +1570,8 @@ $mini-font: 12px; $normal-font: 14px;
 				margin-bottom: 20px;
 				display: flex;
 				align-items: center;
+				flex-wrap: wrap;
+				gap: 10px;
 			}
 			.search-cont {
 				padding: 0 20px;
@@ -1584,7 +1586,7 @@ $mini-font: 12px; $normal-font: 14px;
 			}
 			.target_tree {
 				color: #333;
-				max-height: calc(100vh - 400px);
+				max-height: calc(100vh - 436px);
 				overflow-y:auto;
 				.custom-tree-node {
 					display: flex !important;