monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 赵鹏军
Commit d2650fa0f2277cb1ff170565bb392c596f32bd6b 2 parents 2e06ae7b 0b410498

Merge branch 'wangfeng' into 'master' 

Wangfeng



See merge request !1125
Inline Side-by-side
Showing 8 changed files with 99 additions and 119 deletions
... ... @@ -24,12 +24,12 @@ li{
.contain{
width:413px;
height:710px;
height:808px;
/*margin-left:3%;*/
/*margin-top:5%;*/
/* background-color: red; */
background-image: url(../../src/assets/images/machineRoom/img-no-machine.png);
background-size: 100% 100%;
background-image: url(/vue3/src/assets/images/machineRoom/img-no-machine.png);
background-size: 100%;
background-repeat: no-repeat;
position: relative;
... ... @@ -46,19 +46,20 @@ li{
flex-direction:column;
align-items: center;
/* background-color: red; */
margin-bottom: 15px;
}
.serve{
width:315px;
width:382px;
height:61px;
/*margin-left:-3px;*/
background-image: url(../../src/assets/images/machineRoom/img-4Uservice.png);
background-image: url(/vue3/src/assets/images/machineRoom/img-4Uservice.png);
background-size: 100% 100%;
background-repeat: no-repeat;
/*position: absolute;*/
/*bottom: 0;*/
margin-bottom: 10px;
position: absolute;
bottom: 0;
}
.serve-4u-1{
bottom: 66px;
... ... @@ -106,29 +107,29 @@ li{
bottom: 878px;
}
.img-serve-1{
background-image: url(../../src/assets/images/machineRoom/img-1Uservice.png);
background-image: url(/vue3/src/assets/images/machineRoom/img-1Uservice.png);
height:17px;
width: 315px;
width:383px;
}
.img-serve-2{
background-image: url(../../src/assets/images/machineRoom/img-2Uservice.png);
background-image: url(/vue3/src/assets/images/machineRoom/img-2Uservice.png);
height:34px;
width: 315px;
width:383px;
}
.img-serve-6{
background-image: url(../../src/assets/images/machineRoom/img-6Uservice.png);
height: 60px;
width: 315px;
background-image: url(/vue3/src/assets/images/machineRoom/img-6Uservice.png);
height:100px;
width:383px;
}
.img-serve-8{
background-image: url(../../src/assets/images/machineRoom/img-8Uservice.png);
background-image: url(/vue3/src/assets/images/machineRoom/img-8Uservice.png);
height:127px;
width: 315px;
width:383px;
}
.img-serve-10{
background-image: url(../../src/assets/images/machineRoom/img-10Uservice.png);
background-image: url(/vue3/src/assets/images/machineRoom/img-10Uservice.png);
height:157px;
width: 315px;
width:383px;
}
.img-serve-1 .img-serve-text{
font-size: 11px;
... ... @@ -217,21 +218,21 @@ li{
display: flex;
flex-flow: column;
justify-content: center;
margin-left:20px;
}
.info-top{
height:280px;
/*margin-top:-10px;*/
background-image: url(../../src/assets/images/machineRoom/img-machineInfo-bg.png);
background-image: url(/vue3/src/assets/images/machineRoom/img-machineInfo-bg.png);
}
.info-bottom{
height:370px;
height:390px;
margin-top:20px;
background-image: url(../../src/assets/images/machineRoom/img-deviceInfo-bg.png);
background-image: url(/vue3/src/assets/images/machineRoom/img-deviceInfo-bg.png);
}
.contain{
display: flex;
... ... @@ -293,31 +294,7 @@ body::-webkit-scrollbar-track{
borderd-radius:2em;
}
/** 王凤添加 2023-04-29 start */
.serve_small{
height: 35px;
}
.state_small{
width:16px;
height:16px;
margin-top:0px;
margin-left:4px;
}
.lamp_small{
margin-top:-3px;
}
.active{
background: #5686a9;
opacity: 0.6;
}
.img-empty{
margin-left:50px;
margin-top:15px;
width:30px;
height:5px;
}
/** 王凤添加 2023-04-29 end */
... ...
... ... @@ -173,7 +173,8 @@
<img src="/vue3/src/assets/images/machineRoom/icon-state.png" alt="" class='state'>
<div class='img-serve-text' style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;width: 100px;" :title="item.resName">{{item.resName}}-{{item.health}}</div>
<div class='lamp'>
<img src="/vue3/src/assets/images/machineRoom/icon-weblogical.png" alt="" class='img-weblog'>
<!--暂时注释掉，后续根据设备安装的软件加载对应图标-->
<!--<img src="/vue3/src/assets/images/machineRoom/icon-weblogical.png" alt="" class='img-weblog'>-->
<div class='img-lamp' v-if="item.health == 1">
<!--中-->
<img src="/vue3/src/assets/images/machineRoom/1Color.png" alt="资源状态：中">
... ... @@ -220,7 +221,7 @@
<div class='info-text'>设备信息</div>
<div class='info-text-bot'>
<p v-if="!isRes">资源名称：<span>{{deviceDataInfo.resName}}</span></p>
<p v-if="isRes">资源名称：<span style="cursor: pointer;color: #1e9fff;" @click="goResDetail(deviceDataInfo.resId,deviceDataInfo.resType)">{{deviceDataInfo.resName}}</span></p>
<p v-if="isRes">资源名称：<span class="link" @click="goResDetail(deviceDataInfo.resId,deviceDataInfo.resType,deviceDataInfo.resName)">{{deviceDataInfo.resName}}</span></p>
<p>品 牌：{{deviceDataInfo.brand}}</p>
<p>型 号：{{deviceDataInfo.model}}</p>
<p>序 列 号：{{deviceDataInfo.serialnumber}}</p>
... ...
... ... @@ -19,6 +19,7 @@ export default {
isRes: {
type: Boolean,
default: false
// default: true
},
//传过来的U位
Uposition:{
... ... @@ -323,7 +324,8 @@ export default {
dialogVisible.value = flg;
}
//资源名称下探
let goResDetail=(resId,resType)=>{
let goResDetail=(resId,resType,resName)=>{
if(props.isRes){
proxy.$global.openDetail(resId, resType, proxy);
}
... ...
... ... @@ -69,10 +69,10 @@ export default {
name:'K10',
clas:'img_wd'
},{
name:'K9',
name:'K09',
clas:'img_wd'
},{
name:'K8',
name:'K08',
clas:'img_wd'
}
],
... ... @@ -117,10 +117,10 @@ export default {
name:'J10',
clas:'img_wd'
},{
name:'J9',
name:'J09',
clas:'img_wd'
},{
name:'J8',
name:'J08',
clas:'img_wd'
}],
[
... ... @@ -164,10 +164,10 @@ export default {
name:'I10',
clas:'img_wd'
},{
name:'I9',
name:'I09',
clas:'img_wd'
},{
name:'I8',
name:'I08',
clas:'img_wd'
}],
[
... ... @@ -211,10 +211,10 @@ export default {
name:'H10',
clas:'img_wd'
},{
name:'H9',
name:'H09',
clas:'img_wd'
},{
name:'H8',
name:'H08',
clas:'img_wd'
}
],
... ... @@ -259,31 +259,31 @@ export default {
name:'G10',
clas:'img_wd'
},{
name:'G9',
name:'G09',
clas:'img_wd'
},{
name:'G8',
name:'G08',
clas:'img_wd'
},{
name:'G7',
name:'G07',
clas:'img_wd'
},{
name:'G6',
name:'G06',
clas:'img_wd'
},{
name:'G5',
name:'G05',
clas:'img_wd'
},{
name:'G4',
name:'G04',
clas:'img_wd'
},{
name:'G3',
name:'G03',
clas:'img_wd'
},{
name:'G2',
name:'G02',
clas:'img_wd'
},{
name:'G1',
name:'G01',
clas:'img_wd'
}
],
... ... @@ -328,31 +328,31 @@ export default {
name:'F10',
clas:'img_wd'
},{
name:'F9',
name:'F09',
clas:'img_wd'
},{
name:'F8',
name:'F08',
clas:'img_wd'
},{
name:'F7',
name:'F07',
clas:'img_wd'
},{
name:'F6',
name:'F06',
clas:'img_wd'
},{
name:'F5',
name:'F05',
clas:'img_wd'
},{
name:'F4',
name:'F04',
clas:'img_wd'
},{
name:'F3',
name:'F03',
clas:'img_wd'
},{
name:'F2',
name:'F02',
clas:'img_wd'
},{
name:'F1',
name:'F01',
clas:'img_wd'
}
],
... ... @@ -383,31 +383,31 @@ export default {
name:'E10',
clas:'img_wd'
},{
name:'E9',
name:'E09',
clas:'img_wd'
},{
name:'E8',
name:'E08',
clas:'img_wd'
},{
name:'',
clas:'empty'
},{
name:'E7',
name:'E07',
clas:'img_wd'
},{
name:'E6',
name:'E06',
clas:'img_wd'
},{
name:'E5',
name:'E05',
clas:'img_wd'
},{
name:'E4',
name:'E04',
clas:'img_wd'
},{
name:'E3',
name:'E03',
clas:'img_wd'
},{
name:'E2',
name:'E02',
clas:'img_wd'
}
],
... ... @@ -436,31 +436,31 @@ export default {
name:'D10',
clas:'img_wd'
},{
name:'D9',
name:'D09',
clas:'img_wd'
},{
name:'D8',
name:'D08',
clas:'img_wd'
},{
name:'D7',
name:'D07',
clas:'img_wd'
},{
name:'D6',
name:'D06',
clas:'img_wd'
},{
name:'D5',
name:'D05',
clas:'img_wd'
},{
name:'D4',
name:'D04',
clas:'img_wd'
},{
name:'D3',
name:'D03',
clas:'img_wd'
},{
name:'D2',
name:'D02',
clas:'img_wd'
},{
name:'D1',
name:'D01',
clas:'img_wd'
}],
[
... ... @@ -489,31 +489,31 @@ export default {
name:'C10',
clas:'img_wd'
},{
name:'C9',
name:'C09',
clas:'img_wd'
},{
name:'C8',
name:'C08',
clas:'img_wd'
},{
name:'C7',
name:'C07',
clas:'img_wd'
},{
name:'C6',
name:'C06',
clas:'img_wd'
},{
name:'C5',
name:'C05',
clas:'img_wd'
},{
name:'C4',
name:'C04',
clas:'img_wd'
},{
name:'C3',
name:'C03',
clas:'img_wd'
},{
name:'C2',
name:'C02',
clas:'img_wd'
},{
name:'C1',
name:'C01',
clas:'img_wd'
}
],
... ... @@ -558,25 +558,25 @@ export default {
name:'',
clas:'empty'
},{
name:'B7',
name:'B07',
clas:'img_wd'
},{
name:'B6',
name:'B06',
clas:'img_wd'
},{
name:'B5',
name:'B05',
clas:'img_wd'
},{
name:'B4',
clas:'img_wd img_light'
name:'B04',
clas:'img_wd'
},{
name:'B3',
name:'B03',
clas:'img_wd'
},{
name:'B2',
name:'B02',
clas:'img_wd'
},{
name:'B1',
name:'B01',
clas:'img_wd'
}
],
... ... @@ -614,31 +614,31 @@ export default {
name:'A10',
clas:'img_wd'
},{
name:'A9',
name:'A09',
clas:'img_wd'
},{
name:'A8',
name:'A08',
clas:'img_wd'
},{
name:'A7',
name:'A07',
clas:'img_wd'
},{
name:'A6',
name:'A06',
clas:'img_wd'
},{
name:'A5',
name:'A05',
clas:'img_wd'
},{
name:'A4',
name:'A04',
clas:'img_wd'
},{
name:'A3',
name:'A03',
clas:'img_wd'
},{
name:'A2',
name:'A02',
clas:'img_wd'
},{
name:'A1',
name:'A01',
clas:'img_wd'
}]
]
... ...