diff --git a/docker/default.conf b/docker/default.conf index 82d9cb7d..c8a1e30d 100644 --- a/docker/default.conf +++ b/docker/default.conf @@ -2,28 +2,34 @@ server { listen 80 default_server; server_name _; + #charset koi8-r; + #access_log /var/log/nginx/host.access.log main; + + # 跳转到伊利GPT + # 反向代理配置 + location /aiagent/ { + proxy_pass https://yiligpt.x.digitalyili.com; + proxy_set_header Host yiligpt.x.digitalyili.com; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + # 如果需要忽略SSL证书验证(测试环境) + # proxy_ssl_verify off; + } + + location / { root /var/www/html; index index.html index.htm; try_files $uri $uri/ //index.html; } - # 反向代理配置:将 /yiligpt 映射到外部链接 - location /yiligpt { - proxy_pass https://yiligpt.x.digitalyili.com/aiagent/assistant/78907182-cc42-4072-abae-86ef67c1ecd3/share ; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - # 如果目标服务器使用 HTTPS,需要以下设置 - # proxy_ssl_server_name on; - # proxy_ssl_verify on; - } - - # 错误页面 + # redirect server error pages to the static page /50x.html error_page 500 502 503 504 /50x.html; location = /50x.html { root /var/www/html; } + } diff --git a/src/views/planetDesign/Logical/fragment/LogicList.vue b/src/views/planetDesign/Logical/fragment/LogicList.vue index f6760b81..7828647e 100644 --- a/src/views/planetDesign/Logical/fragment/LogicList.vue +++ b/src/views/planetDesign/Logical/fragment/LogicList.vue @@ -1283,19 +1283,23 @@ function domEventHandle(dataList, allQuesList, questionInfo, saveLogical) { edit: true }; if (flag === 'skip') { + // 提前跳转 logical.logicals.push(temp); } else if (flag === 'show') { + // 题后隐藏 logical.logicals.push({ ...temp, skip_type: 1 }); } else if (flag === 'quota') { + // 逻辑配额 logical.logicals.push({ ...temp, skip_type: 2, sample_number: '' }); } else if (flag === 'auto') { + // 自动填写 logical.logicals.push({ ...temp, skip_type: 3,