Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

shuishen

2023-02-03 b04626e83798ddf56f646f043a9812063e3f0b31

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

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

@@ -74,7 +74,7 @@

.el-pagination.is-background .el-pager li:not(.disabled).active {
    background-color: #184fca;
    color: #ffffff !important;
    color: #c0c4cc !important;
}

.el-pagination.is-background .btn-next,

 src/styles/media/index.scss

@@ -2691,6 +2691,9 @@
            margin-left: countSizeVw(110, 1920);
            display: flex;
        }
        .el-picker-panel__body {
            display: flex;
        }
       
        .el-date-table .disabled div{
            background-color: $sub-tab-border-color;

 src/views/activity/index.vue

@@ -62,7 +62,7 @@

                <div>
                    <div class="category">活动名称：</div>
                    <div class="category-value">
                    <div class="category-value search-activity">
                        <input
                            type="text"
                            placeholder="请输入…"
@@ -70,6 +70,14 @@
                            class="category-input"
                            @input="inputChange"
                        />
                        <div
                            class="clear"
                            v-show="isShowActivityClearBtn"
                            @click="clearActivitySearchValue"
                            title="清空"
                        >
                            <img src="../../../public/img/icon/clear.png" alt />
                        </div>
                        <button class="category-button el-icon-search" @click="searchClick"></button>
                    </div>
                </div>
@@ -122,7 +130,7 @@
            </div>
        </div>

        <div v-show="dialogVisible" class="draw-btn-box">
        <div v-show="dialogVisible&&!polylineBtnSwitch" class="draw-btn-box">
            <div class="left">
                <h3>预案布置</h3>
                <div>
@@ -700,7 +708,8 @@
                video6: false,
                video7: false,
                video8: false,
            }
            },
            isShowActivityClearBtn: false,
        }
    },
    created () {
@@ -800,6 +809,11 @@

        inputChange (e) {
            console.log(e)
            if (this.searchActivity == '') {
                this.isShowActivityClearBtn = false
            } else {
                this.isShowActivityClearBtn = true
            }
        },

        // 点击搜索
@@ -1563,6 +1577,12 @@
            this.searchExtensivelyChange()
        },

        clearActivitySearchValue () {
            this.searchActivity = ''
            this.inputChange()
            this.searchClick()
        },

        getRegionList (positionNewStr) {
            getRegionList(1, 15, positionNewStr).then(res => {
                console.log(11, res.data.data.list)
@@ -1722,6 +1742,21 @@

                .category-value {
                    flex: 1;
                }
                .search-activity {
                    position: relative;
                    .clear {
                        position: absolute;
                        top: 0;
                        right: 70px;
                        cursor: pointer;

                        img {
                            width: 12px;
                            height: 12px;
                            margin-top: 8px;
                        }
                    }
                }

                input {
@@ -2160,7 +2195,7 @@
            letter-spacing: 4px;
            width: 98%;
            height: 98%;
            background-color: #000;
            background-color: rgba(0, 0, 0, 0.7);
            margin: 1%;
            display: flex;
            align-items: center;