From df5176a04b06842f6dd349638111f584b82165d2 Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Wed, 17 Jul 2024 15:30:04 +0800
Subject: [PATCH] 'commit'

---
 .../tb/zbdc/examine/data_submit_xx_new.html   | 64 ++++++-------------
 WebRoot/view/tb/zbdc/examine/template.js      |  2 +-
 2 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/WebRoot/view/tb/zbdc/examine/data_submit_xx_new.html b/WebRoot/view/tb/zbdc/examine/data_submit_xx_new.html
index 11f12b44..7c6fa46d 100644
--- a/WebRoot/view/tb/zbdc/examine/data_submit_xx_new.html
+++ b/WebRoot/view/tb/zbdc/examine/data_submit_xx_new.html
@@ -175,45 +175,10 @@
                     <div class="layui-card">
                         <div class="layui-card-header">小学科学</div>
                         <div class="layui-card-body" id="xxkx">
-
-
-
                         </div>
 
                         <div class="layui-card-header header_top">音乐</div>
-                        <div class="layui-card-body">
-                            <div class="layui-row">
-                                <div class="layui-col-xs4">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label"><span class="require-star"></span>教室（室数）：
-                                        </label>
-                                        <div class="layui-input-block">
-                                            <span class="text" id="xx_yqjtrshshu">0</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs4">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label"><span class="require-star"></span>教室面积（㎡）：
-                                        </label>
-                                        <div class="layui-input-block">
-                                            <span class="text" id="xx_yqjtrmj">0</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs4">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label"><span class="require-star"></span>器材库（间数）：
-                                        </label>
-                                        <div class="layui-input-block">
-                                            <span class="text" id="xx_yqqjkkjshu">0</span>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </div>
-
-
+                        <div class="layui-card-body" id="xxyy">
                         </div>
 
                         <div class="layui-card-header header_top">体育</div>
@@ -749,24 +714,35 @@
                 url: "/QingLong/zbdc/getSchoolCgzb?bureau_id=" + bureauId,
                 success: function (res) {
 
+                    var _mjTitle = "面积（㎡）";
 
-                    var _xxkxHtml = "";
-                    var _xxkx = res.list_xx_kx;                   
 
+                    var _xxkxHtml = "";
+                    var _xxkx = res.list_xx_kx;
                     for (var i = 0; i < _xxkx.length; i++) {
                         if (_xxkx[i].jsny == 0) {
-                            _xxkxHtml += getSingle(_xxkx[i].lx_name, _xxkx[i].mj);
-                        } else {                           
-
+                            _xxkxHtml += getSingle(_xxkx[i].lx_name + _mjTitle, _xxkx[i].mj);
+                        } else {
                             _xxkxHtml += getDouble(_xxkx[i].jsny, _xxkx[i].mj);
-
                         }
 
                     }
+                    $('#xxkx').html(_xxkxHtml);
+
+
+                    var _xxyyHtml = "";
+                    var _xxyy = res.list_xx_yq;
+                    for (var i = 0; i < _xxyy.length; i++) {
+                        if (_xxkx[i].lx_name == '器材库') {
+                            _xxyyHtml += getSingle(_xxkx[i].lx_name + "（间数）", _xxkx[i].mj);
+                        } else {
+                            _xxyyHtml += getSingle("教室" + _mjTitle, _xxkx[i].mj);
+                        }
+                    }
+                    $('#xxyy').html(_xxyyHtml);
+
 
-                    console.log(_xxkxHtml);
 
-                    $('#xxkx').html(_xxkxHtml);
 
 
 
diff --git a/WebRoot/view/tb/zbdc/examine/template.js b/WebRoot/view/tb/zbdc/examine/template.js
index f3cb3460..fd8af7bf 100644
--- a/WebRoot/view/tb/zbdc/examine/template.js
+++ b/WebRoot/view/tb/zbdc/examine/template.js
@@ -30,7 +30,7 @@ function getSingle(text,mj) {
     '<div class="layui-row">'+
     '<div class="layui-col-xs4">'+
     '<div class="layui-form-item">'+
-    '<label class="layui-form-label">'+ text +'面积（㎡）：'+
+    '<label class="layui-form-label">'+ text +'：'+
     '</label>'+
     '<div class="layui-input-block">'+
     '<span class="text">'+ mj +'</span>'+