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

rev：更新

Browse Source
This commit is contained in:
gengby
2024-07-03 12:04:15 +08:00
parent dcef47fff8
commit ffce40df0e
22 changed files with 266 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
nladmin-ui/src/views/acs/config/assigned/index.vue
View File

@@ -2,6 +2,47 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-suffix=":"
>
<el-form-item label="设备编码">
<el-input
v-model="query.device_code"
size="small"
clearable
placeholder="请输入设备编码"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="任务终点">
<el-input
v-model="query.task_nextDevice_code"
size="small"
clearable
placeholder="请输入任务终点"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="指令终点">
<el-input
v-model="query.inst_nextDevice_code"
size="small"
clearable
placeholder="请输入指令终点"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
@@ -144,6 +185,7 @@
import crudAcsDeviceAssigned from '@/api/acs/config/deviceAssigned'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import rrOperation from '@crud/RR.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import deviceCrud from '@/api/acs/device/device'
@@ -159,7 +201,7 @@ const defaultForm = {
}
export default {
name: 'AcsDeviceAssigned',
components: { pagination, crudOperation, udOperation },
components: { pagination, crudOperation, udOperation, rrOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -170,7 +212,8 @@ export default {
optShow: {
add: true,
edit: true,
del: true
del: true,
reset: true
},
crudMethod: { ...crudAcsDeviceAssigned }
})

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

@@ -475,7 +475,7 @@
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="25" />
<el-table-column type="selection" width="50" />
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))" />
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" :min-width="flexWidth('task_type',crud.data,$t('task.txt_box.Task_type'))">
@@ -591,7 +591,7 @@ export default {
return CRUD({ title: i18n.t('task.txt_box.Task'), url: 'api/task', idField: 'task_id', sort: 'task_id,desc',
optShow: {
add: false,
edit: true,
edit: false,
del: true,
reset: false,
download: false

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

@@ -25,33 +25,33 @@
v-if="logType === '接口日志'"
prop="request_url"
label="请求路径"
:min-width="flexWidth('method',crud.data,'请求路径')"
show-overflow-tooltip
/>
<el-table-column
v-if="logType === '接口日志'"
prop="request_param"
label="请求参数"
:min-width="flexWidth('request_param',crud.data,'请求参数')"
show-overflow-tooltip
/>
<el-table-column
v-if="logType === '接口日志'"
prop="response_param"
label="返回参数"
:min-width="flexWidth('response_param',crud.data,'返回参数')"
show-overflow-tooltip
/>
<el-table-column
v-if="logType === '接口日志'"
prop="status_code"
label="状态码"
:min-width="flexWidth('status_code',crud.data,'状态码')"
show-overflow-tooltip
/>
<!-- <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" label="内容详情" :min-width="flexWidth('content',crud.data,'内容详情')" />
<el-table-column prop="logTime" label="记录时间" :min-width="flexWidth('logTime',crud.data,'记录时间')" />
<el-table-column prop="operate" label="操作" :min-width="flexWidth('operate',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>
<!--分页组件-->

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

@@ -361,19 +361,19 @@ export default {
} else if (val === 'height') {
const obj = { name: '高度', value: data[val] }
this.arr.push(obj)
} else if (val === 'prohibitInWarehouse') {
} else if (val === 'prohibitInWarehouseLabel') {
const obj = { name: '禁止入库', value: data[val] }
this.arr.push(obj)
} else if (val === 'prohibitOutWarehouse') {
} else if (val === 'prohibitOutWarehouseLabel') {
const obj = { name: '禁止出库', value: data[val] }
this.arr.push(obj)
} else if (val === 'stopReceiveTask') {
} else if (val === 'stopReceiveTaskLabel') {
const obj = { name: '停止接收任务', value: data[val] }
this.arr.push(obj)
} else if (val === 'requireSuccess') {
} else if (val === 'requireSuccessLabel') {
const obj = { name: '请求标记', value: data[val] }
this.arr.push(obj)
} else if (val === 'againRequireSuccess') {
} else if (val === 'againRequireSuccessLabel') {
const obj = { name: '异常请求标记', value: data[val] }
this.arr.push(obj)
} else if (val === 'front_command') {

8
nladmin-ui/src/views/system/param/index.vue
View File

@@ -42,10 +42,10 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="id" label="id" />
<el-table-column prop="code" :label="$t('SysParam.table.code')" min-width="130" show-overflow-tooltip />
<el-table-column :prop="$langPre.computedProp('name')" :label="$t('SysParam.table.name')" min-width="120" show-overflow-tooltip />
<el-table-column prop="value" :label="$t('SysParam.table.values')" min-width="270" show-overflow-tooltip />
<el-table-column prop="remark" :label="$t('SysParam.table.description')" />
<el-table-column prop="code" :label="$t('SysParam.table.code')" show-overflow-tooltip />
<el-table-column :prop="$langPre.computedProp('name')" :label="$t('SysParam.table.name')" show-overflow-tooltip />
<el-table-column prop="value" :label="$t('SysParam.table.values')" show-overflow-tooltip />
<el-table-column prop="remark" :label="$t('SysParam.table.description')" show-overflow-tooltip />
<el-table-column v-permission="['admin','param:edit','param:del']" :label="$t('auto.common.Operate')" width="150px" align="center">
<template slot-scope="scope">
<udOperation

2
nladmin-ui/src/views/system/timing/index.vue
View File

@@ -139,7 +139,7 @@
<el-table-column
v-permission="['admin','timing:edit','timing:del']"
:label="$t('auto.common.Operate')"
width="170px"
width="220px"
align="center"
fixed="right"
>