折线图渲染加异步

deviceManager/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

deviceManager/static/css/chunk-2d1d87f5.f4f45be1.css

@@ -0,0 +1 @@
+.errPage-container[data-v-0e5c12bd]{width:800px;max-width:100%;margin:100px auto}.errPage-container .pan-back-btn[data-v-0e5c12bd]{background:#008489;color:#fff;border:none!important}.errPage-container .pan-gif[data-v-0e5c12bd]{margin:0 auto;display:block}.errPage-container .pan-img[data-v-0e5c12bd]{display:block;margin:0 auto;width:100%}.errPage-container .text-jumbo[data-v-0e5c12bd]{font-size:60px;font-weight:700;color:#484848}.errPage-container .list-unstyled[data-v-0e5c12bd]{font-size:14px}.errPage-container .list-unstyled li[data-v-0e5c12bd]{padding-bottom:5px}.errPage-container .list-unstyled a[data-v-0e5c12bd]{color:#008489;text-decoration:none}.errPage-container .list-unstyled a[data-v-0e5c12bd]:hover{text-decoration:underline}

deviceManager/static/css/chunk-58e08142.4f216fb8.css

@@ -0,0 +1 @@
+.user-info-head[data-v-20a6c9d6]{position:relative;display:inline-block;height:120px}.user-info-head[data-v-20a6c9d6]:hover:after{content:"+";position:absolute;left:0;right:0;top:0;bottom:0;color:#eee;background:rgba(0,0,0,.5);font-size:24px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;cursor:pointer;line-height:110px;border-radius:50%}

deviceManager/static/css/chunk-6a3a862b.02c39c52.css

@@ -0,0 +1 @@
+.register{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:100%;background-size:cover}.title{margin:0 auto 30px auto;text-align:center;color:#707070}.register-form{border-radius:6px;background:#fff;width:400px;padding:25px 25px 5px 25px}.register-form .el-input,.register-form .el-input input{height:38px}.register-form .input-icon{height:39px;width:14px;margin-left:2px}.register-tip{font-size:13px;text-align:center;color:#bfbfbf}.register-code{width:33%;height:38px;float:right}.register-code img{cursor:pointer;vertical-align:middle}.el-register-footer{height:40px;line-height:40px;position:fixed;bottom:0;width:100%;text-align:center;color:#fff;font-family:Arial;font-size:12px;letter-spacing:1px}.register-code-img{height:38px}

deviceManager/static/css/chunk-7e1d3d52.edabf9ec.css

@@ -0,0 +1 @@
+.bg[data-v-5b194c9a]{width:100%;height:100%;overflow:hidden;position:fixed;top:0;left:0;z-index:-1}.bg .bgimg[data-v-5b194c9a]{width:100%;height:100%;position:absolute;top:0;left:0;z-index:-1}.logo[data-v-5b194c9a]{width:100%;position:fixed;top:0}.logo img[data-v-5b194c9a]{width:152px;margin:10px 2rem 0 20px;vertical-align:middle}.logo .logo_txt[data-v-5b194c9a]{font-size:1.5rem;color:#fff;vertical-align:middle;letter-spacing:4px}.login[data-v-5b194c9a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:100%;background-size:cover}.title[data-v-5b194c9a]{margin:0 auto 30px auto;text-align:left;color:#000;font-size:20px}.title span[data-v-5b194c9a]{margin-left:10px;opacity:.25}.login-form[data-v-5b194c9a]{border-radius:6px;background:#fff;width:456px;padding:63px 35px}.login-form .el-input[data-v-5b194c9a]{height:40px;font-size:16px!important}.login-form .el-input input[data-v-5b194c9a]{height:40px}.login-form .input-icon[data-v-5b194c9a]{height:39px;width:14px;margin-left:2px}.login-tip[data-v-5b194c9a]{font-size:13px;text-align:center;color:#bfbfbf}.login-code[data-v-5b194c9a]{width:33%;height:36px;float:right}.login-code img[data-v-5b194c9a]{cursor:pointer;vertical-align:middle;width:100%;height:36px;margin-top:-1px}.el-login-footer[data-v-5b194c9a]{height:40px;line-height:40px;position:fixed;bottom:0;width:100%;text-align:center;color:#fff;font-family:Arial;font-size:12px;letter-spacing:1px}[data-v-5b194c9a] .el-input__inner{height:36px!important;line-height:36px!important}

deviceManager/static/img/dark.412ca67e.svg

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="52px" height="45px" viewBox="0 0 52 45" version="1.1" 
+    xmlns="http://www.w3.org/2000/svg" 
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs>
+        <filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+        </filter>
+        <rect id="path-2" x="0" y="0" width="48" height="40" rx="4"></rect>
+        <filter x="-4.2%" y="-2.5%" width="108.3%" height="110.0%" filterUnits="objectBoundingBox" id="filter-4">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="配置面板" width="48" height="40" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="setting-copy-2" width="48" height="40" transform="translate(-1190.000000, -136.000000)">
+            <g id="Group-8" width="48" height="40" transform="translate(1167.000000, 0.000000)">
+                <g id="Group-5-Copy-5" filter="url(#filter-1)" transform="translate(25.000000, 137.000000)">
+                    <mask id="mask-3" fill="white">
+                        <use xlink:href="#path-2"></use>
+                    </mask>
+                    <g id="Rectangle-18">
+                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
+                        <use fill="#F0F2F5" fill-rule="evenodd" xlink:href="#path-2"></use>
+                    </g>
+                    <rect id="Rectangle-11" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="48" height="10"></rect>
+                    <rect id="Rectangle-18" fill="#303648" mask="url(#mask-3)" x="0" y="0" width="16" height="40"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

deviceManager/static/img/light.4183aad0.svg

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="52px" height="45px" viewBox="0 0 52 45" version="1.1" 
+    xmlns="http://www.w3.org/2000/svg" 
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs>
+        <filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+        </filter>
+        <rect id="path-2" x="0" y="0" width="48" height="40" rx="4"></rect>
+        <filter x="-4.2%" y="-2.5%" width="108.3%" height="110.0%" filterUnits="objectBoundingBox" id="filter-4">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="配置面板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="setting-copy-2" transform="translate(-1254.000000, -136.000000)">
+            <g id="Group-8" transform="translate(1167.000000, 0.000000)">
+                <g id="Group-5" filter="url(#filter-1)" transform="translate(89.000000, 137.000000)">
+                    <mask id="mask-3" fill="white">
+                        <use xlink:href="#path-2"></use>
+                    </mask>
+                    <g id="Rectangle-18">
+                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
+                        <use fill="#F0F2F5" fill-rule="evenodd" xlink:href="#path-2"></use>
+                    </g>
+                    <rect id="Rectangle-18" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="16" height="40"></rect>
+                    <rect id="Rectangle-11" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="48" height="10"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

deviceManager/static/js/chunk-2d0f012d.1bde8e38.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f012d"],{"9b8f":function(e,r,n){"use strict";n.r(r);n("ac1f"),n("5319");var t,u,a={created:function(){var e=this.$route,r=e.params,n=e.query,t=r.path;this.$router.replace({path:"/"+t,query:n})},render:function(e){return e()}},c=a,o=n("2877"),p=Object(o["a"])(c,t,u,!1,null,null,null);r["default"]=p.exports}}]);

deviceManager/static/js/chunk-2d1d87f5.8dc74559.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d1d87f5"],{9798:function(t,e,s){},cc6c:function(t,e,s){t.exports=s.p+"static/img/401.089007e7.gif"},e356:function(t,e,s){"use strict";s("9798")},ec55:function(t,e,s){"use strict";s.r(e);var a=function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",{staticClass:"errPage-container"},[s("el-button",{staticClass:"pan-back-btn",attrs:{icon:"arrow-left"},on:{click:t.back}},[t._v(" 返回 ")]),s("el-row",[s("el-col",{attrs:{span:12}},[s("h1",{staticClass:"text-jumbo text-ginormous"},[t._v(" 401错误! ")]),s("h2",[t._v("您没有访问权限！")]),s("h6",[t._v("对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面")]),s("ul",{staticClass:"list-unstyled"},[s("li",{staticClass:"link-type"},[s("router-link",{attrs:{to:"/index"}},[t._v(" 回首页 ")])],1)])]),s("el-col",{attrs:{span:12}},[s("img",{attrs:{src:t.errGif,width:"313",height:"428",alt:"Girl has dropped her ice cream."}})])],1)],1)},c=[],n=s("cc6c"),r=s.n(n),i={name:"Page401",data:function(){return{errGif:r.a+"?"+ +new Date}},methods:{back:function(){this.$route.query.noGoBack?this.$router.push({path:"/"}):this.$router.go(-1)}}},o=i,l=(s("e356"),s("2877")),u=Object(l["a"])(o,a,c,!1,null,"0e5c12bd",null);e["default"]=u.exports}}]);

deviceManager/static/js/chunk-4b5668c0.f2c4fb5e.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-4b5668c0"],{"26fc":function(t,s,i){t.exports=i.p+"static/img/404_cloud.0f4bc32b.png"},2754:function(t,s,i){"use strict";i.r(s);var c=function(){var t=this,s=t.$createElement,i=t._self._c||s;return i("div",{staticClass:"wscn-http404-container"},[i("div",{staticClass:"wscn-http404"},[t._m(0),i("div",{staticClass:"bullshit"},[i("div",{staticClass:"bullshit__oops"},[t._v(" 404错误! ")]),i("div",{staticClass:"bullshit__headline"},[t._v(" "+t._s(t.message)+" ")]),i("div",{staticClass:"bullshit__info"},[t._v(" 对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。 ")]),i("router-link",{staticClass:"bullshit__return-home",attrs:{to:"/index"}},[t._v(" 返回首页 ")])],1)])])},a=[function(){var t=this,s=t.$createElement,c=t._self._c||s;return c("div",{staticClass:"pic-404"},[c("img",{staticClass:"pic-404__parent",attrs:{src:i("a36b"),alt:"404"}}),c("img",{staticClass:"pic-404__child left",attrs:{src:i("26fc"),alt:"404"}}),c("img",{staticClass:"pic-404__child mid",attrs:{src:i("26fc"),alt:"404"}}),c("img",{staticClass:"pic-404__child right",attrs:{src:i("26fc"),alt:"404"}})])}],e={name:"Page404",computed:{message:function(){return"找不到网页！"}}},l=e,n=(i("e077"),i("2877")),r=Object(n["a"])(l,c,a,!1,null,"267f2676",null);s["default"]=r.exports},"2e5e":function(t,s,i){},a36b:function(t,s,i){t.exports=i.p+"static/img/404.a57b6f31.png"},e077:function(t,s,i){"use strict";i("2e5e")}}]);

src/api/business/OM/eventCenter/index.js

@@ -54,7 +54,7 @@ export function collectTbAlarm(data) { //告警统计
 }
 
 
-export function getTbAlarmCollectIco(data) { //折线图多个
+export function getTbAlarmCollectIco(data) { //饼图在线
     return request({
         url: "/tbAlarm/collectIco",
         method: 'post',
@@ -69,7 +69,23 @@ export function getTbAlarmCollectIcoDetail(data) { //折线图单个在线
         data: data
     })
 }
-export function getTbAlarmCollectIcoStatusDetail(data) { //折线图单个离线
+
+
+
+// 离线
+
+
+
+
+export function getTbDeviceStatusCollect(data) { //饼图离线
+    return request({
+        url: "/tbDeviceStatus/collect",
+        method: 'post',
+        data: data
+    })
+}
+
+export function getTbDeviceStatusCollectIcoDetail(data) { //折线图离线
     return request({
         url: "/tbDeviceStatus/collectIcoDetail",
         method: 'post',
@@ -77,6 +93,14 @@ export function getTbAlarmCollectIcoStatusDetail(data) { //折线图单个离线
     })
 }
 
+export function tbDeviceStatus(data) { //设备离线
+    return request({
+        url: "/tbDeviceStatus/page",
+        method: 'post',
+        data: data
+    })
+}
+
 export function tbInfoList(data) { //设备工况
     return request({
         url: "/tbInfo/list",
@@ -86,6 +110,19 @@ export function tbInfoList(data) { //设备工况
 }
 
 
+export function exportTbDeviceStatus(data) {
+    return request({
+        url: "/tbDeviceStatus/export",
+        method: 'post',
+        data: data
+    })
+}
+
+
+
+
+
+
 
 
 

src/assets/js/dataFormate.js

@@ -263,6 +263,25 @@ function YearMonthDate() {
     return currDate
 }
 
+/**
+ * 获得当前年月日SFM
+ * ***/
+ function YearMonthDateSFN() {
+    var date = new Date();
+    var mon = date.getMonth() + 1;
+    var day = date.getDate();
+
+    var h = date.getHours();
+    h = h < 10 ? ('0' + h) : h;
+    var minute = date.getMinutes();
+    minute = minute < 10 ? ('0' + minute) : minute;
+    var second = date.getSeconds();
+    second = second < 10 ? ('0' + second) : second;
+
+    var currDate = date.getFullYear() + "-" + (mon < 10 ? "0" + mon : mon) + "-" + (day < 10 ? "0" + day : day) + " " + h + ":" + minute + ":" + second;
+    return currDate
+}
+
 export {
     getWeekStartAndEnd,
     getMonthStartAndEnd,
@@ -283,5 +302,6 @@ export {
     timestampToTime,
     getThisDateBeforMonth,
     getThisDateNextMonth,
-    YearMonthDate
+    YearMonthDate,
+    YearMonthDateSFN
 }

src/assets/js/print.js

@@ -68,7 +68,6 @@ Print.prototype = {
         }
 
         for (var k3 = 0; k3 < selects.length; k3++) {
-            console.log(isNeedRemove)
             if (selects[k3].type == 'select-one') {
                 var child = selects[k3].children;
                 for (var i in child) {
@@ -140,7 +139,6 @@ Print.prototype = {
                 frameWindow.close();
             }, 10);
         } catch (err) {
-            console.log('err', err);
         }
     },
     isDOM: (typeof HTMLElement === 'object') ?

src/assets/styles/index.scss

@@ -185,4 +185,48 @@ aside {
 
 .mg10 {
     margin-top: 10px
-}
+}
+
+.color-green {
+    color: #37FF01!important
+}
+
+.color-blue {
+    color: #6F99FA!important
+}
+
+.color-red {
+    color: #FF5801!important
+}
+
+.color-yellow {
+    color: #EAF665!important
+}
+
+.color-orange {
+    color: #DE8C54!important
+}
+
+
+// 运维管理
+.event{
+    border:1px solid #ccc;
+    padding:1.5vh 0;
+    font-size:0.9vw;
+  }
+  .colorc{
+    font-size:1.2vw;
+    margin-left:4px;
+  }
+  .color1{
+    color:#6F99FA!important;
+  }
+  .color2{
+    color:#DE8C54!important
+  }
+  .color3{
+    color:#FF5801!important
+  }
+  .color4{
+    color:#37FF01!important
+  }

src/main.js

@@ -44,7 +44,6 @@ Vue.directive('down', {
             el.addEventListener('click', () => {
                     let link = document.createElement('a')
                     let url = binding.value
-                    console.log(link)
                         // 这里是将url转成blob地址，
                     fetch(url).then(res => res.blob()).then(blob => { // 将链接地址字符内容转变成blob地址
                         link.href = URL.createObjectURL(blob)

src/utils/request.js

@@ -3,7 +3,6 @@ import { Notification, MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-let url2 = undefined
 axios.defaults.headers['Content-Type'] = 'application/json;multipart/form-data;charset=utf-8'
     // 创建axios实例
 const service = axios.create({
@@ -87,41 +86,9 @@ service.interceptors.response.use(res => {
 
             }
         }
-
-
-
-
-        // if (code === 401) {
-        //     MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-        //         confirmButtonText: '重新登录',
-        //         cancelButtonText: '取消',
-        //         type: 'warning'
-        //     }).then(() => {
-        //         store.dispatch('LogOut').then(() => {
-        //             location.href = '/vuedx/#/';
-        //         })
-        //     }).catch(() => {});
-        //     // return Promise.reject()
-        //     // return msg && Promise.reject(new Error(msg)) || ""
-        // } else if (code === 500) {
-        //     Message({
-        //         message: msg,
-        //         type: 'error'
-        //     })
-        //     return msg && Promise.reject(new Error(msg)) || ""
-        // } else if (code !== 200) {
-        //     Notification.error({
-        //         title: msg
-        //     })
-        //     return Promise.reject('error')
-        // } else {
-        //     return res.headers['content-type'].indexOf("application/vnd.ms-excel") != -1 ? res : res.data.data
-        // }
-
     },
     error => {
         let msg = error.response.data.msg
-            // console.log('err' + error)
             // let { message } = error;
             // if (message == "Network Error") {
             //     message = "后端接口连接异常";
@@ -143,10 +110,4 @@ service.interceptors.response.use(res => {
         return Promise.reject(error)
     }
 )
-
-
-
-
-
-
 export default service

src/views/business/OM/eventCenter/alarm/index.vue

@@ -240,7 +240,6 @@ export default {
         data.startTime = data.params.beginTime
       }
       getTbAlarm(data).then(response => {
-        console.log(response)
         this.adminList = response.data.records;
         this.total = response.data.total;
         this.loading = false;
@@ -249,7 +248,6 @@ export default {
     /** 综合列表列表 */
     getCollect(){
       collectTbAlarm({type:2}).then(response => {
-        console.log(response)
         this.collectList = response.data
       });
     },
@@ -336,27 +334,3 @@ export default {
   }
 };
 </script>
-
-<style>
-.event{
-  border:1px solid #ccc;
-  padding:1.5vh 0;
-  font-size:0.9vw;
-}
-.colorc{
-  font-size:1.2vw;
-  margin-left:4px;
-}
-.color1{
-  color:#6F99FA!important;
-}
-.color2{
-  color:#DE8C54!important
-}
-.color3{
-  color:#FF5801!important
-}
-.color4{
-  color:#37FF01!important
-}
-</style>

src/views/business/OM/eventCenter/event/index.vue

@@ -335,26 +335,3 @@ export default {
 };
 </script>
 
-<style>
-.event{
-  border:1px solid #ccc;
-  padding:1.5vh 0;
-  font-size:0.9vw;
-}
-.colorc{
-  font-size:1.2vw;
-  margin-left:4px;
-}
-.color1{
-  color:#6F99FA!important;
-}
-.color2{
-  color:#DE8C54!important
-}
-.color3{
-  color:#FF5801!important
-}
-.color4{
-  color:#37FF01!important
-}
-</style>

src/views/business/OM/eventCenter/hiddenDanger/index.vue

@@ -329,26 +329,4 @@ export default {
   }
 };
 </script>
-<style>
-.event{
-  border:1px solid #ccc;
-  padding:1.5vh 0;
-  font-size:0.9vw;
-}
-.colorc{
-  font-size:1.2vw;
-  margin-left:4px;
-}
-.color1{
-  color:#6F99FA!important;
-}
-.color2{
-  color:#DE8C54!important
-}
-.color3{
-  color:#FF5801!important
-}
-.color4{
-  color:#37FF01!important
-}
-</style>
+

src/views/business/OM/workMange/index.vue

@@ -333,9 +333,6 @@ export default {
               this.open2 = false;
             })
           }else{
-            // this.form.companyName = "东信"
-            // this.form.companyCode = this.form.company.id
-            // console.log(this.form)
             addWorkOrder(this.form).then(response => {
               this.loading = false,
               this.msgSuccess("修改成功");
@@ -400,26 +397,3 @@ export default {
 };
 </script>
 
-<style>
-.event{
-  border:1px solid #ccc;
-  padding:1.5vh 0;
-  font-size:0.9vw;
-}
-.colorc{
-  font-size:1.2vw;
-  margin-left:4px;
-}
-.color1{
-  color:#6F99FA!important;
-}
-.color2{
-  color:#DE8C54!important
-}
-.color3{
-  color:#FF5801!important
-}
-.color4{
-  color:#37FF01!important
-}
-</style>

src/views/business/buildMange/building/index.vue

@@ -267,7 +267,6 @@ export default {
     submitForm(row) {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          console.log(this.form)
           this.loading = true
           this.form.addr1 = this.form.province.value
           this.form.addr2 = this.form.city.value
@@ -330,7 +329,6 @@ export default {
 
     // 省份 市 县联动
     selectProvinceFun (event) {
-      console.log(event)
       if (event) {
         this.addr2 = event.children
         this.addr3 = []

src/views/business/buildMange/room/index.vue

@@ -305,7 +305,6 @@ export default {
             name:val.buildName
           }
         })
-        console.log(this.buildListData)
       });
     },
     /* 楼层列表 */
@@ -317,9 +316,6 @@ export default {
             name:val.floorName
           }
         })
-
-        console.log(this.floorListData)
-
       });
     },
     getBuildId(id){

src/views/business/deviceMange/devicePassageWay/index.vue

@@ -388,7 +388,6 @@ export default {
       delete queryParams.size
       queryParams.dwType = queryParams.dwtype
       this.exportLoading = true;
-      console.log(queryParams)
       exportDeviceChannel(queryParams).then(response =>{
         this.exportLoading = false;
         document.getElementById("xz").href = BASEPATH()  + response.data
@@ -410,7 +409,6 @@ export default {
         }
       });
       getDeviceType({current:1,size:100}).then(response =>{
-        console.log(response)
         this.dwtypeList = response.data.records.map(val=>{
           return {
             id:Number(val.typeValue),

src/views/business/fireInternet/deviceMonitoring/SSMonitoring/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container home" >
     <div id="main" >
       <el-row :gutter="4">
-          <el-col :span="12">
+          <el-col :span="12" v-loading="loading1">
             <div class="card_left">
               <el-col :span="24">
-              <el-card class="box-card card1 " v-loading="loading1 & loading2">
+              <el-card class="box-card card1" >
                 <span class="title">
                   <el-image
                     class="imgTitle"
@@ -35,7 +35,7 @@
                     <div>
                       <span>处置率</span>
                       <div>
-                        <p>{{index1Data.checkRadio ? Number((index1Data.checkRadio)*100).toFixed(2) : '0.00'}}%</p>
+                        <p v-loading="loading1">{{index1Data.checkRadio ? Number((index1Data.checkRadio)*100).toFixed(2) : '0'}}%</p>
                       </div>
                     </div>
                 </div>
@@ -56,7 +56,7 @@
           </el-col>
           <el-col :span="12">
             <div class="card_right">
-              <el-card class="box-card card2"  v-loading="loading3">
+              <el-card class="box-card card2"  v-loading="loading2">
                 <div class="contain">
                   <index2
                   :resData="index2Data"
@@ -65,7 +65,7 @@
               </el-card>
             </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
               <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
                 <el-form-item label="单位名称：" prop="companyCode">
@@ -84,8 +84,8 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：" prop="status">
-                  <el-select v-model="queryParams.status" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
+                <el-form-item label="处理状态：" >
+                  <el-select v-model="queryParams.checkStatus" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
                   </el-select>
@@ -114,15 +114,14 @@
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table v-loading="loading4" :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
+            <el-table  :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
               <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
               <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
               <el-table-column label="报告时间" align="center" prop="alarmTime" sortable  show-overflow-tooltip />
-              <el-table-column label="报告数据" align="center" prop="alertValue"  show-overflow-tooltip />
-              <el-table-column label="报告内容" align="center" prop="alarmContent"  show-overflow-tooltip />
+              <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
               <el-table-column label="处理状态" align="center"  show-overflow-tooltip >
                 <template slot-scope="scope">
-                  <span>{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
+                  <span :class="scope.row.alarmStatus == 0 ? 'color-red' : 'color-green'">{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="处理人" align="center" prop="updateBy"  show-overflow-tooltip />
@@ -144,7 +143,7 @@
 </template>
 
 <script>
-import { getTbAlarmCollectIcoStatusDetail,  exportTbAlarm ,getTbAlarm, collectTbAlarm } from "@/api/business/OM/eventCenter";
+import { getTbDeviceStatusCollectIcoDetail, exportTbDeviceStatus ,tbDeviceStatus, getTbDeviceStatusCollect } from "@/api/business/OM/eventCenter";
 import { listChannel } from "@/api/system/product";
 import index1 from "@/views/components/fireInternetInfo/index1";
 import index2 from "@/views/components/fireInternetInfo/index2";
@@ -163,12 +162,9 @@ export default {
       index2Data:[],//折线图
       index3Data:[],//table
       // 遮罩层
-      loading1: false,
-      loading2: false,
-      loading3: false,
-      loading4: true,
-      loading5: true,
-      loading6: true,
+      loading1: true,
+      loading2: true,
+      loading3: true,
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
@@ -179,18 +175,20 @@ export default {
       t:null,
       timeList:[],
       queryParams:{
-        type:2,
-        bigDeviceType:6,
-        status:0,
+        type:3,
         current:1,
         size:10,
         companyCode:undefined,
-        status:undefined,
-        num:0,
-        isLine:0,
+        checkStatus:undefined,
+      },
+      queryParams2:{
+        type:3,
+        current:1,
+        size:10,
         startTime:getThisDateBeforMonth(),
         endTime:YearMonthDate(),
       },
+      
       dataZ:[],//折线图
       // 公司列表
       companyList: [],
@@ -206,18 +204,18 @@ export default {
   /* type=2&bigDeviceType=1&isLine=1
    type 1隐患2告警
    bigDeviceType1火系统 2 水系统 3rtu 4电气火灾 5 视频监控 6烟感
-   isLine 0离线 1在线 */
+   */
   methods: {
     init(){
         /* 饼图 */
-        collectTbAlarm(this.queryParams).then(response =>{
+        getTbDeviceStatusCollect(this.queryParams).then(response =>{
           this.index1Data = response.data
           this.loading1 = false
           this.loading2 = false
         })
         this.queryParams.status = 0
         /* 折线图 */
-        getTbAlarmCollectIcoStatusDetail(this.queryParams).then(response =>{
+        getTbDeviceStatusCollectIcoDetail(this.queryParams2).then(response =>{
           this.loading3 = false
           let data = response.data
           let lineData = []
@@ -252,18 +250,11 @@ export default {
         });
     },
     getList(){
-      if(this.queryParams.num == 0){
-        this.queryParams.status = undefined
-        this.queryParams.num = 1
-      }
-      if(this.dateRange.length>0){
-        this.queryParams.startTime = this.dateRange[0]
-        this.queryParams.endTime = this.dateRange[1]
-      }
-      getTbAlarm(this.queryParams).then(response =>{
+      this.loading3 = true
+      tbDeviceStatus(this.queryParams).then(response =>{
         this.adminList = response.data.records
         this.total = response.data.total;
-        this.loading4 = false;
+        this.loading3 = false;
       })
     },
     /** 搜索按钮操作 */
@@ -273,9 +264,10 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams.current = 1;
+      this.queryParams.size = 10;
+      this.queryParams.checkStatus = undefined
       this.queryParams.startTime = undefined;
       this.queryParams.endTime = undefined;
-      this.queryParams.num = 0;
       this.queryParams.status = undefined;
       this.queryParams.companyCode = undefined;
       this.dateRange = [];
@@ -288,7 +280,7 @@ export default {
       delete queryParams.current
       delete queryParams.size
       this.exportLoading = true;
-      exportTbAlarm(queryParams).then(response =>{
+      exportTbDeviceStatus(queryParams).then(response =>{
         this.exportLoading = false;
         document.getElementById("xz").href = BASEPATH() + response.data
         document.getElementById("xz").download = response.data
@@ -357,6 +349,7 @@ export default {
         .title{
           width:100%;
           display: block;
+          text-align: left !important;
           .imgTitle{
             width:5%;
             display: inline-block;

src/views/business/fireInternet/deviceMonitoring/fireMonitoring/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container home" >
     <div id="main" >
       <el-row :gutter="4">
-          <el-col :span="12">
+          <el-col :span="12" v-loading="loading1">
             <div class="card_left">
               <el-col :span="24">
-              <el-card class="box-card card1 " v-loading="loading1 & loading2">
+              <el-card class="box-card card1 ">
                 <span class="title">
                   <el-image
                     class="imgTitle"
@@ -35,7 +35,7 @@
                     <div>
                       <span>处置率</span>
                       <div>
-                        <p>{{index1Data.checkRadio ? Number((index1Data.checkRadio)*100).toFixed(2) : '0.00'}}%</p>
+                        <p v-loading="loading1">{{index1Data.checkRadio ? Number((index1Data.checkRadio)*100).toFixed(2) : '0'}}%</p>
                       </div>
                     </div>
                 </div>
@@ -55,8 +55,8 @@
             </div>
           </el-col>
           <el-col :span="12">
-            <div class="card_right">
-              <el-card class="box-card card2"  v-loading="loading3">
+            <div class="card_right" v-loading="loading2">
+              <el-card class="box-card card2">
                 <div class="contain">
                   <index2
                   :resData="index2Data"
@@ -65,7 +65,7 @@
               </el-card>
             </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
               <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
                 <el-form-item label="单位名称：" prop="companyCode">
@@ -84,8 +84,8 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：" prop="status">
-                  <el-select v-model="queryParams.status" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
+                <el-form-item label="处理状态：" >
+                  <el-select v-model="queryParams.checkStatus" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
                   </el-select>
@@ -114,15 +114,15 @@
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table v-loading="loading4" :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
+            <el-table :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
               <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
               <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
               <el-table-column label="报告时间" align="center" prop="alarmTime" sortable  show-overflow-tooltip />
-              <el-table-column label="报告数据" align="center" prop="alertValue"  show-overflow-tooltip />
-              <el-table-column label="报告内容" align="center" prop="alarmContent"  show-overflow-tooltip />
+              <el-table-column label="报告数据" align="center" prop="property"  show-overflow-tooltip />
+              <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
               <el-table-column label="处理状态" align="center"  show-overflow-tooltip >
                 <template slot-scope="scope">
-                  <span>{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
+                  <span :class="scope.row.alarmStatus == 0 ? 'color-red' : 'color-green'">{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="处理人" align="center" prop="updateBy"  show-overflow-tooltip />
@@ -145,7 +145,7 @@
 
 <script>
 
-import { getTbAlarmCollectIcoStatusDetail,  exportTbAlarm ,getTbAlarm, collectTbAlarm } from "@/api/business/OM/eventCenter";
+import { getTbDeviceStatusCollectIcoDetail,  exportTbDeviceStatus ,tbDeviceStatus, getTbDeviceStatusCollect } from "@/api/business/OM/eventCenter";
 import { listChannel } from "@/api/system/product";
 import index1 from "@/views/components/fireInternetInfo/index1";
 import index2 from "@/views/components/fireInternetInfo/index2";
@@ -164,12 +164,9 @@ export default {
       index2Data:[],//折线图
       index3Data:[],//table
       // 遮罩层
-      loading1: false,
-      loading2: false,
-      loading3: false,
-      loading4: true,
-      loading5: true,
-      loading6: true,
+      loading1: true,
+      loading2: true,
+      loading3: true,
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
@@ -180,14 +177,16 @@ export default {
       t:null,
       timeList:[],
       queryParams:{
-        type:2,
         bigDeviceType:1,
-        status:0,
         current:1,
         size:10,
         companyCode:undefined,
-        status:undefined,
-        num:0,
+        checkStatus:undefined,
+      },
+      queryParams2:{
+        bigDeviceType:1,
+        current:1,
+        size:10,
         startTime:getThisDateBeforMonth(),
         endTime:YearMonthDate(),
       },
@@ -206,19 +205,16 @@ export default {
   /* type=2&bigDeviceType=1&isLine=1
    type 1隐患2告警
    bigDeviceType1火系统 2 水系统 3rtu 4电气火灾 5 视频监控
-   isLine 0离线 1在线 */
+    */
   methods: {
     init(){
         /* 饼图 */
-        collectTbAlarm(this.queryParams).then(response =>{
+        getTbDeviceStatusCollect(this.queryParams).then(response =>{
           this.index1Data = response.data
           this.loading1 = false
-          this.loading2 = false
         })
-        this.queryParams.status = 0
         /* 折线图 */
-        getTbAlarmCollectIcoStatusDetail(this.queryParams).then(response =>{
-          this.loading3 = false
+        getTbDeviceStatusCollectIcoDetail(this.queryParams2).then(response =>{
           let data = response.data
           let lineData = []
           let total = []
@@ -236,6 +232,7 @@ export default {
             this.index2Data.push(total[0],checkCount[0],lineData)
             this.index2Data.push({name:"火灾监控离线处理情况跟踪",color:"#FF2416"})
           }
+          this.loading2 = false
         })
         /* 公司列表 */
         this.queryParams.status = undefined
@@ -252,18 +249,15 @@ export default {
         });
     },
     getList(){
-      if(this.queryParams.num == 0){
-        this.queryParams.status = undefined
-        this.queryParams.num = 1
-      }
+      this.loading3 = true
       if(this.dateRange.length>0){
         this.queryParams.startTime = this.dateRange[0]
         this.queryParams.endTime = this.dateRange[1]
       }
-      getTbAlarm(this.queryParams).then(response =>{
+      tbDeviceStatus(this.queryParams).then(response =>{
         this.adminList = response.data.records
         this.total = response.data.total;
-        this.loading4 = false;
+        this.loading3 = false;
       })
     },
     /** 搜索按钮操作 */
@@ -273,9 +267,10 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams.current = 1;
+      this.queryParams.size = 10;
+      this.queryParams.checkStatus = undefined
       this.queryParams.startTime = undefined;
       this.queryParams.endTime = undefined;
-      this.queryParams.num = 0;
       this.queryParams.status = undefined;
       this.queryParams.companyCode = undefined;
       this.dateRange = [];
@@ -288,7 +283,7 @@ export default {
       delete queryParams.current
       delete queryParams.size
       this.exportLoading = true;
-      exportTbAlarm(queryParams).then(response =>{
+      exportTbDeviceStatus(queryParams).then(response =>{
         this.exportLoading = false;
         document.getElementById("xz").href = BASEPATH() + response.data
         document.getElementById("xz").download = response.data
@@ -359,6 +354,7 @@ export default {
         .title{
           width:100%;
           display: block;
+          text-align: left !important;
           .imgTitle{
             width:5%;
             display: inline-block;

src/views/business/fireInternet/deviceMonitoring/waterMonitoring/device/index.vue

@@ -73,12 +73,6 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：" prop="status">
-                  <el-select v-model="queryParams.status" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
-                    <el-option label="未处理" :value="0"/>
-                    <el-option label="已处理" :value="1"/>
-                  </el-select>
-                </el-form-item>
                 <el-form-item label="时间:" label-width="50px">
                   <el-date-picker style="vertical-align: middle;width:340px"
                     v-model="dateRange"
@@ -92,15 +86,7 @@
                 </el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-top:4px">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                <el-button
-                  type="warning"
-                  plain
-                  icon="el-icon-download"
-                  size="mini"
-                  :loading="exportLoading"
-                  @click="handleExport"
-                  v-hasPermi="['system:admin:export']"
-                >导出</el-button>
+                
               </el-form>
             </div>
             <el-table @row-click="clickData" v-loading="loading3" :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'createTime', order: 'descending'}" highlight-current-row>
@@ -166,8 +152,6 @@ export default {
         size:10,
         companyCode:undefined,
         pointCodes: [201],
-        status:undefined,
-        num:0,
         isNew:1,
         deviceId:"",
         startTime:getThisDateBeforMonth(),
@@ -178,8 +162,6 @@ export default {
         size:10,
         companyCode:undefined,
         pointCodes: [201,202],
-        status:undefined,
-        num:0,
         isNew:1,
         deviceId:"",
         startTime:getThisDateBeforMonth(),
@@ -222,7 +204,7 @@ export default {
     },
     tubiao(id){
       if(id){
-        this.queryParams.deviceId = id
+        this.queryParams2.deviceId = id
       }
       /* 饼图、折线图 */
         tbInfoList(this.queryParams2).then(response =>{//pointCode=201 信息  pointCode=202 电量
@@ -248,14 +230,7 @@ export default {
         })
     },
     getList(){
-      if(this.queryParams.num == 0){
-        this.queryParams.status = undefined
-        this.queryParams.num = 1
-      }
-      if(this.dateRange.length>0){
-        this.queryParams.startTime = this.dateRange[0]
-        this.queryParams.endTime = this.dateRange[1]
-      }
+      this.loading3 = true
       tbInfoList(this.queryParams).then(response =>{ 
         //table
         this.adminList = response.data.records
@@ -274,28 +249,11 @@ export default {
       this.queryParams.current = 1;
       this.queryParams.startTime = undefined;
       this.queryParams.endTime = undefined;
-      this.queryParams.num = 0;
-      this.queryParams.status = undefined;
       this.queryParams.companyCode = undefined;
       this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      let queryParams = {...this.queryParams};
-      delete queryParams.current
-      delete queryParams.size
-      this.exportLoading = true;
-      exportTbAlarm(queryParams).then(response =>{
-        this.exportLoading = false;
-        document.getElementById("xz").href = BASEPATH() + response.data
-        document.getElementById("xz").download = response.data
-        document.getElementById("xz").click()
-      })
-    },
-
-
   }
 }
 </script>
@@ -358,6 +316,7 @@ export default {
         .title{
           width:100%;
           display: block;
+          text-align: left !important;
           .imgTitle{
             width:5%;
             display: inline-block;

src/views/business/fireInternet/deviceMonitoring/waterMonitoring/offLine/index.vue

@@ -65,7 +65,7 @@
               </el-card>
             </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
               <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
                 <el-form-item label="单位名称：" prop="companyCode">
@@ -84,8 +84,8 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：" prop="status">
-                  <el-select v-model="queryParams.status" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
+                <el-form-item label="处理状态：">
+                  <el-select v-model="queryParams.checkStatus" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
                   </el-select>
@@ -114,7 +114,7 @@
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table v-loading="loading4" :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
+            <el-table  :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
               <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
               <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
               <el-table-column label="报告时间" align="center" prop="alarmTime" sortable  show-overflow-tooltip />
@@ -145,7 +145,7 @@
 
 <script>
 
-import { getTbAlarmCollectIcoStatusDetail,  exportTbAlarm ,getTbAlarm, collectTbAlarm } from "@/api/business/OM/eventCenter";
+import { getTbDeviceStatusCollectIcoDetail,  exportTbDeviceStatus ,getTbDeviceStatusCollect ,tbDeviceStatus } from "@/api/business/OM/eventCenter";
 import { listChannel } from "@/api/system/product";
 import index1 from "@/views/components/fireInternetInfo/index1";
 import index2 from "@/views/components/fireInternetInfo/index2";
@@ -180,15 +180,16 @@ export default {
       t:null,
       timeList:[],
       queryParams:{
-        type:2,
         bigDeviceType:2,
-        status:0,
         current:1,
         size:10,
         companyCode:undefined,
-        status:undefined,
-        num:0,
-        isLine:0,
+        checkStatus:undefined,
+      },
+      queryParams2:{
+        bigDeviceType:2,
+        current:1,
+        size:10,
         startTime:getThisDateBeforMonth(),
         endTime:YearMonthDate(),
       },
@@ -207,19 +208,16 @@ export default {
   /* type=2&bigDeviceType=1&isLine=1
    type 1隐患2告警
    bigDeviceType1火系统 2 水系统 3rtu 4电气火灾 5 视频监控
-   isLine 0离线 1在线 */
+    */
   methods: {
     init(){
         /* 饼图 */
-        collectTbAlarm(this.queryParams).then(response =>{
+        getTbDeviceStatusCollect(this.queryParams).then(response =>{
           this.index1Data = response.data
           this.loading1 = false
-          this.loading2 = false
         })
-        this.queryParams.status = 0
         /* 折线图 */
-        getTbAlarmCollectIcoStatusDetail(this.queryParams).then(response =>{
-          this.loading3 = false
+        getTbDeviceStatusCollectIcoDetail(this.queryParams2).then(response =>{
           let data = response.data
           let lineData = []
           let total = []
@@ -237,6 +235,7 @@ export default {
             this.index2Data.push(total[0],checkCount[0],lineData)
             this.index2Data.push({name:"水系统离线处理情况跟踪",color:"#00FFFF"})
           }
+          this.loading2 = false
         })
         /* 公司列表 */
         this.queryParams.status = undefined
@@ -253,18 +252,15 @@ export default {
         });
     },
     getList(){
-      if(this.queryParams.num == 0){
-        this.queryParams.status = undefined
-        this.queryParams.num = 1
-      }
+      this.loading3 = true
       if(this.dateRange.length>0){
         this.queryParams.startTime = this.dateRange[0]
         this.queryParams.endTime = this.dateRange[1]
       }
-      getTbAlarm(this.queryParams).then(response =>{
+      tbDeviceStatus(this.queryParams).then(response =>{
         this.adminList = response.data.records
         this.total = response.data.total;
-        this.loading4 = false;
+        this.loading3 = false;
       })
     },
     /** 搜索按钮操作 */
@@ -274,10 +270,10 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams.current = 1;
+      this.queryParams.size = 10;
       this.queryParams.startTime = undefined;
       this.queryParams.endTime = undefined;
-      this.queryParams.num = 0;
-      this.queryParams.status = undefined;
+      this.queryParams.checkStatus = undefined;
       this.queryParams.companyCode = undefined;
       this.dateRange = [];
       this.resetForm("queryForm");
@@ -289,7 +285,7 @@ export default {
       delete queryParams.current
       delete queryParams.size
       this.exportLoading = true;
-      exportTbAlarm(queryParams).then(response =>{
+      exportTbDeviceStatus(queryParams).then(response =>{
         this.exportLoading = false;
         document.getElementById("xz").href = BASEPATH() + response.data
         document.getElementById("xz").download = response.data
@@ -360,6 +356,7 @@ export default {
         .title{
           width:100%;
           display: block;
+          text-align: left !important;
           .imgTitle{
             width:5%;
             display: inline-block;

src/views/business/fireInternet/fireAlarm/fireMonitoring/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container home" >
     <div id="main" >
       <el-row :gutter="4">
-          <el-col :span="12">
+          <el-col :span="12" v-loading="loading1">
             <div class="card_left">
               <el-col :span="24">
-              <el-card class="box-card card1 " v-loading="loading1 & loading2">
+              <el-card class="box-card card1">
                 <span class="title">
                   <el-image
                     class="imgTitle"
@@ -35,7 +35,7 @@
                     <div>
                       <span>处置率</span>
                       <div>
-                        <p>{{index1Data.checkRadio ? Number((index1Data.checkRadio)*100).toFixed(2) : '0.00'}}%</p>
+                        <p v-loading="loading1">{{index1Data.checkRadio ? Number((index1Data.checkRadio)*100).toFixed(2) : '0'}}%</p>
                       </div>
                     </div>
                 </div>
@@ -56,7 +56,7 @@
           </el-col>
           <el-col :span="12">
             <div class="card_right">
-              <el-card class="box-card card2"  v-loading="loading3">
+              <el-card class="box-card card2"  v-loading="loading2">
                 <div class="contain">
                   <index2
                   :resData="index2Data"
@@ -65,7 +65,7 @@
               </el-card>
             </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
               <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
                 <el-form-item label="单位名称：" prop="companyCode">
@@ -84,7 +84,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：" prop="status">
+                <el-form-item label="处理状态：" >
                   <el-select v-model="queryParams.status" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
@@ -114,15 +114,15 @@
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table v-loading="loading4" :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
+            <el-table :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
               <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
               <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
               <el-table-column label="报告时间" align="center" prop="alarmTime" sortable  show-overflow-tooltip />
-              <el-table-column label="报告数据" align="center" prop="alertValue"  show-overflow-tooltip />
-              <el-table-column label="报告内容" align="center" prop="alarmContent"  show-overflow-tooltip />
+              <el-table-column label="报告数据" align="center" prop="property"  show-overflow-tooltip />
+              <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
               <el-table-column label="处理状态" align="center"  show-overflow-tooltip >
                 <template slot-scope="scope">
-                  <span>{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
+                  <span :class="scope.row.alarmStatus == 0 ? 'color-red' : 'color-green'">{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="处理人" align="center" prop="updateBy"  show-overflow-tooltip />
@@ -164,12 +164,9 @@ export default {
       index2Data:[],//折线图
       index3Data:[],//table
       // 遮罩层
-      loading1: false,
-      loading2: false,
-      loading3: false,
-      loading4: true,
-      loading5: true,
-      loading6: true,
+      loading1: true,
+      loading2: true,
+      loading3: true,
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
@@ -180,14 +177,19 @@ export default {
       t:null,
       timeList:[],
       queryParams:{
-        type:2,
         bigDeviceType:1,
-        status:0,
         current:1,
         size:10,
         companyCode:undefined,
         status:undefined,
-        num:0,
+      },
+      queryParams2:{
+        type:2,
+        bigDeviceType:1,
+        current:1,
+        size:10,
+        // startTime:"2022-01-18 00:00:00",
+        // endTime:"2022-04-18 00:00:00",
         startTime:getThisDateBeforMonth(),
         endTime:YearMonthDate(),
       },
@@ -206,18 +208,16 @@ export default {
    /* type=2&bigDeviceType=1&isLine=1
    type 1隐患2告警
    bigDeviceType1火系统 2 水系统 3rtu 4电气火灾 5 视频监控
-   isLine 0离线 1在线 */
+    */
   methods: {
     init(){
         /* 饼图 */
         collectTbAlarm(this.queryParams).then(response =>{
           this.index1Data = response.data
           this.loading1 = false
-          this.loading2 = false
         })
         /* 折线图 */
-        getTbAlarmCollectIcoDetail(this.queryParams).then(response =>{
-          this.loading3 = false
+        getTbAlarmCollectIcoDetail(this.queryParams2).then(response =>{
           let data = response.data
           let lineData = []
           let total = []
@@ -235,9 +235,9 @@ export default {
             this.index2Data.push(total[0],checkCount[0],lineData)
             this.index2Data.push({name:"火警监控告警处理情况跟踪",color:"#FF2416"})
           }
+          this.loading2 = false
         })
         /* 公司列表 */
-        this.queryParams.status = undefined
         listChannel(this.queryParams).then(response => {
           if(response.data.records.length>0){
             this.companyList = response.data.records.map(val =>{
@@ -251,10 +251,7 @@ export default {
         });
     },
     getList(){
-      if(this.queryParams.num == 0){
-        this.queryParams.status = undefined
-        this.queryParams.num = 1
-      }
+      this.loading3 = true
       if(this.dateRange.length>0){
         this.queryParams.startTime = this.dateRange[0]
         this.queryParams.endTime = this.dateRange[1]
@@ -262,7 +259,7 @@ export default {
       getTbAlarm(this.queryParams).then(response =>{
         this.adminList = response.data.records
         this.total = response.data.total;
-        this.loading4 = false;
+        this.loading3 = false;
       })
     },
     /** 搜索按钮操作 */
@@ -272,9 +269,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams.current = 1;
+      this.queryParams.size = 10;
       this.queryParams.startTime = undefined;
       this.queryParams.endTime = undefined;
-      this.queryParams.num = 0;
       this.queryParams.status = undefined;
       this.queryParams.companyCode = undefined;
       this.dateRange = [];
@@ -359,6 +356,7 @@ export default {
         .title{
           width:100%;
           display: block;
+          text-align: left !important;
           .imgTitle{
             width:5%;
             display: inline-block;
@@ -441,8 +439,3 @@ export default {
 }
 
 </style>
-<style>
-
-
-</style>
-

src/views/business/fireInternet/fireAlarm/waterAlarm/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container home" >
     <div id="main" >
       <el-row :gutter="4">
-          <el-col :span="12">
+          <el-col :span="12" v-loading="loading1">
             <div class="card_left">
               <el-col :span="24">
-              <el-card class="box-card card1 " v-loading="loading1 & loading2">
+              <el-card class="box-card card1">
                 <span class="title">
                   <el-image
                     class="imgTitle"
@@ -35,7 +35,7 @@
                     <div>
                       <span>处置率</span>
                       <div>
-                        <p>{{index1Data.checkRadio ? Number((index1Data.checkRadio)*100).toFixed(2) : '0.00'}}%</p>
+                        <p v-loading="loading1">{{index1Data.checkRadio ? Number((index1Data.checkRadio)*100).toFixed(2) : '0'}}%</p>
                       </div>
                     </div>
                 </div>
@@ -56,7 +56,7 @@
           </el-col>
           <el-col :span="12">
             <div class="card_right">
-              <el-card class="box-card card2"  v-loading="loading3">
+              <el-card class="box-card card2"  v-loading="loading2">
                 <div class="contain">
                   <index2
                   :resData="index2Data"
@@ -65,7 +65,7 @@
               </el-card>
             </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
               <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
                 <el-form-item label="单位名称：" prop="companyCode">
@@ -84,7 +84,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：" prop="status">
+                <el-form-item label="处理状态：" >
                   <el-select v-model="queryParams.status" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
@@ -114,15 +114,15 @@
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table v-loading="loading4" :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
+            <el-table :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
               <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
               <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
               <el-table-column label="报告时间" align="center" prop="alarmTime" sortable show-overflow-tooltip />
-              <el-table-column label="报告数据" align="center" prop="alertValue" show-overflow-tooltip />
-              <el-table-column label="报告内容" align="center" prop="alarmContent" show-overflow-tooltip />
+              <el-table-column label="报告数据" align="center" prop="property"  show-overflow-tooltip />
+              <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
               <el-table-column label="处理状态" align="center"  show-overflow-tooltip >
                 <template slot-scope="scope">
-                  <span>{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
+                  <span :class="scope.row.alarmStatus == 0 ? 'color-red' : 'color-green'">{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="处理人" align="center" prop="updateBy"  show-overflow-tooltip />
@@ -164,12 +164,9 @@ export default {
       index2Data:[],//折线图
       index3Data:[],//table
       // 遮罩层
-      loading1: false,
-      loading2: false,
-      loading3: false,
-      loading4: true,
-      loading5: true,
-      loading6: true,
+      loading1: true,
+      loading2: true,
+      loading3: true,
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
@@ -180,16 +177,19 @@ export default {
       t:null,
       timeList:[],
       queryParams:{
-        type:2,
         bigDeviceType:2,
-        status:0,
         current:1,
         size:10,
         companyCode:undefined,
         status:undefined,
-        num:0,
+      },
+      queryParams2:{
+        bigDeviceType:2,
+        current:1,
+        size:10,
         startTime:getThisDateBeforMonth(),
         endTime:YearMonthDate(),
+        type:2
       },
       dataZ:[],//折线图
       // 公司列表
@@ -206,19 +206,16 @@ export default {
   /* type=2&bigDeviceType=1&isLine=1
    type 1隐患2告警
    bigDeviceType1火系统 2 水系统 3rtu 4电气火灾 5 视频监控
-   isLine 0离线 1在线 */
+   */
   methods: {
     init(){
         /* 饼图 */
         collectTbAlarm(this.queryParams).then(response =>{
           this.index1Data = response.data
           this.loading1 = false
-          this.loading2 = false
         })
         /* 折线图 */
-        getTbAlarmCollectIcoDetail(this.queryParams).then(response =>{
-          console.log(response)
-          this.loading3 = false
+        getTbAlarmCollectIcoDetail(this.queryParams2).then(response =>{
           let data = response.data
           let lineData = []
           let total = []
@@ -236,9 +233,9 @@ export default {
             this.index2Data.push(total[0],checkCount[0],lineData)
             this.index2Data.push({name:"水系统监控告警处理情况跟踪",color:"#00FFFF"})
           }
+          this.loading2 = false
         })
         /* 公司列表 */
-        this.queryParams.status = undefined
         listChannel(this.queryParams).then(response => {
           if(response.data.records.length>0){
             this.companyList = response.data.records.map(val =>{
@@ -252,10 +249,7 @@ export default {
         });
     },
     getList(){
-      if(this.queryParams.num == 0){
-        this.queryParams.status = undefined
-        this.queryParams.num = 1
-      }
+      this.loading3 = true
       if(this.dateRange.length>0){
         this.queryParams.startTime = this.dateRange[0]
         this.queryParams.endTime = this.dateRange[1]
@@ -263,7 +257,7 @@ export default {
       getTbAlarm(this.queryParams).then(response =>{
         this.adminList = response.data.records
         this.total = response.data.total;
-        this.loading4 = false;
+        this.loading3 = false;
       })
     },
     /** 搜索按钮操作 */
@@ -273,9 +267,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams.current = 1;
+      this.queryParams.size = 10;
       this.queryParams.startTime = undefined;
       this.queryParams.endTime = undefined;
-      this.queryParams.num = 0;
       this.queryParams.status = undefined;
       this.queryParams.companyCode = undefined;
       this.dateRange = [];
@@ -359,6 +353,7 @@ export default {
         .title{
           width:100%;
           display: block;
+          text-align: left !important;
           .imgTitle{
             width:5%;
             display: inline-block;

src/views/business/fireInternet/hiddenDanger/index.vue

@@ -2,61 +2,61 @@
   <div class="app-container home" >
     <div id="main" >
       <el-row :gutter="4">
-          <el-col :span="12">
+          <el-col :span="12" v-loading="loading1">
             <div class="card_left">
               <el-col :span="24">
-              <el-card class="box-card card1 " v-loading="loading1 & loading2">
-                <span class="title">
-                  <el-image
-                    class="imgTitle"
-                    :src="img"
-                    ></el-image>
-                  <p>{{title}}</p>
-                </span>
-                <div class="contain">
-                    <div>
-                      <span>总数</span>
+                <el-card class="box-card card1">
+                  <span class="title">
+                    <el-image
+                      class="imgTitle"
+                      :src="img"
+                      ></el-image>
+                    <p>{{title}}</p>
+                  </span>
+                  <div class="contain" >
                       <div>
-                        <p>{{index1Data.total}}</p>
+                        <span>总数</span>
+                        <div>
+                          <p>{{index1Data.total}}</p>
+                        </div>
                       </div>
-                    </div>
-                    <div>
-                      <span>已处理</span>
                       <div>
-                        <p>{{index1Data.checkCount}}</p>
+                        <span>已处理</span>
+                        <div>
+                          <p>{{index1Data.checkCount}}</p>
+                        </div>
                       </div>
-                    </div>
-                    <div>
-                      <span>未处理</span>
                       <div>
-                        <p>{{index1Data.noCheckCount}}</p>
+                        <span>未处理</span>
+                        <div>
+                          <p>{{index1Data.noCheckCount}}</p>
+                        </div>
                       </div>
-                    </div>
-                    <div>
-                      <span>处置率</span>
                       <div>
-                        <p>{{index1Data.checkRadio ? Number((index1Data.checkRadio)*100).toFixed(2) : '0.00'}}%</p>
+                        <span>处置率</span>
+                        <div>
+                          <p v-loading="loading1">{{index1Data.checkRadio ? Number((index1Data.checkRadio)*100).toFixed(2) : '0'}}%</p>
+                        </div>
                       </div>
+                  </div>
+                  <div class="contain2">
+                    <div class="wrap">
+                      <index1 :resData="index1Data.checkRadio"
+                        :dataMap="index1Data.checkRadio"
+                        color="#80FFA5"
+                        :size="21"
+                        :with="16"
+                        :tick="false" style="width:100%;" alt="饼图" />
+                      <p>处置率</p>
                     </div>
-                </div>
-                <div class="contain2">
-                  <div class="wrap">
-                    <index1 :resData="index1Data.checkRadio"
-                      :dataMap="index1Data.checkRadio"
-                      color="#80FFA5"
-                      :size="21"
-                      :with="16"
-                      :tick="false" style="width:100%;" alt="饼图" />
-                    <p>处置率</p>
                   </div>
-                </div>
-              </el-card>
+                </el-card>
               </el-col>
             </div>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-loading="loading2">
             <div class="card_right">
-              <el-card class="box-card card2"  v-loading="loading3">
+              <el-card class="box-card card2">
                 <div class="contain">
                   <index2
                   :resData="index2Data"
@@ -65,7 +65,7 @@
               </el-card>
             </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" v-loading="loading3">
             <div class="card_bottom">
               <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
                 <el-form-item label="单位名称：" prop="companyCode">
@@ -84,7 +84,7 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item label="处理状态：" prop="status">
+                <el-form-item label="处理状态：">
                   <el-select v-model="queryParams.status" style="width: 160px" placeholder="请选择处理状态" clearable size="small">
                     <el-option label="未处理" :value="0"/>
                     <el-option label="已处理" :value="1"/>
@@ -114,38 +114,38 @@
                 >导出</el-button>
               </el-form>
             </div>
-            <el-table v-loading="loading4" :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
+            <el-table :data="adminList" height="calc(100vh - 67vh)" :default-sort = "{prop: 'alarmTime', order: 'descending'}">
               <el-table-column label="序号" align="center" prop="id"  show-overflow-tooltip />
               <el-table-column label="单位名称" align="center" prop="companyName" show-overflow-tooltip />
               <el-table-column label="报告时间" align="center" prop="alarmTime" sortable show-overflow-tooltip />
-              <el-table-column label="报告数据" align="center" prop="alertValue" show-overflow-tooltip />
-              <el-table-column label="报告内容" align="center" prop="alarmContent" show-overflow-tooltip />
+              <el-table-column label="报告数据" align="center" prop="property"  show-overflow-tooltip />
+              <el-table-column label="报告内容" align="center" prop="deviceName"  show-overflow-tooltip />
               <el-table-column label="处理状态" align="center"  show-overflow-tooltip >
                 <template slot-scope="scope">
-                  <span>{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
+                  <span :class="scope.row.alarmStatus == 0 ? 'color-red' : 'color-green'">{{ scope.row.alarmStatus == 0 ? '未处理':scope.row.alarmStatus ==1 ? '已处理':'' }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="处理人" align="center" prop="updateBy"  show-overflow-tooltip />
               <el-table-column label="处理时间" align="center" prop="updateTime"  show-overflow-tooltip />
             </el-table>
+             <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.current"
+                :limit.sync="queryParams.size"
+                @pagination="getList"
+              />
           </el-col>
       </el-row>
     </div>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.current"
-      :limit.sync="queryParams.size"
-      @pagination="getList"
-    />
+   
     <!-- 导出-->
     <a href="" download="" id="xz" style="position: absolute;z-index: -1;opacity: 0;"></a>
   </div>
 </template>
 
 <script>
-
-import { getTbAlarmCollectIcoDetail,  exportTbAlarm ,getTbAlarm, collectTbAlarm } from "@/api/business/OM/eventCenter";
+import {  getTbAlarmCollectIcoDetail, exportTbAlarm ,getTbAlarm, collectTbAlarm } from "@/api/business/OM/eventCenter";
 import { listChannel } from "@/api/system/product";
 import index1 from "@/views/components/fireInternetInfo/index1";
 import index2 from "@/views/components/fireInternetInfo/index2";
@@ -164,12 +164,9 @@ export default {
       index2Data:[],//折线图
       index3Data:[],//table
       // 遮罩层
-      loading1: false,
-      loading2: false,
-      loading3: false,
-      loading4: true,
-      loading5: true,
-      loading6: true,
+      loading1: true,
+      loading2: true,
+      loading3: true,
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
@@ -181,16 +178,19 @@ export default {
       timeList:[],
       queryParams:{
         type:1,
-        status:0,
         current:1,
         size:10,
         companyCode:undefined,
         status:undefined,
-        num:0,
-        isLine:0,
+      },
+      queryParams2:{
+        type:1,
+        current:1,
+        size:10,
         startTime:getThisDateBeforMonth(),
         endTime:YearMonthDate(),
       },
+      
       dataZ:[],//折线图
       // 公司列表
       companyList: [],
@@ -213,12 +213,9 @@ export default {
         collectTbAlarm(this.queryParams).then(response =>{
           this.index1Data = response.data
           this.loading1 = false
-          this.loading2 = false
         })
-        this.queryParams.status = 0
         /* 折线图 */
-        getTbAlarmCollectIcoDetail(this.queryParams).then(response =>{
-          this.loading3 = false
+        getTbAlarmCollectIcoDetail(this.queryParams2).then(response =>{
           let data = response.data
           let lineData = []
           let total = []
@@ -236,6 +233,7 @@ export default {
             this.index2Data.push(total[0],checkCount[0],lineData)
             this.index2Data.push({name:"隐患总揽",color:"#FF9721"})
           }
+          this.loading2 = false
         })
         /* 公司列表 */
         this.queryParams.status = undefined
@@ -252,10 +250,7 @@ export default {
         });
     },
     getList(){
-      if(this.queryParams.num == 0){
-        this.queryParams.status = undefined
-        this.queryParams.num = 1
-      }
+      this.loading3 = true
       if(this.dateRange.length>0){
         this.queryParams.startTime = this.dateRange[0]
         this.queryParams.endTime = this.dateRange[1]
@@ -263,7 +258,7 @@ export default {
       getTbAlarm(this.queryParams).then(response =>{
         this.adminList = response.data.records
         this.total = response.data.total;
-        this.loading4 = false;
+        this.loading3 = false;
       })
     },
     /** 搜索按钮操作 */
@@ -273,10 +268,10 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams.current = 1;
+      this.queryParams.size = 1;
+      this.queryParams.status = undefined;
       this.queryParams.startTime = undefined;
       this.queryParams.endTime = undefined;
-      this.queryParams.num = 0;
-      this.queryParams.status = undefined;
       this.queryParams.companyCode = undefined;
       this.dateRange = [];
       this.resetForm("queryForm");
@@ -359,6 +354,7 @@ export default {
         .title{
           width:100%;
           display: block;
+          text-align: left !important;
           .imgTitle{
             width:5%;
             display: inline-block;

src/views/business/propertyMange/index.vue

@@ -450,7 +450,6 @@ export default {
       //@ts-nocheckgetPropertyMange(this.addDateRange(this.queryParams,this.dateRange)).then(response => {
       getPropertyMange(this.queryParams).then(response => {
         this.adminList = response.data.records;
-        console.log(this.adminList)
         this.total = response.data.total;
         this.loading = false;
       });

src/views/components/fireAlarm/index2.vue

@@ -22,7 +22,6 @@ export default {
     getData() {
       let myChart = echarts.init(document.getElementById("index2"));
       let data = this.resData;
-      console.log(this.resData)
       let series = []; //定义一个数组变量用于存放配置
       for (var i = 0; i < data.length -1; i++) {
         series.push({

src/views/components/fireInternetInfo/index2.vue

@@ -21,174 +21,142 @@ export default {
   methods: {
     getData() {
       let myChart = echarts.init(document.getElementById("index2"));
-      let data = this.resData;
-      
-      // let name1 = data[0].name
-      // let name2 = data[1].name
-      // console.log(name1,name2)
-       let series = [
-         {
-            name: this.resData[0].name,
-            type: 'line',
-            stack: 'Total',
-            smooth: true,
-            lineStyle: {
-              width: 0
-            },
-            showSymbol: false,
-            areaStyle: {
-              opacity: 0.8,
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+      let data = this.resData
+      setTimeout(()=>{
+        let series = [
+          {
+              name: this.resData[0].name,
+              type: 'line',
+              stack: 'Total',
+              smooth: true,
+              lineStyle: {
+                width: 0
+              },
+              showSymbol: false,
+              areaStyle: {
+                opacity: 0.8,
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 
-                 {
-                    offset: 0,
-                    color: 'rgb(255, 0, 135)'
-                  },
                   {
-                    offset: 1,
-                    color: 'rgb(135, 0, 157)'
-                  }
-              ])
-            },
-            emphasis: {
-              focus: 'series'
+                      offset: 0,
+                      color: 'rgb(255, 0, 135)'
+                    },
+                    {
+                      offset: 1,
+                      color: 'rgb(135, 0, 157)'
+                    }
+                ])
+              },
+              emphasis: {
+                focus: 'series'
+              },
+              data: data[0].data
             },
-            data: data[0].data
-          },
-          {
-            name: this.resData[1].name,
-            type: 'line',
-            stack: 'Total',
-            smooth: true,
-            lineStyle: {
-              width: 0
-            },
-            showSymbol: false,
-            areaStyle: {
-              opacity: 0.8,
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                 {
-                    offset: 0,
-                    color: 'rgb(128, 255, 165)'
-                  },
+            {
+              name: this.resData[1].name,
+              type: 'line',
+              stack: 'Total',
+              smooth: true,
+              lineStyle: {
+                width: 0
+              },
+              showSymbol: false,
+              areaStyle: {
+                opacity: 0.8,
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
-                    offset: 1,
-                    color: 'rgb(1, 191, 236)'
-                  }
-              ])
-            },
-            emphasis: {
-              focus: 'series'
+                      offset: 0,
+                      color: 'rgb(128, 255, 165)'
+                    },
+                    {
+                      offset: 1,
+                      color: 'rgb(1, 191, 236)'
+                    }
+                ])
+              },
+              emphasis: {
+                focus: 'series'
+              },
+              data: data[1].data
+            }
+        ]; //定义一个数组变量用于存放配置
+        let option = {
+          legend: {
+            itemGap: 20, // 图例每项之间的间隔。
+            icon: "stack",
+            right: 20,
+            top:6,
+            padding: 0, // 图例内边距
+            textStyle: {
+              color: "#000",
+              align: "center"
+            }
+          },
+          title: {
+            x:'center',
+            text: data[3].name,
+            textStyle:{ //设置主标题风格
+              color:data[3].color,//设置主标题字体颜色
             },
-            data: data[1].data
-          }
-       ]; //定义一个数组变量用于存放配置
-      // for (var i = 0; i < data.length -1; i++) {
-      //   series.push({
-      //     name: data[i].name,
-      //     type: "line",
-      //     areaStyle: {
-      //       normal: {
-      //         color: new echarts.graphic.LinearGradient(
-      //           0,
-      //           0,
-      //           0,
-      //           1,
-      //           [
-      //             {
-      //               offset: 0,
-      //               color: "red"
-      //             },
-      //             {
-      //               offset: 1,
-      //               color: "blue"
-      //             }
-      //           ],
-      //           false
-      //         ),
-      //         shadowColor: "rgba(111,153,250, 0.9)",
-      //         shadowBlur: 20
-      //       }
-      //     },
-      //     data: data[i].data
-      //   });
-      // }
-      let option = {
-        legend: {
-          itemGap: 20, // 图例每项之间的间隔。
-          icon: "stack",
-          right: 20,
-          top:6,
-          padding: 0, // 图例内边距
-          textStyle: {
-            color: "#000",
-            align: "center"
-          }
-        },
-        title: {
-          x:'center',
-          text: data[3].name,
-          textStyle:{ //设置主标题风格
-            color:data[3].color,//设置主标题字体颜色
           },
-        },
-        color: ["#FF0087" , "#80FFA5" ],
-        grid: {
-          bottom: "0",
-          right: "10",
-          left: "10",
-          top: "35",
-          containLabel: true
-        },
-        tooltip: {
-          trigger: "axis",
-          confine: true,
-          textStyle: {
-            fontSize: 12
-          }
-        },
-        xAxis: {
-          type: "category",
-          boundaryGap: false,
-          // data: ["12：00", "13：00", "14：00", "15：00", "16：00", "17：00"],
-          data: data[2],
-          axisLabel: {
-            color: "#ccc"
+          color: ["#FF0087" , "#80FFA5" ],
+          grid: {
+            bottom: "0",
+            right: "10",
+            left: "10",
+            top: "35",
+            containLabel: true
           },
-          axisLine: {
-            lineStyle: {
-              color: "rgba(0,130,255,.2)"
+          tooltip: {
+            trigger: "axis",
+            confine: true,
+            textStyle: {
+              fontSize: 12
             }
           },
-          axisTick: {
-            show: false
-          }
-        },
-        yAxis: {
-          type: "value",
-          axisLabel: {
-            color: "#ccc"
-          },
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            lineStyle: {
-              color: "rgba(0,130,255,.2)"
+          xAxis: {
+            type: "category",
+            boundaryGap: false,
+            // data: ["12：00", "13：00", "14：00", "15：00", "16：00", "17：00"],
+            data: data[2],
+            axisLabel: {
+              color: "#ccc"
+            },
+            axisLine: {
+              lineStyle: {
+                color: "rgba(0,130,255,.2)"
+              }
+            },
+            axisTick: {
+              show: false
             }
           },
-          splitLine: {
-            lineStyle: {
-              color: "rgba(255,255,255,.1)"
+          yAxis: {
+            type: "value",
+            axisLabel: {
+              color: "#ccc"
+            },
+            axisTick: {
+              show: false
+            },
+            axisLine: {
+              lineStyle: {
+                color: "rgba(0,130,255,.2)"
+              }
+            },
+            splitLine: {
+              lineStyle: {
+                color: "rgba(255,255,255,.1)"
+              }
             }
-          }
-        },
-        series: series
-      };
+          },
+          series: series
+        };
         myChart.setOption(option);
-        window.addEventListener("resize", function() {
-            myChart.resize();
-        });
+      },1000)
+      window.addEventListener("resize", function() {
+          myChart.resize();
+      });
     }
   }
 };

src/views/components/fireInternetInfo/index3.vue

@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <div id="index1" ref="echartD" style="width:100%;height:300px;"></div>
+    <div id="index1" ref="echartD" style="width:100%;height:300px;" v-loading="loading"></div>
   </el-row>
 </template>
 <script>
@@ -8,7 +8,9 @@ import * as echarts from "echarts";
 export default {
   props: ["resData"],
   data() {
-    return {};
+    return {
+      loading:true
+    };
   },
   watch: {
     resData() {
@@ -81,7 +83,8 @@ export default {
         window.addEventListener("resize", function() {
           myChart.resize();
         });
-      },1000)
+        this.loading = false
+      },2000)
     },
 
   }

src/views/components/index/index2.vue

@@ -26,11 +26,6 @@ export default {
         name.push(val.deviceTypeS)
         num.push(val.deviceCount)
       })
-      setTimeout(()=>{
-        console.log(name)
-      },1000)
-
-      // num =[1,10,20,30,40,50]
       let option = {
           xAxis: {
             type: 'category',

src/views/components/index/index4.vue

@@ -35,13 +35,10 @@ export default {
   },
   methods: {
     initWebSocket() {
-      console.log(111)
       let arrData = [];
       let wsUri = "wss://iot.usky.cn:55120";
-      console.log(typeof MozWebSocket )
       try {
           // if (typeof MozWebSocket == 'function')
-          //     console.log(2)
               // WebSocket = MozWebSocket;
               let websocket = new WebSocket(wsUri);
               websocket.onopen = function(evt) {
@@ -53,32 +50,12 @@ export default {
               this.initWebSocket();
           };
           websocket.onmessage = function(evt) {
-              console.log(evt)
               var warningInfo = eval('(' + evt.data + ')');
-              console.log(warningInfo)
-              // if (warningInfo.dwtype) {
-              //     arrData.push(warningInfo)
-              //     console.log('arrData')
-              //         // console.log(arrData)
-              // }
-              // var items = '';
-              // arrData.forEach(function(item, index) {
-              //     items += ` <tr>
-              //     <td >${index+1}</td>
-              //     <td >${item.time}</td>
-              //     <td >${item.dwtype} </td>
-              //     <td title="${item.evtname}"> ${item.evtname}</td>
-              //     <td >${item.insertid} </td>
-              // </tr>`
-              // })
-              // $('.warning-info').html(items)
           };
           websocket.onerror = function(evt) {
-              // console.log("Error:", evt.data);
               (function() {})()
           };
       } catch (exception) {
-          // console.log("Exception:", exception);
           (function() {})()
       }
     },

src/views/components/monthReport/index.vue

@@ -27,7 +27,6 @@ export default {
     getData() {
       let myChart = echarts.init(document.getElementById(this.time));
       let data = this.resData1;
-      console.log(this.resData1)
       let series = []; //定义一个数组变量用于存放配置
       for (var i = 0; i < data.length -1; i++) {
         series.push({

src/views/index.vue

@@ -171,9 +171,7 @@ export default {
     this.initWebSocket()
   },
   mounted() {
-    this.timer = setInterval(function() {
-        getNYRSFM()
-    });
+
   },
   methods: {
     getList(){
@@ -258,11 +256,9 @@ export default {
 
           };
           websocket.onerror = function(evt) {
-              // console.log("Error:", evt.data);
               (function() {})()
           };
       } catch (exception) {
-          // console.log("Exception:", exception);
           (function() {})()
       }
     },
@@ -457,25 +453,7 @@ export default {
     font-size: 1.5vh;
     margin-top:4px;
 }
-.color-green {
-    color: #37FF01!important
-}
 
-.color-blue {
-    color: #6F99FA!important
-}
-
-.color-red {
-    color: #FF5801!important
-}
-
-.color-yellow {
-    color: #EAF665!important
-}
-
-.color-orange {
-    color: #DE8C54!important
-}
 .des-huan {
     max-width: 100%;
     font-size: 1vh;

src/views/system/role/index.vue

@@ -346,7 +346,6 @@ export default {
       this.loading = true;
       listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
         response => {
-          console.log(response)
           this.roleList = response.data.rows;
           this.total = response.data.total;
           this.loading = false;