mt-ck/mt-qj-wms-ui
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新 #19

Merged
zwq merged 1 commits from zwq into master 2022-07-12 14:20:06 +08:00
Conversation 0 Commits 1 Files Changed 29 +356 -270
29 changed files with 356 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 80bacbcae5 - Show all commits

8
src/router/index.js
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-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', 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: '/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-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', 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 } }, { 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: '/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-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-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-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-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 } }, // { 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-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-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-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-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-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) { beforeEnter (to, from, next) {
let token = Vue.cookie.get('token') let token = Vue.cookie.get('token')

8
src/views/common/add-process.vue
View File

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

6
src/views/common/board-part.vue
View File

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

4
src/views/common/home.vue
View File

@ -82,7 +82,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="kilnName" prop="kilnName"
label="窑炉" label="工业炉"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -100,7 +100,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
scope.row.taskType === 0 scope.row.taskType === 0
? "缓存到窑炉加工" ? "缓存到工业炉加工"
: scope.row.taskType === 1 : scope.row.taskType === 1
? "出炉到缓存" ? "出炉到缓存"
: scope.row.taskType === 2 : scope.row.taskType === 2

28
src/views/common/order-auto-add.vue
View File

@ -50,12 +50,13 @@
<el-form-item label="数量" prop="quantity"> <el-form-item label="数量" prop="quantity">
<el-input <el-input
v-model="dataForm.quantity" v-model="dataForm.quantity"
:max="dataForm.quantity - dataForm.finishQuantity" :max="dataForm.targetQuantity"
@change="changes" @change="changes"
oninput = "value=value.replace(/[^\d.]/g,'')"
type="number" type="number"
placeholder="数量" placeholder="数量"
style="width:200px"
></el-input> ></el-input>
<el-tag>数量最大值:{{dataForm.targetQuantity}}</el-tag>
</el-form-item> </el-form-item>
<el-form-item label="单位" prop="unit"> <el-form-item label="单位" prop="unit">
<el-input <el-input
@ -68,11 +69,12 @@
<el-input <el-input
v-model="dataForm.weight" v-model="dataForm.weight"
type="number" type="number"
:max="dataForm.targetWeight - dataForm.finishWeight" :max="dataForm.targetWeight"
@change="changeWeight" @change="changeWeight"
oninput = "value=value.replace(/[^\d.]/g,'')"
placeholder="重量" placeholder="重量"
style="width:200px"
></el-input> ></el-input>
<el-tag>重量最大值:{{dataForm.targetWeight}}</el-tag>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -115,13 +117,19 @@ export default {
}, },
methods: { methods: {
changes (value) { changes (value) {
if (value > this.dataForm.quantity - this.dataForm.finishQuantity) { if (/[\u4E00-\u9FA5]/g.test(value)) {
this.dataForm.quantity = this.dataForm.quantity - this.dataForm.finishQuantity this.dataForm.quantity = null
}
if (value > this.dataForm.targetQuantity) {
this.dataForm.quantity = null
} }
}, },
changeWeight (value) { changeWeight (value) {
if (value > this.dataForm.targetWeight - this.dataForm.finishWeight) { if (/[\u4E00-\u9FA5]/g.test(value)) {
this.dataForm.weight = this.dataForm.targetWeight - this.dataForm.finishWeight this.dataForm.weight = null
}
if (value > this.dataForm.targetWeight) {
this.dataForm.weight = null
} }
}, },
init (row, idx) { init (row, idx) {
@ -149,8 +157,8 @@ export default {
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.data this.dataForm = data.data
this.dataForm.targetQuantity = data.data.quantity this.dataForm.targetQuantity = data.data.quantity - data.data.finishQuantity - data.data.waitQuantity
this.dataForm.targetWeight = data.data.weight this.dataForm.targetWeight = data.data.weight - data.data.finishWeight - data.data.waitWeight
this.dataForm.weight = null this.dataForm.weight = null
this.dataForm.quantity = null this.dataForm.quantity = null
} else { } else {

58
src/views/common/order-auto-submit.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz * @Author: gtz
* @Date: 2022-03-04 10:22:13 * @Date: 2022-03-04 10:22:13
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-07-08 23:10:55 * @LastEditTime: 2022-07-12 10:42:13
* @Description: file content * @Description: file content
* @FilePath: \mt-qj-wms-ui\src\views\common\order-auto-submit.vue * @FilePath: \mt-qj-wms-ui\src\views\common\order-auto-submit.vue
--> -->
@ -25,50 +25,54 @@
<el-option :value="1" label="复加工" /> <el-option :value="1" label="复加工" />
</el-select> </el-select>
</el-form-item> </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-form-item label="加工起点" prop="startPosition" style="margin-bottom: 24px">
<el-select v-model="dataForm.startPosition" :disabled="!(dataForm.autoTaskType)"> <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="YYT003" label="液压台3"></el-option>
<el-option value="YYT004" label="液压台4"></el-option> <el-option value="YYT004" label="液压台4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="加工炉" prop="firstPosition" style="margin-bottom: 24px"> <el-form-item label="加工炉" prop="firstPosition" style="margin-bottom: 24px">
<el-select v-model="dataForm.firstPosition" :disabled="!(dataForm.autoTaskType)"> <el-select v-model="dataForm.firstPosition" @change="handleChange($event,0)" :disabled="!(dataForm.autoTaskType)">
<el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" /> <el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工艺" prop="firstProcess" style="margin-bottom: 24px"> <el-form-item label="工艺" prop="firstProcess" style="margin-bottom: 24px">
<el-select v-model="dataForm.firstProcess" :disabled="!(dataForm.autoTaskType)"> <el-select v-model="dataForm.firstProcess" :disabled="!(dataForm.autoTaskType) || processDis.firstProcess">
<el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" /> <el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form-item> </el-form-item>
<el-form-item label="清洗炉"> <el-form-item :label="dataForm.autoTaskType !== 2?'第一步':'第二步'">
<el-form-item label="加工起点" v-if="dataForm.autoTaskType !== 2" prop="startPosition" style="margin-bottom: 24px"> <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-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="YYT003" label="液压台3"></el-option>
<el-option value="YYT004" label="液压台4"></el-option> <el-option value="YYT004" label="液压台4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="加工炉" prop="secPosition" style="margin-bottom: 24px"> <el-form-item label="加工炉" prop="secPosition" style="margin-bottom: 24px">
<el-select v-model="dataForm.secPosition" :disabled="!(dataForm.autoTaskType)"> <el-select v-model="dataForm.secPosition" @change="handleChange($event,1)" :disabled="!(dataForm.autoTaskType)">
<el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" /> <el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="工艺" prop="secProcess" style="margin-bottom: 24px"> <el-form-item label="工艺" prop="secProcess" style="margin-bottom: 24px">
<el-select v-model="dataForm.secProcess" :disabled="!(dataForm.autoTaskType)"> <el-select v-model="dataForm.secProcess" :disabled="!(dataForm.autoTaskType) || processDis.secProcess">
<el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" /> <el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
</el-select> </el-select>
</el-form-item> -->
</el-form-item> </el-form-item>
<el-form-item label="结束加工炉"> </el-form-item>
<el-form-item :label="dataForm.autoTaskType !== 2?'第二步':'第三步'">
<el-form-item label="加工炉" prop="thirdPosition" style="margin-bottom: 24px"> <el-form-item label="加工炉" prop="thirdPosition" style="margin-bottom: 24px">
<el-select v-model="dataForm.thirdPosition" :disabled="!(dataForm.autoTaskType)"> <el-select v-model="dataForm.thirdPosition" @change="handleChange($event,2)" :disabled="!(dataForm.autoTaskType)">
<el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" /> <el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工艺" prop="thirdProcess" style="margin-bottom: 24px"> <el-form-item label="工艺" prop="thirdProcess" style="margin-bottom: 24px">
<el-select v-model="dataForm.thirdProcess" :disabled="!(dataForm.autoTaskType)"> <el-select v-model="dataForm.thirdProcess" :disabled="!(dataForm.autoTaskType) || processDis.thirdProcess">
<el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" /> <el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -104,7 +108,7 @@
firstPosition: null, firstPosition: null,
firstProcess: null, firstProcess: null,
secPosition: null, secPosition: null,
secProcess: 1, secProcess: null,
thirdPosition: null, thirdPosition: null,
thirdProcess: null thirdProcess: null
}, },
@ -137,14 +141,38 @@
dataList: [], dataList: [],
formLoading: false, formLoading: false,
row: null, row: null,
editIndex: null editIndex: null,
processDis: {
secProcess: false,
thirdPosition: false,
thirdProcess: false
}
} }
}, },
methods: { 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) { init (list) {
this.dataList.splice(0, this.dataList.length) this.dataList.splice(0, this.dataList.length)
this.dataList = list this.dataList = list
this.btnLoad = false this.btnLoad = false
this.processDis = {
secProcess: false,
thirdPosition: false,
thirdProcess: false
}
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
@ -155,7 +183,7 @@
this.dataForm.firstPosition = null this.dataForm.firstPosition = null
this.dataForm.firstProcess = null this.dataForm.firstProcess = null
this.dataForm.secPosition = null this.dataForm.secPosition = null
this.dataForm.secProcess = 1 this.dataForm.secProcess = null
this.dataForm.thirdPosition = null this.dataForm.thirdPosition = null
this.dataForm.thirdProcess = null this.dataForm.thirdProcess = null
}, },

2
src/views/common/order-auto.vue
View File

@ -193,7 +193,7 @@
this.getAutoDataList() this.getAutoDataList()
}, },
methods: { methods: {
// 获取窑炉、工艺列表 // 获取工业炉、工艺列表
getDictList () { getDictList () {
this.$http({ this.$http({
url: this.$http.adornUrl('/kilnInfo/page'), url: this.$http.adornUrl('/kilnInfo/page'),

50
src/views/common/order-process-add.vue
View File

@ -20,13 +20,33 @@
<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>
<el-form-item label="数量" prop="quantity"> <el-form-item label="数量" prop="quantity">
<el-input v-model="dataForm.quantity" placeholder="数量"></el-input> <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-form-item> </el-form-item>
<el-form-item label="单位" prop="unit"> <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>
<el-form-item label="重量" prop="weight"> <el-form-item label="重量" prop="weight">
<el-input v-model="dataForm.weight" placeholder="重量"></el-input> <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-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -47,8 +67,10 @@
materialDes: null, materialDes: null,
orderNo: null, orderNo: null,
productName: null, productName: null,
targetQuantity: null,
quantity: null, quantity: null,
unit: null, unit: null,
targetWeight: null,
weight: null weight: null
}, },
dataRule: { dataRule: {
@ -68,11 +90,29 @@
} }
}, },
methods: { 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) { init (row, idx) {
this.visible = true this.visible = true
this.row = null this.row = null
this.editIndex = null this.editIndex = null
this.formLoading = false this.formLoading = false
this.dataForm.targetQuantity = null
this.dataForm.targetWeight = null
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (row) { if (row) {
@ -95,8 +135,8 @@
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.data this.dataForm = data.data
this.dataForm.targetQuantity = data.data.quantity this.dataForm.targetQuantity = data.data.quantity - data.data.finishQuantity - data.data.waitQuantity
this.dataForm.targetWeight = data.data.weight this.dataForm.targetWeight = data.data.weight - data.data.finishWeight - data.data.waitWeight
this.dataForm.weight = null this.dataForm.weight = null
this.dataForm.quantity = null this.dataForm.quantity = null
} else { } else {

2
src/views/common/order-process-point.vue
View File

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

8
src/views/common/order-process.vue
View File

@ -23,7 +23,7 @@
<!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button> --> <!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button> -->
</el-form-item> </el-form-item>
<el-form-item style="margin-left:1%"> <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-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.kilnName" />
</el-select> </el-select>
<!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnId}}</el-button> --> <!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnId}}</el-button> -->
@ -142,7 +142,7 @@
this.getEqList() this.getEqList()
}, },
methods: { methods: {
// 获取窑炉列表 // 获取工业炉列表
getEqList () { getEqList () {
this.$http({ this.$http({
url: this.$http.adornUrl('/kilnInfo/page'), url: this.$http.adornUrl('/kilnInfo/page'),
@ -219,7 +219,7 @@
}) })
} else if (!this.kilnId) { } else if (!this.kilnId) {
this.$message({ this.$message({
message: '请选择窑炉', message: '请选择工业炉',
type: 'warning' type: 'warning'
}) })
} else if (!this.craftCode) { } else if (!this.craftCode) {
@ -255,7 +255,7 @@
this.dataList = [] this.dataList = []
sessionStorage.setItem('taskList', '') sessionStorage.setItem('taskList', '')
this.startPosition = '选择起点' this.startPosition = '选择起点'
this.kilnId = '选择窑炉' this.kilnId = '选择工业炉'
this.targetPosition = null this.targetPosition = null
} else { } else {
this.btnLoad = false this.btnLoad = false

24
src/views/energy/ammonia-analysis.vue
View File

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

24
src/views/energy/ammonia.vue
View File

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

24
src/views/energy/electric-acquisition.vue
View File

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

24
src/views/energy/electric.vue
View File

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

24
src/views/energy/gas-acquisition.vue
View File

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

24
src/views/energy/kiln-electric.vue
View File

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

24
src/views/energy/kiln-speed.vue
View File

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

24
src/views/energy/methanol.vue
View File

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

24
src/views/energy/nitrogen.vue
View File

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

24
src/views/energy/process-temperature.vue
View File

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

24
src/views/energy/propane.vue
View File

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

24
src/views/energy/sulfur-dioxide.vue
View File

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

24
src/views/energy/sump-temperature.vue
View File

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

24
src/views/energy/temperature-acquisition.vue
View File

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

10
src/views/main-sidebar.vue
View File

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

14
src/views/order/current-task.vue
View File

@ -53,15 +53,24 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
scope.row.taskType === 0 scope.row.taskType === 0
? "入库到窑炉" ? "入库到工业炉"
: scope.row.taskType === 1 : scope.row.taskType === 1
? "入库到缓存" ? "入库到缓存"
: scope.row.taskType === 2 : scope.row.taskType === 2
? "窑炉出库到缓存区" ? "工业炉出库到缓存区"
: "缓存区出库" : "缓存区出库"
}}</span> }}</span>
</template> </template>
</el-table-column> </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="startPosition" label="开始位置"> </el-table-column>
<el-table-column prop="targetPosition" label="目标位置"> <el-table-column prop="targetPosition" label="目标位置">
</el-table-column> </el-table-column>
@ -104,7 +113,6 @@
<el-button <el-button
type="text" type="text"
:disabled="scope.row.status === 1" :disabled="scope.row.status === 1"
v-if="!scope.row.isAuto"
style="color:red" style="color:red"
size="small" size="small"
@click="deleteHandle(scope.row.sheetNo)" @click="deleteHandle(scope.row.sheetNo)"

6
src/views/report/kiln-alarm.vue
View File

@ -2,7 +2,7 @@
<div class="mod-config"> <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 style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <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 <el-option
v-for="item in kilnList" v-for="item in kilnList"
:key="item.id" :key="item.id"
@ -45,7 +45,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="equipmentName" prop="equipmentName"
label="窑炉名称" label="工业炉名称"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -106,7 +106,7 @@ export default {
this.getKilnList() this.getKilnList()
}, },
methods: { methods: {
// 获取窑炉列表 // 获取工业炉列表
getKilnList () { getKilnList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({

4
src/views/report/task-history.vue
View File

@ -86,11 +86,11 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
scope.row.taskType === 0 scope.row.taskType === 0
? "入库到窑炉" ? "入库到工业炉"
: scope.row.taskType === 1 : scope.row.taskType === 1
? "入库到缓存" ? "入库到缓存"
: scope.row.taskType === 2 : scope.row.taskType === 2
? "窑炉出库到缓存区" ? "工业炉出库到缓存区"
: "缓存区出库" : "缓存区出库"
}}</span> }}</span>
</template> </template>

68
static/config/init.js
View File

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