Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/school/js/schoolDetail.js

@@ -190,7 +190,7 @@ function getSchoolType(id) {
 			return '小学';
 			break;
 		case 2:
-			return '初级中学';
+			return '中学';
 			break;
 		case 6:
 			return '高等院校';

nngkxxdp/src/main/resources/static/school/school.html

@@ -130,6 +130,7 @@
     var limit;
     var schoolData;
     PATH = "https://www.cqna.gov.cn/data";
+    // PATH = "http://localhost:7777";
     schoolName = ''
     schoolLocation = ''
     department = ''
@@ -290,7 +291,7 @@
                 return '小学';
                 break;
             case 2:
-                return '初级中学';
+                return '中学';
                 break;
             case 6:
                 return '高等院校';
@@ -375,7 +376,7 @@
         }
     }
     function gotoOfficial(number) {
-        if (schoolData[number].website != null) {
+        if (schoolData[number].website != null && schoolData[number].website != '') {
             window.location.href = schoolData[number].website;
         }
     }