ldong 3 місяців тому
батько
коміт
d19172e3bc

+ 14 - 3
src/lang/modules/ETATables/En.js

@@ -36,9 +36,20 @@ export default {
     keep_one_row_msg: "Please keep at least one row",
     no_here_val_msg: "Unable to insert value here",
     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 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 />
-    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.`,
+    1. Select indicators from the indicator library or forecast indicator library. By default, the dates and values of the last 12 periods are displayed, with the indicator dates based on the first added indicator (Column A). Other columns match data values according to the date. If there is no value for a corresponding date and there are values for adjacent dates, calculate the value for the corresponding date using linear interpolation: [(Y - Y1) / (X - X1) = (Y2 - Y1) / (X2 - X1)], and mark the background color.<br />
+    2. The table supports setting "Indicator Column + Date Row" and "Indicator Row + Date Column" layouts, with different formats available by default as "Indicator Column + Date Row". Dates can be set to ascending and descending order, with ascending order being the default.<br />
+    3. Supports adding more historical and future dates by clicking to add dates. Adding historical dates means taking more historical periods' dates according to the indicator in column A and looking up the values of other columns' indicators for that date, following the same rules as in 1; when adding future dates, a deadline must be set, and the system will automatically add future date rows/columns based on the deadline and the frequency of the indicators. Users can manually enter future forecast values or input simple formulas like "=A1+A2", and the system will automatically mark the background color of the cells.<br />
+    4. Supports the addition of text; by clicking, text rows/columns can be added. Users can input custom content or simple formulas, such as "=A1+A2".<br />
+    5. By clicking on the indicator name cell, you can edit the display name of the indicator within the table without affecting the original name of the indicator.<br />
+    6. The data in the table automatically updates along with the indicators, updating on a rolling basis by period. If forecast values are set, when the data is updated to the forecast date, the actual values will override the forecasted values.<br />
+    7. Supports deleting date rows/columns, and after deletion, the dates and values corresponding to the number of periods starting from the most recent date will be displayed.`,
+    TablebalanceMixText: `Table Instructions:<br />
+    1. Manual Entry: Click on each cell to directly input text, numbers, or dates (format example: 2023-05-23).<br />
+    2. Select Metric Values Based on Date: In the pop-up window, select a metric or forecast metric, you can choose the latest date of the metric or shift the period of the latest date, and you can also link to a specific cell date in the spreadsheet. On this basis, you can further transform the date, supporting date shifts or specifying frequencies, such as obtaining the Monday date of the week where the latest date is located. By using metrics and dates to retrieve data values, insert them into a cell.<br />
+    3. Import Date: You can choose the latest date of a metric or perform period shifts, or select the system date. On this basis, you can further transform the date, supporting date shifts or specifying frequencies to obtain a dynamically updated date.<br />
+    4. Date Calculation: Calculate between two date cells in the spreadsheet to obtain the result.<br />
+    5. Metric Calculation: Supports quickly selecting related metrics from the table, or searching for metrics in the metric library & forecast metric library to perform calculations. The generated results are inserted into cells, and the calculated metrics are updated along with the original metric data updates. The date for the calculated metrics can also be flexibly selected, following the same logic as in point 2.<br />
+    6. Formula Calculation: Directly enter formulas in the cells to perform simple calculations, such as entering "=A1+A2".`,
     select_table_category: "Please select table category",
     saving_loading_text: "Saving...",
     table_explaination_text: "Table explaination",

+ 14 - 3
src/lang/modules/ETATables/Zh.js

@@ -50,9 +50,20 @@ export default {
     table_name_empty_msg: "表格名称不能为空",
     name_empty_msg: "名称不能为空",
     TableInstructionsText: `表格说明:<br>
-    1、手动输入:单击每个单元格可直接输入文本、数字、日期(格式示例:2023-05-23),输入内容可匹配指标名称,指标库和衍生指标库指标均可搜索,在下拉框中选择指标,则该单元格为已选指标行/列。<br>
-    2、插入指标值:右键单元格,点击“插入指标值”,则查询该单元格行、列最近的日期和指标名称,将查找到的指标对应日期的值填入该单元格,指标值总是在右下角。<br>
-    3、更新与计算规则:表格中指标值的日期不自动更新,数值不支持单元格计算`,
+    1、选择指标库或预测指标库的指标,默认展示最近12期的日期和值,指标日期以第一个添加的指标为准(A列),其他列按照日期匹配数据值,若未匹配到对应日期的值,且前后日期有值,则通过线性插值法【(Y-Y1)/(X-X1)=(Y2-Y1)/(X2-X1)】计算出对应日期的值,并标记背景色;<br>
+    2、表格支持设置“指标列+日期行”和“指标行+日期列”,版式不同,默认为“指标列+日期行”,日期支持设置升序和降序,默认为升序;<br>
+    3、支持点击添加日期进行更多历史日期和未来日期的添加,添加历史日期表示按照A列指标取更多历史期数的日期,并根据该日期查找其他列指标的值,规则同1;添加未来日期时需要设置截止日期,系统会根据截止日期和指标频度,自动增加未来的日期行/列,用户可手动输入未来的预测值或输入简单的公式如“=A1+A2”,系统自动标记单元格的背景色;<br>
+    4、支持添加文本,点击则添加文本行/列,可自定义输入内容或输入简单的公式,如“=A1+A2”;<br>
+    5、点击指标名称单元格,可编辑该指标在表格中的名称显示,不影响指标的原始指标名称;<br>
+    6、表格中数据跟随指标自动更新,按照期数滚动式更新,若设置了预测值,则在数据更新到预测日期时,用实际值覆盖预测值;<br>
+    7、支持删除日期行/列,删除后,从最新日期开始取对应期数的日期和值进行展示;`,
+    TablebalanceMixText:`表格说明:<br>
+    1、手动输入:单击每个单元格可直接输入文本、数字、日期(格式示例:2023-05-23);<br>
+    2、根据日期选择指标值:在弹窗中选择一个指标或预测指标,可选择该指标的最新日期或对指标最新日期进行期数位移,也可关联到表格中的某个单元格日期,在上述基础上,可再进行日期变换,支持日期位移或指定频率,如获取最新日期所在周的周一日期,通过指标和日期取到数据值,插入单元格;<br>
+    3、导入日期:可以选择一个指标的最新日期或进行期数位移,也可选择系统日期,在上述基础上,可再进行日期变换,支持日期位移或指定频率,得到一个动态更新的日期;<br>
+    4、日期计算:对表格中两个日期单元格进行计算,得到计算结果;<br>
+    5、指标计算:支持快速选择表格中的关联的指标,也可搜索指标库&预测指标库中的指标,进行指标计算,生成的结果插入单元格,计算指标跟随原指标数据更新而更新,计算指标的日期也可灵活选择,逻辑同2;<br>
+    6、公式计算:直接在单元格输入公式,可进行简单的计算,如输入“=A1+A2”;<br>`,
     date_type_label: "日期类型",
     past_date_label: "过去日期",
     future_date_label: "未来日期",

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

@@ -1130,10 +1130,10 @@ export default {
     fit_residu: {
       zh: `拟合残差:计算一个指标(B)的实际值和拟合值(B’)的差值。拟合值B’由指标A(自变量)和指标B(因变量)通过线性回归拟合得到,具体算法如下:<br>
       根据指标A(自变量)和指标B(因变量)过去一个时间段内(这个N期可以是从最新值往前倒退N期,包含最新,也可以是选取历史数据的一个时间段内的数据),生成线性回归方程 Y=aX+b<br>
-      由指标A(自变量)和拟合方程的系数a,b,计算得到拟合出来的系列B’=aA b 再计算拟合系列B’和原始系列B的差值得到新的数据系列Delta,Delta=B-B'`,
-      en: `Fitting Residuals:Compute the difference between the actual value of a metric (B) and its fitted value (B’). The fitted value B’ is obtained through linear regression fitting of metric A (independent variable) and metric B (dependent variable), using the following algorithm:<br>
-      Based on past data for a certain period (this period N can be counting backwards N periods from the most recent, including the latest, or it can be a selected historical time frame) of metrics A (independent variable) and B (dependent variable), generate a linear regression equation Y = aX + b.<br>
-      Using the independent variable A and coefficients a, b from the fitting equation, calculate the fitted series B’ = aA + b. Then compute the difference between the fitted series B’ and the original series B to obtain a new data series Delta, where Delta = B - B’.`
+      由指标A(自变量)和拟合方程的系数a,b,计算得到拟合出来的系列B’=aA+b 再计算拟合系列B’和原始系列B的差值得到新的数据系列Delta,Delta=B-B'`,
+      en: `Fitting Residuals: Calculate the difference between the actual value of an indicator (B) and its fitted value (B'). The fitted value (B') is obtained by fitting the indicator A (independent variable) and the indicator B (dependent variable) through linear regression, with the specific algorithm as follows:<br>
+      According to indicator A (independent variable) and indicator B (dependent variable) over a certain period of time in the past (this N-period can be from the most recent value backwards N periods, including the most recent, or it can be selected from a specific period of historical data), generate a linear regression equation Y = aX + b.<br>
+      By using the independent variable A and the coefficients a and b from the fitting equation, calculate the fitted series B' = aA + b. Then, calculate the difference between the fitted series B' and the original series B to obtain a new data series Delta, where Delta = B - B'.`
     },
     annual: {
       zh: `年化值=S / a (S表示指标数值,a表示年化平均占比)<br>

+ 1 - 1
src/views/datasheet_manage/balanceSheetEdit.vue

@@ -269,7 +269,7 @@ export default {
       return url;
     },
     rules() {
-      return this.$t('OnlineExcelPage.TableInstructionsText') || ''
+      return this.$t('OnlineExcelPage.TablebalanceMixText') || ''
     },
     isView(){
       return this.$route.path==='/viewBalanceSheet'

+ 1 - 1
src/views/datasheet_manage/mixedSheetEdit.vue

@@ -117,7 +117,7 @@ export default {
               this.permissionBtn.isShowBtn('etaTablePermission','etaTable_customize_mix_save')
     },
     rules(){
-      return this.$t('OnlineExcelPage.TableInstructionsText') ||''
+      return this.$t('OnlineExcelPage.TablebalanceMixText') ||''
     },
     sheetTypeOption(){
       return [