diff --git a/src/views/contentData/index.js b/src/views/contentData/index.js index 25e9d31..ce4c8a9 100644 --- a/src/views/contentData/index.js +++ b/src/views/contentData/index.js @@ -98,7 +98,7 @@ export function allDevices(options, type, show) { style: { image: require(`@/assets/img/device/deviceIcon/${deviceItem.icon}.png`), // visibleDepth:false, - scale: 1, + scale: 1.5, horizontalOrigin: Cesium.HorizontalOrigin.CENTER, verticalOrigin: Cesium.VerticalOrigin.BOTTOM, clampToGround: true, @@ -130,7 +130,7 @@ export function allDevices(options, type, show) { style: { image: require(`@/assets/img/device/deviceIcon/${item.icon}.png`), // visibleDepth:false, - scale: 1, + scale: 1.5, horizontalOrigin: Cesium.HorizontalOrigin.CENTER, verticalOrigin: Cesium.VerticalOrigin.BOTTOM, clampToGround: true, @@ -382,11 +382,13 @@ export function mapUavFiex(options) { if (graphicDevice) { let deviceGraphic = graphicDevice.getGraphicById(item.DeviceId); console.log(deviceGraphic, "deviceGraphic"); - deviceGraphic.setOptions({ - style: { - scale: 1.5 - } - }); + if (deviceGraphic !== undefined) { + deviceGraphic.setOptions({ + style: { + scale: 2 + } + }); + } } }); //绑定气泡弹窗 diff --git a/src/views/menuData/DeviceDialog.vue b/src/views/menuData/DeviceDialog.vue index 81eda1b..f028228 100644 --- a/src/views/menuData/DeviceDialog.vue +++ b/src/views/menuData/DeviceDialog.vue @@ -131,6 +131,16 @@ export default { model: "deviceSN", rules: [{ required: true, message: "请输入设备SN" }] }, + { + label: "关联防区", + type: "select", + model: "positionId", + options: [], + disabled: false, + rules: [ + { required: true, message: "请选择关联防区", trigger: "change" } + ] + }, { label: "icon", type: "selectImg", @@ -226,13 +236,6 @@ export default { model: "pointP", disabled: false }, - { - label: "关联防区", - type: "select", - model: "positionId", - options: [], - disabled: false - }, { label: "设备图片", type: "img",