zengh
2021-07-04 d07eafd530ea2aa85260d7dd5ba70f4c57188553
Merge remote-tracking branch 'origin/master'
3 files modified
1 files added
254 ■■■■ changed files
pages.json 82 ●●●●● patch | view | raw | blame | history
pages/alarm_list/alarm_list.vue 20 ●●●● patch | view | raw | blame | history
pages/poput/alarmOver/alarmOver.vue 150 ●●●●● patch | view | raw | blame | history
pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue 2 ●●● patch | view | raw | blame | history
pages.json
@@ -28,7 +28,7 @@
            "style": {
                "navigationBarTitleText": "",
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle":"white"
                "navigationBarTextStyle": "white"
            }
        },
        {
@@ -37,7 +37,7 @@
            "style": {
                "navigationBarTitleText": "关于我们",
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle":"white"
                "navigationBarTextStyle": "white"
            }
        },
        {
@@ -46,7 +46,7 @@
            "style": {
                "navigationBarTitleText": "系统设置",
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle":"white"
                "navigationBarTextStyle": "white"
            }
        },
        {
@@ -63,15 +63,15 @@
            "style": {
                "navigationBarTitleText": "隐私政策",
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle":"white"
                "navigationBarTextStyle": "white"
            }
        },
        {
            "path": "pages/business/business",
            "style": {
                "navigationBarTitleText": "工作台",
                "navigationBarBackgroundColor":"#0BB9C8",
                "navigationBarTextStyle":"white"
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle": "white"
            }
        },
        {
@@ -119,8 +119,8 @@
            "name": "reported",
            "style": {
                "navigationBarTitleText": "我要报",
                "app-plus":{
                    "titleNView":false
                "app-plus": {
                    "titleNView": false
                }
            }
        },
@@ -134,17 +134,17 @@
            }
        },
        {
            "path" : "components/submit/submit",
            "style" : {}
            "path": "components/submit/submit",
            "style": {}
        },
        {
            "path": "pages/groupChat/chating",
            "name": "chating",
            "style": {
                "navigationBarTitleText": "聊天室2",
                "navigationStyle":"custom",
                "app-plus":{
                    "titleNView":false
                "navigationStyle": "custom",
                "app-plus": {
                    "titleNView": false
                }
            }
        },
@@ -153,9 +153,9 @@
            "name": "chatingQZ",
            "style": {
                "navigationBarTitleText": "聊天室2",
                "navigationStyle":"custom",
                "app-plus":{
                    "titleNView":false
                "navigationStyle": "custom",
                "app-plus": {
                    "titleNView": false
                }
            }
        },
@@ -198,8 +198,8 @@
            "path": "pages/article/article",
            "style": {
                "navigationBarTitleText": "资讯",
                "navigationBarBackgroundColor":"#0BB9C8",
                "navigationBarTextStyle":"white"
                "navigationBarBackgroundColor": "#0BB9C8",
                "navigationBarTextStyle": "white"
            }
        },
        {
@@ -228,8 +228,8 @@
            "name": "workbench",
            "style": {
                "navigationBarTitleText": "我要巡",
                "app-plus":{
                    "titleNView":false
                "app-plus": {
                    "titleNView": false
                }
            }
        },
@@ -245,7 +245,7 @@
            "style": {
                "navigationBarTitleText": "群防任务",
                "navigationBarBackgroundColor": "#0cd7e5",
                "navigationBarTextStyle":"white"
                "navigationBarTextStyle": "white"
            }
        },
        {
@@ -268,8 +268,8 @@
            "style": {
                "navigationBarTitleText": "打卡签到",
                "navigationBarBackgroundColor": "#25262E",
                "app-plus":{
                    "titleNView":false
                "app-plus": {
                    "titleNView": false
                }
            }
        },
@@ -285,7 +285,17 @@
            "name": "mapJQtijiao",
            "style": {
                "navigationBarTitleText": "处理结果",
                "navigationBarBackgroundColor": "#0cd7e5"
                "navigationBarBackgroundColor": "#0cd7e5",
                "navigationBarTextStyle": "white"
            }
        },
        {
            "path": "pages/poput/alarmOver/alarmOver",
            "name": "alarmOver",
            "style": {
                "navigationBarTitleText": "任务详情",
                "navigationBarBackgroundColor": "#0cd7e5",
                "navigationBarTextStyle": "white"
            }
        },
        {
@@ -307,7 +317,7 @@
            }
        }
    ],
    "globalStyle": {//将组件安装在项目的components目录下,并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册,直接在页面中使用。
    "globalStyle": { //将组件安装在项目的components目录下,并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册,直接在页面中使用。
        "autoscan": true
    },
    "tabBar": {
@@ -319,7 +329,7 @@
                "text": "首页",
                "iconPath": "static/tabbar/index01.png",
                "selectedIconPath": "static/tabbar/index02.png"
            },{
            }, {
                "pagePath": "pages/article/article",
                "text": "资讯",
                "iconPath": "static/tabbar/article.png",
@@ -341,14 +351,14 @@
        ]
    },
    "globalStyle": { // 不能在globalStyle中设置隐藏头部导航栏,否则聊天页面的头部栏会不显示,在pages中设置titleNView为false就可以隐藏头部导航栏了
            "navigationBarTextStyle": "black",
            "navigationBarTitleText": "hello",
            "navigationBarBackgroundColor": "#fff",
            "backgroundColor": "#f7f7f7",
            "backgroundTextStyle":"light",
            "pageOrientation":"portrait", //横屏配置,屏幕旋转设置
            "app-plus": {
                "bounce": "none"
            }
        }
        "navigationBarTextStyle": "black",
        "navigationBarTitleText": "hello",
        "navigationBarBackgroundColor": "#fff",
        "backgroundColor": "#f7f7f7",
        "backgroundTextStyle": "light",
        "pageOrientation": "portrait", //横屏配置,屏幕旋转设置
        "app-plus": {
            "bounce": "none"
        }
    }
}
pages/alarm_list/alarm_list.vue
@@ -23,11 +23,13 @@
                <view class="alarm-info" v-for="item in data" @click="gotoDetail(item)">
                    <view class="alarm-id-type-status">
                        <view class="alarm-id-type">({{item.id}}){{item.alarmType}}</view>
                        <view class="alarm-status" :style="{color:untreatedColor}" v-if="item.securityId==null || item.securityId=='' ">未处理
                        <view class="alarm-status" :style="{color:untreatedColor}"
                            v-if="item.securityId==null || item.securityId=='' ">未处理
                        </view>
                        <view class="alarm-status" :style="{color:processedColor}"
                            v-if="item.securityId!='' && item.jtype==1">处理中</view>
                        <view class="alarm-status" :style="{color:finishColor}" v-if="item.jtype==2 && item.securityId!=''">已处理</view>
                        <view class="alarm-status" :style="{color:finishColor}"
                            v-if="item.jtype==2 && item.securityId!=''">已处理</view>
                    </view>
                    <view class="alarm-position-time">
                        <view class="image-place">
@@ -209,6 +211,12 @@
            //跳转详情页面或者接受任务
            gotoDetail(item) {
                if (item.jtype == 2) {
                    uni.navigateTo({
                        url: '/pages/poput/alarmOver/alarmOver?data=' + JSON.stringify(item)
                    })
                    return;
                }
                if (item.securityId == null) {
                    this.itemData = item;
                    this.popuShow = true;
@@ -221,13 +229,13 @@
                    datas.userid = this.$store.state.puserID;
                    datas.username = this.$store.state.puserName;
                    datas.url = this.$store.state.piAPI + "alarm/alarm/APP-setAlarm";
                    // datas.jd = 114.91385;//模拟位置
                    // datas.wd = 25.81051;//模拟位置
                    // datas.wd = 25.81051;//模拟位置
                    var data = [datas]; //传给地图的参数
                    // console.log(data) 
                    uni.navigateTo({
pages/poput/alarmOver/alarmOver.vue
New file
@@ -0,0 +1,150 @@
<template>
    <view class="alarmOver">
        <view class="once">
            <view class="titles">事件描述:</view>
            <view class="mains">{{data.alarmType}}</view>
        </view>
        <view class="once">
            <view class="titles">事件地点:</view>
            <view class="mains">{{data.place}}</view>
        </view>
        <view class="once">
            <view class="titles">处理流程:</view>
            <!-- <view class="mains">加载中···</view> -->
            <view class="mains">
                <u-time-line>
                    <u-time-line-item nodeTop="19" v-for="(item,index) in oderData" :key="index">
                        <!-- 此处自定义了左边内容,用一个图标替代 -->
                        <template v-slot:node>
                            <view class="u-node" style="background: #19be6b;">
                                <!-- 此处为uView的icon组件 -->
                                <u-icon name="clock-fill" color="#fff" :size="30"></u-icon>
                            </view>
                        </template>
                        <template v-slot:content>
                            <view class="u-order">
                                <span class="u-o-time"> {{item.time}}</span>
                                <span class="u-o-main"> {{item.content}}</span>
                                <span class="zw" v-if="item == '暂无'">暂无</span>
                            </view>
                        </template>
                    </u-time-line-item>
                </u-time-line>
            </view>
        </view>
        <view class="once">
            <view class="titles">处理结果:</view>
            <view class="mains">妥善处理</view>
        </view>
        <view class="once">
            <view class="titles">问题反馈:</view>
            <view class="mains">无</view>
        </view>
    </view>
</template>
<script>
    export default {
        data() {
            return {
                data: '',
                oderData: ['暂无'
                    //     {
                    //     time: '2019-05-08 12:12',
                    //     content: '任务下发'
                    // }, {
                    //     time: '2019-05-08 12:12',
                    //     content: '任务接收'
                    // }, {
                    //     time: '2019-05-08 12:12',
                    //     content: '处置完成'
                    // },
                ]
            }
        },
        methods: {
            userData(d) {
                console.log(d);
                var a = [{
                        time: '2019-05-08 12:12',
                        content: '任务下发'
                    },
                    {
                        time: '2019-05-08 12:12',
                        content: '任务接收'
                    }, {
                        time: '2019-05-08 12:12',
                        content: '处置完成'
                    }
                ]
                this.oderData = a;
            }
        },
        mounted() {
        },
        onLoad: function(options) {
            this.data = JSON.parse(options.data);
            if (this.data == '') {
                console.log('未传数据');
                return;
            }
            this.userData(this.data);
        }
    }
</script>
<style lang="scss" scoped>
    .u-node {
        width: 44rpx;
        height: 44rpx;
        border-radius: 100rpx;
        display: flex;
        justify-content: center;
        align-items: center;
        background: #d0d0d0;
    }
    .u-o-time {
        color: rgb(200, 200, 200);
        font-size: 26rpx;
    }
    .u-o-main {
        margin-left: 2rem;
    }
    .alarmOver {
        background-color: #F7F7F7;
        width: 100%;
        height: 100%;
        overflow: auto;
        .once {
            width: 100%;
            min-height: 4rem;
            background-color: #fff;
            margin: 1rem 0;
            .titles {
                width: 100%;
                // border: 1px solid #0078A8;
                font-weight: 600;
                padding-left: 2rem;
                height: 1.5rem;
                line-height: 1.5rem;
            }
            .mains {
                width: 100%;
                // border: 1px solid #0078A8;
                padding-left: 2rem;
                min-height: 2.5rem;
                line-height: 2.5rem;
            }
        }
    }
</style>
pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
@@ -259,7 +259,7 @@
            height: 100%;
            // border: 1px solid #000000;
            box-sizing: border-box;
            background-color: #efefef;
            background-color: #F7F7F7;
            .title {
                margin-left: 1rem;