测试问题修改4
This commit is contained in:
parent
1ae811604f
commit
3ec6ee836a
|
|
@ -58,7 +58,7 @@ export function delStaffApi(staffId) {
|
||||||
//更新员工人脸
|
//更新员工人脸
|
||||||
export function editStaffFaceStateApi(data) {
|
export function editStaffFaceStateApi(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/kitchen_staff_info/edit/face-state',
|
url: '/smart-canteen/kitchen_staff_info/edit/face-state',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -179,7 +179,13 @@
|
||||||
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="150"/>
|
<el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="150"/>
|
||||||
<el-table-column label="订单状态" align="center" prop="orderState" :show-overflow-tooltip="true" width="100">
|
<el-table-column label="订单状态" align="center" prop="orderState" :show-overflow-tooltip="true" width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.sm_order_status" :value="scope.row.orderState"/>
|
<!-- <dict-tag :options="dict.type.sm_order_status" :value="scope.row.orderState"/> -->
|
||||||
|
<span v-if="scope.row.orderState==1">已下单</span>
|
||||||
|
<span v-if="scope.row.orderState==2">已完成</span>
|
||||||
|
<span v-if="scope.row.orderState==3&&scope.row.payState==3">已退单</span>
|
||||||
|
<span v-if="scope.row.orderState==3&&scope.row.payState==4">已取消</span>
|
||||||
|
<span v-if="scope.row.orderState==4">待下单</span>
|
||||||
|
<span v-if="scope.row.orderState==5">部分退单</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
|
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
|
||||||
|
|
|
||||||
|
|
@ -183,7 +183,13 @@
|
||||||
<el-table-column label="下单时间" align="center" prop="orderTime" :show-overflow-tooltip="true" width="180"/>
|
<el-table-column label="下单时间" align="center" prop="orderTime" :show-overflow-tooltip="true" width="180"/>
|
||||||
<el-table-column label="订单状态" align="center" prop="orderState" :show-overflow-tooltip="true" width="100">
|
<el-table-column label="订单状态" align="center" prop="orderState" :show-overflow-tooltip="true" width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.sm_order_status" :value="scope.row.orderState"/>
|
<!-- <dict-tag :options="dict.type.sm_order_status" :value="scope.row.orderState"/> -->
|
||||||
|
<span v-if="scope.row.orderState==1">已下单</span>
|
||||||
|
<span v-if="scope.row.orderState==2">已完成</span>
|
||||||
|
<span v-if="scope.row.orderState==3&&scope.row.payState==3">已退单</span>
|
||||||
|
<span v-if="scope.row.orderState==3&&scope.row.payState==4">已取消</span>
|
||||||
|
<span v-if="scope.row.orderState==4">待下单</span>
|
||||||
|
<span v-if="scope.row.orderState==5">部分退单</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
|
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
|
||||||
|
|
|
||||||
|
|
@ -295,7 +295,21 @@ export default {
|
||||||
color: "#8C8C8C",
|
color: "#8C8C8C",
|
||||||
},
|
},
|
||||||
height: 50,
|
height: 50,
|
||||||
width:300
|
width:300,
|
||||||
|
formatter: function (name) {
|
||||||
|
let data = option.series[0].data;
|
||||||
|
let total = 0;
|
||||||
|
let tarValue;
|
||||||
|
for (let i = 0; i < data.length; i++) {
|
||||||
|
total += data[i].value;
|
||||||
|
if (data[i].name == name) {
|
||||||
|
tarValue = data[i].value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let v = tarValue;
|
||||||
|
let p = Math.round((tarValue / total) * 100); //占比
|
||||||
|
return `${name} (${p}%)`;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
series: [
|
series: [
|
||||||
{
|
{
|
||||||
|
|
@ -437,7 +451,21 @@ export default {
|
||||||
color: "#8C8C8C",
|
color: "#8C8C8C",
|
||||||
},
|
},
|
||||||
height: 50,
|
height: 50,
|
||||||
width:300
|
width:300,
|
||||||
|
formatter: function (name) {
|
||||||
|
let data = option.series[0].data;
|
||||||
|
let total = 0;
|
||||||
|
let tarValue;
|
||||||
|
for (let i = 0; i < data.length; i++) {
|
||||||
|
total += data[i].value;
|
||||||
|
if (data[i].name == name) {
|
||||||
|
tarValue = data[i].value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let v = tarValue;
|
||||||
|
let p = Math.round((tarValue / total) * 100); //占比
|
||||||
|
return `${name} (${p}%)`;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
series: [
|
series: [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -600,8 +600,10 @@ export default {
|
||||||
reset() {
|
reset() {
|
||||||
this.getCanteenList();
|
this.getCanteenList();
|
||||||
this.getKitchenDeviceSelect();
|
this.getKitchenDeviceSelect();
|
||||||
this.fileList = []//图片
|
this.fileList0 = []//图片
|
||||||
this.checkUrlList = []//图片
|
this.checkUrlList0 = []//图片
|
||||||
|
this.fileList1 = []//图片
|
||||||
|
this.checkUrlList1 = []//图片
|
||||||
this.fileList2 = []//图片
|
this.fileList2 = []//图片
|
||||||
this.checkUrlList2 = []//图片
|
this.checkUrlList2 = []//图片
|
||||||
this.accessAuthorityList = [{
|
this.accessAuthorityList = [{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue