Ver código fonte

Update文字更改

YueYunyun 2 anos atrás
pai
commit
a6239064ae
19 arquivos alterados com 29 adições e 29 exclusões
  1. 1 1
      VbdsmUI_V2.1.1/src/pc/govnew/js/plugins/echarts2/util/mapData/geoJson/china_geo.js
  2. 1 1
      VbdsmUI_V2.1.1/src/pc/govnew/js/plugins/echarts2/util/mapData/params.js
  3. 1 1
      VbdsmUI_V2.1.1/src/pc/govnew/js/plugins/echarts2/util/mapData/rawData/geoJson/china_city.json
  4. 1 1
      VbdsmUI_V2.1.1/src/pc/govnew/js/plugins/echarts2/util/mapData/rawData/geoJson/china_geo.json
  5. 2 2
      VbdsmUI_V2.1.1/src/pc/powergov/js/province_name.js
  6. 2 2
      VbdsmUI_V2.1.1/src/pc/powerservice/anal/affect_category/category.html
  7. 2 2
      VbdsmUI_V2.1.1/src/pc/powerservice/anal/affect_time/time.html
  8. 2 2
      VbdsmUI_V2.1.1/src/pc/powerservice/anal/date/date.html
  9. 1 1
      VbdsmUI_V2.1.1/src/pc/powerservice/anal/index/indexAnalyse.html
  10. 2 2
      VbdsmUI_V2.1.1/src/pc/powerservice/anal/month/month.html
  11. 2 2
      VbdsmUI_V2.1.1/src/pc/powerservice/anal/year/year.html
  12. 2 2
      VbdsmUI_V2.1.1/src/static/js/lib/echarts/build/dist/chart/map.js
  13. 2 2
      VbdsmUI_V2.1.1/src/static/js/lib/echarts/build/dist/echarts-all.js
  14. 2 2
      VbdsmUI_V2.1.1/src/static/js/lib/echarts/build/source/chart/map.js
  15. 2 2
      VbdsmUI_V2.1.1/src/static/js/lib/echarts/build/source/echarts-all.js
  16. 1 1
      VbdsmUI_V2.1.1/src/static/js/lib/echarts/util/mapData/geoJson/china_geo.js
  17. 1 1
      VbdsmUI_V2.1.1/src/static/js/lib/echarts/util/mapData/params.js
  18. 1 1
      VbdsmUI_V2.1.1/src/static/js/lib/echarts/util/mapData/rawData/geoJson/china_city.json
  19. 1 1
      VbdsmUI_V2.1.1/src/static/js/lib/echarts/util/mapData/rawData/geoJson/china_geo.json

+ 1 - 1
VbdsmUI_V2.1.1/src/pc/govnew/js/plugins/echarts2/util/mapData/geoJson/china_geo.js

@@ -166,7 +166,7 @@ define(function () {
 				properties: { name: "重庆", cp: [107.7539, 30.1904], childNum: 40 },
 				geometry: { type: "Polygon", coordinates: ["@@əȂòɜƨ˜ѺɛƦȁ̐@ƪ—õŏφƥòȃƥ̍Ƨôυ̏ƧôñóóôɛŏƩôƧƥôƧóυƨœ̒ѹôœƦȃ@փƥɛ̑@@ɜƧó@ɚƧ@ñφσõ@ŎɝôƧ—@ʵѷóƧʵó˜@ŎóŐó@ôȁƥ›ó̒υôóʶə˜ƧȄς̎ƧȂôƨƨƨφɛ̎Őƨʷɞ@ςԮóŌôôφ@ɜֈ̎ƨ"], encodeOffsets: [[111150, 32446]] },
 			},
-			{ type: "Feature", id: "ning_xia", properties: { name: "江苏", cp: [105.9961, 37.3096], childNum: 5 }, geometry: { type: "Polygon", coordinates: ["@@ల̒ôޠφӒςôƪͧυևɜŋѺó̎ȁ̍ɛ@ѹס@@ʵƧȁôó@ǿ̐ŏöʵɝŋɛ@ô̑ƥóóƨƧ—ó˜ôœó@ƩôóƦ̍œóȀƨŎɛӒôŐυͪɛ@@Ȁə@"], encodeOffsets: [[106831, 38340]] } },
+			{ type: "Feature", id: "ning_xia", properties: { name: "宁夏", cp: [105.9961, 37.3096], childNum: 5 }, geometry: { type: "Polygon", coordinates: ["@@ల̒ôޠφӒςôƪͧυևɜŋѺó̎ȁ̍ɛ@ѹס@@ʵƧȁôó@ǿ̐ŏöʵɝŋɛ@ô̑ƥóóƨƧ—ó˜ôœó@ƩôóƦ̍œóȀƨŎɛӒôŐυͪɛ@@Ȁə@"], encodeOffsets: [[106831, 38340]] } },
 			{ type: "Feature", id: "hai_nan", properties: { name: "海南", cp: [109.9512, 19.2041], childNum: 18 }, geometry: { type: "Polygon", coordinates: ["@@φɜƦʶ̐ôφô̎@ƨŎö@τʵƦ˜ԩ۫õН̏óƥȃƧ@Ʃəםƨ̑Ʀ@ޤ"], encodeOffsets: [[111240, 19846]] } },
 			{ type: "Feature", id: "tai_wan", properties: { name: "台湾", cp: [121.0254, 23.5986], childNum: 1 }, geometry: { type: "Polygon", coordinates: ["@@ô—ƩɝöƧɝѵəޣ̏ρƩԭóōóͪρɞƧОôԪ݈ଦѶɜ̒ɛ"], encodeOffsets: [[124831, 25650]] } },
 			{ type: "Feature", id: "bei_jing", properties: { name: "北京", cp: [116.4551, 40.2539], childNum: 19 }, geometry: { type: "Polygon", coordinates: ["@@óóó›υóôƥ@ŏóóə@ƧŋƩŌρóɛŐóʶѶʴƥʶ̎œôƨɞ@óŎɜŌ̎̍φ›Ƨŋƨʵ"], encodeOffsets: [[120241, 41176]] } },

+ 1 - 1
VbdsmUI_V2.1.1/src/pc/govnew/js/plugins/echarts2/util/mapData/params.js

@@ -386,7 +386,7 @@ define(function (require) {
 				})
 			},
 		},
-		江苏: {
+		宁夏: {
 			getGeoJson: function (callback) {
 				require(["./geoJson/ning_xia_geo"], function (md) {
 					callback(decode(md))

+ 1 - 1
VbdsmUI_V2.1.1/src/pc/govnew/js/plugins/echarts2/util/mapData/rawData/geoJson/china_city.json

@@ -2135,7 +2135,7 @@
 		"改则": { "x": "84.1", "y": "32.33" },
 		"普兰": { "x": "81.18", "y": "30.37" }
 	},
-	"江苏": {
+	"宁夏": {
 		"银川": { "x": "106.27", "y": "38.47" },
 		"永宁": { "x": "106.24", "y": "38.28" },
 		"贺兰": { "x": "106.35", "y": "38.55" },

+ 1 - 1
VbdsmUI_V2.1.1/src/pc/govnew/js/plugins/echarts2/util/mapData/rawData/geoJson/china_geo.json

@@ -2798,7 +2798,7 @@
 		{
 			"type": "Feature",
 			"id": "ning_xia",
-			"properties": { "name": "江苏", "cp": [105.9961, 37.3096], "childNum": 5 },
+			"properties": { "name": "宁夏", "cp": [105.9961, 37.3096], "childNum": 5 },
 			"geometry": {
 				"type": "Polygon",
 				"coordinates": [

+ 2 - 2
VbdsmUI_V2.1.1/src/pc/powergov/js/province_name.js

@@ -82,8 +82,8 @@ function getProvinceName(cityName) {
 	if (cityName.indexOf("广西") > -1) {
 		pname = "广西"
 	}
-	if (cityName.indexOf("江苏") > -1) {
-		pname = "江苏"
+	if (cityName.indexOf("宁夏") > -1) {
+		pname = "宁夏"
 	}
 	if (cityName.indexOf("内蒙古") > -1) {
 		pname = "内蒙古"

+ 2 - 2
VbdsmUI_V2.1.1/src/pc/powerservice/anal/affect_category/category.html

@@ -94,12 +94,12 @@
             id="checkSpan"></span>
         <a class="easyui-linkbutton" data-options="plain:false, iconCls:'icon-ok'" href="javascript:void(0);"
            id="selectBtn">确定</a>
-        <a class="easyui-splitbutton" data-options="plain:false, menu:'#mm1',iconCls:'icon-other'" href="javascript:;"
+        <!-- <a class="easyui-splitbutton" data-options="plain:false, menu:'#mm1',iconCls:'icon-other'" href="javascript:;"
            id="btnO">其它</a>
         <div id="mm1" style="width: 100px;">
             <div data-options="iconCls:'icon-device'" onclick="showEquipmentList()">设备列表</div>
             <div data-options="iconCls:'icon-pictures'" onclick="showMonitorPicture()">配网图</div>
-        </div>
+        </div> -->
     </div>
     <div id='monitorDiv'>
         <div class="chartbox" id="monitorChart" style="height:300px;border-bottom:1px solid #DDD">

+ 2 - 2
VbdsmUI_V2.1.1/src/pc/powerservice/anal/affect_time/time.html

@@ -78,12 +78,12 @@
                                                          style="width: 100px;"/>
         <span id="checkSpan"></span> <a class="easyui-linkbutton" data-options="plain:false, iconCls:'icon-ok'" href="javascript:void(0);"
                                         id="selectBtn">确定</a>
-        <a class="easyui-splitbutton" data-options="plain:false, menu:'#mm1',iconCls:'icon-other'" href="javascript:;"
+        <!-- <a class="easyui-splitbutton" data-options="plain:false, menu:'#mm1',iconCls:'icon-other'" href="javascript:;"
            id="btnO">其它</a>
         <div id="mm1" style="width: 100px;">
             <div data-options="iconCls:'icon-device'" onclick="showEquipmentList()">设备列表</div>
             <div data-options="iconCls:'icon-pictures'" onclick="showMonitorPicture()">配网图</div>
-        </div>
+        </div> -->
     </div>
     <div style="padding: 2px; background-color: #eee; border-bottom: solid 1px #ddd; vertical-align: left; color: #444444;">
 			<span id="daySpan"> 第一时间:<input class="easyui-datebox" id="day1" style="width: 100px"></input> 第二时间:<input

+ 2 - 2
VbdsmUI_V2.1.1/src/pc/powerservice/anal/date/date.html

@@ -79,11 +79,11 @@
 						<option value="31">31次畸变率</option>
 					</select>
 				</span>
-				<a class="easyui-splitbutton" data-options="plain:false, menu:'#mm1',iconCls:'icon-other'" href="javascript:;" id="btnO">其它</a>
+				<!-- <a class="easyui-splitbutton" data-options="plain:false, menu:'#mm1',iconCls:'icon-other'" href="javascript:;" id="btnO">其它</a>
 				<div id="mm1" style="width: 100px">
 					<div data-options="iconCls:'icon-device'" onclick="showEquipmentList()">设备列表</div>
 					<div data-options="iconCls:'icon-pictures'" onclick="showMonitorPicture()">配网图</div>
-				</div>
+				</div> -->
 			</div>
 			<div class="chartbox" id="monitorChart" style="height: 300px">
 				<div id="container" style="width: 100%; height: 298px; margin: 0 auto; float: left"></div>

+ 1 - 1
VbdsmUI_V2.1.1/src/pc/powerservice/anal/index/indexAnalyse.html

@@ -86,7 +86,7 @@
 					<a class="easyui-linkbutton" data-options="plain:false, iconCls:'icon-collapse'" href="javascript:changePanel();" id="queryOption">折叠查询</a>
 					<a class="easyui-linkbutton" data-options="plain:false, iconCls:'icon-ok'" href="javascript:query();">确定</a>
 					<a class="easyui-linkbutton" data-options="plain:false, iconCls:'icon-cancel'" href="javascript:clearAll();">清空</a>
-					<a class="easyui-linkbutton" data-options="iconCls:'icon-excelexport',plain:false" href="javascript:exportExcel();" id="pourOut">导出Excel</a>
+					<!-- <a class="easyui-linkbutton" data-options="iconCls:'icon-excelexport',plain:false" href="javascript:exportExcel();" id="pourOut">导出Excel</a> -->
 				</div>
 				<div class="easyui-panel" data-options="border:false,noheader:true" id="panel" style="width: 100%; height: auto; padding: 10px; background-color: #eee">
 					<table id="selectOptions" style="width: 100%">

+ 2 - 2
VbdsmUI_V2.1.1/src/pc/powerservice/anal/month/month.html

@@ -57,11 +57,11 @@
 				<a class="easyui-linkbutton" id="nextMonth" style="margin-left: -5px; height: 22px; width: 25px; disabled: disabled" title="后一月">&gt;</a>
 				曲线:<input class="easyui-combobox" id="ImageType" panelHeight="auto" style="width: 120px" />
 				<span id="checkSpan"></span>
-				<a class="easyui-splitbutton" data-options="plain:false, menu:'#mm1',iconCls:'icon-other'" href="javascript:;" id="btnO">其它</a>
+				<!-- <a class="easyui-splitbutton" data-options="plain:false, menu:'#mm1',iconCls:'icon-other'" href="javascript:;" id="btnO">其它</a>
 				<div id="mm1" style="width: 100px">
 					<div data-options="iconCls:'icon-device'" onclick="showEquipmentList()">设备列表</div>
 					<div data-options="iconCls:'icon-pictures'" onclick="showMonitorPicture()">配网图</div>
-				</div>
+				</div> -->
 			</div>
 			<div class="chartbox" id="monitorChart" style="height: 300px">
 				<div id="container" style="height: 298px; width: 100%; margin: 0 auto; float: left"></div>

+ 2 - 2
VbdsmUI_V2.1.1/src/pc/powerservice/anal/year/year.html

@@ -57,11 +57,11 @@
 				<a class="easyui-linkbutton" id="nextYear" style="margin-left: -5px; height: 22px; width: 25px; disabled: disabled" title="后一年">&gt;</a>
 				曲线:<input class="easyui-combobox" id="ImageType" panelHeight="auto" style="width: 120px" />
 				<span id="checkSpan"></span>
-				<a class="easyui-splitbutton" data-options="plain:false, menu:'#mm1',iconCls:'icon-other'" href="javascript:;" id="btnO">其它</a>
+				<!-- <a class="easyui-splitbutton" data-options="plain:false, menu:'#mm1',iconCls:'icon-other'" href="javascript:;" id="btnO">其它</a>
 				<div id="mm1" style="width: 100px">
 					<div data-options="iconCls:'icon-device'" onclick="showEquipmentList()">设备列表</div>
 					<div data-options="iconCls:'icon-pictures'" onclick="showMonitorPicture()">配网图</div>
-				</div>
+				</div> -->
 			</div>
 
 			<div class="chartbox" id="monitorChart" style="height: 300px">

+ 2 - 2
VbdsmUI_V2.1.1/src/static/js/lib/echarts/build/dist/chart/map.js

@@ -2143,7 +2143,7 @@ define(
 					})
 				},
 			},
-			江苏: {
+			宁夏: {
 				getGeoJson: function (i) {
 					e(["./geoJson/ning_xia_geo"], function (e) {
 						i(t(e))
@@ -3022,7 +3022,7 @@ define(
 					properties: { name: "重庆", cp: [107.7539, 30.1904], childNum: 40 },
 					geometry: { type: "Polygon", coordinates: ["@@əȂòɜƨ˜ѺɛƦȁ̐@ƪ—õŏφƥòȃƥ̍Ƨôυ̏ƧôñóóôɛŏƩôƧƥôƧóυƨœ̒ѹôœƦȃ@փƥɛ̑@@ɜƧó@ɚƧ@ñφσõ@ŎɝôƧ—@ʵѷóƧʵó˜@ŎóŐó@ôȁƥ›ó̒υôóʶə˜ƧȄς̎ƧȂôƨƨƨφɛ̎Őƨʷɞ@ςԮóŌôôφ@ɜֈ̎ƨ"], encodeOffsets: [[111150, 32446]] },
 				},
-				{ type: "Feature", id: "ning_xia", properties: { name: "江苏", cp: [105.9961, 37.3096], childNum: 5 }, geometry: { type: "Polygon", coordinates: ["@@ల̒ôޠφӒςôƪͧυևɜŋѺó̎ȁ̍ɛ@ѹס@@ʵƧȁôó@ǿ̐ŏöʵɝŋɛ@ô̑ƥóóƨƧ—ó˜ôœó@ƩôóƦ̍œóȀƨŎɛӒôŐυͪɛ@@Ȁə@"], encodeOffsets: [[106831, 38340]] } },
+				{ type: "Feature", id: "ning_xia", properties: { name: "宁夏", cp: [105.9961, 37.3096], childNum: 5 }, geometry: { type: "Polygon", coordinates: ["@@ల̒ôޠφӒςôƪͧυևɜŋѺó̎ȁ̍ɛ@ѹס@@ʵƧȁôó@ǿ̐ŏöʵɝŋɛ@ô̑ƥóóƨƧ—ó˜ôœó@ƩôóƦ̍œóȀƨŎɛӒôŐυͪɛ@@Ȁə@"], encodeOffsets: [[106831, 38340]] } },
 				{ type: "Feature", id: "hai_nan", properties: { name: "海南", cp: [109.9512, 19.2041], childNum: 18 }, geometry: { type: "Polygon", coordinates: ["@@φɜƦʶ̐ôφô̎@ƨŎö@τʵƦ˜ԩ۫õН̏óƥȃƧ@Ʃəםƨ̑Ʀ@ޤ"], encodeOffsets: [[111240, 19846]] } },
 				{ type: "Feature", id: "tai_wan", properties: { name: "台湾", cp: [121.0254, 23.5986], childNum: 1 }, geometry: { type: "Polygon", coordinates: ["@@ô—ƩɝöƧɝѵəޣ̏ρƩԭóōóͪρɞƧОôԪ݈ଦѶɜ̒ɛ"], encodeOffsets: [[124831, 25650]] } },
 				{ type: "Feature", id: "bei_jing", properties: { name: "北京", cp: [116.4551, 40.2539], childNum: 19 }, geometry: { type: "Polygon", coordinates: ["@@óóó›υóôƥ@ŏóóə@ƧŋƩŌρóɛŐóʶѶʴƥʶ̎œôƨɞ@óŎɜŌ̎̍φ›Ƨŋƨʵ"], encodeOffsets: [[120241, 41176]] } },

+ 2 - 2
VbdsmUI_V2.1.1/src/static/js/lib/echarts/build/dist/echarts-all.js

@@ -17401,7 +17401,7 @@
 						})
 					},
 				},
-				江苏: {
+				宁夏: {
 					getGeoJson: function (i) {
 						e(["./geoJson/ning_xia_geo"], function (e) {
 							i(t(e))
@@ -18256,7 +18256,7 @@
 						properties: { name: "重庆", cp: [107.7539, 30.1904], childNum: 40 },
 						geometry: { type: "Polygon", coordinates: ["@@əȂòɜƨ˜ѺɛƦȁ̐@ƪ—õŏφƥòȃƥ̍Ƨôυ̏ƧôñóóôɛŏƩôƧƥôƧóυƨœ̒ѹôœƦȃ@փƥɛ̑@@ɜƧó@ɚƧ@ñφσõ@ŎɝôƧ—@ʵѷóƧʵó˜@ŎóŐó@ôȁƥ›ó̒υôóʶə˜ƧȄς̎ƧȂôƨƨƨφɛ̎Őƨʷɞ@ςԮóŌôôφ@ɜֈ̎ƨ"], encodeOffsets: [[111150, 32446]] },
 					},
-					{ type: "Feature", id: "ning_xia", properties: { name: "江苏", cp: [105.9961, 37.3096], childNum: 5 }, geometry: { type: "Polygon", coordinates: ["@@ల̒ôޠφӒςôƪͧυևɜŋѺó̎ȁ̍ɛ@ѹס@@ʵƧȁôó@ǿ̐ŏöʵɝŋɛ@ô̑ƥóóƨƧ—ó˜ôœó@ƩôóƦ̍œóȀƨŎɛӒôŐυͪɛ@@Ȁə@"], encodeOffsets: [[106831, 38340]] } },
+					{ type: "Feature", id: "ning_xia", properties: { name: "宁夏", cp: [105.9961, 37.3096], childNum: 5 }, geometry: { type: "Polygon", coordinates: ["@@ల̒ôޠφӒςôƪͧυևɜŋѺó̎ȁ̍ɛ@ѹס@@ʵƧȁôó@ǿ̐ŏöʵɝŋɛ@ô̑ƥóóƨƧ—ó˜ôœó@ƩôóƦ̍œóȀƨŎɛӒôŐυͪɛ@@Ȁə@"], encodeOffsets: [[106831, 38340]] } },
 					{ type: "Feature", id: "hai_nan", properties: { name: "海南", cp: [109.9512, 19.2041], childNum: 18 }, geometry: { type: "Polygon", coordinates: ["@@φɜƦʶ̐ôφô̎@ƨŎö@τʵƦ˜ԩ۫õН̏óƥȃƧ@Ʃəםƨ̑Ʀ@ޤ"], encodeOffsets: [[111240, 19846]] } },
 					{ type: "Feature", id: "tai_wan", properties: { name: "台湾", cp: [121.0254, 23.5986], childNum: 1 }, geometry: { type: "Polygon", coordinates: ["@@ô—ƩɝöƧɝѵəޣ̏ρƩԭóōóͪρɞƧОôԪ݈ଦѶɜ̒ɛ"], encodeOffsets: [[124831, 25650]] } },
 					{ type: "Feature", id: "bei_jing", properties: { name: "北京", cp: [116.4551, 40.2539], childNum: 19 }, geometry: { type: "Polygon", coordinates: ["@@óóó›υóôƥ@ŏóóə@ƧŋƩŌρóɛŐóʶѶʴƥʶ̎œôƨɞ@óŎɜŌ̎̍φ›Ƨŋƨʵ"], encodeOffsets: [[120241, 41176]] } },

+ 2 - 2
VbdsmUI_V2.1.1/src/static/js/lib/echarts/build/source/chart/map.js

@@ -3503,7 +3503,7 @@ define("echarts/util/mapData/params", ["require"], function (require) {
 				})
 			},
 		},
-		江苏: {
+		宁夏: {
 			getGeoJson: function (callback) {
 				require(["./geoJson/ning_xia_geo"], function (md) {
 					callback(decode(md))
@@ -5011,7 +5011,7 @@ define("echarts/util/mapData/geoJson/china_geo", [], function () {
 				type: "Feature",
 				id: "ning_xia",
 				properties: {
-					name: "江苏",
+					name: "宁夏",
 					cp: [105.9961, 37.3096],
 					childNum: 5,
 				},

+ 2 - 2
VbdsmUI_V2.1.1/src/static/js/lib/echarts/build/source/echarts-all.js

@@ -30369,7 +30369,7 @@
 					})
 				},
 			},
-			江苏: {
+			宁夏: {
 				getGeoJson: function (callback) {
 					require(["./geoJson/ning_xia_geo"], function (md) {
 						callback(decode(md))
@@ -31850,7 +31850,7 @@
 					type: "Feature",
 					id: "ning_xia",
 					properties: {
-						name: "江苏",
+						name: "宁夏",
 						cp: [105.9961, 37.3096],
 						childNum: 5,
 					},

+ 1 - 1
VbdsmUI_V2.1.1/src/static/js/lib/echarts/util/mapData/geoJson/china_geo.js

@@ -166,7 +166,7 @@ define(function () {
 				properties: { name: "重庆", cp: [107.7539, 30.1904], childNum: 40 },
 				geometry: { type: "Polygon", coordinates: ["@@əȂòɜƨ˜ѺɛƦȁ̐@ƪ—õŏφƥòȃƥ̍Ƨôυ̏ƧôñóóôɛŏƩôƧƥôƧóυƨœ̒ѹôœƦȃ@փƥɛ̑@@ɜƧó@ɚƧ@ñφσõ@ŎɝôƧ—@ʵѷóƧʵó˜@ŎóŐó@ôȁƥ›ó̒υôóʶə˜ƧȄς̎ƧȂôƨƨƨφɛ̎Őƨʷɞ@ςԮóŌôôφ@ɜֈ̎ƨ"], encodeOffsets: [[111150, 32446]] },
 			},
-			{ type: "Feature", id: "ning_xia", properties: { name: "江苏", cp: [105.9961, 37.3096], childNum: 5 }, geometry: { type: "Polygon", coordinates: ["@@ల̒ôޠφӒςôƪͧυևɜŋѺó̎ȁ̍ɛ@ѹס@@ʵƧȁôó@ǿ̐ŏöʵɝŋɛ@ô̑ƥóóƨƧ—ó˜ôœó@ƩôóƦ̍œóȀƨŎɛӒôŐυͪɛ@@Ȁə@"], encodeOffsets: [[106831, 38340]] } },
+			{ type: "Feature", id: "ning_xia", properties: { name: "宁夏", cp: [105.9961, 37.3096], childNum: 5 }, geometry: { type: "Polygon", coordinates: ["@@ల̒ôޠφӒςôƪͧυևɜŋѺó̎ȁ̍ɛ@ѹס@@ʵƧȁôó@ǿ̐ŏöʵɝŋɛ@ô̑ƥóóƨƧ—ó˜ôœó@ƩôóƦ̍œóȀƨŎɛӒôŐυͪɛ@@Ȁə@"], encodeOffsets: [[106831, 38340]] } },
 			{ type: "Feature", id: "hai_nan", properties: { name: "海南", cp: [109.9512, 19.2041], childNum: 18 }, geometry: { type: "Polygon", coordinates: ["@@φɜƦʶ̐ôφô̎@ƨŎö@τʵƦ˜ԩ۫õН̏óƥȃƧ@Ʃəםƨ̑Ʀ@ޤ"], encodeOffsets: [[111240, 19846]] } },
 			{ type: "Feature", id: "tai_wan", properties: { name: "台湾", cp: [121.0254, 23.5986], childNum: 1 }, geometry: { type: "Polygon", coordinates: ["@@ô—ƩɝöƧɝѵəޣ̏ρƩԭóōóͪρɞƧОôԪ݈ଦѶɜ̒ɛ"], encodeOffsets: [[124831, 25650]] } },
 			{ type: "Feature", id: "bei_jing", properties: { name: "北京", cp: [116.4551, 40.2539], childNum: 19 }, geometry: { type: "Polygon", coordinates: ["@@óóó›υóôƥ@ŏóóə@ƧŋƩŌρóɛŐóʶѶʴƥʶ̎œôƨɞ@óŎɜŌ̎̍φ›Ƨŋƨʵ"], encodeOffsets: [[120241, 41176]] } },

+ 1 - 1
VbdsmUI_V2.1.1/src/static/js/lib/echarts/util/mapData/params.js

@@ -386,7 +386,7 @@ define(function (require) {
 				})
 			},
 		},
-		江苏: {
+		宁夏: {
 			getGeoJson: function (callback) {
 				require(["./geoJson/ning_xia_geo"], function (md) {
 					callback(decode(md))

+ 1 - 1
VbdsmUI_V2.1.1/src/static/js/lib/echarts/util/mapData/rawData/geoJson/china_city.json

@@ -2135,7 +2135,7 @@
 		"改则": { "x": "84.1", "y": "32.33" },
 		"普兰": { "x": "81.18", "y": "30.37" }
 	},
-	"江苏": {
+	"宁夏": {
 		"银川": { "x": "106.27", "y": "38.47" },
 		"永宁": { "x": "106.24", "y": "38.28" },
 		"贺兰": { "x": "106.35", "y": "38.55" },

+ 1 - 1
VbdsmUI_V2.1.1/src/static/js/lib/echarts/util/mapData/rawData/geoJson/china_geo.json

@@ -2798,7 +2798,7 @@
 		{
 			"type": "Feature",
 			"id": "ning_xia",
-			"properties": { "name": "江苏", "cp": [105.9961, 37.3096], "childNum": 5 },
+			"properties": { "name": "宁夏", "cp": [105.9961, 37.3096], "childNum": 5 },
 			"geometry": {
 				"type": "Polygon",
 				"coordinates": [