Merge branch 'requirements_206'

src/lang/modules/EtaBase/En.js

@@ -209,6 +209,22 @@ export default {
     field_instru: '*Field Description',
     res_show_col1: 'Date',
     res_show_col2: 'Value',
+    opt_tip_btn:'Operation instruction',
+    opt_tip_btn_text:`<div>1. Enter the code in the code input box to invoke the index library indicators for analysis and calculation. After running, output the analysis results:</div>
+    <div>2. Click on the index information, select the data source and search for the index ID/index name, then display the table structure where the index is located, and you can copy and fetch the index code with one click:</div>
+    <div>3. Add a line of code at the end of the calculation for formatted output, where "raw" is the data after final calculation (fill in with actual variable names):</div>
+    <div>result = format_data(raw, "data_time", "value")</div>
+    <div>4. Here is a runnable code example (the code to fetch index data needs to be replaced according to the system query):</div>
+    <br />
+    <div># Fetching Index Data Code:</div>
+    <div>sql1 = f'""'SELECT data_time,\`value\` FROM edb_data_ths WHERE edb_code = 'S004414853' ;'""'</div>
+    <div>raw = pandas_fetch_all(sql1, db)</div>
+    <div># Index Calculation Method Code:</div>
+    <div>raw['value'] = raw['value'] + 1</div>
+    <div># Date Format Conversion Code:</div>
+    <div>raw['data_time'] = raw['data_time'].apply(lambda x: x.strftime("%Y-%m-%d"))</div>
+    <div># Print Calculation Result Code:</div>
+    <div>result = format_data(raw, "data_time", "value")</div>`
   },
 
   /* 数据调整页面 */

src/lang/modules/EtaBase/Zh.js

@@ -210,6 +210,22 @@ export default {
     field_instru: '*字段说明',
     res_show_col1: '日期',
     res_show_col2: '值',
+    opt_tip_btn:'操作说明',
+    opt_tip_btn_text:`<div>1、在代码输入框中输入代码，可调用指标库指标进行分析计算，运行后输出分析结果；</div>
+    <div>2、点击指标信息，选择数据来源并检索指标ID/指标名称后，展示指标所在表结构，可一键复制调取指标代码；</div>
+    <div>3、代码运算的最后需要加一行代码用于格式化输出，其中raw是最后计算后的数据（变量名以实际名填写）：</div>
+    <div>result = format_data(raw, "data_time", "value")</div>
+    <div>4、以下是可运行的代码示例（其中调取指标数据代码需根据系统查询替换）：</div>
+    <br />
+    <div>#调取指标数据代码：</div>
+    <div>sql1 = f'""'SELECT data_time,\`value\` FROM edb_data_ths WHERE edb_code = 'S004414853' ;'""'</div>
+    <div>raw = pandas_fetch_all(sql1, db)</div>
+    <div>#指标计算方式代码：</div>
+    <div>raw['value'] = raw['value'] + 1</div>
+    <div>#日期格式转化代码：</div>
+    <div>raw['data_time'] = raw['data_time'].apply(lambda x: x.strftime("%Y-%m-%d"))</div>
+    <div>#打印运算结果代码：</div>
+    <div>result = format_data(raw, "data_time", "value")</div>`
   },
 
   /* 数据调整页面 */

src/views/dataEntry_manage/codecount/index.vue

@@ -1,7 +1,14 @@
 <template>
 	<el-card class="codecount-container">
 		<div slot="header" class="header">
-			<span><!-- 代码运算 -->{{$t('EtaBasePage.algorithm_btn')}}</span>
+			<div class="header-left">
+				<span><!-- 代码运算 -->{{$t('EtaBasePage.algorithm_btn')}}</span>
+				<span class="opt-btn" @click="operationTipShow=true">
+					<img src="~@/assets/img/data_m/icon01.png" alt="">
+					<!-- 操作说明 -->
+					<span>{{$t('CodeCountPage.opt_tip_btn')}}</span> 
+				</span>
+			</div>
 			<div>
 				<el-button type="primary" @click="runCodeHandle"><!-- 运行 -->{{$t('CodeCountPage.run_btn')}}</el-button>
 				<el-button type="primary" plain @click="saveHandle" v-if="!isView"><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
@@ -171,6 +178,20 @@
 				</el-tabs>
 			</el-col>
 		</div>
+		<!-- 操作说明 -->
+		<el-dialog
+			:title="$t('CodeCountPage.opt_tip_btn')"
+			:visible.sync="operationTipShow"
+			:close-on-click-modal="false"
+			center
+			v-dialogDrag
+			:append-to-body="true"
+			width="900px"
+		> 
+			<div class="dialog-container">
+				<div style="line-height:20px;color:#000000;font-size: 14px;word-break: normal;" v-html="$t('CodeCountPage.opt_tip_btn_text')"></div>
+			</div>
+		</el-dialog>
 	</el-card>
 </template>
 
@@ -218,7 +239,9 @@ export default {
 				sheetArr:[],
 				sheet_name: '',
 				sql_code: ''
-			}
+			},
+
+			operationTipShow:false
 		};
 	},
 	watch: {
@@ -467,6 +490,24 @@ export default {
 		justify-content: space-between;
 		align-items: center;
 		font-size: 16px;
+		.header-left{
+			display:flex;
+			align-items: center;
+			.opt-btn{
+				display:inline-flex;
+				align-items: center;
+				margin-left: 10px;
+				cursor: pointer;
+				img{
+					width: 32px;
+					height: 34px;
+				}
+				span{
+					color:rgb(64, 158, 255);
+				}
+			}
+		}
+
 	}
 	.bottom {
 		height: calc(100vh - 240px);
@@ -509,6 +550,9 @@ export default {
 		}
 	}
 }
+.dialog-container{
+	padding:0 60px 60px ;
+}
 </style>
 <style lang="scss">
 .codecount-container {