From d60a7581b801f7573232c08f75e7719e600a5d39 Mon Sep 17 00:00:00 2001
From: liukaiyun <108042817+supermapliukaiyun@users.noreply.github.com>
Date: Fri, 7 Jul 2023 16:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=86=8D=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/saveScene/index.vue            |   8 +-
 .../components/layoutRightSider/index.vue     |   7 +-
 .../analyse/analyse-profile/index.vue         |   2 +-
 .../analyse/analyse-profile/js/profile.js     |  20 +-
 .../analyse/analyse-shadow/index.vue          |   2 +-
 .../analyse/analyse-sightLine/index.vue       |   8 +-
 .../analyse/analyse-skyline/index.vue         |   2 +-
 .../src/package/analyse3d/analyse/index.vue   |  15 +-
 .../analyse3d/clip/clip-plane/index.vue       |  26 +-
 .../src/package/analyse3d/index.vue           |   5 +-
 .../src/package/layerList/index.vue           |  40 +-
 .../layerSeries/layerAttribute/index.ts       |   3 +
 .../layerSeries/layerAttribute/index.vue      | 464 ++++++++++++++++++
 .../layerSeries/layerOpration/index.ts        |   3 +
 .../layerSeries/layerOpration/index.vue       |   3 +
 .../package/layerSeries/layerStyle/index.ts   |   3 +
 .../package/layerSeries/layerStyle/index.vue  |   3 +
 .../draw-geomety/coms/ellipse.vue             |  20 +-
 .../fly-route/components/create-route.vue     |  17 +-
 .../fly-route/components/import-route.vue     |   8 +-
 .../sceneSet/fly-route/components/rotate.vue  |  87 +++-
 .../src/package/sceneSet/index.vue            |  15 +-
 SuperMap iEarth/src/store/panelStore/index.ts |  21 +
 SuperMap iEarth/src/styles/index.css          |   1 +
 SuperMap iEarth/src/styles/index.scss         |   4 +-
 SuperMap iEarth/src/views/panel/index.vue     |  32 ++
 SuperMap iEarth/src/views/viewer/index.vue    |   3 +-
 27 files changed, 754 insertions(+), 68 deletions(-)
 create mode 100644 SuperMap iEarth/src/package/layerSeries/layerAttribute/index.ts
 create mode 100644 SuperMap iEarth/src/package/layerSeries/layerAttribute/index.vue
 create mode 100644 SuperMap iEarth/src/package/layerSeries/layerOpration/index.ts
 create mode 100644 SuperMap iEarth/src/package/layerSeries/layerOpration/index.vue
 create mode 100644 SuperMap iEarth/src/package/layerSeries/layerStyle/index.ts
 create mode 100644 SuperMap iEarth/src/package/layerSeries/layerStyle/index.vue

diff --git a/SuperMap iEarth/src/layout/layoutHeader/components/saveScene/index.vue b/SuperMap iEarth/src/layout/layoutHeader/components/saveScene/index.vue
index be0f90ac..db3fbcce 100644
--- a/SuperMap iEarth/src/layout/layoutHeader/components/saveScene/index.vue	
+++ b/SuperMap iEarth/src/layout/layoutHeader/components/saveScene/index.vue	
@@ -374,8 +374,8 @@ function createAndSaveScene() {
               getRootUrl() +
               "apps/earth/v2/index.html?id=" +
               response.data.newResourceID;
-              console.log("currentUrl:",currentUrl)
-            // window.open(currentUrl, "_self");
+              // console.log("currentUrl:",currentUrl)
+            window.open(currentUrl, "_self");
           }, 1000);
         })
         .catch(function (error) {
@@ -465,8 +465,8 @@ function updateScene() {
           message.success("场景更新成功！");
           let currentUrl =
             getRootUrl() + "apps/earth/v2/index.html?id=" + state.sceneID;
-            console.log("currentUrl:",currentUrl)
-          // window.open(currentUrl, "_self");
+            // console.log("currentUrl:",currentUrl)
+          window.open(currentUrl, "_self");
         })
         .catch(function (error) {
           console.log(error)
diff --git a/SuperMap iEarth/src/layout/layoutMain/components/layoutRightSider/index.vue b/SuperMap iEarth/src/layout/layoutMain/components/layoutRightSider/index.vue
index 687ed856..fc5d5527 100644
--- a/SuperMap iEarth/src/layout/layoutMain/components/layoutRightSider/index.vue	
+++ b/SuperMap iEarth/src/layout/layoutMain/components/layoutRightSider/index.vue	
@@ -26,7 +26,7 @@
     </div>
     <!-- 分析等弹窗 -->
     <div class="too-bar four-tool-bar">
-      <span class="icon-container" v-for="iconItem in panelStore.panelList.rightToolBarList" :key="iconItem.id"
+      <span class="icon-container" v-for="iconItem in state.rightToolBarList" :key="iconItem.id"
         @click="changePanel(iconItem)" :class="iconItem.isSelected ? 'select-too-bar-bg' : ''">
         <i class="iconfont" :class="iconItem.iconName" :title="iconItem.title"></i>
       </span>
@@ -58,6 +58,11 @@ onMounted(() => {
   init();
 });
 
+let state = reactive({
+  rightToolBarList:panelStore.panelList.rightToolBarList.slice(0,4)
+})
+
+
 // 初始化
 function init() {
   if (!viewer) return;
diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/index.vue b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/index.vue
index ed52caeb..aaeafeb9 100644
--- a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/index.vue	
+++ b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/index.vue	
@@ -73,7 +73,7 @@
     <span>剖面信息</span>
   </div> -->
   <div class="row-item" style="margin-right: 0.1rem">
-      <span>剖面信息展示</span>
+      <span>剖面截图展示</span>
       <div class="check-box">
         <n-checkbox v-model:checked="state.profileInfoShow"></n-checkbox>
       </div>
diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/js/profile.js b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/js/profile.js
index 2bcce1a3..428264d6 100644
--- a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/js/profile.js	
+++ b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/js/profile.js	
@@ -187,7 +187,7 @@ class ProfileAnalysis {
                 text: "截面",
                 textStyle: {
                     fontSize: 15,
-                    color: '#fff'
+                    color: '#CAE6FF'
                 },
                 top: '3%',
                 left:'3%', 
@@ -201,7 +201,7 @@ class ProfileAnalysis {
                 containLabel: true
             },
             axisLabel: {// 设置坐标轴字的颜色
-               color: '#fff'
+               color: 'color: rgba(255, 255, 255, 0.85);'
             },
             backgroundColor: "#000817",
             tooltip: {
@@ -231,8 +231,12 @@ class ProfileAnalysis {
             toolbox: {
                 show: true,
                 feature: {
-                  restore: {},
-                  saveAsImage: {}
+                  restore: {
+                    title:'刷新'
+                  },
+                  saveAsImage: {
+                    title:"下载"
+                  }
                 },
                 right: "3%",
                 iconStyle: {
@@ -276,7 +280,13 @@ class ProfileAnalysis {
                 data: this.LatAndLons.map(function (item) {
                     return item.height;
                 }),
-                areaStyle: {},
+                areaStyle: {
+                opacity: 0
+                },
+                lineStyle: {
+                    color: '#3499E5'
+                },
+                showSymbol: false
             },
         };
         this.myChart.setOption(option);
diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-shadow/index.vue b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-shadow/index.vue
index 397ad207..58f7bcbb 100644
--- a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-shadow/index.vue	
+++ b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-shadow/index.vue	
@@ -4,7 +4,7 @@
       <n-slider v-model:value="state.timeArray" :max="96" :step="0.5" range :marks="state.marks"
           :format-tooltip="formatTime" />
           <i class="iconfont iconSize iconbofang btnImg" title="播放一天时间段内阳光和阴影动画" v-show="state.showStartTimeBtn" @click="sunLightForTime(true)"></i>
-          <i class="iconfont iconSize iconzanting btnImg" title="播放一年的阳光和阴影动画" v-show="!state.showStartTimeBtn" @click="sunLightForTime(false)"></i>
+          <i class="iconfont iconSize iconzanting btnImg" title="播放一天时间段内阳光和阴影动画" v-show="!state.showStartTimeBtn" @click="sunLightForTime(false)"></i>
   </div>
   <div class="itemBox-shadow">
       <!-- <n-date-picker class="shadow-date-picker" v-model:value="currentTime" type="date" size="small"
diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-sightLine/index.vue b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-sightLine/index.vue
index dad828b6..8b00349a 100644
--- a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-sightLine/index.vue	
+++ b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-sightLine/index.vue	
@@ -3,7 +3,7 @@
   <div class="row-item">
     <span>经度</span>
     <n-input-number
-      style="width: 1.96rem;height: 0.32rem"
+      style="width: 1.96rem"
       v-model:value="state.degreesArray[0]"
       :show-button="false"
       disabled
@@ -15,7 +15,7 @@
   <div class="row-item">
     <span>纬度</span>
     <n-input-number
-      style="width: 1.96rem;height: 0.32rem;"
+      style="width: 1.96rem"
       v-model:value="state.degreesArray[1]"
       :show-button="false"
       disabled
@@ -27,7 +27,7 @@
   <div class="row-item">
     <span>高程</span>
     <n-input-number
-      style="width: 1.96rem;height: 0.32rem;"
+      style="width: 1.96rem"
       v-model:value="state.degreesArray[2]"
       :show-button="false"
       disabled
@@ -67,7 +67,7 @@
       @click="analysis"
       >分析</n-button
     >
-    <n-button class="btn-secondary" @click="clear">清除</n-button>
+    <n-button class="btn-secondary" @click="clear" >清除</n-button>
   </div>
 </template>
 
diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-skyline/index.vue b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-skyline/index.vue
index 05f19674..9f34fe62 100644
--- a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-skyline/index.vue	
+++ b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-skyline/index.vue	
@@ -48,7 +48,7 @@
       ></n-color-picker>
     </div>
   </div>
-  <div class="row-item">
+  <div class="row-item" v-show="state.skylineMode ==='BODY'">
     <span>天际体颜色</span>
     <div class="check-color-pick">
         <n-checkbox v-model:checked="state.displaySkyBody"></n-checkbox>
diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/index.vue b/SuperMap iEarth/src/package/analyse3d/analyse/index.vue
index fe195498..a23a201e 100644
--- a/SuperMap iEarth/src/package/analyse3d/analyse/index.vue	
+++ b/SuperMap iEarth/src/package/analyse3d/analyse/index.vue	
@@ -6,7 +6,7 @@
         <SmAnalyseSightLine></SmAnalyseSightLine>
       </n-tab-pane>
       <!-- 可视域 -->
-      <n-tab-pane name="viewshed" tab="可视域">
+      <n-tab-pane name="viewshed" tab="可视域" class="use-scroll">
         <SmAnalyseViewshed></SmAnalyseViewshed>
       </n-tab-pane>
       <!-- 阴影 -->
@@ -45,7 +45,18 @@ function tabsChange(value) {}
 .analyse-box {
   width: 100%;
   height: 100%;
-  padding: 0 0.12rem;
+  // padding: 0 0.12rem;
   box-sizing: border-box;
+  :deep(.n-tabs-nav){
+    padding:0 0.12rem;
+  };
+  :deep(.n-tab-pane) {
+    box-sizing: border-box;
+    padding-left: 0.12rem;
+    padding-right: 0.12rem;
+  }
+  .use-scroll{
+    padding-right: 0px;
+  }
 }
 </style>
diff --git a/SuperMap iEarth/src/package/analyse3d/clip/clip-plane/index.vue b/SuperMap iEarth/src/package/analyse3d/clip/clip-plane/index.vue
index 90926eef..d17dc7fd 100644
--- a/SuperMap iEarth/src/package/analyse3d/clip/clip-plane/index.vue	
+++ b/SuperMap iEarth/src/package/analyse3d/clip/clip-plane/index.vue	
@@ -34,6 +34,7 @@
   </div>
 </template>
 
+
 <script lang="ts" setup>
 import { reactive, watch, onBeforeUnmount } from "vue";
 import ClipPlane from "./js/clip-plane.js";
@@ -43,12 +44,16 @@ type stateType = {
   clipFaceShow: boolean; // 是否显示裁剪面
   directionByNormal: boolean; // 是否沿法线
   modeOptions: any[]; // 模式选项
+  pickPosition: any, // 存储当前裁剪平面拾取位置
+  normal: any, // 存储当前裁剪平面法线
 };
 
 let state = reactive<stateType>({
   zoom: 1,
   clipFaceShow: true,
   directionByNormal: false,
+  pickPosition: null,
+  normal: null,
   modeOptions: [
     {
       label: "截面前",
@@ -93,6 +98,8 @@ function clipPlaneStart() {
 function left_click(e: any) {
   let pickPosition = viewer.scene.pickPosition(e.message.position);
   let normal = viewer.scene.pickNormal(e.message.position);
+  state.pickPosition = pickPosition;
+  state.normal = normal;
   if (pickPosition) clipPlane.startClip(pickPosition, normal);
   viewer.eventManager.removeEventListener("CLICK", left_click);
   viewer.eventManager.removeEventListener("MOUSE_MOVE", mouse_move);
@@ -102,15 +109,27 @@ function left_click(e: any) {
 //沿法线方向裁剪时实时显示参考平面
 function mouse_move(e: any) {
   if (state.directionByNormal) {
-    let cartesian = viewer.scene.pickPosition(e.message.endPosition);
-    let normal = viewer.scene.pickNormal(e.message.endPosition);
+    let cartesian = viewer.scene.pickPosition(e.message.position);
+    let normal = viewer.scene.pickNormal(e.message.position);
     clipPlane.setReferencePlane(cartesian, normal);
   }
 }
 
+// 更新平面裁剪模式
+function updatePlane() {
+  clipPlane.clear();
+
+  if (state.directionByNormal) {
+    clipPlane.setReferencePlane(state.pickPosition, state.normal);
+  }
+  if (state.pickPosition) clipPlane.startClip(state.pickPosition, state.normal);
+}
+
 // 清除
 function clear() {
   clipPlane.clear();
+  state.pickPosition = null;
+  state.normal = null;
   viewer.eventManager.removeEventListener("CLICK", left_click);
   viewer.eventManager.removeEventListener("MOUSE_MOVE", mouse_move);
   document.body.classList.remove("measureCur");
@@ -134,6 +153,9 @@ watch(
   () => state.directionByNormal,
   (val) => {
     clipPlane.setDirectionByNormal = val;
+    if(state.pickPosition){
+      updatePlane();
+    }
   }
 );
 
diff --git a/SuperMap iEarth/src/package/analyse3d/index.vue b/SuperMap iEarth/src/package/analyse3d/index.vue
index aee10d41..41ce2ace 100644
--- a/SuperMap iEarth/src/package/analyse3d/index.vue	
+++ b/SuperMap iEarth/src/package/analyse3d/index.vue	
@@ -9,7 +9,7 @@
       :key="item.id"
       :title="item.title"
     >
-      <i class="iconfont" :class="item.iconName"></i>
+      <i class="iconfont" :class="item.iconName" style="font-size: 18px"></i>
     </div>
   </div>
 
@@ -88,6 +88,7 @@ function changeItem(iconItem: any) {
   }
 }
 .select-bg {
-  background: #69798d;
+  background: rgba(255, 255, 255, 0.15);
+  color: #fff !important;
 }
 </style>
\ No newline at end of file
diff --git a/SuperMap iEarth/src/package/layerList/index.vue b/SuperMap iEarth/src/package/layerList/index.vue
index 6ee2d464..dc7d71bc 100644
--- a/SuperMap iEarth/src/package/layerList/index.vue	
+++ b/SuperMap iEarth/src/package/layerList/index.vue	
@@ -30,6 +30,8 @@ import {
   Trash
 } from "@vicons/ionicons5";
 import { h } from "vue";
+import { usePanelStore } from "@/store";
+const panelStore = usePanelStore();
 const layerStore = useLayerStore();
 let currentTerrainProvider: any; // 保存当前地形图层，方便控制其显隐
 
@@ -57,6 +59,7 @@ function renderSuffix({ option }: { option: TreeOption | any }) {
           title: "显隐",
           onClick: (e) => {
             console.log(e)
+            console.log("option:",option)
             if (!option.key) return;
             let optionKey: any = option.key;
             if (optionKey.indexOf("-") != -1) {
@@ -106,18 +109,37 @@ function renderSuffix({ option }: { option: TreeOption | any }) {
         {
           trigger: "click",
           placement: "right-start",
-          options: [
+          options: option.type === 's3m' ? [
             {
               label: "快速定位",
               key: 1,
               icon: () => h("i", { class: "iconfont icondingwei" }, ""), 
             },
+            // {
+            //   label: "图层操作",
+            //   key: 2,
+            //   icon: () => h("i", { class: "iconfont iconyidong" }, ""), 
+            // },
+            // {
+            //   label: "图层属性",
+            //   key: 3,
+            //   icon: () => h("i", { class: "iconfont icontishi" }, ""), 
+            // },
+            // {
+            //   label: "图层风格",
+            //   key: 4,
+            //   icon: () => h("i", { class: "iconfont icontuceng" }, ""), 
+            // },
             {
               label: "移除",
-              key: 2,
+              key: 5,
               icon: () => h("i", { class: "iconfont iconshanchu", style: "color: #DC5849"}, ""),
             },
-          ],
+          ]:[{
+              label: "移除",
+              key: 5,
+              icon: () => h("i", { class: "iconfont iconshanchu", style: "color: #DC5849"}, ""),
+            }],
           onSelect: (key: any) => {
             // key为1：定位，key为2：删除图层
             if (key === 1) {
@@ -141,7 +163,17 @@ function renderSuffix({ option }: { option: TreeOption | any }) {
                   },
                 });
               }
-            } else if (key === 2) {
+            }
+            else if(key === 2){
+              panelStore.setRightToolBarList({id:7});
+            }
+            else if(key === 3){
+              panelStore.setRightToolBarList({id:8});
+            }
+            else if(key === 4){
+              panelStore.setRightToolBarList({id:9});
+            }
+            else if (key === 5) {
               // 删除图层之后 再显隐会有问题，不通过id
               let type = option.type;
               let layerName = option.label;
diff --git a/SuperMap iEarth/src/package/layerSeries/layerAttribute/index.ts b/SuperMap iEarth/src/package/layerSeries/layerAttribute/index.ts
new file mode 100644
index 00000000..6dce78c3
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/layerAttribute/index.ts	
@@ -0,0 +1,3 @@
+import LayerAttribute from './index.vue';
+
+export default LayerAttribute;
diff --git a/SuperMap iEarth/src/package/layerSeries/layerAttribute/index.vue b/SuperMap iEarth/src/package/layerSeries/layerAttribute/index.vue
new file mode 100644
index 00000000..ba18a152
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/layerAttribute/index.vue	
@@ -0,0 +1,464 @@
+<template>
+    <!-- 绘制线 -->
+    <div class="row-item">
+      <span>图层名称</span>
+      <n-select
+        style="width: 1.96rem;height: 32px;"
+        v-model:value="state.selectedType"
+        size="small"
+        :options="state.optionMode"
+      />
+    </div>
+  
+    <div class="row-item">
+      <span class="name">符号库</span>
+      <div class="icon-list-space" style="width: 1.96rem;">
+        <span
+          v-for="(line, index) in state.lineOptions"
+          :key="index"
+          class="icon-span"
+          :title="line.name"
+          :class="line.isSelect ? 'selected-icon' : ''"
+          @click="changleIconItem(line)"
+        >
+          <!-- <svg-icon :name="line.iconName" class="icon-size" /> -->
+          <i class="iconfont iconSize" :class="line.iconName"></i>
+        </span>
+      </div>
+    </div>
+  
+    <div class="row-item">
+      <span>线颜色</span>
+      <div class="color-pick-box row-content" style="width: 1.96rem;height: 32px;">
+        <n-color-picker
+          v-model:value="state.lineColor"
+          :render-label="
+            () => {
+              return '';
+            }
+          "
+          size="small"
+        ></n-color-picker>
+      </div>
+    </div>
+  
+    <div class="row-item">
+      <span>线宽</span>
+      <div class="slider-box" style="width: 1.96rem;height: 32px;">
+        <n-slider
+          style="width: 1.5rem"
+          v-model:value="state.lineWidth"
+          :step="1"
+          :min="1"
+          :max="10"
+        />
+        <span>{{ state.lineWidth }}</span>
+      </div>
+    </div>
+  
+    
+    <div class="row-item">
+        <span>编辑线</span>
+        <div class="check-box" >
+          <n-checkbox v-model:checked="state.isEdit"></n-checkbox>
+        </div>
+      </div>
+    <div class="row-item">
+        <span>编辑线Z轴</span>
+        <div class="check-box">
+          <n-checkbox v-model:checked="state.isEditZ"></n-checkbox>
+        </div>
+      </div>
+    <div class="btn-row-item">
+      <n-button
+        type="info"
+        color="#3499E5"
+        text-color="#fff"
+        @click="add"
+        style="margin-right: 0.1rem"
+        >绘制</n-button
+      >
+      <n-button class="btn-secondary" @click="clear">清除</n-button>
+    </div>
+  </template>
+    
+    <script lang="ts" setup>
+  import { reactive, onBeforeUnmount, watch } from "vue";
+  import { useNotification } from "naive-ui";
+  import initHandler from "@/tools/drawHandler";
+  import setEditHandler from "@/tools/editHandler";
+  import locale from "@/tools/locateTemp";
+  
+  type stateType = {
+    selectedType: string, // 当前选择的绘制模式
+    selectedId: number, // 当前选择的线类型索引
+    lineColor: string, //设置线颜色
+    lineWidth: number, //设置选中线宽
+    dottedColor: string, //间隔颜色
+    dottedLength: number, 
+    outLineColor: string,
+    outLineWidth: number,
+    glowStrength: number,
+    trailPercentage: number,
+    isEdit: boolean, // 是否编辑
+    isEditZ: boolean, // 是否只编辑Z轴
+    optionMode:any,// 绘制模式选项
+    lineOptions:any,// 线类型选项
+  }
+  
+  // 初始化数据
+  let state = reactive<stateType>({
+    selectedType: "NONE",
+    selectedId: 0,
+    lineColor: "rgba(250, 196, 65, 1)", //设置线颜色
+    lineWidth: 5, //设置选中线宽
+    dottedColor: "rgba(250, 196, 65, 0)", //间隔颜色
+    dottedLength: 30,
+    outLineColor: "rgba(29, 206, 200, 1)",
+    outLineWidth: 2,
+    glowStrength: 0.5,
+    trailPercentage: 0.3,
+    isEdit: false,
+    isEditZ: false,
+    optionMode: [
+      {
+        label: () => locale.SpaceMode,
+        value: "NONE",
+      },
+      {
+        label: () => locale.TERRAINMode,
+        value: "TERRAIN",
+      },
+      {
+        label: () => locale.S3M_TILEMode,
+        value: "S3M_TILE",
+      },
+      {
+        label: () => locale.BOTHMode,
+        value: "BOTH",
+      },
+    ],
+    lineOptions: [
+      {
+        id: 0,
+        iconName: "iconshixian",
+        name: "实线",
+        nameEN: "solidline",
+        isSelect: true,
+      },
+      {
+        id: 1,
+        iconName: "iconxuxian",
+        name: "虚线",
+        nameEN: "dottedline",
+        isSelect: false,
+      },
+      {
+        id: 2,
+        iconName: "iconlunkuoxian",
+        name: "轮廓线",
+        nameEN: "outline",
+        isSelect: false,
+      },
+      {
+        id: 3,
+        iconName: "iconjiantou",
+        name: "箭头线",
+        nameEN: "arrowline",
+        isSelect: false,
+      },
+      {
+        id: 4,
+        iconName: "iconguangyunxian",
+        name: "光晕线",
+        nameEN: "haloline",
+        isSelect: false,
+      },
+      {
+        id: 5,
+        iconName: "iconweijixian",
+        name: "尾迹线",
+        nameEN: "trailline",
+        isSelect: false,
+      },
+    ],
+  });
+  
+  const notification = useNotification();
+  
+  let handlerPolyline,
+    removeEdit,
+    line_ids: any[] = [];
+  let clampToGround = undefined,
+    classificationType = undefined,
+    selected_line: any = undefined;
+  
+  // 分析
+  function add() {
+    notification.create({
+      content: () => locale.DrawSymbolTip,
+      duration: 3500,
+    });
+    add_line();
+  }
+  
+  // 添加线
+  function add_line() {
+    if (!handlerPolyline) {
+      handlerPolyline = initHandler("Polyline");
+    }
+    handlerPolyline.handlerDrawing().then(
+      (res) => {
+        creat_entity_line(res.object.positions);
+        handlerPolyline.polylineTransparent.show = false;
+      },
+      (err) => {
+        console.log(err);
+      }
+    );
+    handlerPolyline.activate();
+  }
+  
+  // 清除
+  function clear() {
+    if (handlerPolyline) handlerPolyline.clearHandler();
+    if (selected_line) {
+      viewer.entities.removeById(selected_line.id);
+      selected_line = undefined;
+    } else {
+      line_ids.forEach((id) => viewer.entities.removeById(id));
+      line_ids.length = 0;
+    }
+    removeEditHandler();
+  
+    state.isEdit = false;
+  }
+  
+  // 根据索引创建不同类型的线实体 - entity
+  function creat_entity_line(position: any) {
+    let lineColor = SuperMap3D.Color.fromCssColorString(state.lineColor);
+    let lineWidth = Number(state.lineWidth);
+    let material: any;
+    let id = "add-line-" + new Date().getTime();
+    switch (state.selectedId) {
+      case 0:
+        material = lineColor;
+        break;
+      case 1:
+        let dottedColor = SuperMap3D.Color.fromCssColorString(state.dottedColor); //间隔颜色
+        let dottedLength = Number(state.dottedLength);
+        material = new SuperMap3D.PolylineDashMaterialProperty({
+          color: lineColor,
+          gapColor: dottedColor,
+          dashLength: dottedLength,
+        });
+        break;
+      case 2:
+        let outLineColor = SuperMap3D.Color.fromCssColorString(
+          state.outLineColor
+        ); //轮廓颜色
+        let outLineWidth = Number(state.outLineWidth);
+        material = new SuperMap3D.PolylineOutlineMaterialProperty({
+          color: lineColor,
+          outlineWidth: outLineWidth,
+          outlineColor: outLineColor,
+        });
+        break;
+      case 3:
+        material = new SuperMap3D.PolylineArrowMaterialProperty(lineColor);
+        break;
+      case 4:
+        let glowStrength = Number(state.glowStrength);
+        material = new SuperMap3D.PolylineGlowMaterialProperty({
+          glowPower: glowStrength,
+          color: lineColor,
+        });
+        break;
+      case 5:
+        let trailPercentage = Number(state.trailPercentage);
+        material = new SuperMap3D.PolylineTrailMaterialProperty({
+          color: lineColor,
+          trailLength: trailPercentage,
+          // period: state.trailPeroid
+        });
+        break;
+      default:
+        material = lineColor;
+        break;
+    }
+    line_ids.push(id);
+    selected_line = viewer.entities.add({
+      id: id,
+      polyline: {
+        positions: position,
+        width: lineWidth,
+        material: material,
+        classificationType: classificationType, //贴地贴对象模式设置
+        clampToGround: clampToGround, //贴地贴对象需要设置true
+      },
+    });
+  }
+  
+  // 设置线的绘制模式：贴地、空间、贴S3M
+  function setLineMode(val1, val2) {
+    clampToGround = val1;
+    classificationType = val2;
+    if (selected_line) {
+      selected_line.polyline.clampToGround = clampToGround;
+      selected_line.polyline.classificationType = classificationType;
+    }
+  }
+  
+  // 设置线实体可编辑
+  function setEdit() {
+    viewer.selectedEntity = undefined;
+    removeEdit = viewer.selectedEntityChanged.addEventListener(() => {
+      if (
+        viewer.selectedEntity &&
+        viewer.selectedEntity.id &&
+        viewer.selectedEntity.id.includes("add-line")
+      ) {
+        setEditHandler(viewer.selectedEntity, state.isEditZ);
+        selected_line = viewer.selectedEntity;
+      } else selected_line = undefined;
+    });
+  }
+  
+  // 移除编辑
+  function removeEditHandler() {
+    if (removeEdit) removeEdit();
+    if (window.editHandler) window.editHandler.clear();
+    viewer.selectedEntity = undefined;
+  }
+  
+  // 切换项目
+  function changleIconItem(item: any) {
+    state.selectedId = item.id;
+    for (let i = 0; i < state.lineOptions.length; i++) {
+      if (state.lineOptions[i].id == item.id) {
+        state.lineOptions[i].isSelect = true;
+      } else {
+        state.lineOptions[i].isSelect = false;
+      }
+    }
+  }
+  
+  watch(
+    () => state.selectedType,
+    (val) => {
+      switch (val) {
+        case "NONE":
+          setLineMode(undefined, undefined);
+          break;
+        case "TERRAIN":
+          setLineMode(true, SuperMap3D.ClassificationType.TERRAIN);
+          break;
+        case "S3M_TILE":
+          setLineMode(true, SuperMap3D.ClassificationType.S3M_TILE);
+          break;
+        case "BOTH":
+          setLineMode(true, SuperMap3D.ClassificationType.BOTH);
+          break;
+        default:
+          setLineMode(undefined, undefined);
+          break;
+      }
+    }
+  );
+  
+  watch(
+    () => state.lineColor,
+    (val) => {
+      let color = SuperMap3D.Color.fromCssColorString(val);
+      if (selected_line) selected_line.polyline.material.color = color;
+    }
+  );
+  watch(
+    () => state.lineWidth,
+    (val) => {
+      if (selected_line) selected_line.polyline.width = Number(val);
+    }
+  );
+  
+  watch(
+    () => state.dottedColor,
+    (val) => {
+      let color = SuperMap3D.Color.fromCssColorString(val);
+      if (selected_line) selected_line.polyline.material.gapColor = color;
+    }
+  );
+  
+  watch(
+    () => state.dottedLength,
+    (val) => {
+      if (selected_line) selected_line.polyline.material.dashLength = Number(val);
+    }
+  );
+  watch(
+    () => state.outLineColor,
+    (val) => {
+      let color = SuperMap3D.Color.fromCssColorString(val);
+      if (selected_line) selected_line.polyline.material.outlineColor = color;
+    }
+  );
+  watch(
+    () => state.outLineWidth,
+    (val) => {
+      if (selected_line)
+        selected_line.polyline.material.outlineWidth = Number(val);
+    }
+  );
+  watch(
+    () => state.glowStrength,
+    (val) => {
+      if (selected_line) selected_line.polyline.material.glowPower = Number(val);
+    }
+  );
+  watch(
+    () => state.trailPercentage,
+    (val) => {
+      if (selected_line)
+        selected_line.polyline.material.trailLength = Number(val);
+    }
+  );
+  
+  watch(
+    () => state.isEdit,
+    (val) => {
+      if (val) {
+        notification.create({
+          content: () => locale.DrawlineTip,
+          duration: 3500,
+        });
+        setEdit();
+      } else removeEditHandler();
+    }
+  );
+  watch(
+    () => state.isEditZ,
+    (val) => {
+      if (window.editHandler) {
+        window.editHandler.isEditZ = val;
+      }
+    }
+  );
+  
+  onBeforeUnmount(() => {
+    clear();
+  });
+  
+  </script>
+    
+    
+  <style lang="scss" scoped>
+  :deep(.n-slider-handle){
+    background-color: #414141 !important;
+    border: 1.5px solid #3499E5 !important;
+  }
+  </style>
+    
+    
+    
+    
+    
+    
\ No newline at end of file
diff --git a/SuperMap iEarth/src/package/layerSeries/layerOpration/index.ts b/SuperMap iEarth/src/package/layerSeries/layerOpration/index.ts
new file mode 100644
index 00000000..e73893d7
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/layerOpration/index.ts	
@@ -0,0 +1,3 @@
+import LayerOpration from './index.vue';
+
+export default LayerOpration;
diff --git a/SuperMap iEarth/src/package/layerSeries/layerOpration/index.vue b/SuperMap iEarth/src/package/layerSeries/layerOpration/index.vue
new file mode 100644
index 00000000..60a19e36
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/layerOpration/index.vue	
@@ -0,0 +1,3 @@
+<template>
+    <h1>图层操作</h1>
+</template>
\ No newline at end of file
diff --git a/SuperMap iEarth/src/package/layerSeries/layerStyle/index.ts b/SuperMap iEarth/src/package/layerSeries/layerStyle/index.ts
new file mode 100644
index 00000000..46aa222f
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/layerStyle/index.ts	
@@ -0,0 +1,3 @@
+import LayerStyle from './index.vue';
+
+export default LayerStyle;
diff --git a/SuperMap iEarth/src/package/layerSeries/layerStyle/index.vue b/SuperMap iEarth/src/package/layerSeries/layerStyle/index.vue
new file mode 100644
index 00000000..1379c753
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/layerStyle/index.vue	
@@ -0,0 +1,3 @@
+<template>
+    <h1>图层风格</h1>
+</template>
\ No newline at end of file
diff --git a/SuperMap iEarth/src/package/objectPainting/draw-geomety/coms/ellipse.vue b/SuperMap iEarth/src/package/objectPainting/draw-geomety/coms/ellipse.vue
index 0ec89870..53851a21 100644
--- a/SuperMap iEarth/src/package/objectPainting/draw-geomety/coms/ellipse.vue	
+++ b/SuperMap iEarth/src/package/objectPainting/draw-geomety/coms/ellipse.vue	
@@ -4,7 +4,7 @@
     <div class="row-item">
         <span>短半轴</span>
         <div class="slider-box" style="width: 1.96rem;height: 32px;">
-            <n-slider style="width: 1.5rem" v-model:value="state.semiMinorAxis" :step="20" :min="10" :max="100" />
+            <n-slider style="width: 1.5rem" v-model:value="state.semiMinorAxis" :step="20" :min="1" :max="100" />
             <span>{{ state.semiMinorAxis }}</span>
         </div>
     </div>
@@ -149,15 +149,15 @@ function clear() {
     deactiveAll();
     viewer.entities.removeAll();
 }
-
-watch(
-    () => state.semiMinorAxis, // 不起效果，而且场景会动不了，但是页面组件随便用
-    (val) => {
-        if (targetEntity) {
-            targetEntity.ellipse['semiMinorAxis'] = val;
-        }
-    }
-);
+// 赋值会场景卡死不动，范例上没问题，后面再看
+// watch(
+//     () => state.semiMinorAxis, // 不起效果，而且场景会动不了，但是页面组件随便用
+//     (val) => {
+//         if (targetEntity) {
+//             targetEntity.ellipse['semiMinorAxis'] = val;
+//         }
+//     }
+// );
 watch(
     () => state.geometryMaterial,
     (val) => {
diff --git a/SuperMap iEarth/src/package/sceneSet/fly-route/components/create-route.vue b/SuperMap iEarth/src/package/sceneSet/fly-route/components/create-route.vue
index 1568b279..032143c8 100644
--- a/SuperMap iEarth/src/package/sceneSet/fly-route/components/create-route.vue	
+++ b/SuperMap iEarth/src/package/sceneSet/fly-route/components/create-route.vue	
@@ -102,8 +102,7 @@
   <rotate></rotate>
 </template>
   
-  
-  <script lang='ts' setup>
+<script lang='ts' setup>
 import { watch, reactive, onBeforeUnmount } from "vue";
 import { useNotification,useMessage } from "naive-ui";
 import rotate from "./rotate.vue";
@@ -175,25 +174,25 @@ let state = reactive<stateType>({
   itemOptions: [
     {
       index: 1,
-      lable: "",
+      lable: "添加站点",
       iconName: "icontianjia",
       isSelect: false,
     },
     {
       index: 2,
-      lable: "",
+      lable: "删除站点",
       iconName: "iconshanchu",
       isSelect: false,
     },
     {
       index: 3,
-      lable: "",
+      lable: "恢复",
       iconName: "iconfuwei",
       isSelect: false,
     },
     {
       index: 4,
-      lable: "",
+      lable: "保存",
       iconName: "iconbaocun",
       isSelect: false,
     },
@@ -201,19 +200,19 @@ let state = reactive<stateType>({
   actionOptions:[
     {
       index: 1,
-      lable: "",
+      lable: "播放",
       iconName: "iconbofang",
       isSelect: false,
     },
     {
       index: 2,
-      lable: "",
+      lable: "暂停",
       iconName: "iconzanting",
       isSelect: false,
     },
     {
       index: 3,
-      lable: "",
+      lable: "停止",
       iconName: "icontingzhi",
       isSelect: false,
     }
diff --git a/SuperMap iEarth/src/package/sceneSet/fly-route/components/import-route.vue b/SuperMap iEarth/src/package/sceneSet/fly-route/components/import-route.vue
index 6737caf2..e2f33626 100644
--- a/SuperMap iEarth/src/package/sceneSet/fly-route/components/import-route.vue	
+++ b/SuperMap iEarth/src/package/sceneSet/fly-route/components/import-route.vue	
@@ -64,6 +64,7 @@
   </n-space>
 </template>
   
+  
 <script lang="ts" setup>
 import { ref, onBeforeUnmount, watch, reactive, onMounted } from "vue";
 import rotate from "./rotate.vue";
@@ -89,19 +90,19 @@ let state = reactive<stateType>({
   actionOptions: [
     {
       index: 1,
-      lable: "",
+      lable: "播放",
       iconName: "iconbofang",
       isSelect: false,
     },
     {
       index: 2,
-      lable: "",
+      lable: "暂停",
       iconName: "iconzanting",
       isSelect: false,
     },
     {
       index: 3,
-      lable: "",
+      lable: "停止",
       iconName: "icontingzhi",
       isSelect: false,
     }
@@ -275,6 +276,7 @@ onBeforeUnmount(() => {
 </script>
   
   
+  
 <style lang="scss" scoped>
 :deep(.n-slider-handle){
   background-color: #414141 !important;
diff --git a/SuperMap iEarth/src/package/sceneSet/fly-route/components/rotate.vue b/SuperMap iEarth/src/package/sceneSet/fly-route/components/rotate.vue
index 8ffded18..5f2ffea9 100644
--- a/SuperMap iEarth/src/package/sceneSet/fly-route/components/rotate.vue	
+++ b/SuperMap iEarth/src/package/sceneSet/fly-route/components/rotate.vue	
@@ -61,6 +61,7 @@ type stateType = {
   flyCircleLoop: true, // 是否循环
   rotateShow: false, // 是否绕点旋转
   itemOptions: any,// 功能选项
+  position: any, // 绕点选择中心点
 }
 
 // 初始化数据
@@ -68,27 +69,28 @@ let state = reactive<stateType>({
   speedRatio: 1,
   flyCircleLoop: true,
   rotateShow: false, 
+  position: null,
   itemOptions: [
     {
       index: 1,
-      lable: "",
+      lable: "添加",
       iconName: "icontianjia",
       isSelect: false,
     },
     {
       index: 2,
-      lable: "",
-      iconName: "iconzanting",
+      lable: "播放",
+      iconName: "iconbofang",
       isSelect: false,
     },
     {
       index: 3,
-      lable: "",
+      lable: "停止",
       iconName: "icontingzhi",
       isSelect: false,
-    },    {
+    }, {
       index: 4,
-      lable: "",
+      lable: "复位",
       iconName: "iconfuwei",
       isSelect: false,
     }
@@ -96,6 +98,13 @@ let state = reactive<stateType>({
 });
 
 init();
+
+const scene = viewer.scene;
+let windowPosition = new SuperMap3D.Cartesian2();
+let scratchTiltFrame = new SuperMap3D.Matrix4();
+let scratchOldTransform = new SuperMap3D.Matrix4();
+let listener;
+
 function init() {
   if (!window.viewer) return;
   viewer.scene.camera.flyCircleLoop = state.flyCircleLoop;
@@ -112,31 +121,45 @@ function changleIconItem(item:any){
     }
   });
 
-  switch(item.index){
-    case 1:{
+  switch (item.index) {
+    case 1: {
+      addCenter();
+      break;
+    }
+    case 2: {
       startFlyCircle();
       break;
     }
-    case 3:{
+    case 3: {
       clearFlyCircle();
       break;
     }
+    case 4: {
+      reset();
+      break;
+    }
     default:
-        break;
+      break;
   }
 }
 
+
 // 绑定监听事件
-function startFlyCircle() {
+function addCenter() {
   viewer.enableCursorStyle = false;
   viewer._element.style.cursor = "";
   document.body.classList.add("measureCur");
   viewer.eventManager.addEventListener("CLICK", left_click, true);
 }
 
-// 绕点旋转
-function left_click(e:any) {
-  let center = viewer.scene.pickPosition(e.message.position);
+// 添加点
+function left_click(e: any) {
+  state.position = e.message.position;
+}
+
+// 开始旋转
+function startFlyCircle() {
+  let center = viewer.scene.pickPosition(state.position);
   if (SuperMap3D.defined(center)) viewer.scene.camera.flyCircle(center); // 相机绕中心点旋转
   document.body.classList.remove("measureCur");
   viewer.eventManager.removeEventListener("CLICK", left_click);
@@ -149,6 +172,42 @@ function clearFlyCircle() {
   viewer.eventManager.removeEventListener("CLICK", left_click);
 }
 
+// 复位-指北旋转
+function reset() {
+  windowPosition.x = scene.canvas.clientWidth / 2;
+  windowPosition.y = scene.canvas.clientHeight / 2;
+  let viewCenter = viewer.scene.pickPosition(windowPosition);
+  if (!viewCenter || listener !== undefined) {
+    return;
+  }
+  let tiltFrame = SuperMap3D.Transforms.eastNorthUpToFixedFrame(viewCenter, scene.globe.ellipsoid, scratchTiltFrame);
+  // scene.camera.lookAtTransform(tiltFrame);
+  let rotateAngle;
+  listener = setInterval(function () {
+    let currentHeading = SuperMap3D.Math.toDegrees(scene.camera.heading);
+    let oldTransform = SuperMap3D.Matrix4.clone(scene.camera.transform, scratchOldTransform);
+    scene.camera.lookAtTransform(tiltFrame);
+    if (currentHeading > 180 && currentHeading < 360) {
+      rotateAngle = SuperMap3D.Math.toRadians(360 - currentHeading) / 2;
+      scene.camera.rotateLeft(rotateAngle);    //顺时针旋转
+      scene.camera.lookAtTransform(oldTransform);
+      if ((360 - currentHeading) < 1) {               //罗盘指北移除监听
+        clearInterval(listener);
+        listener = undefined;
+      }
+    } else {
+      rotateAngle = SuperMap3D.Math.toRadians(currentHeading) / 2;
+      scene.camera.rotateRight(rotateAngle);     //逆时针旋转
+      scene.camera.lookAtTransform(oldTransform);
+      if ((1 - currentHeading) > 0) {               //罗盘指北移除监听
+        clearInterval(listener);
+        listener = undefined;
+      }
+    }
+  }, 100);
+}
+
+
 watch(
   () => state.speedRatio,
   (val) => {
diff --git a/SuperMap iEarth/src/package/sceneSet/index.vue b/SuperMap iEarth/src/package/sceneSet/index.vue
index 958dccdc..f356eb85 100644
--- a/SuperMap iEarth/src/package/sceneSet/index.vue	
+++ b/SuperMap iEarth/src/package/sceneSet/index.vue	
@@ -2,7 +2,7 @@
   <div class="scene-set-box">
     <n-tabs type="line" animated :on-update:value="tabsChange" justify-content="left">
       <!-- 场景属性 -->
-      <n-tab-pane name="publicService" tab="场景属性">
+      <n-tab-pane name="publicService" tab="场景属性" class="use-scroll">
         <SmSceneAttribute></SmSceneAttribute>
       </n-tab-pane>
       <!-- 飞行 -->
@@ -44,10 +44,21 @@ function tabsChange() {}
 .scene-set-box {
   width: 100%;
   height: 100%;
-  padding: 0 0.12rem;
+  // padding: 0 0.12rem;
   box-sizing: border-box;
 }
 :deep(.n-tabs-tab-wrapper){
   margin-right:0.16rem;
 }
+  :deep(.n-tabs-nav){
+    padding:0 0.12rem;
+  };
+  :deep(.n-tab-pane) {
+    box-sizing: border-box;
+    padding-left: 0.12rem;
+    padding-right: 0.12rem;
+  }
+  .use-scroll{
+    padding-right: 0px;
+  }
 </style>
diff --git a/SuperMap iEarth/src/store/panelStore/index.ts b/SuperMap iEarth/src/store/panelStore/index.ts
index 5b96bac8..8bd1bb27 100644
--- a/SuperMap iEarth/src/store/panelStore/index.ts	
+++ b/SuperMap iEarth/src/store/panelStore/index.ts	
@@ -52,6 +52,27 @@ export const usePanelStore = defineStore({
                     isSelected: false,
                     panelName: "ObjectPainting"
                 },
+                {
+                    id: 7,
+                    iconName: "iconhuizhi",
+                    title: "图层操作",
+                    isSelected: false,
+                    panelName: "layerOpration"
+                },
+                {
+                    id: 8,
+                    iconName: "iconhuizhi",
+                    title: "图层属性",
+                    isSelected: false,
+                    panelName: "layerAttr"
+                },
+                {
+                    id: 9,
+                    iconName: "iconhuizhi",
+                    title: "图层风格",
+                    isSelected: false,
+                    panelName: "layerStyle"
+                },
             ]
         },
         rightTooPanel: false,
diff --git a/SuperMap iEarth/src/styles/index.css b/SuperMap iEarth/src/styles/index.css
index 8e9c947a..b566ef6b 100644
--- a/SuperMap iEarth/src/styles/index.css	
+++ b/SuperMap iEarth/src/styles/index.css	
@@ -95,6 +95,7 @@ html, body, #app {
   border: 1px solid rgba(255, 255, 255, 0.85);
 }
 
+
 .n-input-number {
   border: 1px solid rgba(255, 255, 255, 0.15);
 }
diff --git a/SuperMap iEarth/src/styles/index.scss b/SuperMap iEarth/src/styles/index.scss
index 627cf723..4cab37e0 100644
--- a/SuperMap iEarth/src/styles/index.scss	
+++ b/SuperMap iEarth/src/styles/index.scss	
@@ -120,8 +120,8 @@ html, body,#app{
 
 
 .btn-secondary {
-    color: rgba(255, 255, 255, 0.65);
-    border: 1px solid rgba(255, 255, 255, 0.65);
+    // color: rgba(255, 255, 255, 0.65);
+    // border: 1px solid rgba(255, 255, 255, 0.65);
     :hover {
         color: #5EB7F2 !important;
     }
diff --git a/SuperMap iEarth/src/views/panel/index.vue b/SuperMap iEarth/src/views/panel/index.vue
index 49adcfd3..a8179a62 100644
--- a/SuperMap iEarth/src/views/panel/index.vue	
+++ b/SuperMap iEarth/src/views/panel/index.vue	
@@ -42,6 +42,21 @@
           v-if="panelStore.panelList.rightToolBarList[3].isSelected"
           >对象绘制</span
         >
+        <span
+          class="panle-title"
+          v-if="panelStore.panelList.rightToolBarList[4].isSelected"
+          >图层操作</span
+        >
+        <span
+          class="panle-title"
+          v-if="panelStore.panelList.rightToolBarList[5].isSelected"
+          >图层属性</span
+        >
+        <span
+          class="panle-title"
+          v-if="panelStore.panelList.rightToolBarList[6].isSelected"
+          >图层风格</span
+        >
         <span class="zst1"></span>
         <span class="zst2"></span>
         <div class="panel-close" @click="panelCloseHandle(2)">
@@ -62,6 +77,16 @@
         <ObjectPainting
           v-if="panelStore.panelList.rightToolBarList[3].isSelected"
         ></ObjectPainting>
+        
+        <LayerOpration
+          v-if="panelStore.panelList.rightToolBarList[4].isSelected"
+        ></LayerOpration>
+        <LayerAttribute
+          v-if="panelStore.panelList.rightToolBarList[5].isSelected"
+        ></LayerAttribute>
+        <LayerStyle
+          v-if="panelStore.panelList.rightToolBarList[6].isSelected"
+        ></LayerStyle>
       </div>
       <div class="panle-footer"></div>
     </div>
@@ -82,6 +107,13 @@ import Measure from "@/package/measure/index";
 import SceneSet from "@/package/sceneSet/index";
 // 对象绘制
 import ObjectPainting from "@/package/objectPainting/index";
+
+
+// 图层系列操作
+import LayerOpration from "@/package/layerSeries/layerOpration/index";
+import LayerAttribute from "@/package/layerSeries/layerAttribute/index";
+import LayerStyle from "@/package/layerSeries/layerStyle/index";
+
 import { usePanelStore } from "@/store/index";
 
 const panelStore = usePanelStore();
diff --git a/SuperMap iEarth/src/views/viewer/index.vue b/SuperMap iEarth/src/views/viewer/index.vue
index fdb52c76..347eb520 100644
--- a/SuperMap iEarth/src/views/viewer/index.vue	
+++ b/SuperMap iEarth/src/views/viewer/index.vue	
@@ -73,7 +73,8 @@ function initViewer() {
   window["viewer"] = viewer; //绑定到window
   GlobalStore.isViewer = true; // viewer初始化完成标志
   viewer.eventManager = new EventManager(viewer); //添加屏幕事件管理
-  // viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
+  viewer.resolutionScale = window.devicePixelRatio;
+  viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
   viewer.scene.globe.baseColor = SuperMap3D.Color.BLACK; // 没有影像图层时地球的底色
   if (viewer.geocoder) {
     // 请开发者自行到supermap online官网（http://www.supermapol.com/）申请key