网格化DEMO版

leiSP-admin/src/main/java/com/sooka/web/controller/system/SysLoginController.java

@@ -15,6 +15,7 @@ import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -24,7 +25,7 @@ import java.util.List;
 
 /**
  * 登录验证
- * 
+ *
  * @author lei_wang
  */
 @Controller
@@ -50,6 +51,17 @@ public class SysLoginController extends BaseController
     @ResponseBody
     public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe)
     {
+        return login(username,password,rememberMe);
+    }
+
+    @GetMapping("/getLogin/{username}/{password}")
+    @ResponseBody
+    public AjaxResult ajaxLogin(@PathVariable("username") String username, @PathVariable("password") String password)
+    {
+        return login(username,password,false);
+    }
+
+    public AjaxResult login(String username, String password, Boolean rememberMe){
         UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
         Subject subject = SecurityUtils.getSubject();
         try

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/bigdata.js

@@ -61,25 +61,25 @@ function queryXinGuan() {
     temp.jieZhongShuLiang = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0,
         "jzNumber" : 0
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0,
         "jzNumber" : 0
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0,
         "jzNumber" : 0
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0,
         "jzNumber" : 0
     });

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/fzjc_canJi.js

@@ -6,7 +6,7 @@ $(document).ready(function () {
     temp.canJi = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0,
         "btNumber" : 0,
         "cjNumber" : 0,
@@ -16,7 +16,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0,
         "btNumber" : 0,
         "cjNumber" : 0,
@@ -26,7 +26,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0,
         "btNumber" : 0,
         "cjNumber" : 0,
@@ -36,7 +36,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0,
         "btNumber" : 0,
         "cjNumber" : 0,

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/fzjc_diBao.js

@@ -6,7 +6,7 @@ $(document).ready(function () {
     temp.diBao = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0,
         "fsNumber" : 0,
         "jzNumber" : 0,
@@ -15,7 +15,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0,
         "fsNumber" : 0,
         "jzNumber" : 0,
@@ -24,7 +24,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0,
         "fsNumber" : 0,
         "jzNumber" : 0,
@@ -33,7 +33,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0,
         "fsNumber" : 0,
         "jzNumber" : 0,

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/fzjc_junRen.js

@@ -6,7 +6,7 @@ $(document).ready(function () {
     temp.junRen = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0,
         "gjNumber" : 0,
         "jcNumber" : 0,
@@ -20,7 +20,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0,
         "gjNumber" : 0,
         "jcNumber" : 0,
@@ -34,7 +34,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0,
         "gjNumber" : 0,
         "jcNumber" : 0,
@@ -48,7 +48,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0,
         "gjNumber" : 0,
         "jcNumber" : 0,

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/fzjc_laoLingRen.js

@@ -6,7 +6,7 @@ $(document).ready(function () {
     temp.laoLingRen = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0,
         "gljtNumber000" : 0,
         "gljtNumber200" : 0,
@@ -31,7 +31,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0,
         "gljtNumber000" : 0,
         "gljtNumber200" : 0,
@@ -56,7 +56,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0,
         "gljtNumber000" : 0,
         "gljtNumber200" : 0,
@@ -81,7 +81,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0,
         "gljtNumber000" : 0,
         "gljtNumber200" : 0,

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/fzjc_nianLingGouCheng.js

@@ -6,7 +6,7 @@ $(document).ready(function () {
     temp.nianLing = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0,
         "age18_25" : 0,
         "age25_35" : 0,
@@ -18,7 +18,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0,
         "age18_25" : 0,
         "age25_35" : 0,
@@ -30,7 +30,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0,
         "age18_25" : 0,
         "age25_35" : 0,
@@ -42,7 +42,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0,
         "age18_25" : 0,
         "age25_35" : 0,

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/fzjc_qiKaiQuJuMinZongShu.js

@@ -5,22 +5,22 @@ $(document).ready(function () {
     temp.jdRenKou = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0
     });
     qiKaiQuJuMinZongShu(temp);

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/fzjc_teShuRenQun.js

@@ -6,7 +6,7 @@ $(document).ready(function () {
     temp.teShuRenQun = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0,
         "tsrqNumber1" : 0,
         "tsrqNumber2" : 0,
@@ -34,7 +34,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0,
         "tsrqNumber1" : 0,
         "tsrqNumber2" : 0,
@@ -62,7 +62,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0,
         "tsrqNumber1" : 0,
         "tsrqNumber2" : 0,
@@ -90,7 +90,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0,
         "tsrqNumber1" : 0,
         "tsrqNumber2" : 0,

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/xgym_3.js

@@ -6,7 +6,7 @@ $(document).ready(function () {
     temp.meiLeiYiMiaoJieZhongShuLiang = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,
@@ -14,7 +14,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,
@@ -22,7 +22,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,
@@ -30,7 +30,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/xgym_5.js

@@ -5,7 +5,7 @@ $(document).ready(function () {
     temp.jieDaoYiMiaoJieZhongQingKuangBaoBiao = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,
@@ -13,7 +13,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,
@@ -21,7 +21,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,
@@ -29,7 +29,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/xgym_7.js

@@ -8,7 +8,7 @@ $(document).ready(function () {
         array.push(array1);
         array1.push({
             "jdId" : 170387468639,
-            "jdName" : "锦程街道办事处",
+            "jdName" : "黎明街道办事处",
             "year" : year,
             "month1" : 0,
             "month2" : 0,
@@ -25,7 +25,7 @@ $(document).ready(function () {
         });
         array1.push({
             "jdId" : 172291278969,
-            "jdName" : "东风街道办事处",
+            "jdName" : "通胜街道办事处",
             "year" : year,
             "month1" : 0,
             "month2" : 0,
@@ -42,7 +42,7 @@ $(document).ready(function () {
         });
         array1.push({
             "jdId" : 288313983755,
-            "jdName" : "富民街道办事处",
+            "jdName" : "城东街道办事处",
             "year" : year,
             "month1" : 0,
             "month2" : 0,
@@ -59,7 +59,7 @@ $(document).ready(function () {
         });
         array1.push({
             "jdId" : 288313983756,
-            "jdName" : "前程街道办事处",
+            "jdName" : "团结街道办事处",
             "year" : year,
             "month1" : 0,
             "month2" : 0,

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/xgym_9.js

@@ -5,7 +5,7 @@ $(document).ready(function () {
     temp.jieDaoYiMiaoJieZhongQingKuangBaoBiao = array;
     array.push({
         "jdId" : 170387468639,
-        "jdName" : "锦程街道办事处",
+        "jdName" : "黎明街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,
@@ -13,7 +13,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 172291278969,
-        "jdName" : "东风街道办事处",
+        "jdName" : "通胜街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,
@@ -21,7 +21,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983755,
-        "jdName" : "富民街道办事处",
+        "jdName" : "城东街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,
@@ -29,7 +29,7 @@ $(document).ready(function () {
     });
     array.push({
         "jdId" : 288313983756,
-        "jdName" : "前程街道办事处",
+        "jdName" : "团结街道办事处",
         "rkNumber" : 0,
         "ymOneNum" : 0,
         "ymTwoNum" : 0,

leiSP-admin/src/main/resources/static/bigdata/ksh/js/charts-home/event-report.js

@@ -18,22 +18,22 @@ option = {
 	dataset: {
 		dimensions: ['product', '上报', '归档'],
 		source: [{
-				product: '锦程街道',
+				product: '黎明街道',
 				上报: 43.3,
 				归档: 85.8
 			},
 			{
-				product: '东风街道',
+				product: '通胜街道',
 				上报: 83.1,
 				归档: 73.4
 			},
 			{
-				product: '前程街道',
+				product: '团结街道',
 				上报: 86.4,
 				归档: 65.2
 			},
 			{
-				product: '富民街道',
+				product: '城东街道',
 				上报: 72.4,
 				归档: 53.9
 			}
@@ -49,7 +49,7 @@ option = {
 		axisTick: {
 			show: false
 		},
-		
+
 	},
 	yAxis: {
 		axisLine: {
@@ -79,9 +79,9 @@ option = {
 						color: '#0066cc'
 					}
 				]
-		
+
 			)
-		
+
 		}
 	}, {
 		type: 'bar',
@@ -97,9 +97,9 @@ option = {
 						color: '#54ba4f'
 					}
 				]
-		
+
 			)
-		
+
 		}
 	}]
 };

leiSP-admin/src/main/resources/static/bigdata/ksh/js/charts-home/event-signfor.js

@@ -18,22 +18,22 @@ option = {
 	dataset: {
 		dimensions: ['product', '签收', '办结'],
 		source: [{
-				product: '锦程街道',
+				product: '黎明街道',
 				签收: 43.3,
 				办结: 85.8
 			},
 			{
-				product: '东风街道',
+				product: '通胜街道',
 				签收: 83.1,
 				办结: 73.4
 			},
 			{
-				product: '前程街道',
+				product: '团结街道',
 				签收: 86.4,
 				办结: 65.2
 			},
 			{
-				product: '富民街道',
+				product: '城东街道',
 				签收: 72.4,
 				办结: 53.9
 			}
@@ -50,7 +50,7 @@ option = {
 			show: false
 		},
 		 inverse:true
-		
+
 	},
 	xAxis: {
 		axisLine: {
@@ -80,9 +80,9 @@ option = {
 						color: '#0066cc'
 					}
 				]
-		
+
 			)
-		
+
 		}
 	}, {
 		type: 'bar',
@@ -98,9 +98,9 @@ option = {
 						color: '#3926d4'
 					}
 				]
-		
+
 			)
-		
+
 		}
 	}]
 };

leiSP-admin/src/main/resources/static/bigdata/ksh/js/dataSwitches.js

@@ -538,10 +538,10 @@ $(document).ready(function () {
     /**根据点击事件name获取deptId**/
     function getDeptIdByName(name) {
         switch (name) {
-            case "锦程街道" : return 170387468639;break;
-            case "东风街道" : return 172291278969;break;
-            case "前程街道" : return 288313983756;break;
-            case "富民街道" : return 288313983755;break;
+            case "黎明街道" : return 170387468639;break;
+            case "通胜街道" : return 172291278969;break;
+            case "团结街道" : return 288313983756;break;
+            case "城东街道" : return 288313983755;break;
         }
     }
 
@@ -674,22 +674,22 @@ $(document).ready(function () {
                         dimensions: ['product', '上报', '归档'],
                         source: [
                             {
-                                product: '锦程街道',
+                                product: '黎明街道',
                                 上报: res[0].sbs,
                                 归档: res[0].gds
                             },
                             {
-                                product: '东风街道',
+                                product: '通胜街道',
                                 上报: res[1].sbs,
                                 归档: res[1].gds
                             },
                             {
-                                product: '前程街道',
+                                product: '团结街道',
                                 上报: res[2].sbs,
                                 归档: res[2].gds
                             },
                             {
-                                product: '富民街道',
+                                product: '城东街道',
                                 上报: res[3].sbs,
                                 归档: res[3].gds
                             }
@@ -803,22 +803,22 @@ $(document).ready(function () {
                         dimensions: ['product', '签收', '办结'],
                         source: [
                             {
-                                product: '锦程街道',
+                                product: '黎明街道',
                                 签收: res[0].qss,
                                 办结: res[0].bjs
                             },
                             {
-                                product: '东风街道',
+                                product: '通胜街道',
                                 签收: res[1].qss,
                                 办结: res[1].bjs
                             },
                             {
-                                product: '前程街道',
+                                product: '团结街道',
                                 签收: res[2].qss,
                                 办结: res[2].bjs
                             },
                             {
-                                product: '富民街道',
+                                product: '城东街道',
                                 签收: res[3].qss,
                                 办结: res[3].bjs
                             }

leiSP-admin/src/main/resources/static/bigdata/ksh/js/mapIndex.js

@@ -35,10 +35,10 @@ function initMap(mapPoint,layersList,zoom){
     map = L.map('map', {
         preferCanvas: true,
         center: mapPoint,//初始化后中心坐标点，暂时不知道
-        zoom: zoom,
+        zoom: 14,
         crs: L.CRS.EPSG4326,
         // crs: L.CRS.EPSG3857,
-        zoomControl: true,
+        zoomControl: false,
         doubleClickZoom: false,
         /*layers: [map_jilinShiLiang,map_qikaiYingXiang,map_dfjd,map_dfjd_chuangye,map_dfjd_yangliu]*/
         layers: layersList

leiSP-admin/src/main/resources/static/ruoyi/index.js

@@ -478,12 +478,12 @@ $(function() {
 
     // 可视化
     $('#goKsh').on('click', function () {
-    	location.href = "/qk/ksh"
+    	location.href = ctx + "ksh"
     });
 
     // 辅助决策
     $('#goFzjc').on('click', function () {
-    	location.href = "/qk/fzjc"
+    	location.href = ctx + "fzjc"
     });
 
     // 全屏显示

leiSP-admin/src/main/resources/templates/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
-    <title>汽开区智慧社区后台管理系统</title>
+    <title>集安市智慧社区后台管理系统</title>
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="shortcut icon" href="../static/sooka.ico" th:href="@{sooka.ico}"/>
@@ -179,7 +179,7 @@
                         <i class="fa fa-bars"></i>
                     </a>
                 </div>
-                <div style="float: left;margin: 8px 0 0 0; font-size: 24px; color: #fff; font-weight: bold">汽开区智慧社区后台管理系统 </div>
+                <div style="float: left;margin: 8px 0 0 0; font-size: 24px; color: #fff; font-weight: bold">集安市智慧社区后台管理系统 </div>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
                     <!--<li><a title="示例" href="" target="_blank"><i class="fa fa-video-camera"></i> 示例</a></li>
                     <li><a title="文档" href="" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
@@ -240,7 +240,7 @@
                     th:src="@{/system/main}" frameborder="0" seamless></iframe>
         </div>
         <div class="footer">
-            <div class="pull-right">汽开区智慧社区后台管理系统</div>
+            <div class="pull-right">集安市智慧社区后台管理系统</div>
         </div>
     </div>
     <!--右侧部分结束-->

leiSP-admin/src/main/resources/templates/login.html

@@ -56,10 +56,11 @@
                 <strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
             </div>
         </div>-->
-        <div style=" font-size: 36px; font-weight: bold; margin-bottom: 20px">汽开区智慧社区后台管理系统</div>
+        <div style=" font-size: 36px; font-weight: bold; margin-bottom: 20px">集安市智慧社区后台管理系统</div>
         <div>
             <form id="signupForm" autocomplete="off">
-                <h4 style=" color: #333;margin-bottom: 20px; border-bottom: 2px solid #1269ff; display: block; width: fit-content; padding-bottom: 5px;">请登录</h4>
+                <h4 style=" color: #333;margin-bottom: 20px; border-bottom: 2px solid #1269ff; display: block; width: fit-content; padding-bottom: 5px;">请登录//<a onclick="syncLogin()">测试登录新野1</a></h4>
+
                 <input type="text" name="username" class="form-control uname" placeholder="用户名" value=""/>
                 <input type="password" name="password" class="form-control pword" placeholder="密码" value=""/>
                 <div class="row m-t" th:if="${captchaEnabled==true}">
@@ -79,6 +80,7 @@
 <!--                </div>-->
                 <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后..." style="height: 50px">登录</button>
             </form>
+            <a href="http://localhost:8889/jian/getLogin/admin/123456" target="_blank">测试登录新野</a>
         </div>
     </div>
     <!--<div class="signup-footer">
@@ -100,5 +102,28 @@
 <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
 <script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js}"></script>
 <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
+<script>
+    function syncLogin() {
+        let url = "localhost";
+        let port = "8889";
+        $.ajax({
+            type: "post",
+            url: ctx + "login",
+            data: {
+                "username": "admin",
+                "password": "1a2b3c!",
+                "rememberMe": false
+            },
+            success: function(r) {
+                /*location.href = ctx + 'index';*/
+                if(r.perFlag=="zhzx"||r.perFlag=="jd"){
+                    window.open("http://"+url+":"+port+"/jian/ksh");
+                }else{
+                    window.open("http://"+url+":"+port+"/jian/index");
+                }
+            }
+        });
+    }
+</script>
 </body>
 </html>

leiSP-admin/src/main/resources/templates/main.html

@@ -348,7 +348,7 @@
         </div>
 
         <div id="div_yqtx" class="data-fl-row m-t-30">
-            <span>一汽退休老干部统计</span>
+            <span>退休老干部统计</span>
             <div id="data_yqtx" class="data-image"  ></div>
         </div>
     </div>
@@ -610,7 +610,7 @@
                                 type: 'pie',
                                 radius: ['30%', '50%'],
                                 data: [
-                                    { value: dataList[0], name: nameList[0]+'一汽退休老干部人数', itemStyle: {
+                                    { value: dataList[0], name: nameList[0]+'退休老干部人数', itemStyle: {
                                             color: new echarts.graphic.LinearGradient(1, 1, 0, 0, [{
                                                 offset: 0,
                                                 color: '#006000'
@@ -619,7 +619,7 @@
                                                 color: '#AAAAFF'
                                             }]),
                                         } },
-                                    { value: dataList[1], name: nameList[1]+'一汽退休老干部人数', itemStyle: {
+                                    { value: dataList[1], name: nameList[1]+'退休老干部人数', itemStyle: {
                                             color: new echarts.graphic.LinearGradient(1, 1, 0, 0, [{
                                                 offset: 0,
                                                 color: '#A5A552'

mybusiness/src/main/java/com/business/zhsq_qk/fzjc/service/impl/ZhsqFzjcServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.List;
  * 辅助决策信息Service业务层处理
  */
 @Service
-public class ZhsqFzjcServiceImpl implements IZhsqFzjcService 
+public class ZhsqFzjcServiceImpl implements IZhsqFzjcService
 {
     @Autowired
     private ZhsqFzjcMapper zhsqFzjcMapper;
@@ -417,10 +417,10 @@ public class ZhsqFzjcServiceImpl implements IZhsqFzjcService
                         jd2.setYear(i);
                         jd3.setYear(i);
                         jd4.setYear(i);
-                        jd1.setJdName("锦程街道办事处");
-                        jd2.setJdName("东风街道办事处");
-                        jd3.setJdName("富民街道办事处");
-                        jd4.setJdName("前程街道办事处");
+                        jd1.setJdName("黎明街道办事处");
+                        jd2.setJdName("通胜街道办事处");
+                        jd3.setJdName("城东街道办事处");
+                        jd4.setJdName("团结街道办事处");
                         demoDataList.add(jd1);
                         demoDataList.add(jd2);
                         demoDataList.add(jd3);

mybusiness/src/main/java/com/business/zhsq_qk/socket/WebSocketConfig.java

@@ -4,17 +4,17 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
-@Configuration
-public class WebSocketConfig {
-    /**
-     * ServerEndpointExporter 作用
-     *
-     * 这个Bean会自动注册使用@ServerEndpoint注解声明的websocket endpoint
-     *
-     * @return
-     */
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter() {
-        return new ServerEndpointExporter();
-    }
-}
+//@Configuration
+//public class WebSocketConfig {
+//    /**
+//     * ServerEndpointExporter 作用
+//     *
+//     * 这个Bean会自动注册使用@ServerEndpoint注解声明的websocket endpoint
+//     *
+//     * @return
+//     */
+//    @Bean
+//    public ServerEndpointExporter serverEndpointExporter() {
+//        return new ServerEndpointExporter();
+//    }
+//}

mybusiness/src/main/resources/templates/zhsq_qk/eventProcess/eventProcess/choseEventLatLng.html

@@ -33,7 +33,7 @@
         iconSize: [50, 50],
         iconAnchor: [33, 30]
     });
-    var map, marker = null, url = iServerMap,dataUrl=iServerJieDaoSheQuData;//初始化基本参数
+    var map, marker = null, pointsLayer = null, url = iServerMap,dataUrl=iServerJieDaoSheQuData;//初始化基本参数
     var workspace_qk=iServerJilinshengAndQikaiMap;//省矢量及区影像，固定加载。
     var workspace_jdsq=iServerJieDaoSheQuMap;//街道社区的地图服务路径
     var map_jilinShiLiang = L.supermap.tiledMapLayer(workspace_qk+'/吉林省矢量地图 ', {
@@ -46,17 +46,27 @@
     var map_jiedao = L.supermap.tiledMapLayer( workspace_jdsq+'/'+jdLayerId, {//东风街道 /dongfengjiedao
         noWrap: true
     });
+    //不同社区人员登录后，根据  【图层ID】   ，加载不同图层，样例为东风新立社区dongfengxinli，
+    //东风街道-创业社区
+    var map_shequ = L.supermap.tiledMapLayer(workspace_jdsq + '/' + layerId, {
+        noWrap: true
+    });
+
+    if(layerId == "" || layerId == null){
+        layer.alert("当前社区未绑定图层！");
+    }
     map = L.map('map', {
         preferCanvas: true,
         center: [centerpointLat, centerpointLon],//iServerqiKaiQuMapCenterPoint初始化后中心坐标点，应为不同社区图层的坐标点，从部门管理中获取。格式为：  [43.876540660858154,125.24094343185425],
         zoom: 14,
         crs: L.CRS.EPSG4326,
+        // crs: L.CRS.EPSG3857,
         zoomControl: true,
         doubleClickZoom: false,
-        layers: [map_jilinShiLiang,map_qikaiYingXiang,map_jiedao]
+        layers: [map_jilinShiLiang,map_qikaiYingXiang,map_jiedao,map_shequ]
     }).on({"dblclick": callbackFunction});
 
-    var pointsLayer = L.featureGroup().addTo(map); //添加到地图
+    pointsLayer = L.featureGroup().addTo(map); //添加到地图
 
     function callbackFunction(e) {
         clearLayer();
@@ -86,4 +96,4 @@
     <div class='panel-body content' id="panelBodyContent"></div>
 </div>
 </body>
-</html>
+</html>

mybusiness/src/main/resources/templates/zhsq_qk/fzjc/fzjc.html

@@ -2,7 +2,7 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org">
 	<head>
 		<meta charset="utf-8" />
-		<title>汽开区智慧社区后台管理系统</title>
+		<title>集安市智慧社区后台管理系统</title>
 		<link rel="shortcut icon" href="../static/sooka.ico" th:href="@{/sooka.ico}"/>
 		<script th:inline="javascript"> var ctx = [[@{/}]]; </script>
 		<script th:src="@{/js/jquery.min.js}"></script>
@@ -34,7 +34,7 @@
 					</ul>
 				</div>
 				<div class="logo-title">
-					<h6>汽开区辅助决策系统</h6>
+					<h6>集安市辅助决策系统</h6>
 				</div>
 				<div class="fast-menu">
 					<a title="后台管理系统" href="javascript:void(0)" id="goHtgl">后台管理系统</a>
@@ -51,7 +51,7 @@
 						<i class="chart-block-normal"></i>
 						<i class="chart-block-normal"></i>
 						<i class="chart-block-normal"></i>
-						<div class="chart-title">汽开区居民总数</div>
+						<div class="chart-title">集安市居民总数</div>
 						<div class="chart-first">
 							<div class="people-count" id="openDialogJuMin" style="cursor: pointer">
 								<div class="p-t">居民总数</div><label id="rkTotal" class="count" style="cursor: pointer"></label><div class="p-n">人</div>

mybusiness/src/main/resources/templates/zhsq_qk/fzjc/rktj/qkqjmzs.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('汽开区居民总数')" />
+    <th:block th:include="include :: header('集安市居民总数')" />
 </head>
 <body class="gray-bg">
 <div class="container-div">
@@ -407,4 +407,4 @@
     });
 </script>
 </body>
-</html>
+</html>

mybusiness/src/main/resources/templates/zhsq_qk/ksh/fullScreen.html

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
-    <th:block th:include="include :: header('汽开区智慧社区数据孪生平台')" />
+    <th:block th:include="include :: header('集安市智慧社区数据孪生平台')" />
     <script th:src="@{/bigdata/ksh/js/jquery.js}" type="text/javascript" charset="utf-8"></script>
     <script th:src="@{/bigdata/js/businessutil.js}"></script>
     <script th:src="@{/bigdata/js/dateweatherutil.js}"></script>
@@ -19,10 +19,10 @@
         <div class="nav" style="display: none">
             <div class="nav-con">
                 <a class="nav-a" deptId="-1" id="-1" style="display:none">所有街道</a>
-                <a class="nav-a" deptId="170387468639"  id="170387468639">锦程街道</a>
-                <a class="nav-a" deptId="172291278969"  id="172291278969">东风街道</a>
-                <a class="nav-a" deptId="288313983756"  id="288313983756">前程街道</a>
-                <a class="nav-a" deptId="288313983755"  id="288313983755">富民街道</a>
+                <a class="nav-a" deptId="170387468639"  id="170387468639">黎明街道</a>
+                <a class="nav-a" deptId="172291278969"  id="172291278969">通胜街道</a>
+                <a class="nav-a" deptId="288313983756"  id="288313983756">团结街道</a>
+                <a class="nav-a" deptId="288313983755"  id="288313983755">城东街道</a>
             </div>
             <div class="nav-right">
                 <span id="day"></span>

mybusiness/src/main/resources/templates/zhsq_qk/ksh/ksh.html

@@ -3,7 +3,7 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
     <script th:inline="javascript"> var ctx = [[@{/}]]; </script>
-    <th:block th:include="include :: header('汽开区智慧社区数据孪生平台')" />
+    <th:block th:include="include :: header('集安市智慧社区数据孪生平台')" />
     <script th:src="@{/bigdata/ksh/js/jquery.js}" type="text/javascript" charset="utf-8"></script>
     <script th:src="@{/bigdata/js/businessutil.js}"></script>
     <script th:src="@{/bigdata/js/dateweatherutil.js}"></script>
@@ -37,7 +37,7 @@
                 <div class="s-r"></div>
             </div>
             <div class="logo-title">
-                <h6>汽开区智慧社区数据孪生平台</h6>
+                <h6>集安市智慧社区数据孪生平台</h6>
             </div>
             <div class="fast-menu">
                 <a title="后台管理系统" href="javascript:void(0)" id="goHtgl">后台管理系统</a>
@@ -46,13 +46,17 @@
             </div>
         </div>
         <div class="nav">
-            <div class="nav-left"><img th:src="@{/bigdata/ksh/img/qk-logo.png}"><span>汽开区智慧社区数据孪生平台</span></div>
+            <div class="nav-left"><img style="height:25px;width:25px;" th:src="@{/bigdata/ksh/img/qk-logo.png}"><span>集安市智慧社区数据孪生平台</span></div>
             <div class="nav-con">
                 <a class="nav-a" deptId="-1" id="-1" style="display:none">所有街道</a>
-                <a class="nav-a" deptId="170387468639"  id="170387468639">锦程街道</a>
-                <a class="nav-a" deptId="172291278969"  id="172291278969">东风街道</a>
-                <a class="nav-a" deptId="288313983756"  id="288313983756">前程街道</a>
-                <a class="nav-a" deptId="288313983755"  id="288313983755">富民街道</a>
+<!--                <a class="nav-a" deptId="170387468639"  id="170387468639">锦程街道</a>-->
+<!--                <a class="nav-a" deptId="172291278969"  id="172291278969">东风街道</a>-->
+<!--                <a class="nav-a" deptId="288313983756"  id="288313983756">前程街道</a>-->
+<!--                <a class="nav-a" deptId="288313983755"  id="288313983755">富民街道</a>-->
+                <a class="nav-a" deptId="170387468639"  id="170387468639">黎明街道</a>
+                <a class="nav-a" deptId="172291278969"  id="172291278969">通胜街道</a>
+                <a class="nav-a" deptId="288313983756"  id="288313983756">团结街道</a>
+                <a class="nav-a" deptId="288313983755"  id="288313983755">城东街道</a>
             </div>
             <div class="nav-right">
                 <span id="day"></span>
@@ -260,7 +264,8 @@
     var iServerqiKaiQuMapCenterPoint = getSuperMapCenterPoint("[[${iServerqiKaiQuMapCenterPoint}]]");
     var iServerJieDaoSheQuData = "[[${iServerJieDaoSheQuData}]]";//街道社区数据源
     var perFlag="[[${perFlag}]]";
-    var jdId="[[${jdId}]]";
+    var jdId="[[${jdId}]]" == "0" ? "172291278969" : "[[${jdId}]]";
+    console.log(jdId);
     if(perFlag=="jd"){
         //街道登录，只展示本街道按钮，其他街道隐藏，区指挥中心和管理员登录，显示全部
         /*$("#170387468639").hide();
@@ -278,8 +283,8 @@
 <script th:src="@{/bigdata/ksh/js/visualization.js}" type="text/javascript" charset="utf-8"></script>
 <script>
     function onNavClick(jdId){
-        // 根据当前人登录选择默认导航
-        // $("#" + jdId).click();
+        //选择默认导航
+        // $("#288313983755").click();
         setTimeout("$('#"+jdId+"').click()",200);
         // 街道登录不能点别的街道
         $("#jdId").val(jdId);

mybusiness/src/main/resources/templates/zhsq_qk/ksh/ksh_jd.html

@@ -30,7 +30,7 @@
                 <div class="s-r"></div>
             </div>
             <div class="logo-title">
-                <h6>汽开区智慧社区数据孪生平台</h6>
+                <h6>集安市智慧社区数据孪生平台</h6>
             </div>
             <div class="fast-menu">
                 <a title="后台管理系统" href="javascript:void(0)" id="goHtgl">后台管理系统</a>
@@ -39,12 +39,12 @@
             </div>
         </div>
         <div class="nav">
-            <div class="nav-left"><img th:src="@{/bigdata/ksh/img/qk-logo.png}"><span>汽开区智慧社区数据孪生平台</span></div>
+            <div class="nav-left"><img th:src="@{/bigdata/ksh/img/qk-logo.png}"><span>集安市智慧社区数据孪生平台</span></div>
             <div class="nav-con">
-                <a class="nav-a" href="#">锦程街道</a>
-                <a class="nav-a" href="#">东风街道</a>
-                <a class="nav-a" href="#">前程街道</a>
-                <a class="nav-a" href="#">富民街道</a>
+                <a class="nav-a" href="#">黎明街道</a>
+                <a class="nav-a" href="#">通胜街道</a>
+                <a class="nav-a" href="#">团结街道</a>
+                <a class="nav-a" href="#">城东街道</a>
             </div>
             <div class="nav-right">
                 <span>2022年1月17日</span>
@@ -152,10 +152,10 @@
                         <span>
 									街道
 									<select>
-										<option value="">锦程街道</option>
-										<option value="">东风街道</option>
-										<option value="">前程街道</option>
-										<option value="">富民街道</option>
+										<option value="">黎明街道</option>
+										<option value="">通胜街道</option>
+										<option value="">团结街道</option>
+										<option value="">城东街道</option>
 									</select>
 								</span>
                         <span>

mybusiness/src/main/resources/templates/zhsq_qk/person/person/add.html

@@ -182,7 +182,7 @@
                         </div>
                     </div>
                     <div class="form-group col-sm-6">
-                        <label class="col-sm-3 control-label is-required" >是否一汽退休老干部：</label>
+                        <label class="col-sm-3 control-label is-required" >是否退休老干部：</label>
                         <div class="col-sm-8">
                             <select name="perYqtx" id="perYqtx" class="form-control m-b" th:with="type=${@dict.getType('yes_no')}" required>
                                 <option  value="">-请选择-</option>
@@ -1013,7 +1013,7 @@ function changeJunrenYfzl(junrenSfyf){
                 return;
             }
             if($("#perYqtx").val()==""||$("#perYqtx").val()==null){
-                $.modal.alert('请选择是否一汽退休老干部！');
+                $.modal.alert('请选择是否退休老干部！');
                 $("#jbxx").click();
                 return;
             }
@@ -1129,4 +1129,4 @@ function changeJunrenYfzl(junrenSfyf){
     </script>
 </div>
 </body>
-</html>
+</html>

mybusiness/src/main/resources/templates/zhsq_qk/person/person/detail.html

@@ -175,7 +175,7 @@
                             </div>
                         </div>
                         <div class="form-group col-sm-6">
-                            <label class="col-sm-3 control-label">是否一汽退休老干部：</label>
+                            <label class="col-sm-3 control-label">是否退休老干部：</label>
                             <div class="col-sm-8">
                                 <select name="perYqtx" class="form-control m-b" th:with="type=${@dict.getType('yes_no')}">
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{perYqtx}"></option>
@@ -991,4 +991,4 @@
     </script>
 </div>
 </body>
-</html>
+</html>

mybusiness/src/main/resources/templates/zhsq_qk/person/person/edit.html

@@ -175,7 +175,7 @@
                             </div>
                         </div>
                         <div class="form-group col-sm-6">
-                            <label class="col-sm-3 control-label is-required">是否一汽退休老干部：</label>
+                            <label class="col-sm-3 control-label is-required">是否退休老干部：</label>
                             <div class="col-sm-8">
                                 <select name="perYqtx" class="form-control m-b" th:with="type=${@dict.getType('yes_no')}" required>
                                     <option  value="">-请选择-</option>
@@ -1015,4 +1015,4 @@
     </script>
 </div>
 </body>
-</html>
+</html>

mybusiness/src/main/resources/templates/zhsq_qk/person/person/handiao.html

@@ -101,7 +101,7 @@
             <!--<br />-->
             <!--<br />-->
             <div class="dy_cell_r">
-                中共长春市汽开区[[*{zhsqFangjian.jdName}]][[*{zhsqFangjian.sqName}]]委员会
+                中共集安市[[*{zhsqFangjian.jdName}]][[*{zhsqFangjian.sqName}]]委员会
             </div>
             <!--<br />-->
             <div class="dy_cell_r">
@@ -117,4 +117,4 @@
         document.getElementById("button_print").style.display = "block";
     }
 </script>
-</html>
+</html>

mybusiness/src/main/resources/templates/zhsq_qk/person/person/juzhu.html

@@ -127,7 +127,7 @@
         <div class="page">
             <div class="subpage">
                 <div class="padding-con cell_dotted_b">
-                    <div class="sm_tit">长春市汽开区[[*{zhsqFangjian.jdName}]][[*{zhsqFangjian.sqName}]]证明信(存根)</div>
+                    <div class="sm_tit">集安市[[*{zhsqFangjian.jdName}]][[*{zhsqFangjian.sqName}]]证明信(存根)</div>
                     <div class="dy_cell_r">
                         第&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号
                     </div>

mybusiness/src/main/resources/templates/zhsq_qk/zhcx/xqrk/detail.html

@@ -175,7 +175,7 @@
                             </div>
                         </div>
                         <div class="form-group col-sm-6">
-                            <label class="col-sm-3 control-label">是否一汽退休老干部：</label>
+                            <label class="col-sm-3 control-label">是否退休老干部：</label>
                             <div class="col-sm-8">
                                 <select name="perYqtx" class="form-control m-b" th:with="type=${@dict.getType('yes_no')}">
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{perYqtx}"></option>
@@ -991,4 +991,4 @@
     </script>
 </div>
 </body>
-</html>
+</html>