Skip to content

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

123

parent 57b8914c
Show whitespace changes
Inline Side-by-side
Showing with 171 additions and 20 deletions
static/css/dist/gjjc.css
View file @ 5edce793
...@@ -240,6 +240,11 @@ ...@@ -240,6 +240,11 @@
border-top: 0.01rem solid rgba(68, 109, 193, 0.8); border-top: 0.01rem solid rgba(68, 109, 193, 0.8);
} }
.container .content .left-item .bottom-item .info-item .panel-item .panel-info .info-item .item-main .flex-item:hover {
cursor: pointer;
background: rgba(12, 112, 164, 0.8);
}
.container .content .left-item .bottom-item .info-item .panel-item .panel-info .info-item .item-main .flex-item .green { .container .content .left-item .bottom-item .info-item .panel-item .panel-info .info-item .item-main .flex-item .green {
color: #00FFA2; color: #00FFA2;
} }
...@@ -249,9 +254,25 @@ ...@@ -249,9 +254,25 @@
} }
.container .content .left-item .bottom-item .info-item .panel-item .panel-info .info-item .item-main .flex-item .desc { .container .content .left-item .bottom-item .info-item .panel-item .panel-info .info-item .item-main .flex-item .desc {
display: flex;
align-items: center;
white-space: nowrap; white-space: nowrap;
} }
.container .content .left-item .bottom-item .info-item .panel-item .panel-info .info-item .item-main .flex-item .blue {
color: #00ffa2;
}
.container .content .left-item .bottom-item .info-item .panel-item .panel-info .info-item .item-main .flex-item .yellow {
color: #c0d3e6;
}
.container .content .left-item .bottom-item .info-item .panel-item .panel-info .info-item .item-main .flex-item img {
width: 0.2rem;
height: 0.2rem;
margin-right: .1rem;
}
.container .content .map-legend { .container .content .map-legend {
position: absolute; position: absolute;
bottom: .2rem; bottom: .2rem;
...@@ -426,6 +447,26 @@ ...@@ -426,6 +447,26 @@
background: #113780; background: #113780;
} }
.popup-info .main .left-item .info-item .item-main .blue {
color: #00ffa2;
}
.popup-info .main .left-item .info-item .item-main .yellow {
color: #c0d3e6;
}
.popup-info .main .left-item .info-item .item-main .desc {
display: flex;
align-items: center;
white-space: nowrap;
}
.popup-info .main .left-item .info-item .item-main .desc img {
width: 0.2rem;
height: 0.2rem;
margin-right: .1rem;
}
.popup-info .main .left-item .info-item .item-main .flex-item { .popup-info .main .left-item .info-item .item-main .flex-item {
cursor: pointer; cursor: pointer;
display: flex; display: flex;
...@@ -637,13 +678,46 @@ ...@@ -637,13 +678,46 @@
.popup-info .main .right-item .name-item { .popup-info .main .right-item .name-item {
background: #3069F4; background: #3069F4;
height: .5rem; height: .4rem;
color: #fff; color: #fff;
font-size: .18rem; font-size: .18rem;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: space-between;
margin-top: .1rem; margin-top: .1rem;
padding: 0 .2rem;
}
.popup-info .main .right-item .name-item div {
position: relative;
display: flex;
align-items: center;
}
.popup-info .main .right-item .name-item .tips {
display: none;
position: absolute;
background: rgba(0, 0, 0, 0.7);
color: #C0D3E6;
font-size: .16rem;
padding: .12rem;
white-space: nowrap;
top: 110%;
right: -0.15rem;
}
.popup-info .main .right-item .name-item .right1 {
cursor: pointer;
}
.popup-info .main .right-item .name-item .right1:hover .tips {
display: block;
}
.popup-info .main .right-item .name-item img {
width: .2rem;
height: .2rem;
margin-right: .1rem;
} }
.popup-info .main .right-item .info-item { .popup-info .main .right-item .info-item {
...@@ -675,6 +749,8 @@ ...@@ -675,6 +749,8 @@
padding: 0 .2rem; padding: 0 .2rem;
background: #0D3177; background: #0D3177;
border-bottom: .01rem solid #1E499B; border-bottom: .01rem solid #1E499B;
color: #C0D3E6;
font-size: .14rem;
} }
.popup-info .main .right-item .info-item .desc p { .popup-info .main .right-item .info-item .desc p {
...@@ -683,7 +759,10 @@ ...@@ -683,7 +759,10 @@
.popup-info .main .right-item .info-item .bw-item { .popup-info .main .right-item .info-item .bw-item {
border-width: .01rem 0; border-width: .01rem 0;
padding: 0 .1rem .2rem; }
.popup-info .main .right-item .info-item .bw-item .main-item {
padding: 0;
} }
.popup-info .main .right-item .info-item .bw-item .main-item .name { .popup-info .main .right-item .info-item .bw-item .main-item .name {
......
static/css/scss/gjjc.scss
View file @ 5edce793
...@@ -209,6 +209,10 @@ ...@@ -209,6 +209,10 @@
background: rgba(22,65,152,0.3); background: rgba(22,65,152,0.3);
padding: .13rem; padding: .13rem;
border-top: .01rem solid rgba(68,109,193,0.8); border-top: .01rem solid rgba(68,109,193,0.8);
&:hover{
cursor: pointer;
background: rgba(12,112,164,0.8);
}
.green{ .green{
color: #00FFA2; color: #00FFA2;
} }
...@@ -216,8 +220,21 @@ ...@@ -216,8 +220,21 @@
color: #E7555C; color: #E7555C;
} }
.desc{ .desc{
display: flex;
align-items: center;
white-space: nowrap; white-space: nowrap;
} }
.blue{
color: #00ffa2;
}
.yellow{
color: #c0d3e6;
}
img{
width: 0.2rem;
height: 0.2rem;
margin-right: .1rem;
}
} }
} }
// .time-item{ // .time-item{
...@@ -380,6 +397,22 @@ ...@@ -380,6 +397,22 @@
} }
.item-main{ .item-main{
background: #113780; background: #113780;
.blue{
color: #00ffa2;
}
.yellow{
color: #c0d3e6;
}
.desc{
display: flex;
align-items: center;
white-space: nowrap;
img{
width: 0.2rem;
height: 0.2rem;
margin-right: .1rem;
}
}
.flex-item{ .flex-item{
cursor: pointer; cursor: pointer;
display: flex; display: flex;
...@@ -515,13 +548,43 @@ ...@@ -515,13 +548,43 @@
} }
.name-item{ .name-item{
background: #3069F4; background: #3069F4;
height: .5rem; height: .4rem;
color: #fff; color: #fff;
font-size: .18rem; font-size: .18rem;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: space-between;
margin-top: .1rem; margin-top: .1rem;
padding: 0 .2rem;
div{
position: relative;
display: flex;
align-items: center;
}
.tips{
display: none;
position: absolute;
background: rgba(0,0,0,0.7);
color: #C0D3E6;
font-size: .16rem;
padding: .12rem;
white-space: nowrap;
top: 110%;
right: -0.15rem;
}
.right1{
cursor: pointer;
&:hover{
.tips{
display: block;
}
}
}
img{
width: .2rem;
height: .2rem;
margin-right: .1rem;
}
} }
.info-item{ .info-item{
height: calc(100% - 1.01rem); height: calc(100% - 1.01rem);
...@@ -536,6 +599,8 @@ ...@@ -536,6 +599,8 @@
padding: 0 .2rem; padding: 0 .2rem;
background: #0D3177; background: #0D3177;
border-bottom: .01rem solid #1E499B; border-bottom: .01rem solid #1E499B;
color: #C0D3E6;
font-size: .14rem;
p{ p{
width: 50%; width: 50%;
} }
...@@ -544,8 +609,9 @@ ...@@ -544,8 +609,9 @@
// height: calc(100% - .9rem); // height: calc(100% - .9rem);
border-width: .01rem 0; border-width: .01rem 0;
// overflow: auto; // overflow: auto;
padding: 0 .1rem .2rem; // padding: 0 .1rem .2rem;
.main-item{ .main-item{
padding: 0;
.name{ .name{
color: #3FD9FF; color: #3FD9FF;
font-size: .18rem; font-size: .18rem;
......
static/js/gjjc.js
View file @ 5edce793
...@@ -57,8 +57,8 @@ var taskList = { ...@@ -57,8 +57,8 @@ var taskList = {
</div> </div>
</div> </div>
<div class="item-main hidden"> <div class="item-main hidden">
${item2.sample_list.map((item3) => { ${item2.sample_list.map((item3, index3) => {
return (`<div class="flex-item"><p>构件编号：${item3.sample_no}</p><p class="desc">钢筋数：${item3.sample_count}</p></div>`); return (`<div class="flex-item" onclick="detail.listgetsubRightData('${data[i].project_id}', '${item3.sample_id}', '${i}','${index3}')"><p>样品编号：${item3.sample_no}</p><p class="desc ${item3.ysjl_count>0?'blue':'yellow'}">${item3.ysjl_count>0?`<img src="../static/images/icon_gj_mr.png"/>钢筋数：${item3.sample_count}`:'<img src="../static/images/icon_gj_xz.png"/>暂未检测'}</p></div>`);
}).join('') }).join('')
} }
</div> </div>
...@@ -247,7 +247,7 @@ var map = { ...@@ -247,7 +247,7 @@ var map = {
var detail = { var detail = {
data: [], data: [],
ysjl_list: [], ysjl_list: [],
getData: function (project_id) { getData: function (project_id, sample_id, index, index2) {
let _this = this; let _this = this;
$.ajax({ $.ajax({
url: baseURL_gjjc + "GetTaskInfo.ashx", url: baseURL_gjjc + "GetTaskInfo.ashx",
...@@ -258,7 +258,7 @@ var detail = { ...@@ -258,7 +258,7 @@ var detail = {
}, },
success: function (data) { success: function (data) {
if (data.data && data.data.length > 0) { if (data.data && data.data.length > 0) {
_this.setLeftData(data.data); _this.setLeftData(data.data, sample_id, index, index2);
} else { } else {
$("#subrwList").html('<div class="noData">暂无数据</div>'); $("#subrwList").html('<div class="noData">暂无数据</div>');
} }
...@@ -269,7 +269,7 @@ var detail = { ...@@ -269,7 +269,7 @@ var detail = {
} }
}) })
}, },
setLeftData: function (data) { setLeftData: function (data, sample_id, index, index2) {
this.data = data; this.data = data;
var str = ''; var str = '';
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
...@@ -286,11 +286,11 @@ var detail = { ...@@ -286,11 +286,11 @@ var detail = {
<div class="icon icon2"><img src="../static/images/jiantou.png"/></div> <div class="icon icon2"><img src="../static/images/jiantou.png"/></div>
</div> </div>
</div> </div>
<div class="item-tab"><div>构件数量：${item.sample_list.length}</div></div> <div class="item-tab"><div>样品数量：${item.sample_list.length}</div></div>
<div class="item-main hidden"> <div class="item-main hidden">
${item.sample_list.map((item2, index2) => { ${item.sample_list.map((item2, index2) => {
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>`); return (`<div class="flex-item" onclick="detail.getsubRightData('${item2.sample_id}', '${i}','${index2}')"><p>样品编号：${item2.sample_no}</p><p class="desc ${item2.ysjl_count>0?'blue':'yellow'}">${item2.ysjl_count>0?`<img src="../static/images/icon_gj_mr.png"/>钢筋数：${item2.sample_count}`:'<img src="../static/images/icon_gj_xz.png"/>暂未检测'}</p></div>`);
}).join('') }).join('')
} }
</div> </div>
...@@ -299,6 +299,9 @@ var detail = { ...@@ -299,6 +299,9 @@ var detail = {
`; `;
} }
$("#popup-info .left-item").html(str); $("#popup-info .left-item").html(str);
if(sample_id){
detail.getsubRightData(sample_id, index, index2);
}
this.setRightData(0, 'subrwInfo-0'); this.setRightData(0, 'subrwInfo-0');
this.showPopup(); this.showPopup();
}, },
...@@ -413,12 +416,12 @@ var detail = { ...@@ -413,12 +416,12 @@ var detail = {
this.ysjl_list = item.ysjl_list; this.ysjl_list = item.ysjl_list;
$("#popup-info .right-item2").html(` $("#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="flex-item"><div class="value">任务单号：${item.task_no}</div><div class="value">检测单位：${item.customer_name}</div></div>
<div class="name-item">构件编号：【${item.sample_no}】</div> <div class="name-item">样品编号：【${item.sample_no}】</div>
${item.ysjl_list && item.ysjl_list.length > 0 ? '' : '<div class="noData">暂无数据</div>'} ${item.ysjl_list && item.ysjl_list.length > 0 ? '' : '<div class="noData">暂无数据</div>'}
<div class="info-item ${item.ysjl_list && item.ysjl_list.length > 0 ? '' : 'hidden'}"> <div class="info-item ${item.ysjl_list && item.ysjl_list.length > 0 ? '' : 'hidden'}">
<div class="desc"><p>主筋直径：${item.main_bar_diameter}</p><p>主筋间距：${item.main_bar_spacing}</p></div> <div class="desc"><p>主筋直径：${item.main_bar_diameter?item.main_bar_diameter+'mm':''}</p><p>主筋间距：${item.main_bar_spacing?item.main_bar_spacing+'mm':''}</p></div>
<div class="desc"><p>箍筋直径：${item.stirrup_diameter}</p><p>箍筋间距：${item.stirrup_spacing}</p></div> <div class="desc"><p>箍筋直径：${item.stirrup_diameter?item.stirrup_diameter+'mm':''}</p><p>箍筋间距：${item.stirrup_spacing?item.stirrup_spacing+'mm':''}</p></div>
<div class="desc"><p>设计厚度：${item.design_thickness}</p><p>试验仪器编号：${item.equ_no}</p></div> <div class="desc"><p>设计厚度：${item.design_thickness?item.design_thickness+'mm':''}</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.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>数据同步时间：${item.create_time}</p><p>操作人员：${item.op_name}</p></div>
<div class="desc"><p style="width: 100%">检测位置：${item.address}</p></div> <div class="desc"><p style="width: 100%">检测位置：${item.address}</p></div>
...@@ -426,7 +429,7 @@ var detail = { ...@@ -426,7 +429,7 @@ var detail = {
${item.ysjl_list && 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 (` return (`
<div class="main-item" style="background: transparent; height: auto;"> <div class="main-item" style="background: transparent; height: auto;">
<div class="name">第${index2+1}次上传</div> <div class="name-item"><div>第${index2+1}次上传</div><div class="right1"><img src="../static/images/tip.png">构件编号：${item2.component_no}<p class="tips">该构件编号由设备上传</p></div></div>
<div class="sub-item">`+ <div class="sub-item">`+
item2.jc_dataArr.map((item3, index3) => { item2.jc_dataArr.map((item3, index3) => {
return (` return (`
...@@ -465,6 +468,9 @@ var detail = { ...@@ -465,6 +468,9 @@ var detail = {
</div> </div>
`); `);
}, },
listgetsubRightData: function(project_id, sample_id, index, index2){
detail.getData(project_id, sample_id, index, index2);
},
showPopup: function () { showPopup: function () {
layer.open({ layer.open({
type: 1, type: 1,
......
static/js/public.js
View file @ 5edce793
...@@ -93,7 +93,7 @@ function getHeader() { ...@@ -93,7 +93,7 @@ function getHeader() {
function getHeaderInfo() { function getHeaderInfo() {
$.ajax({ $.ajax({
url: "/Ajax/Screen/GetHeaderInfo.ashx", url: "https://jtjc.vnet1000.net/Ajax/Screen/GetHeaderInfo.ashx",
type: "get", type: "get",
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
...@@ -172,7 +172,7 @@ const baseURL = '/Ajax/Screen/Pile/'; ...@@ -172,7 +172,7 @@ const baseURL = '/Ajax/Screen/Pile/';
const baseURL_xcjc = '/Ajax/Screen/XCJC/'; const baseURL_xcjc = '/Ajax/Screen/XCJC/';
const baseURL_jzjc = '/Ajax/Screen/JZJC/'; const baseURL_jzjc = '/Ajax/Screen/JZJC/';
const baseURL_htjc = '/Ajax/Screen/HTJC/'; const baseURL_htjc = '/Ajax/Screen/HTJC/';
const baseURL_gjjc = '/Ajax/Screen/GJBHC/'; const baseURL_gjjc = 'https://jtjc.vnet1000.net/Ajax/Screen/GJBHC/';
const baseURL_Utility = '/Ajax/Screen/Utility/'; 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