驾驶舱-样式优化

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtOrderData.java

@@ -175,6 +175,7 @@ public class GxtOrderData extends BaseEntity
 
     private String hasCenter;
 
+    @Excel(name = "复启数量")
     private Integer restartNum;
 
     private String devices;

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

@@ -690,7 +690,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 wo.pcs_station_name AS pcs,
                 wo.brand,
                 wo.model,
-                IF(wo.repair_method='2', 1, 0) AS restart_flag,
+                IF(wo.repair_method='2', 1, null) AS restart_flag,
                 wo.mis_no AS `system`,
 --                 d.dept_name AS pcs,
                 p.dept_name AS center,

ygtx-ui/src/views/index4.vue

@@ -221,8 +221,8 @@
               <label class="checkbox-item ml-2">
                 <el-checkbox v-model="indicatorFilters.workorder.workorder" label="工单数量" @change="handleWorkorderSelect" />
               </label>
-              <label class="checkbox-item ml-2">
-                <el-checkbox v-model="indicatorFilters.workorder.restartNum" label="复位启机数量" @change="handleWorkorderSelect" />
+              <label v-if="!onlyWorkOrder" class="checkbox-item ml-2">
+                <el-checkbox v-model="indicatorFilters.workorder.restartNum" label="复启数量" @change="handleWorkorderSelect" />
               </label>
             </div>
           </div>
@@ -465,7 +465,7 @@
             <el-table-column v-if="queryParams.chargePerson" prop="chargePerson" label="工作负责人" :style="{ width: changeWidth() + '%' }" header-align="center" align="center"></el-table-column>
             <el-table-column v-if="queryParams.workOrderNum==1" prop="workOrderNum" label="维保工单数" :style="{ width: changeWidth() + '%' }" header-align="center" align="center"></el-table-column>
             <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.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>
@@ -1276,20 +1276,30 @@ export default {
       this.queryParams.chargePerson = this.dimensionFilters.other.manager;
 
       // 指标筛选
-      if (this.indicatorFilters.workorder.workorder) {
+      if (this.dimensionFilters.type.repair && this.indicatorFilters.workorder.workorder) {
         this.queryParams.repairOrderNum = 1;
-        this.queryParams.workOrderNum = 1;
       }else{
         this.queryParams.repairOrderNum = null;
+      }
+      if (this.dimensionFilters.type.maintenance && this.indicatorFilters.workorder.workorder) {
+        this.queryParams.workOrderNum = 1;
+      }else{
         this.queryParams.workOrderNum = null;
       }
-      this.queryParams.restartNum = this.indicatorFilters.workorder.restartNum ? 1 : null;
-      this.queryParams.tjsc = this.indicatorFilters.workhour.items.tjsc;
-      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.onlyWorkOrder) {
+        this.queryParams.restartNum = 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.zbsc = this.indicatorFilters.workhour.items.zbsc;
+      }
       this.queryParams.clsc = this.indicatorFilters.workhour.items.clsc;
       this.queryParams.qjbwsc = this.indicatorFilters.workhour.items.qjbwsc;
+      this.queryParams.tjsc = this.indicatorFilters.workhour.items.tjsc;
       this.queryParams.gqsc = this.indicatorFilters.workhour.items.gqsc;
       if (this.indicatorFilters.score.enabled) {
         this.queryParams.score = 1;