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

rev:优化日志检索页面

Browse Source
This commit is contained in:
tuqiang
2024-06-28 09:08:04 +08:00
parent 2134dcfd33
commit aa53ece8ab
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java
View File

@@ -361,12 +361,21 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
requireSucess = true;
logServer.deviceExecuteLog(this.device_code, "", "", "申请套管,返回参数:" + applyPlugPullSitResponse);
message = "申请套管成功";
} else {
}
if (StrUtil.equals("2", is_bushing)){
Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command", 97);
this.writing(map);
requireSucess = true;
message = "不套管,送空气轴";
logServer.deviceExecuteLog(this.device_code, "", "", "不申请套管反馈,返回参数:" + applyPlugPullSitResponse);
}
if (StrUtil.equals("0", is_bushing)){
Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command", 98);
this.writing(map);
requireSucess = true;
message = "不申请套管";
message = "缺少纸管,人工确认";
logServer.deviceExecuteLog(this.device_code, "", "", "不申请套管反馈,返回参数:" + applyPlugPullSitResponse);
}
} else {

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
View File

@@ -373,7 +373,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
}
}
}
if (!ObjectUtil.isEmpty(task)) {
this.executeReadyTask(task);
} else {

21
acs2/nladmin-ui/src/views/monitor/lucene/index.vue
View File

@@ -14,18 +14,12 @@
>
<!-- <el-table-column type="selection" width="55"/>-->
<!-- <el-table-column v-if="false" prop="id" label="id"/>-->
<el-table-column prop="operate" label="操作" :min-width="flexWidth('operate',crud.data,操作)" />
<el-table-column prop="device_code" label="设备号" :min-width="flexWidth('device_code',crud.data,设备号)" />
<el-table-column prop="device_code" label="设备号" width="100px" />
<!-- <el-table-column prop="trace_id" label="链路追踪" /> -->
<el-table-column prop="task_code" label="任务编号" :min-width="flexWidth('task_code',crud.data,任务编号)" />
<el-table-column prop="instruct_code" label="指令编号" :min-width="flexWidth('instruct_code',crud.data,指令编号)" />
<el-table-column prop="method" label="方法" :min-width="flexWidth('method',crud.data,方法)" />
<el-table-column prop="status_code" label="状态码" :min-width="flexWidth('status_code',crud.data,状态码)" />
<el-table-column prop="requestparam" label="请求参数" :show-overflow-tooltip="true" width="300px" />
<el-table-column prop="responseparam" label="返回参数" :show-overflow-tooltip="true" width="300px" />
<el-table-column prop="logTime" label="记录时间" :min-width="flexWidth('logTime',crud.data,记录时间)" />
<el-table-column prop="content" label="内容详情" :show-overflow-tooltip="true" width="300px"/>
<el-table-column prop="task_code" label="任务编号" width="100px" />
<el-table-column prop="instruct_code" label="指令编号" width="100px" />
<el-table-column prop="logTime" label="记录时间" width="180px" />
<el-table-column prop="content" label="内容详情" class="text-wrapper" />
</el-table>
<!--分页组件-->
<pagination />
@@ -106,5 +100,8 @@ export default {
</script>
<style scoped>
.text-wrapper {
word-break: break-all;
word-wrap: break-word
}
</style>