liuyg
2022-02-25 3b0ca0a11e238085de8bbd4ca054661f4881f5b9
+我参与 拆分成3个  每个字段以及地图显示模式更改
10 files modified
168 ■■■■■ changed files
pages/grabOrders/grabOrdersMain/business.vue 26 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/feedback.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue 2 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/map.vue 17 ●●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/feedback.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/grabOrders.vue 4 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/map.vue 56 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/feedback.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue 4 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/map.vue 53 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersMain/business.vue
@@ -48,21 +48,21 @@
        data() {
            return {
                tabbar: this.$store.state.tabbar,
                bashow:false,
                bashow: false,
                dataOne: [{
                    title: '治安巡查',
                    img: '/static/workbench/task2.png',
                    url: '../grabOrdersZAXC/grabOrders',
                    url: '../grabOrdersZAXC/grabOrders?detailData=0',
                    cout: 0
                }, {
                    title: '治安义务宣传',
                    img: '/static/workbench/task1.png',
                    url: '../grabOrdersZAYWXC/grabOrders',
                    url: '../grabOrdersZAYWXC/grabOrders?detailData=0',
                    cout: 0
                }, {
                    title: '治安防范培训',
                    img: '/static/workbench/task3.png',
                    url: '../grabOrdersZAFFPX/grabOrders',
                    url: '../grabOrdersZAFFPX/grabOrders?detailData=0',
                    cout: 0
                }, {
                    title: '保安管理',
@@ -93,6 +93,14 @@
        onLoad() {
        },
        onBackPress(e) {
            console.log("监听返回按钮事件2", e);
            uni.switchTab({
                url: "/pages/home/home"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
        },
        mounted() {
            // if (this.$store.state.UserData.stype != "1") {
            //     this.$refs.uToast.show({
@@ -115,15 +123,15 @@
                    },
                    success: (res) => {
                        var data = res.data.data;
                        this.dataOne[0].cout=Number(data.xcha);
                        this.dataOne[1].cout=Number(data.xchuan);
                        this.dataOne[2].cout=Number(data.px);
                        this.dataOne[0].cout = Number(data.xcha);
                        this.dataOne[1].cout = Number(data.xchuan);
                        this.dataOne[2].cout = Number(data.px);
                    }
                });
            },
            //页面跳转
            goOnePage(url, index) {
                if(index == "3"){
                if (index == "3") {
                    this.bashow = !this.bashow;
                }
                uni.navigateTo({
@@ -158,7 +166,7 @@
                });
            },
            goTwoPage(url, index) {
                 if (index == "1") {
                if (index == "1") {
                    this.$refs.uToast.show({
                        title: '功能研发中',
                        type: 'warning',
pages/grabOrders/grabOrdersZAFFPX/feedback.vue
@@ -67,7 +67,7 @@
        onBackPress(e) {
            console.log("监听返回按钮事件1", e);
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrders"
                url: "/pages/grabOrders/grabOrdersZAFFPX/grabOrders?detailData=0"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
@@ -181,10 +181,12 @@
                    d = {
                        serid: uni.getStorageSync("ids") || that.$store.state.puserID,
                        type: val + "",
                        tasktype:'2'
                    };
                if (val == 1) {
                    d.jurisdiction = this.$store.state.UserData.jurisdiction;
                    d.workjurisdiction = this.$store.state.UserData.workjurisdiction;
                }
                // console.log(that.$store.state.puserID)
                uni.request({
pages/grabOrders/grabOrdersZAFFPX/map.vue
@@ -47,7 +47,7 @@
                    培训地点
                </span>
                <span class="once-right">
                    {{ourData.province}}&nbsp;-&nbsp;{{ourData.city}}&nbsp;-&nbsp;{{ourData.district}}
                    {{ourData.gathername}}
                </span>
            </view>
            <view class="once">
@@ -279,7 +279,8 @@
                        // }
                        this.bye = true;
                        uni.redirectTo({
                            url: '/pages/grabOrders/feedback?data=' + JSON.stringify(this.ourData) +
                            url: '/pages/grabOrders/grabOrdersZAFFPX/feedback?data=' + JSON.stringify(this
                                    .ourData) +
                                '&other="11111"'
                        });
                    } else if (that.ourData.butCT == "begin") {
@@ -328,7 +329,7 @@
                            // data: JSON.stringify(item),
                            that: that,
                            fn: () => {
                                that.getGrabOrders(that.current); //重获取数据
                                // that.getGrabOrders(that.current); //重获取数据
                                // setTimeout(() => {
                                //     that.openOnce(item);
                                // }, 500)
@@ -601,7 +602,7 @@
        mounted() {},
        onReady() {
            let that = this;
            return
            this.types = uni.getSystemInfoSync();
            var animation = uni.createAnimation({
@@ -751,7 +752,7 @@
            }
            that.ourData = data;
            return
            uni.getSystemInfo({ //初始化地图高度
                success(res) {
                    that.mapHeight = res.windowHeight;
@@ -903,10 +904,12 @@
            //     }
            // })
            return
            //画线
            // console.log(data)
            let line = data.line.split("(")[1].split(")")[0].split(",");
            if (data.line) {
                let line = data.line.split("(")[1].split(")")[0].split(",");
            }
            // console.log(line[0].split(" ")[1])
            // console.log(line[0].split(" ")[0])
            this.latitude = line[0].split(" ")[1];
pages/grabOrders/grabOrdersZAXC/feedback.vue
@@ -67,7 +67,7 @@
        onBackPress(e) {
            console.log("监听返回按钮事件1", e);
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrders"
                url: "/pages/grabOrders/grabOrdersZAXC/grabOrders?detailData=0"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
pages/grabOrders/grabOrdersZAXC/grabOrders.vue
@@ -64,7 +64,7 @@
        },
        onBackPress(e) {
            console.log("监听返回按钮事件2", e);
            uni.switchTab({
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrdersMain/business"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
@@ -181,10 +181,12 @@
                    d = {
                        serid: uni.getStorageSync("ids") || that.$store.state.puserID,
                        type: val + "",
                        tasktype:'0'
                    };
                if (val == 1) {
                    d.jurisdiction = this.$store.state.UserData.jurisdiction;
                    d.workjurisdiction = this.$store.state.UserData.workjurisdiction;
                }
                // console.log(that.$store.state.puserID)
                uni.request({
pages/grabOrders/grabOrdersZAXC/map.vue
@@ -47,7 +47,7 @@
                    集合点
                </span>
                <span class="once-right">
                    {{ourData.province}}&nbsp;-&nbsp;{{ourData.city}}&nbsp;-&nbsp;{{ourData.district}}
                    {{ourData.gathername}}
                </span>
            </view>
            <view class="once">
@@ -124,6 +124,8 @@
                longitude: 115.8995839881188,
                circles: [], //圆
                markers: [], //标记点
                jihecircles: [], //集合点
                jihemarkers: [], //集合点
                mypolylines: [{ //指定一系列坐标点,从数组第一项连线至最后一项
                        points: [],
                        color: "#FE0000", //线的颜色
@@ -253,7 +255,7 @@
                                });
                                setTimeout(function() {
                                    uni.redirectTo({
                                        url: "/pages/grabOrders/grabOrders?in=true"
                                        url: "/pages/grabOrders/grabOrdersZAXC/grabOrders?in=true"
                                    })
                                }, 2200)
                            }
@@ -276,7 +278,7 @@
                        // }
                        this.bye = true;
                        uni.redirectTo({
                            url: '/pages/grabOrders/feedback?data=' + JSON.stringify(this.ourData) +
                            url: '/pages/grabOrders/grabOrdersZAXC/feedback?data=' + JSON.stringify(this.ourData) +
                                '&other="11111"'
                        });
                    } else if (that.ourData.butCT == "begin") {
@@ -325,7 +327,7 @@
                            // data: JSON.stringify(item),
                            that: that,
                            fn: () => {
                                that.getGrabOrders(that.current); //重获取数据
                                // that.getGrabOrders(that.current); //重获取数据
                                // setTimeout(() => {
                                //     that.openOnce(item);
                                // }, 500)
@@ -556,10 +558,10 @@
                }
            },
            circlesCom() {
                return this.circles.slice(0);
                return [...this.circles.slice(0), ...this.jihecircles.slice(0)];
            },
            markersCom() {
                return this.markers.slice(0);
                return [...this.markers.slice(0), ...this.jihemarkers.slice(0)];
            },
            // mypolylinesCom() {
            //     // console.log(this.mypolylines,"333333333333333333333")
@@ -595,8 +597,8 @@
                deep: true
            }
        },
        mounted() {},
        onReady() {
        // mounted() {},
        mounted() {
            let that = this;
            this.types = uni.getSystemInfoSync();
@@ -720,6 +722,8 @@
                    myid: 111,
                    myName: 222,
                    url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    gather: "28.699957,115.862118",
                    gathername: "江西省南昌市红谷滩区沙井街道凤凰中大道南昌市公安局"
                    // })
                }
            } else {
@@ -746,8 +750,28 @@
            if (data.team) {
                data["teams"] = data.team.split(",");
            }
            if (data.gather) {
                data["latlong"] = data.gather.split(",");
            }
            that.ourData = data;
            this.latitude = data.latlong[0];
            this.longitude = data.latlong[1];
            //集合标记点
            that.markers = [{
                id: 1,
                latitude: data.latlong[0],
                longitude: data.latlong[1],
                iconPath: './map/img/dinw/dinw6.png',
            }]
            that.circles = [{ //在地图上显示圆
                latitude: data.latlong[0],
                longitude: data.latlong[1],
                fillColor: "#D9E6EF", //填充颜色
                color: "#A7B6CB", //描边的颜色
                radius: 20, //半径
                strokeWidth: 2 //描边的宽度
            }]
            uni.getSystemInfo({ //初始化地图高度
                success(res) {
@@ -906,14 +930,14 @@
            let line = data.line.split("(")[1].split(")")[0].split(",");
            // console.log(line[0].split(" ")[1])
            // console.log(line[0].split(" ")[0])
            this.latitude = line[0].split(" ")[1];
            this.longitude = line[0].split(" ")[0];
            this.map.moveToLocation({
                // latitude: line[0].split(" ")[1],
                // longitude: line[0].split(" ")[0]
                latitude: 40.013305,
                longitude: 118.685713
            });
            // this.latitude = line[0].split(" ")[1];
            // this.longitude = line[0].split(" ")[0];
            // this.map.moveToLocation({
            //     // latitude: line[0].split(" ")[1],
            //     // longitude: line[0].split(" ")[0]
            //     latitude: 40.013305,
            //     longitude: 118.685713
            // });
            let ourline = [];
            for (let k in line) {
                let ins = line[k].split(" ");
pages/grabOrders/grabOrdersZAYWXC/feedback.vue
@@ -67,7 +67,7 @@
        onBackPress(e) {
            console.log("监听返回按钮事件1", e);
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrders"
                url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders?detailData=0"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
            return true;
pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
@@ -64,7 +64,7 @@
        },
        onBackPress(e) {
            console.log("监听返回按钮事件2", e);
            uni.switchTab({
            uni.redirectTo({
                url: "/pages/grabOrders/grabOrdersMain/business"
            })
            // 此处一定姚要return为true,否则页面不会返回到指定路径
@@ -181,10 +181,12 @@
                    d = {
                        serid: uni.getStorageSync("ids") || that.$store.state.puserID,
                        type: val + "",
                        tasktype:'1'
                    };
                if (val == 1) {
                    d.jurisdiction = this.$store.state.UserData.jurisdiction;
                    d.workjurisdiction = this.$store.state.UserData.workjurisdiction;
                }
                // console.log(that.$store.state.puserID)
                uni.request({
pages/grabOrders/grabOrdersZAYWXC/map.vue
@@ -47,7 +47,7 @@
                    集合点
                </span>
                <span class="once-right">
                    {{ourData.province}}&nbsp;-&nbsp;{{ourData.city}}&nbsp;-&nbsp;{{ourData.district}}
                    {{ourData.gathername}}
                </span>
            </view>
            <view class="once">
@@ -124,6 +124,8 @@
                longitude: 115.8995839881188,
                circles: [], //圆
                markers: [], //标记点
                jihecircles: [], //集合点
                jihemarkers: [], //集合点
                mypolylines: [{ //指定一系列坐标点,从数组第一项连线至最后一项
                        points: [],
                        color: "#FE0000", //线的颜色
@@ -253,7 +255,7 @@
                                });
                                setTimeout(function() {
                                    uni.redirectTo({
                                        url: "/pages/grabOrders/grabOrders?in=true"
                                        url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders?in=true"
                                    })
                                }, 2200)
                            }
@@ -276,7 +278,8 @@
                        // }
                        this.bye = true;
                        uni.redirectTo({
                            url: '/pages/grabOrders/feedback?data=' + JSON.stringify(this.ourData) +
                            url: '/pages/grabOrders/grabOrdersZAYWXC/feedback?data=' + JSON.stringify(this
                                .ourData) +
                                '&other="11111"'
                        });
                    } else if (that.ourData.butCT == "begin") {
@@ -325,7 +328,7 @@
                            // data: JSON.stringify(item),
                            that: that,
                            fn: () => {
                                that.getGrabOrders(that.current); //重获取数据
                                // that.getGrabOrders(that.current); //重获取数据
                                // setTimeout(() => {
                                //     that.openOnce(item);
                                // }, 500)
@@ -556,10 +559,10 @@
                }
            },
            circlesCom() {
                return this.circles.slice(0);
                return [...this.circles.slice(0), ...this.jihecircles.slice(0)];
            },
            markersCom() {
                return this.markers.slice(0);
                return [...this.markers.slice(0), ...this.jihemarkers.slice(0)];
            },
            // mypolylinesCom() {
            //     // console.log(this.mypolylines,"333333333333333333333")
@@ -720,6 +723,8 @@
                    myid: 111,
                    myName: 222,
                    url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    gather: "28.699957,115.862118",
                    gathername: "江西省南昌市红谷滩区沙井街道凤凰中大道南昌市公安局"
                    // })
                }
            } else {
@@ -746,8 +751,28 @@
            if (data.team) {
                data["teams"] = data.team.split(",");
            }
            if (data.gather) {
                data["latlong"] = data.gather.split(",");
            }
            that.ourData = data;
            this.latitude = data.latlong[0];
            this.longitude = data.latlong[1];
            //集合标记点
            that.markers = [{
                id: 1,
                latitude: data.latlong[0],
                longitude: data.latlong[1],
                iconPath: './map/img/dinw/dinw6.png',
            }]
            that.circles = [{ //在地图上显示圆
                latitude: data.latlong[0],
                longitude: data.latlong[1],
                fillColor: "#D9E6EF", //填充颜色
                color: "#A7B6CB", //描边的颜色
                radius: 20, //半径
                strokeWidth: 2 //描边的宽度
            }]
            uni.getSystemInfo({ //初始化地图高度
                success(res) {
@@ -906,14 +931,14 @@
            let line = data.line.split("(")[1].split(")")[0].split(",");
            // console.log(line[0].split(" ")[1])
            // console.log(line[0].split(" ")[0])
            this.latitude = line[0].split(" ")[1];
            this.longitude = line[0].split(" ")[0];
            this.map.moveToLocation({
                // latitude: line[0].split(" ")[1],
                // longitude: line[0].split(" ")[0]
                latitude: 40.013305,
                longitude: 118.685713
            });
            // this.latitude = line[0].split(" ")[1];
            // this.longitude = line[0].split(" ")[0];
            // this.map.moveToLocation({
            //     // latitude: line[0].split(" ")[1],
            //     // longitude: line[0].split(" ")[0]
            //     latitude: 40.013305,
            //     longitude: 118.685713
            // });
            let ourline = [];
            for (let k in line) {
                let ins = line[k].split(" ");