diff --git a/src/assets/images/mapbox/Group 1000015865.png b/src/assets/images/mapbox/Group 1000015865.png new file mode 100644 index 00000000..abb2409c Binary files /dev/null and b/src/assets/images/mapbox/Group 1000015865.png differ diff --git a/src/assets/images/mapbox/Group 1000015866.png b/src/assets/images/mapbox/Group 1000015866.png new file mode 100644 index 00000000..210d8e51 Binary files /dev/null and b/src/assets/images/mapbox/Group 1000015866.png differ diff --git a/src/assets/images/mapbox/Group 31.png b/src/assets/images/mapbox/Group 31.png new file mode 100644 index 00000000..674b0146 Binary files /dev/null and b/src/assets/images/mapbox/Group 31.png differ diff --git a/src/assets/images/mapbox/Rectangle 22.png b/src/assets/images/mapbox/Rectangle 22.png new file mode 100644 index 00000000..a39d8efc Binary files /dev/null and b/src/assets/images/mapbox/Rectangle 22.png differ diff --git a/src/assets/images/mapbox/Rectangle 24.png b/src/assets/images/mapbox/Rectangle 24.png new file mode 100644 index 00000000..6a92ab77 Binary files /dev/null and b/src/assets/images/mapbox/Rectangle 24.png differ diff --git a/src/assets/images/mapbox/Rectangle 34624274.png b/src/assets/images/mapbox/Rectangle 34624274.png new file mode 100644 index 00000000..b2037209 Binary files /dev/null and b/src/assets/images/mapbox/Rectangle 34624274.png differ diff --git a/src/components/mars3d/MarsBox.vue b/src/components/mars3d/MarsBox.vue index ae7c270c..244868e1 100644 --- a/src/components/mars3d/MarsBox.vue +++ b/src/components/mars3d/MarsBox.vue @@ -41,7 +41,7 @@
边框颜色:
-
+
@@ -49,7 +49,7 @@
填充颜色:
-
+
@@ -57,7 +57,7 @@
文字颜色:
-
+
@@ -75,7 +75,7 @@
是否虚线:
- +
@@ -125,7 +125,7 @@ @click="onmapitem(item)" >{{item.name}}
-
--> +
-->
@@ -846,15 +846,20 @@ export default { position: relative; .mars-3d-deleter { - width: 296px; + width: 300px; display: flex; align-items: center; justify-content: space-between; padding: 0 15px; height: 42px; - border-left: 5px solid #52a3de; - border-bottom: 2px solid #52a3de; - background: #3c444f; + // border-left: 5px solid linear-gradient(180deg, #3170e2 0%, #52b2ee 100%); + // border-bottom: 2px solid #4faced; + background: rgba(11, 22, 51, 0.3); + background-image: url("~@/assets/images/mapbox/Group 31.png"); + background-position: center center; + background-repeat: no-repeat; + + background-size: 100% 100%; color: #ffffff; // box-sizing: border-box; @@ -870,7 +875,11 @@ export default { width: 300px; height: 420px; - background: #3c444f; + // background: #3c444f; + background-image: url("~@/assets/images/mapbox/Rectangle 24.png"); + // background-position: center center; + background-size: 100% 100%; + background-repeat: no-repeat; z-index: 1000; padding: 0 15px 15px; display: flex; @@ -886,8 +895,12 @@ export default { line-height: 45px; padding-left: 15px !important; padding-right: 15px !important; - background: #2a3653; - border: 1px solid #344c7b; + // background: #2a3653; + + // border: 1px solid #344c7b; + background-image: url("~@/assets/images/mapbox/Rectangle 22.png"); + background-size: 100% 100%; + background-repeat: no-repeat; position: absolute; left: 0; padding: 0; @@ -925,6 +938,24 @@ export default { width: 100px; } + .distinction { + // background: skyblue; + display: flex; + // align-items: flex-start; + align-items: center; + + input { + width: 140px !important; + } + + ::v-deep .el-color-picker--small .el-color-picker__trigger { + width: 23px !important; + height: 23px !important; + margin-right: 8px !important; + margin-top: 5px !important; + } + } + .mar3d-con { flex: 1; display: flex; @@ -933,7 +964,25 @@ export default { // background: skyblue; .block { - width: 200px; + width: 180px; + + ::v-deep .el-slider__runway { + background-image: url("~@/assets/images/mapbox/Rectangle 34624274.png") !important; + background-size: 100% 100%; + background-repeat: no-repeat; + + .el-slider__bar { + background: transparent !important; + } + + .el-slider__button { + // background: yellow !important; + background-image: url("~@/assets/images/mapbox/Group 1000015866.png") !important; + background-size: 100% 100%; + background-repeat: no-repeat; + border: 0px !important; + } + } } } } @@ -949,7 +998,7 @@ export default { top: 30px; left: 20px; - background: skyblue; + // background: skyblue; display: flex; flex-direction: column; @@ -957,9 +1006,10 @@ export default { // background: red !important; input { - border: 1px solid #516182; - background: #4a5261 !important; - color: #ffffff; + border: 1px solid #3e62a6; + background: #778098; + + color: #fff; } i { @@ -979,8 +1029,10 @@ export default { .sea-list { width: 100%; flex: 1; - background: #434447 !important; - border: 1px solid rgba(66, 70, 78 / 0.1); + background-image: url("~@/assets/images/mapbox/Rectangle 24.png"); + // background-position: center center; + background-size: 100% 100%; + background-repeat: no-repeat; box-sizing: border-box; color: #ffffff; diff --git a/src/components/mars3d/MarsBoxarea.vue b/src/components/mars3d/MarsBoxarea.vue index 5506f2e3..c3a4f230 100644 --- a/src/components/mars3d/MarsBoxarea.vue +++ b/src/components/mars3d/MarsBoxarea.vue @@ -2,7 +2,17 @@
-
+ +
+ {{ !latlntswtich ? '绘制面' : '获取经纬度'}} + +
+ +
多边形面 @@ -22,14 +32,14 @@
区域名称:
-
+
边框颜色:
-
+
@@ -37,7 +47,7 @@
填充颜色:
-
+
@@ -45,7 +55,7 @@
文字颜色:
-
+
@@ -63,7 +73,7 @@
是否虚线:
- +
@@ -74,12 +84,7 @@
-
-
- 经纬度数据 - -
- +
当前经度:
@@ -699,14 +704,49 @@ export default { .mars3d-com { position: relative; - .mars3d-box { + .mars-3d-deleter { + width: 300px; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 15px; + height: 42px; + // border-left: 5px solid linear-gradient(180deg, #3170e2 0%, #52b2ee 100%); + // border-bottom: 2px solid #4faced; + background: rgba(11, 22, 51, 0.3); + background-image: url("~@/assets/images/mapbox/Group 31.png"); + background-position: center center; + background-repeat: no-repeat; + + background-size: 100% 100%; + color: #ffffff; + // box-sizing: border-box; + position: absolute; right: 50px; - top: 50px; + top: 20px; + } + + .mars3d-jinwei { + height: 220px !important; + } + + .mars3djinwie-box { + height: 220px !important; + } + + .mars3d-box, + .mars3djinwie-box { + position: absolute; + right: 50px; + top: 70px; width: 300px; height: 420px; - background: #3c444f; + background-image: url("~@/assets/images/mapbox/Rectangle 24.png"); + // background-position: center center; + background-size: 100% 100%; + background-repeat: no-repeat; z-index: 1000; padding: 0 15px 15px; display: flex; @@ -722,7 +762,9 @@ export default { line-height: 45px; padding-left: 15px !important; padding-right: 15px !important; - background: #2a3653; + background-image: url("~@/assets/images/mapbox/Rectangle 22.png"); + background-size: 100% 100%; + background-repeat: no-repeat; border: 1px solid #344c7b; position: absolute; left: 0; @@ -761,13 +803,49 @@ export default { width: 100px; } + .distinction { + // background: skyblue; + display: flex; + // align-items: flex-start; + align-items: center; + + input { + width: 140px !important; + } + + ::v-deep .el-color-picker--small .el-color-picker__trigger { + width: 23px !important; + height: 23px !important; + margin-right: 8px !important; + margin-top: 5px !important; + } + } + .mar3d-con { flex: 1; display: flex; align-items: center; .block { - width: 200px; + width: 180px; + + ::v-deep .el-slider__runway { + background-image: url("~@/assets/images/mapbox/Rectangle 34624274.png") !important; + background-size: 100% 100%; + background-repeat: no-repeat; + + .el-slider__bar { + background: transparent !important; + } + + .el-slider__button { + // background: yellow !important; + background-image: url("~@/assets/images/mapbox/Group 1000015866.png") !important; + background-size: 100% 100%; + background-repeat: no-repeat; + border: 0px !important; + } + } } } } diff --git a/src/views/projectFront/quality/businessModule/checkPointer.vue b/src/views/projectFront/quality/businessModule/checkPointer.vue index 61a87c0e..727fa957 100644 --- a/src/views/projectFront/quality/businessModule/checkPointer.vue +++ b/src/views/projectFront/quality/businessModule/checkPointer.vue @@ -443,12 +443,13 @@ - - -
- -
-
+
+ +
+ +
+
+