Browse Source

ETA_1.9.1 bug修复

hbchen 9 months ago
parent
commit
bcd588157e

+ 6 - 4
src/lang/modules/systemManage/DataRefresh.js

@@ -54,6 +54,7 @@ export const DataRefreshZh = {
 
   reference_time:"引用时间",
   reference_source:"引用来源",
+  reference_chart_table:"引用图表/表格",
 
   refresh_rate: "刷新频率",
   trading_day: "每交易日",
@@ -83,8 +84,8 @@ export const DataRefreshZh = {
   edbStopDays_hint_front:"指标库间隔",
   edbStopDays_hint_behind:"天未引用则停用",
   IntervalDaysError:"请输入正确的格式",
-
-  disable_indicator_prompt:"停用后该数据将停止刷新,是否继续操作?"
+  disable_indicator_prompt:"停用后该数据将停止刷新,是否继续操作?",
+  status_rule_prompt:"只针对wind和钢联化工指标生效"
 };
 
 /* 英文 */
@@ -135,6 +136,7 @@ export const DataRefreshEn = {
   
   reference_time:"Reference Time",
   reference_source:"Reference Source",
+  reference_chart_table:"Refer to the chart/table",
 
   refresh_rate: "Refresh Rate",
   trading_day: "Every Trading Day",
@@ -164,6 +166,6 @@ export const DataRefreshEn = {
   edbStopDays_hint_behind:"days, it will be deactivated.",
   disableRulePrompt:"After closing the configuration, metrics will not be automatically processed as disabled",
   IntervalDaysError:"Please enter the correct format",
-  
-  disable_indicator_prompt:"After disabling, the data will stop refreshing. Do you want to continue?"
+  disable_indicator_prompt:"After disabling, the data will stop refreshing. Do you want to continue?",
+  status_rule_prompt:"Only effective for Wind and Ganglian Chemical indicators."
 };

+ 9 - 1
src/views/system_manage/components/defaultRefreshStatusDia.vue

@@ -37,6 +37,9 @@
             </el-form-item>
           </el-form>
       </div>
+      <div class="rule-prompt">
+        ({{$t('SystemManage.DataRefresh.status_rule_prompt')}})
+      </div>
       <!-- 弹窗按钮 -->
       <div class="dialog-btn">
           <el-button type="primary" plain @click="$emit('update:show',false)" style="width: 120px;">{{$t('Dialog.cancel_btn')}}</el-button>
@@ -117,7 +120,7 @@
 
 <style lang="scss" scoped>
   .rule-container{
-    padding-left: 55px;
+    padding-left: 35px;
     .rule-enable{
       .rule-enable-item,.rule-item{
         display: flex;
@@ -130,6 +133,11 @@
       }
     }
   }
+  .rule-prompt{
+    font-size:14px;
+    color: #F56C6C;
+    text-align: center;
+  }
   .dialog-btn{
     padding: 40px 0 30px 0;
     display: flex;

+ 5 - 0
src/views/system_manage/components/referenceCountDia.vue

@@ -22,6 +22,11 @@
             {{scope.row.ReferObjectTypeName}}
           </template>
       </el-table-column>
+      <el-table-column align="center" prop="ReferObjectName" :label="$t('SystemManage.DataRefresh.reference_chart_table')">
+          <template slot-scope="scope">
+            {{scope.row.ReferObjectName}}
+          </template>
+      </el-table-column>
     </el-table>
     <!-- 弹窗按钮 -->
     <div class="dialog-btn">

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

@@ -989,9 +989,9 @@ export default {
                 }
                 if(type==='search'){
                     //如果是表格筛选项改变导致重新请求数据
-                    //数据获取完成后,列表全选,表格全
+                    //数据获取完成后,清空所
                     this.statusDataSelectionItem.selectList = []
-                    this.statusListCheckAllChange(true)
+                    this.statusListCheckAllChange(false)
                 }else{
                     //若不是,数据获取完成后,查询列表全选的值
                     //若当页有数据在selectList内,则勾选/剔除