From 73dec3abfe6a6126b1dbd773fbed289fe89549cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Tue, 14 Dec 2021 09:07:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E6=89=A7=E6=B3=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/js/project/basis/basisDetail.js | 3 +++ .../static/js/project/complaint/complaintAdd.js | 5 +++++ .../js/project/complaint/complaintDetail.js | 7 ++++++- .../static/js/project/notice/noticeDetail.js | 3 +++ .../static/js/project/scheme/schemeDetail.js | 3 +++ .../static/js/project/work/workDetail.js | 3 +++ .../view/basis/basisDetail.html | 14 +++++++++++--- .../view/basis/basisList.html | 2 +- .../view/complaint/complaintAdd.html | 12 ++++++------ .../view/complaint/complaintDetail.html | 16 ++++++++++------ .../view/noticeAnnouncement/noticeDetail.html | 12 ++++++++++-- .../view/schemeDisclosure/schemeDetail.html | 12 ++++++++++-- .../view/workDynamics/workDetail.html | 12 ++++++++++-- 13 files changed, 81 insertions(+), 23 deletions(-) diff --git a/agriculturalLawEnforcement/static/js/project/basis/basisDetail.js b/agriculturalLawEnforcement/static/js/project/basis/basisDetail.js index df21948..514547e 100644 --- a/agriculturalLawEnforcement/static/js/project/basis/basisDetail.js +++ b/agriculturalLawEnforcement/static/js/project/basis/basisDetail.js @@ -39,6 +39,9 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa $("#newTime").html('发布时间：'+content.newsTime); $("#newCome").html('来源：'+content.createBy); $("#newContent").html(content.content); + if (document.body.scrollHeight > document.body.offsetHeight){ + document.getElementById('bottomInformation').style.position = 'relative'; + } } } diff --git a/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js b/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js index 0cbc4b8..22609f2 100644 --- a/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js +++ b/agriculturalLawEnforcement/static/js/project/complaint/complaintAdd.js @@ -17,6 +17,11 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa module.init = function (page) { tools.doGet(getTopDeptId, {}, module.getInformation , true); + if (document.body.scrollHeight <= document.body.offsetHeight){ + document.getElementById('bottomInformation').style.position = 'fixed'; + document.getElementById('bottomInformation').style.bottom = '0'; + + } }; module.getInformation = function (data) { diff --git a/agriculturalLawEnforcement/static/js/project/complaint/complaintDetail.js b/agriculturalLawEnforcement/static/js/project/complaint/complaintDetail.js index 0d1b020..40e589f 100644 --- a/agriculturalLawEnforcement/static/js/project/complaint/complaintDetail.js +++ b/agriculturalLawEnforcement/static/js/project/complaint/complaintDetail.js @@ -18,7 +18,8 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa module.init = function (page) { //新闻管理列表 tools.doGet(dictType + '/communicate_type', {}, module.dictType , true); - tools.doGet(communicateDetail + '/' + getQueryVariable('id'), {}, module.newList , true); + + }; //获取地址栏参数 @@ -34,6 +35,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa module.dictType = function (data) { module.data.communicateOptions = data.data; + tools.doGet(communicateDetail + '/' + getQueryVariable('id'), {}, module.newList , true); } //新闻列表 @@ -45,6 +47,9 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa module.data.newList = content; var newData = template('newData', module.data); $("#newContent").html(newData); + if (document.body.scrollHeight > document.body.offsetHeight){ + document.getElementById('bottomInformation').style.position = 'relative'; + } } } diff --git a/agriculturalLawEnforcement/static/js/project/notice/noticeDetail.js b/agriculturalLawEnforcement/static/js/project/notice/noticeDetail.js index df21948..514547e 100644 --- a/agriculturalLawEnforcement/static/js/project/notice/noticeDetail.js +++ b/agriculturalLawEnforcement/static/js/project/notice/noticeDetail.js @@ -39,6 +39,9 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa $("#newTime").html('发布时间：'+content.newsTime); $("#newCome").html('来源：'+content.createBy); $("#newContent").html(content.content); + if (document.body.scrollHeight > document.body.offsetHeight){ + document.getElementById('bottomInformation').style.position = 'relative'; + } } } diff --git a/agriculturalLawEnforcement/static/js/project/scheme/schemeDetail.js b/agriculturalLawEnforcement/static/js/project/scheme/schemeDetail.js index d094e65..ff1bcd6 100644 --- a/agriculturalLawEnforcement/static/js/project/scheme/schemeDetail.js +++ b/agriculturalLawEnforcement/static/js/project/scheme/schemeDetail.js @@ -38,6 +38,9 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa module.data.newList = content; var newData = template('newData', module.data); $("#newContent").html(newData); + if (document.body.scrollHeight > document.body.offsetHeight){ + document.getElementById('bottomInformation').style.position = 'relative'; + } } } diff --git a/agriculturalLawEnforcement/static/js/project/work/workDetail.js b/agriculturalLawEnforcement/static/js/project/work/workDetail.js index df21948..514547e 100644 --- a/agriculturalLawEnforcement/static/js/project/work/workDetail.js +++ b/agriculturalLawEnforcement/static/js/project/work/workDetail.js @@ -39,6 +39,9 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa $("#newTime").html('发布时间：'+content.newsTime); $("#newCome").html('来源：'+content.createBy); $("#newContent").html(content.content); + if (document.body.scrollHeight > document.body.offsetHeight){ + document.getElementById('bottomInformation').style.position = 'relative'; + } } } diff --git a/agriculturalLawEnforcement/view/basis/basisDetail.html b/agriculturalLawEnforcement/view/basis/basisDetail.html index f4fb35a..ede38ca 100644 --- a/agriculturalLawEnforcement/view/basis/basisDetail.html +++ b/agriculturalLawEnforcement/view/basis/basisDetail.html @@ -15,11 +15,19 @@ .ql-align-center{ text-align: center; } + body{ + overflow: auto; + background: #f4f4f4; + } + .bottomInformation{ + position: fixed; + bottom: 0; + } -
+
@@ -37,7 +45,7 @@
  • 首页
    • -
  • 工作动态
    • +
  • 工作动态
  • 通知公告
  • 方案公开
  • 执法依据
    • @@ -66,7 +74,7 @@
    -
    +

    技术支持：北京农燊高科信息技术有限公司400-879-1505

    diff --git a/agriculturalLawEnforcement/view/basis/basisList.html b/agriculturalLawEnforcement/view/basis/basisList.html index e792ea1..be774f0 100644 --- a/agriculturalLawEnforcement/view/basis/basisList.html +++ b/agriculturalLawEnforcement/view/basis/basisList.html @@ -33,7 +33,7 @@
    • 首页
      • -
    • 工作动态
      • +
    • 工作动态
    • 通知公告
    • 方案公开
    • 执法依据
      • diff --git a/agriculturalLawEnforcement/view/complaint/complaintAdd.html b/agriculturalLawEnforcement/view/complaint/complaintAdd.html index 92422d6..424cb99 100644 --- a/agriculturalLawEnforcement/view/complaint/complaintAdd.html +++ b/agriculturalLawEnforcement/view/complaint/complaintAdd.html @@ -39,11 +39,15 @@ font-size: 16px; margin: 0 auto; } + body{ + overflow: auto; + background: #f4f4f4; + } -
      +
      @@ -133,11 +137,7 @@
      - - -
      - -
      +

      技术支持：北京农燊高科信息技术有限公司400-879-1505

      diff --git a/agriculturalLawEnforcement/view/complaint/complaintDetail.html b/agriculturalLawEnforcement/view/complaint/complaintDetail.html index 0ed80df..7cc7036 100644 --- a/agriculturalLawEnforcement/view/complaint/complaintDetail.html +++ b/agriculturalLawEnforcement/view/complaint/complaintDetail.html @@ -19,11 +19,19 @@ padding: 15px 0; width: 50%; } + body{ + overflow: auto; + background: #f4f4f4; + } + .bottomInformation{ + position: fixed; + bottom: 0; + } -
      +
      @@ -97,11 +105,7 @@
      - - -
      - -
      +

      技术支持：北京农燊高科信息技术有限公司400-879-1505

      diff --git a/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html b/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html index ef3e901..7e32565 100644 --- a/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html +++ b/agriculturalLawEnforcement/view/noticeAnnouncement/noticeDetail.html @@ -15,11 +15,19 @@ .ql-align-center{ text-align: center; } + body{ + overflow: auto; + background: #f4f4f4; + } + .bottomInformation{ + position: fixed; + bottom: 0; + } -
      +
      @@ -66,7 +74,7 @@
      -
      +

      技术支持：北京农燊高科信息技术有限公司400-879-1505

      diff --git a/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html b/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html index b57fa95..f99519c 100644 --- a/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html +++ b/agriculturalLawEnforcement/view/schemeDisclosure/schemeDetail.html @@ -46,11 +46,19 @@ padding: 0px 10px; margin-bottom: 5px; } + body{ + overflow: auto; + background: #f4f4f4; + } + .bottomInformation{ + position: fixed; + bottom: 0; + } -
      +
      @@ -175,7 +183,7 @@
      -
      +

      技术支持：北京农燊高科信息技术有限公司400-879-1505

      diff --git a/agriculturalLawEnforcement/view/workDynamics/workDetail.html b/agriculturalLawEnforcement/view/workDynamics/workDetail.html index 24fa156..abea647 100644 --- a/agriculturalLawEnforcement/view/workDynamics/workDetail.html +++ b/agriculturalLawEnforcement/view/workDynamics/workDetail.html @@ -15,11 +15,19 @@ .ql-align-center{ text-align: center; } + body{ + overflow: auto; + background: #f4f4f4; + } + .bottomInformation{ + position: fixed; + bottom: 0; + } -
      +
      @@ -64,7 +72,7 @@
      -
      +

      技术支持：北京农燊高科信息技术有限公司400-879-1505