【杨琨】【颜色修改】

Author: killer1992

src/service/3DPlot/Draw/DrawPoint.js

@@ -8,60 +8,65 @@
  */
 
 import DrawObject from "../../../service/PlotBase/Draw/DrawObject";
-import { PrimitiveFactory } from "../Primitive/PrimitiveFactory";
+import {PrimitiveFactory} from "../Primitive/PrimitiveFactory";
 import {CesiumUtil} from "../Utils/CesiumUtil";
 
 export default class DrawPoint extends DrawObject {
-  constructor(viewer, symbol, plotLayer) {
-    super();
-    this._viewer = viewer;
-    this._symbol = symbol;
-    this.m_coords = [];
-    this._primitive = null;
-    this._plotLayer = plotLayer;
-  }
+    constructor(viewer, symbol, plotLayer) {
+        super();
+        this._viewer = viewer;
+        this._symbol = symbol;
+        this.m_coords = [];
+        this._primitive = null;
+        this._plotLayer = plotLayer;
+    }
 
-  addHooks() {
-    const viewer = this._viewer;
-    const symbol = this._symbol;
-    const handler = new Cesium.ScreenSpaceEventHandler(viewer.canvas);
-    let that = this;
-    handler.setInputAction((event) => {
-      const worldPos = viewer.scene.globe.pick(
-        viewer.camera.getPickRay(event.position),
-        viewer.scene
-      );
+    addHooks() {
+        const viewer = this._viewer;
+        const symbol = this._symbol;
+        const handler = new Cesium.ScreenSpaceEventHandler(viewer.canvas);
+        let that = this;
+        handler.setInputAction((event) => {
+            const worldPos = viewer.scene.globe.pick(
+                viewer.camera.getPickRay(event.position),
+                viewer.scene
+            );
 
-      if (!worldPos) return;
+            if (!worldPos) return;
 
-      symbol.getElement().then(function (res) {
-        const {classificationType} = that._symbol;
-        res.classificationType = classificationType;
-        that._primitive = PrimitiveFactory.createInstance(symbol.type, {
-          positions: that.m_coords,
-          element: res
-        });
+            symbol.getElement().then(function (res) {
+                const {classificationType} = that._symbol;
+                res.classificationType = classificationType;
+                const {style} = that._symbol;
+                if(style){
+                    res.initNodeStyles(style);
+                }
 
-        const lnglat = CesiumUtil.cartesian3ToDegrees(
-          viewer.scene.globe.ellipsoid,
-          worldPos
-        );
-        that.m_coords.push(lnglat);
-        that._plotLayer._primitiveCollection.add(that._primitive);
+                that._primitive = PrimitiveFactory.createInstance(symbol.type, {
+                    positions: that.m_coords,
+                    element: res
+                });
 
-        that._primitive.positions = that.m_coords;
-        that.disable();
-        that.fireFinishEvent({ plotObj3D: that._primitive });
-      });
-    }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+                const lnglat = CesiumUtil.cartesian3ToDegrees(
+                    viewer.scene.globe.ellipsoid,
+                    worldPos
+                );
+                that.m_coords.push(lnglat);
+                that._plotLayer._primitiveCollection.add(that._primitive);
 
-    this._handler = handler;
-  }
+                that._primitive.positions = that.m_coords;
+                that.disable();
+                that.fireFinishEvent({plotObj3D: that._primitive});
+            });
+        }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
 
-  removeHooks() {
-    const handler = this._handler;
-    // handler.removeInputAction();
-    handler.destroy();
-    this._handler = null;
-  }
+        this._handler = handler;
+    }
+
+    removeHooks() {
+        const handler = this._handler;
+        // handler.removeInputAction();
+        handler.destroy();
+        this._handler = null;
+    }
 }

src/service/3DPlot/Draw/DrawPolyline.js

@@ -61,6 +61,10 @@ export default class DrawPolyline extends DrawObject {
         if (!that._isAdded) {
           const {classificationType} = that._symbol;
           res.classificationType = classificationType;
+          const {style} = that._symbol;
+          if(style){
+            res.initNodeStyles(style);
+          }
           that._primitive = PrimitiveFactory.createInstance(symbol.type, {
             positions: that.m_coords,
             element: res,