root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
LENOVO
2024-05-10 19:20:07 +08:00
parent d83f7c450b f9667ee9a1
commit 10dcb6f9a5
7 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java
View File

@@ -64,7 +64,7 @@ public class AcsPointAngleController {
@GetMapping("/updateActive") @GetMapping("/updateActive")
@Log("是否启用") @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); acsPointAngleService.updateOn(id, is_active);
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }

7
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java
View File

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable; import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
@@ -23,14 +25,15 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("acs_point_angle") @TableName("acs_point_angle")
@NoArgsConstructor
@AllArgsConstructor
public class AcsPointAngle implements Serializable { public class AcsPointAngle implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Long id; private String id;
private String start_device_code; private String start_device_code;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java
View File

@@ -28,7 +28,7 @@ public interface IAcsPointAngleService extends IService<AcsPointAngle> {
Map<String, Object> queryAll(Map whereJson, Pageable page); Map<String, Object> queryAll(Map whereJson, Pageable page);
void updateOn(Long id, String is_active); void updateOn(String id, String is_active);
/** /**

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java
View File

@@ -97,7 +97,7 @@ public class AcsPointAngleServiceImpl extends ServiceImpl<AcsPointAngleMapper, A
} }
@Override @Override
public void updateOn(Long id, String is_active) { public void updateOn(String id, String is_active) {
AcsPointAngle acsPointAngle = new AcsPointAngle(); AcsPointAngle acsPointAngle = new AcsPointAngle();
acsPointAngle.setId(id); acsPointAngle.setId(id);
acsPointAngle.setIs_active(is_active); acsPointAngle.setIs_active(is_active);

24
acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue
View File

@@ -14,7 +14,7 @@
<el-select <el-select
v-model="query.route_plan_id" v-model="query.route_plan_id"
:placeholder="$t('route.placeholder.please_type')" :placeholder="$t('route.placeholder.please_type')"
style="width: 250px;" style="width: 200px;"
> >
<el-option <el-option
v-for="item in routePlanList" v-for="item in routePlanList"
@@ -30,7 +30,7 @@
clearable clearable
size="small" size="small"
:placeholder="$t('route.placeholder.enter_code')" :placeholder="$t('route.placeholder.enter_code')"
style="width: 250px;" style="width: 200px;"
class="filter-item" class="filter-item"
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
@@ -41,7 +41,7 @@
clearable clearable
size="small" size="small"
:placeholder="$t('route.placeholder.enter_next_device_code')" :placeholder="$t('route.placeholder.enter_next_device_code')"
style="width: 250px;" style="width: 200px;"
class="filter-item" class="filter-item"
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
@@ -176,18 +176,18 @@
:label="$t('device.device_table_title.device_encoding')" :label="$t('device.device_table_title.device_encoding')"
:min-width="flexWidth('device_code',crud.data,$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 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"> <template slot-scope="scope">
<span v-if="scope.row.type=='0' ">{{ $t('route.table_title.transport_route') }}</span> <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> <span v-if="scope.row.type=='1' ">{{ $t('route.table_title.agv_route') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="next_device_code" min-width="120" :label="$t('route.table_title.next_device_code')" /> <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="120" label="后置设备名称" /> <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="120" :label="$t('route.table_title.next_device_type')" /> <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" :label="$t('route.table_title.weights')" /> <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 <el-table-column
:label="$t('auto.common.is_on')" :label="$t('auto.common.is_on')"
@@ -207,12 +207,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="update_by" :label="$t('auto.common.update_by')" /> <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="160" :label="$t('auto.common.update_time')" /> <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 <el-table-column
v-permission="['admin','routeLine:edit','routeLine:del']" v-permission="['admin','routeLine:edit','routeLine:del']"
:label="$t('auto.common.Operate')" :label="$t('auto.common.Operate')"
width="150px" width="100px"
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">

7
acs2/nladmin-ui/src/views/system/menu/index.vue
View File

@@ -16,15 +16,18 @@
clearable clearable
size="mini" size="mini"
:placeholder="$t('menu.placeholder.fuzzy_search')" :placeholder="$t('menu.placeholder.fuzzy_search')"
style="width: 200px;margin-bottom: 10px" style="width: 200px;"
class="filter-item" class="filter-item"
@keyup.enter.native="queryBlurry" @keyup.enter.native="queryBlurry"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('menu.placeholder.owning_system')"> <el-form-item :label="$t('menu.placeholder.owning_system')">
<el-select <el-select
clearable
size="mini"
v-model="query.system_type" v-model="query.system_type"
style="width: 200px; margin-bottom: 10px" class="filter-item"
style="width: 200px;"
:placeholder="$t('menu.placeholder.owning_system')" :placeholder="$t('menu.placeholder.owning_system')"
@change="changetype" @change="changetype"
> >

2
acs2/nladmin-ui/src/views/system/timing/index.vue
View File

@@ -139,7 +139,7 @@
<el-table-column <el-table-column
v-permission="['admin','timing:edit','timing:del']" v-permission="['admin','timing:edit','timing:del']"
:label="$t('auto.common.Operate')" :label="$t('auto.common.Operate')"
width="170px" width="250px"
align="center" align="center"
fixed="right" fixed="right"
> >