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

shuishen

2023-03-06 73c375076d5a70fadd8e290c3b98745e1a7f2155

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

 public/img/icon/icon2.png

 src/styles/media/index.scss

@@ -1516,8 +1516,7 @@
                            width: countSizeVw(520, 1920);
                            z-index: 99;

                            .left,
                            .right {
                            .left {
                                h3 {
                                    font-size: countSizeVh(16);
                                    height: countSizeVh(30);
@@ -1527,6 +1526,10 @@
                                &>div {
                                    height: countSizeVh(44);
                                    line-height: countSizeVh(44);
                                }

                                .plot-box {
                                    height: countSizeVh(88);
                                }

                                ul {
@@ -1545,13 +1548,13 @@
                                }
                            }

                            .right {
                                padding-top: countSizeVh(35);
                            // .right {
                            //     padding-top: countSizeVh(35);

                                ul li {
                                    height: countSizeVh(50);
                                }
                            }
                            //     ul li {
                            //         height: countSizeVh(50);
                            //     }
                            // }
                        }

                        .second-container {
@@ -2246,8 +2249,8 @@

                    .add-polygon-box {
                        .el-dialog {
                            width: countSizeVw(300, 1920);
                            height: countSizeVh(166);
                            width: countSizeVw(340, 1920);
                            height: countSizeVh(220);

                            .el-dialog__body {
                                .el-button {
@@ -2260,7 +2263,7 @@
                                }

                                .value-name-box {
                                    width: countSizeVh(90);
                                    width: countSizeVh(110);
                                }

                                input {
@@ -2275,8 +2278,8 @@

                    .edit-plot-box {
                        .el-dialog {
                            width: countSizeVw(300, 1920);
                            height: countSizeVh(180);
                            width: countSizeVw(340, 1920);
                            height: countSizeVh(220);

                            .el-dialog__body {
                                .el-button {

 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-03-06 17:33:41
 * @LastEditTime: 2023-03-06 17:39:12
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活
 *
@@ -1661,16 +1661,21 @@
                        position = new global.DC.Position(Number(position[0]), Number(position[1]))
                        chooseArrow = new global.DC.Billboard(position, `/img/icon/${iconImgName}.png`)
                        arrowsListLayer.addOverlay(chooseArrow)
                        let point = new global.DC.Point(position)
                        arrowsListLayer.addOverlay(point)
                        point.attrParams = { 'id': item.id, 'color': item.color, item }
                        point.on(global.DC.MouseEventType.CLICK, this.reeditArrowClick)
                        point.setStyle({
                            "color": color, //颜色
                            "outlineColor": color, //边框颜色
                            "outlineWidth": 0, //边框大小，
                            "pixelSize": 32,
                        chooseArrow.attrParams = { 'id': item.id, 'color': item.color, item }
                        chooseArrow.setStyle({
                            "material": color,
                        })
                        chooseArrow.on(global.DC.MouseEventType.CLICK, this.reeditArrowClick)
                        // let point = new global.DC.Point(pointPosition)
                        // arrowsListLayer.addOverlay(point)
                        // point.attrParams = { 'id': item.id, 'color': item.color, item }
                        // point.on(global.DC.MouseEventType.CLICK, this.reeditArrowClick)
                        // point.setStyle({
                        //     "color": color, //颜色
                        //     "outlineColor": color, //边框颜色
                        //     "outlineWidth": 0, //边框大小，
                        //     "pixelSize": 32,
                        // })
                    }

                    chooseArrow.attrParams = { 'id': item.id, 'color': item.color, item }