+人员查询基础页，屏蔽群众人员查询，巡查页面修复

liuyg

2022-03-08 24327e8eb3dccfa7c6c750004e97e5a003166e33

+人员查询基础页，屏蔽群众人员查询，巡查页面修复

 pages/alarm_list/alarm_list.vue

@@ -15,14 +15,70 @@

<script>
    import pageNav from '@/components/page-nav/page-nav.vue';
    import list from "./demo.config.js";
    // import list from "./demo.config.js";
    export default {
        components: {
            pageNav
        },
        data() {
            let list = [{
                    groupName: '基础功能',
                    list: [{
                        path: '/pages/alarm_list/integral/integral',
                        icon: 'cell',
                        title: '查积分',
                    }, {
                        path: '/pages/grabOrders/taskCount/taskCount/grabOrders',
                        icon: 'sticky',
                        title: '查任务',
                    }]
                },
                {
                    groupName: '业务功能',
                    list: [{
                            path: 'pages/alarm_list/organ/organ',
                            icon: 'layout',
                            title: '组织申请',
                        }, {
                            path: 'pages/alarm_list/industry/industry',
                            icon: 'tabbar',
                            title: '行业政策',
                        },
                        {
                            path: 'pages/grabOrders/personnelCount/personnelCount',
                            icon: 'tabbar',
                            title: '人员统计',
                        },
                    ]
                }
            ];

            let who = this.$store.state.roleid == "1417092295132561409" ?
                "民警" :
                (this.$store.state.roleid == "1430798487303671810" ?
                    '管理员' :
                    this.$store.state.roleid == "1123598816738675201" ?
                    '超级管理员' :
                    "其他")
            // console.log(this.$store.state.roleid)
            // console.log(who)
            let lists = [];
            for (let k in list) {
                let listin = list[k].list;
                lists.push(list[k]);
                lists[k].list = [];
                for (let kin in listin) {
                    if (who == "其他") {
                        if (listin[kin].title == "人员统计") {
                            continue;
                        }
                    }
                    lists[k].list.push(listin[kin])
                }
            }
            // console.log(lists)
            return {
                list: list,
                list: lists,
                title: '基础功能示例合集',
                desc: '众多示例覆盖开发过程的各个需求，正在不断完善中。可让您快速集成，开箱即用。'
            }
@@ -35,7 +91,7 @@
            },
        },
        onShow() {
			

        },
        created() {


 pages/grabOrders/grabOrdersZAFFPX - 副本/feedback.vue

File was deleted

 pages/grabOrders/grabOrdersZAFFPX - 副本/grabOrders.vue

File was deleted

 pages/grabOrders/grabOrdersZAFFPX - 副本/inPage/page0.vue

File was deleted

 pages/grabOrders/grabOrdersZAFFPX - 副本/inPage/page1.vue

File was deleted

 pages/grabOrders/grabOrdersZAFFPX - 副本/inPage/page2.vue

File was deleted

 pages/grabOrders/grabOrdersZAFFPX - 副本/map.vue

File was deleted

 pages/grabOrders/grabOrdersZAFFPX - 副本/map/img/dingwei.png

Binary files differ

 pages/grabOrders/grabOrdersZAFFPX - 副本/map/img/dinw/dinw1.png

Binary files differ

 pages/grabOrders/grabOrdersZAFFPX - 副本/map/img/dinw/dinw2.png

Binary files differ

 pages/grabOrders/grabOrdersZAFFPX - 副本/map/img/dinw/dinw3.png

Binary files differ

 pages/grabOrders/grabOrdersZAFFPX - 副本/map/img/dinw/dinw4.png

Binary files differ

 pages/grabOrders/grabOrdersZAFFPX - 副本/map/img/dinw/dinw5.png

Binary files differ

 pages/grabOrders/grabOrdersZAFFPX - 副本/map/img/dinw/dinw6.png

Binary files differ

 pages/grabOrders/grabOrdersZAFFPX - 副本/map/img/dinw/location.png

Binary files differ

 pages/grabOrders/grabOrdersZAFFPX - 副本/map/js/move.js

File was deleted

 pages/grabOrders/grabOrdersZAFFPX - 副本/map/js/moveUniAppMap.js

File was deleted

 pages/grabOrders/grabOrdersZAFFPX - 副本/once.vue

Binary files differ

 pages/grabOrders/grabOrdersZAFFPX - 副本/task - 副本.vue

File was deleted

 pages/grabOrders/grabOrdersZAFFPX - 副本/task.vue

File was deleted

 pages/grabOrders/grabOrdersZAXC/grabOrders.vue

@@ -12,7 +12,7 @@
                <view class="swiper-item">
                    <scroll-view scroll-y :style="{ height: useHeight, width: '100%' }" @scrolltolower="onreachBottom">
                        <page0 :listData="leftdata" :swiperCurrent="0" v-if="item.name == '正在进行'" @openOnce="openOnce"
                            @getOrders="getOrders"></page0>
                            @getOrders="getOrders" @outOrders="outOrders"></page0>
                        <page1 :listData="rightdata" :swiperCurrent="1" v-if="item.name == '可参与'" @openOnce="openOnce"
                            @getOrders="getOrders"></page1>
                        <page2 :listData="overdata" :swiperCurrent="2" v-if="item.name == '已完成'" @openOnce="openOnce"
@@ -119,6 +119,29 @@
            }
        },
        methods: {
            //取消任务
            outOrders(d) {
                let that = this;
                uni.request({
                    url: this.$store.state.piAPI +
                        `taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`,
                    method: "get",
                    // data: d,
                    header: {
                        "content-type": "application/x-www-form-urlencoded",
                    },
                    success(res) {
                        const data = res.data.msg;
                        if (data == "操作成功") {
                            uni.showToast({
                                title: data,
                                duration: 2000,
                            });
                        }
                        that.$store.commit("changegotuGrabOrders");
                    }
                })
            },
            //实时位置传递
            setNowposition(rid, jd, wd) {
                console.log(uni.getStorageSync("ids") || this.$store.state.puserID, rid, jd, wd);
@@ -190,7 +213,7 @@
                        tasktype: '0'
                    };
                let isWhere = val == 0 ? "可参与" : val == 1 ? "正在进行" : "已完成";
                if (val == 1) {
                if (val == 0) {
                    d.jurisdiction = this.$store.state.UserData.jurisdiction;
                    d.workjurisdiction = this.$store.state.UserData.workjurisdiction;
                }
@@ -312,7 +335,6 @@
                    item = b.item,
                    that = this;
                console.log(val, item)

                if (val == 0) { //正在进行
                    if (item.type == "2") { //开始任务按钮
                        // that.useWebScoketApi(item.id, item.serid, "start");

 pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue

@@ -39,10 +39,12 @@
<script>
    import page0 from "./inPage/page0.vue";
    import page1 from "./inPage/page1.vue";
    import page2 from "./inPage/page2.vue";
    export default {
        components: {
            page0,
            page1,
            page2
        },
        data() {
            return {
@@ -339,7 +341,6 @@
                    item = b.item,
                    that = this;
                console.log(val, item)

                if (val == 0) { //正在进行
                    if (item.type == "2") { //开始任务按钮
                        // that.useWebScoketApi(item.id, item.serid, "start");

 pages/grabOrders/personnelCount/personnelCount.vue

@@ -1,6 +1,49 @@
<template>
    <view>
		
    <view class="advisory-big">
        <view class="m-top">
        </view>
        <view class="bomBut">
            <view style="width: 400rpx;padding-left: 30rpx;">
                <u-tabs :list="list" :is-scroll="false"></u-tabs>
            </view>
            <u-row gutter="16">
                <u-col span="7">
                    <view class="bom-text">当前积分</view>
                    <view class="bom-int">{{dqjf}}</view>
                </u-col>
                <u-col span="5">
                    <view class="bom-text">累计积分</view>
                    <view class="bom-int">{{ljjf}}</view>
                </u-col>
            </u-row>
        </view>

        <view class="bomList">
            <view class="">
                <u-dropdown border-bottom="true">
                    <u-dropdown-item v-model="value1" @change="change" title="收支类型" :options="options1"></u-dropdown-item>
                </u-dropdown>
            </view>

            <scroll-view id="articleBox" :style="{ height: swiperHeight + 'px' }" class="article-content" scroll-y
                style="width: 100%; margin-top: 15rpx;">
                <view v-for="i in data" class="advisory-model" @click="goDetail(i)">
                    <view class="advisory-left">
                        <view class="advisory-title-top">
                            <view class="advisory-title">{{i.access}}</view>
                        </view>
                        <view class="advisory-title-down">
                            <view class="advisory-title-time">{{i.time}}</view>
                        </view>
                    </view>
                    <view class="advisory-right">
                        <view v-if="i.type =='2'" class="advisory-title-integral">- {{i.integral}}</view>
                        <view v-if="i.type =='1'" class="advisory-title-integraladd">+{{i.integral}}</view>
                    </view>
                    <u-line class="advisory-line" color="#ebebeb" />
                </view>
            </scroll-view>
        </view>
    </view>
</template>

@@ -8,15 +51,211 @@
    export default {
        data() {
            return {
				
                dqjf:"暂无",
                ljjf:"暂无",
                list: [{
                    name: '积分明细'
                }, {
                    name: ''
                }, {
                    name: '',
                }],
                options1: [{
                        label: '全部',
                        value: 1,
                    },
                    {
                        label: '积分获取',
                        value: 2,
                    },
                    {
                        label: '积分支出',
                        value: 3,
                    }
                ],
                value1: 1,
                data: [],
                swiperHeight: 0
            }
        },
        methods: {
			
            onLoad() {
                this.getData(1);
            },
            getData(e){
                var that = this;
                uni.request({
                    url:that.$store.state.piAPI + '/integral/selectCount?uid='+this.$store.state.puserID+"&type="+e,
                    method:'POST',
                    success(res) {
                        that.dqjf = res.data.data.sjf;
                        that.ljjf = res.data.data.zjf.integral;
                        that.data = res.data.data.list;
                    }
                });
            },
            goDetail() {
				
            },
            change(e){
                this.getData(e);
            },
            onReady() {
                let that = this;
                uni.getSystemInfo({
                    success(e) {
                        console.log(e);
                        let {
                            windowWidth,
                            windowHeight,
                            safeArea
                        } = e;
                        const query = uni.createSelectorQuery().in(that);
                        query
                            .select('#articleBox')
                            .boundingClientRect(data => {
                                that.swiperHeight = (safeArea.bottom - data.top - 50);
                            })
                            .exec();
                    }
                });
            },
        }
    }
</script>

<style>
    .advisory-big {
        width: 100%;
        height: 100vh;
        background-color: #f7f7f7;
    }

    .bomBut {
        width: 93%;
        margin: 0 auto;
        height: 7.5rem;
        z-index: 999;
        border-radius: 10px;
        margin-top: -2.5rem;
        background-color: #fff;
    }

    .bomList {
        width: 93%;
        margin: 0 auto;
        height: 30rem;
        z-index: 999;
        border-radius: 10px;
        margin-top: 1rem;
        background-color: #fff;
    }

    .bom-text {
        font-size: 30rpx;
        font-family: PingFang SC;
        color: #585b61;
        padding-left: 30rpx;
    }

    .bom-int {
        font-size: 40rpx;
        font-family: PingFang SC;
        color: #ff910a;
        font-weight: bold;
        padding-left: 30rpx;
        padding-top: 10rpx;
    }

    .m-top {
        width: 100%;
        height: 3rem;
        border-radius: 0px 0px 20px 20px;
        background-image: linear-gradient(to bottom, #103289, #174cd1);
        color: #fff;
        flex-direction: column;
    }

    .u-row {
        margin: 10rpx 0;
    }

    .demo-layout {
        height: 80rpx;
        border-radius: 8rpx;
    }

    .bg-purple {
        background: #d3dce6;
    }

    .bg-purple-light {
        background: #e5e9f2;
    }

    .bg-purple-dark {
        background: #99a9bf;
    }

    .advisory-model {
        width: 93%;
        margin: 0 auto;
        margin-top: 0.5rem;
        height: 3rem;
        background-color: #FFF;
    }

    .advisory-title {
        font-size: 15px;
        font-weight: 550;
        overflow: hidden;
        text-overflow: ellipsis;
        display: -webkit-box;
        -webkit-line-clamp: 2;
        -webkit-box-orient: vertical;
    }

    .advisory-title-down {
        /* background-color: #0078A8; */
        width: 100%;
        height: 25%;
        font-size: 12px;
        font-weight: 350;
        color: #808080;
        padding-top: 10rpx;
    }

    .advisory-title-time {
        position: relative;
    }

    .advisory-right {
        // background-color: #222222;
        left: 25%;
        top: 30%;
        position: relative;
    }

    .advisory-left {
        width: 64%;
        height: 80%;
        float: left;
        position: relative;
        // background-color: #00FFFF;
        left: 3%;
        top: 10%;
    }

    .advisory-line {
        top: 70%;
        position: relative;
    }
	
    .advisory-title-integraladd{
        color: #00aaff;
    }
	
    .advisory-title-integral{
        color: #ff0000;
    }
</style>

 store/actions.js

@@ -6,105 +6,107 @@


const actions = {
    loging (store, data) {
        var user = [{
            name: '1',
            password: '111111'
        },
        {
            name: '2',
            password: '222222'
        },
        {
            name: '3',
            password: '333333'
        },
        ],
            pasw = md5(data.pass),
            url = this.state.piAPI + '/blade-auth/oauth/token?tenantId=000000&username=' + data.name +
                ' &password=' + pasw + '&grant_type=password&scope=all&type=account'
        // url ='http://192.168.0.109:82/blade-auth/oauth/token';
        // url ='http://192.168.0.109:82/blade-auth/oauth/token?tenantId=000000&username=admin&password=93369e86dc5fa854a0eaf75558c4039d&grant_type=password';
        // url ='http://web.byisf.com/api/blade-auth/oauth/token?tenantId=000000&username=admin&password=93369e86dc5fa854a0eaf75558c4039d&grant_type=password&scope=all';
        // console.log(url);
        wx.request({ //uniapp 自带axios
            url: url, //仅为示例，并非真实接口地址。
            // data: d,
            // data: {
            //     tenantId: '000000',
            //     username: data.name,
            //     password: pasw,
            //     grant_type: 'password',
            //     scope: 'all',
            //     type: "account"
            // },
            header: {
                // "Content-Type":"",
                "Authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0",
                "Tenant-Id": "000000"
    loging(store, data) {
        var user = [{
                    name: '1',
                    password: '111111'
                },
                {
                    name: '2',
                    password: '222222'
                },
                {
                    name: '3',
                    password: '333333'
                },
            ],
            pasw = md5(data.pass),
            url = this.state.piAPI + '/blade-auth/oauth/token?tenantId=000000&username=' + data.name +
            ' &password=' + pasw + '&grant_type=password&scope=all&type=account'
        // url ='http://192.168.0.109:82/blade-auth/oauth/token';
        // url ='http://192.168.0.109:82/blade-auth/oauth/token?tenantId=000000&username=admin&password=93369e86dc5fa854a0eaf75558c4039d&grant_type=password';
        // url ='http://web.byisf.com/api/blade-auth/oauth/token?tenantId=000000&username=admin&password=93369e86dc5fa854a0eaf75558c4039d&grant_type=password&scope=all';
        // console.log(url);
        wx.request({ //uniapp 自带axios
            url: url, //仅为示例，并非真实接口地址。
            // data: d,
            // data: {
            //     tenantId: '000000',
            //     username: data.name,
            //     password: pasw,
            //     grant_type: 'password',
            //     scope: 'all',
            //     type: "account"
            // },
            header: {
                // "Content-Type":"",
                "Authorization": "Basic c2FiZXI6c2FiZXJfc2VjcmV0",
                "Tenant-Id": "000000"

                // "Cookie": "JSESSIONID=maOJY05vT2jj4nHwsQGSPgWWVFH1mY-TGWOLYCSh"
            },
            method: "post",
            //     // dataType: 'JSON',
            success: (res) => {
                if (res.statusCode == 200) {
                    if (res.data.error_code == "400") {
                        uni.hideNavigationBarLoading()
                        uni.showToast({
                            title: '密码错误，请重试',
                            icon: 'none',
                            duration: 2000
                        })
                        return
                    }
                    store.commit('getUserData', res.data)
                    // console.log(res.data,123542);
                    data.isit = true
                    data.userName = res.data.nick_name //警袁姓名
                    data.userID = res.data.user_id //警袁id
                    data.avatar = res.data.avatar //头像
                    data.accounts = data.name
                    data.pass = data.pass
                    // data.userPhon = res.user_id;
                    store.commit('login', data)
                // "Cookie": "JSESSIONID=maOJY05vT2jj4nHwsQGSPgWWVFH1mY-TGWOLYCSh"
            },
            method: "post",
            //     // dataType: 'JSON',
            success: (res) => {
                if (res.statusCode == 200) {
                    if (res.data.error_code == "400") {
                        uni.hideNavigationBarLoading()
                        uni.showToast({
                            title: '密码错误，请重试',
                            icon: 'none',
                            duration: 2000
                        })
                        return
                    }
                    store.commit('getUserData', res.data)
                    console.log(res.data, 123542);
                    data.isit = true
                    store.state.roleid = res.data.role_id; //角色id
                    data.userName = res.data.nick_name //警袁姓名
                    data.userID = res.data.user_id //警袁id
                    data.avatar = res.data.avatar //头像
                    data.accounts = data.name
                    data.pass = data.pass
                    // data.userPhon = res.user_id;
                    store.commit('login', data)

                    wx.request({
                        url: "http://223.82.109.183:2080/api/userVip/getUserVipInfo?idCardNo=" + res
                            .data.cardid,
                        method: 'get',
                        success: (result) => {
                            if (JSON.stringify(result.data.data) != '{}') {
                                store.state.billFlag = true
                            }
                        }
                    })
                    wx.request({
                        url: "http://223.82.109.183:2080/api/userVip/getUserVipInfo?idCardNo=" +
                            res
                            .data.cardid,
                        method: 'get',
                        success: (result) => {
                            if (JSON.stringify(result.data.data) != '{}') {
                                store.state.billFlag = true
                            }
                        }
                    })

                }
            },
            fail: (res) => {
                console.log('失去连接 请稍等')
                // console.log(res);
            }
        })
        // var time = setTimeout(() => { //模拟请求时间
        //     var ud = user,
        //         isit = false;
        //     for (var key in ud) {
        //         if (ud[key].name == data.name && ud[key].password == data.pass) {
        //             isit = true;
        //             break;
        //         } else {
        //             isit = false;
        //         }
        //     }
        //     data.isit = isit;
        //     store.commit('login', data);
        // }, 2000)
                }
            },
            fail: (res) => {
                console.log('失去连接 请稍等')
                // console.log(res);
            }
        })
        // var time = setTimeout(() => { //模拟请求时间
        //     var ud = user,
        //         isit = false;
        //     for (var key in ud) {
        //         if (ud[key].name == data.name && ud[key].password == data.pass) {
        //             isit = true;
        //             break;
        //         } else {
        //             isit = false;
        //         }
        //     }
        //     data.isit = isit;
        //     store.commit('login', data);
        // }, 2000)

    },
    ...websocket.actions,
    ...positions.actions
    },
    ...websocket.actions,
    ...positions.actions
}

export default actions

 store/state.js

@@ -11,12 +11,14 @@
    message: {
        useName: '过客',
    },
    roleid:'',//角色id
    logPath: '',
    piAPI: apis.api,
    // piAPI: 'http://223.82.109.183: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/',
    // BaopiAPI: 'http://223.82.109.183:2080/api/',
    puserName: '',
    puserID: '',
    puserIphone: '',