~zhoushihao/YiWuProject.git

			@@ -210,40 +210,24 @@
			label: t('sorter.straighttasks'),
			}
			]
			function getStatusTypea(taskRunning) {
			switch (taskRunning) {
			case 0:
			return 'info';
			function getStatusTypea(taskType) {
			switch (taskType) {
			case 1:
			return 'success';
			return 'info';
			case 2:
			return 'success';
			case 3:
			return 'success';
			case 4:
			return 'success';
			case 5:
			return 'danger';
			case 6:
			return 'info';
			}
			}
			function getStatusTexta(taskRunning) {
			switch (taskRunning) {
			case 0:
			return t('sorter.emptymissions');
			function getStatusTexta(taskType) {
			switch (taskType) {
			case 1:
			return t('sorter.advancetask');
			case 2:
			return t('sorter.outputtasks');
			case 3:
			return t('sorter.straighttasks');
			case 4:
			return t('searchOrder.infilm');
			case 5:
			return t('sorter.endingtask');
			case 6:
			return t('sorter.another');
			}
			}
			function getStatusTypeb(taskState) {
			@@ -252,34 +236,14 @@
			return 'info';
			case 1:
			return 'success';
			case 2:
			return 'success';
			case 3:
			return 'success';
			case 4:
			return 'success';
			case 5:
			return 'danger';
			case 6:
			return 'info';
			}
			}
			function getStatusTextb(taskState) {
			switch (taskState) {
			case 0:
			return t('sorter.emptymissions');
			return t('searchOrder.empty');
			case 1:
			return t('sorter.advancetask');
			case 2:
			return t('sorter.outputtasks');
			case 3:
			return t('sorter.straighttasks');
			case 4:
			return t('searchOrder.infilm');
			case 5:
			return t('sorter.endingtask');
			case 6:
			return t('sorter.another');
			return t('searchOrder.endtask');
			}
			}
			// 格式化时间戳为年月日时间字符串的函数
			@@ -359,35 +323,10 @@
			<el-table height="90" ref="table"
			@selection-change="handleSelectionChange"
			:data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
			<el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
			<el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
			<el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
			<el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
			<el-table-column prop="startCell" align="center" :label="$t('processCard.layer')" min-width="120" />
			<el-table-column
			align="center"
			:label="$t('sorter.place')"
			min-width="80"
			prop="inPlace"
			>
			<template #default="scope">
			<el-tag
			:type="scope.row.inPlace === 1 ? 'success' : 'warning'"
			>
			{{ scope.row.inPlace === 1 ? $t('sorter.inPlace') : $t('sorter.ninPlace') }}
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column
			align="center"
			:label="$t('sorter.taskRunning')"
			min-width="80"
			prop="taskRunning"
			>
			<template #default="scope">
			<el-tag :type="getStatusTypea(scope.row.taskRunning)">
			{{ getStatusTexta(scope.row.taskRunning) }}
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column
			align="center"
			:label="$t('film.taskstatus')"
			@@ -397,6 +336,18 @@
			<template #default="scope">
			<el-tag :type="getStatusTypeb(scope.row.taskState)">
			{{ getStatusTextb(scope.row.taskState) }}
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column
			align="center"
			:label="$t('film.enabletype')"
			min-width="80"
			prop="taskType"
			>
			<template #default="scope">
			<el-tag :type="getStatusTypea(scope.row.taskType)">
			{{ getStatusTexta(scope.row.taskType) }}
			</el-tag>
			</template>
			</el-table-column>
			@@ -458,35 +409,10 @@
			}}</el-button>
			</div>
			<el-table ref="table" style="margin-top: 20px;height: 650px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
			<el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
			<el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
			<el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
			<el-table-column prop="startCell" align="center" :label="$t('processCard.layer')" min-width="120" />
			<el-table-column
			align="center"
			:label="$t('sorter.place')"
			min-width="80"
			prop="inPlace"
			>
			<template #default="scope">
			<el-tag
			:type="scope.row.inPlace === 1 ? 'success' : 'warning'"
			>
			{{ scope.row.inPlace === 1 ? $t('sorter.inPlace') : $t('sorter.ninPlace') }}
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column
			align="center"
			:label="$t('sorter.taskRunning')"
			min-width="80"
			prop="taskRunning"
			>
			<template #default="scope">
			<el-tag :type="getStatusTypea(scope.row.taskRunning)">
			{{ getStatusTexta(scope.row.taskRunning) }}
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column
			align="center"
			:label="$t('film.taskstatus')"
			@@ -499,6 +425,18 @@
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column
			align="center"
			:label="$t('film.enabletype')"
			min-width="80"
			prop="taskType"
			>
			<template #default="scope">
			<el-tag :type="getStatusTypea(scope.row.taskType)">
			{{ getStatusTexta(scope.row.taskType) }}
			</el-tag>
			</template>
			</el-table-column>
			<el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="120" />
			<el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
			</el-table>