diff --git a/src/router/index.js b/src/router/index.js
index 5a87d0e..3206a07 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -44,7 +44,23 @@ const mainRoutes = {
{ path: '/basic-cache-location', component: _import('basic/components/location'), name: 'basic-cache-location', meta: { title: '库位信息' } },
{ path: '/basic-equipmentInfo', component: _import('basic/equipmentInfo'), name: 'basic-equipmentInfo', meta: { title: '设备基础信息' } },
{ path: '/basic-carInfo', component: _import('basic/carInfo'), name: 'basic-carInfo', meta: { title: '车辆信息' } },
- { path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息' } }
+ { path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息' } },
+ { path: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表' } },
+ { path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前执行任务' } },
+ { path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '窑炉报警' } },
+ { path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警' } },
+ { path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表' } },
+ { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表' } },
+ { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析' } },
+ { path: '/energy-electric', component: _import('energy/electric'), name: 'energy-electric', meta: { title: '用电能源分析' } },
+ { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析' } },
+ { path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析' } },
+ { path: '/energy-nitrogen', component: _import('energy/nitrogen'), name: 'energy-nitrogen', meta: { title: '氮气流量分析' } },
+ { path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据' } },
+ { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '窑炉加工温度' } },
+ { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度' } },
+ { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析' } },
+ { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数' } }
],
beforeEnter (to, from, next) {
let token = Vue.cookie.get('token')
diff --git a/src/views/energy/ammonia-analysis.vue b/src/views/energy/ammonia-analysis.vue
new file mode 100644
index 0000000..0052525
--- /dev/null
+++ b/src/views/energy/ammonia-analysis.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/energy/ammonia.vue b/src/views/energy/ammonia.vue
new file mode 100644
index 0000000..518d7f5
--- /dev/null
+++ b/src/views/energy/ammonia.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/energy/electric-acquisition.vue b/src/views/energy/electric-acquisition.vue
new file mode 100644
index 0000000..9cca3c7
--- /dev/null
+++ b/src/views/energy/electric-acquisition.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/energy/electric.vue b/src/views/energy/electric.vue
new file mode 100644
index 0000000..4e73f0f
--- /dev/null
+++ b/src/views/energy/electric.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/energy/kiln-electric.vue b/src/views/energy/kiln-electric.vue
new file mode 100644
index 0000000..be54658
--- /dev/null
+++ b/src/views/energy/kiln-electric.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/energy/kiln-speed.vue b/src/views/energy/kiln-speed.vue
new file mode 100644
index 0000000..ecb8900
--- /dev/null
+++ b/src/views/energy/kiln-speed.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/energy/nitrogen.vue b/src/views/energy/nitrogen.vue
new file mode 100644
index 0000000..66adad8
--- /dev/null
+++ b/src/views/energy/nitrogen.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/energy/process-temperature.vue b/src/views/energy/process-temperature.vue
new file mode 100644
index 0000000..cb3b402
--- /dev/null
+++ b/src/views/energy/process-temperature.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/energy/sulfur-dioxide.vue b/src/views/energy/sulfur-dioxide.vue
new file mode 100644
index 0000000..a435f8c
--- /dev/null
+++ b/src/views/energy/sulfur-dioxide.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/energy/sump-temperature.vue b/src/views/energy/sump-temperature.vue
new file mode 100644
index 0000000..87a385b
--- /dev/null
+++ b/src/views/energy/sump-temperature.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index 58e9b3d..d60a249 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -5,35 +5,56 @@
:default-active="menuActiveName || 'home'"
:collapse="sidebarFold"
:collapseTransition="false"
- class="site-sidebar__menu">
+ class="site-sidebar__menu"
+ >
-
- 首页
+
+ 首页
-
+
订单加工
-
+
货物出库
-
+
追加加工
-
+
demo
-
+
echarts
-
+
ueditor
@@ -43,19 +64,31 @@
基础信息
-
+
缓存区信息
-
+
设备基础信息
-
+
车辆信息
-
+
报警基础信息
@@ -65,20 +98,191 @@
订单加工管理
-
+
当前订单列表
-
+
当前执行任务
+
+
+
+ 能源管理
+
+
+
+ 用电能源分析
+
+
+
+ 窑炉用电分析
+
+
+
+
+ 窑炉用气分析
+
+
+
+ 二氧化硫流量分析
+
+
+
+ 氨气流量分析
+
+
+
+ 氮气流量分析
+
+
+
+
+ 电能采集数据
+
+
+
+
+ 温度分析
+
+
+
+ 窑炉加工温度
+
+
+
+ 油槽温度
+
+
+
+
+
+ 用气分析
+
+
+
+ 使用氮气分析
+
+
+
+
+ 窑炉速度参数
+
+
+
+
+
+ 报表统计
+
+
+
+
+ 报警信息
+
+
+
+ 窑炉报警
+
+
+
+ 车辆运行报警
+
+
+
+
+ 订单历史列表
+
+
+
+ 执行任务历史列表
+
+
+ :dynamicMenuRoutes="dynamicMenuRoutes"
+ >
@@ -86,77 +290,101 @@
diff --git a/src/views/order/current-order.vue b/src/views/order/current-order.vue
new file mode 100644
index 0000000..b1607e2
--- /dev/null
+++ b/src/views/order/current-order.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/order/current-task.vue b/src/views/order/current-task.vue
new file mode 100644
index 0000000..eb78940
--- /dev/null
+++ b/src/views/order/current-task.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/report/car-alarm.vue b/src/views/report/car-alarm.vue
new file mode 100644
index 0000000..dbdbf6b
--- /dev/null
+++ b/src/views/report/car-alarm.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/report/kiln-alarm.vue b/src/views/report/kiln-alarm.vue
new file mode 100644
index 0000000..c20a13f
--- /dev/null
+++ b/src/views/report/kiln-alarm.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/report/order-history.vue b/src/views/report/order-history.vue
new file mode 100644
index 0000000..eaa3543
--- /dev/null
+++ b/src/views/report/order-history.vue
@@ -0,0 +1,7 @@
+
diff --git a/src/views/report/task-history.vue b/src/views/report/task-history.vue
new file mode 100644
index 0000000..ccbb1ac
--- /dev/null
+++ b/src/views/report/task-history.vue
@@ -0,0 +1,7 @@
+