Skip to content

N
nwjs
Commit 17b5734f authored by 潘永坪's avatar 潘永坪
Browse files
Options

大屏发布

parent cafd5e16
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 17 deletions
nwjs-v0.25.2-win-ia32/TubidaNewScreen/css/comm.css
View file @ 17b5734f
......@@ -596,4 +596,13 @@ table tbody tr:nth-child(2n){background: #f9f9f9;}
/*潘永坪写的部分结束*/
\ No newline at end of file
/*潘永坪写的部分结束*/
/*联合国际部分*/
#page_guojiData{width:100%;height:100%;}
.guojiData{display:flex;align-content: space-between;flex-wrap:wrap;min-width:100%;min-height: 100%;background:#1F74B3;box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.08);text-align:center;padding:1rem 0;font-size:0.42rem;color:#FFFFFF;box-sizing:border-box;}
.guojiData div{width:100%;}
.guojiDataDiv1 p:first-child{font-size:0.63rem;font-weight:bold;}
.guojiDataDiv1 p:nth-child(2){font-size:0.56rem;margin-top:0.5rem;}
.guojiDataDiv1 p:last-child{font-size:0.31rem;}
.guojiDataDiv2{;font-size: 0.7rem;}
.guojiDataDiv3{color: #FFE600;}
\ No newline at end of file
nwjs-v0.25.2-win-ia32/TubidaNewScreen/globle.js
View file @ 17b5734f
......@@ -412,7 +412,6 @@
// 异步调用注册方法，初始化需要在异步函数中调用
// status为调用函数返回的状态，同时会线程自动调用 OnStatus(status) 函数
register: function (func, funcError) {
//debugger;
var that = this;
that.hard.register({
name: that.PrinterHardName,
......
nwjs-v0.25.2-win-ia32/TubidaNewScreen/js/base/base_hard.js
View file @ 17b5734f
......@@ -263,7 +263,6 @@ $.extend(Base, {
if (!$page.length || func == null) {
return;
}
// debugger;
// 执行页面面的 return function(res,$page)｛｝函数
func(cache, $page);
},
......@@ -362,7 +361,6 @@ $.extend(Base, {
* @param res
*/
deviceOnUpdate: function (res, func) {
debugger;
var data = res.data || {};
var version = data.version || [];
// 判断是否需要更新
......@@ -425,8 +423,6 @@ $.extend(Base, {
var $html = $(html);
$("body").append($html);
debugger;
// 设置设备中心的回调函数,下载为多线程
function onUpdate(res) {
$.extend(data, res);
......@@ -482,7 +478,6 @@ $.extend(Base, {
localStorage.versionName = last.updateVersion;
Base.close();
}, function (res) {
debugger;
// 更新失败，可以继续登录
$html.remove();
showStatus(res.msg || res.Msg || "更新未知错误");
......@@ -512,7 +507,6 @@ $.extend(Base, {
* @param funcError 读取失败时需要执行的函数
*/
deviceGetVersion: function (func) {
debugger;
showStatus("版本号获取...");
function ret(v, vName) {
......
nwjs-v0.25.2-win-ia32/TubidaNewScreen/js/data_show/visitor.js
View file @ 17b5734f
......@@ -15,7 +15,6 @@ $(function () {
}
function InitLoad(res) {
debugger;
var day_people = Control.UnitNumber(res.person_total);
var day_grouy_people = Control.UnitNumber(res.group_person_total);
......
nwjs-v0.25.2-win-ia32/TubidaNewScreen/js/home/base_welcome.js
View file @ 17b5734f
......@@ -29,7 +29,6 @@ $(function () {
if (cachePos >= list.length) {
cachePos = 1;
}
debugger;
var data = {
projectMaxPerson: 0,
other: {},
......@@ -57,10 +56,8 @@ $(function () {
function next() {
setTimeout(getList, time);
}
var data = {
companyId: Base.config.companyId,
};
Base.Request(url.getRangeList, data, function (res) {
showStatus("");
......@@ -89,7 +86,7 @@ $(function () {
if (res.error) {
showStatus(res.message);
}
else if (res.init) {
else if (res.init && !Base.config.sortGuoji) {
getList();
}
});
......
nwjs-v0.25.2-win-ia32/TubidaNewScreen/js/home/guojiData.js 0 → 100644
View file @ 17b5734f
$(function () {
var $body = $(".guojiData");
var $companyName = $body.find(".companyName");
var $number = $body.find(".number");
var $sortStart = $body.find(".sortStart");
var $sortEnd = $body.find(".sortEnd");
var $date = $body.find(".date");
var $address = $body.find(".address");
var url = {
getRangeList: Base.getStoreUrl("sort/time/batchQuery")
};
var time = 900;
function getList() {
function next() {
setTimeout(getList, time);
}
var data = {
companyId: Base.config.companyId,
};
Base.Request(url.getRangeList, data, function (res) {
showStatus("");
var list = res.data || [];
let data=""
if(list&&list.length>1){
data=list[0]
}
$companyName.text(data.projectName)
$number.text(data.displayCapacity)
$sortStart.text(data.showStart)
$sortEnd.text(data.showEnd)
$date.text(new Date().formatString("yyyy-MM-dd"))
$address.text(data.projectRemark)
next();
}, {
error: function (res) {
showStatus(res.msg);
next();
}
});
}
// 返回根据缓存加载数据的方法
setPageLoad(function (cache, $page) {
var res = Base.getRes(cache.data);
if (res.error) {
showStatus(res.message);
}
else if (res.init && Base.config.sortGuoji) {
getList();
}
});
});
nwjs-v0.25.2-win-ia32/TubidaNewScreen/js/home/index.js
View file @ 17b5734f
......@@ -15,21 +15,26 @@ $(function () {
$("#DeveiceKey").text(code);
deviceLogin("OrderScreen", code, "", "", true, function (res) {
var data = res.data || {};
var config = data.config || {};
config.title = config.title || data.companyName;
config.titleLogin = config.titleLogin || config.title;
config.titleLoginEn = config.titleLoginEn || config.title;
// config.sortGuoji = true;
$.extend(Base.config, data, config);
Base.configSave();
initTitle();
$(".pn_deveiceKey").hide();
showWelcome({code: "00", init: true});
var resInit = {code: "00", init: true};
if(Base.config.sortGuoji){
showResPage(resInit, "/page/home/guojiData.html");
}
else{
showResPage(resInit, "/page/home/base_welcome.html");
}
showStatus("");
autoNext(true);
}, function (res) {
$(".pn_deveiceKey").show();
$("#DeveiceKey").text(code);
......
nwjs-v0.25.2-win-ia32/TubidaNewScreen/page/home/guojiData.html 0 → 100644
View file @ 17b5734f
<div class="guojiData">
<div class="guojiDataDiv1">
<p class="companyName">云端之眼 · 高空观景台</p>
<p>智能排号系统</p>
<p class="number">承载量：8000/天</p>
</div>
<div class="guojiDataDiv2">
当前可排队号：<span class="sortStart">3001</span> ~ <span class="sortEnd">3600</span>
</div>
<div class="guojiDataDiv3">
<p>温馨提示：请在“胖丁旅行”小程序中</p>
<p>及时查询您的排队号，过号需重取排队号</p>
</div>
<div>
<span style="margin-right:0.3rem;">日期：<i class="date">2021.11.08</i> </span>
<span>排队地点：<i class="address">联合国际大厦1楼电梯</i></span>
</div>
</div>
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