From 0b3d2deb37745ea5dce42fa4a18f22a29d2f4a12 Mon Sep 17 00:00:00 2001 From: fei.wang <wf18701153496@163.com> Date: 星期三, 16 四月 2025 09:13:24 +0800 Subject: [PATCH] v2.0.2更新时间4.16 --- dist/index.html | 2 src/views/dpdv/dpdv.vue | 215 ++- src/views/dpdv/map.vue | 1993 ++++++++++++++++++++------------ src/views/login/login.vue | 4 src/views/retransmission/index.vue | 134 +- src/views/system/settings.vue | 4 src/views/equipment/monitoring.vue | 72 + /dev/null | 1 src/views/alarm/log.vue | 432 ++++-- src/views/alarm/sms.vue | 39 src/views/equipment/difference.vue | 236 ++- src/views/alarm/threshold.vue | 386 ++++- src/views/analysis/index.vue | 133 + 13 files changed, 2,364 insertions(+), 1,287 deletions(-) diff --git a/dist/index.html b/dist/index.html index 575df88..b9f719d 100644 --- a/dist/index.html +++ b/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.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> \ No newline at end of file +<!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.c950a347.js rel=preload as=script><link href=/static/js/chunk-elementUI.63f99718.js rel=preload as=script><link href=/static/js/chunk-libs.c4a5fcd6.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],h=c[1],f=c[2],b=0,o=[];b<d.length;b++)t=d[b],Object.prototype.hasOwnProperty.call(r,t)&&r[t]&&o.push(r[t][0]),r[t]=0;for(u in h)Object.prototype.hasOwnProperty.call(h,u)&&(e[u]=h[u]);k&&k(c);while(o.length)o.shift()();return a.push.apply(a,f||[]),n()}function n(){for(var e,c=0;c<a.length;c++){for(var n=a[c],u=!0,t=1;t<n.length;t++){var d=n[t];0!==r[d]&&(u=!1)}u&&(a.splice(c--,1),e=h(h.s=n[0]))}return e}var u={},t={runtime:0},r={runtime:0},a=[];function d(e){return h.p+"static/js/"+({}[e]||e)+"."+{"chunk-07b38cef":"dbb84645","chunk-0e20b77c":"38dde20a","chunk-176b7762":"0d906918","chunk-6bae1535":"d951b34a","chunk-1d8a5bcf":"f9a6184e","chunk-1f62ac54":"8b264e8b","chunk-2a3f9be0":"56724821","chunk-3b2acc12":"712243f0","chunk-83b30dcc":"ac05bb61","chunk-c1ae4854":"f7d0711d","chunk-89531222":"6c7395a6","chunk-2d0a4d2d":"30a53ba0","chunk-2d0c22ac":"d7972e27","chunk-2d2105d3":"40f39be6","chunk-2d213765":"c81e502a","chunk-2d230fe7":"a331634e","chunk-2edc6a52":"697b1f90","chunk-335bb7b8":"91f555aa","chunk-3bd257ec":"6dcff9e9","chunk-40264523":"8b11903e","chunk-529cb226":"8879bb07","chunk-61f0dab4":"ad43deb6","chunk-636f154d":"13beb7b9","chunk-651b7084":"5cc6556c","chunk-71ab3fbe":"a82bce3b","chunk-72eba88f":"d40044a7","chunk-748ed53f":"9b0f151b","chunk-7c3380c9":"815f3f91","chunk-2d0dd4bc":"d5610926","chunk-9590661c":"92447729","chunk-999939d4":"892463e1","chunk-d49b2eb2":"0c95a8ec","chunk-c5d7f5f4":"46406197"}[e]+".js"}function h(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,h),n.l=!0,n.exports}h.e=function(e){var c=[],n={"chunk-07b38cef":1,"chunk-0e20b77c":1,"chunk-176b7762":1,"chunk-6bae1535":1,"chunk-1d8a5bcf":1,"chunk-1f62ac54":1,"chunk-3b2acc12":1,"chunk-83b30dcc":1,"chunk-c1ae4854":1,"chunk-89531222":1,"chunk-2edc6a52":1,"chunk-335bb7b8":1,"chunk-3bd257ec":1,"chunk-40264523":1,"chunk-529cb226":1,"chunk-61f0dab4":1,"chunk-636f154d":1,"chunk-651b7084":1,"chunk-71ab3fbe":1,"chunk-72eba88f":1,"chunk-748ed53f":1,"chunk-7c3380c9":1,"chunk-9590661c":1,"chunk-999939d4":1,"chunk-c5d7f5f4":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-07b38cef":"0f824ef5","chunk-0e20b77c":"24eb0e50","chunk-176b7762":"6b65c02a","chunk-6bae1535":"77c56283","chunk-1d8a5bcf":"952ec519","chunk-1f62ac54":"e78edaae","chunk-2a3f9be0":"31d6cfe0","chunk-3b2acc12":"1d1ead1b","chunk-83b30dcc":"9d41e4fe","chunk-c1ae4854":"f6d59cd6","chunk-89531222":"0807454c","chunk-2d0a4d2d":"31d6cfe0","chunk-2d0c22ac":"31d6cfe0","chunk-2d2105d3":"31d6cfe0","chunk-2d213765":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-2edc6a52":"2c2f805b","chunk-335bb7b8":"f856109d","chunk-3bd257ec":"c8dfc952","chunk-40264523":"9886cdea","chunk-529cb226":"de96f263","chunk-61f0dab4":"ae290b67","chunk-636f154d":"bcad5d4c","chunk-651b7084":"38b6e585","chunk-71ab3fbe":"af2656e6","chunk-72eba88f":"a4016c15","chunk-748ed53f":"f3bb7dd1","chunk-7c3380c9":"ecc751e7","chunk-2d0dd4bc":"31d6cfe0","chunk-9590661c":"fb99f9de","chunk-999939d4":"27c38f45","chunk-d49b2eb2":"31d6cfe0","chunk-c5d7f5f4":"13a7e89e"}[e]+".css",r=h.p+u,a=document.getElementsByTagName("link"),d=0;d<a.length;d++){var f=a[d],b=f.getAttribute("data-href")||f.getAttribute("href");if("stylesheet"===f.rel&&(b===u||b===r))return c()}var o=document.getElementsByTagName("style");for(d=0;d<o.length;d++){f=o[d],b=f.getAttribute("data-href");if(b===u||b===r)return c()}var k=document.createElement("link");k.rel="stylesheet",k.type="text/css",k.onload=c,k.onerror=function(c){var u=c&&c.target&&c.target.src||r,a=new Error("Loading CSS chunk "+e+" failed.\n("+u+")");a.code="CSS_CHUNK_LOAD_FAILED",a.request=u,delete t[e],k.parentNode.removeChild(k),n(a)},k.href=r;var i=document.getElementsByTagName("head")[0];i.appendChild(k)})).then((function(){t[e]=0})));var u=r[e];if(0!==u)if(u)c.push(u[2]);else{var a=new Promise((function(c,n){u=r[e]=[c,n]}));c.push(u[2]=a);var f,b=document.createElement("script");b.charset="utf-8",b.timeout=120,h.nc&&b.setAttribute("nonce",h.nc),b.src=d(e);var o=new Error;f=function(c){b.onerror=b.onload=null,clearTimeout(k);var n=r[e];if(0!==n){if(n){var u=c&&("load"===c.type?"missing":c.type),t=c&&c.target&&c.target.src;o.message="Loading chunk "+e+" failed.\n("+u+": "+t+")",o.name="ChunkLoadError",o.type=u,o.request=t,n[1](o)}r[e]=void 0}};var k=setTimeout((function(){f({type:"timeout",target:b})}),12e4);b.onerror=b.onload=f,document.head.appendChild(b)}return Promise.all(c)},h.m=e,h.c=u,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 u in e)h.d(n,u,function(c){return e[c]}.bind(null,u));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 f=window["webpackJsonp"]=window["webpackJsonp"]||[],b=f.push.bind(f);f.push=c,f=f.slice();for(var o=0;o<f.length;o++)c(f[o]);var k=b;n()})([]);</script><script src=/static/js/chunk-elementUI.63f99718.js></script><script src=/static/js/chunk-libs.c4a5fcd6.js></script><script src=/static/js/app.c950a347.js></script></body><script src="https://api.map.baidu.com/api?v=2.0&&type=webgl&ak=zoVtgLNWuaZBjMAa32RZRFIagXxST0fm"></script></html> \ No newline at end of file diff --git a/dist/static/css/chunk-7fc5f13f.bf487b84.css b/dist/static/css/chunk-7fc5f13f.bf487b84.css deleted file mode 100644 index cffefec..0000000 --- a/dist/static/css/chunk-7fc5f13f.bf487b84.css +++ /dev/null @@ -1 +0,0 @@ -.pagination-container[data-v-47c26396]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-47c26396]{display:none}.el-upload[data-v-c1f1bf56]{border:1px dashed #d9d9d9!important;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.el-upload .el-icon-plus.avatar-uploader-icon[data-v-c1f1bf56]{border:1px dashed #d9d9d9!important;border-radius:6px;font-size:28px;color:#8c939d;width:128px;height:128px;line-height:128px;text-align:center}.avatar-uploader[data-v-c1f1bf56]{height:128px}.avatar-uploader img[data-v-c1f1bf56]{width:128px;height:128px} \ No newline at end of file diff --git a/src/views/alarm/log.vue b/src/views/alarm/log.vue index 6544610..6e2b64e 100644 --- a/src/views/alarm/log.vue +++ b/src/views/alarm/log.vue @@ -1,8 +1,13 @@ <template> <div class="app-container"> <div class="filter-container"> - <el-input v-model="listQuery.keyword" size="small" placeholder="璇疯緭鍏ヨ澶嘔D/璁惧鍚嶇О" clearable - class="filter-item w-200" /> + <el-input + v-model="listQuery.keyword" + size="small" + placeholder="璇疯緭鍏ヨ澶嘔D/璁惧鍚嶇О" + clearable + class="filter-item w-200" + /> <el-button-group class="filter-item"> <el-button size="small" type="primary" icon="el-icon-search" @click="search"> 鎼滅储 @@ -13,12 +18,22 @@ <el-button size="small" type="primary" icon="el-icon-edit" @click="recordsall"> 鍏ㄩ儴澶勭悊 </el-button> - + <el-button size="small" type="primary" icon="el-icon-delete" @click="deleteall"> + 鍏ㄩ儴鍒犻櫎 + </el-button> </el-button-group> </div> - <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit height="100%" - class="table-container" highlight-current-row> + <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="搴忓彿" width="70"> <template slot-scope="scope"> {{ scope.row.id }} @@ -56,13 +71,11 @@ </template> </el-table-column> <el-table-column label="澶勭悊鎯呭喌" width="90"> - <template slot-scope="scope"> {{ scope.row.status }} </template> </el-table-column> <el-table-column label="澶勭悊鎯呭喌" width="90"> - <template slot-scope="scope"> {{ scope.row.records }} </template> @@ -72,13 +85,29 @@ {{ scope.row.delltime }} </template> </el-table-column> - <el-table-column label="鎿嶄綔" width="200" v-if="uupdate == 'Yes' || udelete == 'Yes'"> + <el-table-column + label="鎿嶄綔" + width="200" + v-if="uupdate == 'Yes' || udelete == 'Yes'" + > <template slot-scope="scope"> <el-button-group> - <el-button v-if="uupdate == 'Yes'" type="primary" icon="el-icon-edit" size="mini" @click="edit(scope)"> + <el-button + v-if="uupdate == 'Yes'" + type="primary" + icon="el-icon-edit" + size="mini" + @click="edit(scope)" + > 澶勭悊 </el-button> - <el-button v-if="udelete == 'Yes'" type="danger" icon="el-icon-delete" size="mini" @click="del(scope)"> + <el-button + v-if="udelete == 'Yes'" + type="danger" + icon="el-icon-delete" + size="mini" + @click="del(scope)" + > 鍒犻櫎 </el-button> </el-button-group> @@ -86,23 +115,41 @@ </el-table-column> </el-table> - <pagination v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" - @pagination="fetchData" /> + <pagination + v-show="total > 0" + :total="total" + :page.sync="listQuery.current" + :limit.sync="listQuery.size" + @pagination="fetchData" + /> - <el-dialog :visible.sync="dialogVisible" :title="dialogType === 'modify' ? '淇敼' : '鏂板'"> + <el-dialog + :visible.sync="dialogVisible" + :title="dialogType === 'modify' ? '淇敼' : '鏂板'" + > <el-form ref="dataForm" :model="temp" label-width="120px" label-position="right"> <el-form-item label="搴忓彿" v-if="dialogType != 'modifyall'"> - <el-input v-model="temp.id - " /> + <el-input v-model="temp.id" /> </el-form-item> <el-form-item label="蹇�熷鐞�"> - <div style="display: flex;"> - <div v-for="option in options" :key="option.value" style="margin-right: 15px;"> - <input type="radio" :id="option.value" :value="option.value" v-model="radio" style="margin-right: 5px;width: 15px;height: 15px;-webkit-appearance: auto;"/> - <label :for="option.value">{{ option.text }}</label> + <div style="display: flex"> + <div v-for="option in options" :key="option.value" style="margin-right: 15px"> + <input + type="radio" + :id="option.value" + :value="option.value" + v-model="radio" + style=" + margin-right: 5px; + width: 15px; + height: 15px; + -webkit-appearance: auto; + " + /> + <label :for="option.value">{{ option.text }}</label> + </div> </div> - </div> - + <!-- <el-radio-group v-model="radio" class="logradio"> <input type="radio" v-model="radio1" style="width: 10px;">鏃犻渶澶勭悊 <input type="radio" v-model="radio2">璇姤 @@ -113,136 +160,190 @@ </el-radio-group> --> </el-form-item> <el-form-item label="澶勭悊璁板綍"> - <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="璇疯緭鍏ュ鐞嗚褰�" v-model="temp.records"> + <el-input + type="textarea" + :autosize="{ minRows: 2, maxRows: 4 }" + placeholder="璇疯緭鍏ュ鐞嗚褰�" + v-model="temp.records" + > </el-input> <!-- <el-input v-model="temp.records " placeholder="璇疯緭鍏ュ鐞嗚褰�" /> --> </el-form-item> </el-form> <div class="text-right"> - <el-button type="danger" @click="dialogVisible = false"> - 鍙栨秷 - </el-button> - <el-button type="primary" @click="submit"> - 纭畾 - </el-button> + <el-button type="danger" @click="dialogVisible = false"> 鍙栨秷 </el-button> + <el-button type="primary" @click="submit"> 纭畾 </el-button> </div> </el-dialog> </div> </template> <script> -import Pagination from '@/components/Pagination' -import { getAlarmrecordPage, delAlarmrecord, addorupAlarmrecord, searchAlarmrecord, addSystemOperationLog, recordsall } from '@/api/Alarmrecord' -import { deepClone } from '@/utils' +import Pagination from "@/components/Pagination"; +import { + getAlarmrecordPage, + delAlarmrecord, + addorupAlarmrecord, + searchAlarmrecord, + addSystemOperationLog, + recordsall, + delAlarmrecordAll, +} from "@/api/Alarmrecord"; +import { deepClone } from "@/utils"; const _temp = { - id: '', - status: '宸插鐞�', - records: '', -} + id: "", + status: "宸插鐞�", + records: "", +}; export default { components: { - Pagination + Pagination, }, data() { return { - selectedOption: '', + selectedOption: "", options: [ - { text: '鏃犻渶澶勭悊', value: '鏃犻渶澶勭悊' }, - { text: '璇姤', value: '璇姤' }, - { text: '宸茶仈绯�', value: '宸茶仈绯�' }, + { text: "鏃犻渶澶勭悊", value: "鏃犻渶澶勭悊" }, + { text: "璇姤", value: "璇姤" }, + { text: "宸茶仈绯�", value: "宸茶仈绯�" }, ], - uadd: '', - udelete: '', - uupdate: '', - radio: '鏃犻渶澶勭悊', + uadd: "", + udelete: "", + uupdate: "", + radio: "鏃犻渶澶勭悊", total: 0, list: [], menus: [], listLoading: true, listQuery: { - username: localStorage.getItem('username') || '', + username: localStorage.getItem("username") || "", current: 1, size: 20, keyword: undefined, - type: 1 + type: 1, }, - uploadUrl: '', + uploadUrl: "", temp: Object.assign({}, _temp), dialogVisible: false, - dialogType: 'create', - loading: false - } + dialogType: "create", + loading: false, + }; }, created() { - this.fetchData() + this.fetchData(); }, methods: { + deleteall() { + if (this.list.length > 0) { + this.$prompt("杈撳叆鍒犻櫎瀵嗙爜", "纭鍏ㄩ儴鍒犻櫎?", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/, + + inputErrorMessage: "瀵嗙爜閿欒", + inputValidator: (value) => { + //input鏍¢獙 + if (value != 20151102) { + return "瀵嗙爜閿欒"; + } + }, + }) + .then(({ value }) => { + console.log(1222222222); + + // const params = { tagid: this.multipleSelection[0].tagid }; + delAlarmrecordAll(this.temp).then((response) => { + console.log(response); + this.temp.adminname = localStorage.getItem('username') || ''; + const params = { name: this.temp.adminname, content: '鍒犻櫎浜嗗叏閮ㄥ憡璀︽棩蹇�'}; + addSystemOperationLog(params).then(response => { + + }) + this.fetchData(); + }); + this.$message({ + type: "success", + message: "鍒犻櫎鎴愬姛!", + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "鍙栨秷鍒犻櫎", + }); + }); + } else { + this.$message({ + type: "info", + message: "褰撳墠宸叉棤鍛婅璁板綍", + }); + } + }, recordsall() { - this.dialogVisible = true - this.dialogType = 'modifyall' + this.dialogVisible = true; + this.dialogType = "modifyall"; }, // 鎼滅储 search() { - this.listLoading = true - searchAlarmrecord(this.listQuery).then(response => { - if (response.data!=null) { - this.list = response.data.records - this.total = response.data.total - }else{ + this.listLoading = true; + searchAlarmrecord(this.listQuery).then((response) => { + if (response.data != null) { + this.list = response.data.records; + this.total = response.data.total; + } else { this.$message({ - message: '鏈悳绱㈠埌鏁版嵁', - type: 'error' - }) + message: "鏈悳绱㈠埌鏁版嵁", + type: "error", + }); } - - this.listLoading = false - }) + + this.listLoading = false; + }); }, refresh() { this.listQuery = { - username: localStorage.getItem('username') || '', + username: localStorage.getItem("username") || "", current: 1, size: 20, - keyword: undefined - } - this.fetchData() + keyword: undefined, + }; + this.fetchData(); }, // 鍒嗛〉鏁版嵁 fetchData() { - this.uadd = localStorage.getItem('uadd') || ''; - this.udelete = localStorage.getItem('udelete') || ''; - this.uupdate = localStorage.getItem('uupdate') || ''; - this.listLoading = true - getAlarmrecordPage(this.listQuery).then(response => { - this.list = response.data.records - this.total = response.data.total - this.listLoading = false - }) + this.uadd = localStorage.getItem("uadd") || ""; + this.udelete = localStorage.getItem("udelete") || ""; + this.uupdate = localStorage.getItem("uupdate") || ""; + this.listLoading = true; + getAlarmrecordPage(this.listQuery).then((response) => { + this.list = response.data.records; + this.total = response.data.total; + this.listLoading = false; + }); }, resetTemp() { - this.temp = Object.assign({}, _temp) + this.temp = Object.assign({}, _temp); }, add() { - this.resetTemp() - this.dialogVisible = true - this.dialogType = 'create' + this.resetTemp(); + this.dialogVisible = true; + this.dialogType = "create"; // this.$nextTick(() => { // this.$refs['dataForm'].clearValidate() // }) }, edit(scope) { - if (scope.row.status == '宸插鐞�') { - this.$message.error('璇ュ憡璀﹀凡澶勭悊'); + if (scope.row.status == "宸插鐞�") { + this.$message.error("璇ュ憡璀﹀凡澶勭悊"); } else { - - this.resetTemp() - this.dialogVisible = true - this.dialogType = 'modify' - this.temp = deepClone(scope.row) + this.resetTemp(); + this.dialogVisible = true; + this.dialogType = "modify"; + this.temp = deepClone(scope.row); // this.$nextTick(() => { // this.$refs['dataForm'].clearValidate() // }) @@ -250,86 +351,88 @@ }, changeStatus(value, scope) { setTimeout(() => { - this.list[scope.$index].status = value + this.list[scope.$index].status = value; this.$message({ - message: '鏇存柊鎴愬姛', - type: 'success' - }) - }, 300) + message: "鏇存柊鎴愬姛", + type: "success", + }); + }, 300); }, // 鍒犻櫎 del(scope) { - this.$confirm('纭鍒犻櫎璇ユ潯鏁版嵁鍚楋紵', '鎻愮ず', { - confirmButtonText: '纭畾', - cancelButtonText: '鍙栨秷', - type: 'warning' + this.$confirm("纭鍒犻櫎璇ユ潯鏁版嵁鍚楋紵", "鎻愮ず", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning", }).then(() => { setTimeout(() => { const params = { id: scope.row.id }; - this.list.splice(scope.$index, 1) - delAlarmrecord(params).then(response => { - this.temp.adminname = localStorage.getItem('username') || ''; - const params = { name: this.temp.adminname, content: '鍒犻櫎浜嗕竴涓憡璀︽棩蹇楋紝璇ヨ澶噄d涓猴細' + scope.row.tagid }; - addSystemOperationLog(params).then(response => { - - }) + this.list.splice(scope.$index, 1); + delAlarmrecord(params).then((response) => { + this.temp.adminname = localStorage.getItem("username") || ""; + const params = { + name: this.temp.adminname, + content: "鍒犻櫎浜嗕竴涓憡璀︽棩蹇楋紝璇ヨ澶噄d涓猴細" + scope.row.tagid, + }; + addSystemOperationLog(params).then((response) => {}); this.$message({ - message: '鍒犻櫎鎴愬姛', - type: 'success' - }) - this.fetchData() - }) - }, 300) - }) + message: "鍒犻櫎鎴愬姛", + type: "success", + }); + this.fetchData(); + }); + }, 300); + }); }, submit() { if (this.loading) { - return + return; } if (!this.temp.records) { - this.temp.records = this.radio + this.temp.records = this.radio; } - if (this.dialogType == 'modifyall') { - this.loading = true + if (this.dialogType == "modifyall") { + this.loading = true; recordsall(this.temp).then(() => { - this.temp.adminname = localStorage.getItem('username') || ''; - const params = { name: this.temp.adminname, content: '澶勭悊浜嗗叏閮ㄥ憡璀︽棩蹇楋紝澶勭悊鎯呭喌涓猴細' + this.temp.records }; - addSystemOperationLog(params).then(response => { - - }) - this.fetchData() + this.temp.adminname = localStorage.getItem("username") || ""; + const params = { + name: this.temp.adminname, + content: "澶勭悊浜嗗叏閮ㄥ憡璀︽棩蹇楋紝澶勭悊鎯呭喌涓猴細" + this.temp.records, + }; + addSystemOperationLog(params).then((response) => {}); + this.fetchData(); setTimeout(() => { this.$message({ - message: '鎻愪氦鎴愬姛', - type: 'success' - }) - this.dialogVisible = false - this.loading = false - }, 300) - }) + message: "鎻愪氦鎴愬姛", + type: "success", + }); + this.dialogVisible = false; + this.loading = false; + }, 300); + }); } else { - this.loading = true + this.loading = true; addorupAlarmrecord(this.temp).then(() => { - this.temp.adminname = localStorage.getItem('username') || ''; - const params = { name: this.temp.adminname, content: '澶勭悊浜嗕竴涓憡璀︽棩蹇楋紝璇ヨ澶噄d涓猴細' + this.temp.tagid }; - addSystemOperationLog(params).then(response => { - - }) - this.fetchData() + this.temp.adminname = localStorage.getItem("username") || ""; + const params = { + name: this.temp.adminname, + content: "澶勭悊浜嗕竴涓憡璀︽棩蹇楋紝璇ヨ澶噄d涓猴細" + this.temp.tagid, + }; + addSystemOperationLog(params).then((response) => {}); + this.fetchData(); setTimeout(() => { this.$message({ - message: '鎻愪氦鎴愬姛', - type: 'success' - }) - this.dialogVisible = false - this.loading = false - }, 300) - }) + message: "鎻愪氦鎴愬姛", + type: "success", + }); + this.dialogVisible = false; + this.loading = false; + }, 300); + }); } - - } - } -} + }, + }, +}; </script> <style lang="scss"> @@ -352,24 +455,25 @@ } } -.aui-checkbox, input[type=radio] { - width: 15px; - height: 15px; - /* -webkit-appearance: none; */ - /* -webkit-user-select: none; */ +.aui-checkbox, +input[type="radio"] { + width: 15px; + height: 15px; + /* -webkit-appearance: none; */ + /* -webkit-user-select: none; */ - /* user-select: none; */ - /* -webkit-transition: background-color .1s ease; */ - /* transition: background-color .1s ease; */ - -ms-flex-negative: 0; - /* flex-shrink: 0; */ - /* border-radius: 0; */ - /* margin: 0 3px 0 0 !important; */ - /* position: relative; */ - -} - input[type=radio]:checked:after, input[type=radio]:checked:before { - content: ""; + /* user-select: none; */ + /* -webkit-transition: background-color .1s ease; */ + /* transition: background-color .1s ease; */ + -ms-flex-negative: 0; + /* flex-shrink: 0; */ + /* border-radius: 0; */ + /* margin: 0 3px 0 0 !important; */ + /* position: relative; */ +} +input[type="radio"]:checked:after, +input[type="radio"]:checked:before { + content: ""; } .avatar-uploader { height: 128px; diff --git a/src/views/alarm/sms.vue b/src/views/alarm/sms.vue index 11c51e1..a7369fd 100644 --- a/src/views/alarm/sms.vue +++ b/src/views/alarm/sms.vue @@ -134,7 +134,18 @@ udelete:'', uupdate:'', bumenoptions: [], - options: [], + options: [ + { + value:'瓒呴槇鍊兼姤璀�', + label:'瓒呴槇鍊兼姤璀�' + }, { + value:'璁惧寮傚父鎶ヨ', + label:'璁惧寮傚父鎶ヨ' + }, { + value:'寮曟搸绂荤嚎鎶ヨ', + label:'寮曟搸绂荤嚎鎶ヨ' + }, + ], total: 0, list: [], menus: [], @@ -208,20 +219,20 @@ this.total = response.data.total this.listLoading = false }) - this.options=[] - getVoicetip().then(response => { - for (let index = 0; index < response.data.length; index++) { - var json = { - value: '', - label: '', - } - const element = response.data[index]; - json.value = element - json.label = element - this.options.push(json) - } + // this.options=[] + // getVoicetip().then(response => { + // for (let index = 0; index < response.data.length; index++) { + // var json = { + // value: '', + // label: '', + // } + // const element = response.data[index]; + // json.value = element + // json.label = element + // this.options.push(json) + // } - }) + // }) this.bumenoptions=[] getbumen().then(response => { for (let index = 0; index < response.data.length; index++) { diff --git a/src/views/alarm/threshold.vue b/src/views/alarm/threshold.vue index 374e2f9..2cdd290 100644 --- a/src/views/alarm/threshold.vue +++ b/src/views/alarm/threshold.vue @@ -9,7 +9,7 @@ <el-button size="small" type="primary" icon="el-icon-refresh" @click="refresh"> 鍒锋柊 </el-button> - <el-button v-if="uadd=='Yes'" size="small" type="primary" icon="el-icon-plus" @click="add"> + <el-button v-if="uadd == 'Yes'" size="small" type="primary" icon="el-icon-plus" @click="add"> 鏂板 </el-button> </el-button-group> @@ -17,48 +17,60 @@ <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="搴忓彿" width="80" > + <el-table-column fixed label="搴忓彿" width="80"> <template slot-scope="scope"> {{ scope.row.id }} </template> </el-table-column> - <el-table-column label="璁惧ID" > + <el-table-column label="璁惧ID"> <template slot-scope="scope"> {{ scope.row.tagid }} </template> </el-table-column> - <el-table-column label="鍚嶇О" > + <el-table-column label="鍚嶇О"> <template slot-scope="scope"> {{ scope.row.alarmname }} </template> </el-table-column> - <el-table-column label="鍏徃" width="180"> + <el-table-column label="鍏徃" width="180"> <template slot-scope="scope"> {{ scope.row.company }} </template> </el-table-column> - <el-table-column label="澶╅槇鍊�" > + <el-table-column label="澶╅槇鍊硷紙姣背锛�"> <template slot-scope="scope"> - {{ scope.row.hdsv}} + {{ scope.row.hdsv }} </template> </el-table-column> - <el-table-column label="鍖楅槇鍊�" > + <el-table-column label="鍖楅槇鍊硷紙姣背锛�"> <template slot-scope="scope"> - {{ scope.row.ndsv}} + {{ scope.row.ndsv }} </template> </el-table-column> - <el-table-column label="涓滈槇鍊�" > + <el-table-column label="涓滈槇鍊硷紙姣背锛�"> <template slot-scope="scope"> - {{ scope.row.edsv}} + {{ scope.row.edsv }} </template> </el-table-column> - <el-table-column label="鎿嶄綔" width="200" v-if="uupdate=='Yes' || udelete=='Yes'"> + + <el-table-column label="鎶ヨ鐢佃瘽"> + <template slot-scope="scope"> + {{ scope.row.phone }} + </template> + </el-table-column> + + <el-table-column label="搴旀�ュ箍鎾悕绉�"> + <template slot-scope="scope"> + {{ scope.row.guangboname }} + </template> + </el-table-column> + <el-table-column label="鎿嶄綔" width="200" v-if="uupdate == 'Yes' || udelete == 'Yes'"> <template slot-scope="scope"> <el-button-group> - <el-button v-if="uupdate=='Yes'" type="primary" icon="el-icon-edit" size="mini" @click="edit(scope)"> + <el-button v-if="uupdate == 'Yes'" type="primary" icon="el-icon-edit" size="mini" @click="edit(scope)"> 淇敼 </el-button> - <el-button v-if="udelete=='Yes'" type="danger" icon="el-icon-delete" size="mini" @click="del(scope)"> + <el-button v-if="udelete == 'Yes'" type="danger" icon="el-icon-delete" size="mini" @click="del(scope)"> 鍒犻櫎 </el-button> </el-button-group> @@ -72,31 +84,70 @@ <el-dialog :visible.sync="dialogVisible" :title="dialogType === 'modify' ? '淇敼' : '鏂板'"> <el-form :ref="temp" :model="temp" label-width="120px" label-position="right" :rules="rules"> <el-form-item label="璁惧ID" prop="tagid"> - <el-input v-model="temp.tagid - " placeholder="璇疯緭鍏ヨ澶嘔D" /> + <!-- <el-input v-model="temp.tagid + " placeholder="璇疯緭鍏ヨ澶嘔D" @change="secode" /> --> + <el-select style="width: 100%;" v-model="temp.tagid" filterable remote placeholder="璇烽�夋嫨璁惧ID" + :remote-method="jzsearchMethod" :loading="searchloading" @change="secode"> + <el-option v-for="item in tagidList" :key="item.tagid" :label="item.tagid" :value="item.tagid"> + </el-option> + </el-select> + +<!-- <el-select style="width: 100%;" v-model="temp.tagid" filterable remote placeholder="璇烽�夋嫨璁惧ID" + :remote-method="jzsearchMethod" :loading="searchloading"> + <el-option v-for="item in tagidList" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </el-select> --> </el-form-item> <el-form-item label="鍚嶇О" prop="alarmname"> <el-input v-model="temp.alarmname - " placeholder="璇疯緭鍏ュ悕绉�" /> + " :disabled="true" placeholder="璇疯緭鍏ュ悕绉�" /> </el-form-item> <el-form-item label="鍏徃" prop="companyid"> - <el-select style="width: 100%;" v-model="temp.companyid" filterable remote placeholder="璇疯緭鍏ュ叧閿瘝" + <!-- <el-select style="width: 100%;" :disabled="true" v-model="temp.companyid" filterable remote placeholder="璇疯緭鍏ュ叧閿瘝" :remote-method="searchMethod" :loading="searchloading"> <el-option v-for="item in options" :key="item.id" :label="item.companyname" :value="item.id"> </el-option> - </el-select> + </el-select> --> + <el-input v-model="company + " :disabled="true" placeholder="璇疯緭鍏ュ叕鍙�" /> </el-form-item> <el-form-item label="涓滀綅绉婚璀﹀��" prop="hdsv"> - <el-input v-model="temp.hdsv - " placeholder="璇疯緭鍏ヤ笢浣嶇Щ棰勮鍊�" type="number"/> + <el-input v-model="temp.edsv + " placeholder="璇疯緭鍏ヤ笢浣嶇Щ棰勮鍊硷紙鍗曚綅姣背锛�" type="number" /> + </el-form-item> <el-form-item label="鍖椾綅绉婚璀﹀��" prop="ndsv"> <el-input v-model="temp.ndsv - " placeholder="璇疯緭鍏ュ寳浣嶇Щ棰勮鍊�" type="number"/> + " placeholder="璇疯緭鍏ュ寳浣嶇Щ棰勮鍊硷紙鍗曚綅姣背锛�" type="number" /> </el-form-item> <el-form-item label="澶╀綅绉婚璀﹀��" prop="edsv"> - <el-input v-model="temp.edsv - " placeholder="璇疯緭鍏ュぉ浣嶇Щ棰勮鍊�" type="number"/> + <el-input v-model="temp.hdsv + " placeholder="璇疯緭鍏ュぉ浣嶇Щ棰勮鍊硷紙鍗曚綅姣背锛�" type="number" /> + </el-form-item> + + <el-form-item label="鍛婅鐢佃瘽" prop="phone"> + + <el-select style="width: 100%;" v-model="temp.phone" filterable remote placeholder="璇烽�夋嫨鎶ヨ浜虹數璇�" + :remote-method="searchphMethod" :loading="searchloading"> + <el-option v-for="item in phopneoptions" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </el-select> + <!-- <el-select style="width: 100%;" v-model="temp.phone" placeholder="璇烽�夋嫨"> + <el-option v-for="item in phopneoptions" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </el-select> --> + </el-form-item> + + <el-form-item label="搴旀�ュ箍鎾�" > + <el-select style="width: 100%;" v-model="temp.guangboid" filterable remote placeholder="璇烽�夋嫨鎾斁搴旀�ュ箍鎾紪鍙�" + :remote-method="searchgbMethod" :loading="searchloading"> + <el-option v-for="item in gaungboList" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </el-select> + <!-- <el-select style="width: 100%;" v-model="temp.guangboid" placeholder="璇烽�夋嫨"> + <el-option v-for="item in gaungboList" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </el-select> --> </el-form-item> </el-form> <div class="text-right"> @@ -113,7 +164,7 @@ <script> import Pagination from '@/components/Pagination' -import { getAlarmsystemPage, delAlarmsystem, addorupAlarmsystem, search,searchAlarmsystem,addSystemOperationLog } from '@/api/threshold' +import { getAlarmsystemPage, delAlarmsystem, addorupAlarmsystem, search, searchAlarmsystem, addSystemOperationLog, getGuangbo, getdevicestate,getDuanxin,getDuanxinfive,getGuangbofive,jzsearchfive,jzsearch } from '@/api/threshold' import { deepClone } from '@/utils' const _temp = { @@ -123,7 +174,7 @@ ndsv: '', edsv: '', companyid: '', - alarmname:'', + alarmname: '', } export default { @@ -132,12 +183,16 @@ }, data() { return { - uadd:'', - udelete:'', - uupdate:'', + tagidList:[], + company: '', + uadd: '', + udelete: '', + uupdate: '', total: 0, list: [], menus: [], + phopneoptions: [], + gaungboList: [], options: [], searchloading: false, listLoading: true, @@ -154,32 +209,175 @@ loading: false, rules: { tagid: [ - { required: true, message: '璇疯緭鍏ヨ澶嘔D', trigger: 'blur' }, - ], - alarmname: [ - { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' }, - ], - companyid: [ - { required: true, message: '璇烽�夋嫨鍏徃', trigger: 'change' } - ], - hdsv: [ - { required: true, message: '璇疯緭鍏ヤ笢浣嶇Щ棰勮鍊�', trigger: 'blur' } - ], - edsv: [ - { required: true, message: '璇疯緭鍏ュぉ浣嶇Щ棰勮鍊�', trigger: 'change' } - ], - ndsv: [ - { required: true, message: '璇疯緭鍏ュ寳浣嶇Щ棰勮鍊�', trigger: 'blur' } - ] - }, + { required: true, message: '璇疯緭鍏ヨ澶嘔D', trigger: 'blur' }, + ], + alarmname: [ + { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' }, + ], + companyid: [ + { required: true, message: '璇烽�夋嫨鍏徃', trigger: 'change' } + ], + hdsv: [ + { required: true, message: '璇疯緭鍏ヤ笢浣嶇Щ棰勮鍊�', trigger: 'blur' } + ], + edsv: [ + { required: true, message: '璇疯緭鍏ュぉ浣嶇Щ棰勮鍊�', trigger: 'change' } + ], + ndsv: [ + { required: true, message: '璇疯緭鍏ュ寳浣嶇Щ棰勮鍊�', trigger: 'blur' } + ], + guangboid: [ + { required: true, message: '璇疯緭鍏ュ簲鎬ュ箍鎾紪鍙�', trigger: 'blur' } + ], + phone: [ + { required: true, message: '璇疯緭鍏ュ憡璀︾數璇�', trigger: 'blur' } + ] + }, } }, created() { this.fetchData() }, methods: { - // 杩滅▼鎼滅储 - searchMethod(query) { + + secode(event) { + if (event !== '') { + this.loading = true; + var params = { tagid: event } + getdevicestate(params).then(response => { + console.log(response); + if (response.data.dataList2 == null || response.data.dataList2.type != 1) { + this.$message({ + message: '缂栧彿閿欒', + type: 'error' + }) + } else { + this.temp.alarmname = response.data.dataList2.anchorname + this.temp.companyid = response.data.dataList2.companyid + this.company = response.data.dataList2.company + } + }) + } else { + // this.options = []; + } + }, + + searchgbMethod(query) { + if (query !== '') { + var params = { query: query } + this.gaungboList=[] + getGuangbo(params).then(response => { + for (let index = 0; index < response.data.length; index++) { + var json = { + value: '', + label: '', + } + const element = response.data[index]; + json.value = element + json.label = element + this.gaungboList.push(json) + } + + }) + } else { + this.gaungboList = []; + } + }, + + searchphMethod(query) { + if (query !== '') { + this.phopneoptions=[] + var params = { query: query } + + getDuanxin(params).then(response => { + for (let index = 0; index < response.data.length; index++) { + var json = { + value: '', + label: '', + } + const element = response.data[index]; + json.value = element + json.label = element + this.phopneoptions.push(json) + } + + }) + } else { + this.phopneoptions = []; + } + }, + + // 杩滅▼鎼滅储 + jzsearchMethod(query) { + if (query !== '') { + this.loading = true; + var params = { type: '1' } + jzsearch(params).then(response => { + this.tagidList = response.data; + this.loading = false; + }) + } else { + this.tagidList = []; + } + }, + // 杩滅▼鎼滅储 + jzsearchMethodfive() { + + this.loading = true; + var params = { type: '1' } + jzsearchfive(params).then(response => { + this.tagidList = response.data; + this.loading = false; + }) + + }, + + searchgbMethodfive(query) { + if (query !== '') { + var params = { query: query } + this.gaungboList=[] + getGuangbofive(params).then(response => { + for (let index = 0; index < response.data.length; index++) { + var json = { + value: '', + label: '', + } + const element = response.data[index]; + json.value = element + json.label = element + this.gaungboList.push(json) + } + + }) + } else { + this.gaungboList = []; + } + }, + + searchphMethodfive(query) { + if (query !== '') { + this.phopneoptions=[] + var params = { query: query } + + getDuanxinfive(params).then(response => { + for (let index = 0; index < response.data.length; index++) { + var json = { + value: '', + label: '', + } + const element = response.data[index]; + json.value = element + json.label = element + this.phopneoptions.push(json) + } + + }) + } else { + this.phopneoptions = []; + } + }, + // 杩滅▼鎼滅储 + searchMethod(query) { if (query !== '') { this.loading = true; var params = { query: query } @@ -195,16 +393,16 @@ search() { this.listLoading = true searchAlarmsystem(this.listQuery).then(response => { - if (response.data!=null) { + if (response.data != null) { this.list = response.data.records this.total = response.data.total - }else{ + } else { this.$message({ message: '鏈悳绱㈠埌鏁版嵁', type: 'error' }) } - + this.listLoading = false }) }, @@ -228,6 +426,12 @@ this.total = response.data.total this.listLoading = false }) + + this.searchphMethodfive() + +this.jzsearchMethodfive() + this.searchgbMethodfive() + }, resetTemp() { this.temp = Object.assign({}, _temp) @@ -270,10 +474,10 @@ this.list.splice(scope.$index, 1) delAlarmsystem(params).then(response => { this.temp.adminname = localStorage.getItem('username') || ''; - const params = { name: this.temp.adminname, content: '鍒犻櫎浜嗕竴涓姤璀﹂槇鍊硷紝璇ヨ澶噄d涓猴細'+scope.row.tagid }; + const params = { name: this.temp.adminname, content: '鍒犻櫎浜嗕竴涓姤璀﹂槇鍊硷紝璇ヨ澶噄d涓猴細' + scope.row.tagid }; addSystemOperationLog(params).then(response => { - }) + }) this.$message({ message: '鍒犻櫎鎴愬姛', type: 'success' @@ -284,46 +488,54 @@ }) }, submit() { - if (this.loading) { - return - } + // if (this.loading) { + // return + // } this.loading = true this.$refs[this.temp].validate((valid) => { if (valid) { - addorupAlarmsystem(this.temp).then(() => { - if (this.temp.id=="") { - this.temp.adminname = localStorage.getItem('username') || ''; - const params = { name: this.temp.adminname, content: '鏂板浜嗕竴涓姤璀﹂槇鍊硷紝璇ヨ澶噄d涓猴細'+this.temp.tagid }; - addSystemOperationLog(params).then(response => { - - }) - } else { - this.temp.adminname = localStorage.getItem('username') || ''; - const params = { name: this.temp.adminname, content: '淇敼浜嗕竴涓姤璀﹂槇鍊硷紝璇ヨ澶噄d涓猴細'+this.temp.tagid }; - addSystemOperationLog(params).then(response => { - - }) - } - this.fetchData() - - setTimeout(() => { - this.$message({ - message: '鎻愪氦鎴愬姛', - type: 'success' + addorupAlarmsystem(this.temp).then((response) => { + if (response.data==-1) { + this.$message({ + message: '褰撳墠璁惧id宸插瓨鍦紝璇烽噸鏂拌緭鍏ワ紒', + type: 'error' }) - this.dialogVisible = false - this.loading = false - }, 300) - }) - } else { - this.$message({ + return + } + + if (this.temp.id == "") { + this.temp.adminname = localStorage.getItem('username') || ''; + const params = { name: this.temp.adminname, content: '鏂板浜嗕竴涓姤璀﹂槇鍊硷紝璇ヨ澶噄d涓猴細' + this.temp.tagid }; + addSystemOperationLog(params).then(response => { + + }) + } else { + this.temp.adminname = localStorage.getItem('username') || ''; + const params = { name: this.temp.adminname, content: '淇敼浜嗕竴涓姤璀﹂槇鍊硷紝璇ヨ澶噄d涓猴細' + this.temp.tagid }; + addSystemOperationLog(params).then(response => { + + }) + } + this.fetchData() + + setTimeout(() => { + this.$message({ + message: '鎻愪氦鎴愬姛', + type: 'success' + }) + this.dialogVisible = false + this.loading = false + }, 300) + }) + } else { + this.$message({ message: '鎻愪氦澶辫触锛岃妫�鏌ヨ〃鍗曞繀濉」鏄惁涓虹┖', type: 'error' }) - console.log('error submit!!'); - return false; - } - }); + console.log('error submit!!'); + return false; + } + }); } } } diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue index 6b5496e..92c50aa 100644 --- a/src/views/analysis/index.vue +++ b/src/views/analysis/index.vue @@ -26,14 +26,19 @@ <el-button style="margin-left: 10px;" type="primary" @click="exportExcel">瀵煎嚭EXCEL</el-button> + <el-button style="margin-left: 10px;" type="primary" @click="resetinitv">閲嶇疆鍒濆鍊�</el-button> + </span> </div> <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit height="100%" - class="table-container" highlight-current-row> + class="table-container" highlight-current-row @selection-change="handleSelectionChange"> + <el-table-column type="selection" width="55"> + </el-table-column> <el-table-column fixed label="搴忓彿" width="80"> + <template slot-scope="scope"> {{ scope.row.id }} </template> @@ -80,6 +85,11 @@ </el-table-column> + <el-table-column label="鍒濆鍊间笢鍖楀ぉ" width="250"> + <template slot-scope="scope"> + {{ scope.row.ed + ';' + scope.row.nd + ';' + scope.row.td }} + </template> + </el-table-column> <el-table-column label="娣诲姞鏃堕棿"> <template slot-scope="scope"> {{ scope.row.addtime }} @@ -111,7 +121,7 @@ <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> + + this.tagid + "鍙樺寲瓒嬪娍鍥�" }}</span> <line-chart :chart-data="lineChartData" /> @@ -124,7 +134,7 @@ import { formatTime1 } from "@/utils/index.js"; //鏃ユ湡鏍煎紡杞崲 import LineChart from "./components/LineChart"; import Pagination from '@/components/Pagination' -import { getList, searcheveryday, handlechart2, handlechartupdate3,handlechartupdate2 } from '@/api/analysis' +import { getList, searcheveryday, handlechart2, handlechartupdate3, handlechartupdate2,resetinitv } from '@/api/analysis' import { deepClone } from '@/utils' const lineChartData = { @@ -197,7 +207,7 @@ time: undefined, }, uploadUrl: '', - + multipleSelection: [], dialogVisible: false, dialogType: 'create', loading: false @@ -207,40 +217,87 @@ this.fetchData() }, methods: { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + resetinitv() { + console.log("閲嶇疆鍒濆鍊�"); + console.log(this.multipleSelection); + if (this.multipleSelection.length == 0) { + this.$message({ + message: '璇峰厛閫夋嫨涓�鏉℃暟鎹�', + type: 'error' + }) + } else if (this.multipleSelection.length > 1) { + this.$message({ + message: '璇烽�夋嫨涓�鏉℃暟鎹�', + type: 'error' + }) + + + }else{ + + this.$confirm('浣犲皢纭畾灏�' + this.multipleSelection[0].tagid + ' 缂栧彿璁惧閲嶇疆鍒濆鍊间负' + this.multipleSelection[0].ed + ';' + this.multipleSelection[0].nd + ';' + this.multipleSelection[0].td + ' 鍚�?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning', + center: true + }).then(() => { + + const params = { tagid: this.multipleSelection[0].tagid , initv: this.multipleSelection[0].ed + ';' + this.multipleSelection[0].nd + ';' + this.multipleSelection[0].td }; + resetinitv(params).then(response => { +console.log(response); + + + }) + this.$message({ + type: 'success', + message: '閲嶇疆鎴愬姛!' + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '宸插彇娑堥噸缃�' + }); + }); + + } + + }, 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); + 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() { }, @@ -253,7 +310,7 @@ 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 }) @@ -478,16 +535,16 @@ search() { this.listLoading = true searcheveryday(this.listQuery).then(response => { - if (response.data!=null) { + if (response.data != null) { this.list = response.data.records this.total = response.data.total - }else{ + } else { this.$message({ message: '鏈悳绱㈠埌鏁版嵁', type: 'error' }) } - + this.listLoading = false }) }, diff --git a/src/views/dpdv/dpdv.vue b/src/views/dpdv/dpdv.vue index e01a4ff..d0eb566 100644 --- a/src/views/dpdv/dpdv.vue +++ b/src/views/dpdv/dpdv.vue @@ -77,17 +77,22 @@ @click="monitorvisible = false">鍏抽棴</el-button> <el-divider content-position="right"></el-divider> <!-- <dv-border-box-12 class="monitor" style="position: absolute;z-index: 2004;"> --> - <el-table class="dptable" :data="monitorGridData" height="250" style=" overflow: auto;" > + <el-table class="dptable" :data="monitorGridData" height="250" style=" overflow: auto;"> <el-table-column width="80" property="date" label="缂栧彿"><template slot-scope="scope"> {{ scope.row.tagid }} </template></el-table-column> <el-table-column width="150" property="name" label="鍚嶇О"> <template slot-scope="scope"> {{ scope.row.anchorname }} </template></el-table-column> - <el-table-column width="80" property="address" label="鐘舵��"> <template slot-scope="scope"> - <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online.png"></span> + <el-table-column width="120" property="address" label="鐘舵��"> <template slot-scope="scope"> + <!-- <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online.png"></span> <span v-else-if="scope.row.onlie == '0'"><img - src="../../assets/images/offline.png"></span> + src="../../assets/images/offline.png"></span> --> + <span v-if="scope.row.onlie == '1'">鍦ㄧ嚎</span> + <span v-else-if="scope.row.onlie == '0'">绂荤嚎</span> + <span v-else-if="scope.row.onlie == '4'">楂樼簿搴�</span> + <span v-else-if="scope.row.onlie == '6'">瓒呴槇鍊煎憡璀�</span> + <span v-else-if="scope.row.onlie == '7'">闈為珮绮惧害鍛婅</span> </template></el-table-column> <el-table-column width="150" property="address" label="鏃堕棿"> <template slot-scope="scope"> <span>{{ scope.row.addtime }}</span> @@ -96,7 +101,7 @@ <!-- </dv-border-box-12> --> <el-button class="title_right_monitor" type="text" style="color: aliceblue; font-size: 30px;" slot="reference">{{ - monitorNum }}</el-button> + monitorNum }}</el-button> <!-- <span class="title_right_monitor" slot="reference" @click="monitorNumList">{{ monitorNum }}</span> --> </el-popover> @@ -113,10 +118,15 @@ <el-table-column width="150" property="name" label="鍚嶇О"> <template slot-scope="scope"> {{ scope.row.anchorname }} </template></el-table-column> - <el-table-column width="80" property="address" label="鐘舵��"> <template slot-scope="scope"> - <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online.png"></span> + <el-table-column width="120" property="address" label="鐘舵��"> <template slot-scope="scope"> + <!-- <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online.png"></span> <span v-else-if="scope.row.onlie == '0'"><img - src="../../assets/images/offline.png"></span> + src="../../assets/images/offline.png"></span> --> + <span v-if="scope.row.onlie == '1'">鍦ㄧ嚎</span> + <span v-else-if="scope.row.onlie == '0'">绂荤嚎</span> + <span v-else-if="scope.row.onlie == '4'">楂樼簿搴�</span> + <span v-else-if="scope.row.onlie == '6'">瓒呴槇鍊煎憡璀�</span> + <span v-else-if="scope.row.onlie == '7'">闈為珮绮惧害鍛婅</span> </template></el-table-column> <el-table-column width="150" property="address" label="鏃堕棿"> <template slot-scope="scope"> <span>{{ scope.row.addtime }}</span> @@ -125,7 +135,7 @@ <!-- </dv-border-box-12> --> <el-button class="title_right_standard" type="text" style="color: aliceblue; font-size: 30px;" slot="reference">{{ - standardNum }}</el-button> + standardNum }}</el-button> <!-- <span class="title_right_standard" slot="reference">{{ standardNum }}</span> --> <!-- <span class="title_right_monitor" @click="monitorNumList">{{ monitorNum }}</span> --> </el-popover> @@ -143,10 +153,16 @@ <el-table-column width="150" property="name" label="鍚嶇О"> <template slot-scope="scope"> {{ scope.row.anchorname }} </template></el-table-column> - <el-table-column width="80" property="address" label="鐘舵��"> <template slot-scope="scope"> - <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online.png"></span> + <el-table-column width="120" property="address" label="鐘舵��"> <template slot-scope="scope"> + <!-- <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online.png"></span> <span v-else-if="scope.row.onlie == '0'"><img - src="../../assets/images/offline.png"></span> + src="../../assets/images/offline.png"></span> --> + + <span v-if="scope.row.onlie == '1'">鍦ㄧ嚎</span> + <span v-else-if="scope.row.onlie == '0'">绂荤嚎</span> + <span v-else-if="scope.row.onlie == '4'">楂樼簿搴�</span> + <span v-else-if="scope.row.onlie == '6'">瓒呴槇鍊煎憡璀�</span> + <span v-else-if="scope.row.onlie == '7'">闈為珮绮惧害鍛婅</span> </template></el-table-column> <el-table-column width="150" property="address" label="绂荤嚎鏃堕棿"> <template slot-scope="scope"> <span>{{ scope.row.addtime }}</span> @@ -155,7 +171,7 @@ <!-- </dv-border-box-12> --> <el-button class="title_right_offline" type="text" style="color: aliceblue; font-size: 30px;" slot="reference">{{ - offlineNum }}</el-button> + offlineNum }}</el-button> <!-- <span class="title_right_offline" slot="reference">{{ offlineNum }}</span> --> <!-- <span class="title_right_offline" >{{ offlineNum }}</span> --> <!-- <span class="title_right_monitor" @click="monitorNumList">{{ monitorNum }}</span> --> @@ -177,7 +193,7 @@ <el-table-column width="80" property="address" label="鎶ヨ绫诲瀷"> <template slot-scope="scope"> {{ scope.row.alarmtype }} </template></el-table-column> - <el-table-column width="80" property="address" label="澶勭悊鐘舵��"> <template slot-scope="scope"> + <el-table-column width="80" property="address" label="澶勭悊鐘舵��"> <template slot-scope="scope"> {{ scope.row.status }} </template></el-table-column> <el-table-column width="150" property="address" label="鏃堕棿"> <template slot-scope="scope"> @@ -200,7 +216,7 @@ <!-- </dv-border-box-12> --> <el-button class="title_right_alarm" type="text" style="color: aliceblue; font-size: 30px;" slot="reference">{{ - alarmNum }}</el-button> + alarmNum }}</el-button> <!-- <span class="title_right_alarm" slot="reference">{{ alarmNum }}</span> --> <!-- <span class="title_right_offline" >{{ offlineNum }}</span> --> <!-- <span class="title_right_offline" >{{ offlineNum }}</span> --> @@ -247,14 +263,19 @@ </el-table-column> --> <el-table-column label="璁惧鐘舵��" width="160" align="center"> <template slot-scope="scope"> - <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online.png"></span> - <span v-else-if="scope.row.onlie == '0'"><img src="../../assets/images/offline.png"></span> + <!-- <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online.png"></span> + <span v-else-if="scope.row.onlie == '0'"><img src="../../assets/images/offline.png"></span> --> + <span v-if="scope.row.onlie == '1'">鍦ㄧ嚎</span> + <span v-else-if="scope.row.onlie == '0'">绂荤嚎</span> + <span v-else-if="scope.row.onlie == '4'">楂樼簿搴�</span> + <span v-else-if="scope.row.onlie == '6'">瓒呴槇鍊煎憡璀�</span> + <span v-else-if="scope.row.onlie == '7'">闈為珮绮惧害鍛婅</span> </template> </el-table-column> <el-table-column label="鍗槦鏁�" align="center"> <template slot-scope="scope"> - <span>{{ scope.row.gpsnum }}</span> + <span>{{ scope.row.gpsnum+"/"+scope.row.gpsstate }}</span> </template> </el-table-column> <el-table-column label="鍒嗘瀽鏃堕棿" align="center"> @@ -285,13 +306,13 @@ <el-dialog :modal="false" :visible.sync="processingdialogVisible" title="澶勭悊"> - + <el-form ref="dataForm" :model="temp" label-width="120px" label-position="right"> <el-form-item label="搴忓彿"> <el-input v-model="temp.id - " /> + " /> </el-form-item> - <el-form-item label="蹇�熷鐞�" > + <el-form-item label="蹇�熷鐞�"> <el-radio-group v-model="radio" v-removeAriaHidden class="dpradio"> <el-radio :label="3" class="dpradio">鏃犻渶澶勭悊</el-radio> <el-radio :label="6" class="dpradio">璇姤</el-radio> @@ -316,7 +337,7 @@ <!-- 鏌ョ湅瀵硅瘽妗� --> <!-- <el-dialog :modal="false" :visible.sync="dialogVisible" :title="dialogType === 'view' ? '鏌ョ湅' : '鏂板'" custom-class="lineChart"> --> - <!-- <el-form ref="dataForm" :model="temp" label-width="120px" label-position="right"> + <!-- <el-form ref="dataForm" :model="temp" label-width="120px" label-position="right"> <el-form-item label="缂栧彿"> <el-input v-model="temp.tagid" readonly /> </el-form-item> @@ -336,19 +357,22 @@ <el-input v-model="temp.gpsnum" readonly /> </el-form-item> </el-form> --> - - <div class="lineChart" v-if="dialogVisible" style="background-color:rgb(8, 17, 56) ;"> - <span style=" display: flex;justify-content: center;align-items: center;font-size: 25px;margin-top: 20px;"> {{ temp.anchorname+"-" +temp.tagid+"鍙樺寲瓒嬪娍鍥�"}}</span> - - <el-button type="text" class="monitor_left_bnt" - style="position: absolute;right: 20px;top: 0;font-size: 25px;" - @click="dialogVisible = false">鍏抽棴</el-button> - <el-divider content-position="right"></el-divider> - <line-chart :chart-data="lineChartData" height="85%" /> - <!-- <el-button type="primary" @click="dialogVisible = false"> + + <div class="lineChart" v-if="dialogVisible" style="background-color:rgb(8, 17, 56) ;"> + <span + style=" display: flex;justify-content: center;align-items: center;font-size: 25px;margin-top: 20px;"> + {{ + temp.anchorname + "-" + temp.tagid+"鍙樺寲瓒嬪娍鍥�"}}</span> + + <el-button type="text" class="monitor_left_bnt" + style="position: absolute;right: 20px;top: 0;font-size: 25px;" + @click="dialogVisible = false">鍏抽棴</el-button> + <el-divider content-position="right"></el-divider> + <line-chart :chart-data="lineChartData" height="85%" /> + <!-- <el-button type="primary" @click="dialogVisible = false"> 鍏抽棴 </el-button> --> - </div> + </div> <!-- </el-dialog> --> </div> <!-- </dv-full-screen-container> --> @@ -459,7 +483,7 @@ import Pagination from '@/components/Pagination' import drawMixin from "@/utils/drawMixin"; //鑷�傚簲缂╂斁 import { formatTime1 } from "@/utils/index.js"; //鏃ユ湡鏍煎紡杞崲 -import { getList, getEquipment, alldevice, getdevicestate, getsystem,getEquipmentmonitor,getEquipmenttwo } from '@/api/user' +import { getList, getEquipment, alldevice, getdevicestate, getsystem, getEquipmentmonitor, getEquipmenttwo } from '@/api/user' import { deepClone } from '@/utils' import { handlechart2, handlechartupdate3 } from '@/api/analysis' const lineChartData = { @@ -489,7 +513,7 @@ }, data() { return { - month:'', + month: '', barChartData: { tagid: '', ed: [], @@ -553,7 +577,7 @@ offlineNum: 0,//绂荤嚎璁惧 alarmNum: 0,//鎶ヨ鏉℃暟 messageNum: 0,//鎶ユ枃鏉℃暟 - alerttime:'', + alerttime: '', total: 0, dialogVisible: false, dialogType: 'view', @@ -565,7 +589,7 @@ }, created() { console.log(333333333); - + this.fetchData() this.monitordata() }, @@ -574,7 +598,7 @@ const params = { username: localStorage.getItem('username'), phone: localStorage.getItem('phone') }; alldevice(params).then(response => { console.log(response.data.dataList); - + this.initMap(response.data.dataList, response.data.view) }) @@ -693,9 +717,9 @@ fetchData() { const params = { csname: localStorage.getItem('username'), phone: localStorage.getItem('phone') }; getsystem(params).then(response => { - if (response.data.systemname!=null) { + if (response.data.systemname != null) { localStorage.setItem('systemname', response.data.systemname); - }else{ + } else { localStorage.setItem('systemname', response.data.systemname); } this.systemname = response.data.systemname @@ -707,14 +731,14 @@ getEquipmentmonitor(params1).then(response => { console.log(4444444); this.list = response.data -console.log(response); -this.listLoading = false + console.log(response); + this.listLoading = false }) const params2 = { username: localStorage.getItem('username'), phone: localStorage.getItem('phone') }; getEquipmenttwo(params2).then(response => { console.log(5555555555); - this.processBarModel = [] + this.processBarModel = [] // this.list = response.data var json = { edmm: [], @@ -737,7 +761,7 @@ json.winmin = response.data[index].winmin } this.barChartData = json -console.log(response); + console.log(response); }) // getList(this.listQuery).then(response => { @@ -768,6 +792,9 @@ // this.total = response.data.total // this.listLoading = false // }) + setTimeout(() => { + this.fetchData() + }, 10000); }, //鍙充晶鏁版嵁 monitordata() { @@ -784,11 +811,11 @@ this.alarmNum = response.data.alarmNum this.messageNum = response.data.messageNum this.alerttime = response.data.alerttime - + }) setTimeout(() => { this.monitordata() - }, 15000); + }, 10000); }, resetTemp() { this.temp = Object.assign({}, _temp) @@ -801,22 +828,22 @@ var new_year = currentDate.getFullYear(); // 鍙栧綋鍓嶇殑骞翠唤锛堝疄闄呮槸杈撳叆鏃ユ湡鐨勫勾浠斤級 var month = currentDate.getMonth(); // 鑾峰彇鏈堜唤锛�0-11锛� var new_month = month + 1; // 灏嗘湀浠借浆鎹负鍙鐨勬牸寮忥紙1-12锛� - this.month=new_month + this.month = new_month // 鑾峰彇褰撴湀鐨勭涓�澶� var firstDay = new Date(new_year, new_month - 6, 1); // 鏈堜唤闇�瑕佸噺1锛屽洜涓篻etMonth()杩斿洖鐨勬槸0-11 const newDate = formatTime1(firstDay, "yyyy-MM-dd"); //鑾峰彇褰撳墠骞存湀鏃� const dateYear = formatTime1(new Date(), "yyyy-MM-dd"); - const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '' ,tagid:scope.row.tagid}; + const params = { date1: dateYear, date2: newDate, username: localStorage.getItem('username') || '', tagid: scope.row.tagid }; console.log(params); - + handlechartupdate3(params).then(response => { this.lineChartData = response.data console.log(response.data); this.dialogVisible = true }) this.resetTemp() - + this.dialogType = 'view' this.temp = deepClone(scope.row) // this.$nextTick(() => { @@ -836,26 +863,26 @@ }, //璺宠浆鍚庡彴 backstage() { - - window.open('/#/large/dashboard'); + + window.open('/#/large/dashboard'); // window.open('/dashboard'); // window.open('http://localhost:8084/#/dashboard'); // this.$router.push({ path: '/dashboard' }) }, - //閫�鍑� -// backout() { - backout() { - this.$store.dispatch('user/logout') - this.$router.push(`/login?redirect=${this.$route.fullPath}`) - }, + //閫�鍑� + // backout() { + backout() { + this.$store.dispatch('user/logout') + this.$router.push(`/login?redirect=${this.$route.fullPath}`) + }, // window.open('/#/large/dashboard'); - // window.open('/dashboard'); - // window.open('http://localhost:8084/#/dashboard'); - // this.$router.push({ path: '/dashboard' }) + // window.open('/dashboard'); + // window.open('http://localhost:8084/#/dashboard'); + // this.$router.push({ path: '/dashboard' }) - // }, - + // }, + //褰撳墠鏃堕棿 timeFn() { this.timing = setInterval(() => { @@ -899,7 +926,6 @@ </script> <style lang="scss" scoped> - #index { color: #d3d6dd; // width: 118%; @@ -944,6 +970,7 @@ height: 80px; background: url(../../assets/images/topright.png) no-repeat; } + .right { position: absolute; top: 100px; @@ -1036,16 +1063,17 @@ margin-top: 69px; margin-left: 68px; } - .el-radio__input { - white-space: nowrap; - cursor: pointer; - outline: none; - display: inline-block; - line-height: 1; - position: relative; - vertical-align: middle; -} + .el-radio__input { + white-space: nowrap; + cursor: pointer; + outline: none; + display: inline-block; + line-height: 1; + position: relative; + vertical-align: middle; + + } .title_left_tdmm.el-radio__input.is-checked .el-radio__inner { border-color: #1890ff; @@ -1093,15 +1121,18 @@ background-color: rgb(8, 17, 56); color: #fff; } - .dpradio::v-deep.el-radio__input, .el-radio__input { - white-space: nowrap; - cursor: pointer; - outline: none; - display: inline-block; - line-height: 1; - position: relative; - vertical-align: middle; -} + + .dpradio::v-deep.el-radio__input, + .el-radio__input { + white-space: nowrap; + cursor: pointer; + outline: none; + display: inline-block; + line-height: 1; + position: relative; + vertical-align: middle; + } + // 琛ㄥご杈规 ::v-deep .el-table tr { background-color: transparent !important; @@ -1305,7 +1336,7 @@ margin-left: 280px; } - + .custom-table .el-table__row .el-table_1_column_1 { color: #ffffff; @@ -1320,15 +1351,17 @@ } + .dpradio.el-radio__input { - white-space: nowrap; - cursor: pointer; - outline: none; - display: inline-block; - line-height: 1; - position: relative; - vertical-align: middle; -} + white-space: nowrap; + cursor: pointer; + outline: none; + display: inline-block; + line-height: 1; + position: relative; + vertical-align: middle; + } + .page { // width: 100%; height: 20%; diff --git a/src/views/dpdv/map.vue b/src/views/dpdv/map.vue index 810ba57..ec26740 100644 --- a/src/views/dpdv/map.vue +++ b/src/views/dpdv/map.vue @@ -1,827 +1,1340 @@ <template> - <div class="center"> - <div id="map" style="width:100%;height:100%;"></div> - <!-- <Dialog v-model="DialogVisible" :DialogVisible="DialogVisible" :tagid="tagid"/> --> - <el-dialog :modal="false" :visible.sync="centerdialogVisible" title="璁惧淇℃伅" width="60%" align-center - @close="handelClose" draggable> - <el-descriptions :column="2" border> - <el-descriptions-item> - <template slot="label"> - <div class="cell-item"> - <svg t="1725344883243" class="icon" viewBox="0 0 1024 1024" version="1.1" - xmlns="http://www.w3.org/2000/svg" p-id="3262" width="16" height="16"> - <path - d="M93.149 564.65h639.198l-293.404 293.4 73.35 73.351 419.147-419.149-419.149-419.143-73.35 73.351 293.404 293.401h-639.198l0.001 104.79zM93.149 564.65z" - fill="#272636" p-id="3263"></path> - </svg> - <!-- <arrow-right-outlined /> --> - 涓滀綅绉� - </div> - </template> - {{ edm }} - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - <div class="cell-item"> - <svg t="1671784088964" class="icon" viewBox="0 0 1024 1024" version="1.1" - xmlns="http://www.w3.org/2000/svg" p-id="2978" style="margin-top: 3px" - width="16" height="16"> - <path - d="M719.8 115c-6.5 0-13 0.3-19.4 1-16.2 1.6-28.4 15.4-28.4 31.7 0 18.9 16.2 33.9 35 32 4-0.4 8.1-0.6 12.2-0.6 32.9-0.2 64.4 12.1 88.3 34.6 26.1 24.5 40.4 57.8 40.4 93.4 0 3.6-0.1 7.1-0.4 10.6-1.5 18.5 13.2 34.4 31.8 34.4h0.2c16.5 0 30.4-12.6 31.8-29 0.5-6.2 0.7-12.5 0.6-18.9-1.5-105.5-86.7-189.3-192.1-189.2z" - p-id="2979"></path> - <path - d="M717 0c-5 0-9.9 0.1-14.8 0.3-16.9 0.9-30.2 14.9-30.2 31.9v0.3c0 18.2 15.3 32.6 33.5 31.8 3.8-0.2 7.6-0.3 11.5-0.3 32.8 0 64.7 6.4 94.6 19.1 28.9 12.2 54.9 29.8 77.3 52.1 22.3 22.3 39.9 48.3 52.1 77.3 12.7 29.9 19.1 61.7 19.1 94.6 0 3.8-0.1 7.6-0.3 11.4-0.8 18.3 13.6 33.6 31.9 33.6h0.2c17 0 31.1-13.3 31.9-30.3 0.2-4.9 0.3-9.8 0.3-14.7C1024 137.2 886.8 0 717 0zM293.5 368.9L249 413.5 93.4 257.9c-1.6-1.6-1.6-4.1 0-5.7l38.9-38.9c1.6-1.6 4.1-1.6 5.7 0l155.5 155.6m90.5 0L146.4 131.4c-6.2-6.2-16.4-6.2-22.6 0L11.4 243.8c-6.2 6.2-6.2 16.4 0 22.6L249 504l135-135.1zM814 889.4l-41.7 41.7c-1.6 1.6-4.1 1.6-5.7 0L611 775.5l44.5-44.5L814 889.4M655.6 640.5l-135.1 135 237.6 237.6c6.2 6.2 16.4 6.2 22.6 0l112.4-112.4c6.2-6.2 6.2-16.4 0-22.6L655.6 640.5zM780.4 244.9c-12.4-12.9-33.5-12.6-46.2 0.1l-89.3 89.3c-12.5 12.5-32.8 12.5-45.3 0l-33.9-33.9c-18.7-18.7-49.1-18.7-67.9 0L128.3 669.9c-62.5 62.5-62.5 163.8 0 226.3 31.2 31.2 72.2 46.9 113.1 46.9 40.9 0 81.9-15.6 113.1-46.9L724 526.7c18.7-18.7 18.7-49.1 0-67.9l-33.9-33.9c-12.5-12.5-12.5-32.8 0-45.3l89.8-89.8c12.5-12.4 12.6-32.3 0.5-44.9z m-471.1 606c-37.5 37.5-98.3 37.5-135.8 0-18.7-18.7-28.1-43.3-28.1-67.9s9.4-49.1 28.1-67.9l352.6-352.6c3.1-3.1 8.2-3.1 11.3 0L661.9 487c3.1 3.1 3.1 8.2 0 11.3L309.3 850.9z" - p-id="2980"></path> - </svg> - 鍗槦鏁伴噺 - </div> - </template> - {{ gpsnum }} - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - <div class="cell-item"> - <svg t="1725345044683" class="icon" viewBox="0 0 1024 1024" version="1.1" - xmlns="http://www.w3.org/2000/svg" p-id="5299" width="16" height="16"> - <path - d="M512.00988746 141.21142578c10.45623779 0 19.24145531 3.50024414 26.37542748 10.71331811l259.5421145 259.55200196C805.03668189 418.58105492 808.63085938 427.33660865 808.63085938 437.84228516c0 10.60949731-3.53485132 19.46887183-10.56994606 26.46936011-7.02026391 7.00543237-15.88952661 10.60949731-26.50891137 10.60949731-10.44140625 0-19.22167969-3.60900903-26.35565185-10.71331811L549.09863305 267.79370094V845.7097168c0 10.19915748-3.62384057 18.94976782-10.89624071 26.16284179-7.23284888 7.31195068-15.97357177 10.91601563-26.2122798 10.91601563-10.23376465 0-18.959656-3.60900903-26.22216796-10.91601563-7.24273705-7.21307397-10.87646508-15.96862769-10.87646508-26.16284179V267.79370094l-196.10760522 196.41906761C271.65484619 471.31213355 262.87951684 474.92114258 252.41833496 474.92114258c-10.61938477 0-19.45898438-3.60900903-26.4990232-10.60949731C218.86444068 457.31115699 215.36914062 448.45178247 215.36914062 437.84228516c0-10.50567651 3.55462623-19.26123023 10.69354248-26.36553931l259.53717042-259.55200196C492.7288816 144.71166992 501.52398658 141.21142578 511.97033691 141.21142578h0.03955055z" - p-id="5300"></path> - </svg> - 鍖椾綅绉� - </div> - </template> - {{ ndm }} - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - <div class="cell-item"> - <svg t="1725345147550" class="icon" viewBox="0 0 1024 1024" version="1.1" - xmlns="http://www.w3.org/2000/svg" p-id="6533" width="16" height="16"> - <path d="M0 0h1024v1024H0z" fill="#FFFFFF" opacity=".005" p-id="6534"></path> - <path - d="M743.509333 303.36a55.466667 55.466667 0 0 1 55.466667 55.466667v55.466666h27.818667a55.466667 55.466667 0 0 1 55.466666 55.466667v111.317333a55.466667 55.466667 0 0 1-55.466666 55.466667h-27.818667v55.466667a55.466667 55.466667 0 0 1-55.466667 55.466666h-584.533333a55.466667 55.466667 0 0 1-55.466667-55.466666V358.826667a55.466667 55.466667 0 0 1 55.466667-55.466667z m83.498667 278.314667v-111.317334h-83.498667V358.826667h-584.533333v333.952h584.533333v-111.317334z" - p-id="6535"></path> - <path - d="M205.696 390.314667h350.336q15.232 0 15.232 20.864v229.589333q0 20.864-15.232 20.864H205.696q-15.232 0-15.232-20.864V411.178667q0-20.864 15.232-20.864z" - p-id="6536"></path> - </svg> - 璁惧鐢甸噺 - </div> - </template> - {{ power }} - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - <div class="cell-item"> - <svg t="1725345066520" class="icon" viewBox="0 0 1024 1024" version="1.1" - xmlns="http://www.w3.org/2000/svg" p-id="5457" width="16" height="16"> - <path - d="M904 692c0 8.189-3.124 16.379-9.372 22.628-12.497 12.496-32.759 12.496-45.256 0L512 377.255 174.628 714.628c-12.497 12.496-32.758 12.496-45.255 0-12.497-12.498-12.497-32.758 0-45.256l360-360c12.497-12.496 32.758-12.496 45.255 0l360 360C900.876 675.621 904 683.811 904 692z" - fill="" p-id="5458"></path> - </svg> - 澶╀綅绉� - </div> - </template> - {{ hdm }} - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - <div class="cell-item"> - <svg t="1725345253428" class="icon" viewBox="0 0 1024 1024" version="1.1" - xmlns="http://www.w3.org/2000/svg" p-id="7693" width="16" height="16"> - <path - d="M139.884 420.157a33.142 33.142 0 0 1-10.635-1.756 34.642 34.642 0 0 1-21.432-43.576C164.71 199.629 324.495 81.92 505.421 81.92c179.968 0 339.481 116.895 396.938 290.877a34.657 34.657 0 0 1-21.217 43.69 33.613 33.613 0 0 1-42.793-21.663c-48.185-145.92-181.98-243.948-332.928-243.948-151.752 0-285.773 98.719-333.486 245.642a33.859 33.859 0 0 1-32.051 23.64zM505.42 936.96c-185.61 0-346.624-121.667-400.67-302.756a34.606 34.606 0 0 1 22.46-43.008 33.674 33.674 0 0 1 42.148 22.938c45.328 151.859 180.378 253.89 336.062 253.89 155.008 0 293.652-105.938 337.147-257.623a33.684 33.684 0 0 1 41.907-23.408 34.601 34.601 0 0 1 22.922 42.767c-51.845 180.874-217.17 307.2-401.976 307.2z m-44.826-250.568a33.556 33.556 0 0 1-31.744-22.738l-67.584-190.52-48.046 57.969a33.48 33.48 0 0 1-25.784 12.21H59.392a34.483 34.483 0 0 1 0-68.955h212.357l75.612-91.223a33.413 33.413 0 0 1 31.744-11.669 33.976 33.976 0 0 1 25.795 22.2l64.799 182.677 60.6-91.924a33.485 33.485 0 0 1 31.744-15.023 33.905 33.905 0 0 1 27.75 21.766l16.19 42.465 34.17-51.118a33.587 33.587 0 0 1 27.9-15.043h286.315a34.483 34.483 0 0 1 0 68.956H685.875l-60.242 90.112a33.475 33.475 0 0 1-59.392-6.927l-16.005-41.984-61.63 93.537a33.577 33.577 0 0 1-28.01 15.232z" - p-id="7694"></path> - </svg> - 璁惧鐘舵�� - </div> - </template> - {{ gpsstate }} - </el-descriptions-item> - </el-descriptions> - </el-dialog> + <div class="center"> + <div id="map" style="width: 100%; height: 100%"></div> + <!-- <Dialog v-model="DialogVisible" :DialogVisible="DialogVisible" :tagid="tagid"/> --> + <el-dialog + :modal="false" + :visible.sync="centerdialogVisible" + title="璁惧淇℃伅" + width="60%" + align-center + @close="handelClose" + draggable + > + <el-descriptions :column="2" border> + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1725344883243" + class="icon" + viewBox="0 0 1024 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="3262" + width="16" + height="16" + > + <path + d="M93.149 564.65h639.198l-293.404 293.4 73.35 73.351 419.147-419.149-419.149-419.143-73.35 73.351 293.404 293.401h-639.198l0.001 104.79zM93.149 564.65z" + fill="#272636" + p-id="3263" + ></path> + </svg> + <!-- <arrow-right-outlined /> --> + 涓滀綅绉� </div> + </template> + {{ edm }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1671784088964" + class="icon" + viewBox="0 0 1024 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="2978" + style="margin-top: 3px" + width="16" + height="16" + > + <path + d="M719.8 115c-6.5 0-13 0.3-19.4 1-16.2 1.6-28.4 15.4-28.4 31.7 0 18.9 16.2 33.9 35 32 4-0.4 8.1-0.6 12.2-0.6 32.9-0.2 64.4 12.1 88.3 34.6 26.1 24.5 40.4 57.8 40.4 93.4 0 3.6-0.1 7.1-0.4 10.6-1.5 18.5 13.2 34.4 31.8 34.4h0.2c16.5 0 30.4-12.6 31.8-29 0.5-6.2 0.7-12.5 0.6-18.9-1.5-105.5-86.7-189.3-192.1-189.2z" + p-id="2979" + ></path> + <path + d="M717 0c-5 0-9.9 0.1-14.8 0.3-16.9 0.9-30.2 14.9-30.2 31.9v0.3c0 18.2 15.3 32.6 33.5 31.8 3.8-0.2 7.6-0.3 11.5-0.3 32.8 0 64.7 6.4 94.6 19.1 28.9 12.2 54.9 29.8 77.3 52.1 22.3 22.3 39.9 48.3 52.1 77.3 12.7 29.9 19.1 61.7 19.1 94.6 0 3.8-0.1 7.6-0.3 11.4-0.8 18.3 13.6 33.6 31.9 33.6h0.2c17 0 31.1-13.3 31.9-30.3 0.2-4.9 0.3-9.8 0.3-14.7C1024 137.2 886.8 0 717 0zM293.5 368.9L249 413.5 93.4 257.9c-1.6-1.6-1.6-4.1 0-5.7l38.9-38.9c1.6-1.6 4.1-1.6 5.7 0l155.5 155.6m90.5 0L146.4 131.4c-6.2-6.2-16.4-6.2-22.6 0L11.4 243.8c-6.2 6.2-6.2 16.4 0 22.6L249 504l135-135.1zM814 889.4l-41.7 41.7c-1.6 1.6-4.1 1.6-5.7 0L611 775.5l44.5-44.5L814 889.4M655.6 640.5l-135.1 135 237.6 237.6c6.2 6.2 16.4 6.2 22.6 0l112.4-112.4c6.2-6.2 6.2-16.4 0-22.6L655.6 640.5zM780.4 244.9c-12.4-12.9-33.5-12.6-46.2 0.1l-89.3 89.3c-12.5 12.5-32.8 12.5-45.3 0l-33.9-33.9c-18.7-18.7-49.1-18.7-67.9 0L128.3 669.9c-62.5 62.5-62.5 163.8 0 226.3 31.2 31.2 72.2 46.9 113.1 46.9 40.9 0 81.9-15.6 113.1-46.9L724 526.7c18.7-18.7 18.7-49.1 0-67.9l-33.9-33.9c-12.5-12.5-12.5-32.8 0-45.3l89.8-89.8c12.5-12.4 12.6-32.3 0.5-44.9z m-471.1 606c-37.5 37.5-98.3 37.5-135.8 0-18.7-18.7-28.1-43.3-28.1-67.9s9.4-49.1 28.1-67.9l352.6-352.6c3.1-3.1 8.2-3.1 11.3 0L661.9 487c3.1 3.1 3.1 8.2 0 11.3L309.3 850.9z" + p-id="2980" + ></path> + </svg> + 鍗槦鏁伴噺 + </div> + </template> + {{ gpsnum }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1725345044683" + class="icon" + viewBox="0 0 1024 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="5299" + width="16" + height="16" + > + <path + d="M512.00988746 141.21142578c10.45623779 0 19.24145531 3.50024414 26.37542748 10.71331811l259.5421145 259.55200196C805.03668189 418.58105492 808.63085938 427.33660865 808.63085938 437.84228516c0 10.60949731-3.53485132 19.46887183-10.56994606 26.46936011-7.02026391 7.00543237-15.88952661 10.60949731-26.50891137 10.60949731-10.44140625 0-19.22167969-3.60900903-26.35565185-10.71331811L549.09863305 267.79370094V845.7097168c0 10.19915748-3.62384057 18.94976782-10.89624071 26.16284179-7.23284888 7.31195068-15.97357177 10.91601563-26.2122798 10.91601563-10.23376465 0-18.959656-3.60900903-26.22216796-10.91601563-7.24273705-7.21307397-10.87646508-15.96862769-10.87646508-26.16284179V267.79370094l-196.10760522 196.41906761C271.65484619 471.31213355 262.87951684 474.92114258 252.41833496 474.92114258c-10.61938477 0-19.45898438-3.60900903-26.4990232-10.60949731C218.86444068 457.31115699 215.36914062 448.45178247 215.36914062 437.84228516c0-10.50567651 3.55462623-19.26123023 10.69354248-26.36553931l259.53717042-259.55200196C492.7288816 144.71166992 501.52398658 141.21142578 511.97033691 141.21142578h0.03955055z" + p-id="5300" + ></path> + </svg> + 鍖椾綅绉� + </div> + </template> + {{ ndm }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1725345147550" + class="icon" + viewBox="0 0 1024 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="6533" + width="16" + height="16" + > + <path + d="M0 0h1024v1024H0z" + fill="#FFFFFF" + opacity=".005" + p-id="6534" + ></path> + <path + d="M743.509333 303.36a55.466667 55.466667 0 0 1 55.466667 55.466667v55.466666h27.818667a55.466667 55.466667 0 0 1 55.466666 55.466667v111.317333a55.466667 55.466667 0 0 1-55.466666 55.466667h-27.818667v55.466667a55.466667 55.466667 0 0 1-55.466667 55.466666h-584.533333a55.466667 55.466667 0 0 1-55.466667-55.466666V358.826667a55.466667 55.466667 0 0 1 55.466667-55.466667z m83.498667 278.314667v-111.317334h-83.498667V358.826667h-584.533333v333.952h584.533333v-111.317334z" + p-id="6535" + ></path> + <path + d="M205.696 390.314667h350.336q15.232 0 15.232 20.864v229.589333q0 20.864-15.232 20.864H205.696q-15.232 0-15.232-20.864V411.178667q0-20.864 15.232-20.864z" + p-id="6536" + ></path> + </svg> + 璁惧鐢甸噺 + </div> + </template> + {{ power }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1725345066520" + class="icon" + viewBox="0 0 1024 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="5457" + width="16" + height="16" + > + <path + d="M904 692c0 8.189-3.124 16.379-9.372 22.628-12.497 12.496-32.759 12.496-45.256 0L512 377.255 174.628 714.628c-12.497 12.496-32.758 12.496-45.255 0-12.497-12.498-12.497-32.758 0-45.256l360-360c12.497-12.496 32.758-12.496 45.255 0l360 360C900.876 675.621 904 683.811 904 692z" + fill="" + p-id="5458" + ></path> + </svg> + 澶╀綅绉� + </div> + </template> + {{ hdm }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1725345253428" + class="icon" + viewBox="0 0 1024 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="7693" + width="16" + height="16" + > + <path + d="M139.884 420.157a33.142 33.142 0 0 1-10.635-1.756 34.642 34.642 0 0 1-21.432-43.576C164.71 199.629 324.495 81.92 505.421 81.92c179.968 0 339.481 116.895 396.938 290.877a34.657 34.657 0 0 1-21.217 43.69 33.613 33.613 0 0 1-42.793-21.663c-48.185-145.92-181.98-243.948-332.928-243.948-151.752 0-285.773 98.719-333.486 245.642a33.859 33.859 0 0 1-32.051 23.64zM505.42 936.96c-185.61 0-346.624-121.667-400.67-302.756a34.606 34.606 0 0 1 22.46-43.008 33.674 33.674 0 0 1 42.148 22.938c45.328 151.859 180.378 253.89 336.062 253.89 155.008 0 293.652-105.938 337.147-257.623a33.684 33.684 0 0 1 41.907-23.408 34.601 34.601 0 0 1 22.922 42.767c-51.845 180.874-217.17 307.2-401.976 307.2z m-44.826-250.568a33.556 33.556 0 0 1-31.744-22.738l-67.584-190.52-48.046 57.969a33.48 33.48 0 0 1-25.784 12.21H59.392a34.483 34.483 0 0 1 0-68.955h212.357l75.612-91.223a33.413 33.413 0 0 1 31.744-11.669 33.976 33.976 0 0 1 25.795 22.2l64.799 182.677 60.6-91.924a33.485 33.485 0 0 1 31.744-15.023 33.905 33.905 0 0 1 27.75 21.766l16.19 42.465 34.17-51.118a33.587 33.587 0 0 1 27.9-15.043h286.315a34.483 34.483 0 0 1 0 68.956H685.875l-60.242 90.112a33.475 33.475 0 0 1-59.392-6.927l-16.005-41.984-61.63 93.537a33.577 33.577 0 0 1-28.01 15.232z" + p-id="7694" + ></path> + </svg> + 璁惧鐘舵�� + </div> + </template> + {{ gpsstate }} + </el-descriptions-item> + </el-descriptions> + </el-dialog> + + <el-dialog + :modal="false" + :visible.sync="centerdialogVisiblegb" + title="璁惧淇℃伅" + width="60%" + align-center + @close="handelClose" + draggable + > + <el-descriptions :column="2" border> + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1744275935891" + class="icon" + viewBox="0 0 1024 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="2364" + width="16" + height="16" + > + <path + d="M921.088 102.4c-84.992-84.992-383.488 2.048-383.488 2.048l-3.072 3.072-464.896 464.896c-7.168 7.168-7.168 19.456 0 26.624l354.304 354.304c7.168 7.168 19.456 7.168 26.624 0l464.896-464.896 3.072-3.072c0 0.512 87.04-298.496 2.56-382.976z m-118.784 280.576c-45.056 45.056-117.76 45.056-162.304 0-45.056-45.056-45.056-117.76 0-162.304 45.056-45.056 117.76-45.056 162.304 0 45.056 44.544 45.056 117.248 0 162.304z" + fill="#333333" + p-id="2365" + ></path> + </svg> + <!-- <arrow-right-outlined /> --> + 缂栧彿 + </div> + </template> + {{ tagid }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1744276028377" + class="icon" + viewBox="0 0 1024 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="3386" + width="16" + height="16" + > + <path + d="M478.144 947.328c-120.448 0-176.96 0.128-297.408-0.064-104.384-0.128-146.432-42.56-146.496-147.264 0-195.008-0.128-389.952 0-584.96 0.064-92.224 44.48-137.792 137.152-137.984 247.04-0.576 430.144-0.64 677.184 0.064 95.104 0.256 140.992 47.36 141.056 141.696 0.128 196.032 0.128 392 0 588.032-0.064 95.872-44.16 140.096-140.992 140.416-123.456 0.384-246.976 0.064-370.496 0.064z m375.296-51.52c62.016-0.128 84.224-22.72 84.288-85.248v-596.992c0-62.528-22.208-85.312-84.16-85.312-248.96-0.128-433.984-0.128-682.944 0-62.016 0.064-84.224 22.72-84.288 85.248v596.992c0 62.592 22.208 85.248 84.16 85.312 123.456 0.192 182.976 0.064 306.432 0.064 125.44 0 251.008 0.128 376.512-0.064z" + fill="#101317" + p-id="3387" + ></path> + <path + d="M594.176 358.912c0.576-26.24-2.432-50.88 8.768-74.048 27.264-56.576 77.952-56.896 130.624-57.024 49.024-0.128 94.272 7.232 114.304 57.6 19.776 49.664 20.864 103.296-0.576 152.256-25.984 59.456-82.368 58.048-136.64 57.28-46.912-0.704-86.464-13.632-108.224-59.584-11.968-25.216-6.912-52.032-8.256-76.48z m51.84 1.024c-0.384 76.544 6.144 82.944 83.328 82.944 7.104 0 14.208 0.128 21.312-0.064 32.832-1.024 53.44-14.656 56.128-44.096 5.12-56.512 6.208-99.84-26.752-114.048a58.112 58.112 0 0 0-20.736-3.84 1113.856 1113.856 0 0 0-67.008 0c-29.184 1.152-44.16 16.32-46.144 45.632-0.768 11.136-0.128 22.336-0.128 33.472z m-319.232 416.768c-58.176 0-52.288 0.064-110.464-0.064-9.152 0-18.496 0.256-27.456-1.28-13.12-2.24-23.488-9.6-23.872-23.808-0.384-15.744 10.24-25.6 24.896-25.664 135.68-0.576 207.296-0.576 342.976 0 13.312 0.064 23.104 8.768 23.424 23.488 0.384 16.32-10.112 24.832-24.576 25.92-23.36 1.664-46.848 1.28-70.336 1.344-44.8 0.192-89.728 0.064-134.592 0.064z m-121.792-109.376c-19.2 0-40.256-1.216-39.552-26.496 0.576-22.976 21.376-24.512 38.976-24.576 125.248-0.32 186.56-0.32 311.808-0.128 18.88 0.064 39.872 1.728 39.232 27.328-0.64 24.064-20.928 23.808-38.656 23.808-63.168 0.128-126.272 0.064-189.44 0.064h-122.368z" + fill="#101317" + p-id="3388" + ></path> + </svg> + 鍚嶇О + </div> + </template> + {{ name }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1744276104323" + class="icon" + viewBox="0 0 1099 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="4375" + width="16" + height="16" + > + <path + d="M805.56 253c-28.7 0-52 23.3-52 52 0 9.6 2.6 18.6 7.1 26.2L613.16 538.7c-3.3-0.7-6.7-1-10.1-1-10.4 0-20.2 3.1-28.3 8.4l-103.1-66.3c0-0.4 0-0.9 0-1.3 0-28.7-23.3-52-52-52-28.7 0-52 23.3-52 52 0 8.1 1.8 15.8 5.2 22.7L270.46 657c-2.7-0.4-5.5-0.7-8.3-0.7-28.7 0-52 23.3-52 52 0 28.7 23.3 52 52 52s52-23.3 52-52c0-10.3-3-19.8-8.1-27.9l100-151.9c4.4 1.2 9 1.8 13.8 1.8 12.6 0 24.2-4.5 33.2-12l98.8 63.5c-0.4 2.5-0.6 5.1-0.6 7.7 0 28.7 23.3 52 52 52s52-23.3 52-52c0-9.6-2.6-18.6-7.1-26.2l147.6-207.5c3.3 0.7 6.7 1 10.1 1 28.7 0 52-23.3 52-52S834.26 253 805.56 253z" + p-id="4376" + ></path> + </svg> + 鐘舵�� + </div> + </template> + {{ state == "0" ? "绂荤嚎" : "鍦ㄧ嚎" }} + </el-descriptions-item> + + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1744276127620" + class="icon" + viewBox="0 0 1024 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="5459" + width="16" + height="16" + > + <path + d="M384 196.266667v93.866666c-76.8 42.666667-128 128-128 221.866667 0 140.8 115.2 256 256 256s256-115.2 256-256c0-93.866667-51.2-179.2-128-221.866667V196.266667c123.733333 51.2 213.333333 174.933333 213.333333 315.733333 0 187.733333-153.6 341.333333-341.333333 341.333333s-341.333333-153.6-341.333333-341.333333c0-145.066667 89.6-264.533333 213.333333-315.733333z m85.333333-25.6h85.333334v213.333333h-85.333334V170.666667z" + fill="#444444" + p-id="5460" + ></path> + </svg> + 寮�鍏� + </div> + </template> + <el-switch + v-model="relayone" + active-color="#13ce66" + inactive-color="#ff4949" + @change="change" + > + </el-switch> + <!-- {{ }} --> + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + <div class="cell-item"> + <svg + t="1744276145529" + class="icon" + viewBox="0 0 1024 1024" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + p-id="6544" + width="16" + height="16" + > + <path + d="M878.08 731.274667a32 32 0 0 1-54.88-32.938667A360.789333 360.789333 0 0 0 874.666667 512c0-200.298667-162.368-362.666667-362.666667-362.666667S149.333333 311.701333 149.333333 512s162.368 362.666667 362.666667 362.666667a360.789333 360.789333 0 0 0 186.314667-51.445334 32 32 0 0 1 32.928 54.88A424.778667 424.778667 0 0 1 512 938.666667C276.362667 938.666667 85.333333 747.637333 85.333333 512S276.362667 85.333333 512 85.333333s426.666667 191.029333 426.666667 426.666667c0 78.293333-21.152 153.568-60.586667 219.274667z m-548.704-81.898667L480 498.741333V320a32 32 0 0 1 64 0v192a32 32 0 0 1-9.376 22.624l-160 160a32 32 0 1 1-45.248-45.248z" + fill="#000000" + p-id="6545" + ></path> + </svg> + 鏃堕棿 + </div> + </template> + {{ addtime }} + </el-descriptions-item> + </el-descriptions> + </el-dialog> + </div> </template> <script> const ToDigital = (strDu, strFen, strMiao, len) => { - len = (len > 6 || typeof (len) == "undefined") ? 6 : len;//绮剧‘鍒板皬鏁扮偣鍚庢渶澶氬叚浣� - strDu = (typeof (strDu) == "undefined" || strDu == "") ? 0 : parseFloat(strDu); - strFen = (typeof (strFen) == "undefined" || strFen == "") ? 0 : parseFloat(strFen) / 60; - strMiao = (typeof (strMiao) == "undefined" || strMiao == "") ? 0 : parseFloat(strMiao) / 60; //绉掍负鍒嗙殑鏍煎紡 - var digital = strDu + strFen + strMiao; - if (digital == 0) { - return ""; - } else { - return digital.toFixed(len); - } -} + len = len > 6 || typeof len == "undefined" ? 6 : len; //绮剧‘鍒板皬鏁扮偣鍚庢渶澶氬叚浣� + strDu = typeof strDu == "undefined" || strDu == "" ? 0 : parseFloat(strDu); + strFen = typeof strFen == "undefined" || strFen == "" ? 0 : parseFloat(strFen) / 60; + strMiao = typeof strMiao == "undefined" || strMiao == "" ? 0 : parseFloat(strMiao) / 60; //绉掍负鍒嗙殑鏍煎紡 + var digital = strDu + strFen + strMiao; + if (digital == 0) { + return ""; + } else { + return digital.toFixed(len); + } +}; class Convertor { - constructor(ak) { - this.stepCount = 100; - this.pointCount = []; - this.Result = []; - this.NoisIndex = []; - this.Time = new Date(); - this.AK = ak; - this.M_PI = 3.14159265358979324; - this.A = 6378245.0; - this.EE = 0.00669342162296594323; - this.X_PI = this.M_PI * 3000.0 / 180.0; + constructor(ak) { + this.stepCount = 100; + this.pointCount = []; + this.Result = []; + this.NoisIndex = []; + this.Time = new Date(); + this.AK = ak; + this.M_PI = 3.14159265358979324; + this.A = 6378245.0; + this.EE = 0.00669342162296594323; + this.X_PI = (this.M_PI * 3000.0) / 180.0; + } + /** + * WGS->鐧惧害鍧愭爣绯� + */ + WGS2BD09(poi) { + var poi2 = this.WGS2GCJ(poi); + if (typeof poi2 === "undefined") { + return; } - /** - * WGS->鐧惧害鍧愭爣绯� - */ - WGS2BD09(poi) { - var poi2 = this.WGS2GCJ(poi); - if (typeof poi2 === "undefined") { - return; - } - //GCJ->鐧惧害鍧愭爣绯� - return this.GCJ2BD09(poi2); - } + //GCJ->鐧惧害鍧愭爣绯� + return this.GCJ2BD09(poi2); + } - GCJ2BD09(poi) { - var poi2 = {}; - var x = poi.lng - , y = poi.lat; - var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * this.X_PI); - var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * this.X_PI); - poi2.lng = z * Math.cos(theta) + 0.0065; - poi2.lat = z * Math.sin(theta) + 0.006; - return poi2; + GCJ2BD09(poi) { + var poi2 = {}; + var x = poi.lng, + y = poi.lat; + var z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * this.X_PI); + var theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * this.X_PI); + poi2.lng = z * Math.cos(theta) + 0.0065; + poi2.lat = z * Math.sin(theta) + 0.006; + return poi2; + } + WGS2GCJ(poi) { + if (this.outofChine(poi)) { + return; } - WGS2GCJ(poi) { - if (this.outofChine(poi)) { - return; - } - var poi2 = {}; - var dLat = this.WGS2GCJ_lat(poi.lng - 105.0, poi.lat - 35.0); - var dLon = this.WGS2GCJ_lng(poi.lng - 105.0, poi.lat - 35.0); - var radLat = poi.lat / 180.0 * this.M_PI; - var magic = Math.sin(radLat); - magic = 1 - this.EE * magic * magic; - var sqrtMagic = Math.sqrt(magic); - dLat = (dLat * 180.0) / ((this.A * (1 - this.EE)) / (magic * sqrtMagic) * this.M_PI); - dLon = (dLon * 180.0) / (this.A / sqrtMagic * Math.cos(radLat) * this.M_PI); - poi2.lat = poi.lat + dLat; - poi2.lng = poi.lng + dLon; - return poi2; + var poi2 = {}; + var dLat = this.WGS2GCJ_lat(poi.lng - 105.0, poi.lat - 35.0); + var dLon = this.WGS2GCJ_lng(poi.lng - 105.0, poi.lat - 35.0); + var radLat = (poi.lat / 180.0) * this.M_PI; + var magic = Math.sin(radLat); + magic = 1 - this.EE * magic * magic; + var sqrtMagic = Math.sqrt(magic); + dLat = + (dLat * 180.0) / (((this.A * (1 - this.EE)) / (magic * sqrtMagic)) * this.M_PI); + dLon = (dLon * 180.0) / ((this.A / sqrtMagic) * Math.cos(radLat) * this.M_PI); + poi2.lat = poi.lat + dLat; + poi2.lng = poi.lng + dLon; + return poi2; + } + WGS2GCJ_lat(x, y) { + var ret1 = + -100.0 + + 2.0 * x + + 3.0 * y + + 0.2 * y * y + + 0.1 * x * y + + 0.2 * Math.sqrt(Math.abs(x)); + ret1 += + ((20.0 * Math.sin(6.0 * x * this.M_PI) + 20.0 * Math.sin(2.0 * x * this.M_PI)) * + 2.0) / + 3.0; + ret1 += + ((20.0 * Math.sin(y * this.M_PI) + 40.0 * Math.sin((y / 3.0) * this.M_PI)) * 2.0) / + 3.0; + ret1 += + ((160.0 * Math.sin((y / 12.0) * this.M_PI) + + 320 * Math.sin((y * this.M_PI) / 30.0)) * + 2.0) / + 3.0; + return ret1; + } + WGS2GCJ_lng(x, y) { + var ret2 = + 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x)); + ret2 += + ((20.0 * Math.sin(6.0 * x * this.M_PI) + 20.0 * Math.sin(2.0 * x * this.M_PI)) * + 2.0) / + 3.0; + ret2 += + ((20.0 * Math.sin(x * this.M_PI) + 40.0 * Math.sin((x / 3.0) * this.M_PI)) * 2.0) / + 3.0; + ret2 += + ((150.0 * Math.sin((x / 12.0) * this.M_PI) + + 300.0 * Math.sin((x / 30.0) * this.M_PI)) * + 2.0) / + 3.0; + return ret2; + } + outofChine(p) { + if (p.lng < 72.004 || p.lng > 137.8347) { + return true; } - WGS2GCJ_lat(x, y) { - var ret1 = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x)); - ret1 += (20.0 * Math.sin(6.0 * x * this.M_PI) + 20.0 * Math.sin(2.0 * x * this.M_PI)) * 2.0 / 3.0; - ret1 += (20.0 * Math.sin(y * this.M_PI) + 40.0 * Math.sin(y / 3.0 * this.M_PI)) * 2.0 / 3.0; - ret1 += (160.0 * Math.sin(y / 12.0 * this.M_PI) + 320 * Math.sin(y * this.M_PI / 30.0)) * 2.0 / 3.0; - return ret1; + if (p.lat < 0.8293 || p.lat > 55.8271) { + return true; } - ; - WGS2GCJ_lng(x, y) { - var ret2 = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x)); - ret2 += (20.0 * Math.sin(6.0 * x * this.M_PI) + 20.0 * Math.sin(2.0 * x * this.M_PI)) * 2.0 / 3.0; - ret2 += (20.0 * Math.sin(x * this.M_PI) + 40.0 * Math.sin(x / 3.0 * this.M_PI)) * 2.0 / 3.0; - ret2 += (150.0 * Math.sin(x / 12.0 * this.M_PI) + 300.0 * Math.sin(x / 30.0 * this.M_PI)) * 2.0 / 3.0; - return ret2; - } - outofChine(p) { - if (p.lng < 72.004 || p.lng > 137.8347) { - return true; - } - if (p.lat < 0.8293 || p.lat > 55.8271) { - return true; - } - return false; - } + return false; + } } -import jizhun from "@/assets/images/ceju.png" -import jiance from "@/assets/images/lingjin.png" -import onlie from "@/assets/images/onile.png" +import jizhun from "@/assets/images/ceju.png"; +import jiance from "@/assets/images/lingjin.png"; +import onlie from "@/assets/images/onile.png"; + +import zguangbo from "@/assets/images/onguangbo.png"; +import lguangbo from "@/assets/images/offguangbo.png"; +import gjimage from "@/assets/images/gaoj.png"; +// import lguangbo from "@/assets/images/offguangbo.png" import processBar from "@/components/processPar"; -import Pagination from '@/components/Pagination' +import Pagination from "@/components/Pagination"; import drawMixin from "@/utils/drawMixin"; //鑷�傚簲缂╂斁 import { formatTime1 } from "@/utils/index.js"; //鏃ユ湡鏍煎紡杞崲 -import { getList, getEquipment, alldevice, getdevicestate } from '@/api/user' -import { deepClone } from '@/utils' -const _temp = {//琛ㄥ崟鏁版嵁瀵硅薄 - tagid: '', - anchorname: '', - edmm: '', - ndmm: [], - tdmm: '绠$悊鍛�', - gpsnum: '', -} +import { + getList, + getEquipment, + alldevice, + getdevicestate, + startorstop, +} from "@/api/user"; +import { deepClone } from "@/utils"; +const _temp = { + //琛ㄥ崟鏁版嵁瀵硅薄 + tagid: "", + anchorname: "", + edmm: "", + ndmm: [], + tdmm: "绠$悊鍛�", + gpsnum: "", +}; +var map; +var markerg; +var labelg; +var marker; +var label; +var c = new Convertor(); export default { - mixins: [drawMixin], - name: 'Home', - components: { - processBar, - Pagination + mixins: [drawMixin], + name: "Home", + components: { + processBar, + Pagination, + }, + data() { + return { + tagid: "", + name: "", + state: "", + addtime: "", + relayone: "", + gpsnum: "", + edm: "", + hdm: "", + ndm: "", + power: "", + gpsstate: "", + centerdialogVisiblegb: false, + centerdialogVisible: false, + DialogVisible: false, + tagid: "", + temp: Object.assign({}, _temp), + count: null, //鐧惧垎姣旀�诲拰 + zongdmm: null, //鎬讳綅绉� + pagerCount: "3", + processBarModel: [], + list: [], + listLoading: true, + listQuery: { + current: 1, + size: 20, + created_at: undefined, + status: undefined, + keyword: undefined, + }, + role: "瓒呯骇绠$悊鍛�", //鍙充笂瑙掑綋鍓嶇櫥闄嗕汉鏉冮檺 + timing: null, + //鏃跺垎绉� + dateDay: null, + //骞存湀鏃� + dateYear: null, + //鍛ㄥ嚑 + dateWeek: null, + //鍛ㄥ嚑 + weekday: ["鍛ㄦ棩", "鍛ㄤ竴", "鍛ㄤ簩", "鍛ㄤ笁", "鍛ㄥ洓", "鍛ㄤ簲", "鍛ㄥ叚"], + monitorNum: 0, //鐩戞祴绔� + standardNum: 0, //鍩哄噯绔� + offlineNum: 0, //绂荤嚎璁惧 + alarmNum: 0, //鎶ヨ鏉℃暟 + messageNum: 0, //鎶ユ枃鏉℃暟 + total: 0, + dialogVisible: false, + dialogType: "view", + }; + }, + computed: {}, + created() {}, + mounted() { + const params = { + username: localStorage.getItem("username"), + phone: localStorage.getItem("phone"), + }; + alldevice(params).then((response) => { + console.log(111111111); + + console.log(response); + + this.initMap( + response.data.gbList, + response.data.dataList, + response.data.view, + response.data.shijiao + ); + }); + }, + methods: { + change(e) { + console.log(333333333); + + console.log(e); + var state = ""; + if (e == true) { + state = "ON"; + } else { + state = "OFF"; + } + + const params = { status: state, tagid: this.tagid }; + + startorstop(params).then((response) => { + console.log(111111111); + + console.log(response); + + // this.initMap(response.data.gbList, response.data.dataList, response.data.view, response.data.shijiao) + }); }, - data() { - return { - gpsnum: '', - edm: '', - hdm: '', - ndm: '', - power: '', - gpsstate: '', - centerdialogVisible: false, - DialogVisible: false, - tagid: '', - temp: Object.assign({}, _temp), - count: null,//鐧惧垎姣旀�诲拰 - zongdmm: null,//鎬讳綅绉� - pagerCount: '3', - processBarModel: [], - list: [], - listLoading: true, - listQuery: { - current: 1, - size: 20, - created_at: undefined, - status: undefined, - keyword: undefined - }, - role: '瓒呯骇绠$悊鍛�',//鍙充笂瑙掑綋鍓嶇櫥闄嗕汉鏉冮檺 - timing: null, - //鏃跺垎绉� - dateDay: null, - //骞存湀鏃� - dateYear: null, - //鍛ㄥ嚑 - dateWeek: null, - //鍛ㄥ嚑 - weekday: ["鍛ㄦ棩", "鍛ㄤ竴", "鍛ㄤ簩", "鍛ㄤ笁", "鍛ㄥ洓", "鍛ㄤ簲", "鍛ㄥ叚"], - monitorNum: 0,//鐩戞祴绔� - standardNum: 0,//鍩哄噯绔� - offlineNum: 0,//绂荤嚎璁惧 - alarmNum: 0,//鎶ヨ鏉℃暟 - messageNum: 0,//鎶ユ枃鏉℃暟 - total: 0, - dialogVisible: false, - dialogType: 'view', + handelClose() { + this.edm = ""; + this.ndm = ""; + this.hdm = ""; + this.power = ""; + this.gpsnum = ""; + this.gpsstate = ""; + }, + + guangbopoint(gaungbo) { + let zxguangbo = new BMapGL.Icon(zguangbo, new BMapGL.Size(30, 30)); + let lxguangbo = new BMapGL.Icon(lguangbo, new BMapGL.Size(30, 30)); + // let onliezhan = new BMapGL.Icon(onlie, new BMapGL.Size(30, 30)) + for (let i = 0; i < gaungbo.length; i++) { + if (gaungbo[i].center != null && gaungbo[i].center != "") { + if ( + gaungbo[i].center.split(";")[0].toString().length > 5 && + gaungbo[i].center.split(";")[0].toString().length > 4 + ) { + markerg; + labelg = new BMapGL.Label(gaungbo[i].name + " " + gaungbo[i].tagid, { + offset: new BMapGL.Size(0, -40), + }); + console.log(222222222); + + console.log(gaungbo[i]); + console.log(444444444); + if (gaungbo[i].state == 1) { + // var rr = c.WGS2BD09({ + // lng: new Number(ToDigital(gaungbo[i].center.split(";")[0].substring(0, 3), gaungbo[i].center.split(";")[0].substring(3, 5), gaungbo[i].center.split(";")[0].substring(5))), + // lat: new Number(ToDigital(gaungbo[i].center.split(";")[1].substring(0, 2),gaungbo[i].center.split(";")[1].substring(2, 4),gaungbo[i].center.split(";")[1].substring(4))) + // }); + var rr = c.WGS2BD09({ + lng: new Number(), + lat: new Number(gaungbo[i].center.split(";")[1]), + }); + var pt = new BMapGL.Point( + gaungbo[i].center.split(";")[0], + gaungbo[i].center.split(";")[1] + ); + markerg = new BMapGL.Marker(pt, { + icon: zxguangbo, + }); + labelg.setStyle({ + color: "#fff", + fontSize: "14px", + borderRadius: "5px", + padding: "5px 5px", + border: "0", + backgroundColor: "#fa770b", + transform: "translateX(-50%)", + }); + } else { + // var rr = c.WGS2BD09({ + // lng: new Number(ToDigital(gaungbo[i].center.split(";")[0].substring(0, 3), gaungbo[i].center.split(";")[0].substring(3, 5),gaungbo[i].center.split(";")[0].substring(5))), + // lat: new Number(ToDigital(gaungbo[i].center.split(";")[1].substring(0, 2), gaungbo[i].center.split(";")[1].substring(2, 4), gaungbo[i].center.split(";")[1].substring(4))) + // }); + + // var rr = c.WGS2BD09({ + // lng: new Number(gaungbo[i].center.split(";")[0]), + // lat: new Number(gaungbo[i].center.split(";")[1]) + // }); + var pt = new BMapGL.Point( + gaungbo[i].center.split(";")[0], + gaungbo[i].center.split(";")[1] + ); + // var pt = new BMapGL.Point(rr.lng, rr.lat) + markerg = new BMapGL.Marker(pt, { + icon: lxguangbo, + }); + labelg.setStyle({ + color: "#fff", + fontSize: "14px", + borderRadius: "5px", + padding: "5px 5px", + border: "0", + backgroundColor: "#474747", + transform: "translateX(-50%)", + }); + } + + markerg.addEventListener("click", () => { + this.tagid = gaungbo[i].tagid; + // var params = { tagid: gaungbo[i].tagid } + // getdevicestate(params).then(response => { + // this.tagid = response.data.dataList.tagid + this.name = gaungbo[i].name; + this.state = gaungbo[i].state; + this.addtime = gaungbo[i].addtime; + this.relayone = gaungbo[i].relayone == 0 ? false : true; + // }) + + // tagid.value = tags[i].tagid + this.centerdialogVisiblegb = true; + }); + markerg.setLabel(labelg); + map.addOverlay(markerg); + } } + } + + setTimeout(() => { + const params = { + username: localStorage.getItem("username"), + phone: localStorage.getItem("phone"), + }; + alldevice(params).then((response) => { + console.log(111111111); + + console.log(response); + this.guangbopoint(response.data.gbList); + // this.initMap(response.data.gbList, response.data.dataList, response.data.view, response.data.shijiao) + }); + }, 5000); }, - computed: { + pointdata(tags) { + 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)); + let gjimg = new BMapGL.Icon(gjimage, 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) { + marker; + 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) { + if (tags[i].onlie == 1 || tags[i].onlie == 4) { + 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: jizhunzhan, + }); + label.setStyle({ + color: "#fff", + fontSize: "14px", + borderRadius: "5px", + padding: "5px 5px", + border: "0", + backgroundColor: "#fa770b", + transform: "translateX(-50%)", + }); + } else if (tags[i].onlie == 6 || tags[i].onlie == 7) { + 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: gjimg + }); + label.setStyle({ + color: "#fff", + fontSize: "14px", + borderRadius: "5px", + padding: "5px 5px", + border: "0", + 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 { + if (tags[i].onlie == 1 || tags[i].onlie == 4) { + 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: jiancezhan, + }); + label.setStyle({ + color: "#fff", + fontSize: "14px", + borderRadius: "5px", + padding: "5px 5px", + border: "0", + backgroundColor: "#32CD32", + transform: "translateX(-50%)", + }); + } else if (tags[i].onlie == 6 || tags[i].onlie == 7) { + 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: gjimg, + }); + label.setStyle({ + color: "#fff", + fontSize: "14px", + borderRadius: "5px", + padding: "5px 5px", + border: "0", + 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%)", + }); + } + } + marker.addEventListener("click", () => { + this.tagid = tags[i].tagid; + var params = { tagid: tags[i].tagid }; + getdevicestate(params).then((response) => { + this.edm = response.data.dataList.edmm + "mm"; + this.ndm = response.data.dataList.ndmm + "mm"; + this.hdm = response.data.dataList.tdmm + "mm"; + this.power = response.data.dataList2.electricity; + this.gpsnum = response.data.dataList2.gpsnum; + this.gpsstate = response.data.dataList2.gpsstate; + }); + + // tagid.value = tags[i].tagid + this.centerdialogVisible = true; + }); + marker.setLabel(label); + map.addOverlay(marker); + } + } + } + + setTimeout(() => { + const params = { + username: localStorage.getItem("username"), + phone: localStorage.getItem("phone"), + }; + alldevice(params).then((response) => { + console.log(111111111); + + console.log(response); + this.pointdata(response.data.dataList); + // this.initMap(response.data.gbList, response.data.dataList, response.data.view, response.data.shijiao) + }); + }, 5000); }, - created() { - }, - mounted() { - const params = { username: localStorage.getItem('username'), phone: localStorage.getItem('phone') }; - alldevice(params).then(response => { - console.log(111111111); - - console.log(response); - - this.initMap(response.data.dataList, response.data.view,response.data.shijiao) - }) + initMap(gaungbo, tags, view, shijiao) { + console.log(shijiao); - }, - methods: { - handelClose() { - this.edm = '' - this.ndm = '' - this.hdm = '' - this.power = '' - this.gpsnum = '' - this.gpsstate = '' - }, - initMap(tags, view,shijiao) { - - // $(window).scrollTop(0); - // window.scroll(0, 0); - var c = new Convertor(); - var map = new BMapGL.Map("map"); - // 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]), 19); - map.enableScrollWheelZoom(true); - map.setHeading(shijiao); // 璁剧疆鍦板浘鏃嬭浆瑙掑害 - map.setTilt(shijiao); // 璁剧疆鍦板浘鍊炬枩瑙掑害 - - map.addEventListener("rightclick", function(e) { - console.log(e); - + // $(window).scrollTop(0); + // window.scroll(0, 0); + var c = new Convertor(); + map = new BMapGL.Map("map"); + // 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]), 19); + map.enableScrollWheelZoom(true); + map.setHeading(shijiao); // 璁剧疆鍦板浘鏃嬭浆瑙掑害 + map.setTilt(shijiao); // 璁剧疆鍦板浘鍊炬枩瑙掑害 + map.addEventListener("rightclick", function (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(); // 娣诲姞缂╂斁鎺т欢 - map.addControl(zoomCtrl); - //缁胯壊鐩戞祴锛屾鑹插熀鍑� - 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) { - - 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))) - }); - var pt = new BMapGL.Point(rr.lng, rr.lat) - marker = new BMapGL.Marker(pt, { - icon: jizhunzhan - }); - label.setStyle({ - color: "#fff", - fontSize: "14px", - borderRadius: "5px", - padding: "5px 5px", - border: "0", - 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 { - - 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))) - }); - var pt = new BMapGL.Point(rr.lng, rr.lat) - marker = new BMapGL.Marker(pt, { - icon: jiancezhan - }); - label.setStyle({ - color: "#fff", - fontSize: "14px", - borderRadius: "5px", - padding: "5px 5px", - border: "0", - 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 - var params = { tagid: tags[i].tagid } - getdevicestate(params).then(response => { - this.edm = response.data.dataList.edmm + "mm" - this.ndm = response.data.dataList.ndmm + "mm" - this.hdm = response.data.dataList.tdmm + "mm" - this.power = response.data.dataList2.electricity - this.gpsnum = response.data.dataList2.gpsnum - this.gpsstate = response.data.dataList2.gpsstate - }) - - // tagid.value = tags[i].tagid - this.centerdialogVisible = true - }) - marker.setLabel(label) - map.addOverlay(marker) - } - } - } - }, - - } -} + }); + var scaleCtrl = new BMapGL.ScaleControl(); // 娣诲姞姣斾緥灏烘帶浠� + map.addControl(scaleCtrl); + var zoomCtrl = new BMapGL.ZoomControl(); // 娣诲姞缂╂斁鎺т欢 + map.addControl(zoomCtrl); + //缁胯壊鐩戞祴锛屾鑹插熀鍑� + this.pointdata(tags); + this.guangbopoint(gaungbo); + // setTimeout(() => { + // // this.monitordata() + // }, 5000); + }, + }, +}; </script> <style lang="scss" scoped> .center { - // position: fixed; - position: absolute; - // left: 50%; - // top: 90px; - width: 100%; - height: 100%; - // transform: translate(-50%, -50%); - // transform-origin: left top; - // background: url(../../assets/images/center.png) no-repeat; - z-index: 20; - overflow: hidden; - } - .el-dialog__wrapper { - position: fixed; - top: 42%; - right: 0; - bottom: 0; - left: 34%; - overflow: auto; - margin: 0; + // position: fixed; + position: absolute; + // left: 50%; + // top: 90px; + width: 100%; + height: 100%; + // transform: translate(-50%, -50%); + // transform-origin: left top; + // background: url(../../assets/images/center.png) no-repeat; + z-index: 20; + overflow: hidden; } + +.el-dialog__wrapper { + position: fixed; + top: 42%; + right: 0; + bottom: 0; + left: 34%; + overflow: auto; + margin: 0; +} + #index { - color: #d3d6dd; - // width: 118%; - // height: 115%; - width: 2270px; - height: 1080px; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - transform-origin: left top; + color: #d3d6dd; + // width: 118%; + // height: 115%; + width: 2270px; + height: 1080px; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + transform-origin: left top; + overflow: hidden; + + .bg { + position: fixed; + //鏁翠綋椤甸潰鑳屾櫙 + width: 100%; + height: 100%; + padding: 16px 16px 0 16px; + background-image: url("../../assets/images/bj.png"); //鑳屾櫙鍥� + background-size: cover; //鑳屾櫙灏哄 + background-position: center center; //鑳屾櫙浣嶇疆 + z-index: 1; overflow: hidden; + } - .bg { + .top { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 80px; + background-color: transparent; + background: url(../../assets/images/top.png) no-repeat; + background-position: 50% 0; + } - position: fixed; - //鏁翠綋椤甸潰鑳屾櫙 - width: 100%; - height: 100%; - padding: 16px 16px 0 16px; - background-image: url("../../assets/images/bj.png"); //鑳屾櫙鍥� - background-size: cover; //鑳屾櫙灏哄 - background-position: center center; //鑳屾櫙浣嶇疆 - z-index: 1; - overflow: hidden; - } + .title_right { + top: 10px; + width: 100%; + height: 80px; + background: url(../../assets/images/topright.png) no-repeat; + } - .top { - position: absolute; - left: 0; - top: 0; - width: 100%; - height: 80px; - background-color: transparent; - background: url(../../assets/images/top.png) no-repeat; - background-position: 50% 0; - } + .right { + position: absolute; + top: 100px; + width: 23%; + height: 60%; + background: url(../../assets/images/right.png) no-repeat; + z-index: 20; + } - .title_right { - top: 10px; - width: 100%; - height: 80px; - background: url(../../assets/images/topright.png) no-repeat; - } + .title_left { + position: absolute; + top: 16px; + width: 98.5%; + height: 80px; + background: url(../../assets/images/topleft.png) no-repeat; + background-position: 100% 0; + } - .right { - position: absolute; - top: 100px; - width: 23%; - height: 60%; - background: url(../../assets/images/right.png) no-repeat; - z-index: 20; - } + .center { + position: fixed; + // position: absolute; + left: 24%; + top: 105px; + width: 51.5%; + height: 60%; + // background: url(../../assets/images/center.png) no-repeat; + z-index: 20; + overflow: hidden; + } - .title_left { - position: absolute; - top: 16px; - width: 98.5%; - height: 80px; - background: url(../../assets/images/topleft.png) no-repeat; - background-position: 100% 0; - } + .left { + position: absolute; + left: 76%; + top: 100px; + width: 30%; + height: 100%; + background: url(../../assets/images/left.png) no-repeat; + z-index: 20; + } - .center { - position: fixed; - // position: absolute; - left: 24%; - top: 105px; - width: 51.5%; - height: 60%; - // background: url(../../assets/images/center.png) no-repeat; - z-index: 20; - overflow: hidden; - } + .title_left_tdmm { + font-size: 14px; + position: absolute; + margin-top: 78px; + margin-left: 380px; + } - .left { - position: absolute; - left: 76%; - top: 100px; - width: 30%; - height: 100%; - background: url(../../assets/images/left.png) no-repeat; - z-index: 20; - } + .title_left_ndmm { + font-size: 14px; + position: absolute; + margin-top: 78px; + margin-left: 250px; + } - .title_left_tdmm { - font-size: 14px; - position: absolute; - margin-top: 78px; - margin-left: 380px; - } + .title_left_edmm { + font-size: 14px; + position: absolute; + margin-top: 78px; + margin-left: 95px; + } - .title_left_ndmm { - font-size: 14px; - position: absolute; - margin-top: 78px; - margin-left: 250px; - } + .bottom { + position: absolute; + bottom: -15px; + width: 75%; + height: 30%; + z-index: 20; + } - .title_left_edmm { - font-size: 14px; - position: absolute; - margin-top: 78px; - margin-left: 95px; - } + /*鏈�澶栧眰閫忔槑*/ + .bottom ::v-deep .el-table, + .bottom ::v-deep .el-table__expanded-cell { + position: absolute; + z-index: 20; + background-color: transparent; + width: 98%; + left: 1%; + // background: url(../../assets/images/bottom.png) no-repeat; + } - .bottom { - position: absolute; - bottom: -15px; - width: 75%; - height: 30%; - z-index: 20; - } + // 澶撮儴鏍峰紡 + .bottom ::v-deep .el-table th { + background-color: rgb(8, 17, 56); + color: #fff; + } - /*鏈�澶栧眰閫忔槑*/ - .bottom ::v-deep .el-table, - .bottom ::v-deep .el-table__expanded-cell { - position: absolute; - z-index: 20; - background-color: transparent; - width: 98%; - left: 1%; - // background: url(../../assets/images/bottom.png) no-repeat; + // 琛ㄥご杈规 + ::v-deep .el-table tr { + background-color: transparent !important; + } - } + // 鍐呭琛屾牱鑹� + .bottom::v-deep .el-table__row { + background-color: rgb(14, 27, 71) !important; + color: #b2c9ee; + } + //鑷畾涔夋枒椹嚎鍜岄紶鏍囩Щ鍏ユ牱寮� + // .bottom ::v-deep .el-table__body tr.hover-row>td { + // background-color: rgb(14, 27, 71) !important; + // } + ::v-deep.el-table__body tr.current-row > td { + background-color: transparent; + } - // 澶撮儴鏍峰紡 - .bottom ::v-deep .el-table th { - background-color: rgb(8, 17, 56); - color: #fff; - } + ::v-deep .el-table--enable-row-hover .el-table__body tr:hover:nth-child(odd) > td { + background-color: rgb(14, 27, 71) !important; + } - // 琛ㄥご杈规 - ::v-deep .el-table tr { - background-color: transparent !important; - } + //鏂戦┈绾归鑹� + .bottom::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td { + background: rgb(8, 17, 56); + } - // 鍐呭琛屾牱鑹� - .bottom::v-deep .el-table__row { - background-color: rgb(14, 27, 71) !important; - color: #B2C9EE; - } + //鍘绘帀琛ㄥご涓嬭竟妗嗙嚎 + ::v-deep .is-leaf { + border-bottom: none !important; + } - //鑷畾涔夋枒椹嚎鍜岄紶鏍囩Щ鍏ユ牱寮� - // .bottom ::v-deep .el-table__body tr.hover-row>td { - // background-color: rgb(14, 27, 71) !important; - // } - ::v-deep.el-table__body tr.current-row>td { - background-color: transparent; - } + //鍘绘帀琛ㄦ牸鍐呭涓嬭竟妗嗙嚎 + ::v-deep .el-table td, + .el-table th.is-leaf { + border-bottom: none; + } - ::v-deep .el-table--enable-row-hover .el-table__body tr:hover:nth-child(odd)>td { - background-color: rgb(14, 27, 71) !important; - } + /* // 鍘绘帀鏈�涓嬮潰鐨勯偅涓�鏉$嚎 */ + ::v-deep .el-table::before { + height: 0px; + } - //鏂戦┈绾归鑹� - .bottom::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td { - background: rgb(8, 17, 56); - } + /* 瀹氫箟婊氬姩瀹瑰櫒鐨勬粴鍔ㄦ潯鏍峰紡 */ + ::v-deep.el-table__body-wrapper::-webkit-scrollbar { + width: 10px; + /* 瀹氫箟婊氬姩鏉$殑瀹藉害 */ + height: 10px; + /* 瀹氫箟婊氬姩鏉$殑楂樺害 */ + } - //鍘绘帀琛ㄥご涓嬭竟妗嗙嚎 - ::v-deep .is-leaf { - border-bottom: none !important; - } + /* 瀹氫箟婊氬姩鏉℃粦鍧楃殑鏍峰紡 */ + ::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb { + background-color: #0d9eec; + /* 瀹氫箟婊戝潡鐨勯鑹� */ + border-radius: 5px; + /* 瀹氫箟婊戝潡鐨勫渾瑙� */ + } - //鍘绘帀琛ㄦ牸鍐呭涓嬭竟妗嗙嚎 - ::v-deep .el-table td, - .el-table th.is-leaf { - border-bottom: none; - } + //鍘婚櫎琛ㄥご杞ㄩ亾 + ::v-deep .el-table th.gutter { + display: none !important; + // width: 100px !important; + } - /* // 鍘绘帀鏈�涓嬮潰鐨勯偅涓�鏉$嚎 */ - ::v-deep .el-table::before { - height: 0px; - } + .title_left_text { + left: 86%; + position: absolute; + top: 30px; + } - /* 瀹氫箟婊氬姩瀹瑰櫒鐨勬粴鍔ㄦ潯鏍峰紡 */ - ::v-deep.el-table__body-wrapper::-webkit-scrollbar { + .title_right_img { + position: absolute; + margin-top: 20px; + margin-left: 20px; + } - width: 10px; - /* 瀹氫箟婊氬姩鏉$殑瀹藉害 */ - height: 10px; - /* 瀹氫箟婊氬姩鏉$殑楂樺害 */ - } + .title_right_time { + font-size: 16px; + position: absolute; + margin-top: 20px; + margin-left: 42px; + } - /* 瀹氫箟婊氬姩鏉℃粦鍧楃殑鏍峰紡 */ - ::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb { - background-color: #0d9eec; - /* 瀹氫箟婊戝潡鐨勯鑹� */ - border-radius: 5px; - /* 瀹氫箟婊戝潡鐨勫渾瑙� */ - } + .title_right_day { + font-size: 14px; + position: absolute; + margin-top: 40px; + margin-left: 42px; + } - //鍘婚櫎琛ㄥご杞ㄩ亾 - ::v-deep .el-table th.gutter { - display: none !important; - // width: 100px !important; - } + .title_right_week { + font-size: 14px; + position: absolute; + margin-top: 40px; + margin-left: 120px; + } - .title_left_text { - left: 86%; - position: absolute; - top: 30px; - } + /* 榧犳爣鏈偓娴椂鏁堟灉璁剧疆 */ + .title_left_bnt { + font-size: 16px; + color: rgb(43, 150, 226); + left: 94%; + position: absolute; + top: 20px; + } - .title_right_img { - position: absolute; - margin-top: 20px; - margin-left: 20px; + /* 榧犳爣鎮诞鍚庣殑璁剧疆 */ + .title_left_bnt:hover { + color: #ffffff; + text-decoration: underline; + } - } + .title_right_monitor { + font-size: 30px; + // left: 94%; + position: absolute; + margin-top: 100px; + margin-left: 160px; + } - .title_right_time { - font-size: 16px; - position: absolute; - margin-top: 20px; - margin-left: 42px; - } + .title_right_standard { + font-size: 30px; + // left: 94%; + position: absolute; + margin-top: 100px; + margin-left: 410px; + } - .title_right_day { - font-size: 14px; - position: absolute; - margin-top: 40px; - margin-left: 42px; - } + .title_right_offline { + font-size: 30px; + // left: 94%; + position: absolute; + margin-top: 260px; + margin-left: 160px; + } - .title_right_week { - font-size: 14px; - position: absolute; - margin-top: 40px; - margin-left: 120px; - } + .title_right_alarm { + font-size: 30px; + // left: 94%; + position: absolute; + margin-top: 260px; + margin-left: 410px; + } - /* 榧犳爣鏈偓娴椂鏁堟灉璁剧疆 */ - .title_left_bnt { - font-size: 16px; - color: rgb(43, 150, 226); - left: 94%; - position: absolute; - top: 20px; - } + .title_right_message { + font-size: 50px; + // left: 94%; + position: absolute; + margin-top: 500px; + margin-left: 130px; + } - /* 榧犳爣鎮诞鍚庣殑璁剧疆 */ - .title_left_bnt:hover { - color: #ffffff; - text-decoration: underline; - } + .custom-table .el-table__row .el-table_1_column_1 { + color: #ffffff; + background: url(../../assets/images/bottom.png) no-repeat; - .title_right_monitor { - font-size: 30px; - // left: 94%; - position: absolute; - margin-top: 100px; - margin-left: 160px; - } + /* 璁剧疆鏂囨湰棰滆壊 */ + } - .title_right_standard { - font-size: 30px; - // left: 94%; - position: absolute; - margin-top: 100px; - margin-left: 410px; - } + .cell-bg-color { + background-color: #2167a0; + /* 浣犳兂瑕佺殑鑳屾櫙棰滆壊 */ + } + .page { + width: 100%; + height: 20%; + position: absolute; + z-index: 20; + top: 250px; + left: 30%; + } - .title_right_offline { - font-size: 30px; - // left: 94%; - position: absolute; - margin-top: 260px; - margin-left: 160px; - } + .pageleft { + width: 30%; + height: 20%; + position: absolute; + z-index: 20; + top: 85%; + left: 4%; + } + .pagination-container[data-v-72233bcd] { + background: transparent !important; + padding: 0; + } - .title_right_alarm { - font-size: 30px; - // left: 94%; - position: absolute; - margin-top: 260px; - margin-left: 410px; - } + .pagination-container { + margin-top: 0; + } + .process { + position: relative; + top: 100px; + z-index: 30; + width: 70%; + height: 75%; + left: 30px; + } - .title_right_message { - font-size: 50px; - // left: 94%; - position: absolute; - margin-top: 500px; - margin-left: 130px; - } + .process_left_tagid { + font-size: 14px; + position: absolute; + margin-top: 22px; + margin-left: 8px; + } - .custom-table .el-table__row .el-table_1_column_1 { - color: #ffffff; - background: url(../../assets/images/bottom.png) no-repeat; - - /* 璁剧疆鏂囨湰棰滆壊 */ - } - - .cell-bg-color { - background-color: #2167a0; - /* 浣犳兂瑕佺殑鑳屾櫙棰滆壊 */ - - - } - - .page { - width: 100%; - height: 20%; - position: absolute; - z-index: 20; - top: 250px; - left: 30%; - } - - .pageleft { - width: 30%; - height: 20%; - position: absolute; - z-index: 20; - top: 85%; - left: 4%; - } - - .pagination-container[data-v-72233bcd] { - background: transparent !important; - padding: 0; - } - - .pagination-container { - margin-top: 0; - } - - .process { - position: relative; - top: 100px; - z-index: 30; - width: 70%; - height: 75%; - left: 30px; - } - - .process_left_tagid { - font-size: 14px; - position: absolute; - margin-top: 22px; - margin-left: 8px; - } - - .process_left_zong { - font-size: 14px; - position: absolute; - margin-top: 22px; - margin-left: 8px; - } + .process_left_zong { + font-size: 14px; + position: absolute; + margin-top: 22px; + margin-left: 8px; + } } -</style> \ No newline at end of file +</style> diff --git a/src/views/equipment/difference.vue b/src/views/equipment/difference.vue index 0b40380..efbd0d5 100644 --- a/src/views/equipment/difference.vue +++ b/src/views/equipment/difference.vue @@ -1,7 +1,8 @@ <template> <div class="app-container"> <div class="filter-container"> - <el-input v-model="listQuery.keyword" size="small" placeholder="璇疯緭鍏ョ紪鍙�/鍚嶇О/鍗″彿" clearable class="filter-item w-200" /> + <el-input v-model="listQuery.keyword" size="small" placeholder="璇疯緭鍏ョ紪鍙�/鍚嶇О/鍗″彿" clearable + class="filter-item w-200" /> <el-button-group class="filter-item"> <el-button size="small" type="primary" icon="el-icon-search" @click="search"> 鎼滅储 @@ -9,15 +10,27 @@ <el-button size="small" type="primary" icon="el-icon-refresh" @click="refresh"> 鍒锋柊 </el-button> - <el-button v-if="uadd=='Yes'" size="small" type="primary" icon="el-icon-plus" @click="add"> + <el-button v-if="uadd == 'Yes'" size="small" type="primary" icon="el-icon-plus" @click="add"> 鏂板 </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> --> + + <el-button style="margin-left: 10px;" type="primary" @click="resetzuobiao">閲嶇疆鍩虹珯鍧愭爣</el-button> + + </span> </div> <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="70" > + class="table-container" highlight-current-row @selection-change="handleSelectionChange"> + <el-table-column type="selection" width="55"> + </el-table-column> + <el-table-column fixed label="ID" width="70"> <template slot-scope="scope"> {{ scope.row.id }} </template> @@ -27,12 +40,12 @@ {{ scope.row.tagid }} </template> </el-table-column> - <el-table-column label="鍚嶇О" width="150"> + <el-table-column label="鍚嶇О" width="150"> <template slot-scope="scope"> {{ scope.row.anchorname }} </template> </el-table-column> - <el-table-column label="鍏徃" width="170"> + <el-table-column label="鍏徃" width="170"> <template slot-scope="scope"> {{ scope.row.company }} </template> @@ -41,9 +54,14 @@ <template slot-scope="scope"> <!-- <template slot-scope="scope"> --> - <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online6.png"></span> - <span v-else-if="scope.row.onlie == '0'"><img src="../../assets/images/offline4.png"></span> - <!-- </template> --> + <!-- <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online6.png"></span> + <span v-else-if="scope.row.onlie == '0'"><img src="../../assets/images/offline4.png"></span> --> + <span v-if="scope.row.onlie == '1'">鍦ㄧ嚎</span> + <span v-else-if="scope.row.onlie == '0'">绂荤嚎</span> + <span v-else-if="scope.row.onlie == '4'">楂樼簿搴�</span> + <span v-else-if="scope.row.onlie == '6'">瓒呴槇鍊煎憡璀�</span> + <span v-else-if="scope.row.onlie == '7'">闈為珮绮惧害鍛婅</span> + <!-- </template> --> <!-- <span v-if="scope.row.onlie == 1">鍦ㄧ嚎</span> <span v-if="scope.row.onlie == 0">绂荤嚎</span> --> </template> @@ -64,7 +82,7 @@ {{ scope.row.gpsnum }} </template> </el-table-column> - <el-table-column label="鍗″彿" width="190"> + <el-table-column label="鍗″彿" width="190"> <template slot-scope="scope"> {{ scope.row.cid }} </template> @@ -79,23 +97,23 @@ {{ scope.row.lat }} </template> </el-table-column> - <el-table-column label="楂樼▼" > + <el-table-column label="楂樼▼"> <template slot-scope="scope"> {{ scope.row.height }} </template> </el-table-column> - <el-table-column label="鏃堕棿" width="180"> + <el-table-column label="鏃堕棿" width="180"> <template slot-scope="scope"> {{ scope.row.addtime }} </template> </el-table-column> - <el-table-column label="鎿嶄綔" width="200" v-if="uupdate=='Yes' || udelete=='Yes'"> + <el-table-column label="鎿嶄綔" width="200" v-if="uupdate == 'Yes' || udelete == 'Yes'"> <template slot-scope="scope"> <el-button-group> - <el-button v-if="uupdate=='Yes'" type="primary" icon="el-icon-edit" size="mini" @click="edit(scope)"> + <el-button v-if="uupdate == 'Yes'" type="primary" icon="el-icon-edit" size="mini" @click="edit(scope)"> 淇敼 </el-button> - <el-button v-if="udelete=='Yes'" type="danger" icon="el-icon-delete" size="mini" @click="del(scope)"> + <el-button v-if="udelete == 'Yes'" type="danger" icon="el-icon-delete" size="mini" @click="del(scope)"> 鍒犻櫎 </el-button> </el-button-group> @@ -110,11 +128,11 @@ <el-form :ref="temp" :model="temp" label-width="120px" label-position="right" :rules="rules"> <el-form-item label="缂栧彿" prop="tagid"> <el-input v-model="temp.tagid - " placeholder="璇疯緭鍏ョ紪鍙�" /> + " placeholder="璇疯緭鍏ョ紪鍙�" /> </el-form-item> <el-form-item label="鍚嶇О" prop="anchorname"> <el-input v-model="temp.anchorname - " placeholder="璇疯緭鍏ュ悕绉�" /> + " placeholder="璇疯緭鍏ュ悕绉�" /> </el-form-item> <el-form-item label="鍏徃" prop="companyid"> <el-select style="width: 100%;" v-model="temp.company" filterable remote placeholder="璇烽�夋嫨鍏徃" @@ -142,17 +160,17 @@ <script> import Pagination from '@/components/Pagination' -import { getList, delEquipment, addorupEquipment, searchEquipment,search,addSystemOperationLog } from '@/api/equipment' +import { getList, delEquipment, addorupEquipment, searchEquipment, search, addSystemOperationLog, resetzuobiao,searchfive } from '@/api/equipment' import { deepClone } from '@/utils' const _temp = { - adminname:'', + adminname: '', id: '', anchorname: '', tagid: '', companyid: '', // cid: '', - type:0 + type: 0 } export default { @@ -161,9 +179,9 @@ }, data() { return { - uadd:'', - udelete:'', - uupdate:'', + uadd: '', + udelete: '', + uupdate: '', total: 0, list: [], menus: [], @@ -175,6 +193,7 @@ keyword: undefined, type: 0 }, + multipleSelection: [], uploadUrl: '', temp: Object.assign({}, _temp), dialogVisible: false, @@ -184,18 +203,18 @@ options: [], rules: { tagid: [ - { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' }, - ], - anchorname: [ - { required: true, message: '璇锋暟鎹悕绉�', trigger: 'blur' } - ], - companyid: [ - { required: true, message: '璇烽�夋嫨鍏徃', trigger: 'blur' } - ], - // cid: [ - // { required: true, message: '璇疯緭鍏ュ崱鍙�', trigger: 'blur' } - // ] - }, + { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' }, + ], + anchorname: [ + { required: true, message: '璇锋暟鎹悕绉�', trigger: 'blur' } + ], + companyid: [ + { required: true, message: '璇烽�夋嫨鍏徃', trigger: 'blur' } + ], + // cid: [ + // { required: true, message: '璇疯緭鍏ュ崱鍙�', trigger: 'blur' } + // ] + }, searchloading: false } }, @@ -203,8 +222,57 @@ this.fetchData() }, methods: { - // 杩滅▼鎼滅储 - searchMethod(query) { + handleSelectionChange(val) { + this.multipleSelection = val; + }, + resetzuobiao() { + console.log(this.multipleSelection); + if (this.multipleSelection.length == 0) { + this.$message({ + message: '璇峰厛閫夋嫨涓�鏉℃暟鎹�', + type: 'error' + }) + } else if (this.multipleSelection.length > 1) { + this.$message({ + message: '璇烽�夋嫨涓�鏉℃暟鎹�', + type: 'error' + }) + + + } else { + this.$prompt('璇ユ搷浣滈渶瑕佺敱涓撲笟鎶�鏈汉鍛樺畬鎴�,璇疯緭鍏ユ搷浣滃瘑鐮�', '璁惧缂栧彿' + this.multipleSelection[0].tagid + '纭鎿嶄綔', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/, + + inputErrorMessage: '瀵嗙爜閿欒', + inputValidator: (value) => {//input鏍¢獙 + if (value != 20151102) { + return '瀵嗙爜閿欒'; + } + }, + }).then(({ value }) => { + + const params = { tagid: this.multipleSelection[0].tagid }; + resetzuobiao(params).then(response => { + console.log(response); + + + }) + this.$message({ + type: 'success', + message: '閲嶇疆鎴愬姛!' + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '鍙栨秷閲嶇疆' + }); + }); + } + }, + // 杩滅▼鎼滅储 + searchMethod(query) { if (query !== '') { this.loading = true; var params = { query: query } @@ -216,20 +284,34 @@ this.options = []; } }, + + // 杩滅▼鎼滅储 + searchMethodfive(query) { + if (query !== '') { + this.loading = true; + // var params = { query: query } + searchfive().then(response => { + this.options = response.data; + this.loading = false; + }) + } else { + this.options = []; + } + }, // 鎼滅储 search() { this.listLoading = true searchEquipment(this.listQuery).then(response => { - if (response.data!=null) { + if (response.data != null) { this.list = response.data.records this.total = response.data.total - }else{ + } else { this.$message({ message: '鏈悳绱㈠埌鏁版嵁', type: 'error' }) } - + this.listLoading = false }) }, @@ -239,7 +321,7 @@ current: 1, size: 20, keyword: undefined, - type:0 + type: 0 } this.fetchData() }, @@ -254,6 +336,7 @@ this.total = response.data.total this.listLoading = false }) + this.searchMethodfive() }, resetTemp() { this.temp = Object.assign({}, _temp) @@ -292,7 +375,7 @@ }, // 鍒犻櫎 del(scope) { - + this.$confirm('纭鍒犻櫎璇ユ潯鏁版嵁鍚楋紵', '鎻愮ず', { confirmButtonText: '纭畾', cancelButtonText: '鍙栨秷', @@ -303,10 +386,10 @@ 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 => { - }) + }) this.$message({ message: '鍒犻櫎鎴愬姛', type: 'success' @@ -317,49 +400,52 @@ }) }, submit() { - + if (this.loading) { return } - this.temp.companyid=this.temp.companyid + if ( this.dialogType != 'modify') { + this.temp.companyid=this.temp.company + } + // this.temp.companyid = this.temp.companyid this.loading = true this.$refs[this.temp].validate((valid) => { if (valid) { - addorupEquipment(this.temp).then(() => { - if (this.temp.id=="") { - this.temp.adminname = localStorage.getItem('username') || ''; - const params = { name: this.temp.adminname, content: '鏂板浜嗕竴涓熀鍑嗙珯锛岃缂栧彿涓猴細'+this.temp.tagid }; - addSystemOperationLog(params).then(response => { + addorupEquipment(this.temp).then(() => { + if (this.temp.id == "") { + this.temp.adminname = localStorage.getItem('username') || ''; + 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 }; - addSystemOperationLog(params).then(response => { + }) + } else { + this.temp.adminname = localStorage.getItem('username') || ''; + const params = { name: this.temp.adminname, content: '淇敼浜嗕竴涓熀鍑嗙珯锛岃缂栧彿涓猴細' + this.temp.tagid }; + addSystemOperationLog(params).then(response => { - }) - } - - this.fetchData() - setTimeout(() => { - this.$message({ - message: '鎻愪氦鎴愬姛', - type: 'success' + }) + } + + this.fetchData() + setTimeout(() => { + this.$message({ + message: '鎻愪氦鎴愬姛', + type: 'success' + }) + this.dialogVisible = false + this.loading = false + }, 300) }) - this.dialogVisible = false - this.loading = false - }, 300) - }) - } else { - this.$message({ + } else { + this.$message({ message: '鎻愪氦澶辫触锛岃妫�鏌ヨ〃鍗曞繀濉」鏄惁涓虹┖', type: 'error' }) - console.log('error submit!!'); - return false; - } - }); - + console.log('error submit!!'); + return false; + } + }); + } } } diff --git a/src/views/equipment/monitoring.vue b/src/views/equipment/monitoring.vue index 341590c..4675d68 100644 --- a/src/views/equipment/monitoring.vue +++ b/src/views/equipment/monitoring.vue @@ -40,8 +40,13 @@ <el-table-column label="鐘舵��" width="80"> <template slot-scope="scope"> - <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online6.png"></span> - <span v-else-if="scope.row.onlie == '0'"><img src="../../assets/images/offline4.png"></span> + <!-- <span v-if="scope.row.onlie == '1'"><img src="../../assets/images/online6.png"></span> + <span v-else-if="scope.row.onlie == '0'"><img src="../../assets/images/offline4.png"></span> --> + <span v-if="scope.row.onlie == '1'">鍦ㄧ嚎</span> + <span v-else-if="scope.row.onlie == '0'">绂荤嚎</span> + <span v-else-if="scope.row.onlie == '4'">楂樼簿搴�</span> + <span v-else-if="scope.row.onlie == '6'">瓒呴槇鍊煎憡璀�</span> + <span v-else-if="scope.row.onlie == '7'">闈為珮绮惧害鍛婅</span> </template> </el-table-column> @@ -139,7 +144,7 @@ <el-input v-model="temp.anchorname " placeholder="璇疯緭鍏ュ悕绉�" /> </el-form-item> - <el-form-item label="鍏徃" prop="companyid"> + <el-form-item label="鍏徃" prop="company"> <el-select style="width: 100%;" v-model="temp.company" filterable remote placeholder="璇烽�夋嫨鍏徃" :remote-method="searchMethod" :loading="searchloading"> <el-option v-for="item in options" :key="item.id" :label="item.companyname" :value="item.id"> @@ -147,8 +152,13 @@ </el-select> </el-form-item> <el-form-item label="鍩哄噯" prop="needbaseid"> - <el-input v-model="temp.needbaseid - " placeholder="璇疯緭鍏ュ熀鍑�" /> + <!-- <el-input v-model="temp.needbaseid + " placeholder="璇疯緭鍏ュ熀鍑�" /> --> + <el-select style="width: 100%;" v-model="temp.needbaseid" filterable remote placeholder="璇烽�夋嫨鍏徃" + :remote-method="jzsearchMethod" :loading="searchloading"> + <el-option v-for="item in jzoptions" :key="item.tagid" :label="item.tagid" :value="item.tagid"> + </el-option> + </el-select> </el-form-item> </el-form> <div class="text-right"> @@ -165,7 +175,7 @@ <script> import Pagination from '@/components/Pagination' -import { getList, delEquipment, addorupEquipment, searchEquipment, search,addSystemOperationLog } from '@/api/equipment' +import { getList, delEquipment, addorupEquipment, searchEquipment, search,addSystemOperationLog,searchfive,jzsearchfive,jzsearch } from '@/api/equipment' import { deepClone } from '@/utils' const _temp = { @@ -204,6 +214,7 @@ dialogType: 'create', loading: false, value: '', + jzoptions:[], options: [], searchloading: false, rules: { @@ -239,6 +250,47 @@ this.options = []; } }, + // 杩滅▼鎼滅储 + searchMethodfive(query) { + if (query !== '') { + this.loading = true; + // var params = { query: query } + searchfive().then(response => { + this.options = response.data; + this.loading = false; + }) + } else { + this.options = []; + } + }, + + // 杩滅▼鎼滅储 + jzsearchMethod(query) { + if (query !== '') { + this.loading = true; + var params = { type: '0' } + jzsearch(params).then(response => { + this.jzoptions = response.data; + this.loading = false; + }) + } else { + this.jzoptions = []; + } + }, + // 杩滅▼鎼滅储 + jzsearchMethodfive() { + + this.loading = true; + var params = { type: '0' } + jzsearchfive(params).then(response => { + this.jzoptions = response.data; + this.loading = false; + }) + + }, + + + // 鎼滅储 search() { this.listLoading = true @@ -277,6 +329,8 @@ this.total = response.data.total this.listLoading = false }) + this.searchMethodfive(); + this.jzsearchMethodfive(); }, resetTemp() { this.temp = Object.assign({}, _temp) @@ -346,10 +400,14 @@ }) }, submit(formName) { + if ( this.dialogType != 'modify') { + this.temp.companyid=this.temp.company + } + if (this.loading) { return } - this.temp.companyid=this.temp.companyid + this.$refs[this.temp].validate((valid) => { if (valid) { this.loading = true diff --git a/src/views/login/login.vue b/src/views/login/login.vue index d10275f..c5730ba 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -84,11 +84,13 @@ </div> - <div style="width: 100%;position: fixed;top: 32%;left: 40%"> + <div style="width: 20%;position: absolute;bottom:20px;left: 40%;z-index: 9999;color:rgb(255, 255, 255)"> + 鐗堟湰V2.0.3 鏇存柊鏃堕棿2025.04.15 </div> <canvas ref="canvas" style="position:fixed; width:100%; height:100%; left: 0; top: 0; opacity: .3; pointer-events: none;"></canvas> + </div> </template> diff --git a/src/views/retransmission/index.vue b/src/views/retransmission/index.vue index 0ceb17b..28ae4a8 100644 --- a/src/views/retransmission/index.vue +++ b/src/views/retransmission/index.vue @@ -1,7 +1,7 @@ <template> - <div v-if="role=='璁垮'" class="app-container"> - <el-empty description="鏆傛棤鏉冮檺"></el-empty> -</div> + <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="璇疯緭鍏P鍦板潃" clearable class="filter-item w-200" /> @@ -12,7 +12,7 @@ <el-button size="small" type="primary" icon="el-icon-refresh" @click="refresh"> 鍒锋柊 </el-button> - <el-button v-if="uadd=='Yes'" size="small" type="primary" icon="el-icon-plus" @click="add"> + <el-button v-if="uadd == 'Yes'" size="small" type="primary" icon="el-icon-plus" @click="add"> 鏂板 </el-button> </el-button-group> @@ -20,38 +20,38 @@ <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="搴忓彿" width="80" > + <el-table-column fixed label="搴忓彿" width="80"> <template slot-scope="scope"> {{ scope.row.id }} </template> </el-table-column> - <el-table-column label="ip鍦板潃" > + <el-table-column label="ip鍦板潃"> <template slot-scope="scope"> {{ scope.row.ip }} </template> </el-table-column> - <el-table-column label="绔彛" > + <el-table-column label="绔彛"> <template slot-scope="scope"> {{ scope.row.port }} </template> </el-table-column> - <el-table-column label="杞彂绫诲瀷" > + <el-table-column label="杞彂绫诲瀷"> <template slot-scope="scope"> {{ scope.row.datatype }} </template> </el-table-column> - <el-table-column label="娣诲姞鏃堕棿" > + <el-table-column label="娣诲姞鏃堕棿"> <template slot-scope="scope"> {{ scope.row.addtime }} </template> </el-table-column> - <el-table-column label="鎿嶄綔" width="200" v-if="uupdate=='Yes' || udelete=='Yes'"> + <el-table-column label="鎿嶄綔" width="200" v-if="uupdate == 'Yes' || udelete == 'Yes'"> <template slot-scope="scope"> <el-button-group> - <el-button v-if="uupdate=='Yes'" type="primary" icon="el-icon-edit" size="mini" @click="edit(scope)"> + <el-button v-if="uupdate == 'Yes'" type="primary" icon="el-icon-edit" size="mini" @click="edit(scope)"> 淇敼 </el-button> - <el-button v-if="udelete=='Yes'" type="danger" icon="el-icon-delete" size="mini" @click="del(scope)"> + <el-button v-if="udelete == 'Yes'" type="danger" icon="el-icon-delete" size="mini" @click="del(scope)"> 鍒犻櫎 </el-button> </el-button-group> @@ -66,11 +66,11 @@ <el-form :ref="temp" :model="temp" label-width="120px" label-position="right" :rules="rules"> <el-form-item label="ip鍦板潃" prop="ip"> <el-input v-model="temp.ip - " placeholder="璇疯緭鍏p鍦板潃" /> + " placeholder="璇疯緭鍏p鍦板潃" /> </el-form-item> <el-form-item label="绔彛" prop="port"> <el-input v-model="temp.port - " placeholder="璇疯緭鍏ョ鍙�" /> + " placeholder="璇疯緭鍏ョ鍙�" /> </el-form-item> <el-form-item label="杞彂绫诲瀷" prop="datatype"> <el-select style="width: 100%;" v-model="temp.datatype" placeholder="璇烽�夋嫨杞彂绫诲瀷"> @@ -95,7 +95,7 @@ <script> import Pagination from '@/components/Pagination' -import { getForwardDataPage, delForwardData, addorupForwardData, searchForwardData,addSystemOperationLog } from '@/api/forwar' +import { getForwardDataPage, delForwardData, addorupForwardData, searchForwardData, addSystemOperationLog } from '@/api/forwar' import { deepClone } from '@/utils' const _temp = { @@ -111,16 +111,16 @@ }, data() { return { - role:localStorage.getItem('role'), - uadd:'', - udelete:'', - uupdate:'', - options:[{ - value:'TCP', - label:'TCP' - },{ - value:'UDP', - label:'UDP' + role: localStorage.getItem('role'), + uadd: '', + udelete: '', + uupdate: '', + options: [{ + value: 'TCP', + label: 'TCP' + }, { + value: 'UDP', + label: 'UDP' }], total: 0, list: [], @@ -138,35 +138,37 @@ loading: false, rules: { ip: [ - { required: true, message: '璇疯緭鍏p鍦板潃', trigger: 'blur' }, - ], - datatype: [ - { required: true, message: '璇烽�夋嫨杞彂绫诲瀷', trigger: 'blur' } - ], - port: [ - { required: true, message: '璇疯緭鍏ョ鍙�', trigger: 'change' } - ] - }, + { required: true, message: '璇疯緭鍏p鍦板潃', trigger: 'blur' }, + ], + datatype: [ + { required: true, message: '璇烽�夋嫨杞彂绫诲瀷', trigger: 'blur' } + ], + port: [ + { required: true, message: '璇疯緭鍏ョ鍙�', trigger: 'change' } + ] + }, } }, created() { this.fetchData() }, methods: { + + // 鎼滅储 search() { this.listLoading = true searchForwardData(this.listQuery).then(response => { - if (response.data!=null) { + if (response.data != null) { this.list = response.data.records this.total = response.data.total - }else{ + } else { this.$message({ message: '鏈悳绱㈠埌鏁版嵁', type: 'error' }) } - + this.listLoading = false }) }, @@ -231,10 +233,10 @@ this.list.splice(scope.$index, 1) delForwardData(params).then(response => { this.temp.adminname = localStorage.getItem('username') || ''; - const params = { name: this.temp.adminname, content: '鍒犻櫎浜嗕竴涓暟鎹浆鍙戯紝璇p鍦板潃涓猴細'+scope.row.ip }; + const params = { name: this.temp.adminname, content: '鍒犻櫎浜嗕竴涓暟鎹浆鍙戯紝璇p鍦板潃涓猴細' + scope.row.ip }; addSystemOperationLog(params).then(response => { - }) + }) this.$message({ message: '鍒犻櫎鎴愬姛', type: 'success' @@ -251,39 +253,39 @@ this.loading = true this.$refs[this.temp].validate((valid) => { if (valid) { - addorupForwardData(this.temp).then(() => { - if (this.temp.id=="") { - this.temp.adminname = localStorage.getItem('username') || ''; - const params = { name: this.temp.adminname, content: '鏂板浜嗕竴涓暟鎹浆鍙戯紝璇p鍦板潃涓猴細'+this.temp.ip }; - addSystemOperationLog(params).then(response => { + addorupForwardData(this.temp).then(() => { + if (this.temp.id == "") { + this.temp.adminname = localStorage.getItem('username') || ''; + const params = { name: this.temp.adminname, content: '鏂板浜嗕竴涓暟鎹浆鍙戯紝璇p鍦板潃涓猴細' + this.temp.ip }; + addSystemOperationLog(params).then(response => { - }) - } else { - this.temp.adminname = localStorage.getItem('username') || ''; - const params = { name: this.temp.adminname, content: '淇敼浜嗕竴涓暟鎹浆鍙戯紝璇p鍦板潃涓猴細'+this.temp.ip }; - addSystemOperationLog(params).then(response => { + }) + } else { + this.temp.adminname = localStorage.getItem('username') || ''; + const params = { name: this.temp.adminname, content: '淇敼浜嗕竴涓暟鎹浆鍙戯紝璇p鍦板潃涓猴細' + this.temp.ip }; + addSystemOperationLog(params).then(response => { - }) - } - this.fetchData() - setTimeout(() => { - this.$message({ - message: '鎻愪氦鎴愬姛', - type: 'success' + }) + } + this.fetchData() + setTimeout(() => { + this.$message({ + message: '鎻愪氦鎴愬姛', + type: 'success' + }) + this.dialogVisible = false + this.loading = false + }, 300) }) - this.dialogVisible = false - this.loading = false - }, 300) - }) - } else { - this.$message({ + } else { + this.$message({ message: '鎻愪氦澶辫触锛岃妫�鏌ヨ〃鍗曞繀濉」鏄惁涓虹┖', type: 'error' }) - console.log('error submit!!'); - return false; - } - }); + console.log('error submit!!'); + return false; + } + }); } } } diff --git a/src/views/system/settings.vue b/src/views/system/settings.vue index f2b065e..9d41d01 100644 --- a/src/views/system/settings.vue +++ b/src/views/system/settings.vue @@ -84,7 +84,7 @@ <el-dialog :visible.sync="dialogVisible" :title="dialogType === 'modify' ? '淇敼' : '鏂板'"> <el-form :ref="temp" :model="temp" label-width="120px" label-position="right" :rules="rules"> - <!-- <el-form-item label="UDP绔彛" prop="udpport"> + <el-form-item label="UDP绔彛" prop="udpport"> <el-input v-model="temp.udpport " placeholder="璇疯緭鍏DP绔彛" /> </el-form-item> @@ -92,7 +92,7 @@ <el-input v-model="temp.savetime " placeholder="璇疯緭鍏ュ巻鍙叉暟鎹繚瀛樻椂闀�" /> </el-form-item> - <el-form-item label="瑙嗗浘涓績" prop="view"> + <!--<el-form-item label="瑙嗗浘涓績" prop="view"> <el-input v-model="temp.view " placeholder="璇疯緭鍏ヨ鍥句腑蹇�" /> </el-form-item> --> -- Gitblit v1.9.3