From b009a2de00fbee557647c6619123f7c425021523 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 8 Mar 2022 10:10:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AE=BF=E8=88=8D=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B--=E5=85=AC=E5=AF=93=E6=A5=BC=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E3=80=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Accommodation/Floor.cshtml          | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml
index 60987f4f5..d76eb7d4e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml	
@@ -57,8 +57,7 @@
                     @*山西省小店区高新校区*@
 
                     <ul class="indSec1List">
-                        @*<li><a href="#"><img src="/Content/images/floor/inSec1-5.png" alt="" />多条件查找宿舍楼</a></li>*@
-                        <li><a href="#" @@click="allocation()"><img src="/Content/images/floor/inSec1-6.png" alt="" />自动分配宿舍</a></li>
+                        @*<li><a href="#" @@click="allocation()"><img src="/Content/images/floor/inSec1-6.png" alt="" />自动分配宿舍</a></li>*@
                         <li><a href="#" @@click="addFloor()"><img src="/Content/images/floor/inSec1-7.png" alt="" />添加宿舍楼</a></li>
                         @*<li><a href="#"><img src="/Content/images/floor/inSec1-8.png" alt="" />批量删除</a></li>*@
                         @*<li><a href="#"><img src="/Content/images/floor/inSec1-9.png" alt="" />打印宿舍数据</a></li>*@
@@ -75,7 +74,10 @@
                                         <div class="inSec1Con inSec1Con1">
                                             <img class="inSec1Horn" src="/Content/images/floor/inSec1-11.png" alt="" />
                                             <div class="inSec1Con2">
-                                                <div class="inSec1ConT">{{floor.dormitory.Name}} <div class="inSec1Sex" :style="floor.dormitory.Sex | filter_style"><img :src="floor.dormitory.Sex | filter_sexImg" alt="" />{{floor.dormitory.Sex | filter_sex}}</div></div>
+                                                <div class="inSec1ConT">
+                                                    {{floor.dormitory.Name}}
+                                                    @*<div class="inSec1Sex" :style="floor.dormitory.Sex | filter_style"><img :src="floor.dormitory.Sex | filter_sexImg" alt="" />{{floor.dormitory.Sex | filter_sex}}</div>*@
+                                                </div>
                                                 <div class="inSec1ConTxt">
                                                     <span>{{floor.UnitNum}}</span>单元 <span>{{floor.floorNum}}</span>层 <span>{{floor.RoomNum}}</span>间
                                                 </div>
@@ -131,7 +133,7 @@
                     }.bind(this), 1000);
                 },
                 filter_Dept: function (value) {
-                    var result;
+                    var result = '';
                     top.learun.clientdata.getAsync('custmerData', {
                         sync: true,
                         url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
@@ -144,7 +146,7 @@
                     return result;
                 },
                 filter_Major: function (value) {
-                    var result;
+                    var result = '';
                     top.learun.clientdata.getAsync('custmerData', {
                         sync: true,
                         url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
@@ -195,7 +197,7 @@
                 },
                 addFloor: function () {
                     var url = "";
-                    url = top.$.rootUrl + '/LogisticsManagement/Accommodation/Form';
+                    url = top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify';
                     top.learun.layerForm({
                         id: 'form',
                         title: '新增',
@@ -212,7 +214,7 @@
                     top.learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/LogisticsManagement/Accommodation/Form?keyValue=' + id,
+                        url: top.$.rootUrl + '/LogisticsManagement/Accommodation/FormClassify?keyValue=' + id,
                         width: 600,
                         height: 400,
                         callBack: function (id) {
@@ -234,7 +236,10 @@
                     var echarts1;
                     //圆形图
                     var i = 0;
-                    var g = (floor.HasStudentNum / floor.BedNum) * 100 + "%";
+                    var g = "0%";
+                    if (!!floor.HasStudentNum && !!floor.BedNum && floor.HasStudentNum != 0 && floor.BedNum != 0) {
+                        g = ((floor.HasStudentNum / floor.BedNum) * 100).toFixed(2) + "%";
+                    }
                     layer.open({
                         type: 1,
                         closeBtn: 2,
@@ -243,7 +248,8 @@
                             '<img class="layerImg" src="/Content/images/floor/inSec1-4.png" alt="" />' +
                             '<div class="layer_sec1 layer_sec">' +
                             '<div class="laySec1L">' +
-                            '<div class="laySec1ConT">' + floor.dormitory.Name + this.filter_sex(floor.dormitory.Sex) +
+                            '<div class="laySec1ConT">' + floor.dormitory.Name +
+                            '<span style="display:none">' + this.filter_sex(floor.dormitory.Sex) + '</span>' +
                             '</div>' +
                             '<div class="laySec1R">' +
                             '<div><div class="laySec1Txt"><span>负&nbsp;责&nbsp;人</span>' + floor.dormitory.Functionary + '</div>  <div class="laySec1Txt"><span>负责人电话</span>' + floor.dormitory.Phone + '</div></div>' +
@@ -254,15 +260,15 @@
                             '<div class="layer_sec layer_sec2">' +
                             '<ul class="laySec2List">' +
                             '<li><span>编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</span>' + floor.dormitory.Name + '</li>' +
-                            '<li><span>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</span>' + floor.dormitory.Price + ' <i>元</i></li>' +
+                            '<li><span>价&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</span>' + (floor.dormitory.Price == null ? '' : floor.dormitory.Price) + ' <i>元</i></li>' +
                             '<li><span>单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;元</span>' + floor.UnitNum + ' <i>个</i></li>' +
                             '<li><span>入&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;住</span>' + floor.HasStudentNum + ' <i>人</i></li>' +
                             '<li><span>楼&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;层</span>' + floor.floorNum + ' <i>层</i></li>' +
                             '<li><span>空&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;床</span>' + floor.NoStudentNum + ' <i>床</i></li>' +
                             '<li><span>房&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</span>' + floor.RoomNum + ' <i>间</i></li>' +
-                            '<li><span>涉及院系</span>' + this.filter_Dept(floor.dormitory.Dept) + '</li>' +
+                            //'<li><span>涉及院系</span>' + this.filter_Dept(floor.dormitory.Dept) + '</li>' +
                             '<li><span>床&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位</span>' + floor.UnitNum + ' <i>个</i></li>' +
-                            '<li><span>涉及专业</span>' + this.filter_Major(floor.dormitory.Major) + '</li>' +
+                            // '<li><span>涉及专业</span>' + this.filter_Major(floor.dormitory.Major) + '</li>' +
                             '</ul>' +
                             '<div class="laySec2Btn">' +
                             //'<a href="#"><img @@click="update(floor.dormitory.ID)" src="/Content/images/floor/inSec1-1.png" alt="" /></a>' +