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:
lishuai
2024-06-19 10:54:34 +08:00
parent 2724907920 bdadb9d622
commit dc356bf29e
8 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
View File

@@ -295,7 +295,7 @@
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" />
<el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))" />
<el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))" />
<el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" :show-overflow-tooltip="true" />
<el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" :show-overflow-tooltip="true" width="150px" />
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
<el-table-column prop="remark" :label="$t('task.select.Remark')" />

2
acs2/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -502,7 +502,7 @@
<el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />
<el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')" :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))" />
<el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')" :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))" />
<el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true" />
<el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true":show-overflow-tooltip="true" width="150px" />
<el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
<el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
<el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />

6
acs2/nladmin-ui/src/views/monitor/logQuery/index.vue
View File

@@ -17,10 +17,10 @@
<el-table-column prop="operate" label="操作" :min-width="flexWidth('operate',crud.data,操作)" />
<!-- <el-table-column prop="trace_id" label="链路追踪" /> -->
<el-table-column prop="method" label="方法" :min-width="flexWidth('method',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="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" />
<el-table-column prop="content" label="内容详情" :show-overflow-tooltip="true" width="300px" />
</el-table>
<!--分页组件-->

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

@@ -21,10 +21,10 @@
<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="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" />
<el-table-column prop="content" label="内容详情" :show-overflow-tooltip="true" width="300px"/>
</el-table>
<!--分页组件-->