From 80bacbcae5cc627009ae7db8fe4684d02f741e0d Mon Sep 17 00:00:00 2001 From: zwq Date: Tue, 12 Jul 2022 14:19:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 8 +-- src/views/common/add-process.vue | 8 +-- src/views/common/board-part.vue | 6 +- src/views/common/home.vue | 4 +- src/views/common/order-auto-add.vue | 28 +++++--- src/views/common/order-auto-submit.vue | 58 ++++++++++++----- src/views/common/order-auto.vue | 2 +- src/views/common/order-process-add.vue | 50 ++++++++++++-- src/views/common/order-process-point.vue | 2 +- src/views/common/order-process.vue | 8 +-- src/views/energy/ammonia-analysis.vue | 26 ++++---- src/views/energy/ammonia.vue | 26 ++++---- src/views/energy/electric-acquisition.vue | 24 +++---- src/views/energy/electric.vue | 24 +++---- src/views/energy/gas-acquisition.vue | 24 +++---- src/views/energy/kiln-electric.vue | 26 ++++---- src/views/energy/kiln-speed.vue | 26 ++++---- src/views/energy/methanol.vue | 24 +++---- src/views/energy/nitrogen.vue | 24 +++---- src/views/energy/process-temperature.vue | 26 ++++---- src/views/energy/propane.vue | 24 +++---- src/views/energy/sulfur-dioxide.vue | 26 ++++---- src/views/energy/sump-temperature.vue | 26 ++++---- src/views/energy/temperature-acquisition.vue | 24 +++---- src/views/main-sidebar.vue | 10 +-- src/views/order/current-task.vue | 14 +++- src/views/report/kiln-alarm.vue | 6 +- src/views/report/task-history.vue | 4 +- static/config/init.js | 68 ++++++++++---------- 29 files changed, 356 insertions(+), 270 deletions(-) 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: --> 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 + } +})()