commit

04.系统编码/App/Content/scripts/beijing/result-list.js

@@ -21,7 +21,7 @@
         this.PlayButton.on('click', this.OnPlayButtonClick.bind(this));
         this.PauseButton.on('click', this.OnPauseButtonClick.bind(this));
 
-        this.Self.find('.clac-title a').on('click', this.OnTabHeaderClick.bind(this));
+        this.Self.find('.clac-title span').on('click', this.OnTabHeaderClick.bind(this));
         this.Self.find('.switch:first').on('click', this.OnSwitchChanged.bind(this));
     };
 
@@ -43,7 +43,7 @@
 
     this.OnTabHeaderClick = function (event) {
         // Toogle tab header
-        this.Self.find('.clac-title a').removeClass("active");
+        this.Self.find('.clac-title span').removeClass("active");
         $(event.target).addClass("active");
 
         // Toogle time list

04.系统编码/App/Content/scripts/menggu/result-list.js

@@ -21,7 +21,7 @@
         this.PlayButton.on('click', this.OnPlayButtonClick.bind(this));
         this.PauseButton.on('click', this.OnPauseButtonClick.bind(this));
 
-        this.Self.find('.clac-title a').on('click', this.OnTabHeaderClick.bind(this));
+        this.Self.find('.clac-title span').on('click', this.OnTabHeaderClick.bind(this));
         this.Self.find('.switch:first').on('click', this.OnSwitchChanged.bind(this));
     };
 
@@ -43,7 +43,7 @@
 
     this.OnTabHeaderClick = function (event) {
         // Toogle tab header
-        this.Self.find('.clac-title a').removeClass("active");
+        this.Self.find('.clac-title span').removeClass("active");
         $(event.target).addClass("active");
 
         // Toogle time list

04.系统编码/App/Content/styles/common.css

@@ -428,38 +428,10 @@
 
 .statistic-toolbar .statistic-type {
     margin-right: 5px;
-    overflow: hidden;
-    display: flex;
 }
 
 .statistic-toolbar .statistic-type span {
-    padding: 0 16px;
-    cursor: pointer;
-    line-height: 28px;
-    text-align: center;
-    border: 1px solid #3871af;
-    border-left: 0;
-    border-radius: 3px 0 0 3px;
-    background: #03244c;
-    color: #ffffff;
-}
-
-.statistic-toolbar .statistic-type span:first-of-type {
-    border-radius: 3px 0 0 3px;
-    border-left: 1px solid #3871af;
-}
-
-.statistic-toolbar .statistic-type span:last-of-type {
-    border-radius: 0 3px 3px 0;
-}
-
-.statistic-toolbar .statistic-type span.active {
-    background: linear-gradient(#266cb9, #002c5d);
-}
-
-.statistic-toolbar .statistic-type span:first-of-type.active,
-.statistic-toolbar .statistic-type span:last-of-type.active {
-    border-color: #3871af;
+    width: 90px;
 }
 
 .statistic-toolbar .easyui-datetimebox {
@@ -599,35 +571,9 @@
     color: #ffffff;
 }
 
-.manage-dialog .modal-body .row .col .sex-select {
-    width: 120px;
-    border-radius: 3px;
-    overflow: hidden;
-    display: flex;
-}
-
 .manage-dialog .modal-body .row .col .sex-select span {
     width: 60px;
-    cursor: pointer;
-    line-height: 28px;
-    text-align: center;
-    border-style: solid;
-    border-color: #3871af;
-    border-width: 1px 0 1px 1px;
     color: #ffffff;
-    background: #03244c;
-}
-
-.manage-dialog .modal-body .row .col .sex-select span:first-of-type {
-    border-left: 1px solid #3871af;
-}
-
-.manage-dialog .modal-body .row .col .sex-select span:last-of-type {
-    border-right: 1px solid #3871af;
-}
-
-.manage-dialog .modal-body .row .col .sex-select span.active {
-    background: linear-gradient(#266cb9, #002c5d);
 }
 
 .manage-dialog .modal-body .row .col .passwordbox-open {
@@ -892,4 +838,28 @@
 
 .btn-file input[type=file] {
     font-size: 0;
+}
+
+.tab {
+    display: flex;
+}
+
+.tab span {
+    width: 76px;
+    display: block;
+    text-align: center;
+    line-height: 28px;
+    border: 1px solid #3871af;
+    border-radius: 3px 0 0 3px;
+    background: #03244c;
+    cursor: pointer;
+}
+
+.tab span:last-of-type {
+    border-left: 0;
+    border-radius: 0 3px 3px 0;
+}
+
+.tab span.active {
+    background: linear-gradient(#266cb9, #002c5d);
 }

04.系统编码/App/Content/styles/index.css

@@ -199,30 +199,6 @@
     padding: 10px 0 8px 10px;
 }
 
-.param-content .type-select {
-    display: flex;
-}
-
-.param-content .type-select span {
-    width: 76px;
-    display: block;
-    text-align: center;
-    line-height: 28px;
-    border: 1px solid #3871af;
-    border-radius: 3px 0 0 3px;
-    background: #03244c;
-    cursor: pointer;
-}
-
-.param-content .type-select span.active {
-    background: linear-gradient(#266cb9, #002c5d);
-}
-
-.param-content .type-select span:last-of-type {
-    border-left: 0;
-    border-radius: 0 3px 3px 0;
-}
-
 .param-type {
     display: inline-block;
     border-radius: 3px;
@@ -231,44 +207,44 @@
     overflow: hidden;
 }
 
-    .param-type a {
-        width: 74px;
-        float: left;
-        line-height: 28px;
-        text-align: center;
-        color: #868686;
-        overflow: hidden;
-        position: relative;
-        border-top: 1px solid #d5d5d5;
-        border-bottom: 1px solid #d5d5d5;
-    }
+.param-type a {
+    width: 74px;
+    float: left;
+    line-height: 28px;
+    text-align: center;
+    color: #868686;
+    overflow: hidden;
+    position: relative;
+    border-top: 1px solid #d5d5d5;
+    border-bottom: 1px solid #d5d5d5;
+}
 
-        .param-type a.spread {
-            background: url('../images/divider-line.png') no-repeat left;
-        }
+.param-type a.spread {
+    background: url('../images/divider-line.png') no-repeat left;
+}
 
-        .param-type a.action {
-            border-top: 1px solid #fdbe56;
-            border-bottom: 1px solid #f59c05;
-            color: #FFFFFF;
-            position: relative;
-            z-index: 10;
-        }
+.param-type a.action {
+    border-top: 1px solid #fdbe56;
+    border-bottom: 1px solid #f59c05;
+    color: #FFFFFF;
+    position: relative;
+    z-index: 10;
+}
 
-            .param-type a.action:before {
-                content: '';
-                width: 100%;
-                height: 100%;
-                display: block;
-                position: absolute;
-                top: 0;
-                left: 0;
-                z-index: -1;
-                background: -webkit-linear-gradient(#febc50, #faad2d, #f69c04);
-                background: -moz-linear-gradient(#febc50, #faad2d, #f69c04);
-                background: -o-linear-gradient(#febc50, #faad2d, #f69c04);
-                background: linear-gradient(#febc50, #faad2d, #f69c04);
-            }
+.param-type a.action:before {
+    content: '';
+    width: 100%;
+    height: 100%;
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: -1;
+    background: -webkit-linear-gradient(#febc50, #faad2d, #f69c04);
+    background: -moz-linear-gradient(#febc50, #faad2d, #f69c04);
+    background: -o-linear-gradient(#febc50, #faad2d, #f69c04);
+    background: linear-gradient(#febc50, #faad2d, #f69c04);
+}
 
 .param-text {
     margin-bottom: 10px;
@@ -375,6 +351,7 @@
 .realtime-btn {
     display: inline-block;
     margin-left: 0;
+    height: 30px;
 }
 
 .label-shade {
@@ -476,24 +453,8 @@
     padding: 10px 0 10px 10px;
 }
 
-.clac-title a {
+.clac-title span {
     width: 133px;
-    float: left;
-    text-align: center;
-    line-height: 28px;
-    border: 1px solid #3871af;
-    border-radius: 3px 0 0 3px;
-    background: #03244c;
-}
-
-.clac-title a:last-child {
-    border-left: 0;
-    border-radius: 0 3px 3px 0;
-}
-
-.clac-title a.active {
-    color: #ffffff;
-    background: linear-gradient(#266cb9, #002c5d);
 }
 
 .shadow {

04.系统编码/App/Content/styles/register.css

@@ -91,8 +91,6 @@
 }
 
 .register-block .sex-select {
-    overflow: hidden;
-    display: flex;
     position: absolute;
     right: 0;
     top: 0;
@@ -100,34 +98,8 @@
 
 .register-block .sex-select span {
     width: 40px;
-    float: left;
-    cursor: pointer;
-    text-align: center;
-    line-height: 38px;
-    border: 1px solid #3871af;
-    border-radius: 5px 0 0 5px;
-    background: #03244c;
-    color: #ffffff;
-}
-
-.register-block .sex-select span:first-of-type {
-    border-left: 1px solid #3871af;
-    border-radius: 3px 0 0 3px;
-}
-
-.register-block .sex-select span:last-of-type {
-    border-left: 0;
-    border-right: 1px solid #3871af;
-    border-radius: 0 3px 3px 0;
-}
-
-.register-block .sex-select span.active {
-    background: linear-gradient(#266cb9, #002c5d);
-}
-
-.register-block .sex-select span:first-of-type.active,
-.register-block .sex-select span:last-of-type.active {
-    border-color: #3871af;
+    height: 40px;
+    line-height: 40px;
 }
 
 .register-block .password-toggle {

04.系统编码/App/Views/Beijing/Controls/HistoryTabPage.cshtml

@@ -41,9 +41,9 @@
             </div>
         </div>
         <div class="calc-list">
-            <div class="clac-title clearfix">
-                <a href="javascript:;" type="backward" class="active">溯源</a>
-                <a href="javascript:;" type="forward">扩散</a>
+            <div class="clac-title tab">
+                <span type="backward" class="active">溯源</span>
+                <span type="forward">扩散</span>
             </div>
             <div class="slider-list">
                 <ul class="backward-time-list"></ul>

04.系统编码/App/Views/Beijing/Controls/RealtimeTabPage.cshtml

@@ -5,7 +5,7 @@
     <div class="param-content">
         <div class="param-text clearfix">
             <label>经纬度类型：</label>
-            <div class="type-select fl">
+            <div class="type-select tab fl">
                 <span class="active" type="decimal">小数</span>
                 <span type="degree">度分秒</span>
             </div>
@@ -98,9 +98,9 @@
             </div>
         </div>
         <div class="calc-list">
-            <div class="clac-title clearfix">
-                <a href="javascript:;" type="backward" class="active">溯源</a>
-                <a href="javascript:;" type="forward">扩散</a>
+            <div class="clac-title tab">
+                <span type="backward" class="active">溯源</span>
+                <span type="forward">扩散</span>
             </div>
             <div class="slider-list">
                 <ul class="backward-time-list"></ul>

04.系统编码/App/Views/Menggu/Controls/HistoryTabPage.cshtml

@@ -39,9 +39,9 @@
             </div>
         </div>
         <div class="calc-list">
-            <div class="clac-title clearfix">
-                <a href="javascript:;" type="backward" class="active">溯源</a>
-                <a href="javascript:;" type="forward">扩散</a>
+            <div class="clac-title tab">
+                <span type="backward" class="active">溯源</span>
+                <span type="forward">扩散</span>
             </div>
             <div class="slider-list">
                 <ul class="backward-time-list"></ul>

04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml

@@ -77,9 +77,9 @@
             </div>
         </div>
         <div class="calc-list">
-            <div class="clac-title clearfix">
-                <a href="javascript:;" type="backward" class="active">溯源</a>
-                <a href="javascript:;" type="forward">扩散</a>
+            <div class="clac-title tab">
+                <span type="backward" class="active">溯源</span>
+                <span type="forward">扩散</span>
             </div>
             <div class="slider-list">
                 <ul class="backward-time-list"></ul>

04.系统编码/App/Views/Register/Index.cshtml

@@ -10,7 +10,7 @@
             <div class="register-block register-username">
                 <span class="icon"><img src="~/Content/images/login-username.png" /></span>
                 <input type="text" id="username" placeholder="请输入用户名" />
-                <div class="sex-select">
+                <div class="sex-select tab">
                     <span class="active" gender="1">男</span>
                     <span gender="0">女</span>
                 </div>

04.系统编码/App/Views/StatisticAnalysis/Index.cshtml

@@ -23,7 +23,7 @@
     <div class="container">
         <div class="toolbar statistic-toolbar">
             <span class="tip">统计类型</span>
-            <div class="statistic-type">
+            <div class="statistic-type tab">
                 <span class="active" type="user">根据用户</span>
                 <span type="org">根据机构</span>
             </div>

04.系统编码/App/Views/UserManagement/AddDialog.cshtml

@@ -16,7 +16,7 @@
                             </div>
                             <div class="item">
                                 <label>性别&nbsp;<span class="star">*</span></label>
-                                <div class="sex-select" id="add-dialog-sex-select">
+                                <div class="sex-select tab" id="add-dialog-sex-select">
                                     <span class="active" gender="1">男</span>
                                     <span gender="0">女</span>
                                 </div>

04.系统编码/App/Views/UserManagement/EditDialog.cshtml

@@ -16,7 +16,7 @@
                             </div>
                             <div class="item">
                                 <label>性别&nbsp;<span class="star">*</span></label>
-                                <div class="sex-select" id="sex">
+                                <div class="sex-select tab" id="sex">
                                     <span class="active" gender="1">男</span>
                                     <span gender="0">女</span>
                                 </div>