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

shuishen

2023-02-17 b9f0f59593fca142060e9ba1e69aabb7cc20bbdf

 src/views/activity/index.vue

@@ -494,13 +494,14 @@
            class="edit-line-box"
        >
            <div>
                <div class="value-name-box">设置宽度：</div>
                <div class="value-name-box">设置缓冲范围：</div>
                <div class="input-width-box">
                    <input type="text" v-model="lineWidth" placeholder="请输入..." />
                </div>
                <div class="units">米</div>
            </div>
            <div>
                <div class="value-name-box">选择颜色：</div>
                <div class="value-name-box">选择范围颜色：</div>
                <div class="color-box">
                    <div
                        class="red-color"
@@ -515,6 +516,7 @@
                        @click="changeLineColor('#0000FF')"
                    >{{ chooseColor == '#0000FF'?'√':'' }}</div>
                </div>
                <div class="units"></div>
            </div>
            <div>
                <el-button @click="watchVideo">查看视频</el-button>
@@ -1338,6 +1340,7 @@
        // 分页页码变化事件
        handleCurrentChange: function (currentPage) {
            this.currentPage = currentPage
            this.currentClickIndex = -1
            this.getSecurityList(this.currentPage, this.pagesize)
        },

@@ -2574,14 +2577,32 @@

    .video5 {
        left: calc(400 / 1920 * 100vw);
        .video {
            padding: 1% 0 1% 1%;
        }
        .no-video {
            margin: 1% 0 1% 1%;
        }
    }

    .video6 {
        left: calc(780 / 1920 * 100vw);
        .video {
            padding: 1% 0 1% 1%;
        }
        .no-video {
            margin: 1% 0 1% 1%;
        }
    }

    .video7 {
        left: calc(1160 / 1920 * 100vw);
        .video {
            padding: 1% 0 1% 1%;
        }
        .no-video {
            margin: 1% 0 1% 1%;
        }
    }

    .video8 {