From 98aec0baaef46392f6bede8f507466fc75eca137 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 23 三月 2023 14:37:57 +0800
Subject: [PATCH] 顶部菜单修改，目录管理批量导入修改
---
src/assets/img/menu/navbg.jpg | 0
src/assets/css/index.css | 36 +++++++----
src/components/login.vue | 4
src/components/preview_map.vue | 47 +++++++++++++++
src/views/datamanage/catalogueManage.vue | 27 +++++---
src/components/navMenu.vue | 25 +++-----
src/components/ProjectOl.vue | 5 +
src/views/Tools/AddOnlineMap.vue | 2
src/views/datamanage/SpatialData.vue | 2
9 files changed, 102 insertions(+), 46 deletions(-)
diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index 8c72cc0..5761591 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -12,7 +12,7 @@
.el-header {
padding: 0;
- height: 90px !important;
+ height: 60px !important;
}
.el-main {
@@ -43,7 +43,7 @@
/* width: 415px;
height: 70px;
background: url("../img/LOGO.png") no-repeat center; */
- width: 240px;
+ width: 18%;
height: 50px;
background: url("../img/menu/navtitle.png") no-repeat center center;
background-size: 100% 100%;
@@ -52,7 +52,9 @@
.topMenu {
width: auto;
flex: 1;
- height: 100px;
+ height: 60px;
+ margin-left: 3%;
+
}
.menuContent {
@@ -60,7 +62,17 @@
height: 100%;
display: flex;
align-items: center;
- justify-content: center;
+ /* justify-content: center; */
+}
+
+.topUser {
+
+ color: white;
+ width: 9%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ padding-left: 10px;
}
.contentDiv {
@@ -81,10 +93,10 @@
}
.menulabel {
- font-size: 10px;
+ font-size: 15px;
font-family: Source Han Sans CN;
text-align: left;
- padding: 0 20px;
+ padding: 0 10px;
/*width: 100px;*/
/*width: 120px;*/
color: #fff
@@ -164,12 +176,7 @@
background-size: 100% 100%;
}
-.topUser {
- color: white;
- height: 70px;
- display: flex;
- align-items: center;
-}
+
.userName {
margin: 0px 10px 0 5px;
@@ -177,6 +184,7 @@
display: flex;
justify-content: space-between;
height: 30px;
+ align-items: center;
}
.userLanguage {
@@ -184,6 +192,7 @@
/*margin-top: 10px;*/
display: flex;
height: 30px;
+ align-items: center;
}
.userImage {
@@ -205,6 +214,7 @@
background-size: 100% 100%;
cursor: pointer;
}
+
.theme {
background: url("../img/menu/theme.png") no-repeat;
background-size: 100% 100%;
@@ -303,4 +313,4 @@
/* background-image: url("../../assets/img/synthesis/鍦板舰.png");*/
/* background-repeat: no-repeat;*/
/* background-size: contain;*/
-/*}*/
+/*}*/
\ No newline at end of file
diff --git a/src/assets/img/menu/navbg.jpg b/src/assets/img/menu/navbg.jpg
index ee2b612..2f15218 100644
--- a/src/assets/img/menu/navbg.jpg
+++ b/src/assets/img/menu/navbg.jpg
Binary files differ
diff --git a/src/components/ProjectOl.vue b/src/components/ProjectOl.vue
index 73a955f..ce9bc12 100644
--- a/src/components/ProjectOl.vue
+++ b/src/components/ProjectOl.vue
@@ -164,8 +164,9 @@
});
},
async showLoacation(res) {
- this.formInline.lon = res[0].toFixed(6);
- this.formInline.lat = res[1].toFixed(6);
+
+ this.formInline.lon = parseFloat(res[0]).toFixed(6);
+ this.formInline.lat = parseFloat(res[1]).toFixed(6);
const data = await project_selectLocation({
x: res[0],
y: res[1],
diff --git a/src/components/login.vue b/src/components/login.vue
index ba72a0d..460dbb6 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -228,7 +228,7 @@
sessionStorage.setItem("routerName", "/Thematic");
sessionStorage.setItem("changeSelectStyle", 1);
this.$router.push("/");
- }else {
+ } else {
this.$message({
message: "璇锋偍鑱旂郴绠＄悊鍛樺垎閰嶈鑹茶彍鍗�",
type: "error",
@@ -323,7 +323,7 @@
}
.title_img {
position: absolute;
- left: 17%;
+ left: 20%;
top: 8%;
width: 20%;
/* transform: translateX(-50%); */
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 40a0ec5..7de5719 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -43,22 +43,15 @@
</div>
<div class="topUser">
<div class="userLanguage">
- <div class="userImage theme" @click="themeChange"></div>
- <div class="userImage user2" @click="switchLang"></div>
-<!-- <div class="TextLanguage">-->
-<!-- <el-link-->
-<!-- @click="switchLang"-->
-<!-- :underline="false"-->
-<!-- class="elLink"-->
-<!-- >{{$t("common.language")}}</el-link>-->
-<!-- </div>-->
-<!-- <div class="TextLanguage">-->
-<!-- <el-link-->
-<!-- @click="themeChange"-->
-<!-- :underline="false"-->
-<!-- class="elLink"-->
-<!-- > 涓婚鍒囨崲</el-link>-->
-<!-- </div>-->
+ <div
+ class="userImage theme"
+ @click="themeChange"
+ ></div>
+ <div
+ class="userImage user2"
+ @click="switchLang"
+ ></div>
+
</div>
<div class="userName">
<div class="userImage user1"></div>
diff --git a/src/components/preview_map.vue b/src/components/preview_map.vue
index 40c1fc6..cb39621 100644
--- a/src/components/preview_map.vue
+++ b/src/components/preview_map.vue
@@ -186,6 +186,47 @@
</div>
</el-dialog>
+ <!-- <el-dialog
+ :title=" $t('synthesis.rangequery')"
+ :visible.sync="dialogMapVisible"
+ width="90%"
+ top="10vh"
+ :before-close="handleMapClose"
+ >
+ <div style="height:700px">
+ <map-sdk v-if='showMapVisible'></map-sdk>
+ </div>
+ </el-dialog> -->
+ <el-dialog
+ title="棰勮"
+ :append-to-body="false"
+ :visible.sync="dialog.dialogVisible"
+ width="70%"
+ :close-on-click-modal="false"
+ >
+ <div
+ v-if="dialog.isPdf"
+ class="pdfClass"
+ >
+ <iframe
+ :src="dialog.src"
+ type="application/x-google-chrome-pdf"
+ width="100%"
+ height="100%"
+ >
+ </iframe>
+ </div>
+ <div
+ v-if="dialog.isJpg"
+ class="pdfClass"
+ >
+ <img
+ style="width:100%; height:100%"
+ :src="dialog.src"
+ alt=""
+ />
+ </div>
+ </el-dialog>
</div>
</template>
@@ -375,7 +416,6 @@
},
//闄勪欢鍒楄〃鏌ヨ
async getAttacthFlieList() {
- debugger
var obj = {
eventid: this.layerID,
tabName: "lf.sys_style"
@@ -719,5 +759,10 @@
max-height: 300px;
overflow: auto;
}
+ .pdfClass {
+ height: 70vh;
+ width: 100%;
+ position: relative;
+ }
}
</style>
\ No newline at end of file
diff --git a/src/views/Tools/AddOnlineMap.vue b/src/views/Tools/AddOnlineMap.vue
index f8b2392..ca1e7b9 100644
--- a/src/views/Tools/AddOnlineMap.vue
+++ b/src/views/Tools/AddOnlineMap.vue
@@ -313,7 +313,7 @@
window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
url: ulr,
- maximumLevel: 18,
+ maximumLevel: 22,
})
);
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 41bcb6c..3fed848 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -272,7 +272,7 @@
@click="setAttachDel"
>{{$t('common.delete')}}</el-link>
</el-col>
-
+ <!-- <el-col :span="3"> <el-link class="elLink" :underline="false" >{{$t('common.reset')}}</i></el-link></el-col> -->
</el-row>
</el-form-item>
</el-form>
diff --git a/src/views/datamanage/catalogueManage.vue b/src/views/datamanage/catalogueManage.vue
index f223bd7..2bf0266 100644
--- a/src/views/datamanage/catalogueManage.vue
+++ b/src/views/datamanage/catalogueManage.vue
@@ -493,8 +493,11 @@
exts: res[i].exts,
orderNum: null,
pid: null,
+ tid: parseInt(value[2]) + 1,
+ sid: parseInt(value[3]) + 1
})
}
+
this.tableData = arr;
this.setInsertData(this.tableData);
@@ -511,19 +514,20 @@
}
}
if (chLevel == 1) {
- return [res['L' + chLevel], null]
+ return [res['L' + chLevel], null, flag, -1]
} else {
faLevel = chLevel - 1;
for (var i = flag; i >= 0; i--) {
var val = result[i]
if (val['L' + faLevel]) {
- return [res['L' + chLevel], val['L' + faLevel]]
+ return [res['L' + chLevel], val['L' + faLevel], flag, i]
break;
}
}
}
},
setInsertData(res) {
+
var list = this.excelData(res);
if (list.length != 0) {
@@ -531,7 +535,7 @@
return this.$message.error("涓婁紶鏁版嵁閿欒锛岀涓�鏉℃暟鎹笉涓虹┖");
}
- this.getAllNodeId(list);
+ this.getAllNodeId(res);
}
},
async getAllNodeId(res) {
@@ -542,8 +546,9 @@
val.orderNum = this.dirList[this.dirList.length - 1].orderNum + 1;
val.pid = 0;
} else {
+
this.tableData.filter((child) => {
- if (child.name == val.pname) {
+ if (child.tid == val.sid) {
val.pid = child.id;
val.orderNum = i + 1;
}
@@ -553,29 +558,31 @@
const data = await insertDir(val);
if (data.code != 200) {
}
+
this.tableData.filter((child) => {
- if (child.name == val.name && child.pname == val.pname) {
+
+ if (child.name == val.name && child.tid == val.tid) {
child.id = data.result;
}
});
this.itemaName = data.result;
this.getDirTree();
- if (res[i].children) {
- this.getAllNodeId(res[i].children);
- }
+ // if (res[i].children) {
+ // this.getAllNodeId(res[i].children);
+ // }
}
},
excelData(source) {
let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
return cloneData.filter((father) => {
// 寰幆鎵�鏈夐」
- let branchArr = cloneData.filter((child) => father.name == child.pname); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁
+ let branchArr = cloneData.filter((child) => father.tid == child.sid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁
branchArr.length > 0 ? (father.children = branchArr) : ""; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
// 灞炰簬鍚屼竴瀵硅薄闂锛屼緥濡傦細浠� a=b銆乧=1 锛岀劧鍚庡啀浠� b.c=c 锛� 閭ｄ箞 a.c=b.c=c=1 锛涘悓鐞嗭紝鍚庣画浠� c.d=2 ,閭ｄ箞 a.c.d 涔熸槸=2锛�
// 鐢辨寰幆澶氭鍚庯紝灏辫兘褰㈡垚鐩稿簲鐨勬爲褰㈡暟鎹粨鏋�
- return father.pname == null; // 杩斿洖涓�绾ц彍鍗�
+ return father.sid == 0; // 杩斿洖涓�绾ц彍鍗�
});
},
readFile(file) {
--
Gitblit v1.9.3