Merge remote-tracking branch 'remotes/origin/sl' into yx

public/static/js/videoPlayer/h5scluster.js

@@ -1,33 +0,0 @@
-function H5SClusterHttpGet(url)
-{
-    var xmlHttp = new XMLHttpRequest();
-    xmlHttp.open("GET", url, false );
-    xmlHttp.send( null );
-    return xmlHttp.responseText;
-}
-
-function H5SClusterGetConf(conf)
-{
-    var strStatusUrl =  conf.protocol + '//' + conf.host + conf.rootpath +
-                'api/v1/cluster/GetClusterStatus';
-    console.log(strStatusUrl);        
-    var strStatus = H5SClusterHttpGet(strStatusUrl);
-    console.log(strStatus);
-    var strStatusJson = JSON.parse(strStatus);
-    if (strStatusJson["bEnable"] == true)
-    {
-        console.log("Cluster enable");
-        var strProtocol = "http";
-        if (conf.protocol == "https:")
-        {
-            strProtocol = "https";
-        }
-        var strAddrUrl =  conf.protocol + '//' + conf.host + conf.rootpath +
-                    'api/v1/cluster/GetServiceAddr?service=' + strProtocol + '&token=' + conf.token;
-        var strAddr = H5SClusterHttpGet(strAddrUrl);
-        console.log(strAddr);
-        var strAddrJson = JSON.parse(strAddr);
-        conf.host = strAddrJson["strAddr"] + ':' + strAddrJson["nPort"];
-        console.log("Cluster get play host", conf.host);
-    }
-}

public/static/js/videoPlayer/h5sevent.js

@@ -1,184 +0,0 @@
-/** 
- *=================Event API
- *
- */
-/** 
- * Interface with h5s Event API
- * @constructor
- * @param 
- var conf = {
-	protocol: window.location.protocol, // {string} - 'http:' or 'https:'
-	host: window.location.host, //{string} - 'localhost:8080'
-	rootpath:window.location.pathname, // {string} - path of the app running
-	callback: EventCB, //{function}(event(string), userdata(object)) 
-	userdata: user data // user data
-	session:'c1782caf-b670-42d8-ba90-2244d0b0ee83', //{string} - session got from login
-	consolelog: 'true' // 'true' or 'false' enable/disable console.log
-};
-*/
-
-function H5sEvent(conf)
-{
-	this.wsSocket;
-	this.keepaliveTimerId;
-	this.bNeedReconnect = false;
-	this.bDisConnected = false;
-	
-	this._debug = true;	
-	if (conf.consolelog !== undefined)
-	{
-		if (conf.consolelog === 'false')
-		{
-			this._debug = false;	
-		}
-	}	
-	
-
-	this._conf = conf;	
-}
-
-H5sEvent.prototype.ReconnectFunction = function() 
-{
-	//if(this._debug === true) console.log('Try Reconnect...', this.bNeedReconnect);
-	if (this.bNeedReconnect === true)
-	{
-		if(this._debug === true) console.log('Reconnect...');
-		
-		this.setupWebSocket(this._token);
-		this.bNeedReconnect = false;
-	}
-	//if(this._debug === true) console.log('Try Reconnect...', this.bNeedReconnect);
-}
-	
-	
-H5sEvent.prototype.H5SWebSocketClient = function(h5spath) 
-{
-	var socket;
-	if(this._debug === true) console.log("H5SWebSocketClient");
-	try {
-		//alert(this._conf.protocol);
-		if (this._conf.protocol == "http:") 
-		{
-			if (typeof MozWebSocket != "undefined")
-			{
-				socket = new MozWebSocket('ws://' + this._conf.host  +  h5spath);
-			}else
-			{
-				socket = new WebSocket('ws://' + this._conf.host +  h5spath);
-			}
-		}
-		if (this._conf.protocol == "https:")
-		{	
-			//alert(this._conf.host);
-			if(this._debug === true) console.log(this._conf.host);
-			if (typeof MozWebSocket != "undefined")
-			{
-				socket = new MozWebSocket('wss://' + this._conf.host +  h5spath);
-			}else
-			{
-				socket = new WebSocket('wss://' + this._conf.host + h5spath);
-			}				
-		}
-		if(this._debug === true) console.log(this._conf.host);
-	} catch (e) {
-		alert('error');
-		return;
-	}
-	return socket;
-}
-
-H5sEvent.prototype.keepaliveTimer = function()	
-{
-	try {
-		var j = {};
-		j.type = "keepalive";
-		this.wsSocket.send(JSON.stringify(j));
-	} catch (e) {
-	  if(this._debug === true) console.log(e);
-	}
-}
-
-
-H5sEvent.prototype.onWebSocketData = function(msg)	
-{
-	
-	if (this._conf.callback != undefined)
-	{
-		this._conf.callback(msg.data, this._conf.userdata);
-	}
-} 
-	
-
-H5sEvent.prototype.setupWebSocket = function(token)	
-{	
-	var h5spath = "api/v1/h5seventapi";
-
-	h5spath = this._conf.rootpath + h5spath + '?session=' + this._conf.session;
-	
-	if(this._debug === true) console.log(h5spath);
-	
-	this.wsSocket = this.H5SWebSocketClient(h5spath);
-	if(this._debug === true) console.log("setupWebSocket", this.wsSocket);
-	this.wsSocket.binaryType = 'arraybuffer';
-	this.wsSocket.h5 = this;
-	this.wsSocket.onmessage = this.onWebSocketData.bind(this);
-	
-	this.wsSocket.onopen = function()
-	{
-		if(this.h5._debug === true) console.log("wsSocket.onopen", this.h5);
-		
-		this.h5.keepaliveTimerId = setInterval(this.h5.keepaliveTimer.bind(this.h5), 1000);
-
-	}
-	
-	this.wsSocket.onclose = function () {
-		if(this.h5._debug === true) console.log("wsSocket.onclose", this.h5);
-		if (this.h5.bDisConnected === true)
-		{
-			if(this.h5._debug === true) console.log("wsSocket.onclose disconnect");
-		}else
-		{
-			this.h5.bNeedReconnect = true;
-		}
-		
-		this.h5.CleanupWebSocket(this.h5);
-	}
-
-}
-
-
-H5sEvent.prototype.CleanupWebSocket = function(h5sPlayer)
-{
-	if(h5sPlayer._debug === true) console.log('CleanupWebSocket', h5sPlayer);
-	clearInterval(h5sPlayer.keepaliveTimerId);
-	h5sPlayer.emptyBuffCnt = 0;
-	h5sPlayer.lastBuffTime = 0;
-	h5sPlayer.buffTimeSameCnt = 0;
-}
-
-
-/** 
- * Connect a websocket Stream to videoElement 
-*/
-H5sEvent.prototype.connect = function() {
-	/* start connect to server */
-	this.setupWebSocket(this._token);
-	this.reconnectTimerId = setInterval(this.ReconnectFunction.bind(this), 3000);
-}
-
-
-/** 
- * Disconnect a websocket Stream and clear videoElement source
-*/
-H5sEvent.prototype.disconnect = function() {
-	if(this._debug === true) console.log("disconnect", this);
-	this.bDisConnected = true;
-	clearInterval(this.reconnectTimerId);
-	
-	if (this.wsSocket != null)
-	{
-		this.wsSocket.close();
-		this.wsSocket = null;
-	}
-	if(this._debug === true) console.log("disconnect", this);
-} 

public/static/js/videoPlayer/h5spbcontrol.js

@@ -1,278 +0,0 @@
-/** 
- * Interface with h5s websocket pb ctonrol API
- * @constructor
- * @param 
- var pbconf1 = {
-	begintime: '2019-03-23T120101+08',//{string} begintime 0 for fileplayback
-	endtime: '2019-03-23T150101+08',//{string} endtime 0 for fileplayback
-	serverpb: 'true', //'true' or 'false' playback from h5stream record, default false 
-	filename: 'token1.mp4', // file name need to playback (begintime == 0 & endtime == 0 and serverpb is true)
-	callback: PlaybackCB, //{function}(event(string), userdata(object)) 
-	userdata:  user data // user data
-};
- 
- var conf = {
-	protocol: window.location.protocol, // {string} - 'http:' or 'https:'
-	host: window.location.host, //{string} - 'localhost:8080'
-	rootpath:window.location.pathname, // {string} - path of the app running
-	token:'token1', // {string} - token of stream
-	streamprofile: 'main', // {string} - stream profile, main/sub or other predefine transcoding profile
-	pbconf: pbconf1, //This is optional, if no pbconf, this will be live.
-	session:'c1782caf-b670-42d8-ba90-2244d0b0ee83', //{string} - session got from login
-	consolelog: 'true' // 'true' or 'false' enable/disable console.log
-};                     
-*/
-
-function H5sPbControl(conf)
-{
-	this.wsSocket;
-	this.keepaliveTimerId;
-	this.bDisConnected = false;
-	
-	this._debug = true;	
-	if (conf.consolelog !== undefined)
-	{
-		if (conf.consolelog === 'false')
-		{
-			this._debug = false;	
-		}
-	}	
-	
-	this._conf = conf;
-	if(this._debug === true) console.log("[PBCONTROL] Websocket Conf:", conf);
-	
-	this._pbconf = conf.pbconf;
-	
-	this._token = conf.token;
-}
-	
-H5sPbControl.prototype.H5SWebSocketClient = function(h5spath) 
-{
-	var socket;
-	if(this._debug === true) console.log("[PBCONTROL] H5SWebSocketClient");
-	try {
-		//alert(this._conf.protocol);
-		if (this._conf.protocol == "http:") 
-		{
-			if (typeof MozWebSocket != "undefined")
-			{
-				socket = new MozWebSocket('ws://' + this._conf.host  +  h5spath);
-			}else
-			{
-				socket = new WebSocket('ws://' + this._conf.host +  h5spath);
-			}
-		}
-		if (this._conf.protocol == "https:")
-		{	
-			//alert(this._conf.host);
-			if(this._debug === true) console.log(this._conf.host);
-			if (typeof MozWebSocket != "undefined")
-			{
-				socket = new MozWebSocket('wss://' + this._conf.host +  h5spath);
-			}else
-			{
-				socket = new WebSocket('wss://' + this._conf.host + h5spath);
-			}				
-		}
-		if(this._debug === true) console.log(this._conf.host);
-	} catch (e) {
-		alert('error');
-		return;
-	}
-	return socket;
-}
-
-H5sPbControl.prototype.keepaliveTimer = function()	
-{
-	try {
-		var j = {};
-		j.cmd = "H5_KEEPALIVE";
-		this.wsSocket.send(JSON.stringify(j));
-	} catch (e) {
-	  if(this._debug === true) console.log(e);
-	}
-}
-
-H5sPbControl.prototype.onWebSocketData = function(msg)	
-{	
-	if(typeof msg.data === 'string')
-	{
-		if(this._debug === true) console.log("[PBCONTROL] string");
-		if (this._pbconf != undefined && this._pbconf.callback != undefined)
-		{
-			this._pbconf.callback(msg.data, this._pbconf.userdata);
-		}
-		return;
-	}
-	
-	if (this.bDisConnected === true)
-	{
-		return;
-	}
-} 
-
-H5sPbControl.prototype.setupWebSocket = function(token)	
-{
-	var h5spath = "api/v1/h5spbcontrolapi";
-	var streamprofile = 'main';
-	if (this._conf.streamprofile === undefined)
-	{}else 
-	{
-		streamprofile = this._conf.streamprofile;
-	}
-	
-	if (this._pbconf === undefined)
-	{
-		h5spath = this._conf.rootpath + h5spath + "?token=" + token 
-						+ "&profile=" + streamprofile + '&session=' + this._conf.session;
-	}else 
-	{
-		var serverpb = 'false';
-		var filename = 'fake';
-		if (this._pbconf.serverpb === undefined)
-		{}else 
-		{
-			serverpb = this._pbconf.serverpb;
-		}
-
-		if (this._pbconf.filename === undefined)
-		{}else 
-		{
-			filename = this._pbconf.filename;
-		}		
-		
-		h5spath = this._conf.rootpath + h5spath + "?token=" + token 
-								+ "&playback=true"
-								+ '&profile=' + streamprofile
-								+ "&serverpb=" + serverpb
-								+ "&begintime=" + encodeURIComponent(this._pbconf.begintime)//this._pbconf.begintime
-								+ "&endtime=" + encodeURIComponent(this._pbconf.endtime)//this._pbconf.endtime
-								+ "&filename=" + filename//file name
-								+ '&session=' + this._conf.session;
-	}				+ '&session=' + this._conf.session;
-
-	
-	
-	if(this._debug === true) console.log(h5spath);
-	
-	this.wsSocket = this.H5SWebSocketClient(h5spath);
-	if(this._debug === true) console.log("[PBCONTROL] setupWebSocket", this.wsSocket);
-	this.wsSocket.binaryType = 'arraybuffer';
-	this.wsSocket.h5 = this;
-	this.wsSocket.onmessage = this.onWebSocketData.bind(this);
-	
-	this.wsSocket.onopen = function()
-	{
-		if(this.h5._debug === true) console.log("[PBCONTROL] wsSocket.onopen", this.h5);
-		this.h5.keepaliveTimerId = setInterval(this.h5.keepaliveTimer.bind(this.h5), 1000);
-
-		var j = {};
-		j.type = "H5S_WS_CONNECTED";
-		if (this.h5._pbconf != undefined && this.h5._pbconf.callback != undefined)
-		{
-			this.h5._pbconf.callback(JSON.stringify(j), this.h5._pbconf.userdata);
-		}
-	}
-	
-	this.wsSocket.onclose = function () {
-		if(this.h5._debug === true) console.log("[PBCONTROL] wsSocket.onclose", this.h5);
-		
-		var j = {};
-		j.type = "H5S_WS_DISCONNECTED";
-		if (this.h5._pbconf != undefined && this.h5._pbconf.callback != undefined)
-		{
-			this.h5._pbconf.callback(JSON.stringify(j), this.h5._pbconf.userdata);
-		}
-		
-		this.h5.CleanupWebSocket(this.h5);
-	}
-
-}
-	
-H5sPbControl.prototype.CleanupWebSocket = function(h5sPlayer)
-{
-	if(h5sPlayer._debug === true) console.log('[PBCONTROL] CleanupWebSocket', h5sPlayer);
-	clearInterval(h5sPlayer.keepaliveTimerId);
-}
-
-
-/** 
- * Connect a websocket Stream to videoElement 
-*/
-H5sPbControl.prototype.connect = function() {
-	/* start connect to server */
-	this.setupWebSocket(this._token);
-}
-
-
-/** 
- * Disconnect a websocket Stream and clear videoElement source
-*/
-H5sPbControl.prototype.disconnect = function() {
-	if(this._debug === true) console.log("[PBCONTROL] disconnect", this);
-	this.bDisConnected = true;
-	clearInterval(this.reconnectTimerId);
-	
-	try {
-		if (this.wsSocket != null)
-		{
-			this.wsSocket.close();
-			this.wsSocket = null;
-		}
-	}
-	catch (e){}
-	
-	if(this._debug === true) console.log("[PBCONTROL] disconnect", this);
-}
-
-H5sPbControl.prototype.start = function(){
-	try {
-		var j = {};
-		j.cmd = "H5_START";
-		this.wsSocket.send(JSON.stringify(j));
-	} catch (e) {
-	  if(this._debug === true) console.log(e);
-	}
-}
-
-H5sPbControl.prototype.pause = function(){
-	try {
-		var j = {};
-		j.cmd = "H5_PAUSE";
-		this.wsSocket.send(JSON.stringify(j));
-	} catch (e) {
-	  if(this._debug === true) console.log(e);
-	}
-}
-
-H5sPbControl.prototype.resume = function(){
-	try {
-		var j = {};
-		j.cmd = "H5_RESUME";
-		this.wsSocket.send(JSON.stringify(j));
-	} catch (e) {
-	  if(this._debug === true) console.log(e);
-	}
-}
-
-H5sPbControl.prototype.seek = function(nTime){
-	try {
-		var j = {};
-		j.cmd = "H5_SEEK";
-		j.nSeekTime = nTime;
-		this.wsSocket.send(JSON.stringify(j));
-	} catch (e) {
-	  if(this._debug === true) console.log(e);
-	}
-}
-
-H5sPbControl.prototype.speed = function(nSpeed){
-	try {
-		var j = {};
-		j.cmd = "H5_SPEED";
-		j.nSpeed = nSpeed;
-		this.wsSocket.send(JSON.stringify(j));
-	} catch (e) {
-	  if(this._debug === true) console.log(e);
-	}
-}

public/static/js/videoPlayer/h5splayerhelper.js

@@ -1,110 +0,0 @@
-/** 
- * Check platform and OS
-	(platform.name); // 'Safari'
-	(platform.version); // '11.1'
-	(platform.product); // 'iPad'
-	(platform.manufacturer); // 'Apple'
-	(platform.layout); // 'WebKit'
-	(platform.os.family); // 'iOS'
-	(platform.description);// 'Safari 11.1 on Apple iPad (iOS 11.0)'
- 
-*/
-function H5siOS() {
-    var browserName=platform.os.family;  
-    if(/ios/i.test(browserName) ){  
-        return true;  
-    } 
-	return false;
-}
-
-function H5sChromeBrowser(){  
-    var browserName=platform.name;  
-    if(/chrome/i.test(browserName) ){  
-        return true;  
-    }  
-    return false;
-}  
-
-
-function H5sEdgeBrowser(){  
-    var browserName=platform.name;  
-    if(/edge/i.test(browserName) ){  
-        return true;  
-    }  
-    return false;
-} 
-
-function H5sSafariBrowser(){  
-    var browserName=platform.name;  
-	console.log(browserName);
-    if(/safari/i.test(browserName) ){  
-        return true;  
-    }  
-    return false;
-}
-
-function H5sAndriodPlatform(){  
-    var browserName=platform.os.family;  
-    if(/android/i.test(browserName) ){  
-        return true;  
-    }  
-    return false;
-}
-
-/** 
- *=================H5Player Create
- *
- */
- 
-function H5sPlayerCreate(conf) {
-	var player;
-
-	if (H5siOS())
-	{
-        player = new H5sPlayerRTC(conf);
-	}else{
-        player = new H5sPlayerWS(conf);
-	}
-	return player;
-}
-
-
-function GetURLParameter(sParam)
-{
-    var sPageURL = window.location.search.substring(1);
-    var sURLVariables = sPageURL.split('&');
-    for (var i = 0; i < sURLVariables.length; i++) 
-    {
-        var sParameterName = sURLVariables[i].split('=');
-        if (sParameterName[0] == sParam) 
-        {
-            return sParameterName[1];
-        }
-    }
-}
-
-
-function H5sSnapshot(vid, fileName)
-{
-	var video = vid;
-	var w = video.videoWidth;//video.videoWidth * scaleFactor;
-	var h = video.videoHeight;//video.videoHeight * scaleFactor;
-	var canvas = document.createElement('canvas');
-	canvas.width = w;
-	canvas.height = h;
-	var ctx = canvas.getContext('2d');
-	ctx.drawImage(video, 0, 0, w, h);
-	var MIME_TYPE = "image/png";
-	var imgURL = canvas.toDataURL(MIME_TYPE);
-
-	var dlLink = document.createElement('a');
-	dlLink.download = fileName;
-	dlLink.href = imgURL;
-	dlLink.dataset.downloadurl = [MIME_TYPE, dlLink.download, dlLink.href].join(':');
-
-	document.body.appendChild(dlLink);
-	dlLink.click();
-	document.body.removeChild(dlLink);           
-}
- 
-

public/static/js/videoPlayer/jQuery.md5.js

@@ -1,214 +0,0 @@
-	/**
-	 * jQuery MD5 hash algorithm function
-	 * 
-	 * 	<code>
-	 * 		Calculate the md5 hash of a String 
-	 * 		String $.md5 ( String str )
-	 * 	</code>
-	 * 
-	 * Calculates the MD5 hash of str using the » RSA Data Security, Inc. MD5 Message-Digest Algorithm, and returns that hash. 
-	 * MD5 (Message-Digest algorithm 5) is a widely-used cryptographic hash function with a 128-bit hash value. MD5 has been employed in a wide variety of security applications, and is also commonly used to check the integrity of data. The generated hash is also non-reversable. Data cannot be retrieved from the message digest, the digest uniquely identifies the data.
-	 * MD5 was developed by Professor Ronald L. Rivest in 1994. Its 128 bit (16 byte) message digest makes it a faster implementation than SHA-1.
-	 * This script is used to process a variable length message into a fixed-length output of 128 bits using the MD5 algorithm. It is fully compatible with UTF-8 encoding. It is very useful when u want to transfer encrypted passwords over the internet. If you plan using UTF-8 encoding in your project don't forget to set the page encoding to UTF-8 (Content-Type meta tag). 
-	 * This function orginally get from the WebToolkit and rewrite for using as the jQuery plugin.
-	 * 
-	 * Example
-	 * 	Code
-	 * 		<code>
-	 * 			$.md5("I'm Persian."); 
-	 * 		</code>
-	 * 	Result
-	 * 		<code>
-	 * 			"b8c901d0f02223f9761016cfff9d68df"
-	 * 		</code>
-	 * 
-	 * @alias Muhammad Hussein Fattahizadeh < muhammad [AT] semnanweb [DOT] com >
-	 * @link http://www.semnanweb.com/jquery-plugin/md5.html
-	 * @see http://www.webtoolkit.info/
-	 * @license http://www.gnu.org/licenses/gpl.html [GNU General Public License]
-	 * @param {jQuery} {md5:function(string))
-	 * @return string
-	 */
-	(function($){
-		var rotateLeft = function(lValue, iShiftBits) {
-			return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
-		}
-		var addUnsigned = function(lX, lY) {
-			var lX4, lY4, lX8, lY8, lResult;
-			lX8 = (lX & 0x80000000);
-			lY8 = (lY & 0x80000000);
-			lX4 = (lX & 0x40000000);
-			lY4 = (lY & 0x40000000);
-			lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
-			if (lX4 & lY4) return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
-			if (lX4 | lY4) {
-				if (lResult & 0x40000000) return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
-				else return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
-			} else {
-				return (lResult ^ lX8 ^ lY8);
-			}
-		}
-		var F = function(x, y, z) {
-			return (x & y) | ((~ x) & z);
-		}
-		var G = function(x, y, z) {
-			return (x & z) | (y & (~ z));
-		}
-		var H = function(x, y, z) {
-			return (x ^ y ^ z);
-		}
-		var I = function(x, y, z) {
-			return (y ^ (x | (~ z)));
-		}
-		var FF = function(a, b, c, d, x, s, ac) {
-			a = addUnsigned(a, addUnsigned(addUnsigned(F(b, c, d), x), ac));
-			return addUnsigned(rotateLeft(a, s), b);
-		};
-		var GG = function(a, b, c, d, x, s, ac) {
-			a = addUnsigned(a, addUnsigned(addUnsigned(G(b, c, d), x), ac));
-			return addUnsigned(rotateLeft(a, s), b);
-		};
-		var HH = function(a, b, c, d, x, s, ac) {
-			a = addUnsigned(a, addUnsigned(addUnsigned(H(b, c, d), x), ac));
-			return addUnsigned(rotateLeft(a, s), b);
-		};
-		var II = function(a, b, c, d, x, s, ac) {
-			a = addUnsigned(a, addUnsigned(addUnsigned(I(b, c, d), x), ac));
-			return addUnsigned(rotateLeft(a, s), b);
-		};
-		var convertToWordArray = function(string) {
-			var lWordCount;
-			var lMessageLength = string.length;
-			var lNumberOfWordsTempOne = lMessageLength + 8;
-			var lNumberOfWordsTempTwo = (lNumberOfWordsTempOne - (lNumberOfWordsTempOne % 64)) / 64;
-			var lNumberOfWords = (lNumberOfWordsTempTwo + 1) * 16;
-			var lWordArray = Array(lNumberOfWords - 1);
-			var lBytePosition = 0;
-			var lByteCount = 0;
-			while (lByteCount < lMessageLength) {
-				lWordCount = (lByteCount - (lByteCount % 4)) / 4;
-				lBytePosition = (lByteCount % 4) * 8;
-				lWordArray[lWordCount] = (lWordArray[lWordCount] | (string.charCodeAt(lByteCount) << lBytePosition));
-				lByteCount++;
-			}
-			lWordCount = (lByteCount - (lByteCount % 4)) / 4;
-			lBytePosition = (lByteCount % 4) * 8;
-			lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
-			lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
-			lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
-			return lWordArray;
-		};
-		var wordToHex = function(lValue) {
-			var WordToHexValue = "", WordToHexValueTemp = "", lByte, lCount;
-			for (lCount = 0; lCount <= 3; lCount++) {
-				lByte = (lValue >>> (lCount * 8)) & 255;
-				WordToHexValueTemp = "0" + lByte.toString(16);
-				WordToHexValue = WordToHexValue + WordToHexValueTemp.substr(WordToHexValueTemp.length - 2, 2);
-			}
-			return WordToHexValue;
-		};
-		var uTF8Encode = function(string) {
-			string = string.replace(/\x0d\x0a/g, "\x0a");
-			var output = "";
-			for (var n = 0; n < string.length; n++) {
-				var c = string.charCodeAt(n);
-				if (c < 128) {
-					output += String.fromCharCode(c);
-				} else if ((c > 127) && (c < 2048)) {
-					output += String.fromCharCode((c >> 6) | 192);
-					output += String.fromCharCode((c & 63) | 128);
-				} else {
-					output += String.fromCharCode((c >> 12) | 224);
-					output += String.fromCharCode(((c >> 6) & 63) | 128);
-					output += String.fromCharCode((c & 63) | 128);
-				}
-			}
-			return output;
-		};
-		$.extend({
-			md5: function(string) {
-				var x = Array();
-				var k, AA, BB, CC, DD, a, b, c, d;
-				var S11=7, S12=12, S13=17, S14=22;
-				var S21=5, S22=9 , S23=14, S24=20;
-				var S31=4, S32=11, S33=16, S34=23;
-				var S41=6, S42=10, S43=15, S44=21;
-				string = uTF8Encode(string);
-				x = convertToWordArray(string);
-				a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
-				for (k = 0; k < x.length; k += 16) {
-					AA = a; BB = b; CC = c; DD = d;
-					a = FF(a, b, c, d, x[k+0],  S11, 0xD76AA478);
-					d = FF(d, a, b, c, x[k+1],  S12, 0xE8C7B756);
-					c = FF(c, d, a, b, x[k+2],  S13, 0x242070DB);
-					b = FF(b, c, d, a, x[k+3],  S14, 0xC1BDCEEE);
-					a = FF(a, b, c, d, x[k+4],  S11, 0xF57C0FAF);
-					d = FF(d, a, b, c, x[k+5],  S12, 0x4787C62A);
-					c = FF(c, d, a, b, x[k+6],  S13, 0xA8304613);
-					b = FF(b, c, d, a, x[k+7],  S14, 0xFD469501);
-					a = FF(a, b, c, d, x[k+8],  S11, 0x698098D8);
-					d = FF(d, a, b, c, x[k+9],  S12, 0x8B44F7AF);
-					c = FF(c, d, a, b, x[k+10], S13, 0xFFFF5BB1);
-					b = FF(b, c, d, a, x[k+11], S14, 0x895CD7BE);
-					a = FF(a, b, c, d, x[k+12], S11, 0x6B901122);
-					d = FF(d, a, b, c, x[k+13], S12, 0xFD987193);
-					c = FF(c, d, a, b, x[k+14], S13, 0xA679438E);
-					b = FF(b, c, d, a, x[k+15], S14, 0x49B40821);
-					a = GG(a, b, c, d, x[k+1],  S21, 0xF61E2562);
-					d = GG(d, a, b, c, x[k+6],  S22, 0xC040B340);
-					c = GG(c, d, a, b, x[k+11], S23, 0x265E5A51);
-					b = GG(b, c, d, a, x[k+0],  S24, 0xE9B6C7AA);
-					a = GG(a, b, c, d, x[k+5],  S21, 0xD62F105D);
-					d = GG(d, a, b, c, x[k+10], S22, 0x2441453);
-					c = GG(c, d, a, b, x[k+15], S23, 0xD8A1E681);
-					b = GG(b, c, d, a, x[k+4],  S24, 0xE7D3FBC8);
-					a = GG(a, b, c, d, x[k+9],  S21, 0x21E1CDE6);
-					d = GG(d, a, b, c, x[k+14], S22, 0xC33707D6);
-					c = GG(c, d, a, b, x[k+3],  S23, 0xF4D50D87);
-					b = GG(b, c, d, a, x[k+8],  S24, 0x455A14ED);
-					a = GG(a, b, c, d, x[k+13], S21, 0xA9E3E905);
-					d = GG(d, a, b, c, x[k+2],  S22, 0xFCEFA3F8);
-					c = GG(c, d, a, b, x[k+7],  S23, 0x676F02D9);
-					b = GG(b, c, d, a, x[k+12], S24, 0x8D2A4C8A);
-					a = HH(a, b, c, d, x[k+5],  S31, 0xFFFA3942);
-					d = HH(d, a, b, c, x[k+8],  S32, 0x8771F681);
-					c = HH(c, d, a, b, x[k+11], S33, 0x6D9D6122);
-					b = HH(b, c, d, a, x[k+14], S34, 0xFDE5380C);
-					a = HH(a, b, c, d, x[k+1],  S31, 0xA4BEEA44);
-					d = HH(d, a, b, c, x[k+4],  S32, 0x4BDECFA9);
-					c = HH(c, d, a, b, x[k+7],  S33, 0xF6BB4B60);
-					b = HH(b, c, d, a, x[k+10], S34, 0xBEBFBC70);
-					a = HH(a, b, c, d, x[k+13], S31, 0x289B7EC6);
-					d = HH(d, a, b, c, x[k+0],  S32, 0xEAA127FA);
-					c = HH(c, d, a, b, x[k+3],  S33, 0xD4EF3085);
-					b = HH(b, c, d, a, x[k+6],  S34, 0x4881D05);
-					a = HH(a, b, c, d, x[k+9],  S31, 0xD9D4D039);
-					d = HH(d, a, b, c, x[k+12], S32, 0xE6DB99E5);
-					c = HH(c, d, a, b, x[k+15], S33, 0x1FA27CF8);
-					b = HH(b, c, d, a, x[k+2],  S34, 0xC4AC5665);
-					a = II(a, b, c, d, x[k+0],  S41, 0xF4292244);
-					d = II(d, a, b, c, x[k+7],  S42, 0x432AFF97);
-					c = II(c, d, a, b, x[k+14], S43, 0xAB9423A7);
-					b = II(b, c, d, a, x[k+5],  S44, 0xFC93A039);
-					a = II(a, b, c, d, x[k+12], S41, 0x655B59C3);
-					d = II(d, a, b, c, x[k+3],  S42, 0x8F0CCC92);
-					c = II(c, d, a, b, x[k+10], S43, 0xFFEFF47D);
-					b = II(b, c, d, a, x[k+1],  S44, 0x85845DD1);
-					a = II(a, b, c, d, x[k+8],  S41, 0x6FA87E4F);
-					d = II(d, a, b, c, x[k+15], S42, 0xFE2CE6E0);
-					c = II(c, d, a, b, x[k+6],  S43, 0xA3014314);
-					b = II(b, c, d, a, x[k+13], S44, 0x4E0811A1);
-					a = II(a, b, c, d, x[k+4],  S41, 0xF7537E82);
-					d = II(d, a, b, c, x[k+11], S42, 0xBD3AF235);
-					c = II(c, d, a, b, x[k+2],  S43, 0x2AD7D2BB);
-					b = II(b, c, d, a, x[k+9],  S44, 0xEB86D391);
-					a = addUnsigned(a, AA);
-					b = addUnsigned(b, BB);
-					c = addUnsigned(c, CC);
-					d = addUnsigned(d, DD);
-				}
-				var tempValue = wordToHex(a) + wordToHex(b) + wordToHex(c) + wordToHex(d);
-				return tempValue.toLowerCase();
-			}
-		});
-	})(jQuery);

src/router/index.js

@@ -87,7 +87,7 @@ const routes = [{
 			import( /* webpackChunkName: "windsitemap1" */ '../views/WindSite/pages/Map1.vue'),
 	},
 	{
-		path: '/decision/decision3db', //单机横向对比
+		path: '/decision3db', //单机横向对比
 		name: 'decision3db',
 		component: () => import( /* webpackChunkName: "decision3db" */
 			'../views/Decision/Decision3Db.vue'),
@@ -134,61 +134,61 @@ const routes = [{
 	component: () =>
 		import( /* webpackChunkName: "lightmatrix3" */ '../views/LightMatrix3/LightMatrix3.vue'),
 }, {
-	path: '/decision/decision1', //风机绩效榜
+	path: '/decision1', //风机绩效榜
 	name: 'decision1',
 	component: () =>
 		import( /* webpackChunkName: "decision1" */ '../views/Decision/Decision1.vue'),
 },
 {
-	path: '/decision/decision1Mx', //风机绩效榜明细
+	path: '/decision1Mx', //风机绩效榜明细
 	name: 'decision1Mx',
 	component: () =>
 		import( /* webpackChunkName: "decision1Mx" */ '../views/Decision/Decision1Mx.vue'),
 },
 {
-	path: '/decision/decision2', //五项损失率
+	path: '/decision2', //五项损失率
 	name: 'decision2',
 	component: () =>
 		import( /* webpackChunkName: "decision2" */ '../views/Decision/Decision2.vue'),
 },
 {
-	path: '/decision/decision2Cndb', //场内对标
+	path: '/decision2Cndb', //场内对标
 	name: 'decision2Cndb',
 	component: () =>
 		import( /* webpackChunkName: "decision2Cndb" */ '../views/Decision/Decision2Cndb.vue'),
 },
 {
-	path: '/decision/decision2Cjdb', //场际对标
+	path: '/decision2Cjdb', //场际对标
 	name: 'decision2Cjdb',
 	component: () =>
 		import( /* webpackChunkName: "decision2Cjdb" */ '../views/Decision/Decision2Cjdb.vue'),
 },
 {
-	path: '/decision/decision2Xmdb', //项目对标
+	path: '/decision2Xmdb', //项目对标
 	name: 'decision2Xmdb',
 	component: () =>
 		import( /* webpackChunkName: "decision2Xmdb" */ '../views/Decision/Decision2Xmdb.vue'),
 },
 {
-	path: '/decision/decision2Xldb', //线路对标
+	path: '/decision2Xldb', //线路对标
 	name: 'decision2Xldb',
 	component: () =>
 		import( /* webpackChunkName: "decision2Xldb" */ '../views/Decision/Decision2Xldb.vue'),
 },
 {
-	path: '/decision/decision3', //性能对标
+	path: '/decision3', //性能对标
 	name: 'decision3',
 	component: () =>
 		import( /* webpackChunkName: "decision3" */ '../views/Decision/Decision3.vue'),
 },
 {
-	path: '/decision/decision4', //值际对标
+	path: '/decision4', //值际对标
 	name: 'decision4',
 	component: () =>
 		import( /* webpackChunkName: "decision4" */ '../views/Decision/Decision4.vue'),
 },
 {
-	path: '/decision/decision4czzl', //操作指令统计
+	path: '/decision4czzl', //操作指令统计
 	name: 'decision4czzl',
 	component: () =>
 		import( /* webpackChunkName: "decision4czzl" */ '../views/Decision/Decision4Czzl.vue'),

src/views/layout/Header.vue

@@ -29,16 +29,23 @@ export default {
           path: "/monitor/home",
           isActive: true,
         },
+
         {
-          id: "realSearch",
-          text: "数据管理",
-          path: "/realSearch",
+          id: "performanceAnalysis",
+          text: "增发分析",
+          path: "/performanceAnalysis",
           isActive: false,
         },
         {
-          id: "performanceAnalysis",
-          text: "统计分析",
-          path: "/performanceAnalysis",
+          id: "ztfx",
+          text: "降损分析",
+          path: "/new/ztfx",
+          isActive: false,
+        },
+         {
+          id: "realSearch",
+          text: "数据支撑",
+          path: "/realSearch",
           isActive: false,
         },
         {
@@ -47,16 +54,16 @@ export default {
           path: "/health",
           isActive: false,
         },
+        // {
+        //   id: "decision",
+        //   text: "决策支持",
+        //   path: "/decision/decision1",
+        //   isActive: false,
+        // },
         {
-          id: "decision",
-          text: "决策支持",
-          path: "/decision/decision1",
-          isActive: false,
-        },
-        {
-          id: "knowledge",
-          text: "知识管理",
-          path: "/knowledge",
+          id: "personnel",
+          text: "安措管控",
+          path: "/new/personnel",
           isActive: false,
         },
         {

src/views/layout/Menu.vue

@@ -88,79 +88,13 @@ export default {
           ],
         },
         {
-          id: "realSearch",
-          text: "数据管理",
-          data: [
-            {
-              text: "原始数据查询",
-              icon: "svg-wind-site",
-              path: "/yssjcx",
-              children: [
-                {
-                  text: "测点数据查询",
-                  icon: "svg-wind-site",
-                  path: "/realSearch",
-                },
-                {
-                  text: "测点历史数据查询",
-                  icon: "svg-wind-site",
-                  path: "/historySearch",
-                },
-              ],
-            },
-            {
-              text: "预警记录",
-              icon: "svg-wind-site",
-              path: "/new",
-              children: [
-                {
-                  text: "预警管理",
-                  icon: "svg-wind-site",
-                  path: "/new/alarmcenter",
-                },
-
-                {
-                  text: "停机事件管理",
-                  icon: "svg-wind-site",
-                  path: "/new/tjsj",
-                },
-                {
-                  text: "限电管理",
-                  icon: "svg-wind-site",
-                  path: "/new/xdgl",
-                },
-                {
-                  text: "升压站报警",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/boosterAlarm",
-                },
-                {
-                  text: "SCADA报警",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/scadaAlarm",
-                },
-                {
-                  text: "自定义报警",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/customAlarm",
-                },
-                {
-                  text: "自定义报警统计",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/customStatistics",
-                },
-              ],
-            },
-          ],
-        },
-        {
           id: "performanceAnalysis",
-          text: "统计分析",
+          text: "增发分析",
           data: [
             {
               text: "能效分析",
               icon: "svg-wind-site",
-              path: "/nxfx",
+              path: "/powerCurve",
               children: [
                 {
                   text: "功率曲线拟合",
@@ -202,7 +136,7 @@ export default {
             {
               text: "可靠性分析",
               icon: "svg-wind-site",
-              path: "/kxkfx",
+              path: "/new/alarmcenter1",
               children: [
                                 {
                   text: "预警分析",
@@ -229,7 +163,7 @@ export default {
             {
               text: "风光资源分析",
               icon: "svg-wind-site",
-              path: "/fgzyfx",
+              path: "/windAnalysis",
               children: [
                 {
                   text: "风资源散点",
@@ -241,11 +175,41 @@ export default {
                   path: "/windAnalysis/fx",
                 },
               ],
-            },
+            }
+            // {
+            //   text: "单机分析",
+            //   icon: "svg-wind-site",
+            //   path: "/fgzyfx",
+            //   children: [
+            //     {
+            //       text: "单机分析详细",
+            //       icon: "svg-wind-site",
+            //       path: "/new/dj1",
+            //     },
+            //     {
+            //       text: "电量预测",
+            //       icon: "svg-wind-site",
+            //       path: "/new/pf1",
+            //     },
+            //     {
+            //       text: "气象预测",
+            //       icon: "svg-wind-site",
+            //       path: "/new/fs",
+            //     }
+            //   ]
+            // }
+          ],
+        },
+        ,
+        {
+          id: "ztfx",
+          text: "降损分析",
+          data: [
+           
             {
               text: "专题分析",
               icon: "svg-wind-site",
-              path: "/fgzyfx",
+              path: "/new/ztfx",
               children: [
                 {
                   text: "综合分析",
@@ -318,6 +282,85 @@ export default {
                   path: "/new/zzhcydl",
                 },
               ]
+            }, {
+              text: "对标管理",
+              icon: "svg-matrix",
+              path: "/decision1",
+              children: [
+              
+                {
+                  text: "风机绩效榜",
+                  icon: "svg-wind-site",
+                  path: "/decision1",
+                },
+                {
+                  text: "五项损失率",
+                  icon: "svg-wind-site",
+                  path: "/decision2",
+                },
+                {
+                  text: "场内对标",
+                  icon: "svg-wind-site",
+                  path: "/decision2Cndb",
+                },
+                {
+                  text: "场际对标",
+                  icon: "svg-wind-site",
+                  path: "/decision2Cjdb",
+                },
+                {
+                  text: "项目对标",
+                  icon: "svg-wind-site",
+                  path: "/decision2Xmdb",
+                },
+                {
+                  text: "线路对标",
+                  icon: "svg-wind-site",
+                  path: "/decision2Xldb",
+                },
+                {
+                  text: "性能对标",
+                  icon: "svg-wind-site",
+                  path: "/decision3",
+                },
+                {
+                  text: "值际对标",
+                  icon: "svg-wind-site",
+                  path: "/decision4",
+                },
+                {
+                  text: "单机横向对比",
+                  icon: "svg-matrix",
+                  path: "/decision3db",
+                },{
+                  text: "操作指令统计",
+                  icon: "svg-matrix",
+                  path: "/decision4czzl",
+                },
+                
+              ],
+            }, // 三率管理
+            {
+              text: "三率管理",
+              icon: "svg-matrix",
+              path: "/fwjsl",
+              children: [
+                {
+                  text: "复位及时率",
+                  icon: "svg-wind-site",
+                  path: "/fwjsl",
+                },
+                {
+                  text: "状态转换率",
+                  icon: "svg-wind-site",
+                  path: "/ztzhl",
+                },
+                {
+                  text: "消缺及时率",
+                  icon: "svg-wind-site",
+                  path: "/xqjsl",
+                },
+              ],
             },
             // {
             //   text: "单机分析",
@@ -344,6 +387,114 @@ export default {
           ],
         },
         {
+          id: "realSearch",
+          text: "数据管理",
+          data: [
+            {
+              text: "原始数据查询",
+              icon: "svg-wind-site",
+              path: "/realSearch",
+              children: [
+                {
+                  text: "测点数据查询",
+                  icon: "svg-wind-site",
+                  path: "/realSearch",
+                },
+                {
+                  text: "测点历史数据查询",
+                  icon: "svg-wind-site",
+                  path: "/historySearch",
+                },
+              ],
+            },
+            {
+              text: "预警记录",
+              icon: "svg-wind-site",
+              path: "/new/alarmcenter",
+              children: [
+                {
+                  text: "预警管理",
+                  icon: "svg-wind-site",
+                  path: "/new/alarmcenter",
+                },
+
+                {
+                  text: "停机事件管理",
+                  icon: "svg-wind-site",
+                  path: "/new/tjsj",
+                },
+                {
+                  text: "限电管理",
+                  icon: "svg-wind-site",
+                  path: "/new/xdgl",
+                },
+                {
+                  text: "升压站报警",
+                  icon: "svg-wind-site",
+                  path: "/alarmCenter/boosterAlarm",
+                },
+                {
+                  text: "SCADA报警",
+                  icon: "svg-wind-site",
+                  path: "/alarmCenter/scadaAlarm",
+                },
+                {
+                  text: "自定义报警",
+                  icon: "svg-wind-site",
+                  path: "/alarmCenter/customAlarm",
+                },
+                {
+                  text: "自定义报警统计",
+                  icon: "svg-wind-site",
+                  path: "/alarmCenter/customStatistics",
+                },
+              ],
+            },
+            {
+              text: "专家知识",
+              icon: "svg-wind-site",
+              path: "/knowledge",
+              children: [
+                 {
+              text: "故障知识列表",
+              icon: "svg-matrix",
+              path: "/knowledge",
+            },
+            {
+              text: "安全措施知识",
+              icon: "svg-matrix",
+              path: "/knowledge2",
+            },
+            {
+              text: "排查检修方案",
+              icon: "svg-matrix",
+              path: "/knowledge6",
+            },
+            {
+              text: "预警知识",
+              icon: "svg-matrix",
+              path: "/knowledge7",
+            },
+            {
+              text: "特征参数",
+              icon: "svg-matrix",
+              path: "/knowledge5",
+            },
+            {
+              text: "风险辨识知识",
+              icon: "svg-matrix",
+              path: "/knowledge3",
+            },
+            {
+              text: "作业指导知识",
+              icon: "svg-matrix",
+              path: "/knowledge4",
+            },
+              ],
+            },
+          ],
+        },
+        {
           id: "health",
           text: "健康管理",
           data: [
@@ -398,192 +549,109 @@ export default {
           ],
         },
         {
-          id: "decision",
-          text: "决策支持",
+          id: "personnel",
+          text: "安措管控",
           data: [
-            {
-              text: "对标管理",
-              icon: "svg-matrix",
-              path: "/decision/decision1",
-              children: [
-              
-                {
-                  text: "风机绩效榜",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision1",
-                },
-                {
-                  text: "五项损失率",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision2",
-                },
-                {
-                  text: "场内对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision2Cndb",
-                },
-                {
-                  text: "场际对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision2Cjdb",
-                },
-                {
-                  text: "项目对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision2Xmdb",
-                },
-                {
-                  text: "线路对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision2Xldb",
-                },
-                {
-                  text: "性能对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision3",
-                },
-                {
-                  text: "值际对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision4",
-                },
-                {
-                  text: "单机横向对比",
-                  icon: "svg-matrix",
-                  path: "/decision/decision3db",
-                },{
-                  text: "操作指令统计",
-                  icon: "svg-matrix",
-                  path: "/decision/decision4czzl",
-                },
-                
-              ],
-            }
+           
             // ,
             // {
             //   text: "五项损失率",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision2",
+            //   path: "/decision2",
             // },
             // {
             //   text: "场内对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision2Cndb",
+            //   path: "/decision2Cndb",
             // },
             // {
             //   text: "场际对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision2Cjdb",
+            //   path: "/decision2Cjdb",
             // },
             // {
             //   text: "项目对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision2Xmdb",
+            //   path: "/decision2Xmdb",
             // },
             // {
             //   text: "线路对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision2Xldb",
+            //   path: "/decision2Xldb",
             // },
             // {
             //   text: "性能对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision3",
+            //   path: "/decision3",
             // },
             // {
             //   text: "值际对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision4",
+            //   path: "/decision4",
             // }
-            ,
+            
             {
-              text: "排行榜",
+              text: "安全管控",
               icon: "svg-matrix",
-              path: "/phb",
+              path: "/new/personnel",
               children: [
                 {
-                  text: "发电效率排行",
-                  icon: "svg-wind-site",
-                  path: "/powerRank",
-                },
-                {
-                  text: "总发电效率排行",
+                  text: "人员矩阵",
                   icon: "svg-wind-site",
-                  path: "/totalPowerRank",
+                  path: "/new/personnel",
                 },
                 {
-                  text: "报警排行",
+                  text: "全局监视",
                   icon: "svg-wind-site",
-                  path: "/warningRank",
-                },
-              ],
-            },
-            // 三率管理
-            {
-              text: "三率管理",
-              icon: "svg-matrix",
-              path: "/slgl",
-              children: [
-                {
-                  text: "复位及时率",
-                  icon: "svg-wind-site",
-                  path: "/fwjsl",
-                },
-                {
-                  text: "状态转换率",
-                  icon: "svg-wind-site",
-                  path: "/ztzhl",
-                },
-                {
-                  text: "消缺及时率",
-                  icon: "svg-wind-site",
-                  path: "/xqjsl",
+                  path: "/new/personnel",
                 },
+
               ],
             },
+           
           ],
         },
-        {
-          id: "knowledge",
-          text: "知识管理",
-          data: [
-            {
-              text: "故障知识列表",
-              icon: "svg-matrix",
-              path: "/knowledge",
-            },
-            {
-              text: "安全措施知识",
-              icon: "svg-matrix",
-              path: "/knowledge2",
-            },
-            {
-              text: "排查检修方案",
-              icon: "svg-matrix",
-              path: "/knowledge6",
-            },
-            {
-              text: "预警知识",
-              icon: "svg-matrix",
-              path: "/knowledge7",
-            },
-            {
-              text: "特征参数",
-              icon: "svg-matrix",
-              path: "/knowledge5",
-            },
-            {
-              text: "风险辨识知识",
-              icon: "svg-matrix",
-              path: "/knowledge3",
-            },
-            {
-              text: "作业指导知识",
-              icon: "svg-matrix",
-              path: "/knowledge4",
-            },
-          ],
-        },
+        // {
+        //   id: "knowledge",
+        //   text: "知识管理",
+        //   data: [
+        //     {
+        //       text: "故障知识列表",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge",
+        //     },
+        //     {
+        //       text: "安全措施知识",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge2",
+        //     },
+        //     {
+        //       text: "排查检修方案",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge6",
+        //     },
+        //     {
+        //       text: "预警知识",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge7",
+        //     },
+        //     {
+        //       text: "特征参数",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge5",
+        //     },
+        //     {
+        //       text: "风险辨识知识",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge3",
+        //     },
+        //     {
+        //       text: "作业指导知识",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge4",
+        //     },
+        //   ],
+        // },
         {
           id: "bdzcx",
           text: "智能报表",
@@ -592,7 +660,7 @@ export default {
             {
               text: "统计分析",
               icon: "svg-matrix",
-              path: "/bdzcx",
+              path: "/tjfx",
               children: [
                 {
                   text: "统计分析",