|
@@ -15,8 +15,8 @@ appFormly.config(
|
15
|
15
|
function config(formlyConfigProvider) {
|
16
|
16
|
//格式转换方法 XXX-XXX转驼峰命名
|
17
|
17
|
});
|
18
|
|
-appFormly.controller('newDashCtrl', ['$rootScope', '$auth', '$scope', '$parse', '$injector', '$http', '$q', '$state', '$modal', '$timeout', '$interval', 'SweetAlert', 'i18nService', '$window', "ngTableParams", 'Restangular', 'UserRestangular', 'BpmRestangular', 'api_configure_form', 'api_bpm_domain', 'api_bpm_data','api_event_form', 'api_user_data', 'api_report', 'api_msg', 'api_bpm_schedule', 'api_newreport', 'api_statistic', "calendarConfig", "api_login",
|
19
|
|
- function($rootScope, $auth, $scope, $parse, $injector, $http, $q, $state, $modal, $timeout, $interval, SweetAlert, i18nService, $window, ngTableParams, Restangular, UserRestangular, BpmRestangular, api_configure_form, api_bpm_domain, api_bpm_data,api_event_form, api_user_data, api_report, api_msg, api_bpm_schedule, api_newreport, api_statistic, calendarConfig, api_login) {
|
|
18
|
+appFormly.controller('newDashCtrl', ['$rootScope', '$auth', '$scope', '$parse', '$injector', '$http', '$q', '$state', '$modal', '$timeout', '$interval', 'SweetAlert', 'i18nService', '$window', "ngTableParams", 'Restangular', 'UserRestangular', 'BpmRestangular', 'api_configure_form', 'api_bpm_domain', 'api_bpm_data','api_event_form', 'api_user_data', 'api_report', 'api_msg', 'api_bpm_schedule', 'api_newreport', 'api_statistic', "calendarConfig", "api_login","api_sysinfo",
|
|
19
|
+ function($rootScope, $auth, $scope, $parse, $injector, $http, $q, $state, $modal, $timeout, $interval, SweetAlert, i18nService, $window, ngTableParams, Restangular, UserRestangular, BpmRestangular, api_configure_form, api_bpm_domain, api_bpm_data,api_event_form, api_user_data, api_report, api_msg, api_bpm_schedule, api_newreport, api_statistic, calendarConfig, api_login,api_sysinfo) {
|
20
|
20
|
$scope.incidentlist = {};
|
21
|
21
|
$scope.bodyheight = {};
|
22
|
22
|
// $scope.tableParams = {};
|
|
@@ -1769,6 +1769,19 @@ appFormly.controller('newDashCtrl', ['$rootScope', '$auth', '$scope', '$parse',
|
1769
|
1769
|
}else{
|
1770
|
1770
|
$scope.isShowTj = false;
|
1771
|
1771
|
}
|
|
1772
|
+ $scope.ifShowTj = false;
|
|
1773
|
+ $scope.ifShowTjFunc = function(){
|
|
1774
|
+ api_sysinfo.fetchDataList('systemConfiguration',{
|
|
1775
|
+ "idx": 0,
|
|
1776
|
+ "sum": 1,
|
|
1777
|
+ systemConfiguration: {
|
|
1778
|
+ keyconfig: "ifWorking"
|
|
1779
|
+ }
|
|
1780
|
+ }).then(function(result) {
|
|
1781
|
+ $scope.ifShowTj = result.list[0].valueconfig == 1;
|
|
1782
|
+ });
|
|
1783
|
+ }
|
|
1784
|
+ $scope.ifShowTjFunc();
|
1772
|
1785
|
|
1773
|
1786
|
// 首页统计数据(新)
|
1774
|
1787
|
$scope.managerIndexInfo = {};
|