Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
This commit is contained in:
commit
66f76ac918
|
|
@ -35,7 +35,7 @@
|
||||||
<el-table-column align="center" prop="modelTitle" label="模块名称" show-overflow-tooltip />
|
<el-table-column align="center" prop="modelTitle" label="模块名称" show-overflow-tooltip />
|
||||||
<!-- <el-table-column show-overflow-tooltip align="center" prop="method" label="请求方式" />-->
|
<!-- <el-table-column show-overflow-tooltip align="center" prop="method" label="请求方式" />-->
|
||||||
<!-- <el-table-column show-overflow-tooltip align="center" prop="method" label="请求地址" />-->
|
<!-- <el-table-column show-overflow-tooltip align="center" prop="method" label="请求地址" />-->
|
||||||
<el-table-column show-overflow-tooltip align="center" prop="task" label="任务ID" />
|
<el-table-column show-overflow-tooltip align="center" prop="taskId" label="任务ID" />
|
||||||
<el-table-column show-overflow-tooltip align="center" prop="typeParentName" label="机具类型" />
|
<el-table-column show-overflow-tooltip align="center" prop="typeParentName" label="机具类型" />
|
||||||
<el-table-column show-overflow-tooltip align="center" prop="typeName" label="机具规格" />
|
<el-table-column show-overflow-tooltip align="center" prop="typeName" label="机具规格" />
|
||||||
<el-table-column show-overflow-tooltip align="center" prop="preStoreNum" label="操作前库存" />
|
<el-table-column show-overflow-tooltip align="center" prop="preStoreNum" label="操作前库存" />
|
||||||
|
|
@ -111,13 +111,11 @@ export default {
|
||||||
{ label: '创建人', content: 'creator' },
|
{ label: '创建人', content: 'creator' },
|
||||||
{ label: '请求地址', content: 'method' },
|
{ label: '请求地址', content: 'method' },
|
||||||
{ label: '模块名称', content: 'modelTitle' },
|
{ label: '模块名称', content: 'modelTitle' },
|
||||||
{ label: '请求地址', content: 'requestMethod' },
|
|
||||||
{ label: '机具类型', content: 'typeParentName' },
|
{ label: '机具类型', content: 'typeParentName' },
|
||||||
{ label: '机具规格', content: 'typeName' },
|
{ label: '机具规格', content: 'typeName' },
|
||||||
{ label: '申请数量', content: 'preNum' },
|
{ label: '申请数量', content: 'preNum' },
|
||||||
{ label: '审核数量', content: 'auditNum' },
|
{ label: '审核数量', content: 'auditNum' },
|
||||||
{ label: '日期', content: 'createTime' },
|
{ label: '日期', content: 'createTime' },
|
||||||
{ label: '实例', content: 'task' },
|
|
||||||
],
|
],
|
||||||
logsDetailsInfo: {},
|
logsDetailsInfo: {},
|
||||||
deviceTypeTree: [], // 设备 树结构数据
|
deviceTypeTree: [], // 设备 树结构数据
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue