App-Android(使用App+htnl5框架,解决消息推送兼容SignalR问题)
loulijun2021
2022-09-24 8ca4dddbb74bb69b517419adef886739aad1b362
1.递交
已修改3个文件
273 ■■■■ 文件已修改
pages/sbgl/dqby.html 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/sbgl/rcdj.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/sbgl/sbwx.html 248 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/sbgl/dqby.html
@@ -409,11 +409,13 @@
            },
            methods: {
                // 月 年选择
                onSelectSheet(val) {
                    dropdownValue = val
                    this.$forceUpdate()
                    this.sheetFlag = false
                },
                //提交
                submit() {
                    let children = []
                    centerContent.forEach(item => {
@@ -433,15 +435,11 @@
                        children: children
                    }
                    console.log(data, 1)
                    const params = {
                        username: localStorage.getItem('username'),
                        maintcyc: dropdownValue
                    }
// vant.Notify(JSON.stringify(params))
// vant.Toast(JSON.stringify(data))
                    post('AppDeviceManage/AppDeviceRepairSave' + formatParams(params), data)
                        .then(res => {
                            if (res.code === '200') {
@@ -470,6 +468,7 @@
                vanFieldBlur() {
                    this.$forceUpdate()
                },
                //扫描保养工位点击不同选择项
                topContentClcik(code) {
                    radioValue = code
                    this.$forceUpdate()
@@ -500,16 +499,11 @@
                        }
                    })
                },
                //保养结果点击
                resultClick(val) {
                    resultValue = val
                    this.$forceUpdate()
                },
                selected(id) {
                    alert(id)
                },
                // 扫描保养工位扫描
                topScanClick() {
                    createWithoutTitle('../../components/barcode_scan.html', {
@@ -547,7 +541,6 @@
                        }
                    });
                },
                // 部位正常 异常按钮点击
                bwClick(item, val) {
                    item.isOK = val
pages/sbgl/rcdj.html
@@ -396,9 +396,6 @@
                        result: resultValue,
                        children: children
                    }
                    console.log(data, 1)
                    post('AppDeviceManage/AppDeviceCheckSave?username=' + localStorage.getItem('username'), data)
                        .then(res => {
                            if (res.code === '200') {
@@ -454,16 +451,10 @@
                        }
                    })
                },
                resultClick(val) {
                    resultValue = val
                    this.$forceUpdate()
                },
                selected(id) {
                    alert(id)
                },
                // 扫描点检工位扫描
                topScanClick() {
                    createWithoutTitle('../../components/barcode_scan.html', {
@@ -501,7 +492,6 @@
                        }
                    });
                },
                // 部位正常 异常按钮点击
                bwClick(item, val) {
                    item.isOK = val
pages/sbgl/sbwx.html
@@ -6,8 +6,6 @@
        <meta name="HandheldFriendly" content="true" />
        <meta name="MobileOptimized" content="320" />
        <title>新凯迪制造云平台</title>
        <!-- 引入像素转换 px->rpx -->
        <!-- <script src="../../js/rpx4html.js"></script> -->
        <!-- 引入样式文件 -->
        <link rel="stylesheet" href="../../css/vant.css" />
@@ -19,10 +17,75 @@
        <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>
        <link rel="stylesheet" href="../css/global.css" type="text/css" charset="utf-8" />
        <script type="text/javascript" src="../../js/global.js"></script>
        <!-- <link rel="stylesheet" href="../../css/global.css" type="text/css" charset="utf-8" /> -->
        <script type="text/javascript">
            var topContent = [
                // {
                //     code: 'SB003',
                //     name: '齿轮箱组',
                //     wksp_code: "CJ002",
                //     wksp_name: '装配车间',
                //     eqpchkmain_code: "djbz002"
                // },
                // {
                //     code: 'SB001',
                //     name: '齿轮箱组',
                //     wksp_code: "CJ002",
                //     wksp_name: '装配车间',
                //     eqpchkmain_code: "djbz002"
                // },
            ];
            let radioValue = '' //单选框选中的项
            // 扫描点检工位返回时执行方法
            function scaned(r) {
                // let flag = false
                // topContent.forEach((item, index) => {
                //     if (item.code === r) {
                //         flag = true
                //     }
                // })
                // if (flag) {
                //     vant.Notify({
                //         type: 'danger',
                //         message: '此条码已扫描,已在列表中!'
                //     });
                // } else {
                //     get('AppDeviceManage/CheckScanDeviceQrCodeData', {
                //         eqpcode: r
                //     }).then(res => {
                //         if (res.code === '200' && res.data[0].eqpchkmain_code !== null) {
                //             topContent.unshift(res.data[0])
                //             topContentClcik(topContent[0].code)
                //         }
                //         if (res.code === '200' && res.data[0].eqpchkmain_code === null) {
                //             vant.Notify({
                //                 type: 'danger',
                //                 message: '当前设备未设置点检标准绑定点检项目!'
                //             });
                //         }
                //     })
                // }
            }
            function topContentClcik(code) {
            }
        </script>
    </head>
    <!-- <body onload="loadNodes()"> -->
    <body>
        <div id="app">
@@ -39,8 +102,88 @@
                    </template>
                </van-nav-bar>
                <div class="head">
                    <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>
                    <div class="flex_between" style="">
                        <div id="contentLeft" style="width: 100%;margin-top: 10px;">
                            <div id="topContentID" v-for="item in topContent" :key="item.code"
                                style="margin-bottom: 10px;margin-left: 20px;" @click="topContentClcik(item.code)">
                                <div style="display: flex;align-items: center;">
                                    <div>
                                        <div>工位编码:</div>
                                        <div>工位名称:</div>
                                        <div>生产车间:</div>
                                    </div>
                                    <div>
                                        <div>{{item.code}}</div>
                                        <div>{{item.name}}</div>
                                        <div>{{item.wksp_name}}</div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div id="contentRight">
                            <van-radio-group v-model="radioValue" style="padding-right: 12px;">
                                <van-radio checked-color='red' icon-size="18px"
                                    style="height: 63px;margin-bottom: 10px;" v-for="item in topContent"
                                    :key="item.code" :name="item.code"></van-radio>
                            </van-radio-group>
                        </div>
                    </div>
                </div>
                <div class="head"
                    :style="{marginTop:topContent.length===0?'100px':'0',minHeight:topContent.length===0?'0':'220px'}"
                    style="margin-bottom: 130px;padding-bottom: 10px;overflow-y: ;"
                    :style="{marginTop:topContent.length===0?'78px':'0'}">
                    <div class="head_block" style="margin-bottom:10px;">
                        <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;">
                        <van-field v-model="messageDescr" rows="2" autosize type="textarea" placeholder="请输入" />
                    </div>
                    <div style="width: 96%;margin: auto;margin-top: 10px;">
                        <van-uploader v-model="fileList" :after-read="afterRead" multiple :max-count="3" />
                    </div>
                </div>
                <div style="">
                    <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>
            <van-overlay :show="overlayShow" @click="overlayShow=false" />
@@ -48,6 +191,7 @@
        </div>
    </body>
    <script>
        var app = new Vue({
            el: '#app',
            data: function() {
@@ -64,16 +208,59 @@
                        icon: 'revoke',
                        text: '退出登录'
                    }],
                    topContent2: topContent,
                    messageDescr: '',
                    fileList: [
                        // {
                        //     url: 'https://img01.yzcdn.cn/vant/leaf.jpg'
                        // },
                        // Uploader 根据文件后缀来判断是否为图片文件
                        // 如果图片 URL 中不包含类型信息,可以添加 isImage 标记来声明
                        // {
                        //     url: 'https://img01.yzcdn.cn/vant/leaf.jpg'
                        // },
                    ],
                }
            },
            watch: {
                'topContent2.length': {
                    handler(newValue, oldValue) {
                        if (newValue !== oldValue) {
                            // this.topContent2 = topContent
                            // this.$forceUpdate()
                            if (topContent[0] && topContent[0].code) {
                                this.$forceUpdate()
                                this.topContentClcik(topContent[0].code)
                            }
                }
            },
            created() {
                    deep: true,
                    immediate: true,
            },
            mounted() {
            },
            created() {},
            mounted() {},
            methods: {
                afterRead(file) {
                    // 此时可以自行将文件上传至服务器
                    console.log(file);
                    //创建FormData对象。上传图片需要转换二进制,这里要用到FormData
                    let    forms = new FormData();
                    console.log(file.file);
                    //"file"表示给后台传的属性名字
                    forms.append("file", file.file); //获取上传图片信息
                    console.log(forms, 1);
                },
                submit() {},
                // 输入框失焦触发事件
                vanFieldBlur() {
                    this.$forceUpdate()
                },
                topContentClcik(code) {
                },
                onClickleft(){
                    history.back()
                },
@@ -81,19 +268,27 @@
                    this.overlayShow = true
                },
                onSelect(action) {
                    vant.Toast(action.text);
                    if (action.text === '操作指导') {
                        topPopoverClick('操作指导')
                    } else if (action.text === '成品追溯') {
                        topPopoverClick('成品追溯')
                    } else if (action.text === '退出登录') {
                        topPopoverClick('退出登录')
                    }
                    this.overlayShow = false
                },
            }
        })
    </script>
    <style type="text/css">
        @import url('../../css/global.css');
        body {
            background-color: #fff;
        }
        .body {
            height: 600px;
            min-height: 600px;
            background-color: grey;
            margin-top: 0px;
            background-color: #fff;
@@ -109,8 +304,43 @@
            color: #fff;
            letter-spacing: 2px;
        }
        .van-nav-bar__arrow{
            color: #fff !important;
        }
        .createElementDiv {
            display: flex;
            justify-content: space-between;
            align-items: center;
            margin-bottom: 10px;
            margin-left: 20px;
        }
        .vanFieldInput {
            height: 36px;
            line-height: 36px;
            align-items: center;
            /* width: 200px; */
            padding: 0;
            padding-left: 10px;
            /* border-radius: 5px; */
            margin: 5px 0;
            /* background-color: #fff; */
        }
        .buttonSmall {
            /* border-radius: 5px; */
        }
        .vanButtonInfo {
            width: 100%;
            letter-spacing: 2px;
            height: 50px;
            font-size: 18px;
            /* margin-left: 0; */
        }
    </style>
</html>