Authored by 王涛

资产视图优化;

<div style="display: flex">
<div @click="openDetail" style="cursor:pointer;width: calc(100% - 25px)">{{textString}}</div>
<div @click="openCmdbAssets" style="cursor:pointer;width: calc(100% - 25px)">{{textString}}</div>
<el-dropdown style="width: 25px">
<span class="el-dropdown-link" style="cursor:pointer;">
<i class="el-icon-more" style="color: blue;font-weight: bold;" />
... ... @@ -12,8 +12,8 @@
<el-dropdown-item v-if="topo" title="拓扑" @click="openTopoPage">
<i class="iconfont icon-wangluotuopu" style="color: #FEB61E"/>拓扑
</el-dropdown-item>
<el-dropdown-item v-if="assets" title="资产" @click="openCmdbAssets">
<i class="iconfont icon-assets" style="color: #FEB61E"/>资产
<el-dropdown-item v-if="assets" title="资产" @click="openDetail">
<i class="iconfont icon-assets" style="color: #FEB61E"/>详情
</el-dropdown-item>
</el-dropdown-menu>
</template>
... ...
... ... @@ -184,18 +184,23 @@
:model="treeNodeForm"
:rules="treeNodeFormRules"
label-position="right"
label-width="120px">
label-width="150px">
<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>
<!--<el-form-item label="详情页配置函数" prop="type">
<el-input :size="$global.elementSize" v-model="treeNodeForm.detailFunc" type="textarea" clearable></el-input>
</el-form-item>-->
<el-form-item label="查询视图" prop="sort">
<el-input :size="$global.elementSize" v-model="treeNodeForm.veiwName" clearable readonly></el-input>
<el-input :size="$global.elementSize" v-model="treeNodeForm.veiwname" clearable readonly></el-input>
</el-form-item>
</el-form>
... ...
... ... @@ -40,7 +40,6 @@ let configPageEdit = (columns, currentNode) => {
row.colTypeExtend = '';
return;
}
let params = {
resTypeId: currentNode.value.id,
colType: row.colType,
... ... @@ -152,7 +151,8 @@ const treeNodeConfig = (currentNode) => {
let treeNodeDialogFlg = Vue.ref(false);
let treeNodeForm = Vue.ref({
options: '',
veiwName: ''
veiwname: '',
cmdbResTypeId:''
});
let treeNodeFormRules = Vue.ref({});
... ... @@ -168,7 +168,8 @@ const treeNodeConfig = (currentNode) => {
treeNodeForm.value = {
id: currentNode.value.id,
options: currentNode.value.map.options,
veiwName: currentNode.value.map.veiwName
veiwname: currentNode.value.map.veiwName,
cmdbResTypeId: currentNode.value.map.cmdbResTypeId,
}
}
treeNodeDialogFlg.value = flg;
... ... @@ -335,6 +336,7 @@ export default {
}
currentNode.value = data;
getConfigData();
getColType({});
}
}
... ...
... ... @@ -320,6 +320,7 @@ export default {
let getPageInfo = ({page, limit}) => {
searchForm.value.page = page;
searchForm.value.pageSize = limit;
debugger
// 下一页搜索
getPage();
}
... ...
... ... @@ -15,7 +15,7 @@
<el-form :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item v-for="searchInfo in obj.searchList" :label="searchInfo.name">
<el-input v-if="searchInfo.type == 'INPUT'" v-model="searchForm[searchInfo.key]" :placeholder="'请输入' + searchInfo.name"></el-input>
<el-select v-else v-model="searchForm[searchInfo.key]" :placeholder="'请选择' + searchInfo.name" clearable >
<el-select v-else v-model="searchForm[searchInfo.key]" :placeholder="'请选择' + searchInfo.name" clearable filterable >
<el-option
v-for="item in searchItem[searchInfo.key]"
:key="item.val"
... ...