Skip to content

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

调整

parent bd08ff4f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 991 additions and 331 deletions
pages/htjc.html
View file @ d3472e8b
......@@ -15,6 +15,7 @@
<script src="../static/plugin/layui/layui.js"></script>
<script src="../static/js/public.js?v=1.0.1"></script>
<script src="../static/js/swiper.min.js"></script>
<script src="../static/js/md5.js"></script>
<style>
.container .content .map .amap-info-content {
background: rgba(0, 0, 0, 0.6) !important;
......@@ -26,6 +27,15 @@
top: 5px !important;
right: 5px !important;
}
.hover-row:hover {
background-color: rgba(42, 93, 197, 0.8) !important;
}
.hover-row {
background-color: rgba(42, 93, 197, 0.4) !important;
margin-bottom:10px;
}
</style>
</head>
......
pages/jzjc.html
View file @ d3472e8b
......@@ -218,7 +218,7 @@
</body>
<script type="text/javascript"
src="https://webapi.amap.com/maps?v=1.4.15&key=fc00c5b70f67a8414344682f217d4b6e&plugin=AMap.MarkerClusterer,AMap.DistrictSearch"></script>
<script src="../static/js/jzjc.js"></script>
<script src="../static/js/jzjc.js?vt=1.0.1"></script>
<script>
$(function () {
$("#jzjc-item a").addClass('active');
......
pages/xcjc.html
View file @ d3472e8b
......@@ -96,7 +96,7 @@
<div id="popup-info" class="hidden popup-info"></div>
</body>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=fc00c5b70f67a8414344682f217d4b6e&plugin=AMap.MarkerClusterer,AMap.DistrictSearch"></script>
<script src="../static/js/xcjc.js"></script>
<script src="../static/js/xcjc.js?vt=1.0.1"></script>
<script>
$(function(){
$("#xcjc-item a").addClass('active');
......
pages/zjjc.html
View file @ d3472e8b
......@@ -10,10 +10,10 @@
<link rel="stylesheet" href="../static/plugin/layui/css/layui.css">
<link rel="stylesheet" href="../static/css/dist/swiper.css">
<link rel="stylesheet" href="../static/css/dist/public.css">
<link rel="stylesheet" href="../static/css/dist/zjjc.css">
<link rel="stylesheet" href="../static/css/dist/zjjc.css?vt=1.0.2">
<script src="../static/js/jquery-3.0.0.min.js"></script>
<script src="../static/plugin/layui/layui.js"></script>
<script src="../static/js/public.js"></script>
<script src="../static/js/public.js?vt=1.0.1"></script>
<script src="../static/js/swiper.min.js"></script>
</head>
......@@ -139,7 +139,7 @@
</body>
<script type="text/javascript"
src="https://webapi.amap.com/maps?v=1.4.15&key=fc00c5b70f67a8414344682f217d4b6e&plugin=AMap.MarkerClusterer,AMap.DistrictSearch"></script>
<script src="../static/js/zjjc.js"></script>
<script src="../static/js/zjjc.js?vt=1.0.3"></script>
<script>
$(function () {
$("#zjjc-item a").addClass('active');
......
static/css/scss/htjc.scss
View file @ d3472e8b
......@@ -15,18 +15,7 @@
.map{
.info-item{
cursor: pointer;
display: flex;
align-items: center;
padding-right: .3rem;
.btn{
font-size: .14rem;
color: $white;
border: $border $white;
border-radius: .12rem;
padding: .05rem .1rem;
cursor: pointer;
white-space: nowrap;
}
padding: 12px 27px 10px 12px;
}
.bottom-center .amap-info-sharp{
border-top-color: rgba(0, 0, 0, 0.6);
......@@ -219,10 +208,6 @@
background: rgba(22,65,152,0.3);
padding: .13rem;
border-top: .01rem solid rgba(68,109,193,0.8);
&:hover{
cursor: pointer;
background: rgba(12,112,164,0.8);
}
.green{
color: #00FFA2;
}
......@@ -673,74 +658,3 @@
}
}
}
\ No newline at end of file
.layui-label {
color: #fff;
margin-bottom: 12px;
}
#popup-unusual {
position: relative;
}
.submit-btn {
position: absolute;
left: 50%;
bottom: .7rem;
transform: translateX(-50%);
width: 100%;
text-align: center;
}
.layui-form {
padding: 20px;
}
.layui-form .layui-input {
background: transparent;
border-color: #4470C5;
color: #fff;
}
.layui-form textarea {
background: transparent;
border-color: #4470C5;
color: #fFF;
}
.layui-form-select dl {
background: #1E499B;
color: #fff;
border-color: #4470C5;
}
.layui-form-select dl dd.layui-this {
background-color: #3069F4;
}
.layui-form-select dl dd:hover {
background-color: #46A6D8;
}
table {
width: 100%;
table-layout: fixed;
}
td {
width: 100%;
word-break: keep-all;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.switch {
height: inherit;
padding: 6px 12px;
line-height: inherit;
background-color: #46A6D8;
}
\ No newline at end of file
static/js/htjc.js
View file @ d3472e8b
function getAccess(cb) {
var api_secret = "40DB5CA9-9FA7-45E6-95B9-E7E8AF24F699";
var api_key = "10014";
var timestamp = new Date().getTime();
$.ajax({
url: `${newBaseURL_htjc}access`,
type: "post",
contentType: "application/json",
data: JSON.stringify({
api_key,
timestamp,
sign: md5(`api_key${api_key}timestamp${timestamp}${api_secret}`),
}),
success: (res) => {
if (res.status == 200) {
$.ajaxSetup({
beforeSend: (xhr) => {
xhr.setRequestHeader('Authorization', `${res.data.token_type} ${res.data.access_token}`);
// 添加其他需要的头部
}
});
if (cb) {
cb()
}
}
}
})
}
var laydateObj;
var taskList = {
data: [],
......@@ -459,8 +493,8 @@ var detail = {
console.log(sample_id, index, index2);
let _this = this;
$.ajax({
url: baseURL_htjc + "GetPartInfo.ashx",
type: "post",
url: newBaseURL_htjc + "screen/htjc/sjxq_jcbw",
type: "get",
dataType: "json",
data: {
sample_id
......@@ -497,9 +531,24 @@ var detail = {
${item.test_status == 1 && item.ysjl_list && item.ysjl_list.length > 0 ?
item.ysjl_list.map((item2, index2) => {
return (`
<div class="item ${item2.test_status == '1' ? 'common' : 'fail'}" onmouseover="mouseover(${index2}, event)" onmouseout="mouseout()">${item2.jc_data21}
${item2.is_change > 0 ? '<img class="icon-change" src="../static/images/icon-change.png" />' : ''}
${item2.ysjl_list ? `
<div style="margin-bottom:10px">
<div class="flex-item hover-row" style="position:relative;cursor:pointer" onclick="toggleContainer(${index2})">
<div class="value">构件名称：${item2.gj_name}</div>${item2.gj_no ? `<div class="value">构件编号：${item2.gj_no}</div>` : ''}
<img src="../static/images/jiantou.png" id="block_arrow_${index2}" style="width:10px;height:10px;position:absolute;top:8px;right:10px;transform"/>
</div>
<div class="item-container" id="block_${index2}" style="display:none;flex-wrap:wrap">
${item2.ysjl_list && item.ysjl_list.length > 0 ? item2.ysjl_list.map((innerItem, innerIndex) => {
return `<div class="item ${innerItem.test_status == '1' ? 'common' : 'fail'}" onmouseover="mouseover(${index2},${innerIndex}, event)" onmouseout="mouseout()">${innerItem.jc_data21 ? innerItem.jc_data21 : '未计算'}
${modifyChange(innerItem.change_list[0]) > 0 ? '<img class="icon-change" src="../static/images/icon-change.png" />' : ''}
</div>`
}).join('') : ''}
</div>
</div >
` : ''}
`);
}).join('')
: '<div class="noData">暂无数据</div>'
......@@ -527,12 +576,16 @@ var detail = {
}
});
},
showPopupChangeList: function (sample_id, jc_data26, group_no, index, val) {
showPopupChangeList: function (ysjl_id, index, val) {
$("#popup-info-change-list .content .table .table-body").html('');
$.ajax({
url: baseURL_htjc + `GetChangeList.ashx?sample_id=${sample_id}&jc_data26=${jc_data26}&group_no=${group_no}&index=${index}`,
url: newBaseURL_htjc + `screen/htjc/xgjl`,
type: "get",
data: {
ysjl_id,
index
},
dataType: "json",
success: function (data) {
......@@ -553,7 +606,7 @@ var detail = {
${arr.map(item => {
return (`
<tr>
<td width="25%">${item.update_opname}</td>
<td width="25%">${item.update_opname ? item.update_opname : ''}</td>
<td width="25%">${item.update_time}</td>
<td width="25%">${item.jc_data}</td>
<td width="25%">${item.newVal}</td>
......@@ -628,26 +681,25 @@ var detail = {
var hoverInfoTime;
var isHoverInfoModal; // 弹窗是否正在显示
function mouseover(index, e) {
function mouseover(index, indexInner, e) {
if (isHoverInfoModal) {
return
}
var arr = [];
let notArr = ['jc_data21', 'test_status', 'change_list', 'group_no', 'is_change', 'jc_data26']
for (i in detail.ysjl_list[index]) {
let notArr = ['jc_data21', 'test_status', 'change_list', 'group_no', 'is_change', 'jc_data26', 'ysjl_id']
for (i in detail.ysjl_list[index].ysjl_list[indexInner]) {
if (!notArr.includes(i)) {
arr.push(detail.ysjl_list[index][i]);
arr.push(detail.ysjl_list[index].ysjl_list[indexInner][i]);
}
}
$("#hoverInfo").html(`
${arr.map((item2, index2) => {
let bool = detail.ysjl_list[index].change_list[0][`is_change${index2 + 1}`] > 0
let bool = detail.ysjl_list[index].ysjl_list[indexInner].change_list[0][`is_change${index2 + 1}`] > 0
return (`
<div onClick="detail.showPopupChangeList('${detail.sample_id}', '${detail.ysjl_list[index].jc_data26}','${detail.ysjl_list[index].group_no}','${index2 + 1}','${item2}')" class="${bool ? 'modification' : ''}">${item2}</div>
<div onClick="detail.showPopupChangeList('${detail.ysjl_list[index].ysjl_list[indexInner].ysjl_id}','${index2 + 1}','${item2}')" class="${bool ? 'modification' : ''}">${item2}</div>
`);
}).join('')
}
......@@ -849,7 +901,7 @@ var testLocationMap = {
}
}
init();
function init() {
getHeader();
layui.use(['form', 'layer', 'laydate'], function () {
......@@ -910,3 +962,26 @@ function init() {
taskList.init();
testCount.init();
}
function toggleContainer(index) {
console.log($(`#block_${index}`).css("display"))
if ($(`#block_${index}`).css("display") == 'flex') {
$(`#block_${index}`).css("display", "none")
$(`#block_arrow_${index}`).css("transform", "none")
} else {
$(`#block_${index}`).css("display", "flex")
$(`#block_arrow_${index}`).css("transform", "rotate(180deg)")
}
}
function modifyChange(objdata) {
var total = 0
for (var i in objdata) {
total += objdata[i]
}
return total
}
getAccess(() => {
init();
});
\ No newline at end of file
static/js/md5.js
View file @ d3472e8b
This diff is collapsed.
static/js/public.js
View file @ d3472e8b
......@@ -76,10 +76,6 @@ function getHeader() {
<p class="tab-item" id="htjc-item"><a href='/screen/pages/htjc.html'>回弹检测</a></p>
<span class="icon_font icon-vertical_line"></span>
</div>
<div class="sub-tab hiddenImportant">
<p class="tab-item" id="gjjc-item"><a href='/screen/pages/gjjc.html'>钢筋检测</a></p>
<span class="icon_font icon-vertical_line"></span>
</div>
</div>
<div class="back-item" onclick="back()">后台管理</div>
<div class="user-info">
......@@ -93,7 +89,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) {
......@@ -131,7 +127,7 @@ function showPopup(url, title) {
type: 2,
shadeClose: true,
maxmin: true,
title: "<p class='popup-title'>" + title + "</p>",
title: "<p class='popup-title'>" + title + "</p >",
area: ['9rem', '6rem'],
content: url,
end: function () {
......@@ -143,7 +139,7 @@ function showPopup(url, title) {
type: 1,
shadeClose: true,
maxmin: true,
title: "<p class='popup-title'>" + title + "</p>",
title: "<p class='popup-title'>" + title + "</p >",
area: ['9rem', '6rem'],
content: $('#popup-info'),
end: function () {
......@@ -153,7 +149,6 @@ function showPopup(url, title) {
}
});
}
}
$(function () {
window.onresize = function () {
......@@ -171,14 +166,14 @@ $(function () {
})
});
const imgURL = '/';
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 newBaseURL_htjc = `${window.location.protocol}//detectapi.cnjsjd.net/api/`
const baseURL_Utility = 'https://jtjc.vnet1000.net/Ajax/Screen/Utility/';
const baseURL_Utility = '/Ajax/Screen/Utility/';
window._AMapSecurityConfig = {
securityJsCode: '0711374220aba81dbf7515aaac08e50b',
......
static/js/xcjc.js
View file @ d3472e8b
......@@ -268,15 +268,11 @@ var getLeftData = {
$(".content .left-item .panel2 .panel-info").html('<div class="noData">暂无数据</div>');
}
},
// 视频通话
videoConnection(target_op_code){
<<<<<<< static/js/xcjc.js
window.open('https://detect.cnjsjd.net/VideoConnection.aspx?target_op_code='+target_op_code);
// showPopup('http://detect.cnjsjd.net/VideoConnection.aspx?target_op_code='+target_op_code, '视频通话');
=======
window.open('https://detect.cnjsjd.net/VideoConnection.aspx?target_op_code=' + target_op_code);
>>>>>>> static/js/xcjc.js
}
    // 视频通话
    videoConnection(target_op_code){
        window.open('https://detect.cnjsjd.net/VideoConnection.aspx?target_op_code='+target_op_code);
        // showPopup('http://detect.cnjsjd.net/VideoConnection.aspx?target_op_code='+target_op_code, '视频通话');
    }
}
var getCenterData = {
......
static/js/zjjc.js
View file @ d3472e8b
......@@ -337,6 +337,7 @@ var getLeftdata = {
map.getMap(data);
},
error: function (jqXHR) {
map.getMap([]);
console.log("发生错误：" + jqXHR.status);
}
})
......
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