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

rev acs更新

Browse Source
This commit is contained in:
周俊杰
2024-01-18 14:17:09 +08:00
parent 4ec19ad5f4
commit 3add95ac30
21 changed files with 851 additions and 1126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue
View File

@@ -66,6 +66,11 @@
</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-input v-model="form.max_emptypalletnum" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关联设备" prop="device_code">
<el-select

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

@@ -70,7 +70,7 @@
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
<!-- <el-button
slot="right"
class="filter-item"
size="mini"
@@ -79,7 +79,7 @@
@click="reload"
>
同步
</el-button>
</el-button> -->
</crudOperation>
<!--表单组件-->
<el-dialog

1175
acs/nladmin-ui/src/views/acs/monitor/device/index.vue
View File

File diff suppressed because it is too large Load Diff

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

@@ -68,7 +68,7 @@
>
新增
</el-button>
<el-button
<!-- <el-button
slot="right"
class="filter-item"
size="mini"
@@ -77,7 +77,7 @@
@click="reload"
>
同步
</el-button>
</el-button> -->
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="500px">

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

@@ -16,7 +16,7 @@
<!-- <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="trace_id" label="链路追踪" /> -->
<el-table-column prop="trace_id" label="链路追踪" />
<el-table-column prop="task_code" label="任务编号" />
<el-table-column prop="instruct_code" label="指令编号" />
<el-table-column prop="method" label="方法" />

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

@@ -14,14 +14,11 @@
:show-close="false"
:modal="false"
>
<el-table :data="arr" style="width: 100%" max-height="500px">
<el-table-column label="长字符串字段">
<template slot-scope="scope">
<span style="white-space: normal;">{{ scope.row.longStringField }}</span>
</template>
</el-table-column>
<!-- 其他表格列 -->
</el-table>
<el-table
:data="arr"
style="width: 100%"
max-height="500px"
>
<el-table-column
prop="name"
label="监控项"
@@ -186,7 +183,7 @@ export default {
size: 5
},
background: {
backgroundImage: 'url("data:image/svg+xml;base64,PH`N2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")',
backgroundImage: 'url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")',
backgroundRepeat: 'repeat'
},
isSilentMode: true,
@@ -473,10 +470,9 @@ export default {
const obj = { name: '行走列', value: data[val] }
this.arr.push(obj)
} else if (val === 'task1') {
const obj = { name: '前工位任务', value: data[val] }
const obj = { name: '前工位任务号', value: data[val] }
this.arr.push(obj)
}
else if (val === 'task2') {
} else if (val === 'task2') {
const obj = { name: '后工位任务号', value: data[val] }
this.arr.push(obj)
} else if (val === 'labeling_qty') {
@@ -512,44 +508,7 @@ export default {
} else if (val === 'qty') {
const obj = { name: '数量', value: data[val] }
this.arr.push(obj)
} else if (val === 'phase') {
const obj = { name: 'AGV交互', value: data[val] }
this.arr.push(obj)
} else if (val === 'x') {
const obj = { name: 'X坐标', value: data[val] }
this.arr.push(obj)
} else if (val === 'y') {
const obj = { name: 'Y坐标', value: data[val] }
this.arr.push(obj)
} else if (val === 'angle') {
const obj = { name: '角度', value: data[val] }
this.arr.push(obj)
} else if (val === 'phase_name') {
const obj = { name: 'AGV交互名称', value: data[val] }
this.arr.push(obj)
} else if (val === 'status_name') {
const obj = { name: '状态', value: data[val] }
this.arr.push(obj)
} else if (val === 'electricity') {
const obj = { name: '电量', value: data[val] }
this.arr.push(obj)
} else if (val === 'fault') {
const obj = { name: '异常', value: data[val] }
this.arr.push(obj)
} else if (val === 'task_code') {
const obj = { name: '当前执行任务号', value: data[val] }
this.arr.push(obj)
}else if (val==='modeName'){
const obj = { name: '模式名称', value: data[val] }
this.arr.push(obj)
}
else if (val==='requireSucess1'){
const obj = { name: '请求成功标记', value: data[val] }
this.arr.push(obj)
}
// const obj = { name: '请求成功标记', value: data[requireSucess1] }
// this.arr.push(obj)
}
}
// console.log('arr:', this.arr)