From aed63616ac05aeaf42716b5a7859c62834b1e54c Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 14 Jan 2022 09:08:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=BD=91=E4=B8=8A=E5=8A=9E=E4=BA=8B=E5=A4=A7?= =?UTF-8?q?=E5=8E=85=E5=8A=9F=E8=83=BD=20=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA=E8=A5=BF=E6=98=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LR_OAModule/Views/ResourceFile/Index.js | 2 ++ .../Content/images/wsbsdt.png | Bin 0 -> 2028 bytes .../Views/Home/AdminDefault.cshtml | 16 ++++++++++++++++ .../Views/UserCenter/Index.cshtml | 2 +- .../Views/UserCenter/IndexForDC.cshtml | 4 ++-- .../Accommodation/AccommodationService.cs | 2 +- 6 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/wsbsdt.png diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.js index 0653a3830..07317e713 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.js @@ -303,10 +303,12 @@ var bootstrap = function ($, learun) { break; case "myShare": _url = "/LR_OAModule/ResourceFile/GetMyShareListJson"; + $(".crumb-path").find('[data-folderid=allfile]').html('我的共享'); $("#lr-cancelshare").show(); break; case "othersShare": _url = "/LR_OAModule/ResourceFile/GetOthersShareListJson"; + $(".crumb-path").find('[data-folderid=allfile]').html('他人共享'); //$gridTable.setGridParam().showCol("CreateUserName"); $("#lr-download").show(); break; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/wsbsdt.png b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/images/wsbsdt.png new file mode 100644 index 0000000000000000000000000000000000000000..9bcf6dce2d02d0680a0312e38cc20a3f8220c714 GIT binary patch literal 2028 zcmcIlZA=qq9IwkH4CdwwIyKuk&WWI0@0DwNS{Sq_9ab4sg^9-Nb5H3>+dJoRBr4Idmt@JZ7e6?sS#<6NH+3`Pi<&)0OJ^2!d|A`WJukoK z_y7H0p8vI$uUIxEZEl*yVwvJ8byuMGbn{6~u~;T$eRgaJO&(B7t96SdeTMl=vb?cx zw#71eMD|q~Ro>+SP{LMGQvA>w3#$liu`DT!sUoO@2Ihyga>R*W89a_-vgE|qViSJv`K@NO)Gq$sSY?Kys!XU5)%+X7#boL3x^`Q5Od;VyaF1V%OsACL5w;lUSt}? zs=VcxOVJ>fZ{-O}$meT^z4E1<5_ zYXFusz=$z#+?WKCXVrQwH0G%UNEm`)1k;f)I%!G`Du$v5mAm+n+)jF<3N8(bhNAft zB{ZI>@^Kc-<-&5-$Pr12>ba(#1RT0W13GbrVrYUw31fUTCvfP`E~4xLMa7|BR0Wb~ zh!X=Vk{oE92-NEpJQ3XxBLI5bP8^A{%CaO#Ebr%RfFc0Ju>?bLfUxIt65*E^PGVTQ zot5C2E_B|lfO<1{=J|NhN(w+6$@mBX8bTmCAQ8w1JQ1*QJRt%I36^3Q*3VFYa>Ttv zY%4Vx-5W7=F+M*2V!E1bCao(>NvpA)shs5mkvC z7Hc7?Mrv{FA2lu|q-b76LNRA=U-!6N<(d+ZLuf;k8AxEM ztfLG!CazH>+>{uFWNfT91reB6!ifX37NCSDmgPHyd14O5X`?}iNbgZ4ahR?IjHsx= zqFR)a|ENLoZqjwJ;oib0Rv-VH@I**KP>j?<)LTj1bcHm#P&^^zzjHOVcU#9Ahod%V z4wL;CO_CiPMi8}z`t#bgu@})N;T?~=$Y*bF|9Y@)S5d~~tLI1iyxku!>^{_*`trlm z(--YHcxq|$)DQZ%rOoosPwAV!_~fiZ9jU**utA*W9$J=#=Qd;0d|X>mR$I&FlGFZx z+Sxnu`0P%He(Bue(Wj>zy;Snx=}rBUGUr~Sw%S&`{_VhSerwm~c_(J}_OSj(X3^^x z{@8P&v+Pt3-*seU=kEPy_r$h*QD1cU#Gc>}d`H)j;nXwqxs~?z1NN5Zs(P-a&RqRg ztE+SPnSDRc&mLGaybIjlKl`^Qdalj^F-v$A&F?j2lET{AMHI;G&T$)kN!zqh8}SekLUI=ne!`E`GAb + .lr-im-bell2 { + width: 80px; + right: 123px; + display: flex; + justify-content: space-around; + align-items: center; + } + .lr-im-bell2 .point { + left: 23px; + right: auto; + } + @@ -45,6 +58,9 @@
  • 中层请假归档 @ViewBag.UnfileLeaveZC 条
  •           共 @ViewBag.UnreadNum 条
    • +
    + +
    @* 即时通讯窗体 *@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml index c0e834ff3..bef8570ee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml @@ -713,7 +713,7 @@ @if (ViewBag.UserType == "学生") {
    -

    西昌民族幼儿师范高等专科学校

    +

    长阳土家族自治县职业教育中心

    选修课选课流程 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml index 3047b8b85..d61d6b063 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml @@ -742,8 +742,8 @@ @if (ViewBag.UserType == "学生") {
    -

    西昌民族幼儿师范高等专科学校

    -
    +

    长阳土家族自治县职业教育中心

    +

    选修课选课流程

    diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs index fd28eb6be..aa608c1ad 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs @@ -737,7 +737,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement bedInfo.Dept = stuInfo.DeptNo; bedInfo.Major = stuInfo.MajorNo; bedInfo.Class = stuInfo.ClassNo; - bedInfo.Sex = stuInfo.GenderNo != null && stuInfo.GenderNo.Value ? "男" : "女"; + bedInfo.Sex = Convert.ToString(stuInfo.GenderNo); this.BaseRepository("CollegeMIS").Update(bedInfo); return true; }