From 15ad25a91bee0d50c25c3ab5b5a3e17c39a7b0cf Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 2 Jun 2023 13:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E7=9B=91=E7=9D=A3=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/router/index.js                    |    1 -
 client/src/views/supervisionNew/mytask.vue    |   13 +-
 .../src/views/supervisionNew/statistics.vue   | 1394 +++++++++--------
 client/src/views/supervisionNew/taskdo.vue    |   39 +-
 4 files changed, 786 insertions(+), 661 deletions(-)

diff --git a/client/src/router/index.js b/client/src/router/index.js
index c7ea09f..bab0062 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -270,7 +270,6 @@ export const asyncRoutes = [
         name: 'statistics',
         component: () => import('@/views/supervisionNew/statistics.vue'),
         meta: { title: '部门报告'},
-        hidden: true
       },
       {
         path: 'mytaskDo',
diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue
index 512ca2d..e9b6529 100644
--- a/client/src/views/supervisionNew/mytask.vue
+++ b/client/src/views/supervisionNew/mytask.vue
@@ -36,7 +36,7 @@
                   <span>{{ props.row.num_complaint }}</span>
                 </el-form-item>
                 <el-form-item label="客户投诉结果">
-                  <span>{{ props.row.num_complaint10 }}</span>
+                  <span>{{ props.row.num_complaint_10 }}</span>
                 </el-form-item>
                 <el-form-item label="外部监督检查">
                   <span>{{ props.row.num_oinspect }}</span>
@@ -861,6 +861,7 @@
               saveNum(this.task2do,this.numbers).then((res) => {
                 if (res.code >= 200) {
                     this.$message.success("成功");
+                    this.getList();
                 }
               });
             } else {
@@ -1040,14 +1041,15 @@
             }else if(type=='complaint'){
               form.key = "num_complaint"
             }else if(type=='oinspect'){
-              form.key = "num_oinspect "
+              form.key = "num_oinspect"
             }
             noNum(this.task2do,form).then(res=>{
               if(res.code>=200){
                 this.$message.success("提交成功");
+                this.getList();
               }else{}
             })
-           
+
           })
           .catch((err) => {
           });
@@ -1078,22 +1080,27 @@
         rcSaveSuccess(){
           this.dialogRc = false;
           this.getRcList();
+          this.getList();
         },
         ptSaveSuccess(){
           this.dialogPt = false;
           this.getPtList();
+          this.getList();
         },
         comSaveSuccess(){
           this.dialogCom = false;
           this.getComplaintList();
+          this.getList();
         },
         riskSaveSuccess(){
           this.dialogRisk = false;
           this.getRiskList();
+          this.getList();
         },
         oinSaveSuccess(){
           this.dialogOin = false;
           this.getOinspectList();
+          this.getList();
         },
         downloads() {
           let a = document.createElement('a')
diff --git a/client/src/views/supervisionNew/statistics.vue b/client/src/views/supervisionNew/statistics.vue
index a681a86..90033ba 100644
--- a/client/src/views/supervisionNew/statistics.vue
+++ b/client/src/views/supervisionNew/statistics.vue
@@ -1,13 +1,11 @@
- 
 <template>
     <div class="app-container">
       <el-card>
           <el-row :gutter="6">
             <el-select
-                v-model="listQuery.dept"
+                v-model="listQuery.belong_dept"
                 placeholder="报送部门"
                 clearable
-                @change="handleFilter"
             >
                 <el-option
                     v-for="item in orgData"
@@ -17,7 +15,7 @@
                 />
             </el-select>
             <el-date-picker
-                v-model="listQuery.year"
+                v-model="listQuery.task2__year"
                 type="year"
                 placeholder="选择年"
                 value-format="yyyy"
@@ -39,26 +37,41 @@
       </el-card>
       <el-card style="margin-top:10px">
         <div ref="print" id="myReport" class="printContainer">
-            <el-table
-            ref="tableRef"
-            :data="tableData"
-            class="tableStyle"
-            :header-cell-style="handerMethod"
-            :span-method="objectSpanMethod"
-            border
+            <!-- <el-table
+                ref="tableRef"
+                :key="timeStamp"
+                :data="tableDatas"
+                class="tableStyle"
+                :header-cell-style="handerMethod"
+                :span-method="objectSpanMethod"
+                border
             >
-            <el-table-column label="统计周期" width="180" prop="type"></el-table-column>
-            <el-table-column label="统计周期" width="180" prop="title"></el-table-column>
-            <el-table-column  prop="first" label="1-2月"></el-table-column>
-            <el-table-column prop="seconde" label="3-4月"></el-table-column>
-            <el-table-column prop="third" label="5-6月"></el-table-column>
-            <el-table-column prop="fouth" label="7-8月"></el-table-column>
-            <el-table-column prop="fifth" label="9-10月"></el-table-column>
-            <el-table-column prop="sixth" label="11-12月"></el-table-column>
-            <el-table-column prop="all" label="年度"></el-table-column>
-            </el-table>
-            <!-- <table border="1" width="1000" cellspacing="0">
-                <thead >
+                <el-table-column label="统计周期" width="180" prop="type"></el-table-column>
+                <el-table-column label="统计周期" width="180" prop="title"></el-table-column>
+                <el-table-column  prop="first" label="1-2月">
+                    <template  slot-scope="scope" v-if="scope.row.first">{{ scope.row.first }}</template>
+                </el-table-column>
+                <el-table-column prop="seconde" label="3-4月">
+                    <template  slot-scope="scope" v-if="scope.row.seconde">{{ scope.row.seconde }}</template>
+                </el-table-column>
+                <el-table-column prop="third" label="5-6月">
+                    <template  slot-scope="scope" v-if="scope.row.third">{{ scope.row.third }}</template>
+                </el-table-column>
+                <el-table-column prop="fouth" label="7-8月">
+                    <template  slot-scope="scope" v-if="scope.row.fouth">{{ scope.row.fouth }}</template>
+                </el-table-column>
+                <el-table-column prop="fifth" label="9-10月">
+                    <template  slot-scope="scope" v-if="scope.row.fifth">{{ scope.row.fifth }}</template>
+                </el-table-column>
+                <el-table-column prop="sixth" label="11-12月">
+                    <template  slot-scope="scope" v-if="scope.row.sixth">{{ scope.row.sixth }}</template>
+                </el-table-column>
+                <el-table-column prop="all" label="年度">
+                    <template  slot-scope="scope" v-if="scope.row.all">{{ scope.row.all }}</template>
+                </el-table-column>
+            </el-table> -->
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="numTable">
+                <thead style="background: #efefef;height: 40px;">
                     <tr>
                         <th colspan="2">统计周期</th>
                         <th>1-2月</th>
@@ -71,648 +84,729 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr>
-                        <td colspan="2">重大质量事故</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td rowspan="3">报告/证书合格率</td>
-                        <td>已发放报告/证书数量</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td>不准确报告/证书数量</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td>报告/证书合格率</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td rowspan="3">报告/证书及时率</td>
-                        <td>应发报告/证书数量</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td>实际按时完成报告/证书数量</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td>报告/证书及时率</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td rowspan="3">能力验证满意率</td>
-                        <td>全部获结果参数数量</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td>满意结果参数数量</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td>能力验证满意率</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td rowspan="3">客户投诉处理满意率</td>
-                        <td>全部已处理投诉数量</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td>获满意结果的投诉数量</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
-                    </tr>
-                    <tr>
-                        <td>客户投诉处理满意率</td>
-                        <td>1</td>
-                        <td>2</td>
-                        <td>3</td>
-                        <td>4</td>
-                        <td>5</td>
-                        <td>6</td>
-                        <td>7</td>
+                    <tr v-for="(item,index) in tableDatas">
+                        <td v-if="index==0" colspan="2">重大质量事故</td>
+                        <td v-if="index==1" rowspan="3">报告/证书合格率</td>
+                        <td v-if="index==1">已发放报告/证书数量</td>
+                        <td v-if="index==2">不准确报告/证书数量</td>
+                        <td v-if="index==3">报告/证书合格率</td>
+                        <td v-if="index==4" rowspan="3">报告/证书及时率</td>
+                        <td v-if="index==4">应发报告/证书数量</td>
+                        <td v-if="index==5">实际按时完成报告/证书数量</td>
+                        <td v-if="index==6">报告/证书及时率</td>
+                        <td v-if="index==7" rowspan="3">能力验证满意率</td>
+                        <td v-if="index==7">全部获结果参数数量</td>
+                        <td v-if="index==8">满意结果参数数量</td>
+                        <td v-if="index==9">报告/能力验证满意率</td>
+                        <td v-if="index==10" rowspan="3">客户投诉处理满意率</td>
+                        <td v-if="index==10">全部已处理投诉数量</td>
+                        <td v-if="index==11">获满意结果的投诉数量</td>
+                        <td v-if="index==12">报告/客户投诉处理满意率</td>
+                        <td class="numCell">{{item[0]}}</td>
+                        <td class="numCell">{{item[1]}}</td>
+                        <td class="numCell">{{item[2]}}</td>
+                        <td class="numCell">{{item[3]}}</td>
+                        <td class="numCell">{{item[5]}}</td>
+                        <td class="numCell">{{item[6]}}</td>
+                        <td class="numCell numCell_last">{{item[7]}}</td>
                     </tr>
                 </tbody>
-            </table> -->
-            <el-row>
-                <el-col :span="12">
-                    <div id="bar1" style="width:500px;height:400px;margin-top: 50px;"></div>
+            </table>
+            <el-row id="echartsContainer">
+                <el-col :span="12" class="chartsWrap" style="border-right:1px solid #eeeeee;border-top:0">
+                    <div id="bar1" style="width:495px;height:400px;"></div>
                 </el-col>
-                <el-col :span="12">
-                    <div id="bar2" style="width:500px;height:400px;margin-top: 50px;"></div>
+                <el-col :span="12" class="chartsWrap" style="border-top:0">
+                    <div id="bar2" style="width:495px;height:400px;margin-left: 10px;"></div>
                 </el-col>
-                <el-col :span="12">
-                    <div id="lin1" style="width:500px;height:400px;margin-top: 50px;"></div>
+                <el-col :span="12" class="chartsWrap" style="border-right:1px solid #eeeeee">
+                    <div id="lin1" style="width:495px;height:400px;"></div>
                 </el-col>
-                <el-col :span="12">
-                    <div id="lin2" style="width:500px;height:400px;margin-top: 50px;"></div>
+                <el-col :span="12" class="chartsWrap">
+                    <div id="lin2" style="width:495px;height:400px;margin-left: 10px;"></div>
                 </el-col>
-                <el-col :span="12">
-                    <div id="lin3" style="width:500px;height:400px;margin-top: 50px;"></div>
+                <el-col :span="12" class="chartsWrap" style="border-right:1px solid #eeeeee">
+                    <div id="lin3" style="width:495px;height:400px;"></div>
                 </el-col>
-                <el-col :span="12">
-                    <div id="lin4" style="width:500px;height:400px;margin-top: 50px;"></div>
+                <el-col :span="12" class="chartsWrap">
+                    <div id="lin4" style="width:495px;height:400px;margin-left: 10px;"></div>
                 </el-col>
             </el-row>
         </div>
-        
       </el-card>
     </div>
   </template>
 <script>
-import { getOrgList, getSubOrgList } from "@/api/org";
-import checkPermission from "@/utils/permission";
-import * as echarts from 'echarts'
-export default {
-data() {
-    return {
-    listQuery:{
-        dept:'',
-        year:''
-    },
-    tableData: [{
-        type:'重大质量事故',
-        title:'重大质量事故',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    },{
-        type:'报告/证书合格率',
-        title:'已发放报告/证书数量',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    },{
-        type:'报告/证书合格率',
-        title:'不准确报告/证书数量',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    }, {
-        type:'报告/证书合格率',
-        title:'报告/证书合格率',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    }, {
-        type:'报告/证书及时率',
-        title:'应发报告/证书数量',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    },{
-        type:'报告/证书及时率',
-        title:'实际按时完成报告/证书数量',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    }, {
-        type:'报告/证书及时率',
-        title:'报告/证书及时率',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    },
-    {
-        type:'能力验证满意率',
-        title:'全部获结果参数数量',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    },{
-        type:'能力验证满意率',
-        title:'满意结果参数数量',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    }, {
-        type:'能力验证满意率',
-        title:'能力验证满意率',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    },{
-        type:'客户投诉处理满意率',
-        title:'全部已处理投诉数量',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    },{
-        type:'客户投诉处理满意率',
-        title:'获满意结果的投诉数量',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    }, {
-        type:'客户投诉处理满意率',
-        title:'客户投诉处理满意率',
-        first:'1',
-        seconde:'2',
-        third:'3',
-        fouth:'4',
-        fifth:'5',
-        sixth:'6',
-        all:'21'
-    },
-    ],
-    orgData:[],
-    barChart1:null,
-    barchart2:null,
-    lineChart1:null,
-    lineChart2:null,
-    lineChart3:null,
-    lineChart4:null,
-    xAxisData:["1-2月","3-4月","5-6月","7-8月","9-10月","11-12月"],
+    import { getTask2Do } from "@/api/task";
+    import { getOrgList, getSubOrgList } from "@/api/org";
+    import checkPermission from "@/utils/permission";
+    import * as echarts from 'echarts';
+    export default {
+        data() {
+            return {
+                timeStamp:0,
+                listQuery:{
+                    belong_dept:'',
+                    task2__year:'',
+                    page:0
+                },
+                tableData: [{
+                    type:'重大质量事故',
+                    title:'重大质量事故',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                },{
+                    type:'报告/证书合格率',
+                    title:'已发放报告/证书数量',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                },{
+                    type:'报告/证书合格率',
+                    title:'不准确报告/证书数量',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                }, {
+                    type:'报告/证书合格率',
+                    title:'报告/证书合格率',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                }, {
+                    type:'报告/证书及时率',
+                    title:'应发报告/证书数量',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                },{
+                    type:'报告/证书及时率',
+                    title:'实际按时完成报告/证书数量',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                }, {
+                    type:'报告/证书及时率',
+                    title:'报告/证书及时率',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                },
+                {
+                    type:'能力验证满意率',
+                    title:'全部获结果参数数量',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                },{
+                    type:'能力验证满意率',
+                    title:'满意结果参数数量',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                }, {
+                    type:'能力验证满意率',
+                    title:'能力验证满意率',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                },{
+                    type:'客户投诉处理满意率',
+                    title:'全部已处理投诉数量',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                },{
+                    type:'客户投诉处理满意率',
+                    title:'获满意结果的投诉数量',
+                    first:'1',
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                }, {
+                    type:'客户投诉处理满意率',
+                    title:'客户投诉处理满意率',
+                    first:1,
+                    seconde:'2',
+                    third:'3',
+                    fouth:'4',
+                    fifth:'5',
+                    sixth:'6',
+                    all:'21'
+                },
+                ],
+                tableData1:[],
+                // tableDatas:[ 
+                //     {type:'重大质量事故',title:'重大质量事故'},
+                //     {type:'报告/证书合格率',title:'已发放报告/证书数量'},
+                //     {type:'报告/证书合格率',title:'不准确报告/证书数量'},
+                //     {type:'报告/证书合格率',title:'报告/证书合格率'},
+                //     {type:'报告/证书及时率',title:'应发报告/证书数量'},
+                //     {type:'报告/证书及时率',title:'实际按时完成报告/证书数量'},
+                //     {type:'报告/证书及时率',title:'报告/证书及时率'},
+                //     {type:'能力验证满意率',title:'全部获结果参数数量'},
+                //     {type:'能力验证满意率',title:'满意结果参数数量'},
+                //     {type:'能力验证满意率',title:'能力验证满意率'},
+                //     {type:'客户投诉处理满意率',title:'全部已处理投诉数量'},
+                //     {type:'客户投诉处理满意率',title:'获满意结果的投诉数量'},
+                //     {type:'客户投诉处理满意率',title:'客户投诉处理满意率'},
+                // ],
+                
+                tableDatas:[
+                    [],[],[],[],[],[],[],[],[],[],[],[],[]
+                ],
+                orgData:[],
+                barChart1:null,
+                bar1option:{},
+                barchart2:null,
+                lineChart1:null,
+                lineChart2:null,
+                lineChart3:null,
+                lineChart4:null,
+                xAxisData:["1-2月","3-4月","5-6月","7-8月","9-10月","11-12月"],
+                bar1Data:[],
+                bar2Data:[],
+                line1Data:[],
+                line2Data:[],
+                line3Data:[],
+                line4Data:[],
+                bar1Option:{},
+                bar2Option:{},
+                line1Option:{},
+                line2Option:{},
+                line3Option:{},
+                line4Option:{},
+            };
+        },
+        mounted() {
+            this.getGroup();
+            this.optionSet();
+        },
+        methods: {
+            optionSet(){
+                let chartDom1 = document.getElementById('bar1');
+                this.barChart1 = echarts.init(chartDom1);
+                this.bar1Option = {
+                    title:{
+                        text:"已发放报告/证书数量"
+                    },
+                    xAxis:{
+                        axisTick: {
+                            show: false
+                        },
+                        data:this.xAxisData
+                    },
+                    yAxis:{},
+                    series:[
+                        {
+                            name:"已发放报告/证书数量",
+                            type:"bar",
+                            data:this.bar1Data
+                        }
+                    ]
+                }
+                let chartDom2 = document.getElementById('bar2');
+                this.barChart2 = echarts.init(chartDom2);
+                this.bar2Option = {
+                    title:{
+                        text:"应发报告/证书数量"
+                    },
+                    xAxis:{
+                        axisTick: {
+                            show: false
+                        },
+                        data:this.xAxisData
+                    },
+                    yAxis:{},
+                    series:[
+                        {
+                            name:"应发报告/证书数量",
+                            type:"bar",
+                            data:this.bar2Data
+                        }
+                    ]
+                }
+                let chartDom3 = document.getElementById('lin1');
+                this.lineChart1 = echarts.init(chartDom3);
+                this.line1Option = {
+                    title: {
+                        text: '报告/证书合格率'
+                    },
+                    tooltip: {
+                        trigger: 'axis'
+                    },
+                    legend: {
+                        data: ['报告/证书合格率']
+                    },
+                    grid: {
+                        left: '5%',
+                        right: '7%',
+                        bottom: '10%',
+                        containLabel: true
+                    },
+                    toolbox: {
+                        feature: {
+                        saveAsImage: {}
+                        }
+                    },
+                    xAxis: {
+                        axisTick: {
+                            show: false
+                        },
+                        splitLine: {
+                            show: false, 
+                        },
+                        type: 'category',
+                        boundaryGap: false,
+                        data: this.xAxisData
+                    },
+                    yAxis: {
+                        type: 'value'
+                    },
+                    series: [
+                        {
+                        name: '报告/证书合格率',
+                        type: 'line',
+                        stack: 'Total',
+                        data: this.line1Data
+                        }
+                    ]
+                };
+                let chartDom4 = document.getElementById('lin2');
+                this.lineChart2 = echarts.init(chartDom4);
+                this.line2Option = {
+                    title: {
+                        text: '报告/证书及时率'
+                    },
+                    tooltip: {
+                        trigger: 'axis'
+                    },
+                    legend: {
+                        data: ['报告/证书及时率']
+                    },
+                    grid: {
+                        left: '7%',
+                        right: '5%',
+                        bottom: '10%',
+                        containLabel: true
+                    },
+                    toolbox: {
+                        feature: {
+                        saveAsImage: {}
+                        }
+                    },
+                    xAxis: {
+                        axisTick: {
+                            show: false
+                        },
+                        splitLine: {
+                            show: false, 
+                        },
+                        type: 'category',
+                        boundaryGap: false,
+                        data: this.xAxisData
+                    },
+                    yAxis: {
+                        type: 'value'
+                    },
+                    series: [
+                        {
+                        name: '报告/证书及时率',
+                        type: 'line',
+                        stack: 'Total',
+                        data: this.line2Data
+                        }
+                    ]
+                };
+                let chartDom5 = document.getElementById('lin3');
+                this.lineChart3 = echarts.init(chartDom5);
+                this.line3Option = {
+                    title: {
+                        text: '能力验证满意率'
+                    },
+                    tooltip: {
+                        trigger: 'axis'
+                    },
+                    legend: {
+                        data: ['能力验证满意率']
+                    },
+                    grid: {
+                        left: '5%',
+                        right: '7%',
+                        bottom: '10%',
+                        containLabel: true
+                    },
+                    toolbox: {
+                        feature: {
+                        saveAsImage: {}
+                        }
+                    },
+                    xAxis: {
+                        axisTick: {
+                            show: false
+                        },
+                        splitLine: {
+                            show: false, 
+                        },
+                        type: 'category',
+                        boundaryGap: false,
+                        data: this.xAxisData
+                    },
+                    yAxis: {
+                        type: 'value'
+                    },
+                    series: [
+                        {
+                        name: '能力验证满意率',
+                        type: 'line',
+                        stack: 'Total',
+                        data: this.line3Data
+                        }
+                    ]
+                };
+                let chartDom6 = document.getElementById('lin4');
+                this.lineChart4 = echarts.init(chartDom6);
+                this.line4Option = {
+                    title: {
+                        text: '客户投诉处理满意率'
+                    },
+                    tooltip: {
+                        trigger: 'axis'
+                    },
+                    legend: {
+                        data: ['客户投诉处理满意率']
+                    },
+                    grid: {
+                        left: '7%',
+                        right: '5%',
+                        bottom: '10%',
+                        containLabel: true
+                    },
+                    toolbox: {
+                        feature: {
+                        saveAsImage: {}
+                        }
+                    },
+                    xAxis: {
+                        axisTick: {
+                            show: false
+                        },
+                        splitLine: {
+                            show: false, 
+                        },
+                        type: 'category',
+                        boundaryGap: false,
+                        data: this.xAxisData
+                    },
+                    yAxis: {
+                        type: 'value'
+                    },
+                    series: [
+                        {
+                        name: '客户投诉处理满意率',
+                        type: 'line',
+                        stack: 'Total',
+                        data:this.line4Data
+                        }
+                    ]
+                };
+            },
+            handleFilter(){
+                let that = this;
+                that.tableData1 = [];
+                that.tableDatas = [ [],[],[],[],[],[],[],[],[],[],[],[],[]];
+                getTask2Do(that.listQuery).then(res=>{
+                    let data = res.data.filter(item=>{
+                        return item.task2_.type==20
+                    });
+                    console.log(data)
+                    data.forEach(element => {
+                        let obj = element;
+                        if(element.num_issue!==null&&element.num_error!==null&&element.num_issue!==0){
+                            let rate1 = ((element.num_issue-element.num_error)/element.num_issue).toFixed(2)
+                            obj.rate1 = Number(rate1)
+                        }else{
+                            obj.rate1 = ''
+                        }
+                        if(element.num_expect!==null&&element.num_issue!==null&&element.num_expect!==0){
+                            let rate2 = (element.num_issue/element.num_expect).toFixed(2)
+                            obj.rate2 = Number(rate2)
+                        }
+                        else{
+                            obj.rate2 = ''
+                        }
+                        if(element.num_pt!==null&&element.num_pt_10!==null&&element.num_pt!==0){
+                            let rate3 = (element.num_pt_10/element.num_pt).toFixed(2)
+                            obj.rate3 =  Number(rate3)
+                        }
+                        else{
+                            obj.rate3 = ''
+                        }
+                        if(element.num_complaint!==null&&element.num_complaint_10!==null&&element.num_complaint!==0){
+                            let rate4 = (element.num_complaint_10/element.num_complaint).toFixed(2)
+                            obj.rate4 =  Number(rate4)
+                        }
+                        else{
+                            obj.rate4 = ''
+                        }
+                        let ind = element.task2_.cycle-1;
+                        that.tableData1[ind] = obj;
+                    });
+                    for (let i = 0; i < that.tableData1.length; i++) {
+                        let item = that.tableData1[i];
+                        if(item!==undefined){
+                            for(let j = 0; j < that.tableDatas.length; j++){
+                                that.tableDatas[j][i] =  
+                                j==0?item.num_acc:
+                                j==1?item.num_issue:
+                                j==2?item.num_error:
+                                j==3?item.rate1:
+                                j==4?item.num_expect:
+                                j==5?item.num_issue:
+                                j==6?item.rate2:
+                                j==7?item.num_pt:
+                                j==8?item.num_pt_10:
+                                j==9?item.rate3:
+                                j==10?item.num_complaint:
+                                j==11?item.num_complaint_10:
+                                item.rate4;
+                            }
+                        } 
+                    }
+                    // debugger;
+                    console.log(that.tableDatas)
+                    that.timeStamp++;
+
+                    for(let k=0;k<that.tableDatas.length;k++){
+                        let num = 0;
+                        let num1 = that.tableDatas[k][0]?that.tableDatas[k][0]:0;
+                        let num2 = that.tableDatas[k][1]?that.tableDatas[k][1]:0;
+                        let num3 = that.tableDatas[k][2]?that.tableDatas[k][2]:0;
+                        let num4 = that.tableDatas[k][3]?that.tableDatas[k][3]:0;
+                        let num5 = that.tableDatas[k][4]?that.tableDatas[k][4]:0;
+                        let num6 = that.tableDatas[k][5]?that.tableDatas[k][5]:0;
+                        if(k==3){
+                            num =  ((that.tableDatas[1][7]-that.tableDatas[2][7])/that.tableDatas[1][7]).toFixed(2)
+                        }else if(k==6){
+                            num = (that.tableDatas[5][7]/that.tableDatas[4][7]).toFixed(2)
+                        }else if(k==9){
+                            num =(that.tableDatas[8][7]/that.tableDatas[7][7]).toFixed(2)
+                        }else if(k==12){
+                            num = (that.tableDatas[11][7]/that.tableDatas[10][7]).toFixed(2)
+                        }else{
+                            num = Number(num1)+Number(num2)+Number(num3)+Number(num4)+Number(num5)+Number(num6);
+                        }
+                        if(num!=='NaN'){
+                            that.tableDatas[k][7] = Number(num);
+                        }else{
+                            that.tableDatas[k][7] = ''
+                        }
+                    }
+                    for(let i=0;i<6;i++){
+                        if(that.tableDatas[1][i]!==undefined){
+                            that.bar1Data.push(Number(that.tableDatas[1][i]))
+                        }else{
+                            that.bar1Data.push(0)
+                        }
+                    }
+                    for(let i=0;i<6;i++){
+                        if(that.tableDatas[4][i]!==undefined){
+                            that.bar2Data.push(Number(that.tableDatas[4][i]))
+                        }else{
+                            that.bar2Data.push(0)
+                        }
+                    }
+                    for(let i=0;i<6;i++){
+                        if(that.tableDatas[3][i]!==undefined){
+                            that.line1Data.push(Number(that.tableDatas[3][i]))
+                        }else{
+                            that.line1Data.push(0)
+                        }
+                    }
+                    for(let i=0;i<6;i++){
+                        if(that.tableDatas[6][i]!==undefined){
+                            that.line2Data.push(Number(that.tableDatas[6][i]))
+                        }else{
+                            that.line2Data.push(0)
+                        }
+                    }
+                    for(let i=0;i<6;i++){
+                        if(that.tableDatas[9][i]!==undefined){
+                            that.line3Data.push(Number(that.tableDatas[9][i]))
+                        }else{
+                            that.line3Data.push(0)
+                        }
+                    }
+                    for(let i=0;i<6;i++){
+                        if(that.tableDatas[12][i]!==undefined){
+                            that.line4Data.push(Number(that.tableDatas[12][i]))
+                        }else{
+                            that.line4Data.push(0)
+                        }
+                    }
+                    console.log(that.bar2Data)
+                    console.log(that.line1Data)
+                    console.log(that.line2Data)
+                    console.log(that.line3Data)
+                    console.log(that.line4Data)
+
+                    that.barChart1.clear();
+                    that.barChart1.setOption(this.bar1Option);
+                    that.barChart2.clear();
+                    that.barChart2.setOption(this.bar2Option);
+
+                    that.lineChart1.clear();
+                    that.lineChart1.setOption(this.line1Option);
+                    that.lineChart2.clear();
+                    that.lineChart2.setOption(this.line2Option);
+
+                    that.lineChart3.clear();
+                    that.lineChart3.setOption(this.line3Option);
+                    that.lineChart4.clear();
+                    that.lineChart4.setOption(this.line4Option);
+                })
+            },
+            handlePrint() {
+                this.$PRINT('#myReport');
+            },
+           
+            checkPermission,
+            getGroup() {
+                if (this.checkPermission(["record_confirm"])) {
+                    getOrgList({ can_supervision: true }).then((res) => {
+                        this.orgData = res.data;
+                    });
+                } else {
+                    getSubOrgList().then((res) => {
+                        this.orgData = res.data;
+                    });
+                }
+            },
+            //合并单位表头
+            handerMethod ({ row, column, rowIndex, columnIndex }) {
+                if (row[0].level == 1) {
+                    //这里有个非常坑的bug 必须是row[0]=0 row[1]=2才会生效
+                    row[0].colSpan = 0
+                    row[1].colSpan = 2
+                    if (columnIndex === 0) {
+                    return { display: 'none' }
+                    }
+                }
+            },
+            //合并单元格
+            objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+                if (rowIndex==0) {
+                    if(columnIndex==1){
+                        return {
+                            rowspan: 1, 
+                            colspan: 0,// 如果相等，则将colspan设置为0
+                        };
+                    }else if(columnIndex==0){
+                        return {
+                            rowspan: 1, 
+                            colspan: 2,
+                        };
+                    }else{
+                        return {
+                            rowspan: 1, 
+                            colspan: 1,
+                        };
+                    }
+                }else{
+                    if(columnIndex==0){
+                        if(rowIndex==1||rowIndex==4||rowIndex==7||rowIndex==10){
+                            return {
+                                rowspan: 3,
+                                colspan: 1,
+                            }
+                        }else{
+                            return {
+                                rowspan:0, 
+                                colspan:1,
+                            }
+                        }
+                    }else{
+                        return {
+                            rowspan:1, 
+                            colspan:1, 
+                        }
+                    }
+                }
+            },
+        }
     };
-},
-mounted() {
-    this.getGroup();
-    this.getBarChart1();
-    this.getBarChart2();
-    this.getLineChart1();
-    this.getLineChart2();
-    this.getLineChart3();
-    this.getLineChart4();
-},
-methods: {
-    handlePrint() {
-        this.$PRINT('#myReport');
-    },
-    getBarChart1(){
-        let chartDom = document.getElementById('bar1');
-        this.barChart1 = echarts.init(chartDom);
-        let option = {
-            title:{
-                text:"已发放报告/证书数量"
-            },
-            xAxis:{
-                axisTick: {
-                    show: false
-                },
-                data:this.xAxisData
-            },
-            yAxis:{},
-            series:[
-                {
-                    name:"已发放报告/证书数量",
-                    type:"bar",
-                    data:[8,10,4,5,4,8]
-                }
-            ]
-        }
-        this.barChart1.setOption(option);
-    },
-    getBarChart2(){
-        let chartDom = document.getElementById('bar2');
-        this.barChart2 = echarts.init(chartDom);
-        let option = {
-            title:{
-                text:"已发放报告/证书数量"
-            },
-            xAxis:{
-                axisTick: {
-                    show: false
-                },
-                data:this.xAxisData
-            },
-            yAxis:{},
-            series:[
-                {
-                    name:"已发放报告/证书数量",
-                    type:"bar",
-                    data:[8,10,4,5,4,8]
-                }
-            ]
-        }
-        this.barChart2.setOption(option);
-    },
-    getLineChart1(){
-        let chartDom = document.getElementById('lin1');
-        this.lineChart1 = echarts.init(chartDom);
-        let  option = {
-            title: {
-                text: '报告/证书合格率'
-            },
-            tooltip: {
-                trigger: 'axis'
-            },
-            legend: {
-                data: ['报告/证书合格率']
-            },
-            grid: {
-                left: '3%',
-                right: '4%',
-                bottom: '3%',
-                containLabel: true
-            },
-            toolbox: {
-                feature: {
-                saveAsImage: {}
-                }
-            },
-            xAxis: {
-                axisTick: {
-                    show: false
-                },
-                splitLine: {
-                    show: false, 
-                },
-                type: 'category',
-                boundaryGap: false,
-                data: this.xAxisData
-            },
-            yAxis: {
-                type: 'value'
-            },
-            series: [
-                {
-                name: '报告/证书合格率',
-                type: 'line',
-                stack: 'Total',
-                data: [80, 99, 80, 96, 95, 97, 99]
-                }
-            ]
-        };
-        this.lineChart1.setOption(option);
-    },
-    getLineChart2(){
-        let chartDom = document.getElementById('lin2');
-        this.lineChart2 = echarts.init(chartDom);
-        let  option = {
-            title: {
-                text: '报告/证书合格率'
-            },
-            tooltip: {
-                trigger: 'axis'
-            },
-            legend: {
-                data: ['报告/证书合格率']
-            },
-            grid: {
-                left: '3%',
-                right: '4%',
-                bottom: '3%',
-                containLabel: true
-            },
-            toolbox: {
-                feature: {
-                saveAsImage: {}
-                }
-            },
-            xAxis: {
-                axisTick: {
-                    show: false
-                },
-                splitLine: {
-                    show: false, 
-                },
-                type: 'category',
-                boundaryGap: false,
-                data: this.xAxisData
-            },
-            yAxis: {
-                type: 'value'
-            },
-            series: [
-                {
-                name: '报告/证书合格率',
-                type: 'line',
-                stack: 'Total',
-                data: [100, 99, 80, 96, 95, 97, 99]
-                }
-            ]
-        };
-        this.lineChart2.setOption(option);
-    },
-    getLineChart3(){
-        let chartDom = document.getElementById('lin3');
-        this.lineChart3 = echarts.init(chartDom);
-        let  option = {
-            title: {
-                text: '报告/证书合格率'
-            },
-            tooltip: {
-                trigger: 'axis'
-            },
-            legend: {
-                data: ['报告/证书合格率']
-            },
-            grid: {
-                left: '3%',
-                right: '4%',
-                bottom: '3%',
-                containLabel: true
-            },
-            toolbox: {
-                feature: {
-                saveAsImage: {}
-                }
-            },
-            xAxis: {
-                axisTick: {
-                    show: false
-                },
-                splitLine: {
-                    show: false, 
-                },
-                type: 'category',
-                boundaryGap: false,
-                data: this.xAxisData
-            },
-            yAxis: {
-                type: 'value'
-            },
-            series: [
-                {
-                name: '报告/证书合格率',
-                type: 'line',
-                stack: 'Total',
-                data: [97, 99, 98.8, 98.9, 99, 99.9, 96]
-                }
-            ]
-        };
-        this.lineChart3.setOption(option);
-    },
-    getLineChart4(){
-        let chartDom = document.getElementById('lin4');
-        this.lineChart4 = echarts.init(chartDom);
-        let  option = {
-            title: {
-                text: '报告/证书合格率'
-            },
-            tooltip: {
-                trigger: 'axis'
-            },
-            legend: {
-                data: ['报告/证书合格率']
-            },
-            grid: {
-                left: '3%',
-                right: '4%',
-                bottom: '3%',
-                containLabel: true
-            },
-            toolbox: {
-                feature: {
-                saveAsImage: {}
-                }
-            },
-            xAxis: {
-                axisTick: {
-                    show: false
-                },
-                splitLine: {
-                    show: false, 
-                },
-                type: 'category',
-                boundaryGap: false,
-                data: this.xAxisData
-            },
-            yAxis: {
-                type: 'value'
-            },
-            series: [
-                {
-                name: '报告/证书合格率',
-                type: 'line',
-                stack: 'Total',
-                data:[89, 99, 92, 96, 95, 97, 99]
-                }
-            ]
-        };
-        this.lineChart4.setOption(option);
-    },
-    checkPermission,
-    getGroup() {
-        if (this.checkPermission(["record_confirm"])) {
-            getOrgList({ can_supervision: true }).then((res) => {
-                this.orgData = res.data;
-            });
-        } else {
-            getSubOrgList().then((res) => {
-                this.orgData = res.data;
-            });
-        }
-    },
-    //合并单位表头
-    handerMethod ({ row, column, rowIndex, columnIndex }) {
-    if (row[0].level == 1) {
-        //这里有个非常坑的bug 必须是row[0]=0 row[1]=2才会生效
-        row[0].colSpan = 0
-        row[1].colSpan = 2
-        if (columnIndex === 0) {
-        return { display: 'none' }
-        }
-    }
-    },
-    handleFilter(){},
-    
-        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-    // console.log(row, column, rowIndex, columnIndex)
-    if (rowIndex==0) {
-        if(columnIndex==1){
-            return {
-                rowspan: 1, 
-                colspan: 0,// 如果相等，则将colspan设置为0
-            };
-        }else if(columnIndex==0){
-            return {
-                rowspan: 1, 
-                colspan: 2,
-            };
-        }else{
-            return {
-                rowspan: 1, 
-                colspan: 1,
-            };
-        }
-    }else{
-        if(columnIndex==0){
-            if(rowIndex==1||rowIndex==4||rowIndex==7||rowIndex==10){
-                return {
-                    rowspan: 3,
-                    colspan: 1,
-                }
-            }else{
-                return {
-                    rowspan:0, 
-                    colspan:1,
-                }
-            }
-        }else{
-            return {
-                rowspan:1, 
-                colspan:1, 
-            }
-        }
-    }
-    },
-}
-};
 </script>
 <style>
-.printContainer{
-    width: 1075px;
-}
+    .printContainer{
+        width: 1075px;
+    }
+    #numTable,#echartsContainer{
+        margin-left: 37px;
+    }
+    #numTable td{
+        height: 32px;
+        padding-left: 5px;
+    }
+    .numCell{
+        width: 80px;
+    }
+    .numCell.numCell_last{
+        width: 100px;
+    }
+    #echartsContainer{
+        margin-top: 30px;
+    }
+   .chartsWrap{
+    /* margin-top: 30px; */
+    padding-top: 50px;
+    border-top: 1px solid #eeeeee;
+   }
 </style>
\ No newline at end of file
diff --git a/client/src/views/supervisionNew/taskdo.vue b/client/src/views/supervisionNew/taskdo.vue
index 9c87dfc..7f54521 100644
--- a/client/src/views/supervisionNew/taskdo.vue
+++ b/client/src/views/supervisionNew/taskdo.vue
@@ -211,7 +211,32 @@
         <div>
           <span>执行详情</span>
         </div>
-        <p><span style="margin-right: 50px;">应发报告：{{ task2doItem.num_expect }} </span>已发报告：{{ task2doItem.num_issue }}</p>
+        <p>
+          <el-col :span="4">
+            <p>重大事故：{{ task2doItem.num_acc }} </p>
+            <p>风险识别：{{ task2doItem.num_risk }} </p>
+          </el-col>
+          <el-col :span="4">
+            <p>应发报告：{{ task2doItem.num_expect }} </p>
+            <p>已发报告：{{ task2doItem.num_issue }} </p>
+          </el-col>
+          <el-col :span="4">
+            <p>不准确报告：{{ task2doItem.num_error }} </p>
+            <p>超期报告：{{ task2doItem.num_overdue }} </p>
+          </el-col>
+          <el-col :span="4">
+            <p>能力验证结果：{{ task2doItem.num_pt }} </p>
+            <p>验证结果满意：{{ task2doItem.num_pt_10 }} </p>
+          </el-col>
+          <el-col :span="4">
+            <p>客户投诉：{{ task2doItem.num_complaint }} </p>
+            <p>投诉结果满意：{{ task2doItem.num_complaint_10 }} </p>
+          </el-col>
+          <el-col :span="4">
+            <p>外部监督检查：{{ task2doItem.num_oinspect }} </p>
+          </el-col>
+        </p>
+        
       </el-card>
       <el-row :gutter="5">
         <el-col :span="12" style="margin-top: 5px;">
@@ -224,7 +249,7 @@
                 fit
                 stripe
                 highlight-current-row
-                max-height="300px"
+                height="250px"
               >
                 <el-table-column type="index" width="50" />
                 <el-table-column label="报告证书编号" prop="number"></el-table-column>
@@ -244,7 +269,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  max-height="300px"
+                  height="250px"
                 >
                 <el-table-column type="index" width="40" />
                 <el-table-column label="报告证书编号" prop="number"></el-table-column>
@@ -264,7 +289,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  max-height="300px"
+                  height="250px"
                 >
                 <el-table-column type="index" width="40" />
                 <el-table-column label="名称" prop="name"></el-table-column>
@@ -295,7 +320,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  max-height="300px"
+                  height="250px"
                 >
                 <el-table-column type="index" width="40" />
                 <el-table-column label="投诉人" prop="complainant"></el-table-column>
@@ -322,7 +347,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  max-height="300px"
+                  height="250px"
                 >
                 <el-table-column type="index" width="40" />
                 <el-table-column label="内容" prop="content"></el-table-column>
@@ -350,7 +375,7 @@
                   fit
                   stripe
                   highlight-current-row
-                  max-height="300px"
+                  height="250px"
                 >
                 <el-table-column type="index" width="40" />