From 3943ca967f32343d35f9d384669fc7db29863d1d Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 20 十月 2023 15:48:07 +0800
Subject: [PATCH] 修复问题
---
/dev/null | 26 -------------
.env.development | 5 +-
vite.config.ts | 12 +++---
src/views/loginPage/loginPage.vue | 6 ++
src/views/bigScreen/index.vue | 12 ++++++
.env.production | 2
src/views/bigScreen/components/screen.vue | 29 +++++++++++---
src/views/loginPage/component/accountLogin.vue | 2
src/router/index.ts | 3 +
src/views/bigScreen/fullScreen/index.vue | 12 ++++++
10 files changed, 65 insertions(+), 44 deletions(-)
diff --git a/.env b/.env
deleted file mode 100644
index 6394eba..0000000
--- a/.env
+++ /dev/null
@@ -1,19 +0,0 @@
-# port 端口号
-VITE_PORT = 8001
-
-# open 运行 npm run dev 时自动打开浏览器
-VITE_OPEN = false
-
-# public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可
-
-#内网test环境
-#VITE_PUBLIC_PATH = 'http://192.168.0.52:6002'
-
-#内网UAT环境
-#VITE_PUBLIC_PATH = 'http://192.168.0.52:6006'
-
-#线上UAT预发环境
-#VITE_PUBLIC_PATH = 'http://121.239.169.27:6006'
-
-#国泰线上试用环境
-VITE_PUBLIC_PATH = 'http://121.239.169.27:7000'
diff --git a/.env.development b/.env.development
index 825a49f..8dca95d 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,6 @@
# 本地环境
ENV = 'development'
+#VITE_API_URL = 'http://192.168.0.47:17080'
-VITE_API_URL = 'http://192.168.0.47:17080'
-#线上正式环境接口地址
\ No newline at end of file
+#线上正式环境接口地址
+VITE_API_URL = 'http://121.239.169.30:17081/api'
\ No newline at end of file
diff --git a/.env.production b/.env.production
index ec4bb8e..6c28430 100644
--- a/.env.production
+++ b/.env.production
@@ -2,4 +2,4 @@
ENV = 'production'
# 线上环境打包接口地址
-VITE_API_URL = 'http://121.239.169.27:7000'
+VITE_API_URL = '/api'
diff --git a/postcss.config.js b/postcss.config.js
deleted file mode 100644
index ba3bd84..0000000
--- a/postcss.config.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// module.exports = {
-// 'plugins': {
-// 'autoprefixer': {
-// overrideBrowserslist: [
-// 'Android 4.1',
-// 'iOS 7.1',
-// 'Chrome > 31',
-// 'not ie <= 11', //不考虑IE浏览器
-// 'ff >= 30', //仅新版本用“ff>=30
-// '> 1%',// 全球统计有超过1%的使用率使用“>1%”;
-// 'last 2 versions', // 所有主流浏览器最近2个版本
-// ],
-// grid: true ,// 开启grid布局的兼容(浏览器IE除外其他都能兼容grid，可以关闭开启)
-// },
-// 'postcss-pxtorem': {
-// rootValue: 37.5, //75表示750设计稿，37.5表示375设计稿
-// unitPrecision: 6, // 计算结果保留 6 位小数
-// selectorBlackList: ['.no-rem', 'no-rem'], // 要忽略的选择器并保留为px。
-// propList: ['*'], // 可以从px更改为rem的属性 感叹号开头的不转换
-// replace: true, // 转换成 rem 以后，不保留原来的 px 单位属性
-// mediaQuery: true, // 允许在媒体查询中转换px。
-// minPixelValue: 2, // 设置要替换的最小像素值。
-// exclude: /node_modules/i // 排除 node_modules 文件(node_modules 内文件禁止转换)
-// }
-// }
-// }
diff --git a/src/router/index.ts b/src/router/index.ts
index efe48a5..784be70 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -75,7 +75,8 @@
NProgress.done();
} else {
if (!token) {
- next(`/login?redirect=${to.path}¶ms=${JSON.stringify(to.query ? to.query : to.params)}`);
+ // next(`/login?redirect=${to.path}¶ms=${JSON.stringify(to.query ? to.query : to.params)}`);
+ next(`/login`);
Session.clear();
NProgress.done();
// next()
diff --git a/src/views/bigScreen/components/screen.vue b/src/views/bigScreen/components/screen.vue
index b20993d..d66bf7e 100644
--- a/src/views/bigScreen/components/screen.vue
+++ b/src/views/bigScreen/components/screen.vue
@@ -564,16 +564,34 @@
const getGasTLSocket = ()=>{
initWebSocket('/ws/gas/flux/','气体通量',120)
}
-
+ const getPath=async()=> {
+ try {
+ var htt = window.location.protocol;// 获取协议
+ var host = window.location.host;// 获取地址和端口号
+ return htt+"//"+host;
+ } catch (error) {
+ console.error('Error fetching config:', error);
+ return ''; // 返回一个默认值或者空字符串
+ }
+ }
const initWebSocket =async (requireUrl: string,type: string,beat: number)=>{
if (typeof WebSocket === 'undefined') {
alert('您的浏览器不支持socket');
} else {
// 实例化socket
- let uid = userInfos.value.uid
- let url = import.meta.env.VITE_API_URL + requireUrl + `${uid}`
- url = url.replace('https', 'ws').replace('http', 'ws')
- state.socket = new WebSocket(url)
+ if(import.meta.env.MODE == 'development'){
+ let uid = userInfos.value.uid
+ let url = import.meta.env.VITE_API_URL + requireUrl + `${uid}`
+ url = url.replace('https', 'ws').replace('http', 'ws')
+ state.socket = new WebSocket(url)
+ }else{
+ const apiUrl = await getPath();
+ let uid = userInfos.value.uid
+ let url = apiUrl + import.meta.env.VITE_API_URL + requireUrl + `${uid}`
+ url = url.replace('https', 'ws').replace('http', 'ws')
+ state.socket = new WebSocket(url)
+ }
+
// 监听socket连接
state.socket.onopen = () => {
console.log('socket连接成功')
@@ -1125,7 +1143,6 @@
letter-spacing: 4px;
font-size: 16px;
font-weight: bolder;
- line-height: 38px;
color: #11feee;
}
.long-tit{
diff --git a/src/views/bigScreen/fullScreen/index.vue b/src/views/bigScreen/fullScreen/index.vue
index 44c799d..2e0fb12 100644
--- a/src/views/bigScreen/fullScreen/index.vue
+++ b/src/views/bigScreen/fullScreen/index.vue
@@ -25,7 +25,19 @@
// 页面加载时
onMounted(() => {
+ const baseSize = 38;
+ /* 设置 rem 函数 */
+ function setRem() {
+ const scale = document.documentElement.clientWidth / 1920; /* 当前页面宽度缩放比例，可根据自己需要修改 */
+ document.documentElement.style.fontSize = baseSize * Math.min(scale, 2) + "px";/* 设置页面根节点字体大小 */
+ console.log('切换尺寸>>',document.documentElement.style.fontSize)
+ }
+ setRem();/* 初始化 rem */
+ window.onresize = () => {
+ setRem();/* 改变窗口大小时重新设置 rem */
+ console.log('执行切换')
+ }
});
const clickFullscreen =() => {
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index e41e39d..7a985d5 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -26,7 +26,19 @@
// 页面加载时
onMounted(() => {
+ const baseSize = 38;
+ /* 设置 rem 函数 */
+ function setRem() {
+ const scale = document.documentElement.clientWidth / 1920; /* 当前页面宽度缩放比例，可根据自己需要修改 */
+ document.documentElement.style.fontSize = baseSize * Math.min(scale, 2) + "px";/* 设置页面根节点字体大小 */
+ console.log('切换尺寸>>',document.documentElement.style.fontSize)
+ }
+ setRem();/* 初始化 rem */
+ window.onresize = () => {
+ setRem();/* 改变窗口大小时重新设置 rem */
+ console.log('执行切换')
+ }
});
const clickFullscreen =() => {
diff --git a/src/views/loginPage/component/accountLogin.vue b/src/views/loginPage/component/accountLogin.vue
index ce41c68..e12a221 100644
--- a/src/views/loginPage/component/accountLogin.vue
+++ b/src/views/loginPage/component/accountLogin.vue
@@ -139,7 +139,7 @@
const hasUserCodeOrPassword =()=> {
if (localStorage.getItem('userCode') && localStorage.getItem('userPassword')) {
state.ruleForm.name = localStorage.getItem('userCode') as string
- state.ruleForm.password = Base64.decode(localStorage.getItem('userPassword'))//解密
+ state.ruleForm.pwd = Base64.decode(localStorage.getItem('userPassword'))//解密
state.saveCode = true
}
}
diff --git a/src/views/loginPage/loginPage.vue b/src/views/loginPage/loginPage.vue
index 17755ba..0e1d6bc 100644
--- a/src/views/loginPage/loginPage.vue
+++ b/src/views/loginPage/loginPage.vue
@@ -14,7 +14,9 @@
</div>
</div>
</div>
- <div class="rights">技术支持：苏州国科鸿宇智能科技有限公司<br/><span>GTXH Intelligent Security Management System V1.0.1</span></div>
+ <div class="rights">技术支持：苏州国科鸿宇智能科技有限公司<br/>
+<!-- <span>GTXH Intelligent Security Management System V1.0.1</span>-->
+ </div>
</div>
</template>
@@ -53,11 +55,13 @@
function setRem() {
const scale = document.documentElement.clientWidth / 1920; /* 当前页面宽度缩放比例，可根据自己需要修改 */
document.documentElement.style.fontSize = baseSize * Math.min(scale, 2) + "px";/* 设置页面根节点字体大小 */
+ console.log('切换尺寸>>',document.documentElement.style.fontSize)
}
setRem();/* 初始化 rem */
window.onresize = () => {
setRem();/* 改变窗口大小时重新设置 rem */
+ console.log('执行切换')
}
});
return {
diff --git a/vite.config.ts b/vite.config.ts
index 94ad22d..129f1c6 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -60,12 +60,12 @@
postCssPxToRem({
rootValue: 37.5, // 1rem的大小（控制1rem的大小 点位：px）
propList: ["*"], // 需要转换的属性，这里选择全部都进行转换
- exclude: (e:any) => { // 不包含
- if (/src(\\|\/)views(\\|\/)bigScreen(\\|\/)components(\\|\/)screen/.test(e)||/src(\\|\/)views(\\|\/)loginPage(\\|\/)loginPage/.test(e)||/src(\\|\/)views(\\|\/)loginPage(\\|\/)component(\\|\/)accountLogin/.test(e)) { // 指定生效页面（正则）
- return false;
- }
- return true;
- }
+ // exclude: (e:any) => { // 不包含
+ // if (/src(\\|\/)views(\\|\/)bigScreen(\\|\/)index/.test(e)||/src(\\|\/)views(\\|\/)bigScreen(\\|\/)fullScreen(\\|\/)index/.test(e)||/src(\\|\/)views(\\|\/)bigScreen(\\|\/)components(\\|\/)screen/.test(e)||/src(\\|\/)views(\\|\/)loginPage(\\|\/)loginPage/.test(e)||/src(\\|\/)views(\\|\/)loginPage(\\|\/)component(\\|\/)accountLogin/.test(e)) { // 指定生效页面（正则）
+ // return false;
+ // }
+ // return true;
+ // }
}),
],
},
--
Gitblit v1.9.2