hbchen 11 月之前
父節點
當前提交
3b691b567d

二進制
src/assets/img/eta_base_config/Logo_ch.png


二進制
src/assets/img/eta_base_config/Logo_en.png


+ 2 - 2
src/lang/modules/DataReport/GlStatisticTable.js

@@ -25,7 +25,7 @@ export const GlStatisticTableEn = {
     table_tips10:'Number of indicators failed updated on this terminal today',
     table_tips10:'Number of indicators failed updated on this terminal today',
     table_tips11:'Number of indicators for which the terminal successfully initiated update tasks but indicator data did not change today',
     table_tips11:'Number of indicators for which the terminal successfully initiated update tasks but indicator data did not change today',
     table_tips12:'Number of indicators for which  terminal data changed today',
     table_tips12:'Number of indicators for which  terminal data changed today',
-    table_tips13:'Name saved in ETA indicators',
+    table_tips13:'Name saved in indicators',
 
 
     change_placeholder:'Please select change type',
     change_placeholder:'Please select change type',
     change_type01:'Change of Basic Information',
     change_type01:'Change of Basic Information',
@@ -71,7 +71,7 @@ export const GlStatisticTableZh = {
     table_tips10:'今日该终端刷新失败的指标数量',
     table_tips10:'今日该终端刷新失败的指标数量',
     table_tips11:'今日该终端成功发起刷新任务,但指标数据未变化的指标数量',
     table_tips11:'今日该终端成功发起刷新任务,但指标数据未变化的指标数量',
     table_tips12:'今日该终端数据发生变化的指标数量',
     table_tips12:'今日该终端数据发生变化的指标数量',
-    table_tips13:'指标在ETA指标库保存的指标名称',
+    table_tips13:'指标在指标库保存的指标名称',
 
 
     change_placeholder:'请选择变更类型',
     change_placeholder:'请选择变更类型',
     change_type01:'基础信息变更',
     change_type01:'基础信息变更',

+ 1 - 1
src/lang/modules/ETATables/En.js

@@ -36,7 +36,7 @@ export default {
     keep_one_row_msg: "Please keep at least one row",
     keep_one_row_msg: "Please keep at least one row",
     no_here_val_msg: "Unable to insert value here",
     no_here_val_msg: "Unable to insert value here",
     TableInstructionsText: `Table Instructions:<br />
     TableInstructionsText: `Table Instructions:<br />
-    1. Manual Input: Click on each cell to directly enter text, numbers, or dates (format example: 2023-05-23). The entered content can match the names of metrics. Metrics from both the ETA Metric Library and the ETA Forecast Metric Library are searchable. If a metric is selected from the dropdown list, then that cell becomes a designated row/column for the selected metric.<br />
+    1. Manual Input: Click on each cell to directly enter text, numbers, or dates (format example: 2023-05-23). The entered content can match the names of metrics. Metrics from both the Metric Library and the Forecast Metric Library are searchable. If a metric is selected from the dropdown list, then that cell becomes a designated row/column for the selected metric.<br />
     2. Insert Metric Value: Right-click on a cell and click "Insert Metric Value". The system will query for the closest date and metric name based on the cell's row and column, and then populate the cell with the value of the metric corresponding to that date. The metric value is always positioned in the lower right corner of the cell.<br />
     2. Insert Metric Value: Right-click on a cell and click "Insert Metric Value". The system will query for the closest date and metric name based on the cell's row and column, and then populate the cell with the value of the metric corresponding to that date. The metric value is always positioned in the lower right corner of the cell.<br />
     3. Update and Calculation Rules: The dates associated with metric values in the table do not update automatically, and values do not support calculations within cells.`,
     3. Update and Calculation Rules: The dates associated with metric values in the table do not update automatically, and values do not support calculations within cells.`,
     select_table_category: "Please select table category",
     select_table_category: "Please select table category",

+ 1 - 1
src/lang/modules/ETATables/Zh.js

@@ -50,7 +50,7 @@ export default {
     table_name_empty_msg: "表格名称不能为空",
     table_name_empty_msg: "表格名称不能为空",
     name_empty_msg: "名称不能为空",
     name_empty_msg: "名称不能为空",
     TableInstructionsText: `表格说明:<br>
     TableInstructionsText: `表格说明:<br>
-    1、手动输入:单击每个单元格可直接输入文本、数字、日期(格式示例:2023-05-23),输入内容可匹配指标名称,ETA指标库和ETA预测指标库指标均可搜索,在下拉框中选择指标,则该单元格为已选指标行/列。<br>
+    1、手动输入:单击每个单元格可直接输入文本、数字、日期(格式示例:2023-05-23),输入内容可匹配指标名称,指标库和预测指标库指标均可搜索,在下拉框中选择指标,则该单元格为已选指标行/列。<br>
     2、插入指标值:右键单元格,点击“插入指标值”,则查询该单元格行、列最近的日期和指标名称,将查找到的指标对应日期的值填入该单元格,指标值总是在右下角。<br>
     2、插入指标值:右键单元格,点击“插入指标值”,则查询该单元格行、列最近的日期和指标名称,将查找到的指标对应日期的值填入该单元格,指标值总是在右下角。<br>
     3、更新与计算规则:表格中指标值的日期不自动更新,数值不支持单元格计算`,
     3、更新与计算规则:表格中指标值的日期不自动更新,数值不支持单元格计算`,
     date_type_label: "日期类型",
     date_type_label: "日期类型",

+ 4 - 4
src/lang/modules/EtaBase/commonLang.js

@@ -85,12 +85,12 @@ export default {
     en:'Switch to curve chart'
     en:'Switch to curve chart'
   },
   },
   eta_name:{
   eta_name:{
-    zh:'ETA指标',
-    en:'ETA index'
+    zh:'指标',
+    en:'index'
   },
   },
   eta_predictor_name:{
   eta_predictor_name:{
-    zh:'ETA预测指标',
-    en:'ETA predictor index'
+    zh:'预测指标',
+    en:'predictor index'
   },
   },
   formula_instru: {
   formula_instru: {
     zh:'公式说明',
     zh:'公式说明',

+ 2 - 2
src/lang/modules/EtaChart/commonLang.js

@@ -526,8 +526,8 @@ export default {
   /* 所有source */
   /* 所有source */
   AllChartSource: {
   AllChartSource: {
     eta_chart: {
     eta_chart: {
-      en: "ETA Gallery",
-      zh: "ETA图库",
+      en: "Gallery",
+      zh: "图库",
     },
     },
     commodity_chart: {
     commodity_chart: {
       en: "Commodity Price Curve",
       en: "Commodity Price Curve",

+ 1 - 1
src/lang/modules/PredictEdb/Zh.js

@@ -6,7 +6,7 @@ export default {
   PredictEdbPage: {
   PredictEdbPage: {
     only_see_mine: '只看我的',
     only_see_mine: '只看我的',
     total_list_view: '共{limit}个预测指标',
     total_list_view: '共{limit}个预测指标',
-    del_edb_msg: 'ETA预测指标删除后不可恢复,确认删除吗',
+    del_edb_msg: '预测指标删除后不可恢复,确认删除吗',
     
     
     /* 查看基础指标弹窗 */
     /* 查看基础指标弹窗 */
     view_rules: '查看预测规则',
     view_rules: '查看预测规则',

+ 6 - 6
src/lang/modules/ReportManagement/ReportList.js

@@ -47,7 +47,7 @@ export const ReportListEn = {
   frequency_select: "Frequency",
   frequency_select: "Frequency",
   creation_time_select: "Creation time",
   creation_time_select: "Creation time",
   insert_chart_tabs: "Insert chart",
   insert_chart_tabs: "Insert chart",
-  chart_inventory_radio: "ETA Gallery",
+  chart_inventory_radio: "Gallery",
   price_curve_radio: "Commodity price curve",
   price_curve_radio: "Commodity price curve",
   related_charts_radio: "Related Charts",
   related_charts_radio: "Related Charts",
   curve_fitting_radio: "Curve fitting",
   curve_fitting_radio: "Curve fitting",
@@ -58,7 +58,7 @@ export const ReportListEn = {
   no_reports_msg: "Sandbox Name/Commodity",
   no_reports_msg: "Sandbox Name/Commodity",
   insert_table_tabs: "Insert Table",
   insert_table_tabs: "Insert Table",
   table_name_tabs: "Table Name",
   table_name_tabs: "Table Name",
-  bulk_insertion_tabs: "Bulk Insertion of MyETA",
+  bulk_insertion_tabs: "My gallery batch insert",
   semantic_analysis_tabs: "Semantic Analysis Insertion",
   semantic_analysis_tabs: "Semantic Analysis Insertion",
   publish_time: "Publish Time",
   publish_time: "Publish Time",
   select_date_and_time: "Select Date and Time",
   select_date_and_time: "Select Date and Time",
@@ -71,7 +71,7 @@ export const ReportListEn = {
   select_date: "Select date",
   select_date: "Select date",
   charts_update_btn: "Charts update",
   charts_update_btn: "Charts update",
   library_top_type: "Territory Lib",
   library_top_type: "Territory Lib",
-  eta_top_type: "ETA table",
+  eta_top_type: "table",
   statistical_top_type: "Stats Analysis",
   statistical_top_type: "Stats Analysis",
   sandbox_top_type: "Sandbox",
   sandbox_top_type: "Sandbox",
   semantic_top_type: "Semantic Analy",
   semantic_top_type: "Semantic Analy",
@@ -164,7 +164,7 @@ export const ReportListZh = {
   frequency_select: "频度",
   frequency_select: "频度",
   creation_time_select: "创建时间",
   creation_time_select: "创建时间",
   insert_chart_tabs: "图表插入",
   insert_chart_tabs: "图表插入",
-  chart_inventory_radio: "ETA图库",
+  chart_inventory_radio: "图库",
   price_curve_radio: "商品价格曲线",
   price_curve_radio: "商品价格曲线",
   related_charts_radio: "相关性图表",
   related_charts_radio: "相关性图表",
   curve_fitting_radio: "拟合方程曲线",
   curve_fitting_radio: "拟合方程曲线",
@@ -175,7 +175,7 @@ export const ReportListZh = {
   no_reports_msg: "沙盘名称/品种",
   no_reports_msg: "沙盘名称/品种",
   insert_table_tabs: "表格插入",
   insert_table_tabs: "表格插入",
   table_name_tabs: "表格名称",
   table_name_tabs: "表格名称",
-  bulk_insertion_tabs: "MyETA批量插入",
+  bulk_insertion_tabs: "我的图库批量插入",
   semantic_analysis_tabs: "语义分析插入",
   semantic_analysis_tabs: "语义分析插入",
   publish_time: "发送时间",
   publish_time: "发送时间",
   select_date_and_time: "选择日期时间",
   select_date_and_time: "选择日期时间",
@@ -188,7 +188,7 @@ export const ReportListZh = {
   select_date: "选择日期",
   select_date: "选择日期",
   charts_update_btn: "图表刷新",
   charts_update_btn: "图表刷新",
   library_top_type: "版图资源库",
   library_top_type: "版图资源库",
-  eta_top_type: "ETA表格",
+  eta_top_type: "表格",
   statistical_top_type: "统计分析",
   statistical_top_type: "统计分析",
   sandbox_top_type: "沙盘图",
   sandbox_top_type: "沙盘图",
   semantic_top_type: "语义分析",
   semantic_top_type: "语义分析",

+ 6 - 6
src/lang/modules/SandboxManage/SandFlow.js

@@ -46,9 +46,9 @@ export const SandFlowEn = {
     copy_tag:'Copy',
     copy_tag:'Copy',
     delete_tag:'Delete',
     delete_tag:'Delete',
     add_link_search_placeholder:'Indicator ID/ indicator name',
     add_link_search_placeholder:'Indicator ID/ indicator name',
-    link_type_opt1:'ETA Indicator/ ETA forecast indicator',
-    link_type_opt2:'ETA Image library',
-    link_type_opt3:'ETA reports',
+    link_type_opt1:'Indicator/ forecast indicator',
+    link_type_opt2:'Image library',
+    link_type_opt3:'reports',
     msg_leave_page_save:'Before leaving this page, do you want to save current contents?',
     msg_leave_page_save:'Before leaving this page, do you want to save current contents?',
   };
   };
   
   
@@ -96,9 +96,9 @@ export const SandFlowEn = {
     copy_tag:'复制',
     copy_tag:'复制',
     delete_tag:'删除',
     delete_tag:'删除',
     add_link_search_placeholder:'指标ID/指标名称',
     add_link_search_placeholder:'指标ID/指标名称',
-    link_type_opt1:'ETA指标/ETA预测指标',
-    link_type_opt2:'ETA图库',
-    link_type_opt3:'ETA研报',
+    link_type_opt1:'指标/预测指标',
+    link_type_opt2:'图库',
+    link_type_opt3:'研报',
     msg_leave_page_save:'在离开页面之前,是否保存当前内容?',
     msg_leave_page_save:'在离开页面之前,是否保存当前内容?',
 
 
   };
   };

+ 1 - 1
src/lang/modules/SandboxManage/SandList.js

@@ -5,7 +5,7 @@
 /* 英文 */
 /* 英文 */
 export const SandListEn = {
 export const SandListEn = {
     logic_add_btn:'Add logic diagram', 
     logic_add_btn:'Add logic diagram', 
-    only_see:'Only see my ETA logic diagram',
+    only_see:'Only see my logic diagram',
     search_placeholder:"Please enter the logic diagram's name",
     search_placeholder:"Please enter the logic diagram's name",
     categories_add_btn:'Add categories',
     categories_add_btn:'Add categories',
     categories_edit_btn:'Edit categories',
     categories_edit_btn:'Edit categories',

+ 4 - 4
src/lang/modules/Slides/pptPresent.js

@@ -17,7 +17,7 @@ export const presentEn = {
   paste_element_btn: "Paste element",
   paste_element_btn: "Paste element",
   layer_editing: "Layer editing",
   layer_editing: "Layer editing",
   keyword_search: "Keyword search",
   keyword_search: "Keyword search",
-  eta_chart_gallery: "ETA Chart Gallery",
+  eta_chart_gallery: "Chart Gallery",
   commodity_price_curve: "Commodity Price Curve",
   commodity_price_curve: "Commodity Price Curve",
   correlation_charts: "Correlation Charts",
   correlation_charts: "Correlation Charts",
   fitted_equation_curves: "Fitted Equation Curves",
   fitted_equation_curves: "Fitted Equation Curves",
@@ -28,7 +28,7 @@ export const presentEn = {
   sandbox_name: "Sandbox",
   sandbox_name: "Sandbox",
   table_name: "Table",
   table_name: "Table",
   table_name_input: "Table Name",
   table_name_input: "Table Name",
-  my_eta_batch: "MyETA Batch",
+  my_eta_batch: "My gallery batch operations",
   layer_element: "Layer element",
   layer_element: "Layer element",
   line_settings: "Line settings",
   line_settings: "Line settings",
   outline_element: "Outline settings",
   outline_element: "Outline settings",
@@ -106,7 +106,7 @@ export const presentZh = {
   paste_element_btn: "粘贴元素",
   paste_element_btn: "粘贴元素",
   layer_editing: "图层编辑",
   layer_editing: "图层编辑",
   keyword_search: "关键字查找",
   keyword_search: "关键字查找",
-  eta_chart_gallery: "ETA图库",
+  eta_chart_gallery: "图库",
   commodity_price_curve: "商品价格曲线",
   commodity_price_curve: "商品价格曲线",
   correlation_charts: "相关性图表",
   correlation_charts: "相关性图表",
   fitted_equation_curves: "拟合方程曲线",
   fitted_equation_curves: "拟合方程曲线",
@@ -118,7 +118,7 @@ export const presentZh = {
   table_name: "表格",
   table_name: "表格",
   table_analysis_semantic: "语义分析插入",
   table_analysis_semantic: "语义分析插入",
   table_name_input: "表格名称",
   table_name_input: "表格名称",
-  my_eta_batch: "MyETA批量",
+  my_eta_batch: "我的图库批量",
   table_chart: "图表",
   table_chart: "图表",
   layer_element: "图层元素",
   layer_element: "图层元素",
   line_settings: "线条设置",
   line_settings: "线条设置",

+ 2 - 2
src/lang/modules/systemManage/BaseConfig.js

@@ -25,7 +25,7 @@ export const BaseConfigEn = {
     iFLYTEK_service:'iFLYTEK Service',
     iFLYTEK_service:'iFLYTEK Service',
     please_enter:'Please enter',
     please_enter:'Please enter',
     report_approval:'Report Approval',
     report_approval:'Report Approval',
-    internal_approval:'ETA Internal Approval',
+    internal_approval:'Internal Approval',
     third_approval:'Third-party Approval',
     third_approval:'Third-party Approval',
     third_approval_tips:"Chinese Research Report(Intelligent Research Report/Research Report List) connected to third-party approval systems via API interface",
     third_approval_tips:"Chinese Research Report(Intelligent Research Report/Research Report List) connected to third-party approval systems via API interface",
     report_share_title_zh:'Title of Chinese research report sharing',
     report_share_title_zh:'Title of Chinese research report sharing',
@@ -93,7 +93,7 @@ export const BaseConfigZh = {
     iFLYTEK_service:'科大讯飞服务',
     iFLYTEK_service:'科大讯飞服务',
     please_enter:'请输入',
     please_enter:'请输入',
     report_approval:'研报审批',
     report_approval:'研报审批',
-    internal_approval:'ETA内部审批',
+    internal_approval:'内部审批',
     third_approval:'第三方审批',
     third_approval:'第三方审批',
     third_approval_tips:'中文研报(智能研报/研报列表)通过API接口对接第三方审批系统',
     third_approval_tips:'中文研报(智能研报/研报列表)通过API接口对接第三方审批系统',
     report_share_title_zh:'中文研报分享抬头',
     report_share_title_zh:'中文研报分享抬头',

+ 2 - 2
src/lang/modules/systemManage/ChartSet.js

@@ -5,7 +5,7 @@
 /* 英文 */
 /* 英文 */
 export const ChartSetEn = {
 export const ChartSetEn = {
     label01:'Chart Types',
     label01:'Chart Types',
-    label02:'ETA Chart Library Default Theme',
+    label02:'Chart Library Default Theme',
     add_btn:'Add Custom Theme',
     add_btn:'Add Custom Theme',
     edit_btn:'Edit Custom Theme',
     edit_btn:'Edit Custom Theme',
     theme_name:'Theme Name',
     theme_name:'Theme Name',
@@ -42,7 +42,7 @@ export const ChartSetEn = {
 /* 中文 */
 /* 中文 */
 export const ChartSetZh = {
 export const ChartSetZh = {
     label01:'图表类型',
     label01:'图表类型',
-    label02:'ETA图库默认主题',
+    label02:'图库默认主题',
     add_btn:'添加自定义主题',
     add_btn:'添加自定义主题',
     edit_btn:'编辑自定义主题',
     edit_btn:'编辑自定义主题',
     theme_name:'主题名称',
     theme_name:'主题名称',

+ 8 - 8
src/lang/modules/systemManage/OperateAuth.js

@@ -6,10 +6,10 @@
 export const OperateAuthEn = {
 export const OperateAuthEn = {
     tab01:'Manual Data Indicators',
     tab01:'Manual Data Indicators',
     tab02:'My Steel Chemical Database',
     tab02:'My Steel Chemical Database',
-    tab03:'ETA Indicator Library',
-    tab04:'ETA Predictive Indicators',
-    tab05:'ETA Gallery',
-    tab06:'ETA Tables',
+    tab03:'Indicator Library',
+    tab04:'Predictive Indicators',
+    tab05:'Gallery',
+    tab06:'Tables',
 
 
     placeholder01:'Please Enter Chart Name',
     placeholder01:'Please Enter Chart Name',
     placeholder02:'Please Enter Indicator ID/Indicator Name',
     placeholder02:'Please Enter Indicator ID/Indicator Name',
@@ -76,10 +76,10 @@ export const OperateAuthEn = {
 export const OperateAuthZh = {
 export const OperateAuthZh = {
     tab01:'手工数据指标',
     tab01:'手工数据指标',
     tab02:'钢联化工数据库',
     tab02:'钢联化工数据库',
-    tab03:'ETA指标库',
-    tab04:'ETA预测指标',
-    tab05:'ETA图库',
-    tab06:'ETA表格',
+    tab03:'指标库',
+    tab04:'预测指标',
+    tab05:'图库',
+    tab06:'表格',
 
 
     placeholder01:'请输入图表名称',
     placeholder01:'请输入图表名称',
     placeholder02:'请输入指标Id/指标名称',
     placeholder02:'请输入指标Id/指标名称',

+ 11 - 11
src/routes/modules/chartRoutes.js

@@ -5,13 +5,13 @@ export default [
 	{
 	{
 		path: '/',
 		path: '/',
 		component: home,
 		component: home,
-		name: 'ETA图库',
+		name: '图库',
 		hidden: false,
 		hidden: false,
 		icon_path: require('@/assets/img/home/data_ic.png'),
 		icon_path: require('@/assets/img/home/data_ic.png'),
 		children: [{
 		children: [{
 				path: 'chartsetting',
 				path: 'chartsetting',
 				component: () => import('@/views/dataEntry_manage/chartSetting.vue'),
 				component: () => import('@/views/dataEntry_manage/chartSetting.vue'),
-				name: 'ETA图库',
+				name: '图库',
 				hidden: false,
 				hidden: false,
 			},
 			},
 			{
 			{
@@ -33,14 +33,14 @@ export default [
 	{
 	{
 		path: '/',
 		path: '/',
 		component: home,
 		component: home,
-		name: 'ETA指标库',
+		name: '指标库',
 		hidden: false,
 		hidden: false,
 		icon_path: require('@/assets/img/home/data_ic.png'),
 		icon_path: require('@/assets/img/home/data_ic.png'),
 		children: [
 		children: [
 			{
 			{
 				path: 'database',
 				path: 'database',
 				component: () => import('@/views/dataEntry_manage/databaseList.vue'),
 				component: () => import('@/views/dataEntry_manage/databaseList.vue'),
-				name: 'ETA指标库',
+				name: '指标库',
 				hidden: false,
 				hidden: false,
 			},
 			},
 			{
 			{
@@ -62,13 +62,13 @@ export default [
 	{
 	{
 		path: '/',
 		path: '/',
 		component: home,
 		component: home,
-		name: 'My ETA',
+		name: '我的图库',
 		hidden: false,
 		hidden: false,
 		icon_path: require('@/assets/img/home/data_ic.png'),
 		icon_path: require('@/assets/img/home/data_ic.png'),
 		children: [
 		children: [
 			{
 			{
 				path: 'mychart',
 				path: 'mychart',
-				name: 'My ETA',
+				name: '我的图库',
 				component: () => import('@/views/mychart_manage/index.vue'),
 				component: () => import('@/views/mychart_manage/index.vue'),
 				hidden: false,
 				hidden: false,
 			},
 			},
@@ -97,7 +97,7 @@ export default [
 	{
 	{
 		path: '/',
 		path: '/',
 		component: home,
 		component: home,
-		name: 'ETA表格',
+		name: '表格',
 		hidden: false,
 		hidden: false,
 		children:[
 		children:[
 			{
 			{
@@ -164,7 +164,7 @@ export default [
 	{
 	{
 		path: '/',
 		path: '/',
 		component: home,
 		component: home,
-		name: 'ETA逻辑',
+		name: '逻辑',
 		hidden: false,
 		hidden: false,
 		children: [
 		children: [
 			// {
 			// {
@@ -176,7 +176,7 @@ export default [
 			// 改版后的ETA逻辑图
 			// 改版后的ETA逻辑图
 			{
 			{
 				path: "sandlist",
 				path: "sandlist",
-				name: 'ETA逻辑',
+				name: '逻辑',
 				component: () => import('@/views/sandbox_manage/index_new_version.vue'),
 				component: () => import('@/views/sandbox_manage/index_new_version.vue'),
 				hidden: false,
 				hidden: false,
 			},
 			},
@@ -198,12 +198,12 @@ export default [
 	{
 	{
 		path:'/',
 		path:'/',
 		component: home,
 		component: home,
-		name: 'ETA预测指标',
+		name: '预测指标',
 		hidden:  false,
 		hidden:  false,
 		children: [
 		children: [
 			{
 			{
 				path: 'predictEdb',
 				path: 'predictEdb',
-				name: 'ETA预测指标',
+				name: '预测指标',
 				component:()=>import('@/views/predictEdb_manage/predictEdb.vue')
 				component:()=>import('@/views/predictEdb_manage/predictEdb.vue')
 			},
 			},
 			{
 			{

+ 1 - 1
src/views/Login.vue

@@ -73,7 +73,7 @@
 			<div class="login-box" id="login-container" v-if="activeModel!=='forgetPassModel'">
 			<div class="login-box" id="login-container" v-if="activeModel!=='forgetPassModel'">
                 <div class="fixed-login-cont">
                 <div class="fixed-login-cont">
                     <span class="login-title">{{ loginTitle }}</span>
                     <span class="login-title">{{ loginTitle }}</span>
-                    <span class="login-sub-title">ETA — {{ $t('LoginPage.login_sub_tit') }}<!-- 让投研领先市场半步 --></span>
+                    <span class="login-sub-title">{{ $t('LoginPage.login_sub_tit') }}<!-- 让投研领先市场半步 --></span>
                     <el-tabs v-model="activeModel" >
                     <el-tabs v-model="activeModel" >
 
 
                         <OrdinaryModel ref="ordinaryModel"
                         <OrdinaryModel ref="ordinaryModel"

+ 1 - 1
src/views/dataEntry_manage/targetList.vue

@@ -563,7 +563,7 @@ export default {
 				TradeCode:item.TradeCode
 				TradeCode:item.TradeCode
 			}).then(res => {
 			}).then(res => {
 				if(res.Data.Status===1){
 				if(res.Data.Status===1){
-					this.$message.error("该指标已加入ETA指标库,不可删除")
+					this.$message.error("该指标已加入指标库,不可删除")
 					return
 					return
 				}else{
 				}else{
 					this.$confirm(
 					this.$confirm(

+ 1 - 1
src/views/dataSource_manage/components/EDBInfoChangeTable.vue

@@ -208,7 +208,7 @@ export default {
         getTableHeadTips(key){
         getTableHeadTips(key){
             const tipsMap={
             const tipsMap={
                 EdbNameSource:this.$t('DataReportManage.GlStatisticTable.table_tips01')||'指标在数据源的全称',
                 EdbNameSource:this.$t('DataReportManage.GlStatisticTable.table_tips01')||'指标在数据源的全称',
-                EdbName:this.$t('DataReportManage.GlStatisticTable.table_tips13')||'指标在ETA指标库保存的指标名称',
+                EdbName:this.$t('DataReportManage.GlStatisticTable.table_tips13')||'指标在指标库保存的指标名称',
                 ErDataUpdateDate:this.$t('DataReportManage.GlStatisticTable.table_tips03')||'指标数据发生变化的最早日期',
                 ErDataUpdateDate:this.$t('DataReportManage.GlStatisticTable.table_tips03')||'指标数据发生变化的最早日期',
             }
             }
             return tipsMap[key]
             return tipsMap[key]

+ 1 - 1
src/views/system_manage/dataRefreshSetting.vue

@@ -30,7 +30,7 @@
                         <el-option v-for="i in terminalCodeList" :key="i.TerminalCode"
                         <el-option v-for="i in terminalCodeList" :key="i.TerminalCode"
                             :label="i.Name" :value="i.TerminalCode"/>
                             :label="i.Name" :value="i.TerminalCode"/>
                     </el-select>
                     </el-select>
-                    <el-cascader placeholder="ETA指标库分类" no-match-text="请选择完整数据源" clearable
+                    <el-cascader placeholder="指标库分类" no-match-text="请选择完整数据源" clearable
                         v-model="selectOption.classify" @change="selectOptionChange('classify')"
                         v-model="selectOption.classify" @change="selectOptionChange('classify')"
                         :options="edbClassifyList" 
                         :options="edbClassifyList" 
                         :show-all-levels="false"
                         :show-all-levels="false"

+ 59 - 7
src/views/system_manage/etaBaseConfig.vue

@@ -86,10 +86,42 @@
                             <el-input type="text" v-model="formData.ETATitle" placeholder="请输入登录页标题" />
                             <el-input type="text" v-model="formData.ETATitle" placeholder="请输入登录页标题" />
                             <ConfigAnnotation picHintText="" picName="ETATitle" @showImage="previewImage"/>
                             <ConfigAnnotation picHintText="" picName="ETATitle" @showImage="previewImage"/>
                         </el-form-item>
                         </el-form-item>
-                        <el-form-item label="网站名称" prop="TabName">
-                            <el-input type="text" v-model="formData.TabName" placeholder="请输入登录页标题" />
-                            <ConfigAnnotation picHintText="" picName="TabName" @showImage="previewImage"/>
-                        </el-form-item>
+                        <div class="inline-form-item-box">
+                            <div class="line-form-item-name">网站名称</div>
+                            <div class="line-form-item">
+                                <el-form-item label="PC端" prop="pcTabName">
+                                    <el-input type="text" v-model="formData.pcTabName" placeholder="请输入登录页标题" />
+                                    <ConfigAnnotation picHintText="" picName="pcTabName" @showImage="previewImage"/>
+                                </el-form-item>
+                                <el-form-item label="移动端" prop="mobileTabName">
+                                    <el-input type="text" v-model="formData.mobileTabName" placeholder="请输入登录页标题" />
+                                    <ConfigAnnotation picHintText="" picName="mobileTabName" @showImage="previewImage"/>
+                                </el-form-item>
+                            </div>
+                        </div>
+                        <div class="inline-form-item-box">
+                            <div class="line-form-item-name">系统logo</div>
+                            <div class="line-form-item">
+                                <el-form-item label="中文版" prop="logoCh">
+                                    <ImgUpload 
+                                    :imgUrl="formData.logoCh"
+                                    @showImage="showImage"
+                                    @upload="(file)=>handleUploadImage(file,'logoCh')"
+                                    @remove="deleteFormImg('logoCh')"
+                                    />
+                                    <ConfigAnnotation picHintText="" picName="logoCh" @showImage="previewImage"/>
+                                </el-form-item>
+                                <el-form-item label="英文版" prop="logoEn">
+                                    <ImgUpload 
+                                        :imgUrl="formData.logoEn"
+                                        @showImage="showImage"
+                                        @upload="(file)=>handleUploadImage(file,'logoEn')"
+                                        @remove="deleteFormImg('logoEn')"
+                                    />
+                                    <ConfigAnnotation picHintText="" picName="logoEn" @showImage="previewImage"/>
+                                </el-form-item>
+                            </div>
+                        </div>
                     </div>
                     </div>
                 </div>
                 </div>
                 <!-- 研报设置 -->
                 <!-- 研报设置 -->
@@ -477,7 +509,10 @@ export default {
                 ReportApproveType:'eta',//研报审批选项
                 ReportApproveType:'eta',//研报审批选项
                 ICPLicense:'', //备案信息
                 ICPLicense:'', //备案信息
                 ETATitle:'', //登录页标题
                 ETATitle:'', //登录页标题
-                TabName:'',//网页名称
+                pcTabName:'',//网页名称-PC端
+                mobileTabName:'',//网页名称-移动端
+                logoCh:'',//logo-中文版
+                logoEn:'',//logo-英文版 
             },//表单预设值
             },//表单预设值
             rules: {
             rules: {
                 Disclaimer:[{ required: true, message: '请输入免责声明', trigger: 'blur' }],
                 Disclaimer:[{ required: true, message: '请输入免责声明', trigger: 'blur' }],
@@ -507,7 +542,10 @@ export default {
                 CnPptCoverImgs:[{ required: true, validator:ListValidator}],
                 CnPptCoverImgs:[{ required: true, validator:ListValidator}],
                 EnPptCoverImgs:[{ required: true, validator:ListValidator}],
                 EnPptCoverImgs:[{ required: true, validator:ListValidator}],
                 ETATitle:[{ required: true, message: '请输入登录页标题', trigger: 'blur' }],
                 ETATitle:[{ required: true, message: '请输入登录页标题', trigger: 'blur' }],
-                TabName:[{ required: true, message: '请输入网站名称', trigger: 'blur' }],
+                pcTabName:[{ required: true, message: '请输入PC端网页名称', trigger: 'blur' }],
+                mobileTabName:[{ required: true, message: '请输入移动端网页名称', trigger: 'blur' }],
+                logoCh:[{ required: true, message: '请上传系统中文版Logo', trigger: 'blur' }],
+                logoEn:[{ required: true, message: '请上传系统英文版Logo', trigger: 'blur' }],
             },//表单校验
             },//表单校验
             disclaimerConfig:{
             disclaimerConfig:{
                 toolbarButtons:[
                 toolbarButtons:[
@@ -562,7 +600,10 @@ export default {
                 'emailContentTemplate':[require('@/assets/img/eta_base_config/email_content_template.png')],
                 'emailContentTemplate':[require('@/assets/img/eta_base_config/email_content_template.png')],
                 'ICPLicense':[require('@/assets/img/eta_base_config/record_information.jpg')],
                 'ICPLicense':[require('@/assets/img/eta_base_config/record_information.jpg')],
                 'ETATitle':[require('@/assets/img/eta_base_config/ETA_title.png')],
                 'ETATitle':[require('@/assets/img/eta_base_config/ETA_title.png')],
-                'TabName':[require('@/assets/img/eta_base_config/website_title.png')]
+                'pcTabName':[require('@/assets/img/eta_base_config/website_title.png')],
+                'mobileTabName':[require('@/assets/img/eta_base_config/website_title.png')],
+                'logoCh':[require('@/assets/img/eta_base_config/Logo_ch.png')],
+                'logoEn':[require('@/assets/img/eta_base_config/Logo_en.png')],
             },
             },
             /* loading */
             /* loading */
             configLoading:null,
             configLoading:null,
@@ -909,6 +950,17 @@ export default {
                     margin-bottom: 10px;
                     margin-bottom: 10px;
                     margin-top: -3px;
                     margin-top: -3px;
                 }
                 }
+                .inline-form-item-box{
+                    .line-form-item-name{
+                        color: #606266;
+                        font-size: 14px;
+                        line-height: 40px;
+                    }
+                    .line-form-item{
+                        display: flex;
+                        gap: 50px;
+                    }
+                }
             }
             }
             .ppt-form-item-wrap{
             .ppt-form-item-wrap{
                 width:100%;
                 width:100%;