From d80d032784216bc4a61692476947ab36f53788d7 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 04 九月 2023 10:18:17 +0800
Subject: [PATCH] 在线制图修改，管理修改
---
src/components/thematicMap/thematicMap.vue | 1
src/views/layer/layerSet.vue | 237 +++++++++++++++++++++++++++++----------
src/assets/js/Map/menuTool.js | 8 +
src/views/export/exportList.vue | 13 +
src/views/menus.vue | 37 ++++-
src/views/Index.vue | 3
src/store/index.ts | 2
7 files changed, 227 insertions(+), 74 deletions(-)
diff --git a/src/assets/js/Map/menuTool.js b/src/assets/js/Map/menuTool.js
index 4e5d98e..874b603 100644
--- a/src/assets/js/Map/menuTool.js
+++ b/src/assets/js/Map/menuTool.js
@@ -309,6 +309,7 @@
case "l3": //鍦ㄧ嚎鍒跺浘
store.state.isShowMap = true;
this.setThematicMap();
+
break;
case "l4":
store.state.isShowMap = true;
@@ -328,6 +329,9 @@
break;
case "t3":
this.delRectangle();
+ break;
+ case "t4":
+ store.state.setExportList = !store.state.setExportList
break;
}
},
@@ -360,6 +364,9 @@
var north1 = ss[3];
var south1 = ss[1];
var geometry = Cesium.Rectangle.fromDegrees(west1, south1, east1, north1);
+
+
+
Viewer.camera.setView({
destination: Cesium.Rectangle.fromDegrees(west, south, east, north),
});
@@ -387,6 +394,7 @@
// var handle = new SmartEarth.Cesium.ScreenSpaceEventHandler(
// earthCtrl.viewer.scene.canvas
// );
+
},
//鍧愭爣瀹氫綅
diff --git a/src/components/thematicMap/thematicMap.vue b/src/components/thematicMap/thematicMap.vue
index 3e54481..38cebc8 100644
--- a/src/components/thematicMap/thematicMap.vue
+++ b/src/components/thematicMap/thematicMap.vue
@@ -61,6 +61,7 @@
right: 0px;
display: flex;
cursor: pointer;
+ z-index: 40;
.menu_Box {
margin-right: 104px;
display: flex;
diff --git a/src/store/index.ts b/src/store/index.ts
index a362c16..9dd0789 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -30,6 +30,8 @@
restLayer: false,
isShowMap: true,
spatialTitle: null,
+ setExportList: false,
+ setLayerManager: false,
},
mutations: {
//鑾峰彇鐧诲綍Code
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 989f3cf..79a3ce4 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -5,6 +5,7 @@
v-if="layerExportshow"
@SETexportMap="SETexportMap"
></export-map>
+ <export-list v-if="store.state.setExportList"></export-list>
<menus></menus>
<bottom-btn v-if="store.state.isShowMap"></bottom-btn>
<mouse-move v-if="store.state.isShowMap"></mouse-move>
@@ -57,6 +58,8 @@
import mapclock from "@/views/mapClock/index.vue";
//鐭㈤噺鏁版嵁淇℃伅寮圭獥
import detailsQuery from "@/views/query/detailsQuery.vue";
+//鍑哄浘鍒楄〃
+import exportList from "./export/exportList.vue";
import router from "@/router";
import { useStore } from "vuex"; // 寮曞叆useStore 鏂规硶
diff --git a/src/views/export/exportList.vue b/src/views/export/exportList.vue
index 0d23c8b..7f12222 100644
--- a/src/views/export/exportList.vue
+++ b/src/views/export/exportList.vue
@@ -25,8 +25,13 @@
defineEmits,
} from "vue";
import { User, Lock } from "@element-plus/icons-vue";
+import { useStore } from "vuex"; // 寮曞叆useStore 鏂规硶
+
+const store = useStore(); // 璇ユ柟娉曠敤浜庤繑鍥瀞tore 瀹炰緥
const emits = defineEmits(["SETspatialClose"]);
-const setSpatialClose = () => {};
+const setSpatialClose = () => {
+ store.state.setExportList = false;
+};
</script>
<style lang="less" scoped>
@@ -35,11 +40,11 @@
height: 400px;
display: flex;
position: absolute;
- bottom: 5%;
- right: 5%;
+ bottom: 10px;
+ right: 50px;
background: rgba(7, 8, 14, 0.8);
border: 1px solid #d6e4ff;
- z-index: 10;
+ z-index: 50;
box-shadow: inset 0px 10px 40px 10px rgba(38, 47, 71, 1);
.exportTitle {
padding: 10px;
diff --git a/src/views/layer/layerSet.vue b/src/views/layer/layerSet.vue
index c5555e7..f91eb0a 100644
--- a/src/views/layer/layerSet.vue
+++ b/src/views/layer/layerSet.vue
@@ -3,7 +3,10 @@
<div class="layerBox">
<div class="layerTitle">
<div class="tileLeft">
- <div class="titleImg" @click="editState">
+ <div
+ class="titleImg"
+ @click="editState"
+ >
<ArrowLeft />
</div>
<div class="titleLable">鍥惧眰缂栬緫</div>
@@ -19,57 +22,78 @@
:expand-on-click-node="false"
@node-click="handleNodeClick"
ref="treeRef"
+ style="font-size: 16px;"
/>
</div>
</div>
<div class="edit_box">
<div class="edit_box_btn btnstyle">
- <el-button type="primary" :icon="Plus" @click="insertLayerData(1)"
- >鏂板鍚岀骇</el-button
- >
- <el-button type="primary" :icon="Plus" @click="insertLayerData(2)"
- >鏂板瀛愮骇</el-button
- >
+ <el-button
+ type="primary"
+ :icon="Plus"
+ @click="insertLayerData(1)"
+ >鏂板鍚岀骇</el-button>
+ <el-button
+ type="primary"
+ :icon="Plus"
+ @click="insertLayerData(2)"
+ >鏂板瀛愮骇</el-button>
<el-button
type="primary"
:icon="Delete"
class="delbtn"
@click="delLayer"
- >鍒犻櫎</el-button
- >
- <el-button type="primary" :icon="Top" @click="move(1)"
- >鍚戜笂绉诲姩</el-button
- >
- <el-button type="primary" :icon="Bottom" @click="move(2)"
- >鍚戜笅绉诲姩</el-button
- >
+ >鍒犻櫎</el-button>
+ <el-button
+ type="primary"
+ :icon="Top"
+ @click="move(1)"
+ >鍚戜笂绉诲姩</el-button>
+ <el-button
+ type="primary"
+ :icon="Bottom"
+ @click="move(2)"
+ >鍚戜笅绉诲姩</el-button>
</div>
<div class="edit_box_form">
- <el-form :model="formInline" label-width="120px">
+ <el-form
+ :model="formInline"
+ label-width="120px"
+ >
<el-form-item label="鍥惧眰绫诲瀷">
- <el-select style="width: 100%" v-model="formInline.isLayer">
- <el-option label="鍥惧眰缁�" value="0"></el-option>
- <el-option label="鍥惧眰" value="1"></el-option>
+ <el-select
+ style="width: 100%"
+ v-model="formInline.isLayer"
+ >
+ <el-option
+ label="鍥惧眰缁�"
+ value="0"
+ ></el-option>
+ <el-option
+ label="鍥惧眰"
+ value="1"
+ ></el-option>
</el-select>
</el-form-item>
<!-- 鏈嶅姟璧勬簮-->
- <el-form-item v-show="formInline.isLayer == 1" label="鏈嶅姟璧勬簮">
+ <el-form-item
+ v-show="formInline.isLayer == 1"
+ label="鏈嶅姟璧勬簮"
+ >
<el-button
size="small"
class="serviceButton"
@click="setServiceChange('0')"
key="0"
:class="{ serviceActive: !serviceActive }"
- >鍚�</el-button
- >
+ >鍚�</el-button>
<el-button
size="small"
class="serviceButton"
@click="setServiceChange('1')"
key="1"
:class="{ serviceActive: serviceActive }"
- >鏄�</el-button
- >
+ >鏄�</el-button>
</el-form-item>
<el-form-item label="鍥惧眰鍚嶇О">
@@ -79,7 +103,10 @@
/>
</el-form-item>
<!-- 鏈嶅姟绫诲埆 -->
- <el-form-item v-show="formInline.isLayer == 1" label="鏈嶅姟绫诲埆">
+ <el-form-item
+ v-show="formInline.isLayer == 1"
+ label="鏈嶅姟绫诲埆"
+ >
<el-select
style="width: 100%"
v-model="formInline.category"
@@ -94,7 +121,10 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="琛ㄥ悕绉�" v-show="formInline.category == 2">
+ <el-form-item
+ label="琛ㄥ悕绉�"
+ v-show="formInline.category == 2"
+ >
<el-input
v-model="formInline.tab"
placeholder="璇疯緭鍏ヨ〃鍚嶇О"
@@ -102,7 +132,10 @@
/>
</el-form-item>
<!-- 鏁版嵁绫诲瀷 -->
- <el-form-item v-show="formInline.isLayer == 1" label="鏁版嵁绫诲瀷">
+ <el-form-item
+ v-show="formInline.isLayer == 1"
+ label="鏁版嵁绫诲瀷"
+ >
<el-select
style="width: 100%"
v-model="formInline.data"
@@ -119,7 +152,10 @@
</el-select>
</el-form-item>
<!-- 鏁版嵁绫诲瀷 -->
- <el-form-item v-show="formInline.isLayer == 1" label="鏈嶅姟绫诲瀷">
+ <el-form-item
+ v-show="formInline.isLayer == 1"
+ label="鏈嶅姟绫诲瀷"
+ >
<el-select
style="width: 100%"
v-model="formInline.type"
@@ -135,7 +171,10 @@
</el-select>
</el-form-item>
- <el-form-item label="鏈嶅姟鍦板潃" v-show="formInline.isLayer == 1">
+ <el-form-item
+ label="鏈嶅姟鍦板潃"
+ v-show="formInline.isLayer == 1"
+ >
<el-input
v-model="formInline.serviceUrl"
placeholder="璇疯緭鍏ユ湇鍔″湴鍧�"
@@ -144,40 +183,63 @@
</el-form-item>
<el-form-item>
<div class="btnstyle editBtn">
- <el-button type="primary" @click="onSubmit">纭畾</el-button>
- <el-button class="delbtn" @click="updateRest">鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ @click="onSubmit"
+ >纭畾</el-button>
+ <el-button
+ class="delbtn"
+ @click="updateRest"
+ >鍙栨秷</el-button>
</div>
</el-form-item>
</el-form>
</div>
</div>
- <el-dialog title="鏂板" v-model="dialogVisible" width="50%">
+ <el-dialog
+ title="鏂板"
+ v-model="dialogVisible"
+ width="50%"
+ >
<div style="width: 100%; max-height: 63vh; overflow-y: auto">
- <el-form :model="insertData" label-width="120px">
+ <el-form
+ :model="insertData"
+ label-width="120px"
+ >
<el-form-item label="鍥惧眰绫诲瀷">
- <el-select style="width: 100%" v-model="insertData.isLayer">
- <el-option label="鍥惧眰缁�" value="0"></el-option>
- <el-option label="鍥惧眰" value="1"></el-option>
+ <el-select
+ style="width: 100%"
+ v-model="insertData.isLayer"
+ >
+ <el-option
+ label="鍥惧眰缁�"
+ value="0"
+ ></el-option>
+ <el-option
+ label="鍥惧眰"
+ value="1"
+ ></el-option>
</el-select>
</el-form-item>
<!-- 鏈嶅姟璧勬簮-->
- <el-form-item v-show="insertData.isLayer == 1" label="鏈嶅姟璧勬簮">
+ <el-form-item
+ v-show="insertData.isLayer == 1"
+ label="鏈嶅姟璧勬簮"
+ >
<el-button
size="small"
class="serviceButton"
@click="setInsertServiceChange('0')"
key="0"
:class="{ serviceActive: !insertServiceActive }"
- >鍚�</el-button
- >
+ >鍚�</el-button>
<el-button
size="small"
class="serviceButton"
@click="setInsertServiceChange('1')"
key="1"
:class="{ serviceActive: insertServiceActive }"
- >鏄�</el-button
- >
+ >鏄�</el-button>
</el-form-item>
<el-form-item label="鍥惧眰鍚嶇О">
@@ -187,7 +249,10 @@
/>
</el-form-item>
<!-- 鏈嶅姟绫诲埆 -->
- <el-form-item v-show="insertData.isLayer == 1" label="鏈嶅姟绫诲埆">
+ <el-form-item
+ v-show="insertData.isLayer == 1"
+ label="鏈嶅姟绫诲埆"
+ >
<el-select
style="width: 100%"
v-model="insertData.category"
@@ -202,7 +267,10 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="琛ㄥ悕绉�" v-show="insertData.category == 2">
+ <el-form-item
+ label="琛ㄥ悕绉�"
+ v-show="insertData.category == 2"
+ >
<el-input
v-model="insertData.tab"
placeholder="璇疯緭鍏ヨ〃鍚嶇О"
@@ -210,7 +278,10 @@
/>
</el-form-item>
<!-- 鏁版嵁绫诲瀷 -->
- <el-form-item v-show="insertData.isLayer == 1" label="鏁版嵁绫诲瀷">
+ <el-form-item
+ v-show="insertData.isLayer == 1"
+ label="鏁版嵁绫诲瀷"
+ >
<el-select
style="width: 100%"
v-model="insertData.data"
@@ -227,7 +298,10 @@
</el-select>
</el-form-item>
<!-- 鏁版嵁绫诲瀷 -->
- <el-form-item v-show="insertData.isLayer == 1" label="鏈嶅姟绫诲瀷">
+ <el-form-item
+ v-show="insertData.isLayer == 1"
+ label="鏈嶅姟绫诲瀷"
+ >
<el-select
style="width: 100%"
v-model="insertData.type"
@@ -243,7 +317,10 @@
</el-select>
</el-form-item>
- <el-form-item label="鏈嶅姟鍦板潃" v-show="insertData.isLayer == 1">
+ <el-form-item
+ label="鏈嶅姟鍦板潃"
+ v-show="insertData.isLayer == 1"
+ >
<el-input
v-model="insertData.serviceUrl"
placeholder="璇疯緭鍏ユ湇鍔″湴鍧�"
@@ -252,44 +329,61 @@
</el-form-item>
<el-form-item>
<div class="btnstyle editBtn">
- <el-button type="primary" size="small" @click="added()"
- >纭畾</el-button
- >
+ <el-button
+ type="primary"
+ size="small"
+ @click="added()"
+ >纭畾</el-button>
<el-button
class="delbtn"
type="info"
size="small"
@click="submitCancel()"
- >鍙栨秷</el-button
- >
+ >鍙栨秷</el-button>
</div>
</el-form-item>
</el-form>
</div>
</el-dialog>
- <el-dialog v-model="dialogService" width="50%" :show-close="false">
+ <el-dialog
+ v-model="dialogService"
+ width="50%"
+ :show-close="false"
+ >
<div style="width: 100%; max-height: 63vh; overflow-y: auto">
<div
style="display: flex; justify-content: space-between"
class="tableForm"
>
<div>
- <el-input size="small" v-model="listData.name">
+ <el-input
+ size="small"
+ v-model="listData.name"
+ >
<template #suffix>
<el-icon
class="el-input__icon el-icon-search"
@click="setServiceQuery"
- ><search
- /></el-icon>
+ >
+ <search />
+ </el-icon>
</template>
</el-input>
</div>
<div class="btnstyle">
- <el-button type="info" size="small" @click="setServiceRest">
+ <el-button
+ type="info"
+ size="small"
+ @click="setServiceRest"
+ >
閲嶇疆
</el-button>
- <el-button type="primary" size="small" @click="setServiceConfirm">
+ <el-button
+ type="primary"
+ size="small"
+ @click="setServiceConfirm"
+ >
纭
</el-button>
<el-button
@@ -302,15 +396,26 @@
</el-button>
</div>
</div>
- <el-table ref="multipleTable" :data="tableData" @select="selectChange">
- <el-table-column type="selection" width="55"> </el-table-column>
+ <el-table
+ ref="multipleTable"
+ :data="tableData"
+ @select="selectChange"
+ >
+ <el-table-column
+ type="selection"
+ width="55"
+ > </el-table-column>
<el-table-column
align="center"
type="index"
label="搴忓彿"
width="70px"
/>
- <el-table-column align="center" prop="cnName" label="璧勬簮鍚嶇О" />
+ <el-table-column
+ align="center"
+ prop="cnName"
+ label="璧勬簮鍚嶇О"
+ />
<el-table-column
align="center"
@@ -325,7 +430,10 @@
:formatter="setResType"
/>
</el-table>
- <div class="pagination_box" style="margin-top: 15px">
+ <div
+ class="pagination_box"
+ style="margin-top: 15px"
+ >
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -937,7 +1045,7 @@
align-items: center;
.titleLable {
- font-size: 24px;
+ font-size: 18px;
font-family: Source Han Sans CN;
font-weight: 400;
color: #ffffff;
@@ -957,6 +1065,11 @@
height: 92%;
overflow: auto;
}
+
+ /deep/.el-tree-node__content {
+ font-size: 16px;
+ }
+
.layerContent::-webkit-scrollbar {
width: 8px;
}
diff --git a/src/views/menus.vue b/src/views/menus.vue
index 32a610a..09c41e8 100644
--- a/src/views/menus.vue
+++ b/src/views/menus.vue
@@ -1,10 +1,21 @@
<template>
- <div class="menus" v-show="fullScreen">
+ <div
+ class="menus"
+ v-show="fullScreen"
+ >
<div class="logo_box">
- <img src="../assets/img/logo.png" alt="" class="logo" />
+ <img
+ src="../assets/img/logo.png"
+ alt=""
+ class="logo"
+ />
<div class="logo_name">
<h3>鏈堢悆澶ф暟鎹湴鐞嗙┖闂村垎鏋愬睍绀哄钩鍙�</h3>
- <img src="../assets/img/logob.png" alt="" class="logo_name_b" />
+ <img
+ src="../assets/img/logob.png"
+ alt=""
+ class="logo_name_b"
+ />
</div>
</div>
<div class="menus_box">
@@ -29,7 +40,10 @@
</div>
</div>
</div>
- <div class="content_box" v-show="fullScreen">
+ <div
+ class="content_box"
+ v-show="fullScreen"
+ >
<div
v-show="checkMenuFlag == 'l1'"
style="position: relative; display: flex"
@@ -46,10 +60,17 @@
<search v-if="thematicMapBtnState"> </search>
</div>
- <top-btn v-show="fullScreen" v-if="thematicMapBtnState"></top-btn>
+ <top-btn
+ v-show="fullScreen"
+ v-if="thematicMapBtnState"
+ ></top-btn>
<thematic-map v-show="!thematicMapBtnState"></thematic-map>
- <div class="fullScreen_btn" v-show="!fullScreen" @click="screen"></div>
+ <div
+ class="fullScreen_btn"
+ v-show="!fullScreen"
+ @click="screen"
+ ></div>
<div
v-show="store.state.doubleMenu"
class="setDobuleMap"
@@ -122,11 +143,11 @@
// fullScreen.value = !fullScreen.value;
screen();
}
-
+ debugger;
if (res.id == "l3") {
thematicMapState.value = false;
thematicMapBtnState.value = false;
- } else {
+ } else if (res.id != "11") {
thematicMapState.value = true;
thematicMapBtnState.value = true;
}
--
Gitblit v1.9.3