Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev

src/components/videoModule/isc_plugin/isc_plugin.vue

@@ -2,13 +2,14 @@
   <div id="playWnd"></div>
 </template>
 <script>
+let closeVideo=null
 import {
   OpenVideo,
   unInitObjPlugin,
-  InitObjPlugin,hidePluginWindow,showPluginWindow,resizeFn,isLoadPlugin
+  InitObjPlugin, hidePluginWindow, showPluginWindow, resizeFn, isLoadPlugin, setWidthAndHeight, setOffset
 } from "./video_isc_plugin.js";
 export default {
-    props: ["devList","type"],
+  props: ["devList", "type", 'isIframe'],
   watch: {
     //监听value的变化，进行相应的操作即可
     devList: function (a, b) {
@@ -34,7 +35,8 @@ export default {
         console.log('resizeFn')
         resizeFn()
       }
-        }
+    },
+
   },
   computed: {
     isExpand() {
@@ -48,6 +50,8 @@ export default {
     }
   },
   created() {
+    if (COMPANY == 'xingxuan') { setWidthAndHeight(633, 381); }
+
     this.$EventBus.$on("controlVideoShowOrHide", (data) => {
       console.log('controlVideoShowOrHide', data)
       if (data == 'hide') {
@@ -56,8 +60,18 @@ export default {
         showPluginWindow()
       }
     });
+
   },
   mounted() {
+    // if (COMPANY == 'xingxuan') {
+    //  closeVideo= setInterval(()=>{
+    //     window.onhashchange = function () {
+    //      hidePluginWindow();
+    //      clearTimeout(closeVideo);
+    //   };
+    //   },1000)
+    // }
+
     var layout = '2x2'
     if (this.type == 'company') {
       // layout='6x10'

src/components/videoModule/isc_plugin/video_isc_plugin.js

@@ -306,6 +306,15 @@ function init(videoData) {
       })
     }).then(function (oData) {
       console.log(width, height, oWebControl)
+      console.log('COMPANY++++++++++++++',COMPANY)
+      console.log(window.localStorage.getItem('isIframe'))
+
+        if (COMPANY=='xingxuan') {
+          oWebControl.oDocOffset.top = 94;
+          oWebControl.oDocOffset.left = 280;
+        }
+        
+
       oWebControl.JS_Resize(width, height);
       // console.log('OpenVideo')
       for (let i = 0; i < videoData.length; i++) {
@@ -456,4 +465,10 @@ export function setOffset(l,t){
     left: l,
     top: t
   })
+  console.log(l, t, "===============================")
+}
+
+export function setWidthAndHeight(width, height) {
+  oWebControl.JS_Resize(width, height);
+
 }

src/components/videoModule/videoModule.vue

@@ -2,7 +2,7 @@
 <!-- 下拉框选择视频，需传入视频列表 -->
   <div class="fullHeight videoOverview" id="videoOverview">
     <leCheng v-if="pluginType=='lecheng'"  :url='urls' :token="lcToken"></leCheng>
-    <iscPlugin v-else-if="pluginType=='isc'" :type="type" :devList="devList" :class="{'isDockingToWoer': isDockingToWoer, 'isLongguangIframe': isIframe, 'isFullScreen': isFullScreen}" :style="{left:worMenuWidth+'px'}"></iscPlugin>
+    <iscPlugin v-else-if="pluginType=='isc'" :type="type" :isIframe="isIframe" :devList="devList" :class="{'isDockingToWoer': isDockingToWoer, 'isLongguangIframe': isIframe, 'isFullScreen': isFullScreen}" :style="{left:worMenuWidth+'px'}"></iscPlugin>
     <div v-else
       :class="!bottomMod?'oneVideoContent videoContent'+winNum:'videoContent videoContent'+winNum"
     >
@@ -226,7 +226,9 @@ export default {
       isFullScreen: false
     };
   },
-
+  destroy(){
+    hidePluginWindow()
+  },
   created() {
     this.company = COMPANY;
     this.devList = this.$props.value;
@@ -282,6 +284,7 @@ export default {
     }
     // window.addEventListener('keydown',this.fullScreen)
     // console.log(document.getElementById('videoOverview'))
+
   },
   destroyed() {
     if (this.pluginType == "videojs") {