diff --git a/src/config/getData2.js b/src/config/getData2.js index c836b2f..cdf537a 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -18,11 +18,38 @@ export const updatePass = (Rfold, Rfnew) => post2('api/pda/updatePass', { RfnewPass: Rfnew }) -/** 任务生成 */ -// 1.1查询设备 -export const queryDevice = () => post2('api/pda/queryDevice', {}) -// 1.2根据区域查询点位 -export const pdaTask = (scode, ncode) => post2('api/pda/task', { - start_devicecode: scode, - next_devicecode: ncode +/** 站点管理 */ +// 1.1查询所有区域信息 +// export const queryArea = () => post2('api/hand/queryArea', {}) +export const queryArea = () => { + let res = { + result: [{region_code: '1', region_name: 'JLDFJLLJ'}, {region_code: '2', region_name: 'JLDFJLLJ'}, {region_code: '3', region_name: 'JLDFJLLJ'}] + } + return res +} +// 1.2根据区域查询设备编号及状态 +// export const queryPointByArea = (code) => post2('api/hand/queryPointByArea', { +// areaCode: code +// }) +export const queryPointByArea = (code) => { + let res = { + result: [{device_code: '1', device_name: 'JLDFJLLJ', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}] + } + return res +} +// 1.3查询物料 +export const queryMaterial = () => post2('api/hand/queryMaterial', {}) +// 1.4点位状态绑定 +export const bindpoint = (code, mtype, type, status) => post2('api/hand/bindpoint', { + device_code: code, + material_type: mtype, + type: type, + status: status +}) + +/** 呼叫管理 */ +// 1.1创建任务(确定起点) +export const callTask = (scodes, code) => post2('api/hand/callTask', { + start_device_codes: scodes, + next_device_code: code }) diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue index 0b5fad5..e404941 100644 --- a/src/pages/login/Home.vue +++ b/src/pages/login/Home.vue @@ -5,7 +5,7 @@

{{$store.getters.userInfo !== '' ? JSON.parse($store.getters.userInfo).nickName : ''}}

-

欢迎进入马钢手持系统!

+

欢迎进入辽宁奥美手持系统!

@@ -16,7 +16,8 @@
    -
  • 任务生成
  • +
  • 站点管理
  • +
  • 呼叫管理
  • 指令管理
  • 任务管理
  • diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue index fb9148b..090d36c 100644 --- a/src/pages/login/Login.vue +++ b/src/pages/login/Login.vue @@ -2,7 +2,7 @@

    欢迎来到

    -

    马钢手持系统!

    +

    辽宁奥美手持系统!

    diff --git a/src/pages/proj/CallManage.vue b/src/pages/proj/CallManage.vue new file mode 100644 index 0000000..ad2c100 --- /dev/null +++ b/src/pages/proj/CallManage.vue @@ -0,0 +1,283 @@ + + + + + diff --git a/src/pages/proj/PaintTask.vue b/src/pages/proj/PaintTask.vue deleted file mode 100644 index c0a5693..0000000 --- a/src/pages/proj/PaintTask.vue +++ /dev/null @@ -1,236 +0,0 @@ - - - - - diff --git a/src/pages/proj/PressCallMater.vue b/src/pages/proj/PressCallMater.vue deleted file mode 100644 index 7198652..0000000 --- a/src/pages/proj/PressCallMater.vue +++ /dev/null @@ -1,127 +0,0 @@ - - - diff --git a/src/pages/proj/SiteManage.vue b/src/pages/proj/SiteManage.vue new file mode 100644 index 0000000..8b51c9b --- /dev/null +++ b/src/pages/proj/SiteManage.vue @@ -0,0 +1,301 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index e648ffc..b8797c5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,8 @@ const Setup = r => require.ensure([], () => r(require('../pages/login/Setup')), const Password = r => require.ensure([], () => r(require('../pages/proj/Password')), 'Password') const TaskManage = r => require.ensure([], () => r(require('../pages/proj/TaskManage')), 'TaskManage') const ZlManage = r => require.ensure([], () => r(require('../pages/proj/ZlManage')), 'ZlManage') -const PaintTask = r => require.ensure([], () => r(require('../pages/proj/PaintTask')), 'PaintTask') +const SiteManage = r => require.ensure([], () => r(require('../pages/proj/SiteManage')), 'SiteManage') +const CallManage = r => require.ensure([], () => r(require('../pages/proj/CallManage')), 'CallManage') Vue.use(Router) @@ -56,8 +57,12 @@ export default new Router({ component: ZlManage }, { - path: '/PaintTask', // 任务生成 - component: PaintTask + path: '/SiteManage', // 站点管理 + component: SiteManage + }, + { + path: '/CallManage', // 呼叫管理 + component: CallManage } ], scrollBehavior (to, from, savedPosition) {