Merge branch 'master-v32-lushangqing' into 'master'

大屏及电子税务局页面样式修改，echart图形提示框数据增加单位



See merge request !55

@@ -68,7 +68,7 @@ export default {
                         that.allData= {
                             polyline: {
                                 title: "带宽占用监控",
-                                unit: "MB",
+                                unit: "bits/秒",
                                 data:dataArr
                                 /*data: [{
                                     name: "入带宽",
@@ -162,6 +162,13 @@ export default {
                     trigger: 'axis',
                     backgroundColor:'rgba(50,50,50,0.7)',
                     borderColor:"#333",
+                    formatter:function(params){
+                        let str='<div>'+params[0].name+'</div>';
+                        for(let i=0;i<params.length;i++){
+                            str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+params[i].data+" bits/秒</span></div>"
+                        }
+                        return str
+                    },
                     textStyle:{
                         color:"#fff",
                         align:'left'

@@ -171,18 +171,36 @@ export default {
                         borderRadius: 2,
                         borderWidth: 2
                     },
-                    // left:20,
+                    left:0,
+                    right:0,
                     label: {
                         // position: 'outer',
                         // alignTo: 'labelLine',
                         formatter: '{c}个',
-                        padding:[10,-20,5,10],
+                        // padding:[10,-20,5,10],
                         color:'#ffffff'
                     },
                     data: dataArr
                 }
             })
             const dataOption = {
+                tooltip: {
+                    trigger: 'item',
+                    backgroundColor:'rgba(50,50,50,0.7)',
+                    borderColor:"#333",
+                    formatter:function(params){
+                        let str="<div style='display:flex;justify-content: space-between'><span>"+params.marker+params.name+"</span><span style='margin-left:10px;'>"+params.value+"个</span></div>"
+
+                        for(let i=0;i<params.length;i++){
+                        }
+                        return str
+                    },
+                    textStyle:{
+                        color:"#fff",
+                        align:'left'
+                    }
+
+                },
 
                 series: seriesArr
             }

@@ -141,6 +141,13 @@ export default {
                     trigger: 'axis',
                     backgroundColor:'rgba(50,50,50,0.7)',
                     borderColor:"#333",
+                    formatter:function(params){
+                        let str='<div>'+params[0].name+'</div>';
+                        for(let i=0;i<params.length;i++){
+                            str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+params[i].data+"%</span></div>"
+                        }
+                        return str
+                    },
                     textStyle:{
                         color:"#fff",
                         align:'left'

@@ -67,7 +67,7 @@ export default {
                         align:'left'
                     },
                     formatter: function(params) {
-                        var res = '<div>'+params[0].data.date+'</div>'+params[0].data.value;
+                        var res = '<div>'+params[0].data.date+'</div>'+params[0].data.value+'个';
                         return res;
                     }
 

@@ -87,6 +87,13 @@ export default {
                      trigger: 'axis',
                      backgroundColor:'rgba(50,50,50,0.7)',
                      borderColor:"#333",
+                     formatter:function(params){
+                         let str='<div>'+params[0].name+'</div>';
+                         for(let i=0;i<params.length;i++){
+                             str+="<div style='display:flex;justify-content: space-between'><span>"+params[i].marker+params[i].seriesName+"</span><span style='margin-left:10px;'>"+params[i].data+"个</span></div>"
+                         }
+                         return str
+                     },
                      textStyle:{
                          color:"#fff",
                          align:'left'

@@ -7,7 +7,6 @@ export default {
     },
     data(){
         return {
-            domainName:'http://192.168.0.245:8180/api-web',
             myChart:'',
             titleFontSize:30,
             yAxisData:'',//y序列的数据

@@ -83,6 +83,7 @@ export default {
                                     map: 'echarts',
                                     roam: true,
                                     zoom: 1.25,
+                                    aspectScale:1,//地图的宽高比
                                     // 地图中心点的坐标, 可调节显示的偏移量
                                     center: [120.453576,29.197459],
                                     label: {

+"use strict";var _createClass=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||false;i.configurable=true;if("value"in i)i.writable=true;Object.defineProperty(e,i.key,i)}}return function(t,n,i){if(n)e(t.prototype,n);if(i)e(t,i);return t}}();function _classCallCheck(e,t){if(!(e instanceof t)){throw new TypeError("Cannot call a class as a function")}}var __instance=function(){var e=void 0;return function(t){if(t)e=t;return e}}();var AudioRenderer=function(){function e(){_classCallCheck(this,e);if(__instance())return __instance();if(e.unique!==undefined){return e.unique}e.unique=this;this.oAudioContext=null;this.currentVolume=.8;this.bSetVolume=false;this.gainNode=null;this.iWndNum=-1;this.mVolumes=new Map;var t=window.AudioContext||window.webkitAudioContext;this.oAudioContext=new t;this.writeString=function(e,t,n){for(var i=0;i<n.length;i++){e.setUint8(t+i,n.charCodeAt(i))}};this.setBufferToDataview=function(e,t,n){for(var i=0;i<n.length;i++,t++){e.setUint8(t,n[i])}};__instance(this)}_createClass(e,[{key:"Play",value:function e(t,n,i){var r=new ArrayBuffer(44+n);var u=new DataView(r);var o=i.samplesPerSec;var a=i.channels;var s=i.bitsPerSample;this.writeString(u,0,"RIFF");u.setUint32(4,32+n*2,true);this.writeString(u,8,"WAVE");this.writeString(u,12,"fmt ");u.setUint32(16,16,true);u.setUint16(20,1,true);u.setUint16(22,a,true);u.setUint32(24,o,true);u.setUint32(28,o*2,true);u.setUint16(32,a*s/8,true);u.setUint16(34,s,true);this.writeString(u,36,"data");u.setUint32(40,n,true);this.setBufferToDataview(u,44,t);var l=this;this.oAudioContext.decodeAudioData(u.buffer,function(e){var t=l.oAudioContext.createBufferSource();if(t==null){return-1}t.buffer=e;t.start(0);if(l.gainNode==null||l.bSetVolume){l.gainNode=l.oAudioContext.createGain();l.bSetVolume=false}l.gainNode.gain.value=l.currentVolume;l.gainNode.connect(l.oAudioContext.destination);t.connect(l.gainNode)},function(e){console.log("decode error");return-1});return 0}},{key:"Stop",value:function e(){if(this.gainNode!=null){this.gainNode.disconnect();this.gainNode=null}return true}},{key:"SetVolume",value:function e(t){this.bSetVolume=true;this.currentVolume=t;this.mVolumes.set(this.iWndNum,t);return true}},{key:"SetWndNum",value:function e(t){this.iWndNum=t;var n=this.mVolumes.get(t);if(n==undefined){n=.8}this.currentVolume=n;return true}},{key:"GetVolume",value:function e(){var t=this.mVolumes.get(this.iWndNum);if(t==undefined){t=.8}return t}}]);return e}();
\ No newline at end of file

+(function(e){var r=0;var a=1;var t=2;var o=100;var n=101;var u=1;var s=48;var f=31;var d=16;self.Module={memoryInitializerRequest:b()};importScripts("Decoder.js");Module.postRun.push(function(){postMessage({function:"loaded"})});var v=[];var i=[];var l=[];var M=[];var c=0;var p=true;var y=-1;var m=0;var A=0;onmessage=function(e){var r=e.data;switch(r.command){case"SetStreamOpenMode":c=r.data;var a=Module._SetStreamOpenMode(c);if(a!=u){postMessage({function:"SetStreamOpenMode",errorCode:a});return}break;case"OpenStream":var t=r.dataSize;var o=Module._malloc(t+4);var s=Module.HEAPU8.subarray(o,o+t);s.set(r.data);var a=Module._OpenStream(o,t,r.bufPoolSize);if(a!=u){postMessage({function:"OpenStream",errorCode:a});Module._free(o);return}var d=new Uint32Array([t]);var y=new Uint8Array(d.buffer);var m=new Uint8Array(t+4);m.set(y,0);m.set(r.data,4);s=Module.HEAPU8.subarray(o,o+t+4);s.set(m);var a=Module._InputData(o,t+4);if(a!=u){postMessage({function:"InputData",errorCode:a});Module._free(o);return}Module._free(o);if(c===0){Module._GetFrameData()}break;case"InputData":var A=r.dataSize;if(A>0){var _=Module._malloc(A);var b=Module.HEAPU8.subarray(_,_+A);b.set(new Uint8Array(r.data));var a=Module._InputData(_,A);if(a!=u){if(a===98){a=1}postMessage({function:"InputData",errorCode:a})}Module._free(_)}p=true;while(p){var g=S();if(n===g||f===g){p=false}}break;case"SetSecretKey":var h=r.nKeyLen;var _=Module._malloc(h);var D=U(r.data);var G=Module.HEAPU8.subarray(_,_+h);G.set(new Uint8Array(D));var a=Module._SetSecretKey(r.nKeyType,_,h);if(a!=u){postMessage({function:"SetSecretKey",errorCode:a});Module._free(_);return}Module._free(_);break;case"GetBMP":var P=r.width;var B=r.height;var _=r.data;var C=P*B*3/2;var E=Module._malloc(C);var b=Module.HEAPU8.subarray(E,E+C);b.set(new Uint8Array(_,0,C));var k=P*B*4+60;var I=Module._malloc(k);var F=Module._malloc(4);Module._memset(F,k,4);var a=Module._GetBMP(E,C,I,F);if(a!=u){postMessage({function:"GetBMP",errorCode:a});Module._free(_);return}var H=M.pop();if(!H){H=new ArrayBuffer(4)}var T=new Uint8Array(H);T.set(Module.HEAPU8.subarray(F,F+4));var k=w(T,0);var K=l.pop();if(!K){K=new ArrayBuffer(k)}else{if(K.byteLength<k){K=new ArrayBuffer(k)}}var L=new Uint8Array(K);L.set(Module.HEAPU8.subarray(I,I+k));postMessage({function:"GetBMP",data:L,errorCode:a});Module._free(E);Module._free(I);Module._free(F);M.push(H);break;case"GetJPEG":var P=r.width;var B=r.height;var _=r.data;var C=P*B*3/2;var E=Module._malloc(C);var b=Module.HEAPU8.subarray(E,E+C);b.set(new Uint8Array(_,0,C));var O=C;var R=Module._malloc(O);var z=Module._malloc(4);var a=Module._GetJPEG(E,C,R,z);if(a!=u){postMessage({function:"GetJPEG",errorCode:a});Module._free(_);return}var J=M.pop();if(!J){J=new ArrayBuffer(4)}var j=new Uint8Array(J);j.set(Module.HEAPU8.subarray(z,z+4));var O=w(j,0);var q=l.pop();if(!q){q=new ArrayBuffer(O)}else{if(q.byteLength<O){q=new ArrayBuffer(O)}}var N=new Uint8Array(q);N.set(Module.HEAPU8.subarray(R,R+O));postMessage({function:"GetJPEG",data:N,errorCode:a});Module._free(_);M.push(J);break;case"SetSecretKey":var W=r.nRegionNum;var X=r.srcRect;var x=r.hDestWnd;var Q=r.bEnable;var a=Module._SetDisplayRegion(W,X,x,Q);if(a!=u){postMessage({function:"SetSecretKey",errorCode:a});return}break;case"SetDecodeFrameType":var V=r.data;var a=Module._SetDecodeFrameType(V);if(a!=u){postMessage({function:"SetDecodeFrameType",errorCode:a});return}break;case"CloseStream":var a=Module._CloseStream();if(a!=u){postMessage({function:"CloseStream",errorCode:a});return}break;case"videoBuffer":v.push(r.data);break;case"audioBuffer":i.push(r.data);break;case"picBuffer":l.push(r.data);break;case"SetIFrameDecInterval":Module._SetIFrameDecInterval(r.data);break;default:break}};function _(e){var r=e.year;var a=e.month;var t=e.day;var o=e.hour;var n=e.minute;var u=e.second;if(a<10){a="0"+a}if(t<10){t="0"+t}if(o<10){o="0"+o}if(n<10){n="0"+n}if(u<10){u="0"+u}return r+"-"+a+"-"+t+" "+o+":"+n+":"+u}function b(){var e=new XMLHttpRequest;e.open("GET","Decoder.js.mem");e.responseType="arraybuffer";e.send();return e}function w(e,r){var a=e[r]&255|(e[r+1]&255)<<8|(e[r+2]&255)<<16|(e[r+3]&255)<<24;return a}function S(){var e=Module._GetFrameData();if(e==u){var s=Module._GetFrameInfo();switch(s.frameType){case r:var f=s.frameSize;if(0===f){return false}var l=Module._GetFrameBuffer();var M=i.pop();if(!M){M=new ArrayBuffer(f)}else{var c=new Uint8Array(M);if(c.length<f){M=new ArrayBuffer(f)}}var p=new Uint8Array(M);p.set(Module.HEAPU8.subarray(l,l+f));postMessage({function:"GetFrameData",type:"audioType",data:p.buffer,frameInfo:s,errorCode:e},[p.buffer]);return o;case a:var y=_(s);var m=s.width;var A=s.height;var b=m*A*3/2;if(0===m||0===A){return false}var w=Module._GetFrameBuffer();var M=v.pop();if(!M){M=new ArrayBuffer(b)}else{var S=new Uint8Array(M);if(S.length<b){M=new ArrayBuffer(b)}}S=new Uint8Array(M);S.set(Module.HEAPU8.subarray(w,w+b));postMessage({function:"GetFrameData",type:"videoType",data:S.buffer,dataLen:S.length,osd:y,frameInfo:s,errorCode:e},[S.buffer]);return n;case t:return d;default:return d}}else{postMessage({function:"GetFrameData",type:"",data:null,dataLen:-1,osd:0,frameInfo:null,errorCode:e});return e}}function g(){return(new Date).getTime()}function h(){return(new Date).getTime()}function U(e){var r,a,t=[];for(var o=0;o<e.length;o++){r=e.charCodeAt(o);a=[];do{a.push(r&255);r=r>>8}while(r);t=t.concat(a.reverse())}return t}})();
\ No newline at end of file

+"use strict";var vertexYUVShader=["attribute vec4 vertexPos;","attribute vec2 texturePos;","varying vec2 textureCoord;","void main()","{","gl_Position = vertexPos;","textureCoord = texturePos;","}"].join("\n");var fragmentYUVShader=["precision highp float;","varying highp vec2 textureCoord;","uniform sampler2D ySampler;","uniform sampler2D uSampler;","uniform sampler2D vSampler;","const mat4 YUV2RGB = mat4","(","1.1643828125, 0, 1.59602734375, -.87078515625,","1.1643828125, -.39176171875, -.81296875, .52959375,","1.1643828125, 2.017234375, 0, -1.081390625,","0, 0, 0, 1",");","void main(void) {","highp float y = texture2D(ySampler,  textureCoord).r;","highp float u = texture2D(uSampler,  textureCoord).r;","highp float v = texture2D(vSampler,  textureCoord).r;","gl_FragColor = vec4(y, u, v, 1) * YUV2RGB;","}"].join("\n");(function(e,t){e.SuperRender=t()})(this,function(){function e(e){this.canvasElement=document.getElementById(e);this.initContextGL();if(this.contextGL){this.YUVProgram=this.initProgram(vertexYUVShader,fragmentYUVShader);this.initBuffers();this.initTextures()}}e.prototype.initContextGL=function(){var e=this.canvasElement;var t=null;try{t=e.getContext("webgl")}catch(e){t=null}if(!t||typeof t.getParameter!=="function"){t=null}this.contextGL=t};e.prototype.initProgram=function(e,t){var r=this.contextGL;var a=r.createShader(r.VERTEX_SHADER);r.shaderSource(a,e);r.compileShader(a);if(!r.getShaderParameter(a,r.COMPILE_STATUS)){console.log("Vertex shader failed to compile: "+r.getShaderInfoLog(a))}var i=r.createShader(r.FRAGMENT_SHADER);r.shaderSource(i,t);r.compileShader(i);if(!r.getShaderParameter(i,r.COMPILE_STATUS)){console.log("Fragment shader failed to compile: "+r.getShaderInfoLog(i))}var o=r.createProgram();r.attachShader(o,a);r.attachShader(o,i);r.linkProgram(o);if(!r.getProgramParameter(o,r.LINK_STATUS)){console.log("Program failed to compile: "+r.getProgramInfoLog(o))}r.deleteShader(a);r.deleteShader(i);return o};e.prototype.initBuffers=function(){var e=this.contextGL;var t=e.createBuffer();e.bindBuffer(e.ARRAY_BUFFER,t);e.bufferData(e.ARRAY_BUFFER,new Float32Array([1,1,-1,1,1,-1,-1,-1]),e.STATIC_DRAW);e.bindBuffer(e.ARRAY_BUFFER,null);var r=e.createBuffer();e.bindBuffer(e.ARRAY_BUFFER,r);e.bufferData(e.ARRAY_BUFFER,new Float32Array([1,0,0,0,1,1,0,1]),e.DYNAMIC_DRAW);e.bindBuffer(e.ARRAY_BUFFER,null);this.vertexPosBuffer=t;this.texturePosBuffer=r};e.prototype.initTextures=function(){var e=this.contextGL;var t=this.YUVProgram;e.useProgram(t);var r=this.initTexture();var a=e.getUniformLocation(t,"ySampler");e.uniform1i(a,0);this.yTextureRef=r;var i=this.initTexture();var o=e.getUniformLocation(t,"uSampler");e.uniform1i(o,1);this.uTextureRef=i;var n=this.initTexture();var u=e.getUniformLocation(t,"vSampler");e.uniform1i(u,2);this.vTextureRef=n;e.useProgram(null)};e.prototype.initTexture=function(){var e=this.contextGL;var t=e.createTexture();e.bindTexture(e.TEXTURE_2D,t);e.texParameteri(e.TEXTURE_2D,e.TEXTURE_MAG_FILTER,e.LINEAR);e.texParameteri(e.TEXTURE_2D,e.TEXTURE_MIN_FILTER,e.LINEAR);e.texParameteri(e.TEXTURE_2D,e.TEXTURE_WRAP_S,e.CLAMP_TO_EDGE);e.texParameteri(e.TEXTURE_2D,e.TEXTURE_WRAP_T,e.CLAMP_TO_EDGE);e.bindTexture(e.TEXTURE_2D,null);return t};e.prototype.SR_DisplayFrameData=function(e,t,r){if(e<=0||t<=0){return}var a=this.contextGL;if(null==r){a.clearColor(0,0,0,0);a.clear(a.COLOR_BUFFER_BIT|a.DEPTH_BUFFER_BIT);return}var i=this.canvasElement;this.nWindowWidth=i.width;this.nWindowHeight=i.height;var o=this.nWindowWidth;var n=this.nWindowHeight;a.clearColor(.8,.8,1,1);a.clear(a.COLOR_BUFFER_BIT|a.DEPTH_BUFFER_BIT);a.viewport(0,0,o,n);this.updateFrameData(e,t,r);var u=this.YUVProgram;a.useProgram(u);var f=this.vertexPosBuffer;a.bindBuffer(a.ARRAY_BUFFER,f);var s=a.getAttribLocation(u,"vertexPos");a.enableVertexAttribArray(s);a.vertexAttribPointer(s,2,a.FLOAT,false,0,0);a.bindBuffer(a.ARRAY_BUFFER,null);var R=this.texturePosBuffer;a.bindBuffer(a.ARRAY_BUFFER,R);var T=a.getAttribLocation(u,"texturePos");a.enableVertexAttribArray(T);a.vertexAttribPointer(T,2,a.FLOAT,false,0,0);a.bindBuffer(a.ARRAY_BUFFER,null);a.drawArrays(a.TRIANGLE_STRIP,0,4);a.disableVertexAttribArray(s);a.disableVertexAttribArray(T);a.useProgram(null)};e.prototype.updateFrameData=function(e,t,r){var a=this.contextGL;var i=this.yTextureRef;var o=this.uTextureRef;var n=this.vTextureRef;var u=r;var f=e*t;var s=u.subarray(0,f);a.activeTexture(a.TEXTURE0);a.bindTexture(a.TEXTURE_2D,i);a.texImage2D(a.TEXTURE_2D,0,a.LUMINANCE,e,t,0,a.LUMINANCE,a.UNSIGNED_BYTE,s);var R=e/2*t/2;var T=u.subarray(f,f+R);a.activeTexture(a.TEXTURE1);a.bindTexture(a.TEXTURE_2D,o);a.texImage2D(a.TEXTURE_2D,0,a.LUMINANCE,e/2,t/2,0,a.LUMINANCE,a.UNSIGNED_BYTE,T);var l=R;var v=u.subarray(f+R,f+R+l);a.activeTexture(a.TEXTURE2);a.bindTexture(a.TEXTURE_2D,n);a.texImage2D(a.TEXTURE_2D,0,a.LUMINANCE,e/2,t/2,0,a.LUMINANCE,a.UNSIGNED_BYTE,v)};e.prototype.SR_SetDisplayRect=function(e){var t=this.contextGL;var r=this.nWindowWidth;var a=this.nWindowHeight;var i=null;if(e&&r>0&&a>0){var o=e.fLeft/r;var n=e.fTop/a;var u=e.fRight/r;var f=e.fBottom/a;i=new Float32Array([u,n,o,n,u,f,o,f])}else{i=new Float32Array([1,0,0,0,1,1,0,1])}var s=this.texturePosBuffer;t.bindBuffer(t.ARRAY_BUFFER,s);t.bufferSubData(t.ARRAY_BUFFER,0,i);t.bindBuffer(t.ARRAY_BUFFER,null)};e.prototype.SR_Destroy=function(){var e=this.contextGL;var t=this.YUVProgram;e.deleteProgram(t);var r=this.vertexPosBuffer;var a=this.texturePosBuffer;e.deleteBuffer(r);e.deleteBuffer(a);var i=this.yTextureRef;var o=this.uTextureRef;var n=this.vTextureRef;e.deleteTexture(i);e.deleteTexture(o);e.deleteTexture(n)};return e});
\ No newline at end of file

+!function(){function e(){var e=new XMLHttpRequest;return e.open("GET","SystemTransform.js.mem"),e.responseType="arraybuffer",e.send(),e}self.Module={memoryInitializerRequest:e()},importScripts("SystemTransform.js"),Module.postRun.push(function(){postMessage({type:"loaded"})}),onmessage=function(e){var a=e.data;if("create"===a.type){var t=a.len,r=Module._malloc(t),o=Module.HEAPU8.subarray(r,r+t);o.set(new Uint8Array(a.buf));var s=a.packType,l=Module._ST_Create(r,t,s);0!=l?console.log("_ST_Create failed!"):(Module._ST_Start(),postMessage({type:"created"}))}else if("inputData"===a.type){var u=a.len,n=Module._malloc(u),o=Module.HEAPU8.subarray(n,n+u);o.set(new Uint8Array(a.buf));var l=Module._ST_InputData(0,n,u);Module._free(n)}else"release"===a.type&&(Module._ST_Stop(),Module._ST_Release(),close())}}();
\ No newline at end of file

@@ -7,7 +7,8 @@
     <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
     <meta http-equiv="Expires" content="0" />
     <script>
-        document.write("<link type='text/css' href=" + new Date().getTime() + "'/static/vue3/public/css/demo.css?version=' rel='stylesheet' />");
+        document.write("<link type='text/css' href='css/demo.css?version=" + new Date().getTime() + "' rel='stylesheet' />");
+
     </script>
 </head>
 <body>