Skip to content

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

1

parent ff71e8ed
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 32 deletions
static/css/dist/gczljc.css
View file @ 383c7548
...@@ -912,12 +912,6 @@ ...@@ -912,12 +912,6 @@
margin-top: .1rem; margin-top: .1rem;
} }
.layui-layer {
top: 50% !important;
left: 50% !important;
transform: translate(-50%, -50%) !important;
}
.el-input .el-input__inner { .el-input .el-input__inner {
padding: 0 0 0 .1rem; padding: 0 0 0 .1rem;
height: 0.3rem; height: 0.3rem;
......
static/css/dist/gjjc.css
View file @ 383c7548
...@@ -698,6 +698,7 @@ ...@@ -698,6 +698,7 @@
justify-content: space-between; justify-content: space-between;
margin-top: .1rem; margin-top: .1rem;
padding: 0 .2rem; padding: 0 .2rem;
cursor: pointer;
} }
.popup-info .main .right-item .name-item div { .popup-info .main .right-item .name-item div {
...@@ -715,7 +716,7 @@ ...@@ -715,7 +716,7 @@
padding: .12rem; padding: .12rem;
white-space: nowrap; white-space: nowrap;
top: 110%; top: 110%;
left: .15rem; right: 0;
} }
.popup-info .main .right-item .name-item .right1 { .popup-info .main .right-item .name-item .right1 {
...@@ -726,14 +727,21 @@ ...@@ -726,14 +727,21 @@
display: block; display: block;
} }
.popup-info .main .right-item .name-item img { .popup-info .main .right-item .name-item .icon1 {
width: .2rem; width: .2rem;
height: .2rem; height: .2rem;
margin-right: .1rem; margin: 0 .1rem 0 .2rem;
}
.popup-info .main .right-item .name-item .icon2 {
margin-left: .2rem;
width: 0.15rem;
height: 0.15rem;
transition: transform 0.5s, top 0.5s;
} }
.popup-info .main .right-item .info-item { .popup-info .main .right-item .info-item {
height: calc(100% - 1.01rem); height: 100%;
overflow: auto; overflow: auto;
} }
......
static/css/dist/zjjc.css
View file @ 383c7548
...@@ -877,3 +877,7 @@ td { ...@@ -877,3 +877,7 @@ td {
line-height: inherit; line-height: inherit;
background-color: #46A6D8; background-color: #46A6D8;
} }
.layui-layer-loading{
height: 60px !important;
}
\ No newline at end of file
static/css/scss/gczljc.scss
View file @ 383c7548
...@@ -718,11 +718,11 @@ ...@@ -718,11 +718,11 @@
} }
} }
.layui-layer{ // .layui-layer{
top: 50% !important; // top: 50% !important;
left: 50% !important; // left: 50% !important;
transform: translate(-50%, -50%) !important; // transform: translate(-50%, -50%) !important;
} // }
.el-input{ .el-input{
.el-input__inner{ .el-input__inner{
......
static/css/scss/gjjc.scss
View file @ 383c7548
...@@ -567,6 +567,7 @@ ...@@ -567,6 +567,7 @@
justify-content: space-between; justify-content: space-between;
margin-top: .1rem; margin-top: .1rem;
padding: 0 .2rem; padding: 0 .2rem;
cursor: pointer;
div{ div{
position: relative; position: relative;
display: flex; display: flex;
...@@ -581,7 +582,8 @@ ...@@ -581,7 +582,8 @@
padding: .12rem; padding: .12rem;
white-space: nowrap; white-space: nowrap;
top: 110%; top: 110%;
left: .15rem; // left: .15rem;
right: 0;
} }
.right1{ .right1{
cursor: pointer; cursor: pointer;
...@@ -591,14 +593,21 @@ ...@@ -591,14 +593,21 @@
} }
} }
} }
img{ .icon1{
width: .2rem; width: .2rem;
height: .2rem; height: .2rem;
margin-right: .1rem; margin: 0 .1rem 0 .2rem;
}
.icon2{
margin-left: .2rem;
width: 0.15rem;
height: 0.15rem;
transition: transform 0.5s, top 0.5s;
} }
} }
.info-item{ .info-item{
height: calc(100% - 1.01rem); // height: calc(100% - 1.01rem);
height: 100%;
overflow: auto; overflow: auto;
@include scrollbar; @include scrollbar;
.desc{ .desc{
......
static/js/gjjc.js
View file @ 383c7548
...@@ -454,22 +454,29 @@ var detail = { ...@@ -454,22 +454,29 @@ var detail = {
var item = data[0]; var item = data[0];
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?item.main_bar_diameter+'mm':''}</p><p>主筋间距：${item.main_bar_spacing?item.main_bar_spacing+'mm':''}</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?item.stirrup_diameter+'mm':''}</p><p>箍筋间距：${item.stirrup_spacing?item.stirrup_spacing+'mm':''}</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?item.design_thickness+'mm':''}</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> -->
<div class="bw-item"> <div class="bw-item">
${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-item"><div class="right1"><img src="../static/images/tip.png">构件编号：${item2.component_no}<p class="tips">该构件编号由设备上传</p></div><div class="${item.ysjl_list.length > 1 ? '' : 'hiddenImportant'}">第${item.ysjl_list.length - index2}次上传</div></div> <div class="name-item"><div class="right1">第4次/JGJ检测<img class="icon1" src="../static/images/tip.png">构件编号：${item2.component_no}<p class="tips">该构件编号由设备上传</p></div><div>数据接收时间： 2023-03-12 09:21<img class="icon2" src="../static/images/jiantou.png"/></div></div>
<div class="sub-item">`+ <div class="sub-item">
<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?item.stirrup_diameter+'mm':''}</p><p>主筋直径：${item.stirrup_spacing?item.stirrup_spacing+'mm':''}</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.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>`+
item2.jc_dataArr.map((item3, index3) => { item2.jc_dataArr.map((item3, index3) => {
return (` return (`
<div class="card"> <div class="card">
......
static/js/public.js
View file @ 383c7548
...@@ -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) {
...@@ -133,7 +133,10 @@ function showPopup(url, title) { ...@@ -133,7 +133,10 @@ function showPopup(url, title) {
maxmin: true, maxmin: true,
title: "<p class='popup-title'>" + title + "</p>", title: "<p class='popup-title'>" + title + "</p>",
area: ['9rem', '6rem'], area: ['9rem', '6rem'],
content: url content: url,
end: function () {
$(".layui-layer-shade").remove();
}
}); });
} else { } else {
layer.open({ layer.open({
...@@ -146,6 +149,7 @@ function showPopup(url, title) { ...@@ -146,6 +149,7 @@ function showPopup(url, title) {
end: function () { end: function () {
$("#popup-info").html(''); $("#popup-info").html('');
$("#popup-info").css('display', 'none'); $("#popup-info").css('display', 'none');
$(".layui-layer-shade").remove();
} }
}); });
} }
...@@ -171,10 +175,10 @@ const imgURL = '/'; ...@@ -171,10 +175,10 @@ const imgURL = '/';
const baseURL = '/Ajax/Screen/Pile/'; 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 = 'https://jtjc.vnet1000.net/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 = 'https://jtjc.vnet1000.net/Ajax/Screen/Utility/';
window._AMapSecurityConfig = { window._AMapSecurityConfig = {
securityJsCode: '0711374220aba81dbf7515aaac08e50b', securityJsCode: '0711374220aba81dbf7515aaac08e50b',
......
static/js/zjjc.js
View file @ 383c7548
var loading
var projectData = ''; var projectData = '';
var map = { var map = {
getMap: function (data) { getMap: function (data) {
...@@ -7,7 +8,8 @@ var map = { ...@@ -7,7 +8,8 @@ var map = {
level: 'province' level: 'province'
}; };
var district = new AMap.DistrictSearch(options); var district = new AMap.DistrictSearch(options);
district.search('杭州市', function (status, result) { district.search($("#province").html(), function (status, result) {
// district.search('杭州市', function (status, result) {
var bounds = result.districtList[0]['boundaries']; var bounds = result.districtList[0]['boundaries'];
var mask = []; var mask = [];
for (var i = 0; i < bounds.length; i++) { for (var i = 0; i < bounds.length; i++) {
...@@ -250,7 +252,7 @@ var map = { ...@@ -250,7 +252,7 @@ var map = {
}, },
// 回放 // 回放
getHistoryvideo: function (equ_no, date, type = 0) { getHistoryvideo: function (equ_no, date, type = 0) {
console.log(equ_no, date) loading = layer.load(1);
$.ajax({ $.ajax({
url: baseURL + "GetVideoPlayBack.ashx", url: baseURL + "GetVideoPlayBack.ashx",
type: "get", type: "get",
...@@ -264,10 +266,12 @@ var map = { ...@@ -264,10 +266,12 @@ var map = {
}, },
error: function (jqXHR) { error: function (jqXHR) {
console.log("发生错误：" + jqXHR.status); console.log("发生错误：" + jqXHR.status);
layer.close(loading);
} }
}) })
}, },
getHistoryvideoHtml: function (data, date, equ_no, type) { getHistoryvideoHtml: function (data, date, equ_no, type) {
layer.close(loading);
console.log(data, type); console.log(data, type);
if (data.data.historyvideo_url) { if (data.data.historyvideo_url) {
$("#popup-info").html(''); $("#popup-info").html('');
...@@ -430,6 +434,7 @@ var getRightdata = { ...@@ -430,6 +434,7 @@ var getRightdata = {
} }
}, },
getHistoryPic: function (equ_no, type) { getHistoryPic: function (equ_no, type) {
loading = layer.load(1);
$.ajax({ $.ajax({
url: baseURL + "GetHistoryPic.ashx", url: baseURL + "GetHistoryPic.ashx",
type: "post", type: "post",
...@@ -443,10 +448,12 @@ var getRightdata = { ...@@ -443,10 +448,12 @@ var getRightdata = {
}, },
error: function (jqXHR) { error: function (jqXHR) {
console.log("发生错误：" + jqXHR.status); console.log("发生错误：" + jqXHR.status);
layer.close(loading);
} }
}) })
}, },
setHistoryPic: function (data, equ_no, type) { setHistoryPic: function (data, equ_no, type) {
layer.close(loading);
if (type == 1) { if (type == 1) {
$("#popup-info .img-item").html(''); $("#popup-info .img-item").html('');
if (data.data) { if (data.data) {
...@@ -492,6 +499,7 @@ var getRightdata = { ...@@ -492,6 +499,7 @@ var getRightdata = {
$(".popup-info .bigger-img").addClass('hiddenImportant'); $(".popup-info .bigger-img").addClass('hiddenImportant');
}, },
get_XCJC_Detail: function (SceneTaskID) { get_XCJC_Detail: function (SceneTaskID) {
loading = layer.load(1);
$.ajax({ $.ajax({
url: '/AppModules/CommonFiles/Scene/XCJC_Detail.aspx?id=' + SceneTaskID, url: '/AppModules/CommonFiles/Scene/XCJC_Detail.aspx?id=' + SceneTaskID,
type: "get", type: "get",
...@@ -500,10 +508,12 @@ var getRightdata = { ...@@ -500,10 +508,12 @@ var getRightdata = {
}, },
error: function (jqXHR) { error: function (jqXHR) {
console.log("发生错误：" + jqXHR.status); console.log("发生错误：" + jqXHR.status);
layer.close(loading);
} }
}) })
}, },
set_XCJC_Detail: function (data) { set_XCJC_Detail: function (data) {
layer.close(loading);
$("#popup-info").html(data); $("#popup-info").html(data);
showPopup('', '静载工程数据详情'); showPopup('', '静载工程数据详情');
} }
......
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