10 Commits

Author SHA1 Message Date
bb4f3e2c0e fix: 🐛 修正构建包安装顺序 2022-02-23 13:22:42 +08:00
0338bf1a15 fix: 🏗️ 修复raphael依赖找不到问题 2022-02-23 12:46:46 +08:00
5fadd533de fix: 🐛 修正构建脚本 2022-02-23 11:40:13 +08:00
f2c038d543 Merge pull request '修改api' (#11) from zwq into develop
Reviewed-on: #11
2022-02-23 11:23:47 +08:00
zwq
30cfedec07 修改api 2022-02-23 11:23:07 +08:00
898803c514 Merge pull request '修改api' (#10) from zwq into develop
Reviewed-on: #10
2022-02-23 11:05:47 +08:00
zwq
4af403b22b 修改api 2022-02-23 11:05:13 +08:00
f3f1c972b4 Merge pull request '更新' (#9) from zwq into develop
Reviewed-on: #9
2022-01-18 14:40:10 +08:00
zwq
fb496d8a97 更新 2022-01-18 14:39:36 +08:00
2455f83b74 Merge pull request '更新' (#8) from zwq into develop
Reviewed-on: #8
2022-01-17 15:34:17 +08:00
7 changed files with 13 additions and 13 deletions

View File

@@ -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

View File

@@ -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'

View File

@@ -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

View File

@@ -66,6 +66,7 @@
"nprogress": "0.2.0",
"outlayer": "^2.1.1",
"path-to-regexp": "2.4.0",
"raphael": "git+https://gitee.com/shihairong/raphael",
"screenfull": "4.2.0",
"script-loader": "0.7.2",
"showdown": "1.9.0",

View File

@@ -343,6 +343,7 @@ export const constantRoutes = [
component: Layout,
redirect: '/user/manager',
name: 'ArticleManager',
hidden: true,
meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true },
children: [
{

View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-01-17 14:03:24
* @LastEditTime: 2022-01-18 14:30:25
* @Description:
-->
<template>
@@ -68,7 +68,7 @@ import i18n from '@/lang'
const tableProps = [
{
prop: 'code',
prop: 'storageCode',
label: i18n.t('module.basicData.Warehouse.StorageBoxNumber'),
align: 'center'
},

View File

@@ -46,8 +46,8 @@ module.exports = {
// 这里写入需要代理的api和对应的目标地址
proxy: {
'/api': {
target: 'http://localhost:8080',
// target: 'http://192.168.0.198:8080',
// target: 'http://192.168.0.148:8080',
target: 'http://a.wms.picaiba.com/api',
// target: 'http://192.168.0.127:8080',
// target: 'http://192.168.0.165:8080',
// target: 'http://192.168.43.105:8080',
@@ -58,7 +58,7 @@ module.exports = {
ws: true,
changeOrigin: true,
pathRewrite: {
'^/portapi': ''
'^/api': ''
}
// 使用了proxy 就需要开启下面的选项 (http-proxy-middleware会将post请求给parse了 所以需要再次进行string化)
// onProxyReq: (proxyReq, req, res, options) => {