驾驶舱取消“下发时长”“接单时长”的统计

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -786,7 +786,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="repairPerson == null or repairPerson == '' or repairPerson == 'false'">ROUND(wo.score,2) AS score,</if>
                 ROUND(TIMESTAMPDIFF( SECOND, wo.occur_time, wo.assign_time ) / 3600,2) AS xfsc,
                 ROUND(( TIMESTAMPDIFF( SECOND, wo.assign_time, wo.accept_time ) - IFNULL(gq.total_night_auto_suspend_seconds, 0))/ 3600,2) AS xysc,
-                ROUND((TIMESTAMPDIFF( SECOND, wo.accept_time, wo.real_start_time ) - IFNULL(gq.total_before_start_suspend_seconds, 0)) / 3600,2) AS zbsc,
+                ROUND((TIMESTAMPDIFF( SECOND, wo.occur_time, wo.real_start_time ) - IFNULL(gq.total_before_start_suspend_seconds, 0)) / 3600,2) AS zbsc,
                 ROUND(TIMESTAMPDIFF( SECOND, wo.occur_time, wo.restart_time ) / 3600,2) AS tjsc,
                 ROUND(TIMESTAMPDIFF( SECOND, wo.restart_time, wo.real_end_time ) / 3600,2) AS qjbwsc,
                 ROUND((TIMESTAMPDIFF( SECOND, wo.real_start_time, wo.real_end_time ) - IFNULL(gq.total_in_work_suspend_seconds, 0)) / 3600,2) AS clsc,

ygtx-ui/src/views/index4.vue

@@ -241,12 +241,12 @@
                 <el-checkbox v-model="indicatorFilters.workhour.enabled" label="工时统计" @change="handleWorkhourToggle" />
               </label>
               <div class="ml-4 mt-1 border-l-2 border-neutral-200 pl-2" style="margin-left: 20px;">
-                <label v-if="!onlyWorkOrder" class="checkbox-item">
+                <!-- <label v-if="!onlyWorkOrder" class="checkbox-item">
                   <el-checkbox v-model="indicatorFilters.workhour.items.xfsc" label="下发时长" @change="handleWorkhourSelect" />
                 </label>
                 <label v-if="!onlyWorkOrder" class="checkbox-item">
                   <el-checkbox v-model="indicatorFilters.workhour.items.xysc" label="接单时长" @change="handleWorkhourSelect" />
-                </label>
+                </label> -->
                 <label v-if="!onlyWorkOrder" class="checkbox-item">
                   <el-checkbox v-model="indicatorFilters.workhour.items.zbsc" label="准备时长" @change="handleWorkhourSelect" />
                 </label>
@@ -492,8 +492,8 @@
             <el-table-column v-if="queryParams.repairOrderNum==1" prop="repairOrderNum" label="维修工单数" :style="{ width: changeWidth() + '%' }" header-align="center" align="center"></el-table-column>
             <el-table-column v-if="queryParams.restartNum==1" prop="restartNum" label="复启数量" :style="{ width: changeWidth() + '%' }" header-align="center" align="center"></el-table-column>
             <el-table-column v-if="queryParams.score==1" prop="score" label="工分" :style="{ width: changeWidth() + '%' }" header-align="center" align="center" :formatter="formatScore"></el-table-column>
-            <el-table-column v-if="queryParams.xfsc" prop="xfsc" label="下发时长(h)" :style="{ width: changeWidth() * 1.5 + '%' }" header-align="center" align="center" :formatter="formatScore"></el-table-column>
-            <el-table-column v-if="queryParams.xysc" prop="xysc" label="接单时长(h)" :style="{ width: changeWidth() * 1.5 + '%' }" header-align="center" align="center" :formatter="formatScore"></el-table-column>
+            <!-- <el-table-column v-if="queryParams.xfsc" prop="xfsc" label="下发时长(h)" :style="{ width: changeWidth() * 1.5 + '%' }" header-align="center" align="center" :formatter="formatScore"></el-table-column>
+            <el-table-column v-if="queryParams.xysc" prop="xysc" label="接单时长(h)" :style="{ width: changeWidth() * 1.5 + '%' }" header-align="center" align="center" :formatter="formatScore"></el-table-column> -->
             <el-table-column v-if="queryParams.zbsc" prop="zbsc" label="准备时长(h)" :style="{ width: changeWidth() * 1.5 + '%' }" header-align="center" align="center" :formatter="formatScore"></el-table-column>
             <el-table-column v-if="queryParams.clsc" prop="clsc" label="作业时长(h)" :style="{ width: changeWidth() * 1.5 + '%' }" header-align="center" align="center" :formatter="formatScore"></el-table-column>
             <el-table-column v-if="queryParams.qjbwsc" prop="qjbwsc" label="验收时长(h)" :style="{ width: changeWidth() * 1.5 + '%' }" header-align="center" align="center" :formatter="formatScore"></el-table-column>
@@ -1323,15 +1323,17 @@ export default {
       }else{
         this.queryParams.workOrderNum = null;
       }
+      this.queryParams.xfsc = null;
+      this.queryParams.xysc = null;
       if (this.onlyWorkOrder) {
         this.queryParams.restartNum = null;
-        this.queryParams.xfsc = null;
-        this.queryParams.xysc = null;
+        // this.queryParams.xfsc = null;
+        // this.queryParams.xysc = null;
         this.queryParams.zbsc = null;
       }else{
         this.queryParams.restartNum = this.indicatorFilters.workorder.restartNum ? 1 : null;
-        this.queryParams.xfsc = this.indicatorFilters.workhour.items.xfsc;
-        this.queryParams.xysc = this.indicatorFilters.workhour.items.xysc;
+        // this.queryParams.xfsc = this.indicatorFilters.workhour.items.xfsc;
+        // this.queryParams.xysc = this.indicatorFilters.workhour.items.xysc;
         this.queryParams.zbsc = this.indicatorFilters.workhour.items.zbsc;
       }
       if (this.queryParams.restartNum == 1) {
@@ -1425,8 +1427,8 @@ export default {
         this.indicatorFilters.workhour.items.xysc = false;
         this.indicatorFilters.workhour.items.zbsc = false;
       }else{
-        this.indicatorFilters.workhour.items.xfsc = val;
-        this.indicatorFilters.workhour.items.xysc = val;
+        this.indicatorFilters.workhour.items.xfsc = false;
+        this.indicatorFilters.workhour.items.xysc = false;
         this.indicatorFilters.workhour.items.zbsc = val;
       }
       this.indicatorFilters.workhour.items.tjsc = val;