[ADD] change currentScreen layout

package.json

@@ -9,17 +9,11 @@
   },
   "dependencies": {
     "@jiaminghi/data-view": "^2.10.0",
-
-
-
-    "moment": "^2.29.4",
-    "mux.js": "^6.3.0",
-    "v-scale-screen": "^1.0.2",
-
     "axios": "^0.18.0",
     "bpmn-js-token-simulation": "^0.10.0",
     "core-js": "^3.6.4",
     "echarts": "^4.2.1",
+    "echarts-gl": "^1.1.0",
     "element-ui": "^2.13.0",
     "flv": "^0.0.1",
     "flv.js": "^1.6.2",
@@ -31,11 +25,14 @@
     "layui-layer": "^1.0.9",
     "lodash": "^4.17.5",
     "min-dash": "^3.5.2",
+    "moment": "^2.29.4",
+    "mux.js": "^6.3.0",
     "pdfjs-dist": "^2.5.207",
     "register-service-worker": "^1.6.2",
     "socket.io": "^4.6.1",
     "sortablejs": "^1.7.0",
     "v-charts": "^1.19.0",
+    "v-scale-screen": "^1.0.2",
     "video.js": "^8.0.4",
     "videojs-contrib-hls": "^5.15.0",
     "vue": "^2.6.11",
@@ -48,15 +45,6 @@
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
-
-    "@vue/eslint-config-prettier": "^6.0.0",
-
-    "eslint-plugin-prettier": "^3.3.1",
-
-
-    "prettier": "^2.2.1",
-
-
     "@vue/cli-plugin-babel": "~4.2.0",
     "@vue/cli-plugin-eslint": "~4.2.0",
     "@vue/cli-plugin-pwa": "~4.2.0",
@@ -64,6 +52,7 @@
     "@vue/cli-plugin-unit-jest": "~4.2.0",
     "@vue/cli-plugin-vuex": "~4.2.0",
     "@vue/cli-service": "~4.2.0",
+    "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-standard": "^5.1.0",
     "@vue/test-utils": "1.0.0-beta.31",
     "babel-eslint": "^10.0.3",
@@ -73,16 +62,17 @@
     "eslint": "^6.7.2",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^6.1.2",
     "less": "^4.1.3",
     "less-loader": "^7.3.0",
     "lint-staged": "^9.5.0",
+    "prettier": "^2.2.1",
     "sass": "^1.58.3",
     "sass-loader": "^7.3.1",
     "vue-template-compiler": "^2.6.11"
-
   },
   "eslintConfig": {
     "root": true,

src/components/hk/hkCamara.vue

@@ -160,6 +160,8 @@ export default {
           this.getLoginParams().then((res) => {
             console.log("🚀 解析完 >> ", res);
             this.login(res);
+          }).then(() => {
+            this.$emit("init", true);
           });
         })
         window.addEventListener("resize", that.handleResize);

src/components/hk/hkv.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="video-player">
-    <div id="divPlugin" class="divPlugin"></div>
+    <div id="divPlugin2" class="divPlugin"></div>
     <!-- <div id="divPlugin" class="divPlugin" ref="divPlugin" v-if="plugin">
         </div> -->
     <!-- <div class="down" v-else>
@@ -95,7 +95,7 @@ export default {
       });
       console.log("🚀 初始化插件完成 >> ", that.g_iWndIndex);
       console.log("🚀 插入插件");
-      WebVideoCtrl.I_InsertOBJECTPlugin("divPlugin").then(() => {
+      WebVideoCtrl.I_InsertOBJECTPlugin("divPlugin2").then(() => {
         WebVideoCtrl.I_Resize(
           380 / (this.zoom / 1.25),
           260 / (this.zoom / 1.25)
@@ -430,7 +430,6 @@ export default {
       });
     },
   },
-  //因为项目中需求，总公司要查看所有子公司的监控，所以做了个监听来切换查看各个子公司的监控
   watch: {
     companyVideoData: {
       handler(val, oldVal) {
@@ -451,20 +450,6 @@ export default {
             console.log("🚀 解析完 >> ", res);
             this.login(res);
           });
-          // for (let i = 0; i < this.wndNum; i++) {
-          //   WebVideoCtrl.I_Stop(i);
-          //   console.log("🚀 关闭 >> ", i);
-          //   WebVideoCtrl.I_StopAllPlay ()
-          // }
-          // WebVideoCtrl.I_StopAllPlay().then(() => {
-          //   console.log("🚀 采集卡全关 >> ", );
-          //   this.getLoginParams().then((res) => {
-          //     console.log("🚀 解析完 >> ", res);
-          //     this.login(res);
-          //   });
-          // })
-
-          //
         }
       },
     },
@@ -505,6 +490,21 @@ export default {
   right: 0;
   bottom: 0;
 }
+.divPlugin {
+  width: 100%;
+  height: 100%;
+  color: red;
+  /* display: flex; */
+  justify-content: center;
+  align-items: center;
+  font-size: 18px;
+  position: fixed;
+  /* top: 680px; */
+  /* top: 0px; */
+  /* right: 0px; */
+
+  overflow: hidden;
+}
 .down {
   width: 100%;
   height: 100%;

src/views/taskScreen.vue

@@ -193,18 +193,19 @@
                       :src="require('../assets/img/rightIcon.svg')"
                       fit="contain"
                     ></el-image>
-                    训练态势监控
+<!--                    训练态势监控-->
+                    指令监控
                   </div>
-                  <el-image
-                    @click="showFull('allVideo')"
-                    style="width: 20px; height: 20px; margin-right: 6px; margin-top: -10px"
-                    :src="require('../assets/img/iconMore.svg')"
-                    fit="contain"
-                    class="moreBtn_style"
-                  ></el-image>
+<!--                  <el-image-->
+<!--                    @click="showFull('allVideo')"-->
+<!--                    style="width: 20px; height: 20px; margin-right: 6px; margin-top: -10px"-->
+<!--                    :src="require('../assets/img/iconMore.svg')"-->
+<!--                    fit="contain"-->
+<!--                    class="moreBtn_style"-->
+<!--                  ></el-image>-->
                 </div>
-                <div class="video_title">{{ camaraName[0] }}</div>
-                <hk-camara  v-if="HKCamaraShow" :companyVideoData="camaraData" @init="HKCardInit" ref="hkCard"/>
+<!--                <div class="video_title">{{ camaraName[0] }}</div>-->
+<!--                <hk-camara  v-if="HKCamaraShow" :companyVideoData="camaraData" @init="HKCardInit" ref="hkCard"/>-->
               </div>
               <div class="commandMonitoring_task">
                 <div class="map_more_box">
@@ -845,7 +846,7 @@ export default {
       }
 
       setTimeout(() => {
-        this.HKCamaraShow = true;
+        this.HKCardShow = true
       }, 800);
 
        let params1 = {