From 5087cb92b7037a20fb95ee7154d80c83bb777556 Mon Sep 17 00:00:00 2001 From: yubaolee Date: Wed, 11 Apr 2018 17:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/FlowInstances/Detail.cshtml | 2 +- .../Views/FlowInstances/Disposed.cshtml | 4 +- OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml | 25 +- OpenAuth.Mvc/Views/FlowInstances/Index.cshtml | 4 +- .../Views/FlowInstances/Verification.cshtml | 2 +- OpenAuth.Mvc/Views/FlowInstances/Wait.cshtml | 4 +- OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml | 2 +- OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml | 4 +- .../Views/FlowSchemes/NodeInfo.cshtml | 2 +- OpenAuth.Mvc/Views/Forms/Edit.cshtml | 2 +- OpenAuth.Mvc/Views/Forms/index.cshtml | 4 +- OpenAuth.Mvc/Views/ModuleManager/Index.cshtml | 2 +- OpenAuth.Mvc/Views/OrgManager/Index.cshtml | 4 +- OpenAuth.Mvc/Views/RoleManager/Index.cshtml | 4 +- OpenAuth.Mvc/Views/UserManager/Index.cshtml | 4 +- OpenAuth.Mvc/css/main.css | 392 +++++++++--------- OpenAuth.Mvc/js/flowlayout.js | 10 +- OpenAuth.Mvc/userJs/flowInstanceEdit.js | 25 +- 18 files changed, 258 insertions(+), 238 deletions(-) diff --git a/OpenAuth.Mvc/Views/FlowInstances/Detail.cshtml b/OpenAuth.Mvc/Views/FlowInstances/Detail.cshtml index d4d6d528..eb102d4b 100644 --- a/OpenAuth.Mvc/Views/FlowInstances/Detail.cshtml +++ b/OpenAuth.Mvc/Views/FlowInstances/Detail.cshtml @@ -8,7 +8,7 @@
-
+
  • 流程信息
  • 表单信息
    • diff --git a/OpenAuth.Mvc/Views/FlowInstances/Disposed.cshtml b/OpenAuth.Mvc/Views/FlowInstances/Disposed.cshtml index b7dfa20c..901bb2eb 100644 --- a/OpenAuth.Mvc/Views/FlowInstances/Disposed.cshtml +++ b/OpenAuth.Mvc/Views/FlowInstances/Disposed.cshtml @@ -6,12 +6,12 @@
    -
    +
    -
    +
    diff --git a/OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml b/OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml index 298c5013..99f503f0 100644 --- a/OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml +++ b/OpenAuth.Mvc/Views/FlowInstances/Edit.cshtml @@ -15,7 +15,7 @@
    -
    +
    • 基本信息
    • 选择流程模板
      • @@ -52,11 +52,26 @@
      -
        +
          -
          -
          -
          +
          +
          +
          + 申请内容 +
          +
          +
          +
          +
          +
          +
          + 流程预览 +
          +
          +
          +
          +
          diff --git a/OpenAuth.Mvc/Views/FlowInstances/Index.cshtml b/OpenAuth.Mvc/Views/FlowInstances/Index.cshtml index 073ea4b8..45967c3c 100644 --- a/OpenAuth.Mvc/Views/FlowInstances/Index.cshtml +++ b/OpenAuth.Mvc/Views/FlowInstances/Index.cshtml @@ -6,12 +6,12 @@
          -
          +
          -
          +
        diff --git a/OpenAuth.Mvc/Views/FlowInstances/Verification.cshtml b/OpenAuth.Mvc/Views/FlowInstances/Verification.cshtml index 19781de7..2abc8f54 100644 --- a/OpenAuth.Mvc/Views/FlowInstances/Verification.cshtml +++ b/OpenAuth.Mvc/Views/FlowInstances/Verification.cshtml @@ -9,7 +9,7 @@
        -
        +
        • 流程信息
        • 表单信息
          • diff --git a/OpenAuth.Mvc/Views/FlowInstances/Wait.cshtml b/OpenAuth.Mvc/Views/FlowInstances/Wait.cshtml index df8167b9..90a4bdc0 100644 --- a/OpenAuth.Mvc/Views/FlowInstances/Wait.cshtml +++ b/OpenAuth.Mvc/Views/FlowInstances/Wait.cshtml @@ -6,12 +6,12 @@
          -
          +
          -
          +
        diff --git a/OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml b/OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml index db904581..514f80c9 100644 --- a/OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml +++ b/OpenAuth.Mvc/Views/FlowSchemes/Design.cshtml @@ -10,7 +10,7 @@
        -
        +
        • 基本信息
        • 选择表单
          • diff --git a/OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml b/OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml index 1bfac404..1471c9d5 100644 --- a/OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml +++ b/OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml @@ -6,12 +6,12 @@
          -
          +
          -
          +
        diff --git a/OpenAuth.Mvc/Views/FlowSchemes/NodeInfo.cshtml b/OpenAuth.Mvc/Views/FlowSchemes/NodeInfo.cshtml index 484d59a6..25f9906f 100644 --- a/OpenAuth.Mvc/Views/FlowSchemes/NodeInfo.cshtml +++ b/OpenAuth.Mvc/Views/FlowSchemes/NodeInfo.cshtml @@ -5,7 +5,7 @@
        -
        +
        • 基本信息
        • 执行人
          • diff --git a/OpenAuth.Mvc/Views/Forms/Edit.cshtml b/OpenAuth.Mvc/Views/Forms/Edit.cshtml index 77e3e65b..6981fcaa 100644 --- a/OpenAuth.Mvc/Views/Forms/Edit.cshtml +++ b/OpenAuth.Mvc/Views/Forms/Edit.cshtml @@ -14,7 +14,7 @@
          -
          +
          • 基本信息
          • 表单设计
            • diff --git a/OpenAuth.Mvc/Views/Forms/index.cshtml b/OpenAuth.Mvc/Views/Forms/index.cshtml index 94e71d02..d2bee5f3 100644 --- a/OpenAuth.Mvc/Views/Forms/index.cshtml +++ b/OpenAuth.Mvc/Views/Forms/index.cshtml @@ -7,11 +7,11 @@
            -
            +
              -
              +
          diff --git a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml index 9f9f56f7..971ba48e 100644 --- a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml @@ -42,7 +42,7 @@ -
          +
          -
          +
          -
          +
          diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml index 4f10bc93..686f1840 100644 --- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml @@ -6,11 +6,11 @@
          -
          +
            -
            +
            diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml index 2859c6e1..a6d135cb 100644 --- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml @@ -6,12 +6,12 @@
            -
            +
            -
            +
            diff --git a/OpenAuth.Mvc/css/main.css b/OpenAuth.Mvc/css/main.css index e2de4173..752ecf57 100644 --- a/OpenAuth.Mvc/css/main.css +++ b/OpenAuth.Mvc/css/main.css @@ -1,188 +1,204 @@ -/*公共样式*/ -.main_body{ min-width:320px; } -.layui-elem-quote.title{ padding:10px 15px; margin-bottom:0; } -.layui-tab-more{ position: relative; z-index: 99; background:#fff; } -.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{ height:42px !important; } -.layui-layer-tab .layui-layer-title span{ min-width:45px !important; } -.marg0{ margin:0; } -/*模拟加载层图标样式*/ -.layui-layer-dialog .layui-layer-content .layui-layer-ico16{ background-size:100% 100% !important; } - -/*样式改变的过渡*/ -.showMenu .layui-body,.showMenu .layui-footer,.showMenu.layui-layout-admin .layui-side,.logo,.top_menu .layui-nav-item[pc],.component,.top_menu .layui-nav-item[mobile],.layui-nav,.layui-layout-admin .layui-main,.site-mobile .layui-side,.layui-layout-admin .layui-side,.site-mobile .site-tree-mobile,.layui-body,.layui-layout-admin .layui-footer,.layui-layout-admin .layui-side,.panel,.panel .panel_icon i{ transition: all 0.3s ease-in-out;-webkit-transition: all 0.3s ease-in-out;-o-transition: all 0.3s ease-in-out;-moz-transition: all 0.3s ease-in-out;-ms-transition: all 0.3s ease-in-out; } - - -.showMenu.layui-layout-admin .layui-side{ left:-200px; } -.showMenu .layui-body,.showMenu .layui-footer{ left:0; } -.layui-layout-admin .layui-main{ margin:0; } -.logo{ color: #fff; float: left; line-height:60px; font-size:20px; padding:0 25px; text-align: center; width:150px;} -.hideMenu{ float:left; width:20px; height:20px; margin:15px 15px 0 0; font-size:17px; text-align:center; padding:5px 5px; color:#fff; background-color:#1AA094; } -.hideMenu:hover{ color:#fff; } -.weather{ color:#fff; float:left; margin:15px 0 0 50px;} -.component{ float: left; width:200px; height:30px; margin-top: 15px; position: relative;} -.component .layui-input{ height:30px; line-height: 30px; font-size:12px; border:none; transition: all 0.3s; } -.component .layui-input:focus{ background:#fff; color:#000; } -.component .layui-form-select dl{ top:33px; background:#fff; } -.component .layui-form-select .layui-edge,.top_menu .layui-nav-item[mobile]{ display:none; } -.component .layui-icon{ position: absolute; right:8px; top:8px; color:#000; } - -/*顶部右侧导航*/ -.layui-nav .layui-nav-item>a{ color:#fff; } -.top_menu{ position:absolute; right:0; background:none } -.top_menu.layui-nav .layui-this:after{ width:0px; } -.top_menu.layui-nav .layui-this,.closeBox.layui-nav .layui-this{ background-color:transparent; } -.top_menu.layui-nav .layui-this a,.closeBox.layui-nav .layui-this a{ color:#c2c2c2; } -.top_menu.layui-nav dd.layui-this a,.closeBox.layui-nav dd.layui-this a{ color:#333; } -.top_menu.layui-nav .layui-nav-child a:hover,.closeBox.layui-nav .layui-nav-child a:hover{ color:#fff; background-color:#5FB878; } -.top_menu .iconfont{ font-size: 14px !important; } -.top_menu .layui-nav-bar{ top:60px !important; background-color:rgba(0,0,0,0.7) } - -/*左侧用户头像*/ -.layui-nav{ background-color:inherit !important; } -.layui-layout-admin .layui-side{ left:0; } -.user-photo{width: 200px; height: 120px; padding-top: 15px; padding-bottom: 5px;} -.user-photo a.img{ display: block; width: 76px; height: 76px; margin: 0 auto; margin-bottom: 15px;} -.user-photo a.img img{ display: block; border: none; width: 100%; height: 100%; border-radius: 50%; -webkit-border-radius: 50%; -moz-border-radius: 50%; border: 4px solid #44576b;} -.user-photo p{ display: block; width: 100%; height: 25px; color: #ffffff; text-align: center; font-size: 12px; white-space: nowrap;line-height: 25px; overflow: hidden;} -/*左侧导航重定义*/ -.layui-nav-item a cite{ padding:0 5px; } -.layui-side-scroll{ height:auto; } -.layui-nav-tree .layui-nav-child a{ padding-left: 40px; } -.layui-nav-tree .layui-nav-child a:hover{ background-color:#4E5465; } -.layui-nav-tree .layui-nav-child dd.layui-this a:hover{ background-color:#009688; } - -/*右侧body*/ -#top_tabs_box{ padding-right:138px; height:40px; border-bottom:1px solid #e2e2e2; } -#top_tabs{ position: absolute; border-bottom:none;} -/*多窗口页面操作下拉*/ -.closeBox{ position:absolute; right:0; background-color:#fff !important; color:#000; border-left:1px solid #e2e2e2; border-bottom:1px solid #e2e2e2; } -.closeBox .layui-nav-item{ line-height:40px; } -.closeBox .layui-nav-item a,.closeBox .layui-nav-item a:hover{ color:#000; } -.closeBox .layui-nav-more{ top:17px; } -.closeBox .layui-nav-mored{ top:11px; } -.closeBox .layui-nav-child{ top:42px; left:-12px; } -.closeBox .layui-nav-bar{ display:none; } -.closeBox .icon-caozuo{ font-size: 20px; position:absolute; top:1px; left:-2px; } - -.layui-body{overflow:hidden; border-top:5px solid #1AA094;border-left:2px solid #1AA094;} -.layui-tab-content{ height:100%; padding:0; } -.layui-tab-item{ position: absolute; top: 41px; bottom:0; left: 0; right: 0; padding: 0; margin: 0; -webkit-overflow-scrolling:touch; overflow:auto;} -.layui-tab-title .layui-this{ background-color:#18A093;} -.layui-tab-title .layui-this:after{ border:none; } -.layui-tab-title li cite{ font-style: normal; padding-left:5px; } -.layui-tab-card .layui-tab-title{background-color: #ffffff} -.layui-tab-card .layui-tab-title .layui-this{background-color: #f2f2f2} -.clildFrame.layui-tab-content{ padding-right: 0; } -.clildFrame.layui-tab-content iframe{ width: 100%; height:100%; border:none; min-width: 320px; position:absolute; } -/*main.html*/ -.row,.col,.panel_word,.panel_icon{ box-sizing:border-box; -webkit-box-sizing:border-box; -moz-box-sizing:border-box; -o-box-sizing:border-box;} -.row{ margin-left:-10px; overflow:hidden;display: flex; flex-wrap: wrap;} -.col{ padding-left:10px;} -.panel{float: left; text-align: center; width:16.666%; min-width:210px; margin-bottom: 10px;} -.panel_box a{display:block; background-color:#f2f2f2; border-radius:5px; overflow:hidden; } -.panel_icon{ width:40%; display: inline-block; padding:22px 0; background-color:#54ade8;float:left;} -.panel_icon i{ font-size:3em; color:#fff;} -.panel a:hover .panel_icon i{ display:inline-block; transform:rotate(360deg); -webkit-transform:rotate(360deg); -moz-transform:rotate(360deg); -o-transform:rotate(360deg); -ms-transform:rotate(360deg);} -.panel_word{ width:60%; display: inline-block; float:right; margin-top: 22px; } -.panel_word span{ font-size:25px; display:block; height:30px; line-height:30px; } -.allNews em{ font-style:normal; font-size:16px;display: block; } -.panel_box a .allNews cite{ display:none; } -.panel_box a cite{ font-size:16px; display: block; font-style:normal; } -.sysNotice{ width:50%; float: left; } -.sysNotice .layui-elem-quote{ line-height:26px; position: relative;} -.sysNotice .layui-table{ margin-top:0; border-left:5px solid #e2e2e2; } -.sysNotice .title .icon-new1{ position: absolute; top:8px; margin-left: 10px; color:#f00; font-size:25px; } -.explain .layui-btn{ margin:5px 5px 5px 0; } - -/*打开页面动画*/ -.layui-tab-item.layui-show{ animation:moveTop 1s; -webkit-animation:moveTop 1s; animation-fill-mode:both; -webkit-animation-fill-mode:both; } -@keyframes moveTop{ - 0% {opacity: 0;-webkit-transform: translateY(20px);-ms-transform: translateY(20px);transform: translateY(20px);} - 100% {opacity: 1;-webkit-transform: translateY(0);-ms-transform: translateY(0);transform: translateY(0);} -} -@-o-keyframes moveTop{ - 0% {opacity: 0;-webkit-transform: translateY(20px);-ms-transform: translateY(20px);transform: translateY(20px);} - 100% {opacity: 1;-webkit-transform: translateY(0);-ms-transform: translateY(0);transform: translateY(0);} -} -@-moz-keyframes moveTop{ - 0% {opacity: 0;-webkit-transform: translateY(20px);-ms-transform: translateY(20px);transform: translateY(20px);} - 100% {opacity: 1;-webkit-transform: translateY(0);-ms-transform: translateY(0);transform: translateY(0);} -} -@-webkit-keyframes moveTop{ - 0% {opacity: 0;-webkit-transform: translateY(20px);-ms-transform: translateY(20px);transform: translateY(20px);} - 100% {opacity: 1;-webkit-transform: translateY(0);-ms-transform: translateY(0);transform: translateY(0);} -} - -/*锁屏*/ -.admin-header-lock{width: 320px; height: 170px; padding: 20px; position: relative; text-align: center;} -.admin-header-lock-img{width: 60px; height: 60px; margin: 0 auto;} -.admin-header-lock-img img{width: 60px; height: 60px; border-radius: 100%;} -.admin-header-lock-name{color: #009688;margin: 8px 0 15px 0;} -.input_btn{ overflow: hidden; margin-bottom: 10px; } -.admin-header-lock-input{width: 170px; color: #fff;background-color: #009688; float: left; margin:0 10px 0 40px; border:none;} -.admin-header-lock-input::-webkit-input-placeholder {color:#fff;} -.admin-header-lock-input::-moz-placeholder {color:#fff;} -.admin-header-lock-input::-ms-input-placeholder {color:#fff;} -.admin-header-lock-input:-moz-placeholder {color:#fff;} -#unlock{ float: left; } -#lock-box p{ color:#e60000; } - -/*换肤*/ -.skins_box{ padding:10px 34px 0; } -.skinBtn{ text-align:right; } -/*橙色*/ -.orange .layui-layout-admin .layui-header{ background-color:orange!important; } -.orange .layui-bg-black{ background-color:#e47214!important; } -/*蓝色*/ -.blue .layui-layout-admin .layui-header{ background-color:#3396d8!important; } -.blue .layui-bg-black,.blue .hideMenu{ background-color:#146aa2!important; } -/*藏青*/ -.cyan .layui-layout-admin .layui-header{ background-color:#2F4056!important; } -.cyan .layui-bg-black, .cyan .hideMenu{ background-color:#2F4056!important; } - -/*自定义*/ -.skinCustom{ visibility:hidden; } -.skinCustom input{ width:48%; margin:5px 2% 5px 0; float:left; } - -.orange .layui-nav-tree .layui-nav-child a,.blue .layui-nav-tree .layui-nav-child a{ color:#fff; } -.orange .top_menu.layui-nav .layui-nav-more,.blue .top_menu.layui-nav .layui-nav-more{border-color:#fff transparent transparent !important;} -.orange .top_menu.layui-nav-itemed .layui-nav-more,.orange .top_menu.layui-nav .layui-nav-mored,.blue .top_menu.layui-nav-itemed .layui-nav-more,.blue .top_menu.layui-nav .layui-nav-mored{border-color:transparent transparent #fff !important;} - -/*底部*/ -.footer{ text-align: center; line-height:44px;border-left: 2px solid #1AA094;} - - -/*响应式*/ -@media screen and (max-width:1282px){ - .panel{ width:33.3333%; } -} -@media screen and (max-width:1050px){ - .layui-nav.top_menu .layui-nav-item a{ padding:0 10px; } - /*天气信息*/ - .weather[pc]{ display: none !important; } - .sysNotice{ width:100%; } - .component{ width:165px; } -} -@media screen and (max-width: 750px){ - .logo{ padding:0;} - .top_menu .layui-nav-item[pc],.component,.site-mobile .site-tree-mobile{ display: none !important; } - .top_menu .layui-nav-item.showNotice[pc]{ display:inline-block !important; } - .top_menu .layui-nav-item[mobile]{ display:inline-block; } - .layui-nav.top_menu,.layui-nav.top_menu .layui-nav-item a{ padding:0 10px; } - .layui-layout-admin .layui-main{ margin-right: 0; } - .hideMenu{ display:none; } - /*左侧导航*/ - .layui-layout-admin .layui-side{ left:-260px; } - .site-mobile .layui-side{ left: 0; z-index:9999; } - .site-tree-mobile {display: block!important; position: fixed; z-index: 100000; bottom: 15px; left: 15px; width: 50px; height: 50px; line-height: 50px; border-radius: 2px; text-align: center; background-color: rgba(0,0,0,.7); color: #fff;} - .site-mobile .site-mobile-shade { content: ''; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: rgba(0,0,0,.8); z-index: 999;} - - /*layui-body*/ - .panel{ width:50%; } - - .layui-body,.layui-layout-admin .layui-footer{ left:0; } -} -@media screen and (max-width:432px){ - .top_menu .layui-nav-item.showNotice[pc]{ display:none !important; } - .panel{ width:100%; } -} +/*公共样式*/ +.main_body{ min-width:320px; } +.layui-elem-quote.title{ padding:10px 15px; margin-bottom:0; } +.layui-tab-more{ position: relative; z-index: 99; background:#fff; } +.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{ height:42px !important; } +.layui-layer-tab .layui-layer-title span{ min-width:45px !important; } +.marg0{ margin:0; } +/*模拟加载层图标样式*/ +.layui-layer-dialog .layui-layer-content .layui-layer-ico16{ background-size:100% 100% !important; } + +.layui-header { + height: 50px; +} + +.layui-layout-admin .layui-body { + top: 50px; +} + +.layui-layout-admin .layui-side { + top: 50px; +} + +.layui-nav .layui-nav-item { + line-height: 50px; +} + +/*样式改变的过渡*/ +.showMenu .layui-body,.showMenu .layui-footer,.showMenu.layui-layout-admin .layui-side,.logo,.top_menu .layui-nav-item[pc],.component,.top_menu .layui-nav-item[mobile],.layui-nav,.layui-layout-admin .layui-main,.site-mobile .layui-side,.layui-layout-admin .layui-side,.site-mobile .site-tree-mobile,.layui-body,.layui-layout-admin .layui-footer,.layui-layout-admin .layui-side,.panel,.panel .panel_icon i{ transition: all 0.3s ease-in-out;-webkit-transition: all 0.3s ease-in-out;-o-transition: all 0.3s ease-in-out;-moz-transition: all 0.3s ease-in-out;-ms-transition: all 0.3s ease-in-out; } + + +.showMenu.layui-layout-admin .layui-side{ left:-200px; } +.showMenu .layui-body,.showMenu .layui-footer{ left:0; } +.layui-layout-admin .layui-main{ margin:0; } +.logo{ color: #fff; float: left; line-height:50px; font-size:20px; padding:0 25px; text-align: center; width:150px;} +.hideMenu{ float:left; width:20px; height:20px; margin:10px 15px 0 0; font-size:17px; text-align:center; padding:5px 5px; color:#fff; background-color:#1AA094; } +.hideMenu:hover{ color:#fff; } +.weather{ color:#fff; float:left; margin:10px 0 0 50px;} +.component{ float: left; width:200px; height:30px; margin-top: 10px; position: relative;} +.component .layui-input{ height:30px; line-height: 30px; font-size:12px; border:none; transition: all 0.3s; } +.component .layui-input:focus{ background:#fff; color:#000; } +.component .layui-form-select dl{ top:33px; background:#fff; } +.component .layui-form-select .layui-edge,.top_menu .layui-nav-item[mobile]{ display:none; } +.component .layui-icon{ position: absolute; right:8px; top:8px; color:#000; } + +/*顶部右侧导航*/ +.layui-nav .layui-nav-item>a{ color:#fff; } +.top_menu{ position:absolute; right:0; background:none } +.top_menu.layui-nav .layui-this:after{ width:0px; } +.top_menu.layui-nav .layui-this,.closeBox.layui-nav .layui-this{ background-color:transparent; } +.top_menu.layui-nav .layui-this a,.closeBox.layui-nav .layui-this a{ color:#c2c2c2; } +.top_menu.layui-nav dd.layui-this a,.closeBox.layui-nav dd.layui-this a{ color:#333; } +.top_menu.layui-nav .layui-nav-child a:hover,.closeBox.layui-nav .layui-nav-child a:hover{ color:#fff; background-color:#5FB878; } +.top_menu .iconfont{ font-size: 14px !important; } +.top_menu .layui-nav-bar{ top:60px !important; background-color:rgba(0,0,0,0.7) } + +/*左侧用户头像*/ +.layui-nav{ background-color:inherit !important; } +.layui-layout-admin .layui-side{ left:0; } +.user-photo{width: 200px; height: 120px; padding-top: 15px; padding-bottom: 5px;} +.user-photo a.img{ display: block; width: 76px; height: 76px; margin: 0 auto; margin-bottom: 15px;} +.user-photo a.img img{ display: block; border: none; width: 100%; height: 100%; border-radius: 50%; -webkit-border-radius: 50%; -moz-border-radius: 50%; border: 4px solid #44576b;} +.user-photo p{ display: block; width: 100%; height: 25px; color: #ffffff; text-align: center; font-size: 12px; white-space: nowrap;line-height: 25px; overflow: hidden;} +/*左侧导航重定义*/ +.layui-nav-item a cite{ padding:0 5px; } +.layui-side-scroll{ height:auto; } +.layui-nav-tree .layui-nav-child a{ padding-left: 40px; } +.layui-nav-tree .layui-nav-child a:hover{ background-color:#4E5465; } +.layui-nav-tree .layui-nav-child dd.layui-this a:hover{ background-color:#009688; } + +/*右侧body*/ +#top_tabs_box{ padding-right:138px; height:40px; border-bottom:1px solid #e2e2e2; } +#top_tabs{ position: absolute; border-bottom:none;} +/*多窗口页面操作下拉*/ +.closeBox{ position:absolute; right:0; background-color:#fff !important; color:#000; border-left:1px solid #e2e2e2; border-bottom:1px solid #e2e2e2; } +.closeBox .layui-nav-item{ line-height:40px; } +.closeBox .layui-nav-item a,.closeBox .layui-nav-item a:hover{ color:#000; } +.closeBox .layui-nav-more{ top:17px; } +.closeBox .layui-nav-mored{ top:11px; } +.closeBox .layui-nav-child{ top:42px; left:-12px; } +.closeBox .layui-nav-bar{ display:none; } +.closeBox .icon-caozuo{ font-size: 20px; position:absolute; top:1px; left:-2px; } + +.layui-body{overflow:hidden; border-top:5px solid #1AA094;border-left:2px solid #1AA094;} +.layui-tab-content{ height:100%; padding:0; } +.layui-tab-item{ position: absolute; top: 41px; bottom:0; left: 0; right: 0; padding: 0; margin: 0; -webkit-overflow-scrolling:touch; overflow:auto;} +.layui-tab-title .layui-this{ background-color:#18A093;} +.layui-tab-title .layui-this:after{ border:none; } +.layui-tab-title li cite{ font-style: normal; padding-left:5px; } +.layui-tab-card .layui-tab-title{background-color: #ffffff} +.layui-tab-card .layui-tab-title .layui-this{background-color: #f2f2f2} +.clildFrame.layui-tab-content{ padding-right: 0; } +.clildFrame.layui-tab-content iframe{ width: 100%; height:100%; border:none; min-width: 320px; position:absolute; } +/*main.html*/ +.row,.col,.panel_word,.panel_icon{ box-sizing:border-box; -webkit-box-sizing:border-box; -moz-box-sizing:border-box; -o-box-sizing:border-box;} +.row{ margin-left:-10px; overflow:hidden;display: flex; flex-wrap: wrap;} +.col{ padding-left:10px;} +.panel{float: left; text-align: center; width:16.666%; min-width:210px; margin-bottom: 10px;} +.panel_box a{display:block; background-color:#f2f2f2; border-radius:5px; overflow:hidden; } +.panel_icon{ width:40%; display: inline-block; padding:22px 0; background-color:#54ade8;float:left;} +.panel_icon i{ font-size:3em; color:#fff;} +.panel a:hover .panel_icon i{ display:inline-block; transform:rotate(360deg); -webkit-transform:rotate(360deg); -moz-transform:rotate(360deg); -o-transform:rotate(360deg); -ms-transform:rotate(360deg);} +.panel_word{ width:60%; display: inline-block; float:right; margin-top: 22px; } +.panel_word span{ font-size:25px; display:block; height:30px; line-height:30px; } +.allNews em{ font-style:normal; font-size:16px;display: block; } +.panel_box a .allNews cite{ display:none; } +.panel_box a cite{ font-size:16px; display: block; font-style:normal; } +.sysNotice{ width:50%; float: left; } +.sysNotice .layui-elem-quote{ line-height:26px; position: relative;} +.sysNotice .layui-table{ margin-top:0; border-left:5px solid #e2e2e2; } +.sysNotice .title .icon-new1{ position: absolute; top:8px; margin-left: 10px; color:#f00; font-size:25px; } +.explain .layui-btn{ margin:5px 5px 5px 0; } + +/*打开页面动画*/ +.layui-tab-item.layui-show{ animation:moveTop 1s; -webkit-animation:moveTop 1s; animation-fill-mode:both; -webkit-animation-fill-mode:both; } +@keyframes moveTop{ + 0% {opacity: 0;-webkit-transform: translateY(20px);-ms-transform: translateY(20px);transform: translateY(20px);} + 100% {opacity: 1;-webkit-transform: translateY(0);-ms-transform: translateY(0);transform: translateY(0);} +} +@-o-keyframes moveTop{ + 0% {opacity: 0;-webkit-transform: translateY(20px);-ms-transform: translateY(20px);transform: translateY(20px);} + 100% {opacity: 1;-webkit-transform: translateY(0);-ms-transform: translateY(0);transform: translateY(0);} +} +@-moz-keyframes moveTop{ + 0% {opacity: 0;-webkit-transform: translateY(20px);-ms-transform: translateY(20px);transform: translateY(20px);} + 100% {opacity: 1;-webkit-transform: translateY(0);-ms-transform: translateY(0);transform: translateY(0);} +} +@-webkit-keyframes moveTop{ + 0% {opacity: 0;-webkit-transform: translateY(20px);-ms-transform: translateY(20px);transform: translateY(20px);} + 100% {opacity: 1;-webkit-transform: translateY(0);-ms-transform: translateY(0);transform: translateY(0);} +} + +/*锁屏*/ +.admin-header-lock{width: 320px; height: 170px; padding: 20px; position: relative; text-align: center;} +.admin-header-lock-img{width: 60px; height: 60px; margin: 0 auto;} +.admin-header-lock-img img{width: 60px; height: 60px; border-radius: 100%;} +.admin-header-lock-name{color: #009688;margin: 8px 0 15px 0;} +.input_btn{ overflow: hidden; margin-bottom: 10px; } +.admin-header-lock-input{width: 170px; color: #fff;background-color: #009688; float: left; margin:0 10px 0 40px; border:none;} +.admin-header-lock-input::-webkit-input-placeholder {color:#fff;} +.admin-header-lock-input::-moz-placeholder {color:#fff;} +.admin-header-lock-input::-ms-input-placeholder {color:#fff;} +.admin-header-lock-input:-moz-placeholder {color:#fff;} +#unlock{ float: left; } +#lock-box p{ color:#e60000; } + +/*换肤*/ +.skins_box{ padding:10px 34px 0; } +.skinBtn{ text-align:right; } +/*橙色*/ +.orange .layui-layout-admin .layui-header{ background-color:orange!important; } +.orange .layui-bg-black{ background-color:#e47214!important; } +/*蓝色*/ +.blue .layui-layout-admin .layui-header{ background-color:#3396d8!important; } +.blue .layui-bg-black,.blue .hideMenu{ background-color:#146aa2!important; } +/*藏青*/ +.cyan .layui-layout-admin .layui-header{ background-color:#2F4056!important; } +.cyan .layui-bg-black, .cyan .hideMenu{ background-color:#2F4056!important; } + +/*自定义*/ +.skinCustom{ visibility:hidden; } +.skinCustom input{ width:48%; margin:5px 2% 5px 0; float:left; } + +.orange .layui-nav-tree .layui-nav-child a,.blue .layui-nav-tree .layui-nav-child a{ color:#fff; } +.orange .top_menu.layui-nav .layui-nav-more,.blue .top_menu.layui-nav .layui-nav-more{border-color:#fff transparent transparent !important;} +.orange .top_menu.layui-nav-itemed .layui-nav-more,.orange .top_menu.layui-nav .layui-nav-mored,.blue .top_menu.layui-nav-itemed .layui-nav-more,.blue .top_menu.layui-nav .layui-nav-mored{border-color:transparent transparent #fff !important;} + +/*底部*/ +.footer{ text-align: center; line-height:44px;border-left: 2px solid #1AA094;} + + +/*响应式*/ +@media screen and (max-width:1282px){ + .panel{ width:33.3333%; } +} +@media screen and (max-width:1050px){ + .layui-nav.top_menu .layui-nav-item a{ padding:0 10px; } + /*天气信息*/ + .weather[pc]{ display: none !important; } + .sysNotice{ width:100%; } + .component{ width:165px; } +} +@media screen and (max-width: 750px){ + .logo{ padding:0;} + .top_menu .layui-nav-item[pc],.component,.site-mobile .site-tree-mobile{ display: none !important; } + .top_menu .layui-nav-item.showNotice[pc]{ display:inline-block !important; } + .top_menu .layui-nav-item[mobile]{ display:inline-block; } + .layui-nav.top_menu,.layui-nav.top_menu .layui-nav-item a{ padding:0 10px; } + .layui-layout-admin .layui-main{ margin-right: 0; } + .hideMenu{ display:none; } + /*左侧导航*/ + .layui-layout-admin .layui-side{ left:-260px; } + .site-mobile .layui-side{ left: 0; z-index:9999; } + .site-tree-mobile {display: block!important; position: fixed; z-index: 100000; bottom: 15px; left: 15px; width: 50px; height: 50px; line-height: 50px; border-radius: 2px; text-align: center; background-color: rgba(0,0,0,.7); color: #fff;} + .site-mobile .site-mobile-shade { content: ''; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: rgba(0,0,0,.8); z-index: 999;} + + /*layui-body*/ + .panel{ width:50%; } + + .layui-body,.layui-layout-admin .layui-footer{ left:0; } +} +@media screen and (max-width:432px){ + .top_menu .layui-nav-item.showNotice[pc]{ display:none !important; } + .panel{ width:100%; } +} diff --git a/OpenAuth.Mvc/js/flowlayout.js b/OpenAuth.Mvc/js/flowlayout.js index 31fffba2..ab39e139 100644 --- a/OpenAuth.Mvc/js/flowlayout.js +++ b/OpenAuth.Mvc/js/flowlayout.js @@ -232,6 +232,7 @@ "NodeDesignateType6": "发起者公司领导" }; var _NodeConfluenceType = { "0": "所有步骤通过", "1": "一个步骤通过即可", "2": "按百分比计算" }; + if (options.flowcontent == undefined) return; $.each(options.flowcontent.nodes, function (i, item) { if (item.setInfo != undefined) { @@ -339,15 +340,10 @@ $('#' + item.id).attr('data-content', "该节点未被设置"); } }); - $('.GooFlow_item').popover({ html: true }); + //$('.GooFlow_item').popover({ html: true }); } - function labellingRedNode(id) { - $('.flow-labellingnode-red').removeClass('flow-labellingnode-red'); - $('#' + id).addClass('flow-labellingnode-red'); - } - - return flowPanel; + return flowPanel; } exports('flowlayout'); diff --git a/OpenAuth.Mvc/userJs/flowInstanceEdit.js b/OpenAuth.Mvc/userJs/flowInstanceEdit.js index 6c74ecce..e35882ee 100644 --- a/OpenAuth.Mvc/userJs/flowInstanceEdit.js +++ b/OpenAuth.Mvc/userJs/flowInstanceEdit.js @@ -4,8 +4,6 @@ var form = layui.form, element = layui.element, layer = layui.layer, $ = layui.jquery; - var table = layui.table; - var openauth = layui.openauth; var index = layer.getFrameIndex(window.name); //获取窗口索引 var id = $.getUrlParam("id"); //ID var update = (id !=null && id != ''); @@ -16,16 +14,17 @@ el: "#formEdit" }); - //标签切换 - element.on('tab(tab)', function (data) { - layer.iframeAuto(index); - }); + ////标签切换 + //element.on('tab(tab)', function (data) { + // layer.iframeAuto(index); + //}); /*=========流程设计（begin）======================*/ var flowDesignPanel = $('#flowPanel').flowdesign({ height: 300, - widht: 300, + widht: $(window).width() - 250, haveTool: false, + preview:1, OpenNode: function (object) { FlowDesignObject = object; //为NodeInfo窗口提供调用 @@ -111,7 +110,6 @@ $.ajax(url, { async: false - , success: function (data) { var json = JSON.parse(data); zTreeObj = $.fn.zTree.init($("#frmTree"), setting); @@ -125,7 +123,6 @@ var node = zTreeObj.getNodeByParam("Id", id, null); zTreeObj.checkNode(node, true, false); } - return { setCheck: setCheck } @@ -148,7 +145,6 @@ }); } - //提交数据 form.on('submit(formSubmit)', function (data) { @@ -172,16 +168,13 @@ return false; //阻止表单跳转。 }); - //$(window).resize(function() { - // flowDesignPanel.reinitSize($(window).width()-30, $(window).height()-100); - //}); + $(window).resize(function() { + flowDesignPanel.reinitSize($(window).width()-250, $(window).height()-100); + }); //该函数供给父窗口确定时调用 submit = function () { //只能用隐藏的submit btn才行，用form.submit()时data.field里没有数据 $("#btnSubmit").click(); } - - //让层自适应iframe - layer.iframeAuto(index); }) \ No newline at end of file