From acaf0e90887fa217ff9aec6d0f25af5ec5e237a9 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 03 七月 2023 18:38:10 +0800
Subject: [PATCH] 配置修改
---
src/assets/js/Map/index.js | 2
src/api/api.js | 8 ++++
public/mapscreen/css/style.css | 14 +++++-
src/views/login.vue | 15 ++++++-
public/config/config.js | 2
src/components/topBtn.vue | 2 +
src/views/menus.vue | 4 +-
src/views/search/search.vue | 24 ++++++-----
src/assets/js/Map/config.js | 7 +++
9 files changed, 57 insertions(+), 21 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index 4d67337..0c7f103 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -1 +1 @@
-const BASE_URL = "http://127.0.0.1:9999/api/moonProject/"; //鍚庣鎺ュ彛鍦板潃
+const BASE_URL = "http://192.168.20.83:8088/MoonServer/"; //鍚庣鎺ュ彛鍦板潃
diff --git a/public/mapscreen/css/style.css b/public/mapscreen/css/style.css
index 7a91a2b..eccd741 100644
--- a/public/mapscreen/css/style.css
+++ b/public/mapscreen/css/style.css
@@ -1,4 +1,5 @@
-html, body {
+html,
+body {
position: absolute;
width: 100%;
height: 100%;
@@ -55,13 +56,20 @@
}
.world-globe-halo {
- position: absolute;
+ /* position: absolute;
left: 50%;
top: 50%;
width: 730px;
height: 715px;
margin-left: -368px;
- margin-top: -350px;
+ margin-top: -350px; */
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ width: 730px;
+ height: 681px;
+ margin-left: -368px;
+ margin-top: -324px;
}
.info {
diff --git a/src/api/api.js b/src/api/api.js
index f26324a..011c840 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -13,3 +13,11 @@
//璇锋眰鍦板潃
return request.get("/select", { params: params });
}
+
+
+//鍦板悕鏌ヨ
+export function dataQuery_selectByPage(params) {
+ //璇锋眰鍦板潃
+ return request.get("/dataQuery/selectByPage", { params: params });
+}
+
diff --git a/src/assets/js/Map/config.js b/src/assets/js/Map/config.js
index 6d0b0d5..7f16aca 100644
--- a/src/assets/js/Map/config.js
+++ b/src/assets/js/Map/config.js
@@ -1,9 +1,16 @@
+
+//鏄惁涓虹敓浜х幆澧�
+const isWeb = false;
+//鏄惁涓虹敓浜х幆澧�
+const webUrl = isWeb ? "/web" : ""
//閰嶇疆鏂囦欢鍦板潃
const config = {
//妞悆浣撳垵濮嬪寲鍔犺浇鍥剧墖
imgUrl: "Workers/image/earth.jpg",
//license璁稿彲
licenseServer: "http://183.162.245.49:18080",
+ //SDK璁稿彲
+ StaticFileBaseUrl: webUrl + "/CIMSDK/",
//tmsserver
moonTms: "/TMS",
//Wmtsserver
diff --git a/src/assets/js/Map/index.js b/src/assets/js/Map/index.js
index 5619b08..e5201bc 100644
--- a/src/assets/js/Map/index.js
+++ b/src/assets/js/Map/index.js
@@ -16,7 +16,7 @@
);
//椤甸潰鍒濆鍖�
this.earthCtrl = new SmartEarth.EarthCtrl("cesiumContainer", {
- StaticFileBaseUrl: "/CIMSDK/",
+ StaticFileBaseUrl: config.StaticFileBaseUrl,
});
// this.earthCtrl.environment.disableAllEffect();
diff --git a/src/components/topBtn.vue b/src/components/topBtn.vue
index 7f8c1bd..3335722 100644
--- a/src/components/topBtn.vue
+++ b/src/components/topBtn.vue
@@ -137,12 +137,14 @@
margin-right: 7px;
background: url("../assets/img/topBtn/鍥炬爣bj.png") no-repeat;
background-size: 100% 100%;
+ opacity: 0.8;
.First_img {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
+ opacity: 1;
}
}
diff --git a/src/views/login.vue b/src/views/login.vue
index 0ddaf06..3921cba 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -30,6 +30,7 @@
</div>
<div class="zz">
<div class="title_img">
+ <div class="titleLogo"></div>
<h3>鏈堢悆澶ф暟鎹湴鐞嗙┖闂村垎鏋愬睍绀哄钩鍙�</h3>
</div>
<div class="loginMenu">
@@ -175,14 +176,22 @@
}
.title_img {
position: absolute;
- left: 15%;
+ left: 12%;
top: 8%;
- width: 20%;
- /* transform: translateX(-50%); */
+
+ display: flex;
+ align-items: center;
+ .titleLogo {
+ width: 80px;
+ height: 80px;
+ background: url("../assets/img/logo.png") no-repeat;
+ background-size: 100% 100%;
+ }
h3 {
color: #fff;
font-size: 40px;
white-space: nowrap;
+ margin-left: 10px;
}
}
}
diff --git a/src/views/menus.vue b/src/views/menus.vue
index 5ef6baf..080615b 100644
--- a/src/views/menus.vue
+++ b/src/views/menus.vue
@@ -168,7 +168,7 @@
.menus {
position: absolute;
top: 27px;
- left: 14px;
+ left: 0px;
.logo_box {
display: flex;
align-items: center;
@@ -194,7 +194,7 @@
}
}
.menus_box {
- background: #010a1c;
+ background: rgba(1, 10, 28, 0.68);
left: 7px;
position: absolute;
diff --git a/src/views/search/search.vue b/src/views/search/search.vue
index 7612f91..1f2f12b 100644
--- a/src/views/search/search.vue
+++ b/src/views/search/search.vue
@@ -55,7 +55,7 @@
/>
<el-input
class="numInput"
- v-model="listData.num"
+ v-model="listData.pageIndex"
/>
<el-button
size="small"
@@ -105,21 +105,15 @@
defineProps,
defineEmits,
} from "vue";
-import {
- Search,
- DArrowLeft,
- ArrowLeft,
- ArrowRight,
- DArrowRight,
-} from "@element-plus/icons-vue";
-
+import { dataQuery_selectByPage } from "@/api/api.js";
let searchValue = ref("");
const activeNames = ref(["1"]);
const listData = ref({
count: 0,
page: 0,
- num: 1,
+ pageIndex: 1,
+ pageSize: 10,
});
const NumhandleChange = (value: number) => {
console.log(value);
@@ -132,8 +126,16 @@
searchValue.value = "";
};
-const setSearchClick = () => {
+const setSearchClick = async () => {
if (!searchValue) return;
+
+ var obj = {
+ filter: "name like '" + searchValue.value + "'",
+ pageIndex: listData.value.pageIndex,
+ pageSize: listData.value.pageSize,
+ };
+ const data = await dataQuery_selectByPage(obj);
+ debugger;
searchFLag.value = true;
};
const searchFLag = ref(false);
--
Gitblit v1.9.3