Quellcode durchsuchen

fix(1.5): 修复最大化未撑满屏幕的问题 替换最小化 图标

17602115550 vor 10 Monaten
Ursprung
Commit
bed74f4af1
2 geänderte Dateien mit 11 neuen und 1 gelöschten Zeilen
  1. 10 1
      src/modules/createmodel/components/EchartsGraph.vue
  2. 1 0
      static/invoice/mini.svg.svg

+ 10 - 1
src/modules/createmodel/components/EchartsGraph.vue

@@ -1,7 +1,8 @@
 <template>
     <div id="graphBox"  :class="fullScreenActionFlag ? 'full-screen-graph-box' : ''" :style="{position:(fullScreenActionFlag ? 'fixed' : 'relative'),width:(fullScreenActionFlag ? '100vw' : '100%'),height:(fullScreenActionFlag ? '100vh' : 'calc(100% - '+ relationGraphSearchHeight +'px)'),'overflow-x': 'scroll'}">
         <div class="full-screen-box" :style="{top: fullScreenActionFlag ? '10px': relationGraphSearchHeight + 108 +'px',right: '10px'}" v-if="myChartGroupInnerOptionData">
-            <el-button class="full-screen-box-button" icon="el-icon-full-screen" @click="fullScreenAction"></el-button>
+            <el-button v-if="!fullScreenActionFlag" class="full-screen-box-button" icon="el-icon-full-screen" @click="fullScreenAction"></el-button>
+            <img v-if="fullScreenActionFlag" class="full-screen-box-img-mini" src="../../../../static/invoice/mini.svg.svg" @click="fullScreenAction">
         </div>
         <div v-if="reloadGetDataFlag" class="over-map-loading"></div>
         <div :style="{width:(seriesDataList.length == 1 || seriesDataList.length == 2 ? '100%' : (seriesDataList.length == 0 ? 1 : seriesDataList.length)*relationGraphHeight+'px'),height: '100%'}" id="relationGraph"></div>
@@ -83,8 +84,10 @@ export default {
             // console.log("浏览器视口高度:", viewportHeight, "px");  
             if(this.fullScreenActionFlag){
                 document.getElementById("relationGraph").style.height = viewportHeight + 'px';  
+                document.getElementById("relationGraph").style.width ='100vw';  
             }else{
                 document.getElementById("relationGraph").style.height = this.relationGraphHeight + 'px';  
+                document.getElementById("relationGraph").style.width ='100%';  
             }
             this.myChartGroupInner.resize();
         },
@@ -503,6 +506,7 @@ export default {
             // console.log('seriesDataList-=-==links',links)
             const seriesDataList = this.getNodeGroup(data, links)
             this.seriesDataList = seriesDataList.dataGroup
+            // this.seriesDataList = [seriesDataList.dataGroup[0],seriesDataList.dataGroup[1]]
             console.log('seriesDataList-=-==',seriesDataList)
             let seriesList = []
             seriesDataList.dataGroup.forEach((item,index)=>{
@@ -713,4 +717,9 @@ export default {
     left: 0;
     z-index: 10;
 }
+
+.full-screen-box-img-mini{
+    width: 30px;
+    margin-right: 10px;
+}
 </style>

+ 1 - 0
static/invoice/mini.svg.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1727768656956" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1450" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M42.666667 128v213.333333a21.333333 21.333333 0 0 0 42.666666 0V128c0-23.466667 19.2-42.666667 42.666667-42.666667h213.333333a21.333333 21.333333 0 0 0 0-42.666666H128c-46.933333 0-85.333333 38.4-85.333333 85.333333zM981.333333 896v-213.333333a21.333333 21.333333 0 1 0-42.666666 0v213.333333c0 23.466667-19.2 42.666667-42.666667 42.666667h-213.333333a21.333333 21.333333 0 1 0 0 42.666666h213.333333c46.933333 0 85.333333-38.4 85.333333-85.333333zM362.666667 960A21.333333 21.333333 0 0 0 341.333333 938.666667H128c-23.466667 0-42.666667-19.2-42.666667-42.666667v-213.333333a21.333333 21.333333 0 1 0-42.666666 0v213.333333c0 46.933333 38.4 85.333333 85.333333 85.333333h213.333333a21.333333 21.333333 0 0 0 21.333334-21.333333zM981.333333 341.333333a21.333333 21.333333 0 0 0-21.333333-21.333333h-213.333333a41.386667 41.386667 0 0 1-12.672-2.56 20.949333 20.949333 0 0 0 7.509333-4.778667l211.2-211.2c8.277333-8.277333 8.277333-21.845333 0-30.122666s-21.888-8.32-30.208 0l-211.2 211.2a20.949333 20.949333 0 0 0-4.693333 7.466666 41.386667 41.386667 0 0 1-2.602667-12.672v-213.333333a21.333333 21.333333 0 0 0-42.666667 0v213.333333c0 46.933333 38.4 85.333333 85.333334 85.333334h213.333333A21.333333 21.333333 0 0 0 981.333333 341.333333z" fill="#ffffff" p-id="1451"></path></svg>