Merge branch '2.1.2' into 铂沅

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]] } },

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))

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" },

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": [

VbdsmUI_V2.1.1/src/pc/manage/js/desktop.util.js

@@ -437,27 +437,24 @@ define(
 						right: 37,
 					})
 				})()
+				;(function () {
+					//只有企业才提示用电概况
+					if (AUTH.company.orgType != 1) {
+						return
+					}
 
-				/*	(function(){
-			//只有企业才提示用电概况
-			if(AUTH.company.orgType != 1){
-				return;
-			}
-
-			core.openApp({"icon":"electricity_situation.png","fullable":0,"width":1200,"categoryId":0,"state":1,"type":3,"resize":1,"id":142,"content":"[232]","free":1,"title":"用电概况","height":600,"border":0,"reopen":1});
-
-		})();
-		(function(){
-			//只有gov才提示用电概况
-			if(AUTH.company.id == 9370 || AUTH.company.id == 9370){
-				//原尺寸
-				core.openApp({"icon":"bigscreen.png","fullable":1,"width":'100%',"categoryId":29,"state":1,"type":3,"resize":1,"id":146,"content":"[1552]","free":1,"title":"大屏展示","height":'100%',"border":0,"reopen":1},true); //80
-				//全屏
-				//core.openApp({"icon":"bigscreen.png","fullable":1,"width":'100%',"categoryId":29,"state":1,"type":3,"resize":1,"id":146,"content":"[1552]","free":1,"title":"大屏展示","height":h,"border":0,"reopen":1},true);
-			}
-			return;
-
-		})();*/
+					core.openApp({ icon: "electricity_situation.png", fullable: 0, width: 1200, categoryId: 0, state: 1, type: 3, resize: 1, id: 73, content: "[100]", free: 1, title: "用电概况", height: 600, border: 0, reopen: 1 })
+				})()
+				;(function () {
+					//只有gov才提示用电概况
+					// if (AUTH.company.id == 9370 || AUTH.company.id == 9370) {
+					// 	//原尺寸
+					// 	core.openApp({ icon: "bigscreen.png", fullable: 1, width: "100%", categoryId: 29, state: 1, type: 3, resize: 1, id: 146, content: "[1552]", free: 1, title: "大屏展示", height: "100%", border: 0, reopen: 1 }, true) //80
+					// 	//全屏
+					// 	//core.openApp({"icon":"bigscreen.png","fullable":1,"width":'100%',"categoryId":29,"state":1,"type":3,"resize":1,"id":146,"content":"[1552]","free":1,"title":"大屏展示","height":h,"border":0,"reopen":1},true);
+					// }
+					return
+				})()
 			})
 	}
 ),
@@ -5405,6 +5402,7 @@ define(
 									},
 									error: core.ajaxError,
 									success: function (e) {
+										core.tips.close(LNG.success)
 										if (e.status == 1)
 											if ("edit" == add_or_edit || "add" == add_or_edit) {
 												FrameCall.top("Openapp_store", "App.reload", '""')

VbdsmUI_V2.1.1/src/pc/manage/js/setting.util.js

@@ -492,11 +492,13 @@ define(
 							if (data.lastLoginIp == null || data.lastLoginIp == "" || data.lastLoginIp == undefined) {
 								data.lastLoginIp = firstMsg
 							}
+							data.lastLoginIp = data.lastLoginIp ? data.lastLoginIp.split(",")[0] : ""
+							data.currLoginIp = data.currLoginIp ? data.currLoginIp.split(",")[0] : ""
 							$(".main").html(template.compile(a)({ G: G, LNG: LNG, data: data }))
-							$.getScript("http://int.dpool.sina.com.cn/iplookup/iplookup.php?format=js&ip=" + data.currLoginIp, function (r, s) {
+							$.get("/queryIp?type=1&ip=" + data.currLoginIp, function (s) {
 								var msg = "载入中..."
-								if (s == "success") {
-									msg = remote_ip_info.province + " " + remote_ip_info.city
+								if (s.code == 0) {
+									msg = s.address
 								} else {
 									msg = "获取失败"
 								}
@@ -505,10 +507,11 @@ define(
 							if (firstMsg == data.lastLoginIp) {
 								$("#lastLoginAddr").text(firstMsg)
 							} else {
-								$.getScript("http://int.dpool.sina.com.cn/iplookup/iplookup.php?format=js&ip=" + data.lastLoginIp, function (r, s) {
+								//https://www.ip.cn/api/index?type=1&ip= Nignx代理到此地址，否则会出现跨域错误
+								$.get("/queryIp?type=1&ip=" + data.lastLoginIp, function (s) {
 									var msg = "载入中..."
-									if (s == "success") {
-										msg = remote_ip_info.province + " " + remote_ip_info.city
+									if (s && s.code == 0) {
+										msg = s.address
 									} else {
 										msg = "获取失败"
 									}

VbdsmUI_V2.1.1/src/pc/manage/setting_system.html

@@ -51,7 +51,7 @@
 		<div class="box">
 			<div class="title" style="padding-top: 20px"><span>用户体验</span></div>
 			<div class="section system_setting" style="border-top: none">
-				<div class="box_line">
+				<!-- <div class="box_line">
 					<input name="auto_open_apps" type="hidden" />
 					<div>
 						<span class="infotitle">登录后自动打开APP:</span>
@@ -66,7 +66,7 @@
 						</li>
 					</ul>
 					<ol class="auto-open-box"></ol>
-				</div>
+				</div> -->
 				<!-- <div class="box_line">
 					<span class="infotitle">{{LNG.auto_login}}:</span>
 					<label>

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 = "内蒙古"

VbdsmUI_V2.1.1/src/pc/powergov/platformparkuser/js/datagrid.js

@@ -68,7 +68,7 @@ tableObj.datagrid({
 				align: "left",
 				formatter: function (value, row) {
 					var orgId = row.orgId
-					return '<a href="http://' + host + "/?auth_cid=" + orgId + '" target="_parent">' + value + "</a>"
+					return '<a href="http://' + host + "/classic.html?auth_cid=" + orgId + '" target="_parent">' + value + "</a>"
 				},
 			},
 			{

VbdsmUI_V2.1.1/src/pc/powergov/platformuser/js/datagrid.js

@@ -69,7 +69,7 @@ tableObj.datagrid({
 				align: "left",
 				formatter: function (value, row) {
 					var orgId = row.orgId
-					return '<a href="http://' + host + "/?auth_cid=" + orgId + '" target="_blank">' + value + "</a>"
+					return '<a href="http://' + host + "/classic.html?auth_cid=" + orgId + '" target="_blank">' + value + "</a>"
 				},
 			},
 			{

VbdsmUI_V2.1.1/src/pc/powergov/statistics/js/power_distribution_load_chart_new.js

@@ -1159,7 +1159,7 @@ function initTabData() {
 					align: "left",
 					formatter: function (value, row) {
 						var orgId = row.companyId
-						return '<a href="http://' + host + "/?auth_cid=" + orgId + '" target="_blank">' + value + "</a>"
+						return '<a href="http://' + host + "/classic.html?auth_cid=" + orgId + '" target="_blank">' + value + "</a>"
 					},
 				},
 				{

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">

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

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>

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%">

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>

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">

VbdsmUI_V2.1.1/src/pc/powerservice/powerservice/powerserviceList.html

@@ -247,7 +247,7 @@
 						align: "left",
 						formatter: function (value, row) {
 							var orgId = row.orgId
-							return '<a href="http://' + host + "/?auth_cid=" + orgId + '" target="_blank">' + value + "</a>"
+							return '<a href="http://' + host + "/classic.html?auth_cid=" + orgId + '" target="_blank">' + value + "</a>"
 						},
 					},
 					{ field: "monitorOnline", title: "监测点(离线/总数)", width: 150, align: "center" },

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]] } },

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]] } },

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,
 				},

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,
 					},

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]] } },

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))

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" },

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": [

VbdsmUI_V2.1.1/src/static/js/util.js

@@ -13,8 +13,7 @@ var FrameCall = (function () {
 	var ie = !-[1] //是否ie
 	return {
 		apiOpen: function () {
-			var html =
-				'<input id="FrameCall" type="hidden" action="1" value="1" onclick="FrameCall.api()" result=""/>'
+			var html = '<input id="FrameCall" type="hidden" action="1" value="1" onclick="FrameCall.api()" result=""/>'
 			$(html).prependTo("body")
 		},
 		//其他窗口调用该窗口函数，调用另一个frame的方法
@@ -198,11 +197,7 @@ var Tips = (function () {
 		var tipsIDname = "messageTips"
 		var tipsID = "#" + tipsIDname
 		if ($(tipsID).length == 0) {
-			var html =
-				'<div id="' +
-				tipsIDname +
-				'" class="tips_box"><i></i><span></span>' +
-				'<a class="tips_close">×</a></div>'
+			var html = '<div id="' + tipsIDname + '" class="tips_box" style="border-radius:5px"><i></i><span></span>' + '<a class="tips_close">×</a></div>'
 			$("body").append(html)
 
 			$(tipsID)
@@ -267,28 +262,29 @@ var Tips = (function () {
 			code = msg.code
 			msg = msg.data
 		}
-		if (offset_top == undefined) offset_top = 0
 		var self = _init(msg, code)
+		if (offset_top == undefined || offset_top == 0) offset_top = ($(window).height() - self.innerHeight()) / 2 - 100
 		self
 			.stop(true, true)
 			.css({ opacity: "0", top: offset_top - self.height() })
 			.show()
 			.animate({ opacity: opacity, top: offset_top }, in_time, 0)
-			.delay(delay)
-			.animate({ opacity: 0, top: "-=" + (offset_top + self.height()) }, in_time, 0, function () {
+		setTimeout(function () {
+			self.animate({ opacity: 0, top: "-=" + (offset_top + self.height()) }, in_time, 0, function () {
 				$(this).hide()
 			})
+		}, delay)
 	}
 	var loading = function (msg, code, offset_top) {
 		if (typeof msg == "object") {
 			code = msg.code
 			msg = msg.data
 		}
-		if (offset_top == undefined) offset_top = 0
-		if (msg == undefined) msg = "loading..."
+		if (msg == undefined) msg = "加载中..."
 		msg += "&nbsp;&nbsp; <img src='/images/loading.gif'/>"
 
 		var self = _init(msg, code)
+		if (offset_top == undefined || offset_top == 0) offset_top = ($(window).height() - self.innerHeight()) / 2 - 100
 		self
 			.stop(true, true)
 			.css({ opacity: "0", top: offset_top - self.height() })
@@ -304,22 +300,13 @@ var Tips = (function () {
 				msg = ""
 			}
 		}
-		if (offset_top == undefined) offset_top = 0
 		var self = _init(msg, code)
-		self
-			.delay(delay)
-			.show()
-			.animate(
-				{
-					opacity: 0,
-					top: "-=" + (offset_top + self.height()),
-				},
-				in_time,
-				0,
-				function () {
-					$(this).hide()
-				}
-			)
+		if (offset_top == undefined || offset_top == 0) offset_top = ($(window).height() - self.innerHeight()) / 2 - 100
+		setTimeout(function () {
+			self.animate({ opacity: 0, top: "-=" + (offset_top + self.height()) }, in_time, 0, function () {
+				$(this).hide()
+			})
+		}, delay)
 	}
 	return {
 		tips: tips,
@@ -370,12 +357,7 @@ var MaskView = (function () {
 		if (time != undefined) animatetime == time
 
 		if ($(maskId).length == 0) {
-			var html =
-				'<div id="windowMaskView" style="position:fixed;top:0;left:0;right:0;bottom:0;background:' +
-				color +
-				";opacity:" +
-				opacity +
-				';z-index:9998;"></div><div id="maskViewContent" style="position:absolute;z-index:9999"></div>'
+			var html = '<div id="windowMaskView" style="position:fixed;top:0;left:0;right:0;bottom:0;background:' + color + ";opacity:" + opacity + ';z-index:9998;"></div><div id="maskViewContent" style="position:absolute;z-index:9999"></div>'
 			$("body").append(html)
 			$(maskId).bind("click", close)
 			$(maskContent).bind("click", function (e) {
@@ -400,11 +382,7 @@ var MaskView = (function () {
 		add("<div style='font-size:50px;color:#fff;opacity:0.6;'>" + msg + "</div>")
 	}
 	var image = function (url) {
-		add(
-			"<img src='" +
-				url +
-				"' class='image' onload='MaskView.resize();' style='-webkit-box-reflect: below 1px -webkit-gradient(linear,left top,left bottom,from(transparent),color-stop(80%,transparent),color-stop(70%,rgba(255,255,255,0)),to(rgba(255,255,255,0.3)));'/>"
-		)
+		add("<img src='" + url + "' class='image' onload='MaskView.resize();' style='-webkit-box-reflect: below 1px -webkit-gradient(linear,left top,left bottom,from(transparent),color-stop(80%,transparent),color-stop(70%,rgba(255,255,255,0)),to(rgba(255,255,255,0.3)));'/>")
 		var $content = $(maskContent)
 		var $dom = $content.find(".image")
 		var dragFlag = false,
@@ -537,7 +515,6 @@ var MaskView = (function () {
 			})
 	}
 })(jQuery)
-
 ;(function ($) {
 	$.fn.extend({
 		//dom绑定enter事件  用于input
@@ -577,7 +554,6 @@ var MaskView = (function () {
 		},
 	})
 })(jQuery)
-
 ;(function ($) {
 	$.tooltipsy = function (el, options) {
 		this.options = options
@@ -738,22 +714,12 @@ var MaskView = (function () {
 
 		readify: function () {
 			this.ready = true
-			this.$tipsy = $(
-				'<div id="tooltipsy' +
-					this.random +
-					'" style="position:fixed;z-index:2147483647;display:none">'
-			).appendTo("body")
+			this.$tipsy = $('<div id="tooltipsy' + this.random + '" style="position:fixed;z-index:2147483647;display:none">').appendTo("body")
 			this.$tip = $('<div class="' + this.settings.className + '">').appendTo(this.$tipsy)
 			this.$tip.data("rootel", this.$el)
 			var e = this.$el
 			var t = this.$tip
-			this.$tip.html(
-				this.settings.content != ""
-					? typeof this.settings.content == "string"
-						? this.settings.content
-						: this.settings.content(e, t)
-					: this.title
-			)
+			this.$tip.html(this.settings.content != "" ? (typeof this.settings.content == "string" ? this.settings.content : this.settings.content(e, t)) : this.title)
 		},
 
 		offset: function (el) {
@@ -805,21 +771,7 @@ var date = function (format, timestamp) {
 	}
 	var txt_weekdays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
 	var txt_ordin = { 1: "st", 2: "nd", 3: "rd", 21: "st", 22: "nd", 23: "rd", 31: "st" }
-	var txt_months = [
-		"",
-		"January",
-		"February",
-		"March",
-		"April",
-		"May",
-		"June",
-		"July",
-		"August",
-		"September",
-		"October",
-		"November",
-		"December",
-	]
+	var txt_months = ["", "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
 	var f = {
 		// Day
 		d: function () {
@@ -912,8 +864,7 @@ var date = function (format, timestamp) {
 		},
 		B: function () {
 			var off = (jsdate.getTimezoneOffset() + 60) * 60
-			var theSeconds =
-				jsdate.getHours() * 3600 + jsdate.getMinutes() * 60 + jsdate.getSeconds() + off
+			var theSeconds = jsdate.getHours() * 3600 + jsdate.getMinutes() * 60 + jsdate.getSeconds() + off
 			var beat = Math.floor(theSeconds / 86.4)
 			if (beat > 1000) beat -= 1000
 			if (beat < 0) beat += 1000
@@ -989,12 +940,7 @@ var Base64 = (function () {
 			} else if (isNaN(chr3)) {
 				enc4 = 64
 			}
-			output =
-				output +
-				_keyStr.charAt(enc1) +
-				_keyStr.charAt(enc2) +
-				_keyStr.charAt(enc3) +
-				_keyStr.charAt(enc4)
+			output = output + _keyStr.charAt(enc1) + _keyStr.charAt(enc2) + _keyStr.charAt(enc3) + _keyStr.charAt(enc4)
 		}
 		return output
 	}