@@ -12,7 +12,7 @@ steps: | |||
- name: dockerconfig | |||
path: /root/.docker | |||
commands: | |||
- docker build -t harbor.picaiba.com/mes/mes-cigs-ui ./ && docker push harbor.picaiba.com/mes/mes-cigs-ui | |||
- docker build -t harbor.picaiba.com/kszny/wms-ui:00a-1.0.0 ./ && docker push harbor.picaiba.com/kszny/wms-ui:00a-1.0.0 | |||
- name: deploy | |||
image: harbor.picaiba.com/tools/kubectl:1.19.8 | |||
@@ -20,9 +20,9 @@ steps: | |||
- echo "172.27.0.20 lb.kubesphere.local" >> /etc/hosts | |||
#- echo "52.74.223.119 github.com" >> /etc/hosts | |||
- sleep 1 | |||
- kubectl scale --replicas=0 deployment/mes-ui -n mes-cigs | |||
- kubectl scale --replicas=0 deployment/a-wms-ui -n wms | |||
- sleep 3 | |||
- kubectl scale --replicas=1 deployment/mes-ui -n mes-cigs | |||
- kubectl scale --replicas=1 deployment/a-wms-ui -n wms | |||
depends_on: | |||
- build | |||
@@ -2,6 +2,6 @@ | |||
ENV = 'production' | |||
# base api | |||
VUE_APP_BASE_API = '/api' | |||
VUE_APP_BASE_API = '' | |||
VUE_APP_REPORT_DESIGN_URL = '/ureport/designer' | |||
VUE_APP_REPORT_VIEW_URL = '/ureport/preview' | |||
VUE_APP_REPORT_VIEW_URL = '/ureport/preview' |
@@ -1,9 +1,7 @@ | |||
FROM node:12 AS builder | |||
WORKDIR /app | |||
ADD package.json /app/ | |||
RUN npm install \ | |||
--registry=https://registry.npm.taobao.org \ | |||
--disturl=https://npm.taobao.org/dist | |||
RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install | |||
ADD . /app | |||
RUN npm run build:prod | |||
@@ -2,42 +2,42 @@ import request from '@/utils/request' | |||
export function list(data) { | |||
return request({ | |||
url: '/process/process-flow/page', | |||
url: '/api/process/process-flow/page', | |||
method: 'post', | |||
data | |||
}) | |||
} | |||
export function getInfo(data) { | |||
return request({ | |||
url: '/process/process-flow/get', | |||
url: '/api/process/process-flow/get', | |||
method: 'post', | |||
data | |||
}) | |||
} | |||
export function enabled(data) { | |||
return request({ | |||
url: '/process/process-flow/enabled', | |||
url: '/api/process/process-flow/enabled', | |||
method: 'post', | |||
data | |||
}) | |||
} | |||
export function del(data) { | |||
return request({ | |||
url: '/process/process-flow/delete', | |||
url: '/api/process/process-flow/delete', | |||
method: 'post', | |||
data | |||
}) | |||
} | |||
export function update(data) { | |||
return request({ | |||
url: '/process/process-flow/update', | |||
url: '/api/process/process-flow/update', | |||
method: 'post', | |||
data | |||
}) | |||
} | |||
export function add(data) { | |||
return request({ | |||
url: '/process/process-flow/add', | |||
url: '/api/process/process-flow/add', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -45,7 +45,7 @@ export function add(data) { | |||
// 获取基板列表 | |||
export function listSubstrate(data) { | |||
return request({ | |||
url: '/process/process-flow/substrateList', | |||
url: '/api/process/process-flow/substrateList', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -53,7 +53,7 @@ export function listSubstrate(data) { | |||
// 获取BOM列表 | |||
export function listBom(data) { | |||
return request({ | |||
url: '/process/process-flow/bomList', | |||
url: '/api/process/process-flow/bomList', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -70,7 +70,7 @@ export function listEquipmentBom(data) { | |||
// 获取所有设备的bom | |||
export function listAllEquipmentBom(data) { | |||
return request({ | |||
url: '/process/process-flow-equipment/allEquipmentBomList', | |||
url: '/api/process/process-flow-equipment/allEquipmentBomList', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -86,7 +86,7 @@ export function listEquipmentRecipe(data) { | |||
// 获取所有设备下的配方 | |||
export function listAllEquipmentRecipe(data) { | |||
return request({ | |||
url: '/process/process-flow-equipment/allEquipmentRecipeList', | |||
url: '/api/process/process-flow-equipment/allEquipmentRecipeList', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -102,7 +102,7 @@ export function addProcessFlows(data) { | |||
// 获取工艺流程下所有节点 | |||
export function listProcessFlowNode(data) { | |||
return request({ | |||
url: '/process/process-flow-equipment/list', | |||
url: '/api/process/process-flow-equipment/list', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -111,7 +111,7 @@ export function listProcessFlowNode(data) { | |||
// 获取工序列表 | |||
export function listProcess(data) { | |||
return request({ | |||
url: '/process/work-sequence/list', | |||
url: '/api/process/work-sequence/list', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -120,7 +120,7 @@ export function listProcess(data) { | |||
// 获取工艺自动code | |||
export function getCode() { | |||
return request({ | |||
url: '/process/process-flow/getCode', | |||
url: '/api/process/process-flow/getCode', | |||
method: 'post' | |||
}) | |||
} |
@@ -1,8 +1,8 @@ | |||
/* | |||
* @Author: gtz | |||
* @Date: 2021-04-06 20:20:10 | |||
* @LastEditors: gtz | |||
* @LastEditTime: 2021-04-07 16:14:47 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2022-02-25 09:04:24 | |||
* @Description: file content | |||
*/ | |||
@@ -10,7 +10,7 @@ import request from '@/utils/request' | |||
export function list(data) { | |||
return request({ | |||
url: '/process/work-sequence/page', | |||
url: '/api/process/work-sequence/page', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -18,7 +18,7 @@ export function list(data) { | |||
export function getInfo(data) { | |||
return request({ | |||
url: '/process/work-sequence/get', | |||
url: '/api/process/work-sequence/get', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -26,7 +26,7 @@ export function getInfo(data) { | |||
export function del(data) { | |||
return request({ | |||
url: '/process/work-sequence/delete', | |||
url: '/api/process/work-sequence/delete', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -34,7 +34,7 @@ export function del(data) { | |||
export function update(data) { | |||
return request({ | |||
url: '/process/work-sequence/update', | |||
url: '/api/process/work-sequence/update', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -42,7 +42,7 @@ export function update(data) { | |||
export function add(data) { | |||
return request({ | |||
url: '/process/work-sequence/add', | |||
url: '/api/process/work-sequence/add', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -2,14 +2,14 @@ | |||
* @Author: zwq | |||
* @Date: 2020-12-29 16:00:14 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2021-01-15 16:03:31 | |||
* @LastEditTime: 2022-02-24 08:57:40 | |||
* @Description: | |||
*/ | |||
import request from '@/utils/request' | |||
export function materialList(data) { // 获取物料信息列表 | |||
return request({ | |||
url: '/basic/material/page', | |||
url: '/api/wms/material/page', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -17,7 +17,7 @@ export function materialList(data) { // 获取物料信息列表 | |||
export function materialDetail(id) { // 获取物料信息单条数据 | |||
return request({ | |||
url: '/basic/material/get', | |||
url: '/api/wms/material/get', | |||
method: 'post', | |||
data: { id } | |||
}) | |||
@@ -25,7 +25,7 @@ export function materialDetail(id) { // 获取物料信息单条数据 | |||
export function materialUpdate(data) { // 更新物料信息单条数据 | |||
return request({ | |||
url: '/basic/material/update', | |||
url: '/api/wms/material/update', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -33,7 +33,7 @@ export function materialUpdate(data) { // 更新物料信息单条数据 | |||
export function materialAdd(data) { // 新增物料信息单条数据 | |||
return request({ | |||
url: '/basic/material/add', | |||
url: '/api/wms/material/add', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -41,14 +41,14 @@ export function materialAdd(data) { // 新增物料信息单条数据 | |||
export function materialCode() { // 获取物料信息code | |||
return request({ | |||
url: '/basic/material/get-code', | |||
url: '/api/wms/material/get-code', | |||
method: 'post' | |||
}) | |||
} | |||
export function materialDelete(id) { // 删除物料信息单条数据 | |||
return request({ | |||
url: '/basic/material/delete', | |||
url: '/api/wms/material/delete', | |||
method: 'post', | |||
data: { id } | |||
}) | |||
@@ -2,14 +2,14 @@ | |||
* @Author: zwq | |||
* @Date: 2020-12-29 16:00:14 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2021-01-16 12:09:29 | |||
* @LastEditTime: 2022-02-24 14:46:16 | |||
* @Description: | |||
*/ | |||
import request from '@/utils/request' | |||
export function materialAttrList(data) { // 获取物料属性列表 | |||
return request({ | |||
url: '/basic/material-attr/page', | |||
url: '/api/wms/material-attr/page', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -17,7 +17,7 @@ export function materialAttrList(data) { // 获取物料属性列表 | |||
export function materialAttrDetail(id) { // 获取物料属性单条数据 | |||
return request({ | |||
url: '/basic/material-attr/get', | |||
url: '/api/wms/material-attr/get', | |||
method: 'post', | |||
data: { id } | |||
}) | |||
@@ -25,7 +25,7 @@ export function materialAttrDetail(id) { // 获取物料属性单条数据 | |||
export function materialAttrUpdate(data) { // 更新物料属性单条数据 | |||
return request({ | |||
url: '/basic/material-attr/update', | |||
url: '/api/wms/material-attr/update', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -33,7 +33,7 @@ export function materialAttrUpdate(data) { // 更新物料属性单条数据 | |||
export function materialAttrAdd(data) { // 新增物料属性单条数据 | |||
return request({ | |||
url: '/basic/material-attr/add', | |||
url: '/api/wms/material-attr/add', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -41,14 +41,14 @@ export function materialAttrAdd(data) { // 新增物料属性单条数据 | |||
export function materialAttrCode() { // 获取物料属性code | |||
return request({ | |||
url: '/basic/material-attr/get-code', | |||
url: '/api/wms/material-attr/get-code', | |||
method: 'post' | |||
}) | |||
} | |||
export function materialAttrDelete(id) { // 删除物料属性单条数据 | |||
return request({ | |||
url: '/basic/material-attr/delete', | |||
url: '/api/wms/material-attr/delete', | |||
method: 'post', | |||
data: { id } | |||
}) | |||
@@ -2,14 +2,14 @@ | |||
* @Author: zwq | |||
* @Date: 2020-12-29 16:00:14 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2021-01-16 11:52:14 | |||
* @LastEditTime: 2022-02-24 14:46:20 | |||
* @Description: | |||
*/ | |||
import request from '@/utils/request' | |||
export function materialsTypeList(data) { // 获取物料类型列表 | |||
return request({ | |||
url: '/basic/material-type/page', | |||
url: '/api/wms/material-type/page', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -17,7 +17,7 @@ export function materialsTypeList(data) { // 获取物料类型列表 | |||
export function materialsTypeDetail(id) { // 获取物料类型单条数据 | |||
return request({ | |||
url: '/basic/material-type/get', | |||
url: '/api/wms/material-type/get', | |||
method: 'post', | |||
data: { id } | |||
}) | |||
@@ -25,7 +25,7 @@ export function materialsTypeDetail(id) { // 获取物料类型单条数据 | |||
export function materialsTypeUpdate(data) { // 更新物料类型单条数据 | |||
return request({ | |||
url: '/basic/material-type/update', | |||
url: '/api/wms/material-type/update', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -33,7 +33,7 @@ export function materialsTypeUpdate(data) { // 更新物料类型单条数据 | |||
export function materialsTypeAdd(data) { // 新增物料类型单条数据 | |||
return request({ | |||
url: '/basic/material-type/add', | |||
url: '/api/wms/material-type/add', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -41,14 +41,14 @@ export function materialsTypeAdd(data) { // 新增物料类型单条数据 | |||
export function materialsTypeCode() { // 获取物料类型code | |||
return request({ | |||
url: '/basic/material-type/get-code', | |||
url: '/api/wms/material-type/get-code', | |||
method: 'post' | |||
}) | |||
} | |||
export function materialsTypeDelete(id) { // 删除物料类型单条数据 | |||
return request({ | |||
url: '/basic/material-type/delete', | |||
url: '/api/wms/material-type/delete', | |||
method: 'post', | |||
data: { id } | |||
}) | |||
@@ -1,7 +1,7 @@ | |||
/* | |||
* @Date: 2021-01-21 18:08:29 | |||
* @LastEditors: Please set LastEditors | |||
* @LastEditTime: 2021-07-12 10:11:14 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2022-02-24 14:55:06 | |||
* @FilePath: \basic-admin\src\api\dict\index.js | |||
* @Description: 数据字典定义 | |||
*/ | |||
@@ -11,7 +11,7 @@ import { requestWithCache } from '@/utils/request' | |||
// 获取设备列表列表 | |||
export function getDictDevice(data) { | |||
return requestWithCache({ | |||
url: '/basic/equipment/page', | |||
url: '/api/wms/equipment/page', | |||
method: 'post', | |||
data | |||
}).then(res => { | |||
@@ -41,7 +41,7 @@ export function getDictDeviceType(data) { | |||
// 获取物料列表 | |||
export function getDictBom(data) { | |||
return requestWithCache({ | |||
url: '/basic/material/page', | |||
url: '/api/wms/material/page', | |||
method: 'post', | |||
data | |||
}).then(res => { | |||
@@ -71,7 +71,7 @@ export function getDictSupplier(data) { | |||
// 获取单位列表 | |||
export function getDictUnit(data) { | |||
return requestWithCache({ | |||
url: '/basic/platform-dict/selectPlatformDictDataListByPage', | |||
url: '/api/wms/platform-dict/selectPlatformDictDataListByPage', | |||
method: 'post', | |||
data: { | |||
current: 1, | |||
@@ -105,7 +105,7 @@ export function getDictMaterial(data) { | |||
// 获取维修类型 | |||
export function getDictRepairType(data) { | |||
return requestWithCache({ | |||
url: '/basic/maintenance-type/page', | |||
url: '/api/wms/maintenance-type/page', | |||
method: 'post', | |||
data: { | |||
current: 1, | |||
@@ -129,7 +129,7 @@ export function getDictRepairType(data) { | |||
// 获取员工列表 | |||
export function getDictWorker() { | |||
return requestWithCache({ | |||
url: '/basic/worker/page', | |||
url: '/api/wms/worker/page', | |||
method: 'post', | |||
data: { | |||
current: 1, | |||
@@ -153,7 +153,7 @@ export function getDictWorker() { | |||
// 获取基础备品备件列表 | |||
export function getDictSparepart(data) { | |||
return requestWithCache({ | |||
url: '/basic/tool-spare-part/page', | |||
url: '/api/wms/tool-spare-part/page', | |||
method: 'post', | |||
data: { | |||
current: 1, | |||
@@ -176,7 +176,7 @@ export function getDictSparepart(data) { | |||
// 获取备件型号 | |||
export function getDictModel(data) { | |||
return requestWithCache({ | |||
url: '/basic/tool-spare-part/list', | |||
url: '/api/wms/tool-spare-part/list', | |||
method: 'post', | |||
data: { | |||
current: 1, | |||
@@ -200,7 +200,7 @@ export function getDictModel(data) { | |||
// 质量---报废: 报废原因 | |||
export function scrapReasonList(data) { | |||
return requestWithCache({ | |||
url: '/basic/scrap-information/page', | |||
url: '/api/wms/scrap-information/page', | |||
method: 'post', | |||
data: { | |||
current: 1, | |||
@@ -250,7 +250,7 @@ export function faultLevelList(data) { | |||
// 获取保养周期 | |||
export function maintainPeriod(data) { | |||
return requestWithCache({ | |||
url: '/basic/platform-dict/selectPlatformDictDataListByPage', | |||
url: '/api/wms/platform-dict/selectPlatformDictDataListByPage', | |||
method: 'post', | |||
data: { | |||
current: 1, | |||
@@ -327,7 +327,7 @@ export function equipmentTypeParam(id) { | |||
export function statusList(id) { | |||
return requestWithCache({ | |||
url: '/basic/configure-display/page', | |||
url: '/api/wms/configure-display/page', | |||
method: 'post', | |||
data: { | |||
current: 1, | |||
@@ -350,7 +350,7 @@ export function statusList(id) { | |||
// 获取角色列表 | |||
export function workerRoleList() { | |||
return requestWithCache({ | |||
url: '/basic/platform-dict/selectPlatformDictDataListByPage', | |||
url: '/api/wms/platform-dict/selectPlatformDictDataListByPage', | |||
method: 'post', | |||
data: { | |||
dictTypeId: '1383318968677273601', | |||
@@ -1,7 +1,7 @@ | |||
/* | |||
* @Date: 2021-01-05 15:25:38 | |||
* @LastEditors: gtz | |||
* @LastEditTime: 2021-04-21 13:26:36 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2022-02-24 14:48:53 | |||
* @FilePath: \basic-admin\src\api\equipment\bom.js | |||
* @Description: 设备管理——设备物料bom管理 接口定义 | |||
*/ | |||
@@ -10,7 +10,7 @@ import request from '@/utils/request' | |||
// 获取物料bom列表 | |||
export function getBOMList(data) { | |||
return request({ | |||
url: '/equipment/equipment-bom/findAllByEQNameOrEQCodeOrMaterialNameWithPage', | |||
url: '/api/wms/equipment-bom/findAllByEQNameOrEQCodeOrMaterialNameWithPage', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -19,7 +19,7 @@ export function getBOMList(data) { | |||
// 新增物料bom | |||
export function addBOM(data) { | |||
return request({ | |||
url: '/equipment/equipment-bom/create', | |||
url: '/api/wms/equipment-bom/create', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -28,7 +28,7 @@ export function addBOM(data) { | |||
// 修改物料bom | |||
export function editBOM(data) { | |||
return request({ | |||
url: '/equipment/equipment-bom/update', | |||
url: '/api/wms/equipment-bom/update', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -37,7 +37,7 @@ export function editBOM(data) { | |||
// 删除物料bom | |||
export function delBOM(data) { | |||
return request({ | |||
url: '/equipment/equipment-bom/delete', | |||
url: '/api/wms/equipment-bom/delete', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -46,7 +46,7 @@ export function delBOM(data) { | |||
// 根据id获取物料bom | |||
export function getBOMInfo(data) { | |||
return request({ | |||
url: '/equipment/equipment-bom/findById', | |||
url: '/api/wms/equipment-bom/findById', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -55,7 +55,7 @@ export function getBOMInfo(data) { | |||
// 获取设备物料bom列表 | |||
export function getDeviceBOMList(data) { | |||
return request({ | |||
url: '/equipment/equipment-bom-detail/findAllByEQBomIdWithPage', | |||
url: '/api/wms/equipment-bom-detail/findAllByEQBomIdWithPage', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -64,7 +64,7 @@ export function getDeviceBOMList(data) { | |||
// 新增设备物料bom | |||
export function addDeviceBOM(data) { | |||
return request({ | |||
url: '/equipment/equipment-bom-detail/create', | |||
url: '/api/wms/equipment-bom-detail/create', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -73,7 +73,7 @@ export function addDeviceBOM(data) { | |||
// 修改设备物料bom | |||
export function editDeviceBOM(data) { | |||
return request({ | |||
url: '/equipment/equipment-bom-detail/update', | |||
url: '/api/wms/equipment-bom-detail/update', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -82,7 +82,7 @@ export function editDeviceBOM(data) { | |||
// 删除设备物料bom | |||
export function delDeviceBOM(data) { | |||
return request({ | |||
url: '/equipment/equipment-bom-detail/delete', | |||
url: '/api/wms/equipment-bom-detail/delete', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -91,7 +91,7 @@ export function delDeviceBOM(data) { | |||
// 根据id获取设备物料bom详细 | |||
export function getDeviceBOMInfo(data) { | |||
return request({ | |||
url: '/equipment/equipment-bom-detail/findById', | |||
url: '/api/wms/equipment-bom-detail/findById', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -101,7 +101,7 @@ export function getDeviceBOMInfo(data) { | |||
export function getMaterialList(data) { | |||
return request({ | |||
url: '/basic/material/page', | |||
url: '/api/wms/material/page', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -1,7 +1,7 @@ | |||
/* | |||
* @Date: 2021-01-28 15:01:57 | |||
* @LastEditors: gtz | |||
* @LastEditTime: 2021-04-20 10:50:48 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2022-02-24 14:49:42 | |||
* @FilePath: \basic-admin\src\api\equipment\recipe.js | |||
* @Description: 设备配方设置 | |||
*/ | |||
@@ -11,7 +11,7 @@ import request from '@/utils/request' | |||
// 获取设备配方CODE | |||
export function getDeviceRecipeCode(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe/getEquipmentRecipeCode', | |||
url: '/api/wms/equipment-recipe/getEquipmentRecipeCode', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -20,7 +20,7 @@ export function getDeviceRecipeCode(data) { | |||
// 获取设备配方列表 | |||
export function getDeviceRecipeList(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe/findAllByEquipmentTypeAndRecipeName', | |||
url: '/api/wms/equipment-recipe/findAllByEquipmentTypeAndRecipeName', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -29,7 +29,7 @@ export function getDeviceRecipeList(data) { | |||
// 新建设备配方 | |||
export function addDeviceRecipe(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe/create', | |||
url: '/api/wms/equipment-recipe/create', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -38,7 +38,7 @@ export function addDeviceRecipe(data) { | |||
// 编辑设备配方 | |||
export function editDeviceRecipe(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe/update', | |||
url: '/api/wms/equipment-recipe/update', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -47,7 +47,7 @@ export function editDeviceRecipe(data) { | |||
// 删除设备配方 | |||
export function delDeviceRecipe(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe/delete', | |||
url: '/api/wms/equipment-recipe/delete', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -56,7 +56,7 @@ export function delDeviceRecipe(data) { | |||
// 获取设备配方 | |||
export function getDeviceRecipe(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe/findById', | |||
url: '/api/wms/equipment-recipe/findById', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -65,7 +65,7 @@ export function getDeviceRecipe(data) { | |||
// 根据id获取设备配方参数列表 | |||
export function getDeviceRecipeParamList(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe-parameter/findAllByRecipeIdWithPage', | |||
url: '/api/wms/equipment-recipe-parameter/findAllByRecipeIdWithPage', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -74,7 +74,7 @@ export function getDeviceRecipeParamList(data) { | |||
// 新增设备配方参数 | |||
export function addDeviceRecipeParam(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe-parameter/create', | |||
url: '/api/wms/equipment-recipe-parameter/create', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -83,7 +83,7 @@ export function addDeviceRecipeParam(data) { | |||
// 修改设备配方参数 | |||
export function editDeviceRecipeParam(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe-parameter/update', | |||
url: '/api/wms/equipment-recipe-parameter/update', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -92,7 +92,7 @@ export function editDeviceRecipeParam(data) { | |||
// 删除设备配方参数 | |||
export function delDeviceRecipeParam(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe-parameter/delete', | |||
url: '/api/wms/equipment-recipe-parameter/delete', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -101,7 +101,7 @@ export function delDeviceRecipeParam(data) { | |||
// 获取设备配方参数详细 (等待接口补全) | |||
export function getDeviceRecipeParam(data) { | |||
return request({ | |||
url: '/equipment/equipment-recipe-parameter/findById', | |||
url: '/api/wms/equipment-recipe-parameter/findById', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -1,15 +1,15 @@ | |||
/* | |||
* @Author: gtz | |||
* @Date: 2021-04-01 09:24:20 | |||
* @LastEditors: gtz | |||
* @LastEditTime: 2021-04-16 13:24:51 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2022-02-25 09:06:19 | |||
* @Description: file content | |||
*/ | |||
import request from '@/utils/request' | |||
export function page(data) { | |||
return request({ | |||
url: '/report/report-sheet-category/page', | |||
url: '/api/report/report-sheet-category/page', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -17,7 +17,7 @@ export function page(data) { | |||
export function list(data) { | |||
return request({ | |||
url: '/report/report-sheet-category/list', | |||
url: '/api/report/report-sheet-category/list', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -25,7 +25,7 @@ export function list(data) { | |||
export function del(data) { | |||
return request({ | |||
url: '/report/report-sheet-category/delete', | |||
url: '/api/report/report-sheet-category/delete', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -33,7 +33,7 @@ export function del(data) { | |||
export function update(data) { | |||
return request({ | |||
url: '/report/report-sheet-category/update', | |||
url: '/api/report/report-sheet-category/update', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -41,7 +41,7 @@ export function update(data) { | |||
export function add(data) { | |||
return request({ | |||
url: '/report/report-sheet-category/add', | |||
url: '/api/report/report-sheet-category/add', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -49,7 +49,7 @@ export function add(data) { | |||
export function getData(data) { | |||
return request({ | |||
url: '/report/report-sheet-category/get', | |||
url: '/api/report/report-sheet-category/get', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -1,15 +1,15 @@ | |||
/* | |||
* @Author: gtz | |||
* @Date: 2021-03-07 18:39:03 | |||
* @LastEditors: gtz | |||
* @LastEditTime: 2021-04-22 20:03:49 | |||
* @LastEditors: zwq | |||
* @LastEditTime: 2022-02-25 09:05:53 | |||
* @Description: file content | |||
*/ | |||
import request from '@/utils/request' | |||
export function page(data) { | |||
return request({ | |||
url: '/report/report-sheet/page', | |||
url: '/api/report/report-sheet/page', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -17,7 +17,7 @@ export function page(data) { | |||
export function del(data) { | |||
return request({ | |||
url: '/report/report-sheet/delete', | |||
url: '/api/report/report-sheet/delete', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -25,7 +25,7 @@ export function del(data) { | |||
export function getInfo(data) { | |||
return request({ | |||
url: '/report/report-sheet/get', | |||
url: '/api/report/report-sheet/get', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -33,7 +33,7 @@ export function getInfo(data) { | |||
export function update(data) { | |||
return request({ | |||
url: '/report/report-sheet/update', | |||
url: '/api/report/report-sheet/update', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -42,7 +42,7 @@ export function update(data) { | |||
// 报表分类列表 | |||
export function listCategory(data) { | |||
return request({ | |||
url: '/report/report-sheet-category/list', | |||
url: '/api/report/report-sheet-category/list', | |||
method: 'post', | |||
data | |||
}) | |||
@@ -160,6 +160,62 @@ export const constantRoutes = [ | |||
name: 'equipmentInfoAdd', | |||
hidden: true, | |||
meta: { title: routerTitle.basicData.equipment.equipmentInfoAdd?.[language] || routerTitle.basicData.equipment.equipmentInfoAdd.en, icon: 'form', affix: true, required: true, requireToken: true } | |||
}, | |||
{ | |||
path: '/Materials', | |||
component: () => import('@/views/basicData/index'), | |||
name: 'Materials', | |||
meta: { title: routerTitle.basicData.materials?.[language] || routerTitle.basicData.materials.en, icon: 'form', affix: true, required: true, requireToken: true }, | |||
children: [ | |||
{ | |||
path: 'Material', | |||
component: () => import('@/views/basicData/Materials/material'), | |||
name: 'Material', | |||
meta: { title: routerTitle.basicData.materials.material?.[language] || routerTitle.basicData.materials.material.en, icon: 'form', affix: true, required: true, requireToken: true } | |||
}, | |||
{ | |||
path: 'MaterialAdd', | |||
component: () => import('@/views/basicData/Materials/components/material-add'), | |||
name: 'MaterialAdd', | |||
hidden: true, | |||
meta: { title: routerTitle.basicData.materials.MaterialAdd?.[language] || routerTitle.basicData.materials.MaterialAdd.en, icon: 'form', affix: true, required: true, requireToken: true } | |||
}, | |||
{ | |||
path: 'MaterialsType', | |||
component: () => | |||
import('@/views/basicData/Materials/materialsType'), | |||
name: 'MaterialsType', | |||
meta: { title: routerTitle.basicData.materials.materialType?.[language] || routerTitle.basicData.materials.materialType.en, icon: 'form', affix: true, required: true, requireToken: true } | |||
} | |||
] | |||
} | |||
] | |||
}, | |||
{ | |||
path: '/art', | |||
component: Layout, | |||
redirect: '/art/list', | |||
name: 'ArtManager', | |||
meta: { title: routerTitle.technology?.[language] || routerTitle.technology.en, icon: 'form', iconPart: 'ArtManager', affix: true, required: true, requireToken: true }, | |||
children: [ | |||
{ | |||
path: 'list', | |||
component: () => import('@/views/art/list'), | |||
name: 'ArtList', | |||
meta: { title: routerTitle.technology.technologylist?.[language] || routerTitle.technology.technologylist.en, icon: 'form', affix: true, required: true, requireToken: true } | |||
}, | |||
{ | |||
path: 'process', | |||
component: () => import('@/views/art/process/list'), | |||
name: 'Process', | |||
meta: { title: routerTitle.technology.technologyprocess?.[language] || routerTitle.technology.technologyprocess.en, icon: 'form', affix: true, required: true, requireToken: true }, | |||
hidden: true | |||
}, | |||
{ | |||
path: 'processList', | |||
component: () => import('@/views/art/processList'), | |||
name: 'Process', | |||
meta: { title: routerTitle.technology.processList?.[language] || routerTitle.technology.processList.en, icon: 'form', affix: true, required: true, requireToken: true } | |||
} | |||
] | |||
}, | |||
@@ -224,45 +280,6 @@ export const constantRoutes = [ | |||
] | |||
}, | |||
{ | |||
// path: '/form', | |||
// component: Layout, | |||
// redirect: '/form', | |||
// name: 'formManage', | |||
// meta: { title: routerTitle.form?.[language] || routerTitle.form.en, icon: 'form', iconPart: 'formManage', affix: true, required: true, requireToken: true, unuse: false }, | |||
// children: [{ | |||
// path: 'report', | |||
// component: () => import('@/views/report-manage/ReportSortChoise'), | |||
// name: 'Report', | |||
// meta: { title: routerTitle.form.report?.[language] || routerTitle.form.report.en, icon: 'form', affix: true, required: true, requireToken: true } | |||
// }, | |||
// { | |||
// path: 'report-sort-list', | |||
// component: () => import('@/views/report-manage/Report'), | |||
// name: 'ReportSortList', | |||
// hidden: true, | |||
// meta: { title: routerTitle.form.reportSortList?.[language] || routerTitle.form.reportSortList.en, icon: 'form', affix: true, required: true, requireToken: true } | |||
// }, | |||
// { | |||
// path: 'report-view', | |||
// component: () => import('@/views/report-manage/ReportView'), | |||
// name: 'ReportDesign', | |||
// meta: { title: routerTitle.form.reportView?.[language] || routerTitle.form.reportView.en, icon: 'form', affix: true, required: true, requireToken: true }, | |||
// hidden: true | |||
// }, | |||
// { | |||
// path: 'report-design', | |||
// component: () => import('@/views/report-manage/ReportDesign'), | |||
// name: 'ReportDesign', | |||
// meta: { title: routerTitle.form.reportDesign?.[language] || routerTitle.form.reportDesign.en, icon: 'form', affix: true, required: true, requireToken: true } | |||
// }, | |||
// { | |||
// path: 'report-sort', | |||
// component: () => import('@/views/report-manage/ReportSort/index'), | |||
// name: 'ReportSort', | |||
// meta: { title: routerTitle.form.reportSort?.[language] || routerTitle.form.reportSort.en, icon: 'form', affix: true, required: true, requireToken: true } | |||
// }] | |||
// }, | |||
// { | |||
path: '/interface', | |||
component: Layout, | |||
redirect: '/interface', | |||
@@ -46,8 +46,13 @@ module.exports = { | |||
// 这里写入需要代理的api和对应的目标地址 | |||
proxy: { | |||
'/api': { | |||
<<<<<<< HEAD | |||
// target: 'http://localhost:8080', | |||
target: 'http://192.168.0.148:8080', | |||
======= | |||
// target: 'http://192.168.0.148:8080', | |||
target: 'http://a.wms.picaiba.com/api', | |||
>>>>>>> 14bf2dc2f6d116f4005fe216e91bb59aa7ba338f | |||
// target: 'http://192.168.0.127:8080', | |||
// target: 'http://192.168.0.165:8080', | |||
// target: 'http://192.168.43.105:8080', | |||
@@ -58,7 +63,7 @@ module.exports = { | |||
ws: true, | |||
changeOrigin: true, | |||
pathRewrite: { | |||
'^/portapi': '' | |||
'^/api': '' | |||
} | |||
// 使用了proxy 就需要开启下面的选项 (http-proxy-middleware会将post请求给parse了 所以需要再次进行string化) | |||
// onProxyReq: (proxyReq, req, res, options) => { | |||