Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/qfqk-android

shuishen

2022-02-28 e4bb3e14d8c7b3c69ab79c171c12b5a1720e1ac9

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/qfqk-android

 pages/grabOrders/grabOrdersZAFFPX/map/img/dinw/location.png

 pages/grabOrders/grabOrdersZAXC/grabOrders.vue

@@ -181,7 +181,7 @@
                    d = {
                        serid: uni.getStorageSync("ids") || that.$store.state.puserID,
                        type: val + "",
                        tasktype:'0'
                        tasktype: '0'
                    };

                if (val == 1) {
@@ -313,6 +313,7 @@
                            serid: item.serid,
                            type: "start",
                            // data: JSON.stringify(item),
                            goto: "grabOrdersZAXC",
                            that: that,
                            fn: () => {
                                that.getGrabOrders(that.current); //重获取数据
@@ -339,7 +340,7 @@
            },
            confirms() {
                let that = this;
                this.popupData["serid"] = (uni.getStorageSync("ids") || that.$store.state.puserID) + ",";
                this.popupData["serid"] = "," + (uni.getStorageSync("ids") || that.$store.state.puserID);
                this.popupData["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
                // console.log(item)
                // return;

 pages/grabOrders/grabOrdersZAXC/map.vue

@@ -53,8 +53,9 @@
                <span class="once-left">
                    集合点
                </span>
                <span class="once-right">
                <span class="once-right" @click="openMeeting">
                    {{ourData.gathername}}
                    <u-icon name="map-fill" color="#429FFF"></u-icon>
                </span>
            </view>
            <view class="once">
@@ -129,38 +130,45 @@
                mapHeight: 0,
                latitude: 28.687205773173343,
                longitude: 115.8995839881188,
                circles: [{
                circles: [{ //集合点
                    latitude: '',
                    longitude: '',
                    fillColor: "#D9E6EF", //填充颜色
                    color: "#A7B6CB", //描边的颜色
                    radius: 50, //半径
                    strokeWidth: 2, //描边的宽度
                    // fillColor: "#429FFF", //填充颜色
                    // color: "#A7B6CB", //描边的颜色
                    // radius: 2, //半径
                    // strokeWidth: 2, //描边的宽度
                }, {
                    latitude: '',
                    longitude: '',
                    fillColor: "#D9E6EF", //填充颜色
                    color: "#A7B6CB", //描边的颜色
                    radius: 10, //半径
                    strokeWidth: 2, //描边的宽度
                }], //圆
                markers: [{
                    width: 40,
                    height: 40,
                    // fillColor: "#D9E6EF", //填充颜色
                    // color: "#A7B6CB", //描边的颜色
                    // radius: 10, //半径
                    // strokeWidth: 2, //描边的宽度
                }
                ], //圆
                markers: [{ // 集合点
                    width: '40',
                    height: '40',
                    // label: {
                    //     content: "集合点",
                    //     color: "#FE0000",
                    //     fontSize: 24,
                    //     textAlign: "center",
                    // },
                    id: 1,
                    latitude: '',
                    longitude: '',
                    iconPath: 'http://223.82.109.183:2081/zhba/upload/20220225/f0aecffbaf0a2ce80f7938569da20de7.png',
                    iconPath: '/static/dinw/location8.png',
                }, {
                    width: 40,
                    height: 40,
                    width: '30',
                    height: '30',
                    id: 2,
                    latitude: '',
                    longitude: '',
                    iconPath: 'http://223.82.109.183:2081/zhba/upload/20220225/7b486f647a15e708aca662dbd496dcd3.png',
                    iconPath: '/static/dinw/dinw11.png',
                }], //标记点
                jihecircles: [], //集合点
                jihemarkers: [], //集合点
                jihelatitude: '', //集合点
                jihelongitude: '', //集合点
                mypolylines: [{ //指定一系列坐标点，从数组第一项连线至最后一项
                        points: [],
                        color: "#FE0000", //线的颜色
@@ -205,8 +213,19 @@
            }
        },
        methods: {
            openMeeting() {
                let that = this;
                if (this.jihelatitude &&
                    this.jihelongitude) {
                    this.map.moveToLocation({
                        latitude: that.jihelatitude,
                        longitude: that.jihelongitude
                    });
                }
            },
            mapControlsBack() {
                // console.log(1111)
                this.inThere = true;
                this.getLocationInfo("notSet");
                // this.bye = false;
                // this.timeBegin(1);
@@ -233,8 +252,10 @@
                let that = this;
                if (type == "oks") {
                    let dataAppend = that.ourData;
                    dataAppend["serid"] = (uni.getStorageSync("ids") || that.$store.state.puserID) + ",";
                    dataAppend["serid"] = "," + (uni.getStorageSync("ids") || that.$store.state.puserID);
                    dataAppend["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
                    // console.log(dataAppend)
                    // return
                    uni.request({
                        url: that.$store.state.piAPI + "taskqd/Graborder",
                        method: "POST",
@@ -638,7 +659,7 @@
                    // this.$store.commit("stopTask", this.socketValue.rid);
                    this.bye = true;
                    uni.redirectTo({
                        url: "/pages/grabOrders/grabOrders"
                        url: "/pages/grabOrders/grabOrdersZAXC/grabOrders"
                    });
                }
            },
@@ -815,6 +836,9 @@
            that.ourData = data;
            this.latitude = +data.latlong[0];
            this.longitude = +data.latlong[1];
            //集合点
            this.jihelatitude = +data.latlong[0];
            this.jihelongitude = +data.latlong[1];
            that.markers[0].latitude = data.latlong[0];
            that.markers[0].longitude = data.latlong[1];
            that.circles[0].latitude = data.latlong[0];

 pages/grabOrders/grabOrdersZAXC/map/img/dinw/location.png

 pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue

@@ -181,7 +181,7 @@
                    d = {
                        serid: uni.getStorageSync("ids") || that.$store.state.puserID,
                        type: val + "",
                        tasktype:'1'
                        tasktype: '1'
                    };

                if (val == 1) {
@@ -313,6 +313,7 @@
                            serid: item.serid,
                            type: "start",
                            // data: JSON.stringify(item),
                            goto: "grabOrdersZAYWXC",
                            that: that,
                            fn: () => {
                                that.getGrabOrders(that.current); //重获取数据
@@ -339,7 +340,7 @@
            },
            confirms() {
                let that = this;
                this.popupData["serid"] = (uni.getStorageSync("ids") || that.$store.state.puserID) + ",";
                this.popupData["serid"] = "," + (uni.getStorageSync("ids") || that.$store.state.puserID);
                this.popupData["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
                // console.log(item)
                // return;

 pages/grabOrders/grabOrdersZAYWXC/map.vue

@@ -5,7 +5,7 @@
        <!-- <web-view :src="urls" @message="message"></web-view> -->
        <map :scale='18' id="myMap" style="width: 100%" :style="{height: mapHeight + 'px'}" :markers="markers"
            :longitude="longitude" :latitude="latitude" :circles="circles" :polyline="mypolylines" show-location="true">
            <cover-view class="dingwBut" @click="mapControlsBack">
            <cover-view class="dingwBut">
                <cover-image src="./map/img/dingwei.png" @click="mapControlsBack">
                </cover-image>
            </cover-view>
@@ -53,8 +53,9 @@
                <span class="once-left">
                    集合点
                </span>
                <span class="once-right">
                <span class="once-right" @click="openMeeting">
                    {{ourData.gathername}}
                    <u-icon name="map-fill" color="#429FFF"></u-icon>
                </span>
            </view>
            <view class="once">
@@ -129,38 +130,44 @@
                mapHeight: 0,
                latitude: 28.687205773173343,
                longitude: 115.8995839881188,
                circles: [{
                circles: [{ //集合点
                    latitude: '',
                    longitude: '',
                    fillColor: "#D9E6EF", //填充颜色
                    color: "#A7B6CB", //描边的颜色
                    radius: 50, //半径
                    strokeWidth: 2, //描边的宽度
                    // fillColor: "#429FFF", //填充颜色
                    // color: "#A7B6CB", //描边的颜色
                    // radius: 2, //半径
                    // strokeWidth: 2, //描边的宽度
                }, {
                    latitude: '',
                    longitude: '',
                    fillColor: "#D9E6EF", //填充颜色
                    color: "#A7B6CB", //描边的颜色
                    radius: 10, //半径
                    strokeWidth: 2, //描边的宽度
                    // fillColor: "#D9E6EF", //填充颜色
                    // color: "#A7B6CB", //描边的颜色
                    // radius: 10, //半径
                    // strokeWidth: 2, //描边的宽度
                }], //圆
                markers: [{
                    width: 40,
                    height: 40,
                markers: [{ // 集合点
                    width: '60',
                    height: '60',
                    // label: {
                    //     content: "集合点",
                    //     color: "#FE0000",
                    //     fontSize: 24,
                    //     textAlign: "center",
                    // },
                    id: 1,
                    latitude: '',
                    longitude: '',
                    iconPath: 'http://223.82.109.183:2081/zhba/upload/20220225/f0aecffbaf0a2ce80f7938569da20de7.png',
                    iconPath: '/static/dinw/location4.png',
                }, {
                    width: 40,
                    height: 40,
                    width: '10',
                    height: '10',
                    id: 2,
                    latitude: '',
                    longitude: '',
                    iconPath: 'http://223.82.109.183:2081/zhba/upload/20220225/7b486f647a15e708aca662dbd496dcd3.png',
                    iconPath: '/static/dinw/dinw11.png',
                }], //标记点
                jihecircles: [], //集合点
                jihemarkers: [], //集合点
                jihelatitude: '', //集合点
                jihelongitude: '', //集合点
                mypolylines: [{ //指定一系列坐标点，从数组第一项连线至最后一项
                        points: [],
                        color: "#FE0000", //线的颜色
@@ -205,8 +212,19 @@
            }
        },
        methods: {
            openMeeting() {
                let that = this;
                if (this.jihelatitude &&
                    this.jihelongitude) {
                    this.map.moveToLocation({
                        latitude: that.jihelatitude,
                        longitude: that.jihelongitude
                    });
                }
            },
            mapControlsBack() {
                // console.log(1111)
                console.log(1111)
                this.inThere = true;
                this.getLocationInfo("notSet");
                // this.bye = false;
                // this.timeBegin(1);
@@ -233,8 +251,11 @@
                let that = this;
                if (type == "oks") {
                    let dataAppend = that.ourData;
                    dataAppend["serid"] = (uni.getStorageSync("ids") || that.$store.state.puserID) + ",";
                    dataAppend["serid"] = "," + (uni.getStorageSync("ids") || that.$store.state.puserID);
                    // dataAppend["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
                    dataAppend["captain"] = uni.getStorageSync("name") || that.$store.state.puserName;
                    console.log(dataAppend, 888)
                    return
                    uni.request({
                        url: that.$store.state.piAPI + "taskqd/Graborder",
                        method: "POST",
@@ -624,7 +645,7 @@
                    // this.$store.commit("stopTask", this.socketValue.rid);
                    this.bye = true;
                    uni.redirectTo({
                        url: "/pages/grabOrders/grabOrders"
                        url: "/pages/grabOrders/grabOrdersZAYWXC/grabOrders"
                    });
                }
            },
@@ -802,6 +823,9 @@
            this.latitude = data.latlong[0];
            this.longitude = data.latlong[1];

            //集合点
            this.jihelatitude = +data.latlong[0];
            this.jihelongitude = +data.latlong[1];
            //集合标记点
            that.markers[0].latitude = data.latlong[0];
            that.markers[0].longitude = data.latlong[1];

 pages/grabOrders/grabOrdersZAYWXC/map/img/dinw/location.png

 static/dinw/dinw1.png

 static/dinw/dinw11.png

 static/dinw/dinw12.png

 static/dinw/dinw13.png

 static/dinw/dinw2.png

 static/dinw/dinw3.png

 static/dinw/dinw4.png

 static/dinw/dinw5.png

 static/dinw/dinw6.png

 static/dinw/location.png

 static/dinw/location1.png

 static/dinw/location2.png

 static/dinw/location3.png

 static/dinw/location4.png

 static/dinw/location5.png

 static/dinw/location6.png

 static/dinw/location7.png

 static/dinw/location8.png

 store/apiConfig.js

@@ -1,10 +1,13 @@
let i = 1; //1是服务器
if (i) {
if (i == 1) {
    var api = 'http://223.82.109.183:2082/api/';
    var wsapi = 'ws://223.82.109.183:2082/wss/websocket';
} else {
} else if (i == 0) {//曾
    var api = 'http://192.168.0.108:83/';
    var wsapi = 'ws://192.168.0.108:9034/websocket';
} else if (i == 2) {//唐
    var api = 'http://192.168.0.110:83/';
    var wsapi = 'ws://192.168.0.110:9034/websocket';
}

// var api = 'http://192.168.0.222:83/';