diff --git a/src/api/api_equipment.js b/src/api/api_equipment.js
index fa0675e..0aa96a2 100644
--- a/src/api/api_equipment.js
+++ b/src/api/api_equipment.js
@@ -34,3 +34,89 @@ export const apiFindStaffDevice = data => {
return http({ url: `/lz_management/api/findUsersEquipmentsByName`, method: 'post', data })
}
+// 获取类型信息
+export const apiGetDeviceTypes = data => {
+ return http({ url: `/lz_management/modules/type/equipmentTypeList`, method: 'post', data })
+}
+
+// 获取规格信息
+export const apiGetDeviceSpecs = data => {
+ return http({ url: `/lz_management/modules/specs/equipmentSpecsList`, method: 'post', data })
+}
+
+// 获取品牌信息
+export const apiGetDeviceBrands = data => {
+ return http({ url: `/lz_management/modules/specs/brandList`, method: 'post', data })
+}
+
+// 获取品牌信息列表
+export const apiGetDeviceBrandList = data => {
+ return http({ url: `/lz_management/modules/brand/equipmentBrandList`, method: 'post', data })
+}
+
+// 编辑规格信息
+export const apiEditDeviceSpecs = data => {
+ return http({ url: `/lz_management/modules/specs/equipmentSpecsEdit`, method: 'post', data })
+}
+
+// 添加规格信息
+export const apiAddDeviceSpecs = data => {
+ return http({ url: `/lz_management/modules/specs/equipmentSpecsAdd`, method: 'post', data })
+}
+
+// 删除规格信息
+export const apiDelDeviceSpecs = data => {
+ return http({ url: `/lz_management/modules/specs/equipmentSpecsDelete`, method: 'post', data })
+}
+
+// 编辑规格信息
+export const apiEditDeviceTypes = data => {
+ return http({ url: `/lz_management/modules/type/equipmentTypeEdit`, method: 'post', data })
+}
+
+// 添加规格信息
+export const apiAddDeviceTypes = data => {
+ return http({ url: `/lz_management/modules/type/equipmentTypeAdd`, method: 'post', data })
+}
+
+// 删除规格信息
+export const apiDelDeviceTypes = data => {
+ return http({ url: `/lz_management/modules/type/equipmentTypeDelete`, method: 'post', data })
+}
+
+// 编辑品牌信息
+export const apiEditDeviceBrands = data => {
+ return http({ url: `/lz_management/modules/brand/equipmentBrandEdit`, method: 'post', data })
+}
+
+// 添加品牌信息
+export const apiAddDeviceBrands = data => {
+ return http({ url: `/lz_management/modules/brand/equipmentBrandAdd`, method: 'post', data })
+}
+
+// 删除品牌信息
+export const apiDelDeviceBrands = data => {
+ return http({ url: `/lz_management/modules/brand/equipmentBrandDelete`, method: 'post', data })
+}
+
+// 获取使用设备列表
+export const apiGetUseDeviceList = data => {
+ return http({ url: `/lz_management/modules/usereq/equipmentInfoList`, method: 'post', data })
+}
+
+// 编辑使用设备信息
+export const apiEditUseDevice = data => {
+ return http({ url: `/lz_management/modules/usereq/equipmentInfoEdit`, method: 'post', data })
+}
+
+
+// 删除使用设备信息
+export const apiDelUseDevice = data => {
+ return http({ url: `/lz_management/modules/usereq/equipmentInfoDelete`, method: 'post', data })
+}
+
+// 打印编码
+export const apiGetRePrintCode = (data, code) => {
+ return http({ url: `/lz_management/oneCode/re/print?code=${code}`, method: 'get', data })
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index 5325e7d..73c3ed3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,9 +9,9 @@ import Router from 'vue-router'
import { apiGetMenuNav } from '@/api/api_menu'
import { isURL } from '@/utils/validate'
import {clearLoginInfo} from '@/utils'
-//import VConsole from 'vconsole'
+import VConsole from 'vconsole'
-//let vConsole = new VConsole()
+let vConsole = new VConsole()
Vue.use(Router)
// 开发环境不使用懒加载, 因为懒加载页面太多的话会造成webpack热更新太慢, 所以只有生产环境使用懒加载
@@ -33,6 +33,10 @@ const dingtalkRoutes=[
{ path: '/devicemark', component: _import('modules/device/device-mark'), name: 'devicemark', meta: { title: '设备备注' } },
{ path: '/devicestaff', component: _import('modules/device/device-staff-device'), name: 'devicestaff', meta: { title: '人员资产信息' } },
{ path: '/devicestaffdepat', component: _import('modules/device/device-staff-depat'), name: 'devicestaffdepat', meta: { title: '搜索人员' } },
+ { path: '/devicespec', component: _import('modules/device-manage/device-spec'), name: 'devicespec', meta: { title: '设备规格管理' } },
+ { path: '/devicetypes', component: _import('modules/device-manage/device-type'), name: 'devicetypes', meta: { title: '设备类型管理' } },
+ { path: '/devicebrand', component: _import('modules/device-manage/device-brand'), name: 'devicebrand', meta: { title: '设备品牌管理' } },
+ { path: '/devicelist', component: _import('modules/device-manage/device-list'), name: 'devicelist', meta: { title: '设备列表管理' } },
{ path: '/devicedetail', component: _import('modules/device/device-detail'), name: 'devicedetail', meta: { title: '资产盘点设备详情页' } }
]
@@ -104,13 +108,13 @@ router.beforeEach((to, from, next) => {
if (router.options.isAddDynamicMenuRoutes || fnCurrentRouteType(to, globalRoutes) === 'global') {
next()
} else if (fnIsInRoutes(to, dingtalkRoutes)) {//判断是否全屏路由
- if(fnCheckToken()){
+ /*if(fnCheckToken()){
next()
} else {
clearLoginInfo()
next({ name: 'login' })
- }
- //next()
+ }*/
+ next()
/*console.log(to)
let newpage = router.resolve({
name: to.path,
diff --git a/src/views/modules/device-manage/device-brand-detail.vue b/src/views/modules/device-manage/device-brand-detail.vue
new file mode 100644
index 0000000..73dd544
--- /dev/null
+++ b/src/views/modules/device-manage/device-brand-detail.vue
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{brand}}
+
+
+ {{rank}}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-brand.vue b/src/views/modules/device-manage/device-brand.vue
new file mode 100644
index 0000000..a0d1116
--- /dev/null
+++ b/src/views/modules/device-manage/device-brand.vue
@@ -0,0 +1,258 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 新增品牌
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-list-detail.vue b/src/views/modules/device-manage/device-list-detail.vue
new file mode 100644
index 0000000..c2e85b3
--- /dev/null
+++ b/src/views/modules/device-manage/device-list-detail.vue
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-list.vue b/src/views/modules/device-manage/device-list.vue
new file mode 100644
index 0000000..c49cb97
--- /dev/null
+++ b/src/views/modules/device-manage/device-list.vue
@@ -0,0 +1,507 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空筛选
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getStatusStr(scope.row.equipmentState) }}
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+ 打印标识
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 新增规格
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-type-detail.vue b/src/views/modules/device-manage/device-type-detail.vue
new file mode 100644
index 0000000..278d3bc
--- /dev/null
+++ b/src/views/modules/device-manage/device-type-detail.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+ {{type}}
+
+
+ {{rank}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/device-manage/device-type.vue b/src/views/modules/device-manage/device-type.vue
new file mode 100644
index 0000000..512a1ad
--- /dev/null
+++ b/src/views/modules/device-manage/device-type.vue
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 新增类型
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/equipment/main.vue b/src/views/modules/equipment/main.vue
deleted file mode 100644
index 25ec54c..0000000
--- a/src/views/modules/equipment/main.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
-
-
-
-