工程安全分析

js/pages/newDataAnalysis/engineeringSafetyAnalysis.js

@@ -18,7 +18,7 @@ function initTable(bidCode,name) {
         id: 'demo2',
         skin: 'line',
         page: true,
-        height: 'full-400',
+        height: 'full-410',
         headers: {
             "decrypt": "decrypt",
             "Authorization": token
@@ -27,12 +27,6 @@ function initTable(bidCode,name) {
             bidCode: bidCode,
             name:name
         },
-        response: {
-            statusName: "code",
-            statusCode: 200,
-            countName: "count",
-            dataName: "rows",
-        },
         cols: [[
             { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列
             { field: 'proName', title: '工程名称', align: 'center', width: '10%' },
@@ -269,14 +263,43 @@ function initEchartsOne(data) {
         }
     });
 
-
     window.addEventListener("resize", function () {
         myChart.resize();
     });
 }
 
 function environmentalReadings() {
-    layer.open()
+    layer.open({
+        type: 2,
+        title: "监测点",
+        content: "environmentalReadings.html",
+        area: ["80%", "80%"],
+        shade: 0.3, // 遮罩透明度
+        skin: "custom-layer-style", // 自定义皮肤
+        success: function (layero, index) {
+            // 修改弹框背景颜色
+            $(layero).css(
+                "background",
+                "rgba(13, 34, 37, 0.9)"
+            ); // 半透明黑色背景
+            $(layero).find(".layui-layer-title").css({
+                color: "#fff", // 标题文字颜色
+                background: "transparent", // 标题背景透明
+                "border-bottom":
+                    "1px solid rgba(255, 255, 255, 0.2)", // 标题底部边框
+            });
+            $(layero).find(".layui-layer-content").css({
+                background: "transparent", // 内容区域透明
+            });
+
+            $(layero)
+                .find(".layui-layer-setwin .layui-layer-close")
+                .css({
+                    color: "#fff", // 文字颜色
+                    "border-color": "#fff", // 边框颜色（如果按钮有边框）
+                });
+        },
+    });
 }
 
 function initEchartsTwo(data) {
@@ -328,6 +351,51 @@ function initEchartsTwo(data) {
         ]
     }
     myChart2.setOption(riskOption, true)
+
+    // 添加点击事件监听器
+    myChart2.on('click', function (params) {
+        if (params.componentType === 'series') {
+            hiddenDanger()
+        }
+    });
+}
+
+function hiddenDanger() {
+    layer.open({
+        type: 2,
+        title: "监测点",
+        content: "hiddenDanger.html",
+        area: ["80%", "80%"],
+        shade: 0.3, // 遮罩透明度
+        skin: "custom-layer-style", // 自定义皮肤
+        success: function (layero, index) {
+            // 修改弹框背景颜色
+            $(layero).css(
+                "background",
+                "rgba(13, 34, 37, 0.9)"
+            ); // 半透明黑色背景
+            $(layero).find(".layui-layer-title").css({
+                color: "#fff", // 标题文字颜色
+                background: "transparent", // 标题背景透明
+                "border-bottom":
+                    "1px solid rgba(255, 255, 255, 0.2)", // 标题底部边框
+            });
+            $(layero).find(".layui-layer-content").css({
+                background: "transparent", // 内容区域透明
+            });
+
+            $(layero)
+                .find(".layui-layer-setwin .layui-layer-close")
+                .css({
+                    color: "#fff", // 文字颜色
+                    "border-color": "#fff", // 边框颜色（如果按钮有边框）
+                });
+            // 获取弹出层内容区域的高度
+            var contentHeight = $(layero).find('.layui-layer-content').height();
+            // 设置表格的高度
+            $('#dangerTable').css('height', contentHeight + 'px');
+        },
+    });
 }
 
 function handlDetails(analysisReason){

js/pages/newDataAnalysis/environmentalReadings.js

@@ -17,7 +17,6 @@ function initTable(bidCode,name) {
         id: 'demo2',
         skin: 'line',
         page: true,
-        height: 'full-400',
         headers: {
             "decrypt": "decrypt",
             "Authorization": token
@@ -26,12 +25,6 @@ function initTable(bidCode,name) {
             bidCode: bidCode,
             name:name
         },
-        response: {
-            statusName: "code",
-            statusCode: 200,
-            countName: "count",
-            dataName: "rows",
-        },
         cols: [[
             { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列
             { field: 'id', title: '监测点编号', align: 'center' },
@@ -57,6 +50,6 @@ function initTable(bidCode,name) {
 
 function query(type) {
     let name = $('#name').val();
-    let bidCode = parent.parent.$('#bidPro').val()
+    let bidCode = parent.parent.parent.$('#bidPro').val()
     initTable(bidCode,name);
 }

js/pages/newDataAnalysis/hiddenDanger.js

@@ -17,7 +17,7 @@ function initTable(bidCode,name) {
         id: 'demo2',
         skin: 'line',
         page: true,
-        height: 'full-400',
+        // height: 'full-400',
         headers: {
             "decrypt": "decrypt",
             "Authorization": token
@@ -26,12 +26,6 @@ function initTable(bidCode,name) {
             bidCode: bidCode,
             name:name
         },
-        response: {
-            statusName: "code",
-            statusCode: 200,
-            countName: "count",
-            dataName: "rows",
-        },
         cols: [[
             { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列
             { field: 'id', title: '隐患编号', align: 'center',},
@@ -55,6 +49,6 @@ function initTable(bidCode,name) {
 
 function query(type) {
     let name = $('#name').val();
-    let bidCode = parent.parent.$('#bidPro').val()
+    let bidCode = parent.parent.parent.$('#bidPro').val()
     initTable(bidCode,name);
 }

pages/newDataAnalysis/environmentalReadings.html

@@ -47,7 +47,9 @@
                 </div>
             </form>
         </div>
-        <table id="demo2" lay-filter="demo2"></table>
+        <div style="height:90%;width: 100%;">
+            <table id="demo2" lay-filter="demo2" ></table>
+        </div>
     </div>
 </div>
 </body>

pages/newDataAnalysis/hiddenDanger.html

@@ -32,10 +32,10 @@
 <body>
 <div style="height: 100%;width: 100%;">
     <div style="height: 99%;width: 100%; margin-top: 1%">
-        <div class="basic-search-box layout">
+        <div class="basic-search-box layout" >
             <form class="layui-form basic-form layout" onclick="return false;" onsubmit="return false;">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
+                <div class="layui-form-item" >
+                    <div class="layui-inline" >
                         <label class="layui-form-label" style="width: 80px;">隐患编号:</label>
                         <div class="layui-input-inline">
                             <input type="text" id="name" class="layui-input" autocomplete="off">
@@ -47,7 +47,9 @@
                 </div>
             </form>
         </div>
-        <table id="demo2" lay-filter="demo2"></table>
+        <div style="height:90%;width: 100%;">
+            <table id="demo2" lay-filter="demo2" ></table>
+        </div>
     </div>
 </div>
 </body>