App-Android(使用App+htnl5框架,解决消息推送兼容SignalR问题)
loulijun2021
2022-10-21 0ab4bf8f3982bdee9962076f29c5664185328517
pages/adgl/adxy.html
@@ -17,18 +17,144 @@
      <script type="text/javascript" src="../../js/axios.min.js"></script>
      <script type="text/javascript" src="../../js/http.js"></script>
      <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="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"
            // },
            // {
            //    code: 'SB005',
            //    name: '齿轮箱组一线',
            //    wksp_code: "CJ001",
            //    "wksp_name": "装配车间",
            //    "eqpchkmain_code": "djbz002"
            // },
         ];
         var submitIsDisabled = false; //提交按钮是否disabled
         let radioValue = '' //单选框选中的项
         let centerContent = [] //中间部分内容
         let falseArray = [] // 假数组   做扫码回来视图更新用
         // 扫描工位返回时执行方法
         function scaned(r) {
            radioValue = r
            var temp = {}
            var flag = 0
            if (topContent.find(i => i.eqp_code === r)) {
               topContent.forEach((item, index) => {
                  if (item.eqp_code === r) {
                     temp = item
                     topContent.splice(index, 1)
                     flag = 1
                  }
               })
            }
            if (flag === 1) { //对已在列表的数据   排序到第一个去
               topContent.unshift(temp)
               falseArray.push({
                  id: '1'
               })
            } else { //未在列表的数据  进行新增操作
               topSpanClick(r)
               falseArray.push({
                  id: '1'
               })
            }
         }
         function topSpanClick(code) {
            post('AppDeviceManage/AppDeviceAnDengLampResponseScanSearch?eqpcode=' + code).then(res => {
               if (res.code === '200') {
                  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'
                  })
               }
            })
         }
      </script>
   </head>
   <!-- <body onload="scaned('SB001')"> -->
   <body>
      <div id="app">
         <div class="body">
            <van-sticky>
               <van-nav-bar title="安灯响应" @click-right="onClickRight" left-arrow @click-left="onClickleft">
                  <template #right>
@@ -42,10 +168,101 @@
               </van-nav-bar>
            </van-sticky>
            <div v-if="topContent.length===0">
               <div class="sacnBody">
                  <div class="scanImg" @click="topScanClick()"></div>
                  <div class="scanText">扫描工位</div>
               </div>
            </div>
            <div v-else>
               <div class="head" style="min-height: 100px;max-height: 260px; overflow: scroll;">
                  <div class="head_block">
                     <div class="head_left">
                        <div class="head_bar"></div>
                        <div class="head_title">
                           扫描工位
                        </div>
                     </div>
                     <div style="margin-right: 10px;">
                        <van-icon name="scan" color='red' size='24' @click='topScanClick()' />
                     </div>
                  </div>
                  <van-radio-group v-model="radioValue">
                     <van-cell-group>
                        <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.eqp_code" />
                              </template>
                           </van-cell>
                           <div class="cellDiv">生产车间:{{item.org_name}}</div>
                        </div>
                     </van-cell-group>
                  </van-radio-group>
               </div>
               <div class="head" style="min-height: 100px; ">
                  <div class="head_block">
                     <div class="head_left">
                        <div class="head_bar"></div>
                        <div class="head_title">
                           选择响应类型
                        </div>
                     </div>
                  </div>
                  <div style="padding: 10px;display: flex;flex-direction: column"
                     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.typename}}</div>
                        <div style="margin-right: 10px;">
                           <van-switch size="24" v-model="item.typecode" @change='val=>switchChange(val,item)'
                              active-color="#ee0a24" inactive-color="#dcdee0" />
                        </div>
                     </div>
                  </div>
               </div>
               <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="正在提交,请稍等..."
                     class="vanButtonInfo" @click='submit' type="info">
                     确认提交</van-button>
               </div>
            </div>
         </div>
         <van-overlay :show="overlayShow" @click="overlayShow=false" />
      </div>
      <van-overlay :show="overlayShow" @click="overlayShow=false" />
      </div>
@@ -55,6 +272,7 @@
         el: '#app',
         data: function() {
            return {
               overlayShow: false,
               showPopover: false,
               actions: [{
@@ -67,8 +285,28 @@
                  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()
               },
               deep: true,
               immediate: true,
            },
         },
         created() {
@@ -77,6 +315,100 @@
         },
         methods: {
            switchChange(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) {
               // 明天研究一下  列表选项切换问题
               radioValue = code
               // this.$forceUpdate()
               // 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()
            },
            topScanClick() {
               createWithoutTitle('../../components/barcode_scan.html', {
                  titleNView: {
                     type: 'float',
                     backgroundColor: 'rgba(215,75,40,0.3)',
                     titleText: '扫一扫',
                     titleColor: '#FFFFFF',
                     autoBackButton: true,
                     buttons: [{
                        fontSrc: '_www/helloh5.ttf',
                        text: '\ue302',
                        fontSize: '18px',
                        onclick: 'javascript:scanPicture()'
                     }]
                  }
               });
            },
            onClickleft() {
               history.back()
            },
@@ -98,5 +430,9 @@
   </script>
   <style type="text/css">
      @import url('../../css/global.css');
      .van-hairline--top-bottom {
         position: static;
      }
   </style>
</html>