Merge branch 'fix' into debug

src/lang/modules/ReportManagement/ReportList.js

@@ -250,7 +250,7 @@ export const ReportListZh = {
   library_top_type: "版图资源库",
   eta_top_type: "表格",
   statistical_top_type: "统计分析",
-  sandbox_top_type: "沙盘图",
+  sandbox_top_type: "逻辑图",
   semantic_top_type: "语义分析",
   chart_top_type: "图库",
   insert_charts_msg: "请插入图表",

src/lang/modules/Slides/pptPresent.js

@@ -129,8 +129,8 @@ export const presentZh = {
   statistical_features: "统计特征",
   intercommodity_analysis: "跨品种分析",
   show_only_mine: "只看我的",
-  sandbox_name_category: "沙盘名称/品种",
-  sandbox_name: "沙盘",
+  sandbox_name_category: "逻辑图名称/品种",
+  sandbox_name: "逻辑图",
   table_name: "表格",
   table_analysis_semantic: "语义分析插入",
   table_name_input: "表格名称",

src/views/report_manage/reportV2/normalReport/components/ETASandBox.vue

@@ -4,7 +4,7 @@
             <div class="right">
                 <el-input
                     class="search-box"
-					:placeholder="$t('ReportManage.ReportList.no_reports_msg')"
+					placeholder="逻辑图名称"
 					v-model="keyword"
 					size="medium"
 					prefix-icon="el-icon-search"

src/views/report_manage/reportV2/smartReport/components/ETASandBox.vue

@@ -7,7 +7,7 @@
             <div class="right">
                 <el-input
                     class="search-box"
-					:placeholder="$t('ReportManage.ReportList.no_reports_msg')"
+					placeholder="逻辑图名称"
 					v-model="keyword"
 					size="medium"
 					prefix-icon="el-icon-search"

src/views/system_manage/etaBaseConfig.vue

@@ -83,7 +83,7 @@
                             <ConfigAnnotation picHintText="" picName="ICPLicense" @showImage="previewImage"/>
                         </el-form-item>
                         <el-form-item :label="$t('SystemManage.BaseConfig.login_title')" prop="ETATitle">
-                            <el-input type="text" v-model="formData.ETATitle" placeholder="$t('SystemManage.BaseConfig.login_title_pld')" />
+                            <el-input type="text" v-model="formData.ETATitle" :placeholder="$t('SystemManage.BaseConfig.login_title_pld')" />
                             <ConfigAnnotation picHintText="" picName="ETATitle" @showImage="previewImage"/>
                         </el-form-item>
                         <!-- <el-form-item :label="login_name" prop="TabName">