Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

guanqb

2023-01-03 b842a171ba4e125dda88dc92af76a83602683bf5

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

 src/styles/element-ui/element-ui.scss

@@ -35,9 +35,11 @@
    color: #fff;
}

.el-table tr:hover td {
    cursor: pointer;
    background-color: rgba(222, 176, 176, 0.2) !important;
.el-table tr:hover {
    td {
        cursor: pointer;
        background-color: rgba(222, 176, 176, 0.2) !important;
    }
}

.el-table::before {

 src/styles/scssFile.scss

@@ -1,4 +1,4 @@
$bg-one-color: rgba(35, 50, 167, 0.8);
$bg-one-color: rgba(35, 50, 167, 0.7);

$bg-color: $bg-one-color;


 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: 2023-01-02 11:49:02
 * @LastEditTime: 2023-01-03 15:52:12
 * @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>
@@ -221,9 +180,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 +229,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 +269,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>
@@ -1298,11 +1237,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;
@@ -1372,12 +1311,12 @@
                .row-box {
                    margin: 10px;
                    padding: 10px;
                    background: $table-body-tr-2n-color;
                    cursor: pointer;
                    font-size: 14px;
                    border-radius: 8px;

                    .row-content {
                        & > div {
                        &>div {
                            display: flex;
                            line-height: 28px;

@@ -1393,16 +1332,23 @@
                            }
                        }
                    }

                    &:nth-child(2n) {
                        background: $table-body-tr-2n-color;
                    }

                    &:nth-child(2n-1) {
                        background: $table-body-tr-n-color;
                    }

                }

                .row-box:hover {
                    // background-color: $table-header-bg-color;
                    background-color: rgba(17, 38, 163, 0.5);
                    background-color: rgba(222, 176, 176, 0.2) !important;
                }

                .row-box.on {
                    // background: $table-header-bg-color;
                    background-color: rgba(17, 38, 163, 0.5);
                    background-color: rgba(222, 176, 176, 0.2) !important;
                }

                :deep(.el-dialog) {
@@ -1439,7 +1385,7 @@
        white-space: nowrap;
        transform: translate(-50%, 0);

        & > div {
        &>div {
            display: flex;
        }

@@ -1542,7 +1488,7 @@
            line-height: 28px;
            display: flex;

            & > div {
            &>div {
                text-align: left;
            }

@@ -1556,6 +1502,7 @@
        }

        .row-btn-box {

            // height: 30px;
            :deep(.el-button) {
                // padding: 7px 20px;
@@ -1586,7 +1533,7 @@
            line-height: 28px;
            display: flex;

            & > div {
            &>div {
                text-align: left;
            }