seimin лет назад: 3
Родитель
Сommit
82f56aaaab
1 измененных файлов с 10 добавлено и 10 удалено
  1. 10 10
      assets/js/controllers/knowledge/knowledgeCtrl.js

+ 10 - 10
assets/js/controllers/knowledge/knowledgeCtrl.js

@@ -371,7 +371,7 @@ app.controller('knowledgeManagerCtrl', ["$rootScope", "$scope", "$http", "i18nSe
371 371
             templateUrl: 'assets/views/import.html',
372 372
             controller: function ($scope, $modalInstance, FileUploader) {
373 373
                 var importUploader = $scope.importUploader = new FileUploader({
374
-                    url: api_solution.upload().getRequestedUrl(),
374
+                    url: api_user_data.importData1('solution').getRequestedUrl(),
375 375
                 });
376 376
 
377 377
                 importUploader.onWhenAddingFileFailed = function (item /*{File|FileLikeObject}*/ , filter, options) {
@@ -440,7 +440,7 @@ app.controller('knowledgeManagerCtrl', ["$rootScope", "$scope", "$http", "i18nSe
440 440
                     importUploader.onBeforeUploadItem = function (item) {
441 441
                         angular.extend(item.headers, $rootScope.getSession());
442 442
                         item.formData.push({
443
-                            'fileName': item.file.name
443
+                            'filename': item.file.name
444 444
                         });
445 445
                         item.formData.push({
446 446
                             'type': "dataImport"
@@ -479,10 +479,12 @@ app.controller('knowledgeManagerCtrl', ["$rootScope", "$scope", "$http", "i18nSe
479 479
                 $scope.downmodel = [{
480 480
                     id: 1,
481 481
                     name: "模版下载"
482
-                }, {
483
-                    id: 2,
484
-                    name: "数据导出"
485
-                }]
482
+                } 
483
+                // ,{
484
+                //     id: 2,
485
+                //     name: "数据导出"
486
+                // }
487
+                ]
486 488
                 $scope.ok = function () {
487 489
                     $modalInstance.close($scope.key);
488 490
                 };
@@ -502,10 +504,8 @@ app.controller('knowledgeManagerCtrl', ["$rootScope", "$scope", "$http", "i18nSe
502 504
                     'model': selectedItem.id
503 505
                 };
504 506
                 $http({
505
-                    url: api_solution.export({
506
-                        'model': 1
507
-                    }).getRequestedUrl(),
508
-                    method: 'POST',
507
+                    url: api_user_data.downDataModel('solution',1).getRequestedUrl(),
508
+                    method: 'GET',
509 509
                     data: JSON.stringify(filadata),
510 510
                     headers: {
511 511
                         // 'Content-type': 'application/xls',