Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/statistic/index.vue

@@ -221,7 +221,7 @@
                                 <div>计划数:{{items.planNum}} {{items.planHour}}分钟  {{items.planCost}}元 </div>
                                 <div>实际数:{{items.nowNum}} {{items.nowHour}}分钟  {{items.nowCost}}元</div>
                                 <div v-if="!isViewUser">进度:{{items.progress}}</div>
-                                <div v-if="isViewUser">进度:{{ comSchedule(items.nowNum, items.planNum) }}</div>
+                                <div v-if="isViewUser">进度:{{ comSchedule(items.nowHour, items.planHour) }}</div>
                             </div>
                         </div>
                     </template>
@@ -231,7 +231,7 @@
                       <div>计划数:{{scope.row.totalPlanNum}}  {{scope.row.totalPlanHour}}分钟  {{scope.row.totalPlanCost}}元 </div>
                       <div>实际数:{{scope.row.totalNowNum}}  {{scope.row.totalNowHour}}分钟  {{scope.row.totalNowCost}}元</div>
                       <div v-if="!isViewUser">进度:{{scope.row.totalProgress}}</div>
-                      <div v-if="isViewUser">进度:{{ comSchedule(scope.row.totalNowNum, scope.row.totalPlanNum) }}</div>
+                      <div v-if="isViewUser">进度:{{ comSchedule(scope.row.totalNowHour, scope.row.totalPlanHour) }}</div>
                   </template>
                 </el-table-column>
             </el-table>