From 84d97857cb5ba7cfb62b6400bdff0911eab4826b Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期六, 17 十二月 2022 18:30:44 +0800
Subject: [PATCH] 图层管理界面添加

---
 src/views/Tools/maplayer.vue      |   45 --
 src/views/exportMap/index.vue     |   36 ++
 src/api/api.js                    |    7 
 src/components/mixin/baseVuex.js  |   46 +++
 src/views/Tools/LayerTree.vue     |  508 +++++++++++++++++++++++++++++++++++++++
 src/main.js                       |    2 
 src/views/Thematic/index.vue      |    5 
 src/components/mixin/layerTree.js |  130 ++++++++++
 8 files changed, 731 insertions(+), 48 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 008b500..7843107 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -632,7 +632,7 @@
 export function dataLib_selectByPageForMeta(params) {
   return request.get('/dataLib/selectByPageForMeta', { params: params });
 }
-//璧勬枡棣�=>鏂囦欢涓嬭浇
+//璧勬枡棣�=>鍒嗛〉鏌ヨ
 export function dataLib_selectDownloadFile(params) {
   return request.get('/dataLib/selectDownloadFile', { params: params });
 }
@@ -640,7 +640,10 @@
 export function dataLib_downloadReq(params) {
   return request.post('/dataLib/downloadReq', params);
 }
-
+//鍦ㄧ嚎鍒跺浘=>鍒嗛〉鏌ヨ
+export function exportSelectByPage(params) {
+  return request.get('/export/selectByPage', { params: params });
+}
 //璇锋眰绔欏満鐐瑰唴瀹�
 export function querySitePoint(size, index, name) {
   return service.get(
diff --git a/src/components/mixin/baseVuex.js b/src/components/mixin/baseVuex.js
new file mode 100644
index 0000000..7a7a7d5
--- /dev/null
+++ b/src/components/mixin/baseVuex.js
@@ -0,0 +1,46 @@
+import {
+  mapState,
+  mapMutations
+} from 'vuex'
+export default {
+  computed: {
+    ...mapState('layerTree', [
+      'treeData',
+    ]),
+    ...mapState('user', [
+      'user',
+    ]),
+    ...mapState('mapTools', [
+      'hideTools',
+      'hidePositionBtn',
+      'statusbar',
+      'navBar',
+      'scaleBarStatus'
+    ]),
+    ...mapState('mapStatus', [
+      'viewCenter',
+      'mapStatus',
+    ])
+  },
+  methods: {
+    ...mapMutations('layerTree', [
+      'setTreeData',
+      'addTreeChildren',
+      'updataTreeNode',
+      'checkTreeNode',
+      'removeTreeNode'
+    ]),
+    ...mapMutations('user', [
+      'changeUserData',
+    ]),
+    ...mapMutations('mapTools', [
+      'changeScaleBarVisible',
+      'changeNavBarVisible',
+      'changeMapToolsVisible',
+    ]),
+    ...mapMutations('mapStatus', [
+      'setView',
+      'changeMapStatus',
+    ])
+  }
+}
diff --git a/src/components/mixin/layerTree.js b/src/components/mixin/layerTree.js
new file mode 100644
index 0000000..8c8cdc6
--- /dev/null
+++ b/src/components/mixin/layerTree.js
@@ -0,0 +1,130 @@
+// 閬嶅巻鑺傜偣
+function ergodicNode(nodes) {
+  if (nodes && nodes.length) {
+    nodes.forEach((item) => {
+      item.rename = false;
+      item.children && ergodicNode(item.children);
+    });
+  }
+}
+
+/**
+ * 鍥惧眰鏍戞暟鎹�
+ */
+export default {
+  namespaced: true,
+  state: {
+    // 宸ョ▼鏍戞暟鎹�
+    treeData: [],
+  },
+  mutations: {
+    // 瀹氫箟宸ョ▼鏍戞暟鎹�
+    setTreeData(state, data = []) {
+      ergodicNode(data);
+      state.treeData = data;
+    },
+    // 鏍戞寚瀹氫綅缃鍔犲瓙鑺傜偣锛堝繀椤绘爣璇嗕负key锛�
+    addTreeChildren({ treeData }, { parentNode, pid, item }) {
+      if (!pid) {
+        treeData.push(item);
+        return;
+      }
+      (parentNode || treeData).forEach((ele) => {
+        if (ele.id === pid) {
+          if (ele.children) {
+            ele.children.push(item);
+          } else {
+            (parentNode || treeData).push(item);
+          }
+
+          return;
+        } else {
+          if (ele.children) {
+            this.commit('layerTree/addTreeChildren', {
+              parentNode: ele.children,
+              pid,
+              item,
+            });
+          }
+        }
+      });
+    },
+    // 鍕鹃�夎妭鐐�
+    checkTreeNode({ treeData }, { parentNode, id, checked }) {
+      (parentNode || treeData).forEach((ele) => {
+        if (!id || (id && ele.id === id)) {
+          // id涓嶅瓨锛屽嬀閫夋墍鏈夊瓙鑺傜偣锛宨d瀛樺湪锛屽嬀閫夊綋鍓嶈妭鐐�
+          ele.checked = checked;
+          if (ele.children) {
+            this.commit('layerTree/checkTreeNode', {
+              parentNode: ele.children,
+              checked,
+            });
+          } else if (ele._children) {
+            this.commit('layerTree/checkTreeNode', {
+              parentNode: ele._children,
+              checked,
+            });
+          }
+          if (id) {
+            return;
+          }
+        } else {
+          // 閫掑綊
+          if (ele.children) {
+            this.commit('layerTree/checkTreeNode', {
+              parentNode: ele.children,
+              id,
+              checked,
+            });
+          }
+        }
+      });
+    },
+    // 鏇存柊鑺傜偣鏁版嵁
+    updataTreeNode({ treeData }, { parentNode, id, nodeValue, key, value }) {
+      (parentNode || treeData).forEach((ele) => {
+        if (ele.id === id) {
+          if (nodeValue) {
+            for (let _key in nodeValue) {
+              if (nodeValue[_key] === undefined) {
+                delete ele[_key];
+              } else {
+                ele[_key] = nodeValue[_key];
+              }
+            }
+          } else {
+            ele[key] = value;
+          }
+          return;
+        } else {
+          if (ele.children) {
+            this.commit('layerTree/updataTreeNode', {
+              parentNode: ele.children,
+              id,
+              nodeValue,
+              key,
+              value,
+            });
+          }
+        }
+      });
+    },
+    // 绉婚櫎鑺傜偣
+    removeTreeNode({ treeData }, { id, parentNode }) {
+      (parentNode || treeData).forEach((ele, index) => {
+        if (ele.id === id) {
+          (parentNode || treeData).splice(index, 1);
+          return;
+        } else {
+          if (ele.children) {
+            this.commit('layerTree/removeTreeNode', {
+              id,
+              parentNode: ele.children,
+            });
+          }
+        }
+      });
+    },
+  },
+};
diff --git a/src/main.js b/src/main.js
index 06cbc2d..f0d0502 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,6 +11,7 @@
 // import locale from 'element-ui/lib/locale/lang/zh-CN'
 // import 'element-ui/lib/theme-chalk/index.css';
 import '@/assets/element-variables.scss';
+
 Vue.prototype.$echarts = echarts;
 import * as echarts from 'echarts';
 Vue.use(ElementUI, { locale });
@@ -24,6 +25,5 @@
   router,
   i18n,
   store,
-
   render: (h) => h(App),
 }).$mount('#app');
diff --git a/src/views/Thematic/index.vue b/src/views/Thematic/index.vue
index 0b27a8f..d17429a 100644
--- a/src/views/Thematic/index.vue
+++ b/src/views/Thematic/index.vue
@@ -547,6 +547,11 @@
   /deep/ .el-form--inline .el-form-item {
     margin-right: 32px;
   }
+  /deep/.el-input__inner {
+    background-color: transparent !important ;
+    color: #fff;
+    border: 1px solid white !important;
+  }
 }
 
 // .themaic .el-divider--horizontal {
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
new file mode 100644
index 0000000..4aeadb2
--- /dev/null
+++ b/src/views/Tools/LayerTree.vue
@@ -0,0 +1,508 @@
+<template>
+  <div class="lalala tree-container">
+    <el-input
+      placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+      v-model="filterText"
+      class="search"
+    >
+    </el-input>
+    <el-tree
+      :data="treeData"
+      node-key="id"
+      default-expand-all
+      show-checkbox
+      @node-click="handleLeftclick"
+      @node-drag-start="handleDragStart"
+      @node-drag-enter="handleDragEnter"
+      @node-drag-leave="handleDragLeave"
+      @node-drag-over="handleDragOver"
+      @node-drag-end="handleDragEnd"
+      @node-drop="handleDrop"
+      @node-contextmenu="rightClick"
+      :filter-node-method="filterNode"
+      draggable
+      :allow-drop="allowDrop"
+      :allow-drag="allowDrag"
+      ref="tree"
+    >
+      <span
+        class="slot-t-node"
+        slot-scope="{ node, data }"
+        @dblclick="editNode(data)"
+      >
+        <span v-show="!data.isEdit">
+          <span :class="[data.id >= 99 ? 'slot-t-node--label' : '']">{{
+            node.label
+          }}</span>
+        </span>
+        <span v-show="data.isEdit">
+          <el-input
+            class="slot-t-input"
+            size="mini"
+            autofocus
+            v-model="data.label"
+            :ref="'slotTreeInput' + data.id"
+            @blur.stop="NodeBlur(node, data)"
+            @keydown.native.enter="NodeBlur(node, data)"
+          ></el-input>
+        </span>
+      </span>
+    </el-tree>
+
+    <el-card
+      class="box-card"
+      ref="card"
+      :style="{ ...rightClickMenuStyle }"
+      v-show="menuVisible"
+    >
+      <div @click="addSameLevelNode()" v-show="firstLevel">
+        <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;鍚岀骇澧炲姞
+      </div>
+      <div class="add" @click="addChildNode()">
+        <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;瀛愮骇澧炲姞
+      </div>
+      <div class="delete" @click="deleteNode()">
+        <i class="el-icon-remove-outline"></i>&nbsp;&nbsp;鍒犻櫎鑺傜偣
+      </div>
+      <div class="edit" @click="editNode()">
+        <i class="el-icon-edit"></i>&nbsp;&nbsp;淇敼鑺傜偣
+      </div>
+    </el-card>
+    <el-dialog
+      :title="appendNodetitle"
+      :visible.sync="dialogVisible"
+      width="30%"
+      top="20vh"
+      :modal="false"
+      :before-close="handleClose"
+    >
+      <el-form ref="form" :model="addFormServer" label-width="100px">
+        <el-form-item label="鏈嶅姟鍚嶇О">
+          <el-input v-model="addFormServer.label"></el-input>
+        </el-form-item>
+        <el-form-item label="鏈嶅姟鍦板潃">
+          <el-input v-model="addFormServer.value"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="setAddServer">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'tree',
+  data() {
+    return {
+      eleId: '',
+      isShow: false,
+      currentData: '',
+      currentNode: '',
+      menuVisible: false,
+      firstLevel: false,
+      filterText: '',
+      appendNodetitle: '',
+      maxexpandId: 4,
+      rightClickMenuStyle: {},
+      dialogVisible: false,
+      addFormServer: {},
+      treeData: [
+        {
+          id: 1,
+          label: '褰卞儚',
+          isEdit: false,
+          children: [],
+        },
+        {
+          id: 2,
+          label: '鍦板舰',
+          isEdit: false,
+          children: [],
+        },
+        {
+          id: 3,
+          label: '妯″瀷',
+          isEdit: false,
+          children: [],
+        },
+        {
+          id: 4,
+          label: '鐭㈤噺',
+          isEdit: false,
+          children: [],
+        },
+      ],
+      defaultProps: {
+        children: 'children',
+        label: 'label',
+      },
+    };
+  },
+  methods: {
+    NodeBlur(Node, data) {
+      console.log(Node, data);
+      if (data.label.length === 0) {
+        this.$message.error('鑿滃崟鍚嶄笉鍙负绌猴紒');
+        return false;
+      } else {
+        if (data.isEdit) {
+          this.$set(data, 'isEdit', false);
+          console.log(data.isEdit);
+        }
+        this.$nextTick(() => {
+          this.$refs['slotTreeInput' + data.id].$refs.input.focus();
+        });
+      }
+    },
+    // 鏌ヨ
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+
+    allowDrop(draggingNode, dropNode, type) {
+      if (dropNode.data.label === '浜岀骇 3-1') {
+        return type !== 'inner';
+      } else {
+        return true;
+      }
+    },
+    allowDrag(draggingNode) {
+      return draggingNode.data.label.indexOf('涓夌骇 3-2-2') === -1;
+    },
+    // 榧犳爣鍙冲嚮浜嬩欢
+    rightClick(event, object, Node, element) {
+      console.log(event, object);
+      this.currentData = object;
+      this.currentNode = Node;
+      if (Node.level === 1) {
+        this.firstLevel = true;
+      } else {
+        this.firstLevel = false;
+      }
+      this.menuVisible = true;
+
+      this.$refs.card.$el.style.left = event.pageX + 20 + 'px';
+      this.$refs.card.$el.style.top = event.pageY + 'px';
+    },
+    // 榧犳爣宸﹀嚮浜嬩欢
+    handleLeftclick(data, node) {
+      this.foo();
+    },
+    //  鍙栨秷榧犳爣鐩戝惉浜嬩欢 鑿滃崟鏍�
+    foo() {
+      this.menuVisible = false;
+      //  瑕佸強鏃跺叧鎺夌洃鍚紝涓嶅叧鎺夌殑鏄竴涓潙锛屼笉淇′綘璇曡瘯锛岃櫧鐒跺墠鍙版樉绀虹殑鏃跺�欐病鏈夊暐姣涚梾锛屽姞涓�涓猘lert浣犲氨鐭ラ亾浜�
+      document.removeEventListener('click', this.foo);
+    },
+    // 澧炲姞鍚岀骇鑺傜偣浜嬩欢
+    addSameLevelNode() {
+      this.foo();
+      let id = Math.ceil(Math.random() * 100);
+      var data = { id: id, label: '鏂板鑺傜偣' };
+      this.$refs.tree.append(data, this.currentNode.parent);
+    },
+    // 澧炲姞瀛愮骇鑺傜偣浜嬩欢
+    addChildNode() {
+      this.foo();
+      if (this.currentNode.level >= 2) {
+        this.$message.error('鏈�澶氬彧鏀袱绾э紒');
+        return false;
+      }
+      this.appendNodetitle = this.currentData.label;
+      this.dialogVisible = true;
+
+      // let id = Math.ceil(Math.random() * 100);
+      // var data = { id: id, label: '鏂板鑺傜偣' };
+      // this.$refs.tree.append(data, this.currentNode);
+    },
+    handleClose() {
+      this.dialogVisible = false;
+      this.addFormServer = {};
+    },
+    setAddServer() {
+      debugger;
+      var data = this.addFormServer;
+      data.id = Math.ceil(Math.random() * 100);
+      this.$refs.tree.append(data, this.currentNode);
+      this.handleClose();
+    },
+    // 鍒犻櫎鑺傜偣
+    deleteNode() {
+      this.foo();
+      if (this.currentNode.level == 1) {
+        this.$message.error('褰撳墠绾у埆鏃犳硶鍒犻櫎!');
+        return false;
+      }
+      this.foo();
+      this.$refs.tree.remove(this.currentNode);
+    },
+
+    // 缂栬緫鑺傜偣
+    editNode(data) {
+      this.foo();
+      this.currentData = data ? data : this.currentData;
+      if (!this.currentData.isEdit) {
+        this.$set(this.currentData, 'isEdit', true);
+      }
+      // 鑾峰彇鐒︾偣
+      this.$nextTick(() => {
+        this.$refs['slotTreeInput' + this.currentData.id].focus();
+      });
+    },
+    handleDragStart(node, ev) {
+      console.log('drag start', node);
+    },
+    handleDragEnter(draggingNode, dropNode, ev) {
+      console.log('tree drag enter: ', dropNode.label);
+    },
+    handleDragLeave(draggingNode, dropNode, ev) {
+      console.log('tree drag leave: ', dropNode.label);
+    },
+    handleDragOver(draggingNode, dropNode, ev) {
+      console.log('tree drag over: ', dropNode.label);
+    },
+    handleDragEnd(draggingNode, dropNode, dropType, ev) {
+      console.log('tree drag end: ', dropNode && dropNode.label, dropType);
+    },
+    handleDrop(draggingNode, dropNode, dropType, ev) {
+      console.log('tree drop: ', dropNode.label, dropType);
+    },
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  mounted() {},
+};
+</script>
+<style scoped lang="less">
+/* 鐐瑰嚮鑺傜偣鏃剁殑閫変腑棰滆壊 */
+.tree-container /deep/.el-tree-node.is-current > .el-tree-node__content {
+  color: #409eff !important;
+}
+
+.tree-container /deep/ .el-tree-node__expand-icon.expanded {
+  -webkit-transform: rotate(90deg);
+  transform: rotate(90deg);
+}
+
+.tree-container /deep/ .el-icon-caret-right:before {
+  content: '\e791';
+  font-size: 18px;
+}
+
+.tree-container /deep/ .el-tree-node__expand-icon {
+  margin-left: 15px;
+  padding: 0px;
+}
+
+.tree-container /deep/ .el-tree-node__expand-icon.is-leaf {
+  margin-left: 0px;
+}
+
+.tree-container /deep/ .el-tree-node {
+  position: relative;
+  padding-left: 16px;
+  // text-indent: 16px;
+}
+
+.tree-container /deep/ .el-tree-node__children {
+  padding-left: 16px;
+}
+
+.tree-container /deep/ .el-tree > .el-tree-node:before {
+  border-left: none;
+}
+
+.tree-container /deep/ .el-tree > .el-tree-node:after {
+  border-top: none;
+}
+.tree-container /deep/ .el-tree > .el-tree-node:before {
+  border-left: none;
+}
+
+.tree-container /deep/ .el-tree > .el-tree-node:after {
+  border-top: none;
+}
+
+.tree-container /deep/ .el-tree-node:before {
+  content: '';
+  left: 10px;
+  position: absolute;
+  right: auto;
+  border-width: 1px;
+}
+
+.tree-container /deep/ .el-tree-node:after {
+  content: '';
+  left: 10px;
+  position: absolute;
+  right: auto;
+  border-width: 1px;
+}
+
+.tree-container /deep/ .el-tree-node:before {
+  border-left: 1px dashed #ccc;
+  bottom: 0px;
+  height: 100%;
+  top: -19px;
+  width: 1px;
+}
+
+.tree-container /deep/ .el-tree-node:after {
+  border-top: 1px dashed #ccc;
+  height: 25px;
+  top: 20px;
+  width: 20px;
+}
+
+.el-tree-node :last-child:before {
+  height: 40px;
+}
+
+.tree-container {
+  margin: 10px;
+}
+.tree-container /deep/ .el-tree .el-tree-node {
+  position: relative;
+}
+.tree-container /deep/ .el-tree-node .el-tree-node__content {
+  height: 34px;
+  padding-left: 0px !important;
+  border: none;
+}
+.tree-container /deep/ .el-tree-node .el-tree-node__content::before {
+  border-left: 1px dashed #ccc;
+  height: 100%;
+  top: 0;
+  width: 1px;
+  margin-left: 1px;
+  margin-top: 0px;
+  z-index: 8;
+}
+.tree-container
+  /deep/
+  .el-tree-node
+  .el-tree-node__children
+  .el-tree-node__content::before {
+  border-left: 0px dashed #ccc;
+  height: 100%;
+  top: 0;
+  width: 1px;
+  margin-left: 1px;
+  margin-top: 0px;
+  z-index: 8;
+}
+
+.tree-container /deep/ .el-tree-node .el-tree-node__content::after {
+  border-top: 1px dashed #ccc;
+  height: 1px;
+  top: 18px;
+  width: 13px;
+  margin-left: 1px;
+  z-index: 8;
+}
+
+.tree-container
+  /deep/
+  .el-tree-node
+  .el-tree-node__children
+  .el-tree-node__content::after {
+  border-top: 0px dashed #ccc;
+}
+
+.tree-container .el-tree-node .el-tree-node__content::before,
+.tree-container .el-tree-node .el-tree-node__content::after {
+  content: '';
+  position: absolute;
+  right: auto;
+}
+/deep/.el-table__placeholder {
+  padding-left: 8px;
+}
+/deep/.el-card__body {
+  padding: 10px !important;
+  > div {
+    padding-bottom: 10px;
+    border-bottom: 1px solid #ccc;
+    &:hover {
+      color: #409eff;
+    }
+  }
+}
+/*.lalala {*/
+/*position: relative;*/
+/*}*/
+.text {
+  font-size: 14px;
+}
+.el-tree {
+  width: 100%;
+  margin-top: 10px;
+}
+.search {
+  width: 100%;
+}
+
+.item {
+  padding: 18px 0;
+}
+
+.add {
+  cursor: pointer;
+  margin-top: 10px;
+}
+
+.delete {
+  margin: 10px 0;
+  cursor: pointer;
+}
+
+.edit {
+  margin-bottom: 10px;
+  cursor: pointer;
+}
+
+.search {
+  cursor: pointer;
+}
+
+.box-card {
+  position: fixed;
+  display: block;
+  z-index: 10000;
+
+  background-color: #fff;
+  padding: 10px 0;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+}
+/deep/ .el-dialog {
+  background: rgba(0, 0, 0, 0.6);
+}
+/deep/.el-range-editor.is-active,
+.el-range-editor.is-active:hover,
+.el-select .el-input.is-focus .el-input__inner {
+  border: 1px solid;
+}
+/deep/.el-dialog__title {
+  color: white;
+}
+/deep/ .el-select .el-input__inner {
+  border-color: #fff !important;
+}
+/deep/.el-cascader .el-input__inner {
+  border-color: #fff !important;
+}
+// 璁剧疆杈撳叆妗嗙殑鑳屾櫙鑹层�佸瓧浣撻鑹层�佽竟妗嗗睘鎬ц缃紱
+/deep/.el-input__inner {
+  background-color: transparent !important ;
+  color: #fff !important;
+  border: 1px solid !important;
+}
+</style>
diff --git a/src/views/Tools/maplayer.vue b/src/views/Tools/maplayer.vue
index beda0d9..dad916d 100644
--- a/src/views/Tools/maplayer.vue
+++ b/src/views/Tools/maplayer.vue
@@ -10,30 +10,23 @@
       :left="data.left || left"
       :top="data.top || top + index * 42 + 'px'"
     >
-      <div class="treeContainer">
-        <el-tree
-          ref="tree"
-          :data="treeData"
-          show-checkbox
-          node-key="id"
-          draggable
-          :expand-on-click-node="false"
-          :auto-expand-parent="false"
-          :default-expanded-keys="defaultExpanded"
-          :default-checked-keys="defaultCheck"
-        >
-        </el-tree>
-      </div>
+   <div  >
+    <layer-tree />
+
+   </div>
     </Popup>
   </div>
 </template>
 
 <script>
 import Popup from './Popup.vue';
+import LayerTree from './LayerTree.vue'
 export default {
   name: 'maplayer',
+
   components: {
     Popup,
+    LayerTree
   },
   data() {
     return {
@@ -41,27 +34,10 @@
       PopupData: ['maplayer'],
       left: 'calc(100% - 330px)',
       top: 10,
-      treeData: [],
-      defaultCheck: [],
-      defaultExpanded: [],
-      selectNode: undefined,
-      rightClickMenuDisplay: false,
-      rightClickMenuStyle: {},
-      isClickParent: false,
-      isNewFold: false,
-      newFoldName: undefined,
-      mergeNode: false,
     };
   },
   computed: {},
-  mounted() {
-    this.treeData([
-      { id: '82A0C3DE', name: '褰卞儚', children: [] },
-      { id: '82C3DE', name: '鍦板舰', children: [] },
-      { id: '4FE10400', name: '妯″瀷', children: [] },
-      { id: '0A51CF71', name: '鐭㈤噺', children: [] },
-    ]);
-  },
+  mounted() {},
   methods: {
     // 鍏抽棴鎵�鏈�
     closeAll() {
@@ -107,8 +83,3 @@
 </script>
 
 <style scoped lang="less">
-.text {
-  margin-left: 15px;
-  margin-right: 15px;
-}
-</style>
diff --git a/src/views/exportMap/index.vue b/src/views/exportMap/index.vue
index 6d7aa42..220ee02 100644
--- a/src/views/exportMap/index.vue
+++ b/src/views/exportMap/index.vue
@@ -38,7 +38,7 @@
           <el-form-item>
             <el-link
               style="color: white"
-              @click="showMapApply = !showMapApply"
+              @click="showMapApply = true"
               :underline="false"
               >鍑哄浘鐢宠
             </el-link></el-form-item
@@ -65,9 +65,9 @@
             <el-button plain size="mini" @click="setMapRemoveDraw()"
               >娓呴櫎</el-button
             >
-            <el-button plain size="mini" @click="setExportMapLayer"
+            <!-- <el-button plain size="mini" @click="setExportMapLayer"
               >鍑哄浘</el-button
-            >
+            > -->
           </el-form-item>
         </el-form>
       </div>
@@ -150,6 +150,12 @@
           </el-table-column>
           <el-table-column property="name" label="鍚嶇О"> </el-table-column>
           <el-table-column property="type" label="绫诲瀷"> </el-table-column>
+          <el-table-column
+            property="createTime"
+            :formatter="formatTime"
+            label="鏃ユ湡"
+          >
+          </el-table-column>
           <el-table-column property="descr" label="鎻忚堪"> </el-table-column>
           <el-table-column label="鎿嶄綔" width="120">
             <template slot-scope="scope">
@@ -235,6 +241,7 @@
 import { removeToken, getToken } from '@/utils/auth';
 import $ from 'jquery';
 import { exportSelectByPage } from '../../api/api.js';
+import moment from 'moment';
 export default {
   data() {
     return {
@@ -259,7 +266,11 @@
           id: 1,
           label: '鍥惧眰',
           children: [
-            { label: '闃�瀹�', value: '闃�瀹�' },
+            {
+              label: '闃�瀹�',
+              value: '闃�瀹�',
+              resource: 'http://192.168.20.39:9055/gisserver/wmsserver/lfgd',
+            },
             { label: '绔欏満', value: '绔欏満' },
             { label: '绠¢亾涓績绾�', value: '绠¢亾涓績绾�' },
           ],
@@ -286,6 +297,13 @@
     this.initMap();
   },
   methods: {
+    formatTime(row, column) {
+      let date = row[column.property];
+      if (date === undefined || date === null) {
+        return '';
+      }
+      return moment(parseInt(date)).format('YYYY-MM-DD HH:mm:ss');
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
@@ -299,9 +317,11 @@
       this.getShowMapList();
     },
     async getShowMapList() {
-      const data = await exportSelectByPage(this.listdata);
-      this.exportable = data.result;
       this.showMapList = true;
+      const data = await exportSelectByPage(this.listdata);
+      debugger;
+      this.exportable = data.result;
+
       this.count = data.count;
     },
     setExportMapLayer(res) {
@@ -427,17 +447,17 @@
         this.arrList.push({
           name: data.label,
         });
+
         var wmsLayer = new Image({
           source: new ImageWMS({
             ratio: 1,
             url: data.resource,
             crossOrigin: 'anonymous',
-
             params: {
               VERSION: '1.3.0',
               FORMAT: 'image/png',
               LAYERS: '',
-              srs: 'EPSG:900913',
+              srs: 'EPSG:4326',
               tiled: true,
               styles: '',
             },

--
Gitblit v1.9.3