update

src/views/scientificPayoffs/index.vue

@@ -22,14 +22,13 @@
                 </div>
             </div>
             <dv-border-box-1 class="contentBorder">
+                <!-- :style="indexData == 1 && kyxmListShow && kyxmDataShow ? 'display: block' : 'display: none'" -->
                 <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 && 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>
@@ -50,6 +49,7 @@ export default {
             month: '',
             timer: '',
             timer2: '',
+            timer3: '',
             indexData: 1,
             //科研项目
             kyxmListShow: false,
@@ -142,11 +142,17 @@ export default {
         if (screenfull.isEnabled && !screenfull.isFullscreen) {
             this.allView()
         }
+
         this.getInit()
+        this.getKeYanChengGuoList()
 
         this.timer = setInterval(() => {
             this.getInit()
         }, 600000)
+
+        this.timer3 = setInterval(() => {
+            this.getKeYanChengGuoList()
+        }, 1000 * 60 * 60)
         this.getCreate()
     },
     beforeDestroy() {
@@ -155,6 +161,7 @@ export default {
         }
         clearInterval(this.timer)
         clearInterval(this.timer2)
+        clearInterval(this.timer3)
     },
     methods: {
         //初始化数据
@@ -167,7 +174,7 @@ export default {
         getCreate() {
             this.timer2 = setInterval(() => {
                 this.next()
-            }, 10000) //180000
+            }, 1000 * 60) //180000
         },
         allView() {
             // 默认显示全屏
@@ -213,19 +220,65 @@ export default {
                 this.getKjhjcgDataAndList(e)
             }
         },
-
-        //接口
-        //科研项目
-        getKyxmDataAndList(month) {
-            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 ${this.likeParams}`
-            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2)]).then(([res1, res2]) => {
+        getKeYanChengGuoList() {
+            let sql1 = `select * from t_kyxm where lei_xing_ = '统计' order by create_time_ desc`
+            let sql2 = `select * from t_kjhjcg where lei_xing_ = '统计' order by create_time_ desc`
+            let sql3 = `select * from t_SCIwztjb where lei_xing_ = '统计' order by create_time_ desc`
+            let sql4 = `select * from t_zwlw where lei_xing_ = '统计' order by create_time_ desc`
+            let sql5 = `select * from t_zz where lei_xing_ = '统计' order by create_time_ desc`
+            let sql6 = `select * from t_zl where lei_xing_ = '统计' order by create_time_ desc`
+            let sql7 = `select * from t_jxjyxmxshd where lei_xing_ = '统计' order by create_time_ desc`
+            Promise.all([curdPost('sql', sql1), curdPost('sql', sql2), curdPost('sql', sql3), curdPost('sql', sql4), curdPost('sql', sql5), curdPost('sql', sql6), curdPost('sql', sql7)]).then(([res1, res2, res3, res4, res5, res6, res7]) => {
                 if (res1.state == 200) {
                     let datas = res1.variables.data
                     let config = indexFile.getKyxmList(datas)
                     this.kyxmData.config = JSON.parse(JSON.stringify(config))
                     this.kyxmListShow = true
                 }
+                if (res2.state == 200) {
+                    let datas = res2.variables.data
+                    let config = indexFile.getkjhjcgList(datas)
+                    this.kjhjcgData.config = config
+                    this.kjhjcgListShow = true
+                }
+                if (res3.state == 200) {
+                    let datas = res3.variables.data
+                    let config = indexFile.getSCIwztjbList(datas)
+                    this.SCIwztjbData.config = config
+                    this.SCIwztjbListShow = true
+                }
+                if (res4.state == 200) {
+                    let datas = res4.variables.data
+                    let config = indexFile.getZwlwList(datas)
+                    this.zwlwData.config = config
+                    this.zwlwListShow = true
+                }
+                if (res5.state == 200) {
+                    let datas = res5.variables.data
+                    let config = indexFile.getZhuZuoList(datas)
+                    this.zhuZuoData.config = config
+                    this.zhuZuoListShow = true
+                }
+                if (res6.state == 200) {
+                    let datas = res6.variables.data
+                    let config = indexFile.getZhuanLiList(datas)
+                    this.zhuanLiData.config = config
+                    this.zhuanLiListShow = true
+                }
+                if (res7.state == 200) {
+                    let datas = res7.variables.data
+                    let config = indexFile.getJxjyxmxshdList(datas)
+                    this.jxjyxmxshdData.config = config
+                    this.jxjyxmxshdListShow = true
+                }
+            })
+        },
+
+        //接口
+        //科研项目
+        getKyxmDataAndList(month) {
+            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}`
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     let datas = res2.variables.data
                     let config = indexFile.getKyxmData(datas)
@@ -237,15 +290,8 @@ export default {
 
         //科技获奖成果
         getKjhjcgDataAndList(month) {
-            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 ${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)
-                    this.kjhjcgData.config = config
-                    this.kjhjcgListShow = true
-                }
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     let datas = res2.variables.data
                     let config = indexFile.getKyxmData(datas)
@@ -257,15 +303,8 @@ export default {
 
         //SCI文章统计表
         getSCIwztjbDataAndList(month) {
-            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 ${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)
-                    this.SCIwztjbData.config = config
-                    this.SCIwztjbListShow = true
-                }
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     let datas = res2.variables.data
                     let config = indexFile.getKyxmData(datas)
@@ -277,15 +316,8 @@ export default {
 
         //中文论文
         getZwlwDataAndList(month) {
-            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 ${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)
-                    this.zwlwData.config = config
-                    this.zwlwListShow = true
-                }
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     let datas = res2.variables.data
                     let config = indexFile.getKyxmData(datas)
@@ -297,15 +329,8 @@ export default {
 
         //著作
         getZhuZuoDataAndList(month) {
-            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 ${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)
-                    this.zhuZuoData.config = config
-                    this.zhuZuoListShow = true
-                }
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     let datas = res2.variables.data
                     let config = indexFile.getKyxmData(datas)
@@ -317,15 +342,8 @@ export default {
 
         //专利
         getZhuanLiDataAndList(month) {
-            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 ${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)
-                    this.zhuanLiData.config = config
-                    this.zhuanLiListShow = true
-                }
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     let datas = res2.variables.data
                     let config = indexFile.getKyxmData(datas)
@@ -337,15 +355,8 @@ export default {
 
         //继续教育项目/学术活动
         getJxjyxmxshdDataAndList(month) {
-            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 ${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)
-                    this.jxjyxmxshdData.config = config
-                    this.jxjyxmxshdListShow = true
-                }
+            curdPost('sql', sql2).then((res2) => {
                 if (res2.state == 200) {
                     let datas = res2.variables.data
                     let config = indexFile.getKyxmData(datas)

src/views/scientificPayoffs/js/index.js

@@ -7,6 +7,7 @@ export default {
             data: data.data,
             rowNum: 6,
             headerHeight: 45,
+            waitTime: 1000
             // columnWidth: [100]
         }
         return config