elis 2 лет назад
Родитель
Сommit
c98539e052

+ 9 - 11
nngkxxdp/src/main/resources/static/school/js/schoolDetail.js

@@ -56,16 +56,14 @@ function initHead(data){
 	let html = '<div class="title" id="name">' + data.name + '</div>' +
 		'<div class="other">' +
 			'<ul>' +
-				'<li id="district">所在区:'+data.address+'</li>' +
-				'<li id="natureOfTheSchool">学校性质:'+natureType+'</li>' +
-				'<li title="'+canteenType+'">餐食情况:'+canteenType+'</li>' +
-				'<li>上级主管部门:'+competentDepartment+'</li>' +
+				'<li id="district">所在区:'+data.address+'</li>' +
+				'<li id="natureOfTheSchool">学校性质:'+natureType+'</li>' +
+				'<li>上级主管部门:'+competentDepartment+'</li>' +
 			'</ul>' +
 			'<ul>' +
-				'<li id="postcode">邮编:'+postal+'</li>' +
-				'<li id="schoolClasses">学校类别:'+schoolType+'</li>' +
-				'<li title="'+recruitType+'">招生方式:'+recruitType+'</li>' +
-				'<li>监督电话:'+superviseTel+'</li>' +
+				'<li id="postcode">邮编:'+postal+'</li>' +
+				'<li id="schoolClasses">学校类别:'+schoolType+'</li>' +
+				'<li>监督电话:'+superviseTel+'</li>' +
 			'</ul>' +
 		'</div>' +
 		'<ul class="bottom">' +
@@ -80,14 +78,14 @@ function initHead(data){
 function gotos(src){
 
 	// console.log(src)
-	window.open(src);
+	window.location.href=src;
 }
 let p =[]
 function initbody(data){
 	p.push(data.introduce)
 	p.push(data.principalIntroduce)
-	p.push(data.traffic)
-	p.push(data.recruitInfo)
+	p.push(data.canteenType)
+	p.push(data.recruitType)
 	document.getElementById('contentText').innerHTML = p[0]
 	document.getElementById('jsao').innerHTML = data.countrySupport
 }

+ 5 - 2
nngkxxdp/src/main/resources/static/school/school.html

@@ -4,10 +4,10 @@
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <title>学校</title>
-    <link rel="stylesheet" href="css/conmon.css">
     <link rel="stylesheet" href="css/school.css">
+    <link rel="stylesheet" href="css/conmon.css">
     <style>
         .btn{
             width: 120px;
@@ -17,6 +17,7 @@
             color: #fff;
             border-radius: 10px;
         }
+
     </style>
 </head>
 
@@ -324,6 +325,7 @@
         switch (id) {
             case 0: return '公办';break;
             case 1: return '民办';break;
+            case 2: return '股份制';break;
         }
     }
     function getSchoolTypeImg(id) {
@@ -381,6 +383,7 @@
         }
     }
 
+
 </script>
 
 </html>

+ 2 - 2
nngkxxdp/src/main/resources/static/school/schoolDetail.html

@@ -257,8 +257,8 @@
         <ul class="titleList">
             <li id="school" class="click" onclick="checkSchool()">学校介绍</li>
             <li id="principal" onclick="checkPrincipal()">校长介绍</li>
-            <li id="JT" onclick="checkJT()">交通介绍</li>
-            <li id="ZZZS" onclick="checkZZZS()">自主招生</li>
+            <li id="JT" onclick="checkJT()">餐食情况</li>
+            <li id="ZZZS" onclick="checkZZZS()">招生方式</li>
 
         </ul>
         <div style="font-size: 16px;color: #333333;text-indent: 40px;margin-top: 20px;line-height: 36px;min-height: 200px;" id="contentText">