App-Android(使用App+htnl5框架,解决消息推送兼容SignalR问题)
loulijun2021
2022-10-20 8050665efc07f2666d803b14f01dfe07dc54da26
unpackage/cache/wgt/H5EDA0853/pages/sbgl/wxyz.html
@@ -22,53 +22,66 @@
      <script type="text/javascript" src="../../js/global.js"></script>
      <script type="text/javascript">
         var topContent = [{
               wxsqd: 'SB00990001',
               code: 'SB001',
               name: '齿轮箱组',
               wksp_code: "CJ002",
               wksp_name: '装配车间',
               eqpchkmain_code: "djbz002",
               sqry: '佩罗西',
               sqsj: '2022-09-20 15:20:30',
               gzly: '设备点检',
               gzms: '精工车间注塑机一号开不',
            },
            {
               wxsqd: 'SB00990002',
               code: 'SB002',
               name: '齿轮箱组',
               wksp_code: "CJ002",
               wksp_name: '装配车间',
               eqpchkmain_code: "djbz002",
               sqry: '佩罗西',
               sqsj: '2022-09-20 15:20:30',
               gzly: '设备点检',
               gzms: '精工车间注塑机一号开不',
            },
         var topContent = [
            // {
            //    wxsqd: 'SB00990003',
            //    code: 'SB003',
            //    name: '齿轮箱组',
            //    repair_code: 'SB00990001',
            //    eqpcode: 'SB001',
            //    eqpname: '齿轮箱组',
            //    wksp_code: "CJ002",
            //    wksp_name: '装配车间',
            //    eqpchkmain_code: "djbz002",
            //    sqry: '佩罗西',
            //    sqsj: '2022-09-20 15:20:30',
            //    gzly: '设备点检',
            //    gzms: '精工车间注塑机一号开不了',
            //    repair_person: '佩罗西',
            //    repair_date: '2022-09-20 15:20:30',
            //    is_shutdown: 'Y',
            //    failure_descript: '精工车间注塑机一号开不精工车间注塑机一号开不',
            //    arrowType: true, //箭头类别
            //    messageDescr: '123',
            //    fileList: [],
            // },
            // {
            //    wxsqd: 'SB00990004',
            //    code: 'SB004',
            //    name: '齿轮箱组',
            //    repair_code: 'SB00990002',
            //    eqpcode: 'SB002',
            //    eqpname: '齿轮箱组',
            //    wksp_code: "CJ002",
            //    wksp_name: '装配车间',
            //    eqpchkmain_code: "djbz002",
            //    sqry: '佩罗西',
            //    sqsj: '2022-09-20 15:20:30',
            //    gzly: '设备点检',
            //    gzms: '精工车间注塑机一号开不了',
            //    repair_person: '佩罗西',
            //    repair_date: '2022-09-20 15:20:30',
            //    is_shutdown: 'N',
            //    failure_descript: '精工车间注塑机一号开不',
            //    arrowType: true, //箭头类别
            //    messageDescr: '123',
            //    fileList: [],
            // },
            // {
            //    repair_code: 'SB00990003',
            //    eqpcode: 'SB003',
            //    eqpname: '齿轮箱组',
            //    wksp_code: "CJ002",
            //    wksp_name: '装配车间',
            //    eqpchkmain_code: "djbz002",
            //    repair_person: '佩罗西',
            //    repair_date: '2022-09-20 15:20:30',
            //    is_shutdown: 'Y',
            //    failure_descript: '精工车间注塑机一号开不了',
            //    arrowType: true, //箭头类别
            //    messageDescr: '123',
            //    fileList: [],
            // },
            // {
            //    repair_code: 'SB00990004',
            //    eqpcode: 'SB004',
            //    eqpname: '齿轮箱组',
            //    wksp_code: "CJ002",
            //    wksp_name: '装配车间',
            //    eqpchkmain_code: "djbz002",
            //    repair_person: '佩罗西',
            //    repair_date: '2022-09-20 15:20:30',
            //    is_shutdown: 'N',
            //    failure_descript: '精工车间注塑机一号开不了',
            //    arrowType: true, //箭头类别
            //    messageDescr: '123',
            //    fileList: [],
            // },
         ];
@@ -77,37 +90,37 @@
         let radioValue = '' //单选框选中的项
         let number = [] //假数组   做扫码回来视图更新用
         let falseArray = [] //假数组   做扫码回来视图更新用
         // 扫描维修工位返回时执行方法
         function scaned(r) {
            radioValue = r
            // let temp = {}
            // let flag = false
            // topContent.forEach((item, index) => {
            //    if (item.code === radioValue) {
            //       temp = item
            //       topContent.splice(index, 1)
            //       flag = true
            //    }
            // })
            // if (flag) {
            //    topContent.unshift(temp)
            // } else {
            //    vant.Notify({
            //       type: 'danger',
            //       message: '所扫二维码围在列表中!'
            //    })
            //    if (topContent.length > 0) {
            //       radioValue = topContent[0].code
            //    }
            // }
            let temp = {}
            let flag = false
            topContent.forEach((item, index) => {
               if (item.repair_code === radioValue) {
                  temp = item
                  topContent.splice(index, 1)
                  flag = true
               }
            })
            if (flag) {
               topContent.unshift(temp)
            } else {
               vant.Notify({
                  type: 'danger',
                  message: '所扫二维码围在列表中!'
               })
               if (topContent.length > 0) {
                  radioValue = topContent[0].repair_code
               }
            }
            number.push({
            falseArray.push({
               id: '1'
            })
         }
@@ -132,103 +145,217 @@
               </van-nav-bar>
            </van-sticky>
            <van-sticky :offset-top="44">
               <div style="display: flex;
                        background-color: #eff0f1;
                        height: 40px;align-items:center;
                        justify-content: space-between;width: 98%;margin: auto;">
                  <div class="head_left">
                     <div class="head_bar"></div>
                     <div class="head_title">
                        扫描维修工位
                     </div>
            <div v-if="topContent.length===0">
               <div class="sacnBody">
                  <div class="box">
                     <div class="boxImg"></div>
                  </div>
                  <div style="margin-right: 10px;">
                     <van-icon name="scan" color='red' size='24' @click='topScanClick()' />
                  </div>
                  <div class="scanText">暂无维修可验证</div>
               </div>
            </van-sticky>
            <div class="head" style="width: 88%;float: left;margin-right: 0;border-radius: 5px 0 0 5px;"
               v-for="item in topContent" :key="item.code">
               <div class="flex_between">
                  <div style="width: 100%;margin-top: 10px;">
                     <div style="margin-bottom: 10px;line-height:20px;margin-left: 20px;"
                        @click="topContentClcik(item.code)">
                        <div style="display: flex;align-items: center;">
                           <div style="text-align: right;">
                              <div>维修申请单:</div>
                              <div>工位编码:</div>
                              <div>工位名称:</div>
                              <div>生产车间:</div>
                              <div>申请人员:</div>
                              <div>申请时间:</div>
                              <div>故障来源:</div>
                              <!-- <div>故障描述:</div> -->
                           </div>
                           <div>
                              <div>{{item.wxsqd}}</div>
                              <div>{{item.code}}</div>
                              <div>{{item.name}}</div>
                              <div>{{item.wksp_name}}</div>
                              <div>{{item.sqry}}</div>
                              <div>{{item.sqsj}}</div>
                              <div>{{item.gzly}}</div>
                              <!-- <div style="width: 200px;" class="textEllipsis">{{item.gzms}}</div> -->
                           </div>
                        </div>
                        <div style="display: flex;">
                           <div style="margin-left: 16px;">故障描述:</div>
                           <div style="width: 180px;">{{item.gzms}}</div>
                        </div>
                     </div>
                  </div>
                  <!--                               <div>
                     <van-radio-group v-model="radioValue" style="padding-right: 12px;">
                        <van-radio checked-color='red' icon-size="18px" @click="topContentClcik(item.code)"
                           style="height: 160px;margin-bottom: 10px;" v-for="item in topContent"
                           :key="item.code" :name="item.code"></van-radio>
                     </van-radio-group>
                  </div> -->
               </div>
               <!-- 箭头图标部分 -->
               <div style="height: 30px;margin: auto;margin-top: 10px;">
                  <div style="border-radius: 5px;width: 60px;height: 30px;background-color: aliceblue;"
                     @click="arrowTypeChange" class="flex_center_center">
                     <van-icon :name="arrowType?'arrow-down':'arrow-up'" />
                  </div>
               </div>
            </div>
            <div style="display: flex;">
               <van-radio-group v-model="radioValue" style="">
                  <van-radio checked-color='red' icon-size="18px" @click="topContentClcik(item.code)"
                     style="padding-right: 30%;background-color: #fff;height: 220px;margin-bottom: 10px;background-color: #fff;margin: 5px 0;padding: 10px 0;"
                     v-for="item in topContent" :key="item.code" :name="item.code"></van-radio>
            <div v-else>
               <van-sticky :offset-top="44">
                  <div style="display: flex;
                           background-color: #eff0f1;
                           height: 40px;align-items:center;
                           justify-content: space-between;width: 98%;margin: auto;">
                     <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-sticky>
               <van-radio-group v-model="radioValue">
                  <van-cell-group>
                     <div class="head" style="width: 96%;float: left;margin-right: 0;"
                        v-for="(item,index) in topContent"
                        @click="topContentClcik(item.repair_code,item.eqpcode,item.wksp_code)"
                        :key="item.repair_code">
                        <div class="cellDiv">设备维修单:{{item.repair_code}}</div>
                        <div class="cellDiv">工位编码:{{item.eqpcode}}</div>
                        <div class="cellDiv">工位名称:{{item.eqpname}}</div>
                        <div class="cellDiv">生产车间:{{item.wksp_name}}</div>
                        <van-cell :title="'申请人员:'+item.repair_person">
                           <template #right-icon>
                              <van-radio style="margin-right: 10px;" checked-color='red'
                                 :name="item.repair_code" />
                           </template>
                        </van-cell>
                        <div class="cellDiv">维修时间:{{item.repair_date}}</div>
                        <div class="cellDiv">停机维修:{{item.is_shutdown==='Y'?'是':'否'}}</div>
                        <div class="cellDiv">故障描述:{{item.failure_descript}}</div>
                        <div v-show="item.arrowType" style="height: 30px;margin: auto;margin-top: 10px;"
                           :style="{marginBottom:(topContent.length-1===index)?'70px':'0px'}">
                           <div style="border-radius: 5px;width: 60px;height: 30px;background-color: aliceblue;"
                              @click="arrowTypeChangeDown(item.repair_code,item.eqpcode,item.wksp_code)"
                              class="flex_center_center">
                              <van-icon :name="item.arrowType?'arrow-down':'arrow-up'" />
                           </div>
                        </div>
                        <!-- <div v-if="topContent.length-1===index" style="z-index: 100;height: 10px;background-color: red;margin-top: -10px;"></div> -->
                        <div v-show="!item.arrowType" class="flex_column">
                           <div class="flex_center_center"
                              style="margin-top: 10px;background-color: #eff0f1;height: 40px;font-size: 20px;">
                              维修详情</div>
                           <div class="head" style="padding-bottom: 0;">
                              <div class="head_block">
                                 <div class="head_left">
                                    <div class="head_bar"></div>
                                    <div class="head_title">
                                       故障描述
                                    </div>
                                 </div>
                              </div>
                              <div
                                 style="display:flex;flex-direction: column;width: 96%;margin: auto;padding: 10px;">
                                 {{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" />
                              </div>
                           </div>
                           <div style="background-color: #eff0f1;height: 10px;"></div>
                           <div class="head" style="padding-bottom: 5px;margin-top: 0;">
                              <div class="head_block" style="">
                                 <div class="head_left">
                                    <div class="head_bar"></div>
                                    <div class="head_title">
                                       停机维修
                                    </div>
                                 </div>
                                 <van-button class="buttonSmall" size="small" type="primary">
                                    {{isStop==='Y'?'是':'否'}}
                                 </van-button>
                              </div>
                           </div>
                           <div style="background-color: #eff0f1;height: 10px;"></div>
                           <div class="head" style="padding-bottom: 0;" v-show="messageDescr2!==''">
                              <div class="head_block">
                                 <div class="head_left">
                                    <div class="head_bar"></div>
                                    <div class="head_title">
                                       维修内容
                                    </div>
                                 </div>
                              </div>
                              <div
                                 style="display:flex;flex-direction: column;width: 96%;margin: auto;padding: 10px;">
                                 {{messageDescr2}}
                              </div>
                           </div>
                           <div style="background-color: #eff0f1;height: 10px;"></div>
                           <div class="head" style="padding-bottom: 0;" v-show="messageDescr3!==''">
                              <div class="head_block">
                                 <div class="head_left">
                                    <div class="head_bar"></div>
                                    <div class="head_title">
                                       更换备件
                                    </div>
                                 </div>
                              </div>
                              <div
                                 style="display:flex;flex-direction: column;width: 96%;margin: auto;padding: 10px;">
                                 {{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" />
                              </div>
                           </div>
                           <div style="background-color: #eff0f1;height: 10px;"></div>
                           <div class="head" style="padding-bottom: 5px;margin-top: 0;">
                              <div class="head_block" style="">
                                 <div class="head_left">
                                    <div class="head_bar"></div>
                                    <div class="head_title">
                                       验证结果
                                    </div>
                                 </div>
                                 <div class="flex_center"
                                    style="width: 30%;display: flex;justify-content: space-around;">
                                    <van-button class="buttonSmall" size="small"
                                       :plain="item.resultValue!=='OK'"
                                       @click="resultValueClick(item.repair_code,'OK')" type="primary">
                                       正常</van-button>
                                    <van-button class="buttonSmall" size="small"
                                       :plain="item.resultValue!=='NG'"
                                       @click="resultValueClick(item.repair_code,'NG')" type="danger">
                                       异常
                                    </van-button>
                                 </div>
                              </div>
                           </div>
                           <div v-show="!item.arrowType" style="height: 30px;margin: auto;margin-top: 10px;"
                              :style="{marginBottom:(topContent.length-1===index)?'70px':'0px'}">
                              <div style="border-radius: 5px;width: 60px;height: 30px;background-color: aliceblue;"
                                 @click="arrowTypeChangeUp(item.repair_code)" class="flex_center_center">
                                 <van-icon :name="item.arrowType?'arrow-down':'arrow-up'" />
                              </div>
                           </div>
                        </div>
                     </div>
                  </van-cell-group>
               </van-radio-group>
            </div>
               <div class="footer" style="min-height:50px;">
                  <div
                     style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center">
                     <van-button :loading="submitIsDisabled"
                        :disabled="topContent.find(item=>item.repair_code===radioValue).resultValue===''"
                        loading-text='正在提交,请稍等...' class="vanButtonInfo" @click="submit" type="info">
                        确认提交</van-button>
            <div class="footer" style="min-height:50px;">
               <div
                  style="position:fixed;bottom: 0;width: 96%;display: flex;justify-content: center;flex-direction: column;align-items: center">
                  <van-button class="vanButtonInfo" @click="submit" type="info">
                     确认提交</van-button>
                  </div>
               </div>
            </div>
         </div>
@@ -238,11 +365,11 @@
      </div>
   </body>
   <script>
      var app = new Vue({
         el: '#app',
         data: function() {
            return {
               submitIsDisabled: false,
               overlayShow: false,
               showPopover: false,
               actions: [{
@@ -255,36 +382,26 @@
                  icon: 'revoke',
                  text: '退出登录'
               }],
               arrowType: true, //箭头类别
               topContent2: topContent,
               messageDescr: '', //故障描述  必填
               fileList: [
                  // {
                  //    url: 'https://img01.yzcdn.cn/vant/leaf.jpg'
                  // },
                  // Uploader 根据文件后缀来判断是否为图片文件
                  // 如果图片 URL 中不包含类型信息,可以添加 isImage 标记来声明
                  // {
                  //    url: 'https://img01.yzcdn.cn/vant/leaf.jpg'
                  // },
               ],
               messageDescr: '', //故障描述
               fileList: [],
               fileList2: [],
               isStop: 'Y',
               messageContent: '', //维修内容  当维修停机选了否   此字段必填
               photoList: [],
               number2: number
               messageDescr2: '', //维修内容
               messageDescr3: '', //更换备件
               falseArray2: falseArray,
               baseUrl: 'http://121.196.36.24:8001', //ip基础地址
            }
         },
         watch: {
            'topContent2.length': {
               handler(newValue, oldValue) {
                  if (newValue !== oldValue) {
                     // this.topContent2 = topContent
                     // this.$forceUpdate()
                     if (topContent[0] && topContent[0].code) {
                     if (topContent[0] && topContent[0].repair_code) {
                        this.$forceUpdate()
                        this.topContentClcik(topContent[0].code)
                        this.topContentClcik(topContent[0].repair_code, topContent[0].eqpcode, topContent[0]
                           .wksp_code)
                     }
                  }
@@ -292,7 +409,7 @@
               deep: true,
               immediate: true,
            },
            'number2.length': {
            'falseArray2.length': {
               handler(newValue, oldValue) {
                  this.$forceUpdate()
               },
@@ -301,22 +418,125 @@
            },
         },
         created() {},
         mounted() {},
         mounted() {
            this.getList()
         },
         methods: {
            arrowTypeChange() {
               this.arrowType = !this.arrowType
            getList() {
               get('AppDeviceManage/RepairVerificationScanDeviceData').then(res => {
                  if (res.code === '200') {
                     topContent = res.data
                     radioValue = topContent[0].repair_code
                     topContent.forEach(item => {
                        item.arrowType = true
                        item.resultValue = ''
                     })
                     this.getDetail(topContent[0].repair_code, topContent[0].eqpcode, topContent[0]
                        .wksp_code)
                     this.$forceUpdate()
                  }
               })
            },
            getDetail(repair_code, eqpcode, wkshpcode) {
               const data = {
                  repair_code,
                  eqpcode,
                  wkshpcode
               }
               get('AppDeviceManage/RepairVerificationScanDeviceDataSub' + formatParams(data)).then(res => {
                  if (res.code === '200') {
                     console.log(res.data)
                     this.messageDescr = res.data.failure_descript
                     this.fileList = res.data.failure_descriptimg ? res.data.failure_descriptimg
                        .filter(item => item.img1url !== '') : []
                     this.fileList.forEach(item => {
                        item.url = this.baseUrl + item.img1url
                     })
                     this.isStop = res.data.repair_content ? 'N' : 'Y'
                     this.messageDescr2 = res.data.repair_content ? res.data.repair_content : ''
                     this.messageDescr3 = res.data.repair_part ? res.data.repair_part : ''
                     this.fileList2 = res.data.repair_partimage ? res.data.repair_partimage.filter(
                        item => item.img2url !== '') : []
                     this.fileList2.forEach(item => {
                        item.url = this.baseUrl + item.img2url
                     })
                     this.$forceUpdate()
                  }
               })
            },
            arrowTypeChangeUp(repair_code) {
               topContent.forEach(item => {
                  item.arrowType = true
                  // if (item.repair_code === repair_code) {
                  //    // item.resultValue=
                  //    item.arrowType = true
                  // }
               })
               this.$forceUpdate()
            },
            arrowTypeChangeDown(repair_code, eqpcode, wksp_code) {
               radioValue = repair_code
               topContent.forEach(item => {
                  item.arrowType = true
                  if (item.repair_code === repair_code) {
                     item.arrowType = false
                     item.resultValue = item.resultValue?item.resultValue:''
                     this.messageDescr = ''
                     this.messageDescr2 = ''
                     this.messageDescr3 = ''
                     this.fileList = []
                     this.fileList2 = []
                     this.getDetail(item.repair_code, item.eqpcode, item.wksp_code)
                  }
               })
               this.$forceUpdate()
            },
            submit() {
               // 开发时对FormData对象append数据后打印出来为空对象,开始以为是没有append进去,实际上是FormData对象不能直接用console.log(formData)进行打印。
               // 如果要打印,可以用下面的方式:
               // for (var key of this.photoList.entries()) {
               //     console.log(key[0] + ', ' + key[1] );
               // }
               const result = topContent.find(item => item.repair_code === radioValue)
               for (let [a, b] of this.photoList.entries()) {
               const formData = new FormData()
               formData.append("username", localStorage.getItem('username'))
               formData.append("eqpcode", result.eqpcode)
               formData.append("wkshpcode", result.wksp_code)
               formData.append("repairwo", result.repair_code)
               formData.append("result", result.resultValue)
               for (let [a, b] of formData.entries()) {
                  console.log(a, ', ', b);
               }
               post('AppDeviceManage/RepairVerificationScanDeviceSave', formData).then(res => {
                  if (res.code === '200') {
                     topContent.forEach((item, index) => {
                        if (item.repair_code === radioValue) {
                           topContent.splice(index, 1)
                        }
                     })
                     if (topContent.length > 0) {
                        radioValue = topContent[0].repair_code
                        this.getDetail(topContent[0].repair_code, topContent[0].eqpcode, topContent[0]
                           .wksp_code)
                     }
                     // this.resultValue=''
                     this.$forceUpdate()
                  }
               })
            },
            resultValueClick(repair_code, val) {
               topContent.forEach(item => {
                  if (item.repair_code === repair_code) {
                     item.resultValue = val
                  }
               })
               this.$forceUpdate()
            },
            topScanClick() {
               createWithoutTitle('../../components/barcode_scan.html', {
@@ -339,8 +559,16 @@
            vanFieldBlur() {
               this.$forceUpdate()
            },
            topContentClcik(code) {
               radioValue = code
            topContentClcik(repair_code, eqpcode, wksp_code) {
               radioValue = repair_code
               // this.resultValue = ''
               topContent.forEach(item => {
                  if (item.repair_code !== repair_code) {
                     item.resultValue=''
               //       this.getDetail(item.repair_code, item.eqpcode, item.wksp_code)
                  }
               })
               this.$forceUpdate()
            },
            onClickleft() {