diff --git a/client/src/views/supervisionNew/basicGoal.vue b/client/src/views/supervisionNew/basicGoal.vue
index 008acdd..0163ce0 100644
--- a/client/src/views/supervisionNew/basicGoal.vue
+++ b/client/src/views/supervisionNew/basicGoal.vue
@@ -74,23 +74,23 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="重大质量事故" prop="pgoal_1">
-                    <el-input v-model="form.pgoal_1" type="number" style="width:90%"/>
+                    <el-input-number style="width:90%" v-model="form.pgoal_1" :precision="0" :min="0" controls-position="right" size="large"/>
                     <span>件</span>
                 </el-form-item>
                 <el-form-item label="报告/证书合格率" prop="pgoal_2">
-                    <el-input v-model="form.pgoal_2" type="number" style="width:90%"/>
+                    <el-input-number style="width:90%" v-model="form.pgoal_2" :precision="1" :min="0" :max="100" controls-position="right" size="large"/>
                     <span>%</span>
                 </el-form-item>
                 <el-form-item label="报告/证书及时率" prop="pgoal_3">
-                    <el-input v-model="form.pgoal_3" type="number" style="width:90%"/>
+                    <el-input-number style="width:90%" v-model="form.pgoal_3" :precision="1" :min="0" :max="100" controls-position="right" size="large"/>
                     <span>%</span>
                 </el-form-item>
                 <el-form-item label="能力验证满意率" prop="pgoal_4">
-                    <el-input v-model="form.pgoal_4" type="number" style="width:90%"/>
+                    <el-input-number style="width:90%" v-model="form.pgoal_4" :precision="1" :min="0" :max="100" controls-position="right" size="large"/>
                     <span>%</span>
                 </el-form-item>
                 <el-form-item label="客户投诉处理满意率" prop="pgoal_5">
-                    <el-input v-model="form.pgoal_5" type="number" style="width:90%"/>
+                    <el-input-number style="width:90%" v-model="form.pgoal_5" :precision="1" :min="0" :max="100" controls-position="right" size="large"/>
                     <span>%</span>
                 </el-form-item>
                 <el-form-item label="模板文件" prop="template" v-if="dialogVisible">
@@ -292,7 +292,35 @@
                 this.listLoading = true;
                 getPgoalList(this.listQuery).then((response) => {
                     if (response.data) {
-                    this.dataList = response.data;
+                        let data = response.data.results;
+                        debugger;
+                        for(let i=0;i<data.length;i++){
+                            let 
+                            pgoal_2 = data[i].pgoal_2+'',
+                            pgoal_3 = data[i].pgoal_3+'',
+                            pgoal_4 = data[i].pgoal_4+'',
+                            pgoal_5 = data[i].pgoal_5+'';
+                            
+                            if(pgoal_2.indexOf('.')>-1){}else{
+                                pgoal_2 = pgoal_2+'.0';
+                                data[i].pgoal_2 = pgoal_2;
+                            }
+                            if(pgoal_3.indexOf('.')>-1){}else{
+                                pgoal_3 = pgoal_3+'.0';
+                                data[i].pgoal_3 = pgoal_3;
+                            }
+                            if(pgoal_4.indexOf('.')>-1){}else{
+                                pgoal_4 = pgoal_4+'.0';
+                                data[i].pgoal_4 = pgoal_4;
+                            }
+                            if(pgoal_5.indexOf('.')>-1){}else{
+                                pgoal_5 = pgoal_5+'.0';
+                                data[i].pgoal_5 = pgoal_5;
+                            }
+                        }
+                        debugger;
+                    this.dataList.results = data;
+                    this.dataList.count = response.data.count;
                     }
                     this.listLoading = false;
                 });
diff --git a/client/src/views/supervisionNew/basicGoalDept.vue b/client/src/views/supervisionNew/basicGoalDept.vue
index 8cbd20f..6b4b93a 100644
--- a/client/src/views/supervisionNew/basicGoalDept.vue
+++ b/client/src/views/supervisionNew/basicGoalDept.vue
@@ -137,23 +137,38 @@
                                     alreadyId.push(data[i].belong_dept)
                                 }
                                 index = alreadyId.length-1;
+                                let goal_value_b = '',goal_value_a = '';
+                                goal_value_a = data[i].goal_value_a+'';
+                                if(goal_value_a.indexOf('.')>-1){}else{
+                                    goal_value_a = goal_value_a+'.0';
+                                }
+                                goal_value_b = data[i].goal_value_b+'';
+                                if(data[i].goal_value_b!==null){
+                                    if(goal_value_b.indexOf('.')>-1){}else{
+                                        goal_value_b = goal_value_b+'.0';
+                                    }
+                                }else{
+                                    goal_value_b = ''
+                                }
                                 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;
+                                    dataList[index].pgoal_1=data[i].goal_value_b!==null?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;
+                                    dataList[0].pgoal_2=goal_value_a;
+                                    dataList[index].pgoal_2=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;
+                                    dataList[0].pgoal_3=goal_value_a;
+                                    dataList[index].pgoal_3=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;
+                                    dataList[0].pgoal_4=goal_value_a;
+                                    dataList[index].pgoal_4=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;
+                                    dataList[0].pgoal_5=goal_value_a;
+                                    dataList[index].pgoal_5=goal_value_b;
                                 }
                             }
+                            debugger;
+                            console.log(dataList)
                             that.dataList.results = dataList;
                         }
                         that.listLoading = false;
diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue
index 8a78bb3..5b3085c 100644
--- a/client/src/views/supervisionNew/mytask.vue
+++ b/client/src/views/supervisionNew/mytask.vue
@@ -146,7 +146,9 @@
                   </el-col>
                   <el-col :span="12">
                     <p>公司目标：
-                      <el-input v-model="item.goal_value_b" type="number" style="width:100px"/>
+                      <el-input-number v-if="item.goal_name=='重大质量事故'" style="width:120px" v-model="item.goal_value_b" :precision="0" :min="0" :max="100" controls-position="right" size="large"/>
+                      <el-input-number v-else style="width:120px" v-model="item.goal_value_b" :precision="1" :min="0" :max="100" controls-position="right" size="large"/>
+                      <!-- <el-input v-model="item.goal_value_b" type="number" style="width:100px"/> -->
                     </p>
                   </el-col>
                   <el-col :span="24">
@@ -810,7 +812,7 @@ import user from "@/store/modules/user";
             getPgoalList({year:item.task2_.year,page:0}).then(resp=>{
               that.task= resp.data[0];
               console.log(that.task)
-              debugger;
+              // debugger;
             })
           }else{//日常监督
             this.numbers.num_expect = item.num_expect;
@@ -894,7 +896,7 @@ import user from "@/store/modules/user";
             this.subData.splice(index,1)
           }
         },
-        saveGoal(item){
+        saveGoal(item){          
           this.saveLoading = true;
           let obj = {};
           obj.year = item.year;