Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-xwx

@@ -2035,7 +2035,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
                 success: function (res) {
                 success: function (res) {
                     if (res.success) {
                     if (res.success) {
                         var lgn = localStorage.getItem("lgn");
                         var lgn = localStorage.getItem("lgn");
-                        if (res.str.indexOf(lgn) != -1) {
+                        if (res.str && res.str.indexOf(lgn) != -1) {
                             refresh();
                             refresh();
                         }
                         }
                     }
                     }

@@ -666,7 +666,6 @@ layui.extend({
                                     //     window.top.location.reload();
                                     //     window.top.location.reload();
                                     //     return;
                                     //     return;
                                     // }
                                     // }
-                                    debugger
                                     tryIndex = 1;
                                     tryIndex = 1;
                                     // 服务异常：服务重启，网络问题等不可访问等因素
                                     // 服务异常：服务重启，网络问题等不可访问等因素
                                     tryFunc();
                                     tryFunc();
@@ -718,7 +717,7 @@ layui.extend({
             }
             }
         }
         }
 
 
-        var tryFunc = function () {
+        var  tryFunc = function () {
             setTimeout(function () {
             setTimeout(function () {
                 if (!connectFlg) {
                 if (!connectFlg) {
                     tryIndex++;
                     tryIndex++;

@@ -172,7 +172,8 @@
                 </div>
                 </div>
             </div>
             </div>
             <div class="layui-form-item">
             <div class="layui-form-item">
-                <div class="inline-half layui-inline resCategory hide">
+                <!-- 取消隐藏 -->
+                <div class="inline-half layui-inline resCategory">
                     <label class="layui-form-label">所属分类<span style="color: red">*</span></label>
                     <label class="layui-form-label">所属分类<span style="color: red">*</span></label>
                     <div class="layui-input-inline">
                     <div class="layui-input-inline">
                         <select class="layui-select" lay-search name="resCategory" lay-verify="required" ></select>
                         <select class="layui-select" lay-search name="resCategory" lay-verify="required" ></select>

@@ -17,7 +17,7 @@
 
 
     <modules>
     <modules>
         <module>hg-monitor-web-base</module>
         <module>hg-monitor-web-base</module>
-        <module>hg-monitor-web-nx</module>
+        <!--<module>hg-monitor-web-nx</module>-->
         <module>hg-monitor-web-qh</module>
         <module>hg-monitor-web-qh</module>
     </modules>
     </modules>
     <properties>
     <properties>

@@ -21,7 +21,7 @@
 更多模板：www.bootstrapmb.com
 更多模板：www.bootstrapmb.com
 **********************************************/
 **********************************************/
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     Start Global CSS
     Start Global CSS
 ====================================================================
 ====================================================================
@@ -158,7 +158,7 @@ img {
     display: inline-block;
     display: inline-block;
     text-transform: capitalize;
     text-transform: capitalize;
     font-family: 'Poppins', sans-serif;
     font-family: 'Poppins', sans-serif;
-    
+
 }
 }
 
 
 /*Social Icon*/
 /*Social Icon*/
@@ -320,13 +320,13 @@ textarea:placeholder,
 }
 }
 
 
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     End Global CSS
     End Global CSS
 ====================================================================
 ====================================================================
  ***/
  ***/
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     Start Hero Section
     Start Hero Section
 ====================================================================
 ====================================================================
@@ -337,6 +337,13 @@ textarea:placeholder,
     background-position: center bottom;
     background-position: center bottom;
     background-size: cover;
     background-size: cover;
 }
 }
+.concat-top {
+    position: relative;
+    background: url('../img/concat/bg.png');
+    background-position: center bottom;
+    background-size: cover;
+    padding: 200px;
+}
 
 
 .hero-content h1 {
 .hero-content h1 {
     font-weight: 300;
     font-weight: 300;
@@ -353,14 +360,14 @@ textarea:placeholder,
     margin: 0 -200px 0 90px;
     margin: 0 -200px 0 90px;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     End Hero Section
     End Hero Section
 ====================================================================
 ====================================================================
  ***/
  ***/
 
 
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     Start Banner Section
     Start Banner Section
 ====================================================================
 ====================================================================
@@ -404,13 +411,13 @@ textarea:placeholder,
     font-size: 14px;
     font-size: 14px;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
      End Banner Section
      End Banner Section
 ====================================================================
 ====================================================================
 
 
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
      Start Services Section
      Start Services Section
 ====================================================================
 ====================================================================
@@ -439,13 +446,13 @@ textarea:placeholder,
 
 
 
 
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     End Services Section
     End Services Section
 ====================================================================
 ====================================================================
  ***/
  ***/
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
      Start Project section
      Start Project section
 ====================================================================
 ====================================================================
@@ -558,7 +565,7 @@ textarea:placeholder,
     right: 20px;
     right: 20px;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
      End Project section
      End Project section
 ====================================================================
 ====================================================================
@@ -618,7 +625,7 @@ textarea:placeholder,
     margin: 10px 0 0;
     margin: 10px 0 0;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     End Success Section
     End Success Section
 ====================================================================
 ====================================================================
@@ -668,7 +675,7 @@ textarea:placeholder,
     border: 2px solid;
     border: 2px solid;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     End Video Section
     End Video Section
 ====================================================================
 ====================================================================
@@ -733,7 +740,7 @@ textarea:placeholder,
 }
 }
 
 
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     End Services Two Section
     End Services Two Section
 ====================================================================
 ====================================================================
@@ -899,7 +906,7 @@ textarea:placeholder,
     margin-top: 5px;
     margin-top: 5px;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
      End Pricing section
      End Pricing section
 ====================================================================
 ====================================================================
@@ -958,7 +965,7 @@ textarea:placeholder,
     color: #1C00AF;
     color: #1C00AF;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     End Team Section
     End Team Section
 ====================================================================
 ====================================================================
@@ -1021,7 +1028,7 @@ textarea:placeholder,
     padding: 16px 0 10px;
     padding: 16px 0 10px;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     End FAQ Section
     End FAQ Section
 ====================================================================
 ====================================================================
@@ -1164,7 +1171,7 @@ textarea:placeholder,
     display: inline-block;
     display: inline-block;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     End Testimonials Section
     End Testimonials Section
 ====================================================================
 ====================================================================
@@ -1406,7 +1413,7 @@ blockquote:before {
 .widget-post-content h6 {
 .widget-post-content h6 {
     margin: 0;
     margin: 0;
     font-weight: 400;
     font-weight: 400;
-    
+
 }
 }
 .widget-post-content h6 a{
 .widget-post-content h6 a{
     color: #848484;
     color: #848484;
@@ -1455,7 +1462,7 @@ blockquote:before {
     color: #FFFFFF;
     color: #FFFFFF;
     transition: .5s;
     transition: .5s;
 }
 }
-/*** 
+/***
 ====================================================================
 ====================================================================
     End Blog Section
     End Blog Section
 ====================================================================
 ====================================================================
@@ -1477,7 +1484,7 @@ blockquote:before {
     margin-bottom: 15px;
     margin-bottom: 15px;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
     End Call For Action Section
     End Call For Action Section
 ====================================================================
 ====================================================================
@@ -1546,7 +1553,7 @@ blockquote:before {
     margin-top: 20px;
     margin-top: 20px;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
      End Contact Page section
      End Contact Page section
 ====================================================================
 ====================================================================
@@ -1616,7 +1623,7 @@ blockquote:before {
     right: 0;
     right: 0;
 }
 }
 
 
-/*** 
+/***
 ====================================================================
 ====================================================================
      End Error section
      End Error section
 ====================================================================
 ====================================================================

@@ -74,7 +74,7 @@
 
 
                         <div class="navbar-collapse navbar-collapse-one collapse clearfix">
                         <div class="navbar-collapse navbar-collapse-one collapse clearfix">
                             <ul class="navigation clearfix">
                             <ul class="navigation clearfix">
-                                <li class="current" top-nav="/">
+                                <li class="current" top-nav="home">
                                     <router-link to="/">首页</router-link>
                                     <router-link to="/">首页</router-link>
                                 </li>
                                 </li>
                                 <li top-nav="services">
                                 <li top-nav="services">
@@ -129,7 +129,7 @@
                         <!--Footer Column-->
                         <!--Footer Column-->
                         <div class="col-sm-4">
                         <div class="col-sm-4">
                             <div class="footer-widget links-widget">
                             <div class="footer-widget links-widget">
-                                <h4 class="footer-title">产品内容1</h4>
+                                <h4 class="footer-title">产品内容</h4>
                                 <div class="widget-content">
                                 <div class="widget-content">
                                     <ul>
                                     <ul>
                                         <li><a href="#">综合告警智能算法平台</a></li>
                                         <li><a href="#">综合告警智能算法平台</a></li>
@@ -143,7 +143,7 @@
 
 
                         <div class="col-sm-4">
                         <div class="col-sm-4">
                             <div class="footer-widget links-widget">
                             <div class="footer-widget links-widget">
-                                <h4 class="footer-title">产品内容2</h4>
+                                <h4 style=" font-weight: 600;position: relative;margin-bottom: 40px;text-transform: capitalize;">&nbsp;</h4>
                                 <div class="widget-content">
                                 <div class="widget-content">
                                     <ul>
                                     <ul>
                                         <li><a href="#">日志综合智能分析平台</a></li>
                                         <li><a href="#">日志综合智能分析平台</a></li>
@@ -166,7 +166,9 @@
                                 <h4 class="footer-title">关于我们</h4>
                                 <h4 class="footer-title">关于我们</h4>
                                 <div class="widget-content">
                                 <div class="widget-content">
                                     <ul>
                                     <ul>
-                                        <li><a href="#">公司简介</a></li>
+                                        <li>
+                                            <router-link to="/about">公司简介</router-link>
+                                        </li>
                                         <li><a href="#">合作流程</a></li>
                                         <li><a href="#">合作流程</a></li>
                                     </ul>
                                     </ul>
                                 </div>
                                 </div>

+export default {
+  mounted() {
+    this.pageInit()
+  },
+  create(){
+    this.pageInit()
+  },
+  methods: {
+    pageInit(){
+      // Loading Box (Preloader)
+      function handlePreloader() {
+        setTimeout(function (){
+          if ($('.preloader').length) {
+            $('.preloader').delay(200).fadeOut(500);
+          }
+        },500);
+      }
+
+
+      // Header Style and Scroll to Top
+      function headerStyle() {
+        if ($('.main-header').length) {
+          var windowpos = $(window).scrollTop();
+          var siteHeader = $('.main-header');
+          var scrollLink = $('.scroll-top');
+          if (windowpos >= 250) {
+            siteHeader.addClass('fixed-header');
+            scrollLink.fadeIn(300);
+          } else {
+            siteHeader.removeClass('fixed-header');
+            scrollLink.fadeOut(300);
+          }
+        }
+      }
+
+      headerStyle();
+
+      // dropdown menu
+
+      var mobileWidth = 991;
+      var navcollapse = $('.navigation li.dropdown');
+
+      $(window).on('resize', function () {
+        navcollapse.children('ul').hide();
+      });
+
+      navcollapse.hover(function () {
+        if ($(window).innerWidth() >= mobileWidth) {
+          $(this).children('ul').stop(true, false, true).slideToggle(300);
+          $(this).children('.megamenu').stop(true, false, true).slideToggle(300);
+        }
+      });
+
+
+      //Submenu Dropdown Toggle
+      if ($('.navigation li.dropdown ul').length) {
+        $('.navigation li.dropdown').append('<div class="dropdown-btn"><span class="fa fa-angle-right"></span></div>');
+
+        //Dropdown Button
+        $('.navigation li.dropdown .dropdown-btn').on('click', function () {
+          $(this).prev('ul').slideToggle(500);
+          $(this).prev('.megamenu').slideToggle(800);
+        });
+
+        //Disable dropdown parent link
+        $('.navigation li.dropdown > a').on('click', function (e) {
+          e.preventDefault();
+        });
+      }
+
+      //Submenu Dropdown Toggle
+      if ($('.main-header .main-menu').length) {
+        $('.main-header .main-menu .navbar-toggle').on('click', function () {
+          $(this).prev().prev().next().next().children('li.dropdown').hide();
+        });
+
+      }
+      // End Main menu
+
+      new WOW().init();
+
+      /* Fact Counter + Text Count */
+      if ($('.success-box').length) {
+        $('.success-box').appear(function () {
+
+          var $t = $(this),
+              n = $t.find(".count-text").attr("data-stop"),
+              r = parseInt($t.find(".count-text").attr("data-speed"), 10);
+
+          if (!$t.hasClass("counted")) {
+            $t.addClass("counted");
+            $({
+              countNum: $t.find(".count-text").text()
+            }).animate({
+              countNum: n
+            }, {
+              duration: r,
+              easing: "linear",
+              step: function () {
+                $t.find(".count-text").text(Math.floor(this.countNum));
+              },
+              complete: function () {
+                $t.find(".count-text").text(this.countNum);
+              }
+            });
+          }
+
+        }, {
+          accY: 0
+        });
+      }
+
+
+      /*========== Start Portfolio isotop Js ==========*/
+      // isotop
+      // init Isotope
+      var $grid = $('.custom-row').isotope({
+        itemSelector: '.grid-item',
+        percentPosition: true,
+        masonry: {
+          // use outer width of grid-sizer for columnWidth
+          columnWidth: 1,
+        }
+      });
+
+
+      // magnificPopup
+      if ($('.projects-popup-link').length) {
+        $('.projects-popup-link').magnificPopup({
+          type: 'image',
+          gallery: {
+            enabled: true
+          },
+        });
+      }
+
+
+      /*============================== start video element     ========================================*/
+
+      // magnificPopup start
+      $('.vedio-play').magnificPopup({
+        type: 'video',
+      });
+      // magnificPopup end
+
+
+      //service-carousel
+      if ($('.service-carousel').length) {
+        $('.service-carousel').owlCarousel({
+          loop: true,
+          items: 3,
+          margin: 20,
+          nav: false,
+          dots: true,
+          active: true,
+          dotsEach: 2,
+          smartSpeed: 1000,
+          autoplay: 5000,
+          responsive: {
+            0: {
+              items: 1,
+            },
+            575: {
+              items: 1,
+            },
+            768: {
+              items: 2,
+            },
+            992: {
+              items: 3,
+            },
+            1200: {
+              items: 3,
+            }
+          }
+        });
+      }
+
+
+      //team-carousel
+      if ($('.team-carousel').length) {
+        $('.team-carousel').owlCarousel({
+          loop: true,
+          items: 3,
+          margin: 20,
+          nav: true,
+          dots: false,
+          active: true,
+          dotsEach: 2,
+          smartSpeed: 1000,
+          autoplay: 5000,
+          navText: ['<span class="flaticon-left-arrow"></span>', '<span class="flaticon-right-arrow"></span>'],
+          responsive: {
+            0: {
+              items: 1,
+            },
+            575: {
+              items: 1,
+            },
+            768: {
+              items: 2,
+            },
+            992: {
+              items: 3,
+            },
+            1200: {
+              items: 3,
+            }
+          }
+        });
+      }
+
+
+      // Scroll to a Specific Div
+      if ($('.scroll-to-target').length) {
+        $(".scroll-to-target").on('click', function () {
+          var target = $(this).attr('data-target');
+          // animate
+          $('html, body').animate({
+            scrollTop: $(target).offset().top
+          }, 1000);
+
+        });
+      }
+
+
+      $('.testi-image-wrap').slick({
+        slidesToShow: 3,
+        slidesToScroll: 1,
+        asNavFor: '.testi-content-wrap',
+        dots: false,
+        focusOnSelect: true,
+        prevArrow: '<i class="flaticon-left-arrow left"></i>',
+        nextArrow: '<i class="flaticon-right-arrow right"></i>',
+        responsive: [
+          {
+            breakpoint: 500,
+            settings: {
+              slidesToShow: 1,
+            }
+          },
+        ]
+      });
+
+
+      $('.testi-content-wrap').slick({
+        asNavFor: '.testi-image-wrap',
+        slidesToShow: 1,
+        slidesToScroll: 1,
+        arrows: false,
+        fade: true,
+        dots: false,
+      });
+
+
+      $('.testimonial-two-wrap').slick({
+        slidesToShow: 1,
+        slidesToScroll: 1,
+        arrows: true,
+        fade: true,
+        dots: false,
+        autoplay: true,
+        prevArrow: '<i class="flaticon-left-arrow left"></i>',
+        nextArrow: '<i class="flaticon-right-arrow right"></i>',
+      });
+
+
+      /* ==========================================================================
+         When document is scroll, do
+         ========================================================================== */
+
+      $(window).on('scroll', function () {
+        headerStyle();
+      });
+
+      /* ==========================================================================
+         When document is loaded, do
+         ========================================================================== */
+
+      $(window).on('load', function () {
+        handlePreloader();
+
+        /*========== Start Portfolio isotop Js ==========*/
+        // isotop
+        // init Isotope
+        var $grid = $('.custom-row').isotope({
+          itemSelector: '.grid-item',
+          percentPosition: true,
+          masonry: {
+            // use outer width of grid-sizer for columnWidth
+            columnWidth: 1,
+          }
+        });
+
+      });
+
+    }
+  }
+}
+
+

@@ -26,4 +26,15 @@ const router = VueRouter.createRouter({
     routes
     routes
 });
 });
 
 
+
+router.beforeEach(async (to, from, next) => {
+    $('[top-nav]').removeClass('current');
+    $('[top-nav="'+to.name+'"]').addClass('current');
+    // 回到顶部
+    $('html, body').animate({
+        scrollTop: 0
+    }, 500);
+    next();
+})
+
 export default router
 export default router

 <section class="banner-section rel">
 <section class="banner-section rel">
     <div class="container">
     <div class="container">
         <h2 class="page-title">关于鸿果科技</h2>
         <h2 class="page-title">关于鸿果科技</h2>
-        <nav aria-label="breadcrumb">
+        <!--<nav aria-label="breadcrumb">
             <ol class="breadcrumb-list">
             <ol class="breadcrumb-list">
                 <li class="breadcrumb-item"><a href="index.html">Home</a></li>
                 <li class="breadcrumb-item"><a href="index.html">Home</a></li>
                 <li class="breadcrumb-item active" aria-current="page">About</li>
                 <li class="breadcrumb-item active" aria-current="page">About</li>
             </ol>
             </ol>
-        </nav>
+        </nav>-->
 
 
         <div class="shape shapeAnimationOne l-10 t-60">
         <div class="shape shapeAnimationOne l-10 t-60">
             <img src="assets/img/shapes/shape1.png" alt="Shape">
             <img src="assets/img/shapes/shape1.png" alt="Shape">

+import pageInit from "../../minixs/pageInit.js";
 export default {
 export default {
     name: 'home',
     name: 'home',
     template: '',
     template: '',
+    mixins:[pageInit],
     components: {},
     components: {},
     props: [],
     props: [],
     setup(props, {attrs, slots, emit}) {
     setup(props, {attrs, slots, emit}) {
@@ -23,295 +25,7 @@ export default {
             path:'assets/img/zzzs/5.jpg'
             path:'assets/img/zzzs/5.jpg'
         }];
         }];
 
 
-        Vue.onMounted(() =>{
-            // Loading Box (Preloader)
-            function handlePreloader() {
-                setTimeout(function (){
-                    if ($('.preloader').length) {
-                        $('.preloader').delay(200).fadeOut(500);
-                    }
-                },1000);
-            }
-
-
-            // Header Style and Scroll to Top
-            function headerStyle() {
-                if ($('.main-header').length) {
-                    var windowpos = $(window).scrollTop();
-                    var siteHeader = $('.main-header');
-                    var scrollLink = $('.scroll-top');
-                    if (windowpos >= 250) {
-                        siteHeader.addClass('fixed-header');
-                        scrollLink.fadeIn(300);
-                    } else {
-                        siteHeader.removeClass('fixed-header');
-                        scrollLink.fadeOut(300);
-                    }
-                }
-            }
-
-            headerStyle();
-
-            // dropdown menu
-
-            var mobileWidth = 991;
-            var navcollapse = $('.navigation li.dropdown');
-
-            $(window).on('resize', function () {
-                navcollapse.children('ul').hide();
-            });
-
-            navcollapse.hover(function () {
-                if ($(window).innerWidth() >= mobileWidth) {
-                    $(this).children('ul').stop(true, false, true).slideToggle(300);
-                    $(this).children('.megamenu').stop(true, false, true).slideToggle(300);
-                }
-            });
-
-
-            //Submenu Dropdown Toggle
-            if ($('.navigation li.dropdown ul').length) {
-                $('.navigation li.dropdown').append('<div class="dropdown-btn"><span class="fa fa-angle-right"></span></div>');
-
-                //Dropdown Button
-                $('.navigation li.dropdown .dropdown-btn').on('click', function () {
-                    $(this).prev('ul').slideToggle(500);
-                    $(this).prev('.megamenu').slideToggle(800);
-                });
-
-                //Disable dropdown parent link
-                $('.navigation li.dropdown > a').on('click', function (e) {
-                    e.preventDefault();
-                });
-            }
-
-            //Submenu Dropdown Toggle
-            if ($('.main-header .main-menu').length) {
-                $('.main-header .main-menu .navbar-toggle').on('click', function () {
-                    $(this).prev().prev().next().next().children('li.dropdown').hide();
-                });
-
-            }
-            // End Main menu
-
-            new WOW().init();
-
-            /* Fact Counter + Text Count */
-            if ($('.success-box').length) {
-                $('.success-box').appear(function () {
-
-                    var $t = $(this),
-                        n = $t.find(".count-text").attr("data-stop"),
-                        r = parseInt($t.find(".count-text").attr("data-speed"), 10);
-
-                    if (!$t.hasClass("counted")) {
-                        $t.addClass("counted");
-                        $({
-                            countNum: $t.find(".count-text").text()
-                        }).animate({
-                            countNum: n
-                        }, {
-                            duration: r,
-                            easing: "linear",
-                            step: function () {
-                                $t.find(".count-text").text(Math.floor(this.countNum));
-                            },
-                            complete: function () {
-                                $t.find(".count-text").text(this.countNum);
-                            }
-                        });
-                    }
-
-                }, {
-                    accY: 0
-                });
-            }
-
-
-            /*========== Start Portfolio isotop Js ==========*/
-            // isotop
-            // init Isotope
-            var $grid = $('.custom-row').isotope({
-                itemSelector: '.grid-item',
-                percentPosition: true,
-                masonry: {
-                    // use outer width of grid-sizer for columnWidth
-                    columnWidth: 1,
-                }
-            });
-
-
-            // magnificPopup
-            if ($('.projects-popup-link').length) {
-                $('.projects-popup-link').magnificPopup({
-                    type: 'image',
-                    gallery: {
-                        enabled: true
-                    },
-                });
-            }
-
-
-            /*============================== start video element     ========================================*/
-
-            // magnificPopup start
-            $('.vedio-play').magnificPopup({
-                type: 'video',
-            });
-            // magnificPopup end
-
-
-            //service-carousel
-            if ($('.service-carousel').length) {
-                $('.service-carousel').owlCarousel({
-                    loop: true,
-                    items: 3,
-                    margin: 20,
-                    nav: false,
-                    dots: true,
-                    active: true,
-                    dotsEach: 2,
-                    smartSpeed: 1000,
-                    autoplay: 5000,
-                    responsive: {
-                        0: {
-                            items: 1,
-                        },
-                        575: {
-                            items: 1,
-                        },
-                        768: {
-                            items: 2,
-                        },
-                        992: {
-                            items: 3,
-                        },
-                        1200: {
-                            items: 3,
-                        }
-                    }
-                });
-            }
-
-
-            //team-carousel
-            if ($('.team-carousel').length) {
-                $('.team-carousel').owlCarousel({
-                    loop: true,
-                    items: 3,
-                    margin: 20,
-                    nav: true,
-                    dots: false,
-                    active: true,
-                    dotsEach: 2,
-                    smartSpeed: 1000,
-                    autoplay: 5000,
-                    navText: ['<span class="flaticon-left-arrow"></span>', '<span class="flaticon-right-arrow"></span>'],
-                    responsive: {
-                        0: {
-                            items: 1,
-                        },
-                        575: {
-                            items: 1,
-                        },
-                        768: {
-                            items: 2,
-                        },
-                        992: {
-                            items: 3,
-                        },
-                        1200: {
-                            items: 3,
-                        }
-                    }
-                });
-            }
-
-
-            // Scroll to a Specific Div
-            if ($('.scroll-to-target').length) {
-                $(".scroll-to-target").on('click', function () {
-                    var target = $(this).attr('data-target');
-                    // animate
-                    $('html, body').animate({
-                        scrollTop: $(target).offset().top
-                    }, 1000);
-
-                });
-            }
-
-
-            $('.testi-image-wrap').slick({
-                slidesToShow: 3,
-                slidesToScroll: 1,
-                asNavFor: '.testi-content-wrap',
-                dots: false,
-                focusOnSelect: true,
-                prevArrow: '<i class="flaticon-left-arrow left"></i>',
-                nextArrow: '<i class="flaticon-right-arrow right"></i>',
-                responsive: [
-                    {
-                        breakpoint: 500,
-                        settings: {
-                            slidesToShow: 1,
-                        }
-                    },
-                ]
-            });
-
-
-            $('.testi-content-wrap').slick({
-                asNavFor: '.testi-image-wrap',
-                slidesToShow: 1,
-                slidesToScroll: 1,
-                arrows: false,
-                fade: true,
-                dots: false,
-            });
-
-
-            $('.testimonial-two-wrap').slick({
-                slidesToShow: 1,
-                slidesToScroll: 1,
-                arrows: true,
-                fade: true,
-                dots: false,
-                autoplay: true,
-                prevArrow: '<i class="flaticon-left-arrow left"></i>',
-                nextArrow: '<i class="flaticon-right-arrow right"></i>',
-            });
-
-
-            /* ==========================================================================
-               When document is scroll, do
-               ========================================================================== */
-
-            $(window).on('scroll', function () {
-                headerStyle();
-            });
-
-            /* ==========================================================================
-               When document is loaded, do
-               ========================================================================== */
-
-            $(window).on('load', function () {
-                handlePreloader();
-
-                /*========== Start Portfolio isotop Js ==========*/
-                // isotop
-                // init Isotope
-                var $grid = $('.custom-row').isotope({
-                    itemSelector: '.grid-item',
-                    percentPosition: true,
-                    masonry: {
-                        // use outer width of grid-sizer for columnWidth
-                        columnWidth: 1,
-                    }
-                });
-
-
-            });
-        })
+        Vue.onMounted(() =>{})
 
 
 
 
         return {
         return {

-<div>
+<section class="hero-section rel  rpt-150 pb-130 rpb-0">
+    <div class="shape shapeAnimationOne l-10 t-60">
+        <img src="assets/img/shapes/shape1.png" alt="Shape">
+    </div>
+    <div class="shape shapeAnimationTwo l-70 t-60">
+        <img src="assets/img/shapes/shape2.png" alt="Shape">
+    </div>
+    <div class="shape shapeAnimationThree l-50 t-100">
+        <img src="assets/img/shapes/shape3.png" alt="Shape">
+    </div>
+</section>
 
 
 
 
+<section class="concat-top rel rpt-150 pb-130 rpb-0 text-left ">
+    <h1 class="color-white mb-2">加入鸿果，成为你想成为的人</h1>
+    <h2 class="color-white mb-2">齐心协力、积极乐观、共同发展、团队共赢！</h2>
+    <h4 class="color-white mb-2">具备足够的勇气及长远的眼光，大家携手一起，齐心协力，积极乐观，超共同的目标前进实现共同发展及利益最大化</h4>
+</section>
 
 
-    contact
+<section class="sps-one pt-120 mb-70 rmb-100">
+    <div class="container">
+        <div class="row align-items-center">
+            <div class="col-lg-6 order-lg-2">
+                <div class="service-right-content mt-50 ml-50 rml-0 rmb-50 wow customFadeInRight delay-0-1s slow">
+                    <div class="section-title style-three mb-15">
+                        <span class="sub-title">成功靠大家努力</span>
+                    </div>
+                    <p>成功的花,人们只惊羡它现时的明艳，然而当初它的芽儿，却浸透了奋斗者的泪泉，洒满了牺牲的血雨——冰心。成功不简单，坚持下去，就是胜利！向着美好的明天，迈进吧！</p>
 
 
+                </div>
+            </div>
+            <div class="col-lg-6">
+                <div class="service-left-image wow customFadeInLeft delay-0-1s slow">
+                    <img style="border-radius: 25px" src="assets/img/concat/s1.JPG" alt="Service image">
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
 
 
-</div>
+
+<section class="sps-two mb-50 rmb-100">
+    <div class="container">
+        <div class="row align-items-center">
+            <div class="col-lg-6">
+                <div class="service-left-content mr-50 rmr-0 rmb-50 wow customFadeInLeft delay-0-1s slow">
+                    <div class="section-title style-three mb-15">
+                        <span class="sub-title">在美好的环境中工作并创新</span>
+                    </div>
+                    <p>在团队活动中释放个性</p>
+                </div>
+            </div>
+            <div class="col-lg-6">
+                <div class="service-right-image wow customFadeInRight delay-0-1s slow">
+                    <img style="border-radius: 25px" src="assets/img/concat/s2.jpg" alt="Service image">
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+
+
+<section class="sps-three mb-50 rmb-100">
+
+    <div class="container">
+        <div class="row align-items-center">
+            <div class="col-lg-6 order-lg-2">
+                <div class="service-right-content ml-50 rml-0 rmb-50 wow customFadeInRight delay-0-1s slow">
+                    <div class="section-title style-three mb-15">
+                        <span class="sub-title">在美好的环境中工作并创新</span>
+                    </div>
+                    <p>团队是什么？</p>
+                    <p>由一小群人组成，有着相同的目标，为实现目标负有相同的责任。</p>
+                </div>
+            </div>
+            <div class="col-lg-6">
+                <div class="service-left-image wow customFadeInLeft delay-0-1s slow">
+                    <img style="border-radius: 25px" src="assets/img/concat/s3.jpg" alt="Service image">
+                </div>
+            </div>
+        </div>
+    </div>
+</section>

+import pageInit from "../../minixs/pageInit.js";
 export default {
 export default {
     name: 'home',
     name: 'home',
     template: '',
     template: '',
+    mixins:[pageInit],
     components: {},
     components: {},
     props: [],
     props: [],
     setup(props, {attrs, slots, emit}) {
     setup(props, {attrs, slots, emit}) {

+import pageInit from "../../minixs/pageInit.js";
 export default {
 export default {
     name: 'home',
     name: 'home',
     template: '',
     template: '',
+    mixins:[pageInit],
     components: {},
     components: {},
     props: [],
     props: [],
     setup(props, {attrs, slots, emit}) {
     setup(props, {attrs, slots, emit}) {
@@ -90,47 +92,8 @@ export default {
         ])
         ])
 
 
         // 挂载完
         // 挂载完
-        Vue.onMounted(() => {
-            $('.team-carousel').owlCarousel({
-                loop:true,
-                items: 1,
-                margin: 20,
-                nav: false,
-                dots: false,
-                active: true,
-                dotsEach: 2,
-                smartSpeed: 1000,
-                autoplay: 5000,
-                // navText: ['<span class="flaticon-left-arrow"></span>', '<span class="flaticon-right-arrow"></span>'],
-                // dotsData: ['<span class="flaticon-left-arrow"></span>', '<span class="flaticon-right-arrow"></span>'],
-                responsive: {
-                   /* 0: {
-                        items: 1,
-                    },
-                    575: {
-                        items: 1,
-                    },
-                    768: {
-                        items: 2,
-                    },
-                    992: {
-                        items: 3,
-                    },
-                    1200: {
-                        items: 3,
-                    }*/
-                }
-            });
-            //lsq 导航高亮样式对应路由
-            let hashUr=location.hash;
-            let href=$('.navigation li a').attr('href');
-            $('.navigation li').unbind('click.li').on('click.li',function (){
-                if(hashUr==href){
-                    $('.navigation li').removeClass('current');
-                    $(this).addClass('current')
-                }
-            })
-        })
+        Vue.onMounted(() => {})
+
         return{
         return{
             isHover,
             isHover,
             tooltipHover,
             tooltipHover,

@@ -142,6 +142,12 @@
                         <span class="sub-title">综合日志智能分析平台</span>
                         <span class="sub-title">综合日志智能分析平台</span>
                     </div>
                     </div>
                     <p>通过对日志的采集、存储、备份、查询、告警分析和报表统计功能，实现海量日志管理。</p>
                     <p>通过对日志的采集、存储、备份、查询、告警分析和报表统计功能，实现海量日志管理。</p>
+                    <ol>
+                        <li style="color: #0b2e13">■ 告警消息统一在平台管理</li>
+                        <li style="color: #0b2e13">■ 基于智能算法对告警消息压缩合并</li>
+                        <li style="color: #0b2e13">■ 支持阈值、同环比、预测异常检测</li>
+                        <li style="color: #0b2e13">■ 自动故障修复</li>
+                    </ol>
                 </div>
                 </div>
             </div>
             </div>
             <div class="col-lg-6">
             <div class="col-lg-6">
@@ -153,11 +159,12 @@
     </div>
     </div>
 </section>
 </section>
 
 
-<section class="sps-one mb-70 rmb-100">
+
+<section class="sps-two mb-50 rmb-100">
     <div class="container">
     <div class="container">
         <div class="row align-items-center">
         <div class="row align-items-center">
-            <div class="col-lg-6 order-lg-2">
-                <div class="service-right-content mt-50 ml-50 rml-0 rmb-50 wow customFadeInRight delay-0-1s slow">
+            <div class="col-lg-6">
+                <div class="service-left-content mr-50 rmr-0 rmb-50 wow customFadeInLeft delay-0-1s slow">
                     <div class="section-title style-three mb-15">
                     <div class="section-title style-three mb-15">
                         <span class="sub-title">信息化协同管理支撑平台</span>
                         <span class="sub-title">信息化协同管理支撑平台</span>
                     </div>
                     </div>
@@ -173,20 +180,20 @@
                 </div>
                 </div>
             </div>
             </div>
             <div class="col-lg-6">
             <div class="col-lg-6">
-                <div class="service-left-image wow customFadeInLeft delay-0-1s slow">
-                    <img src="assets/img/services/s1.png" alt="Service image">
+                <div class="service-right-image wow customFadeInRight delay-0-1s slow">
+                    <img src="assets/img/services/s2.png" alt="Service image">
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
 </section>
 </section>
 
 
-
-<section class="sps-two mb-50 rmb-100">
+<section class="sps-one mb-70 rmb-100">
     <div class="container">
     <div class="container">
         <div class="row align-items-center">
         <div class="row align-items-center">
-            <div class="col-lg-6">
-                <div class="service-left-content mr-50 rmr-0 rmb-50 wow customFadeInLeft delay-0-1s slow">
+            <div class="col-lg-6 order-lg-2">
+                <div class="service-right-content mt-50 ml-50 rml-0 rmb-50 wow customFadeInRight delay-0-1s slow">
+
                     <div class="section-title style-three mb-15">
                     <div class="section-title style-three mb-15">
                         <span class="sub-title">运维一体机</span>
                         <span class="sub-title">运维一体机</span>
                     </div>
                     </div>
@@ -200,10 +207,13 @@
                 </div>
                 </div>
             </div>
             </div>
             <div class="col-lg-6">
             <div class="col-lg-6">
-                <div class="service-right-image wow customFadeInRight delay-0-1s slow">
-                    <img src="assets/img/services/s2.png" alt="Service image">
+                <div class="service-left-image wow customFadeInLeft delay-0-1s slow">
+                    <img src="assets/img/services/s1.png" alt="Service image">
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
 </section>
 </section>
+
+
+

+import pageInit from "../../minixs/pageInit.js";
 export default {
 export default {
     name: 'services',
     name: 'services',
     template: '',
     template: '',
+    mixins:[pageInit],
     components: {},
     components: {},
     props: [],
     props: [],
     setup(props, {attrs, slots, emit}) {
     setup(props, {attrs, slots, emit}) {