diff --git a/src/router/index.js b/src/router/index.js index 4ba765e..5a87d0e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -39,7 +39,12 @@ const mainRoutes = { { path: '/addProcess', component: _import('common/add-process'), name: 'addProcess', meta: { title: '追加加工' } }, { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } }, { path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } }, - { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } } + { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } }, + { path: '/basic-cache', component: _import('basic/cache'), name: 'basic-cache', meta: { title: '缓存区信息' } }, + { 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: '报警基础信息' } } ], beforeEnter (to, from, next) { let token = Vue.cookie.get('token') diff --git a/src/views/basic/alarmInfo.vue b/src/views/basic/alarmInfo.vue new file mode 100644 index 0000000..9360ecc --- /dev/null +++ b/src/views/basic/alarmInfo.vue @@ -0,0 +1,160 @@ + + + diff --git a/src/views/basic/cache.vue b/src/views/basic/cache.vue new file mode 100644 index 0000000..fe2341b --- /dev/null +++ b/src/views/basic/cache.vue @@ -0,0 +1,173 @@ + + + diff --git a/src/views/basic/carInfo.vue b/src/views/basic/carInfo.vue new file mode 100644 index 0000000..b6d60a0 --- /dev/null +++ b/src/views/basic/carInfo.vue @@ -0,0 +1,160 @@ + + + diff --git a/src/views/basic/components/alarmInfo-add.vue b/src/views/basic/components/alarmInfo-add.vue new file mode 100644 index 0000000..a69d206 --- /dev/null +++ b/src/views/basic/components/alarmInfo-add.vue @@ -0,0 +1,99 @@ + + + diff --git a/src/views/basic/components/cache-add.vue b/src/views/basic/components/cache-add.vue new file mode 100644 index 0000000..a69d206 --- /dev/null +++ b/src/views/basic/components/cache-add.vue @@ -0,0 +1,99 @@ + + + diff --git a/src/views/basic/components/carInfo-add.vue b/src/views/basic/components/carInfo-add.vue new file mode 100644 index 0000000..a69d206 --- /dev/null +++ b/src/views/basic/components/carInfo-add.vue @@ -0,0 +1,99 @@ + + + diff --git a/src/views/basic/components/equipmentInfo-add.vue b/src/views/basic/components/equipmentInfo-add.vue new file mode 100644 index 0000000..a69d206 --- /dev/null +++ b/src/views/basic/components/equipmentInfo-add.vue @@ -0,0 +1,99 @@ + + + diff --git a/src/views/basic/components/location-add.vue b/src/views/basic/components/location-add.vue new file mode 100644 index 0000000..a69d206 --- /dev/null +++ b/src/views/basic/components/location-add.vue @@ -0,0 +1,99 @@ + + + diff --git a/src/views/basic/components/location.vue b/src/views/basic/components/location.vue new file mode 100644 index 0000000..c484f18 --- /dev/null +++ b/src/views/basic/components/location.vue @@ -0,0 +1,156 @@ + + + diff --git a/src/views/basic/equipmentInfo.vue b/src/views/basic/equipmentInfo.vue new file mode 100644 index 0000000..9ad194e --- /dev/null +++ b/src/views/basic/equipmentInfo.vue @@ -0,0 +1,160 @@ + + + diff --git a/src/views/common/order-process.vue b/src/views/common/order-process.vue index e9b3c16..bcbd371 100644 --- a/src/views/common/order-process.vue +++ b/src/views/common/order-process.vue @@ -202,7 +202,7 @@ }, // 删除 deleteHandle (id) { - this.$confirm(`确定对[id=${id}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { + this.$confirm(`确定对[id=${id}]进行删除]操作?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index 93e3fb6..58e9b3d 100644 --- a/src/views/main-sidebar.vue +++ b/src/views/main-sidebar.vue @@ -6,7 +6,7 @@ :collapse="sidebarFold" :collapseTransition="false" class="site-sidebar__menu"> - +