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

shuishen

2023-01-02 7e5c7253405fc1c2521dcb788014d1d5c628337c

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

 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 10:39:46
 * @LastEditTime: 2023-01-02 11:49:02
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活动
 * 
@@ -99,9 +99,9 @@
                            <img src="../../../public/img/icon/car-btn.png" style="height:100%" />
                        </button>
                    </li>
                    <li>
                    <!-- <li>
                        <button @click="draw('polyline', 'policecar')">巡逻路线</button>
                    </li>
                    </li>-->
                </ul>
            </div>
            <div>
@@ -129,8 +129,12 @@
                <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>-->
                        <button @click="draw('polyline', 'policecar')">巡逻路线</button>
                    </li>
                </ul>
            </div>
@@ -146,7 +150,10 @@
                活动详情
                <div class="close" @click="closeActivityDetails"></div>
            </div>

            <div class="row-box">
                <div class="category">人数：</div>
                <div class="category-value">{{ activityDetails.number }}</div>
            </div>
            <div class="row-box">
                <div class="category">活动名称：</div>
                <div class="category-value">{{ activityDetails.name }}</div>
@@ -179,14 +186,10 @@
                <div class="category">活动内容：</div>
                <div class="category-value">{{ activityDetails.content }}</div>
            </div>
            <div class="row-box">
                <div class="category">人数：</div>
                <div class="category-value">{{ activityDetails.number }}</div>
            </div>
            <div class="row-box">
            <!-- <div class="row-box">
                <div class="category">活动类型：</div>
                <div class="category-value">{{ activityDetails.type }}</div>
            </div>
            </div>-->

            <!-- <div class="row-box">
                <div class="category">应急预案：</div>