From 0ab4bf8f3982bdee9962076f29c5664185328517 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 21 十月 2022 17:02:10 +0800
Subject: [PATCH] 1.消息全局化2.消息响应静态页面实现
---
unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxsq.html | 7
unpackage/cache/wgt/H5EDA0853/pages/xtsy/index.html | 189 ------
pages/test/test2.html | 9
js/Hubs.js | 20
unpackage/cache/wgt/H5EDA0853/js/Hubs.js | 20
pages/sbgl/wxyz.html | 17
pages/login/index.html | 4
pages/sbgl/dqby.html | 7
pages/adgl/adxy.html | 327 ++++++-----
js/msg.js | 271 +++++++++
pages/xtsy/index.html | 189 ------
unpackage/cache/apk/cmManifestCache.json | 2
pages/sbgl/rcdj.html | 9
unpackage/cache/wgt/H5EDA0853/pages/sbgl/dqby.html | 7
unpackage/cache/wgt/H5EDA0853/pages/test/test2.html | 9
pages/adgl/adhj.html | 114 ++-
unpackage/cache/wgt/H5EDA0853/js/msg.js | 271 +++++++++
unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html | 17
pages/sbgl/sbwx.html | 9
unpackage/cache/apk/H5EDA0853_cm.apk | 0
unpackage/cache/apk/apkurl | 2
unpackage/cache/wgt/H5EDA0853/pages/login/index.html | 4
unpackage/release/apk/H5EDA0853__20221021143125.apk | 0
pages/sbgl/wxsq.html | 7
unpackage/cache/wgt/H5EDA0853/pages/sbgl/rcdj.html | 9
unpackage/cache/wgt/H5EDA0853/pages/sbgl/sbwx.html | 9
unpackage/cache/wgt/H5EDA0853/pages/adgl/adhj.html | 141 +++-
27 files changed, 1,055 insertions(+), 615 deletions(-)
diff --git a/js/Hubs.js b/js/Hubs.js
index 0da6b6b..0cb0ce3 100644
--- a/js/Hubs.js
+++ b/js/Hubs.js
@@ -84,12 +84,32 @@
return proxies['chatHub'].invoke.apply(proxies['chatHub'], $.merge(["SendByGroup"], $.makeArray(arguments)));
},
+ sendByGroupList: function (username, wkshpcode, eqpcode, json) {
+ return proxies['chatHub'].invoke.apply(proxies['chatHub'], $.merge(["SendByGroupList"], $.makeArray(arguments)));
+ },
+
sendByGroups: function (name1, name2, cont) {
return proxies['chatHub'].invoke.apply(proxies['chatHub'], $.merge(["SendByGroups"], $.makeArray(arguments)));
},
sendLogin: function (name) {
return proxies['chatHub'].invoke.apply(proxies['chatHub'], $.merge(["SendLogin"], $.makeArray(arguments)));
+ },
+
+ sendLogins: function (code) {
+ return proxies['chatHub'].invoke.apply(proxies['chatHub'], $.merge(["SendLogins"], $.makeArray(arguments)));
+ }
+ };
+
+ proxies['chatHub2'] = this.createHubProxy('chatHub2');
+ proxies['chatHub2'].client = { };
+ proxies['chatHub2'].server = {
+ hello: function (msg) {
+ return proxies['chatHub2'].invoke.apply(proxies['chatHub2'], $.merge(["Hello"], $.makeArray(arguments)));
+ },
+
+ send: function (count) {
+ return proxies['chatHub2'].invoke.apply(proxies['chatHub2'], $.merge(["Send"], $.makeArray(arguments)));
}
};
diff --git a/js/msg.js b/js/msg.js
new file mode 100644
index 0000000..e5926dc
--- /dev/null
+++ b/js/msg.js
@@ -0,0 +1,271 @@
+import("./vant.min.js");
+// import("./jquery-1.6.4.min.js");
+// import("./jquery.signalR-2.2.2.min.js");
+// import("./Hubs.js");
+
+// const vant = ("./vant.min");
+
+(function(w) {
+
+ var pushServer = "http://demo.dcloud.net.cn/push/?";
+ var message = null;
+
+ var g_wakelock = null;
+
+ // 鐩戝惉plusready浜嬩欢
+ document.addEventListener("plusready", function() {
+
+
+ var main = plus.android.runtimeMainActivity();
+ console.log(main,JSON.stringify(main))
+ var Context = plus.android.importClass("android.content.Context");
+ console.log(Context)
+ var PowerManager = plus.android.importClass("android.os.PowerManager");
+ console.log(PowerManager)
+ var pm = main.getSystemService(Context.POWER_SERVICE);
+ console.log(JSON.stringify(pm))
+ g_wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ANY_NAME");
+ console.log(JSON.stringify(g_wakelock))
+ g_wakelock.acquire();
+
+
+ message = document.getElementById("message");
+ // 鐩戝惉鐐瑰嚮娑堟伅浜嬩欢
+ plus.push.addEventListener("click", function(msg) {
+ // 鍒ゆ柇鏄粠鏈湴鍒涘缓杩樻槸绂荤嚎鎺ㄩ�佺殑娑堟伅
+ switch (msg.payload) {
+ case "LocalMSG":
+ outSet("鐐瑰嚮鏈湴鍒涘缓娑堟伅鍚姩锛�");
+ break;
+ default:
+ outSet("鐐瑰嚮绂荤嚎鎺ㄩ�佹秷鎭惎鍔細");
+ break;
+ }
+ // 鎻愮ず鐐瑰嚮鐨勫唴瀹�
+ plus.nativeUI.alert(msg.content);
+ // 澶勭悊鍏跺畠鏁版嵁
+ logoutPushMsg(msg);
+ }, false);
+ // 鐩戝惉鍦ㄧ嚎娑堟伅浜嬩欢
+ plus.push.addEventListener("receive", function(msg) {
+ if (msg.aps) { // Apple APNS message
+ outSet("鎺ユ敹鍒板湪绾緼PNS娑堟伅锛�");
+ } else {
+ outSet("鎺ユ敹鍒板湪绾块�忎紶娑堟伅锛�");
+ }
+
+ logoutPushMsg(msg);
+ }, false);
+
+ // var main = plus.android.runtimeMainActivity()
+ // vant.Notify(main)
+ // var Context = plus.android.importClass("android.content.Context");
+ // vant.Notify(Context)
+ // var PowerManager = plus.android.importClass("android.os.PowerManager");
+ // var pm = main.getSystemService(Context.POWER_SERVICE);
+ // g_wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ANY_NAME");
+ // g_wakelock.acquire();
+
+ }, false);
+
+ function CreateNotification(msg, n) {
+ console.log(msg, n)
+ var NotifyID = n;
+ var Context = plus.android.importClass("android.content.Context");
+ var main = plus.android.runtimeMainActivity();
+ var Noti = plus.android.importClass("android.app.Notification");
+ var NotificationManager = plus.android.importClass("android.app.NotificationManager");
+ var nm = main.getSystemService(Context.NOTIFICATION_SERVICE)
+ var Notification = plus.android.importClass("android.app.Notification");
+ var mNotification = new Notification.Builder(main);
+ var pending = plus.android.importClass("android.app.PendingIntent");
+ var intent = plus.android.importClass("android.content.Intent");
+
+ //mNotification.setOngoing(true);
+ mNotification.setContentTitle("鎮ㄦ湁涓�鏉℃湭璇绘秷鎭�"); //鏍囬
+ mNotification.setContentText(msg); //鍐呭
+ mNotification.setSmallIcon(17301620); //鍥炬爣
+ mNotification.setTicker("First Time"); //閫氱煡棣栨鍑虹幇鍦ㄩ�氱煡鏍忔椂鐨勬晥鏋�
+ mNotification.setNumber(5); //閫氱煡闆嗗悎鐨勬暟閲�
+ //var str = dateToStr(new Date());
+ //mNotification.setWhen(str);//閫氱煡浜х敓鏃堕棿
+ //mNotification.setContentIntent();//閫氱煡鏍忕偣鍑讳簨浠�
+ mNotification.setDefaults(Noti.DEFAULT_VIBRATE); //澹伴煶銆侀棯鐏�侀渿鍔ㄦ晥鏋滐紝鍙彔鍔�
+ mNotification.setPriority(Noti.PRIORITY_DEFAULT); //閫氱煡浼樺厛绾�
+ mNotification.flags = Notification.FLAG_ONLY_ALERT_ONCE; //鍙戣捣閫氱煡鏃堕渿鍔�
+ var mNb = mNotification.build()
+ nm.notify(NotifyID, mNb);
+ }
+
+
+
+ /**
+ * 鏃ュ織杈撳叆鎺ㄩ�佹秷鎭唴瀹�
+ */
+ function logoutPushMsg(msg) {
+ outLine("title: " + msg.title);
+ outLine("content: " + msg.content);
+ if (msg.payload) {
+ if (typeof(msg.payload) == "string") {
+ outLine("payload(String): " + msg.payload);
+ } else {
+ outLine("payload(JSON): " + JSON.stringify(msg.payload));
+ }
+ } else {
+ outLine("payload: undefined");
+ }
+ if (msg.aps) {
+ outLine("aps: " + JSON.stringify(msg.aps));
+ }
+ }
+
+ /**
+ * 鑾峰彇鏈湴鎺ㄩ�佹爣璇嗕俊鎭�
+ */
+ function getPushInfo() {
+ outSet("鑾峰彇瀹㈡埛绔帹閫佹爣璇嗕俊鎭細");
+ plus.push.getClientInfoAsync(function(info) {
+ outLine('Success');
+ outLine(JSON.stringify(info));
+ }, function(e) {
+ outLine('Failed');
+ outLine(JSON.stringify(e));
+ });
+ }
+ /**
+ * 鏈湴鍒涘缓涓�鏉℃帹鍔ㄦ秷鎭�
+ */
+ function createLocalPushMsg(msg) {
+ var cont = $('#cont').val();
+ var options = {
+ cover: false
+ };
+ // console.log('1222')
+ plus.push.createMessage(msg, "LocalMSG", options);
+ outSet("鍒涘缓鏈湴娑堟伅鎴愬姛锛�");
+ outLine("璇峰埌绯荤粺娑堟伅涓績鏌ョ湅锛�");
+ if (plus.os.name == "iOS") {
+ outLine('*濡傛灉鏃犳硶鍒涘缓娑堟伅锛岃鍒�"璁剧疆"->"閫氱煡"涓厤缃簲鐢ㄥ湪閫氱煡涓績鏄剧ず!');
+ }
+ }
+ /**
+ * 璇诲彇鎵�鏈夋帹閫佹秷鎭�
+ */
+ function listAllPush() {
+ var msgs = null;
+ switch (plus.os.name) {
+ case "Android":
+ msgs = plus.push.getAllMessage();
+ break;
+ default:
+ break;
+ }
+ if (!msgs) {
+ outSet("姝ゅ钩鍙颁笉鏀寔鏋氫妇鎺ㄩ�佹秷鎭垪琛紒");
+ return;
+ }
+ outSet("鏋氫妇娑堟伅鍒楄〃锛�" + msgs.length + "锛夛細");
+ for (var i in msgs) {
+ var msg = msgs[i];
+ outLine(i + ": " + msg.title + " - " + msg.content);
+ }
+ }
+
+
+ /**
+ * 娓呯┖鎵�鏈夋帹鍔ㄦ秷鎭�
+ */
+ function clearAllPush() {
+ plus.push.clear();
+ outSet("娓呯┖鎵�鏈夋帹閫佹秷鎭垚鍔燂紒");
+ }
+
+ // wakeLock()
+ var g_wakelock = null;
+ //鍏佽绋嬪簭鍚庡彴杩愯锛屼互鎸佺画鑾峰彇GPS浣嶇疆
+ function wakeLock() {
+ //Android
+
+ console.log(1)
+
+ var main = plus.android.runtimeMainActivity();
+ var Context = plus.android.importClass("android.content.Context");
+ var PowerManager = plus.android.importClass("android.os.PowerManager");
+ var pm = main.getSystemService(Context.POWER_SERVICE);
+ g_wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ANY_NAME");
+ g_wakelock.acquire();
+ }
+
+ $(function() {
+
+
+ //鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
+ // var work = $.connection.chatHub;
+ var work = $.connection.chatHub;
+
+ console.log(work)
+
+ //瀵瑰簲鍚庣鐨凷endMessage鍑芥暟锛屾秷鎭帴鏀跺嚱鏁�
+ work.client.sendMessage = function(msg) {
+ // vant.Notify({
+ // type: 'success',
+ // message: msg,
+ // duration: 5000
+ // })
+ console.log('鎴戞槸鍚庣杩斿洖鐨勬秷鎭細',msg)
+ // CreateNotification(msg, Math.random())
+ createLocalPushMsg(msg)
+
+ };
+
+ $.connection.hub.url = 'http://121.196.36.24:8001/signalr'
+ //hub杩炴帴寮�鍚�
+ $.connection.hub.start().done(function() {
+
+ var username = localStorage.getItem('username');
+
+ //鍙戦�佷笂绾夸俊鎭�
+ work.server.sendLogin(username);
+
+ // console.log('222')
+ // const aaa = [{
+ // "code": "Q",
+ // "name": "鍛煎彨璐ㄩ噺",
+ // "children": [{
+ // "usercode": "999",
+ // "username": "妤煎厛鐢�"
+ // }]
+ // }]
+
+
+ // work.server.sendByGroupList('妤煎厛鐢�', 'CJ002', 'SB001', aaa)
+
+ });
+
+ });
+
+ // wakeLock()
+ // var g_wakelock = null;
+
+ // //鍏佽绋嬪簭鍚庡彴杩愯锛屼互鎸佺画鑾峰彇GPS浣嶇疆
+ // function wakeLock() {
+ // //Android
+ // var main = plus.android.runtimeMainActivity();
+ // var Context = plus.android.importClass("android.content.Context");
+ // var PowerManager = plus.android.importClass("android.os.PowerManager");
+ // var pm = main.getSystemService(Context.POWER_SERVICE);
+ // g_wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ANY_NAME");
+ // g_wakelock.acquire();
+ // }
+
+ //缁撴潫绋嬪簭鍚庡彴杩愯
+ // function releaseWakeLock() {
+ // if (g_wakelock != null && g_wakelock.isHeld()) {
+ // g_wakelock.release();
+ // g_wakelock = null;
+ // }
+ // }
+
+
+
+})(window);
diff --git a/pages/adgl/adhj.html b/pages/adgl/adhj.html
index ae4a279..7ea27c7 100644
--- a/pages/adgl/adhj.html
+++ b/pages/adgl/adhj.html
@@ -21,9 +21,14 @@
<script type="text/javascript" src="../../js/global.js"></script>
- <script src="http://121.196.36.24:8001/Scripts/jquery-3.4.1.min.js"></script>
- <script src="http://121.196.36.24:8001/Scripts/jquery.signalR-2.2.2.min.js"></script>
- <script src="http://121.196.36.24:8001/SignalR/Hubs"></script>
+ <!-- <script src="http://121.196.36.24:8001/Scripts/jquery-3.4.1.min.js"></script> -->
+ <!-- <script src="http://121.196.36.24:8001/Scripts/jquery.signalR-2.2.2.min.js"></script> -->
+ <!-- <script src="http://121.196.36.24:8001/SignalR/Hubs"></script> -->
+
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+
<script type="text/javascript">
var pushServer = "http://demo.dcloud.net.cn/push/?";
@@ -183,15 +188,61 @@
+ function CreateNotification(msg, n) {
+ console.log(msg, n)
+
+ vant.Notify(msg, n, 9999999999)
+
+ var NotifyID = n;
+ var Context = plus.android.importClass("android.content.Context");
+ var main = plus.android.runtimeMainActivity();
+ var Noti = plus.android.importClass("android.app.Notification");
+ var NotificationManager = plus.android.importClass("android.app.NotificationManager");
+ var nm = main.getSystemService(Context.NOTIFICATION_SERVICE)
+ var Notification = plus.android.importClass("android.app.Notification");
+ var mNotification = new Notification.Builder(main);
+ var pending = plus.android.importClass("android.app.PendingIntent");
+ var intent = plus.android.importClass("android.content.Intent");
+
+ //mNotification.setOngoing(true);
+ mNotification.setContentTitle("鎮ㄦ湁涓�鏉℃湭璇绘秷鎭�"); //鏍囬
+ mNotification.setContentText(msg); //鍐呭
+ mNotification.setSmallIcon(17301620); //鍥炬爣
+ mNotification.setTicker("First Time"); //閫氱煡棣栨鍑虹幇鍦ㄩ�氱煡鏍忔椂鐨勬晥鏋�
+ mNotification.setNumber(5); //閫氱煡闆嗗悎鐨勬暟閲�
+ //var str = dateToStr(new Date());
+ //mNotification.setWhen(str);//閫氱煡浜х敓鏃堕棿
+ //mNotification.setContentIntent();//閫氱煡鏍忕偣鍑讳簨浠�
+ mNotification.setDefaults(Noti.DEFAULT_VIBRATE); //澹伴煶銆侀棯鐏�侀渿鍔ㄦ晥鏋滐紝鍙彔鍔�
+ mNotification.setPriority(Noti.PRIORITY_DEFAULT); //閫氱煡浼樺厛绾�
+ mNotification.flags = Notification.FLAG_ONLY_ALERT_ONCE; //鍙戣捣閫氱煡鏃堕渿鍔�
+ var mNb = mNotification.build()
+ nm.notify(NotifyID, mNb);
+ }
+
+ // wakeLock()
+ // var g_wakelock = null;
+ // //鍏佽绋嬪簭鍚庡彴杩愯锛屼互鎸佺画鑾峰彇GPS浣嶇疆
+ // function wakeLock() {
+ // //Android
+ // var main = plus.android.runtimeMainActivity();
+ // var Context = plus.android.importClass("android.content.Context");
+ // var PowerManager = plus.android.importClass("android.os.PowerManager");
+ // var pm = main.getSystemService(Context.POWER_SERVICE);
+ // g_wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ANY_NAME");
+ // g_wakelock.acquire();
+ // }
$(function() {
//鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
var work = $.connection.chatHub;
-
+ // work
+ console.log(work, 1)
//瀵瑰簲鍚庣鐨凷endMessage鍑芥暟锛屾秷鎭帴鏀跺嚱鏁�
// console.log(work.client.sendMessage)
work.client.sendMessage = function(msg) {
- console.log(msg, 1)
+ // console.log(msg, 1)
+ // CreateNotification(msg, Math.random())
createLocalPushMsg(msg)
};
@@ -331,6 +382,8 @@
falseArray.push({
id: '1'
})
+ }else{
+ topContentClick(topContent[0].code, topContent[0].wksp_code)
}
})
@@ -370,8 +423,8 @@
</script>
</head>
- <body onload="scaned('SB001')">
- <!-- <body> -->
+ <!-- <body onload="scaned('SB001')"> -->
+ <body>
<div id="app">
<div class="body">
@@ -588,7 +641,7 @@
})
if (topContent.length >= 1) {
radioValue = topContent[0].code
- topContentClick(radioValue, topContent.find(i => i.code ===
+ this.topContentClick(radioValue, topContent.find(i => i.code ===
radioValue).wksp_code)
}
@@ -599,33 +652,30 @@
}, 100)
},
- // topContentClick(code, wksp_code) {
- // radioValue = code
- // this.$forceUpdate()
+ topContentClick(code, wksp_code) {
+ radioValue = code
+ const data = {
+ eqpcode: code,
+ wkshpcode: wksp_code
+ }
+ post('AppDeviceManage/AppDeviceAnDengCallItemSearch' + formatParams(data)).then(res => {
+ if (res.code === '200') {
+ centerContent = res.data
- // const data = {
- // eqpcode: code,
- // wkshpcode: wksp_code
- // }
- // post('AppDeviceManage/AppDeviceAnDengCallItemSearch' + formatParams(data)).then(res => {
- // if (res.code === '200') {
- // centerContent = res.data
+ currentValue = centerContent.map(r => {
+ if (r.flag === 'Y') {
+ return r.code
+ }
+ })
- // currentValue = centerContent.map(r => {
- // if (r.flag === 'Y') {
- // return r.code
- // }
- // })
- // centerContent.forEach(i => {
- // i.isTrue = i.flag === 'Y'
- // })
+ centerContent.forEach(i => {
+ i.isTrue = i.flag === 'Y'
+ })
- // this.$forceUpdate()
-
- // }
- // })
-
- // },
+ this.$forceUpdate()
+ }
+ })
+ },
topScanClick() {
diff --git a/pages/adgl/adxy.html b/pages/adgl/adxy.html
index efe5825..d226db5 100644
--- a/pages/adgl/adxy.html
+++ b/pages/adgl/adxy.html
@@ -20,33 +20,39 @@
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/global.js"></script>
- <!-- <script src="http://121.196.36.24:8001/Scripts/jquery-3.4.1.min.js"></script>
- <script src="http://121.196.36.24:8001/Scripts/jquery.signalR-2.2.2.min.js"></script>
- <script src="http://121.196.36.24:8001/SignalR/Hubs"></script>
- -->
+
+ <!-- <script src="http://121.196.36.24:8001/Scripts/jquery-3.4.1.min.js"></script> -->
+ <!-- <script src="http://121.196.36.24:8001/Scripts/jquery.signalR-2.2.2.min.js"></script> -->
+ <!-- <script src="http://121.196.36.24:8001/SignalR/Hubs"></script> -->
+
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+
<script type="text/javascript">
- let topContent = [{
- code: 'SB001',
- name: '鐢垫睜缁勪竴绾�',
- wksp_code: "CJ002",
- wksp_name: '鐢垫睜杞﹂棿',
- "eqpchkmain_code": "djbz002"
- },
- {
- code: 'SB003',
- name: '榻胯疆绠辩粍涓�绾�',
- wksp_code: "CJ001",
- "wksp_name": "瑁呴厤杞﹂棿",
- "eqpchkmain_code": "djbz002"
- },
- {
- code: 'SB004',
- name: '榻胯疆绠辩粍涓�绾�',
- wksp_code: "CJ001",
- "wksp_name": "瑁呴厤杞﹂棿",
- "eqpchkmain_code": "djbz002"
- },
+ let topContent = [
+ // {
+ // code: 'SB001',
+ // name: '鐢垫睜缁勪竴绾�',
+ // wksp_code: "CJ002",
+ // wksp_name: '鐢垫睜杞﹂棿',
+ // "eqpchkmain_code": "djbz002"
+ // },
+ // {
+ // code: 'SB003',
+ // name: '榻胯疆绠辩粍涓�绾�',
+ // wksp_code: "CJ001",
+ // "wksp_name": "瑁呴厤杞﹂棿",
+ // "eqpchkmain_code": "djbz002"
+ // },
+ // {
+ // code: 'SB004',
+ // name: '榻胯疆绠辩粍涓�绾�',
+ // wksp_code: "CJ001",
+ // "wksp_name": "瑁呴厤杞﹂棿",
+ // "eqpchkmain_code": "djbz002"
+ // },
// {
// code: 'SB005',
// name: '榻胯疆绠辩粍涓�绾�',
@@ -56,73 +62,94 @@
// },
];
- let radioValue = 'SB001' //鍗曢�夋閫変腑鐨勯」
+ var submitIsDisabled = false; //鎻愪氦鎸夐挳鏄惁disabled
+
+ let radioValue = '' //鍗曢�夋閫変腑鐨勯」
let centerContent = [] //涓棿閮ㄥ垎鍐呭
let falseArray = [] // 鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤
- // 鎵弿淇濆吇宸ヤ綅杩斿洖鏃舵墽琛屾柟娉�
+
+
+
+ // 鎵弿宸ヤ綅杩斿洖鏃舵墽琛屾柟娉�
function scaned(r) {
+
radioValue = r
- let temp = {}
- let flag = false
+ var temp = {}
+ var flag = 0
- if (topContent.find(i => i.code === radioValue)) {
+ if (topContent.find(i => i.eqp_code === r)) {
topContent.forEach((item, index) => {
- if (item.code === radioValue) {
+ if (item.eqp_code === r) {
temp = item
topContent.splice(index, 1)
- flag = true
+ flag = 1
}
})
}
- if (flag) { //瀵瑰凡鍦ㄥ垪琛ㄧ殑鏁版嵁 鎺掑簭鍒扮涓�涓幓
+ if (flag === 1) { //瀵瑰凡鍦ㄥ垪琛ㄧ殑鏁版嵁 鎺掑簭鍒扮涓�涓幓
topContent.unshift(temp)
- topScanClick(radioValue)
- topContentClick(radioValue, topContent.find(i => i.code === radioValue).wksp_code)
+ falseArray.push({
+ id: '1'
+ })
} else { //鏈湪鍒楄〃鐨勬暟鎹� 杩涜鏂板鎿嶄綔
- topScanClick(radioValue)
- topContentClick(radioValue, topContent.find(i => i.code === radioValue).wksp_code)
+ topSpanClick(r)
+ falseArray.push({
+ id: '1'
+ })
}
- falseArray.push({
- id: '1'
- })
}
- function topScanClick(code) {
+ function topSpanClick(code) {
post('AppDeviceManage/AppDeviceAnDengLampResponseScanSearch?eqpcode=' + code).then(res => {
if (res.code === '200') {
- topContent.unshift(res.data[0])
+ let children = []
+ res.data.forEach(i => {
+ children.push({
+ typecode: i.typecode,
+ typename: i.typename
+ })
+ })
+
+
+ topContent.unshift({
+ eqp_code: res.data[0].eqp_code,
+ eqp_name: res.data[0].eqp_name,
+ org_name: res.data[0].org_name,
+ children
+ })
+
+ // centerContent = res.data.map(r => {
+ // return {
+ // typecode: r.typecode,
+ // typename: r.typename
+ // }
+ // })
+
+ console.log(cneterContent, 1)
+
+ falseArray.push({
+ id: '1'
+ })
+ } else {
+ radioValue = topContent[0].eqp_code
falseArray.push({
id: '1'
})
}
- })
- }
-
- function topContentClick(code, wksp_code) {
- const data = {
- eqpcode: code,
- wkshpcode: wksp_code
- }
- post('AppDeviceManage/AppDeviceAnDengCallItemSearch' + formatParams(data)).then(res => {
- if (res.code === '200') {
- centerContent = res.data
- falseArray.push({
- id: '1'
- })
- }
})
}
</script>
</head>
+ <!-- <body onload="scaned('SB001')"> -->
<body>
<div id="app">
@@ -140,7 +167,6 @@
</template>
</van-nav-bar>
</van-sticky>
-
<div v-if="topContent.length===0">
<div class="sacnBody">
@@ -168,18 +194,18 @@
</div>
- <van-radio-group v-model="radioValue" id="topContent">
+ <van-radio-group v-model="radioValue">
<van-cell-group>
- <div style="margin: 10px 0;" v-for="(item,index) in topContent" :key="item.eqpcode"
- @click="topContentClick(item.code,item.wksp_code)">
- <div class="cellDiv">宸ヤ綅缂栫爜锛歿{item.code}}</div>
- <van-cell :title="'宸ヤ綅鍚嶇О锛�'+item.name">
+ <div style="margin: 10px 0;" v-for="(item,index) in topContent" :key="item.eqp_code"
+ @click="topContentClick(item.eqp_code)">
+ <div class="cellDiv">宸ヤ綅缂栫爜锛歿{item.eqp_code}}</div>
+ <van-cell :title="'宸ヤ綅鍚嶇О锛�'+item.eqp_name">
<template #right-icon>
<van-radio style="margin-right: 10px;" checked-color='red'
- :name="item.code" />
+ :name="item.eqp_code" />
</template>
</van-cell>
- <div class="cellDiv">鐢熶骇杞﹂棿锛歿{item.wksp_name}}</div>
+ <div class="cellDiv">鐢熶骇杞﹂棿锛歿{item.org_name}}</div>
</div>
</van-cell-group>
@@ -187,7 +213,7 @@
</div>
- <div class="head" style="min-height: 100px;max-height: 260px; overflow: scroll;">
+ <div class="head" style="min-height: 100px; ">
<div class="head_block">
<div class="head_left">
<div class="head_bar"></div>
@@ -200,12 +226,16 @@
</div>
+
+
<div style="padding: 10px;display: flex;flex-direction: column"
- v-for="(item,index) in centerContent">
+ v-for="(item,index) in topContent[0].children">
+ <!-- v-for="(item,index) in centerContent"> -->
+
<div style="display: flex;justify-content: space-between;align-items: center;">
- <div style="margin-left: 10px;">{{item.name}}</div>
+ <div style="margin-left: 10px;">{{item.typename}}</div>
<div style="margin-right: 10px;">
- <van-switch size="24" v-model="item.isTrue" @change='val=>switchChange(val,item)'
+ <van-switch size="24" v-model="item.typecode" @change='val=>switchChange(val,item)'
active-color="#ee0a24" inactive-color="#dcdee0" />
</div>
</div>
@@ -216,8 +246,8 @@
<div
style="position:fixed;bottom: 0;width: 96%;margin-left:2%; flex;justify-content: center;flex-direction: column;align-items: center">
- <van-button id='submit' :loading='submitIsDisabled' loading-text="姝e湪鎻愪氦,璇风◢绛�..."
- class="vanButtonInfo" @click="submit" type="info">
+ <van-button id="submit" :loading='submitIsDisabled' loading-text="姝e湪鎻愪氦,璇风◢绛�..."
+ class="vanButtonInfo" @click='submit' type="info">
纭鎻愪氦</van-button>
</div>
@@ -242,7 +272,7 @@
el: '#app',
data: function() {
return {
- submitIsDisabled: false,
+
overlayShow: false,
showPopover: false,
actions: [{
@@ -255,12 +285,21 @@
icon: 'revoke',
text: '閫�鍑虹櫥褰�'
}],
-
+ centerContent2: centerContent,
+ topContent2: topContent,
falseArray2: falseArray, //鍋囨暟缁�
-
}
},
watch: {
+ 'topContent2.length': {
+ handler(newValue, oldValue) {
+ if (newValue !== oldValue) {
+ this.$forceUpdate()
+ }
+ },
+ deep: true,
+ immediate: true,
+ },
'falseArray2.length': {
handler(newValue, oldValue) {
this.$forceUpdate()
@@ -273,92 +312,80 @@
},
mounted() {
- const data = {
- eqpcode: 'SB001',
- wkshpcode: 'CJ002'
- }
- post('AppDeviceManage/AppDeviceAnDengCallItemSearch' + formatParams(data)).then(res => {
- if (res.code === '200') {
- centerContent = res.data
- centerContent.forEach(i => {
- i.isTrue = i.flag === 'Y'
- })
- falseArray.push({
- id: '1'
- })
-
-
- }
- })
},
methods: {
- submit() {
-
-
- const data = {
- username: localStorage.getItem('username'),
- eqpcode: topContent.find(i => i.code === radioValue).code,
- wkshpcode: topContent.find(i => i.code === radioValue).wksp_code
- }
- const DATA = []
- centerContent.forEach(i => {
- if (i.isTrue) {
- i.flag = i.isTrue ? 'Y' : 'N'
- DATA.push(i)
- }
- })
-
- console.log(data, DATA)
-
- this.submitIsDisabled = true
- post('AppDeviceManage/AppDeviceAnDengLampResponseSave' + formatParams(data), DATA).then(
- res => {
- if (res.code === '200') {
- vant.Notify({
- type: 'primary',
- message: '鎻愪氦鎴愬姛锛�'
- })
- topContent.forEach((r, i) => {
- if (r.code === radioValue) {
- topContent.splice(i, 1)
- }
- })
- if (topContent.length >= 1) {
- radioValue = topContent[0].code
- this.topContentClick(radioValue)
- }
-
- this.submitIsDisabled = false
- this.$forceUpdate()
- }
- })
-
-
-
- },
switchChange(val, item) {
- console.log(val, item)
this.$forceUpdate()
+ },
+ submit() {
+ setTimeout(() => {
+ const data = {
+ username: localStorage.getItem('username'),
+ eqpcode: topContent.find(i => i.code === radioValue).code,
+ wkshpcode: topContent.find(i => i.code === radioValue).wksp_code
+ }
+ const DATA = []
+
+
+
+ submitIsDisabled = true
+ // falseArray.push({
+ // id: '1'
+ // })
+ this.$forceUpdate()
+ post('AppDeviceManage/AppDeviceAnDengCallSave' + formatParams(data), DATA).then(
+ res => {
+ if (res.code === '200') {
+ vant.Notify({
+ type: 'primary',
+ message: '鎻愪氦鎴愬姛锛�'
+ })
+ topContent.forEach((r, i) => {
+ if (r.code === radioValue) {
+ topContent.splice(i, 1)
+ }
+ })
+ if (topContent.length >= 1) {
+ radioValue = topContent[0].code
+ this.topContentClick(radioValue)
+ }
+
+ submitIsDisabled = false
+ this.$forceUpdate()
+ }
+ })
+ }, 100)
},
+ topContentClick(code) {
- topContentClick(code, wksp_code) {
- // radioValue = code
+ // 鏄庡ぉ鐮旂┒涓�涓� 鍒楄〃閫夐」鍒囨崲闂
+
+ radioValue = code
// this.$forceUpdate()
- // const data = {
- // eqpcode: code,
- // wkshpcode: wksp_code
- // }
- // post('AppDeviceManage/AppDeviceAnDengCallItemSearch' + formatParams(data)).then(res => {
- // if (res.code === '200') {
- // centerContent = res.data
- // falseArray.push({
- // id: '1'
- // })
- // }
- // })
+ // console.log(JSON.stringify(radioValue), JSON.stringify(topContent))
+ let children = []
+ topContent.find(i => i.eqp_code === radioValue).forEach(i => {
+ children.push({
+ typecode: i.typecode,
+ typename: i.typename
+ })
+ })
+
+
+ topContent.unshift({
+ eqp_code: res.data[0].eqp_code,
+ eqp_name: res.data[0].eqp_name,
+ org_name: res.data[0].org_name,
+ children
+ })
+
+ console.log(JSON.stringify(topContent))
+
+ this.$forceUpdate()
+
},
diff --git a/pages/login/index.html b/pages/login/index.html
index 3abea4a..23d4181 100644
--- a/pages/login/index.html
+++ b/pages/login/index.html
@@ -22,10 +22,6 @@
<!-- 瀵煎叆鑷畾涔夊叏灞�js鏂囦欢 -->
<script type="text/javascript" src="../../js/global.js"></script>
-
-
- <!-- <link rel="stylesheet" href="../css/global.css" type="text/css" charset="utf-8" /> -->
-
</head>
<body>
<div id="app">
diff --git a/pages/sbgl/dqby.html b/pages/sbgl/dqby.html
index a4448be..a4158ba 100644
--- a/pages/sbgl/dqby.html
+++ b/pages/sbgl/dqby.html
@@ -20,7 +20,12 @@
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/global.js"></script>
-
+
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
+
<script type="text/javascript">
var topContent = [
// {
diff --git a/pages/sbgl/rcdj.html b/pages/sbgl/rcdj.html
index 2c84a2b..e20159e 100644
--- a/pages/sbgl/rcdj.html
+++ b/pages/sbgl/rcdj.html
@@ -20,8 +20,11 @@
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/global.js"></script>
-
- <!-- <link rel="stylesheet" href="../../css/global.css" type="text/css" charset="utf-8" /> -->
+
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
<script type="text/javascript">
var topContent = [
@@ -172,7 +175,7 @@
<van-popover style="" placement="bottom-end" :offset="[13,8]" v-model="showPopover"
trigger="click" :actions="actions" @select="onSelect">
<template #reference>
- <van-icon name="bars" size='20' color='#fff'/>
+ <van-icon name="bars" size='20' color='#fff' />
</template>
</van-popover>
</template>
diff --git a/pages/sbgl/sbwx.html b/pages/sbgl/sbwx.html
index e5b0fae..ea5061e 100644
--- a/pages/sbgl/sbwx.html
+++ b/pages/sbgl/sbwx.html
@@ -20,9 +20,12 @@
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/global.js"></script>
-
- <!-- <link rel="stylesheet" href="../../css/global.css" type="text/css" charset="utf-8" /> -->
-
+
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
+
<script type="text/javascript">
var topContent = [
// {
diff --git a/pages/sbgl/wxsq.html b/pages/sbgl/wxsq.html
index 55bfc9d..cd92f36 100644
--- a/pages/sbgl/wxsq.html
+++ b/pages/sbgl/wxsq.html
@@ -21,8 +21,11 @@
<script type="text/javascript" src="../../js/global.js"></script>
- <!-- <link rel="stylesheet" href="../../css/global.css" type="text/css" charset="utf-8" /> -->
-
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
+
<script type="text/javascript">
var topContent = [
// {
diff --git a/pages/sbgl/wxyz.html b/pages/sbgl/wxyz.html
index ff65c09..247a28d 100644
--- a/pages/sbgl/wxyz.html
+++ b/pages/sbgl/wxyz.html
@@ -21,6 +21,11 @@
<script type="text/javascript" src="../../js/global.js"></script>
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
+
<script type="text/javascript">
var topContent = [
// {
@@ -230,7 +235,8 @@
{{messageDescr}}
</div>
<div v-show="fileList.length!==0" style="width: 96%;margin: auto;">
- <van-uploader multiple :deletable='false' v-model="fileList" multiple :max-count="fileList.length" />
+ <van-uploader multiple :deletable='false' v-model="fileList" multiple
+ :max-count="fileList.length" />
</div>
</div>
@@ -294,7 +300,8 @@
{{messageDescr3}}
</div>
<div v-show="fileList2.length!==0" style="width: 96%;margin: auto;">
- <van-uploader :deletable='false' multiple v-model="fileList2" multiple :max-count="fileList2.length" />
+ <van-uploader :deletable='false' multiple v-model="fileList2" multiple
+ :max-count="fileList2.length" />
</div>
</div>
@@ -488,7 +495,7 @@
item.arrowType = true
if (item.repair_code === repair_code) {
item.arrowType = false
- item.resultValue = item.resultValue?item.resultValue:''
+ item.resultValue = item.resultValue ? item.resultValue : ''
this.messageDescr = ''
this.messageDescr2 = ''
this.messageDescr3 = ''
@@ -564,8 +571,8 @@
// this.resultValue = ''
topContent.forEach(item => {
if (item.repair_code !== repair_code) {
- item.resultValue=''
- // this.getDetail(item.repair_code, item.eqpcode, item.wksp_code)
+ item.resultValue = ''
+ // this.getDetail(item.repair_code, item.eqpcode, item.wksp_code)
}
})
diff --git a/pages/test/test2.html b/pages/test/test2.html
new file mode 100644
index 0000000..5eace9d
--- /dev/null
+++ b/pages/test/test2.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title></title>
+ </head>
+ <body>
+ </body>
+</html>
\ No newline at end of file
diff --git a/pages/xtsy/index.html b/pages/xtsy/index.html
index 944ec0a..619fb75 100644
--- a/pages/xtsy/index.html
+++ b/pages/xtsy/index.html
@@ -20,178 +20,17 @@
<script type="text/javascript" src="../../js/http.js"></script>
<script type="text/javascript" src="../../js/global.js"></script>
-
- <script src="http://121.196.36.24:8001/Scripts/jquery-3.4.1.min.js"></script>
+
+
+
+ <!-- <script src="http://121.196.36.24:8001/Scripts/jquery-3.4.1.min.js"></script>
<script src="http://121.196.36.24:8001/Scripts/jquery.signalR-2.2.2.min.js"></script>
- <script src="http://121.196.36.24:8001/SignalR/Hubs"></script>
+ <script src="http://121.196.36.24:8001/SignalR/Hubs"></script> -->
-
-
- <script type="text/javascript">
- var pushServer = "http://demo.dcloud.net.cn/push/?";
- var message = null;
-
- // 鐩戝惉plusready浜嬩欢
- document.addEventListener("plusready", function() {
- message = document.getElementById("message");
- // 鐩戝惉鐐瑰嚮娑堟伅浜嬩欢
- plus.push.addEventListener("click", function(msg) {
- // 鍒ゆ柇鏄粠鏈湴鍒涘缓杩樻槸绂荤嚎鎺ㄩ�佺殑娑堟伅
- switch (msg.payload) {
- case "LocalMSG":
- outSet("鐐瑰嚮鏈湴鍒涘缓娑堟伅鍚姩锛�");
- break;
- default:
- outSet("鐐瑰嚮绂荤嚎鎺ㄩ�佹秷鎭惎鍔細");
- break;
- }
- // 鎻愮ず鐐瑰嚮鐨勫唴瀹�
- plus.nativeUI.alert(msg.content);
- // 澶勭悊鍏跺畠鏁版嵁
- logoutPushMsg(msg);
- }, false);
- // 鐩戝惉鍦ㄧ嚎娑堟伅浜嬩欢
- plus.push.addEventListener("receive", function(msg) {
- if (msg.aps) { // Apple APNS message
- outSet("鎺ユ敹鍒板湪绾緼PNS娑堟伅锛�");
- } else {
- outSet("鎺ユ敹鍒板湪绾块�忎紶娑堟伅锛�");
- }
- logoutPushMsg(msg);
- }, false);
- }, false);
-
- /**
- * 鏃ュ織杈撳叆鎺ㄩ�佹秷鎭唴瀹�
- */
- function logoutPushMsg(msg) {
- outLine("title: " + msg.title);
- outLine("content: " + msg.content);
- if (msg.payload) {
- if (typeof(msg.payload) == "string") {
- outLine("payload(String): " + msg.payload);
- } else {
- outLine("payload(JSON): " + JSON.stringify(msg.payload));
- }
- } else {
- outLine("payload: undefined");
- }
- if (msg.aps) {
- outLine("aps: " + JSON.stringify(msg.aps));
- }
- }
-
- /**
- * 鑾峰彇鏈湴鎺ㄩ�佹爣璇嗕俊鎭�
- */
- function getPushInfo() {
- outSet("鑾峰彇瀹㈡埛绔帹閫佹爣璇嗕俊鎭細");
- plus.push.getClientInfoAsync(function(info) {
- outLine('Success');
- outLine(JSON.stringify(info));
- }, function(e) {
- outLine('Failed');
- outLine(JSON.stringify(e));
- });
- }
- /**
- * 鏈湴鍒涘缓涓�鏉℃帹鍔ㄦ秷鎭�
- */
- function createLocalPushMsg(msg) {
- var cont = $('#cont').val();
- var options = {
- cover: false
- };
- plus.push.createMessage(msg, "LocalMSG", options);
- outSet("鍒涘缓鏈湴娑堟伅鎴愬姛锛�");
- outLine("璇峰埌绯荤粺娑堟伅涓績鏌ョ湅锛�");
- if (plus.os.name == "iOS") {
- outLine('*濡傛灉鏃犳硶鍒涘缓娑堟伅锛岃鍒�"璁剧疆"->"閫氱煡"涓厤缃簲鐢ㄥ湪閫氱煡涓績鏄剧ず!');
- }
- }
- /**
- * 璇诲彇鎵�鏈夋帹閫佹秷鎭�
- */
- function listAllPush() {
- var msgs = null;
- switch (plus.os.name) {
- case "Android":
- msgs = plus.push.getAllMessage();
- break;
- default:
- break;
- }
- if (!msgs) {
- outSet("姝ゅ钩鍙颁笉鏀寔鏋氫妇鎺ㄩ�佹秷鎭垪琛紒");
- return;
- }
- outSet("鏋氫妇娑堟伅鍒楄〃锛�" + msgs.length + "锛夛細");
- for (var i in msgs) {
- var msg = msgs[i];
- outLine(i + ": " + msg.title + " - " + msg.content);
- }
- }
- /**
- * 娓呯┖鎵�鏈夋帹鍔ㄦ秷鎭�
- */
- function clearAllPush() {
- plus.push.clear();
- outSet("娓呯┖鎵�鏈夋帹閫佹秷鎭垚鍔燂紒");
- }
-
-
- $(function() {
- //鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
- // var work = $.connection.chatHub;
- var work = $.connection.chatHub;
-
- //瀵瑰簲鍚庣鐨凷endMessage鍑芥暟锛屾秷鎭帴鏀跺嚱鏁�
- work.client.sendMessage = function(msg) {
- console.log(msg,1)
- createLocalPushMsg(msg)
- };
-
- //鍚庣SendLogin璋冪敤鍚庯紝浜х敓鐨刲oginUser鍥炶皟
- work.client.loginUser = function(userlist) {
- // console.log(userlist, 9)
- // reloadUser(userlist);
- };
-
- $.connection.hub.url = 'http://121.196.36.24:8001/signalr'
- //hub杩炴帴寮�鍚�
- $.connection.hub.start().done(function() {
-
- var username = localStorage.getItem('username');
-
- //鍙戦�佷笂绾夸俊鎭�
- work.server.sendLogin(username);
-
- // const aaa = [{
- // "code": "Q",
- // "name": "鍛煎彨璐ㄩ噺",
- // "children": [{
- // "usercode": "999",
- // "username": "妤煎厛鐢�"
- // }]
- // }]
-
- // work.server.sendByGroupList('妤煎厛鐢�', 'CJ002', 'SB001', aaa)
-
- });
-
- });
-
- //閲嶆柊鍔犺浇鐢ㄦ埛鍒楄〃
- // var reloadUser = function() {
- // $("#username").empty();
- // for (i = 0; i < 5; i++) {
- // $("#username").append("<option value=" + i + ">" + i + "</option>");
- // }
- // }
-
-
-
- </script>
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
@@ -324,12 +163,12 @@
},
mounted() {
this.getfirstMenu()
-
+
this.getLoginAppAnDonMessage()
- setInterval(()=>{
+ setInterval(() => {
this.getLoginAppAnDonMessage()
- },1000*10)
-
+ }, 1000 * 10)
+
},
methods: {
onRefresh() {
@@ -339,7 +178,7 @@
this.getLoginAppAnDonMessage()
// vant.Notify('鍒锋柊鎴愬姛');
this.isLoading = false;
-
+
}, 1000);
},
diff --git a/unpackage/cache/apk/H5EDA0853_cm.apk b/unpackage/cache/apk/H5EDA0853_cm.apk
index 88e00a5..2b5ce6e 100644
--- a/unpackage/cache/apk/H5EDA0853_cm.apk
+++ b/unpackage/cache/apk/H5EDA0853_cm.apk
Binary files differ
diff --git a/unpackage/cache/apk/apkurl b/unpackage/cache/apk/apkurl
index 66e790c..d7f1318 100644
--- a/unpackage/cache/apk/apkurl
+++ b/unpackage/cache/apk/apkurl
@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/98ecbf50-504e-11ed-9fdb-07a931acdbf6
\ No newline at end of file
+https://ide.dcloud.net.cn/build/download/fce4f490-5109-11ed-bd86-39c3cbc54ad7
\ No newline at end of file
diff --git a/unpackage/cache/apk/cmManifestCache.json b/unpackage/cache/apk/cmManifestCache.json
index 1658d78..78adbe4 100644
--- a/unpackage/cache/apk/cmManifestCache.json
+++ b/unpackage/cache/apk/cmManifestCache.json
@@ -1 +1 @@
-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
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/unpackage/cache/wgt/H5EDA0853/js/Hubs.js b/unpackage/cache/wgt/H5EDA0853/js/Hubs.js
index 0da6b6b..0cb0ce3 100644
--- a/unpackage/cache/wgt/H5EDA0853/js/Hubs.js
+++ b/unpackage/cache/wgt/H5EDA0853/js/Hubs.js
@@ -84,12 +84,32 @@
return proxies['chatHub'].invoke.apply(proxies['chatHub'], $.merge(["SendByGroup"], $.makeArray(arguments)));
},
+ sendByGroupList: function (username, wkshpcode, eqpcode, json) {
+ return proxies['chatHub'].invoke.apply(proxies['chatHub'], $.merge(["SendByGroupList"], $.makeArray(arguments)));
+ },
+
sendByGroups: function (name1, name2, cont) {
return proxies['chatHub'].invoke.apply(proxies['chatHub'], $.merge(["SendByGroups"], $.makeArray(arguments)));
},
sendLogin: function (name) {
return proxies['chatHub'].invoke.apply(proxies['chatHub'], $.merge(["SendLogin"], $.makeArray(arguments)));
+ },
+
+ sendLogins: function (code) {
+ return proxies['chatHub'].invoke.apply(proxies['chatHub'], $.merge(["SendLogins"], $.makeArray(arguments)));
+ }
+ };
+
+ proxies['chatHub2'] = this.createHubProxy('chatHub2');
+ proxies['chatHub2'].client = { };
+ proxies['chatHub2'].server = {
+ hello: function (msg) {
+ return proxies['chatHub2'].invoke.apply(proxies['chatHub2'], $.merge(["Hello"], $.makeArray(arguments)));
+ },
+
+ send: function (count) {
+ return proxies['chatHub2'].invoke.apply(proxies['chatHub2'], $.merge(["Send"], $.makeArray(arguments)));
}
};
diff --git a/unpackage/cache/wgt/H5EDA0853/js/msg.js b/unpackage/cache/wgt/H5EDA0853/js/msg.js
new file mode 100644
index 0000000..e5926dc
--- /dev/null
+++ b/unpackage/cache/wgt/H5EDA0853/js/msg.js
@@ -0,0 +1,271 @@
+import("./vant.min.js");
+// import("./jquery-1.6.4.min.js");
+// import("./jquery.signalR-2.2.2.min.js");
+// import("./Hubs.js");
+
+// const vant = ("./vant.min");
+
+(function(w) {
+
+ var pushServer = "http://demo.dcloud.net.cn/push/?";
+ var message = null;
+
+ var g_wakelock = null;
+
+ // 鐩戝惉plusready浜嬩欢
+ document.addEventListener("plusready", function() {
+
+
+ var main = plus.android.runtimeMainActivity();
+ console.log(main,JSON.stringify(main))
+ var Context = plus.android.importClass("android.content.Context");
+ console.log(Context)
+ var PowerManager = plus.android.importClass("android.os.PowerManager");
+ console.log(PowerManager)
+ var pm = main.getSystemService(Context.POWER_SERVICE);
+ console.log(JSON.stringify(pm))
+ g_wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ANY_NAME");
+ console.log(JSON.stringify(g_wakelock))
+ g_wakelock.acquire();
+
+
+ message = document.getElementById("message");
+ // 鐩戝惉鐐瑰嚮娑堟伅浜嬩欢
+ plus.push.addEventListener("click", function(msg) {
+ // 鍒ゆ柇鏄粠鏈湴鍒涘缓杩樻槸绂荤嚎鎺ㄩ�佺殑娑堟伅
+ switch (msg.payload) {
+ case "LocalMSG":
+ outSet("鐐瑰嚮鏈湴鍒涘缓娑堟伅鍚姩锛�");
+ break;
+ default:
+ outSet("鐐瑰嚮绂荤嚎鎺ㄩ�佹秷鎭惎鍔細");
+ break;
+ }
+ // 鎻愮ず鐐瑰嚮鐨勫唴瀹�
+ plus.nativeUI.alert(msg.content);
+ // 澶勭悊鍏跺畠鏁版嵁
+ logoutPushMsg(msg);
+ }, false);
+ // 鐩戝惉鍦ㄧ嚎娑堟伅浜嬩欢
+ plus.push.addEventListener("receive", function(msg) {
+ if (msg.aps) { // Apple APNS message
+ outSet("鎺ユ敹鍒板湪绾緼PNS娑堟伅锛�");
+ } else {
+ outSet("鎺ユ敹鍒板湪绾块�忎紶娑堟伅锛�");
+ }
+
+ logoutPushMsg(msg);
+ }, false);
+
+ // var main = plus.android.runtimeMainActivity()
+ // vant.Notify(main)
+ // var Context = plus.android.importClass("android.content.Context");
+ // vant.Notify(Context)
+ // var PowerManager = plus.android.importClass("android.os.PowerManager");
+ // var pm = main.getSystemService(Context.POWER_SERVICE);
+ // g_wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ANY_NAME");
+ // g_wakelock.acquire();
+
+ }, false);
+
+ function CreateNotification(msg, n) {
+ console.log(msg, n)
+ var NotifyID = n;
+ var Context = plus.android.importClass("android.content.Context");
+ var main = plus.android.runtimeMainActivity();
+ var Noti = plus.android.importClass("android.app.Notification");
+ var NotificationManager = plus.android.importClass("android.app.NotificationManager");
+ var nm = main.getSystemService(Context.NOTIFICATION_SERVICE)
+ var Notification = plus.android.importClass("android.app.Notification");
+ var mNotification = new Notification.Builder(main);
+ var pending = plus.android.importClass("android.app.PendingIntent");
+ var intent = plus.android.importClass("android.content.Intent");
+
+ //mNotification.setOngoing(true);
+ mNotification.setContentTitle("鎮ㄦ湁涓�鏉℃湭璇绘秷鎭�"); //鏍囬
+ mNotification.setContentText(msg); //鍐呭
+ mNotification.setSmallIcon(17301620); //鍥炬爣
+ mNotification.setTicker("First Time"); //閫氱煡棣栨鍑虹幇鍦ㄩ�氱煡鏍忔椂鐨勬晥鏋�
+ mNotification.setNumber(5); //閫氱煡闆嗗悎鐨勬暟閲�
+ //var str = dateToStr(new Date());
+ //mNotification.setWhen(str);//閫氱煡浜х敓鏃堕棿
+ //mNotification.setContentIntent();//閫氱煡鏍忕偣鍑讳簨浠�
+ mNotification.setDefaults(Noti.DEFAULT_VIBRATE); //澹伴煶銆侀棯鐏�侀渿鍔ㄦ晥鏋滐紝鍙彔鍔�
+ mNotification.setPriority(Noti.PRIORITY_DEFAULT); //閫氱煡浼樺厛绾�
+ mNotification.flags = Notification.FLAG_ONLY_ALERT_ONCE; //鍙戣捣閫氱煡鏃堕渿鍔�
+ var mNb = mNotification.build()
+ nm.notify(NotifyID, mNb);
+ }
+
+
+
+ /**
+ * 鏃ュ織杈撳叆鎺ㄩ�佹秷鎭唴瀹�
+ */
+ function logoutPushMsg(msg) {
+ outLine("title: " + msg.title);
+ outLine("content: " + msg.content);
+ if (msg.payload) {
+ if (typeof(msg.payload) == "string") {
+ outLine("payload(String): " + msg.payload);
+ } else {
+ outLine("payload(JSON): " + JSON.stringify(msg.payload));
+ }
+ } else {
+ outLine("payload: undefined");
+ }
+ if (msg.aps) {
+ outLine("aps: " + JSON.stringify(msg.aps));
+ }
+ }
+
+ /**
+ * 鑾峰彇鏈湴鎺ㄩ�佹爣璇嗕俊鎭�
+ */
+ function getPushInfo() {
+ outSet("鑾峰彇瀹㈡埛绔帹閫佹爣璇嗕俊鎭細");
+ plus.push.getClientInfoAsync(function(info) {
+ outLine('Success');
+ outLine(JSON.stringify(info));
+ }, function(e) {
+ outLine('Failed');
+ outLine(JSON.stringify(e));
+ });
+ }
+ /**
+ * 鏈湴鍒涘缓涓�鏉℃帹鍔ㄦ秷鎭�
+ */
+ function createLocalPushMsg(msg) {
+ var cont = $('#cont').val();
+ var options = {
+ cover: false
+ };
+ // console.log('1222')
+ plus.push.createMessage(msg, "LocalMSG", options);
+ outSet("鍒涘缓鏈湴娑堟伅鎴愬姛锛�");
+ outLine("璇峰埌绯荤粺娑堟伅涓績鏌ョ湅锛�");
+ if (plus.os.name == "iOS") {
+ outLine('*濡傛灉鏃犳硶鍒涘缓娑堟伅锛岃鍒�"璁剧疆"->"閫氱煡"涓厤缃簲鐢ㄥ湪閫氱煡涓績鏄剧ず!');
+ }
+ }
+ /**
+ * 璇诲彇鎵�鏈夋帹閫佹秷鎭�
+ */
+ function listAllPush() {
+ var msgs = null;
+ switch (plus.os.name) {
+ case "Android":
+ msgs = plus.push.getAllMessage();
+ break;
+ default:
+ break;
+ }
+ if (!msgs) {
+ outSet("姝ゅ钩鍙颁笉鏀寔鏋氫妇鎺ㄩ�佹秷鎭垪琛紒");
+ return;
+ }
+ outSet("鏋氫妇娑堟伅鍒楄〃锛�" + msgs.length + "锛夛細");
+ for (var i in msgs) {
+ var msg = msgs[i];
+ outLine(i + ": " + msg.title + " - " + msg.content);
+ }
+ }
+
+
+ /**
+ * 娓呯┖鎵�鏈夋帹鍔ㄦ秷鎭�
+ */
+ function clearAllPush() {
+ plus.push.clear();
+ outSet("娓呯┖鎵�鏈夋帹閫佹秷鎭垚鍔燂紒");
+ }
+
+ // wakeLock()
+ var g_wakelock = null;
+ //鍏佽绋嬪簭鍚庡彴杩愯锛屼互鎸佺画鑾峰彇GPS浣嶇疆
+ function wakeLock() {
+ //Android
+
+ console.log(1)
+
+ var main = plus.android.runtimeMainActivity();
+ var Context = plus.android.importClass("android.content.Context");
+ var PowerManager = plus.android.importClass("android.os.PowerManager");
+ var pm = main.getSystemService(Context.POWER_SERVICE);
+ g_wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ANY_NAME");
+ g_wakelock.acquire();
+ }
+
+ $(function() {
+
+
+ //鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
+ // var work = $.connection.chatHub;
+ var work = $.connection.chatHub;
+
+ console.log(work)
+
+ //瀵瑰簲鍚庣鐨凷endMessage鍑芥暟锛屾秷鎭帴鏀跺嚱鏁�
+ work.client.sendMessage = function(msg) {
+ // vant.Notify({
+ // type: 'success',
+ // message: msg,
+ // duration: 5000
+ // })
+ console.log('鎴戞槸鍚庣杩斿洖鐨勬秷鎭細',msg)
+ // CreateNotification(msg, Math.random())
+ createLocalPushMsg(msg)
+
+ };
+
+ $.connection.hub.url = 'http://121.196.36.24:8001/signalr'
+ //hub杩炴帴寮�鍚�
+ $.connection.hub.start().done(function() {
+
+ var username = localStorage.getItem('username');
+
+ //鍙戦�佷笂绾夸俊鎭�
+ work.server.sendLogin(username);
+
+ // console.log('222')
+ // const aaa = [{
+ // "code": "Q",
+ // "name": "鍛煎彨璐ㄩ噺",
+ // "children": [{
+ // "usercode": "999",
+ // "username": "妤煎厛鐢�"
+ // }]
+ // }]
+
+
+ // work.server.sendByGroupList('妤煎厛鐢�', 'CJ002', 'SB001', aaa)
+
+ });
+
+ });
+
+ // wakeLock()
+ // var g_wakelock = null;
+
+ // //鍏佽绋嬪簭鍚庡彴杩愯锛屼互鎸佺画鑾峰彇GPS浣嶇疆
+ // function wakeLock() {
+ // //Android
+ // var main = plus.android.runtimeMainActivity();
+ // var Context = plus.android.importClass("android.content.Context");
+ // var PowerManager = plus.android.importClass("android.os.PowerManager");
+ // var pm = main.getSystemService(Context.POWER_SERVICE);
+ // g_wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ANY_NAME");
+ // g_wakelock.acquire();
+ // }
+
+ //缁撴潫绋嬪簭鍚庡彴杩愯
+ // function releaseWakeLock() {
+ // if (g_wakelock != null && g_wakelock.isHeld()) {
+ // g_wakelock.release();
+ // g_wakelock = null;
+ // }
+ // }
+
+
+
+})(window);
diff --git a/unpackage/cache/wgt/H5EDA0853/pages/adgl/adhj.html b/unpackage/cache/wgt/H5EDA0853/pages/adgl/adhj.html
index ae4a279..10c7da5 100644
--- a/unpackage/cache/wgt/H5EDA0853/pages/adgl/adhj.html
+++ b/unpackage/cache/wgt/H5EDA0853/pages/adgl/adhj.html
@@ -21,9 +21,14 @@
<script type="text/javascript" src="../../js/global.js"></script>
- <script src="http://121.196.36.24:8001/Scripts/jquery-3.4.1.min.js"></script>
- <script src="http://121.196.36.24:8001/Scripts/jquery.signalR-2.2.2.min.js"></script>
- <script src="http://121.196.36.24:8001/SignalR/Hubs"></script>
+ <!-- <script src="http://121.196.36.24:8001/Scripts/jquery-3.4.1.min.js"></script> -->
+ <!-- <script src="http://121.196.36.24:8001/Scripts/jquery.signalR-2.2.2.min.js"></script> -->
+ <!-- <script src="http://121.196.36.24:8001/SignalR/Hubs"></script> -->
+
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+
<script type="text/javascript">
var pushServer = "http://demo.dcloud.net.cn/push/?";
@@ -183,15 +188,61 @@
+ function CreateNotification(msg, n) {
+ console.log(msg, n)
+
+ vant.Notify(msg, n, 9999999999)
+
+ var NotifyID = n;
+ var Context = plus.android.importClass("android.content.Context");
+ var main = plus.android.runtimeMainActivity();
+ var Noti = plus.android.importClass("android.app.Notification");
+ var NotificationManager = plus.android.importClass("android.app.NotificationManager");
+ var nm = main.getSystemService(Context.NOTIFICATION_SERVICE)
+ var Notification = plus.android.importClass("android.app.Notification");
+ var mNotification = new Notification.Builder(main);
+ var pending = plus.android.importClass("android.app.PendingIntent");
+ var intent = plus.android.importClass("android.content.Intent");
+
+ //mNotification.setOngoing(true);
+ mNotification.setContentTitle("鎮ㄦ湁涓�鏉℃湭璇绘秷鎭�"); //鏍囬
+ mNotification.setContentText(msg); //鍐呭
+ mNotification.setSmallIcon(17301620); //鍥炬爣
+ mNotification.setTicker("First Time"); //閫氱煡棣栨鍑虹幇鍦ㄩ�氱煡鏍忔椂鐨勬晥鏋�
+ mNotification.setNumber(5); //閫氱煡闆嗗悎鐨勬暟閲�
+ //var str = dateToStr(new Date());
+ //mNotification.setWhen(str);//閫氱煡浜х敓鏃堕棿
+ //mNotification.setContentIntent();//閫氱煡鏍忕偣鍑讳簨浠�
+ mNotification.setDefaults(Noti.DEFAULT_VIBRATE); //澹伴煶銆侀棯鐏�侀渿鍔ㄦ晥鏋滐紝鍙彔鍔�
+ mNotification.setPriority(Noti.PRIORITY_DEFAULT); //閫氱煡浼樺厛绾�
+ mNotification.flags = Notification.FLAG_ONLY_ALERT_ONCE; //鍙戣捣閫氱煡鏃堕渿鍔�
+ var mNb = mNotification.build()
+ nm.notify(NotifyID, mNb);
+ }
+
+ // wakeLock()
+ // var g_wakelock = null;
+ // //鍏佽绋嬪簭鍚庡彴杩愯锛屼互鎸佺画鑾峰彇GPS浣嶇疆
+ // function wakeLock() {
+ // //Android
+ // var main = plus.android.runtimeMainActivity();
+ // var Context = plus.android.importClass("android.content.Context");
+ // var PowerManager = plus.android.importClass("android.os.PowerManager");
+ // var pm = main.getSystemService(Context.POWER_SERVICE);
+ // g_wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ANY_NAME");
+ // g_wakelock.acquire();
+ // }
$(function() {
//鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
var work = $.connection.chatHub;
-
+ // work
+ console.log(work, 1)
//瀵瑰簲鍚庣鐨凷endMessage鍑芥暟锛屾秷鎭帴鏀跺嚱鏁�
// console.log(work.client.sendMessage)
work.client.sendMessage = function(msg) {
- console.log(msg, 1)
+ // console.log(msg, 1)
+ // CreateNotification(msg, Math.random())
createLocalPushMsg(msg)
};
@@ -555,48 +606,48 @@
this.$forceUpdate()
},
submit() {
- setTimeout(() => {
- const data = {
- username: localStorage.getItem('username'),
- eqpcode: topContent.find(i => i.code === radioValue).code,
- wkshpcode: topContent.find(i => i.code === radioValue).wksp_code
- }
- const DATA = []
- centerContent.forEach(i => {
- if (i.isTrue && !currentValue.includes(i.code)) {
- i.flag = i.isTrue ? 'Y' : 'N'
- DATA.push(i)
- }
- })
+ // setTimeout(() => {
+ // const data = {
+ // username: localStorage.getItem('username'),
+ // eqpcode: topContent.find(i => i.code === radioValue).code,
+ // wkshpcode: topContent.find(i => i.code === radioValue).wksp_code
+ // }
+ // const DATA = []
+ // centerContent.forEach(i => {
+ // if (i.isTrue && !currentValue.includes(i.code)) {
+ // i.flag = i.isTrue ? 'Y' : 'N'
+ // DATA.push(i)
+ // }
+ // })
- submitIsDisabled = true
- // falseArray.push({
- // id: '1'
- // })
- this.$forceUpdate()
- post('AppDeviceManage/AppDeviceAnDengCallSave' + formatParams(data), DATA).then(
- res => {
- if (res.code === '200') {
- vant.Notify({
- type: 'primary',
- message: '鎻愪氦鎴愬姛锛�'
- })
- topContent.forEach((r, i) => {
- if (r.code === radioValue) {
- topContent.splice(i, 1)
- }
- })
- if (topContent.length >= 1) {
- radioValue = topContent[0].code
- topContentClick(radioValue, topContent.find(i => i.code ===
- radioValue).wksp_code)
- }
+ // submitIsDisabled = true
+ // // falseArray.push({
+ // // id: '1'
+ // // })
+ // this.$forceUpdate()
+ // post('AppDeviceManage/AppDeviceAnDengCallSave' + formatParams(data), DATA).then(
+ // res => {
+ // if (res.code === '200') {
+ // vant.Notify({
+ // type: 'primary',
+ // message: '鎻愪氦鎴愬姛锛�'
+ // })
+ // topContent.forEach((r, i) => {
+ // if (r.code === radioValue) {
+ // topContent.splice(i, 1)
+ // }
+ // })
+ // if (topContent.length >= 1) {
+ // radioValue = topContent[0].code
+ // topContentClick(radioValue, topContent.find(i => i.code ===
+ // radioValue).wksp_code)
+ // }
- submitIsDisabled = false
- this.$forceUpdate()
- }
- })
- }, 100)
+ // submitIsDisabled = false
+ // this.$forceUpdate()
+ // }
+ // })
+ // }, 100)
},
// topContentClick(code, wksp_code) {
diff --git a/unpackage/cache/wgt/H5EDA0853/pages/login/index.html b/unpackage/cache/wgt/H5EDA0853/pages/login/index.html
index 3abea4a..23d4181 100644
--- a/unpackage/cache/wgt/H5EDA0853/pages/login/index.html
+++ b/unpackage/cache/wgt/H5EDA0853/pages/login/index.html
@@ -22,10 +22,6 @@
<!-- 瀵煎叆鑷畾涔夊叏灞�js鏂囦欢 -->
<script type="text/javascript" src="../../js/global.js"></script>
-
-
- <!-- <link rel="stylesheet" href="../css/global.css" type="text/css" charset="utf-8" /> -->
-
</head>
<body>
<div id="app">
diff --git a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/dqby.html b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/dqby.html
index a4448be..a4158ba 100644
--- a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/dqby.html
+++ b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/dqby.html
@@ -20,7 +20,12 @@
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/global.js"></script>
-
+
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
+
<script type="text/javascript">
var topContent = [
// {
diff --git a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/rcdj.html b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/rcdj.html
index 2c84a2b..e20159e 100644
--- a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/rcdj.html
+++ b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/rcdj.html
@@ -20,8 +20,11 @@
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/global.js"></script>
-
- <!-- <link rel="stylesheet" href="../../css/global.css" type="text/css" charset="utf-8" /> -->
+
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
<script type="text/javascript">
var topContent = [
@@ -172,7 +175,7 @@
<van-popover style="" placement="bottom-end" :offset="[13,8]" v-model="showPopover"
trigger="click" :actions="actions" @select="onSelect">
<template #reference>
- <van-icon name="bars" size='20' color='#fff'/>
+ <van-icon name="bars" size='20' color='#fff' />
</template>
</van-popover>
</template>
diff --git a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/sbwx.html b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/sbwx.html
index e5b0fae..ea5061e 100644
--- a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/sbwx.html
+++ b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/sbwx.html
@@ -20,9 +20,12 @@
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/global.js"></script>
-
- <!-- <link rel="stylesheet" href="../../css/global.css" type="text/css" charset="utf-8" /> -->
-
+
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
+
<script type="text/javascript">
var topContent = [
// {
diff --git a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxsq.html b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxsq.html
index 55bfc9d..cd92f36 100644
--- a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxsq.html
+++ b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxsq.html
@@ -21,8 +21,11 @@
<script type="text/javascript" src="../../js/global.js"></script>
- <!-- <link rel="stylesheet" href="../../css/global.css" type="text/css" charset="utf-8" /> -->
-
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
+
<script type="text/javascript">
var topContent = [
// {
diff --git a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html
index ff65c09..247a28d 100644
--- a/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html
+++ b/unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html
@@ -21,6 +21,11 @@
<script type="text/javascript" src="../../js/global.js"></script>
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
+
<script type="text/javascript">
var topContent = [
// {
@@ -230,7 +235,8 @@
{{messageDescr}}
</div>
<div v-show="fileList.length!==0" style="width: 96%;margin: auto;">
- <van-uploader multiple :deletable='false' v-model="fileList" multiple :max-count="fileList.length" />
+ <van-uploader multiple :deletable='false' v-model="fileList" multiple
+ :max-count="fileList.length" />
</div>
</div>
@@ -294,7 +300,8 @@
{{messageDescr3}}
</div>
<div v-show="fileList2.length!==0" style="width: 96%;margin: auto;">
- <van-uploader :deletable='false' multiple v-model="fileList2" multiple :max-count="fileList2.length" />
+ <van-uploader :deletable='false' multiple v-model="fileList2" multiple
+ :max-count="fileList2.length" />
</div>
</div>
@@ -488,7 +495,7 @@
item.arrowType = true
if (item.repair_code === repair_code) {
item.arrowType = false
- item.resultValue = item.resultValue?item.resultValue:''
+ item.resultValue = item.resultValue ? item.resultValue : ''
this.messageDescr = ''
this.messageDescr2 = ''
this.messageDescr3 = ''
@@ -564,8 +571,8 @@
// this.resultValue = ''
topContent.forEach(item => {
if (item.repair_code !== repair_code) {
- item.resultValue=''
- // this.getDetail(item.repair_code, item.eqpcode, item.wksp_code)
+ item.resultValue = ''
+ // this.getDetail(item.repair_code, item.eqpcode, item.wksp_code)
}
})
diff --git a/unpackage/cache/wgt/H5EDA0853/pages/test/test2.html b/unpackage/cache/wgt/H5EDA0853/pages/test/test2.html
new file mode 100644
index 0000000..5eace9d
--- /dev/null
+++ b/unpackage/cache/wgt/H5EDA0853/pages/test/test2.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title></title>
+ </head>
+ <body>
+ </body>
+</html>
\ No newline at end of file
diff --git a/unpackage/cache/wgt/H5EDA0853/pages/xtsy/index.html b/unpackage/cache/wgt/H5EDA0853/pages/xtsy/index.html
index 944ec0a..619fb75 100644
--- a/unpackage/cache/wgt/H5EDA0853/pages/xtsy/index.html
+++ b/unpackage/cache/wgt/H5EDA0853/pages/xtsy/index.html
@@ -20,178 +20,17 @@
<script type="text/javascript" src="../../js/http.js"></script>
<script type="text/javascript" src="../../js/global.js"></script>
-
- <script src="http://121.196.36.24:8001/Scripts/jquery-3.4.1.min.js"></script>
+
+
+
+ <!-- <script src="http://121.196.36.24:8001/Scripts/jquery-3.4.1.min.js"></script>
<script src="http://121.196.36.24:8001/Scripts/jquery.signalR-2.2.2.min.js"></script>
- <script src="http://121.196.36.24:8001/SignalR/Hubs"></script>
+ <script src="http://121.196.36.24:8001/SignalR/Hubs"></script> -->
-
-
- <script type="text/javascript">
- var pushServer = "http://demo.dcloud.net.cn/push/?";
- var message = null;
-
- // 鐩戝惉plusready浜嬩欢
- document.addEventListener("plusready", function() {
- message = document.getElementById("message");
- // 鐩戝惉鐐瑰嚮娑堟伅浜嬩欢
- plus.push.addEventListener("click", function(msg) {
- // 鍒ゆ柇鏄粠鏈湴鍒涘缓杩樻槸绂荤嚎鎺ㄩ�佺殑娑堟伅
- switch (msg.payload) {
- case "LocalMSG":
- outSet("鐐瑰嚮鏈湴鍒涘缓娑堟伅鍚姩锛�");
- break;
- default:
- outSet("鐐瑰嚮绂荤嚎鎺ㄩ�佹秷鎭惎鍔細");
- break;
- }
- // 鎻愮ず鐐瑰嚮鐨勫唴瀹�
- plus.nativeUI.alert(msg.content);
- // 澶勭悊鍏跺畠鏁版嵁
- logoutPushMsg(msg);
- }, false);
- // 鐩戝惉鍦ㄧ嚎娑堟伅浜嬩欢
- plus.push.addEventListener("receive", function(msg) {
- if (msg.aps) { // Apple APNS message
- outSet("鎺ユ敹鍒板湪绾緼PNS娑堟伅锛�");
- } else {
- outSet("鎺ユ敹鍒板湪绾块�忎紶娑堟伅锛�");
- }
- logoutPushMsg(msg);
- }, false);
- }, false);
-
- /**
- * 鏃ュ織杈撳叆鎺ㄩ�佹秷鎭唴瀹�
- */
- function logoutPushMsg(msg) {
- outLine("title: " + msg.title);
- outLine("content: " + msg.content);
- if (msg.payload) {
- if (typeof(msg.payload) == "string") {
- outLine("payload(String): " + msg.payload);
- } else {
- outLine("payload(JSON): " + JSON.stringify(msg.payload));
- }
- } else {
- outLine("payload: undefined");
- }
- if (msg.aps) {
- outLine("aps: " + JSON.stringify(msg.aps));
- }
- }
-
- /**
- * 鑾峰彇鏈湴鎺ㄩ�佹爣璇嗕俊鎭�
- */
- function getPushInfo() {
- outSet("鑾峰彇瀹㈡埛绔帹閫佹爣璇嗕俊鎭細");
- plus.push.getClientInfoAsync(function(info) {
- outLine('Success');
- outLine(JSON.stringify(info));
- }, function(e) {
- outLine('Failed');
- outLine(JSON.stringify(e));
- });
- }
- /**
- * 鏈湴鍒涘缓涓�鏉℃帹鍔ㄦ秷鎭�
- */
- function createLocalPushMsg(msg) {
- var cont = $('#cont').val();
- var options = {
- cover: false
- };
- plus.push.createMessage(msg, "LocalMSG", options);
- outSet("鍒涘缓鏈湴娑堟伅鎴愬姛锛�");
- outLine("璇峰埌绯荤粺娑堟伅涓績鏌ョ湅锛�");
- if (plus.os.name == "iOS") {
- outLine('*濡傛灉鏃犳硶鍒涘缓娑堟伅锛岃鍒�"璁剧疆"->"閫氱煡"涓厤缃簲鐢ㄥ湪閫氱煡涓績鏄剧ず!');
- }
- }
- /**
- * 璇诲彇鎵�鏈夋帹閫佹秷鎭�
- */
- function listAllPush() {
- var msgs = null;
- switch (plus.os.name) {
- case "Android":
- msgs = plus.push.getAllMessage();
- break;
- default:
- break;
- }
- if (!msgs) {
- outSet("姝ゅ钩鍙颁笉鏀寔鏋氫妇鎺ㄩ�佹秷鎭垪琛紒");
- return;
- }
- outSet("鏋氫妇娑堟伅鍒楄〃锛�" + msgs.length + "锛夛細");
- for (var i in msgs) {
- var msg = msgs[i];
- outLine(i + ": " + msg.title + " - " + msg.content);
- }
- }
- /**
- * 娓呯┖鎵�鏈夋帹鍔ㄦ秷鎭�
- */
- function clearAllPush() {
- plus.push.clear();
- outSet("娓呯┖鎵�鏈夋帹閫佹秷鎭垚鍔燂紒");
- }
-
-
- $(function() {
- //鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
- // var work = $.connection.chatHub;
- var work = $.connection.chatHub;
-
- //瀵瑰簲鍚庣鐨凷endMessage鍑芥暟锛屾秷鎭帴鏀跺嚱鏁�
- work.client.sendMessage = function(msg) {
- console.log(msg,1)
- createLocalPushMsg(msg)
- };
-
- //鍚庣SendLogin璋冪敤鍚庯紝浜х敓鐨刲oginUser鍥炶皟
- work.client.loginUser = function(userlist) {
- // console.log(userlist, 9)
- // reloadUser(userlist);
- };
-
- $.connection.hub.url = 'http://121.196.36.24:8001/signalr'
- //hub杩炴帴寮�鍚�
- $.connection.hub.start().done(function() {
-
- var username = localStorage.getItem('username');
-
- //鍙戦�佷笂绾夸俊鎭�
- work.server.sendLogin(username);
-
- // const aaa = [{
- // "code": "Q",
- // "name": "鍛煎彨璐ㄩ噺",
- // "children": [{
- // "usercode": "999",
- // "username": "妤煎厛鐢�"
- // }]
- // }]
-
- // work.server.sendByGroupList('妤煎厛鐢�', 'CJ002', 'SB001', aaa)
-
- });
-
- });
-
- //閲嶆柊鍔犺浇鐢ㄦ埛鍒楄〃
- // var reloadUser = function() {
- // $("#username").empty();
- // for (i = 0; i < 5; i++) {
- // $("#username").append("<option value=" + i + ">" + i + "</option>");
- // }
- // }
-
-
-
- </script>
+ <script src="../../js/jquery-3.4.1.min.js"></script>
+ <script src="../../js/jquery.signalR-2.2.2.min.js"></script>
+ <script src="../../js/Hubs.js"></script>
+ <script type="text/javascript" src="../../js/msg.js"></script>
@@ -324,12 +163,12 @@
},
mounted() {
this.getfirstMenu()
-
+
this.getLoginAppAnDonMessage()
- setInterval(()=>{
+ setInterval(() => {
this.getLoginAppAnDonMessage()
- },1000*10)
-
+ }, 1000 * 10)
+
},
methods: {
onRefresh() {
@@ -339,7 +178,7 @@
this.getLoginAppAnDonMessage()
// vant.Notify('鍒锋柊鎴愬姛');
this.isLoading = false;
-
+
}, 1000);
},
diff --git a/unpackage/release/apk/H5EDA0853__20221020132538.apk b/unpackage/release/apk/H5EDA0853__20221021143125.apk
similarity index 63%
rename from unpackage/release/apk/H5EDA0853__20221020132538.apk
rename to unpackage/release/apk/H5EDA0853__20221021143125.apk
index 481ec58..a149a58 100644
--- a/unpackage/release/apk/H5EDA0853__20221020132538.apk
+++ b/unpackage/release/apk/H5EDA0853__20221021143125.apk
Binary files differ
--
Gitblit v1.9.3