Commit da259226 authored by zhuli's avatar zhuli

# 分环境, ipqc模板配置更新

parent 06b10839
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
......@@ -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:8080/; \
location /prod-api/ { \
proxy_pass http://192.168.3.91:8100/; \
proxy_redirect off; \
proxy_set_header Host mes-ui; \
proxy_set_header X-Real-IP \$remote_addr; \
......
......@@ -10,9 +10,9 @@ export function listTemplateindex(query) {
}
// 查询检测模板-检测项详细
export function getTemplateindex(recordId) {
export function getTemplateindex(id) {
return request({
url: '/mes/qc/templateindex/' + recordId,
url: '/mes/qc/templateindex/' + id,
method: 'get'
})
}
......
......@@ -322,7 +322,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.recordId)
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
......@@ -335,7 +335,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const recordId = row.recordId || this.ids
const recordId = row.id || 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.recordId || this.ids;
const recordIds = row.id || this.ids;
this.$modal.confirm('是否确认删除检测模板-检测项编号为"' + recordIds + '"的数据项?').then(function() {
return delTemplateindex(recordIds);
}).then(() => {
......
......@@ -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: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment