Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

src/views/sf/dwxnpgbg.vue

 <!--
  * @Author: your name
  * @Date: 2021-11-24 10:16:47
- * @LastEditTime: 2021-11-30 10:40:46
+ * @LastEditTime: 2021-11-30 10:59:11
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \刑侦二期(1)\founder_vue\src\views\sf\xnpgbg.vue
@@ -49,10 +49,10 @@
           <span class="xnbg">单位工作效能评估报告</span>
         </div>
         <div class="btn">
-          <el-button icon="el-icon-download">导出报告</el-button>
+          <el-button icon="el-icon-download" @click="print">导出报告</el-button>
         </div>
       </div>
-        <div style="padding: 0 10px;">
+        <div style="padding: 0 40px;">
           <div class="title">单位效能评估报告</div>
           <!-- 柱状图 -->
               <div class="htitle">
@@ -254,6 +254,9 @@ export default {
       });
   },
   methods:{
+    print() {
+      window.print();
+    },
     /**
      * @description 绘制柱状图
      */
@@ -405,18 +408,17 @@ export default {
       var self = this;
       let cxFormDataCopy = JSON.parse(JSON.stringify(self.cxFormData))
       queryYwgzAll(cxFormDataCopy).then((res)=>{
-        console.log(res,'resrerer')
         if (res.success && res.code == 200) {
           let hData1 = []
           let zData1 = []
            if(res.data.rows.length>0){
               res.data.rows.forEach((el,index)=>{
                 hData1.push(el.name)
-                zData1.push(el.total+index+1)
+                zData1.push(el.total)
               })
               this.startMyEcharts1(hData1,zData1)
               self.headerInfo1 = `${self.cxFormData.kssj}至${self.cxFormData.jssj}，${res.data.rows[0].name}单位共接受案事件${res.data.rows[0].jsasjs}起，
-              处理立案${res.data.rows[0].las}起，处理案件侦查XXX起；侦查终结案事件${res.data.rows[0].zczjs}起。立案信息采集率为${res.data.rows[0].lal}、立案侦查终结率为${res.data.rows[0].zczjl}`
+              处理立案${res.data.rows[0].las}起，侦查终结案事件${res.data.rows[0].zczjs}起。立案信息采集率为${res.data.rows[0].lal}、立案侦查终结率为${res.data.rows[0].zczjl}`
            }
           self.tableBarData = res.data.rows
         }
@@ -426,7 +428,6 @@ export default {
       var self = this;
       let cxFormDataCopy = JSON.parse(JSON.stringify(self.cxFormData))
         queryDysDlrzAll(cxFormDataCopy).then((res)=>{
-          console.log(res,'ressdsfsdfsd')
           if (res.success && res.code == 200) {
             let hData1 = []
             let zData1 = []
@@ -450,14 +451,13 @@ export default {
   },
   mounted() {
     this.cxFormData.kssj = new Date().getFullYear() +'-01';
-    this.cxFormData.jssj = new Date().getFullYear() +'-12';
+    this.cxFormData.jssj = new Date().getFullYear() +'-' + (new Date().getMonth()*1+1);
     this.doQueryYwData()
     this.doQueryXtData()
   },
   watch:{
     cxFormData:{
       handler(value){
-        console.log(value,'valueuefhaush')
         this.doQueryYwData()
         this.doQueryXtData()
       },

src/views/sf/grxnpgbg.vue

 <!--
  * @Author: your name
  * @Date: 2021-11-29 17:12:15
- * @LastEditTime: 2021-11-30 10:46:52
+ * @LastEditTime: 2021-11-30 11:07:44
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \founder_vue\src\views\sf\grxnpgbg.vue
@@ -50,10 +50,10 @@
           <span class="xnbg">效能评估报告</span>
         </div>
         <div class="btn">
-          <el-button icon="el-icon-download">导出报告</el-button>
+          <el-button icon="el-icon-download" @click="print">导出报告</el-button>
         </div>
       </div>
-      <div style="padding:0 10px;">
+      <div style="padding:0 40px;">
         <div class="title">个人效能评估报告</div>
         <!-- 柱状图 -->
             <div class="htitle">
@@ -285,6 +285,9 @@ export default {
     this.$store.commit("user/SET_Menu", this.Menu);
   },
   methods:{
+    print() {
+      window.print();
+    },
     /**
     * @description 绘制柱状图
     */
@@ -446,7 +449,7 @@ export default {
                 })
                 this.startMyEcharts1(hData1,zData1)
                 self.headerInfo1 = `${self.cxFormData.kssj}至${self.cxFormData.jssj}，${res.data.rows[0].sfhm}共接受案事件${res.data.rows[0].jsasjs}起，
-                    处理立案${res.data.rows[0].las}起，处理案件侦查XXX起；侦查终结案事件${res.data.rows[0].zczjs}起。立案信息采集率为XX%、立案侦查终结率为${res.data.rows[0].zczjl}`
+                    处理立案${res.data.rows[0].las}起，侦查终结案事件${res.data.rows[0].zczjs}起。立案信息采集率为XX%、立案侦查终结率为${res.data.rows[0].zczjl}`
                 }
                 self.tableBarData = res.data.rows
             }
@@ -456,7 +459,6 @@ export default {
       var self = this;
       let cxFormDataCopy = JSON.parse(JSON.stringify(self.cxFormData))
         querySysDlrzAllByPerson(cxFormDataCopy).then((res)=>{
-          console.log(res,'ressdsfsdfsd')
           if (res.success && res.code == 200) {
             let hData1 = []
             let zData1 = []
@@ -493,7 +495,7 @@ export default {
   },
   mounted() {
     this.cxFormData.kssj = new Date().getFullYear() +'-01';
-    this.cxFormData.jssj = new Date().getFullYear() +'-12';
+    this.cxFormData.jssj = new Date().getFullYear() +'-'+ (new Date().getMonth()*1+1);
     this.doQueryYwData()
     this.doQueryXtData()
   },