需求修改

This commit is contained in:
蔡玲
2024-09-11 15:45:45 +08:00
parent 0b9ab4532c
commit 11c685a9bb
12 changed files with 299 additions and 351 deletions

View File

@@ -15,16 +15,16 @@
<table>
<thead>
<tr>
<th>{{$t('command.task-number')}}</th>
<th>{{$t('command.number')}}</th>
<th>{{$t('startequip')}}</th>
<th>{{$t('targetquip')}}</th>
<th>{{$t('state')}}</th>
<th>{{$t('command.vnumber')}}</th>
<th>{{$t('command.carcode')}}</th>
<th>{{$t('command.steps')}}</th>
<th>{{$t('command.priority')}}</th>
<th>{{$t('time')}}</th>
<th>任务号</th>
<th>指令号</th>
<th>起始设备</th>
<th>目标设备</th>
<th>状态</th>
<th>载具号</th>
<th>agv车号</th>
<th>指令执行步骤</th>
<th>优先级</th>
<th>时间</th>
</tr>
</thead>
<tbody>
@@ -33,7 +33,7 @@
<td>{{e.instruction_code}}</td>
<td>{{e.start_devicecode}}</td>
<td>{{e.next_devicecode}}</td>
<td>{{[$t('ready'), $t('progress'), $t('complete'), $t('cancel')][Number(e.inst_status)]}}</td>
<td>{{['就绪', '执行中', '完成', '取消'][Number(e.inst_status)]}}</td>
<td>{{e.carrier}}</td>
<td>{{e.carno}}</td>
<td>{{e.inst_step}}</td>
@@ -46,15 +46,15 @@
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handInst('1')">{{$t('command.revocation')}}</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handInst('2')">{{$t('command.reissue')}}</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handInst('3')">{{$t('command.forced')}}</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handInst('1')">指令撤销</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handInst('2')">重新下发</button>
<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handInst('3')">强制完成</button>
</view>
<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
<view class="msg_content">
<view class="zd-row border-bottom">
<view class="zd-col-6">
<span class="filter_label">{{$t('keyword')}}</span>
<span class="filter_label">关键字</span>
</view>
<view class="zd-col-17">
<input type="text" class="filter_input" v-model="val1">
@@ -62,7 +62,7 @@
</view>
<view class="zd-row border-bottom">
<view class="zd-col-6">
<span class="filter_label">{{$t('startequip')}}</span>
<span class="filter_label">起始设备</span>
</view>
<view class="zd-col-17">
<search-box
@@ -72,7 +72,7 @@
</view>
<view class="zd-row">
<view class="zd-col-6">
<span class="filter_label">{{$t('targetquip')}}</span>
<span class="filter_label">目标设备</span>
</view>
<view class="zd-col-17">
<search-box
@@ -82,9 +82,9 @@
</view>
</view>
<view class="zd-row submit-bar">
<button class="zd-col-7 button-default" @tap.stop="show = false">{{$t('button.cancel')}}</button>
<button class="zd-col-7 button-default" @tap.stop="clearUp">{{$t('button.empty')}}</button>
<button class="zd-col-7 button-primary" @tap="_handInsts">{{$t('button.search')}}</button>
<button class="zd-col-7 button-default" @tap.stop="show = false">取消</button>
<button class="zd-col-7 button-default" @tap.stop="clearUp">清空</button>
<button class="zd-col-7 button-primary" @tap="_handInsts">查询</button>
</view>
</view>
<view v-if="show" class="msg_mask"></view>
@@ -103,7 +103,7 @@
data() {
return {
show: false,
state: [{id:'-1', text: this.$t('whole')}, {id:'0', text: this.$t('ready')}, {id:'1', text: this.$t('progress')}, {id:'2', text: this.$t('complete')}, {id:'3', text: this.$t('cancel')}],
state: [{id:'-1', text: '全部'}, {id:'0', text: '就绪'}, {id:'1', text: '执行中'}, {id:'2', text: '完成'}, {id:'3', text: '取消'}],
tab: '-1',
title: '',
val1: '',