Sfoglia il codice sorgente

报表联调,增加值班提醒

seimin 3 anni fa
parent
commit
9c92bfa9c6

+ 1 - 1
assets/js/controllers/report/analysis.js

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

+ 1 - 1
assets/js/controllers/report/catergry.js

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

+ 1 - 1
assets/js/controllers/system/organizationdesign/worktimeCtrl.js

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

+ 29 - 0
assets/views/system/tpl/systemworktime.html

@@ -67,6 +67,35 @@
67 67
                     </div>
68 68
                 </div>
69 69
             </div>
70
+            <!-- 是否值班提醒 -->
71
+            <div class="margin-bottom-15 anline">
72
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14" style="width: 100px;">是否值班提醒:</div>
73
+                <div class="pull-right openaddinput">
74
+                    <div class="setting-box clearfix">
75
+                        <div class="setting-switch pull-left">
76
+                            <div class="radio clip-radio radio-primary radio-inline">
77
+                                <input type="radio" id="yes" ng-value="1" name="duty" ng-model="worktimedata.duty">
78
+                                <label for="yes">
79
+                                    是
80
+                                </label>
81
+                            </div>
82
+                            <div class="radio clip-radio radio-primary radio-inline">
83
+                                <input type="radio" id="no" ng-value="0" name="duty" ng-model="worktimedata.duty">
84
+                                <label for="no">
85
+                                    否
86
+                                </label>
87
+                            </div>
88
+                        </div>
89
+                    </div>
90
+                </div>
91
+            </div>
92
+            <!-- 值班提醒选择是的时候,需要选择时间 -->
93
+            <div class="margin-bottom-15 anline" ng-if="worktimedata.duty == 1">
94
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14 margin-top-10" style="width: 100px;">每日发送时间*:</div>
95
+                <div class="pull-right openaddinput">
96
+                    <timepicker ng-model="worktimedata.dutyTime" ng-change="changed()" hour-step="hstep" minute-step="mstep" show-meridian="ismeridian"></timepicker>
97
+                </div>
98
+            </div>
70 99
         </div>
71 100
     </form>
72 101
 </div>