projects/mes-zjl #67

Merged
juzi merged 3 commits from projects/mes-zjl into projects/mes-test 2023-11-07 16:01:51 +08:00
19 changed files with 165 additions and 76 deletions

View File

@ -13,8 +13,8 @@ VUE_APP_TITLE = MES系统
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://100.64.0.26:48082' # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
# VUE_APP_BASE_API = 'http://192.168.0.33:48082' VUE_APP_BASE_API = 'http://192.168.0.33:48082'
VUE_APP_BASE_API = 'http://192.168.4.173:48080' # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
# VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
# VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48080'
# VUE_APP_BASE_API = 'http://192.168.1.8:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080'

View File

@ -2,14 +2,14 @@
ENV = 'production' ENV = 'production'
# 页面标题 # 页面标题
VUE_APP_TITLE = 产线监控系统 VUE_APP_TITLE = MES系统
# 芋道管理系统/生产环境 # 芋道管理系统/生产环境
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/prod-api'
# 根据服务器或域名修改 # 根据服务器或域名修改
# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/' # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
PUBLIC_PATH = 'http://192.168.0.33:8888/' PUBLIC_PATH = 'http://192.168.0.33:8889/'
# 二级部署路径 # 二级部署路径
VUE_APP_APP_NAME ='yudao-admin' VUE_APP_APP_NAME ='yudao-admin'

View File

@ -154,11 +154,13 @@ export default {
padding: 8px 8px 8px 40px; padding: 8px 8px 8px 40px;
.title { .title {
height: 16px; height: 16px;
font-size: 14px;
font-weight: 600; font-weight: 600;
color: rgba(0,0,0,0.85); color: rgba(0,0,0,0.85);
} }
.text { .text {
height: 16px; height: 16px;
font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(102,102,102,0.75); color: rgba(102,102,102,0.75);
} }

View File

@ -39,7 +39,7 @@
</el-col> </el-col>
<el-col :span='12'> <el-col :span='12'>
<el-form-item label="装车产品" prop="productId"> <el-form-item label="装车产品" prop="productId">
<el-select v-model="form.productId" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.productId" disabled placeholder="请选择" style="width: 100%;">
<el-option <el-option
v-for="item in productList" v-for="item in productList"
:key="item.id" :key="item.id"
@ -79,6 +79,7 @@
<script> <script>
import { getProductAll } from '@/api/base/product' import { getProductAll } from '@/api/base/product'
import { deliveryLogDetCreate } from '@/api/base/delivery' import { deliveryLogDetCreate } from '@/api/base/delivery'
import { orderDetail } from '@/api/base/orderManage'
export default { export default {
name: 'LoadedPage', name: 'LoadedPage',
data() { data() {
@ -107,16 +108,25 @@ export default {
} }
}, },
methods: { methods: {
init(id, code) { init(id, code, orderId) {
this.getSelectList() this.getSelectList()
this.form.logId = id this.form.logId = id
this.code = code this.code = code
this.getProductId(orderId)
}, },
getSelectList() { getSelectList() {
getProductAll().then(res => { getProductAll().then(res => {
this.productList = res.data || [] this.productList = res.data || []
}) })
}, },
//
getProductId(orderId) {
orderDetail({
id: orderId
}).then(res => {
this.form.productId = res.data.planProductId || ''
})
},
submitForm() { submitForm() {
this.$refs['addOrUpdate'].validate((valid) => { this.$refs['addOrUpdate'].validate((valid) => {
if (valid) { if (valid) {

View File

@ -119,7 +119,8 @@ export default {
{ {
type: 'input', type: 'input',
label: '订单名', label: '订单名',
param: 'orderName' param: 'orderName',
defaultSelect: ''
}, },
{ {
type: 'input', type: 'input',
@ -138,10 +139,10 @@ export default {
color: 'primary' color: 'primary'
}, },
{ {
type: 'separate' type: this.$auth.hasPermi('extend:delivery-log:create') ? 'separate' : '',
}, },
{ {
type: 'button', type: this.$auth.hasPermi('extend:delivery-log:create') ? 'button' : '',
btnName: '新增', btnName: '新增',
name: 'add', name: 'add',
color: 'success', color: 'success',
@ -161,25 +162,25 @@ export default {
tableH: this.tableHeight(260), tableH: this.tableHeight(260),
total: 0, total: 0,
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('extend:delivery-log:loaded')
? { ? {
type: 'loaded', type: 'loaded',
btnName: '装车' btnName: '装车'
} }
: undefined, : undefined,
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('extend:delivery-log:detail')
? { ? {
type: 'detail', type: 'detail',
btnName: '详情' btnName: '详情'
} }
: undefined, : undefined,
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('extend:delivery-log:update')
? { ? {
type: 'edit', type: 'edit',
btnName: '编辑' btnName: '编辑'
} }
: undefined, : undefined,
this.$auth.hasPermi('base:group-team:delete') this.$auth.hasPermi('extend:delivery-log:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除' btnName: '删除'
@ -196,10 +197,32 @@ export default {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.tableH = this.tableHeight(260) this.tableH = this.tableHeight(260)
}) })
if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1]
this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1])
} else {
this.formConfig[0].defaultSelect = ''
}
this.queryParams.orderName = this.formConfig[0].defaultSelect
this.getList(); this.getList();
}, },
components: { AddOrUpdate, LoadedPage, DeliveryLogDetail }, components: { AddOrUpdate, LoadedPage, DeliveryLogDetail },
watch: {
$route: 'initData'
},
methods: { methods: {
initData(to) {
if (to.name === 'DeliveryLog') {
if (location.href.indexOf('?') > 0) {
let arr = location.href.split('?')[1]
this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1])
} else {
this.formConfig[0].defaultSelect = ''
}
this.queryParams.orderName = this.formConfig[0].defaultSelect
this.getList()
}
},
getList() { getList() {
deliveryLogPage({...this.queryParams}).then(res => { deliveryLogPage({...this.queryParams}).then(res => {
this.list = res.data.list || [] this.list = res.data.list || []
@ -236,7 +259,7 @@ export default {
case 'loaded': case 'loaded':
this.centervisible2 = true this.centervisible2 = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.loadedPage.init(val.data.id, val.data.code) this.$refs.loadedPage.init(val.data.id, val.data.code, val.data.orderId)
}) })
break break
default: default:

View File

@ -379,12 +379,14 @@ export default {
padding: 8px 8px 8px 40px; padding: 8px 8px 8px 40px;
.blodTip { .blodTip {
height: 16px; height: 16px;
font-size: 14px;
font-weight: 600; font-weight: 600;
color: rgba(0,0,0,0.85); color: rgba(0,0,0,0.85);
margin-bottom: 8px; margin-bottom: 8px;
} }
.lightTip { .lightTip {
height: 16px; height: 16px;
font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(102,102,102,0.75); color: rgba(102,102,102,0.75);
} }
@ -415,11 +417,13 @@ export default {
padding: 8px 8px 8px 40px; padding: 8px 8px 8px 40px;
.title { .title {
height: 16px; height: 16px;
font-size: 14px;
font-weight: 600; font-weight: 600;
color: rgba(0,0,0,0.85); color: rgba(0,0,0,0.85);
} }
.text { .text {
height: 16px; height: 16px;
font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(102,102,102,0.75); color: rgba(102,102,102,0.75);
} }

View File

@ -61,7 +61,7 @@ const tableProps = [
}, },
{ {
prop: 'rate', prop: 'rate',
label: '累积发货比例%' label: '累积发货比例(%)'
} }
] ]
export default { export default {
@ -92,7 +92,7 @@ export default {
tableH: this.tableHeight(260), tableH: this.tableHeight(260),
total: 0, total: 0,
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('extend:delivery-log-det:detail')
? { ? {
type: 'detail', type: 'detail',
btnName: '详情' btnName: '详情'

View File

@ -92,7 +92,7 @@ export default {
color: 'primary' color: 'primary'
}, },
{ {
type: 'separate' type: this.$auth.hasPermi('base:energy-type:create') ? 'separate' : '',
}, },
{ {
type: this.$auth.hasPermi('base:energy-type:create') ? 'button' : '', type: this.$auth.hasPermi('base:energy-type:create') ? 'button' : '',

View File

@ -62,8 +62,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="消耗量阈值" prop="limitValue"> <el-form-item label="消耗量阈值">
<el-input-number v-model="form.limitValue" :min="0" :max="10000000000000000" style="width: 100%;"></el-input-number> <el-input-number v-model="form.minValue" placeholder="最小值" :max="10000000000000000" style="width: 50%;"></el-input-number>
<el-input-number v-model="form.maxValue" placeholder="最大值" :max="10000000000000000" style="width: 50%;"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -96,14 +97,16 @@ export default {
type: '', type: '',
plcParamId: '', plcParamId: '',
limitType: '', limitType: '',
limitValue: '' minValue: null,
maxValue: null
}, },
objIds: [],// objIds: [],//
isEdit: false, // isEdit: false, //
rules: { rules: {
objectId: [{ required: true, message: '对象不能为空', trigger: 'change' }], objectId: [{ required: true, message: '对象不能为空', trigger: 'change' }],
energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }], energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
type: [{ required: true, message: '监控模式不能为空', trigger: 'change' }] type: [{ required: true, message: '监控模式不能为空', trigger: 'change' }],
limitType: [{ required: true, message: '指标类型不能为空', trigger: 'change' }]
}, },
detailList: [] detailList: []
} }
@ -199,6 +202,12 @@ export default {
this.$modal.msgError("监控模式为详细时,详细参数为必填"); this.$modal.msgError("监控模式为详细时,详细参数为必填");
return false return false
} }
if (this.form.minValue && this.form.maxValue) {
if (this.form.minValue > this.form.maxValue) {
this.$modal.msgError("消耗量阈值,最小值不能大于最大值");
return false
}
}
// this.form.limitType = Number(this.form.limitType) // this.form.limitType = Number(this.form.limitType)
if (this.isEdit) { if (this.isEdit) {
// //
@ -223,6 +232,10 @@ export default {
}, },
formClear() { formClear() {
this.$refs.form.resetFields() this.$refs.form.resetFields()
this.form.type = ''
this.form.plcParamId = ''
this.form.minValue = null
this.form.maxValue = null
this.objIds = '' this.objIds = ''
this.detailList = [] this.detailList = []
this.isEdit = false this.isEdit = false

View File

@ -37,6 +37,7 @@
@cancel="handleCancel" @cancel="handleCancel"
@confirm="handleConfirm" @confirm="handleConfirm"
:before-close="handleCancel" :before-close="handleCancel"
width='60%'
> >
<energy-limit-add ref="energyLimit" @successSubmit="successSubmit" :energyTypeList="energyTypeList" :objList="objList"/> <energy-limit-add ref="energyLimit" @successSubmit="successSubmit" :energyTypeList="energyTypeList" :objList="objList"/>
</base-dialog> </base-dialog>
@ -199,6 +200,15 @@ export default {
item.type = i.label item.type = i.label
} }
}) })
if (item.minValue && item.maxValue) {
item.limitValue = item.minValue + '-' + item.maxValue
} else if(item.minValue){
item.limitValue = '最小值' + item.minValue
}else if(item.maxValue){
item.limitValue = '最大值' + item.maxValue
} else {
item.limitValue = ''
}
}) })
this.list = arr this.list = arr
this.total = response.data.total; this.total = response.data.total;

View File

@ -136,6 +136,15 @@ export default {
item.type = i.name item.type = i.name
} }
}) })
if (item.minValue && item.maxValue) {
item.limitValue = item.minValue + '-' + item.maxValue
} else if(item.minValue){
item.limitValue = '最小值' + item.minValue
}else if(item.maxValue){
item.limitValue = '最大值' + item.maxValue
} else {
item.limitValue = ''
}
}) })
this.list = arr this.list = arr
this.total = response.data.total; this.total = response.data.total;

View File

@ -121,8 +121,9 @@ export default {
this.tableH = this.tableHeight(260) this.tableH = this.tableHeight(260)
this.isFold = this.searchBarWidth('energyReportSearchBox', 1180) this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
}) })
if (this.$route.params.startTime && this.$route.params.endTime) { if (location.href.indexOf('?') > 0) {
this.formConfig[2].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime] let arr = location.href.split('?')[1].split('&')
this.formConfig[2].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
} else { } else {
this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()] this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
} }
@ -138,8 +139,9 @@ export default {
methods: { methods: {
initData(to) { initData(to) {
if (to.name === 'EnergyReportSearch') { if (to.name === 'EnergyReportSearch') {
if (this.$route.params.startTime && this.$route.params.endTime) { if (location.href.indexOf('?') > 0) {
this.formConfig[2].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime] let arr = location.href.split('?')[1].split('&')
this.formConfig[2].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
} else { } else {
this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()] this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
} }

View File

@ -115,7 +115,7 @@ export default {
type: 'select', type: 'select',
label: '能源类型', label: '能源类型',
selectOptions: [], selectOptions: [],
param: 'objType', param: 'energyTypeId',
filterable: true, filterable: true,
width: 120, width: 120,
clearable: false clearable: false
@ -126,7 +126,7 @@ export default {
selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE), selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
labelField: 'label', labelField: 'label',
valueField: 'value', valueField: 'value',
param: 'energyTypeId', param: 'objType',
width: 100, width: 100,
clearable: false clearable: false
}, },

View File

@ -16,10 +16,10 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<span class="separateStyle"></span> <span class="separateStyle" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="small" :disabled="showSetting || settingBtnDis" @click="settingMsg">设置</el-button> <el-button type="primary" size="small" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')" :disabled="showSetting || settingBtnDis" @click="settingMsg">设置</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="small" v-show="showSetting && autoScheduling" @click="schedulingBtn">自动排班</el-button> <el-button type="primary" size="small" v-show="showSetting && autoScheduling" @click="schedulingBtn">自动排班</el-button>
@ -285,21 +285,22 @@ export default {
switch (val) { switch (val) {
case '1': case '1':
this.$router.push({ this.$router.push({
// path: '/core/monitoring/production-line-data', path: '/core/enhance/product-line-24h?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
name: 'ProductionLineData', // name: 'ProductionLineData',
params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime } // params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
}) })
break; break;
case '2': // case '2': //
this.$router.push({ this.$router.push({
name: 'EnergyReportSearch', path: '/energy/monitoring/energy-report-search?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime } // name: 'EnergyReportSearch',
// params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
}) })
break; break;
default: default:
this.$router.push({ this.$router.push({
// path: '/quality/monitoring/quality-statistics', path: '/quality/monitoring/quality-statistics',
name: 'QualityStatistics', // name: 'QualityStatistics',
params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime } params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
}) })
} }

View File

@ -49,12 +49,6 @@ const tableProps = [
label: '上班次数' label: '上班次数'
} }
] ]
const tableBtn = [
{
type: 'detail',
btnName: '详情'
}
]
export default { export default {
name: 'GroupTeamView', name: 'GroupTeamView',
data() { data() {
@ -82,7 +76,14 @@ export default {
}, },
workOrderList: [], workOrderList: [],
workOrderName: '', workOrderName: '',
tableBtn, tableBtn: [
this.$auth.hasPermi('base:group-team-view:detail')
? {
type: 'detail',
btnName: '详情'
}
: undefined
].filter((v) => v),
tableProps, tableProps,
tableH: this.tableHeight(220), tableH: this.tableHeight(220),
list: [], list: [],

View File

@ -72,12 +72,6 @@ const tableProps = [
showOverflowtooltip: true showOverflowtooltip: true
} }
] ]
const tableBtn = [
{
type: 'viewDetail',
btnName: '查看生产情况'
}
]
export default { export default {
name: 'GroupTeamScheduling', name: 'GroupTeamScheduling',
data() { data() {
@ -98,13 +92,14 @@ export default {
{ {
type: 'datePicker', type: 'datePicker',
label: '上班日期', label: '上班日期',
dateType: 'date', dateType: 'daterange',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
valueFormat: 'yyyy-MM-dd', valueFormat: 'yyyy-MM-dd',
rangeSeparator: '-',
// valueFormat: "timestamp", // valueFormat: "timestamp",
param: 'startDay', param: 'tiemStr',
defaultSelect: '', defaultSelect: '',
width: 200 width: 250
}, },
{ {
type: 'button', type: 'button',
@ -119,10 +114,17 @@ export default {
pageSize: 20, pageSize: 20,
classesId: '', classesId: '',
teamName: '', teamName: '',
startDay: '' startDay: []
}, },
tableProps, tableProps,
tableBtn, tableBtn: [
this.$auth.hasPermi('base:team-production:detail')
? {
type: 'viewDetail',
btnName: '查看生产情况'
}
: undefined
].filter((v) => v),
list: [], list: [],
tableH: this.tableHeight(260), tableH: this.tableHeight(260),
total: 0, total: 0,
@ -142,7 +144,8 @@ export default {
this.queryParams.pageNo = 1; this.queryParams.pageNo = 1;
this.queryParams.classesId = val.classesId this.queryParams.classesId = val.classesId
this.queryParams.teamName = val.teamName this.queryParams.teamName = val.teamName
this.queryParams.startDay = val.startDay this.queryParams.startDay[0] = val.tiemStr ? val.tiemStr[0] + ' 00:00:00' : ''
this.queryParams.startDay[1] = val.tiemStr ? val.tiemStr[1] + ' 23:59:59' : ''
this.getList() this.getList()
}, },
getList() { getList() {

View File

@ -165,10 +165,10 @@ export default {
color: 'primary' color: 'primary'
}, },
{ {
type: 'separate' type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
}, },
{ {
type: 'button', type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
btnName: '新增', btnName: '新增',
name: 'add', name: 'add',
color: 'success', color: 'success',
@ -188,31 +188,31 @@ export default {
list: [], list: [],
tableH: this.tableHeight(260), tableH: this.tableHeight(260),
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('base:order-manage:addWorkOrder')
? { ? {
type: 'add', type: 'add',
btnName: '新增工单' btnName: '新增工单'
} }
: undefined, : undefined,
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('base:order-manage:bindWorkOrder')
? { ? {
type: 'bind', type: 'bind',
btnName: '绑定工单' btnName: '绑定工单'
} }
: undefined, : undefined,
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('base:order-manage:detail')
? { ? {
type: 'detail', type: 'detail',
btnName: '详情' btnName: '详情'
} }
: undefined, : undefined,
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('base:order-manage:edit')
? { ? {
type: 'edit', type: 'edit',
btnName: '编辑' btnName: '编辑'
} }
: undefined, : undefined,
this.$auth.hasPermi('base:group-team:delete') this.$auth.hasPermi('base:order-manage:delete')
? { ? {
type: 'delete', type: 'delete',
btnName: '删除' btnName: '删除'
@ -292,7 +292,7 @@ export default {
this.handleDelete(val.data) this.handleDelete(val.data)
break break
case 'detail': case 'detail':
this.$router.push({ name: 'OrderDetailData', params: { orderId: val.data.id }}) this.$router.push({path: '/order/base/order-manage/order-detail-data?orderId='+ val.data.id})
break break
case 'add': case 'add':
this.workIssueTitle = '新增工单' this.workIssueTitle = '新增工单'

View File

@ -222,7 +222,7 @@ export default {
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
this.tableH = this.tableHeight(510) / 2 this.tableH = this.tableHeight(510) / 2
}) })
this.orderId = this.$route.params.orderId this.orderId = location.href.split('?')[1].split('=')[1]
this.getMsg() this.getMsg()
}, },
watch: { watch: {
@ -231,7 +231,7 @@ export default {
methods: { methods: {
initData(to) { initData(to) {
if (to.name === 'OrderDetailData') { if (to.name === 'OrderDetailData') {
this.orderId = this.$route.params.orderId this.orderId = location.href.split('?')[1].split('=')[1]
this.getMsg() this.getMsg()
} }
}, },

View File

@ -144,7 +144,7 @@ export default {
color: 'primary' color: 'primary'
} }
], ],
activeName: 'barChart', activeName: 'dataList',
// //
queryParams: { queryParams: {
pageNo: 1, pageNo: 1,
@ -157,19 +157,19 @@ export default {
tableH: this.tableHeight(270), tableH: this.tableHeight(270),
total: 0, total: 0,
tableBtn: [ tableBtn: [
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
? { ? {
type: 'orderDetail', type: 'orderDetail',
btnName: '工单详情' btnName: '工单详情'
} }
: undefined, : undefined,
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
? { ? {
type: 'qualityDetail', type: 'qualityDetail',
btnName: '质量详情' btnName: '质量详情'
} }
: undefined, : undefined,
this.$auth.hasPermi('base:group-team:update') this.$auth.hasPermi('base:order-completion-monitoring:sendOut')
? { ? {
type: 'sendOutDetail', type: 'sendOutDetail',
btnName: '发货详情' btnName: '发货详情'
@ -194,16 +194,14 @@ export default {
getPage() { getPage() {
orderMonitor({...this.queryParams}).then(res => { orderMonitor({...this.queryParams}).then(res => {
this.list = res.data || [] this.list = res.data || []
this.getPieChart() // this.getPieChart()
}) })
}, },
// //
getPieChart() { getPieChart() {
var chartDom = document.getElementById('orderPieBar'); var chartDom = document.getElementById('orderPieBar');
var myChart = echarts.init(chartDom); var myChart = echarts.init(chartDom);
var option; var option = {
option = {
color:['#288AFF','#7164FF','#fff','#63BDFF','#8EF0AB','#FFCE6A'], color:['#288AFF','#7164FF','#fff','#63BDFF','#8EF0AB','#FFCE6A'],
series: [ series: [
{ {
@ -311,13 +309,12 @@ export default {
show: false show: false
}, },
data: [ data: [
{ value: 1000, name: '5' }, { value: 800, name: '5' },
{ value: 1048, name: 'xxx' } { value: 1048, name: 'xxx' }
] ]
} }
] ]
} }
option && myChart.setOption(option) option && myChart.setOption(option)
}, },
// //
@ -331,9 +328,23 @@ export default {
} }
this.getPage() this.getPage()
}, },
handleClick() {} handleClick(val) {
console.log(val)
switch (val.type) {
case 'orderDetail':
break
case 'qualityDetail':
break
default:
this.$router.push({
path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
})
}
} }
} }
}
</script> </script>
<style lang='scss'> <style lang='scss'>
.orderMonitoring { .orderMonitoring {