From f9667ee9a13650c809772972fb56a6429e99f9ed Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Fri, 10 May 2024 17:51:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BB=A5=E5=8F=8A=E4=BF=AE=E5=A4=8D=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BDbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AcsPointAngleController.java   |  2 +-
 .../nl/acs/angle/domain/AcsPointAngle.java    | 27 ++++++++++---------
 .../angle/service/IAcsPointAngleService.java  |  2 +-
 .../impl/AcsPointAngleServiceImpl.java        |  2 +-
 .../src/views/acs/route/routeLine/index.vue   | 24 ++++++++---------
 .../src/views/system/menu/index.vue           |  7 +++--
 .../src/views/system/timing/index.vue         |  2 +-
 7 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java
index ecfe7c248..6ba644bc8 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java
@@ -64,7 +64,7 @@ public class AcsPointAngleController {
 
     @GetMapping("/updateActive")
     @Log("是否启用")
-    public ResponseEntity<Object> updateOn(@RequestParam Long id, @RequestParam String is_active) {
+    public ResponseEntity<Object> updateOn(@RequestParam String id, @RequestParam String is_active) {
         acsPointAngleService.updateOn(id, is_active);
         return new ResponseEntity<>(HttpStatus.OK);
     }
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java
index d252a5083..1da3bf060 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java
@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 /**
@@ -23,37 +25,38 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("acs_point_angle")
-
+@NoArgsConstructor
+@AllArgsConstructor
 public class AcsPointAngle implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
 
-    
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+
+
     private String start_device_code;
 
-    
+
     private String next_device_code;
 
-    
+
     private BigDecimal next_point_angle;
 
-    
+
     private String is_active;
 
-    
+
     private String create_by;
 
-    
+
     private String create_time;
 
-    
+
     private String update_by;
 
-    
+
     private String update_time;
 
 
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java
index 8628210a9..039f0ff3c 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java
@@ -28,7 +28,7 @@ public interface IAcsPointAngleService extends IService<AcsPointAngle> {
 
     Map<String, Object> queryAll(Map whereJson, Pageable page);
 
-    void updateOn(Long id, String is_active);
+    void updateOn(String id, String is_active);
 
 
     /**
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java
index 4616ad237..e1abff178 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java
@@ -97,7 +97,7 @@ public class AcsPointAngleServiceImpl extends ServiceImpl<AcsPointAngleMapper, A
     }
 
     @Override
-    public void updateOn(Long id, String is_active) {
+    public void updateOn(String id, String is_active) {
         AcsPointAngle acsPointAngle = new AcsPointAngle();
         acsPointAngle.setId(id);
         acsPointAngle.setIs_active(is_active);
diff --git a/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue b/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue
index 985bdd70d..9408568a5 100644
--- a/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue
@@ -14,7 +14,7 @@
             <el-select
               v-model="query.route_plan_id"
               :placeholder="$t('route.placeholder.please_type')"
-              style="width: 250px;"
+              style="width: 200px;"
             >
               <el-option
                 v-for="item in routePlanList"
@@ -30,7 +30,7 @@
               clearable
               size="small"
               :placeholder="$t('route.placeholder.enter_code')"
-              style="width: 250px;"
+              style="width: 200px;"
               class="filter-item"
               @keyup.enter.native="crud.toQuery"
             />
@@ -41,7 +41,7 @@
               clearable
               size="small"
               :placeholder="$t('route.placeholder.enter_next_device_code')"
-              style="width: 250px;"
+              style="width: 200px;"
               class="filter-item"
               @keyup.enter.native="crud.toQuery"
             />
@@ -176,18 +176,18 @@
           :label="$t('device.device_table_title.device_encoding')"
           :min-width="flexWidth('device_code',crud.data,$t('device.device_table_title.device_encoding'))"
         />
-        <el-table-column prop="start_device_type" min-width="120" :label="$t('route.table_title.device_type')" />
+        <el-table-column prop="start_device_type" :min-width="flexWidth('start_device_type',crud.data,$t('route.table_title.device_type'))" :label="$t('route.table_title.device_type')" />
         <el-table-column v-if="false" prop="device_code" :label="$t('device.device_table_title.device_name')" />
-        <el-table-column prop="type" :label="$t('route.table_title.type')">
+        <el-table-column prop="type" :min-width="flexWidth('type',crud.data,$t('route.table_title.type'))" :label="$t('route.table_title.type')">
           <template slot-scope="scope">
             <span v-if="scope.row.type=='0' ">{{ $t('route.table_title.transport_route') }}</span>
             <span v-if="scope.row.type=='1' ">{{ $t('route.table_title.agv_route') }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="next_device_code" min-width="120" :label="$t('route.table_title.next_device_code')" />
-        <el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备名称" />
-        <el-table-column prop="next_device_type" min-width="120" :label="$t('route.table_title.next_device_type')" />
-        <el-table-column prop="weights" :label="$t('route.table_title.weights')" />
+        <el-table-column prop="next_device_code" :min-width="flexWidth('next_device_code',crud.data,$t('route.table_title.next_device_code'))" :label="$t('route.table_title.next_device_code')" />
+        <el-table-column v-if="false" prop="next_device_code" :min-width="flexWidth('next_device_code',crud.data,$t('route.table_title.next_device_code'))" :label="$t('route.table_title.next_device_code')" />
+        <el-table-column prop="next_device_type" :min-width="flexWidth('next_device_type',crud.data,$t('route.table_title.next_device_type'))" :label="$t('route.table_title.next_device_type')" />
+        <el-table-column prop="weights" :min-width="flexWidth('weights',crud.data,$t('route.table_title.weights'))" :label="$t('route.table_title.weights')" />
 
         <el-table-column
           :label="$t('auto.common.is_on')"
@@ -207,12 +207,12 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="update_by" :label="$t('auto.common.update_by')" />
-        <el-table-column prop="update_time" min-width="160" :label="$t('auto.common.update_time')" />
+        <el-table-column prop="update_by" :min-width="flexWidth('update_by',crud.data,$t('auto.common.update_by'))" :label="$t('auto.common.update_by')" />
+        <el-table-column prop="update_time" :min-width="flexWidth('update_time',crud.data,$t('auto.common.update_time'))" :label="$t('auto.common.update_time')" />
         <el-table-column
           v-permission="['admin','routeLine:edit','routeLine:del']"
           :label="$t('auto.common.Operate')"
-          width="150px"
+          width="100px"
           align="center"
         >
           <template slot-scope="scope">
diff --git a/acs2/nladmin-ui/src/views/system/menu/index.vue b/acs2/nladmin-ui/src/views/system/menu/index.vue
index 47cb7c79f..4d51fc229 100644
--- a/acs2/nladmin-ui/src/views/system/menu/index.vue
+++ b/acs2/nladmin-ui/src/views/system/menu/index.vue
@@ -16,15 +16,18 @@
               clearable
               size="mini"
               :placeholder="$t('menu.placeholder.fuzzy_search')"
-              style="width: 200px;margin-bottom: 10px"
+              style="width: 200px;"
               class="filter-item"
               @keyup.enter.native="queryBlurry"
             />
           </el-form-item>
           <el-form-item :label="$t('menu.placeholder.owning_system')">
             <el-select
+              clearable
+              size="mini"
               v-model="query.system_type"
-              style="width: 200px; margin-bottom: 10px"
+              class="filter-item"
+              style="width: 200px;"
               :placeholder="$t('menu.placeholder.owning_system')"
               @change="changetype"
             >
diff --git a/acs2/nladmin-ui/src/views/system/timing/index.vue b/acs2/nladmin-ui/src/views/system/timing/index.vue
index 6f5521ad9..8fbfa4774 100644
--- a/acs2/nladmin-ui/src/views/system/timing/index.vue
+++ b/acs2/nladmin-ui/src/views/system/timing/index.vue
@@ -139,7 +139,7 @@
       <el-table-column
         v-permission="['admin','timing:edit','timing:del']"
         :label="$t('auto.common.Operate')"
-        width="170px"
+        width="250px"
         align="center"
         fixed="right"
       >