Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pda-ui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pda
pda-ui
Commits
1ee36973
Commit
1ee36973
authored
Aug 31, 2024
by
沈翠玲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更换服务器
parent
49e1d47e
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
20 deletions
+11
-20
.env.development
.env.development
+1
-1
.env.production
.env.production
+1
-1
Dockerfile-prod
Dockerfile-prod
+1
-1
Dockerfile-test
Dockerfile-test
+1
-1
website.js
src/config/website.js
+2
-2
productOrderDetail.vue
src/views/mes/pro/workorder/print/productOrderDetail.vue
+2
-2
productOrderSpecification.vue
...ews/mes/pro/workorder/print/productOrderSpecification.vue
+2
-2
index.vue
src/views/system/version/index.vue
+1
-1
vue.config.js
vue.config.js
+0
-9
No files found.
.env.development
View file @
1ee36973
...
...
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 宝绅系统
ENV = 'development'
# 若依管理系统/开发环境
VUE_APP_BASE_API = '
/api
'
VUE_APP_BASE_API = '
http://192.168.3.181:8123
'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
.env.production
View file @
1ee36973
...
...
@@ -5,4 +5,4 @@ VUE_APP_TITLE = 宝绅系统
ENV = 'production'
# 若依管理系统/生产环境
VUE_APP_BASE_API = '
/pda-api
'
VUE_APP_BASE_API = '
http://192.168.3.181:8123
'
Dockerfile-prod
View file @
1ee36973
...
...
@@ -7,7 +7,7 @@ RUN echo "server { \
listen 90; \
client_max_body_size 50M; \
location /prod-api/ { \
proxy_pass http://192.168.3.
9
1:8080/; \
proxy_pass http://192.168.3.
18
1:8080/; \
proxy_redirect off; \
proxy_set_header Host mes-ui; \
proxy_set_header X-Real-IP \$remote_addr; \
...
...
Dockerfile-test
View file @
1ee36973
...
...
@@ -7,7 +7,7 @@ RUN echo "server { \
listen 80; \
client_max_body_size 50M; \
location /pda-api/ { \
proxy_pass http://192.168.3.
9
1:8123/; \
proxy_pass http://192.168.3.
18
1:8123/; \
proxy_redirect off; \
proxy_set_header Host mes-ui; \
proxy_set_header X-Real-IP \$remote_addr; \
...
...
src/config/website.js
View file @
1ee36973
...
...
@@ -4,7 +4,7 @@
* 全局配置文件
*/
export
default
{
reportUrl
:
'http://192.168.3.
9
1:8123/ureport'
,
//test
// reportUrl: 'http://192.168.3.
9
1:8111/ureport', //prod
reportUrl
:
'http://192.168.3.
18
1:8123/ureport'
,
//test
// reportUrl: 'http://192.168.3.
18
1:8111/ureport', //prod
}
src/views/mes/pro/workorder/print/productOrderDetail.vue
View file @
1ee36973
...
...
@@ -323,8 +323,8 @@ export default {
// }
// ],
// img: {
// "frontImg": "http://192.168.3.
9
1:9000/mes/2024/03/20/1111_20240320192902A005.png", // 产品正面
// "backImg": "http://192.168.3.
9
1:9000/mes/2024/03/20/2222_20240320192903A006.png" // 产品背面
// "frontImg": "http://192.168.3.
18
1:9000/mes/2024/03/20/1111_20240320192902A005.png", // 产品正面
// "backImg": "http://192.168.3.
18
1:9000/mes/2024/03/20/2222_20240320192903A006.png" // 产品背面
// },
// processItemList: [ // 物料
// {
...
...
src/views/mes/pro/workorder/print/productOrderSpecification.vue
View file @
1ee36973
...
...
@@ -265,8 +265,8 @@ export default {
// "formula": null,
// "frontColorName": "紫红,深红,朱红",
// "oppositeColorName": "紫红,深红,朱红",
// "frontImg": "http://192.168.3.
9
1:9000/mes/2024/03/20/1111_20240320192902A005.png",
// "backImg": "http://192.168.3.
9
1:9000/mes/2024/03/20/2222_20240320192903A006.png",
// "frontImg": "http://192.168.3.
18
1:9000/mes/2024/03/20/1111_20240320192902A005.png",
// "backImg": "http://192.168.3.
18
1:9000/mes/2024/03/20/2222_20240320192903A006.png",
// "customerApprover": null, // 客户确认->确认人
// "customerApproved": "2024-05-10", // 客户确认->日期
// "processes": [ // map-> processes
...
...
src/views/system/version/index.vue
View file @
1ee36973
...
...
@@ -110,7 +110,7 @@
slot=
"append"
class=
"upload-demo"
ref=
"upload"
:action=
"baseURL + '/common/
bsnUpload
'"
:action=
"baseURL + '/common/
uploadMinio
'"
:before-upload=
"handleBeforeUpload"
:on-success=
"handleUploadSuccess"
:on-error=
"handleUploadError"
...
...
vue.config.js
View file @
1ee36973
...
...
@@ -34,15 +34,6 @@ module.exports = {
open
:
true
,
proxy
:
{
// detail: https://cli.vuejs.org/config/#devserver-proxy
[
process
.
env
.
VUE_APP_BASE_API
]:
{
// target: `http://localhost:8080`,
target
:
`http://192.168.3.91:8123`
,
// target: `http://192.168.4.122:8080`,
changeOrigin
:
true
,
pathRewrite
:
{
[
'^'
+
process
.
env
.
VUE_APP_BASE_API
]:
''
}
},
'/ureport'
:
{
target
:
'http://localhost:8080'
,
ws
:
false
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment