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

add lucene

Browse Source
This commit is contained in:
gengby
2023-05-09 15:37:26 +08:00
parent 9b8d295fe7
commit f6c8f65177
25 changed files with 1049 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wcs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -146,11 +146,11 @@
{{ dict.label.agv_system_type[scope.row.agv_system_type] }}
</template>
</el-table-column>
<!-- <el-table-column prop="agv_inst_type" label="AGV任务类型" show-overflow-tooltip width="130">-->
<!-- <template slot-scope="scope">-->
<!-- {{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="agv_inst_type" label="AGV任务类型" show-overflow-tooltip width="130">-->
<!-- <template slot-scope="scope">-->
<!-- {{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="remark" label="描述" show-overflow-tooltip width="100" />
<el-table-column prop="create_by" label="创建者" show-overflow-tooltip width="100" />
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip width="150" />

56
wcs/nladmin-ui/src/views/acs/order/index.vue
View File

@@ -41,9 +41,9 @@
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in dict.order_status" :key="item.id" :label="item.label" :value="item.value"/>
<el-option v-for="item in dict.order_status" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<rrOperation/>
<rrOperation />
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
@@ -79,22 +79,22 @@
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<el-form-item label="生产总量" prop="qty">
<el-input v-model="form.qty" style="width: 370px;"/>
<el-input v-model="form.qty" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" style="width: 370px;"/>
<el-input v-model="form.material_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.material_name" style="width: 370px;"/>
<el-input v-model="form.material_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="规格型号">
<el-input v-model="form.material_spec" style="width: 370px;"/>
<el-input v-model="form.material_spec" style="width: 370px;" />
</el-form-item>
<el-form-item label="满框数量" prop="one_qty">
<el-input v-model="form.one_qty" style="width: 370px;"/>
<el-input v-model="form.one_qty" style="width: 370px;" />
</el-form-item>
<el-form-item label="托盘模板">
<el-input v-model="form.lane_tray_template" style="width: 370px;" @input="handleEdit"/>
<el-input v-model="form.lane_tray_template" style="width: 370px;" @input="handleEdit" />
</el-form-item>
<el-form-item label="生产设备" prop="device_code">
<el-select
@@ -115,7 +115,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="form.device_code === 'A1_CPQXJ_01_S'" label="上料设备" prop="in_devices">
<el-input v-model="form.in_devices" placeholder="清洗上料时储料仓设备号,多个设备以,分割" style="width: 370px;"/>
<el-input v-model="form.in_devices" placeholder="清洗上料时储料仓设备号,多个设备以,分割" style="width: 370px;" />
</el-form-item>
<el-form-item label="agv搬运" prop="is_needmove">
<el-radio-group v-model="form.is_needmove" size="mini">
@@ -130,10 +130,10 @@
</el-radio-group>
</el-form-item>
<el-form-item label="装箱机编号" prop="ealing_device_code">
<el-input v-model="form.ealing_device_code" style="width: 370px;"/>
<el-input v-model="form.ealing_device_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="开箱机编号" prop="unboxing_device_code">
<el-input v-model="form.unboxing_device_code" style="width: 370px;"/>
<el-input v-model="form.unboxing_device_code" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -150,35 +150,35 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="order_code" label="工单编码" min-width="120" show-overflow-tooltip/>
<el-table-column type="selection" width="55" />
<el-table-column prop="order_code" label="工单编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="order_status" label="工单状态" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.order_status[scope.row.order_status] }}
</template>
</el-table-column>
<el-table-column prop="qty" label="生产数量" min-width="100" show-overflow-tooltip/>
<el-table-column prop="device_code" label="设备编号" min-width="100" show-overflow-tooltip/>
<el-table-column prop="material_code" label="物料编码" min-width="100" show-overflow-tooltip/>
<el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip/>
<el-table-column prop="material_spec" label="规格型号" min-width="100" show-overflow-tooltip/>
<el-table-column prop="one_qty" label="满框数量" min-width="100" show-overflow-tooltip/>
<el-table-column prop="qty" label="生产数量" min-width="100" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编号" min-width="100" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip />
<el-table-column prop="material_spec" label="规格型号" min-width="100" show-overflow-tooltip />
<el-table-column prop="one_qty" label="满框数量" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_needmove" label="是否AGV搬运" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.is_need_move[scope.row.is_needmove] }}
</template>
</el-table-column>
<el-table-column prop="lane_tray_template" label="托盘模板" min-width="100" show-overflow-tooltip/>
<el-table-column prop="in_devices" label="上料模板" min-width="100" show-overflow-tooltip/>
<el-table-column prop="tray_num" label="托盘总数" min-width="100" show-overflow-tooltip/>
<el-table-column prop="is_used_fxx" label="启用封箱线" min-width="100" show-overflow-tooltip/>
<el-table-column prop="ealing_device_code" label="装箱机编号" min-width="100" show-overflow-tooltip/>
<el-table-column prop="unboxing_device_code" label="开箱机编号" min-width="100" show-overflow-tooltip/>
<el-table-column prop="create_by" label="创建者" min-width="100" show-overflow-tooltip/>
<el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip/>
<el-table-column prop="lane_tray_template" label="托盘模板" min-width="100" show-overflow-tooltip />
<el-table-column prop="in_devices" label="上料模板" min-width="100" show-overflow-tooltip />
<el-table-column prop="tray_num" label="托盘总数" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used_fxx" label="启用封箱线" min-width="100" show-overflow-tooltip />
<el-table-column prop="ealing_device_code" label="装箱机编号" min-width="100" show-overflow-tooltip />
<el-table-column prop="unboxing_device_code" label="开箱机编号" min-width="100" show-overflow-tooltip />
<el-table-column prop="create_by" label="创建者" min-width="100" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip />
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

18
wcs/nladmin-ui/src/views/monitor/lucene/api/lucene.js Normal file
View File

@@ -0,0 +1,18 @@
import request from '@/utils/request'
export function getLogData(param) {
return request({
url: 'api/lucene/getAll',
method: 'get',
data: param
})
}
export function labelsValues() {
return request({
url: 'api/loki/labels/values',
method: 'get'
})
}
export default { getLogData, labelsValues }

42
wcs/nladmin-ui/src/views/monitor/lucene/index.vue
View File

@@ -1,20 +1,8 @@
<template>
<div class="app-container">
<div class="head-container">
<Search/>
<crudOperation>
<el-button
slot="left"
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
:loading="crud.delAllLoading"
@click="confirmDelAll()"
>
清空
</el-button>
</crudOperation>
<Search />
<crudOperation />
</div>
<!--表格渲染-->
<el-table
@@ -24,15 +12,22 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="id" label="id"/>
<el-table-column prop="resource_name" label="资源号"/>
<el-table-column prop="create_datetime" label="创建时间"/>
<el-table-column prop="content" label="内容详情"/>
<!-- <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" width="120" 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>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</template>
@@ -43,14 +38,13 @@ import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import { delAll } from '@/api/acs/lucene/log'
const start = new Date()
export default {
name: 'LuceneLog',
components: { Search, pagination, crudOperation },
mixins: [presenter(), header(), crud()],
cruds() {
cruds: function() {
return CRUD({
title: '系统参数', url: 'api/lucene', idField: 'id', sort: 'id,desc',
title: '系统参数', url: 'api/lucene/getAll', idField: 'id', sort: 'id,desc',
queryOnPresenterCreated: true,
optShow: {
add: false,
@@ -64,7 +58,7 @@ export default {
page: 0
},
query: {
createTime: [start.setTime(start.getTime() - 3600 * 1000 * 0.5), new Date()]
createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24)), new Date()]
}
})
},

45
wcs/nladmin-ui/src/views/monitor/lucene/search.vue
View File

@@ -1,10 +1,50 @@
<template>
<div v-if="crud.props.searchToggle">
<el-input
v-model="query.device_code"
clearable
size="small"
placeholder="请输入你要搜索的设备号"
style="width: 200px;"
class="filter-item"
/>
<el-input
v-model="query.method"
clearable
size="small"
placeholder="请输入你要搜索的方法名"
style="width: 200px;"
class="filter-item"
/>
<el-input
v-model="query.status_code"
clearable
size="small"
placeholder="请输入你要搜索的状态码"
style="width: 200px;"
class="filter-item"
/>
<el-input
v-model="query.requestparam"
clearable
size="small"
placeholder="请输入你要搜索的请求参数"
style="width: 200px;"
class="filter-item"
/>
<el-input
v-model="query.responseparam"
clearable
size="small"
placeholder="请输入你要搜索的返回参数"
style="width: 200px;"
class="filter-item"
/>
<el-input
v-model="query.blurry"
clearable
size="small"
placeholder="请输入你要搜索的内容"
placeholder="请输入你要搜索的内容详情"
style="width: 200px;"
class="filter-item"
/>
@@ -16,12 +56,13 @@
v-model="query.createTime"
type="datetimerange"
:picker-options="pickerOptions"
format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
align="right"
/>
<rrOperation/>
<rrOperation />
</div>
</template>

18
wcs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div style="overflow: hidden">
<el-row>
<div id="container" className="container" style="min-height: 100%"/>
<div id="container" className="container" style="min-height: 100%" />
</el-row>
<!--点击设备显示信息-->
<el-dialog
@@ -33,7 +33,7 @@
<el-dialog title="设备设置" :visible.sync="dialogFormVisible" width="35%">
<el-form :model="form" size="small">
<el-form-item label="设备编号" prop="device_code" label-width="80px">
<el-input v-model="form.device_code" :disabled="true"/>
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item label="设备状态" label-width="80px">
@@ -54,7 +54,7 @@
<el-dialog title="设备设置" :visible.sync="dialogFormVisible3" width="35%">
<el-form :model="form" size="small">
<el-form-item label="设备编号" prop="device_code" label-width="80px">
<el-input v-model="form.device_code" :disabled="true"/>
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item label="设备状态" label-width="80px">
<el-radio-group v-model="form.hasGoodStatus">
@@ -64,7 +64,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="物料编码" prop="material_type" label-width="80px">
<el-input v-model="form.material_type"/>
<el-input v-model="form.material_type" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -77,7 +77,7 @@
<el-dialog title="设备设置" :visible.sync="dialogFormVisible4" width="35%">
<el-form :model="form" size="small">
<el-form-item label="设备编号" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true"/>
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item label="禁用机械手" prop="is_disable" label-width="120px">
<el-radio-group v-model="form.is_disable">
@@ -101,7 +101,7 @@
<el-dialog title="设备设置" :visible.sync="dialogFormVisible5" width="35%">
<el-form :model="form" size="small">
<el-form-item label="设备编号" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true"/>
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item label="请求标记" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
@@ -119,7 +119,7 @@
<el-dialog title="设备设置" :visible.sync="dialogFormVisible6" width="35%">
<el-form :model="form" size="small">
<el-form-item label="设备编号" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true"/>
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item label="申请指令标记" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
@@ -144,11 +144,11 @@
<el-dialog title="设备设置" :visible.sync="dialogFormVisible1" width="35%">
<el-form :model="form" size="small">
<el-form-item label="设备编号" prop="device_code" label-width="80px">
<el-input v-model="form.device_code" :disabled="true"/>
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item label="条码" label-width="80px">
<el-input v-model="form.barcode" :disabled="false"/>
<el-input v-model="form.barcode" :disabled="false" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">