Merge branch 'dev'

.angular-cli.json

@@ -23,6 +23,7 @@
         "../node_modules/layui-layer/dist/theme/default/layer.css",
         "../node_modules/animate.css/animate.min.css",
         "assets/inspinia/style.scss",
+        "../node_modules/xterm/dist/xterm.css",
         "sass/style.scss",
         "styles.css"
       ],
@@ -32,7 +33,7 @@
         "../node_modules/jquery-sparkline/jquery.sparkline.js",
         "../node_modules/tether/dist/js/tether.min.js",
         "../node_modules/bootstrap/dist/js/bootstrap.min.js",
-        "../node_modules/term.js/src/term.js",
+        "../node_modules/xterm/dist/xterm.js",
         "../node_modules/layui-layer/dist/layer.js",
         "../node_modules/socket.io-client/dist/socket.io.js",
         "./assets/js/mstsc.js",

src/app/ControlPage/cleftbar/cleftbar.component.css

@@ -67,7 +67,11 @@ label {
   background: #2f2a2a;
   font-size: 9pt;
   border-top-width: 1px;
+<<<<<<< HEAD
+  left: 0;
+=======
   left: 0px;
+>>>>>>> github_dev
   padding: 1px 20px 0 20px;
   position: absolute;
 }

src/app/elements/term/term.component.ts

@@ -22,27 +22,27 @@ export class ElementTermComponent implements OnInit, AfterViewInit {
   ngAfterViewInit() {
     term.col = Math.floor(jQuery(this.el.nativeElement).width() / jQuery('#liuzheng').width() * 8) - 3;
     term.row = Math.floor(jQuery(this.el.nativeElement).height() / jQuery('#liuzheng').height()) - 5;
-    console.log(term);
     // term.term = Terminal({
     //   cols: term.col,
     //   rows: term.row,
     //   useStyle: true,
     //   screenKeys: true,
     // });
-    term.term.open(this.el.nativeElement, true);
-    const that = this;
-    window.onresize = function () {
-      term.col = Math.floor(jQuery(that.el.nativeElement).width() / jQuery('#liuzheng').width() * 8) - 3;
-      term.row = Math.floor(jQuery(that.el.nativeElement).height() / jQuery('#liuzheng').height()) - 5;
-
-      if (term.col < 80) {
-        term.col = 80;
-      }
-      if (term.row < 24) {
-        term.row = 24;
-      }
     term.term.resize(term.col, term.row);
-    };
+    term.term.open(this.el.nativeElement, true);
+    // const that = this;
+    // window.onresize = function () {
+    //   term.col = Math.floor(jQuery(that.el.nativeElement).width() / jQuery('#liuzheng').width() * 8) - 3;
+    //   term.row = Math.floor(jQuery(that.el.nativeElement).height() / jQuery('#liuzheng').height()) - 5;
+    //
+    //   if (term.col < 80) {
+    //     term.col = 80;
+    //   }
+    //   if (term.row < 24) {
+    //     term.row = 24;
+    //   }
+    //   term.term.resize(term.col, term.row);
+    // };
   }
 
 }

src/app/replay-page/json/json.component.ts

-import {AfterViewInit, Component, OnInit} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {Video} from '../../globals';
 import {term} from '../../globals';
 
-import * as jQuery from 'jquery/dist/jquery.min.js';
-
 @Component({
   selector: 'app-json',
   templateUrl: './json.component.html',
   styleUrls: ['./json.component.css']
 })
-export class JsonComponent implements OnInit, AfterViewInit {
+export class JsonComponent implements OnInit {
   speed = 1;
   setPercent = 0;
   toggle = false;
@@ -24,13 +22,9 @@ export class JsonComponent implements OnInit, AfterViewInit {
   }
 
   ngOnInit() {
-  }
-
-  ngAfterViewInit() {
     this.restart();
   }
 
-
   setSpeed() {
     if (this.speed === 0) {
       this.TIMESTEP = this.TICK;