Changes

src/api/dashboard-json.js

@@ -54,7 +54,7 @@ export function chartDlydtsby(params) {
   })
 }
 
-// 检修兑现情况
+// 牵变试验计划兑现情况
 export function chartJxdxqky(params) {
   return request({
     url: '/chart/jxdxqk',
@@ -99,7 +99,7 @@ export function chartSyjhbydxqk(params) {
   })
 }
 
-// 试验计划兑现情况
+// 牵变试验计划兑现情况
 export function chartSyjhdxqk(params) {
   return request({
     url: '/chart/syjhdxqk',

src/views/dashboard-screen/chart-map/chartMap.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="iframe-wrap">
-    <iframe id="mapFrame" ref="mapFrame" src="/gis/index.html" frameborder="none" :onload="loadDone"/>
+    <iframe id="mapFrame" ref="mapFrame" src=" https://gis.isvbytes.com/gis/" frameborder="none" :onload="loadDone"/>
   </div>
 
 </template>
 <script>
-import { chartMap } from '@/api/dashboard-json'
+import {chartMap} from '@/api/dashboard-json'
 
 export default {
   name: 'ChartMap',
@@ -36,6 +36,9 @@ export default {
           },
           '*'
         )
+        this.$refs.mapFrame.contentWindow.addEventListener('message', (evt) => {
+          console.log('onMessage', evt)
+        })
         console.log('data', data)
       })
       console.log('loadDone')

src/views/dashboard-screen/index.vue

@@ -19,6 +19,7 @@
     </div>
     <div class="content-wrap">
       <div class="coner left">
+
         <div class="o-item map">
           <ChartMap/>
           <div class="jryl-wrap">
@@ -31,14 +32,6 @@
 
           </div>
         </div>
-        <div class="o-item">
-          <CardWrap>
-            <span slot="title" @click="openDrawer('试验计划本月兑现情况')">试验计划兑现情况</span>
-            <div slot="content">
-              <SyjhdxqkChart/>
-            </div>
-          </CardWrap>
-        </div>
         <div class="o-item">
           <CardWrap>
 
@@ -48,6 +41,8 @@
             </div>
           </CardWrap>
         </div>
+
+
         <div class="o-item b-r-3">
           <div class="t-1">
 
@@ -70,6 +65,14 @@
           </div>
 
         </div>
+        <div class="o-item">
+          <CardWrap>
+            <span slot="title" @click="openDrawer('试验计划本月兑现情况')">牵变试验计划兑现情况</span>
+            <div slot="content">
+              <SyjhdxqkChart/>
+            </div>
+          </CardWrap>
+        </div>
       </div>
       <div class="coner right">
         <div class="sop sop-1">
@@ -82,7 +85,7 @@
         </div>
         <div class="sop sop-2">
           <CardWrap>
-            <span slot="title" @click="openDrawer('检修兑现情况')">检修兑现情况</span>
+            <span slot="title" @click="openDrawer('牵变试验计划兑现情况')">牵变试验计划兑现情况</span>
             <div slot="content">
               <Jxdxqk/>
             </div>
@@ -186,7 +189,7 @@ export default {
     },
     openDrawer(title) {
       const map = {
-        '检修兑现情况': ScreenJxdxqk,
+        '牵变试验计划兑现情况': ScreenJxdxqk,
         '变电-电力异常信息': ScreenBdDlYcxx,
         '试验计划本月兑现情况': ScreenSyjhbydxqk,
         // '待办事项': ScreenDbsx,
@@ -345,7 +348,7 @@ canvas {
         height: 100%;
         display: grid;
         grid-template-rows: 2fr 1fr;
-        grid-template-columns: 1fr 1fr 2fr;
+        grid-template-columns: 1fr 2fr 1fr ;
         grid-auto-flow: row;
 
         .o-item {

src/views/dashboard-screen/screen/sjdr/index.vue

@@ -50,7 +50,7 @@ export default {
         name: 'Tab3'
       },
       {
-        title: '试验计划兑现情况',
+        title: '牵变试验计划兑现情况',
         name: 'Syjhdxqk'
       },
       {