Skip to content

桩
桩基检测
Commit d5e57c17 authored by 陈珊's avatar 陈珊
Browse files
Options

钢筋检测

parent bbc85bfb
Show whitespace changes
Inline Side-by-side
Showing with 227 additions and 82 deletions
static/css/dist/gjjc.css
View file @ d5e57c17
......@@ -648,72 +648,108 @@
.popup-info .main .right-item .info-item {
height: calc(100% - 1.01rem);
background: #0D3177;
overflow: auto;
}
.popup-info .main .right-item .info-item::-webkit-scrollbar {
width: 10px;
height: 10px;
}
.popup-info .main .right-item .info-item::-webkit-scrollbar-thumb {
background: rgba(0, 0, 0, 0.4);
border-radius: 8px;
}
.popup-info .main .right-item .info-item::-webkit-scrollbar-track {
background: rgba(42, 93, 197, 0.3);
border-radius: 8px;
}
.popup-info .main .right-item .info-item .desc {
height: .5rem;
display: flex;
align-items: center;
justify-content: space-between;
font-size: .18rem;
color: #fff;
padding: 0 .2rem;
background: #0D3177;
border-bottom: .01rem solid #1E499B;
}
.popup-info .main .right-item .info-item .desc p {
width: 50%;
}
.popup-info .main .right-item .info-item .bw-item {
height: calc(100% - .9rem);
border: 0.01rem solid rgba(68, 109, 193, 0.8);
border-width: .01rem 0;
overflow: auto;
padding: 0 .1rem .2rem;
}
.popup-info .main .right-item .info-item .bw-item::-webkit-scrollbar {
width: 10px;
height: 10px;
.popup-info .main .right-item .info-item .bw-item .main-item .name {
color: #3FD9FF;
font-size: .18rem;
padding-bottom: .1rem;
}
.popup-info .main .right-item .info-item .bw-item::-webkit-scrollbar-thumb {
background: rgba(0, 0, 0, 0.4);
border-radius: 8px;
.popup-info .main .right-item .info-item .bw-item .main-item .sub-item {
display: flow-root;
}
.popup-info .main .right-item .info-item .bw-item::-webkit-scrollbar-track {
background: rgba(42, 93, 197, 0.3);
border-radius: 8px;
.popup-info .main .right-item .info-item .bw-item .main-item .sub-item .card {
width: calc(50% - 0.1rem);
margin: 0.03rem 0.04rem 0.03rem;
font-size: .16rem;
background: #0D3177;
float: left;
color: #C0D3E6;
padding: 0 .05rem;
}
.popup-info .main .right-item .info-item .bw-item .item {
position: relative;
background: #0D3177;
border: .01rem solid #90A1B1;
.popup-info .main .right-item .info-item .bw-item .main-item .sub-item .card .sub-name {
display: flex;
align-items: center;
justify-content: space-between;
padding: .12rem .15rem;
}
.popup-info .main .right-item .info-item .bw-item .main-item .sub-item .card .sub-name div:first-child {
color: #3FD9FF;
}
.popup-info .main .right-item .info-item .bw-item .main-item .sub-item .card .value-item {
display: flex;
}
.popup-info .main .right-item .info-item .bw-item .main-item .sub-item .card .value-item .sub-value {
width: calc(33.33% - .1rem);
margin: 0 .05rem .12rem;
font-size: .18rem;
color: #C0D3E6;
height: .8rem;
width: calc(25% - .2rem);
margin: .2rem .1rem 0;
}
.popup-info .main .right-item .info-item .bw-item .main-item .sub-item .card .value-item .sub-value .item1 {
height: .4rem;
float: left;
display: flex;
align-items: center;
justify-content: center;
float: left;
cursor: pointer;
border-color: #90A1B1;
border-style: solid;
}
.popup-info .main .right-item .info-item .bw-item .item:hover {
background: rgba(42, 210, 255, 0.2);
border: .02rem solid #2AD2FF;
color: #2AD2FF;
.popup-info .main .right-item .info-item .bw-item .main-item .sub-item .card .value-item .sub-value .item1:nth-child(1) {
border-width: .01rem .01rem .01rem .01rem;
width: 50%;
}
.popup-info .main .right-item .info-item .bw-item .item:hover .hoverInfo {
display: block;
.popup-info .main .right-item .info-item .bw-item .main-item .sub-item .card .value-item .sub-value .item1:nth-child(2) {
border-width: .01rem .01rem .01rem 0;
width: 50%;
}
.popup-info .main .right-item .info-item .bw-item .active {
background: rgba(249, 3, 3, 0.2);
border: .01rem solid #6B1F49;
color: #E7555C;
.popup-info .main .right-item .info-item .bw-item .main-item .sub-item .card .value-item .sub-value .item1:nth-child(3) {
border-width: 0 .01rem .01rem .01rem;
width: 100%;
}
.popup-info .main .right-item .info-item .sub-desc {
......
static/css/scss/gjjc.scss
View file @ d5e57c17
......@@ -525,52 +525,112 @@
}
.info-item{
height: calc(100% - 1.01rem);
background: #0D3177;
overflow: auto;
@include scrollbar;
.desc{
height: .5rem;
display: flex;
align-items: center;
justify-content: space-between;
font-size: .18rem;
color: #fff;
padding: 0 .2rem;
background: #0D3177;
border-bottom: .01rem solid #1E499B;
p{
width: 50%;
}
}
.bw-item{
height: calc(100% - .9rem);
border: .01rem solid rgba(68,109,193,0.8);
// height: calc(100% - .9rem);
border-width: .01rem 0;
overflow: auto;
// overflow: auto;
padding: 0 .1rem .2rem;
@include scrollbar;
.item{
position: relative;
background: #0D3177;
border: .01rem solid #90A1B1;
.main-item{
.name{
color: #3FD9FF;
font-size: .18rem;
padding-bottom: .1rem;
}
.sub-item{
display: flow-root;
.card{
width: calc(50% - 0.1rem);
margin: 0.03rem 0.04rem 0.03rem;
font-size: .16rem;
background: #0D3177;
float: left;
color: #C0D3E6;
height: .8rem;
width: calc(25% - .2rem);
margin: .2rem .1rem 0;
padding: 0 .05rem;
.sub-name{
display: flex;
align-items: center;
justify-content: center;
justify-content: space-between;
padding: .12rem .15rem;
div:first-child{
color: #3FD9FF;
}
}
.value-item{
display: flex;
.sub-value{
width: calc(33.33% - .1rem);
margin: 0 .05rem .12rem;
font-size: .18rem;
.item1{
height: .4rem;
float: left;
cursor: pointer;
&:hover{
background: rgba(42,210,255,0.2);
border: .02rem solid #2AD2FF;
color: #2AD2FF;
.hoverInfo{
display: block;
display: flex;
align-items: center;
justify-content: center;
border-color: #90A1B1;
border-style: solid;
&:nth-child(1){
border-width: .01rem .01rem .01rem .01rem;
width: 50%;
}
&:nth-child(2){
border-width: .01rem .01rem .01rem 0;
width: 50%;
}
&:nth-child(3){
border-width: 0 .01rem .01rem .01rem;
width: 100%;
}
}
}
}
}
.active{
background: rgba(249,3,3,0.2);
border: .01rem solid #6B1F49;
color: #E7555C;
}
}
// .item{
// position: relative;
// background: #0D3177;
// border: .01rem solid #90A1B1;
// font-size: .18rem;
// color: #C0D3E6;
// height: .8rem;
// width: calc(25% - .2rem);
// margin: .2rem .1rem 0;
// display: flex;
// align-items: center;
// justify-content: center;
// float: left;
// cursor: pointer;
// &:hover{
// background: rgba(42,210,255,0.2);
// border: .02rem solid #2AD2FF;
// color: #2AD2FF;
// .hoverInfo{
// display: block;
// }
// }
// }
// .active{
// background: rgba(249,3,3,0.2);
// border: .01rem solid #6B1F49;
// color: #E7555C;
// }
}
.sub-desc{
height: .4rem;
display: flex;
......
static/js/gjjc.js
View file @ d5e57c17
......@@ -53,13 +53,12 @@ var taskList = {
任务单：${item2.task_no}
</div>
<div class="flex-item">
<div class="number"><p><span>${item2.test_count}</span>&nbsp;/</p>&nbsp;${item2.total_count}</div>
<div class="icon icon2"><img src="../static/images/jiantou.png"/></div>
</div>
</div>
<div class="item-main hidden">
${item2.sample_list.map((item3) => {
return (`<div class="flex-item"><p>${item3.sample_name}</p><p class="desc ${item3.test_status == 1 ? 'green' : item3.test_status == 2 ? 'red' : ''}">${item3.test_status_str}</p></div>`); //0未检测 1已检测 2强度不达标
return (`<div class="flex-item"><p>构件编号：${item3.sample_no}</p><p class="desc">钢筋数：${item3.sample_count}</p></div>`);
}).join('')
}
</div>
......@@ -287,11 +286,11 @@ var detail = {
<div class="icon icon2"><img src="../static/images/jiantou.png"/></div>
</div>
</div>
<div class="item-tab"><div>已检测：${item.test_count}</div><div>强度不达标：${item.abnormal_count}</div><div>未检测：${item.untest_count}</div></div>
<div class="item-tab"><div>构件数量：${item.sample_list.length}</div></div>
<div class="item-main hidden">
${item.sample_list.map((item2, index2) => {
return (`<div class="flex-item" onclick="detail.getsubRightData('${item2.sample_id}', '${i}','${index2}')"><p>${item2.sample_name}</p><p class="desc ${item2.test_status == 1 ? 'green' : item2.test_status == 2 ? 'red' : ''}">${item2.test_status_str}</p></div>`); //0未检测 1已检测 2强度不达标
return (`<div class="flex-item" onclick="detail.getsubRightData('${item2.sample_id}', '${i}','${index2}')"><p>构件编号：${item2.sample_no}</p><p class="desc">钢筋数：${item2.sample_count}</p></div>`);
}).join('')
}
</div>
......@@ -375,6 +374,24 @@ var detail = {
},
success: function (data) {
if (data.data) {
for(var i=0; i<data.data.length; i++){
if(data.data[i].ysjl_list){
for(var j=0; j<data.data[i].ysjl_list.length; j++){
var item = data.data[i].ysjl_list[j];
data.data[i].ysjl_list[j].jc_dataArr = [];
var z = 0;
for(var k=1; k<=100; k++){
if(item['jc_data'+k]){
if(!item.jc_dataArr[z]){
item.jc_dataArr[z] = {value: []};
}
item.jc_dataArr[z]['value'].push(item['jc_data'+k]);
if(k%9==0){z = z+1}
}
}
}
}
}
_this.setsubRightData(index, index2, data.data);
} else {
// $("#subrwList").html('<div class="noData">暂无数据</div>');
......@@ -387,31 +404,63 @@ var detail = {
})
},
setsubRightData(index, index2, data) {
console.log(index, index2);
console.log(data);
$("#subrwList .info-item").removeClass("active");
$("#subrwList .flex-item").removeClass("active");
$("#subrwList .info-item:nth-child(" + (index + 1) + ") .flex-item:nth-child(" + (index2 + 1) + ")").addClass("active");
$("#subrwList .info-item:nth-child(" + (Number(index) + 1) + ") .flex-item:nth-child(" + (Number(index2) + 1) + ")").addClass("active");
$("#popup-info .right-item1").addClass("hiddenImportant");
$("#popup-info .right-item2").removeClass("hiddenImportant");
var item = data[0];
this.ysjl_list = item.ysjl_list;
$("#popup-info .right-item2").html(`
<div class="flex-item"><div class="value">任务单号：${item.task_no}</div><div class="value">检测单位：${item.customer_name}</div></div>
<div class="name-item">${item.sample_name}</div>
<div class="name-item">构件编号：【${item.sample_no}】</div>
<div class="info-item">
<div class="desc"><p>设计强度：${item.sjqd}</p><p>强度推定值MPa：${item.tdz} / <span class="${item.test_status == 1 ? 'green' : item.test_status == 2 ? 'red' : ''}">${item.test_status_str}</span></p></div>
<div class="desc"><p>主筋直径：${item.main_bar_diameter}</p><p>主筋间距：${item.main_bar_spacing}</p></div>
<div class="desc"><p>箍筋直径：${item.stirrup_diameter}</p><p>箍筋间距：${item.stirrup_spacing}</p></div>
<div class="desc"><p>设计厚度：${item.design_thickness}</p><p>试验仪器编号：${item.equ_no}</p></div>
<div class="desc"><p>仪器检测时间：${item.test_time}</p><p>数据接收时间：${item.receive_time}</p></div>
<div class="desc"><p>数据同步时间：${item.create_time}</p><p>操作人员：${item.op_name}</p></div>
<div class="desc"><p style="width: 100%">检测位置：${item.address}</p></div>
<div class="bw-item">
${item.ysjl_list.length > 0 ?
item.ysjl_list.map((item2, index2) => {
${item.ysjl_list && item.ysjl_list.length > 0 ? item.ysjl_list.map((item2, index2) => {
return (`
<div class="item" onmouseover="mouseover(${index2}, event)" onmouseout="mouseout()">${item2.jc_data21}</div>
<div class="main-item" style="background: transparent; height: auto;">
<div class="name">第${index2+1}次上传</div>
<div class="sub-item">`+
item2.jc_dataArr.map((item3, index3) => {
return (`
<div class="card">
<div class="sub-name">
<div>钢筋序号：${index3}</div>
<div>单位：mm</div>
</div>
<div class="value-item">
<div class="sub-value">
<div class="item1 ${item3.value[0]?'':'hidden'}">${item3.value[0]}</div>
<div class="item1 ${item3.value[1]?'':'hidden'}">${item3.value[1]}</div>
<div class="item1 ${item3.value[2]?'':'hidden'}">${item3.value[2]}</div>
</div>
<div class="sub-value">
<div class="item1 ${item3.value[3]?'':'hidden'}">${item3.value[3]}</div>
<div class="item1 ${item3.value[4]?'':'hidden'}">${item3.value[4]}</div>
<div class="item1 ${item3.value[5]?'':'hidden'}">${item3.value[5]}</div>
</div>
<div class="sub-value">
<div class="item1 ${item3.value[6]?'':'hidden'}">${item3.value[6]}</div>
<div class="item1 ${item3.value[7]?'':'hidden'}">${item3.value[7]}</div>
<div class="item1 ${item3.value[8]?'':'hidden'}">${item3.value[8]}</div>
</div>
</div>
</div>
`);
}).join('')
+`</div>
</div>
`);
}).join('')
: '<div class="noData">暂无数据</div>'
}
</div>
<div class="sub-desc"><p>检测人员：${item.op_name || '/'}</p><p>检测时间：${item.test_datetime || '/'}</p><p>检测设备：${item.equ_no || '/'}</p></div>
</div>
`);
},
......
static/js/public.js
View file @ d5e57c17
......@@ -93,7 +93,7 @@ function getHeader() {
function getHeaderInfo() {
$.ajax({
url: "https://jtjc.vnet1000.net/Ajax/Screen/GetHeaderInfo.ashx",
url: "/Ajax/Screen/GetHeaderInfo.ashx",
type: "get",
dataType: "json",
success: function (data) {
......@@ -171,8 +171,8 @@ const imgURL = '/';
const baseURL = '/Ajax/Screen/Pile/';
const baseURL_xcjc = '/Ajax/Screen/XCJC/';
const baseURL_jzjc = '/Ajax/Screen/JZJC/';
const baseURL_htjc = 'https://jtjc.vnet1000.net/Ajax/Screen/HTJC/';
const baseURL_gjjc = 'https://jtjc.vnet1000.net/Ajax/Screen/GJBHC/';
const baseURL_htjc = '/Ajax/Screen/HTJC/';
const baseURL_gjjc = '/Ajax/Screen/GJBHC/';
const baseURL_Utility = '/Ajax/Screen/Utility/';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment