From 8050665efc07f2666d803b14f01dfe07dc54da26 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 20 十月 2022 18:05:29 +0800
Subject: [PATCH] 1.安灯呼叫开发完成
---
pages/adgl/adhj.html | 425 ++++++++++++++++++++++++++++++----------------------
1 files changed, 243 insertions(+), 182 deletions(-)
diff --git a/pages/adgl/adhj.html b/pages/adgl/adhj.html
index 07f5ad0..ae4a279 100644
--- a/pages/adgl/adhj.html
+++ b/pages/adgl/adhj.html
@@ -20,6 +20,7 @@
<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>
@@ -27,7 +28,50 @@
<script type="text/javascript">
var pushServer = "http://demo.dcloud.net.cn/push/?";
var message = null;
- var message2 = null;
+
+
+ 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: '榻胯疆绠辩粍涓�绾�',
+ // wksp_code: "CJ001",
+ // "wksp_name": "瑁呴厤杞﹂棿",
+ // "eqpchkmain_code": "djbz002"
+ // },
+ ];
+
+ var submitIsDisabled = false; //鎻愪氦鎸夐挳鏄惁disabled
+
+ let radioValue = '' //鍗曢�夋閫変腑鐨勯」
+
+ let centerContent = [] //涓棿閮ㄥ垎鍐呭
+
+ let falseArray = [] // 鍋囨暟缁� 鍋氭壂鐮佸洖鏉ヨ鍥炬洿鏂扮敤
+
+ var currentValue = []; //褰撳墠宸ヤ綅涓嬭皟鐢ㄥ懠鍙被鍨嬫帴鍙� flag宸叉槸Y鐨勫�艰繘琛屽瓨鍌�
+
+
// 鐩戝惉plusready浜嬩欢
document.addEventListener("plusready", function() {
@@ -137,19 +181,23 @@
outSet("娓呯┖鎵�鏈夋帹閫佹秷鎭垚鍔燂紒");
}
+
+
+
$(function() {
//鍓嶇Hub鐨勪娇鐢紝娉ㄦ剰鐨勬槸锛孒ub鐨勫悕瀛楁槸ChatHub锛岃繖閲屼娇鐢ㄦ椂棣栧瓧姣嶅皬鍐�
var work = $.connection.chatHub;
//瀵瑰簲鍚庣鐨凷endMessage鍑芥暟锛屾秷鎭帴鏀跺嚱鏁�
+ // console.log(work.client.sendMessage)
work.client.sendMessage = function(msg) {
- console.log(msg)
- // createLocalPushMsg(msg)
+ console.log(msg, 1)
+ createLocalPushMsg(msg)
};
//鍚庣SendLogin璋冪敤鍚庯紝浜х敓鐨刲oginUser鍥炶皟
work.client.loginUser = function(userlist) {
- console.log(userlist, 9)
+ // console.log(userlist, 9)
// reloadUser(userlist);
};
@@ -162,9 +210,7 @@
//鍙戦�佷笂绾夸俊鎭�
work.server.sendLogin(username);
-
-
- // const data = [{
+ // const aaa = [{
// "code": "Q",
// "name": "鍛煎彨璐ㄩ噺",
// "children": [{
@@ -173,59 +219,62 @@
// }]
// }]
- // work.server.sendByGroupList('妤煎厛鐢�', 'CJ002', 'SB001', data)
+ // work.server.sendByGroupList('妤煎厛鐢�', 'CJ002', 'SB001', aaa)
$('#submit').click(function() {
-
- // const data = [{
- // "code": "Q",
- // "name": "鍛煎彨璐ㄩ噺",
- // "children": [{
- // "usercode": "999",
- // "username": "妤煎厛鐢�"
- // }]
- // }]
-
-
-
-
- // console.log(1)
- const data = {
- username: localStorage.getItem('username'),
- eqpcode: topContent.find(i => i.code === radioValue).code,
- wkshpcode: topContent.find(i => i.code === radioValue).wksp_code
- }
+ // vant.Notify('鐐瑰嚮浜�')
+ // 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) {
+ if (i.isTrue && !currentValue.includes(i.code)) {
i.flag = i.isTrue ? 'Y' : 'N'
DATA.push(i)
}
})
+ work.server.sendByGroupList(
+ localStorage.getItem('username'),
+ topContent.find(i => i.code === radioValue).wksp_code,
+ topContent.find(i => i.code === radioValue).code,
+ DATA
+ )
+ // submitIsDisabled = true
+ // falseArray.push({
+ // id: '1'
+ // })
- // console.log(data, DATA)
+ // 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)
+ // }
- work.server.sendByGroupList(localStorage.getItem('username'), topContent.find(i => i.code === radioValue).wksp_code, topContent.find(i => i.code === radioValue).code, DATA)
-
- post('AppDeviceManage/AppDeviceAnDengCallSave' + formatParams(data), DATA).then(res => {
- if (res.code === '200') {
- vant.Notify.primary('鎻愪氦鎴愬姛锛�')
- topContent.forEach((r, i) => {
- if (r.code === radioValue) {
- topContent.splice(i, 1)
- }
- })
- if (topContent.length >= 1) {
- radioValue = topContent[0].code
- this.topContentClcik(radioValue)
- }
-
- this.submitIsDisabled = false
- this.$forceUpdate()
- }
- })
+ // // submitIsDisabled = false
+ // falseArray.push({
+ // id: '1'
+ // })
+ // }
+ // })
})
+
+
});
+
});
//閲嶆柊鍔犺浇鐢ㄦ埛鍒楄〃
@@ -234,76 +283,43 @@
// for (i = 0; i < 5; i++) {
// $("#username").append("<option value=" + i + ">" + i + "</option>");
// }
- // }
- </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"
- },
- // {
- // code: 'SB005',
- // name: '榻胯疆绠辩粍涓�绾�',
- // wksp_code: "CJ001",
- // "wksp_name": "瑁呴厤杞﹂棿",
- // "eqpchkmain_code": "djbz002"
- // },
- ];
-
- let radioValue = 'SB001' //鍗曢�夋閫変腑鐨勯」
-
- 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.code === r)) {
topContent.forEach((item, index) => {
- if (item.code === radioValue) {
+ if (item.code === r) {
temp = item
topContent.splice(index, 1)
- flag = true
+ flag = 1
}
})
}
- if (flag) { //瀵瑰凡鍦ㄥ垪琛ㄧ殑鏁版嵁 鎺掑簭鍒扮涓�涓幓
+ if (flag === 1) { //瀵瑰凡鍦ㄥ垪琛ㄧ殑鏁版嵁 鎺掑簭鍒扮涓�涓幓
topContent.unshift(temp)
- topScanClick(radioValue)
- centerContentClick(radioValue, topContent.find(i => i.code === radioValue).wksp_code)
+ topContentClick(r, topContent.find(i => i.code === r).wksp_code)
+
+ falseArray.push({
+ id: '1'
+ })
} else { //鏈湪鍒楄〃鐨勬暟鎹� 杩涜鏂板鎿嶄綔
- topScanClick(radioValue)
- centerContentClick(radioValue, topContent.find(i => i.code === radioValue).wksp_code)
+
+ topScanClick(r)
+
+ falseArray.push({
+ id: '1'
+ })
}
- falseArray.push({
- id: '1'
- })
}
@@ -311,6 +327,7 @@
post('AppDeviceManage/AppDeviceAnDengCallScanSearch?eqpcode=' + code).then(res => {
if (res.code === '200') {
topContent.unshift(res.data[0])
+ topContentClick(code, topContent.find(i => i.code === code).wksp_code)
falseArray.push({
id: '1'
})
@@ -319,7 +336,8 @@
})
}
- function centerContentClick(code, wksp_code) {
+ function topContentClick(code, wksp_code) {
+ radioValue = code
const data = {
eqpcode: code,
wkshpcode: wksp_code
@@ -327,6 +345,22 @@
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
+ }
+ })
+
+ centerContent.forEach(i => {
+ i.isTrue = i.flag === 'Y'
+ })
+
+ // vant.Notify({
+ // type: 'danger',
+ // message: res.Message + centerContent.length
+ // });
+
falseArray.push({
id: '1'
})
@@ -336,7 +370,8 @@
</script>
</head>
- <body>
+ <body onload="scaned('SB001')">
+ <!-- <body> -->
<div id="app">
<div class="body">
@@ -353,7 +388,6 @@
</template>
</van-nav-bar>
</van-sticky>
-
<div v-if="topContent.length===0">
<div class="sacnBody">
@@ -384,7 +418,7 @@
<van-radio-group v-model="radioValue">
<van-cell-group>
<div style="margin: 10px 0;" v-for="(item,index) in topContent" :key="item.eqpcode"
- @click="topContentClcik(item.code,item.wksp_code)">
+ @click="topContentClick(item.code,item.wksp_code)">
<div class="cellDiv">宸ヤ綅缂栫爜锛歿{item.code}}</div>
<van-cell :title="'宸ヤ綅鍚嶇О锛�'+item.name">
<template #right-icon>
@@ -400,7 +434,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>
@@ -418,8 +452,9 @@
<div style="display: flex;justify-content: space-between;align-items: center;">
<div style="margin-left: 10px;">{{item.name}}</div>
<div style="margin-right: 10px;">
- <van-switch size="24" v-model="item.isTrue" @change='val=>switchChange(val,item)'
- active-color="#ee0a24" inactive-color="#dcdee0" />
+ <van-switch :disabled="item.flag==='Y'" size="24" v-model="item.isTrue"
+ @change='val=>switchChange(val,item)' active-color="#ee0a24"
+ inactive-color="#dcdee0" />
</div>
</div>
</div>
@@ -429,8 +464,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' :load='submitIsDisabled' load-text="姝ｅ湪鎻愪氦,璇风◢绛�..." class="vanButtonInfo"
- @click="submit" type="info">
+ <van-button id="submit" :loading='submitIsDisabled' loading-text="姝ｅ湪鎻愪氦,璇风◢绛�..."
+ class="vanButtonInfo" @click='submit' type="info">
纭鎻愪氦</van-button>
</div>
@@ -455,7 +490,7 @@
el: '#app',
data: function() {
return {
- submitIsDisabled: false,
+
overlayShow: false,
showPopover: false,
actions: [{
@@ -468,12 +503,20 @@
icon: 'revoke',
text: '閫�鍑虹櫥褰�'
}],
-
+ 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()
@@ -486,85 +529,103 @@
},
mounted() {
- const data = {
- eqpcode: 'SB001',
- wkshpcode: 'CJ002'
- }
- post('AppDeviceManage/AppDeviceAnDengCallItemSearch' + formatParams(data)).then(res => {
- if (res.code === '200') {
- centerContent = res.data
+ // 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'
- })
+ // currentValue = centerContent.map(r => {
+ // if (r.flag === 'Y') {
+ // return r.code
+ // }
+ // })
+ // centerContent.forEach(i => {
+ // i.isTrue = i.flag === 'Y'
+ // })
+ // this.$forceUpdate()
-
- }
- })
+ // }
+ // })
},
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)
-
- // post('AppDeviceManage/AppDeviceAnDengCallSave' + formatParams(data), DATA).then(res => {
- // if (res.code === '200') {
- // vant.Notify.primary('鎻愪氦鎴愬姛锛�')
- // topContent.forEach((r, i) => {
- // if (r.code === radioValue) {
- // topContent.splice(i, 1)
- // }
- // })
- // if (topContent.length >= 1) {
- // radioValue = topContent[0].code
- // this.topContentClcik(radioValue)
- // }
-
- // this.submitIsDisabled = false
- // this.$forceUpdate()
- // }
- // })
-
- },
switchChange(val, item) {
- console.log(val, item)
this.$forceUpdate()
-
},
-
- topContentClcik(code, wksp_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'
- })
+ 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)
+ }
+ })
+
+ 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)
},
+ // topContentClick(code, wksp_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
+
+ // currentValue = centerContent.map(r => {
+ // if (r.flag === 'Y') {
+ // return r.code
+ // }
+ // })
+ // centerContent.forEach(i => {
+ // i.isTrue = i.flag === 'Y'
+ // })
+
+ // this.$forceUpdate()
+
+ // }
+ // })
+
+ // },
topScanClick() {
--
Gitblit v1.9.3