Browse Source

公共界面

dgf 8 years ago
parent
commit
c7b3349132

+ 109 - 13
common/app.bootstrap.less

@@ -31,8 +31,54 @@
   }
 }
 
+.btn {
+  &.btn-blue {
+    background: @brand-primary;
+    border: @brand-primary;
+    line-height: normal;
+    width: 72px;
+    height: 24px;
+    padding: 2px 4px;
+    font-size: 12px;
+    &:hover,&:focus {
+          outline: none;
+          background: @brand-primary;
+          border: @brand-primary;
+      }
+      &:active, .open>.dropdown-toggle.btn-primary{
+          border: none;
+          outline: none;
+          background-color: #439BB2;
+          border-color: #439BB2;
+      }
+  }
+}
+
+.btn {
+  &.btn-red {
+    background: @brand-danger;
+    border: @brand-danger;
+    line-height: normal;
+    width: 72px;
+    height: 24px;
+    padding: 2px 4px;
+    font-size: 12px;
+    &:hover,&:focus {
+          outline: none;
+          background: @brand-danger;
+          border: @brand-danger;
+      }
+      &:active, .open>.dropdown-toggle.btn-primary{
+          border: none;
+          outline: none;
+          background-color: #A5403E;
+          border-color: #A5403E;
+      }
+  }
+}
+
 .nav-pills {
-  &.diy {
+  &.defaults {
     font-size: 13px;
     font-weight: 600;
     > li {
@@ -64,19 +110,69 @@
   }
 }
 
-/*&.btn {
-  &.btn-primary,
-  &.btn-success {
-    &:hover,&:focus {
-          outline: none;
+.nav-pills {
+    &.slide {
+      font-size: 12px;
+      font-family: "微软雅黑","宋体";
+      font-weight: normal;
+      > li {
+          > a {
+              background-color: #FFF;
+              border: 1px solid #e6e6e6;
+              color: #777;
+              padding: 5px 20px;
+              margin-bottom: 15px;
+              border-radius: 15px;
+              text-align: left;
+              &.animate {
+                  animation-name:animateRt;
+                  animation-duration:0.1s;
+                  animation-timing-function:linear;
+                  animation-iteration-count:1;
+                  animation-direction:normal;
+                  /* Safari and Chrome: */
+                  -webkit-animation-name:animateRt;
+                  -webkit-animation-duration:0.1s;
+                  -webkit-animation-timing-function:linear;
+                  -webkit-animation-iteration-count:1;
+                  -webkit-animation-direction:normal;
+              }
+          }
+          @keyframes animateRt {
+              0%  {text-align: left;background-color:#FFF;color: #777;}
+              100%  {text-align: right;background-color:#eee;color: #009688;}
+          }
+          @-webkit-keyframes animateRt {
+              0%  {text-align: left;background-color:#FFF;color: #777;}
+              100%  {text-align: right;background-color:#eee;color: #009688;}
+          }
+      }
+      > li.active {
+          > a {
+              border: 1px solid #e6e6e6;
+              background-color:#eee;
+              color: #009688;
+              text-align: right;
+          }
+      }
+    }
+}
+
+.pagination-sm {
+  &.diy {
+      li >a {
+          color: #009EE0;
+      }
+      li.active >a {
+          color: #FFF;
+          border: 1px solid #5bc0de;
           background: #5bc0de;
-          border: #5bc0de;
       }
-      &:active, .open>.dropdown-toggle.btn-primary{
-          border: none;
-          outline: none;
-          background-color: #439BB2;
-          border-color: #439BB2;
+      li.disabled >a{
+          color: #888;
+          &:focus{
+              outline: none;
+          }
       }
   }
-}*/
+}

File diff suppressed because it is too large
+ 1 - 0
dist/webManger12346/app-2be424808c.js


File diff suppressed because it is too large
+ 0 - 1
dist/webManger12346/app-9fadd23821.css


File diff suppressed because it is too large
+ 0 - 1
dist/webManger12346/app-a9472bdec3.js


File diff suppressed because it is too large
+ 1 - 0
dist/webManger12346/app-f7618fe654.css


+ 2 - 2
dist/webManger12346/index.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
     <!--<link rel="stylesheet" href="../bower_components/bootstrap-material-design/dist/bootstrap-material-design.css">-->
     <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">
-    <link rel="stylesheet" href="app-9fadd23821.css">
+    <link rel="stylesheet" href="app-f7618fe654.css">
 
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
     <!--<script src="js/jquery.min.js"></script>-->
@@ -22,7 +22,7 @@
     <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
     <script src="../bower_components/angular-animate/angular-animate.min.js"></script>
 
-    <script src="app-a9472bdec3.js"></script>
+    <script src="app-2be424808c.js"></script>
 </head>
 
 <body ng-app="app">

+ 24 - 0
talkview/src/js/controller/groupsinfoController.js

@@ -11,6 +11,25 @@ angular.module('appMessage').controller('GroupsinfoController', ['$scope', funct
         { loginName: "0578+0+lsslzy", displayName: "蓝梓洋", manger: 2 },
     ];
 
+    $scope.$on('$viewContentLoaded', function() {
+        var tbody = $("#content>tbody")[0];
+        var rMenu = $("#rMenu")[0];
+        tbody.oncontextmenu = function() { return false }; //禁止鼠标右键菜单显示
+        rMenu.oncontextmenu = function() { return false };
+        console.log(tbody);
+        tbody.onmouseup = function(e) {
+            if (e.button === 2) { //如果button=1(鼠标左键),button=2(鼠标右键),button=0(鼠标中间键)
+                console.log(e);
+                console.log(e.clientX, e.clientY);
+                rMenu.style.top = e.clientY + 'px'; //鼠标点击时给右键菜单定位X、Y轴坐标
+                rMenu.style.left = e.clientX + 'px';
+                rMenu.style.display = 'block';
+            } else {
+                rMenu.style.display = 'none';
+            }
+        }
+    });
+
     $scope.searchUser = function() {
         var users = $("#content>tbody>tr");
         //console.log(users);
@@ -59,4 +78,9 @@ angular.module('appMessage').controller('GroupsinfoController', ['$scope', funct
         $(activeClick[0].parentElement).addClass("activebcolor");
         $(activeClick[0].parentElement.parentElement).addClass("activebcolor");
     };
+
+    $scope.rMouseClick = function(e) {
+        console.log("右键菜单");
+    };
+
 }]);

+ 10 - 133
talkview/src/less/app.main.less

@@ -784,7 +784,7 @@ body {
     font-size: 12px;
     font-family: "微软雅黑","宋体";
     border-bottom: 1px solid #ddd;
-    #head{
+    #head {
         line-height: normal !important;
         background-color: #E8F4F8;
         height: 40px;
@@ -883,72 +883,6 @@ body {
         height: 600px;
         .nav-pills {
             margin: 8px 10px 0px 10px;
-            &.diy {
-                font-size: 12px;
-                font-family: "微软雅黑","宋体";
-                font-weight: normal;
-                > li {
-                    > a {
-                        background-color: #FFF;
-                        border: 1px solid #e6e6e6;
-                        color: #777;
-                        padding: 5px 20px;
-                        margin-bottom: 15px;
-                        border-radius: 15px;
-                        text-align: left;
-                        &.animate {
-                            animation-name:animateRt;
-                            animation-duration:0.1s;
-                            animation-timing-function:linear;
-                            animation-iteration-count:1;
-                            animation-direction:normal;
-                            /* Safari and Chrome: */
-                            -webkit-animation-name:animateRt;
-                            -webkit-animation-duration:0.1s;
-                            -webkit-animation-timing-function:linear;
-                            -webkit-animation-iteration-count:1;
-                            -webkit-animation-direction:normal;
-                        }
-                        &.animateLt {
-                            animation-name:animateLt;
-                            animation-duration:1s;
-                            animation-timing-function:linear;
-                            animation-iteration-count:1;
-                            animation-direction:normal;
-                            /* Safari and Chrome: */
-                            -webkit-animation-name:animateLt;
-                            -webkit-animation-duration:1s;
-                            -webkit-animation-timing-function:linear;
-                            -webkit-animation-iteration-count:1;
-                            -webkit-animation-direction:normal;
-                        }
-                    }
-                    @keyframes animateRt {
-                        0%  {text-align: left;background-color:#FFF;color: #777;}
-                        100%  {text-align: right;background-color:#eee;color: #009688;}
-                    }
-                    @-webkit-keyframes animateRt {
-                        0%  {text-align: left;background-color:#FFF;color: #777;}
-                        100%  {text-align: right;background-color:#eee;color: #009688;}
-                    }
-                    @keyframes animateLt {
-                        0%  {text-align: right;background-color:#eee;color: #009688;}
-                        100%  {text-align: left;background-color:#FFF;color: #777;}
-                    }
-                    @-webkit-keyframes animateLt {
-                        0%  {text-align: right;background-color:#eee;color: #009688;}
-                        100%  {text-align: left;background-color:#FFF;color: #777;}
-                    }
-                }
-                > li.active {
-                    > a {
-                        border: 1px solid #e6e6e6;
-                        background-color:#eee;
-                        color: #009688;
-                        text-align: right;
-                    }
-                }
-            }
         }
     }
     .tab-content {
@@ -1067,22 +1001,6 @@ body {
         >ul {
             margin: 8px;
         }
-        .pagination-sm {
-            li >a {
-                color: #009EE0;
-            }
-            li.active >a {
-                color: #FFF;
-                border: 1px solid #5bc0de;
-                background: #5bc0de;
-            }
-            li.disabled >a{
-                color: #888;
-                &:focus{
-                    outline: none;
-                }
-            }
-        }
     }
 }
 
@@ -1247,25 +1165,7 @@ body {
                     float: right;
                     margin: 25px 90px 10px 10px;
                     .btn-primary{
-                        line-height: normal;
-                        height: 24px;
-                        width: 75px;
                         margin-left: 10px;
-                        padding: 2px 4px;
-                        font-size: 12px;
-                        background: #5bc0de;
-                        border: #5bc0de;
-                        &:hover,&:focus {
-                            outline: none;
-                            background: #5bc0de;
-                            border: #5bc0de;
-                        }
-                        &:active, .open>.dropdown-toggle.btn-primary{
-                            border: none;
-                            outline: none;
-                            background-color: #439BB2;
-                            border-color: #439BB2;
-                        }
                     }
                 }
             }
@@ -1346,6 +1246,14 @@ body {
                 }
             }
         }
+        #rMenu {
+           position:absolute;
+           display: none;
+           width:100px;
+           height:150px;
+           background: #FFF;
+           border:1px solid #ddd;
+        }
         .modal .modal-dialog {
             top: 200px;
             left: 140px;
@@ -1364,43 +1272,12 @@ body {
                 text-align: center;
                 >button.sure {
                     margin: 10px auto 20px;
-                    padding: 2px 4px;
                     height: 28px;
                     width: 100px;
                     font-size: 15px;
-                    background: #5bc0de;
-                    border: #5bc0de;
-                    &:hover,&:focus {
-                        outline: none;
-                        background: #5bc0de;
-                        border: #5bc0de;
-                    }
-                    &:active, .open>.dropdown-toggle.btn-primary{
-                        border: none;
-                        outline: none;
-                        background-color: #439BB2;
-                        border-color: #439BB2;
-                    }
                 }
                 >button.del {
-                    margin: 10px 8px 20px;
-                    padding: 2px 4px;
-                    height: 24px;
-                    width: 70px;
-                    font-size: 13px;
-                    background: #5bc0de;
-                    border: #5bc0de;
-                    &:hover,&:focus {
-                        outline: none;
-                        background: #5bc0de;
-                        border: #5bc0de;
-                    }
-                    &:active, .open>.dropdown-toggle.btn-primary{
-                        border: none;
-                        outline: none;
-                        background-color: #439BB2;
-                        border-color: #439BB2;
-                    }
+                    margin: 10px 5px 20px;
                 }
             }
         }

+ 12 - 39
talkview/src/templates/groupsInfo.html

@@ -1,7 +1,7 @@
 <div class="groupinfo">
     <div id="tablist">
         <!-- Nav tabs -->
-        <ul class="nav nav-pills diy" role="tablist">
+        <ul class="nav nav-pills defaults" role="tablist">
             <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">群组资料</a></li>
             <li role="presentation"><a href="#members" aria-controls="members" role="tab" data-toggle="tab">成员列表</a></li>
             <li role="presentation"><a href="#settings" aria-controls="settings" role="tab" data-toggle="tab">群组设置</a></li>
@@ -64,7 +64,7 @@
                                 <th style="width:90px"></th>
                             </tr>
                         </thead>
-                        <tbody>
+                        <tbody ng-mouseup="rMouseClick($event)">
                             <tr ng-click="activeTable($event)" ng-repeat="user in groupUsers track by $index">
                                 <td style="text-align:center;"><img ng-src="{{getMangerIco(user)}}" alt=""></td>
                                 <td><input type="text" readonly="readonly" ng-value="user.loginName"></td>
@@ -73,38 +73,6 @@
                                     <a class="glyphicon glyphicon-remove" data-toggle="modal" data-target="#delModal"></a>
                                 </td>
                             </tr>
-                            <!--<tr ng-click="activeTable($event)">
-                                <td style="text-align:center;"><img src="../img/mangers.png" alt=""></td>
-                                <td><input type="text" readonly="readonly" value="0578+0+lsswsrj2"></td>
-                                <td><input type="text" readonly="readonly" value="丽水市万赛软件科技有限公司维护2"></td>
-                                <td>
-                                    <a class="glyphicon glyphicon-remove" data-toggle="modal" data-target="#delModal"></a>
-                                </td>
-                            </tr>
-                            <tr ng-click="activeTable($event)">
-                                <td style="text-align:center;"><img src="../img/mangers.png" alt=""></td>
-                                <td><input type="text" readonly="readonly" value="0578+0+lsswsrj3"></td>
-                                <td><input type="text" readonly="readonly" value="丽水市万赛软件科技有限公司维护3"></td>
-                                <td>
-                                    <a class="glyphicon glyphicon-remove" data-toggle="modal" data-target="#delModal"></a>
-                                </td>
-                            </tr>
-                            <tr ng-click="activeTable($event)">
-                                <td style="text-align:center;"></td>
-                                <td><input type="text" readonly="readonly" value="0578+0+lsswsrj4"></td>
-                                <td><input type="text" readonly="readonly" value="丽水市万赛软件科技有限公司维护4"></td>
-                                <td>
-                                    <a class="glyphicon glyphicon-remove" data-toggle="modal" data-target="#delModal"></a>
-                                </td>
-                            </tr>
-                            <tr ng-click="activeTable($event)">
-                                <td style="text-align:center;"></td>
-                                <td><input type="text" readonly="readonly" value="0578+0+lsswsrj5"></td>
-                                <td><input type="text" readonly="readonly" value="丽水市万赛软件科技有限公司维护5"></td>
-                                <td>
-                                    <a class="glyphicon glyphicon-remove" data-toggle="modal" data-target="#delModal"></a>
-                                </td>
-                            </tr>-->
                         </tbody>
                     </table>
                 </div>
@@ -127,11 +95,16 @@
                     <div class="text-message" contenteditable="plaintext-only"></div>
                 </div>
                 <div class="button-bottom">
-                    <button type="button" data-toggle="modal" data-target="#okModal" class="btn btn-primary">保存</button>
-                    <button type="button" class="btn btn-primary">关闭</button>
+                    <button type="button" data-toggle="modal" data-target="#okModal" class="btn btn-primary btn-blue">保 存</button>
+                    <button type="button" class="btn btn-primary btn-blue">关 闭</button>
                 </div>
             </form>
         </div>
+        <!--menu-->
+        <div id="rMenu">
+            <p>确定</p>
+            <p>关闭</p>
+        </div>
         <!--OK-->
         <div class="modal fade" id="okModal" tabindex="-2" role="dialog" data-backdrop="static" aria-labelledby="okModalLabel" aria-hidden="true">
             <div class="modal-dialog">
@@ -140,7 +113,7 @@
                         <p id="titleB">保存成功</p>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-primary sure" data-dismiss="modal">确 定</button>
+                        <button type="button" class="btn btn-primary btn-blue sure" data-dismiss="modal">确 定</button>
                     </div>
                 </div>
             </div>
@@ -152,8 +125,8 @@
                         <p id="titleB">确定删除该群成员</p>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-primary del" data-dismiss="modal">确 定</button>
-                        <button type="button" class="btn btn-primary del" data-dismiss="modal">取 消</button>
+                        <button type="button" class="btn btn-primary btn-blue del" data-dismiss="modal">确 定</button>
+                        <button type="button" class="btn btn-primary btn-blue del" data-dismiss="modal">取 消</button>
                     </div>
                 </div>
             </div>

+ 2 - 2
talkview/src/templates/historyMsg.html

@@ -30,7 +30,7 @@
     </div>
     <div style="border-top:solid 1px #ddd;"></div>
     <div id="leftTab">
-        <ul class="nav nav-pills diy nav-stacked">
+        <ul class="nav nav-pills slide nav-stacked">
             <li role="presentation" class="active"><a class="slip" ng-click="animate($event)" href="#recentContacts" aria-controls="home" role="tab" data-toggle="tab"><span>最近联系人</span></a></li>
             <li role="presentation"><a class="slip" ng-click="animate($event)" href="#units" aria-controls="home" role="tab" data-toggle="tab"><span>单位部门</span></a></li>
             <li role="presentation"><a class="slip" ng-click="animate($event)" href="#groups" aria-controls="home" role="tab" data-toggle="tab"><span>群组</span></a></li>
@@ -346,7 +346,7 @@
             </div>
         </div>
         <div id="paginationTab">
-            <ul uib-pagination boundary-links="true" total-items="totalItems" ng-model="currentPage" class="pagination-sm" max-size="maxSize" force-ellipses="true" previous-text="上页" next-text="下页" first-text="首页" last-text="尾页"></ul>
+            <ul uib-pagination boundary-links="true" total-items="totalItems" ng-model="currentPage" class="pagination-sm diy" max-size="maxSize" force-ellipses="true" previous-text="上页" next-text="下页" first-text="首页" last-text="尾页"></ul>
             <p>共{{0+totalItems}}条记录</p>
         </div>
     </div>

+ 2 - 0
webManger12346/src/js/controller/webController.js

@@ -7,6 +7,8 @@ angular.module('app').controller('WebMangerController', ['$scope', '$filter', fu
     $scope.nowDate = $filter("date")($scope.now, "yyyy-MM-dd HH:mm:ss");
     $scope.createDate = $scope.nowDate;
     $scope.currentPage = 1;
+    $scope.totalItems = 100;
+    $scope.maxSize = 5; //最多显示7页其他的用···代替
     $scope.animateFirst = true;
     $scope.user = {
         name: '客服一',

+ 12 - 27
webManger12346/src/less/app.main.less

@@ -107,16 +107,17 @@ body{
             float: right;
             margin: 8px 70px 8px 0px;
             padding:  0px 10px;
-            >li>a {
-            background-color: #4F5661;
-            line-height: normal;
-            font-weight: normal;
             font-size: 14px;
-            color: #FFF;
-            text-decoration: none;
-            i {
-                  font-size: 12px;
-            }
+            >li>a {
+                padding:  5px 10px;
+                background-color: #4F5661;
+                line-height: normal;
+                font-weight: normal;
+                color: #FFF;
+                text-decoration: none;
+                i {
+                    font-size: 12px;
+                }
             }
             .dropdown-menu {
                 border-radius: 0px;
@@ -134,7 +135,7 @@ body{
         width: 180px;
         .nav-pills {
             margin: 10px 10px 0px 20px;
-            &.diy {
+            &.slide {
                 font-size: 14px;
                 font-family: "微软雅黑","宋体";
                 font-weight: normal;
@@ -334,7 +335,7 @@ body{
                             font-size: 12px;
                         }
                         .btn-primary{
-                            width: 75px;
+                            width: 72px;
                             background: #5bc0de;
                             border: #5bc0de;
                             &:hover,&:focus {
@@ -586,22 +587,6 @@ body{
         >ul {
             margin: 8px;
         }
-        .pagination-sm {
-            li >a {
-                color: #009EE0;
-            }
-            li.active >a {
-                color: #FFF;
-                border: 1px solid #5bc0de;
-                background: #5bc0de;
-            }
-            li.disabled >a{
-                color: #888;
-                &:focus{
-                    outline: none;
-                }
-            }
-        }
     }
 }
 

+ 3 - 3
webManger12346/src/templates/mangerWeb.html

@@ -1,7 +1,7 @@
 <div class="webManger">
     <header class="head">
         <span>12345政务服务管理后台</span>
-        <ul class="nav nav-pills diy">
+        <ul class="nav nav-pills">
             <li role="presentation" class="dropdown">
                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                 admin【管理员】<i class="glyphicon glyphicon-menu-down"></i>
@@ -14,7 +14,7 @@
         </ul>
     </header>
     <div id="leftList">
-        <ul class="nav nav-pills diy nav-stacked">
+        <ul class="nav nav-pills slide nav-stacked">
             <li role="presentation" class="active"><a class="slip" ng-click="animate($event)" href="#suggestions" aria-controls="home" role="tab" data-toggle="tab"><span>投诉建议</span></a></li>
             <li role="presentation"><a class="slip" ng-click="animate($event)" href="#managers" aria-controls="home" role="tab" data-toggle="tab"><span>人员管理</span></a></li>
         </ul>
@@ -284,7 +284,7 @@
     <footer class="foot">
         <div id="paginationTab">
             <span>共{{0+totalItems}}条数据</span>
-            <ul uib-pagination boundary-links="true" total-items="totalItems" ng-model="currentPage" class="pagination-sm" max-size="maxSize" force-ellipses="true" previous-text="上页" next-text="下页" first-text="首页" last-text="尾页"></ul>
+            <ul uib-pagination boundary-links="true" total-items="totalItems" ng-model="currentPage" class="pagination-sm diy" max-size="maxSize" force-ellipses="true" previous-text="上页" next-text="下页" first-text="首页" last-text="尾页"></ul>
         </div>
         <div style="border-top:solid 1px #eee;margin:0px auto 15px;"></div>
         <p>Copyright © 2007-2017 | 浙江万赛软件科技有限公司</p>