linweizeng 3 лет назад
Родитель
Сommit
77e29abd7c
2 измененных файлов с 24 добавлено и 14 удалено
  1. 17 7
      src/views/scientificPayoffs/index.vue
  2. 7 7
      src/views/scientificPayoffs/js/index.js

+ 17 - 7
src/views/scientificPayoffs/index.vue

@@ -47,6 +47,7 @@ export default {
             titleName: '科研成果看板',
             month: '',
             timer: '',
+            timer2: '',
             indexData: 1,
             //科研项目
             kyxmListShow: false,
@@ -143,12 +144,16 @@ export default {
         this.timer = setInterval(() => {
             this.getInit()
         }, 600000)
+        this.getCreate()
+
     },
     beforeDestroy() {
         if (screenfull.isFullscreen) {
             screenfull.toggle()
         }
         clearInterval(this.timer)
+        clearInterval(this.timer2)
+
     },
     methods: {
         //初始化数据
@@ -158,6 +163,11 @@ export default {
             this.month = month
             this.updateAll(month)
         },
+        getCreate(){
+            this.timer2 = setInterval(() => {
+                this.next()
+            }, 30000)  //180000
+        },
         allView() {
             // 默认显示全屏
             screenfull.request()
@@ -206,7 +216,7 @@ export default {
         //接口
         //科研项目
         getKyxmDataAndList(month) {
-            let sql1 = `select tk.*,ie.NAME_ from t_kyxm tk left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            let sql1 = `select tk.*,ie.NAME_,tk2.xiang_mu_bian_hao as xiangMuBianHao from t_kyxm tk  left join t_kyxm tk2 on tk.xiang_mu_bian_hao = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
             let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kyxm tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
             Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
                 if (res1.state == 200) {
@@ -226,7 +236,7 @@ export default {
 
         //科技获奖成果
         getKjhjcgDataAndList(month) {
-            let sql1 = `select tk.*,ie.NAME_ from t_kjhjcg tk left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            let sql1 = `select tk.*,ie.NAME_,tk2.dan_wei_ as danWei from t_kjhjcg tk left join t_kjhjcg tk2 on  tk.dan_wei_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
             let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kjhjcg tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
             Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
                 if (res1.state == 200) {
@@ -247,7 +257,7 @@ export default {
 
         //科技获奖成果
         getSCIwztjbDataAndList(month) {
-            let sql1 = `select tk.*,ie.NAME_ from t_SCIwztjb tk left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            let sql1 = `select tk.*,ie.NAME_,tk2.lun_wen_ti_mu_ as lunWenTiMu from t_SCIwztjb tk  left join t_SCIwztjb tk2 on  tk.lun_wen_ti_mu_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
             let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_SCIwztjb tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
             Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
                 if (res1.state == 200) {
@@ -267,7 +277,7 @@ export default {
 
         //中文论文
         getZwlwDataAndList(month) {
-            let sql1 = `select tk.*,ie.NAME_ from t_zwlw tk left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            let sql1 = `select tk.*,ie.NAME_,tk2.lun_wen_ti_mu_ as lunWenTiMu from t_zwlw tk left join t_zwlw tk2 on  tk.lun_wen_ti_mu_ = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
             let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zwlw tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
             Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
                 if (res1.state == 200) {
@@ -288,7 +298,7 @@ export default {
 
         //著作
         getZhuZuoDataAndList(month) {
-            let sql1 = `select tk.*,ie.NAME_ from t_zz tk left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            let sql1 = `select tk.*,ie.NAME_,tk2.zhuan_zhuo_ming_c as zhuanZhuoMingCheng from t_zz tk left join t_zz tk2 on  tk.zhuan_zhuo_ming_c = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
             let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zz tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
             Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
                 if (res1.state == 200) {
@@ -308,7 +318,7 @@ export default {
 
         //专利
         getZhuanLiDataAndList(month) {
-            let sql1 = `select tk.*,ie.NAME_ from t_zl tk left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            let sql1 = `select tk.*,ie.NAME_,tk2.zhuan_li_ming_che as zhuanLiMingCheng from t_zl tk left join t_zl tk2 on  tk.zhuan_li_ming_che = tk2.id_ left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
             let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zl tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
             Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
                 if (res1.state == 200) {
@@ -328,7 +338,7 @@ export default {
 
         //继续教育项目/学术活动
         getJxjyxmxshdDataAndList(month) {
-            let sql1 = `select tk.*,ie.NAME_ from t_jxjyxmxshd tk left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
+            let sql1 = `select tk.*,ie.NAME_,tk2.xiang_mu_bian_hao as xiangmMuBianHao from t_jxjyxmxshd tk left join t_jxjyxmxshd tk2 on  tk.xiang_mu_bian_hao = tk2.id_  left join ibps_party_employee ie on ie.ID_ = tk.xing_ming_ and ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ not like '%1041786072788369408%' where tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' order by tk.create_time_ desc`
             let sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_jxjyxmxshd tk on ie.ID_ = tk.xing_ming_ and tk.lei_xing_ = '个人' and tk.create_time_ like '%${month}%' where ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_`
             Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1,res2]) => {
                 if (res1.state == 200) {

+ 7 - 7
src/views/scientificPayoffs/js/index.js

@@ -19,7 +19,7 @@ export default {
         datas.forEach((item, index) => {
             let list = []
             list.push(item.NAME_ || '')
-            list.push(item.xiang_mu_bian_hao || '')
+            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 || '')
@@ -44,7 +44,7 @@ export default {
             let list = []
             list.push(item.NAME_ || '')
             list.push(item.huo_jiang_zhe_ || '')
-            list.push(item.dan_wei_ || '')
+            list.push(item.danWei || '')
             list.push(item.jiang_li_lei_xing || '')
             list.push(item.wan_cheng_ren_ || '')
             list.push(item.pai_ming_ || '')
@@ -65,7 +65,7 @@ export default {
             let list = []
             list.push(item.NAME_ || '')
             list.push(item.quan_bu_zuo_zhe_ || '')
-            list.push(item.lun_wen_ti_mu_ || '')
+            list.push(item.lunWenTiMu || '')
             list.push(item.qi_kan_ming_cheng || '')
             list.push(item.qi_juan_hao_ || '')
             list.push(item.fa_biao_shi_jian_ || '')
@@ -88,7 +88,7 @@ export default {
             let list = []
             list.push(item.NAME_ || '')
             list.push(item.quan_bu_zuo_zhe_ || '')
-            list.push(item.lun_wen_ti_mu_ || '')
+            list.push(item.lunWenTiMu || '')
             list.push(item.qi_kan_ming_cheng || '')
             list.push(item.qi_juan_hao_ || '')
             list.push(item.fa_biao_shi_jian_ || '')
@@ -111,7 +111,7 @@ export default {
             let list = []
             list.push(item.NAME_ || '')
             list.push(item.zhu_bian_bian_wei || '')
-            list.push(item.zhuan_zhuo_ming_c || '')
+            list.push(item.zhuanZhuoMingCheng || '')
             list.push(item.chu_ban_she_ || '')
             list.push(item.chu_ban_shi_jian_ || '')
             list.push(item.bian_zhuan_zi_shu || '')
@@ -131,7 +131,7 @@ export default {
         datas.forEach((item, index) => {
             let list = []
             list.push(item.NAME_ || '')
-            list.push(item.zhuan_li_ming_che || '')
+            list.push(item.zhuanLiMingCheng || '')
             list.push(item.zhuan_li_quan_ren || '')
             list.push(item.zuo_zhe_pai_ming_ || '')
             list.push(item.lei_bie_ || '')
@@ -153,7 +153,7 @@ export default {
         datas.forEach((item, index) => {
             let list = []
             list.push(item.NAME_ || '')
-            list.push(item.xiang_mu_bian_hao || '')
+            list.push(item.xiangmMuBianHao || '')
             list.push(item.hui_yi_ming_cheng || '')
             list.push(item.fu_ze_ren_ || '')
             list.push(item.xue_fen_ji_bie_ || '')