diff --git a/src/api/modules/huizhou.ts b/src/api/modules/huizhou.ts
new file mode 100644
index 0000000..1d51e82
--- /dev/null
+++ b/src/api/modules/huizhou.ts
@@ -0,0 +1,14 @@
+import { ResPage, User } from "@/api/types/common";
+// import { BASEURL } from "@/api/config/servicePort";
+import http from "@/api";
+
+const BASEURL = import.meta.env.VITE_API_URL;
+
+/**
+ * @name 惠州项目
+ */
+
+// 分析token
+export const userAnalysis = (params: any) => {
+ return http.post(BASEURL + `/xmgl/systemUser/analysis`, params);
+};
diff --git a/src/assets/images/123.gif b/src/assets/images/123.gif
new file mode 100644
index 0000000..4c05ae0
Binary files /dev/null and b/src/assets/images/123.gif differ
diff --git a/src/components/AMap/AMap.ts b/src/components/AMap/AMap.ts
index 1691c42..a1c6087 100644
--- a/src/components/AMap/AMap.ts
+++ b/src/components/AMap/AMap.ts
@@ -10,12 +10,20 @@ window._AMapSecurityConfig = {
};
const amap = (async function (Loader, AMAP_MAP_KEY) {
- return Loader.load({
+ return await Loader.load({
key: AMAP_MAP_KEY,
version: "2.0",
plugins: ["AMap.PlaceSearch", "AMap.AutoComplete", "AMap.Geocoder"]
});
})(AMapLoader, AMAP_MAP_KEY);
+// let amap = new Promise((resolve, reject) => {
+// let responseData = AMapLoader.load({
+// key: AMAP_MAP_KEY,
+// version: "2.0",
+// plugins: ["AMap.PlaceSearch", "AMap.AutoComplete", "AMap.Geocoder"]
+// });
+// resolve(responseData);
+// });
/**
* @description: 初始化 AMap，等待地图加载完成
@@ -24,6 +32,11 @@ const amap = (async function (Loader, AMAP_MAP_KEY) {
async function initAMap() {
try {
const AMap = await amap;
+ // const AMap = AMapLoader.load({
+ // key: AMAP_MAP_KEY,
+ // version: "2.0",
+ // plugins: ["AMap.PlaceSearch", "AMap.AutoComplete", "AMap.Geocoder"]
+ // });
return AMap;
} catch (err) {
console.log(err);
diff --git a/src/components/LeftMenu/leftMenu.scss b/src/components/LeftMenu/leftMenu.scss
index edf38ed..303f6a8 100644
--- a/src/components/LeftMenu/leftMenu.scss
+++ b/src/components/LeftMenu/leftMenu.scss
@@ -85,29 +85,29 @@
}
.el-pager li {
background-color: transparent;
- color: var(--el-color-primary);
- border: 1px solid var(--el-color-primary);
+ color: $primary-light-text-color;
+ border: 1px solid $primary-light-border-color;
height: 26px;
}
.el-pager li:active {
- color: var(--el-color-primary);
+ color: $primary-light-text-color;
border: none;
height: 26px;
}
.el-pager li.is-active {
- background-color: var(--el-color-primary);
- color: #fff;
+ background-color: $primary-light-bg-color;
+ color: $primary-light-text-color;
}
.el-pagination__total {
- color: var(--el-color-primary);
+ color: $primary-light-text-color;
}
.btn-prev,
.btn-next,
.btn-prev:disabled,
.btn-next:disabled {
- color: var(--el-color-primary);
+ color: $primary-light-text-color;
background-color: transparent;
- border: 1px solid var(--el-color-primary);
+ border: 1px solid $primary-light-bg-color;
height: 26px;
}
}
diff --git a/src/components/SearchForm/index.vue b/src/components/SearchForm/index.vue
index 998787c..9764b6e 100644
--- a/src/components/SearchForm/index.vue
+++ b/src/components/SearchForm/index.vue
@@ -49,7 +49,7 @@ const gridRef = ref();
width: 200px;
}
.card {
- background-color: #092945;
+ background-color: $primary-light-bg-color;
box-shadow: none;
}
// :deep(.el-form-item--default) {
diff --git a/src/components/changeTheme/index.vue b/src/components/changeTheme/index.vue
index 2fa0f80..ec4cdac 100644
--- a/src/components/changeTheme/index.vue
+++ b/src/components/changeTheme/index.vue
@@ -11,8 +11,8 @@ import { ref, reactive, nextTick, computed } from "vue";
import { useTheme } from "@/hooks/useTheme";
const { changePrimary } = useTheme();
const changePrimaryVal = (val: string) => {
- const body = document.body as HTMLElement;
- body.setAttribute("style", `filter: opacity(0.7);background-color: ${val};`);
+ // const body = document.body as HTMLElement;
+ // body.setAttribute("style", `filter: opacity(0.7);background-color: ${val};`);
// body.setAttribute("style", "filter: invert(80%)");
changePrimary(val);
};
diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts
index 77ca765..1365ba7 100644
--- a/src/routers/modules/staticRouter.ts
+++ b/src/routers/modules/staticRouter.ts
@@ -20,6 +20,14 @@ export const staticRouter: RouteRecordRaw[] = [
title: "登录"
}
},
+ {
+ path: "/load",
+ name: "load",
+ component: () => import("@/views/loading/index.vue"),
+ meta: {
+ title: "加载"
+ }
+ },
{
path: "/home",
name: "home",
diff --git a/src/styles/element.scss b/src/styles/element.scss
index 0c3bf3b..021190b 100644
--- a/src/styles/element.scss
+++ b/src/styles/element.scss
@@ -385,6 +385,14 @@
margin-right: 14%;
background: rgb(0 0 0 / 10%);
}
+.btnStyle {
+ background-color: #087ba4;
+ border-color: #087ba4;
+ color: white;
+}
+.darkStyle {
+ background-color: #087ba4;
+}
.el-table__body tr:hover > td {
// background-color: #008bff !important;
background-color: rgb(0 139 255 / 10%) !important;
diff --git a/src/styles/var.scss b/src/styles/var.scss
index 15265c7..c9ab8f3 100644
--- a/src/styles/var.scss
+++ b/src/styles/var.scss
@@ -1,2 +1,14 @@
/* 全局 css 变量 */
$primary-color: var(--el-color-primary);
+
+// light主题
+$primary-light-main-color: #087ba4;
+$primary-light-bg-color: #087ba4;
+$primary-light-border-color: #087ba4;
+$primary-light-text-color: white;
+
+// dark主题
+$primary-dark-main-color: #092945;
+$primary-dark-bg-color: #092945;
+$primary-dark-border-color: #087ba4;
+$primary-dark-text-color: #087ba4;
diff --git a/src/views/enterprise/unmannedVideo/equipList/index.vue b/src/views/enterprise/unmannedVideo/equipList/index.vue
index 1132ca9..37b2f5c 100644
--- a/src/views/enterprise/unmannedVideo/equipList/index.vue
+++ b/src/views/enterprise/unmannedVideo/equipList/index.vue
@@ -355,7 +355,7 @@ onMounted(async () => {
height: 78px !important;
}
:deep(.content) {
- height: calc(100% - 100px) !important;
+ height: calc(100% - 150px) !important;
}
.leftProject {
// padding: 5px 8px;
diff --git a/src/views/enterprise/unmannedVideo/videoData/index.scss b/src/views/enterprise/unmannedVideo/videoData/index.scss
index 1f9a556..aa1d9fe 100644
--- a/src/views/enterprise/unmannedVideo/videoData/index.scss
+++ b/src/views/enterprise/unmannedVideo/videoData/index.scss
@@ -10,7 +10,7 @@
height: 78px !important;
}
:deep(.content) {
- height: calc(100% - 100px) !important;
+ height: calc(100% - 150px) !important;
}
.leftProject {
// padding: 5px 8px;
diff --git a/src/views/goverment/huizhou/droneImaging/index.scss b/src/views/goverment/huizhou/droneImaging/index.scss
index 47dd41e..0a15b46 100644
--- a/src/views/goverment/huizhou/droneImaging/index.scss
+++ b/src/views/goverment/huizhou/droneImaging/index.scss
@@ -10,7 +10,7 @@
height: 78px !important;
}
:deep(.content) {
- height: calc(100% - 100px) !important;
+ height: calc(100% - 170px) !important;
}
.leftProject {
// padding: 5px 8px;
@@ -168,9 +168,9 @@
.btn-next,
.btn-prev:disabled,
.btn-next:disabled {
- color: var(--el-color-primary);
+ color: white;
background-color: transparent;
- border: 1px solid var(--el-color-primary);
+ border: 1px solid #087ba4;
height: 26px;
}
}
diff --git a/src/views/goverment/huizhou/droneImaging/index.vue b/src/views/goverment/huizhou/droneImaging/index.vue
index e66a775..8a4fe8c 100644
--- a/src/views/goverment/huizhou/droneImaging/index.vue
+++ b/src/views/goverment/huizhou/droneImaging/index.vue
@@ -42,8 +42,8 @@
/>
- 查询
- 刷新
+ 查询
+ 刷新
diff --git a/src/views/goverment/huizhou/smartConstructionSite/index.vue b/src/views/goverment/huizhou/smartConstructionSite/index.vue
index 1b42d5e..5b541f4 100644
--- a/src/views/goverment/huizhou/smartConstructionSite/index.vue
+++ b/src/views/goverment/huizhou/smartConstructionSite/index.vue
@@ -136,6 +136,7 @@ import initAMap from "@/components/AMap/AMap";
import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
import MapTopData from "@/components/MapTopData/index.vue";
import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
+import { setTimeout } from "timers/promises";
const router = useRouter();
const globalStore = GlobalStore();
@@ -388,12 +389,11 @@ watch(
);
onMounted(async () => {
- await mapData();
// getAIengPage();
getStatisticsList();
getproList();
await getAIproPage();
-
+ await mapData();
onSearch(records.value[0]);
// addMarker();
});
diff --git a/src/views/loading/index.vue b/src/views/loading/index.vue
new file mode 100644
index 0000000..f414af9
--- /dev/null
+++ b/src/views/loading/index.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+