Merge remote-tracking branch 'origin/project9-8' into project9-8

src/views/template/graph/graphWatch.vue

 <template>
-  <div style="height: 100%;">
+  <div style="height: 98%;">
     <div class="super-flow-demo1">
 
       <!-- 最外层,加滚轮监听函数 -->
@@ -8,12 +8,13 @@
       <!-- superflow里面是个弹窗?就点一下出那个悬浮的东西 -->
       <div
         class="super-flow-content"
-        @wheel="handleScroll"
       >
+<!--        @wheel="handleScroll" 阻止默认滚轮事件-->
       <!-- 这下面删了个v-drag就不能拖动画布了 -->
         <div
           ref="flowContainer"
           class="flow-container"
+          style="width: 1920px;height: 1080px"
           id="popSuperBack"
         >
           <super-flow
@@ -943,7 +944,7 @@ export default {
   /* 让宽度跟父元素(外面的大框相关) */
   width: 100%;
   height: 100%;
-  overflow: hidden;
+  overflow: auto;
   background-color: #bbb;
   margin: 10px;
 }
@@ -951,8 +952,6 @@ export default {
 .flow-container {
   float: left;
   position: absolute;
-  width: 100%;
-  height: 100%;
   overflow: hidden;
   /* background: url("./R-C.jpg") no-repeat  center / cover ; */
   background: no-repeat  center / cover ;

src/views/template/planeGraph.vue

@@ -50,12 +50,13 @@
       <!-- superflow里面是个弹窗?就点一下出那个悬浮的东西 -->
       <div
         class="super-flow-content"
-        @wheel="handleScroll"
       >
+<!--        @wheel="handleScroll" 阻止默认滚轮事件-->
       <!-- 这下面删了个v-drag就不能拖动画布了 -->
         <div
           ref="flowContainer"
           class="flow-container"
+          style="width: 1920px;height: 1080px"
           id="mainSuperBack"
         >
           <super-flow
@@ -986,7 +987,7 @@ export default {
 
 
 
-<style>
+<style scoped lang="scss">
 /* .shelf {
   text-align: center;
   width: 100%;
@@ -1019,13 +1020,12 @@ export default {
 
 
 </style>
-<style>
+<style scoped lang="scss">
 /* 外侧盒子 */
 .super-flow-demo1 {
   position: relative;
-  margin-top: 20px;
   width: 100%;
-  height: 800px;
+  height: 750px;
   background-color: #f5f5f5;
 }
 .watchModeButton {
@@ -1059,7 +1059,7 @@ export default {
   /* 让宽度跟父元素(外面的大框相关) */
   width: calc(100% - 220px);
   height: 100%;
-  overflow: hidden;
+  overflow: auto;
   background-color: #bbb;
   margin: 10px;
 }
@@ -1067,9 +1067,6 @@ export default {
 .flow-container {
   float: left;
   position: absolute;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
   background-size: cover; /* 拉伸并填充整个div */
   background-repeat: no-repeat; /* 不重复 */
   /* background-image: url('https://pic35.photophoto.cn/20150511/0034034892281415_b.jpg'); */