Skip to content

S
SURPRISED
Commit 8877f6cb authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

1

parent a9ca2e18
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 14 deletions
css/SignIn.css
View file @ 8877f6cb
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
height: 100%; height: 100%;
} }
.page_right{ .page_right{
left: 20%; left: -10%;
} }
.page_left{ .page_left{
padding: 5% 0 05%; padding: 5% 0 05%;
...@@ -171,7 +171,8 @@ ...@@ -171,7 +171,8 @@
height: 484px; height: 484px;
background: url("../images/texiao/red.png") no-repeat; background: url("../images/texiao/red.png") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
position: absolute; position: fixed;
right: 13%;
} }
.bigCard p { .bigCard p {
...@@ -190,8 +191,8 @@ ...@@ -190,8 +191,8 @@
} }
#container>div{ #container>div{
height: 100% !important; height: 100% !important;
padding-top: 10%; /* padding-top: 10%; */
transform: scaleY(1.4); transform: scale(0.9, 1.3);
} }
.bigCard .bigCard-divBigBsAnm { .bigCard .bigCard-divBigBsAnm {
transition: all 500s ease; transition: all 500s ease;
......
html/SignIn/SignIn.html
View file @ 8877f6cb
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
<div id="container"></div> <div id="container"></div>
<!-- style="display:none;" --> <!-- style="display:none;" -->
<div class="show_info animated" style="display:none;"> <div class="show_info animated" style="display:none;">
<div class="bigCard" style="left: 733.25px; top: 250px; display: block; opacity: 1; transform: scale(1, 1);"> <div class="bigCard" style="top: 250px; display: block; opacity: 1; transform: scale(1, 1);">
<div class="bigCardScale"> <div class="bigCardScale">
<div class="bigCard-divBigBs bigCard-divBigBsAnm" id="uerImg"></div> <div class="bigCard-divBigBs bigCard-divBigBsAnm" id="uerImg"></div>
</div> </div>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
$("#bg_box").css("top", `${(WindowH - 1020) * 0.5}px`) $("#bg_box").css("top", `${(WindowH - 1020) * 0.5}px`)
$("#bg_box").css("transform", `scale(${WindowW / 1813}, ${WindowH / 1020})`) $("#bg_box").css("transform", `scale(${WindowW / 1813}, ${WindowH / 1020})`)
} }
var conn = $.hubConnection("http://192.168.2.66:7838/signalr", { var conn = $.hubConnection("http://192.168.2.65:7838/signalr", {
qs: `i=888888&n=印象之旅&p=${encodeURIComponent( qs: `i=888888&n=印象之旅&p=${encodeURIComponent(
"http://imgfile.oytour.com/New/Upload/User/20191018150051176.png" "http://imgfile.oytour.com/New/Upload/User/20191018150051176.png"
)}` )}`
......
html/annualMeeting/HitMouse.html
View file @ 8877f6cb
...@@ -154,15 +154,15 @@ ...@@ -154,15 +154,15 @@
document.body.addEventListener('touchmove', function (e) { document.body.addEventListener('touchmove', function (e) {
e.preventDefault(); e.preventDefault();
}, {passive: false}); }, {passive: false});
var activity = JSON.parse(localStorage.activity); // var activity = JSON.parse(localStorage.activity);
var clipboard = new Clipboard('.all_Receive'); var clipboard = new Clipboard('.all_Receive');
var EmployeeId = activity.EmployeeId + '_Mouse'; // var EmployeeId = activity.EmployeeId + '_Mouse';
var laoshudata = [];//老鼠数据 var laoshudata = [];//老鼠数据
var audio=document.getElementById("audio"); var audio=document.getElementById("audio");
var conn = $.hubConnection("http://192.168.2.65:7838/signalr", { var conn = $.hubConnection("http://192.168.2.65:7838/signalr", {
qs: `i=${EmployeeId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}&e=${activity.e}` qs: `i=1755_Mouse&n=蔡徐坤&p=${encodeURIComponent('https://dss2.baidu.com/6ONYsjip0QIZ8tyhnq/it/u=1775930210,1659062463&fm=58')}&e=2017-07-06`
}); });
var proxy = conn.createHubProxy("annualLeaveHub"); var proxy = conn.createHubProxy("annualLeaveHub");
conn.start().done(data => { conn.start().done(data => {
......
html/annualMeeting/Money.html
View file @ 8877f6cb
...@@ -100,8 +100,8 @@ ...@@ -100,8 +100,8 @@
let status=0; let status=0;
let clock=null; let clock=null;
let isWinning=false; let isWinning=false;
var activity = JSON.parse(localStorage.activity); // var activity = JSON.parse(localStorage.activity);
var EmployeeId = activity.EmployeeId + '_Money'; // var EmployeeId = activity.EmployeeId + '_Money';
// clipboard.on('success', function(e) { // clipboard.on('success', function(e) {
// console.log(e); // console.log(e);
// }); // });
...@@ -156,8 +156,8 @@ ...@@ -156,8 +156,8 @@
function initConnection(){ function initConnection(){
var conn = $.hubConnection("http://192.168.2.65:7838/signalr", { var conn = $.hubConnection("http://192.168.2.65:7838/signalr", {
qs: `i=${EmployeeId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}&e=${activity.e}` qs: `i=1755_Mouse&n=蔡徐坤&p=${encodeURIComponent('https://dss2.baidu.com/6ONYsjip0QIZ8tyhnq/it/u=1775930210,1659062463&fm=58')}&e=2017-07-06`
}); });
proxy = conn.createHubProxy("annualLeaveHub"); proxy = conn.createHubProxy("annualLeaveHub");
conn.start().done(data => { conn.start().done(data => {
console.log('connection 链接成功'); console.log('connection 链接成功');
......
js/mian.js
View file @ 8877f6cb
...@@ -5,7 +5,8 @@ function getApiUrl() { ...@@ -5,7 +5,8 @@ function getApiUrl() {
urlPost: "https://reborn.oytour.com/api/common/post", urlPost: "https://reborn.oytour.com/api/common/post",
// urlPost: locationName.indexOf('oytour') !== -1 ? "https://reborn.oytour.com/api/common/post" : "http://192.168.2.65:8025/api/common/post", // urlPost: locationName.indexOf('oytour') !== -1 ? "https://reborn.oytour.com/api/common/post" : "http://192.168.2.65:8025/api/common/post",
//urlJava: locationName.indexOf('oytour') !== -1 ? "https://efficient.oytour.com/" : "http://192.168.2.215:9000/" //urlJava: locationName.indexOf('oytour') !== -1 ? "https://efficient.oytour.com/" : "http://192.168.2.215:9000/"
urlJava: "https://efficient.oytour.com/" urlJava: "https://efficient.oytour.com/",
urlSignalr: "http://newyear.oytour.com/signalr"
} }
return url return url
} }
......
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