调整车间管家的进度

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

@@ -221,15 +221,17 @@
                                 <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">进度:{{ ((items.nowNum / items.planNum ) * 100).toFixed(0) }}%</div>
                             </div>
                         </div>
                     </template>
                 </el-table-column>
                 <el-table-column align="center" prop="totalResult" label="合计" min-width="280">
                    <template slot-scope="scope">
-                                <div>计划数:{{scope.row.totalPlanNum}}  {{scope.row.totalPlanHour}}分钟  {{scope.row.totalPlanCost}}元 </div>
-                                <div>实际数:{{scope.row.totalNowNum}}  {{scope.row.totalNowHour}}分钟  {{scope.row.totalNowCost}}元</div>
-                                <div>进度:{{scope.row.totalProgress}}</div>
+                      <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">进度:{{ ((scope.row.totalNowNum / scope.row.totalPlanNum ) * 100).toFixed(0) }}%</div>
                   </template>
                 </el-table-column>
             </el-table>