历史消息

talkview/src/js/controller/historyMsgController.js

@@ -0,0 +1,7 @@
+'use strict';
+
+angular.module('appMessage').controller('HistoryMsgController', ['$scope', '$filter', function($scope, $filter) {
+
+    //lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
+    $scope.selectName = "全部"
+}]);

talkview/src/js/router.js

@@ -7,7 +7,7 @@ angular.module('appMessage').run(['$rootScope', '$state', '$stateParams',
     function($stateProvider, $urlRouterProvider, $compileProvider) {
         $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|local):/);
         $compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|local):/);
-        $urlRouterProvider.otherwise('/smsSend'); //
+        $urlRouterProvider.otherwise('/historyMsg'); //
         $stateProvider.state('messages', {
                 url: '/messages',
                 templateUrl: 'templates/messages.html',
@@ -27,6 +27,11 @@ angular.module('appMessage').run(['$rootScope', '$state', '$stateParams',
                 url: '/smsSend',
                 templateUrl: 'templates/smsSend.html',
                 controller: 'SmsController'
+            })
+            .state('historyMsg', {
+                url: '/historyMsg',
+                templateUrl: 'templates/historyMsg.html',
+                controller: 'HistoryMsgController'
             });
     }
 ]);

talkview/src/less/app.main.less

@@ -74,11 +74,12 @@
     }
     p>span {
         font-size: 11px;
-        font-weight: 500;
         margin-top: 2px;
         margin-left: 5px;
-        color: #007FE0;
+        color: #007FFF;
         >span {
+            font-size: 12px;
+            margin-top: 2px;
             font-family: "微软雅黑","宋体";
             margin: 0px 7px 0px 3px;
         }
@@ -598,7 +599,6 @@ body {
     font-size: 12px;
     font-family: "微软雅黑","宋体";
     #sms-set {
-        position: relative;
         height: 35px;
         background: #F5F5F5;
         >span#dateInput {
@@ -610,23 +610,23 @@ body {
                 height: 25px;
                 font-size: 12px;
                 padding-left: 10px;
+                cursor: default;
             }
             .activeBackground {
                 background: #FFF;
             }
             >span {
                 z-index: 99;
-                position: absolute;
-                top: 7px;
-                left: 485px;
+                float: right;
+                margin-top: -23px;
+                margin-right: 33px;
                 font-size: 16px;
             }
         }
         .checkbox {
             width: 80px;
-            position: absolute;
-            top: 0px;
-            left: 250px;
+            float: right;
+            margin-right: 30px;
             input {
                 margin-top: 3px;
             }
@@ -686,6 +686,7 @@ body {
         border-bottom: none;
         border-radius: 5px 5px 0px 0px;
         margin: 0px 10px;
+        padding-bottom: 5px;
         background: #fff;
         overflow-y: auto;
     }
@@ -754,4 +755,80 @@ body {
             }
         }
     }
+}
+
+.historymsg {
+    width:100%;
+    height: 100%;
+    margin: 0px auto;
+    background: #F5FAFE;
+    font-size: 12px;
+    font-family: "微软雅黑","宋体";
+    #head{
+        height: 45px;
+        .selectData {
+            float: right;
+            margin-top: 9px;
+            margin-right: 30px;
+            width: 200px;
+            >span {
+                float: left;
+                margin-top: 7px;
+                font-size: 13px;
+            }
+            >select {
+                float: right;
+                width: 140px;
+                height: 30px;
+                font-size: 12px;
+            }
+        }
+        .input-group {
+            float: right;
+            margin-top: 9px;
+            margin-right: 120px;
+            height: 30px;
+            width: 300px;
+            .form-control {
+                height: 30px;
+                padding-left: 3px;
+                font-size: 12px;
+            }
+            .btn-default{
+                height: 30px;
+                width: 75px;
+                text-align: left;
+                background: #eee;
+                &:hover,&:active,&:focus {
+                    outline: none;
+                    border: 1px solid #ccc;
+                    background: #eee;
+                }
+            }
+            .dropdown-toggle {
+                margin-left: -25px;
+                height: 28px;
+                width: 10px;
+                border: none;
+                outline: none;
+                border-radius: 0px;
+                &:hover,&:active,&:focus {
+                    border: none;
+                    outline: none;
+                    background: #ddd;
+                }
+                .caret {
+                    float: right;
+                    margin-top: 4px;
+                    margin-right: -4px;
+                }
+            }
+        }
+    }
+    #leftList {
+
+    }
+    #media {
+
+    }
 }

talkview/src/templates/historyMsg.html

@@ -0,0 +1,34 @@
+<div class="historymsg">
+    <div id="head">
+        <div class="input-group">
+            <input type="text" class="form-control" aria-label="..." placeholder="请输入搜索关键字. . .">
+            <div class="input-group-btn">
+                <button type="button" class="btn btn-default">查找</button>
+                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <span class="caret"></span>
+                    <span class="sr-only">Toggle Dropdown</span>
+                </button>
+                <ul class="dropdown-menu">
+                    <li><a href="#">Action</a></li>
+                    <li><a href="#">Another action</a></li>
+                    <li><a href="#">Something else here</a></li>
+                    <li role="separator" class="divider"></li>
+                    <li><a href="#">Separated link</a></li>
+                </ul>
+            </div>
+        </div>
+        <div class="selectData">
+            <span>搜索范围</span>
+            <select class="form-control" ng-change="onSelectedChange()" ng-model="selectName">
+                <option>全部</option>
+                <option>最近一周</option>
+                <option>最近一个月</option>
+            </select>
+        </div>
+    </div>
+    <div style="border-top:solid 1px #ccc;"></div>
+    <div id="leftList">
+    </div>
+    <div id="media">
+    </div>
+</div>

talkview/src/templates/smsSend.html

@@ -1,7 +1,7 @@
 <div class="smsView">
     <div id="sms-set">
         <span id="dateInput">
-            <input type="text" disabled class="form-control" readonly="readonly" onClick="WdatePicker({onpicked: function(){$(this).trigger('change')},dateFmt:'yyyy/MM/dd HH:mm:ss',isShowClear:false,minDate:'%y/%M/%d 00:00:00'})" ng-model="selectDate"/>
+            <input type="text" disabled class="form-control" readonly="readonly" onClick="WdatePicker({onpicked: function(){$(this).trigger('change')},dateFmt:'yyyy/MM/dd HH:mm:ss',isShowClear:false,minDate:'%y/%M/%d 00:00:00',lang:'zh-cn'})" ng-model="selectDate"/>
             <span>
                 <i class="glyphicon glyphicon-calendar"></i>
             </span>