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

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

@@ -6,6 +6,15 @@ layui.use(['element', 'form', 'tree', 'util', 'laydate'], function () {
 		layer = layui.layer,
 		util = layui.util,
 		element = layui.element;
+	if (isMobileUserAgent()){
+		console.log(11111111111111)
+		var searchUrl = window.parent.location.href;
+		var searchData = searchUrl.split("=");
+		let id = searchData[1]
+		window.location = 'schoolDetailMobile.html?id='+id
+	}
+
+
 
 	init();
 
@@ -13,6 +22,11 @@ layui.use(['element', 'form', 'tree', 'util', 'laydate'], function () {
 const PATH = "https://www.cqna.gov.cn/data";
 // const PATH = "https://192.168.0.13:7777";
 
+function isMobileUserAgent() {
+	return /iphone|ipod|android.*mobile|windows.*phone|blackberry.*mobile/i.test(
+		window.parent.navigator.userAgent.toLowerCase("")
+	);
+}
 function init(){
 	var searchUrl = window.parent.location.href;
 	var searchData = searchUrl.split("=");

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

@@ -0,0 +1,266 @@
+layui.use(['element', 'form', 'tree', 'util', 'laydate'], function () {
+	var $ = layui.jquery,
+		form = layui.form,
+		laydate = layui.laydate,
+		tree = layui.tree,
+		layer = layui.layer,
+		util = layui.util,
+		element = layui.element;
+
+	init();
+
+});
+const PATH = "https://www.cqna.gov.cn/data";
+// const PATH = "https://192.168.0.13:7777";
+
+function isMobileUserAgent() {
+	return /iphone|ipod|android.*mobile|windows.*phone|blackberry.*mobile/i.test(
+		window.parent.navigator.userAgent.toLowerCase("")
+	);
+}
+function init(){
+	var searchUrl = window.parent.location.href;
+	var searchData = searchUrl.split("=");
+	let id = searchData[1]
+	// let id = "school2022NACC7"
+	get('/nazwSchool/info', true, {"id":id}, function (res) {
+		let data = res.data;
+		if (!data) {
+			return;
+		}
+		initHead(data)
+		initbody(data)
+		conts(data)
+	});
+}
+
+function back(){
+	window.location.replace(PATH + "/school/school.html")
+}
+
+function initHead(data){
+	// data.schoolImg
+	let tup = data.schoolImg==""?"images/school.png":data.schoolImg
+	$(".logo-img").attr("src",tup)
+
+	$(".name").css("background-image","url("+getSchoolTypeImg(data.schoolType)+")")
+	console.log(getSchoolType(data.schoolType))
+	document.getElementById('schoolType').innerText = getSchoolType(data.schoolType)
+	// $(".name").attr("src",tup)
+	console.log(data.natureType)
+	let natureType = getNature(data.natureType);
+
+	let schoolType = getSchoolType(data.schoolType);
+	let canteenType = data.canteenType==null?"":data.canteenType;
+	let recruitType = data.recruitType==null?"":data.recruitType;
+	let postal = data.postal==null?"":data.postal
+	let competentDepartment = data.competentDepartment==null?"":data.competentDepartment
+	let superviseTel = data.superviseTel==null?"":data.superviseTel
+	let wechatImg = data.wechatImg==null?"":data.wechatImg
+	let website = data.website==null?"":data.website
+
+	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>上级主管部门：'+competentDepartment+'</li>' +
+			'</ul>' +
+			'<ul>' +
+				'<li id="postcode">邮编：'+postal+'</li>' +
+				'<li id="schoolClasses">学校类别：'+schoolType+'</li>' +
+				'<li>监督电话：'+superviseTel+'</li>' +
+			'</ul>' +
+		'</div>' +
+		'<ul class="bottom">' +
+			'<li><img src="images/logo-dh.png" alt="" style="margin-right: 0.9375rem;"><span>电话：</span><span class="link" title="'+data.contactTel+'">'+data.contactTel+'</span></li>' +
+			'<li><img src="images/logo-dt.png" alt="" style="margin-right: 0.8125rem;"><span>地址：</span><span class="link" title="'+data.address+'">'+data.address+'</span></li>' +
+			"<li style='cursor:pointer;position: relative;' onclick='clickQRCode()'><img src='images/logo-wx.png' alt=''><span>微信：点击查看二维码</span><div id='ewmImg' style='position: absolute;z-index: 99999;background: #f6f6f6;border-radius: 0.3125rem;height: 9.375rem;width: 9.375rem;padding: 0.5rem;display: none;top: 1.875rem;'><img style='height: 9.375rem;width: 9.375rem;' src='" + wechatImg + "' alt=''></div></li>" +
+			'<li><img src="images/logo-gw.png" alt=""><span>官网：</span><span class="link" onclick="gotos(\''+website+'\')" title="'+website+'">'+website+'</span></li>' +
+		'</ul>'
+	document.getElementById('infoHead').innerHTML =html
+
+}
+function gotos(src){
+	let split = src.split("//");
+	if (split.length>1){
+		window.open(src);
+	}else {
+		window.open("http://"+src)
+	}
+}
+let p =[]
+function initbody(data){
+	p.push(data.introduce)
+	p.push(data.principalIntroduce)
+	p.push(data.canteenType)
+	p.push(data.recruitType)
+	document.getElementById('contentText').innerHTML = p[0]
+	document.getElementById('jsao').innerHTML = data.countrySupport
+}
+
+function conts(data){
+	let html = ""
+	html+=data.bookCharge==null?"":data.bookCharge;
+	// html+=data.studyCharge==null?"":data.studyCharge;
+	document.getElementById('conts').innerHTML = html;
+}
+
+
+function  checkSchool(){
+	document.getElementById('contentText').innerHTML = p[0]
+	$("#school").addClass("click");
+	$("#principal").removeClass("click");
+	$("#JT").removeClass("click");
+	$("#ZZZS").removeClass("click");
+
+}
+function  checkPrincipal(){
+	document.getElementById('contentText').innerHTML = p[1]
+	$("#school").removeClass("click");
+	$("#principal").addClass("click");
+	$("#JT").removeClass("click");
+	$("#ZZZS").removeClass("click");
+}
+function  checkJT(){
+	document.getElementById('contentText').innerHTML = p[2]
+	$("#school").removeClass("click");
+	$("#principal").removeClass("click");
+	$("#JT").addClass("click");
+	$("#ZZZS").removeClass("click");
+}
+function  checkZZZS(){
+	document.getElementById('contentText').innerHTML = p[3]
+	$("#school").removeClass("click");
+	$("#principal").removeClass("click");
+	$("#JT").removeClass("click");
+	$("#ZZZS").addClass("click");
+}
+
+
+
+
+
+/**
+ * 网络请求
+ * @param {Object} type
+ * @param {Object} uri
+ * @param {Object} async
+ * @param {Object} params
+ * @param {Object} callback
+ * @param {Object} errorback
+ */
+function request(type, uri, async, params, callback, errorback) {
+	$.ajax({
+		type: type,
+		async: async,
+		url: PATH  + uri,
+		data: params,
+		dataType: 'json',
+		success: function (res) {
+			if (callback) callback(res);
+		},
+		error: function (err) {
+			if (errorback) errorback(err);
+		}
+	});
+}
+
+/** GET 网络请求
+ * @param {Object} uri
+ * @param {Object} async
+ * @param {Object} params
+ * @param {Object} callback
+ * @param {Object} errorback
+ */
+function get(uri, async, params, callback, errorback) {
+	request('get', uri, async, params, callback, errorback);
+}
+
+/** POST 网络请求
+ * @param {Object} uri
+ * @param {Object} async
+ * @param {Object} params
+ * @param {Object} callback
+ * @param {Object} errorback
+ */
+function post(uri, async, params, callback, errorback) {
+	request('post', uri, async, params, callback, errorback);
+}
+
+function getSchoolType(id) {
+	switch (id) {
+		case 0:
+			return '幼儿园';
+			break;
+		case 1:
+			return '小学';
+			break;
+		case 2:
+			return '中学';
+			break;
+		case 6:
+			return '高等院校';
+			break;
+		case 7:
+			return '特殊教育学校';
+			break;
+		case 8:
+			return '职业院校';
+			break;
+		default:
+			return '';
+			break;
+	}
+}
+function getNature(id) {
+	switch (id) {
+		case 0: return '公办';break;
+		case 1: return '民办';break;
+		case 2: return '股份制';break;
+		default:
+			return '';
+			break;
+	}
+}
+
+function clickQRCode() {
+	if ($("#ewmImg").css("display") == 'none') {
+		$("#ewmImg").css("display", "block");
+	} else {
+		$("#ewmImg").css("display", "none");
+	}
+
+}
+
+function getSchoolTypeImg(id) {
+	switch (id) {
+		case 0:
+			return 'images/bg-yey.png';
+			break;
+		case 1:
+			return 'images/bg-xx.png';
+			break;
+		case 2:
+			return 'images/bg-cz.png';
+			break;
+		case 3:
+			return 'images/bg-gz.png';
+			break;
+		case 4:
+			return 'images/bg-jnygz.png';
+			break;
+		case 5:
+			return 'images/bg-wqzx.png';
+			break;
+		case 6:
+			return 'images/bg-gdyx.png';
+			break;
+		case 7:
+			return 'images/bg-tsjyxx.png';
+			break;
+		case 8:
+			return 'images/bg-zyxx.png';
+			break;
+	}
+}

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

@@ -19,6 +19,9 @@
         }
 
     </style>
+    <script>
+
+    </script>
 </head>
 
 <body>
@@ -129,6 +132,21 @@
 </body>
 <script src="js/jquery-3.5.1.min.js"></script>
 <script>
+
+    if (isMobileUserAgent()){
+        console.log(11111111111111)
+        var searchUrl = window.parent.location.href;
+        var searchData = searchUrl.split("=");
+        let id = searchData[1]
+        window.location = 'schoolMobile.html'
+    }
+
+    function isMobileUserAgent() {
+        return /iphone|ipod|android.*mobile|windows.*phone|blackberry.*mobile/i.test(
+            window.parent.navigator.userAgent.toLowerCase("")
+        );
+    }
+
     var schoolName;
     var schoolLocation;
     var department;

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

@@ -222,6 +222,9 @@
             background-color: #333;
         }
     </style>
+    <script>
+
+    </script>
 </head>
 
 <body>
@@ -295,21 +298,6 @@
     </div>
 </body>
 <script type="text/javascript" src="layui/layui.js" charset="utf-8"></script>
-<script>
-    if (isMobileUserAgent()){
-        var searchUrl = window.parent.location.href;
-        var searchData = searchUrl.split("=");
-        let id = searchData[1]
-        window.location = 'schoolDetail-Mobile.html?id="'+id+'"'
-    }
-
-    function isMobileUserAgent() {
-        return /iphone|ipod|android.*mobile|windows.*phone|blackberry.*mobile/i.test(
-            window.parent.navigator.userAgent.toLowerCase("")
-        );
-    }
-</script>
 <script src="js/jquery-3.5.1.min.js"></script>
 <script src="js/schoolDetail.js"></script>
-
 </html>

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

@@ -308,6 +308,6 @@
 </body>
 <script type="text/javascript" src="layui/layui.js" charset="utf-8"></script>
 <script src="js/jquery-3.5.1.min.js"></script>
-<script src="js/schoolDetail.js"></script>
+<script src="js/schoolDetailMobile.js"></script>
 
 </html>

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

@@ -19,7 +19,7 @@
         }
 
         /* 适配 */
-        @media screen and (max-width: 750px) {
+        /*@media screen and (max-width: 750px) {*/
             .content {
                 width: 100% !important;
             }
@@ -124,7 +124,7 @@
                 height: 2.6rem;
                 overflow: hidden;
             }
-        }
+        /*}*/
     </style>
 </head>
 
@@ -380,7 +380,7 @@
         getData();
     }
     function gotoInfo(id) {
-        window.location.href = PATH + "/school/schoolDetail.html?id=" + schoolData[id].id
+        window.open("https://www.cqna.gov.cn//2022wzgb/sxna/xx/detail.html?id=" + schoolData[id].id)
     }
     // 拿数据
     function getData() {