Эхлэл Бүгдийг харах Тусламж
Бүртгүүлэх Нэвтрэх
BFFE
/
AMR
2
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

大改

chenrui  3 жил өмнө
parent
8cbdb4e7db
commit
f86eb1e254
87 өөрчлөгдсөн 1070 нэмэгдсэн , 619 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. BIN
      dist.rar
  2. 1 0
      dist/index.html
  3. 0 0
      dist/static/css/app.6dc01c6a1dc68777db1e9dc168f8e162.css
  4. 0 0
      dist/static/css/app.6dc01c6a1dc68777db1e9dc168f8e162.css.map
  5. BIN
      dist/static/fonts/element-icons.535877f.woff
  6. BIN
      dist/static/fonts/element-icons.732389d.ttf
  7. BIN
      dist/static/img/Handle.png
  8. BIN
      dist/static/img/System4.9952cba.png
  9. BIN
      dist/static/img/Transfer_left.png
  10. BIN
      dist/static/img/Transfer_right.png
  11. BIN
      dist/static/img/aa.f7c4034.png
  12. BIN
      dist/static/img/bg-01.16aaefa.png
  13. BIN
      dist/static/img/border.472cdf7.png
  14. BIN
      dist/static/img/border2.eb3177e.png
  15. BIN
      dist/static/img/border_two_upper.a4f91ff.png
  16. BIN
      dist/static/img/dialogBack.c626f6c.png
  17. BIN
      dist/static/img/juxing.png
  18. BIN
      dist/static/img/restart.png
  19. BIN
      dist/static/img/upper_daohang3@2x.5d1fb14.png
  20. BIN
      dist/static/img/upperdaohang2@2x.7acd4f2.png
  21. BIN
      dist/static/img/upperdhang4@2x.7ddd6b3.png
  22. BIN
      dist/static/img/web_position.png
  23. 7 0
      dist/static/js/0.e3430b297c6209e7bf9d.js
  24. 0 0
      dist/static/js/0.e3430b297c6209e7bf9d.js.map
  25. 0 0
      dist/static/js/1.f207b68de19267ef5b54.js
  26. 0 0
      dist/static/js/1.f207b68de19267ef5b54.js.map
  27. 0 0
      dist/static/js/10.b809baf67a5d9b088042.js
  28. 0 0
      dist/static/js/10.b809baf67a5d9b088042.js.map
  29. 2 0
      dist/static/js/11.c7dd9df1daa12226d21e.js
  30. 0 0
      dist/static/js/11.c7dd9df1daa12226d21e.js.map
  31. 0 0
      dist/static/js/12.4125f79e70238d6a93d4.js
  32. 0 0
      dist/static/js/12.4125f79e70238d6a93d4.js.map
  33. 2 0
      dist/static/js/13.09085b7259f818d9d1c4.js
  34. 0 0
      dist/static/js/13.09085b7259f818d9d1c4.js.map
  35. 0 0
      dist/static/js/14.d06a2b534adbd838b3d2.js
  36. 0 0
      dist/static/js/14.d06a2b534adbd838b3d2.js.map
  37. 0 0
      dist/static/js/15.1204cc1b9b130b094be7.js
  38. 0 0
      dist/static/js/15.1204cc1b9b130b094be7.js.map
  39. 0 0
      dist/static/js/16.9345cc7e715ff4b7b8d0.js
  40. 0 0
      dist/static/js/16.9345cc7e715ff4b7b8d0.js.map
  41. 2 0
      dist/static/js/17.b8db5308ef47dfa035e6.js
  42. 0 0
      dist/static/js/17.b8db5308ef47dfa035e6.js.map
  43. 2 0
      dist/static/js/18.02528a9c20fe28dd1686.js
  44. 0 0
      dist/static/js/18.02528a9c20fe28dd1686.js.map
  45. 0 0
      dist/static/js/19.a4237f0df60ffb3b3438.js
  46. 0 0
      dist/static/js/19.a4237f0df60ffb3b3438.js.map
  47. 0 0
      dist/static/js/2.133f8ef72bc447836848.js
  48. 0 0
      dist/static/js/2.133f8ef72bc447836848.js.map
  49. 2 0
      dist/static/js/20.8dcb8aac292269799867.js
  50. 0 0
      dist/static/js/20.8dcb8aac292269799867.js.map
  51. 2 0
      dist/static/js/21.3bf6c515dfae2eb3a0d3.js
  52. 0 0
      dist/static/js/21.3bf6c515dfae2eb3a0d3.js.map
  53. 2 0
      dist/static/js/22.f6099f89ec53dd927e93.js
  54. 0 0
      dist/static/js/22.f6099f89ec53dd927e93.js.map
  55. 0 0
      dist/static/js/3.22ee00ae2a8a6d3a4bb6.js
  56. 0 0
      dist/static/js/3.22ee00ae2a8a6d3a4bb6.js.map
  57. 0 0
      dist/static/js/4.86af33eb522cb76d234a.js
  58. 0 0
      dist/static/js/4.86af33eb522cb76d234a.js.map
  59. 0 0
      dist/static/js/5.15b63eb75060eb2faa46.js
  60. 0 0
      dist/static/js/5.15b63eb75060eb2faa46.js.map
  61. 0 0
      dist/static/js/6.9817d9b869cf9f369c9d.js
  62. 0 0
      dist/static/js/6.9817d9b869cf9f369c9d.js.map
  63. 0 0
      dist/static/js/7.bd27c263fba760384dae.js
  64. 0 0
      dist/static/js/7.bd27c263fba760384dae.js.map
  65. 0 0
      dist/static/js/8.4d340226df8fe234e37a.js
  66. 0 0
      dist/static/js/8.4d340226df8fe234e37a.js.map
  67. 0 0
      dist/static/js/9.7f3abb63eb4ace4ec4c9.js
  68. 0 0
      dist/static/js/9.7f3abb63eb4ace4ec4c9.js.map
  69. 0 0
      dist/static/js/app.23e10449c235a2ad2d0b.js
  70. 0 0
      dist/static/js/app.23e10449c235a2ad2d0b.js.map
  71. 0 0
      dist/static/js/getscript.js
  72. 2 0
      dist/static/js/manifest.959bd6d6c047152ee5ec.js
  73. 0 0
      dist/static/js/manifest.959bd6d6c047152ee5ec.js.map
  74. 4 0
      dist/static/js/serve.json
  75. 0 0
      dist/static/js/vendor.4f0689f4886fa52ac627.js
  76. 0 0
      dist/static/js/vendor.4f0689f4886fa52ac627.js.map
  77. 5 0
      dist/static/serve.js
  78. 117 80
      src/App.vue
  79. 31 3
      src/api/request.js
  80. 42 17
      src/pages/Alarm/History/index.vue
  81. 396 345
      src/pages/Alarm/RealTime/index.vue
  82. 305 124
      src/pages/ArmManage/index.vue
  83. 14 7
      src/pages/Baggage/index/index.vue
  84. 77 30
      src/pages/Common/home.vue
  85. 25 10
      src/pages/ReportStatistics/index.vue
  86. 28 1
      src/pages/admin.vue
  87. 2 2
      static/serve.js

BIN
dist.rar
Файл харах


+ 1 - 0
dist/index.html
Файл харах 

@@ -0,0 +1 @@
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>arm_web</title><script type=text/javascript src=./static/js/getscript.js></script><script src=./static/serve.js></script><link href=./static/css/app.6dc01c6a1dc68777db1e9dc168f8e162.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.959bd6d6c047152ee5ec.js></script><script type=text/javascript src=./static/js/vendor.4f0689f4886fa52ac627.js></script><script type=text/javascript src=./static/js/app.23e10449c235a2ad2d0b.js></script></body></html>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/css/app.6dc01c6a1dc68777db1e9dc168f8e162.css


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/css/app.6dc01c6a1dc68777db1e9dc168f8e162.css.map


BIN
dist/static/fonts/element-icons.535877f.woff
Файл харах


BIN
dist/static/fonts/element-icons.732389d.ttf
Файл харах


BIN
dist/static/img/Handle.png
Файл харах


BIN
dist/static/img/System4.9952cba.png
Файл харах


BIN
dist/static/img/Transfer_left.png
Файл харах


BIN
dist/static/img/Transfer_right.png
Файл харах


BIN
dist/static/img/aa.f7c4034.png
Файл харах


BIN
dist/static/img/bg-01.16aaefa.png
Файл харах


BIN
dist/static/img/border.472cdf7.png
Файл харах


BIN
dist/static/img/border2.eb3177e.png
Файл харах


BIN
dist/static/img/border_two_upper.a4f91ff.png
Файл харах


BIN
dist/static/img/dialogBack.c626f6c.png
Файл харах


BIN
dist/static/img/juxing.png
Файл харах


BIN
dist/static/img/restart.png
Файл харах


BIN
dist/static/img/upper_daohang3@2x.5d1fb14.png
Файл харах


BIN
dist/static/img/upperdaohang2@2x.7acd4f2.png
Файл харах


BIN
dist/static/img/upperdhang4@2x.7ddd6b3.png
Файл харах


BIN
dist/static/img/web_position.png
Файл харах


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 7 - 0
dist/static/js/0.e3430b297c6209e7bf9d.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/0.e3430b297c6209e7bf9d.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/1.f207b68de19267ef5b54.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/1.f207b68de19267ef5b54.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/10.b809baf67a5d9b088042.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/10.b809baf67a5d9b088042.js.map


+ 2 - 0
dist/static/js/11.c7dd9df1daa12226d21e.js
Файл харах 

@@ -0,0 +1,2 @@
 
+webpackJsonp([11],{"1dIK":function(t,e,s){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=s("l/JR"),i={name:"System",data:function(){return{isAdmin:!1}},created:function(){"admin"==JSON.parse(sessionStorage.getItem("userData")).userName&&(this.isAdmin=!0)},methods:{Reboots:function(){Object(n.p)().then(function(t){console.log(t)})},goToUser:function(){this.$router.push("/SystemSet/User")},goToUsers:function(){this.$router.push("/SystemSet/Users")},goToRestart:function(){var t=this;this.$confirm("是否需要重启系统?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){t.Reboots(),t.$message({type:"success",duration:800,message:"重启成功!"})}).catch(function(){t.$message({type:"info",duration:800,message:"已取消操作"})})},goToTaskSetting:function(){this.$router.push("/SystemSet/taskSetting")}}},r={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"System"},[n("div",{on:{click:t.goToUser}},[t._m(0),t._v(" "),n("img",{attrs:{src:s("Qf5d"),alt:""}})]),t._v(" "),n("div",{on:{click:t.goToUsers}},[t._m(1),t._v(" "),n("img",{attrs:{src:s("Qf5d"),alt:""}})]),t._v(" "),n("div",{on:{click:t.goToRestart}},[t._m(2),t._v(" "),n("img",{attrs:{src:s("Qf5d"),alt:""}})])])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("label",[this._v("参数"),e("br"),this._v("配置")])},function(){var t=this.$createElement,e=this._self._c||t;return e("label",[this._v("用户"),e("br"),this._v("管理")])},function(){var t=this.$createElement,e=this._self._c||t;return e("label",[this._v("系统"),e("br"),this._v("重启")])}]};var o=s("VU/8")(i,r,!1,function(t){s("Mwlq")},"data-v-2441b1ae",null);e.default=o.exports},Mwlq:function(t,e){},Qf5d:function(t,e,s){t.exports=s.p+"static/img/System4.9952cba.png"}});
 
+//# sourceMappingURL=11.c7dd9df1daa12226d21e.js.map

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/11.c7dd9df1daa12226d21e.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/12.4125f79e70238d6a93d4.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/12.4125f79e70238d6a93d4.js.map


+ 2 - 0
dist/static/js/13.09085b7259f818d9d1c4.js
Файл харах 

@@ -0,0 +1,2 @@
 
+webpackJsonp([13],{"7lf9":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=a("XLwt"),r=a.n(o),n={name:"echarts",props:["userJson"],data:function(){return{chart:null}},mounted:function(){this.chinaConfigure()},beforeDestroy:function(){this.chart&&(this.chart.dispose(),this.chart=null)},methods:{chinaConfigure:function(){console.log(this.userJson);var e=r.a.init(this.$refs.myEchart);window.onresize=e.resize,e.setOption({backgroundColor:"#02AFDB",tooltip:{},dataRange:{show:!1,min:0,max:1e3,text:["High","Low"],realtime:!0,calculable:!0,color:["orangered","yellow","lightskyblue"]},geo:{map:"china",roam:!0,label:{normal:{show:!0,textStyle:{color:"rgba(0,0,0,0.4)"}}},itemStyle:{normal:{borderColor:"rgba(0, 0, 0, 0.2)"},emphasis:{areaColor:null,shadowOffsetX:0,shadowOffsetY:0,shadowBlur:20,borderWidth:0,shadowColor:"rgba(0, 0, 0, 0.5)"}}},series:[{type:"scatter",coordinateSystem:"geo"},{name:"启动次数",type:"map",geoIndex:0,data:[{name:"北京",value:599},{name:"上海",value:142},{name:"黑龙江",value:44},{name:"深圳",value:92},{name:"湖北",value:810},{name:"四川",value:453}]}]})}}},s={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"echarts"},[t("div",{ref:"myEchart",style:{height:"400px",width:"100%"}})])},staticRenderFns:[]};var l=a("VU/8")(n,s,!1,function(e){a("KzPz")},null,null);t.default=l.exports},KzPz:function(e,t){}});
 
+//# sourceMappingURL=13.09085b7259f818d9d1c4.js.map

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/13.09085b7259f818d9d1c4.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/14.d06a2b534adbd838b3d2.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/14.d06a2b534adbd838b3d2.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/15.1204cc1b9b130b094be7.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/15.1204cc1b9b130b094be7.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/16.9345cc7e715ff4b7b8d0.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/16.9345cc7e715ff4b7b8d0.js.map


+ 2 - 0
dist/static/js/17.b8db5308ef47dfa035e6.js
Файл харах 

@@ -0,0 +1,2 @@
 
+webpackJsonp([17],{ekdI:function(e,t){},"wKA/":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this.$createElement;return(this._self._c||e)("router-view")},staticRenderFns:[]};var c=n("VU/8")({},r,!1,function(e){n("ekdI")},"data-v-530dfb0c",null);t.default=c.exports}});
 
+//# sourceMappingURL=17.b8db5308ef47dfa035e6.js.map

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/17.b8db5308ef47dfa035e6.js.map


+ 2 - 0
dist/static/js/18.02528a9c20fe28dd1686.js
Файл харах 

@@ -0,0 +1,2 @@
 
+webpackJsonp([18],{IeZm:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var c={render:function(){var e=this.$createElement;return(this._self._c||e)("div",{staticClass:"Baggageser"})},staticRenderFns:[]};var r=n("VU/8")({},c,!1,function(e){n("cctY")},null,null);t.default=r.exports},cctY:function(e,t){}});
 
+//# sourceMappingURL=18.02528a9c20fe28dd1686.js.map

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/18.02528a9c20fe28dd1686.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/19.a4237f0df60ffb3b3438.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/19.a4237f0df60ffb3b3438.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/2.133f8ef72bc447836848.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/2.133f8ef72bc447836848.js.map


+ 2 - 0
dist/static/js/20.8dcb8aac292269799867.js
Файл харах 

@@ -0,0 +1,2 @@
 
+webpackJsonp([20],{WgMQ:function(e,t){},by9T:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this.$createElement;return(this._self._c||e)("router-view")},staticRenderFns:[]};var u=n("VU/8")({},r,!1,function(e){n("WgMQ")},"data-v-196249d6",null);t.default=u.exports}});
 
+//# sourceMappingURL=20.8dcb8aac292269799867.js.map

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/20.8dcb8aac292269799867.js.map


+ 2 - 0
dist/static/js/21.3bf6c515dfae2eb3a0d3.js
Файл харах 

@@ -0,0 +1,2 @@
 
+webpackJsonp([21],{Gc5M:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this.$createElement;return(this._self._c||e)("router-view")},staticRenderFns:[]};var c=n("VU/8")({},r,!1,function(e){n("o2p9")},"data-v-0d39dc5b",null);t.default=c.exports},o2p9:function(e,t){}});
 
+//# sourceMappingURL=21.3bf6c515dfae2eb3a0d3.js.map

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/21.3bf6c515dfae2eb3a0d3.js.map


+ 2 - 0
dist/static/js/22.f6099f89ec53dd927e93.js
Файл харах 

@@ -0,0 +1,2 @@
 
+webpackJsonp([22],{SPdZ:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this.$createElement;return(this._self._c||e)("router-view")},staticRenderFns:[]};var c=n("VU/8")({},r,!1,function(e){n("tkJN")},"data-v-0c5c7a0e",null);t.default=c.exports},tkJN:function(e,t){}});
 
+//# sourceMappingURL=22.f6099f89ec53dd927e93.js.map

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/22.f6099f89ec53dd927e93.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/3.22ee00ae2a8a6d3a4bb6.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/3.22ee00ae2a8a6d3a4bb6.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/4.86af33eb522cb76d234a.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/4.86af33eb522cb76d234a.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/5.15b63eb75060eb2faa46.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/5.15b63eb75060eb2faa46.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/6.9817d9b869cf9f369c9d.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/6.9817d9b869cf9f369c9d.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/7.bd27c263fba760384dae.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/7.bd27c263fba760384dae.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/8.4d340226df8fe234e37a.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/8.4d340226df8fe234e37a.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/9.7f3abb63eb4ace4ec4c9.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/9.7f3abb63eb4ace4ec4c9.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/app.23e10449c235a2ad2d0b.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/app.23e10449c235a2ad2d0b.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/getscript.js


+ 2 - 0
dist/static/js/manifest.959bd6d6c047152ee5ec.js
Файл харах 

@@ -0,0 +1,2 @@
 
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],t[d]&&u.push(t[d][0]),t[d]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);u.length;)u.shift()();if(c)for(i=0;i<c.length;i++)b=a(a.s=c[i]);return b};var r={},t={25:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+e+"."+{0:"e3430b297c6209e7bf9d",1:"f207b68de19267ef5b54",2:"133f8ef72bc447836848",3:"22ee00ae2a8a6d3a4bb6",4:"86af33eb522cb76d234a",5:"15b63eb75060eb2faa46",6:"9817d9b869cf9f369c9d",7:"bd27c263fba760384dae",8:"4d340226df8fe234e37a",9:"7f3abb63eb4ace4ec4c9",10:"b809baf67a5d9b088042",11:"c7dd9df1daa12226d21e",12:"4125f79e70238d6a93d4",13:"09085b7259f818d9d1c4",14:"d06a2b534adbd838b3d2",15:"1204cc1b9b130b094be7",16:"9345cc7e715ff4b7b8d0",17:"b8db5308ef47dfa035e6",18:"02528a9c20fe28dd1686",19:"a4237f0df60ffb3b3438",20:"8dcb8aac292269799867",21:"3bf6c515dfae2eb3a0d3",22:"f6099f89ec53dd927e93"}[e]+".js";var f=setTimeout(d,12e4);function d(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=d,o.appendChild(c),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="./",a.oe=function(e){throw console.error(e),e}}([]);
 
+//# sourceMappingURL=manifest.959bd6d6c047152ee5ec.js.map

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/manifest.959bd6d6c047152ee5ec.js.map


+ 4 - 0
dist/static/js/serve.json
Файл харах 

@@ -0,0 +1,4 @@
 
+{
 
+  baseUrl:'http://192.168.30.250:3420/api',
 
+  mapURL:'http://192.168.30.250:3420/api'
 
+}

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/vendor.4f0689f4886fa52ac627.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/static/js/vendor.4f0689f4886fa52ac627.js.map


+ 5 - 0
dist/static/serve.js
Файл харах 

@@ -0,0 +1,5 @@
 
+window.g = {
 
+  url: `http://192.168.30.249:3420`,// 配置服务器地址
 
+  // url: `http://139.198.181.133:5000`,// 配置服务器地址
 
+  mapURL: `http://192.168.30.250:3420/api` // 地图地址
 
+}

+ 117 - 80
src/App.vue
Файл харах 

@@ -1,93 +1,130 @@
 
 <template>
 
-	<div id="app">
 
-		<router-view></router-view>
 
-	</div>
 
+  <div id="app">
 
+    <audio />
 
+    <router-view></router-view>
 
+  </div>
 
 </template>
 
 
 <script>
 
-	import {
 
-		Changestat,
 
-		Changestat2,
 
-		Changestat3
 
-	} from '@/api/request.js'
 
-	export default {
 
-		name: 'App',
 
-		data() {
 
-			return {
 
-				_gap_time:0,
 
-				_beforeUnload_time:0
 
-			}
 
-		},
 
-		created() {
 
-			
-		},
 
-		mounted() {
 
-			
-			// window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
 
-			// window.addEventListener('unload', e => this.unloadHandler(e))
 
-		},
 
-		async destroyed() {
 
-			// window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
 
-			// window.removeEventListener('unload', e => this.unloadHandler(e))
 
-		},
 
-		methods: {
 
-			// beforeunloadHandler() {
 
-			// 	this._beforeUnload_time = new Date().getTime();
 
-			// },
 
-			// async unloadHandler(e) {
 
-			// 	this._gap_time = new Date().getTime() - this._beforeUnload_time;
 
-			// 	//判断是窗口关闭还是刷新
 
-			// 	if (this._gap_time <= 5) {
 
-			// 		let data2 = {
 
-			// 			state:"0"
 
-			// 		}
 
-					
-			// 		await Changestat(data2).then(res => {
 
-			// 			sessionStorage.setItem("isopen1",false);
 
-			// 			sessionStorage.setItem("isopen2",false);
 
-			// 		}).catch(() =>{
 
-			// 		})
 
-			// 		await Changestat2(data2).then(res => {
 
-			// 			sessionStorage.setItem("isopen1",false);
 
-			// 			sessionStorage.setItem("isopen2",false);
 
-			// 		}).catch(() =>{
 
-			// 		})
 
-			// 		await Changestat3(data2).then(res => {
 
-			// 			sessionStorage.setItem("isopen1",false);
 
-			// 			sessionStorage.setItem("isopen2",false);
 
-			// 		}).catch(() =>{
 
-			// 		})
 
-			// 	}
 
-			// 	debugger
 
-			// },
 
-
 
-		},
 
-	}
 
+import {
 
+  Changestat,
 
+  Changestat2,
 
+  Changestat3,
 
+  alarmInformationhos,
 
+  AlarmSon,
 
+} from "@/api/request.js";
 
+export default {
 
+  name: "App",
 
+  data() {
 
+    return {
 
+      _gap_time: 0,
 
+      _beforeUnload_time: 0,
 
+      start: 0,
 
+      audio: new Audio(),
 
+    };
 
+  },
 
+  created() {},
 
+  mounted() {
 
+    setInterval(() => {
 
+      //实时更新数据
 
+      this.alarmList();
 
+    }, 2000);
 
+    // window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
 
+    // window.addEventListener('unload', e => this.unloadHandler(e))
 
+  },
 
+  async destroyed() {
 
+    // window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
 
+    // window.removeEventListener('unload', e => this.unloadHandler(e))
 
+  },
 
+  watch: {
 
+    start() {
 
+      this.linhear();
 
+    },
 
+  },
 
+  methods: {
 
+    //告警声音
 
+    linhear() {
 
+      AlarmSon().then((item) => {
 
+        let audio = new Audio();
 
+        audio.src = item.resultData;
 
+        if (this.start == 1) {
 
+          audio.play();
 
+        } else {
 
+          audio.pause();
 
+        }
 
+      });
 
+    },
 
+    //告警信息
 
+    alarmList() {
 
+      let params = {
 
+        value: false,
 
+        PageIndex: 1,
 
+        PageSize: 8,
 
+      };
 
+      alarmInformationhos(params).then((res) => {
 
+        this.agreepersonlist = res.resultData.result;
 
+        if (this.agreepersonlist.length > 0) {
 
+          this.start = 1;
 
+        } else {
 
+          this.start = 0;
 
+        }
 
+      });
 
+    },
 
+    // beforeunloadHandler() {
 
+    // 	this._beforeUnload_time = new Date().getTime();
 
+    // },
 
+    // async unloadHandler(e) {
 
+    // 	this._gap_time = new Date().getTime() - this._beforeUnload_time;
 
+    // 	//判断是窗口关闭还是刷新
 
+    // 	if (this._gap_time <= 5) {
 
+    // 		let data2 = {
 
+    // 			state:"0"
 
+    // 		}
 
+    // 		await Changestat(data2).then(res => {
 
+    // 			sessionStorage.setItem("isopen1",false);
 
+    // 			sessionStorage.setItem("isopen2",false);
 
+    // 		}).catch(() =>{
 
+    // 		})
 
+    // 		await Changestat2(data2).then(res => {
 
+    // 			sessionStorage.setItem("isopen1",false);
 
+    // 			sessionStorage.setItem("isopen2",false);
 
+    // 		}).catch(() =>{
 
+    // 		})
 
+    // 		await Changestat3(data2).then(res => {
 
+    // 			sessionStorage.setItem("isopen1",false);
 
+    // 			sessionStorage.setItem("isopen2",false);
 
+    // 		}).catch(() =>{
 
+    // 		})
 
+    // 	}
 
+    // 	debugger
 
+    // },
 
+  },
 
+};
 
 </script>
 
 
 <style lang='less'>
 
-	@import "./assets/css/common.less";
 
+@import "./assets/css/common.less";
 
 
-	/depp/.el-button {
 
-		border: none !important;
 
-	}
 
+/depp/.el-button {
 
+  border: none !important;
 
+}
 
 
-	#app {
 
-		width: 100%;
 
-		height: 100%;
 
-	}
 
+#app {
 
+  width: 100%;
 
+  height: 100%;
 
+}
 
 
-	::-webkit-scrollbar {
 
-		width: 4px;
 
-		height: 10px;
 
-	}
 
+::-webkit-scrollbar {
 
+  width: 4px;
 
+  height: 10px;
 
+}
 
 
-	::-webkit-scrollbar-thumb {
 
-		background-color: #0478C0;
 
-		border-radius: 3px;
 
-	}
 
+::-webkit-scrollbar-thumb {
 
+  background-color: #0478c0;
 
+  border-radius: 3px;
 
+}
 
 
-	.el-table {
 
-		background-color: none !important;
 
-	}
 
+.el-table {
 
+  background-color: none !important;
 
+}
 
 </style>

+ 31 - 3
src/api/request.js
Файл харах 

@@ -5,6 +5,12 @@ export function getVehicles(data) {//获取车辆信息
 
     method: 'get',
 
   })
 
 }
 
+export function getVehicleser() {//获取车辆信息
 
+  return Service({
 
+    url: '/Framework/AmrPlc/GetAmrUpperPlcList',
 
+    method: 'get',
 
+  })
 
+}
 
 export function getVehicleByIds(id) {//
 
   return Service({
 
     url: '/vehicles/' + id,
 
@@ -38,6 +44,12 @@ export function alarmInformation() {//告警信息
 
     method: 'get'
 
   })
 
 }
 
+export function alarmInformationhos(data) {//告警信息历史
 
+  return Service({
 
+    url: '/Framework/AlarmPlc/GetAlarmList?value=' + data.value + '&PageIndex=' + data.PageIndex + '&PageSize=' + data.PageSize,
 
+    method: 'get'
 
+  })
 
+}
 
 export function getVehicleFace() {//小车光电
 
   return Service({
 
     url: '/dbvehiclebpc',
 
@@ -82,7 +94,7 @@ export function Getorders(data) {//
 
 }
 
 export function GetTemplateslist() {//订单模板
 
   return Service({
 
-    url: '/templateslist',
 
+    url: '/Framework/IDSInfo/TemplatesInfo',
 
     method: 'get',
 
     params: { page: -1 }
 
   })
 
@@ -103,7 +115,7 @@ export function SetOrders(data) {//命令控制指定订单
 
 
 export function GetUsers() {//获取用户列表
 
   return Service({
 
-    url: '/usersmanagement',
 
+    url: '/Framework/UserInfo/GetAllList',
 
     method: 'get',
 
     params: { page: -1 }
 
   })
 
@@ -381,8 +393,24 @@ export function GetAmrUpperPlcList(data) {//获取车载状态
 
   })
 
 }
 
 export function BaggageInquiry(data) {//行李查询
 
+  if (data.bagid.length == 0) {
 
+    return Service({
 
+      url: '/Framework/BagTrack/GetAllList?PageIndex=' + data.page + "&PageSize=" + data.PageSize,
 
+      method: 'get',
 
+      data: data
 
+    })
 
+  } else {
 
+    return Service({
 
+      url: '/Framework/BagTrack/GetAllList?PageIndex=' + data.page + "&PageSize=" + data.PageSize + '&bagid=' + data.bagid,
 
+      method: 'get',
 
+      data: data
 
+    })
 
+  }
 
+}
 
+
 
+export function AlarmSon(data) {//告警声音
 
   return Service({
 
-    url: '/Framework/BagTrack/GetAllList?PageIndex=' + data.page + "&PageSize=" + data.PageSize,
 
+    url: '/Framework/AlarmSon/SonPatch',
 
     method: 'get',
 
     data: data
 
   })

+ 42 - 17
src/pages/Alarm/History/index.vue
Файл харах 

@@ -15,29 +15,37 @@
 
     <div class="downlodTable" @click="downlodTable">导出</div>
 
     <el-table
 
       :data="tableData"
 
-      style="width: 100%; color: #2daff5; height: 720px; overflow-y: auto"
 
+      style="width: 100%; color: #2daff5; height: 678px; overflow-y: auto"
 
     >
 
       <el-table-column
 
-        prop="error_code"
 
+        prop="error_position"
 
         align="center"
 
-        label="Alarm ID"
 
+        label="报警位置"
 
         width="180"
 
       >
 
       </el-table-column>
 
-      <el-table-column prop="error_reason" align="center" label="报警内容">
 
+      <el-table-column prop="error_content" align="center" label="报警内容">
 
       </el-table-column>
 
-      <el-table-column prop="equ_name" align="center" label="报警模块">
 
+      <el-table-column prop="handle_method" align="center" label="处理方式">
 
       </el-table-column>
 
       <el-table-column prop="alarm_date" align="center" label="报警时间">
 
       </el-table-column>
 
       <el-table-column prop="deal_date" align="center" label="恢复时间">
 
       </el-table-column>
 
     </el-table>
 
+    <el-pagination
 
+      @current-change="changePage"
 
+      @prev-click="changePage"
 
+      @next-click="changePage"
 
+      layout="prev, pager, next"
 
+      :total="pageCount"
 
+    >
 
+    </el-pagination>
 
   </div>
 
 </template>
 
 
 <script>
 
-import { Dbalarm } from "@/api/request.js";
 
+import { alarmInformationhos } from "@/api/request.js";
 
 import FileSaver from "file-saver";
 
 import XLSX from "xlsx";
 
 export default {
 
@@ -45,6 +53,9 @@ export default {
 
   data() {
 
     return {
 
       sj: null,
 
+      pageSize: 1,
 
+      pageSizes: 1,
 
+      pageCount: 0,
 
       reqData: {
 
         ctg: "his",
 
         opt: "nonexcel",
 
@@ -83,19 +94,28 @@ export default {
 
     }
 
   },
 
   methods: {
 
+    changePage(e) {
 
+      this.pageSize = e;
 
+      this.getData();
 
+    },
 
     getData() {
 
-      Dbalarm(this.reqData).then((res) => {
 
-        console.log(res.AlarmInfo);
 
-        this.tableData = res.AlarmInfo;
 
+      let params = {
 
+        value: true,
 
+        PageIndex: this.pageSize,
 
+        PageSize: 13,
 
+      };
 
+      alarmInformationhos(params).then((res) => {
 
+        this.tableData = res.resultData.result;
 
+        this.pageCount = res.pageNumber;
 
         // console.log(this.timeFor(this.tableData[0].alarm_date))
 
-        for (let index in this.tableData) {
 
-          this.tableData[index].alarm_date = this.timeFor(
 
-            this.tableData[index].alarm_date
 
-          );
 
-          this.tableData[index].deal_date = this.timeFor(
 
-            this.tableData[index].deal_date
 
-          );
 
-        }
 
+        // for (let index in this.tableData) {
 
+        //   this.tableData[index].alarm_date = this.timeFor(
 
+        //     this.tableData[index].alarm_date
 
+        //   );
 
+        //   this.tableData[index].deal_date = this.timeFor(
 
+        //     this.tableData[index].deal_date
 
+        //   );
 
+        // }
 
       });
 
     },
 
     timeFor(dateA) {
 
@@ -179,6 +199,11 @@ export default {
 
 </script>
 
 
 <style lang="less" scoped>
 
+/deep/.el-pagination {
 
+  z-index: 9999;
 
+  display: flex;
 
+  justify-content: center;
 
+}
 
 .logBox {
 
   width: 100%;
 
   height: 100%;

+ 396 - 345
src/pages/Alarm/RealTime/index.vue
Файл харах 

@@ -1,371 +1,422 @@
 
 <template>
 
-	<div class="logBox">
 
-		<div class="border_left_top border"></div>
 
-		<div class="border_top border"></div>
 
-		<div class="border_right_top border"></div>
 
-		<div class="border_left border"></div>
 
-		<div class="border_right border"></div>
 
-		<div class="border_left_bottom border"></div>
 
-		<div class="border_bottom border"></div>
 
-		<div class="border_right_bottom border"></div>
 
-		<el-button-group id="topButton">
 
-			<el-button type="primary" class="active">当前</el-button>
 
-			<el-button type="primary" @click="goTo">历史</el-button>
 
-		</el-button-group>
 
-		<div class="downlodTable" @click="downlodTable">导出</div>
 
-		<el-table :data="tableData" id="userTableData" style="width: 100%;color: #2DAFF5;;">
 
-			<el-table-column prop="error_code" align="center" label="Alarm ID" width="180">
 
-			</el-table-column>
 
-			<el-table-column prop="error_reason" align="center" label="报警内容">
 
-			</el-table-column>
 
-			<el-table-column prop="equ_name" align="center" label="报警模块">
 
-			</el-table-column>
 
-			<el-table-column prop="alarm_date" align="center" label="报警时间">
 
-			</el-table-column>
 
-			<el-table-column prop="deal_date" align="center" label="恢复时间">
 
-			</el-table-column>
 
-			<el-table-column prop="error_solve" label="处理方法">
 
-			</el-table-column>
 
-		</el-table>
 
-	</div>
 
+  <div class="logBox">
 
+    <div class="border_left_top border"></div>
 
+    <div class="border_top border"></div>
 
+    <div class="border_right_top border"></div>
 
+    <div class="border_left border"></div>
 
+    <div class="border_right border"></div>
 
+    <div class="border_left_bottom border"></div>
 
+    <div class="border_bottom border"></div>
 
+    <div class="border_right_bottom border"></div>
 
+    <el-button-group id="topButton">
 
+      <el-button type="primary" class="active">当前</el-button>
 
+      <el-button type="primary" @click="goTo">历史</el-button>
 
+    </el-button-group>
 
+    <div class="downlodTable" @click="downlodTable">导出</div>
 
+    <el-table
 
+      :data="tableData"
 
+      id="userTableData"
 
+      style="width: 100%; color: #2daff5"
 
+    >
 
+      <el-table-column
 
+        prop="error_position"
 
+        align="center"
 
+        label="报警位置"
 
+        width="180"
 
+      >
 
+      </el-table-column>
 
+      <el-table-column prop="error_content" align="center" label="报警内容">
 
+      </el-table-column>
 
+      <el-table-column prop="handle_method" align="center" label="处理方式">
 
+      </el-table-column>
 
+      <el-table-column prop="alarm_date" align="center" label="报警时间">
 
+      </el-table-column>
 
+    </el-table>
 
+    <el-pagination
 
+      @current-change="changePage"
 
+      @prev-click="changePage"
 
+      @next-click="changePage"
 
+      layout="prev, pager, next"
 
+      :total="pageCount"
 
+    >
 
+    </el-pagination>
 
+  </div>
 
 </template>
 
 
 <script>
 
-	import {
 
-		Dbalarm,
 
-		DbalarmTime
 
-	} from '../../../api/request.js'
 
-	import FileSaver from "file-saver";
 
-	import XLSX from "xlsx";
 
-	export default {
 
-		name: "RealTime",
 
-		data() {
 
-			return {
 
-				sj: null,
 
-				reqData: {
 
-					ctg: "curr",
 
-					opt: 'nonexcel'
 
-				},
 
-				tableData: [{
 
-					id: 4,
 
-					error_code: "C03",
 
-					equ_name: "输送机",
 
-					error_reason: "C03_Status.Emergency_Stop",
 
-					error_reason: "C03急停",
 
-					error_solve: "检查电控柜急停按钮",
 
-					alarm_date: "/Date(1603778413000)/",
 
-					if_deal: 0,
 
-					deal_man: null,
 
-					deal_date: null
 
-
 
-				}]
 
-			}
 
-		},
 
-		created() {
 
-			// this.DbalarmTimes()
 
-			this.getData()
 
-		},
 
-		mounted(){
 
-			clearInterval(this.sj)
 
-			let that = this;
 
-			this.sj = setInterval(function() {
 
-				that.getData()
 
-			}, 3000)
 
-		},
 
-		beforeRouteLeave(to, from, next){
 
-			next();
 
-			if (this.sj) {
 
-			  clearInterval(this.sj)
 
-			  this.sj = null;
 
-			}
 
-		},
 
-		methods: {
 
-			downlodTable() {
 
-				this.$confirm('是否需要导出xlsx文档, 是否继续?', '提示', {
 
-					confirmButtonText: '确定',
 
-					cancelButtonText: '取消',
 
-					type: 'warning'
 
-				}).then(() => {
 
-					this.downFile();
 
-					this.$message({
 
-						type: 'success',
 
-						message: '导出成功!'
 
-					});
 
-				}).catch(() => {
 
-					this.$message({
 
-						type: 'info',
 
-						message: '已取消导出'
 
-					});
 
-				});
 
-			
-			},
 
-			downFile() {
 
-				var wb = XLSX.utils.table_to_book(document.querySelector("#userTableData"));
 
-				var wbout = XLSX.write(wb, {
 
-					bookType: "xlsx",
 
-					bookSST: true,
 
-					type: "array"
 
-				});
 
-				try {
 
-					FileSaver.saveAs(
 
-						new Blob([wbout], {
 
-							type: "application/octet-stream"
 
-						}),
 
-						"报警统计.xlsx"
 
-					);
 
-				} catch (e) {
 
-					if (typeof console !== "undefined") console.log(e, wbout);
 
-				}
 
-				return wbout;
 
-			},
 
-			DbalarmTimes() {
 
-				DbalarmTime().then(res => {
 
-					console.log(res.AverageTime)
 
-					let dataAry = {}
 
-					res.AverageTime.forEach((item, index, arr) => {
 
-						// console.log(arr[index].execute_vehicle_id)
 
-						if (arr[index].execute_vehicle_id == 1) {
 
-							this.timeTool(arr[index].done_time) - this.timeTool(arr[index].execute_time)
 
-						}
 
-					})
 
-				})
 
-			},
 
-			timeTool(time) {
 
-				return time.substring(time.indexOf('(') + 1, time.indexOf(')')) / 1000
 
-			},
 
-			getData() {
 
-				Dbalarm(this.reqData).then(res => {
 
-					console.log(res)
 
-					console.log(res.AlarmInfo)
 
-					this.tableData = res.AlarmInfo
 
-					for (let index in this.tableData) {
 
-						this.tableData[index].alarm_date = this.timeFor(this.tableData[index].alarm_date)
 
-					}
 
-				})
 
-			},
 
-			timeFor(dateA) { //转换时间戳
 
-				var timestamp = dateA;
 
-				var date = new Date(parseInt(timestamp.replace("/Date(", "").replace(")/", ""), 10));
 
-				let Y = date.getFullYear() + '-';
 
-				let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
 
-				let D = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()) + ' ';
 
-				let h = (date.getHours() < 10 ? '0' + (date.getHours()) : date.getHours()) + ':';
 
-				let m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + ':';
 
-				let s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds());
 
-				var NewDtime = Y + M + D + h + m + s;
 
-				return NewDtime;
 
-			},
 
-			goTo() {
 
-				this.$router.push("/Alarm/History");
 
-			},
 
-			downlodTable() {
 
-				this.$confirm('是否需要导出xlsx文档, 是否继续?', '提示', {
 
-					confirmButtonText: '确定',
 
-					cancelButtonText: '取消',
 
-					type: 'warning'
 
-				}).then(() => {
 
-					this.downFile();
 
-					this.$message({
 
-						type: 'success',
 
-						message: '导出成功!'
 
-					});
 
-				}).catch(() => {
 
-					this.$message({
 
-						type: 'info',
 
-						message: '已取消导出'
 
-					});
 
-				});
 
-
 
-			},
 
-			downFile() {
 
-				var wb = XLSX.utils.table_to_book(document.querySelector("#userTableData"));
 
-				var wbout = XLSX.write(wb, {
 
-					bookType: "xlsx",
 
-					bookSST: true,
 
-					type: "array"
 
-				});
 
-				try {
 
-					FileSaver.saveAs(
 
-						new Blob([wbout], {
 
-							type: "application/octet-stream"
 
-						}),
 
-						"Alarm.xlsx"
 
-					);
 
-				} catch (e) {
 
-					if (typeof console !== "undefined") console.log(e, wbout);
 
-				}
 
-				return wbout;
 
-			},
 
-			//设置指定行、列、具体单元格颜色
 
-			cellStyle({
 
-				row,
 
-				column,
 
-				rowIndex,
 
-				columnIndex
 
-			}) {
 
-				if (columnIndex === 0) { //指定坐标rowIndex ：行，columnIndex ：列
 
-					return 'background:#103366' //rgb(105,0,7)
 
-				} else {
 
-					return ''
 
-				}
 
-			}
 
-		}
 
-	}
 
+import {
 
+  Dbalarm,
 
+  DbalarmTime,
 
+  alarmInformationhos,
 
+} from "../../../api/request.js";
 
+import FileSaver from "file-saver";
 
+import XLSX from "xlsx";
 
+export default {
 
+  name: "RealTime",
 
+  data() {
 
+    return {
 
+      sj: null,
 
+      reqData: {
 
+        ctg: "curr",
 
+        opt: "nonexcel",
 
+      },
 
+      pageSize: 1,
 
+      pageSizes: 1,
 
+      pageCount: 0,
 
+      tableData: [
 
+        {
 
+          id: 4,
 
+          error_code: "C03",
 
+          equ_name: "输送机",
 
+          error_reason: "C03_Status.Emergency_Stop",
 
+          error_reason: "C03急停",
 
+          error_solve: "检查电控柜急停按钮",
 
+          alarm_date: "/Date(1603778413000)/",
 
+          if_deal: 0,
 
+          deal_man: null,
 
+          deal_date: null,
 
+        },
 
+      ],
 
+    };
 
+  },
 
+  created() {
 
+    // this.DbalarmTimes()
 
+    this.getData();
 
+  },
 
+  mounted() {
 
+    clearInterval(this.sj);
 
+    let that = this;
 
+    this.sj = setInterval(function () {
 
+      that.getData();
 
+    }, 3000);
 
+  },
 
+  beforeRouteLeave(to, from, next) {
 
+    next();
 
+    if (this.sj) {
 
+      clearInterval(this.sj);
 
+      this.sj = null;
 
+    }
 
+  },
 
+  methods: {
 
+    changePage(e) {
 
+      this.pageSize = e;
 
+      this.getData();
 
+    },
 
+    downlodTable() {
 
+      this.$confirm("是否需要导出xlsx文档, 是否继续?", "提示", {
 
+        confirmButtonText: "确定",
 
+        cancelButtonText: "取消",
 
+        type: "warning",
 
+      })
 
+        .then(() => {
 
+          this.downFile();
 
+          this.$message({
 
+            type: "success",
 
+            message: "导出成功!",
 
+          });
 
+        })
 
+        .catch(() => {
 
+          this.$message({
 
+            type: "info",
 
+            message: "已取消导出",
 
+          });
 
+        });
 
+    },
 
+    downFile() {
 
+      var wb = XLSX.utils.table_to_book(
 
+        document.querySelector("#userTableData")
 
+      );
 
+      var wbout = XLSX.write(wb, {
 
+        bookType: "xlsx",
 
+        bookSST: true,
 
+        type: "array",
 
+      });
 
+      try {
 
+        FileSaver.saveAs(
 
+          new Blob([wbout], {
 
+            type: "application/octet-stream",
 
+          }),
 
+          "报警统计.xlsx"
 
+        );
 
+      } catch (e) {
 
+        if (typeof console !== "undefined") console.log(e, wbout);
 
+      }
 
+      return wbout;
 
+    },
 
+    DbalarmTimes() {
 
+      DbalarmTime().then((res) => {
 
+        console.log(res.AverageTime);
 
+        let dataAry = {};
 
+        res.AverageTime.forEach((item, index, arr) => {
 
+          // console.log(arr[index].execute_vehicle_id)
 
+          if (arr[index].execute_vehicle_id == 1) {
 
+            this.timeTool(arr[index].done_time) -
 
+              this.timeTool(arr[index].execute_time);
 
+          }
 
+        });
 
+      });
 
+    },
 
+    timeTool(time) {
 
+      return time.substring(time.indexOf("(") + 1, time.indexOf(")")) / 1000;
 
+    },
 
+    getData() {
 
+      let params = {
 
+        value: false,
 
+        PageIndex: this.pageSize,
 
+        PageSize: 13,
 
+      };
 
+      alarmInformationhos(params).then((res) => {
 
+        this.tableData = res.resultData.result;
 
+        this.pageCount = res.pageNumber;
 
+        // for (let index in this.tableData) {
 
+        //   this.tableData[index].alarm_date = this.timeFor(
 
+        //     this.tableData[index].alarm_date
 
+        //   );
 
+        // }
 
+      });
 
+    },
 
+    timeFor(dateA) {
 
+      //转换时间戳
 
+      var timestamp = dateA;
 
+      var date = new Date(
 
+        parseInt(timestamp.replace("/Date(", "").replace(")/", ""), 10)
 
+      );
 
+      let Y = date.getFullYear() + "-";
 
+      let M =
 
+        (date.getMonth() + 1 < 10
 
+          ? "0" + (date.getMonth() + 1)
 
+          : date.getMonth() + 1) + "-";
 
+      let D =
 
+        (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
 
+      let h =
 
+        (date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) + ":";
 
+      let m =
 
+        (date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()) +
 
+        ":";
 
+      let s =
 
+        date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
 
+      var NewDtime = Y + M + D + h + m + s;
 
+      return NewDtime;
 
+    },
 
+    goTo() {
 
+      this.$router.push("/Alarm/History");
 
+    },
 
+    downlodTable() {
 
+      this.$confirm("是否需要导出xlsx文档, 是否继续?", "提示", {
 
+        confirmButtonText: "确定",
 
+        cancelButtonText: "取消",
 
+        type: "warning",
 
+      })
 
+        .then(() => {
 
+          this.downFile();
 
+          this.$message({
 
+            type: "success",
 
+            message: "导出成功!",
 
+          });
 
+        })
 
+        .catch(() => {
 
+          this.$message({
 
+            type: "info",
 
+            message: "已取消导出",
 
+          });
 
+        });
 
+    },
 
+    downFile() {
 
+      var wb = XLSX.utils.table_to_book(
 
+        document.querySelector("#userTableData")
 
+      );
 
+      var wbout = XLSX.write(wb, {
 
+        bookType: "xlsx",
 
+        bookSST: true,
 
+        type: "array",
 
+      });
 
+      try {
 
+        FileSaver.saveAs(
 
+          new Blob([wbout], {
 
+            type: "application/octet-stream",
 
+          }),
 
+          "Alarm.xlsx"
 
+        );
 
+      } catch (e) {
 
+        if (typeof console !== "undefined") console.log(e, wbout);
 
+      }
 
+      return wbout;
 
+    },
 
+    //设置指定行、列、具体单元格颜色
 
+    cellStyle({ row, column, rowIndex, columnIndex }) {
 
+      if (columnIndex === 0) {
 
+        //指定坐标rowIndex ：行，columnIndex ：列
 
+        return "background:#103366"; //rgb(105,0,7)
 
+      } else {
 
+        return "";
 
+      }
 
+    },
 
+  },
 
+};
 
 </script>
 
 
 <style lang="less" scoped>
 
-	.logBox {
 
-		width: 100%;
 
-		height: 100%;
 
-		overflow: hidden;
 
-		position: relative;
 
-		padding: 4.0625rem 1.5rem 4.0625rem 2.5rem;
 
-		box-sizing: border-box;
 
-		overflow-y: auto;
 
-		// background: url(../../assets/img/border.png) no-repeat center center;
 
-		// background-size: 100% 100%;
 
-		.border {
 
-			position: absolute;
 
-		}
 
-
 
-		.border_left_top {
 
-			width: 12.625rem;
 
-			height: 5.875rem;
 
-			background: url(../../../assets/img/border.png);
 
-			left: 1px;
 
-			top: 1px;
 
-		}
 
+/deep/.el-pagination {
 
+  z-index: 9999;
 
+  display: flex;
 
+  justify-content: center;
 
+}
 
+.logBox {
 
+  width: 100%;
 
+  height: 100%;
 
+  overflow: hidden;
 
+  position: relative;
 
+  padding: 4.0625rem 1.5rem 4.0625rem 2.5rem;
 
+  box-sizing: border-box;
 
+  overflow-y: auto;
 
+  // background: url(../../assets/img/border.png) no-repeat center center;
 
+  // background-size: 100% 100%;
 
+  .border {
 
+    position: absolute;
 
+  }
 
 
-		.border_top {
 
-			width: calc(100% - 12.625rem - 4.9375rem);
 
-			height: 1.5rem;
 
-			background: url(../../../assets/img/border_top.png) no-repeat center center;
 
-			background-size: 100% 100%;
 
-			left: 12.625rem;
 
-			top: 0;
 
-		}
 
+  .border_left_top {
 
+    width: 12.625rem;
 
+    height: 5.875rem;
 
+    background: url(../../../assets/img/border.png);
 
+    left: 1px;
 
+    top: 1px;
 
+  }
 
 
-		.border_right_top {
 
-			width: 4.9375rem;
 
-			height: 5.875rem;
 
-			background: url(../../../assets/img/border_right_top.png) no-repeat center center;
 
-			background-size: 100% 100%;
 
-			right: 0.0625rem;
 
-			top: 0;
 
-		}
 
+  .border_top {
 
+    width: calc(100% - 12.625rem - 4.9375rem);
 
+    height: 1.5rem;
 
+    background: url(../../../assets/img/border_top.png) no-repeat center center;
 
+    background-size: 100% 100%;
 
+    left: 12.625rem;
 
+    top: 0;
 
+  }
 
 
-		.border_left {
 
-			width: 1.375rem;
 
-			height: calc(100% - 5.875rem - 7.625rem);
 
-			background: url(../../../assets/img/border_left.png) no-repeat center center;
 
-			background-size: 100% 100%;
 
-			left: 0;
 
-			top: 5.875rem;
 
-		}
 
+  .border_right_top {
 
+    width: 4.9375rem;
 
+    height: 5.875rem;
 
+    background: url(../../../assets/img/border_right_top.png) no-repeat center
 
+      center;
 
+    background-size: 100% 100%;
 
+    right: 0.0625rem;
 
+    top: 0;
 
+  }
 
 
-		.border_right {
 
-			width: 0.1875rem;
 
-			height: calc(100% - 5.875rem - 7.6875rem);
 
-			background: url(../../../assets/img/border_right.png) no-repeat center center;
 
-			background-size: 100% 100%;
 
-			right: 0;
 
-			top: 5.875rem;
 
-		}
 
+  .border_left {
 
+    width: 1.375rem;
 
+    height: calc(100% - 5.875rem - 7.625rem);
 
+    background: url(../../../assets/img/border_left.png) no-repeat center center;
 
+    background-size: 100% 100%;
 
+    left: 0;
 
+    top: 5.875rem;
 
+  }
 
 
-		.border_left_bottom {
 
-			width: 11.625rem;
 
-			height: 7.625rem;
 
-			background: url(../../../assets/img/border_left_bottom.png) no-repeat center center;
 
-			background-size: 100% 100%;
 
-			left: 0;
 
-			bottom: 0;
 
-		}
 
+  .border_right {
 
+    width: 0.1875rem;
 
+    height: calc(100% - 5.875rem - 7.6875rem);
 
+    background: url(../../../assets/img/border_right.png) no-repeat center
 
+      center;
 
+    background-size: 100% 100%;
 
+    right: 0;
 
+    top: 5.875rem;
 
+  }
 
 
-		.border_bottom {
 
-			width: calc(100% - 11.625rem - 4.9375rem);
 
-			height: 0.1875rem;
 
-			background: url(../../../assets/img/border_bottom.png) no-repeat center center;
 
-			background-size: 100% 100%;
 
-			left: 11.625rem;
 
-			bottom: 0;
 
-		}
 
+  .border_left_bottom {
 
+    width: 11.625rem;
 
+    height: 7.625rem;
 
+    background: url(../../../assets/img/border_left_bottom.png) no-repeat center
 
+      center;
 
+    background-size: 100% 100%;
 
+    left: 0;
 
+    bottom: 0;
 
+  }
 
 
-		.border_right_bottom {
 
-			width: 4.9375rem;
 
-			height: 7.6875rem;
 
-			background: url(../../../assets/img/border_right_bottom.png) no-repeat center center;
 
-			background-size: 100% 100%;
 
-			right: 0;
 
-			bottom: 0;
 
-		}
 
+  .border_bottom {
 
+    width: calc(100% - 11.625rem - 4.9375rem);
 
+    height: 0.1875rem;
 
+    background: url(../../../assets/img/border_bottom.png) no-repeat center
 
+      center;
 
+    background-size: 100% 100%;
 
+    left: 11.625rem;
 
+    bottom: 0;
 
+  }
 
 
-		#topButton {
 
-			position: absolute;
 
-			top: 8px;
 
-			left: 8px;
 
-			z-index: 1;
 
+  .border_right_bottom {
 
+    width: 4.9375rem;
 
+    height: 7.6875rem;
 
+    background: url(../../../assets/img/border_right_bottom.png) no-repeat
 
+      center center;
 
+    background-size: 100% 100%;
 
+    right: 0;
 
+    bottom: 0;
 
+  }
 
 
-			button:first-child {
 
-				border: none;
 
-				background: url(../../../assets/img/check1.png) no-repeat center center;
 
-				background-size: 100% 100%;
 
-				padding: 12px 50px 12px 35px;
 
-				position: absolute;
 
-				font-weight: bold;
 
-				font-style: italic;
 
-				color: #76899D;
 
-			}
 
+  #topButton {
 
+    position: absolute;
 
+    top: 8px;
 
+    left: 8px;
 
+    z-index: 1;
 
 
-			button:last-child {
 
-				border: none;
 
-				background: url(../../../assets/img/uncheck2.png) no-repeat center center;
 
-				background-size: 100% 100%;
 
-				padding: 12px 55px;
 
-				position: absolute;
 
-				left: 78px;
 
-				font-weight: bold;
 
-				font-style: italic;
 
-				color: #76899D;
 
-			}
 
+    button:first-child {
 
+      border: none;
 
+      background: url(../../../assets/img/check1.png) no-repeat center center;
 
+      background-size: 100% 100%;
 
+      padding: 12px 50px 12px 35px;
 
+      position: absolute;
 
+      font-weight: bold;
 
+      font-style: italic;
 
+      color: #76899d;
 
+    }
 
 
-			.active {
 
-				color: #fff !important;
 
-			}
 
-		}
 
+    button:last-child {
 
+      border: none;
 
+      background: url(../../../assets/img/uncheck2.png) no-repeat center center;
 
+      background-size: 100% 100%;
 
+      padding: 12px 55px;
 
+      position: absolute;
 
+      left: 78px;
 
+      font-weight: bold;
 
+      font-style: italic;
 
+      color: #76899d;
 
+    }
 
 
-		.el-table::before {
 
-			height: 0;
 
-		}
 
+    .active {
 
+      color: #fff !important;
 
+    }
 
+  }
 
 
-	}
 
+  .el-table::before {
 
+    height: 0;
 
+  }
 
+}
 
 
-	.downlodTable {
 
-		width: 50px;
 
-		height: 30px;
 
-		box-shadow: inset 0px 1px 38px 0px rgba(0, 162, 253, 0.4) !important;
 
-		border: 1px solid rgba(1, 148, 228, 0.34) !important;
 
-		background: none !important;
 
-		float: right;
 
-		position: absolute;
 
-		top: 30px;
 
-		right: 25px;
 
-		color: #ddd;
 
-		text-align: center;
 
-		line-height: 30px;
 
-		cursor: pointer;
 
-	}
 
+.downlodTable {
 
+  width: 50px;
 
+  height: 30px;
 
+  box-shadow: inset 0px 1px 38px 0px rgba(0, 162, 253, 0.4) !important;
 
+  border: 1px solid rgba(1, 148, 228, 0.34) !important;
 
+  background: none !important;
 
+  float: right;
 
+  position: absolute;
 
+  top: 30px;
 
+  right: 25px;
 
+  color: #ddd;
 
+  text-align: center;
 
+  line-height: 30px;
 
+  cursor: pointer;
 
+}
 
 </style>
 
 <style>
 
-	.logBox .el-table th {
 
-		background: #103366 !important;
 
-	}
 
+.logBox .el-table th {
 
+  background: #103366 !important;
 
+}
 
 
-	.logBox .el-table th>.cell {
 
-		color: #0194E4 !important;
 
-	}
 
+.logBox .el-table th > .cell {
 
+  color: #0194e4 !important;
 
+}
 
 
-	.logBox .el-table th,
 
-	.el-table tr:hover {
 
-		background: red;
 
-	}
 
+.logBox .el-table th,
 
+.el-table tr:hover {
 
+  background: red;
 
+}
 
 </style>

+ 305 - 124
src/pages/ArmManage/index.vue
Файл харах 

@@ -222,7 +222,7 @@
 
                 class="item_upper"
 
                 :class=""
 
                 @click="shutDown(item, index)"
 
-                v-if="item.emergency_state == 'OK'"
 
+                v-if="item.uI_Emergency === false"
 
               >
 
                 <div class="upper_title">紧急停止</div>
 
               </div>
 
@@ -230,29 +230,38 @@
 
                 class="item_upper"
 
                 :class=""
 
                 @click="UNshutDown(item, index)"
 
-                v-if="item.emergency_state != 'OK'"
 
+                v-if="item.uI_Emergency === true"
 
               >
 
                 <div class="upper_title">取消急停</div>
 
               </div>
 
             </div>
 
 
             <div class="right_item_body">
 
+              <div class="item_upper" @click="cartTurnLeft(item, index)">
 
+                <div class="upper_title">
 
+                  {{ item.uI_BeltRun_L == false ? "移载左转" : "取消左转" }}
 
+                </div>
 
+              </div>
 
+            </div>
 
+            <!-- <div class="right_item_body">
 
               <div
 
                 class="item_upper"
 
+                v-if="item.uI_BeltRun_L === true"
 
                 :class="{ right_item_active: item.isLeft == 1 }"
 
-                @click="cartTurnLeft(item, index)"
 
+                @click="UPcartTurnLeft(item, index)"
 
               >
 
-                <div class="upper_title">移载左转</div>
 
+                <div class="upper_title">取消左转</div>
 
               </div>
 
-            </div>
 
-
 
+            </div> -->
 
             <div class="right_item_body">
 
               <div
 
                 class="item_upper"
 
                 :class="{ right_item_active: item.isRight == 1 }"
 
                 @click="cartTurnRight(item, index)"
 
               >
 
-                <div class="upper_title">移载右转</div>
 
+                <div class="upper_title">
 
+                  {{ item.uI_BeltRun_R == false ? "移载右转" : "取消右转" }}
 
+                </div>
 
               </div>
 
             </div>
 
 
@@ -302,7 +311,6 @@
 
                 class="item_upper"
 
                 :class=""
 
                 @click="toBatteryCharging(item, index)"
 
-                v-if="item.sys_state != 'CHARGING'"
 
               >
 
                 <div class="upper_title">开始充电</div>
 
               </div>
 
@@ -310,7 +318,6 @@
 
                 class="item_upper"
 
                 :class=""
 
                 @click="stopBatteryCharging(item, index)"
 
-                v-if="item.sys_state == 'CHARGING'"
 
               >
 
                 <div class="upper_title">停止充电</div>
 
               </div>
 
@@ -353,6 +360,7 @@ import {
 
   getVehicleStatus,
 
   carUPlist,
 
   GetAmrUpperPlcList,
 
+  getVehicleser,
 
 } from "../../api/request.js";
 
 export default {
 
   data() {
 
@@ -580,49 +588,75 @@ export default {
 
         let vehicles = JSON.parse(
 
           JSON.parse(JSON.stringify(res.resultData))
 
         ).vehicles;
 
-        if (this.oldData == vehicles) {
 
-          return;
 
-        } else {
 
-          this.oldData = vehicles;
 
-          this.datalist = [];
 
-          for (let index in vehicles) {
 
-            let item = {
 
-              id: "",
 
-              nickname: "",
 
-              itemindex: 0,
 
-              ifOnline: 0,
 
-              ifCharge: 1,
 
-              move_state: "",
 
-              emergency_state: "",
 
-              load_state: "",
 
-              battery_state: "",
 
-            };
 
-            item["nickname"] = vehicles[index].nickname;
 
-            item.move_state = vehicles[index].move_state;
 
-            item.emergency_state = vehicles[index].emergency_state;
 
-            item.sys_state = vehicles[index].sys_state;
 
-            item.load_state = vehicles[index].load_state;
 
-            item["id"] = vehicles[index].id;
 
-            item["ifOnline"] = vehicles[index].is_online;
 
-            item["taskId"] = "";
 
-            item["siteId"] = "";
 
-            // item['siteId'] = "";
 
-            for (let index in this.VehicleStatusData) {
 
-              let str = this.VehicleStatusData[index].tag_name;
 
-              if (str.indexOf("_L") > 0) {
 
-                if (item.nickname == this.VehicleStatusData[index].car_name) {
 
-                  item["isLeft"] = this.VehicleStatusData[index].tag_val;
 
-                }
 
+        // console.log(vehicles);nickname  ipname
 
+        getVehicleser().then((res) => {
 
+          res.resultData.forEach((element) => {
 
+            vehicles.forEach((res) => {
 
+              if (element.ipname == res.nickname) {
 
+                res = Object.assign(res, element);
 
               }
 
-              if (str.indexOf("_R") > 0) {
 
-                if (item.nickname == this.VehicleStatusData[index].car_name) {
 
-                  item["isRight"] = this.VehicleStatusData[index].tag_val;
 
+            });
 
+          });
 
+          if (this.oldData == vehicles) {
 
+            return;
 
+          } else {
 
+            this.oldData = vehicles;
 
+            this.datalist = [];
 
+            for (let index in vehicles) {
 
+              let item = {
 
+                id: "",
 
+                nickname: "",
 
+                itemindex: 0,
 
+                ifOnline: 0,
 
+                ifCharge: 1,
 
+                move_state: "",
 
+                emergency_state: "",
 
+                load_state: "",
 
+                battery_state: "",
 
+                adress: "",
 
+                uI_Emergency: "",
 
+                uI_BeltRun_L: "",
 
+                uI_BeltRun_R: "",
 
+                uI_Restart: "",
 
+                uI_StartCharge: "",
 
+                uI_StopCharge: "",
 
+              };
 
+              item["nickname"] = vehicles[index].nickname;
 
+              item.move_state = vehicles[index].move_state;
 
+              item.emergency_state = vehicles[index].emergency_state;
 
+              item.sys_state = vehicles[index].sys_state;
 
+              item.load_state = vehicles[index].load_state;
 
+              item.uI_Emergency = vehicles[index].uI_Emergency;
 
+              item.adress = vehicles[index].adress;
 
+              item.uI_BeltRun_L = vehicles[index].uI_BeltRun_L;
 
+              item.uI_BeltRun_R = vehicles[index].uI_BeltRun_R;
 
+              item.uI_Restart = vehicles[index].uI_Restart;
 
+              item.uI_StartCharge = vehicles[index].uI_StartCharge;
 
+              item.uI_StopCharge = vehicles[index].uI_StopCharge;
 
+              item["id"] = vehicles[index].id;
 
+              item["ifOnline"] = vehicles[index].is_online;
 
+              item["taskId"] = "";
 
+              item["siteId"] = "";
 
+              // debugger;
 
+              // console.log(vehicles[index].adress);
 
+              // item['siteId'] = "";
 
+              for (let index in this.VehicleStatusData) {
 
+                let str = this.VehicleStatusData[index].tag_name;
 
+                if (str.indexOf("_L") > 0) {
 
+                  if (item.nickname == this.VehicleStatusData[index].car_name) {
 
+                    item["isLeft"] = this.VehicleStatusData[index].tag_val;
 
+                  }
 
+                }
 
+                if (str.indexOf("_R") > 0) {
 
+                  if (item.nickname == this.VehicleStatusData[index].car_name) {
 
+                    item["isRight"] = this.VehicleStatusData[index].tag_val;
 
+                  }
 
                 }
 
               }
 
+              this.datalist.push(item);
 
             }
 
-            this.datalist.push(item);
 
           }
 
-        }
 
+        });
 
       });
 
     },
 
     setCarStatus(data) {
 
@@ -733,18 +767,33 @@ export default {
 
     shutDown(item, index) {
 
       //小车急停
 
       let data = {
 
-        command_type: "CMD_VEHICLE_TRIGGER_EMERGENCY",
 
-        vehicle_id: item.id,
 
+        tagname: "uI_Emergency",
 
+        adress: item.adress,
 
+        value: true,
 
       };
 
-      this.setCarStatus(data);
 
+      // debugger;
 
+      setVehicleFace(data).then((res) => {
 
+        this.$message({
 
+          type: "success",
 
+          message: "成功",
 
+        });
 
+      });
 
+      this.getData();
 
     },
 
     UNshutDown(item, index) {
 
       //取消小车急停
 
       let data = {
 
-        command_type: "CMD_VEHICLE_CANCEL_EMERGENCY",
 
-        vehicle_id: item.id,
 
+        tagname: "uI_Emergency",
 
+        adress: item.adress,
 
+        value: false,
 
       };
 
-      this.setCarStatus(data);
 
+      setVehicleFace(data).then((res) => {
 
+        this.$message({
 
+          type: "success",
 
+          message: "成功",
 
+        });
 
+      });
 
+      this.shutDown();
 
     },
 
     carOver(item, index) {
 
       //结束当前运行的车辆
 
@@ -804,68 +853,179 @@ export default {
 
 
     cartTurnLeft(item, index) {
 
       //移载车辆——左转
 
-      let arr = {};
 
-      this.carList.forEach((res) => {
 
-        if (item.nickname == res.ipname) {
 
-          arr = res;
 
+      if (item.uI_BeltRun_R === true) {
 
+        let data = {
 
+          tagname: "uI_BeltRun_R",
 
+          adress: item.adress,
 
+          value: false,
 
+        };
 
+        setVehicleFace(data).then((res) => {
 
+          let data = {
 
+            tagname: "uI_BeltRun_L",
 
+            adress: item.adress,
 
+            value: true,
 
+          };
 
+          setVehicleFace(data).then((res) => {
 
+            this.$message({
 
+              type: "success",
 
+              message: "成功",
 
+            });
 
+          });
 
+        });
 
+      } else {
 
+        if (item.uI_BeltRun_L == false) {
 
+          let data = {
 
+            tagname: "uI_BeltRun_L",
 
+            adress: item.adress,
 
+            value: true,
 
+          };
 
+          setVehicleFace(data).then((res) => {
 
+            this.$message({
 
+              type: "success",
 
+              message: "成功",
 
+            });
 
+          });
 
+        } else {
 
+          let data = {
 
+            tagname: "uI_BeltRun_L",
 
+            adress: item.adress,
 
+            value: false,
 
+          };
 
+          setVehicleFace(data).then((res) => {
 
+            this.$message({
 
+              type: "success",
 
+              message: "成功",
 
+            });
 
+          });
 
         }
 
-      });
 
-      // GetAmrUpperPlcList(data).then((res) => {
 
-      //   if (res.ResultCode ==1){
 
-      //     res.ResultData.forEach(rel => {
 
-      //       if (rel.) {
 
-
 
-      //       }
 
-      //     });
 
+      }
 
+      // let arr = {};
 
+      // this.carList.forEach((res) => {
 
+      //   if (item.nickname == res.ipname) {
 
+      //     arr = res;
 
+      //   }
 
+      // });
 
+      // // GetAmrUpperPlcList(data).then((res) => {
 
+      // //   if (res.ResultCode ==1){
 
+      // //   }
 
+      // // });
 
+      // let data = {
 
+      //   adress: arr.adress,
 
+      //   tagname: "UI_BeltRun_L",
 
+      //   value: false,
 
+      // };
 
+      // let datas = {
 
+      //   adress: arr.adress,
 
+      //   tagname: "UI_BeltRun_L",
 
+      //   value: true,
 
+      // };
 
+      // let that = this;
 
+      // setVehicleFace(data).then((res) => {
 
+      //   if (res) {
 
+      //     that.setCarFaces(datas);
 
       //   }
 
       // });
 
+    },
 
+    UPcartTurnLeft(item, index) {
 
+      //取消左转
 
       let data = {
 
-        adress: arr.adress,
 
-        tagname: "UI_BeltRun_L",
 
+        tagname: "uI_BeltRun_L",
 
+        adress: item.adress,
 
         value: false,
 
       };
 
-      let datas = {
 
-        adress: arr.adress,
 
-        tagname: "UI_BeltRun_L",
 
-        value: true,
 
-      };
 
-      let that = this;
 
       setVehicleFace(data).then((res) => {
 
-        if (res) {
 
-          that.setCarFaces(datas);
 
-        }
 
+        this.$message({
 
+          type: "success",
 
+          message: "成功",
 
+        });
 
       });
 
     },
 
     cartTurnRight(item, index) {
 
-      //移载车辆——右转
 
-      console.log(item);
 
-      let that = this;
 
-      let num = item.nickname.substring(4);
 
-      this.carTurnStop(item, index, function (datas) {
 
+      if (item.uI_BeltRun_L === true) {
 
         let data = {
 
-          ctg_name: "Belt_Car" + num + "_R",
 
-          ctg_val: 1,
 
+          tagname: "uI_BeltRun_L",
 
+          adress: item.adress,
 
+          value: false,
 
         };
 
-        setTimeout(function () {
 
-          that.setCarFaces(data);
 
-        }, 1000);
 
-      });
 
+        setVehicleFace(data).then((res) => {
 
+          let data = {
 
+            tagname: "uI_BeltRun_R",
 
+            adress: item.adress,
 
+            value: true,
 
+          };
 
+          setVehicleFace(data).then((res) => {
 
+            this.$message({
 
+              type: "success",
 
+              message: "成功",
 
+            });
 
+          });
 
+        });
 
+      } else {
 
+        if (item.uI_BeltRun_R == false) {
 
+          let data = {
 
+            tagname: "uI_BeltRun_R",
 
+            adress: item.adress,
 
+            value: true,
 
+          };
 
+          setVehicleFace(data).then((res) => {
 
+            this.$message({
 
+              type: "success",
 
+              message: "成功",
 
+            });
 
+          });
 
+        } else {
 
+          let data = {
 
+            tagname: "uI_BeltRun_R",
 
+            adress: item.adress,
 
+            value: false,
 
+          };
 
+          setVehicleFace(data).then((res) => {
 
+            this.$message({
 
+              type: "success",
 
+              message: "成功",
 
+            });
 
+          });
 
+        }
 
+      }
 
+      // //移载车辆——右转
 
+      // let that = this;
 
+      // let num = item.nickname.substring(4);
 
+      // this.carTurnStop(item, index, function (datas) {
 
+      //   let data = {
 
+      //     ctg_name: "Belt_Car" + num + "_R",
 
+      //     ctg_val: 1,
 
+      //   };
 
+      //   setTimeout(function () {
 
+      //     that.setCarFaces(data);
 
+      //   }, 1000);
 
+      // });
 
     },
 
     carTurnStop(item, index, callback) {
 
-      //移载车辆——暂停
 
-      console.log(item);
 
-      let num = item.nickname.substring(4);
 
-      let dataL = {
 
-        ctg_name: "Belt_Car" + num + "_L",
 
-        ctg_val: 0,
 
-      };
 
-      let dataR = {
 
-        ctg_name: "Belt_Car" + num + "_R",
 
-        ctg_val: 0,
 
+      //移载车辆——重启
 
+      let data = {
 
+        tagname: "uI_Restart",
 
+        adress: item.adress,
 
+        value: true,
 
       };
 
-      this.setCarFaces(dataL);
 
-      this.setCarFaces(dataR);
 
-      callback(true);
 
+      setVehicleFace(data).then((res) => {
 
+        this.$message({
 
+          type: "success",
 
+          message: "成功",
 
+        });
 
+      });
 
+      // console.log(item);
 
+      // let num = item.nickname.substring(4);
 
+      // let dataL = {
 
+      //   ctg_name: "Belt_Car" + num + "_L",
 
+      //   ctg_val: 0,
 
+      // };
 
+      // let dataR = {
 
+      //   ctg_name: "Belt_Car" + num + "_R",
 
+      //   ctg_val: 0,
 
+      // };
 
+      // this.setCarFaces(dataL);
 
+      // this.setCarFaces(dataR);
 
+      // callback(true);
 
     },
 
     carTurnContinue(item, index) {
 
       //移载车辆——继续carCharge
 
@@ -911,7 +1071,6 @@ export default {
 
           command_type: "CMD_VEHICLE_CANCEL_EMERGENCY_ALL",
 
         };
 
       }
 
-
 
       this.$confirm(str, "提示", {
 
         confirmButtonText: "确定",
 
         cancelButtonText: "取消",
 
@@ -963,19 +1122,30 @@ export default {
 
         }
 
       )
 
         .then(() => {
 
-          let num = item.nickname.substring(3);
 
           let data = {
 
-            ctg_name: "StartCharge_Car" + num,
 
-            ctg_val: 1,
 
+            tagname: "uI_StartCharge",
 
+            adress: item.adress,
 
+            value: true,
 
           };
 
-          this.setCarFaces(data);
 
-          setTimeout(function () {
 
-            let data1 = {
 
-              ctg_name: "StartCharge_Car" + num,
 
-              ctg_val: 0,
 
-            };
 
-            that.setCarFaces(data1);
 
-          }, 1000);
 
+          setVehicleFace(data).then((res) => {
 
+            this.$message({
 
+              type: "success",
 
+              message: "成功",
 
+            });
 
+          });
 
+          // let num = item.nickname.substring(3);
 
+          // let data = {
 
+          //   ctg_name: "StartCharge_Car" + num,
 
+          //   ctg_val: 1,
 
+          // };
 
+          // this.setCarFaces(data);
 
+          // setTimeout(function () {
 
+          //   let data1 = {
 
+          //     ctg_name: "StartCharge_Car" + num,
 
+          //     ctg_val: 0,
 
+          //   };
 
+          //   that.setCarFaces(data1);
 
+          // }, 1000);
 
         })
 
         .catch(() => {});
 
     },
 
@@ -987,19 +1157,30 @@ export default {
 
         type: "warning",
 
       })
 
         .then(() => {
 
-          let num = item.nickname.substring(3);
 
           let data = {
 
-            ctg_name: "EndCharge_Car" + num,
 
-            ctg_val: 1,
 
+            tagname: "uI_StopCharge",
 
+            adress: item.adress,
 
+            value: true,
 
           };
 
-          this.setCarFaces(data);
 
-          setTimeout(function () {
 
-            let data1 = {
 
-              ctg_name: "EndCharge_Car" + num,
 
-              ctg_val: 0,
 
-            };
 
-            that.setCarFaces(data1);
 
-          }, 1000);
 
+          setVehicleFace(data).then((res) => {
 
+            this.$message({
 
+              type: "success",
 
+              message: "成功",
 
+            });
 
+          });
 
+          // let num = item.nickname.substring(3);
 
+          // let data = {
 
+          //   ctg_name: "EndCharge_Car" + num,
 
+          //   ctg_val: 1,
 
+          // };
 
+          // this.setCarFaces(data);
 
+          // setTimeout(function () {
 
+          //   let data1 = {
 
+          //     ctg_name: "EndCharge_Car" + num,
 
+          //     ctg_val: 0,
 
+          //   };
 
+          //   that.setCarFaces(data1);
 
+          // }, 1000);
 
         })
 
         .catch(() => {});
 
     },
 
@@ -1050,7 +1231,7 @@ export default {
 
     height: 50px;
 
     position: relative;
 
     display: flex;
 
-
 
+    z-index: 999;
 
     .title {
 
       flex: 2.4;
 
       height: 100%;

+ 14 - 7
src/pages/Baggage/index/index.vue
Файл харах 

@@ -14,7 +14,9 @@
 
     <div class="bag_box_header">
 
       <div class="bag_box_header_left">
 
         <el-input v-model="input" placeholder="请输入id"></el-input>
 
-        <el-button class="custom_btn Colorbutton_blue">搜索</el-button>
 
+        <el-button class="custom_btn Colorbutton_blue" @click="queryList"
 
+          >搜索</el-button
 
+        >
 
       </div>
 
       <div class="bag_box_header_right">
 
         <div class="downlodTable">导出</div>
 
@@ -25,17 +27,17 @@
 
       id="userTableData"
 
       style="width: 100%; color: #2daff5"
 
     >
 
-      <el-table-column prop="id" align="center" label="行李ID" width="200px">
 
+      <el-table-column prop="bagID" align="center" label="行李ID" width="200px">
 
       </el-table-column>
 
       <el-table-column prop="reciveTime" align="center" label="接收时间">
 
       </el-table-column>
 
-      <el-table-column prop="carID" align="center" label="入口">
 
+      <el-table-column prop="entrance" align="center" label="入口">
 
       </el-table-column>
 
-      <el-table-column prop="transport_State" align="center" label="运输车辆">
 
+      <el-table-column prop="carID" align="center" label="运输车辆">
 
       </el-table-column>
 
       <el-table-column prop="order_ID" align="center" label="运输单号">
 
       </el-table-column>
 
-      <el-table-column prop="tranportstat" align="center" label="运输状态">
 
+      <el-table-column prop="transport_State" align="center" label="运输状态">
 
       </el-table-column>
 
       <el-table-column prop="fini_Time" align="center" label="完成时间">
 
       </el-table-column>
 
@@ -66,16 +68,21 @@ export default {
 
     this.BaggageInquiryList();
 
   },
 
   methods: {
 
+    //搜索
 
+    queryList() {
 
+      this.BaggageInquiryList();
 
+    },
 
     //获取行李查询列表
 
     BaggageInquiryList() {
 
       let params = {
 
+        bagid: this.input,
 
         page: 1,
 
-        PageSize: 10,
 
+        PageSize: 12,
 
       };
 
       BaggageInquiry(params).then((res) => {
 
         if (res.resultCode == 1) {
 
           this.tableData = res.resultData;
 
-          this.totalPages = res.pageNumber * 10;
 
+          this.totalPages = res.pageNumber * 12;
 
         }
 
       });
 
     },

+ 77 - 30
src/pages/Common/home.vue
Файл харах 

@@ -40,7 +40,7 @@
 
                 >
 
                 </el-option>
 
               </el-select>
 
-              <el-select
 
+              <!-- <el-select
 
                 style="margin-left: 24px"
 
                 class="maskright_select"
 
                 v-model="addOrdersC"
 
@@ -54,7 +54,7 @@
 
                   :value="item.template_name"
 
                 >
 
                 </el-option>
 
-              </el-select>
 
+              </el-select> -->
 
               <!-- <el-button class="custom_btn Colorbutton_blue" @click="showModels">模板总览</el-button> -->
 
               <!-- <el-button class="custom_btn Colorbutton_blue" @click="goMap">全屏显示</el-button> -->
 
               <div class="all_pul" @click="goMap"></div>
 
@@ -86,7 +86,7 @@
 
                 >
 
                 </el-option>
 
               </el-select>
 
-              <el-select
 
+              <!-- <el-select
 
                 class="maskright_select"
 
                 v-model="addOrdersC"
 
                 @change="addOrders(addOrdersC)"
 
@@ -99,7 +99,7 @@
 
                   :value="item.template_name"
 
                 >
 
                 </el-option>
 
-              </el-select>
 
+              </el-select> -->
 
               <!-- <el-button class="custom_btn Colorbutton_blue" @click="showModels">模板总览</el-button> -->
 
               <el-button
 
                 class="custom_btn exitRe Colorbutton_blue"
 
@@ -197,6 +197,13 @@
 
                     <label style="color: #ffffff; font-size: 20px">{{
 
                       item.btn_title
 
                     }}</label>
 
+                    <el-input
 
+                      v-if="item.type == 'byrw'"
 
+                      v-model="number"
 
+                      :min="0"
 
+                      onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
 
+                      placeholder=""
 
+                    ></el-input>
 
                     <i
 
                       class="IconFont"
 
                       style="font-size: 20px"
 
@@ -252,7 +259,9 @@
 
 										<div class="start" :class="item.start == 1 ? 'start': 'starter'">{{item.start == 1 ? '已处理': '未处理'}}</div>
 
 									</div> -->
 
                   <p>{{ item.alarm_date }}</p>
 
+                  <span>{{ item.error_position }}</span>
 
                   <span>{{ item.error_content }}</span>
 
+                  <span>{{ item.handle_method }}</span>
 
                 </div>
 
               </vue-seamless-scroll>
 
               <!-- <p v-if="Offline" style="float: left;font-size: 28px;color: #606266b0;letter-spacing: 3px;line-height: 10px;padding-left: 40px;">车辆已下线</p> -->
 
@@ -452,7 +461,7 @@ import {
 
   Changestat3,
 
   Dbalarm,
 
   getbuttonstat,
 
-  alarmInformation,
 
+  alarmInformationhos,
 
   mapIp,
 
   TemplateOrder,
 
   deliveryUP,
 
@@ -470,6 +479,7 @@ export default {
 
       ifRe: false,
 
       Offline: false,
 
       agreepersonlist: [],
 
+      number: "1",
 
       showCar: {
 
         ifshow: true,
 
         num: "#",
 
@@ -873,8 +883,23 @@ export default {
 
     },
 
     //告警信息
 
     alarmList() {
 
-      alarmInformation().then((res) => {
 
+      let params = {
 
+        value: false,
 
+        PageIndex: 1,
 
+        PageSize: 8,
 
+      };
 
+      alarmInformationhos(params).then((res) => {
 
         this.agreepersonlist = res.resultData.result;
 
+        // let audio = new Audio();
 
+        // audio.src = "../viper.mp3";
 
+        // // audio.play();
 
+        // if (this.agreepersonlist.length > 0) {
 
+        //   if (!audio.play()) {
 
+        //     audio.play();
 
+        //   }
 
+        // } else {
 
+        //   this.audio.pause();
 
+        // }
 
         this.agreepersonlist.push();
 
         this.$refs.myScoll.reset();
 
       });
 
@@ -891,7 +916,7 @@ export default {
 
             this.carbtn[0].btn_icon = 0;
 
           }
 
 
-          if (res.resultData[1].mission_boutton == 1) {
 
+          if (res.resultData[0].online_boutton == 1) {
 
             this.isopen2 == true;
 
             this.carbtn[1].btn_icon = 1;
 
           } else {
 
@@ -922,7 +947,7 @@ export default {
 
     setVehicleStatusTo(data) {
 
       //控制车辆状态公用接口
 
       setVehicleStatus(data).then((res) => {
 
-        console.log(res);
 
+        // console.log(res);
 
         if (res) {
 
           this.ifonline = 1;
 
         }
 
@@ -1046,7 +1071,7 @@ export default {
 
             templateid: name,
 
           };
 
           ordersTemplate(data).then((res) => {
 
-            console.log(res);
 
+            // console.log(res);
 
             this.Getorder();
 
             this.$message({
 
               type: "success",
 
@@ -1076,7 +1101,7 @@ export default {
 
             template_name: row.modeName,
 
           };
 
           ordersTemplate(data).then((res) => {
 
-            console.log(res);
 
+            // console.log(res);
 
             this.Getorder();
 
             this.$message({
 
               type: "success",
 
@@ -1226,24 +1251,33 @@ export default {
 
               });
 
             });
 
         } else if (index == 1) {
 
-          Changestat2(data)
 
-            .then((res) => {
 
-              item.btn_icon = "1";
 
-              this.isopen2 = true;
 
-              sessionStorage.setItem("isopen2", true);
 
-              this.$message({
 
-                type: "success",
 
-                duration: 800,
 
-                message: "执行备用任务成功!",
 
-              });
 
-            })
 
-            .catch(() => {
 
-              this.$message({
 
-                type: "error",
 
-                duration: 800,
 
-                message: "执行失败!",
 
+          if (this.number.length && this.number > 0) {
 
+            data.number_online = this.number;
 
+            Changestat2(data)
 
+              .then((res) => {
 
+                item.btn_icon = "1";
 
+                this.isopen2 = true;
 
+                sessionStorage.setItem("isopen2", true);
 
+                this.$message({
 
+                  type: "success",
 
+                  duration: 800,
 
+                  message: "执行备用任务成功!",
 
+                });
 
+              })
 
+              .catch(() => {
 
+                this.$message({
 
+                  type: "error",
 
+                  duration: 800,
 
+                  message: "执行失败!",
 
+                });
 
               });
 
+          } else {
 
+            this.$message({
 
+              type: "error",
 
+              duration: 800,
 
+              message: "请输入控制数量",
 
             });
 
+          }
 
         } else if (index == 2) {
 
           keepCarOnline(data)
 
             .then((res) => {
 
@@ -1311,7 +1345,7 @@ export default {
 
             coordinateoptions["value"] = index + 1;
 
             coordinateoptions["label"] = vehiclesData[index].nickname;
 
             this.coordinateoptions.push(coordinateoptions);
 
-            console.log(this.coordinateoptions);
 
+            // console.log(this.coordinateoptions);
 
           } else if (vehiclesData[index].sys_state == "UNAVAILABLE") {
 
             item["statues"] = "不可执行";
 
           } else if (vehiclesData[index].sys_state == "IDLE") {
 
@@ -1515,8 +1549,8 @@ export default {
 
 
 .IconStart {
 
   display: inline-block;
 
-  width: 35px;
 
-  height: 20px;
 
+  width: 48px;
 
+  height: 24px;
 
   background: url(../../assets/img/icon／开启@2x.png) no-repeat;
 
   background-size: 100% 100%;
 
   // position: relative;
 
@@ -1916,8 +1950,9 @@ export default {
 
                 display: flex;
 
                 align-items: center;
 
                 margin-bottom: 16px;
 
+                padding-left: 0;
 
                 > li {
 
-                  width: 23%;
 
+                  width: 20%;
 
                   height: 100%;
 
                   display: flex;
 
                   align-items: center;
 
@@ -1926,6 +1961,8 @@ export default {
 
                   font-family: Microsoft YaHei;
 
                   font-weight: 400;
 
                   color: #ffffff;
 
+                  margin-left: 30px;
 
+                  // margin-right: 30px;
 
                   > i {
 
                     margin-left: 16px;
 
                   }
 
@@ -1987,6 +2024,16 @@ export default {
 
 #addUserDialog .el-dialog {
 
   background: none;
 
 }
 
+/deep/.carbtn_item .el-input__inner {
 
+  width: 50px;
 
+  height: 32px;
 
+  line-height: 32px;
 
+  background: rgba(0, 0, 0, 0);
 
+  color: #ffffff;
 
+}
 
+/deep/.carbtn_item .el-input {
 
+  width: 50px;
 
+}
 
 /deep/.filter_by_state_select .el-input__inner {
 
   box-shadow: 0px -1px -38px 0px rgba(0, 162, 253, 0.4);
 
   border-radius: 2px !important;

+ 25 - 10
src/pages/ReportStatistics/index.vue
Файл харах 

@@ -18,7 +18,7 @@
 
       <el-button
 
         type="primary"
 
         :class="{ active: isActive == 2 }"
 
-        @click="getWeek"
 
+        @click="getWeeks"
 
         >本周</el-button
 
       >
 
       <el-button
 
@@ -69,9 +69,9 @@
 
       >
 
       </el-table-column>
 
       <el-table-column
 
-        prop="avg_response_time"
 
+        prop="exception_times"
 
         align="center"
 
-        label="订单响应平均时长（S）"
 
+        label="车辆异常次数"
 
       >
 
       </el-table-column>
 
       <el-table-column
 
@@ -261,7 +261,7 @@ export default {
 
       },
 
       value1: "",
 
       startTime: "",
 
-      dateMan: "",
 
+      dateMan: ["", ""],
 
       endTime: "",
 
       isActive: 1,
 
       reqData: {
 
@@ -279,6 +279,9 @@ export default {
 
     let arr = new Date(new Date(new Date().toLocaleDateString()).getTime()); //今日0时日期
 
     this.reqData.begin = Format("yyyy-MM-dd hh:mm:ss", arr);
 
     this.reqData.end = Format("yyyy-MM-dd hh:mm:ss", date);
 
+    this.dateMan[0] = this.reqData.begin.split(" ")[0];
 
+    this.dateMan[1] = this.reqData.end.split(" ")[0];
 
+    console.log(this.dateMan);
 
     // // 本周一的日期
 
     // date.setDate(date.getDate() - date.getDay() + 1);
 
     // var begin =
 
@@ -300,8 +303,15 @@ export default {
 
       //获取接口数据
 
       let data = this.reqData;
 
       Dborder(data).then((res) => {
 
-        console.log(res.StatisticInfo);
 
-        let TOdata = res.data.ORDER[0].VEHICLE;
 
+        console.log(
 
+          JSON.parse(JSON.parse(JSON.stringify(res)).resultData).data
 
+        );
 
+
 
+        // JSON.parse(res, "11111111");
 
+        // // debugger;
 
+        // console.log(res.StatisticInfo);
 
+        let TOdata = JSON.parse(JSON.parse(JSON.stringify(res)).resultData).data
 
+          .ORDER[0].VEHICLE;
 
         this.tableData = TOdata;
 
       });
 
     },
 
@@ -349,6 +359,7 @@ export default {
 
       this.getData();
 
     },
 
     getWeeks() {
 
+      this.isActive = 2;
 
       //本周第一天日期
 
       let date = new Date();
 
       date.setDate(date.getDate() - date.getDay() + 1);
 
@@ -403,10 +414,14 @@ export default {
 
         type: "warning",
 
       })
 
         .then(() => {
 
-          this.downFile();
 
-          this.$message({
 
-            type: "success",
 
-            message: "导出成功!",
 
+          //获取接口数据
 
+          let data = this.reqData;
 
+          data.export = "1";
 
+          Dborder(data).then((res) => {
 
+            this.$message({
 
+              type: "success",
 
+              message: "导出成功!",
 
+            });
 
           });
 
         })
 
         .catch(() => {

+ 28 - 1
src/pages/admin.vue
Файл харах 

@@ -136,11 +136,12 @@
 
 </template>
 
 
 <script>
 
-import { Dbalarm } from "@/api/request.js";
 
+import { Dbalarm, AlarmSon, alarmInformationhos } from "@/api/request.js";
 
 export default {
 
   name: "App",
 
   data() {
 
     return {
 
+      agreepersonlist: [],
 
       isWarn: false,
 
       reqData: {
 
         ctg: "curr",
 
@@ -203,6 +204,32 @@ export default {
 
     }, 2000);
 
   },
 
   methods: {
 
+    //告警信息
 
+    alarmList() {
 
+      let params = {
 
+        value: false,
 
+        PageIndex: 1,
 
+        PageSize: 8,
 
+      };
 
+      debugger;
 
+      alarmInformationhos(params).then((res) => {
 
+        this.agreepersonlist = res.resultData.result;
 
+        AlarmSon().then((item) => {
 
+          this.agreepersonlist = res.resultData.result;
 
+          let audio = new Audio();
 
+          audio.src = item.resultData;
 
+          // audio.play();
 
+          if (this.agreepersonlist.length > 0) {
 
+            audio.play();
 
+            // if (!audio.play()) {
 
+            //   audio.play();
 
+            // }
 
+          } else {
 
+            this.audio.pause();
 
+          }
 
+        });
 
+      });
 
+    },
 
     showWarn() {
 
       this.$router.push({ path: "/Alarm" });
 
     },

+ 2 - 2
static/serve.js
Файл харах 

@@ -1,5 +1,5 @@
 
 window.g = {
 
-  // url: `http://192.168.30.249:3420`,// 配置服务器地址
 
-  url: `http://139.198.181.133:5000`,// 配置服务器地址
 
+  url: `http://192.168.30.249:3420`,// 配置服务器地址
 
+  // url: `http://139.198.181.133:5000`,// 配置服务器地址
 
   mapURL: `http://192.168.30.250:3420/api` // 地图地址
 
 }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно