App-Android(使用App+htnl5框架,解决消息推送兼容SignalR问题)
loulijun2021
2022-10-20 8050665efc07f2666d803b14f01dfe07dc54da26
pages/adgl/adxy.html
@@ -17,18 +17,117 @@
      <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 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
            if (topContent.find(i => i.code === radioValue)) {
               topContent.forEach((item, index) => {
                  if (item.code === radioValue) {
                     temp = item
                     topContent.splice(index, 1)
                     flag = true
                  }
               })
            }
            if (flag) { //对已在列表的数据   排序到第一个去
               topContent.unshift(temp)
               topScanClick(radioValue)
               topContentClick(radioValue, topContent.find(i => i.code === radioValue).wksp_code)
            } else { //未在列表的数据  进行新增操作
               topScanClick(radioValue)
               topContentClick(radioValue, topContent.find(i => i.code === radioValue).wksp_code)
            }
            falseArray.push({
               id: '1'
            })
         }
         function topScanClick(code) {
            post('AppDeviceManage/AppDeviceAnDengLampResponseScanSearch?eqpcode=' + code).then(res => {
               if (res.code === '200') {
                  topContent.unshift(res.data[0])
                  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>
      <div id="app">
         <div class="body">
            <van-sticky>
               <van-nav-bar title="安灯响应" @click-right="onClickRight" left-arrow @click-left="onClickleft">
                  <template #right>
@@ -42,10 +141,98 @@
               </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" id="topContent">
                     <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">
                              <template #right-icon>
                                 <van-radio style="margin-right: 10px;" checked-color='red'
                                    :name="item.code" />
                              </template>
                           </van-cell>
                           <div class="cellDiv">生产车间:{{item.wksp_name}}</div>
                        </div>
                     </van-cell-group>
                  </van-radio-group>
               </div>
               <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>
                  <div style="padding: 10px;display: flex;flex-direction: column"
                     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-right: 10px;">
                           <van-switch size="24" v-model="item.isTrue" @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 +242,7 @@
         el: '#app',
         data: function() {
            return {
               submitIsDisabled: false,
               overlayShow: false,
               showPopover: false,
               actions: [{
@@ -67,16 +255,133 @@
                  icon: 'revoke',
                  text: '退出登录'
               }],
               falseArray2: falseArray, //假数组
            }
         },
         watch: {
            'falseArray2.length': {
               handler(newValue, oldValue) {
                  this.$forceUpdate()
               },
               deep: true,
               immediate: true,
            },
         },
         created() {
         },
         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()
            },
            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
               //       falseArray.push({
               //          id: '1'
               //       })
               //    }
               // })
            },
            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 +403,9 @@
   </script>
   <style type="text/css">
      @import url('../../css/global.css');
      .van-hairline--top-bottom {
         position: static;
      }
   </style>
</html>