Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes-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
mes
mes-ui
Commits
da259226
Commit
da259226
authored
Jun 05, 2024
by
zhuli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# 分环境, ipqc模板配置更新
parent
06b10839
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
8 deletions
+41
-8
Dockerfile-prod
Dockerfile-prod
+32
-0
Dockerfile-test
Dockerfile-test
+2
-2
templateindex.js
src/api/mes/qc/templateindex.js
+2
-2
templateindex.vue
src/views/mes/qc/qctemplate/templateindex.vue
+3
-3
vue.config.js
vue.config.js
+2
-1
No files found.
Dockerfile-prod
0 → 100644
View file @
da259226
FROM nginx
MAINTAINER xin.lu
VOLUME /tmp
ENV LANG en_US.UTF-8
RUN echo "server { \
#80 当前测试环境Nginx端口 \
listen 90; \
client_max_body_size 50M; \
location /prod-api/ { \
proxy_pass http://192.168.3.91:8080/; \
proxy_redirect off; \
proxy_set_header Host mes-ui; \
proxy_set_header X-Real-IP \$remote_addr; \
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; \
} \
#解决Router(mode: 'history')模式下,刷新路由地址不能找到页面的问题 \
location / { \
root /var/mes/mes-ui/; \
index index.html index.htm; \
if (!-e \$request_filename) { \
rewrite ^(.*)\$ /index.html?s=\$1 last; \
break; \
} \
} \
access_log /var/log/nginx/access.log ; \
} " > /etc/nginx/conf.d/default.conf \
&& mkdir -p /var/mes \
&& mkdir -p /var/mes/mes-ui
COPY / /var/mes/mes-ui/
#EXPOSE 80
EXPOSE 443
Dockerfile
→
Dockerfile
-test
View file @
da259226
...
...
@@ -6,8 +6,8 @@ RUN echo "server { \
#80 当前测试环境Nginx端口 \
listen 80; \
client_max_body_size 50M; \
location /
stage
-api/ {
\
proxy_pass http://192.168.3.91:8
08
0/;
\
location /
prod
-api/ { \
proxy_pass http://192.168.3.91:8
10
0/; \
proxy_redirect off; \
proxy_set_header Host mes-ui; \
proxy_set_header X-Real-IP \$remote_addr; \
...
...
src/api/mes/qc/templateindex.js
View file @
da259226
...
...
@@ -10,9 +10,9 @@ export function listTemplateindex(query) {
}
// 查询检测模板-检测项详细
export
function
getTemplateindex
(
recordI
d
)
{
export
function
getTemplateindex
(
i
d
)
{
return
request
({
url
:
'/mes/qc/templateindex/'
+
recordI
d
,
url
:
'/mes/qc/templateindex/'
+
i
d
,
method
:
'get'
})
}
...
...
src/views/mes/qc/qctemplate/templateindex.vue
View file @
da259226
...
...
@@ -322,7 +322,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange
(
selection
)
{
this
.
ids
=
selection
.
map
(
item
=>
item
.
recordI
d
)
this
.
ids
=
selection
.
map
(
item
=>
item
.
i
d
)
this
.
single
=
selection
.
length
!==
1
this
.
multiple
=
!
selection
.
length
},
...
...
@@ -335,7 +335,7 @@ export default {
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
();
const
recordId
=
row
.
recordI
d
||
this
.
ids
const
recordId
=
row
.
i
d
||
this
.
ids
getTemplateindex
(
recordId
).
then
(
response
=>
{
this
.
form
=
response
.
data
;
if
(
response
.
data
.
selectValues
)
this
.
form
.
selectValues
=
JSON
.
parse
(
response
.
data
.
selectValues
)
...
...
@@ -367,7 +367,7 @@ export default {
},
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
recordIds
=
row
.
recordI
d
||
this
.
ids
;
const
recordIds
=
row
.
i
d
||
this
.
ids
;
this
.
$modal
.
confirm
(
'是否确认删除检测模板-检测项编号为"'
+
recordIds
+
'"的数据项?'
).
then
(
function
()
{
return
delTemplateindex
(
recordIds
);
}).
then
(()
=>
{
...
...
vue.config.js
View file @
da259226
...
...
@@ -35,7 +35,8 @@ module.exports = {
proxy
:
{
// detail: https://cli.vuejs.org/config/#devserver-proxy
[
process
.
env
.
VUE_APP_BASE_API
]:
{
target
:
`http://localhost:8080`
,
// target: `http://localhost:8080`,
target
:
`http://192.168.3.91:8080`
,
// target: `http://192.168.4.122:8080`,
changeOrigin
:
true
,
pathRewrite
:
{
...
...
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