Browse Source

update graph for layout

cnwangzd@gmail.com 1 year ago
parent
commit
a812a9ccea

+ 1 - 1
.env

@@ -1,7 +1,7 @@
 VUE_APP_M3_APP="m3graph"
 VUE_APP_M3_TITLE="图查询"
 VUE_APP_M3_HOST="47.92.151.165:8080"
-VUE_APP_M3_COMPANY="wecise"
+VUE_APP_M3_COMPANY="icbctest"
 VUE_APP_M3_USERNAME="admin"
 VUE_APP_M3_PASSWORD="admin"
 # 公共静态资源所在URL,包括 js, css, theme, icon ...,测试环境默认为 assets,生产环境默认为 /static/app/assets

+ 1 - 1
app/matrix/m3graph/index.html

@@ -41,5 +41,5 @@
     </div>
     <div id="app"></div>
     <!-- built files will be auto injected -->
-    <script type="text/javascript" src="/static/app/matrix/m3graph/js/chunk-vendors.46c1597e.js"></script><script type="text/javascript" src="/static/app/matrix/m3graph/js/app.0ffe5f39.js"></script></body>
+    <script type="text/javascript" src="/static/app/matrix/m3graph/js/chunk-vendors.46c1597e.js"></script><script type="text/javascript" src="/static/app/matrix/m3graph/js/app.d6ff2c7c.js"></script></body>
 </html>

+ 4 - 2
src/components/graph/index.vue

@@ -1,5 +1,6 @@
 <template>
-    <div class="container">
+    <el-container style="height:calc(100vh - 30px);background:#fff;">
+    <el-main style="padding: 0px;">
         <Split @onDragEnd="onDragEnd" ref="splitRef" style="overflow:hidden;">
             <SplitArea :size="split.sizes[0]" :minSize="0" style="overflow:hidden;">
                 <SearchBar @graph-data="onSetData" ref="searchBarRef"></SearchBar>
@@ -15,7 +16,8 @@
                 <ContentBar ref="contentRef" @open-right="onOpenRight"></ContentBar>
             </SplitArea>
         </Split>
-    </div>
+    </el-main>
+    </el-container>
 </template>
 
 <script>

+ 2 - 1
src/components/graph/searchbar/AdvBar.vue

@@ -156,11 +156,12 @@ export default {
 
 <style scoped>
     .adv-bar.el-container{
-        position: absolute;
+        position: relative;
         left: 10px;
         top: 10px;
         z-index: 1000;
         background: #f2f2f2;
+        width:auto;
     }
     .adv-bar .el-header{
         text-align: center;

+ 2 - 1
src/components/graph/searchbar/SearchBar.vue

@@ -379,11 +379,12 @@ export default {
 
 <style scoped>
     .search-bar.el-container{
-        position: absolute;
+        position: relative;
         left: 10px;
         top: 10px;
         z-index: 1000;
         background: #f2f2f2;
+        width:35%;
     }
     .search-bar .el-header{
         text-align: center;

+ 1 - 1
src/components/search/index.vue

@@ -79,7 +79,7 @@ export default {
             search:{
                 term: "",
                 class: {
-                    value: "/matrix/devops/alert_status"
+                    value: "/m3event/devops/alert_status"
                 },
                 result: null,
                 loading: false

+ 1 - 1
src/components/search/lineChart.vue

@@ -101,7 +101,7 @@ export default{
                     
                     this.option.series = [{
                         name: `${this.model.bucket} ${this.model.key}`,
-                        data: _.map(rtn,(v)=>{ return v[1];}),
+                        data: _.map(rtn,(v)=>{ return v[2];}),
                         type: 'line',
                         smooth:true,
                         color: 'rgba(108, 212, 11, 1)',