报表联调，增加值班提醒

assets/js/controllers/report/analysis.js

@@ -245,7 +245,7 @@ app.controller('reportanalysisCtrl', ["$scope", "$rootScope", "$state", "$timeou
     }
 
     function getdata(time) {
-        api_hkreport.incidentreport(time, 'incident_trend').then(function(data) {
+        api_hkreport.incidentreport(time, 'incident_trend_hk').then(function(data) {
             handledata(data);
         })
     }

assets/js/controllers/report/catergry.js

@@ -511,7 +511,7 @@ app.controller('reportcatergryCtrl', ["$scope", "$rootScope", "$state", "$timeou
     };
 
     function getdata(time) {
-        api_hkreport.incidentreport(time, 'incident_category_trend').then(function(data) {
+        api_hkreport.incidentreport(time, 'incident_category_trend_hk').then(function(data) {
             headerlist = data.incidentCategoryTrend[0]
             axilist = data.incidentCategoryTrend[1];
             angular.forEach(data.incidentCategoryTrend[2], function(item, index) {

assets/js/controllers/system/organizationdesign/worktimeCtrl.js

@@ -161,7 +161,7 @@ app.controller('woketimeCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                         $scope.dictionary = data;
                     }
                 })
-                $scope.worktimedata = { "startTime": new Date(), "endTime": new Date(), "isTemplate": false }
+                $scope.worktimedata = { "startTime": new Date(), "endTime": new Date(), "isTemplate": false, duty:0 }
                 $scope.cancel = function() {
                     $modalInstance.dismiss('cancel');
                 };

assets/views/system/tpl/systemworktime.html

@@ -67,6 +67,35 @@
                     </div>
                 </div>
             </div>
+            <!-- 是否值班提醒 -->
+            <div class="margin-bottom-15 anline">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14" style="width: 100px;">是否值班提醒:</div>
+                <div class="pull-right openaddinput">
+                    <div class="setting-box clearfix">
+                        <div class="setting-switch pull-left">
+                            <div class="radio clip-radio radio-primary radio-inline">
+                                <input type="radio" id="yes" ng-value="1" name="duty" ng-model="worktimedata.duty">
+                                <label for="yes">
+                                    是
+                                </label>
+                            </div>
+                            <div class="radio clip-radio radio-primary radio-inline">
+                                <input type="radio" id="no" ng-value="0" name="duty" ng-model="worktimedata.duty">
+                                <label for="no">
+                                    否
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- 值班提醒选择是的时候，需要选择时间 -->
+            <div class="margin-bottom-15 anline" ng-if="worktimedata.duty == 1">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14 margin-top-10" style="width: 100px;">每日发送时间*:</div>
+                <div class="pull-right openaddinput">
+                    <timepicker ng-model="worktimedata.dutyTime" ng-change="changed()" hour-step="hstep" minute-step="mstep" show-meridian="ismeridian"></timepicker>
+                </div>
+            </div>
         </div>
     </form>
 </div>