shuishen
2023-01-02 2e7cb3baa153c0e87b9e9f00b05d63612817b732
style changes
5 files modified
233 ■■■■■ changed files
src/App.vue 26 ●●●● patch | view | raw | blame | history
src/styles/base/index.scss 39 ●●●● patch | view | raw | blame | history
src/styles/media/index.scss 25 ●●●●● patch | view | raw | blame | history
src/views/activity/index.vue 141 ●●●● patch | view | raw | blame | history
src/views/home/components/bottomContainer.vue 2 ●●● patch | view | raw | blame | history
src/App.vue
@@ -2,14 +2,17 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 15:58:10
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-01-02 10:19:05
 * @LastEditTime: 2023-01-02 11:43:05
 * @FilePath: \srs-police-affairs\src\App.vue
 * @Description: app.vue
 * 
 * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved. 
-->
<template>
    <div id="app" :style="{ width: currentWidth + 'px', height: currentHeight + 'px' }">
    <div id="app" :style="{
    width: (useSceen == true ? currentWidth + 'px' : '100%'),
    height: (useSceen == true ? currentHeight + 'px' : '100%')
}">
        <router-view></router-view>
    </div>
</template>
@@ -20,13 +23,26 @@
        return {
            currentWidth: 0,
            currentHeight: 0,
            useSceen: false
        }
    },
    watch: {
        $route: {
            handler (newPath, oldPath) {
                if (newPath.path == "/layout/home") {
                    this.useSceen = true
                } else {
                    this.useSceen = false
                }
            },
            immediate: true
        }
    },
    provide () {
        return {
            getWidth: this.getWidth,
            currentHeight: this.currentHeight,
            getWidth: this.getWidth
        }
    },
@@ -47,6 +63,8 @@
<style lang="scss">
#app {
    width: 100%;
    height: 100%;
    font-family: Avenir, Helvetica, Arial, sans-serif;
    -webkit-font-smoothing: antialiased;
    -moz-osx-font-smoothing: grayscale;
src/styles/base/index.scss
@@ -12,6 +12,8 @@
    height: 100%;
    font-size: 16px;
    overflow-x: hidden;
    overflow-y: auto;
    background: #171b22;
    // scrollbar-width: none;
    // -ms-overflow-style: none;
@@ -37,34 +39,33 @@
}
::-webkit-scrollbar {
    width: 8px;
    height: 8px;
    background-color: none;
    border-radius: 8px;
    width: 5px;
    height: 5px;
    background-color: transparent;
}
// hsla(0, 0%, 84.7%, 0.6);
::-webkit-scrollbar {
    width: 7px;
    height: 7px;
    background-color: transparent;
}
::-webkit-scrollbar-thumb {
    border-radius: 8px;
    background-color: rgba(17, 38, 163, 0.5);
    padding-left: 2px;
    padding-right: 2px;
    border-radius: 5px;
    background-color: hsla(220deg, 4%, 58%, 0.3);
}
::-webkit-scrollbar-track {
    background-color: hsla(0, 0%, 84.7%, 0.2);
::-webkit-scrollbar-thumb {
    border-radius: 5px;
    background-color: hsla(220deg, 4%, 58%, 0.3);
}
::-webkit-scrollbar-thumb:window-inactive {
    background-color: rgba(8, 56, 185, 0.9);
::-webkit-scrollbar-track-piece {
    background-color: transparent;
}
:not(select)::-webkit-scrollbar {
    background-color: hsla(0, 0%, 84.7%, 0.2);
}
::-webkit-scrollbar-thumb:hover {
    background-color: rgba(8, 56, 185, 0.9);
::-webkit-scrollbar-track-piece {
    background-color: transparent;
}
.car-video-box {
src/styles/media/index.scss
@@ -1464,6 +1464,7 @@
                                height: countSizeVh(44);
                                line-height: countSizeVh(44);
                            }
                            .close {
                                height: countSizeVh(20);
                            }
@@ -1482,7 +1483,7 @@
                                    }
                                }
                            }
                        }
                        .second-container {
@@ -1572,14 +1573,16 @@
                                    margin-left: countSizeVw(18, 1920) !important;
                                }
                            }
                            .row-btn-box {
                                height: countSizeVh(30);
                               .el-button {
                                       padding: countSizeVh(7) 20px;
                                       font-size: countSizeVh(14);
                                       border: countSizeVh(1)  solid #2e3fad;
                                   }
                               }
                                .el-button {
                                    padding: countSizeVh(7) 20px;
                                    font-size: countSizeVh(14);
                                    border: countSizeVh(1) solid #2e3fad;
                                }
                            }
                        }
                        .btn-box {
@@ -1983,8 +1986,12 @@
                            width: countSizeVw(60, 1920);
                            height: countSizeVh(30);
                            margin-top: countSizeVh(40);
                            background-color: rgba(2, 140, 184, 0.8);
                            border: countSizeVh(1) solid rgba(2, 140, 184, 0.8);
                            background-color: rgba(8, 56, 185, 0.9);
                            border: countSizeVh(1) solid rgba(8, 56, 185, 0.9);
                        }
                        .el-dialog .el-dialog__body .el-button:hover {
                            background-color: #409EFF;
                        }
                    }
src/views/activity/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-12-29 15:46:00
 * @LastEditTime: 2023-01-02 10:39:46
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活动
 * 
@@ -17,19 +17,9 @@
                <div>
                    <div class="category">活动类型:</div>
                    <div class="category-value">
                        <el-select
                            size="small"
                            v-model="activityType"
                            placeholder="请选择"
                            @change="activityTypeChange"
                        >
                            <el-option
                                v-for="item in activityOptions"
                                :key="item.dictKey"
                                :label="item.dictValue"
                                :value="item.dictKey"
                                class="activity-option"
                            ></el-option>
                        <el-select size="small" v-model="activityType" placeholder="请选择" @change="activityTypeChange">
                            <el-option v-for="item in activityOptions" :key="item.dictKey" :label="item.dictValue"
                                :value="item.dictKey" class="activity-option"></el-option>
                        </el-select>
                    </div>
                </div>
@@ -44,46 +34,26 @@
                            placeholder="选择日期"
                            style="width:268px"
                        ></el-date-picker>-->
                        <el-date-picker
                            v-model="selectTime"
                            type="daterange"
                            align="right"
                            unlink-panels
                            format="yyyy-MM-dd HH:mm:ss"
                            value-format="yyyy-MM-dd HH:mm:ss"
                            range-separator="至"
                            start-placeholder="开始日期"
                            end-placeholder="结束日期"
                            :picker-options="pickerOptions"
                            @change="activityTimeChange"
                        ></el-date-picker>
                        <el-date-picker v-model="selectTime" type="daterange" align="right" unlink-panels
                            format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至"
                            start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
                            @change="activityTimeChange"></el-date-picker>
                    </div>
                </div>
                <div>
                    <div class="category">活动名称:</div>
                    <div class="category-value">
                        <input
                            type="text"
                            placeholder="请输入活动名称"
                            v-model="searchActivity"
                            class="category-input"
                            @input="inputChange"
                        />
                        <input type="text" placeholder="请输入活动名称" v-model="searchActivity" class="category-input"
                            @input="inputChange" />
                        <button class="category-button el-icon-search" @click="searchClick"></button>
                    </div>
                </div>
            </div>
            <div class="result-content">
                <div class="table-box">
                    <div
                        v-show="activityList.length > 0"
                        class="row-box"
                        :class="{ on: currentClickIndex === index }"
                        v-for="(item, index) in activityList"
                        :key="index"
                        @click="activityListClick(item, index)"
                    >
                    <div v-show="activityList.length > 0" class="row-box" :class="{ on: currentClickIndex === index }"
                        v-for="(item, index) in activityList" :key="index" @click="activityListClick(item, index)">
                        <div class="row-title">常规安保</div>
                        <div class="row-content">
                            <div>
@@ -96,9 +66,7 @@
                            </div>
                            <div>
                                <div class="category">活动时间:</div>
                                <div
                                    class="category-value"
                                >{{ item.startTime }} 至 {{ item.endTime }}</div>
                                <div class="category-value">{{ item.startTime }} 至 {{ item.endTime }}</div>
                            </div>
                            <div>
                                <div class="category">活动详情:</div>
@@ -110,14 +78,8 @@
                    <div v-show="activityList == 0" class="no-data">暂无数据</div>
                </div>
                <div class="pages">
                    <el-pagination
                        background
                        layout="prev, pager, next"
                        :page-size="pagesize"
                        :page-count="pagesCount"
                        :current-page="currentPage"
                        @current-change="handleCurrentChange"
                    ></el-pagination>
                    <el-pagination background layout="prev, pager, next" :page-size="pagesize" :page-count="pagesCount"
                        :current-page="currentPage" @current-change="handleCurrentChange"></el-pagination>
                </div>
            </div>
        </div>
@@ -129,10 +91,7 @@
                <ul>
                    <li>
                        <button @click="draw('billboard', 'policeman')">
                            <img
                                src="../../../public/img/icon/police-people-btn.png"
                                style="height:100%"
                            />
                            <img src="../../../public/img/icon/police-people-btn.png" style="height:100%" />
                        </button>
                    </li>
                    <li>
@@ -170,11 +129,8 @@
                <span>撤离路线:</span>
                <ul>
                    <li>
                        <el-button
                            title="路线绘制"
                            @click="draw('billboard', 'policeman')"
                            icon="el-icon-my-route"
                        ></el-button>
                        <el-button title="路线绘制" @click="draw('billboard', 'policeman')"
                            icon="el-icon-my-route"></el-button>
                    </li>
                </ul>
            </div>
@@ -217,9 +173,7 @@
            </div>
            <div class="row-box">
                <div class="category">活动时间:</div>
                <div
                    class="category-value"
                >{{ activityDetails.startTime }} 至 {{ activityDetails.endTime }}</div>
                <div class="category-value">{{ activityDetails.startTime }} 至 {{ activityDetails.endTime }}</div>
            </div>
            <div class="row-box">
                <div class="category">活动内容:</div>
@@ -272,24 +226,16 @@
            <div class="row-box">
                <div class="category">应急预案:</div>
                <div class="category-value">
                    <el-switch
                        v-model="polylineSwitch"
                        @change="switchChange"
                        active-color="#13ce66"
                        inactive-color="#ccc"
                    ></el-switch>
                    <el-switch v-model="polylineSwitch" @change="switchChange" active-color="#13ce66"
                        inactive-color="#ccc"></el-switch>
                </div>
            </div>
            <div class="row-box">
                <div class="category">巡逻路线:</div>
                <div class="category-value">
                    <el-switch
                        v-model="polylineBtnSwitch"
                        @change="switchBtnChange"
                        active-color="#13ce66"
                        inactive-color="#ccc"
                    ></el-switch>
                    <el-switch v-model="polylineBtnSwitch" @change="switchBtnChange" active-color="#13ce66"
                        inactive-color="#ccc"></el-switch>
                </div>
            </div>
        </div>
@@ -320,22 +266,12 @@
            </ul>
        </div>
        <el-dialog
            :title="policeChooseTitle"
            :modal="false"
            :visible.sync="policeChooseVisible"
            :before-close="policeChooseBeforeClose"
            :close-on-click-modal="true"
            class="choose-police-box"
        >
        <el-dialog :title="policeChooseTitle" :modal="false" :visible.sync="policeChooseVisible"
            :before-close="policeChooseBeforeClose" :close-on-click-modal="true" class="choose-police-box">
            <div>
                <el-select size="small" v-model="policeType" placeholder="请选择">
                    <el-option
                        v-for="item in policeOption"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value"
                    ></el-option>
                    <el-option v-for="item in policeOption" :key="item.value" :label="item.label"
                        :value="item.value"></el-option>
                </el-select>
                <el-button @click="determine">确定</el-button>
                <el-button @click="cancel">取消</el-button>
@@ -1239,11 +1175,11 @@
        .search-box {
            padding: 0 10px;
            & > div:first-child {
            &>div:first-child {
                margin-top: 0;
            }
            & > div {
            &>div {
                margin-top: 10px;
                display: flex;
                align-items: center;
@@ -1318,7 +1254,7 @@
                    font-size: 14px;
                    .row-content {
                        & > div {
                        &>div {
                            display: flex;
                            line-height: 28px;
@@ -1380,7 +1316,7 @@
        white-space: nowrap;
        transform: translate(-50%, 0);
        & > div {
        &>div {
            display: flex;
        }
@@ -1400,6 +1336,7 @@
                }
            }
        }
        .close {
            position: absolute;
            top: 2%;
@@ -1482,7 +1419,7 @@
            line-height: 28px;
            display: flex;
            & > div {
            &>div {
                text-align: left;
            }
@@ -1494,18 +1431,21 @@
                flex: 1;
            }
        }
        .row-btn-box {
            // height: 30px;
            :deep(.el-button) {
                // padding: 7px 20px;
                font-size: 14px;
                color: #fff;
                background-color: rgba(2, 140, 184, 0.8);
                border: 1px solid #2e3fad;
                background-color: rgba(8, 56, 185, 0.9);
                border: 1px solid rgba(8, 56, 185, 0.9);
                border-radius: 14px;
            }
            :deep(.el-button:hover) {
                background-color: rgba(2, 140, 184, 0.5);
                background-color: #409EFF;
            }
        }
    }
@@ -1518,12 +1458,13 @@
        padding: 10px;
        color: #fff;
        background-color: $bg-color;
        .row-box {
            width: 100%;
            line-height: 28px;
            display: flex;
            & > div {
            &>div {
                text-align: left;
            }
src/views/home/components/bottomContainer.vue
@@ -100,7 +100,7 @@
        }
    },
    inject: ["getWidth", "currentHeight"],
    inject: ["getWidth"],
    components: {
        vueSeamlessScroll