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

…eb into master-500-dev-lushangqing Conflicts: website/assets/css/style.css

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…
…eb into master-500-dev-lushangqing Conflicts: website/assets/css/style.css
鲁尚清
Commit b67588462e7cc018e344af5d870bd71586218251 2 parents a07e8046 858f2b1f
Showing 7 changed files with 98 additions and 38 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
hg-monitor-web-base/src/main/resources/static/src/index.js
hg-monitor-web-base/src/main/resources/static/src/lib/view.js
hg-monitor-web-base/src/main/resources/static/src/pageTips.js
website/assets/css/style.css
website/src/views/concat/index.html
website/src/views/concat/index.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
View file @b675884
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonDetail.js
View file @b675884
@@ -119,6 +119,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
             admin.req({
                 url: common.domainName + url
             }).done(function (res) {
+                var editFlag = localStorage.getItem("editFlag");//是否编辑状态
                 var flags = "";
                 var kpiIdList = "";
                 if (res.data && res.data.length > 0) {
@@ -172,6 +173,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         '</a>'
                     var menuId = "";
                     if (v.id == 'KPIE13DD9A3' || v.id == 'KPI02786E8D' || status != -1) {
+                        if (editFlag == 'true' && v.id == 'KPIE13DD9A3'){
+                            v.name += '<div class="layui-form" style="float: left;height: 30px;width: 30px;padding-left: 10px">' +
+                                '<input style="" lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" data-unit="" ' +
+                                'data-id="' + v.id + '" data-kpiname="' + v.name + '" data-flag="' + v.flag + '" data-name=' + v.name + '></div>';
+                        }
                         v.name = v.name + tips;
                         menuId = "id=\"" + targetId + "_detail_row_menu\"  class='statusMenu'";
                     }
@@ -182,7 +188,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         + $html + valueStr + '</span></li>'
                 });
                 $("#" + targetId).html(li);
-                fn && fn();
+                form.render('checkbox');
+                getCheckedBoxData();
+                fn && fn()
                 //初始化监听告警压制需要的数据
                 if (!statusF) {
@@ -2147,7 +2155,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                                         //拼接表空间名称、文件系统名称等等,如果是性能指标或者趋势指标，则可以下探  徐毫杰还原
                                         if (value.kpiIdent == '1' || value.isWarning == '1' || status != -1) {
                                             var chbox = '';
-                                            if (editFlag && editFlag == "true" && value.kpiIdent == '1') {
+                                            if (editFlag && editFlag == "true" && (value.kpiIdent == '1' || value.kpiId=='KPIFA92AF2D' || value.kpiId=='KPIBD006E36')) {
                                                 chbox = '<input lay-filter="kpicheckboxfilter" type="checkbox" lay-skin="primary" name="identKpiCheckbox" ' +
                                                     'data-id="' + v.id + '" data-kpiname="' + v.name + '" data-flag="' + value.flag + '" data-name="' + kpiname + '" data-unit="' + v.unit + '">';
                                             }
--- a/hg-monitor-web-base/src/main/resources/static/src/index.js
View file @b675884
+++ b/hg-monitor-web-base/src/main/resources/static/src/index.js
View file @b675884
@@ -665,10 +665,10 @@ layui.extend({
                                 },
                                 error:(error)=>{
                                     console.error("检查登录状态：",error)
-                                    // if(error.status === 401){
-                                    //     window.top.location.reload();
-                                    //     return;
-                                    // }
+                                    if(error.status === 401){
+                                        window.top.location.reload();
+                                        return;
+                                    }
                                     tryIndex = 1;
                                     // 服务异常：服务重启，网络问题等不可访问等因素
                                     tryFunc();
--- a/hg-monitor-web-base/src/main/resources/static/src/lib/view.js
View file @b675884
+++ b/hg-monitor-web-base/src/main/resources/static/src/lib/view.js
View file @b675884
@@ -263,9 +263,10 @@ layui.define(['laytpl', 'layer'], function (exports) {
                 view.removeLoad();
                 if (that.render.isError) {
-                    return view.error('请求视图文件异常，状态：' + e.status);
+                    return view.error('请求视图文件异常，请刷新浏览器');
                 }
-
+                // render中报错，防止出现死循环
+                that.render.isError = true;
                 if (e.status === 404) {
                     if (!localStorage.getItem('access_token')) {
                         layer.msg("登录凭证失效，请重新登录验证！", {
@@ -280,7 +281,7 @@ layui.define(['laytpl', 'layer'], function (exports) {
                     that.render('template/tips/error');
                 }
-                that.render.isError = true;
+
             }
         });
         return that;
--- a/hg-monitor-web-base/src/main/resources/static/src/pageTips.js
View file @b675884
+++ b/hg-monitor-web-base/src/main/resources/static/src/pageTips.js
View file @b675884
@@ -24,6 +24,14 @@ layui.define(['element', 'admin', 'view'], function (exports) {
          * hash变更
          */
         hashChane: function () {
+
+            var that = this;
+
+            window.onload = function (){
+                // 绑定事件
+                that.bindElemClickEvent();
+            }
+
             // debugger
             var hash = window.top.location.hash;
             sessionStorage.setItem("pagePath", hash);
@@ -82,14 +90,6 @@ layui.define(['element', 'admin', 'view'], function (exports) {
         },
         ajaxSetupInit: function () {
-            let that = this;
-            setTimeout(function () {
-                // 绑定菜单点击事件
-                that.bindMenuClickEvent();
-                // 绑定元素点击事件
-                that.bindElemClickEvent();
-                console.log("日志事件注册完成！")
-            }, 500)
             // sessionStorage.setItem("batchNo", "");
             // sessionStorage.setItem("groupId", "");
@@ -145,13 +145,13 @@ layui.define(['element', 'admin', 'view'], function (exports) {
             var that = this;
             // 绑定菜单事件
-            // setTimeout(function () {
-            //     // 绑定菜单点击事件
-            //     that.bindMenuClickEvent();
-            //     // 绑定元素点击事件
-            //     that.bindElemClickEvent();
-            //     console.log("日志事件注册完成！")
-            // }, 500)
+            setTimeout(function () {
+                // 绑定菜单点击事件
+                that.bindMenuClickEvent();
+                // 绑定元素点击事件
+                that.bindElemClickEvent();
+                // console.log("日志事件注册完成！")
+            }, 500)
             //lsq给带有title的元素绑定点击事件复制元素内容 2022-09-05
             that.copyTitle();
@@ -290,6 +290,10 @@ layui.define(['element', 'admin', 'view'], function (exports) {
             }
             //菜单点击传入属性lay-href的值，普通元素传入当前页面路由
             if (flg) {
+                // 清空按钮名称
+                sessionStorage.setItem("buttonPath", "");
+                sessionStorage.setItem("buttonName", "");
+
                 //that.sendAjaxData(layHref, text)
                 sessionStorage.setItem("menuName", text);
                 sessionStorage.setItem("menuPath", layHref);
@@ -312,7 +316,6 @@ layui.define(['element', 'admin', 'view'], function (exports) {
          */
         clickEventHandle(thisObj, key) {
             let that = this;
-// debugger
             sessionStorage.setItem("groupId",window.generateUUID().replace(/-/g, ""));
             let layHref = thisObj.attr('lay-href') ? thisObj.attr('lay-href') : '';
@@ -357,12 +360,12 @@ layui.define(['element', 'admin', 'view'], function (exports) {
                 //     }))
                 // }
                 setTimeout(function (){
-                    console.log(`${item}元素点击事件绑定完成！`)
+                    // console.log(`${item}元素点击事件绑定完成！`)
                     $(item).unbind('click.handle').on('click.handle', (function (e) {
                         e.preventDefault();
                         that.clickEventHandle($(this), item)
                     }))
-                },300)
+                },500)
             })
         },
         /**
@@ -425,7 +428,7 @@ layui.define(['element', 'admin', 'view'], function (exports) {
                         if (val.indexOf('el::') != -1) {
                             let elName = val.replace('el::', '');
                             bindContextEvent(elName, 0);
-                            console.log(`${elName}元素右键提示绑定完成！`)
+                            // console.log(`${elName}元素右键提示绑定完成！`)
                         }
                     })
                 }, 300)
--- a/website/assets/css/style.css
View file @b675884
+++ b/website/assets/css/style.css
View file @b675884
@@ -2311,7 +2311,6 @@ blockquote:before {
     font-size: 36px;
     color:#333333;
     line-height: normal;
-    font-family: 'MicrosoftYaHei-Bold';
 }
 .title-intro{
     font-size: 18px;
@@ -2446,6 +2445,25 @@ blockquote:before {
     font-size: 14px;
     color: #8C8C8C;
 }
+/*加入我们 底部*/
+.weFooter{
+    width: 100%;
+    background: #F3F3F3;
+    padding: 20px 0;
+}
+.weFooterColor{
+    color: #ADADAD;
+}
+.weFooterList{
+    display: grid;
+    grid-auto-columns: 15% 25% 25% 35%;
+    grid-auto-rows: 50% 50%;
+    grid-template-areas: "header header header header"
+                          "header header header header";
+}
+.mainContent h5{
+    color: #686868;
+}
 /*lsq 了解鸿果样式调整*/
 .know-intro{
     position: absolute;
@@ -2508,7 +2526,7 @@ blockquote:before {
     flex-flow: column;
 }
 .cultural-con-item{
-   color:#333;
+    color:#333;
     font-size: 18px;
     padding:20px;
 }
--- a/website/src/views/concat/index.html
View file @b675884
+++ b/website/src/views/concat/index.html
View file @b675884
@@ -89,15 +89,34 @@
 </section>
-<section class="services-section rel text-center mt-100 mb-80">
-    <div class="container">
+<!--<section class="services-section rel text-center mt-100 mb-80">-->
+<!--    <div class="container">-->
+<!--        <div class="row">-->
+<!--            <div class="col-lg-12 col-md-12">-->
+<!--                &lt;!&ndash; <h4><a href="#">合作流程</a></h4>-->
+<!--                 <p>专业技术顾问，提供一对一服务</p>&ndash;&gt;-->
+<!--                <div class="service-icon mb-25">-->
+<!--                    <img src="assets/img/concat/gw.png">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</section>-->
+<section class="weFooter sps-three">
+    <div class="mainContent container">
         <div class="row">
-            <div class="col-lg-12 col-md-12">
-                <!-- <h4><a href="#">合作流程</a></h4>
-                 <p>专业技术顾问，提供一对一服务</p>-->
-                <div class="service-icon mb-25">
-                    <img src="assets/img/concat/gw.png">
-                </div>
+            <div class="col-lg-8 col-md-12">
+                <h5>加入鸿果</h5>
+                <span class="mb-15 weFooterColor">鸿果科技依托"金税三期"、"互联网+智能化AI+行业应用"的变革时机，充分运用智能化、运维大数据思维，引入AI、算法和业务深度理解，共同打造AIOps生态圈</span>
+                <h5 class="mt-25 mb-15">热门职位</h5>
+                <ul class="weFooterList">
+                    <li class="weFooterColor cursor-pointer mb-15" v-for="(item,index) in recruitHot.data" :key="index">
+                        <span @click="routerPath(item.url)" class="border-bottom">{{item.text}}</span>
+                    </li>
+                </ul>
+            </div>
+            <div class="col-lg-2 col-sm-12 ml-auto">
+                <span @click="routerPath('sale')" class="btn btn-danger d-inline-block min-width-100">查看更多职位</span>
             </div>
         </div>
     </div>
--- a/website/src/views/concat/index.js
View file @b675884
+++ b/website/src/views/concat/index.js
View file @b675884
 import pageInit from "../../minixs/pageInit.js";
+import {recruit} from "./../../../assets/img/data/serviceSecond.js"
 export default {
     name: 'home',
     template: '',
@@ -6,7 +7,17 @@ export default {
     components: {},
     props: [],
     setup(props, {attrs, slots, emit}) {
+        const {proxy} = Vue.getCurrentInstance()
+        let recruitHot = Vue.ref();
+        recruitHot.value = recruit().hot;
+        let routerPath=(val)=>{
+            proxy.$router.push('/recruit/'+val)
+        }
+        return{
+            recruitHot,
+            routerPath
+        }
     }
 }