dgf 8 år sedan
förälder
incheckning
249faafe1a

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
smsChart/src/js/templates.js


+ 1 - 1
smsChart/temp/manifest/app-js-manifest.json

@@ -1,3 +1,3 @@
 {
-  "app.js": "app-94f9933053.js"
+  "app.js": "app-0e5dee0183.js"
 }

+ 1 - 0
talkview/src/html/index.html

@@ -13,6 +13,7 @@
     <script src="../bower_components/lodash/dist/lodash.js"></script>
     <script src="../bower_components/jquery/dist/jquery.min.js"></script>
     <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <script src="../bower_components/My97DatePicker/WdatePicker.js"></script>
     <script src="../bower_components/jquery-qrcode/jquery.qrcode.min.js"></script>
     <script src="../bower_components/angular/angular.js"></script>
     <script src="../bower_components/ngDraggable/ngDraggable.js"></script>

+ 17 - 2
talkview/src/js/controller/smsController.js

@@ -1,10 +1,25 @@
 'use strict';
 
-angular.module('appMessage').controller('SmsController', ['$scope', '$state', function($scope, $state) {
+angular.module('appMessage').controller('SmsController', ['$scope', '$state', '$filter', function($scope, $state, $filter) {
 
     //lxtalkClient.Invoke('{FB60F992-A0FD-47B3-AAA7-E80DF209C5A4}', '_Register', '', $scope);
+    $scope.now = new Date(); //控制器中使用 
+    $scope.nowDate = $filter("date")($scope.now, "yyyy/MM/dd HH:mm:ss");
+    $scope.selectDate = $scope.nowDate;
+    $scope.checkId = false;
 
-    $scope.Bactive = function($event) {
+    $scope.disable = function($event) {
+        var dataForm = $($event.currentTarget.previousElementSibling.children);
+        if ($scope.checkId) {
+            dataForm[0].disabled = false;
+            dataForm.addClass("activeBackground");
+        } else {
+            dataForm[0].disabled = true;
+            dataForm.removeClass("activeBackground");
+        }
+    };
+
+    $scope.activeClick = function($event) {
         var activeClick = $($event.target.firstElementChild);
         var activeData = $event.target.innerText;
         console.log(activeData);

+ 27 - 7
talkview/src/less/app.main.less

@@ -586,17 +586,37 @@ body {
     font-size: 12px;
     font-family: "微软雅黑","宋体";
     #sms-set {
+        position: relative;
         height: 35px;
         background: #F5F5F5;
-        button {
+        >span#dateInput {
+            width: 187px;
             float: right;
-            height: 25px;
-            width: 75px;
-            padding: 0px;
-            margin: 5px 20px;
-            font-size: 12px;
+            .form-control {
+                margin-top: 5px;
+                margin-left: -12px;
+                height: 25px;
+                font-size: 12px;
+                padding-left: 10px;
+            }
+            .activeBackground {
+                background: #FFF;
+            }
             >span {
-                padding-right: 2px;
+                z-index: 99;
+                position: absolute;
+                top: 7px;
+                left: 505px;
+                font-size: 16px;
+            }
+        }
+        .checkbox {
+            width: 80px;
+            position: absolute;
+            top: 0px;
+            left: 270px;
+            input {
+                margin-top: 3px;
             }
         }
     }

+ 13 - 3
talkview/src/templates/smsSend.html

@@ -1,6 +1,16 @@
 <div class="smsView">
     <div id="sms-set">
-        <button type="button" class="btn btn-success"><span class="glyphicon glyphicon-time"></span>定时发送</button>
+        <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"/>
+            <span>
+                <i class="glyphicon glyphicon-calendar"></i>
+            </span>
+        </span>
+        <div class="checkbox" ng-click="disable($event)">
+            <label>
+                <input type="checkbox" ng-model="checkId"> 定时发送
+            </label>
+        </div>
     </div>
     <div style="border-top:solid 1px #ccc;"></div>
     <div id="sms-manage">
@@ -28,8 +38,8 @@
                     <span class="sr-only">Toggle Dropdown</span>
                 </button>
                 <ul class="dropdown-menu">
-                    <li><a href="#" ng-click="Bactive($event)"><span class="glyphicon glyphicon-ok active"></span> 按Enter键发送消息</a></li>
-                    <li><a href="#" ng-click="Bactive($event)"><span class="glyphicon glyphicon-ok active hid"></span> 按Ctrl+Enter键发送消息</a></li>
+                    <li><a href="#" ng-click="activeClick($event)"><span class="glyphicon glyphicon-ok active"></span> 按Enter键发送消息</a></li>
+                    <li><a href="#" ng-click="activeClick($event)"><span class="glyphicon glyphicon-ok active hid"></span> 按Ctrl+Enter键发送消息</a></li>
                 </ul>
             </div>
         </div>