monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit e57b0b537438b19e54447a2bdaefdeee963eb43f 1 parent 55d49470

临时修改

Inline Side-by-side
Showing 2 changed files with 14 additions and 4 deletions
... ... @@ -192,8 +192,17 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => {
}
global.openDetail = (resId, resType, title) => {
let url = window.top.location.href.split('/#')[0] + `/#/res/resDetail/resId=${resId}/resType=${resType}/title=${title}`;
global.openBlankWindow(url);
// let url = `/#/res/resDetail/view/resId=${resId}`;
let url = window.top.location.href.split('/#')[0] + `/#/res/resDetail/view/resId=${resId}`;
if(resType){
url += '/resType=' + resType
}
if(title){
url += '/title=' + title
}
// global.openBlankWindow(url);
}
/**
... ...
... ... @@ -32,7 +32,8 @@
:showBorder="true" :currentPage="currentPage" :total="total" :loading="false"
:showPage="true" :height="(height - 95)" :maxWidth="max">
<template #default="{row,prop,column}">
<a href="javascript:void(0)" v-if="prop == 'resPositon' || prop == 'cabinetNo'" style="border-bottom: solid 1px blue;margin-bottom: 3px;height: 30px;font-size: 15px;" @click="cellClick(row,prop,column)">{{row[prop].value == undefined ? '' : row[prop].value }}</a>
<!-- <a href="javascript:void(0)" v-if="prop == 'resPositon' || prop == 'cabinetNo'" style="border-bottom: solid 1px blue;margin-bottom: 3px;height: 30px;font-size: 15px;" @click="cellClick(row,prop,column)">{{row[prop].value == undefined ? '' : row[prop].value }}</a>-->
<a href="javascript:void(0)" v-if="prop == 'aaa' || prop == 'bbbbb'" style="border-bottom: solid 1px blue;margin-bottom: 3px;height: 30px;font-size: 15px;" @click="cellClick(row,prop,column)">{{row[prop].value == undefined ? '' : row[prop].value }}</a>
<component v-else-if="row[prop] && row[prop].props && row[prop].props.colComponents " v-bind:is="row[prop].props.colComponents"
:resId="row.resId"
... ... @@ -59,7 +60,7 @@
</div>
<div v-if="cellDetail.prop == 'resPositon'" @click="openCabinet(false)" style="background-image: url('/vue3/src/assets/images/res/img02.jpg');height: 600px;background-repeat: no-repeat;background-position: center;background-size: 80%;">
<div style="font-weight: bold;font-size: 20px;">
{{cellDetail.row[cellDetail.prop]}}布局图
<!--{{cellDetail.row[cellDetail.prop]}}布局图-->
</div>
</div>
</template>
... ...