Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

bug:app-overview:listView\cardView

See merge request root/atms!150

atms-web/src/main/webapp/app/framework/app-overview/app-overview.html

@@ -75,9 +75,9 @@
                 <div style="overflow:hidden;display:inline-block;margin-left:30px;" ng-show="serviceTypeId ==='12' && updateStatus">
                     <button type="button" class="btn btn-in-grid" ng-show="serviceTypeId ==='12' && updateStatus" ngf-select="" ng-model="productFileName" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false" ngf-allow-dir="false"><i class="material-icons middle">add_circle_outline</i>导入</button>
                 </div>
-                <a href="" ng-click="toggleView('workflowView')" ng-class="{true:'active',false:'inactive'}[currentView == 'workflowView']"><i class="fa fa-tasks" aria-hidden="true"></i></a>
-                <!--<a href="" ng-click="toggleView('listView')" ng-class="{true:'active',false:'inactive'}[currentView == 'listView']"><i class="fa fa-list-ul" aria-hidden="true"></i></a>-->
-               <!-- <a href="" ng-click="toggleView('cardView')" ng-class="{true:'active',false:'inactive'}[currentView == 'cardView']"><i class="fa fa-th" aria-hidden="true"></i></a>-->
+                <!--<a href="" ng-click="toggleView('workflowView')" ng-class="{true:'active',false:'inactive'}[currentView == 'workflowView']"><i class="fa fa-tasks" aria-hidden="true"></i></a>-->
+                <a href="" ng-click="toggleView('listView')" ng-class="{true:'active',false:'inactive'}[currentView == 'listView']"><i class="fa fa-list-ul" aria-hidden="true"></i></a>
+                <a href="" ng-click="toggleView('cardView')" ng-class="{true:'active',false:'inactive'}[currentView == 'cardView']"><i class="fa fa-th" aria-hidden="true"></i></a>
                 <div class="button-sort" ng-if="currentView == 'cardView'">
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         {{ 'OrderBy' | translate }}<span class="glyphicon glyphicon-sort"></span>