diff --git a/src/assets/less/amap-item.less b/src/assets/less/amap-item.less
index 9a41844..8aa9077 100644
--- a/src/assets/less/amap-item.less
+++ b/src/assets/less/amap-item.less
@@ -62,6 +62,25 @@
}
}
+//浅色地图上info-window
+.light {
+ .alarm-content {
+ background-color: #f3f5ff;
+ color: #5876DB;
+ border: 1px solid #1b7ef2;
+
+ .close-btn {
+ background-color: #f3f5ff;
+ color: #5876DB;
+ box-shadow: -1px 1px 1px rgba(10, 10, 10, 0.2);
+ }
+
+ .close-btn:hover {
+ background: #1b7ef2;
+ }
+ }
+}
+
/*地图元素样式---end*/
/*infoWindow*/
.amap-info-content {
diff --git a/src/assets/less/index.less b/src/assets/less/index.less
index bf66493..da8cae8 100644
--- a/src/assets/less/index.less
+++ b/src/assets/less/index.less
@@ -193,3 +193,39 @@
margin-bottom: 4px;
}
+//Modal
+.dialog.light {
+ background-color: #f3f5ff;
+
+ .police-con {
+ color: #000;
+ background-color: #f3f5ff;
+ }
+
+ .ant-modal-title {
+ color: #576BAD !important;
+ background: url('/@/assets/images/dialog-light.png') no-repeat;
+ background-size: 100%;
+ }
+}
+
+.dialog.dark {
+ color: #ffffff;
+ background-color: #00152b;
+
+ .police-con {
+ color: #ffffff;
+ background-color: #00152b;
+ }
+
+ .ant-modal-title {
+ color: #ffffff !important;
+ background: url('/@/assets/images/dialog.png') no-repeat;
+ background-size: 100%;
+ }
+}
+
+/*表单*/
+:deep(.ant-form-item-label > label) {
+ color: var(--formLabel);
+}
diff --git a/src/assets/theme/theme.css b/src/assets/theme/theme.css
index c3e071e..859d5c2 100644
--- a/src/assets/theme/theme.css
+++ b/src/assets/theme/theme.css
@@ -1,5 +1,5 @@
+/*默认dark*/
:root {
-
--antSelectDropdownBg: #00152b;
--antSelectDropdownBorderColor: #1b7ef2;
--antSelectItemActive: #002e64;
@@ -8,5 +8,13 @@
/*服务详情数据*/
--typeTimeSelectColor: #45a2ff;
--typeTimeUnSelectColor: #a3a4a4;
-
+ /*表格 */
+ --tableHeadBg: rgba(35, 132, 221, 0.5);
+ --tableFontColor: #fff;
+ --tableRowBg: #00152b;
+ --tableRowBorder: #2384dd;
+ --pageItemLink: #bdc9f5;
+ --pageItemActiveBg: #0081ff;
+ /*表单*/
+ --formLabel: #1b7ef2;
}
\ No newline at end of file
diff --git a/src/assets/theme/themeList.ts b/src/assets/theme/themeList.ts
index f06c604..c0a637e 100644
--- a/src/assets/theme/themeList.ts
+++ b/src/assets/theme/themeList.ts
@@ -9,6 +9,15 @@ export const themeList = {
/*服务详情数据*/
typeTimeSelectColor: '#45a2ff',
typeTimeUnSelectColor: '#a3a4a4',
+ // 表格
+ tableHeadBg: 'rgba(35, 132, 221, 0.5)',
+ tableFontColor: '#fff',
+ tableRowBg: '#00152b',
+ tableRowBorder: '#2384dd',
+ pageItemLink: '#1f2935',
+ pageItemActiveBg: '#0081ff',
+ //form
+ formLabel: '#1b7ef2',
},
light: {
antSelectDropdownBg: '#fff',
@@ -19,6 +28,15 @@ export const themeList = {
/*服务详情数据*/
typeTimeSelectColor: '#45a2ff',
typeTimeUnSelectColor: '#a3a4a4',
+ // 表格
+ tableHeadBg: '#bdc9f5',
+ tableFontColor: '#607DDB',
+ tableRowBg: '#f3f5ff',
+ tableRowBorder: '#e1e6fa',
+ pageItemLink: '#bdc9f5',
+ pageItemActiveBg: '#7092ff',
+ //form
+ formLabel: '#7092ff',
},
};
@@ -26,5 +44,6 @@ export function setTheme(theme: string) {
const themeStyle = themeList[theme];
for (const key in themeStyle) {
document.documentElement.style.setProperty(`--${key}`, themeStyle[key]);
+ document.documentElement.className = theme;
}
}
diff --git a/src/components/body-d-right/oneR.vue b/src/components/body-d-right/oneR.vue
index 3bba603..8dbdaef 100644
--- a/src/components/body-d-right/oneR.vue
+++ b/src/components/body-d-right/oneR.vue
@@ -62,6 +62,7 @@
import { caching, useSession } from '/@/hooks/autoRefresh/caching.ts';
import { DataType } from '/@/utils/settings.ts';
import { useTheme } from '/@/hooks/theme/useTheme.ts';
+ import { message } from 'ant-design-vue';
const props = defineProps({
setting: Object,
@@ -128,6 +129,8 @@
Map.createMarker(item, () => {
handlePolice(item);
});
+ } else {
+ message.warn('暂无定位信息');
}
}
@@ -219,49 +222,49 @@
}
}
-
+
+
+
+
+
+
+
+
+
diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue
index 86cf226..2373a0f 100644
--- a/src/components/dialog/Dialog.vue
+++ b/src/components/dialog/Dialog.vue
@@ -1,6 +1,6 @@