monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by XuHaoJie
Commit e2f240e32d2d20a4c01c261ef0481d9ed33cda62 2 parents bceb3622 87baa318

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

Inline Side-by-side
Showing 17 changed files with 85 additions and 56 deletions
<title>对比分析配置</title>
<iframe src="/vue3/index.html#/analysis" class="layadmin-iframe" style="height: 99.5%!important;"/>
\ No newline at end of file
... ...
... ... @@ -54,4 +54,42 @@
}
.bottom-condition .el-input__inner,.bottom-condition .el-button{
border-color:#409eff;
}
.analysis {
position: relative;
text-align: center;
height:100%;
width: 100%;
/*max-width: 490px;*/
}
.analysis .drop {
padding-top: 20px;
border: 2px dashed #0a93be;
width: 600px;
height: 170px;
line-height: 160px;
margin: 0 auto;
font-size: 16px;
border-radius: 5px;
text-align: center;
color: #bbb;
position: relative;
}
.analysis .el-upload__text {
height: 50px;
line-height: 50px;
em {
color: #0C4493;
font-style: normal;
}
}
.analysis .link-type,
.analysis .link-type:focus {
color: #337ab7;
cursor: pointer;
}
}
\ No newline at end of file
... ...
... ... @@ -235,3 +235,6 @@ body{font-size: 15px;}
position: relative;
top: 14px;
}
.flex-chart .container-title{
}
... ...
... ... @@ -110,7 +110,13 @@ const routes = [{
name: 'analysis',
// component: () => myImport('views/analysis/components/addIndex/index')
component: () => myImport('views/analysis/index')
}
},
{
path: '/analysis/add',
name: 'analysisAdd',
// component: () => myImport('views/analysis/components/addIndex/index')
component: () => myImport('views/analysis/components/add/index')
}
];
// hash模式： createWebHashHistory
... ...
... ... @@ -12,11 +12,7 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item>Action 1</el-dropdown-item>
<el-dropdown-item>Action 2</el-dropdown-item>
<el-dropdown-item>Action 3</el-dropdown-item>
<el-dropdown-item>Action 4</el-dropdown-item>
<el-dropdown-item>Action 5</el-dropdown-item>
<el-date-picker v-model="displayTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间" />
</el-dropdown-menu>
</template>
</el-dropdown>
... ...
... ... @@ -29,6 +29,17 @@ export default {
}
},
computed: {
displayTime: {
get() {
return (+new Date(this.display_time))
},
set(val) {
this.display_time = new Date(val)
}
}
},
setup(){
}
... ...
<div class="container" :style="{'height':height+'px','max-height':height+'px'}">
<div style="margin:0 0 5px 20px;font-size: 16px;color:#337ab7">
<div class="analysis-add-container">
<div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;color:#337ab7">
比对分析场景
</div>
<div class="drop">
<template slot-scope="scope">
<router-link :to="'/example/edit/'" class="link-type">
<img src="../../assets/images/analysis/icon-add.png"></img>
<div class="analysis drop">
<router-link :to="'/analysis/add'" class="analysis link-type">
<div class="analysis-index-container" style="display: grid;">
<img src="/vue3/src/assets/images/analysis/icon-add.png"></img>
<div class="el-upload__text">
<em>点击添加对比分析</em>
</div>
</router-link>
</template>
</div>
</div>
<style type="text/css">
img {
padding-top: 30px;
}
.drop {
border: 2px dashed #0a93be;
width: 600px;
height: 160px;
line-height: 160px;
margin: 0 auto;
font-size: 16px;
border-radius: 5px;
text-align: center;
color: #bbb;
position: relative;
}
</div>
</router-link>
.el-upload__text {
height: 50px;
line-height: 50px;
em {
color: #0C4493;
font-style: normal;
}
}
.link-type,
.link-type:focus {
color: #337ab7;
cursor: pointer;
}
</style>
\ No newline at end of file
</div>
</div>
\ No newline at end of file
... ...
... ... @@ -29,7 +29,7 @@ export default {
},
comtitleImgStyle () {
return {
height: this.titleFontSize * 1.8 + 'px'
// height: this.titleFontSize * 1.8 + 'px'
}
}
},
... ...
... ... @@ -34,7 +34,7 @@ export default {
},
comtitleImgStyle () {
return {
height: this.titleFontSize * 2.1 + 'px'
// height: this.titleFontSize * 2.1 + 'px'
}
},
comcircletextStyle () {
... ...
... ... @@ -37,7 +37,7 @@ export default {
},
comtitlesizeStyle () {
return {
height: this.titleFontSize * 7 + 'px',
// height: this.titleFontSize * 7 + 'px',
// width: this.titleFontSize * 6 + 'px'
}
},
... ...
<div class="monitoring-bar" id="mon-bar">
<img :style="comtitleImgStyle" src="/vue3/src/assets/images/digitalDp/title-monitoring.png" alt="">
<div class="container-title">
<img :style="comtitleImgStyle" src="/vue3/src/assets/images/digitalDp/title-monitoring.png" alt="">
</div>
<BarChart :optionData="optionData" v-if="optionData"></BarChart>
</div>
... ...
... ... @@ -22,7 +22,7 @@ export default {
computed: {
comtitleImgStyle () {
return {
height: this.titleFontSize * 2.1 + 'px'
// height: this.titleFontSize * 2.1 + 'px'
}
}
... ...
... ... @@ -34,8 +34,8 @@ export default {
},
comtitleImgStyle () {
return {
height: this.titleFontSize * 2 + 'px',
width: this.titleFontSize * 14 + 'px'
// height: this.titleFontSize * 2 + 'px',
// width: this.titleFontSize * 14 + 'px'
}
}
},
... ...
... ... @@ -8,7 +8,7 @@
<div class="item sjzx_machineroom" v-for="item in jfdata" >
<h5 >{{item.machineRoomName}}</h5>
<div class="imgDiv">
<img @click="isShow(item)" class="imgDiv-video" src="/vue3/src/assets/images/zjdp/icon-jf.png">
<!-- <img @click="isShow(item)" class="imgDiv-video" src="/vue3/src/assets/images/zjdp/icon-jf.png">-->
<img @click="isShowOuter(item)" v-if="item.healthStatus==0" src="/vue3/src/assets/images/zjdp/jifang-1.png" alt="">
<img @click="isShowOuter(item)" else="item.healthStatus==1" src="/vue3/src/assets/images/zjdp/jifang-2.png" alt="">
</div>
... ...
... ... @@ -27,7 +27,7 @@ export default {
() => myImport('views/zjdaping/components/declareLine/index')
),
'MonitoringMonth': Vue.defineAsyncComponent(
() => myImport('views/zjdaping/components/monitoringMonth/index')
() => myImport('views/dp/components/monitoring/index')
),
'Performance': Vue.defineAsyncComponent(
() => myImport('views/zjdaping/components/performance/index')
... ...