From 2bcf7e471d708693a0195d398890fed49f523b00 Mon Sep 17 00:00:00 2001 From: zwq Date: Fri, 19 Nov 2021 16:36:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=92=8C=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 4 + src/views/basic/alarmInfo.vue | 6 +- src/views/basic/cache.vue | 6 +- src/views/basic/carInfo.vue | 6 +- src/views/basic/equipmentInfo.vue | 6 +- .../order/components/current-order-detail.vue | 66 +++++ .../order/components/current-order-task.vue | 103 ++++++++ .../order/components/current-task-detail.vue | 115 +++++++++ src/views/order/current-order.vue | 243 +++++++++++++++++- src/views/order/current-task.vue | 158 +++++++++++- src/views/report/car-alarm.vue | 121 ++++++++- .../components/order-history-detail.vue | 66 +++++ .../report/components/order-history-task.vue | 103 ++++++++ .../report/components/task-history-detail.vue | 103 ++++++++ src/views/report/kiln-alarm.vue | 121 ++++++++- src/views/report/order-history.vue | 205 ++++++++++++++- src/views/report/task-history.vue | 182 ++++++++++++- 17 files changed, 1560 insertions(+), 54 deletions(-) create mode 100644 src/views/order/components/current-order-detail.vue create mode 100644 src/views/order/components/current-order-task.vue create mode 100644 src/views/order/components/current-task-detail.vue create mode 100644 src/views/report/components/order-history-detail.vue create mode 100644 src/views/report/components/order-history-task.vue create mode 100644 src/views/report/components/task-history-detail.vue diff --git a/src/router/index.js b/src/router/index.js index 3206a07..50ab047 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -46,11 +46,15 @@ const mainRoutes = { { 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: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表' } }, + { path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情' } }, { path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前执行任务' } }, + { path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', 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-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情' } }, { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表' } }, + { path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', 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: '窑炉用电分析' } }, diff --git a/src/views/basic/alarmInfo.vue b/src/views/basic/alarmInfo.vue index 9360ecc..52c4c89 100644 --- a/src/views/basic/alarmInfo.vue +++ b/src/views/basic/alarmInfo.vue @@ -15,11 +15,11 @@ v-loading="dataListLoading" style="width: 100%;"> + label="序号" + width="50"> + label="序号" + width="50"> + label="序号" + width="50"> + label="序号" + width="50"> + + + diff --git a/src/views/order/components/current-order-task.vue b/src/views/order/components/current-order-task.vue new file mode 100644 index 0000000..98aaabe --- /dev/null +++ b/src/views/order/components/current-order-task.vue @@ -0,0 +1,103 @@ + + + diff --git a/src/views/order/components/current-task-detail.vue b/src/views/order/components/current-task-detail.vue new file mode 100644 index 0000000..303911c --- /dev/null +++ b/src/views/order/components/current-task-detail.vue @@ -0,0 +1,115 @@ + + + diff --git a/src/views/order/current-order.vue b/src/views/order/current-order.vue index b1607e2..4bf9f6f 100644 --- a/src/views/order/current-order.vue +++ b/src/views/order/current-order.vue @@ -1,7 +1,236 @@ - + + + diff --git a/src/views/order/current-task.vue b/src/views/order/current-task.vue index eb78940..0c83d27 100644 --- a/src/views/order/current-task.vue +++ b/src/views/order/current-task.vue @@ -1,7 +1,151 @@ - + + + diff --git a/src/views/report/car-alarm.vue b/src/views/report/car-alarm.vue index dbdbf6b..76d22c3 100644 --- a/src/views/report/car-alarm.vue +++ b/src/views/report/car-alarm.vue @@ -1,7 +1,114 @@ - + + + diff --git a/src/views/report/components/order-history-detail.vue b/src/views/report/components/order-history-detail.vue new file mode 100644 index 0000000..26ab36a --- /dev/null +++ b/src/views/report/components/order-history-detail.vue @@ -0,0 +1,66 @@ + + + + diff --git a/src/views/report/components/order-history-task.vue b/src/views/report/components/order-history-task.vue new file mode 100644 index 0000000..2d46560 --- /dev/null +++ b/src/views/report/components/order-history-task.vue @@ -0,0 +1,103 @@ + + + diff --git a/src/views/report/components/task-history-detail.vue b/src/views/report/components/task-history-detail.vue new file mode 100644 index 0000000..90bac0b --- /dev/null +++ b/src/views/report/components/task-history-detail.vue @@ -0,0 +1,103 @@ + + + diff --git a/src/views/report/kiln-alarm.vue b/src/views/report/kiln-alarm.vue index c20a13f..b811684 100644 --- a/src/views/report/kiln-alarm.vue +++ b/src/views/report/kiln-alarm.vue @@ -1,7 +1,114 @@ - + + + diff --git a/src/views/report/order-history.vue b/src/views/report/order-history.vue index eaa3543..0945814 100644 --- a/src/views/report/order-history.vue +++ b/src/views/report/order-history.vue @@ -1,7 +1,198 @@ - + + + diff --git a/src/views/report/task-history.vue b/src/views/report/task-history.vue index ccbb1ac..6dc317f 100644 --- a/src/views/report/task-history.vue +++ b/src/views/report/task-history.vue @@ -1,7 +1,175 @@ - + + +