Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/views/scientificPayoffs/index.vue

@@ -27,7 +27,7 @@
                 <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" 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>
@@ -83,8 +83,7 @@ export default {
                 dataCount: {},
                 config: {
                     header: '',
-                    data: [],
-
+                    data: []
                 }
             },
 
@@ -135,6 +134,8 @@ export default {
                     data: []
                 }
             },
+
+            likeParams: "ie.STATUS_= 'actived' and ie.ID_ != '1' and ie.ID_ != '-1' and ie.ID_ != '702117247933480960' and ie.ID_ != '1115242459127873536' and ie.ID_ != '1115242765924433920' and ie.GROUP_ID_ not like '%1041786072788369408%' GROUP BY ie.id_"
         }
     },
     created() {
@@ -147,7 +148,6 @@ export default {
             this.getInit()
         }, 600000)
         this.getCreate()
-
     },
     beforeDestroy() {
         if (screenfull.isFullscreen) {
@@ -155,7 +155,6 @@ export default {
         }
         clearInterval(this.timer)
         clearInterval(this.timer2)
-
     },
     methods: {
         //初始化数据
@@ -165,10 +164,10 @@ export default {
             this.month = month
             this.updateAll(month)
         },
-        getCreate(){
+        getCreate() {
             this.timer2 = setInterval(() => {
                 this.next()
-            }, 30000)  //180000
+            }, 10000) //180000
         },
         allView() {
             // 默认显示全屏
@@ -198,31 +197,29 @@ export default {
         },
         //时间
         updateAll(e) {
-            if(this.indexData == 1){
+            if (this.indexData == 1) {
                 this.getKyxmDataAndList(e)
                 this.getSCIwztjbDataAndList(e)
             }
-            if(this.indexData == 2){
+            if (this.indexData == 2) {
                 this.getZwlwDataAndList(e)
                 this.getZhuZuoDataAndList(e)
             }
-            if(this.indexData == 3){
+            if (this.indexData == 3) {
                 this.getZhuanLiDataAndList(e)
                 this.getJxjyxmxshdDataAndList(e)
             }
-            if(this.indexData == 4){
+            if (this.indexData == 4) {
                 this.getKjhjcgDataAndList(e)
-
             }
         },
 
         //接口
         //科研项目
         getKyxmDataAndList(month) {
-            // 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 sql1 = `select * from t_kyxm where lei_xing_ = '统计' and create_time_ like '%${month}%' order by 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]) => {
+            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 ${this.likeParams}`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
                     let datas = res1.variables.data
                     let config = indexFile.getKyxmList(datas)
@@ -240,10 +237,9 @@ export default {
 
         //科技获奖成果
         getKjhjcgDataAndList(month) {
-            //let sql1 = `select tk.*,ie.NAME_,tk2.jiang_li_xiang_mu as jiangLiXiangMu  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 sql1 = `select * from t_kjhjcg where lei_xing_ = '统计' and create_time_ like '%${month}%' order by 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]) => {
+            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 ${this.likeParams}`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
                     let datas = res1.variables.data
                     let config = indexFile.getkjhjcgList(datas)
@@ -259,13 +255,11 @@ export default {
             })
         },
 
-
         //SCI文章统计表
         getSCIwztjbDataAndList(month) {
-            // 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 sql1 = `select * from t_SCIwztjb where lei_xing_ = '统计' and create_time_ like '%${month}%' order by 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]) => {
+            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 ${this.likeParams}`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
                     let datas = res1.variables.data
                     let config = indexFile.getSCIwztjbList(datas)
@@ -283,10 +277,9 @@ export default {
 
         //中文论文
         getZwlwDataAndList(month) {
-            //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 sql1 = `select * from t_zwlw where lei_xing_ = '统计' and create_time_ like '%${month}%' order by 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]) => {
+            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 ${this.likeParams}`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
                     let datas = res1.variables.data
                     let config = indexFile.getZwlwList(datas)
@@ -302,13 +295,11 @@ export default {
             })
         },
 
-
         //著作
         getZhuZuoDataAndList(month) {
-            //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 sql1 = `select * from t_zz where lei_xing_ = '统计' and create_time_ like '%${month}%' order by 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]) => {
+            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 ${this.likeParams}`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
                     let datas = res1.variables.data
                     let config = indexFile.getZhuZuoList(datas)
@@ -326,10 +317,9 @@ export default {
 
         //专利
         getZhuanLiDataAndList(month) {
-            //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 sql1 = `select * from t_zl where lei_xing_ = '统计' and create_time_ like '%${month}%' order by 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]) => {
+            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 ${this.likeParams}`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
                     let datas = res1.variables.data
                     let config = indexFile.getZhuanLiList(datas)
@@ -347,10 +337,9 @@ export default {
 
         //继续教育项目/学术活动
         getJxjyxmxshdDataAndList(month) {
-            //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 sql1 = `select * from t_jxjyxmxshd where lei_xing_ = '统计' and create_time_ like '%${month}%' order by 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]) => {
+            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 ${this.likeParams}`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
                 if (res1.state == 200) {
                     let datas = res1.variables.data
                     let config = indexFile.getJxjyxmxshdList(datas)
@@ -364,7 +353,7 @@ export default {
                     this.jxjyxmxshdDataShow = true
                 }
             })
-        },
+        }
     }
 }
 </script>

src/views/statistics/index.vue

@@ -33,14 +33,19 @@
             line-height: 2.825rem;
             text-align:center;
             float: left;
-            margin: -3% 0 0 3%;
-            color: #000 !important;" >
+            margin: -3% 0 0 16%;
+            color: #fff !important;
+            display:flex" >
+            <div>
+              年份：
+            </div>
             <el-date-picker
               v-model="endDate"
               type="year"
               value-format="yyyy"
               @change="checkYear(endDate,'end')"
-              placeholder="选择年">
+              placeholder="选择年"
+              style="width:54%">
             </el-date-picker>
             <!-- <el-button type="primary" size="mini" plain @click="selectAll">
               查询
@@ -70,7 +75,7 @@
             line-height: 2.825rem;
             text-align:center;
             float: right;
-            margin: -3% 12% 0 0;" 
+            margin: -3% 17.1% 0 0;" 
             v-if="rollup">
             <dv-border-box-8>暂停</dv-border-box-8>
           </div>
@@ -81,7 +86,7 @@
             line-height: 2.825rem;
             text-align:center;
             float: right;
-            margin: -3% 12% 0 0;" 
+            margin: -3% 17.1% 0 0;" 
             v-else>
             <dv-border-box-8>继续</dv-border-box-8>
           </div>
@@ -92,7 +97,7 @@
             line-height: 2.825rem;
             text-align:center;
             float: right;
-            margin: -3% 3% 0 0;" >
+            margin: -3% 8.1% 0 0;" >
             <dv-border-box-8>返回</dv-border-box-8>
           </div>