App-Android(使用App+htnl5框架,解决消息推送兼容SignalR问题)
loulijun2021
2022-10-20 8050665efc07f2666d803b14f01dfe07dc54da26
unpackage/cache/wgt/H5EDA0853/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的使用,注意的是,Hub的名字是ChatHub,这里使用时首字母小写
            var work = $.connection.chatHub;
            //对应后端的SendMessage函数,消息接收函数
            // console.log(work.client.sendMessage)
            work.client.sendMessage = function(msg) {
               console.log(msg)
               // createLocalPushMsg(msg)
               console.log(msg, 1)
               createLocalPushMsg(msg)
            };
            //后端SendLogin调用后,产生的loginUser回调
            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() {