diff --git a/index.html b/index.html index 61a0c71..b66d6df 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - ykbk + yzja diff --git a/src/config/getData01.js b/src/config/getData01.js index a1359f6..4c74ac2 100644 --- a/src/config/getData01.js +++ b/src/config/getData01.js @@ -2,32 +2,32 @@ import {post} from '@config/http.js' // import store from '../vuex/store' // 手持登录 -export const loginApi = (user, password) => post('api/aykbk/hand/handlogin', { +export const loginApi = (user, password) => post('api/aja/hand/handlogin', { user: user, password: password }) // 指令管理 // 1.1 查询未完成指令 -export const queryInstraction = (keyword, scode, ncode) => post('api/aykbk/hand/insts', { +export const queryInstraction = (keyword, scode, ncode) => post('api/aja/hand/insts', { keyword: keyword, start_devicecode: scode, next_devicecode: ncode }) // 1.2 指令操作 -export const instOperation = (uuid, type) => post('api/aykbk/hand/inst', { +export const instOperation = (uuid, type) => post('api/aja/hand/inst', { inst_uuid: uuid, type: type }) // 任务管理 // 1.1 查询未完成指令 -export const queryTask = (keyword, scode, ncode) => post('api/aykbk/hand/tasks', { +export const queryTask = (keyword, scode, ncode) => post('api/aja/hand/tasks', { keyword: keyword, start_devicecode: scode, next_devicecode: ncode }) // 1.2 指令操作 -export const taskOperation = (uuid, type) => post('api/aykbk/hand/taskoperation', { +export const taskOperation = (uuid, type) => post('api/aja/hand/taskoperation', { inst_uuid: uuid, type: type }) diff --git a/src/config/getData2.js b/src/config/getData2.js index 05a411c..8dd69b4 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -3,17 +3,17 @@ import {post} from '@config/http.js' // 任务下发 // 1.1查询所有区域信息 -export const handArea = (type) => post('api/aykbk/hand/area', { +export const handArea = (type) => post('api/aja/hand/area', { area_flag: type }) // 1.2根据区域查询设备编号及状态 -export const handPoint = (reg) => post('api/aykbk/hand/point', { +export const handPoint = (reg) => post('api/aja/hand/point', { region: reg }) // 1.3创建任务 -// export const handTask = (scode, ncode, type, no) => post('api/aykbk/hand/task', { +// export const handTask = (scode, ncode, type, no) => post('api/aja/hand/task', { // start_devicecode: scode, // next_devicecode: ncode, // material_type: type, @@ -21,7 +21,7 @@ export const handPoint = (reg) => post('api/aykbk/hand/point', { // }) // 喷漆任务 -export const handTask = (scode, ncode, type, batch) => post('api/aykbk/hand/task', { +export const handTask = (scode, ncode, type, batch) => post('api/aja/hand/task', { start_devicecode: scode, next_devicecode: ncode, material_type: type, @@ -30,7 +30,7 @@ export const handTask = (scode, ncode, type, batch) => post('api/aykbk/hand/task // 设备状态管理 // 1.1修改设备状态 -export const handDeviceStatus = (code, mtype, type, no, batch) => post('api/aykbk/hand/deviceStatus', { +export const handDeviceStatus = (code, mtype, type, no, batch) => post('api/aja/hand/deviceStatus', { device_code: code, material_type: mtype, type: type, @@ -39,10 +39,10 @@ export const handDeviceStatus = (code, mtype, type, no, batch) => post('api/aykb }) // 1查询物料 -export const handMatrial = () => post('api/aykbk/hand/matrial', {}) +export const handMatrial = () => post('api/aja/hand/matrial', {}) // 1.3创建任务（确定起点） -export const handTask2 = (code, mtype, type, batch) => post('api/aykbk/hand/task2', { +export const handTask2 = (code, mtype, type, batch) => post('api/aja/hand/task2', { start_devicecode: code, material_type: mtype, type: type, diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue index 618f63e..62e4b41 100644 --- a/src/pages/login/Home.vue +++ b/src/pages/login/Home.vue @@ -5,7 +5,7 @@

{{$store.getters.userName}}

-

欢迎进入伊科拜克手持系统！

+

欢迎进入扬州晶澳手持系统！

diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue index 69023ad..0174a35 100644 --- a/src/pages/login/Login.vue +++ b/src/pages/login/Login.vue @@ -2,7 +2,7 @@

欢迎来到

-

伊科拜克手持系统！

+

扬州晶澳手持系统！

diff --git a/src/pages/ykbk/PaintTask.vue b/src/pages/proj/PaintTask.vue similarity index 100% rename from src/pages/ykbk/PaintTask.vue rename to src/pages/proj/PaintTask.vue diff --git a/src/pages/ykbk/TaskManage.vue b/src/pages/proj/TaskManage.vue similarity index 100% rename from src/pages/ykbk/TaskManage.vue rename to src/pages/proj/TaskManage.vue diff --git a/src/pages/ykbk/ZlManage.vue b/src/pages/proj/ZlManage.vue similarity index 100% rename from src/pages/ykbk/ZlManage.vue rename to src/pages/proj/ZlManage.vue diff --git a/src/pages/ykbk/siteManage.vue b/src/pages/proj/siteManage.vue similarity index 100% rename from src/pages/ykbk/siteManage.vue rename to src/pages/proj/siteManage.vue diff --git a/src/pages/ykbk/taskGenerate.vue b/src/pages/proj/taskGenerate.vue similarity index 100% rename from src/pages/ykbk/taskGenerate.vue rename to src/pages/proj/taskGenerate.vue diff --git a/src/router/index.js b/src/router/index.js index a193eff..36d1425 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,12 +7,12 @@ const Home = r => require.ensure([], () => r(require('../pages/login/Home')), 'H const Login = r => require.ensure([], () => r(require('../pages/login/Login')), 'Login') const PwdManage = r => require.ensure([], () => r(require('../pages/login/PwdManage')), 'PwdManage') const Setup = r => require.ensure([], () => r(require('../pages/login/Setup')), 'Setup') -// ykbk -const TaskManage = r => require.ensure([], () => r(require('../pages/ykbk/TaskManage')), 'TaskManage') -const ZlManage = r => require.ensure([], () => r(require('../pages/ykbk/ZlManage')), 'ZlManage') -const siteManage = r => require.ensure([], () => r(require('../pages/ykbk/siteManage')), 'siteManage') -const taskGenerate = r => require.ensure([], () => r(require('../pages/ykbk/taskGenerate')), 'taskGenerate') -const PaintTask = r => require.ensure([], () => r(require('../pages/ykbk/PaintTask')), 'PaintTask') +// proj +const TaskManage = r => require.ensure([], () => r(require('../pages/proj/TaskManage')), 'TaskManage') +const ZlManage = r => require.ensure([], () => r(require('../pages/proj/ZlManage')), 'ZlManage') +const siteManage = r => require.ensure([], () => r(require('../pages/proj/siteManage')), 'siteManage') +const taskGenerate = r => require.ensure([], () => r(require('../pages/proj/taskGenerate')), 'taskGenerate') +const PaintTask = r => require.ensure([], () => r(require('../pages/proj/PaintTask')), 'PaintTask') Vue.use(Router) @@ -50,7 +50,7 @@ export default new Router({ name: 'preload', component: PreLoad }, - // ykbk + // proj { path: '/taskmanage', // 任务管理 component: TaskManage