活动调色盘更换

guanqb

2023-02-28 5ef4caf45b5474513fb4d0c3cdb1cff074780058

活动调色盘更换

 package-lock.json

@@ -35,7 +35,6 @@
                "vue-axios": "^3.3.7",
                "vue-router": "^3.2.0",
                "vue-seamless-scroll": "^1.1.23",
                "vue-swatches": "^2.1.1",
                "vuex": "^3.4.0"
            },
            "devDependencies": {
@@ -16611,11 +16610,6 @@
                "node": ">=4.0.0"
            }
        },
        "node_modules/vue-swatches": {
            "version": "2.1.1",
            "resolved": "https://registry.npmmirror.com/vue-swatches/-/vue-swatches-2.1.1.tgz",
            "integrity": "sha512-YugkNbByxMz1dnx1nZyHSL3VSf/TnBH3/NQD+t8JKxPSqUmX87sVGBxjEaqH5IMraOLfVmU0pHCHl2BfXNypQg=="
        },
        "node_modules/vue-template-compiler": {
            "version": "2.7.14",
            "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
@@ -31616,11 +31610,6 @@
                }
            }
        },
        "vue-swatches": {
            "version": "2.1.1",
            "resolved": "https://registry.npmmirror.com/vue-swatches/-/vue-swatches-2.1.1.tgz",
            "integrity": "sha512-YugkNbByxMz1dnx1nZyHSL3VSf/TnBH3/NQD+t8JKxPSqUmX87sVGBxjEaqH5IMraOLfVmU0pHCHl2BfXNypQg=="
        },
        "vue-template-compiler": {
            "version": "2.7.14",
            "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
@@ -32570,4 +32559,4 @@
            }
        }
    }
}
}

 package.json

@@ -35,7 +35,6 @@
        "vue-axios": "^3.3.7",
        "vue-router": "^3.2.0",
        "vue-seamless-scroll": "^1.1.23",
        "vue-swatches": "^2.1.1",
        "vuex": "^3.4.0"
    },
    "devDependencies": {
@@ -53,4 +52,4 @@
        "sass-loader": "^8.0.2",
        "vue-template-compiler": "^2.6.11"
    }
}
}

 public/img/icon/man3.png

 src/styles/base/index.scss

@@ -956,12 +956,6 @@
                width: 120px;
            }

            .vue-swatches__trigger {
                height: 30px !important;
                width: 30px !important;
                border-radius: 6px !important;
            }

        }
    }
}

 src/styles/media/index.scss

@@ -2213,11 +2213,6 @@
                                    line-height: countSizeVh(32);
                                }

                                .vue-swatches__trigger {
                                    height: countSizeVh(30) !important;
                                    width: countSizeVh(30) !important;
                                    border-radius: countSizeVh(6) !important;
                                }

                                .units {
                                    width: countSizeVw(60, 1920);
@@ -2254,11 +2249,6 @@
                                    border: countSizeVh(1) solid rgb(0, 92, 169);
                                }

                                .vue-swatches__trigger {
                                    height: countSizeVh(30) !important;
                                    width: countSizeVh(30) !important;
                                    border-radius: countSizeVh(6) !important;
                                }
                            }
                        }
                    }
@@ -2283,12 +2273,6 @@
                                    height: countSizeVh(32);
                                    line-height: countSizeVh(32);
                                    width: countSizeVw(120, 1920);
                                }

                                .vue-swatches__trigger {
                                    height: countSizeVh(30) !important;
                                    width: countSizeVh(30) !important;
                                    border-radius: countSizeVh(6) !important;
                                }

                            }

 src/views/activity/index.vue

@@ -384,7 +384,10 @@
            <div>
                <div class="value-name-box">选择范围颜色：</div>
                <div class="pick-color-box">
                    <v-swatches v-model="chooseColor"></v-swatches>
                    <el-color-picker
                     v-model="chooseColor"
                     :predefine="predefineColors" size="small">
                   </el-color-picker>
                </div>
            </div>
            <div class="edit-line-btn-box">
@@ -408,7 +411,10 @@
            <div class="line">
                <div class="value-name-box">选择颜色：</div>
                <div class="pick-color-box">
                    <v-swatches v-model="choosePlotColor"></v-swatches>
                    <el-color-picker
                     v-model="choosePlotColor"
                     :predefine="predefineColors" size="small">
                   </el-color-picker>
                </div>
            </div>
            <div class="add-polygon-btn-box">
@@ -422,7 +428,10 @@
            <div>
                <div class="value-name-box">选择标绘颜色：</div>
                <div class="pick-color-box">
                    <v-swatches v-model="choosePlotColor"></v-swatches>
                    <el-color-picker
                     v-model="choosePlotColor"
                     :predefine="predefineColors" size="small">
                   </el-color-picker>
                </div>
            </div>
            <div>
@@ -441,8 +450,6 @@
import { getRegionList, getDevices } from '@/api/video/index.js'
import { getEquipmentAll } from '@/api/home/index.js'
import flvjs from 'flv.js'
import VSwatches from 'vue-swatches'
import 'vue-swatches/dist/vue-swatches.css'

let analyseLayer = null
let analysePolygon = null
@@ -450,6 +457,7 @@
let drawArrowLayers = null
let polylineAreaLayer = null
let arrowsListLayer = null
let pointCircleLayer = null
let plot = undefined
let arrowPlot = undefined
let lineLayer = undefined
@@ -459,8 +467,6 @@

export default {
    inject: ['userInfo'],

    components: { VSwatches },

    data () {
        return {
@@ -676,6 +682,23 @@
            arrowPositionSre: '',
            isLineEdit: true,
            addLinePosition: '',
            color: 'rgba(255, 69, 0)',
          predefineColors: [
          '#ff4500',
          '#ff8c00',
          '#ffd700',
          '#90ee90',
          '#00ced1',
          '#1e90ff',
          '#c71585',
          'rgba(255, 69, 0, )',
          'rgb(255, 120, 0)',
          'hsv(51, 100, 98)',
          'hsva(120, 40, 94)',
          'hsl(181, 100%, 37%)',
          'hsla(209, 100%, 56%)',
          '#c7158577'
        ]
        }
    },

@@ -722,6 +745,11 @@
                arrowPlot = new global.DC.Plot(global.viewer)
            }

            if (pointCircleLayer == null) {
                pointCircleLayer = new global.DC.VectorLayer('pointCircleLayer')
                global.viewer.addLayer(pointCircleLayer)
            }

            if (arrowsListLayer == null) {
                arrowsListLayer = new global.DC.VectorLayer('arrowsListLayer')
                global.viewer.addLayer(arrowsListLayer)
@@ -745,6 +773,7 @@
            //     scale: 0.5
            // })
            // tc.addTrack(track)
            
        })
    },

@@ -999,6 +1028,13 @@
                            incident: this.overlayTypeClick,
                            mouseOverIcident:this.pointMouseOver
                        })
                        // let position = new global.DC.Position(Number(positionObj.lng), Number(positionObj.lat))
                        // let circle = new global.DC.Circle(position, 20)
                        // circle.size = [32,32]
                        // pointCircleLayer.addOverlay(circle)
                        // circle.setStyle({
                        //     "material": global.DC.Color.YELLOW,
                        // })
                    }
                })
            })
@@ -1136,7 +1172,7 @@
            if (iconName == 'activity') {
                positionObj = { lng: `${positionArr[0]}`, lat: `${positionArr[1]}`, alt: 0, url: '/img/icon/activity.png' }
            } else if (iconName == 'policeman') {
                positionObj = { lng: `${positionArr[0]}`, lat: `${positionArr[1]}`, alt: 0, url: '/img/icon/police-people.png', id: plotId, policemanId: policeId, deptId: deptId }
                positionObj = { lng: `${positionArr[0]}`, lat: `${positionArr[1]}`, alt: 0, url: '/img/icon/man3.png', id: plotId, policemanId: policeId, deptId: deptId }
            } else if (iconName == 'policecar') {
                positionObj = { lng: `${positionArr[0]}`, lat: `${positionArr[1]}`, alt: 0, url: '/img/icon/car3.png', id: plotId, carId: policeId, deptId: deptId }
            }
@@ -2278,7 +2314,6 @@
            // #BDC3C8
        },
    },


    destroyed () {
        this.$EventBus.$emit('mapRemoveLayer', {