落日与鲸
2025-02-25 61baff2c6d976f64f34ed8f152854e3031462897
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
12个文件已修改
105 ■■■■■ 已修改文件
H5/pages.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/Appeal/Appeal.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/add-progress/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/dispatchWorkOrder/dispatchWorkOrder.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/index/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/list/list.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/location/location.vue 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/problemReporting/problemReporting.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/progress/progress.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/result-entry/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/work-detail/postpone-apply.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages/work-detail/work-detail.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/pages.json
@@ -4,7 +4,7 @@
    {
        "path": "pages/index/index",
        "style": {
            "navigationBarTitleText": "uni-app",
            "navigationBarTitleText": "首页",
            "navigationStyle": "custom"
        }
    },
@@ -101,7 +101,7 @@
    ],
    "globalStyle": {
        "navigationBarTextStyle": "black",
        "navigationBarTitleText": "uni-app",
        "navigationBarTitleText": "三个身边",
        "navigationBarBackgroundColor": "#F8F8F8",
        "backgroundColor": "#F8F8F8"
    },
H5/pages/Appeal/Appeal.vue
@@ -2,7 +2,7 @@
    <view class="content">
        <view class="main">
            <view class="card  flex a-center h-108 j-between">
                <text class="w-108 fs-27 font-bold mr-85">时间</text>
                <text class="w-108 fs-27 font-bold mr-85">发生时间</text>
                <view class=" flex a-center j-between flex1" @click="showDate=true">
                    <input v-model="time" disabled placeholder-style="color: rgba(0,0,0,0.3);font-size:27rpx;"
                        class="uni-input flex1" maxlength="10" placeholder="请选择问题发生的时间" />
@@ -18,7 +18,7 @@
                </view>
            </view>
            <view class="card  flex a-center h-108 j-between">
                <text class="w-108 fs-27 font-bold mr-85">群众</text>
                <text class="w-108 fs-27 font-bold mr-85">群众姓名</text>
                <input v-model="name" placeholder-style="color: rgba(0,0,0,0.3);font-size:27rpx;"
                    class="uni-input flex1" placeholder="请输入群众姓名" />
H5/pages/add-progress/index.vue
@@ -17,7 +17,7 @@
                    </view>
                </view>
                <view class="flex-column a-center">
                    <view class="fs-27 lh-38 font-bold">群众</view>
                    <view class="fs-27 lh-38 font-bold">群众姓名</view>
                    <view class="fs-27 lh-38 mt-10">{{ info.name }}</view>
                </view>
                <view class="flex-column a-center">
H5/pages/dispatchWorkOrder/dispatchWorkOrder.vue
@@ -13,7 +13,7 @@
            <view class="table-head">
                <view class="type flex1">问题类型</view>
                <view class="person flex1">群众</view>
                <view class="person flex1">群众姓名</view>
                <view class="phone flex1">联系电话</view>
            </view>
H5/pages/index/index.vue
@@ -37,7 +37,7 @@
                </view>
                <view class="pt-38 pb-38 bg1 w-333 br-19 mt-19 flex a-center">
                    <image class="w-81 h-77 ml-38" src="/static/home/img8.png" mode=""></image>
                    <text class="ml-37">分析统计</text>
                    <text class="ml-37">统计分析</text>
                </view>
                <view class="pt-38 pb-38 bg1 w-333 br-19 mt-19 flex a-center" @click="onClick()" v-if="showData">
                    <image class="w-94 h-77 ml-38" src="/static/home/img7.png" mode=""></image>
H5/pages/list/list.vue
@@ -84,7 +84,7 @@
                    </view>
                    <view class="">
                        <view class="">
                            群众
                            群众姓名
                        </view>
                        <view class="mt-10">
                            {{ item.name || '' }}
H5/pages/location/location.vue
@@ -11,7 +11,7 @@
        <view class=" main">
            <view class="searchMain  mb-35 mt-38">
                <view class="search fs-27 ">
                    <text class="mr-35 ml-50">成都市</text>
                    <text class="mr-35 ml-50">{{ city }}</text>
                    <image class="w-17 h-8 mr-35" src="/static/location/toleft.png" mode=""></image>
                    <image class="w-31 h-31 mr-13" src="/static/location/search.png" mode=""></image>
                    <input class="flex1" v-model="keyword" placeholder="搜索小区/写字楼等"
@@ -42,18 +42,12 @@
                map: null,
                uid: 0,
                keyword: '',
                markers:[],
                locationList: [],
                city: '攀枝花市'
            };
        },
        methods: {
            clearMarkers() {
                // 清除所有标点
                this.markers.forEach((marker) => {
                    this.map.removeOverlay(marker);
                });
                this.markers = []; // 清空存储标点的数组
            },
            back() {
                uni.navigateBack()
            },
@@ -108,11 +102,47 @@
        },
        onReady() {
            this.map = new BMapGL.Map("container"); // 创建地图实例 
            console.log(this.map);
            // uni.getLocation({
            //     type: 'wgs84',
            //     success: (res) => {
            navigator.geolocation.getCurrentPosition(success, error, options);
            uni.getLocation({
                type: 'wgs84',
                success: (res) => {
                    console.log(res, 'resgetLocation');
            function success(position) {
                const latitude = position.coords.latitude;
                const longitude = position.coords.longitude;
                const accuracy = position.coords.accuracy; // 精度,单位米
                console.log(`纬度: ${latitude}, 经度: ${longitude}, 精度: ${accuracy}`);
                //  在这里可以使用获取到的经纬度信息,例如在地图上显示位置等。
            }
            function error(err) {
                console.log(err);
                switch (err.code) {
                    case err.PERMISSION_DENIED:
                        console.error("用户拒绝了位置请求。");
                        break;
                    case err.POSITION_UNAVAILABLE:
                        console.error("无法获取位置信息。");
                        break;
                    case err.TIMEOUT:
                        console.error("位置请求超时。");
                        break;
                    default:
                        console.error("未知错误。");
                }
            }
            const options = {
                enableHighAccuracy: true, // 启用高精度定位
                timeout: 5000, // 5 秒超时
                maximumAge: 0 //  不使用缓存
            };
            let res = {
                longitude: 101.725544,
                latitude: 26.587259
            }
                    this.longitude = res.longitude;
                    this.latitude = res.latitude;
                    var point = new BMapGL.Point(res.longitude, res.latitude); // 创建点坐标
@@ -120,11 +150,9 @@
                    this.map.centerAndZoom(point, 12);
                    var marker = new BMapGL.Marker(point);
                    this.map.addOverlay(marker);
                    this.markers.push(marker);
                    var myGeo = new BMapGL.Geocoder();
                    // 根据坐标得到地址描述    
                    myGeo.getLocation(new BMapGL.Point(res.longitude, res.latitude), (result) => {
                        console.log(result, 'result');
                        this.locationList = result.surroundingPois.map((item, index) => {
                            item.id = index + 1
                            return item
@@ -132,7 +160,6 @@
                    })
                    this.map.addEventListener('click', (e) => {
                        this.clearMarkers()
                        var mercator = this.map.lnglatToMercator(e.latlng.lng, e.latlng.lat);
                        this.latitude = e.latlng.lat
                        this.longitude = e.latlng.lng
@@ -150,10 +177,12 @@
                        })
                        var marker = new BMapGL.Marker(point);
                        this.map.addOverlay(marker);
                          this.markers.push(marker);
                    });
                }
            });
            // },
            // error:err=>{
            //     console.log(err,'err');
            // }
            // });
        }
    }
H5/pages/problemReporting/problemReporting.vue
@@ -13,7 +13,7 @@
            <view class="table-head">
                <view class="type flex1">问题类型</view>
                <view class="person flex1">群众</view>
                <view class="person flex1">群众姓名</view>
                <view class="phone flex1">联系电话</view>
            </view>
H5/pages/progress/progress.vue
@@ -17,7 +17,7 @@
                    </view>
                </view>
                <view class="flex-column a-center">
                    <view class="fs-27 lh-38 font-bold">群众</view>
                    <view class="fs-27 lh-38 font-bold">群众姓名</view>
                    <view class="fs-27 lh-38 mt-10">{{ info.name }}</view>
                </view>
                <view class="flex-column a-center">
H5/pages/result-entry/index.vue
@@ -19,7 +19,7 @@
                            info.problemType }}</view>
                    </view>
                    <view class="flex-column a-center">
                        <view class="fs-27 lh-38 font-bold">群众</view>
                        <view class="fs-27 lh-38 font-bold">群众姓名</view>
                        <view class="fs-27 lh-38 mt-10">{{ info.name }}</view>
                    </view>
                    <view class="flex-column a-center">
H5/pages/work-detail/postpone-apply.vue
@@ -17,7 +17,7 @@
                    </view>
                </view>
                <view class="flex-column a-center">
                    <view class="fs-27 lh-38 font-bold">群众</view>
                    <view class="fs-27 lh-38 font-bold">群众姓名</view>
                    <view class="fs-27 lh-38 mt-10">{{ info.name }}</view>
                </view>
                <view class="flex-column a-center">
H5/pages/work-detail/work-detail.vue
@@ -120,7 +120,7 @@
                    <view class="value">{{orderInfo.problemType||''}}</view>
                </view>
                <view class="flex j-between">
                    <view class="label">群众</view>
                    <view class="label">群众姓名</view>
                    <view class="value">{{orderInfo.name||''}}</view>
                </view>
                <view class="flex j-between">
@@ -284,12 +284,12 @@
                        </view>
                        <view class="requireItem">
                            <view class="flex a-center j-between mb-23">
                                <view class="name" :class="index==flowsList.length-1?'opt1':''">{{item.name||''}}</view>
                                <view class="time" :class="index==flowsList.length-1?'opt1':''">
                                <view class="name">{{item.name||''}}</view>
                                <view class="time">
                                    {{item.createTime|formatTime}}
                                </view>
                            </view>
                            <view class="name fs-23" :class="index==flowsList.length-1?'opt1':''">
                            <view class="name fs-23">
                                {{item.type==0?"上报":'下派'}}
                            </view>
@@ -302,8 +302,10 @@
        <!-- 上级显示 -->
        <view class="btnButtom" v-if="[0,1,2,6].includes(orderInfo.status) && !isParty">
            <view class="btnDown" @click.stop="toUp" v-if="userInfo.accountLevel>1">问题上报</view>
            <view class="btnDown" @click.stop="toDown" v-if="userInfo.accountLevel<4">诉求下派</view>
            <view class="btnDown" @click.stop="toUp" v-if="userInfo.accountLevel>1"
                :class="[2,3].includes(userInfo.accountLevel)?'':'partyUp'">问题上报</view>
            <view class="btnDown" @click.stop="toDown" v-if="userInfo.accountLevel<4"
                :class="[2,3].includes(userInfo.accountLevel)?'':'partyDown'">诉求下派</view>
            <view class="btnAdd" @click="addProgress">添加办理进度</view>
            <view class="btnAdd" @click="resultEntery">办理结果录入</view>
        </view>