辅助终端修改

cms/src/main/resources/application.yml

@@ -43,9 +43,10 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     # 本地开始
-    url: jdbc:mysql://192.168.0.100:3306/dt2_cms?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://localhost:3306/dt2_cms?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: root
     password: jd123456
+#    password: 123456
     # 本地结束
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
@@ -53,9 +54,10 @@ spring:
   redis:
     database: 0
     # 本地开始
-    host: 192.168.0.100
+    host: 23.37.100.81
     port: 6379
     password: jd123456
+#    password: 123456
     # 本地结束
     timeout: 5000
     lettuce:
@@ -151,7 +153,7 @@ login:
     #登录超时时间
     login-out-time : 30
     #免登陆接口，相对于根目录，多个以逗号隔开
-    removal-uris: /user/userLogin,/defaultImage/,/public/,/page/,/ftl/,/file/fileUpload,/article/saveFile,/article/articlePublish,/files/selectFile
+    removal-uris: /user/userLogin,/defaultImage/,/public/,/page/,/ftl/,/file/fileUpload,/article/saveFile,/article/articlePublish,/files/selectFile,/files/getNotices,/files/getQYYFiles
   specialChar:
     #不被转义字符的uri,多个以“,”隔开
     filterUris: 

cms/src/main/resources/static/ftl/fzzd/dhl/dtgk/lsyg.ftl

@@ -1,10 +1,9 @@
 <div class="time-line">
-    <ul class="time-top">
-        <div class="center-line"></div>
-        <img src="/${data.websiteInfo.rootPath }/public/img/run-man.png"/>
-        <#if data.articleList?size gt 0>
+    <#if data.articleList?size gt 0 >
+<#--        && (data.articleList?size)%5-->
+        <div class="one">
             <#list data.articleList?reverse as article>
-                <li class="time-item">
+                <div>
                     <p class="flag">
                         <i></i>
                     </p>
@@ -16,12 +15,48 @@
                             ${article.content}
                         </p>
                     </div>
-                </li>
+                </div>
             </#list>
-        </#if>
-    </ul>
+        </div>
+    </#if>
 </div>
 
+<#--<ul class="time-top">-->
+<#--    <div class="center-line"></div>-->
+<#--    <img src="/${data.websiteInfo.rootPath }/public/img/run-man.png"/>-->
+<#--    <#if data.articleList?size gt 0>-->
+<#--        <#list data.articleList?reverse as article>-->
+<#--            <li class="time-item">-->
+<#--                <p class="flag">-->
+<#--                    <i></i>-->
+<#--                </p>-->
+<#--                <div class="contan-box">-->
+<#--                    <div class="item-title">-->
+<#--                        ${article.title}-->
+<#--                    </div>-->
+<#--                    <p class="item-cont">-->
+<#--                        ${article.content}-->
+<#--                    </p>-->
+<#--                </div>-->
+<#--            </li>-->
+<#--        </#list>-->
+<#--    </#if>-->
+<#--</ul>-->
+<#--<div class="one">-->
+<#--    <div>-->
+<#--        <p class="flag">-->
+<#--            <i></i>-->
+<#--        </p>-->
+<#--        <div class="contan-box">-->
+<#--            <div class="item-title">-->
+<#--                1985-->
+<#--            </div>-->
+<#--            <p class="item-cont">-->
+<#--                重庆市城市建设局科技技术情报站成立-->
+<#--            </p>-->
+<#--        </div>-->
+<#--    </div>-->
+<#--</div>-->
 
 <#--<li class="time-item">-->
 <#--    <p class="flag">-->

cms/src/main/resources/static/ftl/fzzd/dhl/hdgn/wjll.ftl

@@ -29,6 +29,8 @@
             width: 100%;
             height: 100%;
             background-color: #FFFFFF;
+            background: url(/fzzd/public/img/bg.png) bottom center no-repeat;
+            background-size: cover;
         }
 
         .box .back {
@@ -39,47 +41,45 @@
             background-color: #000000;
         }
 
-        .back_list {
+        .crumbs {
             position: absolute;
-            top: 5%;
-            right: 5%;
-            width: 15%;
-            z-index: 9999;
+            top: 3%;
+            left: 2%;
             display: flex;
             align-items: center;
-            justify-content: flex-end;
-        }
-
-        .back_list > div {
             font-size: 18px;
-            width: 50%;
-            text-align: center;
-            border-radius: 5px;
-            padding: 5% 0;
+            width: 80%;
+            z-index: 100;
         }
 
-        .back_list .back {
-            color: #FFFFFF;
-            background-color: #ff0000;
+        .crumbs>span {
+            margin: 0 0.5%;
         }
 
-        .back_list .wj_list {
-            margin-left: 1%;
-            color: #297CC2;
-            background-color: #D5E8F6;
+        .crumbs .cur {
+            color: #8BBBDF;
         }
 
-        .file_list {
+        .box-wj {
             position: absolute;
             top: 50%;
             left: 50%;
             transform: translate(-50%, -50%);
+            width: 90%;
+            height: 70%;
+            box-shadow: 0px 1px 9px 0px rgba(0, 0, 0, 0.13);
+            border-radius: 16px;
+            overflow: hidden;
+        }
+
+        .file_list {
             z-index: 1000;
             display: flex;
             align-content: baseline;
             flex-wrap: wrap;
-            width: 70%;
-            height: 60%;
+            width: 100%;
+            height: 87%;
+            overflow-y: scroll;
             border-radius: 5px;
             background-color: #FFFFFF;
         }
@@ -93,7 +93,7 @@
             margin-top: 1%;
         }
 
-        .file_item > img {
+        .file_item>img {
             width: 50%;
         }
 
@@ -105,23 +105,25 @@
             display: -webkit-box;
             -webkit-line-clamp: 2;
             -webkit-box-orient: vertical;
-            font-size: 12px;
+            font-size: 14px;
         }
 
         .show {
-            display: flex;
-            justify-content: flex-end;
+            display: none;
+            justify-content: center;
             width: 100%;
             height: 100%;
             overflow: auto;
             background-color: #FFFFFF;
+            background: url(/fzzd/public/img/bg.png) bottom center no-repeat;
+            background-size: cover;
         }
 
         .show::-webkit-scrollbar {
             width: 0;
         }
 
-        .show > img {
+        .show>img {
             position: relative;
             top: 50%;
             transform: translateY(-50%);
@@ -130,7 +132,7 @@
             margin-right: 2%;
         }
 
-        .show > video {
+        .show>video {
             position: relative;
             top: 50%;
             transform: translateY(-50%);
@@ -146,97 +148,97 @@
         }
 
         .file_ass {
-            position: absolute;
-            top: 0;
-            left: -15%;
-            width: 15%;
-            height: 100%;
-            overflow: auto;
-            z-index: 30;
-            transition: all 0.5s linear;
-            background-color: #FFFFFF;
+            display: flex;
+            align-items: center;
+            width: 100%;
+            height: 13%;
+            background-color: #8EB9E1;
         }
 
         .file_ass::-webkit-scrollbar {
             width: 0;
         }
 
-        .file_ass .title_ass {
-            width: 100%;
-            height: 40px;
-            line-height: 40px;
-            text-align: center;
-            font-weight: 550;
-            color: #333;
-            font-size: 18px;
-            border-bottom: 1px solid #ccc;
-        }
-
         .file_ass .ass_item {
             display: flex;
             align-items: center;
             justify-content: center;
-            width: 100%;
-            height: 10%;
+            width: 20%;
+            height: 100%;
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
-            border-bottom: 1px solid rgba(147, 147, 147, 0.4);
+            color: #FFFFFF;
+            font-size: 20px;
         }
 
         .ass_active {
-            color: #2D8FCE;
-            background-color: #C0DAED;
+            color: #FFFFFF;
+            background-color: #1F7ABF;
         }
 
-        .ass_shrink {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            position: absolute;
-            left: 0%;
-            top: 1%;
-            z-index: 30;
-            width: 3%;
-            height: 40px;
-            border-radius: 5px;
-            transition: all 0.5s linear;
-            background-color: rgba(4, 108, 183, 0.25);
+        .back-ztzs {
+            position: fixed;
+            top: 4%;
+            right: 2%;
+            width: 4%;
+            padding: 0.5%;
+            border-radius: 10px;
+            background-color: #1F7ABF;
+            z-index: 100;
         }
 
-        .ass_shrink > img {
-            width: 60%;
+        .back-ztzs>img {
+            width: 100%;
         }
+
     </style>
 </head>
 
 <body>
-<ul class="file_ass" style="left: 0;">
-    <div class="title_ass">文件分类</div>
-    <#if data.subColumnInfo?size gt 0>
-        <#list data.subColumnInfo as column>
-            <#if column_index == 0>
-                <li class="ass_item" id="firstShow" data-iden="${column.rootPath}">${column.name}</li>
-            <#else>
-                <li class="ass_item" data-iden="${column.rootPath}">${column.name}</li>
-            </#if>
-        </#list>
-    </#if>
-</ul>
+<#--<ul class="file_ass" style="left: 0;">-->
+<#--    <div class="title_ass">文件分类</div>-->
+<#--    <#if data.subColumnInfo?size gt 0>-->
+<#--        <#list data.subColumnInfo as column>-->
+<#--            <#if column_index == 0>-->
+<#--                <li class="ass_item" id="firstShow" data-iden="${column.rootPath}">${column.name}</li>-->
+<#--            <#else>-->
+<#--                <li class="ass_item" data-iden="${column.rootPath}">${column.name}</li>-->
+<#--            </#if>-->
+<#--        </#list>-->
+<#--    </#if>-->
+<#--</ul>-->
 <!-- 收缩文件分类 -->
 <div class="ass_shrink" style="display: none;">
     <img src="/${data.websiteInfo.rootPath }/public/img/bottom.png" style="transform: rotate(90deg);"/>
 </div>
 <!-- 返回和文件列表 -->
-<div class="back_list">
-    <div class="wj_list" style="display: none;">文件列表</div>
-    <div class="back">返回</div>
+<div class="crumbs">
+    <div class="back_wjts">互动功能</div>
+    <span>&gt;</span>
+    <div class="cur">文件浏览</div>
 </div>
 <!-- 文件列表 -->
-<div class=" ">
-    <ul class="file_list">
+<div class="box">
+    <div class="box-wj">
+        <ul class="file_ass" style="left: 0;">
+            <#if data.subColumnInfo?size gt 0>
+                <#list data.subColumnInfo as column>
+                    <#if column_index == 0>
+                        <li class="ass_item" id="firstShow" data-iden="${column.rootPath}">${column.name}</li>
+                    <#else>
+                        <li class="ass_item" data-iden="${column.rootPath}">${column.name}</li>
+                    </#if>
+                </#list>
+            </#if>
+        </ul>
+        <ul class="file_list">
 
-    </ul>
+        </ul>
+    </div>
+</div>
+<div class="back-ztzs" style="display: none;">
+    <img src="/fzzd/public/img/back-ztzs.png" />
 </div>
 <!-- 显示 -->
 <div class="show">
@@ -254,16 +256,15 @@
 <script src="/${data.websiteInfo.rootPath }/public/js/constant.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript">
 
-    $(".back_list").on("click", ".back", function () {
+    $(".crumbs").on("click", ".back_wjts", function() {
         location.href = "/${data.websiteInfo.rootPath }/dhl/hdgn/list.html"
     })
 
     $(".file_list").on("click", ".file_item", function () {
         $(".box").css("display", "none")
         $(".show").css("display", "flex")
-        $(".wj_list").css("display", "block")
         $(".file_list").css("display", "none")
-
+        $(".back-ztzs").css("display", "block")
         // 判断点击的当前元素是否选中
         if (!$(this).hasClass("file_active")) {
             // 删除其他兄弟元素的选中
@@ -291,31 +292,41 @@
     })
 
 
-    $(".back_list").on("click", ".wj_list", function () {
+    <#--$(".back_list").on("click", ".wj_list", function () {-->
+    <#--    $(this).css("display", "none")-->
+    <#--    // $(".show").css("display", "none")-->
+    <#--    // $(".box").css("display", "block")-->
+    <#--    &lt;#&ndash;location.href = "/${data.websiteInfo.rootPath }/dhl/hdgn/wjll/list.html"&ndash;&gt;-->
+    <#--    hideFile();-->
+    <#--})-->
+    // $(".crumbs").on("click", ".cur", function() {
+    //     $(".back-ztzs").css("display", "none")
+    //     // hideFile()
+    //     $(".file_list").css("display", "flex")
+    // })
+    $(".back-ztzs").on("click", function() {
+        $(".show").css("display", "none")
+        $(".box").css("display", "block")
+        $(".file_list").css("display", "flex")
         $(this).css("display", "none")
-        // $(".show").css("display", "none")
-        // $(".box").css("display", "block")
-        <#--location.href = "/${data.websiteInfo.rootPath }/dhl/hdgn/wjll/list.html"-->
-        hideFile();
     })
-
     // 文件分类
-    var idenNum = 1
-    $("body").on("click", ".ass_shrink", function () {
-        if (idenNum == 0) {
-            // 收起
-            $(".file_ass").css("left", "-15%")
-            $(this).css("left", "0")
-            $(this).find("img").attr("src", "img/bottom.png")
-            idenNum += 1
-        } else {
-            // 展开
-            $(".file_ass").css("left", "0")
-            $(this).css("left", "15%")
-            $(this).find("img").attr("src", "img/top.png")
-            idenNum = 0
-        }
-    })
+    // var idenNum = 1
+    // $("body").on("click", ".ass_shrink", function () {
+    //     if (idenNum == 0) {
+    //         // 收起
+    //         $(".file_ass").css("left", "-15%")
+    //         $(this).css("left", "0")
+    //         $(this).find("img").attr("src", "img/bottom.png")
+    //         idenNum += 1
+    //     } else {
+    //         // 展开
+    //         $(".file_ass").css("left", "0")
+    //         $(this).css("left", "15%")
+    //         $(this).find("img").attr("src", "img/top.png")
+    //         idenNum = 0
+    //     }
+    // })
 
     // 点击文件分类并加载相应文件库
     $(".file_ass").on("click", ".ass_item", function () {
@@ -425,7 +436,7 @@
     // 隐藏文件
     function hideFile() {
         // 隐藏文件列表标签
-        $(".wj_list").css("display", "none")
+        // $(".wj_list").css("display", "none")
         // 隐藏打开中的文件
         var fileIden = $(".file_list").find(".file_active ").attr("data-iden")
         console.log(fileIden)
@@ -435,7 +446,7 @@
             $(".show").find(".show_pdf").css("display", "none")
         }
         // 显示文件列表
-        $(".file_list").css("display", "")
+        $(".file_list").css("display", "flex")
     }
 </script>
 </body>

cms/src/main/resources/static/ftl/fzzd/dhl/hdgn/wjts.ftl

@@ -16,6 +16,8 @@
         body {
             width: 100%;
             height: 100%;
+            background: url(/fzzd/public/img/bg.png) bottom center no-repeat;
+            background-size: cover;
         }
 
         .file_input {
@@ -54,7 +56,7 @@
             z-index: 100;
         }
 
-        .look_xz > div {
+        .look_xz>div {
             display: flex;
             align-items: center;
             justify-content: center;
@@ -69,8 +71,8 @@
         }
 
         .look_xz .sh_look {
-            color: #333;
-            border: 1px solid #333;
+            color: #207DC2;
+            border: 1px solid #207DC2;
             background-color: #fff;
         }
 
@@ -78,29 +80,46 @@
             position: absolute;
             display: flex;
             align-items: center;
+            top: 40%;
         }
 
         .st-put .put_wj {
-            width: 120px;
+            width: 156px;
             height: 50px;
             line-height: 50px;
             border: 1px solid transparent;
             padding: 0 18px;
-            background-color: #207DC2;
             color: #fff;
             white-space: nowrap;
             text-align: center;
-            font-size: 14px;
+            font-size: 18px;
             border-radius: 2px;
             cursor: pointer;
+            border-bottom-right-radius: 25px;
+            border-top-right-radius: 25px;
+            background-image: linear-gradient(to right, #0451A3, #207DC2, #2C8ECD);
         }
 
-        .st-put > input {
-            width: 370px;
+        .st-put>input {
+            width: 450px;
             height: 50px;
             font-size: 18px;
+            border-bottom-left-radius: 25px;
+            border-top-left-radius: 25px;
             outline: none;
             background-color: #fff;
+            text-indent: 3em;
+            border-color: #1168B3;
+            border-right: none;
+        }
+
+        .st-put>i {
+            position: absolute;
+            transform: translateY(-50%);
+            top: 53%;
+            left: 4%;
+            font-size: 24px;
+            color: #6D6D6D;
         }
 
         .fail {
@@ -117,32 +136,38 @@
             background-color: #fff;
         }
 
-        .fail > span {
+        .fail>span {
             margin-left: 5%;
         }
 
-        .back_wjts {
+        .crumbs {
             position: absolute;
-            top: 5%;
-            right: 1%;
+            top: 3%;
+            left: 2%;
+            display: flex;
+            align-items: center;
             font-size: 18px;
-            width: 10%;
-            text-align: center;
-            border-radius: 5px;
-            padding: 1% 0;
-            color: #FFFFFF;
-            background-color: #ff0000;
+            width: 80%;
+        }
+
+        .crumbs>span {
+            margin: 0 0.5%;
+        }
+
+        .crumbs .cur {
+            color: #8BBBDF;
         }
     </style>
 </head>
 
 <body>
 <div class="file_input">
-    <form action="#">
+    <form hidden action="#">
         <input type="file" id="put_file" accept="image/png,image/jpeg,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,
         video/mp4,application/msword,application/pdf,application/vnd.ms-powerpoint"/>
     </form>
     <div class="st-put">
+        <i class="iconfont icon-wenjian"></i>
         <input type="text" id="choiceFile" readonly placeholder="请选择文件">
         <div class="put_wj">上传文件</div>
     </div>
@@ -158,8 +183,13 @@
     <img src="/${data.websiteInfo.rootPath }/public/img/fail.png"/>
     <span>文件上传失败</span>
 </div>
-<div class="back_wjts">
-    返回
+<#--<div class="back_wjts">-->
+<#--    返回-->
+<#--</div>-->
+<div class="crumbs">
+    <div class="back_wjts">互动功能</div>
+    <span>&gt;</span>
+    <div class="cur">临时文件推送</div>
 </div>
 <script src="/${data.websiteInfo.rootPath }/public/js/jquery-3.5.1.min.js"></script>
 <script src="/${data.websiteInfo.rootPath }/public/js/constant.js"></script>

cms/src/main/resources/static/ftl/fzzd/index/dtgk.ftl

@@ -82,7 +82,7 @@
         <!-- 工作掠影 -->
         <div class="gzly-box" style="display: none;">
             <div class="pre">
-                <img src="/${data.websiteInfo.rootPath }/public/img/zuoqiehuan.png" />
+                <img src="/${data.websiteInfo.rootPath }/public/img/left.png" />
             </div>
             <div class="swiper">
                 <div class="swiper-wrapper">
@@ -109,7 +109,7 @@
                 </div>
             </div>
             <div class="next">
-                <img src="/${data.websiteInfo.rootPath }/public/img/youqiehuan.png" />
+                <img src="/${data.websiteInfo.rootPath }/public/img/right.png" />
             </div>
         </div>
         <!-- 荣誉奖牌 -->

cms/src/main/resources/static/ftl/fzzd/index/hdgn.ftl

@@ -35,7 +35,7 @@
             if (iden == "wjll") {
                 location.href = "/fzzd/dhl/hdgn/wjll/list.html"
             } else if (iden == "xxtx") {
-                location.href = "/fzzd/dhl/hdgn/xxtx/list.html"
+                // location.href = "/fzzd/dhl/hdgn/xxtx/list.html"
             } else if (iden == "wjts") {
                 location.href = "/fzzd/dhl/hdgn/wjts/list.html"
             }

cms/src/main/resources/static/ftl/fzzd/index/xczs.ftl

@@ -19,10 +19,13 @@
             position: absolute;
             z-index: -1;
             top: -3.3%;
-            left: -109.15%;
-            width: 7%;
+            left: -112.15%;
+            width: 10%;
             height: 99%;
             list-style: none;
+            display: flex;
+            flex-direction: column;
+            align-items: flex-end;
         }
 
         .scene-tab .tab-text {
@@ -31,18 +34,36 @@
             justify-content: center;
             flex-direction: column;
             text-align: center;
-            width: 100%;
+            width: 80%;
             height: 20%;
             padding: 0;
-            color: #656565;
-            background-color: #9FCDEB;
+            color: #FFFFFF;
             border-top-left-radius: 5px;
             border-bottom-left-radius: 5px;
         }
 
+        .scene-tab .tab-text:nth-child(1) {
+            background-color: #1B5688;
+        }
+
+        .scene-tab .tab-text:nth-child(2) {
+            background-color: #FF9757;
+        }
+
+        .scene-tab .tab-text:nth-child(3) {
+            background-color: #01A7E4;
+        }
+
+        .scene-tab .tab-text:nth-child(4) {
+            background-color: #2EC191;
+        }
+
+        .scene-tab .tab-text:nth-child(5) {
+            background-color: #FF6F47;
+        }
+
         .active-scene {
-            color: #FFFFFF !important;
-            background-color: #449ED7 !important;
+            width: 100% !important;
         }
     </style>
 </head>
@@ -56,13 +77,13 @@
             <#list data.subColumnInfo as column>
                 <#if column_index == 0>
                 <#--                    <#assign active = " active-scene">-->
-                    <li class="tab-text active-scene" data-code="${column.rootPath}">
+                    <li class="tab-text active-scene" data-code="${column.rootPath}" data-img="${column_index + 1}">
                         <#list 1..column.name?length as i>
                             <span>${column.name?substring(i-1,i)}</span>
                         </#list>
                     </li>
                 <#else>
-                    <li class="tab-text" data-code="${column.rootPath}">
+                    <li class="tab-text" data-code="${column.rootPath}" data-img="${column_index + 1}">
                         <#list 1..column.name?length as i>
                             <span>${column.name?substring(i-1,i)}</span>
                         </#list>
@@ -176,9 +197,11 @@
         $(".scene-tab").on("click", ".tab-text", function () {
             currentPage = 0;
             const bool = $(this).hasClass("active-scene")
+            const imgId = $(this).attr("data-img")
             if (!bool) {
                 $(this).siblings(".tab-text").removeClass("active-scene")
                 $(this).addClass("active-scene")
+                $("body").css({ "background": "url(/fzzd/public/img/" + imgId + ".png) 75% center no-repeat", "background-size": "92% 90%" })
             }
             // 获取标识属性
             var code = $(this).attr("data-code")

cms/src/main/resources/static/ftl/fzzd/public/css/index_lbfz.css

@@ -1,17 +1,18 @@
-*{
+* {
 	margin: 0;
 	padding: 0;
 	box-sizing: border-box;
 	font-family: "Microsoft YaHei";
 }
 
-html,body{
+html,
+body {
 	width: 100%;
 	height: 100%;
 	background-color: #E8E8F0;
 }
 
-li{
+li {
 	list-style: none;
 }
 
@@ -22,9 +23,10 @@ li{
        url('/fzzd/public/font/iconfont.ttf?t=1649485663505') format('truetype');
 }
 
+
 /* 头部 */
 
-.header{
+.header {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
@@ -32,27 +34,27 @@ li{
 	height: 8%;
 	padding: 0 2%;
 	background-color: #1aadec;
-	background-image: linear-gradient(to right,#0451A3,#207DC2,#2C8ECD);
+	background-image: linear-gradient(to right, #0451A3, #207DC2, #2C8ECD);
 }
 
-.header .head_left{
+.header .head_left {
 	display: flex;
 	align-items: center;
 	cursor: default;
 }
 
-.head_left>img{
+.head_left>img {
 	height: 30px;
 	margin-right: 10px;
 }
 
-.head_left>i{
+.head_left>i {
 	font-size: 25px;
 	font-weight: 550;
 	color: #D5D5D6;
 }
 
-.header .head_right>button{
+.header .head_right>button {
 	width: 95px;
 	height: 40px;
 	border: 1px solid #fff;
@@ -63,7 +65,7 @@ li{
 	background-color: transparent;
 }
 
-.header .head_right .swith{
+.header .head_right .swith {
 	font-size: 18px;
 	color: #FFFFFF;
 	margin-right: 10px;
@@ -71,26 +73,27 @@ li{
 
 
 /* 主体 */
-main{
+
+main {
 	width: 100%;
 	height: 92%;
 	padding: 1%;
 }
 
-.main-tab{
+.main-tab {
 	width: 100%;
 	height: 8%;
 	box-shadow: 0px 4px 13px rgb(147 147 147 / 50%);
 }
 
-.main-tab .tab-list{
+.main-tab .tab-list {
 	display: flex;
 	align-items: center;
 	width: 100%;
 	height: 100%;
 }
 
-.tab-list .tab-item{
+.tab-list .tab-item {
 	display: flex;
 	align-items: center;
 	justify-content: center;
@@ -104,16 +107,16 @@ main{
 	background-color: #fff;
 }
 
-.tab-list .tab-item:nth-child(4){
+.tab-list .tab-item:nth-child(4) {
 	border-right: none;
 }
 
-.tab-item-act{
+.tab-item-act {
 	color: #FFFFFF !important;
-	background-image: linear-gradient(to right,#0451A3,#207DC2,#2C8ECD);
+	background-image: linear-gradient(to right, #0451A3, #207DC2, #2C8ECD);
 }
 
-section{
+section {
 	width: 100%;
 	height: 92%;
 	border-radius: 5px;
@@ -121,4 +124,5 @@ section{
 	box-shadow: 0px 4px 13px rgb(147 147 147 / 50%);
 }
 
-/* 宣传展示 */
+
+/* 宣传展示 */

cms/src/main/resources/static/ftl/fzzd/public/css/indexb.css

@@ -75,6 +75,8 @@ li {
 	position: relative;
 	width: 100%;
 	height: 100%;
+	background: url(/fzzd/public/img/bg.png) bottom center no-repeat;
+	background-size: cover;
 }
 
 
@@ -86,74 +88,109 @@ li {
 
 .lsyg-box .time-line{
 	position: relative;
-	height: 100%;
-}
-
-.time-line .center-line {
-	position: absolute;
-	bottom: 20%;
 	width: 100%;
-	height: 5px;
-	background-color: #0451A3;
+	height: 100%;
+	display: flex;
+	align-items: center;
+	overflow-x: scroll;
+	/* background: url(../img/licheng.png) top left no-repeat;
+    background-size: 100% 100%; */
 }
 
-.time-line img {
-	position: fixed;
-	bottom: 22.5%;
-	left: 50%;
+.one {
+	min-width: 100%;
+	height: 100%;
+	background: url(/fzzd/public/img/licheng.png) top left no-repeat;
+	background-size: 100% 100%;
 }
 
-.time-top {
-	position: relative;
-	display: flex;
-	align-items: center;
-	justify-content: flex-start;
-	width: 100%;
+.two {
+	min-width: 100%;
 	height: 100%;
-	overflow-y: scroll;
+	background: url(/fzzd/public/img/licheng1.png) top left no-repeat;
+	background-size: 100% 100%;
 }
 
-.time-top .time-item {
+.time-line>div {
 	position: relative;
-	bottom: -5%;
-	min-width: 200px;
-	height: 50%;
-	padding-right: 35px;
-	box-sizing: content-box;
 }
 
-.time-top .time-item::after {
-	content: "";
+.time-line>div>div {
 	position: absolute;
-	bottom: 0;
-	width: 100%;
-	height: 5px;
-	background-color: #0451A3;
+	width: 17%;
+	height: 40%;
+}
+
+.one>div:nth-child(1) {
+	top: 32%;
+	left: 6%;
+}
+
+.one>div:nth-child(2) {
+	top: 32%;
+	left: 25%;
+}
+
+.one>div:nth-child(3) {
+	top: 31%;
+	left: 44%;
+}
+
+.one>div:nth-child(4) {
+	height: 52% !important;
+	top: 26%;
+	left: 63%;
+}
+
+.one>div:nth-child(5) {
+	top: 10%;
+	left: 82%;
+}
+
+.two>div:nth-child(1) {
+	top: 15%;
+	left: 6%;
+}
+
+.two>div:nth-child(2) {
+	top: 24%;
+	left: 25%;
+}
+
+.two>div:nth-child(3){
+	top: 35%;
+	left: 44%;
+}
+
+.two>div:nth-child(4) {
+	top: 28%;
+	left: 63%;
 }
 
-.time-top .time-item:nth-of-type(1) {
-	padding-left: 40px;
+.two>div:nth-child(5) {
+	top: 27%;
+	left: 82%;
 }
 
-.time-item .flag {
+.flag {
 	position: absolute;
-	width: 5px;
+	width: 7px;
 	height: 100%;
 	background-color: #0451A3;
 }
 
 .flag>i {
 	position: absolute;
-	top: 5px;
+	top: 0px;
 	display: inline-block;
-	border-top: 40px solid transparent;
-	border-bottom: 40px solid transparent;
-	border-left: 90px solid #0451A3;
+	border-top: 20px solid transparent;
+	border-bottom: 20px solid transparent;
+	border-left: 40px solid #0451A3;
 }
 
-.time-item .contan-box {
+.contan-box {
 	position: absolute;
-	top: 30%;
+	top: 15%;
 	margin-left: 14px;
 }
 
@@ -529,4 +566,5 @@ li {
 	white-space: nowrap;
 	font-size: 18px;
 	text-align: center;
+	margin-top: 2%;
 }

cms/src/main/resources/static/ftl/fzzd/public/css/style.css

@@ -11,7 +11,7 @@ html {
 body {
     width: 100%;
     height: 100%;
-    background: url(../img/xiangce.png) 75% center no-repeat;
+    background: url(/fzzd/public/img/1.png) 75% center no-repeat;
     background-size: 92% 90%;
 }
 
@@ -71,15 +71,17 @@ h1 {
 }
 
 .back>span {
-    display: inline-block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     width: 100%;
-    height: 6%;
-    text-align: center;
-    line-height: 100%;
+    height: 10%;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
     font-size: 18px;
+    background: url(/fzzd/public/img/kk.png) top center no-repeat;
+    background-size: auto 100%;
 }
 /* new */
 
@@ -89,14 +91,17 @@ h1 {
 }
 
 .front>span {
-    display: inline-block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     width: 100%;
-    height: 6%;
-    text-align: center;
+    height: 10%;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
     font-size: 18px;
+    background: url(/fzzd/public/img/kk.png) top center no-repeat;
+    background-size: auto 100%;
 }
 
 .page.active {

cms/src/main/resources/static/ftl/fzzd/public/css/ztzs.css

@@ -22,30 +22,33 @@ li {
 	width: 100%;
 	height: 100%;
 	padding: 2%;
+	background: url(/fzzd/public/img/bg.png) bottom center no-repeat;
+	background-size: cover;
 }
 
 .ztzs .ztzs-list {
 	width: 100%;
-	height: 85%;
+	height: 100%;
 	padding: 0 2%;
+	overflow-y: scroll;
 }
 
 .ztzs-list .ztzs-item {
 	float: left;
 	width: 32%;
-	height: 30%;
+	height: 35%;
 	margin-right: 2%;
 	margin-bottom: 1.5%;
 }
 
 .ztzs-list .ztzs-item>img {
 	width: 100%;
-	height: 87%;
+	height: 89%;
 }
 
 .ztzs-list .ztzs-item>p {
 	width: 100%;
-	height: 13%;
+	height: 11%;
 	text-align: center;
 	text-overflow: ellipsis;
 	overflow: hidden;
@@ -101,12 +104,12 @@ li {
 
 .back-ztzs {
 	position: fixed;
-	top: 1%;
-	right: 1%;
-	width: 5%;
+	top: 4%;
+	right: 2%;
+	width: 4%;
 	padding: 0.5%;
 	border-radius: 10px;
-	background-color: rgb(218, 33, 33);
+	background-color: #1F7ABF;
 }
 
 .back-ztzs>img {

cms/src/main/resources/static/ftl/fzzd/public/font/iconfont.css

@@ -7,12 +7,16 @@
 
 .iconfont {
   font-family: "iconfont" !important;
-  font-size: 20px;
+  font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-wenjian:before {
+  content: "\e631";
+}
+
 .icon-zhaoxiangji:before {
   content: "\e663";
 }
@@ -37,3 +41,4 @@
   content: "\e625";
 }
 
+

cms/src/main/resources/static/ftl/fzzd/public/js/constant.js

@@ -1,8 +1,8 @@
-// var SERVER_IP = 'http://23.37.100.81';
-// var FLAT_PATH = 'http://23.37.100.80:8084/';
+// var SERVER_IP = 'http://192.168.0.95';
+// var FLAT_PATH = 'http://192.168.0.95:8084/';
 // var FLAT_PATH_BASIC = FLAT_PATH + 'basic/';
-// var PAGE_PATH = 'http://23.37.100.81:80/';
-// var HOME_PATH = 'http://23.37.100.81:8089/';
+// var PAGE_PATH = 'http://192.168.0.95:80/';
+// var HOME_PATH = 'http://192.168.0.95:8089/';
 
 var SERVER_IP = 'http://23.37.100.87:8060';
 var FLAT_PATH = 'http://23.37.100.87:8084/';

spring-cloud/server-basic/src/main/java/com/jd/util/HaiKangTest.java

@@ -0,0 +1,55 @@
+package com.jd.util;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hikvision.artemis.sdk.ArtemisHttpUtil;
+import com.hikvision.artemis.sdk.config.ArtemisConfig;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author ：yp
+ * @date ：Created in 2022/5/6 15:22
+ * @description：
+ */
+public class HaiKangTest {
+    static {
+        // 代理API网关nginx服务器ip端口
+        ArtemisConfig.host = "23.211.40.208";
+        // 秘钥appkey
+        ArtemisConfig.appKey = "29154544";
+        // 秘钥appSecret
+        ArtemisConfig.appSecret = "UWNsY26zW0kvg6PZvjXy";
+    }
+
+    /**
+     * 能力开放平台的网站路径
+     */
+    private static final String ARTEMIS_PATH = "/artemis";
+
+    public static void main(String[] args) {
+
+        final String getCamsApi = ARTEMIS_PATH + "/api/video/v1/cameras/previewURLs";
+
+        Map<String, String> path = new HashMap<String, String>(2);
+        path.put("http://", getCamsApi);
+
+        String contentType = "application/json";
+
+        JSONObject jsonBody = new JSONObject();
+        //监控点唯一标识
+        jsonBody.put("cameraIndexCode", "50010301001310020292");
+        //码流类型,0:主码流，1:子码流，2:第三码流，参数不填，默认为主码流
+        jsonBody.put("streamType", 0);
+        //取流协议,“rtsp”:RTSP协议,“rtmp”:RTMP协议,“hls”:HLS协议
+        jsonBody.put("protocol", "rtsp");
+        //传输协议,0:UDP，1:TCP，默认是TCP
+        jsonBody.put("transmode", 1);
+        //扩展内容,格式：key=value
+        jsonBody.put("expand", "streamform=ps");
+        String body = jsonBody.toJSONString();
+
+        String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType, null);
+        System.out.println(result);
+    }
+}