5 Commits 0169ceeb86 ... a84946827c

Author SHA1 Message Date
  xicheng79 a84946827c Merge branch 'develop' 3 years ago
  xicheng79 e5bcc8b7a6 修改了选择框风格和聚合显示bug 3 years ago
  xicheng79 77d835be21 Merge branch 'master' into develop 3 years ago
  xicheng79 3df577d7a6 1 3 years ago
  xicheng79 dbc7e5f8cb getCheckedMap 3 years ago
4 changed files with 63 additions and 7 deletions
  1. 1 0
      index.html
  2. 26 3
      src/components/LayerSelector.vue
  3. 4 4
      src/components/map.vue
  4. 32 0
      static/img/logo.svg

+ 1 - 0
index.html

@@ -13,6 +13,7 @@
     <meta name='apple-mobile-web-app-status-bar-style' content='black'>
     <meta name='apple-mobile-web-app-status-bar-style' content='black'>
     <meta name='format-detection' content='telephone=no'>
     <meta name='format-detection' content='telephone=no'>
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<link rel="icon" href="static/img/logo.svg">
     <!-- 思源字体 -->
     <!-- 思源字体 -->
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noto+Sans+SC:100,300,400,500,700,900">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Noto+Sans+SC:100,300,400,500,700,900">
     <title>成理青年</title>
     <title>成理青年</title>

+ 26 - 3
src/components/LayerSelector.vue

@@ -145,7 +145,7 @@ export default {
   position: absolute;
   position: absolute;
   font-size: 12px;
   font-size: 12px;
   z-index: 100;
   z-index: 100;
-  background: rgb(219, 236, 224);
+  background: transparent;
   /* color: rgb(115, 172,23); */
   /* color: rgb(115, 172,23); */
   opacity: 0.95;
   opacity: 0.95;
   right: 0px;
   right: 0px;
@@ -164,12 +164,35 @@ export default {
 /*设置选项样式*/
 /*设置选项样式*/
 /deep/ .el-checkbox {
 /deep/ .el-checkbox {
    left:10px;
    left:10px;
-   top:8px;
+   top:5px;
  }
  }
 
 
 /deep/ .el-checkbox__label {
 /deep/ .el-checkbox__label {
   font-family: "Source Han Sans CN";
   font-family: "Source Han Sans CN";
-  color: #212529;
+  color: #78af3f;
+}
+
+/deep/ .el-checkbox__input.is-checked+.el-checkbox__label{
+  color: #78af3f
+}
+/deep/ .el-checkbox-group{
+  background-color: rgba(255,255,255,0.5);
+}
+
+/deep/ .el-checkbox__input.is-checked .el-checkbox__inner{
+  background-color: #87BF96;
+  border-color: #87BF96;
+  border-radius: 50%
+}
+
+/deep/ .el-checkbox__inner,.el-checkbox__input{
+  border-radius: 20px!important;
+}
+/deep/ .el-checkbox__inner:hover{
+  border-color: transparent;
+}
+/deep/ .el-checkbox__input.is-focus .el-checkbox__inner{
+  border-color: transparent;
 }
 }
 
 
 </style>
 </style>

+ 4 - 4
src/components/map.vue

@@ -99,7 +99,7 @@ import more from '../assets/icon/more.svg'
 import DrawShape from '../../static/js/startDrawShape'
 import DrawShape from '../../static/js/startDrawShape'
 
 
 // card
 // card
-import phoneCard from './Card.vue'
+import phoneCard from './card.vue'
 
 
 // slogan
 // slogan
 import slogan from './slogan.vue'
 import slogan from './slogan.vue'
@@ -172,7 +172,7 @@ export default {
           image: new Icon({
           image: new Icon({
             crossOrigin: 'anonymous',
             crossOrigin: 'anonymous',
             src: more,
             src: more,
-            scale: 0.15
+            scale: 0.2
           })
           })
         }),
         }),
         LineString: new Style({
         LineString: new Style({
@@ -1042,8 +1042,8 @@ export default {
     this.initMap()
     this.initMap()
     this.initPopupOverLay()
     this.initPopupOverLay()
     this.busOnAction()
     this.busOnAction()
-    this.loadRecentReports(7)
-    this.loadRecentNotices(7)
+    this.loadRecentReports(365)
+    this.loadRecentNotices(365)
     this.loadOthers()
     this.loadOthers()
     this.loadCulture()
     this.loadCulture()
     this.openCluster()
     this.openCluster()

+ 32 - 0
static/img/logo.svg

@@ -0,0 +1,32 @@
+<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M65.4576 11.2656C37.0105 11.2656 13.9148 34.3612 13.9148 62.8084C13.9148 69.672 15.2591 76.2235 17.6988 82.2145C29.4901 102.484 10.1875 110.482 10.1875 110.482C10.1875 110.482 26.3908 124.428 45.2585 110.237C51.4625 112.885 58.2901 114.351 65.4576 114.351C93.9048 114.351 117 91.2556 117 62.8084C117 34.3612 93.9048 11.2656 65.4576 11.2656V11.2656ZM65.4576 22.7195C87.5834 22.7195 105.547 40.6826 105.547 62.8084C105.547 84.9342 87.5834 102.897 65.4576 102.897C43.3318 102.897 25.3687 84.9342 25.3687 62.8084C25.3687 40.6826 43.3318 22.7195 65.4576 22.7195V22.7195Z" fill="#FF8C42"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M66.1408 22.4219C43.6243 22.4219 25.3438 40.7024 25.3438 63.2194C25.3438 85.7359 43.6243 104.016 66.1408 104.016C88.6577 104.016 106.938 85.7359 106.938 63.2194C106.938 40.7024 88.6577 22.4219 66.1408 22.4219ZM66.1408 34.078C82.2242 34.078 95.2821 47.1359 95.2821 63.2194C95.2821 79.3023 82.2242 92.3602 66.1408 92.3602C50.0578 92.3602 36.9999 79.3023 36.9999 63.2194C36.9999 47.1359 50.0578 34.078 66.1408 34.078Z" fill="#D1FEFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M66.1409 34.0781C50.0579 34.0781 37 47.1361 37 63.2195C37 79.3024 50.0579 92.3603 66.1409 92.3603C82.2243 92.3603 95.2822 79.3024 95.2822 63.2195C95.2822 47.1361 82.2243 34.0781 66.1409 34.0781ZM66.1409 45.7348C75.7912 45.7348 83.6256 53.5691 83.6256 63.2195C83.6256 72.8693 75.7912 80.7037 66.1409 80.7037C56.491 80.7037 48.6566 72.8693 48.6566 63.2195C48.6566 53.5691 56.491 45.7348 66.1409 45.7348Z" fill="#71CEC9"/>
+<g opacity="0.9" filter="url(#filter1_d)">
+<path d="M103.62 43.9441C112.446 43.9441 119.6 36.7897 119.6 27.9642C119.6 19.1388 112.446 11.9844 103.62 11.9844C94.7951 11.9844 87.6406 19.1388 87.6406 27.9642C87.6406 36.7897 94.7951 43.9441 103.62 43.9441Z" fill="#F51A51"/>
+</g>
+<defs>
+<filter id="filter0_d" x="2.1875" y="4.26562" width="122.813" height="121.343" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="4"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.741176 0 0 0 0 0.74902 0 0 0 0 0.733333 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+<filter id="filter1_d" x="79.6406" y="6.98438" width="47.9597" height="47.9597" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="3"/>
+<feGaussianBlur stdDeviation="4"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.741176 0 0 0 0 0.74902 0 0 0 0 0.733333 0 0 0 0.9 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>