diff --git a/src/router/index.js b/src/router/index.js
index a392d7e..4c3d6c9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -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')
diff --git a/src/views/common/add-process.vue b/src/views/common/add-process.vue
index 48879dd..2835855 100644
--- a/src/views/common/add-process.vue
+++ b/src/views/common/add-process.vue
@@ -13,7 +13,7 @@
{{startBtnName}}
- 窑炉 :
+ 工业炉 :
{{kilnBtnName}}
@@ -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'
})
}
diff --git a/src/views/common/board-part.vue b/src/views/common/board-part.vue
index 81a3d7d..5823961 100644
--- a/src/views/common/board-part.vue
+++ b/src/views/common/board-part.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-03-07 15:31:13
* @LastEditors: zwq
- * @LastEditTime: 2022-07-05 16:18:48
+ * @LastEditTime: 2022-07-12 11:31:05
* @Description:
-->
@@ -17,7 +17,7 @@
炉号
@@ -74,9 +74,11 @@ export default {
},
data () {
return {
+ cdnUrl: ''
}
},
created () {
+ this.cdnUrl = window.SITE_CONFIG.cdnUrl
},
mounted () {
},
diff --git a/src/views/common/home.vue b/src/views/common/home.vue
index 671b4f2..f349e78 100644
--- a/src/views/common/home.vue
+++ b/src/views/common/home.vue
@@ -82,7 +82,7 @@
{{
scope.row.taskType === 0
- ? "缓存到窑炉加工"
+ ? "缓存到工业炉加工"
: scope.row.taskType === 1
? "出炉到缓存"
: scope.row.taskType === 2
diff --git a/src/views/common/order-auto-add.vue b/src/views/common/order-auto-add.vue
index 6d69181..694907c 100644
--- a/src/views/common/order-auto-add.vue
+++ b/src/views/common/order-auto-add.vue
@@ -50,12 +50,13 @@
+ 数量最大值:{{dataForm.targetQuantity}}
+ 重量最大值:{{dataForm.targetWeight}}
-
+
+
+
-
+
-
+
-
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -104,7 +108,7 @@
firstPosition: null,
firstProcess: null,
secPosition: null,
- secProcess: 1,
+ secProcess: null,
thirdPosition: null,
thirdProcess: null
},
@@ -137,14 +141,38 @@
dataList: [],
formLoading: false,
row: null,
- editIndex: null
+ editIndex: null,
+ processDis: {
+ secProcess: false,
+ thirdPosition: false,
+ thirdProcess: false
+ }
}
},
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()
@@ -155,7 +183,7 @@
this.dataForm.firstPosition = null
this.dataForm.firstProcess = null
this.dataForm.secPosition = null
- this.dataForm.secProcess = 1
+ this.dataForm.secProcess = null
this.dataForm.thirdPosition = null
this.dataForm.thirdProcess = null
},
diff --git a/src/views/common/order-auto.vue b/src/views/common/order-auto.vue
index 01e120a..bc307a8 100644
--- a/src/views/common/order-auto.vue
+++ b/src/views/common/order-auto.vue
@@ -193,7 +193,7 @@
this.getAutoDataList()
},
methods: {
- // 获取窑炉、工艺列表
+ // 获取工业炉、工艺列表
getDictList () {
this.$http({
url: this.$http.adornUrl('/kilnInfo/page'),
diff --git a/src/views/common/order-process-add.vue b/src/views/common/order-process-add.vue
index 14355cb..52249b4 100644
--- a/src/views/common/order-process-add.vue
+++ b/src/views/common/order-process-add.vue
@@ -20,13 +20,33 @@
-
+
+ 数量最大值:{{dataForm.targetQuantity}}
-
+
-
+
+ 重量最大值:{{dataForm.targetWeight}}
-
+
@@ -142,7 +142,7 @@
this.getEqList()
},
methods: {
- // 获取窑炉列表
+ // 获取工业炉列表
getEqList () {
this.$http({
url: this.$http.adornUrl('/kilnInfo/page'),
@@ -219,7 +219,7 @@
})
} else if (!this.kilnId) {
this.$message({
- message: '请选择窑炉',
+ message: '请选择工业炉',
type: 'warning'
})
} else if (!this.craftCode) {
@@ -255,7 +255,7 @@
this.dataList = []
sessionStorage.setItem('taskList', '')
this.startPosition = '选择起点'
- this.kilnId = '选择窑炉'
+ this.kilnId = '选择工业炉'
this.targetPosition = null
} else {
this.btnLoad = false
diff --git a/src/views/energy/ammonia-analysis.vue b/src/views/energy/ammonia-analysis.vue
index 0d7ea70..41e8750 100644
--- a/src/views/energy/ammonia-analysis.vue
+++ b/src/views/energy/ammonia-analysis.vue
@@ -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: [
@@ -699,7 +699,7 @@ export default {
position: relative;
width: 100%;
min-height: calc(100vh - 138px);
-
+
}
diff --git a/src/views/energy/ammonia.vue b/src/views/energy/ammonia.vue
index d4a5f14..7040825 100644
--- a/src/views/energy/ammonia.vue
+++ b/src/views/energy/ammonia.vue
@@ -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: [
@@ -721,7 +721,7 @@ export default {
position: relative;
width: 100%;
min-height: calc(100vh - 138px);
-
+
}
diff --git a/src/views/energy/electric-acquisition.vue b/src/views/energy/electric-acquisition.vue
index 3b5d0f9..e2f0c21 100644
--- a/src/views/energy/electric-acquisition.vue
+++ b/src/views/energy/electric-acquisition.vue
@@ -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'
}
]
diff --git a/src/views/energy/electric.vue b/src/views/energy/electric.vue
index 0ed2578..cb55b4c 100644
--- a/src/views/energy/electric.vue
+++ b/src/views/energy/electric.vue
@@ -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: [
diff --git a/src/views/energy/gas-acquisition.vue b/src/views/energy/gas-acquisition.vue
index 6d95bb7..b6bf33d 100644
--- a/src/views/energy/gas-acquisition.vue
+++ b/src/views/energy/gas-acquisition.vue
@@ -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'
}
]
diff --git a/src/views/energy/kiln-electric.vue b/src/views/energy/kiln-electric.vue
index 1b35c61..a51a457 100644
--- a/src/views/energy/kiln-electric.vue
+++ b/src/views/energy/kiln-electric.vue
@@ -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: [
@@ -786,7 +786,7 @@ export default {
position: relative;
width: 100%;
min-height: calc(100vh - 138px);
-
+
}
diff --git a/src/views/energy/kiln-speed.vue b/src/views/energy/kiln-speed.vue
index 36385fe..e38bae3 100644
--- a/src/views/energy/kiln-speed.vue
+++ b/src/views/energy/kiln-speed.vue
@@ -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: [
@@ -699,7 +699,7 @@ export default {
position: relative;
width: 100%;
min-height: calc(100vh - 138px);
-
+
}
diff --git a/src/views/energy/methanol.vue b/src/views/energy/methanol.vue
index 44ffe33..8a9d0a7 100644
--- a/src/views/energy/methanol.vue
+++ b/src/views/energy/methanol.vue
@@ -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: [
diff --git a/src/views/energy/nitrogen.vue b/src/views/energy/nitrogen.vue
index f8a98a2..be39366 100644
--- a/src/views/energy/nitrogen.vue
+++ b/src/views/energy/nitrogen.vue
@@ -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: [
diff --git a/src/views/energy/process-temperature.vue b/src/views/energy/process-temperature.vue
index 2e24e60..7301933 100644
--- a/src/views/energy/process-temperature.vue
+++ b/src/views/energy/process-temperature.vue
@@ -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: [
@@ -699,7 +699,7 @@ export default {
position: relative;
width: 100%;
min-height: calc(100vh - 138px);
-
+
}
diff --git a/src/views/energy/propane.vue b/src/views/energy/propane.vue
index 400527e..27b1f92 100644
--- a/src/views/energy/propane.vue
+++ b/src/views/energy/propane.vue
@@ -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: [
diff --git a/src/views/energy/sulfur-dioxide.vue b/src/views/energy/sulfur-dioxide.vue
index d422f84..f52af9d 100644
--- a/src/views/energy/sulfur-dioxide.vue
+++ b/src/views/energy/sulfur-dioxide.vue
@@ -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: [
@@ -721,7 +721,7 @@ export default {
position: relative;
width: 100%;
min-height: calc(100vh - 138px);
-
+
}
diff --git a/src/views/energy/sump-temperature.vue b/src/views/energy/sump-temperature.vue
index 1a1cd70..bb881db 100644
--- a/src/views/energy/sump-temperature.vue
+++ b/src/views/energy/sump-temperature.vue
@@ -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: [
@@ -699,7 +699,7 @@ export default {
position: relative;
width: 100%;
min-height: calc(100vh - 138px);
-
+
}
diff --git a/src/views/energy/temperature-acquisition.vue b/src/views/energy/temperature-acquisition.vue
index 460d929..2ecdc70 100644
--- a/src/views/energy/temperature-acquisition.vue
+++ b/src/views/energy/temperature-acquisition.vue
@@ -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'
}
]
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index 542cbe4..b002b69 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -152,7 +152,7 @@
@click="$router.push({ name: 'energy-kiln-electric' })"
>
- 窑炉用电分析
+ 工业炉用电分析
@@ -160,7 +160,7 @@
name="config"
class="site-sidebar__menu-icon"
>
- 窑炉用气分析
+ 工业炉用气分析
- 窑炉速度参数
+ 工业炉速度参数
-->
@@ -308,7 +308,7 @@
@click="$router.push({ name: 'report-kiln-alarm' })"
>
- 窑炉报警
+ 工业炉报警
{{
scope.row.taskType === 0
- ? "入库到窑炉"
+ ? "入库到工业炉"
: scope.row.taskType === 1
? "入库到缓存"
: scope.row.taskType === 2
- ? "窑炉出库到缓存区"
+ ? "工业炉出库到缓存区"
: "缓存区出库"
}}
+
+
+ {{
+ scope.row.isAuto === 1
+ ? "是"
+ : "否"
+ }}
+
+
@@ -104,7 +113,6 @@
-
+
{{
scope.row.taskType === 0
- ? "入库到窑炉"
+ ? "入库到工业炉"
: scope.row.taskType === 1
? "入库到缓存"
: scope.row.taskType === 2
- ? "窑炉出库到缓存区"
+ ? "工业炉出库到缓存区"
: "缓存区出库"
}}
diff --git a/static/config/init.js b/static/config/init.js
index 6b59594..76234a2 100644
--- a/static/config/init.js
+++ b/static/config/init.js
@@ -1,19 +1,19 @@
/*
* @Author: gtz
* @Date: 2021-11-19 10:10:52
- * @LastEditors: gtz
- * @LastEditTime: 2021-11-30 09:40:45
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-12 10:47:39
* @Description: file content
* @FilePath: \mt-qj-wms-ui\static\config\init.js
*/
/**
* 动态加载初始资源
*/
-;(function() {
+;(function () {
var resList = {
- icon: window.SITE_CONFIG.cdnUrl + '/static/img/favicon.ico',
+ icon: window.SITE_CONFIG.cdnUrl + '/static/img/top.png',
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()
}
- };
-})();
\ No newline at end of file
+ }
+})()