From 21f90004070289ff07f21bd8296924310c30e443 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Fri, 14 Jul 2023 17:35:47 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=A4=A7=E5=B1=8F=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8https=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud/bigscreen-design/.env.production | 2 +- cloud/bigscreen-design/docker/default.conf | 5 ++--- cloud/bigscreen-design/public/config.js | 21 ++++++++++--------- cloud/bigscreen-design/src/config.js | 6 +++--- .../src/option/components/datav.vue | 4 ++-- docker/kicc-ui.conf | 17 +++++++++------ 6 files changed, 30 insertions(+), 25 deletions(-) diff --git a/cloud/bigscreen-design/.env.production b/cloud/bigscreen-design/.env.production index d0b7a20..79209f2 100644 --- a/cloud/bigscreen-design/.env.production +++ b/cloud/bigscreen-design/.env.production @@ -5,7 +5,7 @@ VITE_APP_ENV = 'production' VITE_APP_API= #页面基础路径 -VITE_APP_BASE=/ +VITE_APP_BASE=/bigscreen/ # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip diff --git a/cloud/bigscreen-design/docker/default.conf b/cloud/bigscreen-design/docker/default.conf index 7018c5c..02929fb 100644 --- a/cloud/bigscreen-design/docker/default.conf +++ b/cloud/bigscreen-design/docker/default.conf @@ -14,13 +14,12 @@ server { proxy_send_timeout 15s; proxy_read_timeout 15s; proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-Proto http; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; # 代理访问 location / { - try_files $uri $uri/ /index.html; - error_page 405 =200 http://$host$request_uri; + try_files $uri $uri/ /index.html; + error_page 405 =200 http://$host$request_uri; } } diff --git a/cloud/bigscreen-design/public/config.js b/cloud/bigscreen-design/public/config.js index 16ca87e..772a6d0 100644 --- a/cloud/bigscreen-design/public/config.js +++ b/cloud/bigscreen-design/public/config.js @@ -4,7 +4,8 @@ window.$website = { title: '康来生物数据大屏', name: '康来生物有限公司 数据大屏', subName: '可视化数据大屏版权所有 © 长沙康来生物科技有限公司', - url: 'http://kicc.kanglailab.com:9999/system_proxy/bigscreen', + url: 'http://192.168.3.10:9999/system_proxy/bigscreen', + //url: 'https://kicc.kanglailab.com/prod-api/system_proxy/bigscreen', autoSave: false, autoSaveTime: 60000, tabsList: [0, 1, 2, 3, 4, 5, 6], @@ -214,23 +215,23 @@ window.$website = { data: [{ name: "苹果", value: 1000879, - url: "http://www.baidu.com" + url: "https://www.baidu.com" }, { name: "三星", value: 3400879, - url: "http://www.baidu.com" + url: "https://www.baidu.com" }, { name: "小米", value: 2300879, - url: "http://www.baidu.com" + url: "https://www.baidu.com" }, { name: "oppo", value: 5400879, - url: "http://www.baidu.com" + url: "https://www.baidu.com" }, { name: "大疆", value: 3000, - url: "http://www.baidu.com" + url: "https://www.baidu.com" }], dataType: 0, dataFormatter: "", @@ -541,7 +542,7 @@ window.$website = { empAreaColor: "rgba(35, 183, 229, 0.42)", empColor: "rgba(217, 38, 10, 1)", index: "894edc1d-d2f0-4616-962c-8e61083ada71", - mapData: 'http://192.168.3.10:9999/system_proxy/bigscreen/map/detail?id=1678230621244157953', + mapData: '/system_proxy/bigscreen/map/detail?id=1678230621244157953', color: "rgba(13, 255, 255, 1)", } } @@ -801,7 +802,7 @@ window.$website = { }, option: { link: true, - linkHref: 'http://avue.top', + linkHref: 'https://avue.top', linkTarget: '_self', textAlign: "center", fontSize: 26, @@ -899,7 +900,7 @@ window.$website = { }, { value: 'https://img.alicdn.com/tfs/TB1uevcCrj1gK0jSZFuXXcrHpXa-1880-640.jpg', }, { - value: 'http://www.w3school.com.cn/i/movie.ogg' + value: 'https://www.w3school.com.cn/i/movie.ogg' }], dataFormatter: "", dataQuery: "", @@ -958,7 +959,7 @@ window.$website = { left: 0, dataType: 0, data: { - value: 'http://www.w3school.com.cn/i/movie.ogg' + value: 'https://www.w3school.com.cn/i/movie.ogg' }, option: { autoplay: false, diff --git a/cloud/bigscreen-design/src/config.js b/cloud/bigscreen-design/src/config.js index bb4282d..ee8382c 100644 --- a/cloud/bigscreen-design/src/config.js +++ b/cloud/bigscreen-design/src/config.js @@ -67,11 +67,11 @@ export const tip = ` [{ "name": "PC", "value": 97, - "url": "http://www.baidu.com" + "url": "https://www.baidu.com" },{ "name": "PC", "value": 97, - "url": "http://www.baidu.com" + "url": "https://www.baidu.com" }] #象型图数据格式 @@ -149,4 +149,4 @@ export const tip = ` "lat": 37.965854128749434, "zoom": 1 }] - ` \ No newline at end of file + ` diff --git a/cloud/bigscreen-design/src/option/components/datav.vue b/cloud/bigscreen-design/src/option/components/datav.vue index 5f95115..5d39c0a 100644 --- a/cloud/bigscreen-design/src/option/components/datav.vue +++ b/cloud/bigscreen-design/src/option/components/datav.vue @@ -2,7 +2,7 @@