TOSCA-85 Resolve the problem that the value of the version attribute can not show when modify vim information

Change-Id: I63182f2cf0475a71d271cc66eb40733fcdb266f6
Issue-id:TOSCA-85
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>

3 files changed, 19 insertions, 17 deletions

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
index 0a2b097a..255d39aa 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
@@ -23,8 +23,7 @@ var labelTop = {
             position: 'outer',

             formatter: function (params) {

                 var total = params.series.data[1].value + params.series.data[0].value;

-                var util = params.series.data[0].util;

-                // return total+util+"中的"+"\n"+params.value+util+"已使用" ;

+                var util = params.series.data[0].util;                

                 return $.i18n.prop('com_zte_ums_eco_roc_vim_resource_chart_used') + params.value + util + "\n" +

                     $.i18n.prop('com_zte_ums_eco_roc_vim_resource_chart_total') + total + util;

             },

@@ -175,7 +174,7 @@ vimChart.vimPieChart = function (data) {
     };

 

 

-    // 为echarts对象加载数据 

+     

     vimPieChart.hideLoading();

     vimPieChart.setOption(option);

     window.onresize = vimPieChart.resize;

@@ -411,7 +410,7 @@ vimChart.tenantPieChart = function (data) {
     };

 

 

-    // 为echarts对象加载数据 

+  

     tenantPieChart.hideLoading();

     tenantPieChart.setOption(option);

     window.onresize = tenantPieChart.resize;

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
index 17f8e050..dc9f3ad1 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
@@ -33,7 +33,7 @@ var vm = avalon
         },

         initChart: function () {

 

-            //判断租户是否有admin权限

+            //has admin role

             var tenantRoleUrl = vm.$tenantRoleUrl.replace("{vim_id}", vm.vimInfo.id);

             $.ajax({

                 "type": 'get',

@@ -49,16 +49,16 @@ var vm = avalon
                 complete: function () {

                     if (vm.vimInfo.isAdmin == true) {

 

-                        //获取全部资源使用情况 

+                        //get all resource 

                         vm.vimChartLoad();

 

-                        //获取租户列表

+                        //get tenant list

                         vm.vimListLoad();

                     }

 

                 }

             });

-            //获取租户资源使用情况 

+            //get resource of tenant 

             vm.tenantChartLoad();

         },

         gotoVimPage: function () {

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
index 967eb1c6..dfeb5dd8 100644
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
@@ -37,10 +37,10 @@ var vm = avalon
         },

         isSave: true,

         action: {ADD: 'add', UPDATE: 'update'},

-        $queryVimInfoUrl: '../../openoapi/extsys/v1/vims',

-        $addVimInfoUrl: '../../openoapi/extsys/v1/vims/',

-        $updateVimInfoUrl: '../../openoapi/extsys/v1/vims/',

-        $delVimInfoUrl: '../../openoapi/extsys/v1/vims/{vim_id}',

+        $queryVimInfoUrl: '/openoapi/extsys/v1/vims',

+        $addVimInfoUrl: '/openoapi/extsys/v1/vims/',

+        $updateVimInfoUrl: '/openoapi/extsys/v1/vims/',

+        $delVimInfoUrl: '/openoapi/extsys/v1/vims/{vim_id}',

         $initTable: function () {

             $.ajax({

                 "type": 'get',

@@ -94,7 +94,8 @@ var vm = avalon
             saveType: "add",

             description: "",

             vimType: "openstack",

-            vendor: ""

+            vendor: "",

+            version: ""

         },

         $showVimTable: function (el, action) {

             vm.isSave = false;

@@ -125,6 +126,7 @@ var vm = avalon
                 vm.addVim.titleName = $.i18n.prop('com_zte_ums_eco_roc_vim_modify_info');

                 vm.addVim.vimType = el.type;

                 vm.addVim.vendor = el.vendor;

+                vm.addVim.version = el.version;

             }

             vm.executeError.visible = false;

             vm.executeWait.visible = false;

@@ -146,8 +148,7 @@ var vm = avalon
             }

             vm.executeWait.visible = true;

             vm.executeError.visible = false;

-            if (vm.addVim.saveType == "add") {

-                //不能重复添加

+            if (vm.addVim.saveType == "add") {               

                 /*

                  for( var i = 0; i < vm.vimInfo.length; i ++ ){

                  if(vm.addVim.url == vm.vimInfo[i].url){

@@ -162,7 +163,7 @@ var vm = avalon
                 vm.updateVim();

             }

         },

-        //新增vim

+        //add vim

         persistVim: function () {

             $.ajax({

                 type: "Post",

@@ -208,7 +209,7 @@ var vm = avalon
                 }

             });

         },

-        //更新vim

+        //update vim

         updateVim: function () {

             $.ajax({

                 type: "Put",

@@ -242,6 +243,8 @@ var vm = avalon
                                 vm.vimInfo[i].domain = vm.addVim.domain;

                                 vm.vimInfo[i].description = vm.addVim.description;

                                 vm.vimInfo[i].type = vm.addVim.vimType;

+                                vm.vimInfo[i].version=vm.addVim.version;

+                                vm.vimInfo[i].vendor=vm.addVim.vendor;

                             }

                         }

                         $('#addVimDlg').modal('hide');