Commit 86a8faee authored by kevin's avatar kevin

#

parent c897feee
...@@ -185,7 +185,6 @@ public class TemplateController extends BaseController { ...@@ -185,7 +185,6 @@ public class TemplateController extends BaseController {
@RequestParam(name = "projectId") String projectId, @RequestParam(name = "projectId") String projectId,
HttpServletResponse response) throws URISyntaxException { HttpServletResponse response) throws URISyntaxException {
period = 0;
String filePath; String filePath;
File templateFile; File templateFile;
InputStream inputStream = null; InputStream inputStream = null;
......
...@@ -1536,7 +1536,7 @@ ...@@ -1536,7 +1536,7 @@
} }
, ,
{ {
dataField: 'Attribute', dataField: 'attribute',
caption: $translate.instant('Attribute'), caption: $translate.instant('Attribute'),
alignment: 'left' alignment: 'left'
} }
...@@ -2212,7 +2212,7 @@ ...@@ -2212,7 +2212,7 @@
$scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]]; $scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]];
break; break;
case enums.formulaDataSourceType.CIT_TBAM: case enums.formulaDataSourceType.CIT_TBAM:
$scope.detail.dataGridSourceBind = getBlowGridData($scope.detail.dataGridSource[0]); getBlowGridData($scope.detail.dataGridSource[0]);
break; break;
default : default :
$scope.detail.dataGridSourceBind = $scope.detail.dataGridSource; $scope.detail.dataGridSourceBind = $scope.detail.dataGridSource;
...@@ -2236,7 +2236,7 @@ ...@@ -2236,7 +2236,7 @@
var getBlowGridData = function( data){ var getBlowGridData = function( data){
cellCommentService.getCellInformation(data).success(function (res) { cellCommentService.getCellInformation(data).success(function (res) {
if(res.resultMsg){ if(res.resultMsg){
return res.data; $scope.detail.dataGridSourceBind = [res.data[0]];
} }
}).error(function (error) { }).error(function (error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment