Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-04-24 9459612c7ef903fd4de76c84f6c172ee3b0ea144

 public/map/popup/html/FlareClusterLayer_v3.html

@@ -19,6 +19,7 @@
        #appliu {
            /* border: 1px solid #000; */
            border-radius: 5px 5px 5px 5px;
            width: ;
        }

        .names {
@@ -42,6 +43,17 @@
            padding-left: 8px;
            /* border: 1px solid rgb(30, 160, 192); */
        }
        /* .msgs::after{
            content: '';
            display: block;
            width: 10px;
            height: 10px;
            background-color: aquamarine;
            z-index: 1111111;
            position: relative;
            top: 40px;
            left: 20px;
        } */
    </style>
</head>

@@ -63,7 +75,8 @@
                el: '#appliu',
                data: {
                    num: '',
                    name: ''
                    name: '',
                    statesss: '',
                },
                ourData: '',
                // ip2: '',
@@ -80,11 +93,32 @@
                        me.name = dat.deviceName.length >= 13 ? dat.deviceName.substring(0, 13) + '···' : dat.deviceName;
                        this.num = "无数据" && dat.deviceNumber;
                        var ct = document.getElementsByClassName('names')[0];
                        if (dat.onlineStatus == 1) {
                            ct.style.backgroundImage = 'linear-gradient(to right, #3DDEA8 , #1FBD9A';
                        } else {
                            ct.style.backgroundImage = 'linear-gradient(to right, #787878 , #5F5F5F';
                        // if (dat.onlineStatus == 1) {
                        //     ct.style.backgroundImage = 'linear-gradient(to right, #3DDEA8 , #1FBD9A';
                        // } else {
                        //     ct.style.backgroundImage = 'linear-gradient(to right, #787878 , #5F5F5F';

                        // }
                        if (dat.state != '') {
                            ct.style.backgroundImage = 'linear-gradient(to right, #F49966 , #F49966';
                            // cordActive.style.backgroundImage = 'linear-gradient(to right, #F49966 , #F49966';
                            this.statesss = '故障';
                        } else {
                            if (dat.jtype != 1) {
                                if (dat.onlineStatus == 1) {//el-tabs__active-bar
                                    ct.style.backgroundImage = 'linear-gradient(to right, #32C1A2 , #32C1A2';
                                    // cordActive.style.backgroundImage = 'linear-gradient(to right, #32C1A2 , #32C1A2';
                                    this.statesss = '在线';
                                } else {
                                    ct.style.backgroundImage = 'linear-gradient(to right, #CDCDCD , #CDCDCD';
                                    // cordActive.style.backgroundImage = 'linear-gradient(to right, #CDCDCD , #CDCDCD';
                                    this.statesss = '离线';
                                }
                            } else {
                                ct.style.backgroundImage = 'linear-gradient(to right, #F35B5B , #F35B5B';
                                // cordActive.style.backgroundImage = 'linear-gradient(to right, #F35B5B , #F35B5B';
                                this.statesss = '警报';
                            }
                        }
                    }
                },