update 科研看板

src/views/scientificPayoffs/index.vue

@@ -23,12 +23,14 @@
             </div>
             <dv-border-box-1 class="contentBorder">
                 <scientificBoxVue class="contentBorderBox" v-if="indexData == 1 && kyxmListShow && kyxmDataShow" :listShow="kyxmListShow" :dataShow="kyxmDataShow" :dataItem="kyxmData"></scientificBoxVue>
-                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 1 && kjhjcgDataShow && kjhjcgListShow" :listShow="kjhjcgListShow" :dataShow="kjhjcgDataShow" :dataItem="kjhjcgData"></scientificBoxVue>
-                <scientificBoxVue class="contentBorderBox" v-if="indexData == 2 && SCIwztjbDataShow && SCIwztjbListShow" :listShow="SCIwztjbListShow" :dataShow="SCIwztjbDataShow" :dataItem="SCIwztjbData"></scientificBoxVue>
-                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 2 && zwlwListShow && zwlwDataShow" :listShow="zwlwListShow" :dataShow="zwlwDataShow" :dataItem="zwlwData"></scientificBoxVue>
-                <scientificBoxVue class="contentBorderBox" v-if="indexData == 3 && zhuZuoListShow && zhuZuoDataShow" :listShow="zhuZuoListShow" :dataShow="zhuZuoDataShow" :dataItem="zhuZuoData"></scientificBoxVue>
-                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 3 && zhuanLiListShow && zhuanLiDataShow" :listShow="zhuanLiListShow" :dataShow="zhuanLiDataShow" :dataItem="zhuanLiData"></scientificBoxVue>
-                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 4 && jxjyxmxshdListShow && jxjyxmxshdDataShow" :listShow="jxjyxmxshdListShow" :dataShow="jxjyxmxshdDataShow" :dataItem="jxjyxmxshdData"></scientificBoxVue>
+
+                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 1 && SCIwztjbDataShow && SCIwztjbListShow" :listShow="SCIwztjbListShow" :dataShow="SCIwztjbDataShow" :dataItem="SCIwztjbData"></scientificBoxVue>
+                <scientificBoxVue class="contentBorderBox" v-if="indexData == 2 && zwlwListShow && zwlwDataShow" :listShow="zwlwListShow" :dataShow="zwlwDataShow" :dataItem="zwlwData"></scientificBoxVue>
+                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 2 && zhuZuoListShow && zhuZuoDataShow" :listShow="zhuZuoListShow" :dataShow="zhuZuoDataShow" :dataItem="zhuZuoData"></scientificBoxVue>
+                <scientificBoxVue class="contentBorderBox"  v-if="indexData == 3 && zhuanLiListShow && zhuanLiDataShow" :listShow="zhuanLiListShow" :dataShow="zhuanLiDataShow" :dataItem="zhuanLiData"></scientificBoxVue>
+                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 3 && jxjyxmxshdListShow && jxjyxmxshdDataShow" :listShow="jxjyxmxshdListShow" :dataShow="jxjyxmxshdDataShow" :dataItem="jxjyxmxshdData"></scientificBoxVue>
+
+                <scientificBoxVue class="contentBorderBox" :bottomBorder="false" v-if="indexData == 4 && kjhjcgDataShow && kjhjcgListShow" :listShow="kjhjcgListShow" :dataShow="kjhjcgDataShow" :dataItem="kjhjcgData"></scientificBoxVue>
             </dv-border-box-1>
         </dv-full-screen-container>
     </div>
@@ -198,18 +200,19 @@ export default {
         updateAll(e) {
             if(this.indexData == 1){
                 this.getKyxmDataAndList(e)
-                this.getKjhjcgDataAndList(e)
+                this.getSCIwztjbDataAndList(e)
             }
             if(this.indexData == 2){
-                this.getSCIwztjbDataAndList(e)
                 this.getZwlwDataAndList(e)
+                this.getZhuZuoDataAndList(e)
             }
             if(this.indexData == 3){
-                this.getZhuZuoDataAndList(e)
                 this.getZhuanLiDataAndList(e)
+                this.getJxjyxmxshdDataAndList(e)
             }
             if(this.indexData == 4){
-                this.getJxjyxmxshdDataAndList(e)
+                this.getKjhjcgDataAndList(e)
+
             }
         },
 

src/views/scientificPayoffs/js/index.js

@@ -7,24 +7,24 @@ export default {
             data: data.data,
             rowNum: 6,
             headerHeight: 45,
-            columnWidth: [100]
+            // columnWidth: [100]
         }
         return config
     },
 
     //科研项目
     getKyxmList(datas) {
-        let header = ['姓名','全部参与人', '项目编号', '资助单位', '项目类型', '项目名称', '主持/参与', '开始时间','结束时间', '立项经费（万元）']
+        let header = ['全部参与人', '项目编号', '资助单位', '项目类型', '项目名称', '开始时间','结束时间', '立项经费（万元）']
         let data = []
         datas.forEach((item, index) => {
             let list = []
-            list.push(item.NAME_ || '')
+            // list.push(item.NAME_ || '')
             list.push(item.quan_bu_can_yu_re || '')
             list.push(item.xiangMuBianHao || '')
             list.push(item.zi_zhi_dan_wei_ || '')
             list.push(item.xiang_mu_lei_xing || '')
             list.push(item.xiang_mu_ming_che || '')
-            list.push(item.zhu_chi_can_yu_ || '')
+            // list.push(item.zhu_chi_can_yu_ || '')
             list.push(item.qi_zhi_shi_jian_ || '')
             list.push(item.jie_shu_shi_jian_ || '')
             list.push(item.li_xiang_jing_fei || '')
@@ -39,16 +39,16 @@ export default {
     },
     //科研获奖成果
     getkjhjcgList(datas) {
-        let header = ['姓名', '全部获奖者', '单位', '奖励类型', '个人排名', '单位排名']
+        let header = ['全部获奖者', '单位', '奖励类型']
         let data = []
         datas.forEach((item, index) => {
             let list = []
-            list.push(item.NAME_ || '')
+            // list.push(item.NAME_ || '')
             list.push(item.jiangLiXiangMu  || '')
             list.push(item.dan_wei_ || '')
             list.push(item.jiang_li_lei_xing || '')
-            list.push(item.ge_ren_pai_ming_ || '')
-            list.push(item.pai_ming_ || '')
+            // list.push(item.ge_ren_pai_ming_ || '')
+            // list.push(item.pai_ming_ || '')
             data.push(list)
         });
         let dataList = {
@@ -60,11 +60,11 @@ export default {
     },
     //SCI文章统计表
     getSCIwztjbList(datas) {
-        let header = ['姓名', '全部作者', '论文题目', '期刊名称', 'JCR分区', '发表时间', '影响因子IF', '作者排名','WOS号']
+        let header = ['全部作者', '论文题目', '期刊名称', 'JCR分区', '发表时间', '影响因子IF', '作者排名','WOS号']
         let data = []
         datas.forEach((item, index) => {
             let list = []
-            list.push(item.NAME_ || '')
+            // list.push(item.NAME_ || '')
             list.push(item.quan_bu_zuo_zhe_ || '')
             list.push(item.lunWenTiMu || '')
             list.push(item.qi_kan_ming_cheng || '')
@@ -84,11 +84,11 @@ export default {
     },
     //中文论文
     getZwlwList(datas) {
-        let header = ['姓名', '全部作者', '论文题目', '期刊名称', '期卷号', '发表时间', '期刊类别', '作者排名','ISSN号']
+        let header = ['全部作者', '论文题目', '期刊名称', '期卷号', '发表时间', '期刊类别', '作者排名','ISSN号']
         let data = []
         datas.forEach((item, index) => {
             let list = []
-            list.push(item.NAME_ || '')
+            // list.push(item.NAME_ || '')
             list.push(item.quan_bu_zuo_zhe_ || '')
             list.push(item.lunWenTiMu || '')
             list.push(item.qi_kan_ming_cheng || '')
@@ -108,14 +108,14 @@ export default {
     },
     //著作
     getZhuZuoList(datas) {
-        let header = ['姓名','全部作者', '专著名称', '主编/编委', '出版社', '出版时间', '编撰字数']
+        let header = ['全部作者', '专著名称',  '出版社', '出版时间', '编撰字数']
         let data = []
         datas.forEach((item, index) => {
             let list = []
-            list.push(item.NAME_ || '')
+            // list.push(item.NAME_ || '')
             list.push(item.quan_bu_zuo_zhe_ || '')
             list.push(item.zhuanZhuoMingCheng || '')
-            list.push(item.zhu_bian_bian_wei || '')
+            // list.push(item.zhu_bian_bian_wei || '')
             list.push(item.chu_ban_she_ || '')
             list.push(item.chu_ban_shi_jian_ || '')
             list.push(item.bian_zhuan_zi_shu || '')
@@ -130,11 +130,11 @@ export default {
     },
     //专利
     getZhuanLiList(datas) {
-        let header = ['姓名','全部申请人', '专利名称', '专利权人', '类别', '申请时间', '授权时间','作者排名']
+        let header = ['全部申请人', '专利名称', '专利权人', '类别', '申请时间', '授权时间','作者排名']
         let data = []
         datas.forEach((item, index) => {
             let list = []
-            list.push(item.NAME_ || '')
+            // list.push(item.NAME_ || '')
             list.push(item.quan_bu_shen_qing  || '')
             list.push(item.zhuanLiMingCheng || '')
             list.push(item.zhuan_li_quan_ren || '')
@@ -153,11 +153,11 @@ export default {
     },
     //继续教育项目/学术活动
     getJxjyxmxshdList(datas) {
-        let header = ['姓名','全部负责人', '项目编号', '会议名称', '项目级别','学分', '举办时间', '举办地点', '合作单位']
+        let header = ['全部负责人', '项目编号', '会议名称', '项目级别','学分', '举办时间', '举办地点', '合作单位']
         let data = []
         datas.forEach((item, index) => {
             let list = []
-            list.push(item.NAME_ || '')
+            // list.push(item.NAME_ || '')
             list.push(item.quan_bu_zuo_zhe_  || '')
             list.push(item.xiangmMuBianHao || '')
             list.push(item.hui_yi_ming_cheng || '')