diff --git a/client/src/router/index.js b/client/src/router/index.js
index 251e9c5..aebe060 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -213,6 +213,12 @@ export const asyncRoutes = [
         component: () => import('@/views/supervisionNew/basicGoal.vue'),
         meta: { title: '年度基础目标' , perms: ['task2']}
       },
+      {
+        path: 'basicGoalDept',
+        name: 'basicGoalDept',
+        component: () => import('@/views/supervisionNew/basicGoalDept.vue'),
+        meta: { title: '部门年度目标' , perms: ['task2do']}
+      },
       {
         path: 'content',
         name: 'Content',
diff --git a/client/src/views/dashboard/index.vue b/client/src/views/dashboard/index.vue
index 0cb90a2..4dd59f3 100644
--- a/client/src/views/dashboard/index.vue
+++ b/client/src/views/dashboard/index.vue
@@ -1,122 +1,134 @@
 <template>
   <div class="dashboard-container">
-      <el-row :gutter="10" class="panel-group">
-        <el-col :xs="12" :sm="12" :lg="12" :xl="6" class="card-panel-col">
-      <div class="card-panel" @click="toPath('/share/qualification')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="table" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            检验检测资质
+    <el-row :gutter="10" class="panel-group">
+      <el-col :xs="12" :sm="12" :lg="12" :xl="6" class="card-panel-col">
+        <div class="card-panel" @click="toPath('/share/qualification')">
+          <div class="card-panel-icon-wrapper icon-money">
+            <svg-icon icon-class="table" class-name="card-panel-icon" />
           </div>
-          <!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="12" :xl="6" class="card-panel-col">
-      <div class="card-panel" @click="toPath('/share/cma')">
-        <div class="card-panel-icon-wrapper icon-people">
-          <svg-icon icon-class="table" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            检测能力(总部CMA+CNAS)
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              检验检测资质
+            </div>
+            <!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
           </div>
-          <!-- <count-to :start-val="0" v-bind:end-val="ret.consumer1_count" :duration="1600" class="card-panel-num"  /> -->
         </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="12" :xl="6" class="card-panel-col">
-      <div class="card-panel" @click="toPath('/share/cma2')">
-        <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon icon-class="table" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            检测能力(分子公司CMA)
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="12" :xl="6" class="card-panel-col">
+        <div class="card-panel" @click="toPath('/share/cma')">
+          <div class="card-panel-icon-wrapper icon-people">
+            <svg-icon icon-class="table" class-name="card-panel-icon" />
           </div>
-          <!-- <count-to :start-val="0" v-bind:end-val="ret.consumer2_count" :duration="1600" class="card-panel-num" /> -->
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="12"  :xl="6" class="card-panel-col">
-      <div class="card-panel" @click="toPath('/share/inspection')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="table" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            检验能力
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              检测能力(总部CMA+CNAS)
+            </div>
+            <!-- <count-to :start-val="0" v-bind:end-val="ret.consumer1_count" :duration="1600" class="card-panel-num"  /> -->
           </div>
-          <!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
         </div>
-      </div>
-    </el-col>
-     <el-col :xs="12" :sm="12" :lg="12"  :xl="6" class="card-panel-col">
-      <div class="card-panel" @click="toPath('/share/correct')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="table" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            校准/检定能力
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="12" :xl="6" class="card-panel-col">
+        <div class="card-panel" @click="toPath('/share/cma2')">
+          <div class="card-panel-icon-wrapper icon-message">
+            <svg-icon icon-class="table" class-name="card-panel-icon" />
           </div>
-          <!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
-        </div>
-      </div>
-    </el-col>
-     <el-col :xs="12" :sm="12" :lg="12"  :xl="6" class="card-panel-col">
-      <div class="card-panel" @click="toPath('/test/videolist')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="table" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            视频培训
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              检测能力(分子公司CMA)
+            </div>
+            <!-- <count-to :start-val="0" v-bind:end-val="ret.consumer2_count" :duration="1600" class="card-panel-num" /> -->
           </div>
-          <!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
         </div>
-      </div>
-    </el-col>
-   
-  </el-row>
-  <el-row>
-     <el-col :xs="24" :sm="24" :lg="12" :xl="6">
-      <el-card>
-        <div slot="header" class="clearfix">
-        <span>待办任务提醒</span>
-      </div>
-      <div class="litem" @click="goRecord('task2do')" v-if="checkPermission(['task2do'])">
-        <el-link class="desc">
-          您有
-          <span style="color:red">{{task2Num}}</span>
-          条记录待完成
-        </el-link>
-      </div>
-      <div class="litem" @click="goRecord('待报送')" v-if="!checkPermission(['record_confirm']) && checkPermission(['record_up'])">
-        <el-link class="desc">
-          您有
-          <span style="color:red">{{todos.toup}}</span>
-          条记录待报送
-        </el-link>
-      </div>
-      <div class="litem">
-        <el-link class="desc" @click="goRecord('待整改')" v-if="!checkPermission(['record_confirm']) && checkPermission(['record_up'])">
-          您有
-          <span style="color:red">{{todos.tozg}}</span>
-          条记录待整改
-        </el-link>
-      </div>
-      <div class="litem" @click="goRecord('已报送')" v-if="checkPermission(['record_confirm'])">
-        <el-link class="desc" v-if="todos.toconfirm">
-          您有
-          <span style="color:red">{{todos.toconfirm}}</span>
-          条记录待确认
-        </el-link>
-      </div>
-      </el-card>
-    </el-col>
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="12"  :xl="6" class="card-panel-col">
+        <div class="card-panel" @click="toPath('/share/inspection')">
+          <div class="card-panel-icon-wrapper icon-money">
+            <svg-icon icon-class="table" class-name="card-panel-icon" />
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              检验能力
+            </div>
+            <!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
+          </div>
+        </div>
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="12"  :xl="6" class="card-panel-col">
+        <div class="card-panel" @click="toPath('/share/correct')">
+          <div class="card-panel-icon-wrapper icon-money">
+            <svg-icon icon-class="table" class-name="card-panel-icon" />
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              校准/检定能力
+            </div>
+            <!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
+          </div>
+        </div>
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="12"  :xl="6" class="card-panel-col">
+        <div class="card-panel" @click="toPath('/test/videolist')">
+          <div class="card-panel-icon-wrapper icon-money">
+            <svg-icon icon-class="table" class-name="card-panel-icon" />
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">
+              视频培训
+            </div>
+            <!-- <count-to :start-val="0" v-bind:end-val="ret.test_count" :duration="1600" class="card-panel-num" /> -->
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="10">
+      <el-col :xs="24" :sm="24" :lg="12" :xl="6">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>待办任务提醒</span>
+          </div>
+          <div class="litem" @click="goRecord('task2do')" v-if="checkPermission(['task2do'])&&task2Num>0">
+            <el-link class="desc">
+              质量目标：您有
+              <span style="color:red">{{task2Num}}</span>
+              条记录待完成
+            </el-link>
+          </div>
+          <div class="litem" @click="goRecord('待报送')" v-if="!checkPermission(['record_confirm']) && checkPermission(['record_up'])">
+            <el-link class="desc">
+              其他任务：您有
+              <span style="color:red">{{todos.toup}}</span>
+              条记录待报送
+            </el-link>
+          </div>
+          <div class="litem">
+            <el-link class="desc" @click="goRecord('待整改')" v-if="!checkPermission(['record_confirm']) && checkPermission(['record_up'])">
+              其他任务：您有
+              <span style="color:red">{{todos.tozg}}</span>
+              条记录待整改
+            </el-link>
+          </div>
+          <div class="litem" @click="goRecord('已报送')" v-if="checkPermission(['record_confirm'])">
+            <el-link class="desc" v-if="todos.toconfirm">
+              其他任务：您有
+              <span style="color:red">{{todos.toconfirm}}</span>
+              条记录待确认
+            </el-link>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="12" :xl="6">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>质量风险管理库</span>
+          </div>
+          <p>
+            <el-link href="/media/default/集团公司基础质量风险管理库.wlsx" target="_blank" type="primary">集团公司基础质量风险管理库.wlsx</el-link>
+          </p>
+          <p>
+            <el-link href="/media/default/基础质量风险管理库引用文件.rar" target="_blank" type="primary">基础质量风险管理库引用文件.rar</el-link>
+          </p>
+        </el-card>
+      </el-col>
     </el-row>
   </div>
 </template>
diff --git a/client/src/views/supervisionNew/basicGoalDept.vue b/client/src/views/supervisionNew/basicGoalDept.vue
index 57e1f79..c51db61 100644
--- a/client/src/views/supervisionNew/basicGoalDept.vue
+++ b/client/src/views/supervisionNew/basicGoalDept.vue
@@ -36,7 +36,7 @@
         </el-card>
         <el-card style="margin-top: 10px">
             <el-table
-            v-loading="listLoading"
+                v-loading="listLoading"
                 :data="dataList.results"
                 border
                 fit
@@ -45,30 +45,13 @@
                 max-height="600"
             >
                 <el-table-column type="index" width="50" />
-                <el-table-column label="年份" prop="year"></el-table-column>
-                <el-table-column label="重大质量事故(件)" prop="pgoal_1">
-                    <template slot-scope="scope">
-                        基础:{{ scope.row.goal_value_a }}目标:{{ scope.row.goal_value_b }}
-                    </template>
-                   
-                </el-table-column>
+                <el-table-column label="年份" prop="year" width="80"></el-table-column>
+                <el-table-column label="部门名称" prop="dept_name"></el-table-column>
+                <el-table-column label="重大质量事故(件)" prop="pgoal_1"></el-table-column>
                 <el-table-column label="报告/证书合格率(%)" prop="pgoal_2"></el-table-column>
                 <el-table-column label="报告/证书及时率(%)" prop="pgoal_3"></el-table-column>
                 <el-table-column label="能力验证满意率(%)" prop="pgoal_4"></el-table-column>
                 <el-table-column label="客户投诉处理满意率(%)" prop="pgoal_5"></el-table-column>
-                <!-- <el-table-column
-                    align="center"
-                    label="操作"
-                    width="220px"
-                >
-                    <template slot-scope="scope">
-                        <el-link
-                        v-if="checkPermission(['task2do'])"
-                        type="danger"
-                        @click="handleDelete(scope)"
-                        >删除</el-link>
-                    </template>
-                </el-table-column> -->
             </el-table>
             <pagination
                 v-show="dataList.count > 0"
@@ -83,25 +66,24 @@
 
 <script>
     import { getPgoalDeptList } from "@/api/task";
+    import { getOrgList, getSubOrgList } from "@/api/org";
     import checkPermission from "@/utils/permission";
     import Pagination from "@/components/Pagination"; 
-    import { upUrl, upHeaders } from "@/api/file";
-  
     export default {
         components:{Pagination},
         data(){
             return{
                 dataList:{
-                    results:[],
-                    count:0,
+                    results:[],  
+                    count:0
                 },
                 listQuery:{
-                    page: 1,
-                    search:'',
-                    cycle:10,
-                    page_size: 20,
+                    page: 0,
+                    year:'',
+                    goal_key__in:'pgoal_1,pgoal_2,pgoal_3,pgoal_4,pgoal_5',
                 },
-                
+                taskList:[],
+                listLoading:false
             };
         },
         mounted(){
@@ -109,15 +91,84 @@
         },
         methods:{
             checkPermission,
+            getOrgList() {
+          let that = this;
+          let ids = ''
+          if (that.checkPermission(["record_confirm"])) {
+            getOrgList({ can_supervision: true }).then((res) => {
+              let data = res.data;
+              for(let i=0;i<data.length;i++){
+                ids= ids+item.id+',';
+              }
+              that.listQuery.belong_dept__in=ids;
+              that.getList();
+            });
+          } else {
+            getSubOrgList().then((res) => {
+                let data = res.data;
+                for(let i=0;i<data.length;i++){
+                    ids= ids+item.id+',';
+                }
+                that.listQuery.belong_dept__in=ids;
+                that.getList();
+            });
+          }
+        },
+            //获取任务列表===》获取任务id
             getList(){
                 let that = this;
                 that.listLoading = true;
-                getPgoalDeptList(that.listQuery).then((response) => {
-                    if (response.data) {
-                        that.dataList = response.data;
+                if(that.listQuery.year==''){
+                    that.listQuery.year = new Date().getFullYear();
+                }
+                that.listQuery.page=0;
+                getPgoalDeptList(that.listQuery).then((res) => {
+                    debugger;
+                    if (res.data) {
+                        let data0 = res.data;
+                        let data =data0.filter(item=>{
+                           return item.task2do!==null;
+                        });
+                        that.dataList.count = data.length;
+                        if(data.length>0){
+                            let alreadyId = ['000'];
+                            let dataList = [
+                                {year:that.listQuery.year,dept_name:'集团',dept:'000',pgoal_1:'',pgoal_2:'',pgoal_3:'',pgoal_4:'',pgoal_5:''}
+                            ];
+                            for(let i=0;i<data.length;i++){
+                                debugger;
+                                let index = alreadyId.indexOf(data[i].belong_dept)
+                                if(index>-1){
+                                }else{
+                                    let obj = {year:that.listQuery.year,dept_name:data[i].belong_dept_name,dept:data[i].belong_dept,pgoal_1:'',pgoal_2:'',pgoal_3:'',pgoal_4:'',pgoal_5:''};
+                                    dataList.push(obj)
+                                    alreadyId.push(data[i].belong_dept)
+                                }
+                                index = alreadyId.length-1;
+                                if(data[i].goal_key=='pgoal_1'){
+                                    dataList[0].pgoal_1=data[i].goal_value_a;
+                                    dataList[index].pgoal_1=data[i].goal_value_b;
+                                }else  if(data[i].goal_key=='pgoal_2'){
+                                    dataList[0].pgoal_2=data[i].goal_value_a;
+                                    dataList[index].pgoal_2=data[i].goal_value_b;
+                                }else  if(data[i].goal_key=='pgoal_3'){
+                                    dataList[0].pgoal_3=data[i].goal_value_a;
+                                    dataList[index].pgoal_3=data[i].goal_value_b;
+                                }else  if(data[i].goal_key=='pgoal_4'){
+                                    dataList[0].pgoal_4=data[i].goal_value_a;
+                                    dataList[index].pgoal_4=data[i].goal_value_b;
+                                }else  if(data[i].goal_key=='pgoal_5'){
+                                    dataList[0].pgoal_5=data[i].goal_value_a;
+                                    dataList[index].pgoal_5=data[i].goal_value_b;
+                                }
+                            }
+                            that.dataList.results = dataList;
+                            that.listLoading = false;
+                        }
                     }
-                    that.listLoading = false;
+                    
                 });
+                
             },
             resetFilter(){
                 this.listQuery.search = '';
diff --git a/client/src/views/supervisionNew/complaint_form.vue b/client/src/views/supervisionNew/complaint_form.vue
index e52e3ce..9c713ea 100644
--- a/client/src/views/supervisionNew/complaint_form.vue
+++ b/client/src/views/supervisionNew/complaint_form.vue
@@ -12,7 +12,7 @@
               label-position="right"
               :rules="rules"
             >
-                <el-form-item label="投诉人" >
+                <el-form-item label="投诉人/机构" >
                     <el-input v-model="form.complainant"></el-input>
                 </el-form-item>
                 <el-form-item label="投诉内容" >
@@ -28,17 +28,17 @@
                     >
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="反馈日期" >
+                <el-form-item label="处理结果反馈日期" >
                     <el-date-picker
                         v-model="form.date_feedback"
                         type="date"
-                        placeholder="选择日期"
+                        placeholder="处理结果反馈日期"
                         value-format="yyyy-MM-dd"
                         style="width:50%"
                     >
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="是否满意" >
+                <el-form-item label="客户是否满意" >
                     <el-switch
                         v-model="form.is_satisfied"
                         active-text="满意"
diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue
index e1de645..b66874f 100644
--- a/client/src/views/supervisionNew/mytask.vue
+++ b/client/src/views/supervisionNew/mytask.vue
@@ -250,11 +250,11 @@
                   highlight-current-row
                   :height="tableHeight"
                 >
-                <el-table-column type="index" width="50" />
-                <el-table-column label="报告证书编号" prop="number"></el-table-column>
-                <el-table-column label="更改后编号" prop="number_correct"></el-table-column>
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="报告/证书编号" prop="number"></el-table-column>
+                <el-table-column label="更改后报告/证书编号" prop="number_correct"></el-table-column>
                 <el-table-column label="出错原因" prop="reason_error"></el-table-column>
-                <el-table-column label="更改报告发放日期" prop="date_issue"></el-table-column>
+                <el-table-column label="更改报告/证书发放日期" prop="date_issue"></el-table-column>
                 <el-table-column
                     align="center"
                     label="操作"
@@ -294,11 +294,11 @@
                   highlight-current-row
                   :height="tableHeight"
                 >
-                <el-table-column type="index" width="40" />
-                <el-table-column label="报告证书编号" prop="number"></el-table-column>
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="超期报告/证书编号" prop="number"></el-table-column>
                 <el-table-column label="业务受理日期" prop="date_accept"></el-table-column>
-                <el-table-column label="预计发放日期" prop="date_expect"></el-table-column>
-                <el-table-column label="实际发放日期" prop="date_issue"></el-table-column>
+                <el-table-column label="报告/证书应发日期" prop="date_expect"></el-table-column>
+                <el-table-column label="报告/证书实际发放日期" prop="date_issue"></el-table-column>
                 <el-table-column
                     align="center"
                     label="操作"
@@ -345,9 +345,9 @@
                   highlight-current-row
                   :height="tableHeight"
                 >
-                <el-table-column type="index" width="40" />
-                <el-table-column label="名称" prop="name"></el-table-column>
-                <el-table-column label="编号" prop="number"></el-table-column>
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="能力验证名称" prop="name"></el-table-column>
+                <el-table-column label="项目编号" prop="number"></el-table-column>
                 <el-table-column label="组织方" prop="organizer"></el-table-column>
                 <el-table-column label="参加参数名称" prop="params"></el-table-column>
                 <el-table-column label="结果">
@@ -355,7 +355,7 @@
                       <span>{{ resultsOptions[scope.row.result] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="处理结果">
+                <el-table-column label="结果处理状况">
                   <template slot-scope="scope">
                       <span>{{ handleOptions[scope.row.handle_result] }}</span>
                     </template>
@@ -406,12 +406,12 @@
                   highlight-current-row
                   :height="tableHeight"
                 >
-                <el-table-column type="index" width="40" />
-                <el-table-column label="投诉人" prop="complainant"></el-table-column>
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="投诉人/机构" prop="complainant"></el-table-column>
                 <el-table-column label="投诉内容" prop="content"></el-table-column>
                 <el-table-column label="投诉日期" prop="date_occurrence"></el-table-column>
-                <el-table-column label="反馈日期" prop="date_feedback"></el-table-column>
-                <el-table-column label="是否满意">
+                <el-table-column label="处理结果反馈日期" prop="date_feedback"></el-table-column>
+                <el-table-column label="客户是否满意">
                     <template slot-scope="scope">
                         <el-tag v-if="scope.row.is_satisfied" type="primary">满意</el-tag>
                         <el-tag v-else type="warning">不满意</el-tag>
@@ -463,15 +463,15 @@
                   highlight-current-row
                   :height="tableHeight"
                 >
-                <el-table-column type="index" width="40" />
-                <el-table-column label="内容" prop="content"></el-table-column>
-                <el-table-column label="风险等级">
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="风险事实描述" prop="content"></el-table-column>
+                <el-table-column label="风险类别">
                   <template slot-scope="scope">
                       <span>{{ levelOptions[scope.row.level] }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="风险代码" prop="code"></el-table-column>
-                <el-table-column label="整改状态">
+                <el-table-column label="整改情况">
                   <template slot-scope="scope">
                       <span>{{ codeOptions[scope.row.state] }}</span>
                     </template>
@@ -522,13 +522,13 @@
                   highlight-current-row
                   :height="tableHeight"
                 >
-                <el-table-column type="index" width="40" />
-                <el-table-column label="检查分类">
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="检查类型">
                   <template slot-scope="scope">
                       <span>{{ cateOptions[scope.row.cate] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="检查方" prop="checker"></el-table-column>
+                <el-table-column label="检查机构" prop="checker"></el-table-column>
                 <el-table-column label="检查日期" prop="date_inspect"></el-table-column>
                 <el-table-column label="检查结果" prop="result"></el-table-column>
                 <el-table-column
@@ -1263,4 +1263,4 @@ import user from "@/store/modules/user";
     position: absolute;
     width: 100%; */
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/client/src/views/supervisionNew/oinspect_form.vue b/client/src/views/supervisionNew/oinspect_form.vue
index 712c2de..532d585 100644
--- a/client/src/views/supervisionNew/oinspect_form.vue
+++ b/client/src/views/supervisionNew/oinspect_form.vue
@@ -12,10 +12,10 @@
               label-position="right"
               :rules="rules"
             >
-                <el-form-item label="检查分类" >
+                <el-form-item label="检查类型" >
                     <el-select
                         v-model="form.cate"
-                        placeholder="检查分类"
+                        placeholder="检查类型"
                     >
                     <el-option
                         v-for="item in options"
@@ -26,7 +26,7 @@
                     </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="检查方" >
+                <el-form-item label="检查机构" >
                     <el-input v-model="form.checker"></el-input>
                 </el-form-item>
                 <el-form-item label="检查日期" >
diff --git a/client/src/views/supervisionNew/pt_form.vue b/client/src/views/supervisionNew/pt_form.vue
index a581e9f..449d8ef 100644
--- a/client/src/views/supervisionNew/pt_form.vue
+++ b/client/src/views/supervisionNew/pt_form.vue
@@ -12,10 +12,10 @@
               label-position="right"
               :rules="rules"
             >
-                <el-form-item label="名称" >
+                <el-form-item label="能力验证名称" >
                     <el-input v-model="form.name"></el-input>
                 </el-form-item>
-                <el-form-item label="编号" >
+                <el-form-item label="项目编号" >
                     <el-input v-model="form.number"></el-input>
                 </el-form-item>
                 <el-form-item label="组织方" >
@@ -39,10 +39,10 @@
                     </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="处理结果" >
+                <el-form-item label="结果处理状况" >
                     <el-select
                         v-model="form.handle_result"
-                        placeholder="处理结果"
+                        placeholder="结果处理状况"
                         :disabled="form.result==10"
                     >
                     <el-option
diff --git a/client/src/views/supervisionNew/rc_form.vue b/client/src/views/supervisionNew/rc_form.vue
index ec26f0e..25e91fb 100644
--- a/client/src/views/supervisionNew/rc_form.vue
+++ b/client/src/views/supervisionNew/rc_form.vue
@@ -12,7 +12,10 @@
               label-position="right"
               :rules="rules"
             >
-                <el-form-item label="报告证书编号" >
+                <el-form-item label="期报告/证书编号" v-if="type=='add2'||type=='edit2'">
+                    <el-input v-model="form.number"></el-input>
+                </el-form-item>
+                <el-form-item label="报告/证书编号" v-else>
                     <el-input v-model="form.number"></el-input>
                 </el-form-item>
                 <el-form-item label="业务受理日期" v-if="type=='add2'||type=='edit2'">
@@ -25,10 +28,10 @@
                     >
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="更改后证书编号" v-else>
+                <el-form-item label="更改后报告/证书编号" v-else>
                     <el-input v-model="form.number_correct"></el-input>
                 </el-form-item>
-                <el-form-item label="预计发放日期" v-if="type=='add2'||type=='edit2'">
+                <el-form-item label="报告/证书应发日期" v-if="type=='add2'||type=='edit2'">
                     <el-date-picker
                         v-model="form.date_expect"
                         type="date"
@@ -41,7 +44,7 @@
                 <el-form-item label="出错原因" v-else>
                     <el-input v-model="form.reason_error"></el-input>
                 </el-form-item>
-                <el-form-item label="实际发放日期"  v-if="type=='add2'||type=='edit2'">
+                <el-form-item label="报告/证书实际发放日期"  v-if="type=='add2'||type=='edit2'">
                     <el-date-picker
                         v-model="form.date_issue"
                         type="date"
@@ -51,7 +54,7 @@
                     >
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="更改报告发放日期"  v-else>
+                <el-form-item label="更改报告/证书发放日期"  v-else>
                     <el-date-picker
                         v-model="form.date_issue"
                         type="date"
diff --git a/client/src/views/supervisionNew/risk_form.vue b/client/src/views/supervisionNew/risk_form.vue
index e7deb33..39ae686 100644
--- a/client/src/views/supervisionNew/risk_form.vue
+++ b/client/src/views/supervisionNew/risk_form.vue
@@ -12,13 +12,13 @@
               label-position="right"
               :rules="rules"
             >
-                <el-form-item label="内容" >
+                <el-form-item label="风险事实描述" >
                     <el-input v-model="form.content"></el-input>
                 </el-form-item>
-                <el-form-item label="风险等级" >
+                <el-form-item label="风险类别" >
                     <el-select
                         v-model="form.level"
-                        placeholder="风险等级"
+                        placeholder="风险类别"
                     >
                     <el-option
                         v-for="item in options"
@@ -32,10 +32,10 @@
                 <el-form-item label="风险代码" >
                     <el-input v-model="form.code"></el-input>
                 </el-form-item>
-                <el-form-item label="整改状态" >
+                <el-form-item label="整改情况" >
                     <el-select
                         v-model="form.state"
-                        placeholder="整改状态"
+                        placeholder="整改情况"
                     >
                     <el-option
                         v-for="item in stateOptions"
diff --git a/client/src/views/supervisionNew/statistics.vue b/client/src/views/supervisionNew/statistics.vue
index 6cae279..5ded3ba 100644
--- a/client/src/views/supervisionNew/statistics.vue
+++ b/client/src/views/supervisionNew/statistics.vue
@@ -348,7 +348,7 @@
                 this.barChart1 = echarts.init(chartDom1);
                 this.bar1Option = {
                     title:{
-                        text:"已发放报告/证书数量"
+                        text:"已发放报告/证书数量(份)"
                     },
                     xAxis:{
                         axisTick: {
@@ -375,7 +375,7 @@
                 this.barChart2 = echarts.init(chartDom2);
                 this.bar2Option = {
                     title:{
-                        text:"应发报告/证书数量"
+                        text:"应发报告/证书数量(份)"
                     },
                     grid: {
                         left: '5%',
@@ -402,7 +402,7 @@
                 this.lineChart1 = echarts.init(chartDom3);
                 this.line1Option = {
                     title: {
-                        text: '报告/证书合格率'
+                        text: '报告/证书合格率(%)'
                     },
                     tooltip: {
                         trigger: 'axis'
@@ -448,7 +448,7 @@
                 this.lineChart2 = echarts.init(chartDom4);
                 this.line2Option = {
                     title: {
-                        text: '报告/证书及时率'
+                        text: '报告/证书及时率(%)'
                     },
                     tooltip: {
                         trigger: 'axis'
@@ -494,7 +494,7 @@
                 this.lineChart3 = echarts.init(chartDom5);
                 this.line3Option = {
                     title: {
-                        text: '能力验证满意率'
+                        text: '能力验证满意率(%)'
                     },
                     tooltip: {
                         trigger: 'axis'
@@ -540,7 +540,7 @@
                 this.lineChart4 = echarts.init(chartDom6);
                 this.line4Option = {
                     title: {
-                        text: '客户投诉处理满意率'
+                        text: '客户投诉处理满意率(%)'
                     },
                     tooltip: {
                         trigger: 'axis'
@@ -604,27 +604,27 @@
                                 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(4)
-                                    obj.rate1 = Number(rate1)*100
+                                    obj.rate1 = parseFloat(Number(rate1)*100).toFixed(2);
                                 }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(4)
-                                    obj.rate2 = Number(rate2)*100
+                                    obj.rate2 = parseFloat(Number(rate2)*100).toFixed(2);
                                 }
                                 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(4)
-                                    obj.rate3 =  Number(rate3)*100
+                                    obj.rate3 =  parseFloat(Number(rate3)*100).toFixed(2);
                                 }
                                 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(4)
-                                    obj.rate4 =  Number(rate4)*100
+                                    obj.rate4 =  parseFloat(Number(rate4)*100).toFixed(2);
                                 }
                                 else{
                                     obj.rate4 = ''
@@ -676,7 +676,7 @@
                                 if(num!=='NaN'&&num!==NaN){
                                     if(k==3||k==6||k==9||k==12){
                                         console.log(parseFloat((Number(num)*100)))
-                                        let numbe = parseFloat((Number(num)*100).toPrecision(12));
+                                        let numbe = parseFloat(Number(num)*100).toFixed(2);;
                                         that.tableDatas[k][6] = numbe;
                                     }else{
                                         that.tableDatas[k][6] = num;
@@ -843,4 +843,4 @@
     padding-top: 10px;
     border-top: 1px solid #eeeeee;
    }
-</style>
\ No newline at end of file
+</style>
diff --git a/client/src/views/supervisionNew/taskdo.vue b/client/src/views/supervisionNew/taskdo.vue
index 53cc5ea..91afce7 100644
--- a/client/src/views/supervisionNew/taskdo.vue
+++ b/client/src/views/supervisionNew/taskdo.vue
@@ -108,8 +108,8 @@
         </el-table-column>
         <el-table-column label="是否完成">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.count_up>scope.row.count_all " effect="plain">是</el-tag>
-          <el-tag type="danger" effect="plain" v-else>否</el-tag>
+            <el-tag v-if="scope.row.count_up<scope.row.count_all " type="danger" effect="plain">否</el-tag>
+            <el-tag v-else effect="plain">是</el-tag>
           </template>
         </el-table-column>
         <el-table-column
@@ -262,11 +262,11 @@
                 highlight-current-row
                 height="250px"
               >
-                <el-table-column type="index" width="50" />
-                <el-table-column label="报告证书编号" prop="number"></el-table-column>
-                <el-table-column label="更改后编号" prop="number_correct"></el-table-column>
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="报告/证书编号" prop="number"></el-table-column>
+                <el-table-column label="更改后报告/证书编号" prop="number_correct"></el-table-column>
                 <el-table-column label="出错原因" prop="reason_error"></el-table-column>
-                <el-table-column label="更改发放日期" prop="date_issue"></el-table-column>
+                <el-table-column label="更改报告/证书发放日期" prop="date_issue"></el-table-column>
               </el-table>
             </el-card>
         </el-col>
@@ -282,11 +282,11 @@
                   highlight-current-row
                   height="250px"
                 >
-                <el-table-column type="index" width="40" />
-                <el-table-column label="报告证书编号" prop="number"></el-table-column>
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="超期报告/证书编号" prop="number"></el-table-column>
                 <el-table-column label="业务受理日期" prop="date_accept"></el-table-column>
-                <el-table-column label="预计发放日期" prop="date_expect"></el-table-column>
-                <el-table-column label="实际发放日期" prop="date_issue"></el-table-column>
+                <el-table-column label="报告/证书应发日期" prop="date_expect"></el-table-column>
+                <el-table-column label="报告/证书实际发放日期" prop="date_issue"></el-table-column>
               </el-table>
           </el-card>
         </el-col>
@@ -302,9 +302,9 @@
                   highlight-current-row
                   height="250px"
                 >
-                <el-table-column type="index" width="40" />
-                <el-table-column label="名称" prop="name"></el-table-column>
-                <el-table-column label="编号" prop="number"></el-table-column>
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="能力验证名称" prop="name"></el-table-column>
+                <el-table-column label="项目编号" prop="number"></el-table-column>
                 <el-table-column label="组织方" prop="organizer"></el-table-column>
                 <el-table-column label="参加参数名称" prop="params"></el-table-column>
                 <el-table-column label="结果">
@@ -317,7 +317,6 @@
                       <span>{{ handleOptions[scope.row.handle_result] }}</span>
                     </template>
                 </el-table-column>
-               
               </el-table>
           </el-card>
         </el-col>
@@ -333,12 +332,12 @@
                   highlight-current-row
                   height="250px"
                 >
-                <el-table-column type="index" width="40" />
-                <el-table-column label="投诉人" prop="complainant"></el-table-column>
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="投诉人/机构" prop="complainant"></el-table-column>
                 <el-table-column label="投诉内容" prop="content"></el-table-column>
                 <el-table-column label="投诉日期" prop="date_occurrence"></el-table-column>
-                <el-table-column label="反馈日期" prop="date_feedback"></el-table-column>
-                <el-table-column label="是否满意">
+                <el-table-column label="处理结果反馈日期" prop="date_feedback"></el-table-column>
+                <el-table-column label="客户是否满意">
                     <template slot-scope="scope">
                         <el-tag v-if="scope.row.is_satisfied" type="primary">满意</el-tag>
                         <el-tag v-else type="warning">不满意</el-tag>
@@ -360,15 +359,15 @@
                   highlight-current-row
                   height="250px"
                 >
-                <el-table-column type="index" width="40" />
-                <el-table-column label="内容" prop="content"></el-table-column>
-                <el-table-column label="风险等级">
+                <el-table-column label="序号" type="index" width="50" />
+                <el-table-column label="风险事实描述" prop="content"></el-table-column>
+                <el-table-column label="风险类别">
                   <template slot-scope="scope">
                       <span>{{ levelOptions[scope.row.level] }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="风险代码" prop="code"></el-table-column>
-                <el-table-column label="整改状态">
+                <el-table-column label="整改情况">
                   <template slot-scope="scope">
                       <span>{{ codeOptions[scope.row.state] }}</span>
                     </template>
@@ -388,14 +387,14 @@
                   highlight-current-row
                   height="250px"
                 >
-                <el-table-column type="index" width="40" />
+                <el-table-column label="序号" type="index" width="50" />
                 
                 <el-table-column label="检查分类">
                   <template slot-scope="scope">
                       <span>{{ cateOptions[scope.row.cate] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="检查方" prop="checker"></el-table-column>
+                <el-table-column label="检查机构" prop="checker"></el-table-column>
                 <el-table-column label="检查日期" prop="date_inspect"></el-table-column>
                 <el-table-column label="检查结果" prop="result"></el-table-column>
               </el-table>
@@ -490,7 +489,7 @@ export default {
         name:'开始任务'
       }
       ,
-        upHeaders: upHeaders(),
+      upHeaders: upHeaders(),
       upUrl: upUrl(),
       fileList:[],
       Taskdept:{is_yes:true},
@@ -508,6 +507,32 @@ export default {
         5:'9-10月',
         6:'11-12月',
       },
+      resultsOptions:{
+        10:'满意',
+        20:'有问题',
+        30:'不满意'
+      },
+      handleOptions:{
+        0:'/',
+        10:'已整改',
+        20:'被暂停',
+        30:'已被撤销认可资格',
+      },
+      levelOptions:{
+        10:'主要风险',
+        20:'严重风险',
+        30:'重大风险'
+      },
+      codeOptions:{
+        10:'未整改',
+        20:'整改中',
+        30:'整改完成'
+      },
+      cateOptions:{
+        10:'市场监管部门检查',
+        20:'行业主管部门检查',
+        30:'其他检查'
+      },
       task2do:'',
       depts: [],
       deptOptions: [],
@@ -546,13 +571,11 @@ export default {
       this.listLoading = true;
       getTask2Do({task2:this.task.id})
         .then((res) => {
-          // debugger;
           this.listLoading = false;
           this.taskdeptall = [];
           let taskdept = res.data.results;
           taskdept.forEach(item=>{
             let obj = item;
-            // debugger;
             let pross = Number((item.count_up/item.count_all).toFixed(4))
             obj.pross = parseFloat((pross*100).toPrecision(12));
             this.taskdeptall.push(obj);
@@ -569,9 +592,7 @@ export default {
       }
       this.getOrgList();
       this.dialogVisible = true;
-      
     },
-    
     startTask() {
       this.$confirm("确认发布任务吗?", "提示")
         .then(async () => {
@@ -596,7 +617,6 @@ export default {
     getRecordList() {
       getPgoalDeptList(this.listQuery)
         .then((res) => {
-          // debugger;
           this.listLoading2 = false;
           this.recordList = res.data.results;
         })
@@ -623,15 +643,11 @@ export default {
       let that = this;
       getRcList({task2do:that.task2do,etype:10}).then((res) => {
         if (res.code >= 200) {
-          // debugger;
-          console.log(res)
           that.rcList =res.data.results;
         }
       });
       getRcList({task2do:that.task2do,etype:20}).then((res) => {
         if (res.code >= 200) {
-          // debugger;
-          console.log(res)
           that.rc2List =res.data.results;
         }
       });
@@ -640,8 +656,6 @@ export default {
       let that = this;
       getPtList({task2do:that.task2do}).then((res) => {
         if (res.code >= 200) {
-          // debugger;
-          console.log(res.data.results)
           that.ptList=res.data.results;
         }
       });
@@ -660,8 +674,6 @@ export default {
       let that = this;
       getComplaintList({task2do:that.task2do}).then((res) => {
         if (res.code >= 200) {
-          // debugger;
-          console.log(res)
           that.complaintList = res.data.results;
         }
       });
@@ -670,8 +682,6 @@ export default {
       let that = this;
       getOinspectList({task2do:that.task2do}).then((res) => {
         if (res.code >= 200) {
-          // debugger;
-          console.log(res)
           that.oinspectList=res.data.results;
         }
       });
@@ -775,4 +785,4 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>