Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【无】资源无负责人时，详情title显示undefined--更改为显示为空；

业务视图下资源动态获取字段优化

See merge request !891

@@ -4842,7 +4842,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                     title += '管理IP-' + manageIp + '|';
                     title += '管理IP-' + manageIp + '|';
                 }
                 }
             }
             }
-            if (adminName) {
+            if (adminName && adminName!=undefined && adminName!='undefined') {
                 title += adminName + '|';
                 title += adminName + '|';
             }
             }
             if (title.length > 0) {
             if (title.length > 0) {

@@ -447,9 +447,9 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
                 , done: function (res) {
                 , done: function (res) {
                     if (res && res.data ) {
                     if (res && res.data ) {
                         let arr=res.data;
                         let arr=res.data;
-                        if(fieldExpandArr.indexOf(resType)!=-1){
+                        if(fieldExpandArr.indexOf('OperatingSystem')!=-1){
                         }else{
                         }else{
-                            fieldExpandArr.push(resType);
+                            fieldExpandArr.push('OperatingSystem');
                             if(arr.length>0){
                             if(arr.length>0){
                                 arr.map(item=>{
                                 arr.map(item=>{
                                     let listStr='';
                                     let listStr='';