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

rev:现场问题优化

Browse Source
This commit is contained in:
tuqiang
2025-02-27 10:37:53 +08:00
parent f966c662f0
commit 00dc8a08f3
24 changed files with 423 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
acs2/nladmin-ui/src/assets/images/1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

8
acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue
View File

@@ -14,7 +14,7 @@
</template>
<script>
import Logo from '@/assets/images/newloge.png'
import Logo from '@/assets/images/1.png'
import variables from '@/assets/styles/variables.scss'
export default {
name: 'SidebarLogo',
@@ -26,7 +26,7 @@ export default {
},
data() {
return {
title: '山东金宝铜箔ACS系统',
title: '山东金宝ACS系统',
logo: Logo,
title_param: 'platform'
}
@@ -65,8 +65,8 @@ export default {
width: 100%;
& .sidebar-logo {
width: 55px;
height: 15px;
width: 75px;
height: 50px;
vertical-align: middle;
margin-right: 6px;
}

3
acs2/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue
View File

@@ -242,8 +242,7 @@ export default {
rules: {},
region: [
{ region_name: '区域一', region_number: '1' },
{ region_name: '区域二', region_number: '2' },
{ region_name: '区域三', region_number: '3' }
{ region_name: '区域二', region_number: '2' }
]
}
},

104
acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
View File

@@ -43,7 +43,7 @@
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
<el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Task_status')">
@@ -57,7 +57,7 @@
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
<el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Task_type')">
@@ -71,7 +71,7 @@
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
<el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Origin_or_destination')">
@@ -86,7 +86,7 @@
/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.time')">
<Search />
<Search/>
</el-form-item>
</el-form>
<!-- <el-input-->
@@ -125,7 +125,7 @@
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item v-if="false" label="任务标识" prop="task_id">
<el-input v-model="form.task_id" style="width: 370px;" />
<el-input v-model="form.task_id" style="width: 370px;"/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Material_type')">
<el-select
@@ -251,18 +251,21 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('task.select.Priority')">
<el-input v-model="form.priority" style="width: 370px;" />
<el-input v-model="form.priority" style="width: 370px;"/>
</el-form-item>
<el-form-item :label="$t('task.select.Vehicle_number')">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
<el-input v-model="form.vehicle_code" style="width: 370px;"/>
</el-form-item>
<el-form-item :label="$t('task.select.Description')" prop="description">
<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">
<el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{
$t('task.select.Confirm')
}}
</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -274,13 +277,16 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<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="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
<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="vehicle_code" :label="$t('task.txt_box.Vehicle_number')"/>
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
debugger
<template slot-scope="scope">
<span v-if="scope.row.class_type!=null && scope.row.class_type.length===2 ">{{ dict.label.task_type[scope.row.class_type] }}</span>
<span v-if="scope.row.class_type!=null && scope.row.class_type.length===2 ">{{
dict.label.task_type[scope.row.class_type]
}}</span>
<span v-else>{{ dict.label.task_type[scope.row.task_type] }}</span>
</template>
</el-table-column>
@@ -292,22 +298,30 @@
<span v-if="scope.row.task_status=='3' ">{{ $t('task.select.Cancel') }}</span>
</template>
</el-table-column>
<el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" :min-width="flexWidth('priority',crud.data,$t('TaskRecord.table.Priority'))" />
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))" />
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))" />
<el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))" />
<el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))" />
<el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" :show-overflow-tooltip="true" width="150px" />
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
<el-table-column prop="remark" :label="$t('task.select.Remark')" />
<el-table-column prop="create_by" :label="$t('task.select.Creator')" />
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" />
<el-table-column prop="update_by" :label="$t('TaskRecord.table.Update_by')" :min-width="flexWidth('update_by',crud.data,$t('TaskRecord.table.Update_by'))" />
<el-table-column prop="update_time" :label="$t('TaskRecord.table.Update_time')" :min-width="flexWidth('update_time',crud.data,$t('task.select.Update_time'))" />
<el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')"
:min-width="flexWidth('priority',crud.data,$t('TaskRecord.table.Priority'))"/>
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')"
:min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))"/>
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')"
:min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))"/>
<el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')"
:min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))"/>
<el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')"
:min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))"/>
<el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')"
:show-overflow-tooltip="true" width="150px"/>
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')"/>
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')"/>
<el-table-column prop="remark" :label="$t('task.select.Remark')"/>
<el-table-column prop="create_by" :label="$t('task.select.Creator')"/>
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135"/>
<el-table-column prop="update_by" :label="$t('TaskRecord.table.Update_by')"
:min-width="flexWidth('update_by',crud.data,$t('TaskRecord.table.Update_by'))"/>
<el-table-column prop="update_time" :label="$t('TaskRecord.table.Update_time')"
:min-width="flexWidth('update_time',crud.data,$t('task.select.Update_time'))"/>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
</div>
</template>
@@ -315,14 +329,14 @@
<script>
import Search from '@/views/lucene/time'
import crudTask from '@/api/acs/task/task'
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 deviceCrud from '@/api/acs/device/device'
import routeCurd from '@/api/acs/route/routePlan'
import { getDicts } from '@/views/system/dict/dict'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import {getDicts} from '@/views/system/dict/dict'
import {download} from '@/api/data'
import {downloadFile} from '@/utils'
const defaultForm = {
task_id: null,
@@ -347,7 +361,7 @@ const defaultForm = {
}
export default {
name: 'Task',
components: { pagination, crudOperation, Search },
components: {pagination, crudOperation, Search},
dicts: ['task_status', 'task_type'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -356,8 +370,8 @@ export default {
url: 'api/task/getAll',
idField: 'task_id',
sort: 'task_id,desc',
query: { is_over: '1' },
crudMethod: { ...crudTask },
query: {is_over: '1'},
crudMethod: {...crudTask},
optShow: {}
})
},
@@ -424,28 +438,28 @@ export default {
},
rules: {
start_point_code: [
{ required: true, message: '起点不能为空', trigger: 'change' }
{required: true, message: '起点不能为空', trigger: 'change'}
],
next_point_code: [
{ required: true, message: '终点不能为空', trigger: 'change' }
{required: true, message: '终点不能为空', trigger: 'change'}
],
from_y: [
{ validator: checkFromY, trigger: 'change' }
{validator: checkFromY, trigger: 'change'}
],
from_z: [
{ validator: checkFromZ, trigger: 'change' }
{validator: checkFromZ, trigger: 'change'}
],
to_y: [
{ validator: checkToY, trigger: 'change' }
{validator: checkToY, trigger: 'change'}
],
to_z: [
{ validator: checkToZ, trigger: 'change' }
{validator: checkToZ, trigger: 'change'}
]
}
}
},
watch: {
rangeDate: function(newVal, oldVal) {
rangeDate: function (newVal, oldVal) {
if (newVal !== null) {
this.tableParams.beginDate = newVal[0]
this.tableParams.endDate = newVal[1]
@@ -495,9 +509,11 @@ export default {
vehicle_code: this.query.vehicle_code,
material_type: this.query.material_type,
status: this.query.status,
point_code: this.crud.pointCode,
createTime: this.crud.createTime,
end_time: this.crud.endTime // 假设 this.crud.endTime 是你的结束时间
point_code: this.query.point_code,
}
if (this.crud.query.createTime !== undefined) {
params.createTime = this.crud.query.createTime[0]
params.end_time = this.crud.query.createTime[1]
}
const url = 'api/task/downloadTaskLogging'
download(url, params).then(result => {

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

@@ -114,30 +114,12 @@
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="1100px">
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="600px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="135px">
<el-row>
<el-col :span="12">
<div class="grid-content bg-purple"/>
<el-form-item v-if="false" label="任务标识" prop="task_id">
<el-input v-model="form.task_id" style="width: 240px;"/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Material_type')">
<el-select
v-model="form.material"
style="width: 370px;"
filterable
:placeholder="$t('task.select.Placeholder')"
@change="isDisabled=false"
>
<el-option
v-for="item in dict.material_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Task_type')">
<el-select
v-model="form.task_type"
@@ -188,23 +170,23 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.agv_action_type')">
<el-select
v-model="form.agv_action_type"
style="width: 370px;"
filterable
:placeholder="$t('task.select.Placeholder')"
default-first-option
@change="isDisabled=false"
>
<el-option
v-for="item in agvActionList"
:key="item.key"
:label="item.key"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="路由方案">
<el-select
v-model="form.route_plan_code"
style="width: 370px;"
filterable
placeholder="请选择"
default-first-option
@change="isDisabled=false"
>
<el-option
v-for="item in routeList"
:key="item.plan_code"
:label="item.plan_name"
:value="item.plan_code"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.select.Start_point')" prop="start_point_code">
<el-select
v-model="form.start_point_code"
@@ -304,11 +286,6 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="grid-content bg-purple-light"/>
<el-form-item v-show="start_flag" :label="$t('task.select.Starting_column')" prop="from_y2">
<el-select
v-model="form.from_y2"
@@ -381,9 +358,6 @@
<el-form-item :label="$t('task.txt_box.Vehicle_number')">
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">

1
acs2/nladmin-ui/src/views/lucene/time.vue
View File

@@ -10,6 +10,7 @@
:range-separator="$t('monitor.lucence.until')"
:start-placeholder="$t('auto.common.startDate')"
:end-placeholder="$t('auto.common.endDate')"
value-format="yyyy-MM-dd HH:mm:ss"
align="right"
/>
<rrOperation />