~fei.wang/hxzkMonitor-vue.git

fei.wang

2025-03-17 afedb522ac910d1e5265ad93b9bacb1da41cfefb

新增储罐管理，数据分析新增导出功能

已修改17个文件

已删除18个文件

	dist/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-071b4bc7.e40e77ad.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-169fa71c.13a7e89e.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-35ff68f4.52c9646e.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-3c4642d9.a526e487.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-42148c3c.952ec519.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-574580d2.343b1a0e.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-58ce47f7.2b75ca47.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-62727c27.2a0f6250.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-640c118b.e76dde9d.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-7486e616.ff39ea83.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-7e443fe8.36052b77.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-860da7b8.bc1380af.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-934b97e4.607dd7d1.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-96ec3514.d5d226f8.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-c18a8680.1f508e64.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/css/chunk-e3a9413c.2705fe0e.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/img/ceju.ca1da6bf.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	dist/static/img/lingjin.fea0249d.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	package.json	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/assets/images/ceju.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/assets/images/lingjin.png	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/alarm/log.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/alarm/sms.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/alarm/smslog.vue	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/alarm/threshold.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/analysis/components/LineChart.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/analysis/index.vue	349 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/dpdv/map.vue	86 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipment/difference.vue	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/equipment/monitoring.vue	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/login/login.vue	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/mapManage/index.vue	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/retransmission/index.vue	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/system/user.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 dist/index.html

@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>Vue Element Admin</title><link href=/static/css/app.75845777.css rel=preload as=style><link href=/static/css/chunk-libs.52acf3af.css rel=preload as=style><link href=/static/js/app.2388a574.js rel=preload as=script><link href=/static/js/chunk-elementUI.63f99718.js rel=preload as=script><link href=/static/js/chunk-libs.04923f2e.js rel=preload as=script><link href=/static/css/chunk-libs.52acf3af.css rel=stylesheet><link href=/static/css/app.75845777.css rel=stylesheet></head><body><div id=app></div><script>(function(e){function c(c){for(var t,u,f=c[0],h=c[1],d=c[2],o=0,k=[];o<f.length;o++)u=f[o],Object.prototype.hasOwnProperty.call(r,u)&&r[u]&&k.push(r[u][0]),r[u]=0;for(t in h)Object.prototype.hasOwnProperty.call(h,t)&&(e[t]=h[t]);i&&i(c);while(k.length)k.shift()();return a.push.apply(a,d||[]),n()}function n(){for(var e,c=0;c<a.length;c++){for(var n=a[c],t=!0,u=1;u<n.length;u++){var f=n[u];0!==r[f]&&(t=!1)}t&&(a.splice(c--,1),e=h(h.s=n[0]))}return e}var t={},u={runtime:0},r={runtime:0},a=[];function f(e){return h.p+"static/js/"+({}[e]||e)+"."+{"chunk-169fa71c":"c52107e0","chunk-1f62ac54":"8b264e8b","chunk-2d0a4d2d":"30a53ba0","chunk-2d0c22ac":"d7972e27","chunk-2d2105d3":"40f39be6","chunk-2d213765":"c81e502a","chunk-2d230fe7":"a331634e","chunk-2edc6a52":"697b1f90","chunk-35ff68f4":"fd3780a7","chunk-3bd257ec":"6dcff9e9","chunk-3c4642d9":"893a7639","chunk-071b4bc7":"01215085","chunk-40264523":"8b11903e","chunk-42148c3c":"e105058b","chunk-574580d2":"1e7ae298","chunk-58ce47f7":"27fdc895","chunk-d49b2eb2":"0c95a8ec","chunk-62727c27":"54181c21","chunk-636f154d":"13beb7b9","chunk-640c118b":"ba3dbfcc","chunk-7486e616":"a3559700","chunk-7c3380c9":"815f3f91","chunk-7e443fe8":"5c9391b4","chunk-7fc5f13f":"621b8439","chunk-934b97e4":"a1e710fc","chunk-96ec3514":"c2a3f4ca","chunk-c18a8680":"0974d317","chunk-860da7b8":"f938324e","chunk-e3a9413c":"464dba90"}[e]+".js"}function h(c){if(t[c])return t[c].exports;var n=t[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,h),n.l=!0,n.exports}h.e=function(e){var c=[],n={"chunk-169fa71c":1,"chunk-1f62ac54":1,"chunk-2edc6a52":1,"chunk-35ff68f4":1,"chunk-3bd257ec":1,"chunk-3c4642d9":1,"chunk-071b4bc7":1,"chunk-40264523":1,"chunk-42148c3c":1,"chunk-574580d2":1,"chunk-58ce47f7":1,"chunk-62727c27":1,"chunk-636f154d":1,"chunk-640c118b":1,"chunk-7486e616":1,"chunk-7c3380c9":1,"chunk-7e443fe8":1,"chunk-7fc5f13f":1,"chunk-934b97e4":1,"chunk-96ec3514":1,"chunk-c18a8680":1,"chunk-860da7b8":1,"chunk-e3a9413c":1};u[e]?c.push(u[e]):0!==u[e]&&n[e]&&c.push(u[e]=new Promise((function(c,n){for(var t="static/css/"+({}[e]||e)+"."+{"chunk-169fa71c":"13a7e89e","chunk-1f62ac54":"e78edaae","chunk-2d0a4d2d":"31d6cfe0","chunk-2d0c22ac":"31d6cfe0","chunk-2d2105d3":"31d6cfe0","chunk-2d213765":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-2edc6a52":"2c2f805b","chunk-35ff68f4":"52c9646e","chunk-3bd257ec":"c8dfc952","chunk-3c4642d9":"a526e487","chunk-071b4bc7":"e40e77ad","chunk-40264523":"9886cdea","chunk-42148c3c":"952ec519","chunk-574580d2":"343b1a0e","chunk-58ce47f7":"2b75ca47","chunk-d49b2eb2":"31d6cfe0","chunk-62727c27":"2a0f6250","chunk-636f154d":"bcad5d4c","chunk-640c118b":"e76dde9d","chunk-7486e616":"ff39ea83","chunk-7c3380c9":"ecc751e7","chunk-7e443fe8":"36052b77","chunk-7fc5f13f":"bf487b84","chunk-934b97e4":"607dd7d1","chunk-96ec3514":"d5d226f8","chunk-c18a8680":"1f508e64","chunk-860da7b8":"bc1380af","chunk-e3a9413c":"2705fe0e"}[e]+".css",r=h.p+t,a=document.getElementsByTagName("link"),f=0;f<a.length;f++){var d=a[f],o=d.getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(o===t||o===r))return c()}var k=document.getElementsByTagName("style");for(f=0;f<k.length;f++){d=k[f],o=d.getAttribute("data-href");if(o===t||o===r)return c()}var i=document.createElement("link");i.rel="stylesheet",i.type="text/css",i.onload=c,i.onerror=function(c){var t=c&&c.target&&c.target.src||r,a=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");a.code="CSS_CHUNK_LOAD_FAILED",a.request=t,delete u[e],i.parentNode.removeChild(i),n(a)},i.href=r;var l=document.getElementsByTagName("head")[0];l.appendChild(i)})).then((function(){u[e]=0})));var t=r[e];if(0!==t)if(t)c.push(t[2]);else{var a=new Promise((function(c,n){t=r[e]=[c,n]}));c.push(t[2]=a);var d,o=document.createElement("script");o.charset="utf-8",o.timeout=120,h.nc&&o.setAttribute("nonce",h.nc),o.src=f(e);var k=new Error;d=function(c){o.onerror=o.onload=null,clearTimeout(i);var n=r[e];if(0!==n){if(n){var t=c&&("load"===c.type?"missing":c.type),u=c&&c.target&&c.target.src;k.message="Loading chunk "+e+" failed.\n("+t+": "+u+")",k.name="ChunkLoadError",k.type=t,k.request=u,n[1](k)}r[e]=void 0}};var i=setTimeout((function(){d({type:"timeout",target:o})}),12e4);o.onerror=o.onload=d,document.head.appendChild(o)}return Promise.all(c)},h.m=e,h.c=t,h.d=function(e,c,n){h.o(e,c)||Object.defineProperty(e,c,{enumerable:!0,get:n})},h.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},h.t=function(e,c){if(1&c&&(e=h(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(h.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var t in e)h.d(n,t,function(c){return e[c]}.bind(null,t));return n},h.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return h.d(c,"a",c),c},h.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},h.p="/",h.oe=function(e){throw console.error(e),e};var d=window["webpackJsonp"]=window["webpackJsonp"]||[],o=d.push.bind(d);d.push=c,d=d.slice();for(var k=0;k<d.length;k++)c(d[k]);var i=o;n()})([]);</script><script src=/static/js/chunk-elementUI.63f99718.js></script><script src=/static/js/chunk-libs.04923f2e.js></script><script src=/static/js/app.2388a574.js></script></body><script src="https://api.map.baidu.com/api?v=2.0&&type=webgl&ak=zoVtgLNWuaZBjMAa32RZRFIagXxST0fm"></script></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>Vue Element Admin</title><link href=/static/css/app.75845777.css rel=preload as=style><link href=/static/css/chunk-libs.52acf3af.css rel=preload as=style><link href=/static/js/app.8eacaeaa.js rel=preload as=script><link href=/static/js/chunk-elementUI.63f99718.js rel=preload as=script><link href=/static/js/chunk-libs.04923f2e.js rel=preload as=script><link href=/static/css/chunk-libs.52acf3af.css rel=stylesheet><link href=/static/css/app.75845777.css rel=stylesheet></head><body><div id=app></div><script>(function(e){function c(c){for(var u,t,d=c[0],f=c[1],h=c[2],o=0,k=[];o<d.length;o++)t=d[o],Object.prototype.hasOwnProperty.call(a,t)&&a[t]&&k.push(a[t][0]),a[t]=0;for(u in f)Object.prototype.hasOwnProperty.call(f,u)&&(e[u]=f[u]);b&&b(c);while(k.length)k.shift()();return r.push.apply(r,h||[]),n()}function n(){for(var e,c=0;c<r.length;c++){for(var n=r[c],u=!0,t=1;t<n.length;t++){var d=n[t];0!==a[d]&&(u=!1)}u&&(r.splice(c--,1),e=f(f.s=n[0]))}return e}var u={},t={runtime:0},a={runtime:0},r=[];function d(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-1f62ac54":"433a1db9","chunk-2a3f9be0":"56724821","chunk-3f7d45c9":"e0311b56","chunk-ea3d2bb0":"5b8b91ec","chunk-d718eaf2":"7a940988","chunk-4314a1ce":"ed630bea","chunk-fe022a16":"cb12d1c1","chunk-2d0a4d2d":"30a53ba0","chunk-2d0c22ac":"d7972e27","chunk-2d2105d3":"40f39be6","chunk-2d213765":"c81e502a","chunk-2d230fe7":"a331634e","chunk-2edc6a52":"44a00356","chunk-359cb91f":"7e1f235b","chunk-3bd257ec":"0d1a4f7c","chunk-2d0dd4bc":"d5610926","chunk-40264523":"142ed10e","chunk-529cb226":"d247b386","chunk-602f3a03":"9564035f","chunk-62ae299f":"2f2be5ee","chunk-636f154d":"39e10a74","chunk-66879d32":"074d9c57","chunk-72cabb77":"9a5690ba","chunk-72eba88f":"a1cf7a26","chunk-7c3380c9":"174d8141","chunk-7fc5f13f":"1ec6748b","chunk-89e77f4e":"b1559e84","chunk-999939d4":"c724532e","chunk-c5d7f5f4":"46406197","chunk-52287ef4":"20e4f224","chunk-d49b2eb2":"0c95a8ec","chunk-ed6fbb84":"6b94bec6"}[e]+".js"}function f(c){if(u[c])return u[c].exports;var n=u[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,f),n.l=!0,n.exports}f.e=function(e){var c=[],n={"chunk-1f62ac54":1,"chunk-3f7d45c9":1,"chunk-ea3d2bb0":1,"chunk-d718eaf2":1,"chunk-4314a1ce":1,"chunk-fe022a16":1,"chunk-2edc6a52":1,"chunk-359cb91f":1,"chunk-3bd257ec":1,"chunk-40264523":1,"chunk-529cb226":1,"chunk-602f3a03":1,"chunk-62ae299f":1,"chunk-636f154d":1,"chunk-66879d32":1,"chunk-72cabb77":1,"chunk-72eba88f":1,"chunk-7c3380c9":1,"chunk-7fc5f13f":1,"chunk-89e77f4e":1,"chunk-999939d4":1,"chunk-c5d7f5f4":1,"chunk-52287ef4":1,"chunk-ed6fbb84":1};t[e]?c.push(t[e]):0!==t[e]&&n[e]&&c.push(t[e]=new Promise((function(c,n){for(var u="static/css/"+({}[e]||e)+"."+{"chunk-1f62ac54":"e78edaae","chunk-2a3f9be0":"31d6cfe0","chunk-3f7d45c9":"d368b631","chunk-ea3d2bb0":"134e6210","chunk-d718eaf2":"aaeeb42b","chunk-4314a1ce":"ef1db0d2","chunk-fe022a16":"0c649e77","chunk-2d0a4d2d":"31d6cfe0","chunk-2d0c22ac":"31d6cfe0","chunk-2d2105d3":"31d6cfe0","chunk-2d213765":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-2edc6a52":"2c2f805b","chunk-359cb91f":"05b73e41","chunk-3bd257ec":"c8dfc952","chunk-2d0dd4bc":"31d6cfe0","chunk-40264523":"9886cdea","chunk-529cb226":"de96f263","chunk-602f3a03":"b357e576","chunk-62ae299f":"952ec519","chunk-636f154d":"bcad5d4c","chunk-66879d32":"08b770a5","chunk-72cabb77":"a10aada7","chunk-72eba88f":"a4016c15","chunk-7c3380c9":"ecc751e7","chunk-7fc5f13f":"bf487b84","chunk-89e77f4e":"d39843de","chunk-999939d4":"27c38f45","chunk-c5d7f5f4":"13a7e89e","chunk-52287ef4":"e40e77ad","chunk-d49b2eb2":"31d6cfe0","chunk-ed6fbb84":"9d640774"}[e]+".css",a=f.p+u,r=document.getElementsByTagName("link"),d=0;d<r.length;d++){var h=r[d],o=h.getAttribute("data-href")||h.getAttribute("href");if("stylesheet"===h.rel&&(o===u||o===a))return c()}var k=document.getElementsByTagName("style");for(d=0;d<k.length;d++){h=k[d],o=h.getAttribute("data-href");if(o===u||o===a)return c()}var b=document.createElement("link");b.rel="stylesheet",b.type="text/css",b.onload=c,b.onerror=function(c){var u=c&&c.target&&c.target.src||a,r=new Error("Loading CSS chunk "+e+" failed.\n("+u+")");r.code="CSS_CHUNK_LOAD_FAILED",r.request=u,delete t[e],b.parentNode.removeChild(b),n(r)},b.href=a;var i=document.getElementsByTagName("head")[0];i.appendChild(b)})).then((function(){t[e]=0})));var u=a[e];if(0!==u)if(u)c.push(u[2]);else{var r=new Promise((function(c,n){u=a[e]=[c,n]}));c.push(u[2]=r);var h,o=document.createElement("script");o.charset="utf-8",o.timeout=120,f.nc&&o.setAttribute("nonce",f.nc),o.src=d(e);var k=new Error;h=function(c){o.onerror=o.onload=null,clearTimeout(b);var n=a[e];if(0!==n){if(n){var u=c&&("load"===c.type?"missing":c.type),t=c&&c.target&&c.target.src;k.message="Loading chunk "+e+" failed.\n("+u+": "+t+")",k.name="ChunkLoadError",k.type=u,k.request=t,n[1](k)}a[e]=void 0}};var b=setTimeout((function(){h({type:"timeout",target:o})}),12e4);o.onerror=o.onload=h,document.head.appendChild(o)}return Promise.all(c)},f.m=e,f.c=u,f.d=function(e,c,n){f.o(e,c)||Object.defineProperty(e,c,{enumerable:!0,get:n})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,c){if(1&c&&(e=f(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(f.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var u in e)f.d(n,u,function(c){return e[c]}.bind(null,u));return n},f.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="/",f.oe=function(e){throw console.error(e),e};var h=window["webpackJsonp"]=window["webpackJsonp"]||[],o=h.push.bind(h);h.push=c,h=h.slice();for(var k=0;k<h.length;k++)c(h[k]);var b=o;n()})([]);</script><script src=/static/js/chunk-elementUI.63f99718.js></script><script src=/static/js/chunk-libs.04923f2e.js></script><script src=/static/js/app.8eacaeaa.js></script></body><script src="https://api.map.baidu.com/api?v=2.0&&type=webgl&ak=zoVtgLNWuaZBjMAa32RZRFIagXxST0fm"></script></html>

 dist/static/css/chunk-071b4bc7.e40e77ad.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-169fa71c.13a7e89e.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-35ff68f4.52c9646e.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-3c4642d9.a526e487.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-42148c3c.952ec519.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-574580d2.343b1a0e.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-58ce47f7.2b75ca47.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-62727c27.2a0f6250.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-640c118b.e76dde9d.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-7486e616.ff39ea83.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-7e443fe8.36052b77.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-860da7b8.bc1380af.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-934b97e4.607dd7d1.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-96ec3514.d5d226f8.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-c18a8680.1f508e64.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/css/chunk-e3a9413c.2705fe0e.css

ÎÄ¼þÒÑÉ¾³ý

 dist/static/img/ceju.ca1da6bf.png

Binary files differ

 dist/static/img/lingjin.fea0249d.png

Binary files differ

 package.json

@@ -23,7 +23,7 @@
    "core-js": "3.6.5",
    "echarts": "^4.9.0",
    "element-ui": "^2.15.6",
    "file-saver": "2.0.1",
    "file-saver": "^2.0.1",
    "fuse.js": "3.4.4",
    "js-cookie": "2.2.0",
    "jsonlint": "1.6.3",
@@ -41,7 +41,7 @@
    "vue-router": "3.0.2",
    "vue-seamless-scroll": "^1.1.23",
    "vuex": "3.1.0",
    "xlsx": "0.14.1"
    "xlsx": "^0.14.1"
  },
  "devDependencies": {
    "@types/echarts": "^4.9.22",

 src/assets/images/ceju.png



 src/assets/images/lingjin.png



 src/views/alarm/log.vue

@@ -189,8 +189,16 @@
    search() {
      this.listLoading = true
      searchAlarmrecord(this.listQuery).then(response => {
        this.list = response.data.records
        this.total = response.data.total
        if (response.data!=null) {
          this.list = response.data.records
          this.total = response.data.total
        }else{
          this.$message({
            message: 'æªæç´¢å°æ°æ®',
            type: 'error'
          })
        }
      
        this.listLoading = false
      })
    },

 src/views/alarm/sms.vue

@@ -176,8 +176,16 @@
    search() {
      this.listLoading = true
      searchDuanxin(this.listQuery).then(response => {
        this.list = response.data.records
        this.total = response.data.total
        if (response.data!=null) {
          this.list = response.data.records
          this.total = response.data.total
        }else{
          this.$message({
            message: 'æªæç´¢å°æ°æ®',
            type: 'error'
          })
        }
      
        this.listLoading = false
      })
    },

 src/views/alarm/smslog.vue

@@ -90,11 +90,16 @@
    search() {
      this.listLoading = true
      searchDuanxinlog(this.listQuery).then(response => {
        console.log(response);
        
        
        this.list = response.data.records
        this.total = response.data.total
        if (response.data!=null) {
          this.list = response.data.records
          this.total = response.data.total
        }else{
          this.$message({
            message: 'æªæç´¢å°æ°æ®',
            type: 'error'
          })
        }
      
        this.listLoading = false
      })
    },

 src/views/alarm/threshold.vue

@@ -195,8 +195,16 @@
    search() {
      this.listLoading = true
      searchAlarmsystem(this.listQuery).then(response => {
        this.list = response.data.records
        this.total = response.data.total
        if (response.data!=null) {
          this.list = response.data.records
          this.total = response.data.total
        }else{
          this.$message({
            message: 'æªæç´¢å°æ°æ®',
            type: 'error'
          })
        }
      
        this.listLoading = false
      })
    },

 src/views/analysis/components/LineChart.vue

@@ -20,7 +20,7 @@
    },
    height: {
      type: String,
      default: '700px'
      default: '100%'
    },
    autoResize: {
      type: Boolean,

 src/views/analysis/index.vue

@@ -19,6 +19,16 @@
          æ°å¢
        </el-button> -->
      </el-button-group>

      <span style="margin-left: 100px;">
        <el-date-picker v-model="timeExport" type="daterange" unlink-panels :picker-options="pickerOptions"
          range-separator="è³" start-placeholder="å¼å§æ¶é´" end-placeholder="ç»ææ¶é´" value-format="yyyy-MM-dd" />

        <el-button style="margin-left: 10px;" type="primary" @click="exportExcel">å¯¼åºEXCEL</el-button>

      </span>


    </div>

    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit height="100%"
@@ -70,7 +80,7 @@


      </el-table-column>
      <el-table-column label="æ·»å æ¶é´" >
      <el-table-column label="æ·»å æ¶é´">
        <template slot-scope="scope">
          {{ scope.row.addtime }}
        </template>
@@ -84,8 +94,8 @@
  </div>
  <div v-else class="app-container">
    <div style="margin-bottom: 30px;">
      <el-date-picker v-model="queryForm.time" type="monthrange"  unlink-panels  :picker-options="pickerOptions" range-separator="è³" start-placeholder="å¼å§æ¶é´"
        end-placeholder="ç»ææ¶é´" value-format="yyyy-MM-dd" />
      <el-date-picker v-model="queryForm.time" type="daterange" unlink-panels :picker-options="pickerOptions"
        range-separator="è³" start-placeholder="å¼å§æ¶é´" end-placeholder="ç»ææ¶é´" value-format="yyyy-MM-dd" />
      <el-button style="margin-left: 10px;" type="primary" @click="handlechart">æç´¢</el-button>
      <el-button style="position: absolute; right: 50px;" type="primary" @click="fanhui">è¿å</el-button>

@@ -100,7 +110,8 @@
      <el-button v-if="last" style="margin-left: 10px;" :type="lastyearprimary" @click="lastyear">ä¸ä¸å¹´</el-button>
      <el-button v-if="next" style="margin-left: 10px;" :type="nextyearprimary" @click="nextyear">ä¸ä¸å¹´</el-button>
    </div>
    <span style=" display: flex;justify-content: center;align-items: center;font-size: 25px;"> {{ this.anchorname+"-" +this.tagid+"ååè¶å¿å¾"}}</span>
    <span style=" display: flex;justify-content: center;align-items: center;font-size: 25px;"> {{ this.anchorname + "-"
      + this.tagid +"ååè¶å¿å¾"}}</span>
    <line-chart :chart-data="lineChartData" />


@@ -108,10 +119,12 @@
</template>

<script>
import * as XLSX from 'xlsx';
import { saveAs } from 'file-saver';
import { formatTime1 } from "@/utils/index.js"; //æ¥ææ ¼å¼è½¬æ¢
import LineChart from "./components/LineChart";
import Pagination from '@/components/Pagination'
import { getList, searcheveryday, handlechart2, handlechartupdate3 } from '@/api/analysis'
import { getList, searcheveryday, handlechart2, handlechartupdate3,handlechartupdate2 } from '@/api/analysis'
import { deepClone } from '@/utils'

const lineChartData = {
@@ -120,7 +133,7 @@
    nd: [],
    hd: [],
    x: [],
   

  },

};
@@ -132,43 +145,44 @@
  data() {
    return {
      pickerOptions: {
          shortcuts: [{
            text: 'æ¬æ',
            onClick(picker) {
              picker.$emit('pick', [new Date(), new Date()]);
            }
          }, {
            text: 'ä»å¹´è³ä»',
            onClick(picker) {
              const end = new Date();
              const start = new Date(new Date().getFullYear(), 0);
              picker.$emit('pick', [start, end]);
            }
          }, {
            text: 'æè¿åä¸ªæ',
            onClick(picker) {
              const end = new Date();
              const start = new Date();
              start.setMonth(start.getMonth() - 6);
              picker.$emit('pick', [start, end]);
            }
          }]
        },
        yearprimary:'success',
        oneprimary:'primary',
        twoprimary:'primary',
        threeprimary:'primary',
        lastyearprimary:'primary',
        nextyearprimary:'primary',
      last:true,
      next:false,
      yeardata:0,
      anchorname:'',
      tagid:'',
        shortcuts: [{
          text: 'æ¬æ',
          onClick(picker) {
            picker.$emit('pick', [new Date(), new Date()]);
          }
        }, {
          text: 'ä»å¹´è³ä»',
          onClick(picker) {
            const end = new Date();
            const start = new Date(new Date().getFullYear(), 0);
            picker.$emit('pick', [start, end]);
          }
        }, {
          text: 'æè¿åä¸ªæ',
          onClick(picker) {
            const end = new Date();
            const start = new Date();
            start.setMonth(start.getMonth() - 6);
            picker.$emit('pick', [start, end]);
          }
        }]
      },
      yearprimary: 'success',
      oneprimary: 'primary',
      twoprimary: 'primary',
      threeprimary: 'primary',
      lastyearprimary: 'primary',
      nextyearprimary: 'primary',
      last: true,
      next: false,
      yeardata: 0,
      anchorname: '',
      tagid: '',
      queryForm: {
        time: '',
        tagid: ''
      },
      timeExport: '',
      lineChartData: lineChartData.newVisitis,
      analy: true,
      total: 0,
@@ -193,25 +207,64 @@
    this.fetchData()
  },
  methods: {
    exportExcel() {
      console.log(this.timeExport);
      // const data = []
const params = { date1: this.timeExport[1], date2: this.timeExport[0], username: localStorage.getItem('username') || '' };
handlechartupdate2(params).then(response => {
  console.log(response);
  const data = response.data
  // è·åè¦å¯¼åºçæ°æ®
  // const data = this.list; // åè®¾listæ¯è¡¨æ ¼çæ°æ®
  // åå»ºä¸ä¸ªç©ºçå·¥ä½ç°¿
  const workbook = XLSX.utils.book_new();
  // åå»ºä¸ä¸ªå·¥ä½è¡¨
  const worksheet = XLSX.utils.json_to_sheet(data);
  // å°å·¥ä½è¡¨æ·»å å°å·¥ä½ç°¿ä¸
  XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
  // å°å·¥ä½ç°¿è½¬æ¢ä¸ºäºè¿å¶åç¬¦ä¸²
  const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
  // å°äºè¿å¶åç¬¦ä¸²è½¬æ¢ä¸ºBlobå¯¹è±¡
  const blob = new Blob([excelBuffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8' });
  // åå»ºä¸ä¸ªä¸è½½é¾æ¥
  const url = URL.createObjectURL(blob);
  // åå»ºä¸ä¸ªéèçé¾æ¥åç´ 
  const link = document.createElement('a');
  link.href = url;
  link.download = 'export.xlsx'; // è®¾ç½®ä¸è½½çæä»¶å
  // æ¨¡æç¹å»ä¸è½½é¾æ¥
  link.click();
  // éæ¾URLå¯¹è±¡
  URL.revokeObjectURL(url);
})
// console.log(data);

  
},
    Export() {

    },
    fanhui() {
      this.analy = true
    },
    analyze(scope) {
      this.anchorname=scope.row.anchorname
      this.tagid=scope.row.tagid
      const params = { date1: this.queryForm.time[1], date2: this.queryForm.time[0], username: localStorage.getItem('username') || '' ,tagid:scope.row.tagid};
      this.anchorname = scope.row.anchorname
      this.tagid = scope.row.tagid
      const params = { date1: this.queryForm.time[1], date2: this.queryForm.time[0], username: localStorage.getItem('username') || '', tagid: scope.row.tagid };
      handlechart2(params).then(response => {
        console.log(response);
        
        this.lineChartData = response.data
        this.analy = false
      })
    },
    one() {
      this.oneprimary='success'
      this.twoprimary='primary'
      this.threeprimary='primary'
      this.yearprimary='primary'
      this.lastyearprimary='primary'
      this.nextyearprimary='primary'
      this.oneprimary = 'success'
      this.twoprimary = 'primary'
      this.threeprimary = 'primary'
      this.yearprimary = 'primary'
      this.lastyearprimary = 'primary'
      this.nextyearprimary = 'primary'
      // è·åå½åæ¥æ
      const currentDate = new Date();
      // è·åå½åæä»½
@@ -224,22 +277,22 @@
      var time = []
      time.push(newDate)
      time.push(dateYear)
      this.queryForm.time=time
      const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '' ,tagid:this.tagid};
      this.queryForm.time = time
      const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '', tagid: this.tagid };
      handlechartupdate3(params).then(response => {
        this.lineChartData = response.data
      })

    },
    two() {
      this.oneprimary='primary'
      this.twoprimary='success'
      this.threeprimary='primary'
      this.yearprimary='primary'
      this.lastyearprimary='primary'
      this.nextyearprimary='primary'
        // è·åå½åæ¥æ
        const currentDate = new Date();
      this.oneprimary = 'primary'
      this.twoprimary = 'success'
      this.threeprimary = 'primary'
      this.yearprimary = 'primary'
      this.lastyearprimary = 'primary'
      this.nextyearprimary = 'primary'
      // è·åå½åæ¥æ
      const currentDate = new Date();
      // è·åå½åæä»½
      const currentMonth = currentDate.getMonth();
      // è®¾ç½®æ¥æçæä»½ä¸ºå½åæä»½åä¸
@@ -250,20 +303,20 @@
      var time = []
      time.push(newDate)
      time.push(dateYear)
      this.queryForm.time=time
      const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '' ,tagid:this.tagid};
      this.queryForm.time = time
      const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '', tagid: this.tagid };
      handlechartupdate3(params).then(response => {
        this.lineChartData = response.data
      })

    },
    three() {
      this.oneprimary='primary'
      this.twoprimary='primary'
      this.threeprimary='success'
      this.yearprimary='primary'
      this.lastyearprimary='primary'
      this.nextyearprimary='primary'
      this.oneprimary = 'primary'
      this.twoprimary = 'primary'
      this.threeprimary = 'success'
      this.yearprimary = 'primary'
      this.lastyearprimary = 'primary'
      this.nextyearprimary = 'primary'
      // è·åå½åæ¥æ
      const currentDate = new Date();
      // è·åå½åæä»½
@@ -277,23 +330,23 @@
      var time = []
      time.push(newDate)
      time.push(dateYear)
      this.queryForm.time=time
      const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '',tagid:this.tagid };
      this.queryForm.time = time
      const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '', tagid: this.tagid };
      handlechartupdate3(params).then(response => {
        

        this.lineChartData = response.data
      })
    },

    year() {
      this.oneprimary='primary'
      this.twoprimary='primary'
      this.threeprimary='primary'
      this.yearprimary='success'
      this.lastyearprimary='primary'
      this.nextyearprimary='primary'
      this.next=false
      this.last=true
      this.oneprimary = 'primary'
      this.twoprimary = 'primary'
      this.threeprimary = 'primary'
      this.yearprimary = 'success'
      this.lastyearprimary = 'primary'
      this.nextyearprimary = 'primary'
      this.next = false
      this.last = true
      // è·åå½åæ¥æ
      // const currentDate = new Date();
      // è·åå½åæä»½
@@ -303,119 +356,119 @@
      const newDate = formatTime1(new Date(), "yyyy-MM-dd");
      //è·åå½åå¹´ææ¥
      const dateYear = formatTime1(new Date(), "yyyy");
      console.log(dateYear+'-01-01');
      console.log(dateYear + '-01-01');
      this.yeardata = dateYear
      var time = []
      time.push(newDate+'-01-01')
      time.push(newDate + '-01-01')
      time.push(newDate)
      this.queryForm.time=time
      const params = { date1: newDate, date2: dateYear+'-01-01', username: localStorage.getItem('username') || '',tagid:this.tagid };
      this.queryForm.time = time
      const params = { date1: newDate, date2: dateYear + '-01-01', username: localStorage.getItem('username') || '', tagid: this.tagid };
      handlechartupdate3(params).then(response => {
        console.log(response);
        

        this.lineChartData = response.data
      })
    },

    lastornext(){
    lastornext() {
      const currentDate = new Date();
      const currentMonth = currentDate.getFullYear();
      console.log(currentMonth);
      console.log(this.yeardata);
      
      
      if (this.yeardata<currentMonth) {
        this.next=true
        if (this.yeardata<=2022) {
        this.last=false
      }else{
        this.last=true


      if (this.yeardata < currentMonth) {
        this.next = true
        if (this.yeardata <= 2022) {
          this.last = false
        } else {
          this.last = true
        }
      } else {
        this.next = false
      }
      }else {
        this.next=false
      }
      

    },

    lastyear() {
      this.oneprimary='primary'
      this.twoprimary='primary'
      this.threeprimary='primary'
      this.yearprimary='primary'
      this.lastyearprimary='success'
      this.nextyearprimary='primary'
      this.oneprimary = 'primary'
      this.twoprimary = 'primary'
      this.threeprimary = 'primary'
      this.yearprimary = 'primary'
      this.lastyearprimary = 'success'
      this.nextyearprimary = 'primary'
      // è·åå½åæ¥æ
      const currentDate = new Date();
      // è·åå½åæä»½
      const currentMonth = currentDate.getFullYear();

      // è®¾ç½®æ¥æçæä»½ä¸ºå½åæä»½åä¸
      
      if (this.yeardata=="") {

      if (this.yeardata == "") {
        currentDate.setFullYear(currentMonth - 1);
        // this.yeardata=currentMonth - 1;

      }else{
      } else {
        currentDate.setFullYear(this.yeardata - 1);
        // this.yeardata = this.yeardata - 1

      }
      const newDate = formatTime1(currentDate, "yyyy");
      

      this.yeardata = parseInt(newDate)
this.lastornext()
      this.lastornext()
      //è·åå½åå¹´ææ¥
      const dateYear = formatTime1(new Date(), "yyyy-MM-dd");
      // this.queryForm.time.push(newDate+'-01-01')
      // this.queryForm.time.push(newDate+'-12-31')
      var time = []
      time.push(newDate+'-01-01')
      time.push(newDate+'-12-31')
      this.queryForm.time=time
      const params = { date1: newDate+'-12-31', date2: newDate+'-01-01', username: localStorage.getItem('username') || '',tagid:this.tagid };
      time.push(newDate + '-01-01')
      time.push(newDate + '-12-31')
      this.queryForm.time = time
      const params = { date1: newDate + '-12-31', date2: newDate + '-01-01', username: localStorage.getItem('username') || '', tagid: this.tagid };
      handlechartupdate3(params).then(response => {
        

        this.lineChartData = response.data
      })
    },

    nextyear() {
      this.oneprimary='primary'
      this.twoprimary='primary'
      this.threeprimary='primary'
      this.yearprimary='primary'
      this.lastyearprimary='primary'
      this.nextyearprimary='success'
      this.oneprimary = 'primary'
      this.twoprimary = 'primary'
      this.threeprimary = 'primary'
      this.yearprimary = 'primary'
      this.lastyearprimary = 'primary'
      this.nextyearprimary = 'success'
      // è·åå½åæ¥æ
      const currentDate = new Date();
      // è·åå½åæä»½
      // const currentMonth = currentDate.getFullYear();
      // è®¾ç½®æ¥æçæä»½ä¸ºå½åæä»½åä¸
      console.log(this.yeardata);
      
      currentDate.setFullYear( this.yeardata + 1);

      currentDate.setFullYear(this.yeardata + 1);
      const newDate = formatTime1(currentDate, "yyyy");
      console.log(newDate);
      

      this.yeardata = parseInt(newDate)
      //è·åå½åå¹´ææ¥
      this.lastornext()
      const dateYear = formatTime1(new Date(), "yyyy-MM-dd");
      var time = []
      time.push(newDate+'-01-01')
      time.push(newDate+'-12-31')
      this.queryForm.time=time
      const params = { date1: newDate+'-12-31', date2: newDate+'-01-01', username: localStorage.getItem('username') || '',tagid:this.tagid };
      time.push(newDate + '-01-01')
      time.push(newDate + '-12-31')
      this.queryForm.time = time
      const params = { date1: newDate + '-12-31', date2: newDate + '-01-01', username: localStorage.getItem('username') || '', tagid: this.tagid };
      handlechartupdate3(params).then(response => {
        

        this.lineChartData = response.data
      })
    },
    

    handlechart() {
      console.log(this.queryForm.time);
      
      const params = { date1: this.queryForm.time[1], date2: this.queryForm.time[0], username: localStorage.getItem('username') || '',tagid:this.tagid };

      const params = { date1: this.queryForm.time[1], date2: this.queryForm.time[0], username: localStorage.getItem('username') || '', tagid: this.tagid };
      handlechartupdate3(params).then(response => {
        this.lineChartData = response.data
      })
@@ -425,8 +478,16 @@
    search() {
      this.listLoading = true
      searcheveryday(this.listQuery).then(response => {
        this.list = response.data.records
        this.total = response.data.total
        if (response.data!=null) {
          this.list = response.data.records
          this.total = response.data.total
        }else{
          this.$message({
            message: 'æªæç´¢å°æ°æ®',
            type: 'error'
          })
        }
      
        this.listLoading = false
      })
    },
@@ -445,7 +506,7 @@
      this.listLoading = true
      getList(this.listQuery).then(response => {
        console.log(response);
        

        this.list = response.data.records
        this.total = response.data.total
        this.listLoading = false
@@ -455,21 +516,21 @@


    searchorfetchData() {
console.log(this.listQuery.keyword);
      console.log(this.listQuery.keyword);

      if (this.listQuery.keyword!=undefined) {
      if (this.listQuery.keyword != undefined) {
        console.log(111111);
        

        this.search()
      }else{
      } else {
        console.log(2222);
        

        this.fetchData()
      }
      // this.listLoading = true
      // getList(this.listQuery).then(response => {
      //   console.log(response);
        

      //   this.list = response.data.records
      //   this.total = response.data.total
      //   this.listLoading = false
@@ -499,14 +560,18 @@
    text-align: center;
  }
}

.el-table .el-table__body tr:hover {
  background-color: transparent!important; /* ä½ æ³è¦çèæ¯è² */
  color: #000!important;
  background-color: transparent !important;
  /* ä½ æ³è¦çèæ¯è² */
  color: #000 !important;
}

.el-table__body {
  tr:hover > td {
    background-color: transparent!important; /* ä½ æ³è¦çèæ¯è² */
    color: #000!important;
  tr:hover>td {
    background-color: transparent !important;
    /* ä½ æ³è¦çèæ¯è² */
    color: #000 !important;
  }
}


 src/views/dpdv/map.vue

@@ -195,6 +195,8 @@
}
import jizhun from "@/assets/images/ceju.png"
import jiance from "@/assets/images/lingjin.png"
import onlie from "@/assets/images/onile.png"

import processBar from "@/components/processPar";
import Pagination from '@/components/Pagination'
import drawMixin from "@/utils/drawMixin"; //èªéåºç¼©æ¾
@@ -269,7 +271,11 @@
    mounted() {
        const params = { username: localStorage.getItem('username'), phone: localStorage.getItem('phone') };
        alldevice(params).then(response => {
            this.initMap(response.data.dataList, response.data.view)
            console.log(111111111);
            
            console.log(response);
            
            this.initMap(response.data.dataList, response.data.view,response.data.shijiao)
        })


@@ -283,7 +289,7 @@
            this.gpsnum = ''
            this.gpsstate = ''
        },
        initMap(tags, view) {
        initMap(tags, view,shijiao) {

            // $(window).scrollTop(0);
            // window.scroll(0, 0);
@@ -292,8 +298,30 @@
            // var point = new BMapGL.Point(116.404, 39.915); // å°å¾ä¸å¿ç¹åæ   
            // map.centerAndZoom(point, 15);
            const views = view.split(";");
            map.centerAndZoom(new BMapGL.Point(views[0], views[1]), 12);
            map.centerAndZoom(new BMapGL.Point(views[0], views[1]), 19);
            map.enableScrollWheelZoom(true);
            map.setHeading(shijiao); // è®¾ç½®å°å¾æè½¬è§åº¦
            map.setTilt(shijiao); // è®¾ç½®å°å¾å¾æè§åº¦

            map.addEventListener("rightclick", function(e) {
                console.log(e);
                
        // e.point æ¯ç¹å»ä½ç½®çåç´ åæ 
        // e.pixel æ¯ç¹å»ä½ç½®çå°çåæ ï¼ç»çº¬åº¦ï¼
        console.log(e.point);
        console.log(e.pixel);
        
        
        var lat = e.latlng.lat; // çº¬åº¦
        var lng = e.latlng.lng; // ç»åº¦
        

        // å¨æ§å¶å°æå°ç»çº¬åº¦
        console.log("å³é®ç¹å»çç»çº¬åº¦ï¼", `çº¬åº¦: ${lat}, ç»åº¦: ${lng}`);

        // ä½ ä¹å¯ä»¥å°ç»çº¬åº¦æ¾ç¤ºå¨é¡µé¢ä¸
        alert(`å³é®ç¹å»çç»çº¬åº¦ï¼ ${lng}; ${lat}`);
    });
            var scaleCtrl = new BMapGL.ScaleControl();  // æ·»å æ¯ä¾å°ºæ§ä»¶
            map.addControl(scaleCtrl);
            var zoomCtrl = new BMapGL.ZoomControl();  // æ·»å ç¼©æ¾æ§ä»¶
@@ -301,13 +329,18 @@
            //ç»¿è²çæµï¼æ©è²åºå
            let jizhunzhan = new BMapGL.Icon(jizhun, new BMapGL.Size(30, 30))
            let jiancezhan = new BMapGL.Icon(jiance, new BMapGL.Size(30, 30))
            let onliezhan = new BMapGL.Icon(onlie, new BMapGL.Size(30, 30))
            for (let i = 0; i < tags.length; i++) {
                if (tags[i].lon != null && tags[i].lon != "" && tags[i].lat != null && tags[i].lat != "") {
                    if (tags[i].lon.toString().length > 5 && tags[i].lat.toString().length > 4) {
                        var marker;
                        var label = new BMapGL.Label(tags[i].anchorname + "  " + tags[i].tagid, { offset: new BMapGL.Size(0, -40) });
                        console.log(tags[i]);
                        
                        if (tags[i].type == 0) {
                            var rr = c.WGS2BD09({

                            if(tags[i].onlie==1){
                                var rr = c.WGS2BD09({
                                lng: new Number(ToDigital(tags[i].lon.substring(0, 3), tags[i].lon.substring(3, 5), tags[i].lon.substring(5))),
                                lat: new Number(ToDigital(tags[i].lat.substring(0, 2), tags[i].lat.substring(2, 4), tags[i].lat.substring(4)))
                            });
@@ -324,8 +357,31 @@
                                backgroundColor: "#fa770b",
                                transform: 'translateX(-50%)',
                            })
                            }else{
                                var rr = c.WGS2BD09({
                                lng: new Number(ToDigital(tags[i].lon.substring(0, 3), tags[i].lon.substring(3, 5), tags[i].lon.substring(5))),
                                lat: new Number(ToDigital(tags[i].lat.substring(0, 2), tags[i].lat.substring(2, 4), tags[i].lat.substring(4)))
                            });
                            var pt = new BMapGL.Point(rr.lng, rr.lat)
                            marker = new BMapGL.Marker(pt, {
                                icon: onliezhan
                            });
                            label.setStyle({
                                color: "#fff",
                                fontSize: "14px",
                                borderRadius: "5px",
                                padding: "5px 5px",
                                border: "0",
                                backgroundColor: "#474747",
                                transform: 'translateX(-50%)',
                            })
                            }
                          

                        } else {
                            var rr = c.WGS2BD09({

                            if(tags[i].onlie==1){
                                var rr = c.WGS2BD09({
                                lng: new Number(ToDigital(tags[i].lon.substring(0, 3), tags[i].lon.substring(3, 5), tags[i].lon.substring(5))),
                                lat: new Number(ToDigital(tags[i].lat.substring(0, 2), tags[i].lat.substring(2, 4), tags[i].lat.substring(4)))
                            });
@@ -342,6 +398,26 @@
                                backgroundColor: "#32CD32",
                                transform: 'translateX(-50%)',
                            })
                            }else{
                                var rr = c.WGS2BD09({
                                lng: new Number(ToDigital(tags[i].lon.substring(0, 3), tags[i].lon.substring(3, 5), tags[i].lon.substring(5))),
                                lat: new Number(ToDigital(tags[i].lat.substring(0, 2), tags[i].lat.substring(2, 4), tags[i].lat.substring(4)))
                            });
                            var pt = new BMapGL.Point(rr.lng, rr.lat)
                            marker = new BMapGL.Marker(pt, {
                                icon: onliezhan
                            });
                            label.setStyle({
                                color: "#fff",
                                fontSize: "14px",
                                borderRadius: "5px",
                                padding: "5px 5px",
                                border: "0",
                                backgroundColor: "#474747",
                                transform: 'translateX(-50%)',
                            })
                            }
                           
                        }
                        marker.addEventListener("click", () => {
                            this.tagid = tags[i].tagid

 src/views/equipment/difference.vue

@@ -220,8 +220,16 @@
    search() {
      this.listLoading = true
      searchEquipment(this.listQuery).then(response => {
        this.list = response.data.records
        this.total = response.data.total
        if (response.data!=null) {
          this.list = response.data.records
          this.total = response.data.total
        }else{
          this.$message({
            message: 'æªæç´¢å°æ°æ®',
            type: 'error'
          })
        }
      
        this.listLoading = false
      })
    },
@@ -262,6 +270,12 @@
      this.resetTemp()
      this.dialogVisible = true
      this.dialogType = 'modify'
      // this.temp.anchorname = scope.row.anchorname
      // this.temp.companyid = scope.row.companyid
      // this.temp.id = scope.row.id
      // this.temp.needbaseid = scope.row.needbaseid
      // this.temp.tagid = scope.row.tagid
      // this.temp.type = scope.row.type
      this.temp = deepClone(scope.row)
      // this.$nextTick(() => {
      //   this.$refs['dataForm'].clearValidate()
@@ -307,7 +321,7 @@
      if (this.loading) {
        return
      }
      this.temp.companyid=this.temp.company
      this.temp.companyid=this.temp.companyid
      this.loading = true
      this.$refs[this.temp].validate((valid) => {
        if (valid) {

 src/views/equipment/monitoring.vue

@@ -243,8 +243,16 @@
    search() {
      this.listLoading = true
      searchEquipment(this.listQuery).then(response => {
        this.list = response.data.records
        this.total = response.data.total
        if (response.data!=null) {
          this.list = response.data.records
          this.total = response.data.total
        }else{
          this.$message({
            message: 'æªæç´¢å°æ°æ®',
            type: 'error'
          })
        }
      
        this.listLoading = false
      })
    },
@@ -286,7 +294,18 @@
      this.resetTemp()
      this.dialogVisible = true
      this.dialogType = 'modify'
      console.log(scope.row);
      // this.temp = Object.assign({}, _temp)
      console.log(this.temp);
      console.log(deepClone(scope.row));
      // this.temp.anchorname = scope.row.anchorname
      
      // this.temp.id = scope.row.id
      // this.temp.needbaseid = scope.row.needbaseid
      // this.temp.tagid = scope.row.tagid
      // this.temp.type = scope.row.type
      this.temp = deepClone(scope.row)
      // this.temp.companyid = scope.row.companyid
      this.disabled=true
      // this.$nextTick(() => {
      //   this.$refs['dataForm'].clearValidate()
@@ -313,7 +332,7 @@
          this.list.splice(scope.$index, 1)
          delEquipment(params).then(response => {
            this.temp.adminname = localStorage.getItem('username') || '';
            const params = { name:  this.temp.adminname, content: 'å é¤äºä¸ä¸ªåºåç«ï¼è¯¥ç¼å·ä¸ºï¼'+scope.row.tagid };
            const params = { name:  this.temp.adminname, content: 'å é¤äºä¸ä¸ªçæµç«ï¼è¯¥ç¼å·ä¸ºï¼'+scope.row.tagid };
            addSystemOperationLog(params).then(response => {

                        })
@@ -330,20 +349,22 @@
      if (this.loading) {
        return
      }
      this.temp.companyid=this.temp.company
      this.temp.companyid=this.temp.companyid
      this.$refs[this.temp].validate((valid) => {
          if (valid) {
            this.loading = true
            console.log(this.temp);
            
      addorupEquipment(this.temp).then(() => {
        if (this.temp.id=="") {
          this.temp.adminname = localStorage.getItem('username') || '';
            const params = { name:  this.temp.adminname, content: 'æ°å¢äºä¸ä¸ªåºåç«ï¼è¯¥ç¼å·ä¸ºï¼'+this.temp.tagid };
            const params = { name:  this.temp.adminname, content: 'æ°å¢äºä¸ä¸ªçæµç«ï¼è¯¥ç¼å·ä¸ºï¼'+this.temp.tagid };
            addSystemOperationLog(params).then(response => {

                        })
        } else {
          this.temp.adminname = localStorage.getItem('username') || '';
            const params = { name:  this.temp.adminname, content: 'ä¿®æ¹äºä¸ä¸ªåºåç«ï¼è¯¥ç¼å·ä¸ºï¼'+this.temp.tagid };
            const params = { name:  this.temp.adminname, content: 'ä¿®æ¹äºä¸ä¸ªçæµç«ï¼è¯¥ç¼å·ä¸ºï¼'+this.temp.tagid };
            addSystemOperationLog(params).then(response => {

                        })

 src/views/login/login.vue

@@ -30,8 +30,10 @@
                    </li>
                    <li>
                        <i><img src="../../assets/images/password.png"></i>
                        <input class="forminput" type="password" v-model="loginForm.password" required value=""

                        <input class="forminput" :type="passwordType" v-model="loginForm.password" required value=""
                            placeholder="å¯ç ">
                        <i style="margin-left: 85%;"><img :src="paSrc" alt="" @click="changePassward"></i>
                    </li>
                    <div id="captcha-box"></div>

@@ -53,7 +55,7 @@
                    </li>
                    <li>
                        <i><img src="../../assets/images/password.png"></i>
                        <input class="forminput" type="password" v-model="yzms" value="" placeholder="è¯·è¾å¥éªè¯ç ">
                        <input class="forminput" type="text" v-model="yzms" value="" placeholder="è¯·è¾å¥éªè¯ç ">
                    </li>
                    <li>
                        <el-button v-show="denglu" :loading="loading" type="primary"
@@ -147,6 +149,8 @@
export default {
    data() {
        return {
            passwordType: 'password',
            paSrc: require("@/assets/images/login_pass_active.png"),
            imgs: [
                  img0,
                  img1,
@@ -237,6 +241,11 @@

    },
    methods: {
        // åæ¢å¯ç æ¾ç¤ºéè
changePassward() {
  this.passwordType = this.passwordType==='password'?'text':'password';
  this.paSrc = this.paSrc == require("@/assets/images/login_pass_active.png")?require('@/assets/images/login_pass.png'):require("@/assets/images/login_pass_active.png");
},
        onSuccess() {   //æ»åéªè¯éè¿ä¹åè§¦åç
      this.$notify.success("ç»å½æå")
      LoginId="true"

 src/views/mapManage/index.vue

@@ -1,10 +1,21 @@
<template>
  <!-- <div v-if="role=='è®¿å®¢'" class="app-container">
 <el-empty  description="ææ æé"></el-empty>
</div> -->
  <div class="app-container">

    <!-- <el-empty description="æè¿°æå"></el-empty> -->

    <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit height="100%"
      class="table-container" highlight-current-row>
      <el-table-column fixed label="ID" width="80" >
        <template slot-scope="scope">
          {{ scope.row.id }}
        </template>
      </el-table-column>
      <el-table-column label="å¬å¸åç§°" width="200">
        <template slot-scope="scope">
          {{ scope.row.companyname }}
        </template>
      </el-table-column>
      <el-table-column label="å°å¾åç§°" width="90">
@@ -37,7 +48,7 @@
          {{ scope.row.heig}}
        </template>
      </el-table-column>
      <el-table-column label="ç¦çæä»¶" width="100">
      <el-table-column label="ç¦çæä»¶" width="120">
        <template slot-scope="scope">
          {{ scope.row.file}}
        </template>
@@ -52,7 +63,7 @@
          {{ scope.row.ishow}}
        </template>
      </el-table-column>
      <el-table-column label="æ´æ°æ¶é´" >
      <el-table-column label="æ´æ°æ¶é´" width="170">
        <template slot-scope="scope">
          {{ scope.row.addtime}}
        </template>
@@ -108,6 +119,7 @@
</template>

<script>

import Pagination from '@/components/Pagination'
import { getBaidumapPage,  addorupBaidumap,addSystemOperationLog } from '@/api/baidumap'
import { deepClone } from '@/utils'
@@ -126,6 +138,7 @@
  },
  data() {
    return {
      role:localStorage.getItem('role'),
      uadd:'',
      udelete:'',
      uupdate:'',
@@ -136,6 +149,7 @@
      listQuery: {
        current: 1,
        size: 20,
        username:localStorage.getItem('username'),
        keyword: undefined,
      },
      uploadUrl: '',
@@ -155,6 +169,7 @@
      this.listQuery = {
        current: 1,
        size: 20,
        username:localStorage.getItem('username'),
        keyword: undefined
      }
      this.fetchData()

 src/views/retransmission/index.vue

@@ -1,5 +1,8 @@
<template>
  <div class="app-container">
  <div v-if="role=='è®¿å®¢'" class="app-container">
 <el-empty  description="ææ æé"></el-empty>
</div>
  <div v-else class="app-container">
    <div class="filter-container">
      <el-input v-model="listQuery.keyword" size="small" placeholder="è¯·è¾å¥IPå°å" clearable class="filter-item w-200" />
      <el-button-group class="filter-item">
@@ -108,6 +111,7 @@
  },
  data() {
    return {
      role:localStorage.getItem('role'),
      uadd:'',
      udelete:'',
      uupdate:'',
@@ -153,8 +157,16 @@
    search() {
      this.listLoading = true
      searchForwardData(this.listQuery).then(response => {
        this.list = response.data.records
        this.total = response.data.total
        if (response.data!=null) {
          this.list = response.data.records
          this.total = response.data.total
        }else{
          this.$message({
            message: 'æªæç´¢å°æ°æ®',
            type: 'error'
          })
        }
      
        this.listLoading = false
      })
    },

 src/views/system/user.vue

@@ -233,8 +233,16 @@
    search() {
      this.listLoading = true
      searchUser(this.listQuery).then(response => {
        this.list = response.data.records
        this.total = response.data.total
        if (response.data!=null) {
          this.list = response.data.records
          this.total = response.data.total
        }else{
          this.$message({
            message: 'æªæç´¢å°æ°æ®',
            type: 'error'
          })
        }
      
        this.listLoading = false
      })
    },

			@@ -1 +1 @@
			<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>Vue Element Admin</title><link href=/static/css/app.75845777.css rel=preload as=style><link href=/static/css/chunk-libs.52acf3af.css rel=preload as=style><link href=/static/js/app.2388a574.js rel=preload as=script><link href=/static/js/chunk-elementUI.63f99718.js rel=preload as=script><link href=/static/js/chunk-libs.04923f2e.js rel=preload as=script><link href=/static/css/chunk-libs.52acf3af.css rel=stylesheet><link href=/static/css/app.75845777.css rel=stylesheet></head><body><div id=app></div><script>(function(e){function c(c){for(var t,u,f=c[0],h=c[1],d=c[2],o=0,k=[];o<f.length;o++)u=f[o],Object.prototype.hasOwnProperty.call(r,u)&&r[u]&&k.push(r[u][0]),r[u]=0;for(t in h)Object.prototype.hasOwnProperty.call(h,t)&&(e[t]=h[t]);i&&i(c);while(k.length)k.shift()();return a.push.apply(a,d\|\|[]),n()}function n(){for(var e,c=0;c<a.length;c++){for(var n=a[c],t=!0,u=1;u<n.length;u++){var f=n[u];0!==r[f]&&(t=!1)}t&&(a.splice(c--,1),e=h(h.s=n[0]))}return e}var t={},u={runtime:0},r={runtime:0},a=[];function f(e){return h.p+"static/js/"+({}[e]\|\|e)+"."+{"chunk-169fa71c":"c52107e0","chunk-1f62ac54":"8b264e8b","chunk-2d0a4d2d":"30a53ba0","chunk-2d0c22ac":"d7972e27","chunk-2d2105d3":"40f39be6","chunk-2d213765":"c81e502a","chunk-2d230fe7":"a331634e","chunk-2edc6a52":"697b1f90","chunk-35ff68f4":"fd3780a7","chunk-3bd257ec":"6dcff9e9","chunk-3c4642d9":"893a7639","chunk-071b4bc7":"01215085","chunk-40264523":"8b11903e","chunk-42148c3c":"e105058b","chunk-574580d2":"1e7ae298","chunk-58ce47f7":"27fdc895","chunk-d49b2eb2":"0c95a8ec","chunk-62727c27":"54181c21","chunk-636f154d":"13beb7b9","chunk-640c118b":"ba3dbfcc","chunk-7486e616":"a3559700","chunk-7c3380c9":"815f3f91","chunk-7e443fe8":"5c9391b4","chunk-7fc5f13f":"621b8439","chunk-934b97e4":"a1e710fc","chunk-96ec3514":"c2a3f4ca","chunk-c18a8680":"0974d317","chunk-860da7b8":"f938324e","chunk-e3a9413c":"464dba90"}[e]+".js"}function h(c){if(t[c])return t[c].exports;var n=t[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,h),n.l=!0,n.exports}h.e=function(e){var c=[],n={"chunk-169fa71c":1,"chunk-1f62ac54":1,"chunk-2edc6a52":1,"chunk-35ff68f4":1,"chunk-3bd257ec":1,"chunk-3c4642d9":1,"chunk-071b4bc7":1,"chunk-40264523":1,"chunk-42148c3c":1,"chunk-574580d2":1,"chunk-58ce47f7":1,"chunk-62727c27":1,"chunk-636f154d":1,"chunk-640c118b":1,"chunk-7486e616":1,"chunk-7c3380c9":1,"chunk-7e443fe8":1,"chunk-7fc5f13f":1,"chunk-934b97e4":1,"chunk-96ec3514":1,"chunk-c18a8680":1,"chunk-860da7b8":1,"chunk-e3a9413c":1};u[e]?c.push(u[e]):0!==u[e]&&n[e]&&c.push(u[e]=new Promise((function(c,n){for(var t="static/css/"+({}[e]\|\|e)+"."+{"chunk-169fa71c":"13a7e89e","chunk-1f62ac54":"e78edaae","chunk-2d0a4d2d":"31d6cfe0","chunk-2d0c22ac":"31d6cfe0","chunk-2d2105d3":"31d6cfe0","chunk-2d213765":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-2edc6a52":"2c2f805b","chunk-35ff68f4":"52c9646e","chunk-3bd257ec":"c8dfc952","chunk-3c4642d9":"a526e487","chunk-071b4bc7":"e40e77ad","chunk-40264523":"9886cdea","chunk-42148c3c":"952ec519","chunk-574580d2":"343b1a0e","chunk-58ce47f7":"2b75ca47","chunk-d49b2eb2":"31d6cfe0","chunk-62727c27":"2a0f6250","chunk-636f154d":"bcad5d4c","chunk-640c118b":"e76dde9d","chunk-7486e616":"ff39ea83","chunk-7c3380c9":"ecc751e7","chunk-7e443fe8":"36052b77","chunk-7fc5f13f":"bf487b84","chunk-934b97e4":"607dd7d1","chunk-96ec3514":"d5d226f8","chunk-c18a8680":"1f508e64","chunk-860da7b8":"bc1380af","chunk-e3a9413c":"2705fe0e"}[e]+".css",r=h.p+t,a=document.getElementsByTagName("link"),f=0;f<a.length;f++){var d=a[f],o=d.getAttribute("data-href")\|\|d.getAttribute("href");if("stylesheet"===d.rel&&(o===t\|\|o===r))return c()}var k=document.getElementsByTagName("style");for(f=0;f<k.length;f++){d=k[f],o=d.getAttribute("data-href");if(o===t\|\|o===r)return c()}var i=document.createElement("link");i.rel="stylesheet",i.type="text/css",i.onload=c,i.onerror=function(c){var t=c&&c.target&&c.target.src\|\|r,a=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");a.code="CSS_CHUNK_LOAD_FAILED",a.request=t,delete u[e],i.parentNode.removeChild(i),n(a)},i.href=r;var l=document.getElementsByTagName("head")[0];l.appendChild(i)})).then((function(){u[e]=0})));var t=r[e];if(0!==t)if(t)c.push(t[2]);else{var a=new Promise((function(c,n){t=r[e]=[c,n]}));c.push(t[2]=a);var d,o=document.createElement("script");o.charset="utf-8",o.timeout=120,h.nc&&o.setAttribute("nonce",h.nc),o.src=f(e);var k=new Error;d=function(c){o.onerror=o.onload=null,clearTimeout(i);var n=r[e];if(0!==n){if(n){var t=c&&("load"===c.type?"missing":c.type),u=c&&c.target&&c.target.src;k.message="Loading chunk "+e+" failed.\n("+t+": "+u+")",k.name="ChunkLoadError",k.type=t,k.request=u,n[1](k)}r[e]=void 0}};var i=setTimeout((function(){d({type:"timeout",target:o})}),12e4);o.onerror=o.onload=d,document.head.appendChild(o)}return Promise.all(c)},h.m=e,h.c=t,h.d=function(e,c,n){h.o(e,c)\|\|Object.defineProperty(e,c,{enumerable:!0,get:n})},h.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},h.t=function(e,c){if(1&c&&(e=h(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(h.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var t in e)h.d(n,t,function(c){return e[c]}.bind(null,t));return n},h.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return h.d(c,"a",c),c},h.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},h.p="/",h.oe=function(e){throw console.error(e),e};var d=window["webpackJsonp"]=window["webpackJsonp"]\|\|[],o=d.push.bind(d);d.push=c,d=d.slice();for(var k=0;k<d.length;k++)c(d[k]);var i=o;n()})([]);</script><script src=/static/js/chunk-elementUI.63f99718.js></script><script src=/static/js/chunk-libs.04923f2e.js></script><script src=/static/js/app.2388a574.js></script></body><script src="https://api.map.baidu.com/api?v=2.0&&type=webgl&ak=zoVtgLNWuaZBjMAa32RZRFIagXxST0fm"></script></html>
			<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>Vue Element Admin</title><link href=/static/css/app.75845777.css rel=preload as=style><link href=/static/css/chunk-libs.52acf3af.css rel=preload as=style><link href=/static/js/app.8eacaeaa.js rel=preload as=script><link href=/static/js/chunk-elementUI.63f99718.js rel=preload as=script><link href=/static/js/chunk-libs.04923f2e.js rel=preload as=script><link href=/static/css/chunk-libs.52acf3af.css rel=stylesheet><link href=/static/css/app.75845777.css rel=stylesheet></head><body><div id=app></div><script>(function(e){function c(c){for(var u,t,d=c[0],f=c[1],h=c[2],o=0,k=[];o<d.length;o++)t=d[o],Object.prototype.hasOwnProperty.call(a,t)&&a[t]&&k.push(a[t][0]),a[t]=0;for(u in f)Object.prototype.hasOwnProperty.call(f,u)&&(e[u]=f[u]);b&&b(c);while(k.length)k.shift()();return r.push.apply(r,h\|\|[]),n()}function n(){for(var e,c=0;c<r.length;c++){for(var n=r[c],u=!0,t=1;t<n.length;t++){var d=n[t];0!==a[d]&&(u=!1)}u&&(r.splice(c--,1),e=f(f.s=n[0]))}return e}var u={},t={runtime:0},a={runtime:0},r=[];function d(e){return f.p+"static/js/"+({}[e]\|\|e)+"."+{"chunk-1f62ac54":"433a1db9","chunk-2a3f9be0":"56724821","chunk-3f7d45c9":"e0311b56","chunk-ea3d2bb0":"5b8b91ec","chunk-d718eaf2":"7a940988","chunk-4314a1ce":"ed630bea","chunk-fe022a16":"cb12d1c1","chunk-2d0a4d2d":"30a53ba0","chunk-2d0c22ac":"d7972e27","chunk-2d2105d3":"40f39be6","chunk-2d213765":"c81e502a","chunk-2d230fe7":"a331634e","chunk-2edc6a52":"44a00356","chunk-359cb91f":"7e1f235b","chunk-3bd257ec":"0d1a4f7c","chunk-2d0dd4bc":"d5610926","chunk-40264523":"142ed10e","chunk-529cb226":"d247b386","chunk-602f3a03":"9564035f","chunk-62ae299f":"2f2be5ee","chunk-636f154d":"39e10a74","chunk-66879d32":"074d9c57","chunk-72cabb77":"9a5690ba","chunk-72eba88f":"a1cf7a26","chunk-7c3380c9":"174d8141","chunk-7fc5f13f":"1ec6748b","chunk-89e77f4e":"b1559e84","chunk-999939d4":"c724532e","chunk-c5d7f5f4":"46406197","chunk-52287ef4":"20e4f224","chunk-d49b2eb2":"0c95a8ec","chunk-ed6fbb84":"6b94bec6"}[e]+".js"}function f(c){if(u[c])return u[c].exports;var n=u[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,f),n.l=!0,n.exports}f.e=function(e){var c=[],n={"chunk-1f62ac54":1,"chunk-3f7d45c9":1,"chunk-ea3d2bb0":1,"chunk-d718eaf2":1,"chunk-4314a1ce":1,"chunk-fe022a16":1,"chunk-2edc6a52":1,"chunk-359cb91f":1,"chunk-3bd257ec":1,"chunk-40264523":1,"chunk-529cb226":1,"chunk-602f3a03":1,"chunk-62ae299f":1,"chunk-636f154d":1,"chunk-66879d32":1,"chunk-72cabb77":1,"chunk-72eba88f":1,"chunk-7c3380c9":1,"chunk-7fc5f13f":1,"chunk-89e77f4e":1,"chunk-999939d4":1,"chunk-c5d7f5f4":1,"chunk-52287ef4":1,"chunk-ed6fbb84":1};t[e]?c.push(t[e]):0!==t[e]&&n[e]&&c.push(t[e]=new Promise((function(c,n){for(var u="static/css/"+({}[e]\|\|e)+"."+{"chunk-1f62ac54":"e78edaae","chunk-2a3f9be0":"31d6cfe0","chunk-3f7d45c9":"d368b631","chunk-ea3d2bb0":"134e6210","chunk-d718eaf2":"aaeeb42b","chunk-4314a1ce":"ef1db0d2","chunk-fe022a16":"0c649e77","chunk-2d0a4d2d":"31d6cfe0","chunk-2d0c22ac":"31d6cfe0","chunk-2d2105d3":"31d6cfe0","chunk-2d213765":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-2edc6a52":"2c2f805b","chunk-359cb91f":"05b73e41","chunk-3bd257ec":"c8dfc952","chunk-2d0dd4bc":"31d6cfe0","chunk-40264523":"9886cdea","chunk-529cb226":"de96f263","chunk-602f3a03":"b357e576","chunk-62ae299f":"952ec519","chunk-636f154d":"bcad5d4c","chunk-66879d32":"08b770a5","chunk-72cabb77":"a10aada7","chunk-72eba88f":"a4016c15","chunk-7c3380c9":"ecc751e7","chunk-7fc5f13f":"bf487b84","chunk-89e77f4e":"d39843de","chunk-999939d4":"27c38f45","chunk-c5d7f5f4":"13a7e89e","chunk-52287ef4":"e40e77ad","chunk-d49b2eb2":"31d6cfe0","chunk-ed6fbb84":"9d640774"}[e]+".css",a=f.p+u,r=document.getElementsByTagName("link"),d=0;d<r.length;d++){var h=r[d],o=h.getAttribute("data-href")\|\|h.getAttribute("href");if("stylesheet"===h.rel&&(o===u\|\|o===a))return c()}var k=document.getElementsByTagName("style");for(d=0;d<k.length;d++){h=k[d],o=h.getAttribute("data-href");if(o===u\|\|o===a)return c()}var b=document.createElement("link");b.rel="stylesheet",b.type="text/css",b.onload=c,b.onerror=function(c){var u=c&&c.target&&c.target.src\|\|a,r=new Error("Loading CSS chunk "+e+" failed.\n("+u+")");r.code="CSS_CHUNK_LOAD_FAILED",r.request=u,delete t[e],b.parentNode.removeChild(b),n(r)},b.href=a;var i=document.getElementsByTagName("head")[0];i.appendChild(b)})).then((function(){t[e]=0})));var u=a[e];if(0!==u)if(u)c.push(u[2]);else{var r=new Promise((function(c,n){u=a[e]=[c,n]}));c.push(u[2]=r);var h,o=document.createElement("script");o.charset="utf-8",o.timeout=120,f.nc&&o.setAttribute("nonce",f.nc),o.src=d(e);var k=new Error;h=function(c){o.onerror=o.onload=null,clearTimeout(b);var n=a[e];if(0!==n){if(n){var u=c&&("load"===c.type?"missing":c.type),t=c&&c.target&&c.target.src;k.message="Loading chunk "+e+" failed.\n("+u+": "+t+")",k.name="ChunkLoadError",k.type=u,k.request=t,n[1](k)}a[e]=void 0}};var b=setTimeout((function(){h({type:"timeout",target:o})}),12e4);o.onerror=o.onload=h,document.head.appendChild(o)}return Promise.all(c)},f.m=e,f.c=u,f.d=function(e,c,n){f.o(e,c)\|\|Object.defineProperty(e,c,{enumerable:!0,get:n})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,c){if(1&c&&(e=f(e)),8&c)return e;if(4&c&&"object"===typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(f.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&c&&"string"!=typeof e)for(var u in e)f.d(n,u,function(c){return e[c]}.bind(null,u));return n},f.n=function(e){var c=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="/",f.oe=function(e){throw console.error(e),e};var h=window["webpackJsonp"]=window["webpackJsonp"]\|\|[],o=h.push.bind(h);h.push=c,h=h.slice();for(var k=0;k<h.length;k++)c(h[k]);var b=o;n()})([]);</script><script src=/static/js/chunk-elementUI.63f99718.js></script><script src=/static/js/chunk-libs.04923f2e.js></script><script src=/static/js/app.8eacaeaa.js></script></body><script src="https://api.map.baidu.com/api?v=2.0&&type=webgl&ak=zoVtgLNWuaZBjMAa32RZRFIagXxST0fm"></script></html>

			@@ -23,7 +23,7 @@
			"core-js": "3.6.5",
			"echarts": "^4.9.0",
			"element-ui": "^2.15.6",
			"file-saver": "2.0.1",
			"file-saver": "^2.0.1",
			"fuse.js": "3.4.4",
			"js-cookie": "2.2.0",
			"jsonlint": "1.6.3",
			@@ -41,7 +41,7 @@
			"vue-router": "3.0.2",
			"vue-seamless-scroll": "^1.1.23",
			"vuex": "3.1.0",
			"xlsx": "0.14.1"
			"xlsx": "^0.14.1"
			},
			"devDependencies": {
			"@types/echarts": "^4.9.22",

			@@ -189,8 +189,16 @@
			search() {
			this.listLoading = true
			searchAlarmrecord(this.listQuery).then(response => {
			this.list = response.data.records
			this.total = response.data.total
			if (response.data!=null) {
			this.list = response.data.records
			this.total = response.data.total
			}else{
			this.$message({
			message: 'æªæç´¢å°æ°æ®',
			type: 'error'
			})
			}

			this.listLoading = false
			})
			},

			@@ -176,8 +176,16 @@
			search() {
			this.listLoading = true
			searchDuanxin(this.listQuery).then(response => {
			this.list = response.data.records
			this.total = response.data.total
			if (response.data!=null) {
			this.list = response.data.records
			this.total = response.data.total
			}else{
			this.$message({
			message: 'æªæç´¢å°æ°æ®',
			type: 'error'
			})
			}

			this.listLoading = false
			})
			},

			@@ -90,11 +90,16 @@
			search() {
			this.listLoading = true
			searchDuanxinlog(this.listQuery).then(response => {
			console.log(response);


			this.list = response.data.records
			this.total = response.data.total
			if (response.data!=null) {
			this.list = response.data.records
			this.total = response.data.total
			}else{
			this.$message({
			message: 'æªæç´¢å°æ°æ®',
			type: 'error'
			})
			}

			this.listLoading = false
			})
			},

			@@ -195,8 +195,16 @@
			search() {
			this.listLoading = true
			searchAlarmsystem(this.listQuery).then(response => {
			this.list = response.data.records
			this.total = response.data.total
			if (response.data!=null) {
			this.list = response.data.records
			this.total = response.data.total
			}else{
			this.$message({
			message: 'æªæç´¢å°æ°æ®',
			type: 'error'
			})
			}

			this.listLoading = false
			})
			},

			@@ -20,7 +20,7 @@
			},
			height: {
			type: String,
			default: '700px'
			default: '100%'
			},
			autoResize: {
			type: Boolean,

			@@ -19,6 +19,16 @@
			æ°å¢
			</el-button> -->
			</el-button-group>

			<span style="margin-left: 100px;">
			<el-date-picker v-model="timeExport" type="daterange" unlink-panels :picker-options="pickerOptions"
			range-separator="è³" start-placeholder="å¼å§æ¶é´" end-placeholder="ç»ææ¶é´" value-format="yyyy-MM-dd" />

			<el-button style="margin-left: 10px;" type="primary" @click="exportExcel">å¯¼åºEXCEL</el-button>

			</span>


			</div>

			<el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit height="100%"
			@@ -70,7 +80,7 @@


			</el-table-column>
			<el-table-column label="æ·»å æ¶é´" >
			<el-table-column label="æ·»å æ¶é´">
			<template slot-scope="scope">
			{{ scope.row.addtime }}
			</template>
			@@ -84,8 +94,8 @@
			</div>
			<div v-else class="app-container">
			<div style="margin-bottom: 30px;">
			<el-date-picker v-model="queryForm.time" type="monthrange" unlink-panels :picker-options="pickerOptions" range-separator="è³" start-placeholder="å¼å§æ¶é´"
			end-placeholder="ç»ææ¶é´" value-format="yyyy-MM-dd" />
			<el-date-picker v-model="queryForm.time" type="daterange" unlink-panels :picker-options="pickerOptions"
			range-separator="è³" start-placeholder="å¼å§æ¶é´" end-placeholder="ç»ææ¶é´" value-format="yyyy-MM-dd" />
			<el-button style="margin-left: 10px;" type="primary" @click="handlechart">æç´¢</el-button>
			<el-button style="position: absolute; right: 50px;" type="primary" @click="fanhui">è¿å</el-button>

			@@ -100,7 +110,8 @@
			<el-button v-if="last" style="margin-left: 10px;" :type="lastyearprimary" @click="lastyear">ä¸ä¸å¹´</el-button>
			<el-button v-if="next" style="margin-left: 10px;" :type="nextyearprimary" @click="nextyear">ä¸ä¸å¹´</el-button>
			</div>
			<span style=" display: flex;justify-content: center;align-items: center;font-size: 25px;"> {{ this.anchorname+"-" +this.tagid+"ååè¶å¿å¾"}}</span>
			<span style=" display: flex;justify-content: center;align-items: center;font-size: 25px;"> {{ this.anchorname + "-"
			+ this.tagid +"ååè¶å¿å¾"}}</span>
			<line-chart :chart-data="lineChartData" />


			@@ -108,10 +119,12 @@
			</template>

			<script>
			import * as XLSX from 'xlsx';
			import { saveAs } from 'file-saver';
			import { formatTime1 } from "@/utils/index.js"; //æ¥ææ ¼å¼è½¬æ¢
			import LineChart from "./components/LineChart";
			import Pagination from '@/components/Pagination'
			import { getList, searcheveryday, handlechart2, handlechartupdate3 } from '@/api/analysis'
			import { getList, searcheveryday, handlechart2, handlechartupdate3,handlechartupdate2 } from '@/api/analysis'
			import { deepClone } from '@/utils'

			const lineChartData = {
			@@ -120,7 +133,7 @@
			nd: [],
			hd: [],
			x: [],


			},

			};
			@@ -132,43 +145,44 @@
			data() {
			return {
			pickerOptions: {
			shortcuts: [{
			text: 'æ¬æ',
			onClick(picker) {
			picker.$emit('pick', [new Date(), new Date()]);
			}
			}, {
			text: 'ä»å¹´è³ä»',
			onClick(picker) {
			const end = new Date();
			const start = new Date(new Date().getFullYear(), 0);
			picker.$emit('pick', [start, end]);
			}
			}, {
			text: 'æè¿åä¸ªæ',
			onClick(picker) {
			const end = new Date();
			const start = new Date();
			start.setMonth(start.getMonth() - 6);
			picker.$emit('pick', [start, end]);
			}
			}]
			},
			yearprimary:'success',
			oneprimary:'primary',
			twoprimary:'primary',
			threeprimary:'primary',
			lastyearprimary:'primary',
			nextyearprimary:'primary',
			last:true,
			next:false,
			yeardata:0,
			anchorname:'',
			tagid:'',
			shortcuts: [{
			text: 'æ¬æ',
			onClick(picker) {
			picker.$emit('pick', [new Date(), new Date()]);
			}
			}, {
			text: 'ä»å¹´è³ä»',
			onClick(picker) {
			const end = new Date();
			const start = new Date(new Date().getFullYear(), 0);
			picker.$emit('pick', [start, end]);
			}
			}, {
			text: 'æè¿åä¸ªæ',
			onClick(picker) {
			const end = new Date();
			const start = new Date();
			start.setMonth(start.getMonth() - 6);
			picker.$emit('pick', [start, end]);
			}
			}]
			},
			yearprimary: 'success',
			oneprimary: 'primary',
			twoprimary: 'primary',
			threeprimary: 'primary',
			lastyearprimary: 'primary',
			nextyearprimary: 'primary',
			last: true,
			next: false,
			yeardata: 0,
			anchorname: '',
			tagid: '',
			queryForm: {
			time: '',
			tagid: ''
			},
			timeExport: '',
			lineChartData: lineChartData.newVisitis,
			analy: true,
			total: 0,
			@@ -193,25 +207,64 @@
			this.fetchData()
			},
			methods: {
			exportExcel() {
			console.log(this.timeExport);
			// const data = []
			const params = { date1: this.timeExport[1], date2: this.timeExport[0], username: localStorage.getItem('username') \|\| '' };
			handlechartupdate2(params).then(response => {
			console.log(response);
			const data = response.data
			// è·åè¦å¯¼åºçæ°æ®
			// const data = this.list; // åè®¾listæ¯è¡¨æ ¼çæ°æ®
			// åå»ºä¸ä¸ªç©ºçå·¥ä½ç°¿
			const workbook = XLSX.utils.book_new();
			// åå»ºä¸ä¸ªå·¥ä½è¡¨
			const worksheet = XLSX.utils.json_to_sheet(data);
			// å°å·¥ä½è¡¨æ·»å å°å·¥ä½ç°¿ä¸
			XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
			// å°å·¥ä½ç°¿è½¬æ¢ä¸ºäºè¿å¶åç¬¦ä¸²
			const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
			// å°äºè¿å¶åç¬¦ä¸²è½¬æ¢ä¸ºBlobå¯¹è±¡
			const blob = new Blob([excelBuffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8' });
			// åå»ºä¸ä¸ªä¸è½½é¾æ¥
			const url = URL.createObjectURL(blob);
			// åå»ºä¸ä¸ªéèçé¾æ¥åç´
			const link = document.createElement('a');
			link.href = url;
			link.download = 'export.xlsx'; // è®¾ç½®ä¸è½½çæä»¶å
			// æ¨¡æç¹å»ä¸è½½é¾æ¥
			link.click();
			// éæ¾URLå¯¹è±¡
			URL.revokeObjectURL(url);
			})
			// console.log(data);


			},
			Export() {

			},
			fanhui() {
			this.analy = true
			},
			analyze(scope) {
			this.anchorname=scope.row.anchorname
			this.tagid=scope.row.tagid
			const params = { date1: this.queryForm.time[1], date2: this.queryForm.time[0], username: localStorage.getItem('username') \|\| '' ,tagid:scope.row.tagid};
			this.anchorname = scope.row.anchorname
			this.tagid = scope.row.tagid
			const params = { date1: this.queryForm.time[1], date2: this.queryForm.time[0], username: localStorage.getItem('username') \|\| '', tagid: scope.row.tagid };
			handlechart2(params).then(response => {
			console.log(response);

			this.lineChartData = response.data
			this.analy = false
			})
			},
			one() {
			this.oneprimary='success'
			this.twoprimary='primary'
			this.threeprimary='primary'
			this.yearprimary='primary'
			this.lastyearprimary='primary'
			this.nextyearprimary='primary'
			this.oneprimary = 'success'
			this.twoprimary = 'primary'
			this.threeprimary = 'primary'
			this.yearprimary = 'primary'
			this.lastyearprimary = 'primary'
			this.nextyearprimary = 'primary'
			// è·åå½åæ¥æ
			const currentDate = new Date();
			// è·åå½åæä»½
			@@ -224,22 +277,22 @@
			var time = []
			time.push(newDate)
			time.push(dateYear)
			this.queryForm.time=time
			const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') \|\| '' ,tagid:this.tagid};
			this.queryForm.time = time
			const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') \|\| '', tagid: this.tagid };
			handlechartupdate3(params).then(response => {
			this.lineChartData = response.data
			})

			},
			two() {
			this.oneprimary='primary'
			this.twoprimary='success'
			this.threeprimary='primary'
			this.yearprimary='primary'
			this.lastyearprimary='primary'
			this.nextyearprimary='primary'
			// è·åå½åæ¥æ
			const currentDate = new Date();
			this.oneprimary = 'primary'
			this.twoprimary = 'success'
			this.threeprimary = 'primary'
			this.yearprimary = 'primary'
			this.lastyearprimary = 'primary'
			this.nextyearprimary = 'primary'
			// è·åå½åæ¥æ
			const currentDate = new Date();
			// è·åå½åæä»½
			const currentMonth = currentDate.getMonth();
			// è®¾ç½®æ¥æçæä»½ä¸ºå½åæä»½åä¸
			@@ -250,20 +303,20 @@
			var time = []
			time.push(newDate)
			time.push(dateYear)
			this.queryForm.time=time
			const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') \|\| '' ,tagid:this.tagid};
			this.queryForm.time = time
			const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') \|\| '', tagid: this.tagid };
			handlechartupdate3(params).then(response => {
			this.lineChartData = response.data
			})

			},
			three() {
			this.oneprimary='primary'
			this.twoprimary='primary'
			this.threeprimary='success'
			this.yearprimary='primary'
			this.lastyearprimary='primary'
			this.nextyearprimary='primary'
			this.oneprimary = 'primary'
			this.twoprimary = 'primary'
			this.threeprimary = 'success'
			this.yearprimary = 'primary'
			this.lastyearprimary = 'primary'
			this.nextyearprimary = 'primary'
			// è·åå½åæ¥æ
			const currentDate = new Date();
			// è·åå½åæä»½
			@@ -277,23 +330,23 @@
			var time = []
			time.push(newDate)
			time.push(dateYear)
			this.queryForm.time=time
			const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') \|\| '',tagid:this.tagid };
			this.queryForm.time = time
			const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') \|\| '', tagid: this.tagid };
			handlechartupdate3(params).then(response => {


			this.lineChartData = response.data
			})
			},

			year() {
			this.oneprimary='primary'
			this.twoprimary='primary'
			this.threeprimary='primary'
			this.yearprimary='success'
			this.lastyearprimary='primary'
			this.nextyearprimary='primary'
			this.next=false
			this.last=true
			this.oneprimary = 'primary'
			this.twoprimary = 'primary'
			this.threeprimary = 'primary'
			this.yearprimary = 'success'
			this.lastyearprimary = 'primary'
			this.nextyearprimary = 'primary'
			this.next = false
			this.last = true
			// è·åå½åæ¥æ
			// const currentDate = new Date();
			// è·åå½åæä»½
			@@ -303,119 +356,119 @@
			const newDate = formatTime1(new Date(), "yyyy-MM-dd");
			//è·åå½åå¹´ææ¥
			const dateYear = formatTime1(new Date(), "yyyy");
			console.log(dateYear+'-01-01');
			console.log(dateYear + '-01-01');
			this.yeardata = dateYear
			var time = []
			time.push(newDate+'-01-01')
			time.push(newDate + '-01-01')
			time.push(newDate)
			this.queryForm.time=time
			const params = { date1: newDate, date2: dateYear+'-01-01', username: localStorage.getItem('username') \|\| '',tagid:this.tagid };
			this.queryForm.time = time
			const params = { date1: newDate, date2: dateYear + '-01-01', username: localStorage.getItem('username') \|\| '', tagid: this.tagid };
			handlechartupdate3(params).then(response => {
			console.log(response);


			this.lineChartData = response.data
			})
			},

			lastornext(){
			lastornext() {
			const currentDate = new Date();
			const currentMonth = currentDate.getFullYear();
			console.log(currentMonth);
			console.log(this.yeardata);


			if (this.yeardata<currentMonth) {
			this.next=true
			if (this.yeardata<=2022) {
			this.last=false
			}else{
			this.last=true


			if (this.yeardata < currentMonth) {
			this.next = true
			if (this.yeardata <= 2022) {
			this.last = false
			} else {
			this.last = true
			}
			} else {
			this.next = false
			}
			}else {
			this.next=false
			}


			},

			lastyear() {
			this.oneprimary='primary'
			this.twoprimary='primary'
			this.threeprimary='primary'
			this.yearprimary='primary'
			this.lastyearprimary='success'
			this.nextyearprimary='primary'
			this.oneprimary = 'primary'
			this.twoprimary = 'primary'
			this.threeprimary = 'primary'
			this.yearprimary = 'primary'
			this.lastyearprimary = 'success'
			this.nextyearprimary = 'primary'
			// è·åå½åæ¥æ
			const currentDate = new Date();
			// è·åå½åæä»½
			const currentMonth = currentDate.getFullYear();

			// è®¾ç½®æ¥æçæä»½ä¸ºå½åæä»½åä¸

			if (this.yeardata=="") {

			if (this.yeardata == "") {
			currentDate.setFullYear(currentMonth - 1);
			// this.yeardata=currentMonth - 1;

			}else{
			} else {
			currentDate.setFullYear(this.yeardata - 1);
			// this.yeardata = this.yeardata - 1

			}
			const newDate = formatTime1(currentDate, "yyyy");


			this.yeardata = parseInt(newDate)
			this.lastornext()
			this.lastornext()
			//è·åå½åå¹´ææ¥
			const dateYear = formatTime1(new Date(), "yyyy-MM-dd");
			// this.queryForm.time.push(newDate+'-01-01')
			// this.queryForm.time.push(newDate+'-12-31')
			var time = []
			time.push(newDate+'-01-01')
			time.push(newDate+'-12-31')
			this.queryForm.time=time
			const params = { date1: newDate+'-12-31', date2: newDate+'-01-01', username: localStorage.getItem('username') \|\| '',tagid:this.tagid };
			time.push(newDate + '-01-01')
			time.push(newDate + '-12-31')
			this.queryForm.time = time
			const params = { date1: newDate + '-12-31', date2: newDate + '-01-01', username: localStorage.getItem('username') \|\| '', tagid: this.tagid };
			handlechartupdate3(params).then(response => {


			this.lineChartData = response.data
			})
			},

			nextyear() {
			this.oneprimary='primary'
			this.twoprimary='primary'
			this.threeprimary='primary'
			this.yearprimary='primary'
			this.lastyearprimary='primary'
			this.nextyearprimary='success'
			this.oneprimary = 'primary'
			this.twoprimary = 'primary'
			this.threeprimary = 'primary'
			this.yearprimary = 'primary'
			this.lastyearprimary = 'primary'
			this.nextyearprimary = 'success'
			// è·åå½åæ¥æ
			const currentDate = new Date();
			// è·åå½åæä»½
			// const currentMonth = currentDate.getFullYear();
			// è®¾ç½®æ¥æçæä»½ä¸ºå½åæä»½åä¸
			console.log(this.yeardata);

			currentDate.setFullYear( this.yeardata + 1);

			currentDate.setFullYear(this.yeardata + 1);
			const newDate = formatTime1(currentDate, "yyyy");
			console.log(newDate);


			this.yeardata = parseInt(newDate)
			//è·åå½åå¹´ææ¥
			this.lastornext()
			const dateYear = formatTime1(new Date(), "yyyy-MM-dd");
			var time = []
			time.push(newDate+'-01-01')
			time.push(newDate+'-12-31')
			this.queryForm.time=time
			const params = { date1: newDate+'-12-31', date2: newDate+'-01-01', username: localStorage.getItem('username') \|\| '',tagid:this.tagid };
			time.push(newDate + '-01-01')
			time.push(newDate + '-12-31')
			this.queryForm.time = time
			const params = { date1: newDate + '-12-31', date2: newDate + '-01-01', username: localStorage.getItem('username') \|\| '', tagid: this.tagid };
			handlechartupdate3(params).then(response => {


			this.lineChartData = response.data
			})
			},


			handlechart() {
			console.log(this.queryForm.time);

			const params = { date1: this.queryForm.time[1], date2: this.queryForm.time[0], username: localStorage.getItem('username') \|\| '',tagid:this.tagid };

			const params = { date1: this.queryForm.time[1], date2: this.queryForm.time[0], username: localStorage.getItem('username') \|\| '', tagid: this.tagid };
			handlechartupdate3(params).then(response => {
			this.lineChartData = response.data
			})
			@@ -425,8 +478,16 @@
			search() {
			this.listLoading = true
			searcheveryday(this.listQuery).then(response => {
			this.list = response.data.records
			this.total = response.data.total
			if (response.data!=null) {
			this.list = response.data.records
			this.total = response.data.total
			}else{
			this.$message({
			message: 'æªæç´¢å°æ°æ®',
			type: 'error'
			})
			}

			this.listLoading = false
			})
			},
			@@ -445,7 +506,7 @@
			this.listLoading = true
			getList(this.listQuery).then(response => {
			console.log(response);


			this.list = response.data.records
			this.total = response.data.total
			this.listLoading = false
			@@ -455,21 +516,21 @@


			searchorfetchData() {
			console.log(this.listQuery.keyword);
			console.log(this.listQuery.keyword);

			if (this.listQuery.keyword!=undefined) {
			if (this.listQuery.keyword != undefined) {
			console.log(111111);


			this.search()
			}else{
			} else {
			console.log(2222);


			this.fetchData()
			}
			// this.listLoading = true
			// getList(this.listQuery).then(response => {
			// console.log(response);


			// this.list = response.data.records
			// this.total = response.data.total
			// this.listLoading = false
			@@ -499,14 +560,18 @@
			text-align: center;
			}
			}

			.el-table .el-table__body tr:hover {
			background-color: transparent!important; /* ä½ æ³è¦çèæ¯è² */
			color: #000!important;
			background-color: transparent !important;
			/* ä½ æ³è¦çèæ¯è² */
			color: #000 !important;
			}

			.el-table__body {
			tr:hover > td {
			background-color: transparent!important; /* ä½ æ³è¦çèæ¯è² */
			color: #000!important;
			tr:hover>td {
			background-color: transparent !important;
			/* ä½ æ³è¦çèæ¯è² */
			color: #000 !important;
			}
			}

			@@ -195,6 +195,8 @@
			}
			import jizhun from "@/assets/images/ceju.png"
			import jiance from "@/assets/images/lingjin.png"
			import onlie from "@/assets/images/onile.png"

			import processBar from "@/components/processPar";
			import Pagination from '@/components/Pagination'
			import drawMixin from "@/utils/drawMixin"; //èªéåºç¼©æ¾
			@@ -269,7 +271,11 @@
			mounted() {
			const params = { username: localStorage.getItem('username'), phone: localStorage.getItem('phone') };
			alldevice(params).then(response => {
			this.initMap(response.data.dataList, response.data.view)
			console.log(111111111);

			console.log(response);

			this.initMap(response.data.dataList, response.data.view,response.data.shijiao)
			})


			@@ -283,7 +289,7 @@
			this.gpsnum = ''
			this.gpsstate = ''
			},
			initMap(tags, view) {
			initMap(tags, view,shijiao) {

			// $(window).scrollTop(0);
			// window.scroll(0, 0);
			@@ -292,8 +298,30 @@
			// var point = new BMapGL.Point(116.404, 39.915); // å°å¾ä¸å¿ç¹åæ
			// map.centerAndZoom(point, 15);
			const views = view.split(";");
			map.centerAndZoom(new BMapGL.Point(views[0], views[1]), 12);
			map.centerAndZoom(new BMapGL.Point(views[0], views[1]), 19);
			map.enableScrollWheelZoom(true);
			map.setHeading(shijiao); // è®¾ç½®å°å¾æè½¬è§åº¦
			map.setTilt(shijiao); // è®¾ç½®å°å¾å¾æè§åº¦

			map.addEventListener("rightclick", function(e) {
			console.log(e);

			// e.point æ¯ç¹å»ä½ç½®çåç´ åæ
			// e.pixel æ¯ç¹å»ä½ç½®çå°çåæ ï¼ç»çº¬åº¦ï¼
			console.log(e.point);
			console.log(e.pixel);


			var lat = e.latlng.lat; // çº¬åº¦
			var lng = e.latlng.lng; // ç»åº¦


			// å¨æ§å¶å°æå°ç»çº¬åº¦
			console.log("å³é®ç¹å»çç»çº¬åº¦ï¼", `çº¬åº¦: ${lat}, ç»åº¦: ${lng}`);

			// ä½ ä¹å¯ä»¥å°ç»çº¬åº¦æ¾ç¤ºå¨é¡µé¢ä¸
			alert(`å³é®ç¹å»çç»çº¬åº¦ï¼ ${lng}; ${lat}`);
			});
			var scaleCtrl = new BMapGL.ScaleControl(); // æ·»å æ¯ä¾å°ºæ§ä»¶
			map.addControl(scaleCtrl);
			var zoomCtrl = new BMapGL.ZoomControl(); // æ·»å ç¼©æ¾æ§ä»¶
			@@ -301,13 +329,18 @@
			//ç»¿è²çæµï¼æ©è²åºå
			let jizhunzhan = new BMapGL.Icon(jizhun, new BMapGL.Size(30, 30))
			let jiancezhan = new BMapGL.Icon(jiance, new BMapGL.Size(30, 30))
			let onliezhan = new BMapGL.Icon(onlie, new BMapGL.Size(30, 30))
			for (let i = 0; i < tags.length; i++) {
			if (tags[i].lon != null && tags[i].lon != "" && tags[i].lat != null && tags[i].lat != "") {
			if (tags[i].lon.toString().length > 5 && tags[i].lat.toString().length > 4) {
			var marker;
			var label = new BMapGL.Label(tags[i].anchorname + " " + tags[i].tagid, { offset: new BMapGL.Size(0, -40) });
			console.log(tags[i]);

			if (tags[i].type == 0) {
			var rr = c.WGS2BD09({

			if(tags[i].onlie==1){
			var rr = c.WGS2BD09({
			lng: new Number(ToDigital(tags[i].lon.substring(0, 3), tags[i].lon.substring(3, 5), tags[i].lon.substring(5))),
			lat: new Number(ToDigital(tags[i].lat.substring(0, 2), tags[i].lat.substring(2, 4), tags[i].lat.substring(4)))
			});
			@@ -324,8 +357,31 @@
			backgroundColor: "#fa770b",
			transform: 'translateX(-50%)',
			})
			}else{
			var rr = c.WGS2BD09({
			lng: new Number(ToDigital(tags[i].lon.substring(0, 3), tags[i].lon.substring(3, 5), tags[i].lon.substring(5))),
			lat: new Number(ToDigital(tags[i].lat.substring(0, 2), tags[i].lat.substring(2, 4), tags[i].lat.substring(4)))
			});
			var pt = new BMapGL.Point(rr.lng, rr.lat)
			marker = new BMapGL.Marker(pt, {
			icon: onliezhan
			});
			label.setStyle({
			color: "#fff",
			fontSize: "14px",
			borderRadius: "5px",
			padding: "5px 5px",
			border: "0",
			backgroundColor: "#474747",
			transform: 'translateX(-50%)',
			})
			}


			} else {
			var rr = c.WGS2BD09({

			if(tags[i].onlie==1){
			var rr = c.WGS2BD09({
			lng: new Number(ToDigital(tags[i].lon.substring(0, 3), tags[i].lon.substring(3, 5), tags[i].lon.substring(5))),
			lat: new Number(ToDigital(tags[i].lat.substring(0, 2), tags[i].lat.substring(2, 4), tags[i].lat.substring(4)))
			});
			@@ -342,6 +398,26 @@
			backgroundColor: "#32CD32",
			transform: 'translateX(-50%)',
			})
			}else{
			var rr = c.WGS2BD09({
			lng: new Number(ToDigital(tags[i].lon.substring(0, 3), tags[i].lon.substring(3, 5), tags[i].lon.substring(5))),
			lat: new Number(ToDigital(tags[i].lat.substring(0, 2), tags[i].lat.substring(2, 4), tags[i].lat.substring(4)))
			});
			var pt = new BMapGL.Point(rr.lng, rr.lat)
			marker = new BMapGL.Marker(pt, {
			icon: onliezhan
			});
			label.setStyle({
			color: "#fff",
			fontSize: "14px",
			borderRadius: "5px",
			padding: "5px 5px",
			border: "0",
			backgroundColor: "#474747",
			transform: 'translateX(-50%)',
			})
			}

			}
			marker.addEventListener("click", () => {
			this.tagid = tags[i].tagid

			@@ -220,8 +220,16 @@
			search() {
			this.listLoading = true
			searchEquipment(this.listQuery).then(response => {
			this.list = response.data.records
			this.total = response.data.total
			if (response.data!=null) {
			this.list = response.data.records
			this.total = response.data.total
			}else{
			this.$message({
			message: 'æªæç´¢å°æ°æ®',
			type: 'error'
			})
			}

			this.listLoading = false
			})
			},
			@@ -262,6 +270,12 @@
			this.resetTemp()
			this.dialogVisible = true
			this.dialogType = 'modify'
			// this.temp.anchorname = scope.row.anchorname
			// this.temp.companyid = scope.row.companyid
			// this.temp.id = scope.row.id
			// this.temp.needbaseid = scope.row.needbaseid
			// this.temp.tagid = scope.row.tagid
			// this.temp.type = scope.row.type
			this.temp = deepClone(scope.row)
			// this.$nextTick(() => {
			// this.$refs['dataForm'].clearValidate()
			@@ -307,7 +321,7 @@
			if (this.loading) {
			return
			}
			this.temp.companyid=this.temp.company
			this.temp.companyid=this.temp.companyid
			this.loading = true
			this.$refs[this.temp].validate((valid) => {
			if (valid) {

			@@ -243,8 +243,16 @@
			search() {
			this.listLoading = true
			searchEquipment(this.listQuery).then(response => {
			this.list = response.data.records
			this.total = response.data.total
			if (response.data!=null) {
			this.list = response.data.records
			this.total = response.data.total
			}else{
			this.$message({
			message: 'æªæç´¢å°æ°æ®',
			type: 'error'
			})
			}

			this.listLoading = false
			})
			},
			@@ -286,7 +294,18 @@
			this.resetTemp()
			this.dialogVisible = true
			this.dialogType = 'modify'
			console.log(scope.row);
			// this.temp = Object.assign({}, _temp)
			console.log(this.temp);
			console.log(deepClone(scope.row));
			// this.temp.anchorname = scope.row.anchorname

			// this.temp.id = scope.row.id
			// this.temp.needbaseid = scope.row.needbaseid
			// this.temp.tagid = scope.row.tagid
			// this.temp.type = scope.row.type
			this.temp = deepClone(scope.row)
			// this.temp.companyid = scope.row.companyid
			this.disabled=true
			// this.$nextTick(() => {
			// this.$refs['dataForm'].clearValidate()
			@@ -313,7 +332,7 @@
			this.list.splice(scope.$index, 1)
			delEquipment(params).then(response => {
			this.temp.adminname = localStorage.getItem('username') \|\| '';
			const params = { name: this.temp.adminname, content: 'å é¤äºä¸ä¸ªåºåç«ï¼è¯¥ç¼å·ä¸ºï¼'+scope.row.tagid };
			const params = { name: this.temp.adminname, content: 'å é¤äºä¸ä¸ªçæµç«ï¼è¯¥ç¼å·ä¸ºï¼'+scope.row.tagid };
			addSystemOperationLog(params).then(response => {

			})
			@@ -330,20 +349,22 @@
			if (this.loading) {
			return
			}
			this.temp.companyid=this.temp.company
			this.temp.companyid=this.temp.companyid
			this.$refs[this.temp].validate((valid) => {
			if (valid) {
			this.loading = true
			console.log(this.temp);

			addorupEquipment(this.temp).then(() => {
			if (this.temp.id=="") {
			this.temp.adminname = localStorage.getItem('username') \|\| '';
			const params = { name: this.temp.adminname, content: 'æ°å¢äºä¸ä¸ªåºåç«ï¼è¯¥ç¼å·ä¸ºï¼'+this.temp.tagid };
			const params = { name: this.temp.adminname, content: 'æ°å¢äºä¸ä¸ªçæµç«ï¼è¯¥ç¼å·ä¸ºï¼'+this.temp.tagid };
			addSystemOperationLog(params).then(response => {

			})
			} else {
			this.temp.adminname = localStorage.getItem('username') \|\| '';
			const params = { name: this.temp.adminname, content: 'ä¿®æ¹äºä¸ä¸ªåºåç«ï¼è¯¥ç¼å·ä¸ºï¼'+this.temp.tagid };
			const params = { name: this.temp.adminname, content: 'ä¿®æ¹äºä¸ä¸ªçæµç«ï¼è¯¥ç¼å·ä¸ºï¼'+this.temp.tagid };
			addSystemOperationLog(params).then(response => {

			})

			@@ -30,8 +30,10 @@
			</li>
			<li>
			<i><img src="../../assets/images/password.png"></i>
			<input class="forminput" type="password" v-model="loginForm.password" required value=""

			<input class="forminput" :type="passwordType" v-model="loginForm.password" required value=""
			placeholder="å¯ç ">
			<i style="margin-left: 85%;"><img :src="paSrc" alt="" @click="changePassward"></i>
			</li>
			<div id="captcha-box"></div>

			@@ -53,7 +55,7 @@
			</li>
			<li>
			<i><img src="../../assets/images/password.png"></i>
			<input class="forminput" type="password" v-model="yzms" value="" placeholder="è¯·è¾å¥éªè¯ç ">
			<input class="forminput" type="text" v-model="yzms" value="" placeholder="è¯·è¾å¥éªè¯ç ">
			</li>
			<li>
			<el-button v-show="denglu" :loading="loading" type="primary"
			@@ -147,6 +149,8 @@
			export default {
			data() {
			return {
			passwordType: 'password',
			paSrc: require("@/assets/images/login_pass_active.png"),
			imgs: [
			img0,
			img1,
			@@ -237,6 +241,11 @@

			},
			methods: {
			// åæ¢å¯ç æ¾ç¤ºéè
			changePassward() {
			this.passwordType = this.passwordType==='password'?'text':'password';
			this.paSrc = this.paSrc == require("@/assets/images/login_pass_active.png")?require('@/assets/images/login_pass.png'):require("@/assets/images/login_pass_active.png");
			},
			onSuccess() { //æ»åéªè¯éè¿ä¹åè§¦åç
			this.$notify.success("ç»å½æå")
			LoginId="true"

			@@ -1,10 +1,21 @@
			<template>
			<!-- <div v-if="role=='è®¿å®¢'" class="app-container">
			<el-empty description="ææ æé"></el-empty>
			</div> -->
			<div class="app-container">

			<!-- <el-empty description="æè¿°æå"></el-empty> -->

			<el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit height="100%"
			class="table-container" highlight-current-row>
			<el-table-column fixed label="ID" width="80" >
			<template slot-scope="scope">
			{{ scope.row.id }}
			</template>
			</el-table-column>
			<el-table-column label="å¬å¸åç§°" width="200">
			<template slot-scope="scope">
			{{ scope.row.companyname }}
			</template>
			</el-table-column>
			<el-table-column label="å°å¾åç§°" width="90">
			@@ -37,7 +48,7 @@
			{{ scope.row.heig}}
			</template>
			</el-table-column>
			<el-table-column label="ç¦çæä»¶" width="100">
			<el-table-column label="ç¦çæä»¶" width="120">
			<template slot-scope="scope">
			{{ scope.row.file}}
			</template>
			@@ -52,7 +63,7 @@
			{{ scope.row.ishow}}
			</template>
			</el-table-column>
			<el-table-column label="æ´æ°æ¶é´" >
			<el-table-column label="æ´æ°æ¶é´" width="170">
			<template slot-scope="scope">
			{{ scope.row.addtime}}
			</template>
			@@ -108,6 +119,7 @@
			</template>

			<script>

			import Pagination from '@/components/Pagination'
			import { getBaidumapPage, addorupBaidumap,addSystemOperationLog } from '@/api/baidumap'
			import { deepClone } from '@/utils'
			@@ -126,6 +138,7 @@
			},
			data() {
			return {
			role:localStorage.getItem('role'),
			uadd:'',
			udelete:'',
			uupdate:'',
			@@ -136,6 +149,7 @@
			listQuery: {
			current: 1,
			size: 20,
			username:localStorage.getItem('username'),
			keyword: undefined,
			},
			uploadUrl: '',
			@@ -155,6 +169,7 @@
			this.listQuery = {
			current: 1,
			size: 20,
			username:localStorage.getItem('username'),
			keyword: undefined
			}
			this.fetchData()

			@@ -1,5 +1,8 @@
			<template>
			<div class="app-container">
			<div v-if="role=='è®¿å®¢'" class="app-container">
			<el-empty description="ææ æé"></el-empty>
			</div>
			<div v-else class="app-container">
			<div class="filter-container">
			<el-input v-model="listQuery.keyword" size="small" placeholder="è¯·è¾å¥IPå°å" clearable class="filter-item w-200" />
			<el-button-group class="filter-item">
			@@ -108,6 +111,7 @@
			},
			data() {
			return {
			role:localStorage.getItem('role'),
			uadd:'',
			udelete:'',
			uupdate:'',
			@@ -153,8 +157,16 @@
			search() {
			this.listLoading = true
			searchForwardData(this.listQuery).then(response => {
			this.list = response.data.records
			this.total = response.data.total
			if (response.data!=null) {
			this.list = response.data.records
			this.total = response.data.total
			}else{
			this.$message({
			message: 'æªæç´¢å°æ°æ®',
			type: 'error'
			})
			}

			this.listLoading = false
			})
			},

			@@ -233,8 +233,16 @@
			search() {
			this.listLoading = true
			searchUser(this.listQuery).then(response => {
			this.list = response.data.records
			this.total = response.data.total
			if (response.data!=null) {
			this.list = response.data.records
			this.total = response.data.total
			}else{
			this.$message({
			message: 'æªæç´¢å°æ°æ®',
			type: 'error'
			})
			}

			this.listLoading = false
			})
			},