monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 880f17488deabec1e3bf0d0e415892700b21dd7b 1 parent b91d64b1

资产视图优化；

Inline Side-by-side
Showing 5 changed files with 17 additions and 9 deletions
1 <div style="display: flex"> 1 <div style="display: flex">
2 - <div @click="openDetail" style="cursor:pointer;width: calc(100% - 25px)">{{textString}}</div> 2 + <div @click="openCmdbAssets" style="cursor:pointer;width: calc(100% - 25px)">{{textString}}</div>
3 <el-dropdown style="width: 25px"> 3 <el-dropdown style="width: 25px">
4 <span class="el-dropdown-link" style="cursor:pointer;"> 4 <span class="el-dropdown-link" style="cursor:pointer;">
5 <i class="el-icon-more" style="color: blue;font-weight: bold;" /> 5 <i class="el-icon-more" style="color: blue;font-weight: bold;" />
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 <el-dropdown-item v-if="topo" title="拓扑" @click="openTopoPage"> 12 <el-dropdown-item v-if="topo" title="拓扑" @click="openTopoPage">
13 <i class="iconfont icon-wangluotuopu" style="color: #FEB61E"/>拓扑 13 <i class="iconfont icon-wangluotuopu" style="color: #FEB61E"/>拓扑
14 </el-dropdown-item> 14 </el-dropdown-item>
15 - <el-dropdown-item v-if="assets" title="资产" @click="openCmdbAssets">  
16 - <i class="iconfont icon-assets" style="color: #FEB61E"/>资产 15 + <el-dropdown-item v-if="assets" title="资产" @click="openDetail">
  16 + <i class="iconfont icon-assets" style="color: #FEB61E"/>详情
17 </el-dropdown-item> 17 </el-dropdown-item>
18 </el-dropdown-menu> 18 </el-dropdown-menu>
19 </template> 19 </template>
@@ -184,18 +184,23 @@ @@ -184,18 +184,23 @@
184 :model="treeNodeForm" 184 :model="treeNodeForm"
185 :rules="treeNodeFormRules" 185 :rules="treeNodeFormRules"
186 label-position="right" 186 label-position="right"
187 - label-width="120px"> 187 + label-width="150px">
188 188
189 <el-form-item label="配置信息" prop="name"> 189 <el-form-item label="配置信息" prop="name">
190 <el-input :size="$global.elementSize" v-model="treeNodeForm.options" clearable ></el-input> 190 <el-input :size="$global.elementSize" v-model="treeNodeForm.options" clearable ></el-input>
191 </el-form-item> 191 </el-form-item>
  192 + <el-form-item label="CMDB资源类型ID" prop="name">
  193 + <el-input :size="$global.elementSize" v-model="treeNodeForm.cmdbResTypeId" clearable ></el-input>
  194 + </el-form-item>
192 195
193 <!--<el-form-item label="详情页配置函数" prop="type"> 196 <!--<el-form-item label="详情页配置函数" prop="type">
194 <el-input :size="$global.elementSize" v-model="treeNodeForm.detailFunc" type="textarea" clearable></el-input> 197 <el-input :size="$global.elementSize" v-model="treeNodeForm.detailFunc" type="textarea" clearable></el-input>
195 </el-form-item>--> 198 </el-form-item>-->
196 199
  200 +
  201 +
197 <el-form-item label="查询视图" prop="sort"> 202 <el-form-item label="查询视图" prop="sort">
198 - <el-input :size="$global.elementSize" v-model="treeNodeForm.veiwName" clearable readonly></el-input> 203 + <el-input :size="$global.elementSize" v-model="treeNodeForm.veiwname" clearable readonly></el-input>
199 </el-form-item> 204 </el-form-item>
200 205
201 </el-form> 206 </el-form>
@@ -40,7 +40,6 @@ let configPageEdit = (columns, currentNode) => { @@ -40,7 +40,6 @@ let configPageEdit = (columns, currentNode) => {
40 row.colTypeExtend = ''; 40 row.colTypeExtend = '';
41 return; 41 return;
42 } 42 }
43 -  
44 let params = { 43 let params = {
45 resTypeId: currentNode.value.id, 44 resTypeId: currentNode.value.id,
46 colType: row.colType, 45 colType: row.colType,
@@ -152,7 +151,8 @@ const treeNodeConfig = (currentNode) => { @@ -152,7 +151,8 @@ const treeNodeConfig = (currentNode) => {
152 let treeNodeDialogFlg = Vue.ref(false); 151 let treeNodeDialogFlg = Vue.ref(false);
153 let treeNodeForm = Vue.ref({ 152 let treeNodeForm = Vue.ref({
154 options: '', 153 options: '',
155 - veiwName: '' 154 + veiwname: '',
  155 + cmdbResTypeId:''
156 }); 156 });
157 157
158 let treeNodeFormRules = Vue.ref({}); 158 let treeNodeFormRules = Vue.ref({});
@@ -168,7 +168,8 @@ const treeNodeConfig = (currentNode) => { @@ -168,7 +168,8 @@ const treeNodeConfig = (currentNode) => {
168 treeNodeForm.value = { 168 treeNodeForm.value = {
169 id: currentNode.value.id, 169 id: currentNode.value.id,
170 options: currentNode.value.map.options, 170 options: currentNode.value.map.options,
171 - veiwName: currentNode.value.map.veiwName 171 + veiwname: currentNode.value.map.veiwName,
  172 + cmdbResTypeId: currentNode.value.map.cmdbResTypeId,
172 } 173 }
173 } 174 }
174 treeNodeDialogFlg.value = flg; 175 treeNodeDialogFlg.value = flg;
@@ -335,6 +336,7 @@ export default { @@ -335,6 +336,7 @@ export default {
335 } 336 }
336 currentNode.value = data; 337 currentNode.value = data;
337 getConfigData(); 338 getConfigData();
  339 + getColType({});
338 } 340 }
339 } 341 }
340 342
@@ -320,6 +320,7 @@ export default { @@ -320,6 +320,7 @@ export default {
320 let getPageInfo = ({page, limit}) => { 320 let getPageInfo = ({page, limit}) => {
321 searchForm.value.page = page; 321 searchForm.value.page = page;
322 searchForm.value.pageSize = limit; 322 searchForm.value.pageSize = limit;
  323 +debugger
323 // 下一页搜索 324 // 下一页搜索
324 getPage(); 325 getPage();
325 } 326 }
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <el-form :inline="true" :model="searchForm" class="demo-form-inline"> 15 <el-form :inline="true" :model="searchForm" class="demo-form-inline">
16 <el-form-item v-for="searchInfo in obj.searchList" :label="searchInfo.name"> 16 <el-form-item v-for="searchInfo in obj.searchList" :label="searchInfo.name">
17 <el-input v-if="searchInfo.type == 'INPUT'" v-model="searchForm[searchInfo.key]" :placeholder="'请输入' + searchInfo.name"></el-input> 17 <el-input v-if="searchInfo.type == 'INPUT'" v-model="searchForm[searchInfo.key]" :placeholder="'请输入' + searchInfo.name"></el-input>
18 - <el-select v-else v-model="searchForm[searchInfo.key]" :placeholder="'请选择' + searchInfo.name" clearable > 18 + <el-select v-else v-model="searchForm[searchInfo.key]" :placeholder="'请选择' + searchInfo.name" clearable filterable >
19 <el-option 19 <el-option
20 v-for="item in searchItem[searchInfo.key]" 20 v-for="item in searchItem[searchInfo.key]"
21 :key="item.val" 21 :key="item.val"