diff --git a/src/assets/images/dialog-light.png b/src/assets/images/dialog-light.png
new file mode 100644
index 0000000..530b268
Binary files /dev/null and b/src/assets/images/dialog-light.png differ
diff --git a/src/assets/less/amap-item.less b/src/assets/less/amap-item.less
index 8aa9077..4d53d95 100644
--- a/src/assets/less/amap-item.less
+++ b/src/assets/less/amap-item.less
@@ -1,98 +1,98 @@
//高德信息弹窗
.amap-info-contentContainer {
- .amap-content-body {
- background: #00152B;
- border: 1px solid #129BFF;
-
- .amap-lib-infowindow {
- background: #00152B;
-
- .amap-lib-infowindow-title {
- color: #fff;
- border-bottom: 1px solid #129BFF;
- padding: 4px 0;
- }
-
- .amap-lib-infowindow-content {
- color: #fff;
- padding: 4px 0;
- }
- }
- }
-
- .amap-combo-close {
- top: 5px;
- right: 7px;
- }
+ .amap-content-body {
+ background: var(--alarmContentBg);
+ border: 1px solid var(--alarmBorder);
+
+ .amap-lib-infowindow {
+ background: var(--alarmContentBg);
+
+ .amap-lib-infowindow-title {
+ color: var(--antSelectFontColor);
+ border-bottom: 1px solid var(--alarmBorder);
+ padding: 4px 0;
+ }
+
+ .amap-lib-infowindow-content {
+ color: var(--antSelectFontColor);
+ padding: 4px 0;
+ }
+ }
+ }
+
+ .amap-combo-close {
+ top: 5px;
+ right: 7px;
+ }
}
/*地图元素样式---start*/
//marker
.amap-marker-label {
- padding: 0;
- border: none;
+ padding: 0;
+ border: none;
}
.alarm-content {
- background-color: #263d5e;
- color: #fff;
- border: 1px solid #1b7ef2;
- font-size: 14px;
- padding: 7px 10px;
- position: relative;
-
- .close-btn {
- color: #fff;
- background: #ccc;
- box-shadow: -1px 1px 1px rgba(10, 10, 10, 0.2);
- position: absolute;
- top: -6px;
- right: -8px;
- width: 15px;
- height: 15px;
- font-size: 12px;
- border-radius: 50%;
- text-align: center;
- line-height: 15px;
- }
-
- .close-btn:hover {
- background: #666;
- }
+ background-color: #263d5e;
+ color: #fff;
+ border: 1px solid #1b7ef2;
+ font-size: 14px;
+ padding: 7px 10px;
+ position: relative;
+
+ .close-btn {
+ color: #fff;
+ background: #ccc;
+ box-shadow: -1px 1px 1px rgba(10, 10, 10, 0.2);
+ position: absolute;
+ top: -6px;
+ right: -8px;
+ width: 15px;
+ height: 15px;
+ font-size: 12px;
+ border-radius: 50%;
+ text-align: center;
+ line-height: 15px;
+ }
+
+ .close-btn:hover {
+ background: #666;
+ }
}
//浅色地图上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;
- }
- }
+ .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 {
- width: 100%;
- height: 100%;
- background: url("../images/info-modal.png") no-repeat center;
- background-size: 100% 100%;
- //padding: 16px 18px 22px 10px;
+ width: 100%;
+ height: 100%;
+ background: url("../images/info-modal.png") no-repeat center;
+ background-size: 100% 100%;
+ //padding: 16px 18px 22px 10px;
}
.amap-info-contentContainer {
- .amap-info-sharp {
- border-top: none;
- }
+ .amap-info-sharp {
+ border-top: none;
+ }
}
diff --git a/src/assets/less/index.less b/src/assets/less/index.less
index da8cae8..acfe624 100644
--- a/src/assets/less/index.less
+++ b/src/assets/less/index.less
@@ -2,6 +2,11 @@
@import "./themeType";
@import "./public-title";
+html, body, #app {
+ min-width: 1300px;
+ overflow-x: auto;
+}
+
.type-time {
padding-top: 3%;
font-size: 16px;
@@ -132,8 +137,7 @@
}
// 选中字体颜色
-.ant-select-selection-item {
- //color: #1b7ef2 !important;
+:deep(.ant-select-selection-item) {
color: var(--antSelectFontColor);
}
@@ -198,14 +202,14 @@
background-color: #f3f5ff;
.police-con {
- color: #000;
+ color: var(--tableFontColor);
background-color: #f3f5ff;
}
.ant-modal-title {
color: #576BAD !important;
background: url('/@/assets/images/dialog-light.png') no-repeat;
- background-size: 100%;
+ background-size: 100% 100%;
}
}
@@ -221,7 +225,7 @@
.ant-modal-title {
color: #ffffff !important;
background: url('/@/assets/images/dialog.png') no-repeat;
- background-size: 100%;
+ background-size: 100% 100%;
}
}
diff --git a/src/assets/less/public-title.less b/src/assets/less/public-title.less
index b115efb..e30388a 100644
--- a/src/assets/less/public-title.less
+++ b/src/assets/less/public-title.less
@@ -1,96 +1,118 @@
.public-title.dark {
- background: linear-gradient(90deg, rgba(106, 112, 124, 0.4) 0%, rgba(106, 112, 124, 0) 70%, rgba(106, 112, 124, 0) 100%);
- opacity: 1;
- border-top: 1px solid #6a707c;
- border-bottom: 1px solid #6a707c;
- border-image: linear-gradient(
- 90deg,
- rgba(217.0000022649765, 231.00000143051147, 255, 0.5),
- rgba(217.0000022649765, 231.00000143051147, 255, 0)
- )
- 1 1;
- color: #ffffff;
+ background: linear-gradient(90deg, rgba(106, 112, 124, 0.4) 0%, rgba(106, 112, 124, 0) 70%, rgba(106, 112, 124, 0) 100%);
+ opacity: 1;
+ border-top: 1px solid #6a707c;
+ border-bottom: 1px solid #6a707c;
+ border-image: linear-gradient(90deg,
+ rgba(217.0000022649765, 231.00000143051147, 255, 0.5),
+ rgba(217.0000022649765, 231.00000143051147, 255, 0)) 1 1;
+ color: #ffffff;
- &:before {
- position: absolute;
- content: '';
- width: 7px;
- height: 100%;
- top: 0;
- left: 0;
- background-color: #45a2ff;
- }
+ &:before {
+ position: absolute;
+ content: '';
+ width: 7px;
+ height: 100%;
+ top: 0;
+ left: 0;
+ background-color: #45a2ff;
+ }
- .tips {
- font-size: 16px;
- padding-right: 10px;
- font-weight: normal;
- }
+ .tips {
+ font-size: 16px;
+ padding-right: 10px;
+ font-weight: normal;
+ }
}
+
.public-title.light {
- background: url("/@/assets/images/title-background.png") no-repeat;
- background-size: 100% 100%;
- color: #576BAD;
+ background: url("/@/assets/images/title-background.png") no-repeat;
+ background-size: 100% 100%;
+ color: #576BAD;
}
.server-item.light {
- color: #607DDB;
+ color: #607DDB;
}
+
.server-item.dark {
- &:nth-child(odd) {
- background-color: #0a0a0c;
- }
+ &:nth-child(odd) {
+ background-color: #0a0a0c;
+ }
}
-.right-top-item.light{
- >span:nth-child(1) {
- color: #607DDB;
- }
- >span:nth-child(2) {
- color: #F58584;
- }
- >div {
- color: #607DDB;
- }
+.right-top-item.light {
+ .fixed-width {
+ display: inline-flex;
+ width: 100px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
- .terminal-icon {
- background: url('/@/assets/images/terminalNew.png') no-repeat;
- }
+ //名字和类型宽度100
+ > span:nth-child(1) {
+ color: #607DDB;
+ width: 100px;
+ }
- .position {
- background: url('/@/assets/images/positionNew.png') no-repeat;
- }
+ > span:nth-child(2) {
+ color: #F58584;
+ width: 100px;
+ }
+
+ > div {
+ color: #607DDB;
+ }
+
+ .terminal-icon {
+ background: url('/@/assets/images/terminalNew.png') no-repeat;
+ }
+
+ .position {
+ background: url('/@/assets/images/positionNew.png') no-repeat;
+ }
}
+
.right-top-item.dark {
- .fixed-width {
- display: inline-flex;
- width: 100px;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
- }
+ .fixed-width {
+ display: inline-flex;
+ width: 100px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
- span {
- color: #ffffff;
- font-size: 16px;
- }
+ > span:nth-child(1) {
+ width: 100px;
+ }
- .terminal-icon {
- background: url('/@/assets/images/terminal.png') no-repeat;
- }
+ > span:nth-child(2) {
+ width: 100px;
+ }
- .position {
- background: url('/@/assets/img/position.png') no-repeat;
- }
-}
-
-.outer-title.light{
- color: #576BAD;
- background: url('/@/assets/images/top-title-new.png') no-repeat;
-}
-.outer-title.dark{
+ span {
color: #ffffff;
- background: url('/@/assets/images/top-title.png') no-repeat;
+ font-size: 16px;
+ }
+
+ .terminal-icon {
+ background: url('/@/assets/images/terminal.png') no-repeat;
+ }
+
+ .position {
+ background: url('/@/assets/img/position.png') no-repeat;
+ }
+}
+
+.outer-title.light {
+ color: #576BAD;
+ background: url('/@/assets/images/top-title-new.png') no-repeat;
+}
+
+.outer-title.dark {
+ color: #ffffff;
+ background: url('/@/assets/images/top-title.png') no-repeat;
}
\ No newline at end of file
diff --git a/src/assets/loginmini/style/base.less b/src/assets/loginmini/style/base.less
index 22cbffe..80c8097 100644
--- a/src/assets/loginmini/style/base.less
+++ b/src/assets/loginmini/style/base.less
@@ -1,49 +1,49 @@
::-webkit-input-placeholder {
- /* WebKit browsers */
- color: #868686;
- font-size: 15px;
+ /* WebKit browsers */
+ color: #868686;
+ font-size: 15px;
}
::-moz-placeholder {
- /* Mozilla Firefox 19+ */
- color: #868686;
- font-size: 15px;
+ /* Mozilla Firefox 19+ */
+ color: #868686;
+ font-size: 15px;
}
:-ms-input-placeholder {
- /* Internet Explorer 10+ */
- color: #868686;
- font-size: 15px;
+ /* Internet Explorer 10+ */
+ color: #868686;
+ font-size: 15px;
}
input:-webkit-autofill {
- transition: background-color 5000s ease-in-out 0s;
+ transition: background-color 5000s ease-in-out 0s;
}
html {
- scroll-behavior: smooth;
+ scroll-behavior: smooth;
}
html,
body {
- color: #333;
- margin: 0;
- height: 100%;
- font-family: 'Myriad Set Pro', 'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- font-weight: normal;
+ color: #333;
+ margin: 0;
+ height: 100%;
+ font-family: 'Myriad Set Pro', 'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ font-weight: normal;
}
* {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
}
a {
- text-decoration: none;
- color: #000;
+ text-decoration: none;
+ color: #000;
}
a,
@@ -51,19 +51,19 @@ label,
button,
input,
select {
- -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
img {
- max-width: 100%;
- height: auto;
- display: block;
- border: 0;
+ max-width: 100%;
+ height: auto;
+ display: block;
+ border: 0;
}
body {
- background: #e3f0ff;
- color: #666;
+ background: #e3f0ff;
+ color: #666;
}
html,
@@ -92,17 +92,17 @@ legend,
textarea,
th,
td {
- margin: 0;
- padding: 0;
+ margin: 0;
+ padding: 0;
}
a {
- text-decoration: none;
- color: #08acee;
+ text-decoration: none;
+ color: #08acee;
}
button {
- outline: 0;
+ outline: 0;
}
button,
@@ -110,256 +110,256 @@ input,
optgroup,
select,
textarea {
- margin: 0;
- font: inherit;
- color: inherit;
- outline: none;
+ margin: 0;
+ font: inherit;
+ color: inherit;
+ outline: none;
}
li {
- list-style: none;
+ list-style: none;
}
a {
- color: #666;
+ color: #666;
}
.clearfix::after {
- clear: both;
- content: '.';
- display: block;
- height: 0;
- visibility: hidden;
+ clear: both;
+ content: '.';
+ display: block;
+ height: 0;
+ visibility: hidden;
}
.clearfix {
}
.divHeight {
- width: 100%;
- height: 10px;
- background: #f5f5f5;
- position: relative;
- overflow: hidden;
+ width: 100%;
+ height: 10px;
+ background: #f5f5f5;
+ position: relative;
+ overflow: hidden;
}
.r-line {
- position: relative;
+ position: relative;
}
.r-line:after {
- content: '';
- position: absolute;
- z-index: 0;
- top: 0;
- right: 0;
- height: 100%;
- border-right: 1px solid #d9d9d9;
- -webkit-transform: scaleX(0.5);
- transform: scaleX(0.5);
- -webkit-transform-origin: 100% 0;
- transform-origin: 100% 0;
+ content: '';
+ position: absolute;
+ z-index: 0;
+ top: 0;
+ right: 0;
+ height: 100%;
+ border-right: 1px solid #d9d9d9;
+ -webkit-transform: scaleX(0.5);
+ transform: scaleX(0.5);
+ -webkit-transform-origin: 100% 0;
+ transform-origin: 100% 0;
}
.b-line {
- position: relative;
+ position: relative;
}
.b-line:after {
- content: '';
- position: absolute;
- z-index: 2;
- bottom: 0;
- left: 0;
- width: 100%;
- height: 1px;
- border-bottom: 1px solid #dedede;
- -webkit-transform: scaleY(0.5);
- transform: scaleY(0.5);
- -webkit-transform-origin: 0 100%;
- transform-origin: 0 100%;
+ content: '';
+ position: absolute;
+ z-index: 2;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ height: 1px;
+ border-bottom: 1px solid #dedede;
+ -webkit-transform: scaleY(0.5);
+ transform: scaleY(0.5);
+ -webkit-transform-origin: 0 100%;
+ transform-origin: 0 100%;
}
.aui-arrow {
- position: relative;
- padding-right: 0.8rem;
+ position: relative;
+ padding-right: 0.8rem;
}
.aui-arrow span {
- font-size: 0.8rem;
- color: #9b9b9b;
+ font-size: 0.8rem;
+ color: #9b9b9b;
}
.aui-arrow:after {
- content: ' ';
- display: inline-block;
- height: 6px;
- width: 6px;
- border-width: 2px 2px 0 0;
- border-color: #848484;
- border-style: solid;
- -webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
- transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
- position: relative;
- position: absolute;
- top: 50%;
- margin-top: -4px;
- right: 2px;
- border-radius: 1px;
+ content: ' ';
+ display: inline-block;
+ height: 6px;
+ width: 6px;
+ border-width: 2px 2px 0 0;
+ border-color: #848484;
+ border-style: solid;
+ -webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+ transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+ position: relative;
+ position: absolute;
+ top: 50%;
+ margin-top: -4px;
+ right: 2px;
+ border-radius: 1px;
}
.aui-flex {
- display: -webkit-box;
- display: -webkit-flex;
- display: flex;
- -webkit-box-align: center;
- -webkit-align-items: center;
- align-items: center;
- position: relative;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ -webkit-box-align: center;
+ -webkit-align-items: center;
+ align-items: center;
+ position: relative;
}
.aui-flex-box {
- -webkit-box-flex: 1;
- -webkit-flex: 1;
- flex: 1;
- min-width: 0;
- font-size: 14px;
- color: #333;
+ -webkit-box-flex: 1;
+ -webkit-flex: 1;
+ flex: 1;
+ min-width: 0;
+ font-size: 14px;
+ color: #333;
}
/* 必要布局样式css */
.aui-flexView {
- width: 100%;
- height: 100%;
- margin: 0 auto;
- display: -webkit-box;
- display: -webkit-flex;
- display: -ms-flexbox;
- display: flex;
- -webkit-box-orient: vertical;
- -webkit-box-direction: normal;
- -webkit-flex-direction: column;
- -ms-flex-direction: column;
- flex-direction: column;
+ width: 100%;
+ height: 100%;
+ margin: 0 auto;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-orient: vertical;
+ -webkit-box-direction: normal;
+ -webkit-flex-direction: column;
+ -ms-flex-direction: column;
+ flex-direction: column;
}
.aui-scrollView {
- width: 100%;
- height: 100%;
- -webkit-box-flex: 1;
- -webkit-flex: 1;
- -ms-flex: 1;
- flex: 1;
- overflow-y: auto;
- overflow-x: hidden;
- -webkit-overflow-scrolling: touch;
- position: relative;
- padding-bottom: 53px;
+ width: 100%;
+ height: 100%;
+ -webkit-box-flex: 1;
+ -webkit-flex: 1;
+ -ms-flex: 1;
+ flex: 1;
+ overflow-y: auto;
+ overflow-x: hidden;
+ -webkit-overflow-scrolling: touch;
+ position: relative;
+ padding-bottom: 53px;
}
.aui-navBar {
- height: 44px;
- position: relative;
- display: -webkit-box;
- display: -webkit-flex;
- display: -ms-flexbox;
- display: flex;
- z-index: 102;
- background-color: #5064eb;
+ height: 44px;
+ position: relative;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -ms-flexbox;
+ display: flex;
+ z-index: 102;
+ background-color: #5064eb;
}
.aui-navBar-item {
- height: 44px;
- min-width: 15%;
- -webkit-box-flex: 0;
- -webkit-flex: 0 0 15%;
- -ms-flex: 0 0 15%;
- flex: 0 0 15%;
- padding: 0 0.9rem;
- display: -webkit-box;
- display: -webkit-flex;
- display: -ms-flexbox;
- display: flex;
- -webkit-box-align: center;
- -webkit-align-items: center;
- -ms-flex-align: center;
- align-items: center;
- font-size: 0.7rem;
- white-space: nowrap;
- overflow: hidden;
- color: #808080;
- position: relative;
+ height: 44px;
+ min-width: 15%;
+ -webkit-box-flex: 0;
+ -webkit-flex: 0 0 15%;
+ -ms-flex: 0 0 15%;
+ flex: 0 0 15%;
+ padding: 0 0.9rem;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-align: center;
+ -webkit-align-items: center;
+ -ms-flex-align: center;
+ align-items: center;
+ font-size: 0.7rem;
+ white-space: nowrap;
+ overflow: hidden;
+ color: #808080;
+ position: relative;
}
.aui-navBar-item:first-child {
- -webkit-box-ordinal-group: 2;
- -webkit-order: 1;
- -ms-flex-order: 1;
- order: 1;
- margin-right: -25%;
- font-size: 0.9rem;
- font-weight: bold;
+ -webkit-box-ordinal-group: 2;
+ -webkit-order: 1;
+ -ms-flex-order: 1;
+ order: 1;
+ margin-right: -25%;
+ font-size: 0.9rem;
+ font-weight: bold;
}
.aui-navBar-item:last-child {
- -webkit-box-ordinal-group: 4;
- -webkit-order: 3;
- -ms-flex-order: 3;
- order: 3;
- -webkit-box-pack: end;
- -webkit-justify-content: flex-end;
- -ms-flex-pack: end;
- justify-content: flex-end;
+ -webkit-box-ordinal-group: 4;
+ -webkit-order: 3;
+ -ms-flex-order: 3;
+ order: 3;
+ -webkit-box-pack: end;
+ -webkit-justify-content: flex-end;
+ -ms-flex-pack: end;
+ justify-content: flex-end;
}
.aui-center {
- -webkit-box-ordinal-group: 3;
- -webkit-order: 2;
- -ms-flex-order: 2;
- order: 2;
- display: -webkit-box;
- display: -webkit-flex;
- display: -ms-flexbox;
- display: flex;
- -webkit-box-pack: center;
- -webkit-justify-content: center;
- -ms-flex-pack: center;
- justify-content: center;
- -webkit-box-align: center;
- -webkit-align-items: center;
- -ms-flex-align: center;
- align-items: center;
- height: 44px;
- width: 80%;
- margin-left: 22%;
+ -webkit-box-ordinal-group: 3;
+ -webkit-order: 2;
+ -ms-flex-order: 2;
+ order: 2;
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-pack: center;
+ -webkit-justify-content: center;
+ -ms-flex-pack: center;
+ justify-content: center;
+ -webkit-box-align: center;
+ -webkit-align-items: center;
+ -ms-flex-align: center;
+ align-items: center;
+ height: 44px;
+ width: 80%;
+ margin-left: 22%;
}
.aui-center-title {
- text-align: center;
- width: 100%;
- white-space: nowrap;
- overflow: hidden;
- display: block;
- text-overflow: ellipsis;
- font-size: 0.95rem;
- color: #fff;
- font-weight: 500;
+ text-align: center;
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ display: block;
+ text-overflow: ellipsis;
+ font-size: 0.95rem;
+ color: #fff;
+ font-weight: 500;
}
.icon {
- width: 20px;
- height: 20px;
- display: block;
- border: none;
- float: left;
- background-size: 20px;
- background-repeat: no-repeat;
- position: relative;
+ width: 20px;
+ height: 20px;
+ display: block;
+ border: none;
+ float: left;
+ background-size: 20px;
+ background-repeat: no-repeat;
+ position: relative;
}
.login-background-img {
- //background-image: url(../icon/jeecg_bg.png);
- //background-size: cover;
- //background-position: top center;
- //background-repeat: no-repeat;
+ //background-image: url(../icon/jeecg_bg.png);
+ //background-size: cover;
+ //background-position: top center;
+ //background-repeat: no-repeat;
}
diff --git a/src/assets/theme/theme.css b/src/assets/theme/theme.css
index 859d5c2..aeffd2a 100644
--- a/src/assets/theme/theme.css
+++ b/src/assets/theme/theme.css
@@ -17,4 +17,7 @@
--pageItemActiveBg: #0081ff;
/*表单*/
--formLabel: #1b7ef2;
+ /*地图弹窗*/
+ --alarmContentBg: #00152B;
+ --alarmBorder: #1b7ef2;
}
\ No newline at end of file
diff --git a/src/assets/theme/themeList.ts b/src/assets/theme/themeList.ts
index c0a637e..2ae55cc 100644
--- a/src/assets/theme/themeList.ts
+++ b/src/assets/theme/themeList.ts
@@ -18,6 +18,9 @@ export const themeList = {
pageItemActiveBg: '#0081ff',
//form
formLabel: '#1b7ef2',
+ //地图弹窗
+ alarmContentBg: '#00152B',
+ alarmBorder: '#1b7ef2',
},
light: {
antSelectDropdownBg: '#fff',
@@ -37,6 +40,9 @@ export const themeList = {
pageItemActiveBg: '#7092ff',
//form
formLabel: '#7092ff',
+ //地图弹窗
+ alarmContentBg: '#ced7f6',
+ alarmBorder: '#1b7ef2',
},
};
diff --git a/src/components/body-d-left/threeL.vue b/src/components/body-d-left/threeL.vue
index 4c9424b..885639b 100644
--- a/src/components/body-d-left/threeL.vue
+++ b/src/components/body-d-left/threeL.vue
@@ -13,7 +13,7 @@
@@ -78,8 +78,10 @@
everyEmpty && initChart();
}
+ const radarChartsRef = ref();
+
function initChart() {
- const myChart = echarts.init(document.querySelector('.RadarCharts'));
+ const myChart = echarts.init(radarChartsRef.value);
let countList = radarList?.value.map((item) => item?.userCount);
if (countList.length < 1) return;
let max = Math.max(...countList);
@@ -105,7 +107,6 @@
.physical-container {
width: 96%;
height: calc(100% - 35px);
- //padding-top: 6%;
display: flex;
flex-wrap: wrap;
align-content: space-around;
diff --git a/src/components/body-d-right/bodyRightHooks.ts b/src/components/body-d-right/bodyRightHooks.ts
index 889cb25..17d0730 100644
--- a/src/components/body-d-right/bodyRightHooks.ts
+++ b/src/components/body-d-right/bodyRightHooks.ts
@@ -133,9 +133,9 @@ const ringTheme = {
backgroundColor: 'rgba(50,50,50,0.7)',
tooltip: {
textStyle: {
- color: '#fff',
+ color: '#768ddb',
},
- backgroundColor: '#607DDB',
+ backgroundColor: '#d5dcf8',
borderColor: '#1b7ef2',
},
legend: {
@@ -144,7 +144,7 @@ const ringTheme = {
},
},
seriesLabel: {
- color: '#27386E',
+ color: '#fff',
},
},
};
@@ -196,7 +196,7 @@ export function ringOption(chartData, total, theme) {
series: [
{
type: 'pie',
- radius: ['50%', '74%'],
+ radius: ['50%', '80%'],
center: ['50%', '47%'],
avoidLabelOverlap: false,
label: {
diff --git a/src/components/body-d-right/oneR.vue b/src/components/body-d-right/oneR.vue
index 8dbdaef..033be67 100644
--- a/src/components/body-d-right/oneR.vue
+++ b/src/components/body-d-right/oneR.vue
@@ -130,7 +130,7 @@
handlePolice(item);
});
} else {
- message.warn('暂无定位信息');
+ message.warn('暂无经纬度信息！');
}
}
diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue
index 2373a0f..98aaf69 100644
--- a/src/components/dialog/Dialog.vue
+++ b/src/components/dialog/Dialog.vue
@@ -44,6 +44,7 @@
display: flex;
align-items: center;
width: 100%;
+ min-height: 40px;
height: 40px;
background-size: 100% 100%;
color: #ffffff !important;
diff --git a/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.less b/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.less
index 160c92d..05db4f4 100644
--- a/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.less
+++ b/src/components/secondaryScreen/secondMap/components/userInfoModal/userInfoModal.less
@@ -1,57 +1,56 @@
.user-info-modal {
- background-color: #00152b;
- border: 1px solid #129bff;
- padding: 14px;
- position: relative;
-
- .line {
- position: absolute;
- top: 7%;
- bottom: 5%;
- left: 20%;
- border-right: 1px solid #129bff;
- }
-
- .fff {
- color: #fff;
- }
-
- .ant-tabs {
- color: #fff;
- }
+ background-color: #00152b;
+ padding: 14px;
+ position: relative;
+
+ .line {
+ position: absolute;
+ top: 7%;
+ bottom: 5%;
+ left: 20%;
+ border-right: 1px solid #129bff;
+ }
+
+ .fff {
+ color: #fff;
+ }
+
+ .ant-tabs {
+ color: #fff;
+ }
}
.fff {
- color: #fff;
+ color: #fff;
}
:deep(.ant-radio-button-checked) {
- background-color: #1B7EF2 !important;
- border-color: #1B7EF2 !important;
+ background-color: #1B7EF2 !important;
+ border-color: #1B7EF2 !important;
}
:deep(.ant-radio-button-wrapper-checked) {
- border-color: #1B7EF2 !important;
+ border-color: #1B7EF2 !important;
}
:deep(.ant-radio-button-wrapper) {
- background-color: #d8dce5 !important;
- border-color: #d8dce5 !important;
+ background-color: #d8dce5 !important;
+ border-color: #d8dce5 !important;
}
:deep(.item-three :nth-child(n)) {
- color: #ffffff !important;
+ color: #ffffff !important;
}
:deep(.item-picker span) {
- color: #ffffff;
+ color: #ffffff;
}
:deep(.right-d) {
- border-color: #1890ff !important;
+ border-color: #1890ff !important;
}
:deep(.ant-radio-button-wrapper:focus-within) {
-
- box-shadow: none !important;
+
+ box-shadow: none !important;
}
\ No newline at end of file
diff --git a/src/components/xianMap/xianMap.vue b/src/components/xianMap/xianMap.vue
index f50005e..939993c 100644
--- a/src/components/xianMap/xianMap.vue
+++ b/src/components/xianMap/xianMap.vue
@@ -573,8 +573,7 @@
gap: 20px;
.count-item {
- //src/assets/images/footer-num.png
- width: 340px;
+ padding: 0 100px;
height: 80px;
display: flex;
flex-direction: column;
diff --git a/src/main.ts b/src/main.ts
index db31b04..70f016e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -6,7 +6,7 @@ import router from './router';
import('ant-design-vue/dist/antd.less');
import registerGlobComp from './assets/ts/antd.ts';
import directiveMethods from './assets/ts/directive';
-import { setupStore } from './store/index.ts';
+import { setupStore } from '/@/store';
const app = createApp(App);
// 注册自定义事件
diff --git a/src/views/components/phoneDialog/phoneDialog.vue b/src/views/components/phoneDialog/phoneDialog.vue
index 68bf17f..40870b5 100644
--- a/src/views/components/phoneDialog/phoneDialog.vue
+++ b/src/views/components/phoneDialog/phoneDialog.vue
@@ -1,5 +1,5 @@
-