Merge remote-tracking branch 'origin/master'

ioc_frontweb/images/gr.svg

+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="7" cy="7" r="7" fill="url(#paint0_radial_113_233)"/>
+<circle cx="7" cy="7" r="6.85" stroke="#DFB73E" stroke-width="0.3"/>
+<defs>
+<radialGradient id="paint0_radial_113_233" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(7 7) rotate(90) scale(7)">
+<stop stop-color="#DFB73E"/>
+<stop offset="1" stop-color="#DFB73E" stop-opacity="0"/>
+</radialGradient>
+</defs>
+</svg>

ioc_frontweb/js/map.js

@@ -11,15 +11,15 @@ var MTOOL;
 
 // function renderMap() {
 // 渲染地图
-district.search('河北省', function (status, result) {
+district.search('赞皇', function (status, result) {
   var bounds = result.districtList[0].boundaries;
-  var mask = [];
-  for (var i = 0; i < bounds.length; i += 1) {
-    mask.push([bounds[i]]);
-  }
+  // var mask = [];
+  // for (var i = 0; i < bounds.length; i += 1) {
+  //   mask.push([bounds[i]]);
+  // }
   var defaultCenter = [114.72995, 38.37417];
   map = new AMap.Map('container', {
-    mask: mask,
+    // mask: mask,
     center: defaultCenter,
     // resizeEnable: true,
     disableSocket: true,
@@ -64,7 +64,7 @@ district.search('河北省', function (status, result) {
       path: bounds[i],
       strokeColor: '#3edfe1',
       strokeWeight: 5,
-	  strokeOpacity: 7,
+	    strokeOpacity: 7,
       map: map,
     });
   }
@@ -81,7 +81,7 @@ district.search('河北省', function (status, result) {
     //     // })
     //   }),
     // );
-	map.addControl(new AMap.MapType({defaultType: 1 ,showroad: true }));
+	map.addControl(new AMap.MapType({defaultType: 0 ,showroad: true }));
     map.addControl(new AMap.Scale({ visible: true }));
     map.addControl(new AMap.ToolBar({ position: 'LT', ruler: false, direction: false }));
   });
@@ -607,7 +607,7 @@ function removeMaker(category) {
   } else {
     for (var i in marker) {
       map.remove(marker[i]);
-      $('#legend').find('li').removeClass('selected');
+      // $('#legend').find('li').removeClass('selected');
     }
   }
 }

ioc_frontweb/weather.html

@@ -157,8 +157,8 @@
           key: '61b7aa520cb34e62a9eee4644a689fcf',
         },
       };
-	   setInterval("document.getElementById('itemone').innerHTML=new Date().toLocaleString();",1000);
-	   document.getElementById("itemtwo").innerHTML = "星期"+"日一二三四五六".charAt(new Date().getDay());
+	//    setInterval("document.getElementById('itemone').innerHTML=new Date().toLocaleString();",1000);
+	//    document.getElementById("itemtwo").innerHTML = "星期"+"日一二三四五六".charAt(new Date().getDay());
     </script>
     <script src="https://widget.heweather.net/standard/static/js/he-standard-common.js?v=1.1"></script>
     <!-- <div id="he-plugin-standard"></div>