Compare commits

..

No commits in common. "80bacbcae5cc627009ae7db8fe4684d02f741e0d" and "f28b25cfe0ce82f36f7b5ff0782bc3fba92b401c" have entirely different histories.

34 changed files with 387 additions and 575 deletions

BIN
dist.zip

Binary file not shown.

View File

@ -57,7 +57,7 @@ const mainRoutes = {
{ path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情', isTab: true } },
{ path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前任务列表', isTab: true } },
{ path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', meta: { title: '当前执行任务详情', isTab: true } },
{ path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '工业炉报警', isTab: true } },
{ path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '炉报警', isTab: true } },
{ path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警', isTab: true } },
{ path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表', isTab: true } },
{ path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情', isTab: true } },
@ -66,7 +66,7 @@ const mainRoutes = {
{ path: '/report-task-ele', component: _import('report/components/task-ele'), name: 'report-task-ele', meta: { title: '任务能源消耗' } }
// { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析', isTab: true } },
// { path: '/energy-electric', component: _import('energy/electric'), name: 'energy-electric', meta: { title: '用电能源分析', isTab: true } },
// { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '工业炉用电分析', isTab: true } },
// { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '炉用电分析', isTab: true } },
// { path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析', isTab: true } },
// { path: '/energy-methanol', component: _import('energy/methanol'), name: 'energy-methanol', meta: { title: '甲醇流量分析', isTab: true } },
// { path: '/energy-propane', component: _import('energy/propane'), name: 'energy-propane', meta: { title: '丙烷流量分析', isTab: true } },
@ -74,10 +74,10 @@ const mainRoutes = {
// { path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据', isTab: true } },
// { path: '/energy-gas-acquisition', component: _import('energy/gas-acquisition'), name: 'energy-gas-acquisition', meta: { title: '用气采集数据', isTab: true } },
// { path: '/energy-temperature-acquisition', component: _import('energy/temperature-acquisition'), name: 'energy-temperature-acquisition', meta: { title: '温度采集数据', isTab: true } },
// { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '工业炉加工温度', isTab: true } },
// { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '炉加工温度', isTab: true } },
// { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度', isTab: true } },
// { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析', isTab: true } },
// { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '工业炉速度参数', isTab: true } }
// { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '炉速度参数', isTab: true } }
],
beforeEnter (to, from, next) {
let token = Vue.cookie.get('token')

View File

@ -1,12 +1,6 @@
<template>
<div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-button size="small" type="primary" style="float:left" @click="open()">
<icon-svg class="iconClass" name="system"></icon-svg>
重置
</el-button>
</el-form-item>
<el-form-item>
<!-- <el-select size="small" v-model="dataForm.paramKey" filterable placeholder="名称">
<el-option
@ -57,18 +51,6 @@
prop="code"
label="编码">
</el-table-column>
<el-table-column
prop="status"
label="状态"
>
<template slot-scope="scope">
<span>{{
scope.row.status === 0
? "空闲"
: "占用"
}}</span>
</template>
</el-table-column>
<el-table-column
prop="vehicleAlias"
label="缩写">
@ -138,34 +120,6 @@
this.getDataList()
},
methods: {
open () {
this.$confirm('执行此操作前请确定当前没有任务在使用车辆!是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('/vehicle/resetStatus'),
method: 'post'
}).then(({data}) => {
if (data && data.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
this.getDataList()
}
})
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消操作'
})
})
},
//
getDataList () {
this.dataListLoading = true

View File

@ -13,7 +13,7 @@
<el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startBtnName}}</el-button>
</el-form-item>
<el-form-item style="margin-left:2%">
工业:
:
<el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnBtnName}}</el-button>
</el-form-item>
<el-form-item style="margin-left:10%">
@ -115,7 +115,7 @@
data () {
return {
startBtnName: '选择起点',
kilnBtnName: '选择工业炉',
kilnBtnName: '选择炉',
dataList: [],
processType: 1,
pageIndex: 1,
@ -198,9 +198,9 @@
message: '请选择任务起点',
type: 'warning'
})
} else if (this.kilnBtnName === '选择工业炉') {
} else if (this.kilnBtnName === '选择炉') {
this.$message({
message: '请选择工业炉',
message: '请选择炉',
type: 'warning'
})
}

View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-03-07 15:31:13
* @LastEditors: zwq
* @LastEditTime: 2022-07-12 11:31:05
* @LastEditTime: 2022-07-05 16:18:48
* @Description:
-->
<template>
@ -17,7 +17,7 @@
<el-col :span="8">
<div class="front">
<img
:src="cdnUrl + '/static/img/lu/'+imgUrl+'.png'"
:src="'/static/img/lu/'+imgUrl+'.png'"
style="display:block;margin:auto"
/>
</div>
@ -74,11 +74,9 @@ export default {
},
data () {
return {
cdnUrl: ''
}
},
created () {
this.cdnUrl = window.SITE_CONFIG.cdnUrl
},
mounted () {
},

View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-15 15:17:30
* @LastEditors: zwq
* @LastEditTime: 2022-07-08 23:18:46
* @LastEditTime: 2022-03-18 15:00:32
* @Description:
-->
<template>
@ -34,9 +34,9 @@
</el-card>
<el-card class="base-container" style="margin-top: 20px; min-height: 200px">
<el-row :gutter="30" style="padding: 20px;">
<el-col class="footer-item-container" :span="6" v-for="count in 2" :key="count">
<el-col class="footer-item-container" :span="6" v-for="count in 4" :key="count">
<el-card class="footer-item-box base-container" @click.native="selectPlat(count)">
<div class="plat" style="font-size: 24px">出库液压台{{ count }}</div>
<div class="plat" style="font-size: 24px">液压台{{ count }}</div>
</el-card>
</el-col>
</el-row>
@ -63,7 +63,7 @@ export default {
components: {
ExWarehouseInfo
},
activated () {
created () {
this.getWarehouseList()
},
methods: {

View File

@ -1,7 +1,7 @@
<template>
<div>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="8">
<el-card :style="{height: boxHeight + 'px'}" class="box-card box-card-jg" shadow="hover" @click.native="$router.push({ name: 'orderProcess' })">
<p class="box-card-header">
<icon-svg class="iconClass" name="进工业炉加工"></icon-svg>
@ -10,7 +10,7 @@
<p class="box-card-footer">Processing</p>
</el-card>
</el-col>
<el-col :span="12">
<el-col :span="8">
<el-card :style="{height: boxHeight + 'px'}" class="box-card box-card-ck" shadow="hover" @click.native="$router.push({ name: 'exWarehouse' })">
<p class="box-card-header">
<icon-svg class="iconClass" name="出库"></icon-svg>
@ -19,7 +19,7 @@
<p class="box-card-footer">Warehouse</p>
</el-card>
</el-col>
<!-- <el-col :span="8">
<el-col :span="8">
<el-card :style="{height: boxHeight + 'px'}" class="box-card box-card-zj" shadow="hover" @click.native="$router.push({ name: 'addProcess' })">
<p class="box-card-header">
<icon-svg class="iconClass" name="追加加工"></icon-svg>
@ -27,7 +27,7 @@
</p>
<p class="box-card-footer">Append</p>
</el-card>
</el-col> -->
</el-col>
</el-row>
<el-card class="mod-log">
<h3>当前任务列表</h3>
@ -82,7 +82,7 @@
</el-table-column>
<el-table-column
prop="kilnName"
label="工业炉"
label="炉"
>
</el-table-column>
<el-table-column
@ -100,7 +100,7 @@
<template slot-scope="scope">
<span>{{
scope.row.taskType === 0
? "缓存到工业炉加工"
? "缓存到炉加工"
: scope.row.taskType === 1
? "出炉到缓存"
: scope.row.taskType === 2

View File

@ -2,79 +2,31 @@
<el-dialog
:title="!row ? '新增' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible"
>
<el-form
:model="dataForm"
v-loading="formLoading"
:rules="dataRule"
ref="dataForm"
label-width="80px"
>
:visible.sync="visible">
<el-form :model="dataForm" v-loading="formLoading" :rules="dataRule" ref="dataForm" label-width="80px">
<el-form-item label="标识卡号" prop="idenCardNum">
<el-input
v-model="dataForm.idenCardNum"
@change="setIdenCardNum"
ref="idenCardNum"
placeholder="标识卡号"
></el-input>
<el-input v-model="dataForm.idenCardNum" @change="setIdenCardNum" ref="idenCardNum" placeholder="标识卡号"></el-input>
</el-form-item>
<el-form-item label="客户名称" prop="customerName">
<el-input
v-model="dataForm.customerName"
disabled
placeholder="客户名称"
></el-input>
<el-input v-model="dataForm.customerName" disabled placeholder="客户名称"></el-input>
</el-form-item>
<el-form-item label="材料牌号" prop="materialDes">
<el-input
v-model="dataForm.materialDes"
disabled
placeholder="材料牌号"
></el-input>
<el-input v-model="dataForm.materialDes" disabled placeholder="材料牌号"></el-input>
</el-form-item>
<el-form-item label="订单号" prop="orderNo">
<el-input
v-model="dataForm.orderNo"
disabled
placeholder="订单号"
></el-input>
<el-input v-model="dataForm.orderNo" disabled placeholder="订单号"></el-input>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input
v-model="dataForm.productName"
disabled
placeholder="产品名称"
></el-input>
<el-input v-model="dataForm.productName" disabled placeholder="产品名称"></el-input>
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input
v-model="dataForm.quantity"
:max="dataForm.targetQuantity"
@change="changes"
type="number"
placeholder="数量"
style="width:200px"
></el-input>
<el-tag>数量最大值:{{dataForm.targetQuantity}}</el-tag>
<el-input v-model="dataForm.quantity" placeholder="数量"></el-input>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input
v-model="dataForm.unit"
disabled
placeholder="单位"
></el-input>
<el-input v-model="dataForm.unit" disabled placeholder="单位"></el-input>
</el-form-item>
<el-form-item label="重量" prop="weight">
<el-input
v-model="dataForm.weight"
type="number"
:max="dataForm.targetWeight"
@change="changeWeight"
placeholder="重量"
style="width:200px"
></el-input>
<el-tag>重量最大值:{{dataForm.targetWeight}}</el-tag>
<el-input v-model="dataForm.weight" placeholder="重量"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@ -85,119 +37,104 @@
</template>
<script>
export default {
data () {
return {
visible: false,
dataForm: {
idenCardNum: null,
customerName: null,
materialDes: null,
orderNo: null,
productName: null,
targetQuantity: null,
quantity: null,
unit: null,
targetWeight: null,
weight: null
},
dataRule: {
idenCardNum: [
{ required: true, message: '标识卡号不能为空', trigger: 'blur' }
],
quantity: [
{ required: true, message: '数量不能为空', trigger: 'blur' }
],
weight: [{ required: true, message: '重量不能为空', trigger: 'blur' }]
},
formLoading: false,
row: null,
editIndex: null
}
},
methods: {
changes (value) {
if (/[\u4E00-\u9FA5]/g.test(value)) {
this.dataForm.quantity = null
}
if (value > this.dataForm.targetQuantity) {
this.dataForm.quantity = null
export default {
data () {
return {
visible: false,
dataForm: {
idenCardNum: null,
customerName: null,
materialDes: null,
orderNo: null,
productName: null,
quantity: null,
unit: null,
weight: null
},
dataRule: {
idenCardNum: [
{ required: true, message: '标识卡号不能为空', trigger: 'blur' }
],
quantity: [
{ required: true, message: '数量不能为空', trigger: 'blur' }
],
weight: [
{ required: true, message: '重量不能为空', trigger: 'blur' }
]
},
formLoading: false,
row: null,
editIndex: null
}
},
changeWeight (value) {
if (/[\u4E00-\u9FA5]/g.test(value)) {
this.dataForm.weight = null
}
if (value > this.dataForm.targetWeight) {
this.dataForm.weight = null
}
},
init (row, idx) {
this.visible = true
this.formLoading = false
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (row) {
this.row = row
this.dataForm = row
this.editIndex = idx
}
this.$refs['idenCardNum'].focus()
})
},
setIdenCardNum () {
this.formLoading = true
if (this.dataForm.idenCardNum) {
this.$http({
url: this.$http.adornUrl(`/orderInfo/getTaskInfoByIdenCardNum`),
method: 'get',
params: this.$http.adornParams({
idenCardNum: this.dataForm.idenCardNum
})
}).then(({ data }) => {
if (data && data.code === 0) {
this.dataForm = data.data
this.dataForm.targetQuantity = data.data.quantity - data.data.finishQuantity - data.data.waitQuantity
this.dataForm.targetWeight = data.data.weight - data.data.finishWeight - data.data.waitWeight
this.dataForm.weight = null
this.dataForm.quantity = null
} else {
this.$message.warning(data.msg)
methods: {
init (row, idx) {
this.visible = true
this.formLoading = false
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (row) {
this.row = row
this.dataForm = row
this.editIndex = idx
}
this.formLoading = false
this.$refs['idenCardNum'].focus()
})
} else {
this.$message.warning('请输入标识卡号')
}
},
//
dataFormSubmit () {
this.$refs['dataForm'].validate(valid => {
if (valid) {
if (this.editIndex || this.editIndex === 0) {
const taskList = JSON.parse(sessionStorage.getItem('autoTaskList'))
taskList.splice(this.editIndex, 1, this.dataForm)
sessionStorage.setItem('autoTaskList', JSON.stringify(taskList))
} else if (sessionStorage.getItem('autoTaskList')) {
const taskList = JSON.parse(sessionStorage.getItem('autoTaskList'))
taskList.push(this.dataForm)
sessionStorage.setItem('autoTaskList', JSON.stringify(taskList))
} else {
const arr = [this.dataForm]
sessionStorage.setItem('autoTaskList', JSON.stringify(arr))
}
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
},
setIdenCardNum () {
this.formLoading = true
if (this.dataForm.idenCardNum) {
this.$http({
url: this.$http.adornUrl(`/orderInfo/getTaskInfoByIdenCardNum`),
method: 'get',
params: this.$http.adornParams({
'idenCardNum': this.dataForm.idenCardNum
})
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
this.dataForm = data.data
this.dataForm.targetQuantity = data.data.quantity
this.dataForm.targetWeight = data.data.weight
this.dataForm.weight = null
this.dataForm.quantity = null
} else {
this.$message.warning(data.msg)
}
this.formLoading = false
})
} else {
this.$message.warning('请输入标识卡号')
}
})
},
//
dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => {
if (valid) {
if (this.editIndex || this.editIndex === 0) {
const taskList = JSON.parse(sessionStorage.getItem('autoTaskList'))
taskList.splice(this.editIndex, 1, this.dataForm)
sessionStorage.setItem('autoTaskList', JSON.stringify(taskList))
} else if (sessionStorage.getItem('autoTaskList')) {
const taskList = JSON.parse(sessionStorage.getItem('autoTaskList'))
taskList.push(this.dataForm)
sessionStorage.setItem('autoTaskList', JSON.stringify(taskList))
} else {
const arr = [this.dataForm]
sessionStorage.setItem('autoTaskList', JSON.stringify(arr))
}
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
}
})
}
}
}
}
</script>

View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-04 10:22:13
* @LastEditors: zwq
* @LastEditTime: 2022-07-12 10:42:13
* @LastEditTime: 2022-07-08 09:41:08
* @Description: file content
* @FilePath: \mt-qj-wms-ui\src\views\common\order-auto-submit.vue
-->
@ -15,7 +15,7 @@
<el-form :model="dataForm" v-loading="formLoading" :rules="dataRule" ref="dataForm" label-width="120px">
<el-form-item label="自动任务类型" prop="autoTaskType">
<el-select v-model="dataForm.autoTaskType" clearable @change="changeAutoTaskType">
<el-option :value="1" label="化炉加工"></el-option>
<el-option :value="1" label="化炉加工"></el-option>
<el-option :value="2" label="多功能炉加工"></el-option>
</el-select>
</el-form-item>
@ -25,54 +25,50 @@
<el-option :value="1" label="复加工" />
</el-select>
</el-form-item>
<el-form-item v-if="dataForm.autoTaskType === 2" label="第一步">
<el-form-item v-if="dataForm.autoTaskType === 2" label="开始加工炉">
<el-form-item label="加工起点" prop="startPosition" style="margin-bottom: 24px">
<el-select v-model="dataForm.startPosition" :disabled="!(dataForm.autoTaskType)">
<el-option value="YYT001" label="液压台1"></el-option>
<el-option value="YYT002" label="液压台2"></el-option>
<el-option value="YYT003" label="液压台3"></el-option>
<el-option value="YYT004" label="液压台4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="加工炉" prop="firstPosition" style="margin-bottom: 24px">
<el-select v-model="dataForm.firstPosition" @change="handleChange($event,0)" :disabled="!(dataForm.autoTaskType)">
<el-select v-model="dataForm.firstPosition" :disabled="!(dataForm.autoTaskType)">
<el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" />
</el-select>
</el-form-item>
<el-form-item label="工艺" prop="firstProcess" style="margin-bottom: 24px">
<el-select v-model="dataForm.firstProcess" :disabled="!(dataForm.autoTaskType) || processDis.firstProcess">
<el-select v-model="dataForm.firstProcess" :disabled="!(dataForm.autoTaskType)">
<el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
</el-select>
</el-form-item>
</el-form-item>
<el-form-item :label="dataForm.autoTaskType !== 2?'第一步':'第二步'">
<el-form-item label="清洗炉">
<el-form-item label="加工起点" v-if="dataForm.autoTaskType !== 2" prop="startPosition" style="margin-bottom: 24px">
<el-select v-model="dataForm.startPosition" :disabled="!(dataForm.autoTaskType)">
<el-option value="YYT001" label="液压台1"></el-option>
<el-option value="YYT002" label="液压台2"></el-option>
<el-option value="YYT003" label="液压台3"></el-option>
<el-option value="YYT004" label="液压台4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="加工炉" prop="secPosition" style="margin-bottom: 24px">
<el-select v-model="dataForm.secPosition" @change="handleChange($event,1)" :disabled="!(dataForm.autoTaskType)">
<el-select v-model="dataForm.secPosition" :disabled="!(dataForm.autoTaskType)">
<el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" />
</el-select>
</el-form-item>
<el-form-item label="工艺" prop="secProcess" style="margin-bottom: 24px">
<el-select v-model="dataForm.secProcess" :disabled="!(dataForm.autoTaskType) || processDis.secProcess">
<el-select v-model="dataForm.secProcess" :disabled="!(dataForm.autoTaskType)">
<el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
</el-select>
</el-form-item>
</el-form-item>
<el-form-item :label="dataForm.autoTaskType !== 2?'第二步':'第三步'">
<el-form-item label="结束加工炉">
<el-form-item label="加工炉" prop="thirdPosition" style="margin-bottom: 24px">
<el-select v-model="dataForm.thirdPosition" @change="handleChange($event,2)" :disabled="!(dataForm.autoTaskType)">
<el-select v-model="dataForm.thirdPosition" :disabled="!(dataForm.autoTaskType)">
<el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" />
</el-select>
</el-form-item>
<el-form-item label="工艺" prop="thirdProcess" style="margin-bottom: 24px">
<el-select v-model="dataForm.thirdProcess" :disabled="!(dataForm.autoTaskType) || processDis.thirdProcess">
<el-select v-model="dataForm.thirdProcess" :disabled="!(dataForm.autoTaskType)">
<el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
</el-select>
</el-form-item>
@ -80,7 +76,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" :loading="btnLoad" @click="dataFormSubmit()">确定</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
</span>
</el-dialog>
</template>
@ -100,7 +96,6 @@
data () {
return {
visible: false,
btnLoad: false,
dataForm: {
autoTaskType: null,
processType: null,
@ -131,6 +126,9 @@
secPosition: [
{ required: true, message: '加工炉不能为空', trigger: 'blur' }
],
secProcess: [
{ required: true, message: '工艺不能为空', trigger: 'blur' }
],
thirdPosition: [
{ required: true, message: '加工炉不能为空', trigger: 'blur' }
],
@ -141,38 +139,13 @@
dataList: [],
formLoading: false,
row: null,
editIndex: null,
processDis: {
secProcess: false,
thirdPosition: false,
thirdProcess: false
}
editIndex: null
}
},
methods: {
handleChange (e, step) {
const sArr = ['firstProcess', 'secProcess', 'thirdProcess']
this.processDis[sArr[step]] = false
this.dataForm[sArr[step]] = null
this.kilnList.find(item => {
if (item.id === e.split(',')[0]) {
if (item.type === 4) {
this.dataForm[sArr[step]] = 1
this.processDis[sArr[step]] = true
}
}
}
)
},
init (list) {
this.dataList.splice(0, this.dataList.length)
this.dataList = list
this.btnLoad = false
this.processDis = {
secProcess: false,
thirdPosition: false,
thirdProcess: false
}
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
@ -273,26 +246,24 @@
targetPosition: this.dataForm.thirdPosition.split(',')[1]
})
}
this.btnLoad = true
this.$http({
url: this.$http.adornUrl(`/currTask/createAutoTask`),
method: 'post',
data: this.$http.adornData(requestData)
}).then(({data}) => {
console.log(data)
if (data && data.code === 0) {
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
this.btnLoad = false
this.visible = false
sessionStorage.setItem('autoTaskList', '')
this.$emit('refreshDataList')
}
})
} else {
this.btnLoad = false
this.$message.warning(data.msg)
}
})

View File

@ -193,7 +193,7 @@
this.getAutoDataList()
},
methods: {
//
//
getDictList () {
this.$http({
url: this.$http.adornUrl('/kilnInfo/page'),

View File

@ -20,33 +20,13 @@
<el-input v-model="dataForm.productName" disabled placeholder="产品名称"></el-input>
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input
v-model="dataForm.quantity"
:max="dataForm.targetQuantity"
@change="changes"
type="number"
placeholder="数量"
style="width:200px"
></el-input>
<el-tag>数量最大值:{{dataForm.targetQuantity}}</el-tag>
<el-input v-model="dataForm.quantity" placeholder="数量"></el-input>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input
v-model="dataForm.unit"
disabled
placeholder="单位"
></el-input>
<el-input v-model="dataForm.unit" disabled placeholder="单位"></el-input>
</el-form-item>
<el-form-item label="重量" prop="weight">
<el-input
v-model="dataForm.weight"
type="number"
:max="dataForm.targetWeight"
@change="changeWeight"
placeholder="重量"
style="width:200px"
></el-input>
<el-tag>重量最大值:{{dataForm.targetWeight}}</el-tag>
<el-input v-model="dataForm.weight" placeholder="重量"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@ -67,10 +47,8 @@
materialDes: null,
orderNo: null,
productName: null,
targetQuantity: null,
quantity: null,
unit: null,
targetWeight: null,
weight: null
},
dataRule: {
@ -90,29 +68,11 @@
}
},
methods: {
changes (value) {
if (/[\u4E00-\u9FA5]/g.test(value)) {
this.dataForm.quantity = null
}
if (value > this.dataForm.targetQuantity) {
this.dataForm.quantity = null
}
},
changeWeight (value) {
if (/[\u4E00-\u9FA5]/g.test(value)) {
this.dataForm.weight = null
}
if (value > this.dataForm.targetWeight) {
this.dataForm.weight = null
}
},
init (row, idx) {
this.visible = true
this.row = null
this.editIndex = null
this.formLoading = false
this.dataForm.targetQuantity = null
this.dataForm.targetWeight = null
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (row) {
@ -135,8 +95,8 @@
}).then(({data}) => {
if (data && data.code === 0) {
this.dataForm = data.data
this.dataForm.targetQuantity = data.data.quantity - data.data.finishQuantity - data.data.waitQuantity
this.dataForm.targetWeight = data.data.weight - data.data.finishWeight - data.data.waitWeight
this.dataForm.targetQuantity = data.data.quantity
this.dataForm.targetWeight = data.data.weight
this.dataForm.weight = null
this.dataForm.quantity = null
} else {

View File

@ -7,7 +7,7 @@
-->
<template>
<el-dialog
:title="!pointType ? '选择起点' : '选择工业炉'"
:title="!pointType ? '选择起点' : '选择炉'"
:close-on-click-modal="false"
:visible.sync="visible"
>

View File

@ -23,7 +23,7 @@
<!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button> -->
</el-form-item>
<el-form-item style="margin-left:1%">
<el-select v-model="kilnId" size="small" placeholder="工业炉" clearable>
<el-select v-model="kilnId" size="small" placeholder="炉" clearable>
<el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.kilnName" />
</el-select>
<!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnId}}</el-button> -->
@ -34,7 +34,7 @@
</el-select>
</el-form-item>
<el-form-item style="margin-left:1%">
<el-button type="primary" size="small" :loading="btnLoad" @click="submitTask()">提交任务</el-button>
<el-button type="primary" size="small" @click="submitTask()">提交任务</el-button>
</el-form-item>
</el-form>
<el-table
@ -120,7 +120,6 @@
export default {
data () {
return {
btnLoad: false,
startPosition: '',
kilnId: '',
craftCode: '',
@ -142,7 +141,7 @@
this.getEqList()
},
methods: {
//
//
getEqList () {
this.$http({
url: this.$http.adornUrl('/kilnInfo/page'),
@ -219,7 +218,7 @@
})
} else if (!this.kilnId) {
this.$message({
message: '请选择工业炉',
message: '请选择炉',
type: 'warning'
})
} else if (!this.craftCode) {
@ -230,7 +229,6 @@
} else if (this.processType !== 0 && this.processType !== 1) {
this.$message.warning('请选择加工类型')
} else {
this.btnLoad = true
this.$confirm(`确定提交任务?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -251,14 +249,12 @@
}).then(({data}) => {
if (data && data.code === 0) {
this.$message.success('任务提交成功')
this.btnLoad = false
this.dataList = []
sessionStorage.setItem('taskList', '')
this.startPosition = '选择起点'
this.kilnId = '选择工业炉'
this.kilnId = '选择炉'
this.targetPosition = null
} else {
this.btnLoad = false
this.$message.warning(data.msg)
}
})

View File

@ -250,11 +250,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1',
label: '炉1',
value: 63,
percent: 11,
data: [
@ -288,7 +288,7 @@ const yaoluList = [
},
{
id: 2,
label: '工业炉2',
label: '炉2',
value: 44,
percent: 8,
data: [
@ -322,7 +322,7 @@ const yaoluList = [
},
{
id: 3,
label: '工业炉3',
label: '炉3',
value: 56,
percent: 9,
data: [
@ -356,7 +356,7 @@ const yaoluList = [
},
{
id: 4,
label: '工业炉4',
label: '炉4',
value: 56,
percent: 9,
data: [
@ -390,7 +390,7 @@ const yaoluList = [
},
{
id: 5,
label: '工业炉5',
label: '炉5',
value: 56,
percent: 9,
data: [
@ -424,7 +424,7 @@ const yaoluList = [
},
{
id: 6,
label: '工业炉6',
label: '炉6',
value: 56,
percent: 9,
data: [
@ -458,7 +458,7 @@ const yaoluList = [
},
{
id: 7,
label: '工业炉7',
label: '炉7',
value: 56,
percent: 9,
data: [
@ -492,7 +492,7 @@ const yaoluList = [
},
{
id: 8,
label: '工业炉8',
label: '炉8',
value: 56,
percent: 9,
data: [
@ -526,7 +526,7 @@ const yaoluList = [
},
{
id: 9,
label: '工业炉9',
label: '炉9',
value: 56,
percent: 9,
data: [
@ -560,7 +560,7 @@ const yaoluList = [
},
{
id: 10,
label: '工业炉10',
label: '炉10',
value: 56,
percent: 9,
data: [
@ -594,7 +594,7 @@ const yaoluList = [
},
{
id: 11,
label: '工业炉11',
label: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -272,11 +272,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1',
label: '炉1',
value: 63,
percent: 11,
data: [
@ -310,7 +310,7 @@ const yaoluList = [
},
{
id: 2,
label: '工业炉2',
label: '炉2',
value: 44,
percent: 8,
data: [
@ -344,7 +344,7 @@ const yaoluList = [
},
{
id: 3,
label: '工业炉3',
label: '炉3',
value: 56,
percent: 9,
data: [
@ -378,7 +378,7 @@ const yaoluList = [
},
{
id: 4,
label: '工业炉4',
label: '炉4',
value: 56,
percent: 9,
data: [
@ -412,7 +412,7 @@ const yaoluList = [
},
{
id: 5,
label: '工业炉5',
label: '炉5',
value: 56,
percent: 9,
data: [
@ -446,7 +446,7 @@ const yaoluList = [
},
{
id: 6,
label: '工业炉6',
label: '炉6',
value: 56,
percent: 9,
data: [
@ -480,7 +480,7 @@ const yaoluList = [
},
{
id: 7,
label: '工业炉7',
label: '炉7',
value: 56,
percent: 9,
data: [
@ -514,7 +514,7 @@ const yaoluList = [
},
{
id: 8,
label: '工业炉8',
label: '炉8',
value: 56,
percent: 9,
data: [
@ -548,7 +548,7 @@ const yaoluList = [
},
{
id: 9,
label: '工业炉9',
label: '炉9',
value: 56,
percent: 9,
data: [
@ -582,7 +582,7 @@ const yaoluList = [
},
{
id: 10,
label: '工业炉10',
label: '炉10',
value: 56,
percent: 9,
data: [
@ -616,7 +616,7 @@ const yaoluList = [
},
{
id: 11,
label: '工业炉11',
label: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -122,51 +122,51 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1'
label: '炉1'
},
{
id: 2,
label: '工业炉2'
label: '炉2'
},
{
id: 3,
label: '工业炉3'
label: '炉3'
},
{
id: 4,
label: '工业炉4'
label: '炉4'
},
{
id: 5,
label: '工业炉5'
label: '炉5'
},
{
id: 6,
label: '工业炉6'
label: '炉6'
},
{
id: 7,
label: '工业炉7'
label: '炉7'
},
{
id: 8,
label: '工业炉8'
label: '炉8'
},
{
id: 9,
label: '工业炉9'
label: '炉9'
},
{
id: 10,
label: '工业炉10'
label: '炉10'
},
{
id: 11,
label: '工业炉11'
label: '炉11'
}
]

View File

@ -323,11 +323,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
name: '工业炉1',
name: '炉1',
value: 63,
percent: 11,
data: [
@ -361,7 +361,7 @@ const yaoluList = [
},
{
id: 2,
name: '工业炉2',
name: '炉2',
value: 44,
percent: 8,
data: [
@ -395,7 +395,7 @@ const yaoluList = [
},
{
id: 3,
name: '工业炉3',
name: '炉3',
value: 56,
percent: 9,
data: [
@ -429,7 +429,7 @@ const yaoluList = [
},
{
id: 4,
name: '工业炉4',
name: '炉4',
value: 56,
percent: 9,
data: [
@ -463,7 +463,7 @@ const yaoluList = [
},
{
id: 5,
name: '工业炉5',
name: '炉5',
value: 56,
percent: 9,
data: [
@ -497,7 +497,7 @@ const yaoluList = [
},
{
id: 6,
name: '工业炉6',
name: '炉6',
value: 56,
percent: 9,
data: [
@ -531,7 +531,7 @@ const yaoluList = [
},
{
id: 7,
name: '工业炉7',
name: '炉7',
value: 56,
percent: 9,
data: [
@ -565,7 +565,7 @@ const yaoluList = [
},
{
id: 8,
name: '工业炉8',
name: '炉8',
value: 56,
percent: 9,
data: [
@ -599,7 +599,7 @@ const yaoluList = [
},
{
id: 9,
name: '工业炉9',
name: '炉9',
value: 56,
percent: 9,
data: [
@ -633,7 +633,7 @@ const yaoluList = [
},
{
id: 10,
name: '工业炉10',
name: '炉10',
value: 56,
percent: 9,
data: [
@ -667,7 +667,7 @@ const yaoluList = [
},
{
id: 11,
name: '工业炉11',
name: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -119,51 +119,51 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1'
label: '炉1'
},
{
id: 2,
label: '工业炉2'
label: '炉2'
},
{
id: 3,
label: '工业炉3'
label: '炉3'
},
{
id: 4,
label: '工业炉4'
label: '炉4'
},
{
id: 5,
label: '工业炉5'
label: '炉5'
},
{
id: 6,
label: '工业炉6'
label: '炉6'
},
{
id: 7,
label: '工业炉7'
label: '炉7'
},
{
id: 8,
label: '工业炉8'
label: '炉8'
},
{
id: 9,
label: '工业炉9'
label: '炉9'
},
{
id: 10,
label: '工业炉10'
label: '炉10'
},
{
id: 11,
label: '工业炉11'
label: '炉11'
}
]

View File

@ -332,11 +332,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1',
label: '炉1',
value: 63,
percent: 11,
data: [
@ -370,7 +370,7 @@ const yaoluList = [
},
{
id: 2,
label: '工业炉2',
label: '炉2',
value: 44,
percent: 8,
data: [
@ -404,7 +404,7 @@ const yaoluList = [
},
{
id: 3,
label: '工业炉3',
label: '炉3',
value: 56,
percent: 9,
data: [
@ -438,7 +438,7 @@ const yaoluList = [
},
{
id: 4,
label: '工业炉4',
label: '炉4',
value: 56,
percent: 9,
data: [
@ -472,7 +472,7 @@ const yaoluList = [
},
{
id: 5,
label: '工业炉5',
label: '炉5',
value: 56,
percent: 9,
data: [
@ -506,7 +506,7 @@ const yaoluList = [
},
{
id: 6,
label: '工业炉6',
label: '炉6',
value: 56,
percent: 9,
data: [
@ -540,7 +540,7 @@ const yaoluList = [
},
{
id: 7,
label: '工业炉7',
label: '炉7',
value: 56,
percent: 9,
data: [
@ -574,7 +574,7 @@ const yaoluList = [
},
{
id: 8,
label: '工业炉8',
label: '炉8',
value: 56,
percent: 9,
data: [
@ -608,7 +608,7 @@ const yaoluList = [
},
{
id: 9,
label: '工业炉9',
label: '炉9',
value: 56,
percent: 9,
data: [
@ -642,7 +642,7 @@ const yaoluList = [
},
{
id: 10,
label: '工业炉10',
label: '炉10',
value: 56,
percent: 9,
data: [
@ -676,7 +676,7 @@ const yaoluList = [
},
{
id: 11,
label: '工业炉11',
label: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -250,11 +250,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1',
label: '炉1',
value: 63,
percent: 11,
data: [
@ -288,7 +288,7 @@ const yaoluList = [
},
{
id: 2,
label: '工业炉2',
label: '炉2',
value: 44,
percent: 8,
data: [
@ -322,7 +322,7 @@ const yaoluList = [
},
{
id: 3,
label: '工业炉3',
label: '炉3',
value: 56,
percent: 9,
data: [
@ -356,7 +356,7 @@ const yaoluList = [
},
{
id: 4,
label: '工业炉4',
label: '炉4',
value: 56,
percent: 9,
data: [
@ -390,7 +390,7 @@ const yaoluList = [
},
{
id: 5,
label: '工业炉5',
label: '炉5',
value: 56,
percent: 9,
data: [
@ -424,7 +424,7 @@ const yaoluList = [
},
{
id: 6,
label: '工业炉6',
label: '炉6',
value: 56,
percent: 9,
data: [
@ -458,7 +458,7 @@ const yaoluList = [
},
{
id: 7,
label: '工业炉7',
label: '炉7',
value: 56,
percent: 9,
data: [
@ -492,7 +492,7 @@ const yaoluList = [
},
{
id: 8,
label: '工业炉8',
label: '炉8',
value: 56,
percent: 9,
data: [
@ -526,7 +526,7 @@ const yaoluList = [
},
{
id: 9,
label: '工业炉9',
label: '炉9',
value: 56,
percent: 9,
data: [
@ -560,7 +560,7 @@ const yaoluList = [
},
{
id: 10,
label: '工业炉10',
label: '炉10',
value: 56,
percent: 9,
data: [
@ -594,7 +594,7 @@ const yaoluList = [
},
{
id: 11,
label: '工业炉11',
label: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -272,11 +272,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1',
label: '炉1',
value: 63,
percent: 11,
data: [
@ -310,7 +310,7 @@ const yaoluList = [
},
{
id: 2,
label: '工业炉2',
label: '炉2',
value: 44,
percent: 8,
data: [
@ -344,7 +344,7 @@ const yaoluList = [
},
{
id: 3,
label: '工业炉3',
label: '炉3',
value: 56,
percent: 9,
data: [
@ -378,7 +378,7 @@ const yaoluList = [
},
{
id: 4,
label: '工业炉4',
label: '炉4',
value: 56,
percent: 9,
data: [
@ -412,7 +412,7 @@ const yaoluList = [
},
{
id: 5,
label: '工业炉5',
label: '炉5',
value: 56,
percent: 9,
data: [
@ -446,7 +446,7 @@ const yaoluList = [
},
{
id: 6,
label: '工业炉6',
label: '炉6',
value: 56,
percent: 9,
data: [
@ -480,7 +480,7 @@ const yaoluList = [
},
{
id: 7,
label: '工业炉7',
label: '炉7',
value: 56,
percent: 9,
data: [
@ -514,7 +514,7 @@ const yaoluList = [
},
{
id: 8,
label: '工业炉8',
label: '炉8',
value: 56,
percent: 9,
data: [
@ -548,7 +548,7 @@ const yaoluList = [
},
{
id: 9,
label: '工业炉9',
label: '炉9',
value: 56,
percent: 9,
data: [
@ -582,7 +582,7 @@ const yaoluList = [
},
{
id: 10,
label: '工业炉10',
label: '炉10',
value: 56,
percent: 9,
data: [
@ -616,7 +616,7 @@ const yaoluList = [
},
{
id: 11,
label: '工业炉11',
label: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -272,11 +272,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1',
label: '炉1',
value: 63,
percent: 11,
data: [
@ -310,7 +310,7 @@ const yaoluList = [
},
{
id: 2,
label: '工业炉2',
label: '炉2',
value: 44,
percent: 8,
data: [
@ -344,7 +344,7 @@ const yaoluList = [
},
{
id: 3,
label: '工业炉3',
label: '炉3',
value: 56,
percent: 9,
data: [
@ -378,7 +378,7 @@ const yaoluList = [
},
{
id: 4,
label: '工业炉4',
label: '炉4',
value: 56,
percent: 9,
data: [
@ -412,7 +412,7 @@ const yaoluList = [
},
{
id: 5,
label: '工业炉5',
label: '炉5',
value: 56,
percent: 9,
data: [
@ -446,7 +446,7 @@ const yaoluList = [
},
{
id: 6,
label: '工业炉6',
label: '炉6',
value: 56,
percent: 9,
data: [
@ -480,7 +480,7 @@ const yaoluList = [
},
{
id: 7,
label: '工业炉7',
label: '炉7',
value: 56,
percent: 9,
data: [
@ -514,7 +514,7 @@ const yaoluList = [
},
{
id: 8,
label: '工业炉8',
label: '炉8',
value: 56,
percent: 9,
data: [
@ -548,7 +548,7 @@ const yaoluList = [
},
{
id: 9,
label: '工业炉9',
label: '炉9',
value: 56,
percent: 9,
data: [
@ -582,7 +582,7 @@ const yaoluList = [
},
{
id: 10,
label: '工业炉10',
label: '炉10',
value: 56,
percent: 9,
data: [
@ -616,7 +616,7 @@ const yaoluList = [
},
{
id: 11,
label: '工业炉11',
label: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -250,11 +250,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1',
label: '炉1',
value: 63,
percent: 11,
data: [
@ -288,7 +288,7 @@ const yaoluList = [
},
{
id: 2,
label: '工业炉2',
label: '炉2',
value: 44,
percent: 8,
data: [
@ -322,7 +322,7 @@ const yaoluList = [
},
{
id: 3,
label: '工业炉3',
label: '炉3',
value: 56,
percent: 9,
data: [
@ -356,7 +356,7 @@ const yaoluList = [
},
{
id: 4,
label: '工业炉4',
label: '炉4',
value: 56,
percent: 9,
data: [
@ -390,7 +390,7 @@ const yaoluList = [
},
{
id: 5,
label: '工业炉5',
label: '炉5',
value: 56,
percent: 9,
data: [
@ -424,7 +424,7 @@ const yaoluList = [
},
{
id: 6,
label: '工业炉6',
label: '炉6',
value: 56,
percent: 9,
data: [
@ -458,7 +458,7 @@ const yaoluList = [
},
{
id: 7,
label: '工业炉7',
label: '炉7',
value: 56,
percent: 9,
data: [
@ -492,7 +492,7 @@ const yaoluList = [
},
{
id: 8,
label: '工业炉8',
label: '炉8',
value: 56,
percent: 9,
data: [
@ -526,7 +526,7 @@ const yaoluList = [
},
{
id: 9,
label: '工业炉9',
label: '炉9',
value: 56,
percent: 9,
data: [
@ -560,7 +560,7 @@ const yaoluList = [
},
{
id: 10,
label: '工业炉10',
label: '炉10',
value: 56,
percent: 9,
data: [
@ -594,7 +594,7 @@ const yaoluList = [
},
{
id: 11,
label: '工业炉11',
label: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -272,11 +272,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1',
label: '炉1',
value: 63,
percent: 11,
data: [
@ -310,7 +310,7 @@ const yaoluList = [
},
{
id: 2,
label: '工业炉2',
label: '炉2',
value: 44,
percent: 8,
data: [
@ -344,7 +344,7 @@ const yaoluList = [
},
{
id: 3,
label: '工业炉3',
label: '炉3',
value: 56,
percent: 9,
data: [
@ -378,7 +378,7 @@ const yaoluList = [
},
{
id: 4,
label: '工业炉4',
label: '炉4',
value: 56,
percent: 9,
data: [
@ -412,7 +412,7 @@ const yaoluList = [
},
{
id: 5,
label: '工业炉5',
label: '炉5',
value: 56,
percent: 9,
data: [
@ -446,7 +446,7 @@ const yaoluList = [
},
{
id: 6,
label: '工业炉6',
label: '炉6',
value: 56,
percent: 9,
data: [
@ -480,7 +480,7 @@ const yaoluList = [
},
{
id: 7,
label: '工业炉7',
label: '炉7',
value: 56,
percent: 9,
data: [
@ -514,7 +514,7 @@ const yaoluList = [
},
{
id: 8,
label: '工业炉8',
label: '炉8',
value: 56,
percent: 9,
data: [
@ -548,7 +548,7 @@ const yaoluList = [
},
{
id: 9,
label: '工业炉9',
label: '炉9',
value: 56,
percent: 9,
data: [
@ -582,7 +582,7 @@ const yaoluList = [
},
{
id: 10,
label: '工业炉10',
label: '炉10',
value: 56,
percent: 9,
data: [
@ -616,7 +616,7 @@ const yaoluList = [
},
{
id: 11,
label: '工业炉11',
label: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -272,11 +272,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1',
label: '炉1',
value: 63,
percent: 11,
data: [
@ -310,7 +310,7 @@ const yaoluList = [
},
{
id: 2,
label: '工业炉2',
label: '炉2',
value: 44,
percent: 8,
data: [
@ -344,7 +344,7 @@ const yaoluList = [
},
{
id: 3,
label: '工业炉3',
label: '炉3',
value: 56,
percent: 9,
data: [
@ -378,7 +378,7 @@ const yaoluList = [
},
{
id: 4,
label: '工业炉4',
label: '炉4',
value: 56,
percent: 9,
data: [
@ -412,7 +412,7 @@ const yaoluList = [
},
{
id: 5,
label: '工业炉5',
label: '炉5',
value: 56,
percent: 9,
data: [
@ -446,7 +446,7 @@ const yaoluList = [
},
{
id: 6,
label: '工业炉6',
label: '炉6',
value: 56,
percent: 9,
data: [
@ -480,7 +480,7 @@ const yaoluList = [
},
{
id: 7,
label: '工业炉7',
label: '炉7',
value: 56,
percent: 9,
data: [
@ -514,7 +514,7 @@ const yaoluList = [
},
{
id: 8,
label: '工业炉8',
label: '炉8',
value: 56,
percent: 9,
data: [
@ -548,7 +548,7 @@ const yaoluList = [
},
{
id: 9,
label: '工业炉9',
label: '炉9',
value: 56,
percent: 9,
data: [
@ -582,7 +582,7 @@ const yaoluList = [
},
{
id: 10,
label: '工业炉10',
label: '炉10',
value: 56,
percent: 9,
data: [
@ -616,7 +616,7 @@ const yaoluList = [
},
{
id: 11,
label: '工业炉11',
label: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -250,11 +250,11 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1',
label: '炉1',
value: 63,
percent: 11,
data: [
@ -288,7 +288,7 @@ const yaoluList = [
},
{
id: 2,
label: '工业炉2',
label: '炉2',
value: 44,
percent: 8,
data: [
@ -322,7 +322,7 @@ const yaoluList = [
},
{
id: 3,
label: '工业炉3',
label: '炉3',
value: 56,
percent: 9,
data: [
@ -356,7 +356,7 @@ const yaoluList = [
},
{
id: 4,
label: '工业炉4',
label: '炉4',
value: 56,
percent: 9,
data: [
@ -390,7 +390,7 @@ const yaoluList = [
},
{
id: 5,
label: '工业炉5',
label: '炉5',
value: 56,
percent: 9,
data: [
@ -424,7 +424,7 @@ const yaoluList = [
},
{
id: 6,
label: '工业炉6',
label: '炉6',
value: 56,
percent: 9,
data: [
@ -458,7 +458,7 @@ const yaoluList = [
},
{
id: 7,
label: '工业炉7',
label: '炉7',
value: 56,
percent: 9,
data: [
@ -492,7 +492,7 @@ const yaoluList = [
},
{
id: 8,
label: '工业炉8',
label: '炉8',
value: 56,
percent: 9,
data: [
@ -526,7 +526,7 @@ const yaoluList = [
},
{
id: 9,
label: '工业炉9',
label: '炉9',
value: 56,
percent: 9,
data: [
@ -560,7 +560,7 @@ const yaoluList = [
},
{
id: 10,
label: '工业炉10',
label: '炉10',
value: 56,
percent: 9,
data: [
@ -594,7 +594,7 @@ const yaoluList = [
},
{
id: 11,
label: '工业炉11',
label: '炉11',
value: 56,
percent: 9,
data: [

View File

@ -121,51 +121,51 @@ const datePickerType = {
}
}
//
//
const yaoluList = [
{
id: 1,
label: '工业炉1'
label: '炉1'
},
{
id: 2,
label: '工业炉2'
label: '炉2'
},
{
id: 3,
label: '工业炉3'
label: '炉3'
},
{
id: 4,
label: '工业炉4'
label: '炉4'
},
{
id: 5,
label: '工业炉5'
label: '炉5'
},
{
id: 6,
label: '工业炉6'
label: '炉6'
},
{
id: 7,
label: '工业炉7'
label: '炉7'
},
{
id: 8,
label: '工业炉8'
label: '炉8'
},
{
id: 9,
label: '工业炉9'
label: '炉9'
},
{
id: 10,
label: '工业炉10'
label: '炉10'
},
{
id: 11,
label: '工业炉11'
label: '炉11'
}
]

View File

@ -152,7 +152,7 @@
@click="$router.push({ name: 'energy-kiln-electric' })"
>
<icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
<span slot="title">工业炉用电分析</span>
<span slot="title">炉用电分析</span>
</el-menu-item>
<el-submenu index="kiln-gas">
<template slot="title">
@ -160,7 +160,7 @@
name="config"
class="site-sidebar__menu-icon"
></icon-svg>
<span>工业炉用气分析</span>
<span>炉用气分析</span>
</template>
<el-menu-item
index="sulfur-dioxide"
@ -250,7 +250,7 @@
name="tubiao"
class="site-sidebar__menu-icon"
></icon-svg>
<span slot="title">工业炉加工温度</span>
<span slot="title">炉加工温度</span>
</el-menu-item>
<el-menu-item
index="sump-temperature"
@ -287,7 +287,7 @@
@click="$router.push({ name: 'energy-kiln-speed' })"
>
<icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
<span slot="title">工业炉速度参数</span>
<span slot="title">炉速度参数</span>
</el-menu-item>
</el-submenu> -->
<el-submenu index="report">
@ -308,7 +308,7 @@
@click="$router.push({ name: 'report-kiln-alarm' })"
>
<icon-svg name="job" class="site-sidebar__menu-icon"></icon-svg>
<span slot="title">工业炉报警</span>
<span slot="title">炉报警</span>
</el-menu-item>
<el-menu-item
index="car-alarm"

View File

@ -73,6 +73,10 @@
prop="weight"
label="物料重量">
</el-table-column>
<el-table-column
prop="waitWeight"
label="实际重量">
</el-table-column>
<el-table-column
fixed="right"
header-align="center"
@ -170,7 +174,7 @@
components: {
orderDetail
},
activated () {
created () {
this.getDataList()
},
methods: {

View File

@ -53,24 +53,15 @@
<template slot-scope="scope">
<span>{{
scope.row.taskType === 0
? "入库到工业炉"
? "入库到炉"
: scope.row.taskType === 1
? "入库到缓存"
: scope.row.taskType === 2
? "工业炉出库到缓存区"
? "炉出库到缓存区"
: "缓存区出库"
}}</span>
</template>
</el-table-column>
<el-table-column prop="isAuto" label="多步骤">
<template slot-scope="scope">
<span>{{
scope.row.isAuto === 1
? "是"
: "否"
}}</span>
</template>
</el-table-column>
<el-table-column prop="startPosition" label="开始位置"> </el-table-column>
<el-table-column prop="targetPosition" label="目标位置">
</el-table-column>
@ -113,6 +104,7 @@
<el-button
type="text"
:disabled="scope.row.status === 1"
v-if="!scope.row.isAuto"
style="color:red"
size="small"
@click="deleteHandle(scope.row.sheetNo)"
@ -166,7 +158,7 @@ export default {
statusList
}
},
activated () {
created () {
this.getDataList()
this.timer = setInterval(this.getDataList, 180000)
},

View File

@ -94,7 +94,7 @@
carList: []
}
},
activated () {
created () {
this.getCarList()
},
methods: {

View File

@ -2,7 +2,7 @@
<div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-select size="small" v-model="dataForm.equipmentId" clearable filterable placeholder="工业炉名称">
<el-select size="small" v-model="dataForm.equipmentId" clearable filterable placeholder="炉名称">
<el-option
v-for="item in kilnList"
:key="item.id"
@ -45,7 +45,7 @@
</el-table-column>
<el-table-column
prop="equipmentName"
label="工业炉名称"
label="炉名称"
>
</el-table-column>
<el-table-column
@ -102,11 +102,11 @@ export default {
kilnList: []
}
},
activated () {
created () {
this.getKilnList()
},
methods: {
//
//
getKilnList () {
this.dataListLoading = true
this.$http({

View File

@ -6,7 +6,7 @@
:model="dataForm"
@keyup.enter.native="getDataList()"
>
<!-- <el-form-item>
<el-form-item>
<el-select
size="small"
v-model="dataForm.vehicleId"
@ -21,7 +21,7 @@
>
</el-option>
</el-select>
</el-form-item> -->
</el-form-item>
<el-form-item>
<el-date-picker
size="small"
@ -86,12 +86,12 @@
<template slot-scope="scope">
<span>{{
scope.row.taskType === 0
? "入库到工业炉"
? "缓存到窑炉加工"
: scope.row.taskType === 1
? "入库到缓存"
? "出炉到缓存"
: scope.row.taskType === 2
? "工业炉出库到缓存区"
: "缓存区出库"
? "缓存出库"
: "入库缓存"
}}</span>
</template>
</el-table-column>
@ -105,10 +105,10 @@
label="目标位置"
>
</el-table-column>
<!-- <el-table-column
<el-table-column
prop="vehicleName"
label="车辆名称"
> -->
>
</el-table-column>
<el-table-column
fixed="right"
@ -173,7 +173,7 @@ export default {
statusList
}
},
activated () {
created () {
this.getDataList()
},
methods: {

View File

@ -1,19 +1,19 @@
/*
* @Author: gtz
* @Date: 2021-11-19 10:10:52
* @LastEditors: zwq
* @LastEditTime: 2022-07-12 10:47:39
* @LastEditors: gtz
* @LastEditTime: 2021-11-30 09:40:45
* @Description: file content
* @FilePath: \mt-qj-wms-ui\static\config\init.js
*/
/**
* 动态加载初始资源
*/
;(function () {
;(function() {
var resList = {
icon: window.SITE_CONFIG.cdnUrl + '/static/img/top.png',
icon: window.SITE_CONFIG.cdnUrl + '/static/img/favicon.ico',
css: [
window.SITE_CONFIG.cdnUrl + '/static/css/app.css'
window.SITE_CONFIG.cdnUrl + '/static/css/app.css',
],
js: [
// 插件, 放置业务之前加载, 以免业务需求依赖插件时, 还未加载出错
@ -30,53 +30,53 @@
// 图标
(function () {
var _icon = document.createElement('link')
_icon.setAttribute('rel', 'shortcut icon')
_icon.setAttribute('type', 'image/x-icon')
_icon.setAttribute('href', resList.icon)
document.getElementsByTagName('head')[0].appendChild(_icon)
var _icon = document.createElement('link');
_icon.setAttribute('rel', 'shortcut icon');
_icon.setAttribute('type', 'image/x-icon');
_icon.setAttribute('href', resList.icon);
document.getElementsByTagName('head')[0].appendChild(_icon);
})();
// 样式
(function () {
document.getElementsByTagName('html')[0].style.opacity = 0
var i = 0
var _style = null
document.getElementsByTagName('html')[0].style.opacity = 0;
var i = 0;
var _style = null;
var createStyles = function () {
if (i >= resList.css.length) {
document.getElementsByTagName('html')[0].style.opacity = 1
return
document.getElementsByTagName('html')[0].style.opacity = 1;
return;
}
_style = document.createElement('link')
_style.href = resList.css[i]
_style.setAttribute('rel', 'stylesheet')
_style = document.createElement('link');
_style.href = resList.css[i];
_style.setAttribute('rel', 'stylesheet');
_style.onload = function () {
i++
createStyles()
i++;
createStyles();
}
document.getElementsByTagName('head')[0].appendChild(_style)
document.getElementsByTagName('head')[0].appendChild(_style);
}
createStyles()
})()
createStyles();
})();
// 脚本
document.onreadystatechange = function () {
if (document.readyState === 'interactive') {
var i = 0
var _script = null
var i = 0;
var _script = null;
var createScripts = function () {
if (i >= resList.js.length) {
return
return;
}
_script = document.createElement('script')
_script.src = resList.js[i]
_script = document.createElement('script');
_script.src = resList.js[i];
_script.onload = function () {
i++
createScripts()
i++;
createScripts();
}
document.getElementsByTagName('body')[0].appendChild(_script)
document.getElementsByTagName('body')[0].appendChild(_script);
}
createScripts()
createScripts();
}
}
})()
};
})();