From 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 10:04:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/public/index.html | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/web/public/index.html b/web/public/index.html
index 2053fbe..8930306 100644
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -12,7 +12,7 @@
<!-- <script src="./excelData/luckysheet.umd.js"></script>-->
<!-- 绔欑偣閰嶇疆-->
<style>
- /* html,
+ html,
body,
#app {
height: 100%;
@@ -168,13 +168,13 @@
transition: all 0.3s 1s ease-out;
}
- !*.no-js #loader-wrapper {*!
- !* display: none;*!
- !*}*!
+ /*.no-js #loader-wrapper {*/
+ /* display: none;*/
+ /*}*/
- !*.no-js h1 {*!
- !* color: #222222;*!
- !*}*!
+ /*.no-js h1 {*/
+ /* color: #222222;*/
+ /*}*/
#loader-wrapper .load_title {
font-family: 'Open Sans';
@@ -195,7 +195,7 @@
font-size: 13px;
color: #FFF;
opacity: 0.5;
- }*/
+ }
</style>
<script>
window.SITE_CONFIG = {};
@@ -219,8 +219,8 @@
window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false; // 鍔ㄦ��(鑿滃崟)璺敱鏄惁宸茬粡娣诲姞鐨勭姸鎬佹爣绀猴紙鐢ㄤ簬鍒ゆ柇鏄惁闇�瑕侀噸鏂版媺鍙栨暟鎹苟杩涜鍔ㄦ�佹坊鍔犳搷浣滐級
// 鏈嶅姟鍦板潃
- window.SITE_CONFIG['apiURL'] = 'http://' + location.hostname + ':8050/test-project';
- window.SITE_CONFIG['apiURL2'] = 'http://' + location.hostname + ':8050/test-project';
+ window.SITE_CONFIG['apiURL'] = 'http://' + location.hostname + ':8066/test-project';
+ window.SITE_CONFIG['apiURL2'] = 'http://' + location.hostname + ':8066/test-project';
//window.SITE_CONFIG['apiURL2'] = 'http://'+location.hostname+':8066';
//window.SITE_CONFIG['apiURL'] = '<%= process.env.VUE_APP_API_URL %>';
@@ -228,17 +228,12 @@
// WebSocket鍦板潃
- window.SITE_CONFIG['socketURL'] = 'http://' + location.hostname + ':8050/test-project';
+ window.SITE_CONFIG['socketURL'] = 'http://' + location.hostname + ':8066/test-project';
//window.SITE_CONFIG['socketURL'] ='<%= process.env.VUE_APP_SOCKET_URL %>';
</script>
</head>
-<body style='width:100%;height:100%;margin:0;padding:0;
- background-attachment:fixed;
- background-position: center center;
- background-repeat: no-repeat;
- background-image: url("./loading2.gif");
- background-color:#7071c3' class="zt">
+<body class="zt">
<!--<div style='display: none;position:absolute;width:100%;height:100%;text-align:center;background:#000;z-index:100'-->
<!-- id="onload">-->
<!-- <!– <a href="IE11-Windows6.1-x64-zh-cn.rar" id="ref" style='display: none;font-size: 50px; text-decoration:none;'>鐐瑰嚮涓嬭浇IE11鍗囩骇鍖�</a>–>-->
@@ -246,12 +241,12 @@
<!-- <a href="Firefox.zip" id="ref2" style="display: none; font-size: 50px; text-decoration:none">鐐瑰嚮涓嬭浇鐏嫄娴忚鍣�</a>-->
<!--</div>-->
<div id="app">
- <!-- <div id="loader-wrapper">-->
- <!-- <div id="loader"></div>-->
- <!-- <div class="loader-section section-left"></div>-->
- <!-- <div class="loader-section section-right"></div>-->
- <!-- <div class="load_title">姝ｅ湪鍔犺浇绯荤粺璧勬簮锛岃鑰愬績绛夊緟</div>-->
- <!-- </div>-->
+ <div id="loader-wrapper">
+ <div id="loader"></div>
+ <div class="loader-section section-left"></div>
+ <div class="loader-section section-right"></div>
+ <div class="load_title">姝ｅ湪鍔犺浇绯荤粺璧勬簮锛岃鑰愬績绛夊緟</div>
+ </div>
</div>
</body>
</html>
--
Gitblit v1.9.1