驾驶舱超时工单超时时间

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

@@ -8,9 +8,11 @@ import java.util.List;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
+import com.github.pagehelper.util.StringUtil;
 import com.ygtx.common.utils.DictUtils;
 import com.ygtx.gxt.domain.GxtOrderData;
 import com.ygtx.gxt.service.IGxtWorkOrderService;
+import com.ygtx.system.service.ISysConfigService;
 import com.ygtx.system.strategy.AutoCodeUtil;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -52,6 +54,8 @@ public class GxtRepairOrderController extends BaseController
     private AutoCodeUtil autoCodeUtil;
     @Autowired
     private IGxtWorkOrderService gxtWorkOrderService;
+    @Autowired
+    private ISysConfigService configService;
 
     /**
      * 查询维修工单列表
@@ -337,9 +341,12 @@ public class GxtRepairOrderController extends BaseController
         result.setRepairPending(gxtRepairOrderService.getUnfinishedOrder());
         result.setWorkPending(gxtWorkOrderService.getUnfinishedOrder());
         result.setHasCenter(gxtWorkOrderService.hasCenter());
+        String num = configService.selectConfigByKey("gxt.order.timeout");
         GxtRepairOrder gxtRepairOrder = new GxtRepairOrder();
         gxtRepairOrder.setWorkOrderStatus("assigned");
-        gxtRepairOrder.setOutTimeParam(30);
+        if (StringUtil.isNotEmpty(num)) {
+            gxtRepairOrder.setOutTimeParam(Integer.valueOf(num));
+        }
         List<GxtRepairOrder> orders = gxtRepairOrderService.selectGxtRepairOrderList(gxtRepairOrder);
         result.setTimeOutNum(orders.size());
         return success(result);

ygtx-ui/src/views/gxt/repairOrder/index.vue

@@ -2394,7 +2394,7 @@ function parseRouteParams(route) {
     // 解密参数
     const decryptedParams = decryptParams(route.query.data);
     if (decryptedParams.timeOutNum !== undefined) {
-      queryParams.value.timeOutNum = decryptedParams.timeOutNum;
+      queryParams.value.outTimeParam = decryptedParams.timeOutNum;
     }
     if (decryptedParams.workOrderStatus !== undefined) {
       queryParams.value.workOrderStatus = decryptedParams.workOrderStatus;
@@ -2405,7 +2405,7 @@ function parseRouteParams(route) {
   } else {
     // 为了向后兼容，也支持原始的参数传递方式
     if (route.query.timeOutNum !== undefined) {
-      queryParams.value.timeOutNum = route.query.timeOutNum;
+      queryParams.value.outTimeParam = route.query.timeOutNum;
     }
     if (route.query.workOrderStatus !== undefined) {
       queryParams.value.workOrderStatus = route.query.workOrderStatus;
@@ -2622,8 +2622,8 @@ function cancel() {
 }
 
 function resetTimeOutOrder() {
-  if (queryParams.value.timeOutNum != null) {
-    queryParams.value.timeOutNum = null;
+  if (queryParams.value.outTimeParam != null) {
+    queryParams.value.outTimeParam = null;
     queryParams.value.workOrderStatus = null;
     queryParams.value.userType = null;
   }

ygtx-ui/src/views/index4.vue

@@ -470,6 +470,7 @@ import { selectHomePageData } from '@/api/gxt/repairOrder';
 import { listAllEquipment } from '@/api/gxt/equipment';
 import { listMyTodo } from '@/api/gxt/orderMine';
 import { encryptParams } from '@/utils/encrypt';
+import { getConfigKey } from '@/api/system/config';
 
 export default {
   name: 'Index4',
@@ -1424,17 +1425,38 @@ export default {
     },
     toRoute(num) {
       if(num==0) {
-        // 加密参数并传递到目标路由页面
-        const params = {
-          timeOutNum: 30,
-          workOrderStatus: 'assigned'
-        };
-        const encryptedParams = encryptParams(params);
-        this.$router.push({
-          path: "/workOrder/repairOrder",
-          query: {
-            data: encryptedParams
+        // 获取系统配置中的超时时间参数
+        getConfigKey("gxt.order.timeout").then(response => {
+          let timeoutValue = 30; // 默认值
+          if (response && response.msg) {
+            timeoutValue = parseInt(response.msg) || 30;
           }
+          
+          // 加密参数并传递到目标路由页面
+          const params = {
+            timeOutNum: timeoutValue,
+            workOrderStatus: 'assigned'
+          };
+          const encryptedParams = encryptParams(params);
+          this.$router.push({
+            path: "/workOrder/repairOrder",
+            query: {
+              data: encryptedParams
+            }
+          });
+        }).catch(() => {
+          // 如果获取配置失败，使用默认值
+          const params = {
+            timeOutNum: 30,
+            workOrderStatus: 'assigned'
+          };
+          const encryptedParams = encryptParams(params);
+          this.$router.push({
+            path: "/workOrder/repairOrder",
+            query: {
+              data: encryptedParams
+            }
+          });
         });
       }else if(num==1) {
         /*if(this.homePageData.repairPending>0 && this.homePageData.workPending==0) {