diff --git a/img/operEnvironment/cjjc.png b/img/operEnvironment/cjjc.png new file mode 100644 index 0000000..86dace0 Binary files /dev/null and b/img/operEnvironment/cjjc.png differ diff --git a/js/consQuality/consQuality.js b/js/consQuality/consQuality.js index 2a05905..9d04b04 100644 --- a/js/consQuality/consQuality.js +++ b/js/consQuality/consQuality.js @@ -59,7 +59,7 @@ layui.use(['layer', 'element', 'table'], function () { ConstructionQualityList(); //检测记录对比 - detectionRecord('',''); + detectionRecord('','A'); //质量检测 qualityInspectionApi(); @@ -385,10 +385,10 @@ function detectionRecord(button,construction){ } console.log(construction) console.log(construction=='table') - if(construction=='table'){ + if(construction=='A' || construction=='B' || construction=='C'){ $(".echarts-div").css("display","none"); $("#data-table-div").css("display","block"); - getDataTable(); + getDataTable(construction); }else{ $(".echarts-div").css("display","block"); $("#data-table-div").css("display","none"); @@ -398,7 +398,7 @@ function detectionRecord(button,construction){ } //施工质量列表 -function getDataTable(){ +function getDataTable(type){ const url = commonUrl + "screen/largeScreen/constructionQuality/getDevDataList"; table.render({ elem: '#data-table', @@ -413,6 +413,7 @@ function getDataTable(){ orgId: orgId, userId: userId, bidCode: bidCode, + type:type }, cols: [[ {field: 'number', width:80,title: '序号', align: 'center', type: 'numbers', fixed: 'left'}, @@ -440,6 +441,76 @@ function getDataTable(){ }) } + +//施工质量列表 +function getDataTable(type){ + const url = commonUrl + "screen/largeScreen/constructionQuality/getDevDataList"; + let cols; + if(type=='A'){ + cols= [[ + {field: 'number', width:80,title: '序号', align: 'center', type: 'numbers', fixed: 'left'}, + {field: 'name', align: 'center', title: '区域名称'}, + {field: 'bidName', align: 'center', title: '工程名称'}, + {field: 'val', align: 'center', title: '本次沉降'}, + {field: 'hisVal', align: 'center', title: '累计沉降'}, + {field: 'createTime', align: 'center', title: '检测时间'}, + {field: 'jcUser', align: 'center', title: '检测人'}, + {field: 'jhUser', align: 'center', title: '校核人'}, + {field: 'devCode', align: 'center', title: '仪器型号计量编号'} + ]]; + } else if(type=='B' ){ + cols= [[ + {field: 'number', width:80,title: '序号', align: 'center', type: 'numbers', fixed: 'left'}, + {field: 'bidName', align: 'center', title: '工程名称'}, + {field: 'local', align: 'center', title: '检测位置'}, + {field: 'name', align: 'center', title: '检测点名称'}, + {field: 'jcUser', align: 'center', title: '检测人'}, + {field: 'val', align: 'center', title: '是否合格'}, + {field: 'createTime', align: 'center', title: '检测时间'}, + ]]; + } else if(type=='C' ){ + cols= [[ + {field: 'number', width:80,title: '序号', align: 'center', type: 'numbers', fixed: 'left'}, + {field: 'bidName', align: 'center', title: '工程名称'}, + {field: 'local', align: 'center', title: '检测面'}, + {field: 'name', align: 'center', title: '测点名称'}, + {field: 'jcUser', align: 'center', title: '检测人'}, + {field: 'val', align: 'center', title: '是否合格'}, + {field: 'createTime', align: 'center', title: '检测时间'}, + ]]; + } + + table.render({ + elem: '#data-table', + url: url, + skin: 'line', + headers:{ + decrypt:"decrypt", + "Authorization":token + }, + where: { + roleCode: roleCode, + orgId: orgId, + userId: userId, + bidCode: bidCode, + type:type + }, + cols: cols, + initComplete: function () { + // 在表格渲染完成后，重新渲染序号列 + var that = this.elem.next(); + var tool = that.children('.layui-table-box').children('.layui-table-fixed').children('.layui-table-body').children('.layui-table'); + tool.find("tr").each(function (index, item) { + $(this).find('td[data-field="LAY_TABLE_INDEX"]').text(index + 1); + }); + }, + page: true, //开启分页 + loading: true, //数据加载中。。。 + limits: [5, 10, 20, 100], + limit: 7 + }) +} + //查询echars function getDetectionRecord(params){ const url = commonUrl + "screen/largeScreen/constructionQuality/detectionRecord"; diff --git a/pages/consQuality/consQuality.html b/pages/consQuality/consQuality.html index 5c3f351..d568b10 100644 --- a/pages/consQuality/consQuality.html +++ b/pages/consQuality/consQuality.html @@ -78,10 +78,12 @@
-
沉降点记录
-
桩基成孔
-
地面压实
-
大体积混凝土温控检测
+
沉降点记录
+
平整度检测记录
+
焊缝检测记录
+ + +
diff --git a/pages/operEnvironment/operEnvironment.html b/pages/operEnvironment/operEnvironment.html index b2d5d4c..642b8b5 100644 --- a/pages/operEnvironment/operEnvironment.html +++ b/pages/operEnvironment/operEnvironment.html @@ -85,7 +85,7 @@
-
+
diff --git a/pages/safetyHat/index.html b/pages/safetyHat/index.html index d0f0d98..5c4a114 100644 --- a/pages/safetyHat/index.html +++ b/pages/safetyHat/index.html @@ -2,7 +2,9 @@ + +
@@ -64,10 +68,33 @@ iframeUrl="https://caps.runde.pro/login#token="+json2.session_id+"&user_name="+user_name+"&target=home"; console.log(iframeUrl); document.getElementById("iframe").src=iframeUrl; - }else{ - + + var iframeDocument = document.getElementById('iframe').contentDocument || document.getElementById('iframe').contentWindow.document; + console.log("---------->"); + var elements = iframeDocument.getElementsByClassName('container-title'); + var elements2 = iframeDocument.getElementsByClassName('.container-title'); + // + setTimeout(onload, 8000); // 5秒后加载脚本 + console.log("---------->"); + console.log(elements); + console.log(elements2); + console.log(iframeDocument); + } + // window.onload = function() { + // var iframeDocument = window.document.getElementById('iframe').contentDocument || window.document.getElementById('iframe').contentWindow.document; + // var elements = iframeDocument.getElementsByClassName('title'); + // console.log("---------->ABCD"); + // console.log(elements); + // } + function onload(){ + var iframeDocument = document.getElementById('iframe').contentWindow; + console.log("---------->"); + var elements = iframeDocument.getElementsByClassName('container-title'); + var elements2 = iframeDocument.getElementsByClassName('.container-title'); + console.log("---------->"); + console.log(elements); + console.log(elements2); + console.log(iframeDocument); } - - diff --git a/pages/safetyHat/style.css b/pages/safetyHat/style.css new file mode 100644 index 0000000..9af31e6 --- /dev/null +++ b/pages/safetyHat/style.css @@ -0,0 +1,3 @@ +.container-title{ + display: none; +} \ No newline at end of file