修改ja

2022-06-28 10:13:38 +08:00
parent befc5b33da
commit 2fd12e486f
11 changed files with 22 additions and 22 deletions
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
  <head>
    <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">
-    <title>ykbk</title>
+    <title>yzja</title>
    <script src="../../common/js/appmui.js"></script>
    <!-- <script src="http://192.168.81.82:8000/CLodopfuncs.js" id='printid'></script> -->
  </head>
--- 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
 })
--- 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,
--- a/src/pages/login/Home.vue
+++ b/src/pages/login/Home.vue
@@ -5,7 +5,7 @@
      <div class="userInfo">
        <div class="fxcol">
          <p class="p1">{{$store.getters.userName}}</p>
-          <p class="p2">欢迎进入伊科拜克手持系统！</p>
+          <p class="p2">欢迎进入扬州晶澳手持系统！</p>
        </div>
        <div class="exit" @click="Quit">
          <i class="icon-exit"></i>
--- a/src/pages/login/Login.vue
+++ b/src/pages/login/Login.vue
@@ -2,7 +2,7 @@
  <section>
    <section class="content">
      <p class="p1">欢迎来到</p>
-      <p class="p2">伊科拜克手持系统！</p>
+      <p class="p2">扬州晶澳手持系统！</p>
      <div class="input-box">
        <input type="text" class="allwidth" placeholder="请输入用户名" v-model="loginname">
      </div>
--- a/src/pages/proj/PaintTask.vue
+++ b/src/pages/proj/PaintTask.vue
--- a/src/pages/proj/TaskManage.vue
+++ b/src/pages/proj/TaskManage.vue
--- a/src/pages/proj/ZlManage.vue
+++ b/src/pages/proj/ZlManage.vue
--- a/src/pages/proj/siteManage.vue
+++ b/src/pages/proj/siteManage.vue
--- a/src/pages/proj/taskGenerate.vue
+++ b/src/pages/proj/taskGenerate.vue
--- 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