diff --git a/img/back/back.png b/img/back/back.png new file mode 100644 index 0000000..9f23e4a Binary files /dev/null and b/img/back/back.png differ diff --git a/js/consQuality/consQuality.js b/js/consQuality/consQuality.js index 7663f26..7a495e4 100644 --- a/js/consQuality/consQuality.js +++ b/js/consQuality/consQuality.js @@ -336,13 +336,13 @@ function initHistory(){ }, cols: [[ {type: 'numbers', title: '序号'}, // 添加序号列 - {field: 'areaName', align: 'center', title: '区域名称'}, + // {field: 'areaName', align: 'center', title: '区域名称'}, {field: 'deviceName', align: 'center', title: '设备名称'}, {field: 'moduleName', align: 'center', title: '施工工艺'}, {field: 'changeVal', align: 'center', title: '变化值'}, {field: 'val', align: 'center', title: '检测值'}, {field: 'createTime', align: 'center', title: '检测时间'}, - {field: 'isWarn', align: 'center', title: '是否告警'}, + // {field: 'isWarn', align: 'center', title: '是否告警'}, ]], initComplete: function () { // 在表格渲染完成后，重新渲染序号列 diff --git a/js/pages/accessMge/accessMge.js b/js/pages/accessMge/accessMge.js index d3a4152..f505c7b 100644 --- a/js/pages/accessMge/accessMge.js +++ b/js/pages/accessMge/accessMge.js @@ -453,4 +453,4 @@ function exportPerData() { }, function (xhr, status, error) { errorFn(xhr, status, error) }, aqEnnable); -} \ No newline at end of file +} diff --git a/js/pages/home/navigation.js b/js/pages/home/navigation.js index 6f3ba45..4d9d36c 100644 --- a/js/pages/home/navigation.js +++ b/js/pages/home/navigation.js @@ -202,7 +202,7 @@ function setMenusData(data) { // html += '

  • ' + item.menuName + '

    • ' } }) - // html += '

  • 安全帽

    • ' + html += '

  • 安全帽

    • ' } $('#nav-right ul').empty().append(html); } diff --git a/js/pages/index/indexAjax.js b/js/pages/index/indexAjax.js index 568a146..233c2b0 100644 --- a/js/pages/index/indexAjax.js +++ b/js/pages/index/indexAjax.js @@ -30,7 +30,7 @@ function loadProBrief(montageParam) { html += '
    ' }) } else { - html += '
    ' + html += '
    ' } $('#img-carousel').empty().append(html); $('#pro-desc p').html(proBrief); @@ -163,4 +163,4 @@ function loadProCost(montageParam) { initEchartsThree([], [],0); } } -} \ No newline at end of file +} diff --git a/js/pages/video/video.js b/js/pages/video/video.js index 5adcdd3..e414e9e 100644 --- a/js/pages/video/video.js +++ b/js/pages/video/video.js @@ -21,9 +21,9 @@ layui.config({ const nodeId = obj.param.nodeId; let puid = nodeId.replace('QJ', ''); let online = puid.substring(puid.length - 1, puid.length); - if(online === '0'){ - return parent.layer.msg("设备离线",{icon:7}); - } + // if(online === '0'){ + // return parent.layer.msg("设备离线",{icon:7}); + // } puid = puid.substring(0, puid.length - 2); if (puid) { parent.layer.msg("视频加载中,请稍候...", { icon: 16, scrollbar: false, time: 1000, }); diff --git a/js/personnelControl/personnelControl.js b/js/personnelControl/personnelControl.js index 15e74ce..45fd7d4 100644 --- a/js/personnelControl/personnelControl.js +++ b/js/personnelControl/personnelControl.js @@ -24,7 +24,7 @@ layui.use(['layer', 'element', 'table', 'tree'], function () { } }) - // mapInit(); + mapInit(); //人员列表 PersonnelList(); diff --git a/js/publics/shuiYin.js b/js/publics/shuiYin.js index 53c095e..5035074 100644 --- a/js/publics/shuiYin.js +++ b/js/publics/shuiYin.js @@ -1,8 +1,8 @@ -function addWatermark() { - const watermarkDiv = document.createElement('div'); - watermarkDiv.className = 'watermark'; - watermarkDiv.textContent = '大大的水印'; // 可以根据需要动态生成内容 - document.body.appendChild(watermarkDiv); - } - // 调用函数 - window.onload = addWatermark; \ No newline at end of file +// function addWatermark() { +// const watermarkDiv = document.createElement('div'); +// watermarkDiv.className = 'watermark'; +// watermarkDiv.textContent = '大大的水印'; // 可以根据需要动态生成内容 +// document.body.appendChild(watermarkDiv); +// } +// // 调用函数 +// window.onload = addWatermark; diff --git a/pages/accessMge/accessMge.html b/pages/accessMge/accessMge.html index c550835..8d9caa8 100644 --- a/pages/accessMge/accessMge.html +++ b/pages/accessMge/accessMge.html @@ -26,7 +26,7 @@
    -
    +
    @@ -95,14 +95,14 @@
    - +
    异常告警
    - +
    @@ -110,7 +110,7 @@
    - +
    @@ -118,8 +118,8 @@ class="layui-input">
    - - + +
    @@ -127,7 +127,7 @@ class="layui-input">
    - +
    @@ -135,13 +135,13 @@ class="layui-input">
    - +
    - +
    @@ -149,17 +149,17 @@
    - +
    - +
    -
    +
    @@ -228,14 +228,14 @@
    - +
    异常告警
    - +
    @@ -243,7 +243,7 @@
    - +
    @@ -251,8 +251,8 @@ class="layui-input">
    - - + +
    @@ -260,7 +260,7 @@ class="layui-input">
    - +
    @@ -268,7 +268,7 @@ class="layui-input">
    - +
    @@ -281,11 +281,11 @@
    - +
    - +
    @@ -293,4 +293,4 @@
    - \ No newline at end of file + diff --git a/pages/consQuality/consQuality.html b/pages/consQuality/consQuality.html index 52a1d17..83c18cc 100644 --- a/pages/consQuality/consQuality.html +++ b/pages/consQuality/consQuality.html @@ -148,4 +148,4 @@
    - \ No newline at end of file + diff --git a/pages/consQuality/consQualityList.html b/pages/consQuality/consQualityList.html index e1c14d1..b4d40fd 100644 --- a/pages/consQuality/consQualityList.html +++ b/pages/consQuality/consQualityList.html @@ -4,8 +4,8 @@ - - + + @@ -25,7 +25,7 @@
    -
    +
    @@ -66,4 +66,4 @@
    - \ No newline at end of file + diff --git a/pages/dataAnalysis/dataAnalysis.html b/pages/dataAnalysis/dataAnalysis.html index 5d8abf2..ddd2979 100644 --- a/pages/dataAnalysis/dataAnalysis.html +++ b/pages/dataAnalysis/dataAnalysis.html @@ -23,7 +23,7 @@
    @@ -64,10 +64,10 @@
    - +
    - \ No newline at end of file + diff --git a/pages/personnelControl/personnelControl.html b/pages/personnelControl/personnelControl.html index db5e044..828d2dd 100644 --- a/pages/personnelControl/personnelControl.html +++ b/pages/personnelControl/personnelControl.html @@ -16,11 +16,10 @@ - - - - + + + @@ -83,4 +82,4 @@
    - \ No newline at end of file + diff --git a/pages/video/video.html b/pages/video/video.html index 2960d15..bdb472f 100644 --- a/pages/video/video.html +++ b/pages/video/video.html @@ -163,18 +163,6 @@ - - - - - - - - - - - -
    @@ -248,4 +236,4 @@ - \ No newline at end of file +