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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java
This commit is contained in:
lishuai
2024-02-01 16:40:12 +08:00
parent bf368ec156 0bd35e99bd
commit f7f27a4f58
13 changed files with 224 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-ui/src/views/monitor/log/search.vue
View File

@@ -7,7 +7,7 @@
label-position="right"
label-suffix=":"
>
<el-form-item :label="$t('monitor.table.search')">
<el-form-item :label="$t('monitor.table.search')">
<el-input
v-model="query.blurry"
clearable

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

@@ -14,17 +14,17 @@
>
<!-- <el-table-column type="selection" width="55"/>-->
<!-- <el-table-column v-if="false" prop="id" label="id"/>-->
<el-table-column prop="operate" width="50" label="操作" />
<el-table-column prop="device_code" label="设备号" min-width="130" show-overflow-tooltip />
<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="trace_id" label="链路追踪" /> -->
<el-table-column prop="task_code" label="任务编号" />
<el-table-column prop="instruct_code" label="指令编号" />
<el-table-column prop="method" label="方法" />
<el-table-column prop="status_code" label="状态码" />
<el-table-column prop="requestparam" label="请求参数" />
<el-table-column prop="responseparam" label="返回参数" />
<el-table-column prop="logTime" width="170" label="记录时间" />
<el-table-column prop="content" width="500" 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="请求参数" :min-width="flexWidth('requestparam',crud.data,请求参数)" />
<el-table-column prop="responseparam" label="返回参数" :min-width="flexWidth('responseparam',crud.data,返回参数)" />
<el-table-column prop="logTime" label="记录时间" :min-width="flexWidth('logTime',crud.data,记录时间)" />
<el-table-column prop="content" label="内容详情" :min-width="flexWidth('content',crud.data,内容详情)" />
</el-table>
<!--分页组件-->