Merge branch 'xykt-master'

Remove redundant code for MaxTCPPingValue initialization
Update network.html
2024-03-24 22:46:35 +08:00 · 2024-03-24 22:45:56 +08:00 · 2024-03-24 19:26:51 +08:00 · 2024-03-24 19:21:32 +08:00 · 2024-03-24 19:21:07 +08:00 · 2024-03-24 19:20:34 +08:00
6 changed files with 285 additions and 390 deletions
@@ -10,14 +10,6 @@
  .ui.card>.content>.header:not(.ui),.ui.cards>.card>.content>.header:not(.ui) {
    margin-top:0.4em !important;
  }
-  .ui.card>.content>.header,.ui.cards>.card>.content>.header {
-    padding-top: 0.5rem;
-    display: flex;
-    color: rgba(0, 0, 0, .85);
-    align-items: center;
-    padding-bottom: .2em;
-    border-bottom: 1px solid rgba(0, 0, 0, .2);
-  }
  .ui.menu .item>img:not(.ui){
    width: 2.2rem;
  }
@@ -223,4 +215,4 @@ td {

 .ui-alerts.top-center {
  z-index: 99999999;
-}
+}
@@ -20,357 +20,281 @@
 </head>

 <body data-theme="light" data-gridlist="grid">
-<header>
-    <section class="nav-bar clearfix">
-        <figure class="logo">
-            <a href="/">
-                <img src="/static/logo.svg?v20210804" alt='{{tr "NezhaMonitoring"}}' width="50" height="50">
-            </a>
-            <a href="/">{{.Conf.Site.Brand}}</a>
-        </figure>
-        <div class="icon-container">
-            <div class="row cf">
-                <div class="three col">
-                    <div class="hamburger" id="hamburger-icon"><span class="line"></span><span
-                            class="line"></span><span class="line"></span></div>
+    <header>
+        <section class="nav-bar clearfix">
+            <figure class="logo">
+                <a href="/">
+                    <img src="/static/logo.svg?v20210804" alt='{{tr "NezhaMonitoring"}}' width="50" height="50">
+                </a>
+                <a href="/">{{.Conf.Site.Brand}}</a>
+            </figure>
+            <div class="icon-container">
+                <div class="row cf">
+                    <div class="three col">
+                        <div class="hamburger" id="hamburger-icon"><span class="line"></span><span
+                                class="line"></span><span class="line"></span></div>
+                    </div>
+                </div>
+            </div>
+            <nav class="nav-menu">
+                <ul>
+                    <li><a href="/">{{tr "Home"}}</a></li>
+                    <li><a href="/service">{{tr "Services"}}</a></li>
+                    <li><a href="/network">{{tr "NetworkSpiter"}}</a></li>
+                    {{if .Admin}}
+                    <li><a href="/server">{{tr "AdminPanel"}}</a></li>
+                    {{else}}
+                    <li><a href="/login">{{tr "Login"}}</a></li>
+                    {{end}}
+                </ul>
+            </nav>
+        </section>
+    </header>
+
+    <main>
+        <div id="network">
+            <div class="server-info-container" v-for='server in servers' :id="server.ID">
+                <div class="info-body" @click="redirectNetwork(server.ID)">
+                    <ul class="server-info-body-container">
+                        <li>
+                            <h3>@#server.Name#@</h3>
+                        </li>
+                        <li><img :src="'/static/theme-daynight/img/flag/'+(server.Host&&server.Host.CountryCode?server.Host.CountryCode.toUpperCase():'CN')+'.png'"
+                                :title="server.Host.CountryCode.toUpperCase()" /></li>
+                    </ul>
                </div>
            </div>
        </div>
-        <nav class="nav-menu">
-            <ul>
-                <li><a href="/">{{tr "Home"}}</a></li>
-                <li><a href="/service">{{tr "Services"}}</a></li>
-                <li><a href="/network">{{tr "NetworkSpiter"}}</a></li>
-                {{if .Admin}}
-                <li><a href="/server">{{tr "AdminPanel"}}</a></li>
-                {{else}}
-                <li><a href="/login">{{tr "Login"}}</a></li>
-                {{end}}
-            </ul>
-        </nav>
-    </section>
-</header>
-
-<main>
-    <div id="network">
-        <div class="server-info-container" v-for='server in servers' :id="server.ID" style="font-size: .6em">
-            <div class="info-body" @click="redirectNetwork(server.ID)">
-                <ul class="server-info-body-container">
-                    <li>
-                        <h3>@#server.Name#@</h3>
-                    </li>
-                    <li><img :src="'/static/theme-daynight/img/flag/'+(server.Host&&server.Host.CountryCode?server.Host.CountryCode.toUpperCase():'CN')+'.png'"
-                             :title="server.Host.CountryCode.toUpperCase()" /></li>
-                </ul>
+        <div class="network-chart" style="height: 800px;overflow: hidden">
+            <div id="monitor-info-container" style="height: 520px;max-width: 1400px">
            </div>
        </div>
-    </div>
-    <div class="network-chart" style="height: 800px;overflow: hidden">
-        <div id="monitor-info-container" style="height: 520px;max-width: 1400px">
+        <div class="sidebar-container">
+            <ul>
+                <li><i class="fas fa-sun" title='{{tr "LightMode"}}'></i><span>{{tr "LightMode"}}</span></li>
+                <li><i class="fas fa-moon" title='{{tr "DarkMode"}}'></i><span>{{tr "DarkMode"}}</span></li>
+                <li><i class="fas fa-th" title='{{tr "GridLayout"}}'></i><span>{{tr "GridLayout"}}</span></li>
+                <li><i class="fas fa-list-ul" title='{{tr "ListLayout"}}'></i><span>{{tr "ListLayout"}}</span></li>
+            </ul>
        </div>
-    </div>
-    <div class="sidebar-container">
-        <ul>
-            <li><i class="fas fa-sun" title='{{tr "LightMode"}}'></i><span>{{tr "LightMode"}}</span></li>
-            <li><i class="fas fa-moon" title='{{tr "DarkMode"}}'></i><span>{{tr "DarkMode"}}</span></li>
-            <li><i class="fas fa-th" title='{{tr "GridLayout"}}'></i><span>{{tr "GridLayout"}}</span></li>
-            <li><i class="fas fa-list-ul" title='{{tr "ListLayout"}}'></i><span>{{tr "ListLayout"}}</span></li>
-        </ul>
-    </div>
-</main>
+    </main>

-<section class="dark-light-toggle">
-    <label class="switcher">
-        <input type="checkbox" name="theme" id="dark-light" />
-        <div>
-            <i class="fas fa-adjust"></i>
-        </div>
-    </label>
-</section>
+    <section class="dark-light-toggle">
+        <label class="switcher">
+            <input type="checkbox" name="theme" id="dark-light" />
+            <div>
+                <i class="fas fa-adjust"></i>
+            </div>
+        </label>
+    </section>

-<!-- Back to top button -->
-<a id="back-to-top"></a>
+    <!-- Back to top button -->
+    <a id="back-to-top"></a>

-<footer>
-    <div class="footer-container">
-        <div><a href="https://github.com/naiba/nezha" target="_blank">Powered by {{tr "NezhaMonitoring"}} · {{.Version}}</a>
-            <p>&copy; <span id="copyright-date">
+    <footer>
+        <div class="footer-container">
+            <div><a href="https://github.com/naiba/nezha" target="_blank">Powered by {{tr "NezhaMonitoring"}} ·
+                    {{.Version}}</a>
+                <p>&copy; <span id="copyright-date">
                        <script>document.getElementById('copyright-date').appendChild(document.createTextNode(new Date().getFullYear()))</script>
                    </span> · <a href="https://blog.jackiesung.com" target="_blank">Theme designed by Jackie Sung</a>
-            </p>
+                </p>
+            </div>
        </div>
-    </div>
-</footer>
+    </footer>

-<script src="/static/theme-daynight/js/main.js?v202102012266"></script>
-<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
-<script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/limonte-sweetalert2/11.4.4/sweetalert2.all.min.js"></script>
+    <script src="/static/theme-daynight/js/main.js?v202102012266"></script>
+    <script src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/vue/2.6.14/vue.min.js"></script>
+    <script
+        src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-y/limonte-sweetalert2/11.4.4/sweetalert2.all.min.js"></script>

-<script>
-    const monitorInfo =  JSON.parse('{{.MonitorInfos}}');
-    const initData = JSON.parse('{{.Servers}}').servers;
-    let MaxTCPPingValue = {{.Conf.MaxTCPPingValue}};
-    if (MaxTCPPingValue == null) {
-        MaxTCPPingValue = 1000;
-    }
-    new Vue({
-        el: '#app',
-        delimiters: ['@#', '#@'],
-        data: {
-            page: 'network',
-            defaultTemplate: {{.Conf.Site.Theme}},
-            templates: {{.Themes}},
-            servers: initData,
-            option: {
-                tooltip: {
-                    trigger: 'axis',
-                    position: function (pt) {
-                        return [pt[0], '10%'];
-                    },
-                    formatter: function(params){
-                        let result = params[0].axisValueLabel + "<br />";
-                        params.forEach(function(item){
-                            result += item.marker + item.seriesName + ": " + item.value[1].toFixed(2) + " ms<br />";
-                         })
-                        return result;
-                    },
-                    confine: true,
-                    transitionDuration: 0
-                },
-                title: {
-                    left: 'center',
-                    text: "",
-                    textStyle: {}
-                },
-                legend: {
-                    top: '5%',
-                    data: [],
-                    textStyle: {
-                        fontSize: 14
-                    }
-                },
-                grid: {
-                    left: '8%',
-                    right: '8%',
-                },
-                backgroundColor: 'rgba(255, 255, 255, 0.8)',
-                toolbox: {
-                    feature: {
-                        dataZoom: {
-                            yAxisIndex: 'none'
+    <script>
+        const monitorInfo = JSON.parse('{{.MonitorInfos}}');
+        const initData = JSON.parse('{{.Servers}}').servers;
+        let MaxTCPPingValue = {{.Conf.MaxTCPPingValue}};
+        // 基于准备好的dom，初始化echarts实例
+        const myChart = echarts.init(document.getElementById('monitor-info-container'));
+
+        // 使用刚指定的配置项和数据显示图表。
+        var statusCards = new Vue({
+            el: '#network',
+            delimiters: ['@#', '#@'],
+            data: {
+                servers: initData,
+                cache: [],
+                option: {
+                    tooltip: {
+                        trigger: 'axis',
+                        position: function (pt) {
+                            return [pt[0], '10%'];
                        },
-                        restore: {},
-                        saveAsImage: {}
+                        formatter: function (params) {
+                            let result = params[0].axisValueLabel + "<br />";
+                            params.forEach(function (item) {
+                                result += item.marker + item.seriesName + ": " + item.value[1].toFixed(2) + " ms<br />";
+                            })
+                            return result;
+                        },
+                        confine: true,
+                        transitionDuration: 0
+                    },
+                    title: {
+                        left: 'center',
+                        text: "",
+                        textStyle: {}
+                    },
+                    legend: {
+                        top: '5%',
+                        data: [],
+                        textStyle: {
+                            fontSize: 14
+                        }
+                    },
+                    toolbox: {
+                        feature: {
+                            dataZoom: {
+                                yAxisIndex: 'none'
+                            },
+                            restore: {},
+                            saveAsImage: {}
+                        }
+                    },
+                    dataZoom: [
+                        {
+                            start: 94,
+                            end: 100
+                        }
+                    ],
+                    xAxis: {
+                        type: 'time',
+                        boundaryGap: false
+                    },
+                    yAxis: {
+                        type: 'value',
+                        boundaryGap: [0, '100%']
+                    },
+                    series: [],
+                }
+            },
+            mounted() {
+                this.DarkMode();
+                this.parseMonitorInfo(monitorInfo);
+                window.addEventListener('resize', this.resizeHandle);
+            },
+            destroyed() {
+                window.removeEventListener('resize', this.resizeHandle)
+            },
+            methods: {
+                DarkMode() {
+                    const hour = new Date(Date.now()).getHours()
+                    if (hour > 17 || hour < 4) {
+                        document.querySelector("input[name=theme]").checked = true;
+                        document.getElementsByTagName("BODY")[0].setAttribute('data-theme', 'dark');
+                        document.getElementById("monitor-info-container").style.backgroundColor = "#1E1E1E";
                    }
                },
-                dataZoom: [
-                    {
-                        start: 0,
-                        end: 100
-                    }
-                ],
-                xAxis: {
-                    type: 'time',
-                    boundaryGap: false
-                },
-                yAxis: {
-                    type: 'value',
-                    boundaryGap: false
-                },
-                series: [],
-            },
-            chartOnOff: true,
-        },
-        mixins: [mixinsVue],
-        mounted() {
-            this.renderChart();
-            this.parseMonitorInfo(monitorInfo);
-            window.addEventListener('resize', this.resizeHandle);
-        },
-        destroyed () {
-            window.removeEventListener('resize', this.resizeHandle)
-        },
-        methods: {
-            getFontLogoClass(str) {
-                if (["almalinux",
-                        "alpine",
-                        "aosc",
-                        "apple",
-                        "archlinux",
-                        "archlabs",
-                        "artix",
-                        "budgie",
-                        "centos",
-                        "coreos",
-                        "debian",
-                        "deepin",
-                        "devuan",
-                        "docker",
-                        "elementary",
-                        "fedora",
-                        "ferris",
-                        "flathub",
-                        "freebsd",
-                        "gentoo",
-                        "gnu-guix",
-                        "illumos",
-                        "kali-linux",
-                        "linuxmint",
-                        "mageia",
-                        "mandriva",
-                        "manjaro",
-                        "nixos",
-                        "openbsd",
-                        "opensuse",
-                        "pop-os",
-                        "raspberry-pi",
-                        "redhat",
-                        "rocky-linux",
-                        "sabayon",
-                        "slackware",
-                        "snappy",
-                        "solus",
-                        "tux",
-                        "ubuntu",
-                        "void",
-                        "zorin"].indexOf(str)
-                    > -1) {
-                    return str;
-                }
-                if (['openwrt', 'linux', "immortalwrt"].indexOf(str) > -1) {
-                    return 'tux';
-                }
-                if (str == 'amazon') {
-                    return 'redhat';
-                }
-                if (str == 'arch') {
-                    return 'archlinux';
-                }
-                return '';
-            },
-            redirectNetwork(id) {
+                redirectNetwork(id) {
                    this.getMonitorHistory(id)
-                    .then(function(monitorInfo) {
-                          var vm = app.__vue__;
-                          vm.parseMonitorInfo(monitorInfo);
-                    })
-                    .catch(function(error){
-                        window.location.href = "/404";
-                    })
+                        .then(function (monitorInfo) {
+                            var vm = network.__vue__;
+                            vm.parseMonitorInfo(monitorInfo);
+                        })
+                        .catch(function (error) {
+                            window.location.href = "/404";
+                        })
                },
-            getMonitorHistory(id) {
-                  return $.ajax({
-                    url: "/api/v1/monitor/"+id,
-                    method: "GET"
-                  });
-            },
-            parseMonitorInfo(monitorInfo) {
-                let tSeries = [];
-                let tLegendData = [];
-                var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
-                let maxPing = 0;
-                for (let i = 0; i < monitorInfo.result.length; i++) {
-                	 for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
-                	 	avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
-                        if ( avgDelay < MaxTCPPingValue && avgDelay > maxPing) {
-                            maxPing = avgDelay;
+                getMonitorHistory(id) {
+                    return $.ajax({
+                        url: "/api/v1/monitor/" + id,
+                        method: "GET"
+                    });
+                },
+                parseMonitorInfo(monitorInfo) {
+                    let tSeries = [];
+                    let tLegendData = [];
+                    var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
+                    for (let i = 0; i < monitorInfo.result.length; i++) {
+                        var lcolor = lcolors[i % lcolors.length];
+                        var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
+                        var rgbaColorBar = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.35)';
+                        let loss = 0;
+                        let data = [];
+                        let datal = [];
+                        for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
+                            avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
+                            if (avgDelay > 0 && avgDelay < MaxTCPPingValue) {
+                                data.push([monitorInfo.result[i].created_at[j], avgDelay]);
+                            }
+                            else {
+                                loss += 1;
+                                datal.push({
+                                    xAxis: monitorInfo.result[i].created_at[j],
+                                    label: { show: false },
+                                    emphasis: { disabled: true },
+                                    lineStyle: {
+                                        type: "solid",
+                                        color: rgbaColorBar
+                                    }
+                                });
+                            }
                        }
-                	 }
-                }
-                for (let i = 0; i < monitorInfo.result.length; i++) {
-                    var lcolor = lcolors[i % lcolors.length];
-                    var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
-                    var rgbaColorBar = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.35)';
-                    let loss = 0;
-                    let data = [];
-                    let datal = [];
-                    for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
-                        avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
-                        if (avgDelay > 0 && avgDelay < MaxTCPPingValue) {
-                            data.push([monitorInfo.result[i].created_at[j], avgDelay]);
+                        lossRate = ((loss / monitorInfo.result[i].created_at.length) * 100).toFixed(1);
+                        if (lossRate > 99) {
+                            datal = [];
                        }
-                        else {
-                            loss += 1;
-                            datal.push([monitorInfo.result[i].created_at[j], maxPing]);
-                        }
-                    }
-                    lossRate = ((loss / monitorInfo.result[i].created_at.length) * 100).toFixed(1);
-                    if (lossRate > 99) {
-                        datal = [];
-                    }
-                    legendName = monitorInfo.result[i].monitor_name +" "+ lossRate + "%";
-                    tLegendData.push(legendName);
-                    tSeries.push({
+                        legendName = monitorInfo.result[i].monitor_name + " " + lossRate + "%";
+                        tLegendData.push(legendName);
+                        tSeries.push({
                            name: legendName,
                            type: 'line',
                            smooth: true,
                            symbol: 'none',
                            data: data,
+                            markLine: {
+                                symbol: "none",
+                                symbolSize: 0,
+                                data: datal
+                            },
                            markPoint: {
                                data: [
                                    { type: 'max', symbol: 'pin', name: 'Max', itemStyle: { color: rgbaColorMarker }, symbolSize: 30, label: { fontSize: 8 } },
                                    { type: 'min', symbol: 'pin', name: 'Min', itemStyle: { color: rgbaColorMarker }, symbolSize: 30, label: { fontSize: 8, offset: [0, 7.5] }, symbolRotate: 180 }
                                ]
                            }
-                    });
-                    tSeries.push({
-                            name: legendName,
-                            type: 'bar',
-                            smooth: true,
-                            symbol: 'none',
-                            data: datal,
-                            itemStyle: { color: rgbaColorBar }
-                    });
-                }
-                this.option.title.text = monitorInfo.result[0].server_name;
-                this.option.series = tSeries;
-                this.option.legend.data = tLegendData;
-                this.myChart.clear();
-                this.myChart.setOption(this.option);
-            },
-                this.option.title.text = monitorInfo.result[0].server_name;
-                this.option.series = tSeries;
-                this.option.legend.data = tLegendData;
-                this.myChart.clear();
-                this.myChart.setOption(this.option);
-            },
-            isWindowsPlatform(str) {
-                return str.includes('Windows')
-            },
-            renderChart() {
-              this.myChart = echarts.init(this.$refs.chartDom);
-              this.myChart.setOption(this.option);
-            },
-            resizeHandle () {
-              this.myChart.resize();
-            },
-        },
-        beforeDestroy() {
-            this.myChart.dispose();
-            this.myChart = null;
-        },
-    });
-</script>
+                        });
+                    }
+                    this.option.title.text = monitorInfo.result[0].server_name;
+                    this.option.series = tSeries;
+                    this.option.legend.data = tLegendData;
+                    myChart.clear();
+                    myChart.setOption(this.option);
+                },
+                resizeHandle() {
+                    myChart.resize();
+                },
+            }
+        });
+    </script>
 </body>
 <style>
-#network {
-    display: grid;
-    /*grid-template-columns: repeat(5, 1fr);*/
-    grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
-    grid-gap: 1em;
-    width: 100%;
-    width: calc(100vw - 6em);
-    max-width: 1400px;
-    margin: 1em auto;
-    align-content: start;
-}
-#monitor-info-container{
-    margin: 0em auto;
-    align-content: start;
-    background-color: #F1F1F2;
-}
+    #network {
+        width: calc(100vw - 6em);
+        max-width: 1400px;
+        margin: 1em auto;
+    }
+
+    #monitor-info-container {
+        margin: 0em auto;
+        align-content: start;
+        background-color: #F1F1F2;
+    }
+
+    .server-info-container {
+        font-size: .6em;
+        width: fit-content;
+        display: inline-block;
+    }
 </style>

 </html>
-{{end}}
-
+{{end}}
@@ -15,7 +15,7 @@
            <div v-for="server in group.data" :id="server.ID" class="ui card">
              <div class="content" v-if="server.Host" style="margin-top: 10px; padding-bottom: 5px">
                <div class="header">
-                <img v-if="server.Host.CountryCode" style="border-radius: 5px;width:22px;" :src="'https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/6.6.5/flags/4x3/'+server.Host.CountryCode + '.svg'" alt="国家"/>&nbsp;<i v-if='server.Host.Platform == "darwin"'
+                <i style="width: 22px;border-radius: 4px;" :class="'fi fi-' + server.Host.CountryCode"></i>&nbsp;<i v-if='server.Host.Platform == "darwin"'
                    class="apple icon"></i><i v-else-if='isWindowsPlatform(server.Host.Platform)'
                    class="windows icon"></i><i v-else :class="'fl-' + getFontLogoClass(server.Host.Platform)"></i>
                  @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@
@@ -28,9 +28,6 @@
    const monitorInfo =  JSON.parse('{{.MonitorInfos}}');
    const initData = JSON.parse('{{.Servers}}').servers;
    let MaxTCPPingValue = {{.Conf.MaxTCPPingValue}};
-    if (MaxTCPPingValue == null) {
-        MaxTCPPingValue = 1000;
-    }
    new Vue({
        el: '#app',
        delimiters: ['@#', '#@'],
@@ -186,15 +183,6 @@
                let tSeries = [];
                let tLegendData = [];
                var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
-                let maxPing = 0;
-                for (let i = 0; i < monitorInfo.result.length; i++) {
-                	 for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
-                	 	avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
-                        if ( avgDelay < MaxTCPPingValue && avgDelay > maxPing) {
-                            maxPing = avgDelay;
-                        }
-                	 }
-                }
                for (let i = 0; i < monitorInfo.result.length; i++) {
                    var lcolor = lcolors[i % lcolors.length];
                    var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
@@ -209,7 +197,15 @@
                        }
                        else {
                            loss += 1;
-                            datal.push([monitorInfo.result[i].created_at[j], maxPing]);
+                            datal.push({
+                                xAxis: monitorInfo.result[i].created_at[j],
+                                label: { show: false },
+                                emphasis: { disabled: true },
+                                lineStyle: {
+                                    type: "solid",
+                                    color: rgbaColorBar
+                                }
+                            });
                        }
                    }
                    lossRate = ((loss / monitorInfo.result[i].created_at.length) * 100).toFixed(1);
@@ -224,6 +220,11 @@
                            smooth: true,
                            symbol: 'none',
                            data: data,
+                            markLine: {
+                                symbol: "none",
+                                symbolSize :0,
+                                data: datal
+                            },
                            markPoint: {
                                data: [
                                    { type: 'max', symbol: 'pin', name: 'Max', itemStyle: { color: rgbaColorMarker }, symbolSize: 30, label: { fontSize: 8 } },
@@ -231,14 +232,6 @@
                                ]
                            }
                    });
-                    tSeries.push({
-                            name: legendName,
-                            type: 'bar',
-                            smooth: true,
-                            symbol: 'none',
-                            data: datal,
-                            itemStyle: { color: rgbaColorBar }
-                    });
                }
                this.option.title.text = monitorInfo.result[0].server_name;
                this.option.series = tSeries;
@@ -55,9 +55,6 @@
    const monitorInfo =  JSON.parse('{{.MonitorInfos}}');
    const initData = JSON.parse('{{.Servers}}').servers;
    let MaxTCPPingValue = {{.Conf.MaxTCPPingValue}};
-    if (MaxTCPPingValue == null) {
-        MaxTCPPingValue = 1000;
-    }
    new Vue({
        el: '#app',
        delimiters: ['@#', '#@'],
@@ -209,15 +206,6 @@
                let tSeries = [];
                let tLegendData = [];
                var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
-                let maxPing = 0;
-                for (let i = 0; i < monitorInfo.result.length; i++) {
-                	 for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
-                	 	avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
-                        if ( avgDelay < MaxTCPPingValue && avgDelay > maxPing) {
-                            maxPing = avgDelay;
-                        }
-                	 }
-                }
                for (let i = 0; i < monitorInfo.result.length; i++) {
                    var lcolor = lcolors[i % lcolors.length];
                    var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
@@ -232,7 +220,15 @@
                        }
                        else {
                            loss += 1;
-                            datal.push([monitorInfo.result[i].created_at[j], maxPing]);
+                            datal.push({
+                                xAxis: monitorInfo.result[i].created_at[j],
+                                label: { show: false },
+                                emphasis: { disabled: true },
+                                lineStyle: {
+                                    type: "solid",
+                                    color: rgbaColorBar
+                                }
+                            });
                        }
                    }
                    lossRate = ((loss / monitorInfo.result[i].created_at.length) * 100).toFixed(1);
@@ -247,6 +243,11 @@
                            smooth: true,
                            symbol: 'none',
                            data: data,
+                            markLine: {
+                                symbol: "none",
+                                symbolSize :0,
+                                data: datal
+                            },
                            markPoint: {
                                data: [
                                    { type: 'max', symbol: 'pin', name: 'Max', itemStyle: { color: rgbaColorMarker }, symbolSize: 30, label: { fontSize: 8 } },
@@ -254,14 +255,6 @@
                                ]
                            }
                    });
-                    tSeries.push({
-                            name: legendName,
-                            type: 'bar',
-                            smooth: true,
-                            symbol: 'none',
-                            data: datal,
-                            itemStyle: { color: rgbaColorBar }
-                    });
                }
                this.option.title.text = monitorInfo.result[0].server_name;
                this.option.series = tSeries;
@@ -22,9 +22,6 @@
    const monitorInfo =  JSON.parse('{{.MonitorInfos}}');
    const initData = JSON.parse('{{.Servers}}').servers;
    let MaxTCPPingValue = {{.Conf.MaxTCPPingValue}};
-    if (MaxTCPPingValue == null) {
-        MaxTCPPingValue = 1000;
-    }
    new Vue({
        el: '#app',
        delimiters: ['@#', '#@'],
@@ -172,15 +169,6 @@
                let tSeries = [];
                let tLegendData = [];
                var lcolors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
-                let maxPing = 0;
-                for (let i = 0; i < monitorInfo.result.length; i++) {
-                	 for (let j = 0; j < monitorInfo.result[i].created_at.length; j++) {
-                	 	avgDelay = Math.round(monitorInfo.result[i].avg_delay[j]);
-                        if ( avgDelay < MaxTCPPingValue && avgDelay > maxPing) {
-                            maxPing = avgDelay;
-                        }
-                	 }
-                }
                for (let i = 0; i < monitorInfo.result.length; i++) {
                    var lcolor = lcolors[i % lcolors.length];
                    var rgbaColorMarker = 'rgba(' + parseInt(lcolor.slice(1, 3), 16) + ',' + parseInt(lcolor.slice(3, 5), 16) + ',' + parseInt(lcolor.slice(5, 7), 16) + ',0.5)';
@@ -195,7 +183,15 @@
                        }
                        else {
                            loss += 1;
-                            datal.push([monitorInfo.result[i].created_at[j], maxPing]);
+                            datal.push({
+                                xAxis: monitorInfo.result[i].created_at[j],
+                                label: { show: false },
+                                emphasis: { disabled: true },
+                                lineStyle: {
+                                    type: "solid",
+                                    color: rgbaColorBar
+                                }
+                            });
                        }
                    }
                    lossRate = ((loss / monitorInfo.result[i].created_at.length) * 100).toFixed(1);
@@ -210,6 +206,11 @@
                            smooth: true,
                            symbol: 'none',
                            data: data,
+                            markLine: {
+                                symbol: "none",
+                                symbolSize :0,
+                                data: datal
+                            },
                            markPoint: {
                                data: [
                                    { type: 'max', symbol: 'pin', name: 'Max', itemStyle: { color: rgbaColorMarker }, symbolSize: 30, label: { fontSize: 8 } },
@@ -217,14 +218,6 @@
                                ]
                            }
                    });
-                    tSeries.push({
-                            name: legendName,
-                            type: 'bar',
-                            smooth: true,
-                            symbol: 'none',
-                            data: datal,
-                            itemStyle: { color: rgbaColorBar }
-                    });
                }
                this.option.title.text = monitorInfo.result[0].server_name;
                this.option.series = tSeries;
Author	SHA1	Message	Date
naiba	8b5d513c6a	Merge branch 'xykt-master'	2024-03-24 22:46:35 +08:00
naiba	6c718c4f38	Remove redundant code for MaxTCPPingValue initialization	2024-03-24 22:45:56 +08:00
xykt	5a2ab8a7ee	Update network.html	2024-03-24 19:26:51 +08:00
xykt	0ea0c9ad8c	Update network.html	2024-03-24 19:21:32 +08:00
xykt	7d4d8c46b8	Update network.html	2024-03-24 19:21:07 +08:00
xykt	a4636ed774	Update network.html	2024-03-24 19:20:34 +08:00
xykt	bb48e0912d	Update network.html	2024-03-24 19:20:01 +08:00
xykt	a575d1a6e0	Merge branch 'naiba:master' into master	2024-03-24 19:13:03 +08:00
github-actions[bot]	420d1ca8ff	update contributors[no ci]	2024-03-24 08:13:23 +00:00
naiba	29554ec7ec	🐛 revert shit	2024-03-24 16:12:51 +08:00
xykt	9a8c0e7118	Update network.html	2024-03-24 09:24:23 +08:00
xykt	800af7ce4e	Update network.html	2024-03-24 09:22:13 +08:00
xykt	78134a0e8b	Update network.html	2024-03-24 09:20:53 +08:00
xykt	bad910b686	Update network.html	2024-03-24 09:16:41 +08:00
xykt	a7d1bd7487	Update network.html 美化了三网延迟界面： 1. 将Marker缩小降低曲线遮挡 2. 设置为曲线对应的颜色使其更加直观 3. 设置Marker透明度降低对画面的影响 4. 将延迟极小值的Marker倒置显示以快速区别极大值 5. 将超过MaxTCPPingValue的点删除 6. 显示丢包分布（细线），以及服务器断流区间（粗线）	2024-03-24 01:04:03 +08:00
xykt	20a10ac6b8	Merge branch 'naiba:master' into master	2024-03-23 13:25:37 +08:00
xykt	3a395e66c0	Merge branch 'naiba:master' into master	2024-03-04 16:07:13 +08:00
xykt	4e5cc0b642	Update config.go 修复了以下问题： - 延迟默认最高300ms，超过后默认抹平 - 曲线上有很多ping值为0的无效散点，导致毛刺很多，干扰效果 - 图标的y轴比例失调，上方大片留白，大大降低了有效显示区域 - 默认只显示最近不到半小时左右的延迟表现，想看全天需要拖动，影响效果 - 曲线不显示极大极小值，不够直观	2024-02-19 01:17:42 +08:00
xykt	fe2872bbb3	Update network.html 修复以下问题： - 延迟默认最高300ms，超过后默认抹平 - 曲线上有很多ping值为0的无效散点，导致毛刺很多，干扰效果 - 图标的y轴比例失调，上方大片留白，大大降低了有效显示区域 - 默认只显示最近不到半小时左右的延迟表现，想看全天需要拖动，影响效果 - 曲线不显示极大极小值，不够直观	2024-02-19 01:14:26 +08:00