Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

@@ -147,6 +147,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
         function initUserSelect() {
             $.ajax({
                 url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
+                async: false, // 接口请求导致，设置默认值出错
                 success: function (res) {
                     userSelect = xmSelect.render({
                         el: '.adminUser',

@@ -237,10 +237,8 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => {
         if (res && res.success) {
             let obj = res.object;
             let cmdVal = obj.cmdbValue;
-
-            let url = `${preUrl}/#/CI/configuration-item/detail?objId=${cmdVal}&id=${resId}`
-
-            //window.open(url, "_blank", `left=100,fullscreen,toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, copyhistory=no, width=${width}, height=${height}`);
+            //let url = `${preUrl}/#/CI/configuration-item/detail?objId=${cmdVal}&ciId=${resId}`
+            let url = `${preUrl}/#/CI/configuration-item/detail/${resId}/${cmdVal}`
             global.openBlankWindow(url, "80%", "90%");
         } else {
             proxy.$global.showMsg('没有查询到关联数据，请配置！', "error");

@@ -597,7 +597,14 @@
 <script type="text/html" id="resindex_resName">
     <!-- 更改单元格溢出时的tip跑到左上角 LSQ 2022/1/6-->
     <div id="res-div">
-        {{# var w=$("[lay-id='resListTable'] table thead th[data-field='resName']").data('minwidth');
+        {{# var urlLast=window.location.hash;
+            var w=$(".layui-table thead th[data-field='resName']").data('minwidth');
+            if(urlLast=="#/res/index"){
+                w=$("[lay-id='resListTable'] table thead th[data-field='resName'").data('minwidth');
+
+            }else if(urlLast=="#/biz/index"){
+                w=$("[lay-id='bizListTable'] table thead th[data-field='resName'").data('minwidth');
+            }
             var maxW=(w-45)+'px';
             var styleW="float: left;max-width: "+maxW+";overflow: hidden; text-overflow: ellipsis; white-space: nowrap;display: inline-block;";
         }}

@@ -188,8 +188,15 @@
                 <el-form-item label="配置信息" prop="name">
                     <el-input :size="$global.elementSize" v-model="treeNodeForm.options" clearable ></el-input>
                 </el-form-item>
-                <el-form-item label="CMDB资源类型ID" prop="name">
-                    <el-input :size="$global.elementSize" v-model="treeNodeForm.cmdbResTypeId" clearable ></el-input>
+                <el-form-item label="CMDB资源类型" prop="name" style="text-align: left">
+                    <el-select style="width: 100%" :size="$global.elementSize" v-model="treeNodeForm.cmdbResTypeId"  placeholder="请选择CMDB资源类型!" clearable filterable >
+                        <el-option
+                                v-for="item in cmdbResTypeList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id">
+                        </el-option>
+                    </el-select>
                 </el-form-item>
 
                 <!--<el-form-item label="详情页配置函数" prop="type">

@@ -156,6 +156,7 @@ const treeNodeConfig = (currentNode) => {
     });
 
     let treeNodeFormRules = Vue.ref({});
+    let cmdbResTypeList = Vue.ref([]);
 
     /**
      * 展示树节点配置
@@ -172,10 +173,23 @@ const treeNodeConfig = (currentNode) => {
                 cmdbResTypeId: currentNode.value.map.cmdbResTypeId,
             }
         }
+        getCmdbResTypeList();
         treeNodeDialogFlg.value = flg;
     }
 
 
+    let getCmdbResTypeList = () =>{
+        if(cmdbResTypeList.value.length > 0){
+            return;
+        }
+        proxy.$http.get(`/api-web/v32/res/config/getCmdbResTypeList`, {}, function (res) {
+            if (res && res.success) {
+                cmdbResTypeList.value = res.data;
+            }
+        });
+    }
+
+
     /**
      * 保存树节点配置
      */
@@ -192,7 +206,9 @@ const treeNodeConfig = (currentNode) => {
         showTreeNodeDialog,
         saveTreeNodeConfig,
         treeNodeForm,
-        treeNodeFormRules
+        treeNodeFormRules,
+        cmdbResTypeList,
+        getCmdbResTypeList
     }
 }
 
@@ -261,7 +277,9 @@ export default {
             showTreeNodeDialog,
             saveTreeNodeConfig,
             treeNodeForm,
-            treeNodeFormRules
+            treeNodeFormRules,
+            cmdbResTypeList,
+            getCmdbResTypeList
         } = treeNodeConfig(currentNode);
 
 
@@ -494,7 +512,9 @@ export default {
             showTreeNodeDialog,
             saveTreeNodeConfig,
             treeNodeForm,
-            treeNodeFormRules
+            treeNodeFormRules,
+            cmdbResTypeList,
+            getCmdbResTypeList
         }
     }
 }