rev:更新
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 125 KiB After Width: | Height: | Size: 277 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 125 KiB After Width: | Height: | Size: 275 KiB |
@@ -22,13 +22,13 @@
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<span style="color: #C0C0C0;margin-left: 10px;" />
|
||||
<span style="color: #C0C0C0;margin-left: 10px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="设备编号" prop="device_code">
|
||||
<el-input v-model="form.device_code" disabled />
|
||||
<span style="color: #C0C0C0;margin-left: 10px;" />
|
||||
<el-input v-model="form.device_code" disabled/>
|
||||
<span style="color: #C0C0C0;margin-left: 10px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -36,8 +36,8 @@
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="设备名称" prop="device_name">
|
||||
<el-input v-model="form.device_name" disabled />
|
||||
<span style="color: #C0C0C0;margin-left: 10px;" />
|
||||
<el-input v-model="form.device_name" disabled/>
|
||||
<span style="color: #C0C0C0;margin-left: 10px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
@@ -63,7 +63,7 @@
|
||||
</el-col>
|
||||
|
||||
<!-- 组件-->
|
||||
<component :is="currentComponent" :parent-form="form" />
|
||||
<component :is="currentComponent" :parent-form="form"/>
|
||||
|
||||
</el-row>
|
||||
</div>
|
||||
@@ -71,8 +71,8 @@
|
||||
|
||||
<script>
|
||||
import crud from '@/mixins/crud'
|
||||
import { get, selectDriverCodeList } from '@/api/acs/device/driverConfig'
|
||||
import { getDicts } from '@/api/system/dict'
|
||||
import {get, selectDriverCodeList} from '@/api/acs/device/driverConfig'
|
||||
import {getDicts} from '@/api/system/dict'
|
||||
import standard_inspect_site from './driver/standard_inspect_site'
|
||||
import standard_ordinary_site from './driver/standard_ordinary_site'
|
||||
import lamp_three_color from './driver/lamp_three_color'
|
||||
@@ -101,6 +101,8 @@ import lnsh_crusher from '@/views/acs/device/driver/lnsh/lnsh_crusher'
|
||||
import lnsh_palletizing_manipulator_site from '@/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator_site'
|
||||
import conveyor_ssx_barcode from '@/views/acs/device/driver/lnsh/conveyor_ssx_barcode'
|
||||
import conveyor_press_station from '@/views/acs/device/driver/lnsh/conveyor_press_station'
|
||||
import xg_agv from '@/views/acs/device/driver/xg/xg_agv'
|
||||
import rgv_station from '@/views/acs/device/driver/rgv_station'
|
||||
import agv_ndc_one from '@/views/acs/device/driver/agv/agv_ndc_one'
|
||||
import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two'
|
||||
import package_site from './driver/lnsh/package_site.vue'
|
||||
@@ -109,12 +111,43 @@ import photoelectric_detection_station from '@/views/acs/device/driver/shangdian
|
||||
|
||||
export default {
|
||||
name: 'DeviceConfig',
|
||||
components: { standard_ordinary_site, standard_inspect_site,
|
||||
lamp_three_color, standard_storage, standard_scanner, standard_conveyor_control_with_scanner,
|
||||
standard_conveyor_control, standard_conveyor_monitor, lnsh_mixing_mill, lnsh_press, lnsh_palletizing_manipulator, lnsh_fold_disc_site, lnsh_kiln_lane, lnsh_kiln_truss,
|
||||
lnsh_package_line, lnsh_out_kiln_truss, lnsh_package_pallet_manipulator, lnsh_pallet_storage, lnsh_labeling_machine, lnsh_split_manipulator, lnsh_rgv,
|
||||
lnsh_station, lnsh_Laminating_machine, lnsh_package_site, lnsh_crusher, lnsh_palletizing_manipulator_site, conveyor_ssx_barcode, conveyor_press_station,
|
||||
agv_ndc_one, agv_ndc_two, package_site, nl4_station, photoelectric_detection_station },
|
||||
components: {
|
||||
standard_ordinary_site,
|
||||
standard_inspect_site,
|
||||
lamp_three_color,
|
||||
standard_storage,
|
||||
standard_scanner,
|
||||
standard_conveyor_control_with_scanner,
|
||||
standard_conveyor_control,
|
||||
standard_conveyor_monitor,
|
||||
lnsh_mixing_mill,
|
||||
lnsh_press,
|
||||
lnsh_palletizing_manipulator,
|
||||
lnsh_fold_disc_site,
|
||||
lnsh_kiln_lane,
|
||||
lnsh_kiln_truss,
|
||||
lnsh_package_line,
|
||||
lnsh_out_kiln_truss,
|
||||
lnsh_package_pallet_manipulator,
|
||||
lnsh_pallet_storage,
|
||||
lnsh_labeling_machine,
|
||||
lnsh_split_manipulator,
|
||||
lnsh_rgv,
|
||||
lnsh_station,
|
||||
lnsh_Laminating_machine,
|
||||
lnsh_package_site,
|
||||
lnsh_crusher,
|
||||
lnsh_palletizing_manipulator_site,
|
||||
conveyor_ssx_barcode,
|
||||
conveyor_press_station,
|
||||
agv_ndc_one,
|
||||
agv_ndc_two,
|
||||
package_site,
|
||||
nl4_station,
|
||||
photoelectric_detection_station,
|
||||
xg_agv,
|
||||
rgv_station
|
||||
},
|
||||
dicts: ['device_type'],
|
||||
mixins: [crud],
|
||||
data() {
|
||||
@@ -128,11 +161,11 @@ export default {
|
||||
dicts: [],
|
||||
syncLoading: false,
|
||||
genLoading: false,
|
||||
form: { id: null, device_name: '', device_type: '', name: '', code: '', driver_code: '' },
|
||||
form: {id: null, device_name: '', device_type: '', name: '', code: '', driver_code: ''},
|
||||
deviceDriverList: [],
|
||||
rules: {
|
||||
driver_code: [
|
||||
{ required: true, message: '设备驱动不能为空', trigger: 'blur' }
|
||||
{required: true, message: '设备驱动不能为空', trigger: 'blur'}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
551
acs/nladmin-ui/src/views/acs/device/driver/rgv_station.vue
Normal file
551
acs/nladmin-ui/src/views/acs/device/driver/rgv_station.vue
Normal file
@@ -0,0 +1,551 @@
|
||||
<template>
|
||||
<!--检测站点-->
|
||||
<div>
|
||||
<el-card class="box-card" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<span class="role-span">设备协议：</span>
|
||||
</div>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
OpcServer:
|
||||
<el-select
|
||||
v-model="opc_id"
|
||||
placeholder="无"
|
||||
clearable
|
||||
@change="changeOpc"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dataOpcservers"
|
||||
:key="item.opc_id"
|
||||
:label="item.opc_name"
|
||||
:value="item.opc_id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
PLC:
|
||||
<el-select
|
||||
v-model="plc_id"
|
||||
placeholder="无"
|
||||
clearable
|
||||
@change="changePlc"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dataOpcPlcs"
|
||||
:key="item.plc_id"
|
||||
:label="item.plc_name"
|
||||
:value="item.plc_id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</el-card>
|
||||
|
||||
<el-card class="box-card" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<span class="role-span">输送系统：</span>
|
||||
</div>
|
||||
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="电气调度号" label-width="150px">
|
||||
<el-input v-model="form.OPCServer" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<el-card class="box-card" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<span class="role-span">指令相关：</span>
|
||||
</div>
|
||||
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="检验有货">
|
||||
<el-switch v-model="form.inspect_in_stocck" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="忽视取货校验" label-width="150px">
|
||||
<el-switch v-model="form.ignore_pickup_check" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="忽视放货校验" label-width="150px">
|
||||
<el-switch v-model="form.ignore_release_check" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="呼叫">
|
||||
<el-switch v-model="form.apply_task" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="响应" label-width="150px">
|
||||
<el-switch v-model="form.manual_create_task" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="站点管理" label-width="150px">
|
||||
<el-switch v-model="form.station_manager" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<el-card class="box-card" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<span class="role-span">AGV相关：</span>
|
||||
</div>
|
||||
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="取货">
|
||||
<el-switch v-model="form.is_pickup" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="放货">
|
||||
<el-switch v-model="form.is_release" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
<el-card class="box-card" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<span class="role-span">交互相关：</span>
|
||||
</div>
|
||||
<div class="crud-opts2" style="margin-bottom: 5px;">
|
||||
<span class="crud-opts-right2">
|
||||
<!--左侧插槽-->
|
||||
<slot name="left" />
|
||||
<el-button
|
||||
slot="left"
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="insertdtl()"
|
||||
>
|
||||
新增一行
|
||||
</el-button>
|
||||
</span>
|
||||
|
||||
</div>
|
||||
<div class="app-container">
|
||||
<el-table :data="modeform.tableData" border fit highlight-current-row style="width: 100%;" class="tb-edit">
|
||||
<el-table-column label="mode" prop="模式" width="180">
|
||||
<template scope="scope">
|
||||
<el-input-number v-model="scope.row.mode" value="3" :min="3" size="mini" />
|
||||
<span v-show="scope.row.edit">{{ scope.row.mode }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="request" prop="请求方法" width="500">
|
||||
<template scope="scope">
|
||||
<el-select
|
||||
v-model="scope.row.request"
|
||||
filterable
|
||||
clearable
|
||||
placeholder="请选择"
|
||||
style="width: 450px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in requestMethodList"
|
||||
:key="item.code"
|
||||
:label="item.name"
|
||||
:value="item.code"
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作" width="170">
|
||||
<template scope="scope">
|
||||
<el-button
|
||||
type="danger"
|
||||
class="filter-item"
|
||||
size="mini"
|
||||
icon="el-icon-delete"
|
||||
@click.native.prevent="deleteRow(scope.$index, modeform.tableData)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-card class="box-card" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<span class="role-span">PLC读取字段：</span>
|
||||
</div>
|
||||
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
|
||||
<el-table
|
||||
v-loading="false"
|
||||
:data="data1"
|
||||
:max-height="550"
|
||||
size="small"
|
||||
style="width: 100%;margin-bottom: 15px"
|
||||
>
|
||||
|
||||
<el-table-column prop="name" label="用途" />
|
||||
<el-table-column prop="code" label="别名要求" />
|
||||
<el-table-column prop="db" label="DB块">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="data1[scope.$index].db"
|
||||
size="mini"
|
||||
class="edit-input"
|
||||
@input="finishReadEdit(data1[scope.$index])"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="dbr_value">
|
||||
<template slot="header">
|
||||
<el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
|
||||
</template>
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<el-card class="box-card" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<span class="role-span">PLC写入字段：</span>
|
||||
</div>
|
||||
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
|
||||
<el-table
|
||||
v-loading="false"
|
||||
:data="data2"
|
||||
:max-height="550"
|
||||
size="small"
|
||||
style="width: 100%;margin-bottom: 15px"
|
||||
>
|
||||
|
||||
<el-table-column prop="name" label="用途" />
|
||||
<el-table-column prop="code" label="别名要求" />
|
||||
<el-table-column prop="db" label="DB块">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="data2[scope.$index].db"
|
||||
size="mini"
|
||||
class="edit-input"
|
||||
@input="finishWriteEdit(data2[scope.$index])"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="dbr_value2">
|
||||
<template slot="header">
|
||||
<el-link type="primary" :underline="false" @click.native="test_read2()">测试读</el-link>
|
||||
</template>
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="data2[scope.$index].dbr_value" size="mini" class="edit-input" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="dbw_value">
|
||||
<template slot="header">
|
||||
<el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
|
||||
</template>
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<el-card class="box-card" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<span class="role-span" />
|
||||
<el-button
|
||||
:loading="false"
|
||||
icon="el-icon-check"
|
||||
size="mini"
|
||||
style="float: right; padding: 6px 9px"
|
||||
type="primary"
|
||||
@click="doSubmit"
|
||||
>保存
|
||||
</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
queryDriverConfig,
|
||||
updateConfig,
|
||||
testRead,
|
||||
testwrite
|
||||
} from '@/api/acs/device/driverConfig'
|
||||
import { selectOpcList } from '@/api/acs/device/opc'
|
||||
import { selectPlcList } from '@/api/acs/device/opcPlc'
|
||||
import { selectListByOpcID } from '@/api/acs/device/opcPlc'
|
||||
|
||||
import crud from '@/mixins/crud'
|
||||
import deviceCrud from '@/api/acs/device/device'
|
||||
|
||||
export default {
|
||||
name: 'NL4Station',
|
||||
mixins: [crud],
|
||||
props: {
|
||||
parentForm: {
|
||||
type: Object,
|
||||
require: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
device_code: '',
|
||||
device_id: '',
|
||||
plc_id: '',
|
||||
plc_code: '',
|
||||
opc_id: '',
|
||||
opc_code: '',
|
||||
configLoading: false,
|
||||
dataOpcservers: [],
|
||||
dataOpcPlcs: [],
|
||||
deviceList: [],
|
||||
data1: [],
|
||||
data2: [],
|
||||
requestMethodList: [],
|
||||
modeform: {
|
||||
tableData: []
|
||||
},
|
||||
form: {
|
||||
inspect_in_stocck: true,
|
||||
ignore_pickup_check: false,
|
||||
ignore_release_check: false,
|
||||
apply_task: true,
|
||||
link_three_lamp: '',
|
||||
manual_create_task: true,
|
||||
is_pickup: true,
|
||||
is_release: true,
|
||||
link_device_code: []
|
||||
},
|
||||
rules: {}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.$nextTick(() => {
|
||||
// 从父表单获取设备编码
|
||||
this.device_id = this.$props.parentForm.device_id
|
||||
this.device_code = this.$props.parentForm.device_code
|
||||
queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
|
||||
// 给表单赋值，并且属性不能为空
|
||||
if (data.form) {
|
||||
const arr = Object.keys(data.form)
|
||||
// 不为空
|
||||
if (arr.length > 0) {
|
||||
this.form = data.form
|
||||
}
|
||||
}
|
||||
|
||||
// 给表单赋值，并且属性不能为空
|
||||
if (data.parentForm) {
|
||||
const arr = Object.keys(data.parentForm)
|
||||
// 不为空
|
||||
if (arr.length > 0) {
|
||||
this.opc_code = data.parentForm.opc_code
|
||||
this.plc_code = data.parentForm.plc_code
|
||||
}
|
||||
}
|
||||
// 交互相关回显
|
||||
if (data.modeform) {
|
||||
const arr = Object.keys(data.modeform)
|
||||
if (arr.length > 0) {
|
||||
this.modeform.tableData = data.modeform
|
||||
}
|
||||
}
|
||||
this.data1 = data.rs
|
||||
this.data2 = data.ws
|
||||
this.sliceItem()
|
||||
})
|
||||
selectPlcList().then(data => {
|
||||
this.dataOpcPlcs = data
|
||||
this.plc_id = this.$props.parentForm.opc_plc_id
|
||||
})
|
||||
selectOpcList().then(data => {
|
||||
this.dataOpcservers = data
|
||||
this.opc_id = this.$props.parentForm.opc_server_id
|
||||
})
|
||||
deviceCrud.selectDeviceList().then(data => {
|
||||
this.deviceList = data
|
||||
})
|
||||
deviceCrud.selectRequestMethodList().then(data => {
|
||||
this.requestMethodList = data
|
||||
})
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
insertdtl() {
|
||||
this.modeform.tableData.push({ mode: '', request: '' })
|
||||
},
|
||||
deleteRow(index, rows) {
|
||||
rows.splice(index, 1)
|
||||
},
|
||||
finishReadEdit(data) {
|
||||
// 编辑的是code列,并且值包含mode
|
||||
if (data.code.indexOf('mode') !== -1) {
|
||||
debugger
|
||||
const dbValue = data.db
|
||||
// .之前的字符串
|
||||
const beforeStr = dbValue.match(/(\S*)\./)[1]
|
||||
// .之后的字符串
|
||||
const afterStr = dbValue.match(/\.(\S*)/)[1]
|
||||
// 取最后数字
|
||||
const endNumber = afterStr.substring(1)
|
||||
// 最后为非数字
|
||||
if (isNaN(parseInt(endNumber))) {
|
||||
return
|
||||
}
|
||||
for (const val in this.data1) {
|
||||
if (this.data1[val].code.indexOf('heartbeat') !== -1) {
|
||||
this.data1[val].db = beforeStr + '.B0'
|
||||
}
|
||||
if (this.data1[val].code.indexOf('move') !== -1) {
|
||||
this.data1[val].db = beforeStr + '.B2'
|
||||
}
|
||||
if (this.data1[val].code.indexOf('error') !== -1) {
|
||||
this.data1[val].db = beforeStr + '.B3'
|
||||
}
|
||||
if (this.data1[val].code.indexOf('task') !== -1) {
|
||||
this.data1[val].db = beforeStr + '.D4'
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
finishWriteEdit(data) {
|
||||
// 编辑的是code列,并且值包含mode
|
||||
if (data.code.indexOf('to_command') !== -1) {
|
||||
const dbValue = data.db
|
||||
// .之前的字符串
|
||||
const beforeStr = dbValue.match(/(\S*)\./)[1]
|
||||
// .之后的字符串
|
||||
const afterStr = dbValue.match(/\.(\S*)/)[1]
|
||||
// 取最后数字
|
||||
const endNumber = afterStr.substring(1)
|
||||
// 最后为非数字
|
||||
if (isNaN(parseInt(endNumber))) {
|
||||
return
|
||||
}
|
||||
for (const val in this.data2) {
|
||||
if (this.data2[val].code.indexOf('to_target') !== -1) {
|
||||
this.data2[val].db = beforeStr + '.W2'
|
||||
}
|
||||
if (this.data2[val].code.indexOf('to_task') !== -1) {
|
||||
this.data2[val].db = beforeStr + '.D4'
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
changeOpc(val) {
|
||||
this.dataOpcservers.forEach(item => {
|
||||
if (item.opc_id === val) {
|
||||
this.opc_code = item.opc_code
|
||||
}
|
||||
})
|
||||
|
||||
selectListByOpcID(val).then(data => {
|
||||
this.dataOpcPlcs = data
|
||||
this.plc_id = ''
|
||||
this.plc_code = ''
|
||||
if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
|
||||
this.plc_id = this.dataOpcPlcs[0].plc_id
|
||||
this.plc_code = this.dataOpcPlcs[0].plc_code
|
||||
}
|
||||
this.sliceItem()
|
||||
})
|
||||
},
|
||||
changePlc(val) {
|
||||
this.dataOpcPlcs.forEach(item => {
|
||||
if (item.plc_id === val) {
|
||||
this.plc_code = item.plc_code
|
||||
this.sliceItem()
|
||||
return
|
||||
}
|
||||
})
|
||||
},
|
||||
test_read1() {
|
||||
testRead(this.data1, this.opc_id).then(data => {
|
||||
this.data1 = data
|
||||
this.notify('操作成功!', 'success')
|
||||
}).catch(err => {
|
||||
console.log(err.response.data.message)
|
||||
})
|
||||
},
|
||||
test_write1() {
|
||||
testwrite(this.data2, this.opc_id).then(data => {
|
||||
this.notify('操作成功!', 'success')
|
||||
}).catch(err => {
|
||||
console.log(err.response.data.message)
|
||||
})
|
||||
},
|
||||
test_read2() {
|
||||
testRead(this.data2, this.opc_id).then(data => {
|
||||
this.data2 = data
|
||||
console.log(this.data2)
|
||||
this.notify('操作成功!', 'success')
|
||||
}).catch(err => {
|
||||
console.log(err.response.data.message)
|
||||
})
|
||||
},
|
||||
doSubmit() {
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.configLoading = true
|
||||
// 根据驱动类型判断是否为路由设备
|
||||
const parentForm = this.parentForm
|
||||
parentForm.is_route = true
|
||||
parentForm.plc_id = this.plc_id
|
||||
parentForm.opc_id = this.opc_id
|
||||
updateConfig(parentForm, this.form, this.modeform, this.data1, this.data2).then(res => {
|
||||
this.notify('保存成功', 'success')
|
||||
this.configLoading = false
|
||||
}).catch(err => {
|
||||
this.configLoading = false
|
||||
console.log(err.response.data.message)
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
sliceItem() { // 拼接DB的Item值
|
||||
this.data1.forEach(item => {
|
||||
const str = item.code
|
||||
// 是否包含.
|
||||
if (str.search('.') !== -1) {
|
||||
// 截取最后一位
|
||||
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
|
||||
} else {
|
||||
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
|
||||
}
|
||||
})
|
||||
this.data2.forEach(item => {
|
||||
const str = item.code
|
||||
// 是否包含.
|
||||
if (str.search('.') !== -1) {
|
||||
// 截取最后一位
|
||||
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
|
||||
} else {
|
||||
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
103
acs/nladmin-ui/src/views/acs/device/driver/xg/xg_agv.vue
Normal file
103
acs/nladmin-ui/src/views/acs/device/driver/xg/xg_agv.vue
Normal file
@@ -0,0 +1,103 @@
|
||||
<template>
|
||||
<!--agv单工位-->
|
||||
<div>
|
||||
<el-card class="box-card" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<span class="role-span">指令相关：</span>
|
||||
</div>
|
||||
<el-form ref="form" :inline="true" :model="form" size="small" label-width="95px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="ip地址" prop="ip_address">
|
||||
<el-input
|
||||
v-model="form.ip_address"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
<el-card class="box-card" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<span class="role-span" />
|
||||
<el-button
|
||||
:loading="false"
|
||||
icon="el-icon-check"
|
||||
size="mini"
|
||||
style="float: right; padding: 6px 9px"
|
||||
type="primary"
|
||||
@click="doSubmit"
|
||||
>保存
|
||||
</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
queryDriverConfig,
|
||||
updateConfig
|
||||
} from '@/api/acs/device/driverConfig'
|
||||
import crud from '@/mixins/crud'
|
||||
|
||||
export default {
|
||||
name: 'StandardConveyorControl',
|
||||
mixins: [crud],
|
||||
props: {
|
||||
parentForm: {
|
||||
type: Object,
|
||||
require: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
form: {
|
||||
ip_address: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.$nextTick(() => {
|
||||
// 从父表单获取设备编码
|
||||
this.device_id = this.$props.parentForm.device_id
|
||||
this.device_code = this.$props.parentForm.device_code
|
||||
queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
|
||||
// 给表单赋值，并且属性不能为空
|
||||
if (data.form) {
|
||||
const arr = Object.keys(data.form)
|
||||
// 不为空
|
||||
if (arr.length > 0) {
|
||||
this.form = data.form
|
||||
}
|
||||
}
|
||||
this.sliceItem()
|
||||
})
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
doSubmit() {
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.configLoading = true
|
||||
// 根据驱动类型判断是否为路由设备
|
||||
const parentForm = this.parentForm
|
||||
parentForm.is_route = true
|
||||
updateConfig(parentForm, this.form, this.modeform, this.data1, this.data2).then(res => {
|
||||
this.notify('保存成功', 'success')
|
||||
this.configLoading = false
|
||||
}).catch(err => {
|
||||
this.configLoading = false
|
||||
console.log(err.response.data.message)
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -14,9 +14,9 @@
|
||||
class="filter-item"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
<rrOperation />
|
||||
<rrOperation/>
|
||||
</div>
|
||||
<crudOperation :permission="permission" />
|
||||
<crudOperation :permission="permission"/>
|
||||
<!--表单组件-->
|
||||
<el-dialog
|
||||
:close-on-click-modal="false"
|
||||
@@ -27,32 +27,35 @@
|
||||
>
|
||||
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
|
||||
<el-form-item label="OPC编码" prop="opc_code">
|
||||
<el-input v-model="form.opc_code" style="width: 370px;" />
|
||||
<el-input v-model="form.opc_code" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="OPC名称" prop="opc_name">
|
||||
<el-input v-model="form.opc_name" style="width: 370px;" />
|
||||
<el-input v-model="form.opc_name" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="OPC地址">
|
||||
<el-input v-model="form.opc_host" style="width: 370px;" />
|
||||
<el-input v-model="form.opc_host" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="订阅主题">
|
||||
<el-input v-model="form.topic" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="用户名">
|
||||
<el-input v-model="form.user" style="width: 370px;" />
|
||||
<el-input v-model="form.user" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="密码" prop="password">
|
||||
<el-input v-model="form.password" style="width: 370px;" type="password" />
|
||||
<el-input v-model="form.password" style="width: 370px;" type="password"/>
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="getDetail()">详情</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item label="程序ID">
|
||||
<el-input v-model="form.prog_id" style="width: 370px;" />
|
||||
<el-input v-model="form.prog_id" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="注册表ID">
|
||||
<el-input v-model="form.cls_id" style="width: 370px;" />
|
||||
<el-input v-model="form.cls_id" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="domain">
|
||||
<el-input v-model="form.domain" style="width: 370px;" />
|
||||
<el-input v-model="form.domain" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
|
||||
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
@@ -63,18 +66,18 @@
|
||||
|
||||
<el-dialog title="PLC管理" :visible.sync="dialogPlcFormVisible" width="550px">
|
||||
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
|
||||
<el-input v-model="form.opc_server_id" type="hidden" prop="opc_server_id" />
|
||||
<el-input v-model="form.opc_server_id" type="hidden" prop="opc_server_id"/>
|
||||
<el-form-item label="PLC编码" prop="plc_code">
|
||||
<el-input v-model="form.plc_code" style="width: 370px;" />
|
||||
<el-input v-model="form.plc_code" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="OPC名称" prop="plc_opc_name">
|
||||
<el-input v-model="form.plc_opc_name" style="width: 370px;" disabled />
|
||||
<el-input v-model="form.plc_opc_name" style="width: 370px;" disabled/>
|
||||
</el-form-item>
|
||||
<el-form-item label="PLC名称" prop="plc_name">
|
||||
<el-input v-model="form.plc_name" style="width: 370px;" />
|
||||
<el-input v-model="form.plc_name" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="PLC地址" prop="plc_host">
|
||||
<el-input v-model="form.plc_host" style="width: 370px;" />
|
||||
<el-input v-model="form.plc_host" style="width: 370px;"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
@@ -97,18 +100,19 @@
|
||||
@select-all="crud.selectAllChange"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column prop="opc_code" label="OPC编码" width="100" />
|
||||
<el-table-column prop="opc_name" label="OPC名称" />
|
||||
<el-table-column prop="opc_host" label="OPC地址" min-width="130" />
|
||||
<el-table-column prop="type" label="类型" />
|
||||
<el-table-column prop="user" label="用户名" min-width="100" />
|
||||
<el-table-column prop="password" label="密码" />
|
||||
<el-table-column prop="prog_id" label="程序ID" min-width="150" />
|
||||
<el-table-column prop="cls_id" label="注册表ID" min-width="150" />
|
||||
<el-table-column prop="domain" label="domain" />
|
||||
<el-table-column prop="remark" label="备注" min-width="100" />
|
||||
<el-table-column prop="createtime" label="创建时间" />
|
||||
<el-table-column type="selection" width="55"/>
|
||||
<el-table-column prop="opc_code" label="OPC编码" width="100"/>
|
||||
<el-table-column prop="opc_name" label="OPC名称"/>
|
||||
<el-table-column prop="opc_host" label="OPC地址" min-width="130"/>
|
||||
<el-table-column prop="topic" label="订阅主题" min-width="130"/>
|
||||
<el-table-column prop="type" label="类型"/>
|
||||
<el-table-column prop="user" label="用户名" min-width="100"/>
|
||||
<el-table-column prop="password" label="密码"/>
|
||||
<el-table-column prop="prog_id" label="程序ID" min-width="150"/>
|
||||
<el-table-column prop="cls_id" label="注册表ID" min-width="150"/>
|
||||
<el-table-column prop="domain" label="domain"/>
|
||||
<el-table-column prop="remark" label="备注" min-width="100"/>
|
||||
<el-table-column prop="createtime" label="创建时间"/>
|
||||
<el-table-column label="操作" width="200px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="small" @click="handleClick(scope.row,'1')">修改</el-button>
|
||||
@@ -120,14 +124,14 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
<pagination/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import crudOpc from '@/api/acs/device/opc'
|
||||
import CRUD, { crud, form, header, presenter } from '@crud/crud'
|
||||
import CRUD, {crud, form, header, presenter} from '@crud/crud'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
@@ -154,15 +158,16 @@ const defaultForm = {
|
||||
plc_name: null,
|
||||
plc_host: null,
|
||||
opc_server_id: null,
|
||||
plc_opc_name: null
|
||||
plc_opc_name: null,
|
||||
topic: null
|
||||
}
|
||||
export default {
|
||||
name: 'Opc',
|
||||
components: { pagination, crudOperation, rrOperation },
|
||||
components: {pagination, crudOperation, rrOperation},
|
||||
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||
cruds() {
|
||||
return CRUD({
|
||||
title: 'opc', url: 'api/opc', idField: 'opc_id', sort: 'opc_id,desc', crudMethod: { ...crudOpc },
|
||||
title: 'opc', url: 'api/opc', idField: 'opc_id', sort: 'opc_id,desc', crudMethod: {...crudOpc},
|
||||
optShow: {
|
||||
add: true,
|
||||
edit: false,
|
||||
@@ -182,28 +187,28 @@ export default {
|
||||
},
|
||||
rules: {
|
||||
opc_id: [
|
||||
{ required: true, message: 'OPC标识不能为空', trigger: 'blur' }
|
||||
{required: true, message: 'OPC标识不能为空', trigger: 'blur'}
|
||||
],
|
||||
opc_code: [
|
||||
{ required: true, message: 'OPC编码不能为空', trigger: 'blur' }
|
||||
{required: true, message: 'OPC编码不能为空', trigger: 'blur'}
|
||||
],
|
||||
opc_name: [
|
||||
{ required: true, message: 'OPC名称不能为空', trigger: 'blur' }
|
||||
{required: true, message: 'OPC名称不能为空', trigger: 'blur'}
|
||||
],
|
||||
password: [
|
||||
{ required: true, message: '密码不能为空', trigger: 'blur' }
|
||||
{required: true, message: '密码不能为空', trigger: 'blur'}
|
||||
],
|
||||
is_active: [
|
||||
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
|
||||
{required: true, message: '是否启用不能为空', trigger: 'blur'}
|
||||
],
|
||||
is_delete: [
|
||||
{ required: true, message: '是否删除不能为空', trigger: 'blur' }
|
||||
{required: true, message: '是否删除不能为空', trigger: 'blur'}
|
||||
],
|
||||
create_by: [
|
||||
{ required: true, message: '创建者不能为空', trigger: 'blur' }
|
||||
{required: true, message: '创建者不能为空', trigger: 'blur'}
|
||||
],
|
||||
create_time: [
|
||||
{ required: true, message: '创建时间不能为空', trigger: 'blur' }
|
||||
{required: true, message: '创建时间不能为空', trigger: 'blur'}
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -264,7 +269,7 @@ export default {
|
||||
},
|
||||
getDetail() {
|
||||
const _this = this
|
||||
this.crud.crudMethod.getmeteal(this.form).then(function(response) {
|
||||
this.crud.crudMethod.getmeteal(this.form).then(function (response) {
|
||||
_this.form.cls_id = response.classId
|
||||
_this.form.prog_id = response.progId
|
||||
_this.form.remark = response.description
|
||||
|
||||
32
acs/nladmin-ui/src/views/monitor/interface/api/lucene.js
Normal file
32
acs/nladmin-ui/src/views/monitor/interface/api/lucene.js
Normal file
@@ -0,0 +1,32 @@
|
||||
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 function getDeviceLogType() {
|
||||
return request({
|
||||
url: 'api/lucene/getDeviceLogType',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function getLogTypes() {
|
||||
return request({
|
||||
url: 'api/lucene/getLogTypes',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export default { getLogData, labelsValues, getDeviceLogType, getLogTypes }
|
||||
162
acs/nladmin-ui/src/views/monitor/interface/index.vue
Normal file
162
acs/nladmin-ui/src/views/monitor/interface/index.vue
Normal file
@@ -0,0 +1,162 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div class="head-container">
|
||||
<Search
|
||||
:log-types="logTypes"
|
||||
:device-list="deviceList"
|
||||
:device-log-types="deviceLogTypes"
|
||||
@performSearch="performSearch"
|
||||
/>
|
||||
<crudOperation />
|
||||
</div>
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table"
|
||||
v-loading="crud.loading"
|
||||
:data="crud.data"
|
||||
style="width: 100%;"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column
|
||||
prop="request_url"
|
||||
label="请求路径"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="request_direction"
|
||||
label="请求方向"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="request_param"
|
||||
label="请求参数"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="response_param"
|
||||
label="返回参数"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="method"
|
||||
label="执行方法"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="executeTime"
|
||||
label="执行时间"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column prop="content" show-overflow-tooltip label="内容详情" />
|
||||
<el-table-column prop="logTime" show-overflow-tooltip label="记录时间" />
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Search from './search'
|
||||
import CRUD, { crud, header, presenter } from '@crud/crud'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import { delAll } from '@/api/acs/lucene/log'
|
||||
import crudDevice from '@/api/acs/device/device'
|
||||
import crudLucene from './api/lucene'
|
||||
|
||||
export default {
|
||||
name: 'LuceneLog',
|
||||
components: { Search, pagination, crudOperation },
|
||||
mixins: [presenter(), header(), crud()],
|
||||
cruds: function() {
|
||||
return CRUD({
|
||||
title: '接口日志', url: 'api/lucene/getAll', idField: 'id', sort: 'id,desc',
|
||||
queryOnPresenterCreated: true,
|
||||
optShow: {
|
||||
add: false,
|
||||
edit: false,
|
||||
del: false,
|
||||
download: false
|
||||
},
|
||||
page: {
|
||||
size: 40,
|
||||
total: 0,
|
||||
page: 0
|
||||
},
|
||||
query: {
|
||||
createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))],
|
||||
logType: '接口日志'
|
||||
}
|
||||
})
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
query: { blurry: '123' },
|
||||
permission: {
|
||||
add: ['admin', 'param:add'],
|
||||
edit: ['admin', 'param:edit'],
|
||||
del: ['admin', 'param:del']
|
||||
},
|
||||
deviceList: [],
|
||||
deviceLogTypes: [],
|
||||
logTypes: [],
|
||||
rules: {},
|
||||
logType: ''
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getLogTypes()
|
||||
this.getDeviceList()
|
||||
this.getDeviceLogTypes()
|
||||
},
|
||||
methods: {
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
},
|
||||
getLogTypes() {
|
||||
crudLucene.getLogTypes().then(res => {
|
||||
this.logTypes = res
|
||||
})
|
||||
},
|
||||
getDeviceLogTypes() {
|
||||
crudLucene.getDeviceLogType().then(res => {
|
||||
this.deviceLogTypes = res
|
||||
})
|
||||
},
|
||||
getDeviceList() {
|
||||
crudDevice.selectDeviceList().then(res => {
|
||||
this.deviceList = res
|
||||
})
|
||||
},
|
||||
confirmDelAll() {
|
||||
this.$confirm(`确认清空所有操作日志吗?`, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.crud.delAllLoading = true
|
||||
delAll('device_execute').then(res => {
|
||||
this.crud.delAllLoading = false
|
||||
this.crud.dleChangePage(1)
|
||||
this.crud.delSuccessNotify()
|
||||
this.crud.toQuery()
|
||||
}).catch(err => {
|
||||
this.crud.delAllLoading = false
|
||||
console.log(err.response.data.message)
|
||||
})
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
performSearch(value) {
|
||||
console.log('Search with:' + value)
|
||||
this.logType = value
|
||||
this.crud.toQuery()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
134
acs/nladmin-ui/src/views/monitor/interface/search.vue
Normal file
134
acs/nladmin-ui/src/views/monitor/interface/search.vue
Normal file
@@ -0,0 +1,134 @@
|
||||
<template>
|
||||
<div v-if="crud.props.searchToggle">
|
||||
<el-form :model="query" class="filter-form" inline>
|
||||
<el-form-item label="请求方向:">
|
||||
<el-select
|
||||
v-model="query.request_direction"
|
||||
filterable
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="请选择请求方向"
|
||||
>
|
||||
<el-option
|
||||
v-for="direction in directionList"
|
||||
:key="direction"
|
||||
:label="direction"
|
||||
:value="direction"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="请求路径:">
|
||||
<el-input
|
||||
v-model="query.request_url"
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="请输入请求路径"
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="请求参数:">
|
||||
<el-input
|
||||
v-model="query.request_param"
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="请输入请求参数内容"
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="内容详情:">
|
||||
<el-input
|
||||
v-model="query.blurry"
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="请输入你要搜索的内容详情"
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="记录时间:">
|
||||
<el-date-picker
|
||||
v-model="query.createTime"
|
||||
type="datetimerange"
|
||||
:picker-options="pickerOptions"
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
align="right"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { header } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
|
||||
export default {
|
||||
components: { rrOperation },
|
||||
mixins: [header()],
|
||||
props: {
|
||||
deviceList: Array,
|
||||
deviceLogTypes: Array
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
pickerOptions: {
|
||||
shortcuts: [{
|
||||
text: '最近一周',
|
||||
onClick(picker) {
|
||||
const end = new Date()
|
||||
const start = new Date()
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
|
||||
picker.$emit('pick', [start, end])
|
||||
}
|
||||
}, {
|
||||
text: '最近一个月',
|
||||
onClick(picker) {
|
||||
const end = new Date()
|
||||
const start = new Date()
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
|
||||
picker.$emit('pick', [start, end])
|
||||
}
|
||||
}, {
|
||||
text: '最近三个月',
|
||||
onClick(picker) {
|
||||
const end = new Date()
|
||||
const start = new Date()
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
|
||||
picker.$emit('pick', [start, end])
|
||||
}
|
||||
}]
|
||||
},
|
||||
value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
|
||||
value2: '',
|
||||
directionList: [
|
||||
'ACS->LMS',
|
||||
'LMS->ACS',
|
||||
'ACS->HR',
|
||||
'HR->ACS',
|
||||
'ACS->AGV',
|
||||
'AGV->ACS'
|
||||
]
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
logTypes: {
|
||||
immediate: true,
|
||||
handler(newVal) {
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
},
|
||||
methods: {
|
||||
handleLogTypeChange(value) {
|
||||
this.query.logType = value
|
||||
this.$emit('performSearch', this.query.logType)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
64
acs/nladmin-ui/src/views/monitor/interface/time.vue
Normal file
64
acs/nladmin-ui/src/views/monitor/interface/time.vue
Normal file
@@ -0,0 +1,64 @@
|
||||
<template>
|
||||
<div v-if="crud.props.searchToggle">
|
||||
<!--
|
||||
<date-range-picker v-model="query.createTime" class="date-item" />
|
||||
-->
|
||||
|
||||
<el-date-picker
|
||||
v-model="query.createTime"
|
||||
type="datetimerange"
|
||||
:picker-options="pickerOptions"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
align="right"
|
||||
/>
|
||||
<rrOperation />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { header } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
|
||||
export default {
|
||||
components: { rrOperation },
|
||||
mixins: [header()],
|
||||
|
||||
data() {
|
||||
return {
|
||||
pickerOptions: {
|
||||
shortcuts: [{
|
||||
text: '最近一周',
|
||||
onClick(picker) {
|
||||
const end = new Date()
|
||||
const start = new Date()
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
|
||||
picker.$emit('pick', [start, end])
|
||||
}
|
||||
}, {
|
||||
text: '最近一个月',
|
||||
onClick(picker) {
|
||||
const end = new Date()
|
||||
const start = new Date()
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
|
||||
picker.$emit('pick', [start, end])
|
||||
}
|
||||
}, {
|
||||
text: '最近三个月',
|
||||
onClick(picker) {
|
||||
const end = new Date()
|
||||
const start = new Date()
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
|
||||
picker.$emit('pick', [start, end])
|
||||
}
|
||||
}]
|
||||
},
|
||||
value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
|
||||
value2: ''
|
||||
}
|
||||
},
|
||||
created() {
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -15,4 +15,18 @@ export function labelsValues() {
|
||||
})
|
||||
}
|
||||
|
||||
export default { getLogData, labelsValues }
|
||||
export function getDeviceLogType() {
|
||||
return request({
|
||||
url: 'api/lucene/getDeviceLogType',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export function getLogTypes() {
|
||||
return request({
|
||||
url: 'api/lucene/getLogTypes',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
export default { getLogData, labelsValues, getDeviceLogType, getLogTypes }
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div class="head-container">
|
||||
<Search />
|
||||
<Search
|
||||
:log-types="logTypes"
|
||||
:device-list="deviceList"
|
||||
:device-log-types="deviceLogTypes"
|
||||
@performSearch="performSearch"
|
||||
/>
|
||||
<crudOperation />
|
||||
</div>
|
||||
<!--表格渲染-->
|
||||
@@ -14,16 +19,15 @@
|
||||
>
|
||||
<!-- <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="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 v-if="logType !== '接口日志'" prop="device_code" label="设备号" :min-width="flexWidth('device_code',crud.data,'设备号')" />
|
||||
<!-- <el-table-column prop="trace_id" label="链路追踪" /> -->
|
||||
<!-- <el-table-column v-if="logType === '接口日志'" prop="task_code" label="任务编号"-->
|
||||
<!-- :min-width="flexWidth('task_code',crud.data,'任务编号')"/>-->
|
||||
<!-- <el-table-column v-if="logType === '接口日志'" prop="instruct_code" label="指令编号"-->
|
||||
<!-- :min-width="flexWidth('instruct_code',crud.data,'指令编号')"/>-->
|
||||
<el-table-column prop="content" show-overflow-tooltip label="内容详情" />
|
||||
<el-table-column prop="logTime" show-overflow-tooltip label="记录时间" />
|
||||
<!-- <el-table-column prop="operate" show-overflow-tooltip label="操作" :min-width="flexWidth('operate',crud.data,'操作')" />-->
|
||||
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
@@ -37,6 +41,8 @@ import CRUD, { crud, header, presenter } from '@crud/crud'
|
||||
import crudOperation from '@crud/CRUD.operation'
|
||||
import pagination from '@crud/Pagination'
|
||||
import { delAll } from '@/api/acs/lucene/log'
|
||||
import crudDevice from '@/api/acs/device/device'
|
||||
import crudLucene from './api/lucene'
|
||||
|
||||
export default {
|
||||
name: 'LuceneLog',
|
||||
@@ -44,7 +50,7 @@ export default {
|
||||
mixins: [presenter(), header(), crud()],
|
||||
cruds: function() {
|
||||
return CRUD({
|
||||
title: '系统参数', url: 'api/lucene/getAll', idField: 'id', sort: 'id,desc',
|
||||
title: '设备日志', url: 'api/lucene/getAll', idField: 'id', sort: 'id,desc',
|
||||
queryOnPresenterCreated: true,
|
||||
optShow: {
|
||||
add: false,
|
||||
@@ -58,7 +64,8 @@ export default {
|
||||
page: 0
|
||||
},
|
||||
query: {
|
||||
createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))]
|
||||
createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))],
|
||||
logType: '设备日志'
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -70,17 +77,38 @@ export default {
|
||||
edit: ['admin', 'param:edit'],
|
||||
del: ['admin', 'param:del']
|
||||
},
|
||||
|
||||
rules: {}
|
||||
deviceList: [],
|
||||
deviceLogTypes: [],
|
||||
logTypes: [],
|
||||
rules: {},
|
||||
logType: ''
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getLogTypes()
|
||||
this.getDeviceList()
|
||||
this.getDeviceLogTypes()
|
||||
},
|
||||
methods: {
|
||||
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||
[CRUD.HOOK.beforeRefresh]() {
|
||||
return true
|
||||
},
|
||||
getLogTypes() {
|
||||
crudLucene.getLogTypes().then(res => {
|
||||
this.logTypes = res
|
||||
})
|
||||
},
|
||||
getDeviceLogTypes() {
|
||||
crudLucene.getDeviceLogType().then(res => {
|
||||
this.deviceLogTypes = res
|
||||
})
|
||||
},
|
||||
getDeviceList() {
|
||||
crudDevice.selectDeviceList().then(res => {
|
||||
this.deviceList = res
|
||||
})
|
||||
},
|
||||
confirmDelAll() {
|
||||
this.$confirm(`确认清空所有操作日志吗?`, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
@@ -99,6 +127,11 @@ export default {
|
||||
})
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
performSearch(value) {
|
||||
console.log('Search with:' + value)
|
||||
this.logType = value
|
||||
this.crud.toQuery()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,113 +1,86 @@
|
||||
<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-select
|
||||
<el-form :model="query" class="filter-form" inline>
|
||||
<el-form-item label="选择设备:">
|
||||
<el-select
|
||||
v-model="query.device_code"
|
||||
clearable
|
||||
filterable
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="请输入你要搜索的设备号"
|
||||
class="filter-item"
|
||||
style="width: 190px"
|
||||
@change="crud.toQuery"
|
||||
placeholder="请选择设备号"
|
||||
>
|
||||
<el-option v-for="item in device_codes" :key="item.id" :label="item.label" :value="item.value" />
|
||||
</el-select> -->
|
||||
<el-select
|
||||
ref="test"
|
||||
v-model="query.device_code"
|
||||
filterable
|
||||
clearable
|
||||
reserve-keyword
|
||||
placeholder="设备号"
|
||||
style="width: 190px;"
|
||||
@change="crud.toQuery"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in deviceList"
|
||||
:key="item.device_code"
|
||||
:label="item.device_code"
|
||||
:value="item.device_code"
|
||||
/>
|
||||
</el-select>
|
||||
<el-option
|
||||
v-for="device in deviceList"
|
||||
:key="device.device_code"
|
||||
:label="device.device_code"
|
||||
:value="device.device_code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-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="请输入你要搜索的内容详情"
|
||||
style="width: 200px;"
|
||||
class="filter-item"
|
||||
/>
|
||||
<!--
|
||||
<date-range-picker v-model="query.createTime" class="date-item" />
|
||||
-->
|
||||
<el-form-item
|
||||
label="设备日志类型:"
|
||||
>
|
||||
<el-select
|
||||
v-model="query.deviceLogType"
|
||||
filterable
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="设备日志类型"
|
||||
>
|
||||
<el-option
|
||||
v-for="deviceLogType in deviceLogTypes"
|
||||
:key="deviceLogType.code"
|
||||
:label="deviceLogType.name"
|
||||
:value="deviceLogType.code"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="内容详情:">
|
||||
<el-input
|
||||
v-model="query.blurry"
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="请输入你要搜索的内容详情"
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="记录时间:">
|
||||
<el-date-picker
|
||||
v-model="query.createTime"
|
||||
type="datetimerange"
|
||||
:picker-options="pickerOptions"
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
align="right"
|
||||
/>
|
||||
</el-form-item>
|
||||
<rrOperation />
|
||||
</el-form>
|
||||
|
||||
<el-date-picker
|
||||
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 />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { header } from '@crud/crud'
|
||||
import rrOperation from '@crud/RR.operation'
|
||||
import deviceCrud from '@/api/acs/device/device'
|
||||
|
||||
export default {
|
||||
components: { rrOperation },
|
||||
mixins: [header()],
|
||||
|
||||
props: {
|
||||
deviceList: Array,
|
||||
deviceLogTypes: Array,
|
||||
logTypes: Array
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
querySearch: {
|
||||
logType: null
|
||||
},
|
||||
pickerOptions: {
|
||||
shortcuts: [{
|
||||
text: '最近一周',
|
||||
@@ -136,15 +109,25 @@ export default {
|
||||
}]
|
||||
},
|
||||
value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
|
||||
value2: '',
|
||||
deviceList: [],
|
||||
device_code: ''
|
||||
value2: ''
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
logTypes: {
|
||||
immediate: true,
|
||||
handler(newVal) {
|
||||
if (newVal.length > 0 && !this.query.logType) {
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
deviceCrud.selectDeviceList().then(data => {
|
||||
this.deviceList = data
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
handleLogTypeChange(value) {
|
||||
this.query.logType = value
|
||||
this.$emit('performSearch', this.query.logType)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user