seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed headers issues of offline meter file and knowledge file in admin UI

pull/19/MERGE
13621160019@163.com 2021-03-17 11:32:20 +08:00
parent 65a18aff97
commit b99d251e4c
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/app/controllers/login/login.controller.js
View File

@ -7,7 +7,6 @@ app.controller('LoginController', function ($rootScope,
$window, $window,
$common, $common,
$uibModal, $uibModal,
$cookies,
$scope, $scope,
$interval, $interval,
LoginService, LoginService,

14
admin/app/controllers/settings/knowledgefile/knowledgefile.controller.js
View File

@ -1,6 +1,16 @@
'use strict'; 'use strict';
app.controller('KnowledgeFileController', function ($scope, $common, $cookies, $translate, $uibModal, KnowledgeFileService, toaster, SweetAlert) { app.controller('KnowledgeFileController', function (
$scope,
$window,
$common,
$translate,
$uibModal,
KnowledgeFileService,
toaster,
SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser"));
$scope.getAllKnowledgeFiles = function () { $scope.getAllKnowledgeFiles = function () {
KnowledgeFileService.getAllKnowledgeFiles(function (error, data) { KnowledgeFileService.getAllKnowledgeFiles(function (error, data) {
@ -18,7 +28,7 @@ app.controller('KnowledgeFileController', function ($scope, $common, $cookies, $
acceptedFiles: '.xlsx,.xls,.pdf,.docx,.doc,.dwg,.jpg,.png,.csv', acceptedFiles: '.xlsx,.xls,.pdf,.docx,.doc,.dwg,.jpg,.png,.csv',
dictDefaultMessage: 'Click(or Drop) to add files', dictDefaultMessage: 'Click(or Drop) to add files',
maxFilesize: '100', maxFilesize: '100',
headers: { "User-UUID": $cookies.get("user_uuid"), "Token": $cookies.get("token") } headers: { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }
}; };
$scope.dzCallbacks = { $scope.dzCallbacks = {

15
admin/app/controllers/settings/meter/offline-meter-file.controller.js
View File

@ -1,6 +1,17 @@
'use strict'; 'use strict';
app.controller('OfflineMeterFileController', function($scope, $common, $cookies, $translate,$uibModal,$interval, OfflineMeterFileService, toaster, SweetAlert) { app.controller('OfflineMeterFileController', function(
$scope,
$window,
$common,
$translate,
$uibModal,
$interval,
OfflineMeterFileService,
toaster,
SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser"));
$scope.getAllOfflineMeterFiles = function() { $scope.getAllOfflineMeterFiles = function() {
OfflineMeterFileService.getAllOfflineMeterFiles(function(error, data) { OfflineMeterFileService.getAllOfflineMeterFiles(function(error, data) {
@ -18,7 +29,7 @@ app.controller('OfflineMeterFileController', function($scope, $common, $cookies
acceptedFiles: '.xlsx', acceptedFiles: '.xlsx',
dictDefaultMessage: 'Click(or Drop) to add files', dictDefaultMessage: 'Click(or Drop) to add files',
maxFilesize: '100', maxFilesize: '100',
headers: { "User-UUID": $cookies.get("user_uuid"), "Token": $cookies.get("token") } headers: { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }
}; };
$scope.dzCallbacks = { $scope.dzCallbacks = {