区域

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/mapJSON.js

@@ -1125,7 +1125,7 @@ var chinaMapJSON = [{
     "area": ["江岸区", "江汉区", "硚口区", "汉阳区", "武昌区", "青山区", "洪山区", "东西湖区", "汉南区", "蔡甸区", "江夏区", "黄陂区", "新洲区"]
   }, {
     "CityID": 160,
-    "name": "襄阳市",
+    "name": "襄樊市",
     "ProID": 17,
     "CitySort": 160,
     "area": ["襄城区", "樊城区", "襄阳区", "南漳县", "谷城县", "保康县", "老河口市", "枣阳市", "宜城市"]
@@ -1555,12 +1555,6 @@ var chinaMapJSON = [{
     "ProID": 20,
     "CitySort": 272,
     "area": ['其他']
-  }, {
-    "CityID": 273,
-    "name": "三沙市",
-    "ProID": 20,
-    "CitySort": 273,
-    "area": ['其他']
   }]
 }, {
   "ProID": 21,
@@ -1881,7 +1875,7 @@ var chinaMapJSON = [{
     "area": ['其他']
   }, {
     "CityID": 344,
-    "name": "吐鲁番市",
+    "name": "吐鲁番地区",
     "ProID": 24,
     "CitySort": 344,
     "area": ["吐鲁番市", "鄯善县", "托克逊县"]
@@ -1941,7 +1935,7 @@ var chinaMapJSON = [{
     "area": ["城东区", "城中区", "城西区", "城北区", "大通回族土族自治县", "湟中县", "湟源县"]
   }, {
     "CityID": 291,
-    "name": "海东市",
+    "name": "海东地区",
     "ProID": 25,
     "CitySort": 291,
     "area": ["平安县", "民和回族土族自治县", "乐都县", "互助土族自治县", "化隆回族自治县", "循化撒拉族自治县"]
@@ -2193,13 +2187,13 @@ var chinaMapJSON = [{
     "area": ["凯里市", "黄平县", "施秉县", "三穗县", "镇远县", "岑巩县", "天柱县", "锦屏县", "剑河县", "台江县", "黎平县", "榕江县", "从江县", "雷山县", "麻江县", "丹寨县"]
   }, {
     "CityID": 251,
-    "name": "铜仁市",
+    "name": "铜仁地区",
     "ProID": 29,
     "CitySort": 251,
     "area": ["铜仁市", "江口县", "玉屏侗族自治县", "石阡县", "思南县", "印江土家族苗族自治县", "德江县", "沿河土家族自治县", "松桃苗族自治县", "万山特区"]
   }, {
     "CityID": 252,
-    "name": "毕节市",
+    "name": "毕节地区",
     "ProID": 29,
     "CitySort": 252,
     "area": ["毕节市", "大方县", "黔西县", "金沙县", "织金县", "纳雍县", "威宁彝族回族苗族自治县", "赫章县"]

src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html

@@ -456,7 +456,7 @@
 			});
 			function createMoreCity(arr){
 				var tempHtml = arr.map(function(v) {
-					return '<div class="city">'+v.name.replace(/市$/g,'')+'</div>'
+					return '<button class="city">' + v.name.replace(/地区$/g, '市') + '</button>'
 				}).join('');
 				return tempHtml
 			}
@@ -485,7 +485,6 @@
 					// data.push($(this).html())
 				})
 				data = Array.from(new Set(data)); //数组去重
-				console.log(data)
 				var html = '';
 				for (var i = 0; i < data.length; i++) {
 					if (i != data.length - 1) {
@@ -506,11 +505,23 @@
 					 document.querySelector('#' + s).scrollIntoView({block:'center'});
 				 });
 
-				 $(".select-area-box .tab:not(.municipality)").on('click',function(event){
-					 $(this).toggleClass('selected').next('.tab_content').slideDown(500);
-					 $(this).parent().siblings().children('.tab_content').slideUp(500);
+				 $(".select-area-box .tab:not(.municipality)").on('click', function (event) {
+					 if($(this).next('.tab_content:not(:animated)').css("display") == "block"){
+						 $(this).children().children('i').css({
+							 "display":"inline-block",
+							 "transform":"rotate(0)"
+						 })
+					 }else{
+						 $(this).children().children('i').css({
+							 "display":"inline-block",
+							 "transform":"rotate(-180deg)"
+						 })
+					 }
+					 $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500)
+					 // $(this).parent().siblings().children('.tab_content').slideUp(500)
 					 $(this).parent().siblings().children('.tab').removeClass('selected');
-				 });
+
+				 })
 				 $('.province .checkbox:not(.other)').on('change',function(){
 					var isCheckded = $(this).is(':checked');
 					// console.log(isCheckded);
@@ -567,7 +578,6 @@
 							 }
 						 }
 					 });
-					 console.log(province);
 					 if($('.other').is(':checked')){
 						 data.push(val);
 					 }

src/web/staticres/wx_dataExport/js/mapJSON.js

@@ -1125,7 +1125,7 @@ var chinaMapJSON = [{
     "area": ["江岸区", "江汉区", "硚口区", "汉阳区", "武昌区", "青山区", "洪山区", "东西湖区", "汉南区", "蔡甸区", "江夏区", "黄陂区", "新洲区"]
   }, {
     "CityID": 160,
-    "name": "襄阳市",
+    "name": "襄樊市",
     "ProID": 17,
     "CitySort": 160,
     "area": ["襄城区", "樊城区", "襄阳区", "南漳县", "谷城县", "保康县", "老河口市", "枣阳市", "宜城市"]
@@ -1555,12 +1555,6 @@ var chinaMapJSON = [{
     "ProID": 20,
     "CitySort": 272,
     "area": ['其他']
-  }, {
-    "CityID": 273,
-    "name": "三沙市",
-    "ProID": 20,
-    "CitySort": 273,
-    "area": ['其他']
   }]
 }, {
   "ProID": 21,
@@ -1881,7 +1875,7 @@ var chinaMapJSON = [{
     "area": ['其他']
   }, {
     "CityID": 344,
-    "name": "吐鲁番市",
+    "name": "吐鲁番地区",
     "ProID": 24,
     "CitySort": 344,
     "area": ["吐鲁番市", "鄯善县", "托克逊县"]
@@ -1941,7 +1935,7 @@ var chinaMapJSON = [{
     "area": ["城东区", "城中区", "城西区", "城北区", "大通回族土族自治县", "湟中县", "湟源县"]
   }, {
     "CityID": 291,
-    "name": "海东市",
+    "name": "海东地区",
     "ProID": 25,
     "CitySort": 291,
     "area": ["平安县", "民和回族土族自治县", "乐都县", "互助土族自治县", "化隆回族自治县", "循化撒拉族自治县"]
@@ -2193,13 +2187,13 @@ var chinaMapJSON = [{
     "area": ["凯里市", "黄平县", "施秉县", "三穗县", "镇远县", "岑巩县", "天柱县", "锦屏县", "剑河县", "台江县", "黎平县", "榕江县", "从江县", "雷山县", "麻江县", "丹寨县"]
   }, {
     "CityID": 251,
-    "name": "铜仁市",
+    "name": "铜仁地区",
     "ProID": 29,
     "CitySort": 251,
     "area": ["铜仁市", "江口县", "玉屏侗族自治县", "石阡县", "思南县", "印江土家族苗族自治县", "德江县", "沿河土家族自治县", "松桃苗族自治县", "万山特区"]
   }, {
     "CityID": 252,
-    "name": "毕节市",
+    "name": "毕节地区",
     "ProID": 29,
     "CitySort": 252,
     "area": ["毕节市", "大方县", "黔西县", "金沙县", "织金县", "纳雍县", "威宁彝族回族苗族自治县", "赫章县"]

src/web/templates/weixin/dataExport/dataExport_area.html

@@ -424,7 +424,7 @@
 			});
 			function createMoreCity(arr){
 				var tempHtml = arr.map(function(v) {
-					return '<div class="city">'+v.name.replace(/市$/g,'')+'</div>'
+					return '<button class="city">' + v.name.replace(/地区$/g, '市') + '</button>'
 				}).join('');
 				return tempHtml
 			}
@@ -453,7 +453,6 @@
 					// data.push($(this).html())
 				})
 				data = Array.from(new Set(data)); //数组去重
-				console.log(data)
 				var html = '';
 				for (var i = 0; i < data.length; i++) {
 					if (i != data.length - 1) {
@@ -474,11 +473,24 @@
 					 document.querySelector('#' + s).scrollIntoView({block:'center'});
 				 });
 
-				 $(".select-area-box .tab:not(.municipality)").on('click',function(event){
-					 $(this).toggleClass('selected').next('.tab_content').slideDown(500);
-					 $(this).parent().siblings().children('.tab_content').slideUp(500);
+				 $(".select-area-box .tab:not(.municipality)").on('click', function (event) {
+					 if($(this).next('.tab_content:not(:animated)').css("display") == "block"){
+						 $(this).children().children('i').css({
+							 "display":"inline-block",
+							 "transform":"rotate(0)"
+						 })
+					 }else{
+						 $(this).children().children('i').css({
+							 "display":"inline-block",
+							 "transform":"rotate(-180deg)"
+						 })
+					 }
+					 $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500)
+					 // $(this).parent().siblings().children('.tab_content').slideUp(500)
 					 $(this).parent().siblings().children('.tab').removeClass('selected');
+
 				 });
+				 //
 				 $('.province .checkbox:not(.other)').on('change',function(){
 					var isCheckded = $(this).is(':checked');
 					// console.log(isCheckded);