App-Android(使用App+htnl5框架,解决消息推送兼容SignalR问题)
loulijun2021
2022-10-09 2b8231f5da82c56c3315d1cf5b126688ea3d501e
pages/sbgl/wxyz.html
@@ -51,38 +51,37 @@
               arrowType: true, //箭头类别
               messageDescr: '123',
               fileList: [],
            },
            {
               wxsqd: 'SB00990003',
               code: 'SB003',
               name: '齿轮箱组',
               wksp_code: "CJ002",
               wksp_name: '装配车间',
               eqpchkmain_code: "djbz002",
               sqry: '佩罗西',
               sqsj: '2022-09-20 15:20:30',
               gzly: '设备点检',
               gzms: '精工车间注塑机一号开不了',
               arrowType: true, //箭头类别
               messageDescr: '123',
               fileList: [],
            },
            {
               wxsqd: 'SB00990004',
               code: 'SB004',
               name: '齿轮箱组',
               wksp_code: "CJ002",
               wksp_name: '装配车间',
               eqpchkmain_code: "djbz002",
               sqry: '佩罗西',
               sqsj: '2022-09-20 15:20:30',
               gzly: '设备点检',
               gzms: '精工车间注塑机一号开不了',
               arrowType: true, //箭头类别
               messageDescr: '123',
               fileList: [],
            },
            // {
            //    wxsqd: 'SB00990003',
            //    code: 'SB003',
            //    name: '齿轮箱组',
            //    wksp_code: "CJ002",
            //    wksp_name: '装配车间',
            //    eqpchkmain_code: "djbz002",
            //    sqry: '佩罗西',
            //    sqsj: '2022-09-20 15:20:30',
            //    gzly: '设备点检',
            //    gzms: '精工车间注塑机一号开不了',
            //    arrowType: true, //箭头类别
            //    messageDescr: '123',
            //    fileList: [],
            // },
            // {
            //    wxsqd: 'SB00990004',
            //    code: 'SB004',
            //    name: '齿轮箱组',
            //    wksp_code: "CJ002",
            //    wksp_name: '装配车间',
            //    eqpchkmain_code: "djbz002",
            //    sqry: '佩罗西',
            //    sqsj: '2022-09-20 15:20:30',
            //    gzly: '设备点检',
            //    gzms: '精工车间注塑机一号开不了',
            //    arrowType: true, //箭头类别
            //    messageDescr: '123',
            //    fileList: [],
            // },
         ];
@@ -90,7 +89,7 @@
         let radioValue = '' //单选框选中的项
         let number = [] //假数组   做扫码回来视图更新用
         let falseArray = [] //假数组   做扫码回来视图更新用
         // 扫描维修工位返回时执行方法
         function scaned(r) {
@@ -120,7 +119,7 @@
            number.push({
            falseArray.push({
               id: '1'
            })
         }
@@ -145,200 +144,211 @@
               </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>
            <div v-else>
            <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" :key="item.code" @click="topContentClcik(item.code)">
                     <div class="cellDiv">维修申请单:{{item.wxsqd}}</div>
                     <div class="cellDiv">工位编码:{{item.code}}</div>
                     <div class="cellDiv">工位名称:{{item.name}}</div>
                     <div class="cellDiv">生产车间:{{item.wksp_name}}</div>
                     <van-cell :title="'申请人员:'+item.sqry">
                        <template #right-icon>
                           <van-radio style="margin-right: 10px;" checked-color='red' :name="item.code" />
                        </template>
                     </van-cell>
                     <div class="cellDiv">申请时间:{{item.sqsj}}</div>
                     <div class="cellDiv">故障来源:{{item.gzly}}</div>
                     <div class="cellDiv">故障描述:{{item.gzms}}</div>
               <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 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.code)" class="flex_center_center">
                           <van-icon :name="item.arrowType?'arrow-down':'arrow-up'" />
                     <div class="head_left">
                        <div class="head_bar"></div>
                        <div class="head_title">
                           扫描维修工位
                        </div>
                     </div>
                     <!-- <div v-if="topContent.length-1===index" style="z-index: 100;height: 10px;background-color: red;margin-top: -10px;"></div> -->
                     <div style="margin-right: 10px;">
                        <van-icon name="scan" color='red' size='24' @click='topScanClick()' />
                     </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>
               </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" :key="item.code" @click="topContentClcik(item.code)">
                        <div class="cellDiv">维修申请单:{{item.wxsqd}}</div>
                        <div class="cellDiv">工位编码:{{item.code}}</div>
                        <div class="cellDiv">工位名称:{{item.name}}</div>
                        <div class="cellDiv">生产车间:{{item.wksp_name}}</div>
                        <van-cell :title="'申请人员:'+item.sqry">
                           <template #right-icon>
                              <van-radio style="margin-right: 10px;" checked-color='red' :name="item.code" />
                           </template>
                        </van-cell>
                        <div class="cellDiv">申请时间:{{item.sqsj}}</div>
                        <div class="cellDiv">故障来源:{{item.gzly}}</div>
                        <div class="cellDiv">故障描述:{{item.gzms}}</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 10px 0 10px;">
                              <!--    <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr"
                                 rows="2" autosize type="textarea" placeholder="请输入" /> -->
                              {{item.messageDescr}}
                           </div>
                           <div style="width: 96%;margin: auto;">
                              <van-uploader multiple v-model="item.fileList" multiple :max-count="3" />
                           </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" plain size="small" type="primary">
                                 否</van-button>
                           </div>
                        </div>
                        <div style="background-color: #eff0f1;height: 10px;"></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 10px 0 10px;">
                              <!--             <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr"
                                 rows="2" autosize type="textarea" placeholder="请输入" />
                      -->
                              {{item.messageDescr}}
                           </div>
                        </div>
                        <div style="background-color: #eff0f1;height: 10px;"></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 10px 0 10px;">
                              <!--    <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr"
                                 rows="2" autosize type="textarea" placeholder="请输入" /> -->
                              {{item.messageDescr}}
                           </div>
                           <div style="width: 96%;margin: auto;">
                              <van-uploader multiple v-model="item.fileList" multiple :max-count="3" />
                           </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 type="primary">
                                    正常</van-button>
                                 <van-button class="buttonSmall" size="small" plain type="danger">异常
                                 </van-button>
                              </div>
                           </div>
                        </div>
                        <div v-show="!item.arrowType" style="height: 30px;margin: auto;margin-top: 10px;"
                        <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.code)" class="flex_center_center">
                              @click="arrowTypeChangeDown(item.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 10px 0 10px;">
                                 <!--    <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr"
                                    rows="2" autosize type="textarea" placeholder="请输入" /> -->
                                 {{item.messageDescr}}
                              </div>
                              <div style="width: 96%;margin: auto;">
                                 <van-uploader multiple v-model="item.fileList" multiple :max-count="3" />
                              </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" plain size="small" type="primary">
                                    否</van-button>
                              </div>
                           </div>
                           <div style="background-color: #eff0f1;height: 10px;"></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 10px 0 10px;">
                                 <!--             <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr"
                                    rows="2" autosize type="textarea" placeholder="请输入" />
                         -->
                                 {{item.messageDescr}}
                              </div>
                           </div>
                           <div style="background-color: #eff0f1;height: 10px;"></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 10px 0 10px;">
                                 <!--    <van-field class="vanFieldInputArea" readonly v-model="item.messageDescr"
                                    rows="2" autosize type="textarea" placeholder="请输入" /> -->
                                 {{item.messageDescr}}
                              </div>
                              <div style="width: 96%;margin: auto;">
                                 <van-uploader multiple v-model="item.fileList" multiple :max-count="3" />
                              </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 type="primary">
                                       正常</van-button>
                                    <van-button class="buttonSmall" size="small" plain 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.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 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" loading-text='正在提交,请稍等...' class="vanButtonInfo"
                        @click="submit" type="info">
                        确认提交</van-button>
                  </div>
               </van-cell-group>
            </van-radio-group>
            <!-- <div style="height: 1200px;width: 100%;background-color: black;margin-bottom: 100px;"></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 class="vanButtonInfo" @click="submit" type="info">
                     确认提交</van-button>
               </div>
            </div>
         </div>
@@ -353,6 +363,7 @@
         el: '#app',
         data: function() {
            return {
               submitIsDisabled: false,
               overlayShow: false,
               showPopover: false,
               actions: [{
@@ -379,9 +390,8 @@
                  // },
               ],
               isStop: 'Y',
               messageContent: '', //维修内容  当维修停机选了否   此字段必填
               photoList: [],
               number2: number
               messageContent: '', //维修内容  当维修停机选了否   此字段必填
               falseArray2: falseArray
            }
         },
         watch: {
@@ -400,7 +410,7 @@
               deep: true,
               immediate: true,
            },
            'number2.length': {
            'falseArray2.length': {
               handler(newValue, oldValue) {
                  this.$forceUpdate()
               },
@@ -409,8 +419,15 @@
            },
         },
         created() {},
         mounted() {},
         mounted() {
            // this.getList()
         },
         methods: {
            getList() {
               get('AppDeviceManage/RepairVerificationScanDeviceData').then(res => {
               })
            },
            arrowTypeChangeUp(code) {
               topContent.forEach(item => {
                  item.arrowType = true
@@ -428,15 +445,30 @@
               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.code === radioValue)
               for (let [a, b] of this.photoList.entries()) {
               const formData = new FormData()
               formData.append("username", localStorage.getItem('username'))
               formData.append("eqpcode", result.code)
               formData.append("wkshpcode", result.wksp_code)
               formData.append("faultdescr", this.messageDescr)
               formData.append("is_stoprepair", this.isStop)
               formData.append("repaircontent", this.messageDescr2)
               formData.append("replaceparts", this.messageDescr3)
               // this.fileList.forEach(item => {
               //    formData.append('files1', item.file)
               // })
               for (let [a, b] of formData.entries()) {
                  console.log(a, ', ', b);
               }
               // post('AppDeviceManage/RepairVerificationScanDeviceSave', formData).then(res => {
               //    if (res.code === '200') {
               //    }
               // })
            },
            topScanClick() {
               createWithoutTitle('../../components/barcode_scan.html', {