页面

src/lang/modules/DataSources/En.js

@@ -54,6 +54,7 @@ export default {
 
     //导入弹窗
     tit_insert_data:'Import Data',
+    tem_msg:'Template {index}',
     tit_export:'Export to Excel',
     down_tem:'Download Import Templates',
     down_fail_list:'the list of failed imports',
@@ -64,6 +65,7 @@ export default {
     down_fail_list2: 'Download Failure List',
     upload_tip_msg: 'A total of {success_count} data entries have been successfully imported this time.',
     upload_tip_msg2: 'A total of {success_count} data entries were successfully imported this time, with {fail_count} failures.',
+    view_big_img: 'View larger image',
 
     col_status_1:'Completed',
     col_status_2:'Incomplete',

src/lang/modules/DataSources/Zh.js

@@ -54,6 +54,7 @@ export default {
 
     //导入弹窗
     tit_insert_data:'导入数据',
+    tem_msg:'模板{index}',
     tit_export:'导出Excel',
     down_tem:'下载导入模板',
     down_fail_list:'导入失败列表',
@@ -64,6 +65,7 @@ export default {
     down_fail_list2: '下载失败列表',
     upload_tip_msg: '本次共成功导入{success_count}条数据',
     upload_tip_msg2: '本次共成功导入{success_count}条数据，失败{fail_count}条',
+    view_big_img: '查看大图',
 
     col_status_1:'完成',
     col_status_2:'未完成',

src/routes/modules/dataRoutes.js

@@ -92,7 +92,7 @@ export default [
         hidden: true,
       },
       {
-        path: "batchToDel",
+        path: "batchDelList",
         component: () => import("@/views/dataEntry_manage/dataEntry/addToBaseList.vue"),
         name: "批量删除",
         meta: {

src/utils/buttonConfig.js

@@ -218,7 +218,10 @@ export const dataSourcePermission = {
     manualDataWrite_edit:'manualDataWrite:edit',//编辑按钮，直接编辑没有禁
     manualDataWrite_export:'manualDataWrite:export',//导出
     manualDataWrite_import:'manualDataWrite:import',//导入
-    manualDataWrite_copy:'manualDataWrite:copy',//复制
+    manualDataWrite_online_excel:'manualDataWrite:online:excel',//在线excel
+    manualDataWrite_batch_add:'manualDataWrite:batch:add',//批量加入
+    manualDataWrite_batch_del:'manualDataWrite:batch:del',//批量删除
+    
     /*--------期货数据库没有要控制的东西---- */
     /*--------隆众原始数据库---- */
     longzhongData_export:'longzhongData:export',

src/views/dataEntry_manage/components/insertData.vue

@@ -29,7 +29,7 @@
             </a>
             <div>
               <img :src="tem.previewImg" alt="" width="150" style="display:block;margin:10px 0;">
-              <span class="editsty" @click="handlePreviewImg(tem)">查看大图</span>
+              <span class="editsty" @click="handlePreviewImg(tem)"><!-- 查看大图 -->{{$t('ManualEntryPage.view_big_img')}}</span>
             </div>
           </div>
         </div>
@@ -104,12 +104,12 @@ export default {
 
       templateList: [
         {
-          name:"模板1",
+          name:/* "模板1"  */this.$t('ManualEntryPage.tem_msg',{index:1}),
           url: this.downloadTemplate,
           previewImg: require('@/assets/img/data_m/tem1.png')
         },
         {
-          name:"模板2",
+          name:/* "模板2" */this.$t('ManualEntryPage.tem_msg',{index:2}),
           url: this.downloadTemplateTwo,
           previewImg: require('@/assets/img/data_m/tem2.png')
         },

src/views/dataEntry_manage/dataEntry/addToBaseList.vue

@@ -1,23 +1,494 @@
 <template>
-  <div>
-    
+  <div class="batch-opera-list">
+    <div class="header">
+      <div class="left">
+        <el-select
+          v-model="filterObj.source"
+          @change="filterChange"
+          :placeholder="$t('SelftDataPage.ph_channel')"
+          clearable
+        >
+          <el-option 
+            v-for="item in sourceOptions" 
+            :key="item.EdbBusinessSourceId" 
+            :label="item.SourceName" 
+            :value="item.EdbBusinessSourceId"
+          />
+        </el-select>
+
+        <el-select
+          v-model="filterObj.frequency"
+          @change="filterChange"
+          :placeholder="$t('Edb.InputHolderAll.input_fre')"
+          clearable
+        >
+          <el-option v-for="item in frequencyOptions" :key="item.val" :label="item.label" :value="item.val"/>
+        </el-select>
+
+        <el-input 
+          v-model="filterObj.keyWord" 
+          :placeholder="$t('Edb.InputHolderAll.input_name_orid')"
+          style="width: 250px;"
+          @change="filterChange"
+          clearable
+          >
+          <i slot="prefix" class="el-input__icon el-icon-search"/>
+        </el-input>
+
+        <el-checkbox 
+            v-model="filterObj.checkAll"
+            :indeterminate="filterObj.checkSome"
+            :disabled="tableData.length===0"
+            style="margin-left:20px" 
+            @change="listCheckAllChange"
+          ><!-- 列表全选 -->{{$t('SystemManage.OperateAuth.all_select')}}</el-checkbox>
+      </div>
+
+      <el-button 
+        v-permission="permissionBtn.dataSourcePermission.selfData_addEdb"
+        type="primary" 
+        @click="handleCheckEdb('multiple')"
+      ><!-- 添加到指标库 -->{{$t('YsDataPage.add_base_btn')}}</el-button>
+    </div>
+
+    <div class="main">
+      <el-table
+        :data="tableData"
+        ref="table"
+        element-loading-text="加载中..."
+        v-loading="tableLoading"
+        border
+        style="margin:20px 0"
+        @selection-change="selectionChange"
+        @select="selectHandle" 
+        @select-all="selectAllPageHandle"
+      >
+          <el-table-column
+            type="selection"
+            width="55"
+          />
+          <el-table-column
+            v-for="item in tableColums"
+            :key="item.label"
+            :label="item.label"
+            :prop="item.key"
+            :width="item.widthsty"
+            :min-width="item.minwidthsty"
+            align="center"
+          >
+            <template slot-scope="{row}">
+
+              <template v-if="item.key==='IndexName'">
+                <span style="white-space: pre-wrap;">{{ row.IndexName }}</span>
+              </template>
+
+              <span v-else>{{ row[item.key] }}</span>
+            </template>
+          </el-table-column>
+          
+          <div slot="empty" style="padding: 100px 0">
+            <tableNoData :text="$t('Table.prompt_slogan')" size="mini"/>
+          </div>
+      </el-table>
+
+      <div style="height:35px;margin: 20px 0;">
+        <m-page
+          :page_no="page_no"
+          :pageSize="pageSize"
+          :total="total"
+          @handleCurrentChange="pageChange"
+        />
+      </div>
+    </div>
+
+
+    <!-- 操作提示弹窗 -->
+    <el-dialog 
+      :title="$t('BloombergPage.operation_prompt')"
+      :visible.sync="isHintDialogShow"
+      :close-on-click-modal="false"
+      :modal-append-to-body="false"
+      @close="isHintDialogShow=false"
+      width="578px"
+      v-dialogDrag
+      center>
+      <div class="hint-dialog-wrap">
+          <p style="margin-bottom: 20px;">{{ hintText }}</p>
+          <ul>
+              <li v-for="(item,index) in existEdbList" :key="index" class="hint-item" @click="goToEdbBase(item)">
+                  {{ index+1 }}、{{ item.IndexName }}({{ item.IndexCode }})
+              </li>
+          </ul>
+      </div>
+      <div style="text-align: center;margin-bottom: 30px;">
+          <el-button type="primary" @click="handleCloseHintDia">{{$t('Dialog.known')}}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
+import { selfDataInterface } from '@/api/modules/dataSource';
+import mPage from '@/components/mPage.vue';
 export default {
+  components: { mPage },
+  computed: {
+    tableColums() {
+        return [
+          {
+            label: this.$t('Edb.Detail.e_id'),
+            key: 'IndexCode',
+          },
+         {
+            label: this.$t('Edb.Detail.e_name'),
+            key: 'IndexName',
+          },
+          {
+            label: /* '最新日期' */this.$t('Edb.Detail.e_latest_date'),
+            key: 'EndDate',
+            sortable:true,
+          },
+          {
+            label: /* '最新值' */this.$t('Edb.Detail.e_latest_value'),
+            key: 'EndDate',
+            sortable:true,
+          },
+          {
+            label: this.$t('Edb.Detail.e_fre'),
+            key: 'Frequency',
+          },
+          {
+            label: this.$t('Edb.Detail.e_unit'),
+            key: 'Unit',
+          },
+          {  
+            label: this.$t('Edb.Detail.e_creator'),
+            key: 'UserName' 
+          },
+          {  
+            label: this.$t('Edb.Detail.e_update_time'),
+            key: 'ModifyTime' 
+          },
+
+        ]
+    },
+
+    frequencyOptions(){
+      return [
+        { label:'日度',val: '日度' },
+        { label:'周度',val: '周度' },
+        { label:'旬度',val: '旬度' },
+        { label:'月度',val: '月度' },
+        { label:'季度',val: '季度' },
+        { label:'半年度',val: '半年度' },
+        { label:'年度',val: '年度' },
+      ]
+    },
+
+    hintText(){
+        let key = 0
+        if(this.existEdbList.length) key++
+        if(!this.addToBaseList.length) key++
+
+        return {
+            0:'',
+            1:this.$t('YsDataPage.haved_all_msg'),//本次添加的指标均已在指标库中，请勿重复添加！
+            2:this.$t('YsDataPage.haved_some_msg'),//指标库中已存在以下指标，会自动过滤！
+        }[key]
+    }
+  },
   data() {
     return {
+      tableLoading: false,
+      total: 0,
+      
+      tableData: [],
+
+      sourceOptions: [],
+
+      isSelectAll: false, //真正意义上的全选或不全选
+      checkedList: [], //不全选勾选中的 或 全选取消勾的
+      selectionReactCancel:false,//手动设置选中中
+
+      filterObj: {
+        page_no: 1,
+        pageSize: 10,
+        source: '',
+        frequency: '',
+        keyWord: '',
+        sortParam:'',
+        sortType:'',
+        checkAll: false, //控制全选显示状态
+        checkSome: false
+      },
+
+      /* 查看数据弹窗 */
+      isLookDataDia: false,
+      lookEdbInfo: {},
+
+      /* 加入指标库弹窗 */
+      isAddToBaseDia: false,
+      addToType: 'multiple',
+      addToBaseList: [],//可加入的指标
+      existEdbList: [],//已存在的指标
+
+      /* 提示弹窗 */
+      isHintDialogShow: false,
 
     }
   },
   mounted(){
-
+    this.getSource();
+    this.getTableData('init');
   },
   methods:{
+    getSource() {
+      selfDataInterface.getSourceList().then(res => {
+        if(res.Ret!==200 ) return
+
+        this.sourceOptions = res.Data || [];
+      })
+    },
+
+    getTableData(type='pageChange') {
+      this.tableLoading = true;
+
+      const { frequency,page_no,pageSize,keyWord,source,sortParam,sortType } = this.filterObj;
+
+      let params = {
+        Frequency: frequency,
+        CurrentIndex: page_no,
+        PageSize: pageSize,
+        Keywords: keyWord,
+        Source: source,
+        SortField: sortParam,
+        SortRule: sortType
+      }
+			selfDataInterface.getEdbList(params).then(res => {
+        this.tableLoading = false;
+        if( res.Ret!==200 )return
+
+        const { Data } = res;
+
+        this.tableData = Data.List || [];
+        this.total = Data.Paging.Totals;
+        
+        if(type==='filter'){
+          this.listCheckAllChange(true)
+        }else {
+          //页码变化 选中项不做清空
+          this.checkedSomeSelection()
+
+        }
+			});
+    },
+
+    /* 设置当页数据勾选状态 */
+    checkedSomeSelection() {
+      this.selectionReactCancel=true
+
+      if(!this.isSelectAll){
+          this.checkedList.map(_ =>{
+              let row = this.tableData.find(item => item.IndexCode==_.IndexCode)
+              if(row){ //设置部分选中
+                  setTimeout(()=>{
+                      this.$refs.table.toggleRowSelection(row,true)
+                  },20)
+              }
+          })
+      }else{
+          this.$refs.table &&this.$refs.table.toggleAllSelection()
+          this.checkedList.map(_ =>{
+              let row = this.tableData.find(item => item.IndexCode==_.IndexCode)
+              if(row){ //设置部分不勾选
+                  setTimeout(()=>{
+                      this.$refs.table.toggleRowSelection(row,false)
+                  },20)
+              }
+          })
+      }
+      setTimeout(()=>{
+          this.selectionReactCancel=false
+      },30)
+    },
+
+    //列表全选或全不选
+    listCheckAllChange(value){
+      this.checkedList = []
+      this.isSelectAll = value
+      this.$refs.table && this.$refs.table.clearSelection()
+
+      value && this.$refs.table && this.$refs.table.toggleAllSelection()
+    },
+
+    selectionChange() {
+      if(this.selectionReactCancel) return
+
+        //设置全选框状态 选中 半选 不选
+        setTimeout(()=>{
+            let filterChecked = Array.from(new Set(this.checkedList))
+            //全选
+            if(
+              (filterChecked.length===this.total&&this.total>0 && (!this.isSelectAll))
+                || (filterChecked.length === 0 && this.isSelectAll)
+            ){
+                this.filterObj.checkAll = true
+                this.filterObj.checkSome = false
+            //不选
+            }else if(
+              (filterChecked.length === 0 && (!this.isSelectAll))
+              || (filterChecked.length === this.total && this.isSelectAll)
+            ){
+                this.filterObj.checkAll = false
+                this.filterObj.checkSome = false
+            //半选
+            }else{
+                this.filterObj.checkAll = false
+                this.filterObj.checkSome=true
+            }
+        },1)
+    },
+
+    //单选
+    selectHandle(selection,row){ //当前选中的项是进选中还是取消选中中
+        if(this.selectionReactCancel) return 
+
+        //当前项是选中还是取消选
+        let haveChecked = selection.some(_ => _.IndexCode === row.IndexCode);
+
+        //全选取消选和不全选选中才有意义
+        if((haveChecked&&!this.isSelectAll) || (!haveChecked&&this.isSelectAll)) {
+          this.checkedList.push(row)
+        }else {
+          this.checkedList=this.checkedList.filter(_ => _.IndexCode!==row.IndexCode)
+        }
+    },
+
+    //整列选
+    selectAllPageHandle(selection){
+        if(this.selectionReactCancel) return 
+        
+        //当前页是选中还是取消
+        let haveChecked = selection && selection.length>0;
+
+        //全选取消选和不全选选中才有意义
+        if((haveChecked&&!this.isSelectAll) || (!haveChecked&&this.isSelectAll)) {
+          this.checkedList = [...this.checkedList,...this.tableData]
+        }else {
+
+          let pageIds = this.tableData.map(_ => _.IndexCode);
+          this.checkedList = this.checkedList.filter(_ => !pageIds.includes(_.IndexCode))
+        }
+    },
+
+
+    // 页码改变
+    pageChange(page) {
+      this.filterObj.page_no = page;
+      this.getTableData('pageChange')
+    },
+
+    filterChange(val) {
+      this.filterObj.page_no = 1;
+      if(!val) {
+        this.isSelectAll = false
+        this.checkedList = []
+        this.filterObj.checkAll = false
+        this.filterObj.checkSome = false
+      }
+      this.getTableData(val?'filter':'')
+    },
+
+    /* 查看数据 */
+    lookDataHandle(item) {
+
+      this.lookEdbInfo = item;
+      this.isLookDataDia =  true
+    },
+
+    handleCheckEdb(type='multiple',data={}){
+
+      if(type==='multiple' && !this.checkedList.length && !this.isSelectAll) return this.$message.warning('请选择指标')
+
+      const {frequence,keyWord,sortParam,sortType} = this.filterObj
+
+      selfDataInterface.checkEdb({
+          Frequency:frequence,
+          Keywords:keyWord,
+          SortField:sortParam||0,
+          SortRule:sortType||0,
+          ListAll:type==='single'?false:this.isSelectAll,
+          IndexCodes:type==='single'?[data.IndexCode]:this.checkedList.map(_=>_.IndexCode)
+      }).then(res=>{
+          if(res.Ret!==200) return 
+
+          const edbList = res.Data||[]
+          this.existEdbList = edbList.filter(i=>i.EdbExist===1)
+          this.addToBaseList = edbList.filter(i=>i.EdbExist===0)
+
+          this.existEdbList.length&&(this.isHintDialogShow=true)
+          !this.existEdbList.length&&this.handleCloseHintDia()
+      })
+    },
+
+    //提示弹窗关闭
+    handleCloseHintDia(){
+        this.isHintDialogShow = false
+        //判断是否要展示下一个弹窗
+        if(!this.addToBaseList.length) return
+        
+        if(this.addToBaseList.length>100) return this.$message.warning('批量添加指标数量不得超过100个！')
+
+        this.isAddToBaseDia = true
+    },
+
+    //跳转至指标详情
+    goToEdbBase(data){
+        const {EdbClassifyId,EdbInfoId,EdbUniqueCode} = data||{}
+        const { href } = this.$router.resolve({
+            path:'/database',
+            query:{
+                code:EdbUniqueCode,
+                id:EdbInfoId,
+                classifyId:EdbClassifyId,
+            }
+        })
+        window.open(href,"_blank")
+    }
 
   },
 }
 </script>
 <style scoped lang='scss'>
+.batch-opera-list {
+    min-height: calc(100vh - 120px);
+    display: flex;
+    flex-direction: column;
+    background-color: #fff;
+    border: 1px solid #c8cdd9;
+    border-radius: 4px;
+    box-shadow: 0 3px 6px rgba(0, 0, 0, .05);
+    padding: 20px;
+    box-sizing: border-box;
 
+    .header {
+      display: flex;
+      justify-content: space-between;
+      .left {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+      }
+    }
+}
+.hint-dialog-wrap{
+    padding-bottom:30px;
+    .hint-item{
+        cursor: pointer;
+        margin-bottom: 10px;
+        &:hover{
+            color:#409EFF;
+            text-decoration: underline;
+        }
+    }
+}
 </style>

src/views/dataEntry_manage/dataEntry/components/edbDetail.vue

@@ -67,8 +67,24 @@
           v-for="item in dataList"
           :key="item.Dt"
         >
-          <span class="value-label">{{item.Dt}}</span>
-          <span class="value-label">{{item.Close}}</span>
+          <div class="value-label">
+            <el-date-picker
+              v-model="item.Dt"
+              type="date"
+              :placeholder="$t('Edb.InputHolderAll.input_date')"
+              :clearable="false"
+              :editable="false"
+              value-format="yyyy-MM-dd"
+              :readonly="false"
+              @mousedown.native="mousedown($event)"
+              prefix-icon="none"
+              @input="handleTimeChange(rindex, item)"
+              @focus="handleTimeFocus(rindex, item)"
+            ></el-date-picker>
+          </div>
+          <div class="value-label">
+            {{item.Close}}
+          </div>
         </li>
         <li class="nodata value-item" v-if="!dataList.length">{{$t('Table.prompt_slogan')}}</li>
       </ul>
@@ -200,6 +216,11 @@ export default {
       
     },
 
+    /* 更改日期 */
+    handleTimeChange() {
+
+    },
+
     /* 右键 */
     handleRightClick(e) {
       console.log(e)

src/views/dataEntry_manage/dataEntry/index.vue

@@ -4,13 +4,24 @@
     <header>
       <div class="left-btn">
         <el-button type="primary" @click="isShowinsert=true"><!-- 导入数据 -->{{$t('ManualEntryPage.tit_insert_data')}}</el-button>
-        <el-button type="primary"><!-- 批量加入指标库 -->{{$t('ManualEntryPage.batch_addbase')}}</el-button>
-        <el-button type="primary" @click="$router.push({path: '/online_excel' })"><!-- 在线Excel -->{{$t('ManualEntryPage.online_excel')}}</el-button>
-        <el-button type="primary"><!-- 批量删除 -->{{$t('ManualEntryPage.batch_del')}}</el-button>
+        <el-button type="primary" @click="$router.push({path: '/batchToBase' })"><!-- 批量加入指标库 -->{{$t('ManualEntryPage.batch_addbase')}}</el-button>
+        <el-button v-permission="permissionBtn.dataSourcePermission.manualDataWrite_import" type="primary" @click="$router.push({path: '/online_excel' })"><!-- 在线Excel -->{{$t('ManualEntryPage.online_excel')}}</el-button>
+        <el-button type="primary" @click="$router.push({path: '/batchDelList' })"><!-- 批量删除 -->{{$t('ManualEntryPage.batch_del')}}</el-button>
       </div>
 
       <div class="right-wrap">
-        <el-button type="text"><!-- 导出Excel -->{{$t('ManualEntryPage.tit_export')}}</el-button>
+        <a style="width: 100%" :href="exportUrl" download>
+          <el-button
+            v-permission="permissionBtn.dataSourcePermission.manualDataWrite_export"
+            type="text"
+          >
+            <!-- 导出Excel -->{{$t('Common.exp_excel')}}
+            <el-tooltip placement="top">
+              <div slot="content" v-html="exportMsg" style="max-width:350px"></div>
+              <i class="el-icon-warning" style="color: #666;"></i>
+            </el-tooltip>
+          </el-button>
+        </a>
         <el-select
 					v-model="search_txt"
 					v-loadMore="searchLoad"
@@ -19,7 +30,7 @@
 					remote
 					clearable
 					:placeholder="$t('Edb.InputHolderAll.input_name_orid')"
-					style="width: 260px;"
+					style="width: 260px;margin-left:10px;"
 					:remote-method="searchHandle"
 					@click.native="inputFocusHandle"
 				>
@@ -75,7 +86,7 @@
         <!-- 分类 -->
         <template v-if="!selectedEdb">
           <div>
-            <h3>共200个指标</h3>
+            <h3><!-- 共{{total}}个指标 --> {{$t('EtaBasePage.total_show',{limit:total})}}</h3>
             <el-table
               :data="tableData"
               style="box-shadow: 0px 3px 6px rgba(155, 170, 219, 0.2);margin-top: 20px"
@@ -175,7 +186,20 @@ export default {
         {  label: this.$t('Edb.Detail.e_creator'),key: 'UserName', },
         {  label: this.$t('Edb.Detail.e_update_time'),key: 'ModifyTime', },
       ]
-    } 
+    },
+
+    exportUrl() {
+      let exportDataurl = process.env.VUE_APP_API_ROOT + "/entry/export/dataList";
+
+      let str = `${exportDataurl}?Frequency=${this.frequency}&ClassifyId=${
+        this.selectClassifyId
+      }&KeyWord=${
+        !this.leftSearchTradeCode ? "" : this.leftSearchVal
+      }&TradeCode=${
+        !this.leftSearchTradeCode ? "" : this.leftSearchTradeCode
+      }&StartDate=&EndDate=&Mobile=&${localStorage.getItem("auth")}`;
+      return str.replace(/#/g, encodeURIComponent("#")).replace(/;/g, encodeURIComponent(";"));
+    },
   },
   data() {
     return {
@@ -191,6 +215,8 @@ export default {
       total: 0,
       pageSize: 10,
 
+      exportMsg: ``,
+
       selectClassifyId: 0,
       selectNode: '',
       selectedEdb: 0,