P2022036_Web2.git

Surpriseplus

2023-02-20 b04816ec6bffbdc84dfe44aff256ec38f49e4dcf

数据申请界面修改

已修改10个文件

	public/index.html	168 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/assets/lang/en.js	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/assets/lang/zh.js	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/MapView/mapMenuPop.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/MapView/mapMenuTop.vue	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/MapView/mapSpaceTop.vue	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/Archive/dataApplication.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/Archive/index.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/Synthesis/LeftMenu.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/Tools/LayerTree.vue	35 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 public/index.html

@@ -1,83 +1,99 @@
<!DOCTYPE html>
<html lang="">
  <head>
    <meta charset="utf-8" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
    <title> </title>

    <link rel="stylesheet" href="./SmartEarthSDK/Workers/css/smartearth.css" />
    <link rel="stylesheet" href="./SmartEarthSDK/Workers/layui/css/layui.css" />
<head>
  <meta charset="utf-8" />

    <script src="./SmartEarthSDK/Workers/polyfill.min.js"></script>
    <script src="./SmartEarthSDK/Cesium/Cesium.js"></script>
    <script src="./SmartEarthSDK/SmartEarth.min.js"></script>
    <script src="./SmartEarthSDK/Workers/TreeTool.js"></script>
    <script src="./config/config.js"></script>
    <script src="./config/rsa.min.js"></script>
    <script src="./config/rollups.js"></script>
  <meta name="viewport" content="width=device-width,initial-scale=1.0" />

    <style>
      .esriControlsBR {
        display: none;
      }

      .ol-overlaycontainer-stopevent {
        /* display: none; */
      }
      .ol-control button {
        display: block;
        margin: 1px;
        padding: 0;
        color: rgb(102, 102, 102);
        font-weight: bold;
        text-decoration: none;
        font-size: inherit;
        text-align: center;
        height: 1.375em;
        width: 1.375em;
        line-height: 0.4em;
        background-color: #fff;
        border: none;
        border-radius: 2px;
      }
      .ol-full-screen {
        display: none;
        position: absolute;
        right: 0.5em;
        top: 0.5em;
      }
      .ol-rotate {
        display: none;
        position: absolute;
        top: 3em;
        right: 0.5em;
        transition: opacity 0.25s linear, visibility 0s linear;
      }
      .ol-scale-line {
        display: none;
        right: 0.3em;
        bottom: 0.5em;
        position: absolute;
      }
      .ol-scale-line-inner {
        /* padding: 5px 10px; */
        color: rgb(102, 102, 102);
        font-weight: bold;
        background-color: #fff;
        text-align: center;
        border-radius: 5px;
      }
      .ol-zoom {
        display: none;
        right: 0.3em;
        bottom: 3em;
        position: absolute;
      }
    </style>
  </head>
  <meta http-equiv="Expires" content="0" />
  <meta http-equiv="Cache" content="no-cache" />
  <meta http-equiv="Pragma" content="no-cache" />
  <meta http-equiv="Cache-control" content="no-cache" />
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
  <title> </title>

  <body>
    <div id="app"></div>
  </body>
</html>
  <link rel="stylesheet" href="./SmartEarthSDK/Workers/css/smartearth.css" />
  <link rel="stylesheet" href="./SmartEarthSDK/Workers/layui/css/layui.css" />

  <script src="./SmartEarthSDK/Workers/polyfill.min.js"></script>
  <script src="./SmartEarthSDK/Cesium/Cesium.js"></script>
  <script src="./SmartEarthSDK/SmartEarth.min.js"></script>
  <script src="./SmartEarthSDK/Workers/TreeTool.js"></script>
  <script src="./config/config.js"></script>
  <script src="./config/rsa.min.js"></script>
  <script src="./config/rollups.js"></script>

  <style>
    .esriControlsBR {
      display: none;
    }

    .ol-overlaycontainer-stopevent {
      /* display: none; */
    }

    .ol-control button {
      display: block;
      margin: 1px;
      padding: 0;
      color: rgb(102, 102, 102);
      font-weight: bold;
      text-decoration: none;
      font-size: inherit;
      text-align: center;
      height: 1.375em;
      width: 1.375em;
      line-height: 0.4em;
      background-color: #fff;
      border: none;
      border-radius: 2px;
    }

    .ol-full-screen {
      display: none;
      position: absolute;
      right: 0.5em;
      top: 0.5em;
    }

    .ol-rotate {
      display: none;
      position: absolute;
      top: 3em;
      right: 0.5em;
      transition: opacity 0.25s linear, visibility 0s linear;
    }

    .ol-scale-line {
      display: none;
      right: 0.3em;
      bottom: 0.5em;
      position: absolute;
    }

    .ol-scale-line-inner {
      /* padding: 5px 10px; */
      color: rgb(102, 102, 102);
      font-weight: bold;
      background-color: #fff;
      text-align: center;
      border-radius: 5px;
    }

    .ol-zoom {
      display: none;
      right: 0.3em;
      bottom: 3em;
      position: absolute;
    }
  </style>
</head>

<body>
  <div id="app"></div>
</body>

</html>

 src/assets/lang/en.js

@@ -103,7 +103,7 @@
      code:'Code'
    },

    metadataManage: 'metadataManage',
    metadataManage: 'Source Data Management',
    dataLoading: 'dataLoading',
    SpatialData: 'SpatialData',
    versionManage: 'versionManage',
@@ -524,7 +524,8 @@
    status: 'status',
    careatetime: 'Date of application',
    ReApply: 'Re apply',
    details: 'details'
    details: 'details',
    ApplicationCancel: "Application Cancel",
  },
  loglog: {
    serialnumber: 'Serial Number',

 src/assets/lang/zh.js

@@ -1,6 +1,6 @@
const zh = {
  common: {
    bak:'备注',
    bak: '备注',
    domCode: '编码',
    confirm: '确认',
    choose: '请选择',
@@ -41,7 +41,7 @@
    size: '大小',
    versionName: '版本名称',
    type: '类型',
    fileType:'文件类型',
    fileType: '文件类型',
    quayTest: '质检',
    md5: 'MD5码',
    lineNuber: '行数',
@@ -96,11 +96,11 @@
      entryName: '项目名称',
      selectWBSData: '选择WBS数据',
      coordinateSystem: '坐标系',
      fileExtension:"文件扩展名",
      inspectionItems:"检查项",
      code:'编码'
      fileExtension: "文件扩展名",
      inspectionItems: "检查项",
      code: '编码'
    },
    metadataManage: '元数据管理',
    metadataManage: '源数据管理',
    dataLoading: '数据入库',
    SpatialData: '空间数据管理',
    versionManage: '版本管理',
@@ -424,7 +424,7 @@
  synthesis: {
    import: '导入KML',
    export: '导出KML',
    import1:'导入SHP',
    import1: '导入SHP',
    export1: '导出SHP',
    pipelineAnalysis: '管道分析',
    synthesis: '综合展示',
@@ -518,7 +518,8 @@
    status: '状态',
    careatetime: '申请日期',
    ReApply: '重新申请',
    details: '详情'
    details: '详情',
    ApplicationCancel: "申请取消",
  },
  downlog: {
    type1: 'Shp文件',

 src/components/MapView/mapMenuPop.vue

@@ -405,7 +405,7 @@
          std1.push(this.option[i].entity)
        }
        var obj = {
          depcodes: this.insertOption.ids,
          ids: this.insertOption.ids,
          pwd: encr(this.codeForm.password),
          tabs: std,
          entities: std1,

 src/components/MapView/mapMenuTop.vue

@@ -108,7 +108,7 @@
<script>
import queryinfo from "../../views/Tools/queryinfo.vue"
import $ from 'jquery';
import { inquiry_SelectTabs, inquiry_uploadShp, encr } from '../../api/api.js';
import { inquiry_SelectTabs, inquiry_uploadShp, encr, dataLib_selectTabs } from '../../api/api.js';
import { getToken } from '@/utils/auth';
import * as turf from '@turf/turf';
export default {
@@ -187,12 +187,18 @@
      }
    },
    async getAllTable() {
      const data = await inquiry_SelectTabs();
      const data = await dataLib_selectTabs({
        pageIndex: 1,
        pageSize: 500
      });
      if (data.code != 200) {
        this.$message.error('列表调用失败');
      }
      var option = data.result;

      var option = data.result.filter((res) => {
        if (res.rows != 0) {
          return res;
        }
      })
      for (var i in option) {
        var val_Data = option[i];
        val_Data.id = '1' + i;
@@ -236,6 +242,7 @@
          formData.append(val[i].name, val[i]); // fs.files[i].name,file
        }
      }

      if (count != 4) {

        this.$message({
@@ -255,7 +262,8 @@
          if (rs.code !== 200) {
            return this.$message.error('用户角色请求错误');
          }
          this.$store.state.mapMenuShpFile = rs.result;
      
          this.$store.state.mapMenuShpFile = rs.result.wkt;
          this.showMapMenuPop();
        },
        error: (e) => {

 src/components/MapView/mapSpaceTop.vue

@@ -67,20 +67,20 @@
        queryLayer: '',
      },
      layerData: [
        {
          id: 1,
          label: '基础数据',
          tabDesc: '基础数据',
          value: 'BD',
          children: [],
        },
        {
          id: 2,
          label: '业务数据',
          tabDesc: '业务数据',
          value: 'BS',
          children: [],
        },
        // {
        //   id: 1,
        //   label: '基础数据',
        //   tabDesc: '基础数据',
        //   value: 'BD',
        //   children: [],
        // },
        // {
        //   id: 2,
        //   label: '业务数据',
        //   tabDesc: '业务数据',
        //   value: 'BS',
        //   children: [],
        // },
      ],
      defaultProps: {
        children: 'children',

 src/views/Archive/dataApplication.vue

@@ -136,7 +136,7 @@
              @click="handleApplyCancel(scope.$index, scope.row)"
              v-if="matchState(scope,/[]/)"
              plain
            >{{$t('dataApply.type1')}}</el-button>
            >{{$t('dataApply.ApplicationCancel')}}</el-button>
            <el-button
              type="warning"
              size="mini"

 src/views/Archive/index.vue

@@ -1113,10 +1113,14 @@
        return;
      }
      this.downloadLogVisible = false;
 
      var obj = {
        entities: [this.listTypeData.name], // bpachydrogeology,bhydrogeologyattach
        filter: this.listTypeData.filter,
        pwd: encrypt.encrypt(this.codeForm.password)
        pwd: encrypt.encrypt(this.codeForm.password),
        depcodes: [this.listData.depcode],
        dirs: this.listData.dirs

      };
      this.loading = true;
      var that = this;
@@ -1872,6 +1876,7 @@
      var data2 = domains.result;
      this.formInline.fileName = ""
      var std = [];
      this.filedsOption=[];
      for (var i in data1) {

        if (data1[i].type != 'geomtry' && data1[i].type != 'null') {
@@ -2276,8 +2281,8 @@
  /deeep/.el-form-item {
    margin-bottom: 0px;
  }
   /deeep/ .el-dialog__wrapper{
    z-index: 999;
  .el-dialog__wrapper {
    z-index: 9999;
  }
}
</style>

 src/views/Synthesis/LeftMenu.vue

@@ -420,10 +420,11 @@
        window.model.deleteObject();
        window.model = null;
      }
      sgworld.Analysis.clearCurtainContrast();
      if (this.isMenuFlag == "d") {
        this.clearAllAnalsy();
      }
      if (this.isMenuFlag != res.id) {
      if (this.isMenuFlag !=val) {
        sgworld.Creator.SimpleGraphic.clear();
        this.isMenuFlag = val;
        if (this.entityaLayers.length != 0) {

 src/views/Tools/LayerTree.vue

@@ -70,6 +70,12 @@
      >
        <i class="el-icon-edit"></i>&nbsp;&nbsp;修改节点
      </div>
      <div
        class="edit"
        @click="showLayerAttribute()"
      >
        <i class="el-icon-edit"></i>&nbsp;&nbsp;属性
      </div>
      <!-- <div
        class="edit"
        @click="menuMoveF( 'up')"
@@ -137,6 +143,7 @@
        >确 定</el-button>
      </span>
    </el-dialog>
     <queryinfo ref="queryinfo" />
  </div>
</template>

@@ -146,7 +153,7 @@
import Image from 'ol/layer/Image';
import GeoJSON from 'ol/format/GeoJSON.js';
import Map from 'ol/Map.js';

import queryinfo from './queryinfo.vue';
import { Vector as VectorSource } from "ol/source";
import { Vector as VectorLayer, } from "ol/layer";

@@ -155,6 +162,7 @@
import { perms_selectLayers } from '../../api/api.js'
export default {
  name: 'tree',
    components: {  queryinfo },
  data() {
    return {
      eleId: '',
@@ -332,7 +340,29 @@

      this.$refs.tree.remove(this.currentNode);
    },
    //属性显示
    showLayerAttribute(data) {
      this.foo();
      this.currentData = data ? data : this.currentData;
      var layer = this.currentData.layer.replaceAll('_', "");
      this.$store.state.mapSpaceQueryLayer = layer;
      // this.$store.state.mapPopBoolean = true;
      this.$store.state.mapPopBoxFlag = '2';
      this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close();
      this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.open("属性", null, {
        close: () => {

          if (this.$store.state.primitLayer != null) {
            sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
            this.$store.state.primitLayer = null;
          }

          if (window.Viewer.scene.primitives.length != 0) {
            window.Viewer.scene.primitives.removeAll()
          }
        }
      });
    },
    // 编辑节点
    editNode(data) {

@@ -536,6 +566,7 @@
        return this.$message.error("图层列表查询失败");

      }

      this.newData = data.result;
      this.oriData = data.result;
      var std = [];
@@ -553,6 +584,7 @@
        } else if (data.result[i].type == 2) {

          if (data.result[i].url != null) {

            var layer_entity = {
              id: data.result[i].id,
              pid: data.result[i].pid,
@@ -560,6 +592,7 @@
              resource: data.result[i].url,
              type: data.result[i].type,
              isEdit: false,
              layer: data.result[i].enName,
              layerType: data.result[i].serveType
            }
            layer_list.push(layer_entity)

			@@ -1,83 +1,99 @@
			<!DOCTYPE html>
			<html lang="">
			<head>
			<meta charset="utf-8" />
			<meta http-equiv="X-UA-Compatible" content="IE=edge" />
			<meta name="viewport" content="width=device-width,initial-scale=1.0" />
			<title> </title>

			<link rel="stylesheet" href="./SmartEarthSDK/Workers/css/smartearth.css" />
			<link rel="stylesheet" href="./SmartEarthSDK/Workers/layui/css/layui.css" />
			<head>
			<meta charset="utf-8" />

			<script src="./SmartEarthSDK/Workers/polyfill.min.js"></script>
			<script src="./SmartEarthSDK/Cesium/Cesium.js"></script>
			<script src="./SmartEarthSDK/SmartEarth.min.js"></script>
			<script src="./SmartEarthSDK/Workers/TreeTool.js"></script>
			<script src="./config/config.js"></script>
			<script src="./config/rsa.min.js"></script>
			<script src="./config/rollups.js"></script>
			<meta name="viewport" content="width=device-width,initial-scale=1.0" />

			<style>
			.esriControlsBR {
			display: none;
			}

			.ol-overlaycontainer-stopevent {
			/* display: none; */
			}
			.ol-control button {
			display: block;
			margin: 1px;
			padding: 0;
			color: rgb(102, 102, 102);
			font-weight: bold;
			text-decoration: none;
			font-size: inherit;
			text-align: center;
			height: 1.375em;
			width: 1.375em;
			line-height: 0.4em;
			background-color: #fff;
			border: none;
			border-radius: 2px;
			}
			.ol-full-screen {
			display: none;
			position: absolute;
			right: 0.5em;
			top: 0.5em;
			}
			.ol-rotate {
			display: none;
			position: absolute;
			top: 3em;
			right: 0.5em;
			transition: opacity 0.25s linear, visibility 0s linear;
			}
			.ol-scale-line {
			display: none;
			right: 0.3em;
			bottom: 0.5em;
			position: absolute;
			}
			.ol-scale-line-inner {
			/* padding: 5px 10px; */
			color: rgb(102, 102, 102);
			font-weight: bold;
			background-color: #fff;
			text-align: center;
			border-radius: 5px;
			}
			.ol-zoom {
			display: none;
			right: 0.3em;
			bottom: 3em;
			position: absolute;
			}
			</style>
			</head>
			<meta http-equiv="Expires" content="0" />
			<meta http-equiv="Cache" content="no-cache" />
			<meta http-equiv="Pragma" content="no-cache" />
			<meta http-equiv="Cache-control" content="no-cache" />
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			<title> </title>

			<body>
			<div id="app"></div>
			</body>
			</html>
			<link rel="stylesheet" href="./SmartEarthSDK/Workers/css/smartearth.css" />
			<link rel="stylesheet" href="./SmartEarthSDK/Workers/layui/css/layui.css" />

			<script src="./SmartEarthSDK/Workers/polyfill.min.js"></script>
			<script src="./SmartEarthSDK/Cesium/Cesium.js"></script>
			<script src="./SmartEarthSDK/SmartEarth.min.js"></script>
			<script src="./SmartEarthSDK/Workers/TreeTool.js"></script>
			<script src="./config/config.js"></script>
			<script src="./config/rsa.min.js"></script>
			<script src="./config/rollups.js"></script>

			<style>
			.esriControlsBR {
			display: none;
			}

			.ol-overlaycontainer-stopevent {
			/* display: none; */
			}

			.ol-control button {
			display: block;
			margin: 1px;
			padding: 0;
			color: rgb(102, 102, 102);
			font-weight: bold;
			text-decoration: none;
			font-size: inherit;
			text-align: center;
			height: 1.375em;
			width: 1.375em;
			line-height: 0.4em;
			background-color: #fff;
			border: none;
			border-radius: 2px;
			}

			.ol-full-screen {
			display: none;
			position: absolute;
			right: 0.5em;
			top: 0.5em;
			}

			.ol-rotate {
			display: none;
			position: absolute;
			top: 3em;
			right: 0.5em;
			transition: opacity 0.25s linear, visibility 0s linear;
			}

			.ol-scale-line {
			display: none;
			right: 0.3em;
			bottom: 0.5em;
			position: absolute;
			}

			.ol-scale-line-inner {
			/* padding: 5px 10px; */
			color: rgb(102, 102, 102);
			font-weight: bold;
			background-color: #fff;
			text-align: center;
			border-radius: 5px;
			}

			.ol-zoom {
			display: none;
			right: 0.3em;
			bottom: 3em;
			position: absolute;
			}
			</style>
			</head>

			<body>
			<div id="app"></div>
			</body>

			</html>

			@@ -103,7 +103,7 @@
			code:'Code'
			},

			metadataManage: 'metadataManage',
			metadataManage: 'Source Data Management',
			dataLoading: 'dataLoading',
			SpatialData: 'SpatialData',
			versionManage: 'versionManage',
			@@ -524,7 +524,8 @@
			status: 'status',
			careatetime: 'Date of application',
			ReApply: 'Re apply',
			details: 'details'
			details: 'details',
			ApplicationCancel: "Application Cancel",
			},
			loglog: {
			serialnumber: 'Serial Number',

			@@ -1,6 +1,6 @@
			const zh = {
			common: {
			bak:'备注',
			bak: '备注',
			domCode: '编码',
			confirm: '确认',
			choose: '请选择',
			@@ -41,7 +41,7 @@
			size: '大小',
			versionName: '版本名称',
			type: '类型',
			fileType:'文件类型',
			fileType: '文件类型',
			quayTest: '质检',
			md5: 'MD5码',
			lineNuber: '行数',
			@@ -96,11 +96,11 @@
			entryName: '项目名称',
			selectWBSData: '选择WBS数据',
			coordinateSystem: '坐标系',
			fileExtension:"文件扩展名",
			inspectionItems:"检查项",
			code:'编码'
			fileExtension: "文件扩展名",
			inspectionItems: "检查项",
			code: '编码'
			},
			metadataManage: '元数据管理',
			metadataManage: '源数据管理',
			dataLoading: '数据入库',
			SpatialData: '空间数据管理',
			versionManage: '版本管理',
			@@ -424,7 +424,7 @@
			synthesis: {
			import: '导入KML',
			export: '导出KML',
			import1:'导入SHP',
			import1: '导入SHP',
			export1: '导出SHP',
			pipelineAnalysis: '管道分析',
			synthesis: '综合展示',
			@@ -518,7 +518,8 @@
			status: '状态',
			careatetime: '申请日期',
			ReApply: '重新申请',
			details: '详情'
			details: '详情',
			ApplicationCancel: "申请取消",
			},
			downlog: {
			type1: 'Shp文件',

			@@ -405,7 +405,7 @@
			std1.push(this.option[i].entity)
			}
			var obj = {
			depcodes: this.insertOption.ids,
			ids: this.insertOption.ids,
			pwd: encr(this.codeForm.password),
			tabs: std,
			entities: std1,

			@@ -108,7 +108,7 @@
			<script>
			import queryinfo from "../../views/Tools/queryinfo.vue"
			import $ from 'jquery';
			import { inquiry_SelectTabs, inquiry_uploadShp, encr } from '../../api/api.js';
			import { inquiry_SelectTabs, inquiry_uploadShp, encr, dataLib_selectTabs } from '../../api/api.js';
			import { getToken } from '@/utils/auth';
			import * as turf from '@turf/turf';
			export default {
			@@ -187,12 +187,18 @@
			}
			},
			async getAllTable() {
			const data = await inquiry_SelectTabs();
			const data = await dataLib_selectTabs({
			pageIndex: 1,
			pageSize: 500
			});
			if (data.code != 200) {
			this.$message.error('列表调用失败');
			}
			var option = data.result;

			var option = data.result.filter((res) => {
			if (res.rows != 0) {
			return res;
			}
			})
			for (var i in option) {
			var val_Data = option[i];
			val_Data.id = '1' + i;
			@@ -236,6 +242,7 @@
			formData.append(val[i].name, val[i]); // fs.files[i].name,file
			}
			}

			if (count != 4) {

			this.$message({
			@@ -255,7 +262,8 @@
			if (rs.code !== 200) {
			return this.$message.error('用户角色请求错误');
			}
			this.$store.state.mapMenuShpFile = rs.result;

			this.$store.state.mapMenuShpFile = rs.result.wkt;
			this.showMapMenuPop();
			},
			error: (e) => {

			@@ -67,20 +67,20 @@
			queryLayer: '',
			},
			layerData: [
			{
			id: 1,
			label: '基础数据',
			tabDesc: '基础数据',
			value: 'BD',
			children: [],
			},
			{
			id: 2,
			label: '业务数据',
			tabDesc: '业务数据',
			value: 'BS',
			children: [],
			},
			// {
			// id: 1,
			// label: '基础数据',
			// tabDesc: '基础数据',
			// value: 'BD',
			// children: [],
			// },
			// {
			// id: 2,
			// label: '业务数据',
			// tabDesc: '业务数据',
			// value: 'BS',
			// children: [],
			// },
			],
			defaultProps: {
			children: 'children',

			@@ -136,7 +136,7 @@
			@click="handleApplyCancel(scope.$index, scope.row)"
			v-if="matchState(scope,/[]/)"
			plain
			>{{$t('dataApply.type1')}}</el-button>
			>{{$t('dataApply.ApplicationCancel')}}</el-button>
			<el-button
			type="warning"
			size="mini"

			@@ -1113,10 +1113,14 @@
			return;
			}
			this.downloadLogVisible = false;

			var obj = {
			entities: [this.listTypeData.name], // bpachydrogeology,bhydrogeologyattach
			filter: this.listTypeData.filter,
			pwd: encrypt.encrypt(this.codeForm.password)
			pwd: encrypt.encrypt(this.codeForm.password),
			depcodes: [this.listData.depcode],
			dirs: this.listData.dirs

			};
			this.loading = true;
			var that = this;
			@@ -1872,6 +1876,7 @@
			var data2 = domains.result;
			this.formInline.fileName = ""
			var std = [];
			this.filedsOption=[];
			for (var i in data1) {

			if (data1[i].type != 'geomtry' && data1[i].type != 'null') {
			@@ -2276,8 +2281,8 @@
			/deeep/.el-form-item {
			margin-bottom: 0px;
			}
			/deeep/ .el-dialog__wrapper{
			z-index: 999;
			.el-dialog__wrapper {
			z-index: 9999;
			}
			}
			</style>

			@@ -420,10 +420,11 @@
			window.model.deleteObject();
			window.model = null;
			}
			sgworld.Analysis.clearCurtainContrast();
			if (this.isMenuFlag == "d") {
			this.clearAllAnalsy();
			}
			if (this.isMenuFlag != res.id) {
			if (this.isMenuFlag !=val) {
			sgworld.Creator.SimpleGraphic.clear();
			this.isMenuFlag = val;
			if (this.entityaLayers.length != 0) {

			@@ -70,6 +70,12 @@
			>
			<i class="el-icon-edit"></i>  修改节点
			</div>
			<div
			class="edit"
			@click="showLayerAttribute()"
			>
			<i class="el-icon-edit"></i>  属性
			</div>
			<!-- <div
			class="edit"
			@click="menuMoveF( 'up')"
			@@ -137,6 +143,7 @@
			>确定</el-button>
			</span>
			</el-dialog>
			<queryinfo ref="queryinfo" />
			</div>
			</template>

			@@ -146,7 +153,7 @@
			import Image from 'ol/layer/Image';
			import GeoJSON from 'ol/format/GeoJSON.js';
			import Map from 'ol/Map.js';

			import queryinfo from './queryinfo.vue';
			import { Vector as VectorSource } from "ol/source";
			import { Vector as VectorLayer, } from "ol/layer";

			@@ -155,6 +162,7 @@
			import { perms_selectLayers } from '../../api/api.js'
			export default {
			name: 'tree',
			components: { queryinfo },
			data() {
			return {
			eleId: '',
			@@ -332,7 +340,29 @@

			this.$refs.tree.remove(this.currentNode);
			},
			//属性显示
			showLayerAttribute(data) {
			this.foo();
			this.currentData = data ? data : this.currentData;
			var layer = this.currentData.layer.replaceAll('_', "");
			this.$store.state.mapSpaceQueryLayer = layer;
			// this.$store.state.mapPopBoolean = true;
			this.$store.state.mapPopBoxFlag = '2';
			this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close();
			this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.open("属性", null, {
			close: () => {

			if (this.$store.state.primitLayer != null) {
			sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
			this.$store.state.primitLayer = null;
			}

			if (window.Viewer.scene.primitives.length != 0) {
			window.Viewer.scene.primitives.removeAll()
			}
			}
			});
			},
			// 编辑节点
			editNode(data) {

			@@ -536,6 +566,7 @@
			return this.$message.error("图层列表查询失败");

			}

			this.newData = data.result;
			this.oriData = data.result;
			var std = [];
			@@ -553,6 +584,7 @@
			} else if (data.result[i].type == 2) {

			if (data.result[i].url != null) {

			var layer_entity = {
			id: data.result[i].id,
			pid: data.result[i].pid,
			@@ -560,6 +592,7 @@
			resource: data.result[i].url,
			type: data.result[i].type,
			isEdit: false,
			layer: data.result[i].enName,
			layerType: data.result[i].serveType
			}
			layer_list.push(layer_entity)