Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web

WX

2023-09-01 ac73d0ff912040e7a1c7da448b333e349dae4af1

Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web

 public/CIMSDK/Workers/image/location.png

 src/assets/js/Map/menuTool.js

@@ -590,10 +590,7 @@
        outlineColor: Cesium.Color.DODGERBLUE,
      }
    });
    window.Viewer.flyTo(locationPolygonEntity, {
      duration: 5,
      offset: new SmartEarth.Cesium.HeadingPitchRange(0.0, SmartEarth.Cesium.Math.toRadians(-20.0))
    });
    this.setViewerFlyTo(locationPolygonEntity)
  },
  setLocationPoint(res, name) {
    const position = window.Viewer.entities.add({
@@ -607,11 +604,20 @@
        scale: 5.0,
      },
    });
    window.Viewer.flyTo(position, {
      duration: 5,
      offset: new SmartEarth.Cesium.HeadingPitchRange(0.0, SmartEarth.Cesium.Math.toRadians(-20.0))

    this.setViewerFlyTo(position)
  },
  setViewerFlyTo(entity) {
    window.Viewer.flyTo(entity, {
      offset: {
        heading: Cesium.Math.toRadians(0.0),
        pitch: Cesium.Math.toRadians(-45),
        range: 40000
      }
    });
  },


  setLocationLine(res, name) {
    var position = [];

@@ -632,10 +638,7 @@

      },
    })
    window.Viewer.flyTo(polyline, {
      duration: 5,
      offset: new SmartEarth.Cesium.HeadingPitchRange(0.0, SmartEarth.Cesium.Math.toRadians(-20.0))
    });
    this.setViewerFlyTo(polyline)
  }

};

 src/store/index.ts

@@ -29,6 +29,7 @@
    },
    restLayer: false,
    isShowMap: true,
    spatialTitle: null,
  },
  mutations: {
    //获取登录Code

 src/views/layer/attributeList.vue

@@ -5,7 +5,7 @@
  >
    <!--     v-resizable="'right, bottom'" -->
    <div class="spatialTitle">
      <label>属性</label>
      <label>{{store.state.spatialTitle }}</label>
      <el-icon
        @click="setSpatialClose"
        :size="20"

 src/views/layer/layerDetail.vue

@@ -1,8 +1,15 @@
<template>
  <div class="content">
  <div
    class="content"
    v-drag="true"
  >
    <div class="title">
      <label>详细编辑</label>
      <el-icon @click="setSpatialClose" :size="20" style="cursor: pointer">
      <el-icon
        @click="setSpatialClose"
        :size="20"
        style="cursor: pointer"
      >
        <Close />
      </el-icon>
    </div>
@@ -12,9 +19,15 @@
          layerName
        }}</el-checkbox> -->
        {{ layerData.cnName }}
        <img src="../../assets/img/layer.png" alt="" />
        <img
          src="../../assets/img/layer.png"
          alt=""
        />
      </div>
      <div class="slider-demo-block" v-show="diaphaneityShow">
      <div
        class="slider-demo-block"
        v-show="diaphaneityShow"
      >
        <div class="demonstration">透明度</div>
        <el-slider
          v-model="transparence"
@@ -23,7 +36,10 @@
        />
        <div class="demonstration">{{ transparence }}%</div>
      </div>
      <div class="slider-demo-block" v-show="contrastShow">
      <div
        class="slider-demo-block"
        v-show="contrastShow"
      >
        <div class="demonstration">对比度</div>
        <el-slider
          v-model="contrast"
@@ -33,7 +49,10 @@
        />
        <div class="demonstration">{{ contrast }}</div>
      </div>
      <div class="selectBox" v-show="drawingModeShow">
      <div
        class="selectBox"
        v-show="drawingModeShow"
      >
        <div class="selectTile demonstration">拉伸方式</div>
        <el-select
          v-model="stretchValue"
@@ -51,7 +70,10 @@
          </el-option>
        </el-select>
      </div>
      <div class="selectBox" v-show="colorShow">
      <div
        class="selectBox"
        v-show="colorShow"
      >
        <div class="selectTile demonstration">渲染类型</div>
        <el-select
          v-model="renderType"
@@ -71,7 +93,10 @@
            <!-- <img :src="item.url" style="height: 30px; margin-right: 10px" />
            <span>{{ item.label }}</span> -->

            <img :src="item.url" style="height: 30px; width: 100%" />
            <img
              :src="item.url"
              style="height: 30px; width: 100%"
            />
          </el-option>
        </el-select>
      </div>
@@ -237,11 +262,11 @@
.content {
  background: #1e2a3d;
  padding: 20px;
  height: 400px;
  // height: 400px;
  margin-left: 20px;
  margin-top: 40px;
  min-width: 200px;
  z-index: 30;
  z-index: 40;
  position: absolute;
  .title {
    font-size: 18px;

 src/views/layer/layerManage.vue

@@ -208,6 +208,7 @@
  layerDetailIsshow.value = false;
  layerObjData.value = e;

  store.state.spatialTitle = e.cnName;
  if (res == 2) {
    layerAttributeIsshow.value = true;
    store.state.tab = e;

 src/views/query/SpatialQuery.vue

@@ -176,6 +176,7 @@
      v-model="downloaVisible"
      title="下载"
      width="30%"
      :show-close="false"
    >
      <div
        class="spatialTable"
@@ -239,7 +240,10 @@
              size="small"
              @click="submitForm(downFormRef)"
            >提交</el-button>
            <el-button size="small">取消</el-button>
            <el-button
              size="small"
              @click="setCloseSpatialDownload"
            >取消</el-button>
          </el-form-item>
        </el-form>
      </div>
@@ -423,6 +427,10 @@
  downTable.value = menuList.value;
  downloaVisible.value = true;
};
const setCloseSpatialDownload = () => {
  downloaVisible.value = false;
  setClearDownload();
};
//定位显示
const spaceLocation = (index, row) => {
  var geom = menuTool.decr(row.geom);