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
  1 +<title>对比分析配置</title>
  2 +<iframe src="/vue3/index.html#/analysis" class="layadmin-iframe" style="height: 99.5%!important;"/>
@@ -54,4 +54,42 @@ @@ -54,4 +54,42 @@
54 } 54 }
55 .bottom-condition .el-input__inner,.bottom-condition .el-button{ 55 .bottom-condition .el-input__inner,.bottom-condition .el-button{
56 border-color:#409eff; 56 border-color:#409eff;
  57 +}
  58 +.analysis {
  59 + position: relative;
  60 + text-align: center;
  61 + height:100%;
  62 + width: 100%;
  63 + /*max-width: 490px;*/
  64 +}
  65 +.analysis .drop {
  66 + padding-top: 20px;
  67 + border: 2px dashed #0a93be;
  68 + width: 600px;
  69 + height: 170px;
  70 + line-height: 160px;
  71 + margin: 0 auto;
  72 + font-size: 16px;
  73 + border-radius: 5px;
  74 + text-align: center;
  75 + color: #bbb;
  76 + position: relative;
  77 +}
  78 +
  79 +.analysis .el-upload__text {
  80 + height: 50px;
  81 + line-height: 50px;
  82 + em {
  83 + color: #0C4493;
  84 + font-style: normal;
  85 + }
  86 +}
  87 +.analysis .link-type,
  88 +.analysis .link-type:focus {
  89 + color: #337ab7;
  90 + cursor: pointer;
  91 +}
  92 +
  93 +
  94 +
57 } 95 }
@@ -235,3 +235,6 @@ body{font-size: 15px;} @@ -235,3 +235,6 @@ body{font-size: 15px;}
235 position: relative; 235 position: relative;
236 top: 14px; 236 top: 14px;
237 } 237 }
  238 +.flex-chart .container-title{
  239 +
  240 +}
@@ -110,7 +110,13 @@ const routes = [{ @@ -110,7 +110,13 @@ const routes = [{
110 name: 'analysis', 110 name: 'analysis',
111 // component: () => myImport('views/analysis/components/addIndex/index') 111 // component: () => myImport('views/analysis/components/addIndex/index')
112 component: () => myImport('views/analysis/index') 112 component: () => myImport('views/analysis/index')
113 - } 113 + },
  114 + {
  115 + path: '/analysis/add',
  116 + name: 'analysisAdd',
  117 + // component: () => myImport('views/analysis/components/addIndex/index')
  118 + component: () => myImport('views/analysis/components/add/index')
  119 + }
114 ]; 120 ];
115 121
116 // hash模式： createWebHashHistory 122 // hash模式： createWebHashHistory
@@ -12,11 +12,7 @@ @@ -12,11 +12,7 @@
12 </el-button> 12 </el-button>
13 <template #dropdown> 13 <template #dropdown>
14 <el-dropdown-menu> 14 <el-dropdown-menu>
15 - <el-dropdown-item>Action 1</el-dropdown-item>  
16 - <el-dropdown-item>Action 2</el-dropdown-item>  
17 - <el-dropdown-item>Action 3</el-dropdown-item>  
18 - <el-dropdown-item>Action 4</el-dropdown-item>  
19 - <el-dropdown-item>Action 5</el-dropdown-item> 15 + <el-date-picker v-model="displayTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间" />
20 </el-dropdown-menu> 16 </el-dropdown-menu>
21 </template> 17 </template>
22 </el-dropdown> 18 </el-dropdown>
@@ -29,6 +29,17 @@ export default { @@ -29,6 +29,17 @@ export default {
29 29
30 } 30 }
31 }, 31 },
  32 + computed: {
  33 + displayTime: {
  34 +
  35 + get() {
  36 + return (+new Date(this.display_time))
  37 + },
  38 + set(val) {
  39 + this.display_time = new Date(val)
  40 + }
  41 + }
  42 + },
32 setup(){ 43 setup(){
33 44
34 } 45 }
1 -<div class="container" :style="{'height':height+'px','max-height':height+'px'}">  
2 - <div style="margin:0 0 5px 20px;font-size: 16px;color:#337ab7"> 1 +<div class="analysis-add-container">
  2 + <div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;color:#337ab7">
3 比对分析场景 3 比对分析场景
4 </div> 4 </div>
5 - <div class="drop">  
6 - <template slot-scope="scope">  
7 - <router-link :to="'/example/edit/'" class="link-type">  
8 - <img src="../../assets/images/analysis/icon-add.png"></img> 5 + <div class="analysis drop">
  6 + <router-link :to="'/analysis/add'" class="analysis link-type">
  7 + <div class="analysis-index-container" style="display: grid;">
  8 + <img src="/vue3/src/assets/images/analysis/icon-add.png"></img>
9 <div class="el-upload__text"> 9 <div class="el-upload__text">
10 <em>点击添加对比分析</em> 10 <em>点击添加对比分析</em>
11 </div> 11 </div>
12 - </router-link>  
13 - </template>  
14 - </div>  
15 -</div>  
16 -<style type="text/css">  
17 - img {  
18 - padding-top: 30px;  
19 - }  
20 -  
21 - .drop {  
22 - border: 2px dashed #0a93be;  
23 - width: 600px;  
24 - height: 160px;  
25 - line-height: 160px;  
26 - margin: 0 auto;  
27 - font-size: 16px;  
28 - border-radius: 5px;  
29 - text-align: center;  
30 - color: #bbb;  
31 - position: relative;  
32 - } 12 + </div>
  13 + </router-link>
33 14
34 - .el-upload__text {  
35 - height: 50px;  
36 - line-height: 50px;  
37 - em {  
38 - color: #0C4493;  
39 - font-style: normal;  
40 - }  
41 - }  
42 - .link-type,  
43 - .link-type:focus {  
44 - color: #337ab7;  
45 - cursor: pointer;  
46 - }  
47 -</style>  
  15 + </div>
  16 +</div>
@@ -29,7 +29,7 @@ export default { @@ -29,7 +29,7 @@ export default {
29 }, 29 },
30 comtitleImgStyle () { 30 comtitleImgStyle () {
31 return { 31 return {
32 - height: this.titleFontSize * 1.8 + 'px' 32 + // height: this.titleFontSize * 1.8 + 'px'
33 } 33 }
34 } 34 }
35 }, 35 },
@@ -34,7 +34,7 @@ export default { @@ -34,7 +34,7 @@ export default {
34 }, 34 },
35 comtitleImgStyle () { 35 comtitleImgStyle () {
36 return { 36 return {
37 - height: this.titleFontSize * 2.1 + 'px' 37 + // height: this.titleFontSize * 2.1 + 'px'
38 } 38 }
39 }, 39 },
40 comcircletextStyle () { 40 comcircletextStyle () {
@@ -37,7 +37,7 @@ export default { @@ -37,7 +37,7 @@ export default {
37 }, 37 },
38 comtitlesizeStyle () { 38 comtitlesizeStyle () {
39 return { 39 return {
40 - height: this.titleFontSize * 7 + 'px', 40 + // height: this.titleFontSize * 7 + 'px',
41 // width: this.titleFontSize * 6 + 'px' 41 // width: this.titleFontSize * 6 + 'px'
42 } 42 }
43 }, 43 },
1 <div class="monitoring-bar" id="mon-bar"> 1 <div class="monitoring-bar" id="mon-bar">
2 - <img :style="comtitleImgStyle" src="/vue3/src/assets/images/digitalDp/title-monitoring.png" alt=""> 2 +
  3 + <div class="container-title">
  4 + <img :style="comtitleImgStyle" src="/vue3/src/assets/images/digitalDp/title-monitoring.png" alt="">
  5 + </div>
  6 +
3 <BarChart :optionData="optionData" v-if="optionData"></BarChart> 7 <BarChart :optionData="optionData" v-if="optionData"></BarChart>
4 </div> 8 </div>
@@ -22,7 +22,7 @@ export default { @@ -22,7 +22,7 @@ export default {
22 computed: { 22 computed: {
23 comtitleImgStyle () { 23 comtitleImgStyle () {
24 return { 24 return {
25 - height: this.titleFontSize * 2.1 + 'px' 25 + // height: this.titleFontSize * 2.1 + 'px'
26 } 26 }
27 } 27 }
28 28
@@ -34,8 +34,8 @@ export default { @@ -34,8 +34,8 @@ export default {
34 }, 34 },
35 comtitleImgStyle () { 35 comtitleImgStyle () {
36 return { 36 return {
37 - height: this.titleFontSize * 2 + 'px',  
38 - width: this.titleFontSize * 14 + 'px' 37 + // height: this.titleFontSize * 2 + 'px',
  38 + // width: this.titleFontSize * 14 + 'px'
39 } 39 }
40 } 40 }
41 }, 41 },
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <div class="item sjzx_machineroom" v-for="item in jfdata" > 8 <div class="item sjzx_machineroom" v-for="item in jfdata" >
9 <h5 >{{item.machineRoomName}}</h5> 9 <h5 >{{item.machineRoomName}}</h5>
10 <div class="imgDiv"> 10 <div class="imgDiv">
11 - <img @click="isShow(item)" class="imgDiv-video" src="/vue3/src/assets/images/zjdp/icon-jf.png"> 11 +<!-- <img @click="isShow(item)" class="imgDiv-video" src="/vue3/src/assets/images/zjdp/icon-jf.png">-->
12 <img @click="isShowOuter(item)" v-if="item.healthStatus==0" src="/vue3/src/assets/images/zjdp/jifang-1.png" alt=""> 12 <img @click="isShowOuter(item)" v-if="item.healthStatus==0" src="/vue3/src/assets/images/zjdp/jifang-1.png" alt="">
13 <img @click="isShowOuter(item)" else="item.healthStatus==1" src="/vue3/src/assets/images/zjdp/jifang-2.png" alt=""> 13 <img @click="isShowOuter(item)" else="item.healthStatus==1" src="/vue3/src/assets/images/zjdp/jifang-2.png" alt="">
14 </div> 14 </div>
@@ -27,7 +27,7 @@ export default { @@ -27,7 +27,7 @@ export default {
27 () => myImport('views/zjdaping/components/declareLine/index') 27 () => myImport('views/zjdaping/components/declareLine/index')
28 ), 28 ),
29 'MonitoringMonth': Vue.defineAsyncComponent( 29 'MonitoringMonth': Vue.defineAsyncComponent(
30 - () => myImport('views/zjdaping/components/monitoringMonth/index') 30 + () => myImport('views/dp/components/monitoring/index')
31 ), 31 ),
32 'Performance': Vue.defineAsyncComponent( 32 'Performance': Vue.defineAsyncComponent(
33 () => myImport('views/zjdaping/components/performance/index') 33 () => myImport('views/zjdaping/components/performance/index')