Explorar el Código

科研成果看板优化

wangxiaoyi hace 1 año
padre
commit
d4c5082812
Se han modificado 1 ficheros con 16 adiciones y 15 borrados
  1. 16 15
      src/views/scientificPayoffs/index.vue

+ 16 - 15
src/views/scientificPayoffs/index.vue

@@ -9,7 +9,7 @@
                 <div class="title">{{ titleName }}</div>
                 <div class="time">
                     <dv-border-box-8 style="width: 40%;margin-right: 25px">
-                        <ibpsTreeSelect v-model="selectData" :data="treeData" :props="props" :node-key="nodeKey" :clearable="clearable" style="width: 150px;margin-right: 30px;" />
+                        <ibpsTreeSelect v-model="selectData" :data="treeData" :props="props" :node-key="nodeKey" style="width: 150px;margin-right: 30px;" />
                     </dv-border-box-8>
                     <!-- <span>年度:</span> -->
                     <dv-border-box-8 style="width: 25%;">
@@ -33,8 +33,8 @@
                 <scientificBoxVue v-if="indexData === 2 && zwlwListShow && zwlwDataShow" class="contentBorderBox" :list-show="zwlwListShow" :data-show="zwlwDataShow" :data-item="zwlwData" />
                 <scientificBoxVue v-if="indexData === 2 && zhuZuoListShow && zhuZuoDataShow" class="contentBorderBox" :bottom-border="false" :list-show="zhuZuoListShow" :data-show="zhuZuoDataShow" :data-item="zhuZuoData" />
                 <scientificBoxVue v-if="indexData === 3 && zhuanLiListShow && zhuanLiDataShow" class="contentBorderBox" :list-show="zhuanLiListShow" :data-show="zhuanLiDataShow" :data-item="zhuanLiData" />
-                <scientificBoxVue v-if="indexData === 3 && jxjyxmxshdListShow && jxjyxmxshdDataShow" class="contentBorderBox" :bottom-border="false" :list-show="jxjyxmxshdListShow" :data-show="jxjyxmxshdDataShow" :data-item="jxjyxmxshdData" />
-                <scientificBoxVue v-if="indexData === 4 && kjhjcgDataShow && kjhjcgListShow" class="contentBorderBox" :bottom-border="false" :list-show="kjhjcgListShow" :data-show="kjhjcgDataShow" :data-item="kjhjcgData" />
+                <!-- <scientificBoxVue v-if="indexData === 3 && jxjyxmxshdListShow && jxjyxmxshdDataShow" class="contentBorderBox" :bottom-border="false" :list-show="jxjyxmxshdListShow" :data-show="jxjyxmxshdDataShow" :data-item="jxjyxmxshdData" /> -->
+                <scientificBoxVue v-if="indexData === 3 && kjhjcgDataShow && kjhjcgListShow" class="contentBorderBox" :bottom-border="false" :list-show="kjhjcgListShow" :data-show="kjhjcgDataShow" :data-item="kjhjcgData" />
             </dv-border-box-1>
         </dv-full-screen-container>
     </div>
@@ -59,7 +59,7 @@ export default {
             treeData: [],
             clearable: true,
             nodeKey: 'ID_',
-            selectData: '',
+            selectData: mainPos,
             props: {
                 children: 'children',
                 label: 'NAME_'
@@ -253,7 +253,7 @@ export default {
         // 上一页
         previou () {
             if (this.indexData === 1) {
-                this.indexData = 4
+                this.indexData = 3
             } else {
                 this.indexData--
             }
@@ -261,7 +261,7 @@ export default {
         },
         // 下一页
         next () {
-            if (this.indexData === 4) {
+            if (this.indexData === 3) {
                 this.indexData = 1
             } else {
                 this.indexData++
@@ -284,11 +284,12 @@ export default {
             }
             if (this.indexData === 3) {
                 this.getZhuanLiDataAndList(v)
-                this.getJxjyxmxshdDataAndList(v)
-            }
-            if (this.indexData === 4) {
+                //this.getJxjyxmxshdDataAndList(v)
                 this.getKjhjcgDataAndList(v)
             }
+            // if (this.indexData === 4) {
+            //     this.getKjhjcgDataAndList(v)
+            // }
         },
         getKeYanChengGuoList (v1, v2) {
             // const sql1 = `select * from t_kyxm where ${this.likeTongJi} order by create_time_ desc`
@@ -376,7 +377,7 @@ export default {
         // 接口
         // 科研项目
         getKyxmDataAndList ({ month, position }) {
-            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kyxm tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
+            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join (SELECT p.* FROM t_kyxm p JOIN t_kyxm g ON p.ke_yan_biao_id_ = g.id_ AND g.lei_xing_ = '统计' WHERE p.lei_xing_ = '个人') tk on ie.ID_ = tk.parent_id_ and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
             curdPost('query', {
                 key: 'rschMgtBoard8',
                 params: [month, position]
@@ -390,7 +391,7 @@ export default {
 
         // 科技获奖成果
         getKjhjcgDataAndList ({ month, position }) {
-            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kjhjcg tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
+            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join (select p.* FROM t_kjhjcg p JOIN t_kjhjcg g ON p.jiang_li_xiang_mu = g.id_ AND g.lei_xing_ = '统计' WHERE p.lei_xing_ = '个人') tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
             curdPost('query', {
                 key: 'rschMgtBoard9',
                 params: [month, position]
@@ -404,7 +405,7 @@ export default {
 
         // SCI文章统计表
         getSCIwztjbDataAndList ({ month, position }) {
-            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_SCIwztjb tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
+            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join (SELECT p.* FROM t_SCIwztjb p JOIN t_SCIwztjb g ON p.lun_wen_ti_mu_ = g.id_ AND g.lei_xing_ = '统计' WHERE p.lei_xing_ = '个人') tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
             curdPost('query', {
                 key: 'rschMgtBoard10',
                 params: [month, position]
@@ -420,7 +421,7 @@ export default {
 
         // 中文论文
         getZwlwDataAndList ({ month, position }) {
-            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_zwlw tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
+            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join (select p.* FROM t_zwlw p JOIN t_zwlw g ON p.lun_wen_ti_mu_ = g.id_ AND g.lei_xing_ = '统计' WHERE p.lei_xing_ = '个人') tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
             curdPost('query', {
                 key: 'rschMgtBoard11',
                 params: [month, position]
@@ -436,7 +437,7 @@ export default {
 
         // 著作
         getZhuZuoDataAndList ({ month, position }) {
-            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kyzz tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
+            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join (select p.* FROM t_kyzz p JOIN t_kyzz g ON p.zhuan_zhuo_ming_c = g.id_ AND g.lei_xing_ = '统计' WHERE p.lei_xing_ = '个人') tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
             curdPost('query', {
                 key: 'rschMgtBoard12',
                 params: [month, position]
@@ -452,7 +453,7 @@ export default {
 
         // 专利
         getZhuanLiDataAndList ({ month, position }) {
-            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join t_kyzl tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
+            // const sql2 = `select ie.NAME_,count(tk.id_) as count from ibps_party_employee ie left join (select p.* FROM t_kyzl p JOIN t_kyzl g ON p.zhuan_li_ming_che = g.id_ AND g.lei_xing_ = '统计' WHERE p.lei_xing_ = '个人') tk on ie.ID_ = tk.parent_id_ and tk.lei_xing_ = '个人' and tk.create_time_ like concat('%', '${month}', '%') where ${this.likeParams}`
             curdPost('query', {
                 key: 'rschMgtBoard13',
                 params: [month, position]