1.8.2 暂存

src/lang/modules/DataSources/En.js

@@ -193,6 +193,14 @@ export default {
     col_status_irr:'Updates dependent on external sources may experience irregular delays',
     haved_all_msg:'All indicators added this time are already in the indicator library, please do not add them again!',
     haved_some_msg:'The following indicators already exist in the indicator library and will be automatically filtered out!'
+  },
+
+  /* 彭博数据源 */
+  BloombergPage:{
+    operation_prompt:'Operation Prompt',
+    add_edb_hint:'Max 30 indicators for bulk add!',
+    add_edb_check_hint1:'Incomplete Indicator Info',
+    add_edb_check_hint2:'Indicator name exists, please re-enter'
   }
   
 }

src/lang/modules/DataSources/Zh.js

@@ -192,5 +192,13 @@ export default {
     col_status_irr:'更新依赖外部会有不定期延迟',
     haved_all_msg:'本次添加的指标均已在指标库中，请勿重复添加！',
     haved_some_msg:'指标库中已存在以下指标，会自动过滤！'
+  },
+
+  /* 彭博数据源 */
+  BloombergPage:{
+    operation_prompt:'操作提示',
+    add_edb_hint:'批量添加指标数量不得超过30个！',
+    add_edb_check_hint1:'指标信息未填写完整',
+    add_edb_check_hint2:'指标名称已存在，请重新填写'
   }
 }

src/views/dataEntry_manage/thirdBase/bloombergSource.vue

@@ -2,16 +2,24 @@
     <div class="bloomberg-source-wrap">
         <div class="page-header">
             <div class="header-select-box">
-                <el-select v-model="frequenceSelect" placeholder="请选择频度">
+                <!-- 频度 -->
+                <el-select v-model="frequenceSelect" :placeholder="$t('Edb.InputHolderAll.input_fre')" style="width:240px">
                   <el-option label="日度" value="日度"></el-option>
                 </el-select>
-                <el-input v-model="keywordSelect" placeholder="指标ID/指标名称"></el-input>
+                <!-- 指标ID/名称 -->
+                <el-input 
+                    v-model="keywordSelect" 
+                    prefix-icon="el-icon-search"
+                    :placeholder="$t('Edb.InputHolderAll.input_name_orid')" 
+                    style="width:360px"></el-input>
+                <!-- 列表全选 -->
                 <el-checkbox 
                     :indeterminate="isIndeterminate" 
                     v-model="isCheckAll" 
-                    @change="listCheckAllChange">列表全选</el-checkbox>
+                    @change="listCheckAllChange">{{ $t('YsDataPage.label_all_check') }}</el-checkbox>
             </div>
-            <el-button type="primary" @click="isHintDialogShow=true">添加到指标库</el-button>
+            <!-- 添加到指标库 -->
+            <el-button type="primary" @click="isHintDialogShow=true">{{ $t('YsDataPage.add_base_btn') }}</el-button>
         </div>
         <div class="page-table">
             <el-table :data="tableData" border
@@ -34,9 +42,9 @@
                     :sortable="column.sortable?column.sortable:false"
                     align="center">
                 </el-table-column>
-                <el-table-column label="操作" align="center">
+                <el-table-column :label="$t('Table.column_operations')" align="center">
                     <template slot-scope="{row}">
-                        <el-button type="text">添加到指标库</el-button>
+                        <el-button type="text">{{ $t('YsDataPage.add_base_btn') }}</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -55,7 +63,6 @@
             :modal-append-to-body="false"
             @close="isHintDialogShow=false"
             width="578px"
-            top="5vh"
             v-dialogDrag
             center>
             <div class="hint-dialog-wrap">
@@ -67,10 +74,43 @@
                 </ul>
             </div>
             <div style="text-align: center;margin-bottom: 30px;">
-                    <el-button type="primary">知道了</el-button>
+                    <el-button type="primary" @click="handleCloseDialog">{{$t('Dialog.known')}}</el-button>
                 </div>
         </el-dialog>
         <!-- 添加到指标库弹窗 -->
+        <el-dialog 
+            title="添加到指标库"
+            :visible.sync="isAddDialogShow"
+            :close-on-click-modal="false"
+            :modal-append-to-body="false"
+            @close="isAddDialogShow=false"
+            width="900px"
+            top="5vh"
+            v-dialogDrag
+            center>
+            <div class="add-dialog-wrap">
+                <el-form :model="addForm">
+                    <div class="group" v-for="(item,index) in addForm.list" :key="index">
+                        <el-form-item :prop="`list[${index}].name`">
+                            <el-input v-model="item.name"></el-input>
+                        </el-form-item>
+                        <el-form-item :prop="`list[${index}].unit`">
+                            <el-input v-model="item.unit"></el-input>
+                        </el-form-item>
+                        <el-form-item :prop="`list[${index}].frequency`">
+                            <el-select></el-select>
+                        </el-form-item>
+                        <el-form-item :prop="`list[${index}].catalog`">
+                            <el-select></el-select>
+                        </el-form-item>
+                    </div>
+                </el-form>
+            </div>
+            <div style="text-align: center;margin-bottom: 30px;">
+                    <el-button @click="isAddDialogShow=false">{{$t('Dialog.cancel_btn')}}</el-button>
+                    <el-button type="primary" @click="handleCloseDialog">{{$t('Dialog.confirm_save_btn')}}</el-button>
+                </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -80,14 +120,6 @@ export default {
         return {
             frequenceSelect:'',
             keywordSelect:'',
-            tableColumns:[
-                {key:'EdbInfoId',label:'指标ID'},
-                {key:'name',label:'指标名称'},
-                {key:'frequence',label:'频度'},
-                {key:'startDate',label:'指标开始时间',sortable:true},
-                {key:'endDate',label:'指标最新时间',sortable:true},
-                {key:'updateDate',label:'更新时间',sortable:true}
-            ],
             tableData:[
                 {
                     'EdbInfoId':12345,
@@ -117,14 +149,42 @@ export default {
             selectionReactCancel:false,//select-事件触发时,为true;该事件触发完成后,为false;
             
             isHintDialogShow:false,
-            hintText:"本次添加的指标均已在指标库中，请勿重复添加!",
             hintList:[{
                 name:'中国金属硅分省份月度开工',
                 id:'a10123431'
-            }]
+            }],
+            isAddDialogShow:false,
+            addForm:{
+                list:[
+                    {
+                        name:'aaa',
+                        unit:'',
+                        frequency:'',
+                        catalog:''
+                    }
+                ]
+            }
 
         };
     },
+    computed:{
+        tableColumns(){
+            return [
+                    {key:'EdbInfoId',label:this.$t('Edb.Detail.e_id')}, //指标ID
+                    {key:'name',label:this.$t('Edb.Detail.e_name')},//指标名称
+                    {key:'frequence',label:this.$t('Edb.Detail.e_fre')},//频度
+                    {key:'startDate',label:this.$t('DataBankPage.table_col_start_time'),sortable:true},//指标开始时间
+                    {key:'endDate',label:this.$t('DataBankPage.table_col_newest_time'),sortable:true},//指标最新时间
+                    {key:'updateDate',label:this.$t('Edb.Detail.e_update_time'),sortable:true} //更新时间
+                ]
+        },
+        hintText(){
+            return {
+                1:this.$t('YsDataPage.haved_all_msg'),//本次添加的指标均已在指标库中，请勿重复添加！
+                2:this.$t('YsDataPage.haved_some_msg'),//指标库中已存在以下指标，会自动过滤！
+            }[2]
+        }
+    },
     methods: {
         getTableData(type){
             if(type==='optionChange'){
@@ -264,6 +324,12 @@ export default {
             setTimeout(()=>{
                 this.selectionReactCancel=false
             },50)
+        },
+        //操作提示弹窗关闭
+        handleCloseDialog(){
+            //判断是否要展示下一个弹窗
+            this.isHintDialogShow = false
+            this.isAddDialogShow = true
         }
     },
     mounted(){
@@ -272,6 +338,17 @@ export default {
 };
 </script>
 
+<style lang="scss">
+.bloomberg-source-wrap{
+    .add-dialog-wrap{
+        .el-form{
+            .group{
+                display: flex;
+            }
+        }
+    }
+}
+</style>
 <style scoped lang="scss">
 .bloomberg-source-wrap{
     min-height: calc(100vh - 120px);