Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【无】签名服务器及密码服务详情页迁移



See merge request !904

+layui.define(['commonDetail','common', 'admin'], function (exports) {
+    var $ = layui.$;
+    var commonDetail = layui.commonDetail;
+    var common = layui.common;
+    var admin = layui.admin;
+    //对外暴露的接口
+    exports('host_x86_password', function (data) {
+        var resId = '';
+        var resType = '';
+        var os = '';
+        var showFlag = common.getUrlParam("show");
+        if(showFlag  && showFlag == '0'){
+            resId = common.getUrlParam("resId");
+            resType = common.getUrlParam("resType");
+        }else{
+            resId = data.resId;
+            resType = data.resType;
+        }
+
+        //基本信息
+        var jbxxKpi = "KPIE13DD9A3,KPIF74D9D2B,KPI72E7FB4B";
+
+        renderPageInfo()
+
+        //渲染页面
+        function renderPageInfo() {
+            //资源状态
+            commonDetail.renderResHealth("x86password_health_state",resId);
+            //基本信息
+            commonDetail.renderText("x86password_baseinfo",resId,jbxxKpi);
+            //活动告警
+            commonDetail.renderActiveAlarms("x86password_active_alram",resId);
+        }
+
+        //定时任务
+        var timer = setInterval(function () {
+            renderPageInfo()
+        },commonDetail.timerTime);
+        commonDetail.detailTimer.push(timer);
+    });
+});
\ No newline at end of file

+<!--x86密码服务器和签名服务器详细页面-->
+<article class="page-container template">
+    <div class="page-panel">
+        <div class="main">
+            <div class="layui-card template_detail_content">
+                <div class="layui-card-body">
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">资源状态</h5>
+                            <div class="res-state" id="x86password_health_state"></div>
+                        </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">基本信息</h5>
+                            <ul class="info-table" id="x86password_baseinfo"></ul>
+                        </div>
+                    </div>
+                    <div class="lay-row">
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">实时告警动态</h5>
+                            <div id="x86password_active_alram"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</article>
+<textarea id="host_x86_password_param_id" style="display: none;">{{d}}</textarea>
+<script>
+    layui.use('host_x86_password', function (fn) {
+        var $ = layui.$;
+        var parm = $("#host_x86_password_param_id").val();
+        if(parm.indexOf('{{d') != -1){
+            fn();
+        }else{
+            fn(JSON.parse(parm));
+        }
+    });
+</script>
\ No newline at end of file

@@ -823,6 +823,10 @@ layui.define(['xmSelect', 'md5'], function (exports) {
             if (resType == 'DATABASE_ORACLE') {
                 resType = this.checkHasCluster(resType, resId);
             }
+            //密码服务器和签名服务器走相同页面
+            if (resType == 'HOST_X86_PASSWORD' || resType == 'HOST_X86_SIGN') {
+                resType = 'HOST_X86_PASSWORD';
+            }
 
             return "template/detail/" + resType.toLowerCase();
         },