Merge branch 'gn_bug_fix' into debug

src/lang/modules/ETATables/Zh.js

@@ -50,7 +50,7 @@ export default {
     table_name_empty_msg: "表格名称不能为空",
     name_empty_msg: "名称不能为空",
     TableInstructionsText: `表格说明：<br>
-    1、手动输入：单击每个单元格可直接输入文本、数字、日期（格式示例：2023-05-23），输入内容可匹配指标名称，指标库和预测指标库指标均可搜索，在下拉框中选择指标，则该单元格为已选指标行/列。<br>
+    1、手动输入：单击每个单元格可直接输入文本、数字、日期（格式示例：2023-05-23），输入内容可匹配指标名称，指标库和衍生指标库指标均可搜索，在下拉框中选择指标，则该单元格为已选指标行/列。<br>
     2、插入指标值：右键单元格，点击“插入指标值”，则查询该单元格行、列最近的日期和指标名称，将查找到的指标对应日期的值填入该单元格，指标值总是在右下角。<br>
     3、更新与计算规则：表格中指标值的日期不自动更新，数值不支持单元格计算`,
     date_type_label: "日期类型",
@@ -98,7 +98,7 @@ export default {
     not_allow_edit:'当前不可编辑',
     batch_settings:'批量设置',
     metrics:'指标',
-    forecast_metrics:'预测指标',
+    forecast_metrics:'衍生指标',
     please_select_metric_name:'请选择指标名称',
     move_successful:'移动成功',
     no_found_search:'未搜索到该指标',

src/lang/modules/EtaBase/commonLang.js

@@ -109,7 +109,7 @@ export default {
     en:'index'
   },
   eta_predictor_name:{
-    zh:'预测指标',
+    zh:'衍生指标',
     en:'predictor index'
   },
   formula_instru: {

src/lang/modules/EtaChart/Zh.js

@@ -77,7 +77,7 @@ export default {
     section_pos_bot: '底部',
     right_edb_type_on_year:'左轴指标同比',
     right_edb_type_lib:'指标库',
-    right_edb_type_pred:'预测指标',
+    right_edb_type_pred:'衍生指标',
     right_edb_gen_style:'生成样式',
     right_edb_gen_column:'柱形',
     right_edb_gen_mark:'标记点',

src/lang/modules/PredictEdb/Zh.js

@@ -5,8 +5,8 @@ export default {
   /* 预测指标页面 */
   PredictEdbPage: {
     only_see_mine: '只看我的',
-    total_list_view: '共{limit}个预测指标',
-    del_edb_msg: '预测指标删除后不可恢复，确认删除吗',
+    total_list_view: '共{limit}个衍生指标',
+    del_edb_msg: '衍生指标删除后不可恢复，确认删除吗',
     
     /* 查看基础指标弹窗 */
     view_rules: '查看预测规则',
@@ -22,7 +22,7 @@ export default {
   /* 添加指标页面 */
   PredictEditPage: {
     add_to_classify: '添加到分类',
-    predict_edb_name: '预测指标名称',
+    predict_edb_name: '衍生指标名称',
     predict_date_type: '预测日期类型',
     ph_date_type: '请选择日期类型',
     date_type_trade:'交易日',

src/lang/modules/SandboxManage/SandFlow.js

@@ -96,7 +96,7 @@ export const SandFlowEn = {
     copy_tag:'复制',
     delete_tag:'删除',
     add_link_search_placeholder:'指标ID/指标名称',
-    link_type_opt1:'指标/预测指标',
+    link_type_opt1:'指标/衍生指标',
     link_type_opt2:'图库',
     link_type_opt3:'研报',
     msg_leave_page_save:'在离开页面之前，是否保存当前内容？',

src/lang/modules/systemManage/OperateAuth.js

@@ -78,7 +78,7 @@ export const OperateAuthZh = {
     tab01:'手工数据指标',
     tab02:'钢联化工数据库',
     tab03:'指标库',
-    tab04:'预测指标',
+    tab04:'衍生指标',
     tab05:'图库',
     tab06:'表格',
 

src/views/chartRelevance_manage/components/chartCard.vue

@@ -195,7 +195,7 @@ export default {
           this.chartInfo = data.ChartInfo;
           this.tableData=data.EdbInfoList||[]
           this.statisticFrequencyData = data.DataResp;
-          this.setStatisticFrequency();
+          this.statisticFrequencyData&&this.setStatisticFrequency();
           break
       }
     },

src/views/chartRelevance_manage/relevance/components/multipleIndForm.vue

@@ -99,7 +99,7 @@
                 <div class="table-radio-wrap">
                     <el-radio-group v-model="factorData.EdbInfoType" @input="changeEdbType">
                         <el-radio :label="0">ETA指标</el-radio>
-                        <el-radio :label="1">预测指标</el-radio>
+                        <el-radio :label="1">衍生指标</el-radio>
                     </el-radio-group>
                     
                 </div>

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -2452,7 +2452,7 @@ export const chartSetMixin = {
       const chartTheme =  this.chartInfo.ChartThemeStyle ? JSON.parse(this.chartInfo.ChartThemeStyle) : null;
 
       const { DataList,LeftMaxValue,LeftMinValue,RightMaxValue,RightMinValue } = this.statisticFrequencyData;
-      
+      if(!DataList) return 
       let xAxis = {
         ...scatterXAxis,
         tickWidth: 1,

src/views/predictEdb_manage/components/edbDia.vue

@@ -81,7 +81,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="预测指标名称" prop="edbName">
+        <el-form-item label="衍生指标名称" prop="edbName">
           <el-input
           v-model="formData.edbName"
           style="width: 90%"

src/views/predictEdb_manage/predictEdb.vue

@@ -854,7 +854,7 @@ export default {
 
 		/* 添加指标 */
 		addEdbHandle() {
-			if(!this.treeData.length) return this.$message.warning('请先添加预测指标分类');
+			if(!this.treeData.length) return this.$message.warning('请先添加衍生指标分类');
 			this.$router.push({
 				path:'/addpredictEdb'
 			})

src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -138,6 +138,7 @@
                                     </div>
                                     <draggable
                                         :list="item.child"
+                                        v-if="item.child&&item.child.length"
                                         :group="{ name: 'component', pull: true, put: item.child&&item.child.length<3?true:false }"
                                         animation="300"
                                         tag="div"

src/views/semantics_manage/asr/ASR.vue

@@ -1072,6 +1072,7 @@ export default {
         })
       }
       this.select_node_data=""
+      this.page = 1;
       this.getArticleList()
       this.showFilterPopopver=false
     },

src/views/semantics_manage/summery/components/promptClassifySection.vue

@@ -95,8 +95,7 @@
                       <i class="el-icon-more" style="font-size: 16px;transform: rotate(90deg);cursor: pointer"/>
                     </span>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item v-if="permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_delete')"
-                          :command="{key:'del',IsPublic:undefined,item}"><!-- 删除 -->{{$t('Table.delete_btn')}}</el-dropdown-item>
+                      <el-dropdown-item :command="{key:'del',IsPublic:undefined,item}"><!-- 删除 -->{{$t('Table.delete_btn')}}</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>