首页-测试反馈改动

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/GxtWorkOrderController.java

@@ -325,22 +325,25 @@ public class GxtWorkOrderController extends BaseController
     @GetMapping("/getHomePageOrderListData")
     public TableDataInfo getHomePageOrderListData(GxtOrderData gxtOrderData)
     {
-        TableDataInfo dataInfo = new TableDataInfo();
         List<GxtOrderData> result = new ArrayList<>();
-        List<GxtOrderData> list = gxtWorkOrderService.selectHomePageWorkOrderList(gxtOrderData);
-        int total = list.size();
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        if (pageNum!=null && pageSize!=null) {
-            int from = (pageNum-1) * pageSize;
-            int to = pageNum * pageSize;
-            if (to>=total) {
-                result.addAll(list.subList(from,total));
-            }else {
-                result.addAll(list.subList(from, to));
+        int total = 0;
+        if (gxtWorkOrderService.isSelect(gxtOrderData)) {
+            List<GxtOrderData> list = gxtWorkOrderService.selectHomePageWorkOrderList(gxtOrderData);
+            total = list.size();
+            PageDomain pageDomain = TableSupport.buildPageRequest();
+            Integer pageNum = pageDomain.getPageNum();
+            Integer pageSize = pageDomain.getPageSize();
+            if (pageNum!=null && pageSize!=null) {
+                int from = (pageNum-1) * pageSize;
+                int to = pageNum * pageSize;
+                if (to>=total) {
+                    result.addAll(list.subList(from,total));
+                }else {
+                    result.addAll(list.subList(from, to));
+                }
             }
         }
+        TableDataInfo dataInfo = new TableDataInfo();
         dataInfo.setCode(HttpStatus.SUCCESS);
         dataInfo.setMsg("查询成功");
         dataInfo.setTotal(total);

ygtx-gxt/src/main/java/com/ygtx/gxt/service/IGxtWorkOrderService.java

@@ -213,4 +213,6 @@ public interface IGxtWorkOrderService {
     public int getUnfinishedOrder();
 
     public String hasCenter();
+
+    public boolean isSelect(GxtOrderData gxtOrderData);
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtWorkOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ygtx.gxt.service.impl;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -1779,4 +1780,72 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         }
         return "yes";
     }
+
+    public boolean isSelect(GxtOrderData gxtOrderData) {
+        if (gxtOrderData==null) {
+            return false;
+        }
+        if ("true".equals(gxtOrderData.getCenter())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getPcs())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getCode())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getBrand())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getModel())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getSystem())) {
+            return true;
+        }
+        if (gxtOrderData.getRepairOrder()) {
+            return true;
+        }
+        if (gxtOrderData.getWorkOrder()) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getRepairPerson())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getChargePerson())) {
+            return true;
+        }
+        if (gxtOrderData.getRepairOrderNum()!=null && gxtOrderData.getRepairOrderNum()==1) {
+            return true;
+        }
+        if (gxtOrderData.getWorkOrderNum()!=null && gxtOrderData.getWorkOrderNum()==1) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getTjsc())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getXfsc())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getXysc())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getZbsc())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getClsc())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getQjbwsc())) {
+            return true;
+        }
+        if ("true".equals(gxtOrderData.getGqsc())) {
+            return true;
+        }
+        if (gxtOrderData.getScore()!=null && gxtOrderData.getScore().compareTo(BigDecimal.ONE)==0) {
+            return true;
+        }
+
+        return false;
+    }
 }

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

@@ -515,7 +515,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 '维保工单' AS orderType,
                 m.nick_name AS chargePerson,
                 <if test="repairPerson != null and repairPerson == 'true'">u.nick_name AS repairPerson,ROUND(wop.final_score,2) AS score,</if>
-                <if test="repairPerson == null or repairPerson == '' or repairPerson == 'false'">ROUND(wo.score,2),</if>
+                <if test="repairPerson == null or repairPerson == '' or repairPerson == 'false'">ROUND(wo.score,2) AS score,</if>
                 ROUND(TIMESTAMPDIFF( MINUTE, wo.create_time, assign.assign_time ) / 60,2) AS xfsc,
                 ROUND(TIMESTAMPDIFF( MINUTE, assign.assign_time, accept.accept_time ) / 60,2) AS xysc,
                 ROUND(TIMESTAMPDIFF( MINUTE, accept.accept_time, process.process_time ) / 60,2) AS zbsc,
@@ -557,6 +557,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     )
                 </if>
                 <if test="dataPermission != null and dataPermission != ''">${dataPermission}</if>
+                AND p.dept_name IS NOT NULL
             </where>
 
             UNION ALL
@@ -572,7 +573,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 '维修工单' AS orderType,
                 m.nick_name AS chargePerson,
                 <if test="repairPerson != null and repairPerson == 'true'">u.nick_name AS repairPerson,ROUND(wop.final_score,2) AS score,</if>
-                <if test="repairPerson == null or repairPerson == '' or repairPerson == 'false'">ROUND(wo.score,2),</if>
+                <if test="repairPerson == null or repairPerson == '' or repairPerson == 'false'">ROUND(wo.score,2) AS score,</if>
                 ROUND(TIMESTAMPDIFF( MINUTE, wo.occur_time, assign.assign_time ) / 60,2) AS xfsc,
                 ROUND(TIMESTAMPDIFF( MINUTE, assign.assign_time, accept.accept_time ) / 60,2) AS xysc,
                 ROUND(TIMESTAMPDIFF( MINUTE, accept.accept_time, process.process_time ) / 60,2) AS zbsc,
@@ -613,6 +614,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     )
                 </if>
                 <if test="dataPermission != null and dataPermission != ''">${dataPermission}</if>
+                AND p.dept_name IS NOT NULL
             </where>
             ) o
         <where>

ygtx-ui/src/views/index4.vue

@@ -90,7 +90,7 @@
                   <el-checkbox v-model="dimensionFilters.fan.model" label="机型" />
                 </label>
                 <label class="checkbox-item ml-2">
-                  <el-checkbox v-model="dimensionFilters.fan.system" label="风机系统" />
+                  <el-checkbox v-model="dimensionFilters.fan.system" label="风机系统" disabled />
                 </label>
               </div>
             </div>
@@ -98,7 +98,7 @@
             <!-- 类型维度 - 树状选择 -->
             <div class="tree-select">
               <div class="tree-header" data-target="type-content" @click="toggleTree('type')">
-                <span class="font-medium">类型</span>
+                <span class="font-medium">工单类型</span>
                 <i class="fa fa-chevron-left text-neutral-400 transition-transform duration-300" :class="{'rotate-90': treeExpanded.type}"></i>
               </div>
               <div id="type-content" class="tree-content" :class="{'show': treeExpanded.type}">
@@ -343,25 +343,25 @@
             </div>
           </template>
           <el-table :data="orderList" style="width: 100%">
-            <el-table-column v-if="queryParams.code" prop="code" label="风机编号" :width="changeWidth()" header-align="center" align="center"></el-table-column>
+            <el-table-column v-if="queryParams.code" prop="code" label="风机编号" :width="changeWidth()*1.5" header-align="center" align="center"></el-table-column>
             <el-table-column v-if="queryParams.brand" prop="brand" label="品牌" :width="changeWidth()" header-align="center" align="center"></el-table-column>
-            <el-table-column v-if="queryParams.model" prop="model" label="机型" :width="changeWidth()" header-align="center" align="center"></el-table-column>
+            <el-table-column v-if="queryParams.model" prop="model" label="机型" :width="changeWidth()*2" header-align="center" align="center"></el-table-column>
             <el-table-column v-if="queryParams.system" prop="system" label="风机系统" :width="changeWidth()" header-align="center" align="center"></el-table-column>
-            <el-table-column v-if="queryParams.center && checkCenter()" prop="center" label="归属地" :width="changeWidth()" header-align="center" align="center"></el-table-column>
-            <el-table-column v-if="queryParams.pcs" prop="pcs" label="归属地" :width="changeWidth()" header-align="center" align="center"></el-table-column>
-            <el-table-column v-if="queryParams.workOrder || queryParams.repairOrder" prop="orderType" label="类型" :width="changeWidth()" header-align="center" align="center"></el-table-column>
+            <el-table-column v-if="queryParams.center && checkCenter()" prop="center" label="中心" :width="changeWidth()*2" header-align="center" align="center"></el-table-column>
+            <el-table-column v-if="queryParams.pcs" prop="pcs" label="场站" :width="changeWidth()*1.5" header-align="center" align="center"></el-table-column>
+            <el-table-column v-if="queryParams.workOrder || queryParams.repairOrder" prop="orderType" label="工单类型" :width="changeWidth()" header-align="center" align="center"></el-table-column>
             <el-table-column v-if="queryParams.repairPerson" prop="repairPerson" label="维修员" :width="changeWidth()" header-align="center" align="center"></el-table-column>
             <el-table-column v-if="queryParams.chargePerson" prop="chargePerson" label="工作负责人" :width="changeWidth()" header-align="center" align="center"></el-table-column>
-            <el-table-column v-if="queryParams.workOrderNum==1" prop="workOrderNum" label="维保工单数" :width="changeRightWidth()" header-align="center" align="center"></el-table-column>
-            <el-table-column v-if="queryParams.repairOrderNum==1" prop="repairOrderNum" label="维修工单数" :width="changeRightWidth()" header-align="center" align="center"></el-table-column>
-            <el-table-column v-if="queryParams.score==1" prop="score" label="工分" :width="changeRightWidth()" header-align="center" align="center" :formatter="formatScore"></el-table-column>
-            <el-table-column v-if="queryParams.tjsc" prop="tjsc" label="停机时长(h)" :width="changeRightWidth()*1.5" header-align="center" align="center" :formatter="formatScore"></el-table-column>
-            <el-table-column v-if="queryParams.xfsc" prop="xfsc" label="下发时长(h)" :width="changeRightWidth()*1.5" header-align="center" align="center" :formatter="formatScore"></el-table-column>
-            <el-table-column v-if="queryParams.xysc" prop="xysc" label="响应时长(h)" :width="changeRightWidth()*1.5" header-align="center" align="center" :formatter="formatScore"></el-table-column>
-            <el-table-column v-if="queryParams.zbsc" prop="zbsc" label="准备时长(h)" :width="changeRightWidth()*1.5" header-align="center" align="center" :formatter="formatScore"></el-table-column>
-            <el-table-column v-if="queryParams.clsc" prop="clsc" label="处理时长(h)" :width="changeRightWidth()*1.5" header-align="center" align="center" :formatter="formatScore"></el-table-column>
-            <el-table-column v-if="queryParams.qjbwsc" prop="qjbwsc" label="启机并网时长(h)" :width="changeRightWidth()*1.5" header-align="center" align="center" :formatter="formatScore"></el-table-column>
-            <el-table-column v-if="queryParams.gqsc" prop="gqsc" label="挂起时长(h)" :width="changeRightWidth()*1.5" header-align="center" align="center" :formatter="formatScore"></el-table-column>
+            <el-table-column v-if="queryParams.workOrderNum==1" prop="workOrderNum" label="维保工单数" :width="changeWidth()" header-align="center" align="center"></el-table-column>
+            <el-table-column v-if="queryParams.repairOrderNum==1" prop="repairOrderNum" label="维修工单数" :width="changeWidth()" header-align="center" align="center"></el-table-column>
+            <el-table-column v-if="queryParams.score==1" prop="score" label="工分" :width="changeWidth()" header-align="center" align="center" :formatter="formatScore"></el-table-column>
+            <el-table-column v-if="queryParams.tjsc" prop="tjsc" label="停机时长(h)" :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)" :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)" :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)" :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)" :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)" :width="changeWidth()*1.5" header-align="center" align="center" :formatter="formatScore"></el-table-column>
+            <el-table-column v-if="queryParams.gqsc" prop="gqsc" label="挂起时长(h)" :width="changeWidth()*1.5" header-align="center" align="center" :formatter="formatScore"></el-table-column>
           </el-table>
           <pagination
               v-show="total > 0"
@@ -394,43 +394,43 @@ export default {
       // 维度筛选数据
       dimensionFilters: {
         location: {
-          center: true,
-          station: true
+          center: false,
+          station: false
         },
         fan: {
-          number: true,
-          brand: true,
-          model: true,
-          system: true
+          number: false,
+          brand: false,
+          model: false,
+          system: false
         },
         type: {
-          repair: true,
-          maintenance: true
+          repair: false,
+          maintenance: false
         },
         other: {
-          repairman: true,
-          manager: true
+          repairman: false,
+          manager: false
         }
       },
       // 指标筛选数据
       indicatorFilters: {
         workorder: {
-          enabled: true
+          enabled: false
         },
         workhour: {
-          enabled: true,
+          enabled: false,
           items: {
-            tjsc: true,
-            xfsc : true,
-            xysc: true,
-            zbsc: true,
-            clsc: true,
-            qjbwsc: true,
-            gqsc: true
+            tjsc: false,
+            xfsc : false,
+            xysc: false,
+            zbsc: false,
+            clsc: false,
+            qjbwsc: false,
+            gqsc: false
           }
         },
         score: {
-          enabled: true
+          enabled: false
         }
       },
       // 展开收起状态
@@ -456,26 +456,26 @@ export default {
         pageSize: 20,
         startTime: null,
         endTime: null,
-        center: true,
-        pcs: true,
-        code: true,
-        brand: true,
-        model: true,
-        system: true,
-        repairOrder: true,
-        workOrder: true,
-        repairPerson: true,
-        chargePerson: true,
-        repairOrderNum: 1,
-        workOrderNum: 1,
-        tjsc: true,
-        xfsc: true,
-        xysc: true,
-        zbsc: true,
-        clsc: true,
-        qjbwsc: true,
-        gqsc: true,
-        score: 1,
+        center: false,
+        pcs: false,
+        code: false,
+        brand: false,
+        model: false,
+        system: false,
+        repairOrder: false,
+        workOrder: false,
+        repairPerson: false,
+        chargePerson: false,
+        repairOrderNum: null,
+        workOrderNum: null,
+        tjsc: false,
+        xfsc: false,
+        xysc: false,
+        zbsc: false,
+        clsc: false,
+        qjbwsc: false,
+        gqsc: false,
+        score: null,
         remark: null
       },
       orderList: [],
@@ -504,78 +504,80 @@ export default {
   methods: {
 
     resetFilter() {
-      this.leftFormData.field1 = ''
-      this.leftFormData.field2 = ''
-      this.leftFormData.field3 = ''
-      this.leftFormData.field4 = ''
+      this.leftFormData.field1 = '';
+      this.leftFormData.field2 = '';
+      this.leftFormData.field3 = '';
+      this.leftFormData.field4 = '';
       // 重置时间筛选
-      this.selectedPeriod = '本月'
-      this.startDate = ''
-      this.endDate = ''
+      this.startDate = '';
+      this.endDate = '';
+      this.selectedPeriod = '本月';
+      this.selectPeriod('本月');
       // 重置维度筛选
       this.dimensionFilters = {
         location: {
-          center: true,
-          station: true
+          center: false,
+          station: false
         },
         fan: {
-          number: true,
-          brand: true,
-          model: true,
-          system: true
+          number: false,
+          brand: false,
+          model: false,
+          system: false
         },
         type: {
-          repair: true,
-          maintenance: true
+          repair: false,
+          maintenance: false
         },
         other: {
-          repairman: true,
-          manager: true
+          repairman: false,
+          manager: false
         }
-      }
+      };
       // 重置指标筛选
       this.indicatorFilters = {
         workorder: {
-          enabled: true
+          enabled: false
         },
         workhour: {
-          enabled: true,
+          enabled: false,
           items: {
-            tjsc: true,
-            xfsc: true,
-            xysc: true,
-            zbsc: true,
-            clsc: true,
-            qjbwsc: true,
-            gqsc: true
+            tjsc: false,
+            xfsc: false,
+            xysc: false,
+            zbsc: false,
+            clsc: false,
+            qjbwsc: false,
+            gqsc: false
           }
         },
         score: {
-          enabled: true
+          enabled: false
         }
-      }
+      };
+      this.orderList = [];
       // 强制更新视图
       this.$forceUpdate()
     },
     changeWidth() {
       let num = 0;
       if (this.queryParams.code) {
-        num += 1;
+        num += 1.5;
       }
       if (this.queryParams.brand) {
         num += 1;
       }
       if (this.queryParams.model) {
-        num += 1;
+        num += 2;
       }
       if (this.queryParams.system) {
         num += 1;
       }
       if (this.queryParams.pcs) {
-        num += 1;
+        num += 1.5;
       }
       if (this.queryParams.center) {
-        num += 1;
+        num += 2;
       }
       if (this.queryParams.workOrder || this.queryParams.repairOrder) {
         num += 1;
@@ -586,14 +588,6 @@ export default {
       if (this.queryParams.chargePerson) {
         num += 1;
       }
-      if(num==0) {
-        return 0;
-      }else{
-        return Math.round(550/num);
-      }
-    },
-    changeRightWidth() {
-      let num = 0;
       if (this.queryParams.workOrderNum==1) {
         num += 1;
       }
@@ -627,7 +621,7 @@ export default {
       if(num==0) {
         return 0;
       }else{
-        return Math.round(810/num);
+        return Math.round(1370/num);
       }
     },
     applyFilter() {