zengh
2022-05-16 4d20a82e941da668bf833789505d17e5290ded2d
地址修改
31 files modified
96 ■■■■ changed files
api/mock/home.js 6 ●●●● patch | view | raw | blame | history
leafletMapOur/grabOrdersMap/js/vueMain.js 4 ●●●● patch | view | raw | blame | history
leafletMapOur/loginMap/js/vueMain.js 2 ●●● patch | view | raw | blame | history
leafletMapOur/xcxMapJQ - 副本/js/vueMain.js 2 ●●● patch | view | raw | blame | history
leafletMapOur/xcxMapJQ/js/vueMain.js 2 ●●● patch | view | raw | blame | history
leafletMapOur/xcxMapJQLG/js/vueMain.js 2 ●●● patch | view | raw | blame | history
leafletMapOur/xcxjingqingmap_clock_sign_in/js/vueMain.js 2 ●●● patch | view | raw | blame | history
leafletMapOur/xcxjingqingmap_lxdh/js/lxdhmap.js 2 ●●● patch | view | raw | blame | history
manifest.json 2 ●●● patch | view | raw | blame | history
pages/business/businesscopy2.vue 2 ●●● patch | view | raw | blame | history
pages/clockSignIn/clockSignIn.vue 2 ●●● patch | view | raw | blame | history
pages/exam/examTextPage.vue 4 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersMain/business.vue 2 ●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAFFPX/map.vue 4 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAXC/map.vue 4 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrdersZAYWXC/map.vue 4 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrders备份/map - 副本.vue 4 ●●●● patch | view | raw | blame | history
pages/grabOrders/grabOrders备份/map.vue 4 ●●●● patch | view | raw | blame | history
pages/groupChat/chating.vue 2 ●●● patch | view | raw | blame | history
pages/groupChat/chatingQZ.vue 2 ●●● patch | view | raw | blame | history
pages/groupChat/chatingcopy.vue 2 ●●● patch | view | raw | blame | history
pages/groupChat/groupChat.vue 6 ●●●● patch | view | raw | blame | history
pages/investigation/investigation.vue 2 ●●● patch | view | raw | blame | history
pages/map/map.vue 2 ●●● patch | view | raw | blame | history
pages/myself/myself.vue 2 ●●● patch | view | raw | blame | history
pages/patrol/patrol_copy.vue 4 ●●●● patch | view | raw | blame | history
store/actions.js 2 ●●● patch | view | raw | blame | history
store/apiConfig.js 8 ●●●● patch | view | raw | blame | history
store/state.js 6 ●●●● patch | view | raw | blame | history
store/websocket.js 2 ●●● patch | view | raw | blame | history
vue.config.js 2 ●●● patch | view | raw | blame | history
api/mock/home.js
@@ -20,12 +20,12 @@
        try {
            const list = [{
                id: '1',
                img: 'http://223.82.109.183:2081/zhba/upload/20210913/3d9fd42a80094268ab83fdd3bcb18541.jpg',
                img: 'http://61.131.136.25:2081/zhba/upload/20210913/3d9fd42a80094268ab83fdd3bcb18541.jpg',
                url: '../article/article_detail?detailData=' + '{"id":"119"}'
            }, {
                id: '2',
                img: 'http://223.82.109.183:2081/zhba/upload/20220216/b3d4c45eb7202974b3155318914df829.jpg',
                url: '../article/article_video?detailData=' + '{"id":981,"title":"千万别被“冰墩墩”的诱惑冲昏头 小心被盯上!","content":"","url":"http://223.82.109.183:2081/zhba/upload/20220216/b3d4c45eb7202974b3155318914df829.jpg","videoUrl":"http://223.82.109.183:2081/zhba/upload/depl/aed8c0b92b8f49b18c7c2d5056290af8.mp4","createTime":"2022-02-15 00:00:00","updateTime":"2022-02-16 22:49:21","sourceId":"","sourceName":"中国警察网","articleType":"ksp003","recommend":-1,"publish":"0","iscomment":"","iswords":"0","wordsContent":"","type":0}'
                img: 'http://61.131.136.25:2081/zhba/upload/20220216/b3d4c45eb7202974b3155318914df829.jpg',
                url: '../article/article_video?detailData=' + '{"id":981,"title":"千万别被“冰墩墩”的诱惑冲昏头 小心被盯上!","content":"","url":"http://61.131.136.25:2081/zhba/upload/20220216/b3d4c45eb7202974b3155318914df829.jpg","videoUrl":"http://61.131.136.25:2081/zhba/upload/depl/aed8c0b92b8f49b18c7c2d5056290af8.mp4","createTime":"2022-02-15 00:00:00","updateTime":"2022-02-16 22:49:21","sourceId":"","sourceName":"中国警察网","articleType":"ksp003","recommend":-1,"publish":"0","iscomment":"","iswords":"0","wordsContent":"","type":0}'
            }, {
                id: '3',
                img: '/static/images/home/homeTop3.png',
leafletMapOur/grabOrdersMap/js/vueMain.js
@@ -242,7 +242,7 @@
                    team: "你,他,它",
                    time: "2022-02-18 14:15:52",
                    type: "0",
                    url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    url: "http://61.131.136.25:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    fname:"管理员"
                },
                that = this;
@@ -360,7 +360,7 @@
            // desc = "+proj=longlat +datum=WGS84 +no_defs ",
            // crs = new L.CRS("EPSG:4326", desc, {});
            // center = [data[0].wd, data[0].jd],
            // url = `http://223.82.109.183:2082/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
            // url = `http://61.131.136.25:2082/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
            // url = `http://localhost:89/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
            // this.nowPosition = center;
            // axios.post(url).then((res) => {
leafletMapOur/loginMap/js/vueMain.js
@@ -65,7 +65,7 @@
        beginMap (map, data) {
            var that = this,
                center = [data[0].wd, data[0].jd],
                url = `http://223.82.109.183:2082/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`
                url = `http://61.131.136.25:2082/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`
            // url = `http://localhost:89/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
            this.nowPosition = center
leafletMapOur/xcxMapJQ - 副本/js/vueMain.js
@@ -60,7 +60,7 @@
        beginMap(map, data) {
            var that = this,
                center = [data[0].wd, data[0].jd],
                url = `http://223.82.109.183:2082/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
                url = `http://61.131.136.25:2082/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
            // url = `http://localhost:89/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
            this.nowPosition = center;
            axios.post(url).then((res) => {
leafletMapOur/xcxMapJQ/js/vueMain.js
@@ -60,7 +60,7 @@
        beginMap(map, data) {
            var that = this,
                center = [data[0].wd, data[0].jd],
                url = `http://223.82.109.183:2082/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
                url = `http://61.131.136.25:2082/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
            // url = `http://localhost:89/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
            this.nowPosition = center;
            axios.post(url).then((res) => {
leafletMapOur/xcxMapJQLG/js/vueMain.js
@@ -106,7 +106,7 @@
        beginMap(map, data) {
            var that = this,
                center = [data[0].wd, data[0].jd],
                url = `http://223.82.109.183:2082/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
                url = `http://61.131.136.25:2082/api/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
            // url = `http://localhost:89/alarm/alarm/APP-getAlarm?id=${data[0].id}`;
            this.nowPosition = center;
            axios.post(url).then((res) => {
leafletMapOur/xcxjingqingmap_clock_sign_in/js/vueMain.js
@@ -59,7 +59,7 @@
            //保安信息查询
            axios({
                method: "POST",
                url: `http://223.82.109.183:2082/api/blade-user/details`,
                url: `http://61.131.136.25:2082/api/blade-user/details`,
                params: {
                    id: that.snumber,
                },
leafletMapOur/xcxjingqingmap_lxdh/js/lxdhmap.js
@@ -404,7 +404,7 @@
        //警情点查询
        axios({
            method: "post",
            url: `http://223.82.109.183:2082/api/alarm/alarm/APP-getAlarming`,
            url: `http://61.131.136.25:2082/api/alarm/alarm/APP-getAlarming`,
            params: {
                securityId: "1370564873280430082",
            },
manifest.json
@@ -1,6 +1,6 @@
{
    "name" : "洪城义警",
    "appid" : "__UNI__7672DEF",
    "appid" : "__UNI__1A57486",
    "description" : "",
    "versionName" : "1.0.0",
    "versionCode" : "100",
pages/business/businesscopy2.vue
@@ -141,7 +141,7 @@
                    },
                    success: (res) => {
                        if(res.statusCode == "200"){
                            var urls="http://223.82.109.183:2080/securityInfo.html?securityNumber="+res.data.data.securitynumber;
                            var urls="http://61.131.136.25:2080/securityInfo.html?securityNumber="+res.data.data.securitynumber;
                            uni.navigateTo({
                                url: '../voting/information?url=' + urls
                            });
pages/clockSignIn/clockSignIn.vue
@@ -82,7 +82,7 @@
            this.getOneselfInFo();
            //long 转换为字符串
            var code = JSON.stringify(this.$store.state.puserID.toString());
            this.urls = "http://223.82.109.183:2082/xcxjingqingmap_clock_sign_in/xcxmap.html?snumber="+code;
            this.urls = "http://61.131.136.25:2082/xcxjingqingmap_clock_sign_in/xcxmap.html?snumber="+code;
        },
        methods: {
            //获取当前位置信息
pages/exam/examTextPage.vue
@@ -31,7 +31,7 @@
            var that = this
            // 理论考试
            uni.request({
                url: "http://223.82.109.183:2080/api/simulateExamRecord/beginExam",
                url: "http://61.131.136.25:2080/api/simulateExamRecord/beginExam",
                // url: "http://localhost:81/simulateExamRecord/beginExam",
                method: 'POST',
                data: {
@@ -129,7 +129,7 @@
                uni.request({
                    url: "http://223.82.109.183:2080/api/simulateExamRecord/saveSimulateExam",
                    url: "http://61.131.136.25:2080/api/simulateExamRecord/saveSimulateExam",
                    method: 'POST',
                    data: sendData,
                    success: (res) => {
pages/grabOrders/grabOrdersMain/business.vue
@@ -177,7 +177,7 @@
                    success: (res) => {
                        if (res.statusCode == "200") {
                            var urls =
                                "http://223.82.109.183:2080/securityInfo.html?securityNumber=" +
                                "http://61.131.136.25:2080/securityInfo.html?securityNumber=" +
                                res.data.data.securitynumber;
                            uni.navigateTo({
                                url: "../../voting/information?url=" + urls,
pages/grabOrders/grabOrdersZAFFPX/map.vue
@@ -715,7 +715,7 @@
                    fname: "培训老师张",
                    myid: 111,
                    myName: 222,
                    url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    url: "http://61.131.136.25:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    // })
                }
            } else {
@@ -756,7 +756,7 @@
            // var a = options.html != undefined ? options.html : "xcxMapJQ/xcxmap.html";
            // console.log(a)
            // let a = "grabOrdersMap/xcxmap.html";
            // this.urls = "http://223.82.109.183:2082/" + a + "?data=" + data;
            // this.urls = "http://61.131.136.25:2082/" + a + "?data=" + data;
            // let name = 1; //1是本地  2是服务器
            // // let name = 1;
            // let b = this.$store.state.piAPI;
pages/grabOrders/grabOrdersZAXC/map.vue
@@ -790,7 +790,7 @@
                    fname: "管理者",
                    myid: 111,
                    myName: 222,
                    url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    url: "http://61.131.136.25:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    gather: "28.699957,115.862118",
                    gathername: "江西省南昌市红谷滩区沙井街道凤凰中大道南昌市公安局"
                    // })
@@ -859,7 +859,7 @@
            // var a = options.html != undefined ? options.html : "xcxMapJQ/xcxmap.html";
            // console.log(a)
            // let a = "grabOrdersMap/xcxmap.html";
            // this.urls = "http://223.82.109.183:2082/" + a + "?data=" + data;
            // this.urls = "http://61.131.136.25:2082/" + a + "?data=" + data;
            // let name = 1; //1是本地  2是服务器
            // // let name = 1;
            // let b = this.$store.state.piAPI;
pages/grabOrders/grabOrdersZAYWXC/map.vue
@@ -769,7 +769,7 @@
                    fname: "管理者",
                    myid: 111,
                    myName: 222,
                    url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    url: "http://61.131.136.25:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    gather: "28.699957,115.862118",
                    gathername: "江西省南昌市红谷滩区沙井街道凤凰中大道南昌市公安局"
                    // })
@@ -839,7 +839,7 @@
            // var a = options.html != undefined ? options.html : "xcxMapJQ/xcxmap.html";
            // console.log(a)
            // let a = "grabOrdersMap/xcxmap.html";
            // this.urls = "http://223.82.109.183:2082/" + a + "?data=" + data;
            // this.urls = "http://61.131.136.25:2082/" + a + "?data=" + data;
            // let name = 1; //1是本地  2是服务器
            // // let name = 1;
            // let b = this.$store.state.piAPI;
pages/grabOrders/grabOrders备份/map - 副本.vue
@@ -46,7 +46,7 @@
                    team: "你,他,它",
                    time: "2022-02-18 14:15:52",
                    type: "2",
                    url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    url: "http://61.131.136.25:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                })
            } else {
@@ -58,7 +58,7 @@
            // var a = options.html != undefined ? options.html : "xcxMapJQ/xcxmap.html";
            // console.log(a)
            // let a = "grabOrdersMap/xcxmap.html";
            // this.urls = "http://223.82.109.183:2082/" + a + "?data=" + data;
            // this.urls = "http://61.131.136.25:2082/" + a + "?data=" + data;
            let name = 1; //1是本地  2是服务器
            // let name = 1;
            let b = this.$store.state.piAPI;
pages/grabOrders/grabOrders备份/map.vue
@@ -719,7 +719,7 @@
                    fname: "管理者",
                    myid: 111,
                    myName: 222,
                    url: "http://223.82.109.183:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    url: "http://61.131.136.25:2081/zhba/upload/20220218/67f0c8bf3e7b5024c64133691f265072.ico",
                    // })
                }
            } else {
@@ -760,7 +760,7 @@
            // var a = options.html != undefined ? options.html : "xcxMapJQ/xcxmap.html";
            // console.log(a)
            // let a = "grabOrdersMap/xcxmap.html";
            // this.urls = "http://223.82.109.183:2082/" + a + "?data=" + data;
            // this.urls = "http://61.131.136.25:2082/" + a + "?data=" + data;
            // let name = 1; //1是本地  2是服务器
            // // let name = 1;
            // let b = this.$store.state.piAPI;
pages/groupChat/chating.vue
@@ -222,7 +222,7 @@
                        var resdata = res.data.data.user;
                        for (var i = 0; i < resdata.length; i++) {
                            if(resdata[i].avatar == null || resdata[i].avatar == ""){
                                resdata[i].avatar = "http://223.82.109.183:2082/img/bg/img-logo.png";
                                resdata[i].avatar = "http://61.131.136.25:2082/img/bg/img-logo.png";
                            }
                            
                            if(resdata[i].id == that.senId){
pages/groupChat/chatingQZ.vue
@@ -230,7 +230,7 @@
                        var resdata = res.data.data;
                        for (var i = 0; i < resdata.length; i++) {
                            if(resdata[i].avatar == null || resdata[i].avatar == ""){
                                resdata[i].avatar = "http://223.82.109.183:2082/img/bg/img-logo.png";
                                resdata[i].avatar = "http://61.131.136.25:2082/img/bg/img-logo.png";
                            }else{
                                resdata[i].avatar = resdata[i].avatar;
                            }
pages/groupChat/chatingcopy.vue
@@ -218,7 +218,7 @@
                        var resdata = res.data.data.user;
                        for (var i = 0; i < resdata.length; i++) {
                            if(resdata[i].avatar == null || resdata[i].avatar == ""){
                                resdata[i].avatar = "http://223.82.109.183:2082/img/bg/img-logo.png";
                                resdata[i].avatar = "http://61.131.136.25:2082/img/bg/img-logo.png";
                            }
                            
                            if(resdata[i].senderId == WxStorage.get("ids")){
pages/groupChat/groupChat.vue
@@ -142,7 +142,7 @@
                            var resdata = res.data.data;
                            for (var i = 0; i < resdata.length; i++) {
                                if(resdata[i].avatar == null || resdata[i].avatar == ""){
                                    resdata[i].avatar = "http://223.82.109.183:2082/img/bg/img-logo.png";
                                    resdata[i].avatar = "http://61.131.136.25:2082/img/bg/img-logo.png";
                                }
                            }
                            that.dataListP = resdata;
@@ -160,7 +160,7 @@
                            var resdata = res.data.data;    
                            for (var i = 0; i < resdata.length; i++) {
                                if(resdata[i].avatar == null || resdata[i].avatar == ""){
                                    resdata[i].avatar = "http://223.82.109.183:2082/img/bg/qunz.png";
                                    resdata[i].avatar = "http://61.131.136.25:2082/img/bg/qunz.png";
                                }
                            }
                            that.dataListQZ = resdata;
@@ -179,7 +179,7 @@
                            for (var i = 0; i < resdata.length; i++) {
                    
                                if(resdata[i].avatar == null || resdata[i].avatar == ""){
                                    resdata[i].avatar = "http://223.82.109.183:2082/img/bg/img-logo.png";
                                    resdata[i].avatar = "http://61.131.136.25:2082/img/bg/img-logo.png";
                                }
                            }
                            that.dataListTXL = resdata;
pages/investigation/investigation.vue
@@ -51,7 +51,7 @@
            var longitude = wx.getStorageSync("longitude");
            // alert(wx.getStorageSync("longitude"));
            that.urls = "http://223.82.109.183:2082/xcxjingqingmap_lxdh/lxdhmap.html?data=" + data + "&latitude=" +
            that.urls = "http://61.131.136.25:2082/xcxjingqingmap_lxdh/lxdhmap.html?data=" + data + "&latitude=" +
                latitude + "&longitude=" + longitude;
pages/map/map.vue
@@ -33,7 +33,7 @@
            // console.log(options.html)
            var a = options.html != undefined ? options.html : "xcxMapJQ/xcxmap.html";
            // console.log(a)
            this.urls = "http://223.82.109.183:2082/" + a + "?data=" + data;
            this.urls = "http://61.131.136.25:2082/" + a + "?data=" + data;
            // this.dataList = data;
            // console.log(this.urls);
        },
pages/myself/myself.vue
@@ -47,7 +47,7 @@
    export default {
        data() {
            return {
                useimg: 'http://223.82.109.183:2082/img/bg/batx.png',
                useimg: 'http://61.131.136.25:2082/img/bg/batx.png',
                showTextmsg: false,
                textmsg: {
                    title: '提示',
pages/patrol/patrol_copy.vue
@@ -17,8 +17,8 @@
            //long 转换为字符串
            var code = JSON.stringify(this.$store.state.puserID.toString());
            // var code = JSON.stringify("1370564873280430082");
            // this.urls = "http://223.82.109.183:2082/xcxjingqingmap_patrol/xcxmap.html?snumber="+code;
            this.urls = "http://223.82.109.183:2082/xcxMapPatrol/xcxmap.html?snumber="+code;
            // this.urls = "http://61.131.136.25:2082/xcxjingqingmap_patrol/xcxmap.html?snumber="+code;
            this.urls = "http://61.131.136.25:2082/xcxMapPatrol/xcxmap.html?snumber="+code;
        },
    }
</script>
store/actions.js
@@ -72,7 +72,7 @@
                    // data.userPhon = res.user_id;
                    store.commit('login', data)
                    wx.request({
                        url: "http://223.82.109.183:2080/api/userVip/getUserVipInfo?idCardNo=" +
                        url: "http://61.131.136.25:2080/api/userVip/getUserVipInfo?idCardNo=" +
                            res
                            .data.cardid,
                        method: 'get',
store/apiConfig.js
@@ -1,10 +1,10 @@
let i = 3; //1是服务器
let i = 1; //1是服务器
if (i == 1) {
    var api = 'http://223.82.109.183:2082/api/';
    var wsapi = 'ws://223.82.109.183:2082/wss/websocket';
    var api = 'http://61.131.136.25:2082/api/';
    var wsapi = 'ws://61.131.136.25:2082/wss/websocket';
} else if (i == 0) { //曾
    var api = 'http://localhost:83/';
    var wsapi = 'ws://192.168.0.108:9034/websocket';
    var wsapi = 'ws://localhost:9034/websocket';
} else if (i == 2) { //唐
    var api = 'http://192.168.0.110:83/';
    var wsapi = 'ws://192.168.0.110:9034/websocket';
store/state.js
@@ -18,11 +18,11 @@
    Jurisdiction: '', //角色辖区
    logPath: '',
    piAPI: apis.api,
    // piAPI: 'http://223.82.109.183:2082/api/',
    // piAPI: 'http://61.131.136.25:2082/api/',
    //piAPI: 'http://192.168.0.110:83/',
    // piAPI: 'http://192.168.0.222:83/',
    //piAPI: 'http://223.82.109.183:2082/api/',
    BaopiAPI: 'http://223.82.109.183:2080/api/',
    //piAPI: 'http://61.131.136.25:2082/api/',
    BaopiAPI: 'http://61.131.136.25:2080/api/',
    firstlogin: null,
    puserName: '',
    puserID: '',
store/websocket.js
@@ -7,7 +7,7 @@
import $store from './index.js'
import apis from "./apiConfig.js"
// let url = 'ws://192.168.0.108:9034/websocket';
// let url = 'ws://223.82.109.183:2082/websocket';
// let url = 'ws://61.131.136.25:2082/websocket';
let url = apis.wsapi;
const webSockets = new Wst(url);
vue.config.js
@@ -27,7 +27,7 @@
                // target: 'http://192.168.0.107:85', //唐
                target: 'http://192.168.0.108:83',//曾W
                // target: 'http://192.168.0.107:81',//唐N
                // target: 'http://223.82.109.183:81', //唐N
                // target: 'http://61.131.136.25:81', //唐N
                //远程演示服务地址,可用于直接启动项目
                ws: true,
                pathRewrite: {