root/hht-yzja
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改ja

Browse Source
This commit is contained in:
xiangxy
2022-06-28 10:13:38 +08:00
parent befc5b33da
commit 2fd12e486f
11 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@@ -2,7 +2,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0, minimum-scale=1.0,user-scalable=no"> <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0, minimum-scale=1.0,user-scalable=no">
<title>ykbk</title> <title>yzja</title>
<script src="../../common/js/appmui.js"></script> <script src="../../common/js/appmui.js"></script>
<!-- <script src="http://192.168.81.82:8000/CLodopfuncs.js" id='printid'></script> --> <!-- <script src="http://192.168.81.82:8000/CLodopfuncs.js" id='printid'></script> -->
</head> </head>

10
src/config/getData01.js
View File

@@ -2,32 +2,32 @@ import {post} from '@config/http.js'
// import store from '../vuex/store' // 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, user: user,
password: password password: password
}) })
// 指令管理 // 指令管理
// 1.1 查询未完成指令 // 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, keyword: keyword,
start_devicecode: scode, start_devicecode: scode,
next_devicecode: ncode next_devicecode: ncode
}) })
// 1.2 指令操作 // 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, inst_uuid: uuid,
type: type type: type
}) })
// 任务管理 // 任务管理
// 1.1 查询未完成指令 // 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, keyword: keyword,
start_devicecode: scode, start_devicecode: scode,
next_devicecode: ncode next_devicecode: ncode
}) })
// 1.2 指令操作 // 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, inst_uuid: uuid,
type: type type: type
}) })

14
src/config/getData2.js
View File

@@ -3,17 +3,17 @@ import {post} from '@config/http.js'
// 任务下发 // 任务下发
// 1.1查询所有区域信息 // 1.1查询所有区域信息
export const handArea = (type) => post('api/aykbk/hand/area', { export const handArea = (type) => post('api/aja/hand/area', {
area_flag: type area_flag: type
}) })
// 1.2根据区域查询设备编号及状态 // 1.2根据区域查询设备编号及状态
export const handPoint = (reg) => post('api/aykbk/hand/point', { export const handPoint = (reg) => post('api/aja/hand/point', {
region: reg region: reg
}) })
// 1.3创建任务 // 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, // start_devicecode: scode,
// next_devicecode: ncode, // next_devicecode: ncode,
// material_type: type, // 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, start_devicecode: scode,
next_devicecode: ncode, next_devicecode: ncode,
material_type: type, material_type: type,
@@ -30,7 +30,7 @@ export const handTask = (scode, ncode, type, batch) => post('api/aykbk/hand/task
// 设备状态管理 // 设备状态管理
// 1.1修改设备状态 // 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, device_code: code,
material_type: mtype, material_type: mtype,
type: type, type: type,
@@ -39,10 +39,10 @@ export const handDeviceStatus = (code, mtype, type, no, batch) => post('api/aykb
}) })
// 1查询物料 // 1查询物料
export const handMatrial = () => post('api/aykbk/hand/matrial', {}) export const handMatrial = () => post('api/aja/hand/matrial', {})
// 1.3创建任务（确定起点） // 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, start_devicecode: code,
material_type: mtype, material_type: mtype,
type: type, type: type,

2
src/pages/login/Home.vue
View File

@@ -5,7 +5,7 @@
<div class="userInfo"> <div class="userInfo">
<div class="fxcol"> <div class="fxcol">
<p class="p1">{{$store.getters.userName}}</p> <p class="p1">{{$store.getters.userName}}</p>
<p class="p2">欢迎进入伊科拜克手持系统！</p> <p class="p2">欢迎进入扬州晶澳手持系统！</p>
</div> </div>
<div class="exit" @click="Quit"> <div class="exit" @click="Quit">
<i class="icon-exit"></i> <i class="icon-exit"></i>

2
src/pages/login/Login.vue
View File

@@ -2,7 +2,7 @@
<section> <section>
<section class="content"> <section class="content">
<p class="p1">欢迎来到</p> <p class="p1">欢迎来到</p>
<p class="p2">伊科拜克手持系统！</p> <p class="p2">扬州晶澳手持系统！</p>
<div class="input-box"> <div class="input-box">
<input type="text" class="allwidth" placeholder="请输入用户名" v-model="loginname"> <input type="text" class="allwidth" placeholder="请输入用户名" v-model="loginname">
</div> </div>

0
src/pages/ykbk/PaintTask.vue → src/pages/proj/PaintTask.vue
View File

0
src/pages/ykbk/TaskManage.vue → src/pages/proj/TaskManage.vue
View File

0
src/pages/ykbk/ZlManage.vue → src/pages/proj/ZlManage.vue
View File

0
src/pages/ykbk/siteManage.vue → src/pages/proj/siteManage.vue
View File

0
src/pages/ykbk/taskGenerate.vue → src/pages/proj/taskGenerate.vue
View File

14
src/router/index.js
View File

@@ -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 Login = r => require.ensure([], () => r(require('../pages/login/Login')), 'Login')
const PwdManage = r => require.ensure([], () => r(require('../pages/login/PwdManage')), 'PwdManage') const PwdManage = r => require.ensure([], () => r(require('../pages/login/PwdManage')), 'PwdManage')
const Setup = r => require.ensure([], () => r(require('../pages/login/Setup')), 'Setup') const Setup = r => require.ensure([], () => r(require('../pages/login/Setup')), 'Setup')
// ykbk // proj
const TaskManage = r => require.ensure([], () => r(require('../pages/ykbk/TaskManage')), 'TaskManage') const TaskManage = r => require.ensure([], () => r(require('../pages/proj/TaskManage')), 'TaskManage')
const ZlManage = r => require.ensure([], () => r(require('../pages/ykbk/ZlManage')), 'ZlManage') const ZlManage = r => require.ensure([], () => r(require('../pages/proj/ZlManage')), 'ZlManage')
const siteManage = r => require.ensure([], () => r(require('../pages/ykbk/siteManage')), 'siteManage') const siteManage = r => require.ensure([], () => r(require('../pages/proj/siteManage')), 'siteManage')
const taskGenerate = r => require.ensure([], () => r(require('../pages/ykbk/taskGenerate')), 'taskGenerate') const taskGenerate = r => require.ensure([], () => r(require('../pages/proj/taskGenerate')), 'taskGenerate')
const PaintTask = r => require.ensure([], () => r(require('../pages/ykbk/PaintTask')), 'PaintTask') const PaintTask = r => require.ensure([], () => r(require('../pages/proj/PaintTask')), 'PaintTask')
Vue.use(Router) Vue.use(Router)
@@ -50,7 +50,7 @@ export default new Router({
name: 'preload', name: 'preload',
component: PreLoad component: PreLoad
}, },
// ykbk // proj
{ {
path: '/taskmanage', // 任务管理 path: '/taskmanage', // 任务管理
component: TaskManage component: TaskManage