2 Commits 16f733807b ... 5d515e1a86

Autor SHA1 Mensagem Data
  Wayne 5d515e1a86 Merge branch 'master' of http://8.137.121.180:10880/longping/subject_gxj 3 meses atrás
  Wayne 406056a174 列表页面修改 3 meses atrás
27 arquivos alterados com 1293 adições e 640 exclusões
  1. 2 2
      projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoController.java
  2. BIN
      projects/src/main/webapp/asset/css/images/newVersion/banner.jpg
  3. BIN
      projects/src/main/webapp/asset/css/images/newVersion/banner.png
  4. BIN
      projects/src/main/webapp/asset/css/images/newVersion/banner_icon_text_1.png
  5. BIN
      projects/src/main/webapp/asset/css/images/newVersion/banner_icon_text_2.png
  6. BIN
      projects/src/main/webapp/asset/css/images/newVersion/banner_icon_text_3.png
  7. BIN
      projects/src/main/webapp/asset/css/images/newVersion/banner_mask.png
  8. BIN
      projects/src/main/webapp/asset/css/images/newVersion/content_bg.png
  9. BIN
      projects/src/main/webapp/asset/css/images/newVersion/img1.png
  10. BIN
      projects/src/main/webapp/asset/css/images/newVersion/news_icon.png
  11. BIN
      projects/src/main/webapp/asset/css/images/newVersion/news_more.png
  12. 208 0
      projects/src/main/webapp/asset/css/style_new.css
  13. 865 0
      projects/src/main/webapp/asset/sass/style_new.scss
  14. 2 0
      projects/src/main/webapp/vmodules/common/common-css-include.jsp
  15. 11 14
      projects/src/main/webapp/vmodules/problem/info/cbToXjWarn.jsp
  16. 13 48
      projects/src/main/webapp/vmodules/problem/info/endWarn.jsp
  17. 12 40
      projects/src/main/webapp/vmodules/problem/info/monthWarn.jsp
  18. 13 38
      projects/src/main/webapp/vmodules/problem/info/openWarn.jsp
  19. 14 37
      projects/src/main/webapp/vmodules/problem/info/pldWarn.jsp
  20. 0 85
      projects/src/main/webapp/vmodules/problem/info/preInfo.jsp
  21. 12 5
      projects/src/main/webapp/vmodules/problem/info/preWarn.jsp
  22. 17 10
      projects/src/main/webapp/vmodules/problem/track/list.jsp
  23. 28 21
      projects/src/main/webapp/vmodules/subject/subInfo/tz/cb.jsp
  24. 26 188
      projects/src/main/webapp/vmodules/subject/subInfo/tz/end.jsp
  25. 24 10
      projects/src/main/webapp/vmodules/subject/subInfo/tz/main.jsp
  26. 24 89
      projects/src/main/webapp/vmodules/subject/subInfo/tz/new.jsp
  27. 22 53
      projects/src/main/webapp/vmodules/subject/subInfo/tz/xmzk.jsp

+ 2 - 2
projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoController.java

@@ -281,7 +281,7 @@ public class SubInfoController extends BaseController {
                 //新建项目库
                 return new ModelAndView("/vmodules/subject/subInfo/tz/new.jsp");
             case "1":
-                //重点项目
+                //在建项目
                 return new ModelAndView("/vmodules/subject/subInfo/tz/main.jsp");
             case "2":
                 //在建项目
@@ -290,7 +290,7 @@ public class SubInfoController extends BaseController {
                 //储备项目
                 return new ModelAndView("/vmodules/subject/subInfo/tz/cb.jsp");
             case "4":
-                //竣工项目
+                //投产项目
                 model.put("sfgw", SysConstant.SFGW_ID.equals(getCurUser().getUnitId()));
                 return new ModelAndView("/vmodules/subject/subInfo/tz/end.jsp");
             case "5":

BIN
projects/src/main/webapp/asset/css/images/newVersion/banner.jpg


BIN
projects/src/main/webapp/asset/css/images/newVersion/banner.png


BIN
projects/src/main/webapp/asset/css/images/newVersion/banner_icon_text_1.png


BIN
projects/src/main/webapp/asset/css/images/newVersion/banner_icon_text_2.png


BIN
projects/src/main/webapp/asset/css/images/newVersion/banner_icon_text_3.png


BIN
projects/src/main/webapp/asset/css/images/newVersion/banner_mask.png


BIN
projects/src/main/webapp/asset/css/images/newVersion/content_bg.png


BIN
projects/src/main/webapp/asset/css/images/newVersion/img1.png


BIN
projects/src/main/webapp/asset/css/images/newVersion/news_icon.png


BIN
projects/src/main/webapp/asset/css/images/newVersion/news_more.png


+ 208 - 0
projects/src/main/webapp/asset/css/style_new.css

@@ -0,0 +1,208 @@
+.frame_bg { background: linear-gradient(180deg, rgba(247, 252, 255, 0) 0%, #ECF7FF 5%, rgba(236, 247, 255, 0) 100%); }
+
+.header_menu { background: url(./images/newVersion/banner.jpg) no-repeat; background-size: 100% 400px; }
+
+.top_bg { background: rgba(255, 255, 255, 0.39); box-shadow: 0px 3px 0px 0px rgba(255, 255, 255, 0.69); }
+
+.qr_code { display: flex; align-items: center; margin: 0 0 0 30px; padding: 0 0 0 75px; width: 70px; height: 64px; background: url(images/appDownload.png) no-repeat; background-size: 64px 100%; font-size: 13px; color: #15294C; line-height: 22px; }
+
+.layui-btn-normal { color: #007EFF; background: #cde9f9; }
+
+.news .header, .news .func_choice { background: none; }
+.news .func_choice .func_choice_content { background: none; }
+.news .func_choice .func_choice_content .func_choice_left { width: 80%; }
+.news .func_choice .func_choice_content .func_choice_left .news_list_text, .news .func_choice .func_choice_content .func_choice_left > div { position: relative; margin: 0 0 0 30px; width: auto; font-size: 20px; font-weight: bold; color: #15294C; }
+.news .func_choice .func_choice_content .func_choice_left .news_list_text a, .news .func_choice .func_choice_content .func_choice_left > div a { width: auto; color: #15294C; }
+.news .func_choice .func_choice_content .func_choice_left > div:first-child { margin: 0; }
+.news .func_choice .func_choice_content .func_choice_left > div.active { color: #007EFF; background: none; }
+.news .func_choice .func_choice_content .func_choice_left > div.active a { color: #007EFF; }
+.news .func_choice .func_choice_content .func_choice_left > div.active:after { content: ''; position: absolute; left: 0; right: 0; bottom: -2px; height: 4px; background: linear-gradient(270deg, #51A7FF 0%, #B4D8FF 100%); border-radius: 3px; }
+.news .qr_code { font-weight: normal; }
+.news .header .header_content .header_content_right { font-size: 14px; color: #15294C; }
+.news .header .header_content .header_content_right .layui-btn { margin: 0 0 0 15px; padding: 5px 30px; height: 35px; border-radius: 20px; font-size: 14px; border: 1px solid #007EFF; }
+.news .header .header_content .header_content_right .layui-btn-primary { color: #fff; background-color: #007EFF; }
+.news .header .header_content .header_content_right .layui-btn-normal { color: #007EFF; background: #cde9f9; }
+.news .news_top_div { height: auto; }
+.news .news_top_div .news_top { height: auto; }
+.news .banner_newsBox { flex-flow: column; margin-top: 44px; padding: 20px; height: auto; background: #fff; border-radius: 18px; }
+.news .banner_newsBox .news_content { display: flex; }
+.news .banner_newsBox .news_list_title { display: flex; flex-flow: row; justify-content: space-between; margin: 0 0 10px 0; }
+.news .banner_newsBox .news_list_icon { margin: 0 10px 0 0; width: 40px; height: 40px; background: url(./images/newVersion/news_icon.png); }
+.news .banner_newsBox .news_list_text { display: flex; font-size: 32px; color: #007EFF; }
+.news .banner_newsBox .news_list_text > a { color: #007EFF; }
+.news .banner_newsBox .news_more { display: flex; align-items: center; cursor: pointer; }
+.news .banner { flex: 1; height: 334px; }
+.news .banner .banner_text { height: 35px; line-height: 35px; background: rgba(0, 0, 0, 0.5); }
+.news .banner .banner_title { font-size: 14px; }
+.news .banner .layui-carousel-ind { top: -25px; }
+.news .banner .layui-carousel-ind > ul { margin-right: 10px; }
+.news .banner .layui-carousel-ind > ul > li { margin: 0 5px; width: 8px; height: 8px; }
+.news .banner .layui-carousel-ind > ul > li.layui-this { background: #0080ff; }
+.news .first_news { margin-top: 0; width: 580px; height: 334px; overflow: hidden; }
+.news .first_news .item { display: flex; margin: 0 0 10px; width: 100%; }
+.news .first_news .item .img { margin-right: 10px; width: 180px; height: 105px; }
+.news .first_news .item .img > img { max-height: 100%; }
+.news .first_news .item:last-child { margin: 0; }
+.news .first_news .news_list_listItem { flex: 1; display: flex; flex-flow: column; overflow: hidden; line-height: 1; }
+.news .first_news .news_list_listItem .news_list_titleText { margin-bottom: 10px; width: 100%; font-size: 26px; color: #515457; }
+.news .first_news .news_list_listItem .news_list_titleText .news_list_listTitle { width: 100%; font-weight: bold; }
+.news .first_news .news_list_listItem .word { flex: 1; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; overflow: hidden; text-overflow: ellipsis; font-size: 12px; color: #888a8d; line-height: 20px; }
+.news .first_news .news_list_listItem .news_list_time { display: flex; justify-content: space-between; width: 100%; font-size: 12px; color: #c4c6c7; line-height: 20px; }
+.news .first_news .news_list_listItem .news_list_time .more { color: #c4c6c7; }
+.news .footer { padding: 20px 0; height: auto; background: #fff; }
+.news .footer .footer_content .footer_text { line-height: 28px; font-weight: bold; color: #15294C; }
+.news .footer .footer_content .footer_text .footer_text_line { height: auto; font-weight: normal; color: #15294C; }
+.news .footer .split_line { margin: 10px auto 0; width: 55px; height: 2px; background: #15294C; opacity: 0.3; }
+.news .footer .footer_download { display: flex; flex-flow: row; align-items: center; width: auto; line-height: 1.5; text-align: left; font-size: 14px; color: #15294C; }
+.news .footer .footer_download .footer_qrCode { margin: 0 5px 0 0; width: 64px; height: 64px; }
+
+.banner_img { display: flex; align-items: flex-end; margin: 0 auto; width: 100%; height: 150px; }
+
+.banner_mask { padding-top: 150px; background: url(./images/newVersion/banner_mask.png) 0 0 no-repeat; background-size: 100% 250px; }
+
+.banner_img_content { width: 100%; padding: 0 10%; }
+
+.img_ls { display: flex; gap: 20px; }
+
+.search_box { display: flex; margin-top: 20px; width: 620px; border-radius: 5px; background: #fff; }
+.search_box .ipt { flex: 1; margin: 3px 10px; height: 34px; border: none; }
+.search_box .btn { padding: 0 15px; height: 40px; line-height: 40px; background-color: #007EFF; color: #fff; font-size: 15px; border-radius: 0 5px 5px 0; }
+
+.pd0 { padding: 0; }
+
+.layui-layout-admin.frame { flex-flow: row; }
+.layui-layout-admin.frame .layui-side { position: relative; top: 0; width: 210px; background: #fff; overflow-x: visible; }
+.layui-layout-admin.frame .layui-side .header_content_left { position: fixed; top: 0; z-index: 2; padding: 0 0 20px; width: 210px; text-align: center; background-color: #fff; }
+.layui-layout-admin.frame .layui-side .header_content_left .header_code { margin: 10px auto; width: 45px; height: 48px; background: url(images/register/logo.png) no-repeat; background-size: 100% 100%; }
+.layui-layout-admin.frame .layui-side .header_content_left .header_text { font-size: 15px; font-weight: bold; color: #15294C; }
+.layui-layout-admin.frame .layui-side .expand_collapse_btn { display: flex; align-items: center; position: absolute; right: -13px; top: 50%; z-index: 2; transform: translateY(-50%); width: 12px; height: 60px; text-align: center; border-radius: 0 8px 8px 0; background-color: #fff; cursor: pointer; }
+.layui-layout-admin.frame .layui-side .expand_collapse_btn:after { content: ''; display: block; width: 0; height: 0; border-left: 0 solid transparent; border-right: 8px solid #A9BACC; border-top: 5px solid transparent; border-bottom: 5px solid transparent; border-radius: 3px; }
+.layui-layout-admin.frame .layui-side .layui-side-scroll { top: 110px; width: 100%; height: calc(100% - 110px); overflow-y: auto; box-sizing: border-box; }
+.layui-layout-admin.frame .layui-side .layui-side-scroll::-webkit-scrollbar { display: block; }
+.layui-layout-admin.frame .layui-side .layui-nav-tree { width: 100%; }
+.layui-layout-admin.frame .layui-side .icon { display: block; margin: 0 10px; width: 15px; height: 15px; mask-size: 15px 15px; background-color: #BAC8E0; background-image: none; }
+.layui-layout-admin.frame .layui-side .icon_big_screen_active { mask-image: url(images/left/fxdp.svg); }
+.layui-layout-admin.frame .layui-side .icon_work_bench_active { mask-image: url(images/left/gzt.svg); }
+.layui-layout-admin.frame .layui-side .icon_organ_manage_active { mask-image: url(images/left/sbdwxmgl.svg); }
+.layui-layout-admin.frame .layui-side .icon_over_time_active { mask-image: url(images/left/xmjg.svg); }
+.layui-layout-admin.frame .layui-side .icon_project_active { mask-image: url(images/left/xmjdjzjgl.svg); }
+.layui-layout-admin.frame .layui-side .icon_question_active { mask-image: url(images/left/main/question_active.png); }
+.layui-layout-admin.frame .layui-side .icon_system_active { mask-image: url(images/left/xtgl.svg); }
+.layui-layout-admin.frame .layui-side .icon_zjfwk_active { mask-image: url(images/left/zhgd.svg); }
+.layui-layout-admin.frame .layui-side .icon_project_zjfwk_active { mask-image: url(images/left/zjfwk.svg); }
+.layui-layout-admin.frame .layui-side .icon_project_xtgl_active { mask-image: url(images/left/xtgl.svg); }
+.layui-layout-admin.frame .layui-side .icon_question_list { mask-image: url(images/left/sub/question_list.png); }
+.layui-layout-admin.frame .layui-side .icon_question_dw { mask-image: url(images/left/sub/question_dw.png); }
+.layui-layout-admin.frame .layui-side .icon_question_gz { mask-image: url(images/left/sub/question_gz.png); }
+.layui-layout-admin.frame .layui-side .icon_question_tb { mask-image: url(images/left/sub/question_tb.png); }
+.layui-layout-admin.frame .layui-side .layui-nav { background: none; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item .left { display: flex; align-items: center; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item .layui-icon { margin: 0 10px 0 0; font-size: 12px; color: #ADB4C0; transition: all 0.3s linear; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item a { display: flex; padding: 0; width: 100%; background: none; color: #15294C; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item > a { display: flex; justify-content: space-between; color: #15294C !important; background: none; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item > a:hover { color: #5e8ad3 !important; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item.layui-nav-itemed-hand > a { color: #fff !important; background: linear-gradient(85deg, #0073E9 0%, #4CA5FF 100%); }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item.layui-nav-itemed-hand > a:hover { color: #fff !important; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item.layui-nav-itemed-hand > a .icon { background-color: #fff; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item.layui-nav-itemed-hand > a .layui-icon { color: #fff; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item.layui-nav-itemed { box-shadow: 0px 6px 4px -4px #D7DFED; border: 1px solid #FFFFFF; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item.layui-nav-itemed .layui-icon { transform: rotate(-180deg); }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item .layui-nav-child a { text-indent: 2em; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item .layui-nav-child a:hover { color: #5e8ad3 !important; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item .layui-nav-child .layui-this { background: none; }
+.layui-layout-admin.frame .layui-side .layui-nav .layui-nav-item .layui-nav-child .layui-this a { color: #007EFF !important; }
+.layui-layout-admin.frame .layui-side.close { overflow: visible; width: 35px; }
+.layui-layout-admin.frame .layui-side.close .header_content_left { padding-bottom: 0; width: 35px; }
+.layui-layout-admin.frame .layui-side.close .header_content_left .header_code { width: 100%; height: 38px; }
+.layui-layout-admin.frame .layui-side.close .header_content_left .header_text { display: none; }
+.layui-layout-admin.frame .layui-side.close .expand_collapse_btn:after { transform: rotateY(180deg); }
+.layui-layout-admin.frame .layui-side.close .layui-side-scroll { top: 58px; height: calc(100% - 58px); }
+.layui-layout-admin.frame .layui-header { display: flex; align-items: center; position: relative; background: none; color: #15294C; }
+.layui-layout-admin.frame .layui-header .prompt { display: flex; align-items: center; font-size: 20px; font-weight: bold; color: #0073EF; }
+.layui-layout-admin.frame .layui-header .prompt .date { margin-left: 20px; font-size: 14px; }
+.layui-layout-admin.frame .layui-header .top-task, .layui-layout-admin.frame .layui-header .top-dashboard { position: relative; left: auto; top: 0; margin: 0 0 0 20px; width: auto; background: none; border: none; color: #15294C; }
+.layui-layout-admin.frame .layui-header .top-dashboard .top-dashboard-icon { background-image: url(images/icon_dashboard_2.png); }
+.layui-layout-admin.frame .layui-header .notice_ul { background: rgba(255, 255, 255, 0.42); color: #15294C; border-radius: 24px; }
+.layui-layout-admin.frame .layui-header .layui-nav { color: #15294C; }
+.layui-layout-admin.frame .layui-header .layui-nav.layui-layout-right { position: relative !important; flex: 1; display: flex; margin-left: 30px; }
+.layui-layout-admin.frame .layui-header .layui-nav .layui-nav-item { line-height: 50px; }
+.layui-layout-admin.frame .layui-header .layui-nav .layui-nav-item .top-avatar { margin-top: 5px; }
+.layui-layout-admin.frame .layui-header .layui-nav .layui-nav-item a { color: #15294C; }
+.layui-layout-admin.frame .layui-header .notice_ul { width: 100%; }
+.layui-layout-admin.frame .layui-header .notice_ul .notice_icon { margin-right: 15px; }
+.layui-layout-admin.frame .menu-collapse { display: none; }
+.layui-layout-admin.frame .layui-body { position: relative; left: auto; top: 0; flex: 1; padding: 10px 20px 20px; width: calc(100% - 40px); height: 100%; overflow: hidden; background: url(images/newVersion/content_bg.png) no-repeat; background-size: 100% 100%; }
+.layui-layout-admin.frame .layui-body .layui-nav-item .logout { background-image: url(images/icon_06_2.png); }
+.layui-layout-admin.frame .layui-body.close { left: auto; }
+.layui-layout-admin.frame #rightContent { width: 100%; height: calc(100% - 50px); border: 0; }
+
+.layui-form-select dl dd.layui-this { background: #007EFF; }
+
+.right_title { padding-bottom: 0; background: none; }
+.right_title .btn_group .btn { color: #007EFF; border-color: #007EFF; }
+.right_title .btn_group .btn.active { color: #fff; border-color: #007EFF; background-color: #007EFF; }
+.right_title .txt { display: flex; align-items: center; padding: 10px 20px; width: 100%; box-sizing: border-box; font-size: 15px; font-weight: bold; color: #15294C; background: #fff; border-radius: 12px; }
+.right_title .txt .top-breadcrumb { position: relative; left: auto; top: 0; margin-left: 10px; font-size: 12px; color: #15294C; }
+.right_title .txt .btn_group { position: relative; top: 0; left: 0; }
+.right_title .txt .layui-collapse { flex: 1; }
+.right_title .search_form { margin: 20px 0 0; padding: 0 20px; background: linear-gradient(180deg, #BFDDFF 0%, #FFFFFF 100%); border: 1px #fff solid; border-radius: 15px 0 0; }
+.right_title .search_form .layui-form-label { color: #718196; text-align: left !important; }
+.right_title .search_form xm-select { min-height: 24px; height: 24px; line-height: 24px; }
+.right_title .search_form xm-select .xm-label .scroll .label-content { padding: 0 25px 0 10px; line-height: 24px; }
+.right_title .search_form xm-select .xm-label .xm-label-block { margin: 0 5px 0 0; height: 24px; line-height: 24px; background: #FFFFFF !important; color: #15294C; border-radius: 4px; border: 1px solid #BAC8E0; }
+.right_title .search_form xm-select .xm-label .xm-label-block > span, .right_title .search_form xm-select .xm-label .xm-label-block > i { color: #15294C; }
+.right_title .search_form xm-select .xm-body .xm-option.selected .xm-option-icon { color: #007EFF !important; }
+.right_title .search_form .layui-input, .right_title .search_form xm-select, .right_title .search_form .layui-form-select { background-color: #fff; border-color: #bfcfe5; border-radius: 5px; }
+.right_title .search_form .layui-input:focus, .right_title .search_form .layui-input:active, .right_title .search_form .layui-input:hover, .right_title .search_form xm-select:focus, .right_title .search_form xm-select:active, .right_title .search_form xm-select:hover, .right_title .search_form .layui-form-select:focus, .right_title .search_form .layui-form-select:active, .right_title .search_form .layui-form-select:hover { border-color: #48a7ff !important; }
+.right_title .search_form .layui-btn-normal { padding: 4px 15px; height: auto; background-color: #007EFF; color: #fff; border-radius: 5px; }
+.right_title .search_form .morePan { position: relative; vertical-align: middle; color: #007EFF; cursor: pointer; }
+.right_title .search_form .morePan a { color: #007EFF; }
+.right_title .search_form .layui-colla-content { padding-bottom: 0; }
+.right_title .layui-colla-title.return { padding: 0 10px 0 0; cursor: default; }
+.right_title .layui-colla-title.return .btn { padding-top: 5px; background-color: #007EFF; }
+
+.class_ls { padding: 10px 20px; background: #fff; }
+.class_ls .juli { display: inline-block; margin-bottom: 5px; padding: 5px 10px; color: #314b69; background: #f1fbf8; border-radius: 5px; }
+.class_ls .lanse-first { color: #02b77e; }
+.class_ls .second_line .lanse-first { color: #E156A2; }
+
+.export { display: block; position: relative; top: 0; right: auto; margin: 0 0 10px; padding: 0px 7px 0px 15px; height: 32px; line-height: 32px; overflow: hidden; border-radius: 4px; background-color: #007EFF; }
+.export img { margin-right: 3px; filter: drop-shadow(#fff 100px 0); transform: translateX(-100px); }
+
+.export-item > button { cursor: pointer; }
+.export-item > button:hover { color: #5e8ad3; }
+
+.table_box { padding: 0 20px; box-sizing: border-box; }
+.table_box .table_process { max-height: 100% !important; }
+.table_box .layui-laypage { margin: 15px 0 20px; }
+.table_box .layui-laypage > a, .table_box .layui-laypage .layui-laypage-btn { margin-right: 5px; color: #15294C; border: 1px solid #BAC8E0; border-radius: 4px; }
+.table_box .layui-btn-normal { color: #fff; background-color: #007EFF; }
+.table_box .table1 .label { background: #F4FAFF; border: 1px solid #E0EBF7; }
+
+.layui-table-header .layui-table th { background: #EBEFFA; }
+
+.layui-laypage .layui-laypage-curr { margin-right: 5px; }
+.layui-laypage .layui-laypage-curr .layui-laypage-em { background-color: #007EFF; }
+
+.lanse, .toolBar span { color: #007EFF !important; }
+
+.layui-form-select dl dd { color: #1A1B1F; }
+.layui-form-select dl dd.layui-this { background-color: #e2f3ff; color: #1b9fff; }
+
+.detail, .layui-show.detail { margin: 10px 0 0; padding: 10px 10px 0; width: calc(100% - 20px); overflow-x: hidden; border-radius: 12px; background-color: #fff; }
+.detail .table_box, .layui-show.detail .table_box { padding: 0; }
+.detail .table_box .btn_group .btn, .layui-show.detail .table_box .btn_group .btn { color: #007EFF; background-color: #fff; border-color: #007EFF; }
+.detail .table_box .btn_group .btn.btn1, .layui-show.detail .table_box .btn_group .btn.btn1 { padding: 5px 10px 3px; background: none; font-weight: bold; }
+.detail .table_box .btn_group .btn.active, .layui-show.detail .table_box .btn_group .btn.active { background-color: #007EFF; }
+.detail .table_box h2, .detail .table_box .table-title, .layui-show.detail .table_box h2, .layui-show.detail .table_box .table-title { margin: 0 0 10px; padding: 5px 10px; width: 100%; line-height: 25px; color: #0A2047; font-size: 15px; background: linear-gradient(90deg, #E2EDFB 0%, rgba(227, 237, 251, 0) 100%); border-radius: 5px; }
+.detail .table_box h2:before, .detail .table_box .table-title:before, .layui-show.detail .table_box h2:before, .layui-show.detail .table_box .table-title:before { vertical-align: sub; background-color: #007EFF; }
+.detail .table_box .layui-row, .layui-show.detail .table_box .layui-row { max-width: 100%; }
+
+.layui-layer-setwin .layui-layer-close2 { right: -18px; top: -20px; }
+
+.tab-group { background: linear-gradient(180deg, #BFDDFF 0%, #FFFFFF 100%); border: 1px solid #FFFFFF; }
+.tab-group .btn { color: #15294C; }
+.tab-group .btn.active { font-weight: bold; color: #007EFF; background: linear-gradient(180deg, #BFDDFF 0%, #FFFFFF 100%); border: none; }
+.tab-group .layui-btn-normal { margin: 5px 5px 0 0; padding: 3px 10px; background: #007EFF; color: #fff; border-radius: 5px; line-height: 24px; height: auto; }
+
+/*# sourceMappingURL=style_new.css.map */

+ 865 - 0
projects/src/main/webapp/asset/sass/style_new.scss

@@ -0,0 +1,865 @@
+.frame_bg {
+  background: linear-gradient( 180deg, rgba(247,252,255,0) 0%, #ECF7FF 5%, rgba(236,247,255,0) 100%);
+}
+.header_menu {
+  background: url(./images/newVersion/banner.jpg) no-repeat;
+  background-size: 100% 400px;
+}
+.top_bg {
+  background: rgba(255,255,255,0.39);
+  box-shadow: 0px 3px 0px 0px rgba(255,255,255,0.69);
+}
+
+.qr_code {
+  display: flex;
+  align-items: center;
+  margin: 0 0 0 30px;
+  padding: 0 0 0 75px;
+  width: 70px;
+  height: 64px;
+  background: url(images/appDownload.png) no-repeat;
+  background-size: 64px 100%;
+  font-size: 13px;
+  color: #15294C;
+  line-height: 22px;
+}
+
+.layui-btn-normal {
+  color: #007EFF;
+  background: #cde9f9;
+}
+.news {
+  .header, .func_choice {
+    background: none;
+  }
+  .func_choice {
+    .func_choice_content {
+      background: none;
+      .func_choice_left {
+        width: 80%;
+        .news_list_text, & > div {
+          position: relative;
+          margin: 0 0 0 30px;
+          width: auto;
+          font-size: 20px;
+          font-weight: bold;
+          color: #15294C;
+          a {
+            width: auto;
+            color: #15294C;
+          }
+        }
+        & > div:first-child {
+          margin: 0;
+        }
+        & > div.active {
+           color: #007EFF;
+           background: none;
+          a {
+            color: #007EFF;
+          }
+           &:after {
+             content: '';
+             position: absolute;
+             left: 0;
+             right: 0;
+             bottom: -2px;
+             height: 4px;
+             background: linear-gradient( 270deg, #51A7FF 0%, #B4D8FF 100% );
+             border-radius: 3px;
+           }
+         }
+      }
+    }
+  }
+  .qr_code {
+    font-weight: normal;
+  }
+  .header .header_content .header_content_right {
+    font-size: 14px;
+    color: #15294C;
+    .layui-btn {
+      margin: 0 0 0 15px;
+      padding: 5px 30px;
+      height: 35px;
+      border-radius: 20px;
+      font-size: 14px;
+      border: 1px solid #007EFF;
+    }
+    .layui-btn-primary {
+      color: #fff;
+      background-color: #007EFF;
+    }
+    .layui-btn-normal {
+      color: #007EFF;
+      background: #cde9f9;
+    }
+  }
+
+  .news_top_div {
+    height: auto;
+    .news_top {
+      height: auto;
+    }
+  }
+  .banner_newsBox {
+    flex-flow: column;
+    margin-top: 44px;
+    padding: 20px;
+    height: auto;
+    background: #fff;
+    border-radius: 18px;
+    .news_content {
+      display: flex;
+    }
+    .news_list_title {
+      display: flex;
+      flex-flow: row;
+      justify-content: space-between;
+      margin: 0 0 10px 0;
+    }
+    .news_list_icon {
+      margin: 0 10px 0 0;
+      width: 40px;
+      height: 40px;
+      background: url(./images/newVersion/news_icon.png);
+    }
+    .news_list_text {
+      display: flex;
+      font-size: 32px;
+      color: #007EFF;
+      & > a {
+        color: #007EFF;
+      }
+    }
+    .news_more {
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+    }
+  }
+
+  .banner {
+    flex: 1;
+    height: 334px;
+    .banner_text {
+      height: 35px;
+      line-height: 35px;
+      background: rgba(0, 0, 0, 0.5);
+    }
+    .banner_title{
+      font-size: 14px;
+    }
+    .layui-carousel-ind {
+      top: -25px;
+      & > ul {
+        margin-right: 10px;
+        & > li {
+          margin: 0 5px;
+          width: 8px;
+          height: 8px;
+          &.layui-this {
+            background: #0080ff;
+          }
+        }
+      }
+    }
+  }
+  .first_news {
+    margin-top: 0;
+    width: 580px;
+    height: 334px;
+    overflow: hidden;
+    .item {
+      display: flex;
+      margin: 0 0 10px;
+      width: 100%;
+      .img {
+        margin-right: 10px;
+        width: 180px;
+        height: 105px;
+        & > img {
+          max-height: 100%;
+        }
+      }
+      &:last-child {
+        margin: 0;
+      }
+    }
+    .news_list_listItem {
+      flex: 1;
+      display: flex;
+      flex-flow: column;
+      overflow: hidden;
+      line-height: 1;
+      .news_list_titleText {
+        margin-bottom: 10px;
+        width: 100%;
+        font-size: 26px;
+        color: #515457;
+        .news_list_listTitle {
+          width: 100%;
+          font-weight: bold;
+        }
+      }
+      .word {
+        flex: 1;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 3;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        font-size: 12px;
+        color: #888a8d;
+        line-height: 20px;
+      }
+      .news_list_time {
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+        font-size: 12px;
+        color: #c4c6c7;
+        line-height: 20px;
+        .more {
+          color: #c4c6c7;
+        }
+      }
+    }
+  }
+  .footer {
+    padding: 20px 0;
+    height: auto;
+    background: #fff;
+    .footer_content {
+      .footer_text {
+        line-height: 28px;
+        font-weight: bold;
+        color: #15294C;;
+        .footer_text_line {
+          height: auto;
+          font-weight: normal;
+          color: #15294C;
+        }
+      }
+    }
+    .split_line {
+      margin: 10px auto 0;
+      width: 55px;
+      height: 2px;
+      background: #15294C;
+      opacity: 0.3;
+    }
+    .footer_download {
+      display: flex;
+      flex-flow: row;
+      align-items: center;
+      width: auto;
+      line-height: 1.5;
+      text-align: left;
+      font-size: 14px;
+      color: #15294C;
+      .footer_qrCode {
+        margin: 0 5px 0 0;
+        width: 64px;
+        height: 64px;
+      }
+    }
+  }
+}
+
+.banner_img {
+  display: flex;
+  align-items: flex-end;
+  margin: 0 auto;
+  width: 100%;
+  height: 150px;
+}
+.banner_mask {
+  padding-top: 150px;
+  background: url(./images/newVersion/banner_mask.png) 0 0 no-repeat;
+  background-size: 100% 250px;
+}
+.banner_img_content {
+  width: 100%;
+  padding: 0 10%;
+}
+.img_ls {
+  display: flex;
+  gap: 20px;
+}
+.search_box {
+  display: flex;
+  margin-top: 20px;
+  width: 620px;
+  border-radius: 5px;
+  background: #fff;
+  .ipt {
+    flex: 1;
+    margin: 3px 10px;
+    height: 34px;
+    border: none;
+  }
+  .btn {
+    padding: 0 15px;
+    height: 40px;
+    line-height: 40px;
+    background-color: #007EFF;
+    color: #fff;
+    font-size: 15px;
+    border-radius: 0 5px 5px 0;
+  }
+}
+
+.pd0 {
+  padding: 0;
+}
+.layui-layout-admin.frame {
+  flex-flow: row;
+  .layui-side {
+    position: relative;
+    top: 0;
+    width: 210px;
+    background: #fff;
+    overflow-x: visible;
+    .header_content_left {
+      position: fixed;
+      top: 0;
+      z-index: 2;
+      padding: 0 0 20px;
+      width: 210px;
+      text-align: center;
+      background-color: #fff;
+      .header_code {
+        margin: 10px auto;
+        width: 45px;
+        height: 48px;
+        background: url(images/register/logo.png) no-repeat;
+        background-size: 100% 100%;
+      }
+      .header_text {
+        font-size: 15px;
+        font-weight: bold;
+        color: #15294C;
+      }
+    }
+    .expand_collapse_btn {
+      display: flex;
+      align-items: center;
+      position: absolute;
+      right: -13px;
+      top: 50%;
+      z-index: 2;
+      transform: translateY(-50%);
+      width: 12px;
+      height: 60px;
+      text-align: center;
+      border-radius: 0 8px 8px 0;
+      background-color: #fff;
+      cursor: pointer;
+      &:after {
+        content: '';
+        display: block;
+        width: 0;
+        height: 0;
+        border-left: 0 solid transparent;
+        border-right: 8px solid #A9BACC;
+        border-top: 5px solid transparent;
+        border-bottom: 5px solid transparent;
+        border-radius: 3px;
+      }
+    }
+    .layui-side-scroll {
+      top: 110px;
+      width: 100%;
+      height: calc(100% - 110px);
+      overflow-y: auto;
+      box-sizing: border-box;
+      &::-webkit-scrollbar {
+        display: block;
+      }
+    }
+    .layui-nav-tree {
+      width: 100%;
+    }
+    .icon {
+      display: block; margin: 0 10px; width: 15px; height: 15px;
+      mask-size: 15px 15px; background-color: #BAC8E0; background-image: none;
+    }
+    .icon_big_screen_active {mask-image: url(images/left/fxdp.svg)}
+    .icon_work_bench_active {mask-image: url(images/left/gzt.svg) }
+    .icon_organ_manage_active {mask-image: url(images/left/sbdwxmgl.svg) }
+    .icon_over_time_active {mask-image: url(images/left/xmjg.svg) }
+    .icon_project_active {mask-image: url(images/left/xmjdjzjgl.svg) }
+    .icon_question_active {mask-image: url(images/left/main/question_active.png)}
+    .icon_system_active {mask-image: url(images/left/xtgl.svg)}
+    .icon_zjfwk_active {mask-image: url(images/left/zhgd.svg)}
+    .icon_project_zjfwk_active {mask-image: url(images/left/zjfwk.svg)}
+    .icon_project_xtgl_active {mask-image: url(images/left/xtgl.svg)}
+
+    .icon_question_list {mask-image: url(images/left/sub/question_list.png)}
+    .icon_question_dw {mask-image: url(images/left/sub/question_dw.png)}
+    .icon_question_gz {mask-image: url(images/left/sub/question_gz.png)}
+    .icon_question_tb {mask-image: url(images/left/sub/question_tb.png)}
+    .layui-nav {
+      background: none;
+      .layui-nav-item {
+        .left {
+          display: flex;
+          align-items: center;
+        }
+        .layui-icon {
+          margin: 0 10px 0 0;
+          font-size: 12px;
+          color: #ADB4C0;
+          transition: all 0.3s linear;
+        }
+        a {
+          display: flex;
+          padding: 0;
+          width: 100%;
+          background: none;
+          color: #15294C;
+        }
+        & > a {
+          display: flex;
+          justify-content: space-between;
+          color: #15294C !important;
+          background: none;
+          &:hover {
+            color: #5e8ad3 !important;
+          }
+        }
+        &.layui-nav-itemed-hand > a {
+          color: #fff !important;
+          background: linear-gradient( 85deg, #0073E9 0%, #4CA5FF 100%);
+          &:hover {
+            color: #fff !important;
+          }
+          .icon {
+            background-color: #fff;
+          }
+          .layui-icon {
+            color: #fff;
+          }
+        }
+        &.layui-nav-itemed {
+          box-shadow: 0px 6px 4px -4px #D7DFED;
+          border: 1px solid #FFFFFF;
+          .layui-icon {
+            transform: rotate(-180deg);
+          }
+        }
+        .layui-nav-child {
+          a {
+            text-indent: 2em;
+            &:hover {
+              color: #5e8ad3 !important;
+            }
+          }
+          .layui-this {
+            background: none;
+            a {
+              color: #007EFF !important;
+            }
+          }
+        }
+      }
+    }
+    &.close {
+      overflow: visible;
+      width: 35px;
+      .header_content_left {
+        padding-bottom: 0;
+        width: 35px;
+        .header_code {
+          width: 100%;
+          height: 38px;
+        }
+        .header_text {
+          display: none;
+        }
+      }
+      .expand_collapse_btn {
+        &:after {
+          transform: rotateY(180deg);
+        }
+      }
+      .layui-side-scroll {
+        top: 58px;
+        height: calc(100% - 58px);
+      }
+    }
+  }
+  .layui-header {
+    display: flex;
+    align-items: center;
+    position: relative;
+    background: none;
+    color: #15294C;
+    .prompt {
+      display: flex;
+      align-items: center;
+      font-size: 20px;
+      font-weight: bold;
+      color: #0073EF;
+      .date {
+        margin-left: 20px;
+        font-size: 14px;
+      }
+    }
+    .top-task, .top-dashboard {
+      position: relative;
+      left: auto;
+      top: 0;
+      margin: 0 0 0 20px;
+      width: auto;
+      background: none;
+      border: none;
+      color: #15294C;
+    }
+    .top-dashboard .top-dashboard-icon {
+      background-image: url(images/icon_dashboard_2.png);
+    }
+    .notice_ul {
+      background: rgba(255,255,255,0.42);
+      color: #15294C;
+      border-radius: 24px;
+    }
+    .layui-nav {
+      color: #15294C;
+      &.layui-layout-right {
+        position: relative !important;
+        flex: 1;
+        display: flex;
+        margin-left: 30px;
+      }
+      .layui-nav-item {
+        line-height: 50px;
+        .top-avatar {
+          margin-top: 5px;
+        }
+        a {
+          color: #15294C;
+        }
+      }
+    }
+    .notice_ul {
+      width: 100%;
+      .notice_icon {
+        margin-right: 15px;
+      }
+    }
+  }
+  .menu-collapse {
+    display: none;
+  }
+  .layui-body {
+    position: relative;
+    left: auto;
+    top: 0;
+    flex: 1;
+    padding: 10px 20px 20px;
+    width: calc(100% - 40px);
+    height: 100%;
+    overflow: hidden;
+    background: url(images/newVersion/content_bg.png) no-repeat;
+    background-size: 100% 100%;
+    .layui-nav-item {
+      .logout {
+        background-image: url(images/icon_06_2.png);
+      }
+    }
+    &.close {
+      left: auto;
+    }
+  }
+  #rightContent {
+    width: 100%;
+    height: calc(100% - 50px);
+    border: 0;
+  }
+}
+
+.layui-form-select dl dd.layui-this {
+  background: #007EFF;
+}
+.right_title {
+  padding-bottom: 0;
+  background: none;
+  .btn_group .btn {
+    color: #007EFF;
+    border-color: #007EFF;
+    &.active {
+      color: #fff;
+      border-color: #007EFF;
+      background-color: #007EFF;
+    }
+  }
+  .txt {
+    display: flex;
+    align-items: center;
+    padding: 10px 20px;
+    width: 100%;
+    box-sizing: border-box;
+    font-size: 15px;
+    font-weight: bold;
+    color: #15294C;
+    background: #fff;
+    border-radius: 12px;
+    .top-breadcrumb {
+      position: relative;
+      left: auto;
+      top: 0;
+      margin-left: 10px;
+      font-size: 12px;
+      color: #15294C;
+    }
+    .btn_group {
+      position: relative;
+      top: 0;
+      left: 0;
+    }
+    .layui-collapse {
+      flex: 1;
+    }
+  }
+  .search_form {
+    margin: 20px 0 0;
+    padding: 0 20px;
+    background: linear-gradient( 180deg, #BFDDFF 0%, #FFFFFF 100%);
+    border: 1px #fff solid;
+    border-radius: 15px 0 0;
+    .layui-form-label {
+      color: #718196;
+      text-align: left !important;
+    }
+    xm-select {
+      min-height: 24px;
+      height: 24px;
+      line-height: 24px;
+      .xm-label {
+        .scroll .label-content {
+          padding: 0 25px 0 10px;
+          line-height: 24px;
+        }
+        .xm-label-block {
+          margin: 0 5px 0 0;
+          height: 24px;
+          line-height: 24px;
+          background: #FFFFFF !important;
+          color: #15294C;
+          border-radius: 4px;
+          border: 1px solid #BAC8E0;
+          & > span,
+          & > i {
+            color: #15294C;
+          }
+        }
+      }
+      .xm-body .xm-option {
+        &.selected {
+          .xm-option-icon {
+            color: #007EFF !important;
+          }
+        }
+      }
+    }
+    .layui-input, xm-select, .layui-form-select {
+      background-color: #fff;
+      border-color: #bfcfe5;
+      border-radius: 5px;
+      &:focus, &:active, &:hover {
+        border-color: #48a7ff !important;
+      }
+    }
+    .layui-btn-normal {
+      padding: 4px 15px;
+      height: auto;
+      background-color: #007EFF;
+      color: #fff;
+      border-radius: 5px;
+    }
+    .morePan {
+      position: relative;
+      vertical-align: middle;
+      color: #007EFF;
+      cursor: pointer;
+      a {
+        color: #007EFF;
+      }
+    }
+    .layui-colla-content {
+      padding-bottom: 0;
+    }
+  }
+  .layui-colla-title {
+    &.return {
+      padding: 0 10px 0 0;
+      cursor: default;
+      .btn {
+        padding-top: 5px;
+        background-color: #007EFF;
+      }
+    }
+  }
+}
+.class_ls {
+  padding: 10px 20px;
+  background: #fff;
+  .juli {
+    display: inline-block;
+    margin-bottom: 5px;
+    padding: 5px 10px;
+    color: #314b69;
+    background: #f1fbf8;
+    border-radius: 5px;
+  }
+  .lanse-first {
+    color: #02b77e;
+  }
+  .second_line {
+    .lanse-first {
+      color: #E156A2;
+    }
+  }
+}
+.export {
+  display: block;
+  position: relative;
+  top: 0;
+  right: auto;
+  margin: 0 0 10px;
+  padding: 0px 7px 0px 15px;
+  height: 32px;
+  line-height: 32px;
+  overflow: hidden;
+  border-radius: 4px;
+  background-color: #007EFF;
+  img {
+    margin-right: 3px;
+    filter: drop-shadow(#fff 100px 0);
+    transform: translateX(-100px);
+  }
+}
+.export-item {
+  & > button {
+    cursor: pointer;
+    &:hover {
+      color: #5e8ad3;
+    }
+  }
+}
+.table_box {
+  padding: 0 20px;
+  box-sizing: border-box;
+  .table_process {
+    max-height: 100% !important;
+  }
+  .layui-laypage {
+    margin: 15px 0 20px;
+    & > a, .layui-laypage-btn {
+      margin-right: 5px;
+      color: #15294C;
+      border: 1px solid #BAC8E0;
+      border-radius: 4px;
+    }
+  }
+  .layui-btn-normal {
+    color: #fff;
+    background-color: #007EFF;
+  }
+  .table1 .label {
+    background: #F4FAFF;
+    border: 1px solid #E0EBF7;
+  }
+}
+.layui-table-header .layui-table th {
+  background: #EBEFFA;
+}
+.layui-laypage .layui-laypage-curr {
+  margin-right: 5px;
+  .layui-laypage-em {
+    background-color: #007EFF;
+  }
+}
+.lanse, .toolBar span {
+  color: #007EFF !important;
+}
+.layui-form-select dl dd {
+  color: #1A1B1F;
+  &.layui-this {
+    background-color: #e2f3ff;
+    color: #1b9fff;
+  }
+}
+
+.detail, .layui-show.detail {
+  margin: 10px 0 0;
+  padding: 10px 10px 0;
+  width: calc(100% - 20px);
+  overflow-x: hidden;
+  border-radius: 12px;
+  background-color: #fff;
+  .table_box {
+    padding: 0;
+    .btn_group {
+      .btn {
+        color: #007EFF;
+        background-color: #fff;
+        border-color: #007EFF;
+        &.btn1 {
+          padding: 5px 10px 3px;
+          background: none;
+          font-weight: bold;
+        }
+        &.active {
+          background-color: #007EFF;
+        }
+      }
+    }
+    h2, .table-title {
+      margin: 0 0 10px;
+      padding: 5px 10px;
+      width: 100%;
+      line-height: 25px;
+      color: #0A2047;
+      font-size: 15px;
+      background: linear-gradient( 90deg, #E2EDFB 0%, rgba(227,237,251,0) 100%);
+      border-radius: 5px;
+      &:before {
+        vertical-align: sub;
+        background-color: #007EFF;
+      }
+    }
+    .layui-row {
+      max-width: 100%;
+    }
+  }
+}
+.layui-layer-setwin .layui-layer-close2 {
+  right: -18px;
+  top: -20px;
+}
+.tab-group {
+  background: linear-gradient( 180deg, #BFDDFF 0%, #FFFFFF 100%);
+  border: 1px solid #FFFFFF;
+  .btn {
+    color: #15294C;
+    &.active {
+      font-weight: bold;
+      color: #007EFF;
+      background: linear-gradient( 180deg, #BFDDFF 0%, #FFFFFF 100%);
+      border: none;
+    }
+  }
+
+  .layui-btn-normal {
+    margin: 5px 5px 0 0;
+    padding: 3px 10px;
+    background: #007EFF;
+    color: #fff;
+    border-radius: 5px;
+    line-height: 24px;
+    height: auto;
+  }
+}

+ 2 - 0
projects/src/main/webapp/vmodules/common/common-css-include.jsp

@@ -9,6 +9,8 @@
 <link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style.css?version=${version}" media="all"/>
 <link rel="stylesheet" type="text/css" href="${WebSite.asset}/lib/font-awesome-4.7.0/css/font-awesome.min.css?version=${version}" media="all">
 <link rel="stylesheet" href="${WebSite.asset}/css/bigDialog.css?version=${version}" />
+<link rel="stylesheet" type="text/css" href="${WebSite.asset}/css/style_new.css?version=${version}" media="all"/>
+
 <style>
 @font-face {
     font-family: 'SiYuan_M';

+ 11 - 14
projects/src/main/webapp/vmodules/problem/info/cbToXjWarn.jsp

@@ -66,14 +66,12 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
 
         <div class="right_title">
-
-            <div class="layui-collapse">
+            <div class="txt">储备转新建超期 <div class="top-breadcrumb"></div></div>
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
-                <span class="txt">储备转新建超期</span>
-                    <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
                         <form class="layui-form" lay-filter="searchForm">
 
@@ -124,13 +122,8 @@
 <%--                                </div>--%>
                             </div>
                             <div class="layui-row">
-
                                 <div class="layui-col-xs12 layui-col-sm12 layui-col-md3">
                                     <button type="button" class="layui-btn layui-btn-normal" @click="search">查询</button>
-<%--                                    <span class="layui-btn layui-btn-normal" style="position:relative;z-index:9" @click="backHis()">--%>
-<%--                                        返回--%>
-<%--                                    </span>--%>
-                                    <!-- <button type="button" class="layui-btn layui-btn-export" @click="exportExcel">导出</button> -->
                                 </div>
                             </div>
                         </form>
@@ -487,11 +480,9 @@
 <%--                });--%>
 
 
-                console.log("${subjectId}");
-                console.log("${mainId}");
-                console.log("${sourceId}");
-                console.log("${hyfl}");
                 this.getData();
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
                 window.toDetail = this.toDetail;
                 window.showImage = this.showImage;
             },
@@ -907,6 +898,12 @@
             search : function(){
                 this.pageNo = 1;
                 this.getData();
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     });

+ 13 - 48
projects/src/main/webapp/vmodules/problem/info/endWarn.jsp

@@ -69,11 +69,10 @@
 <body>
 <div id="app"></div>
 <template id="template">
-  <div class="layui-layout layui-layout-admin">
-    <!-- 内容区域 -->
-		<span class="txt">在建转投产超期</span>
+  <div class="layui-layout layui-layout-admin pd0">
       <div class="right_title">
-          <div class="layui-collapse">
+          <div class="txt">在建转投产超期 <div class="top-breadcrumb"></div></div>
+          <div class="layui-collapse search_form">
               <div class="layui-colla-item">
                   <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                   <div class="layui-colla-content layui-show">
@@ -149,7 +148,7 @@
           </div>
       </div>
       <div>
-          <div class="layui-row">
+          <div class="layui-row class_ls">
               <div class="layui-form-item" style="display: flex">
                   <label class="juli">
                       问题总数<span class="lanse-first">{{numData.total}}个</span>
@@ -178,48 +177,6 @@
               </div>
           </div>
       </div>
-
-
-
-
-<%--    <div class="right_title">--%>
-<%--      <span class="txt">项目信息</span>--%>
-<%--      <div class="layui-collapse">--%>
-
-
-<%--        <div class="layui-colla-item">--%>
-<%--&lt;%&ndash;          <h2 class="layui-colla-title">筛选</h2>&ndash;%&gt;--%>
-<%--        <h2 class="layui-colla-title" style="padding-right:0">--%>
-<%--          <button class="layui-btn layui-btn-normal" style="position:relative;z-index:9" @click="backHis()">--%>
-<%--            返回--%>
-<%--          </button>--%>
-<%--        </h2>--%>
-
-<%--          <div class="layui-colla-content layui-show">--%>
-<%--            <form class="layui-form" lay-filter="searchForm" id="searchForm">--%>
-
-<%--            <input type="hidden" name="subjectId"    value="${subjectId }">--%>
-<%--            <input type="hidden" name="mainId" value="${mainId }">--%>
-<%--            <input type="hidden" name="sourceId" value="${sourceId }">--%>
-<%--            <input type="hidden" name="hyfl" value="${hyfl }">--%>
-
-<%--              <input type="hidden" name="queryType" value="3">--%>
-<%--              <div class="layui-row">--%>
-<%--&lt;%&ndash;                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                  <div class="layui-form-item">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    <label class="layui-form-label required">项目名称:</label>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    <div class="layui-input-block">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                      <input type="text" name="subName" placeholder="请输入" autocomplete="off" class="layui-input">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                      <button type="button" class="layui-btn layui-btn-normal" @click="search">查询</button>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                  </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                </div>&ndash;%&gt;--%>
-<%--              </div>--%>
-<%--            </form>--%>
-<%--          </div>--%>
-<%--        </div>--%>
-<%--      </div>--%>
-<%--    </div>--%>
     <div>
 
     </div>
@@ -482,6 +439,8 @@
 
 
           this.getData();
+          window.addEventListener('message', this.receiveMessage, false);
+          window.parent.postMessage('init loaded')
         window.toDetail = this.toDetail;
         window.showImage = this.showImage;
       },
@@ -897,7 +856,13 @@
       search : function(){
         this.pageNo = 1;
         this.getData();
-      }
+      },
+        receiveMessage (e) {
+            console.log('cb receiveMessage: ', e.data)
+            if (e.data.topBreadcrumb) {
+                $(".top-breadcrumb").html(e.data.topBreadcrumb)
+            }
+        }
     }
   });
 </script>

+ 12 - 40
projects/src/main/webapp/vmodules/problem/info/monthWarn.jsp

@@ -66,12 +66,12 @@
 <body>
 <div id="app"></div>
 <template id="template">
-  <div class="layui-layout layui-layout-admin">
+  <div class="layui-layout layui-layout-admin pd0">
     <!-- 内容区域 -->
 
     <div class="right_title">
-      <span class="txt">项目月报超期</span>
-      <div class="layui-collapse">
+      <div class="txt">项目月报超期 <div class="top-breadcrumb"></div></div>
+      <div class="layui-collapse search_form">
         <div class="layui-colla-item">
           <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
           <div class="layui-colla-content layui-show">
@@ -156,7 +156,7 @@
     </div>
 
     <div>
-      <div class="layui-row">
+      <div class="layui-row class_ls">
         <div class="layui-form-item" style="display: flex">
           <label class="juli">
             问题总数<span class="lanse-first">{{numData.total}}个</span>
@@ -186,42 +186,6 @@
       </div>
     </div>
 
-<%--    <div class="right_title">--%>
-<%--      <span class="txt">项目信息</span>--%>
-<%--      <div class="layui-collapse">--%>
-<%--        <div class="layui-colla-item">--%>
-<%--          <h2  style="padding-right:0">--%>
-<%--            <button class="layui-btn layui-btn-normal" style="position:relative;z-index:9" @click="backHis()">--%>
-<%--              返回--%>
-<%--            </button>--%>
-<%--          </h2>--%>
-<%--&lt;%&ndash;          <h2 class="layui-colla-title">筛选</h2>&ndash;%&gt;--%>
-<%--          <div class="layui-colla-content layui-show">--%>
-<%--            <form class="layui-form" lay-filter="searchForm" id="searchForm">--%>
-<%--              <input type="hidden" name="subjectId"    value="${subjectId }">--%>
-<%--              <input type="hidden" name="mainId" value="${mainId }">--%>
-<%--              <input type="hidden" name="sourceId" value="${sourceId }">--%>
-<%--              <input type="hidden" name="hyfl" value="${hyfl }">--%>
-<%--              <input type="hidden" name="queryType" value="3">--%>
-<%--              <div class="layui-row">--%>
-<%--                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">--%>
-<%--&lt;%&ndash;                  <div class="layui-form-item">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    <label class="layui-form-label required">项目名称:</label>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    <div class="layui-input-block">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                      <input type="text" name="subName" placeholder="请输入" autocomplete="off" class="layui-input">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                      <button type="button" class="layui-btn layui-btn-normal" @click="search">查询</button>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                  </div>&ndash;%&gt;--%>
-<%--                </div>--%>
-<%--              </div>--%>
-<%--            </form>--%>
-<%--          </div>--%>
-<%--        </div>--%>
-<%--      </div>--%>
-<%--    </div>--%>
-    <div>
-
-    </div>
     <div class="table_box" style="padding-top: 0;">
       <div class="table_process">
         <table id="table1" lay-filter="test"></table>
@@ -531,6 +495,8 @@
         }
 
         this.getData();
+        window.addEventListener('message', this.receiveMessage, false);
+        window.parent.postMessage('init loaded')
         window.toDetail = this.toDetail;
         window.showImage = this.showImage;
       },
@@ -963,6 +929,12 @@
       search : function(){
         this.pageNo = 1;
         this.getData();
+      },
+      receiveMessage (e) {
+        console.log('cb receiveMessage: ', e.data)
+        if (e.data.topBreadcrumb) {
+          $(".top-breadcrumb").html(e.data.topBreadcrumb)
+        }
       }
     }
   });

+ 13 - 38
projects/src/main/webapp/vmodules/problem/info/openWarn.jsp

@@ -66,12 +66,12 @@
 <body>
 <div id="app"></div>
 <template id="template">
-  <div class="layui-layout layui-layout-admin">
+  <div class="layui-layout layui-layout-admin pd0">
     <!-- 内容区域 -->
 
       <div class="right_title">
-      		<span class="txt">新建转在建超期</span>
-          <div class="layui-collapse">
+          <div class="txt">新建转在建超期 <div class="top-breadcrumb"></div></div>
+          <div class="layui-collapse search_form">
               <div class="layui-colla-item">
                   <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                   <div class="layui-colla-content layui-show">
@@ -145,7 +145,7 @@
           </div>
       </div>
       <div>
-          <div class="layui-row">
+          <div class="layui-row class_ls">
               <div class="layui-form-item" style="display: flex">
                   <label class="juli">
                       问题总数<span class="lanse-first">{{numData.total}}个</span>
@@ -174,39 +174,6 @@
               </div>
           </div>
       </div>
-<%--    <div class="right_title">--%>
-<%--      <span class="txt">项目信息</span>--%>
-<%--      <div class="layui-collapse">--%>
-<%--        <div class="layui-colla-item">--%>
-<%--&lt;%&ndash;          <h2 class="layui-colla-title">筛选</h2>&ndash;%&gt;--%>
-<%--    <h2  style="padding-right:0">--%>
-<%--        <button class="layui-btn layui-btn-normal" style="position:relative;z-index:9" @click="backHis()">--%>
-<%--            返回--%>
-<%--        </button>--%>
-<%--    </h2>--%>
-<%--          <div class="layui-colla-content layui-show">--%>
-<%--            <form class="layui-form" lay-filter="searchForm" id="searchForm">--%>
-<%--              <input type="hidden" name="queryType" value="3">--%>
-<%--                <input type="hidden" name="subjectId"    value="${subjectId }">--%>
-<%--                <input type="hidden" name="mainId" value="${mainId }">--%>
-<%--                <input type="hidden" name="sourceId" value="${sourceId }">--%>
-<%--                <input type="hidden" name="hyfl" value="${hyfl }">--%>
-<%--              <div class="layui-row">--%>
-<%--                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">--%>
-<%--&lt;%&ndash;                  <div class="layui-form-item">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    <label class="layui-form-label required">项目名称:</label>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    <div class="layui-input-block">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                      <input type="text" name="subName" placeholder="请输入" autocomplete="off" class="layui-input">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                      <button type="button" class="layui-btn layui-btn-normal" @click="search">查询</button>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                    </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                  </div>&ndash;%&gt;--%>
-<%--                </div>--%>
-<%--              </div>--%>
-<%--            </form>--%>
-<%--          </div>--%>
-<%--        </div>--%>
-<%--      </div>--%>
-<%--    </div>--%>
     <div>
 
     </div>
@@ -469,6 +436,8 @@
 
 
           this.getData();
+          window.addEventListener('message', this.receiveMessage, false);
+          window.parent.postMessage('init loaded')
         window.toDetail = this.toDetail;
         window.showImage = this.showImage;
       },
@@ -876,7 +845,13 @@
 
         this.pageNo = 1;
         this.getData();
-      }
+      },
+        receiveMessage (e) {
+            console.log('cb receiveMessage: ', e.data)
+            if (e.data.topBreadcrumb) {
+                $(".top-breadcrumb").html(e.data.topBreadcrumb)
+            }
+        }
     }
   });
 </script>

+ 14 - 37
projects/src/main/webapp/vmodules/problem/info/pldWarn.jsp

@@ -66,12 +66,12 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
 
         <div class="right_title">
-        	<span class="txt">投产转入规超期</span>
-            <div class="layui-collapse">
+            <div class="txt">投产转入规超期 <div class="top-breadcrumb"></div></div>
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
                     <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -146,7 +146,7 @@
             </div>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item" style="display: flex">
                     <label class="juli">
                         问题总数<span class="lanse-first">{{numData.total}}个</span>
@@ -175,39 +175,6 @@
                 </div>
             </div>
         </div>
-<%--        <div class="right_title">--%>
-<%--            <span class="txt">项目信息</span>--%>
-<%--            <div class="layui-collapse">--%>
-<%--                <div class="layui-colla-item">--%>
-<%--&lt;%&ndash;                    <h2 class="layui-colla-title">筛选</h2>&ndash;%&gt;--%>
-<%--    <h2  style="padding-right:0">--%>
-<%--        <button class="layui-btn layui-btn-normal" style="position:relative;z-index:9" @click="backHis()">--%>
-<%--            返回--%>
-<%--        </button>--%>
-<%--    </h2>--%>
-<%--                    <div class="layui-colla-content layui-show">--%>
-<%--                        <form class="layui-form" lay-filter="searchForm" id="searchForm">--%>
-<%--                            <input type="hidden" name="queryType" value="3">--%>
-<%--                            <input type="hidden" name="subjectId"    value="${subjectId }">--%>
-<%--                            <input type="hidden" name="mainId" value="${mainId }">--%>
-<%--                            <input type="hidden" name="zjly" value="${sourceId }">--%>
-<%--                            <input type="hidden" name="indusKind" value="${hyfl }">--%>
-<%--                            <div class="layui-row">--%>
-<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">--%>
-<%--&lt;%&ndash;                                    <div class="layui-form-item">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                        <label class="layui-form-label required">项目名称:</label>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                        <div class="layui-input-block">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                            <input type="text" name="subName" placeholder="请输入" autocomplete="off" class="layui-input">&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                            <button type="button" class="layui-btn layui-btn-normal" @click="search">查询</button>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                        </div>&ndash;%&gt;--%>
-<%--&lt;%&ndash;                                    </div>&ndash;%&gt;--%>
-<%--                                </div>--%>
-<%--                            </div>--%>
-<%--                        </form>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--            </div>--%>
-<%--        </div>--%>
         <div>
 
         </div>
@@ -469,6 +436,10 @@
 
 
                 this.getData();
+
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
+
                 window.toDetail = this.toDetail;
                 window.showImage = this.showImage;
             },
@@ -881,6 +852,12 @@
 
                 this.pageNo = 1;
                 this.getData();
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     });

+ 0 - 85
projects/src/main/webapp/vmodules/problem/info/preInfo.jsp

@@ -536,91 +536,6 @@
                             self.hangyeList = self.chunkArray(self.hangyeList, 5)
                             self.guimoList = self.chunkArray(self.guimoList, 5)
 
-                            // 切片
-                            // self.bumengList = self.chunkArray(self.bumengList, 5)
-                            // self.zijinList = self.chunkArray(self.zijinList, 5)
-                            // 部门内容
-                            // self.bumengList = res.data.listDepart || [];
-                            // var subNum = res.data.subNum || 0;
-                            // if (self.bumengList == null || self.bumengList == [] || self.bumengList.length == 0) {
-                            //     self.bumengContent = "";
-                            // } else {
-                            //     self.bumengContent = year + "年" + month + "月,哈密市投资项目智慧平台中" + tabName + "共有"
-                            //     self.bumengContent = self.bumengContent + subNum + "个项目出现" + (self.bumengList[0].sumNum || 0) + "个问题,其中";
-                            //     for (var i = 0; i < self.bumengList.length; i++) {
-                            //         if (self.bumengList[i].number != 0) {
-                            //             self.bumengContent = self.bumengContent + self.bumengList[i].title + self.bumengList[i].number + "个占比" + self.bumengList[i].rate + "%,"
-                            //         }
-                            //     }
-                            //     if (self.bumengList[0].sumNum == undefined) {
-                            //         self.bumengContent = self.bumengContent.substring(0, self.bumengContent.length - 3);
-                            //     } else {
-                            //         self.bumengContent = self.bumengContent + "分部门情况看," + self.bumengList[self.bumengList.length - 1].title + tabName + "情况较好," +
-                            //             self.bumengList[0].title + tabName + "情况问题较多";
-                            //     }
-                            // }
-
-                            // 区域内容
-                            // self.quyuList = res.data.listSubject || [];
-                            // if (self.quyuList == null || self.quyuList == [] || self.quyuList.length == 0) {
-                            //     self.quyuContent = "";
-                            // } else {
-                            //     self.quyuContent = year + "年" + month + "月,哈密市投资项目智慧平台中" + tabName + "" + self.quyuList[0].title + "共有"
-                            //     self.quyuContent = self.quyuContent + subNum + "个项目出现" + (self.quyuList[0].sumNum || 0) + "个问题,其中";
-                            //     for (var i = 0; i < self.quyuList.length; i++) {
-                            //
-                            //         if (self.quyuList[i].number != 0) {
-                            //             self.quyuContent = self.quyuContent + self.quyuList[i].title + self.quyuList[i].number + "个占比" + self.quyuList[i].rate + "%,"
-                            //         }
-                            //     }
-                            //     if (self.quyuList[0].sumNum == undefined) {
-                            //         self.quyuContent = self.quyuContent.substring(0, self.quyuContent.length - 3);
-                            //     } else {
-                            //         self.quyuContent = self.quyuContent + "分区县情况看," + self.quyuList[self.quyuList.length - 1].title + "项目" + tabName + "情况较好" +
-                            //             self.quyuList[0].title + "" + tabName + "情况问题较多";
-                            //     }
-                            // }
-
-                            // 资金内容
-                            // self.zijinList = res.data.listAmt || [];
-                            // if (self.zijinList == null || self.zijinList == [] || self.zijinList.length == 0) {
-                            //     self.zijinContent = "";
-                            // } else {
-                            //     self.zijinContent = year + "年" + month + "月,哈密市投资项目智慧平台中" + tabName + "共有";
-                            //     self.zijinContent = self.zijinContent + subNum + "个项目出现" + (self.zijinList[0].sumNum || 0) + "个问题,其中";
-                            //     for (var i = 0; i < self.zijinList.length; i++) {
-                            //         if (self.zijinList[i].number != 0) {
-                            //             self.zijinContent = self.zijinContent + self.zijinList[i].title + self.zijinList[i].number + "个占比" + self.zijinList[i].rate + "%,"
-                            //         }
-                            //     }
-                            //     if (self.zijinList[0].sumNum == undefined) {
-                            //         self.zijinContent = self.zijinContent.substring(0, self.zijinContent.length - 3);
-                            //     } else {
-                            //
-                            //         self.zijinContent = self.zijinContent + "分部门情况看," + self.zijinList[self.zijinList.length - 1].title + tabName + "情况较好," +
-                            //             self.zijinList[0].title + tabName + "情况问题较多";
-                            //     }
-                            // }
-
-                            // 行业内容
-                            // self.hangyeList = res.data.listIndusKind || [];
-                            // if (self.hangyeList == null || self.hangyeList == [] || self.hangyeList.length == 0) {
-                            //     self.hangyeContent = "";
-                            // } else {
-                            //     self.hangyeContent = year + "年" + month + "月,哈密市投资项目智慧平台中" + tabName + "共有";
-                            //     self.hangyeContent = self.hangyeContent + subNum + "个项目出现" + (self.hangyeList[0].sumNum || 0) + "个问题,其中";
-                            //     for (var i = 0; i < self.hangyeList.length; i++) {
-                            //         if (self.hangyeList[i].number != 0) {
-                            //             self.hangyeContent = self.hangyeContent + self.hangyeList[i].title + self.hangyeList[i].number + "个占比" + self.hangyeList[i].rate + "%,"
-                            //         }
-                            //     }
-                            //     if (self.hangyeList[0].sumNum == undefined) {
-                            //         self.hangyeContent = self.hangyeContent.substring(0, self.hangyeContent.length - 3);
-                            //     } else {
-                            //         self.hangyeContent = self.hangyeContent + "分部门情况看," + self.hangyeList[self.hangyeList.length - 1].title + tabName + "情况较好," +
-                            //             self.hangyeList[0].title + tabName + "情况问题较多";
-                            //     }
-                            // }
                         }, 200);
                     }
                 });

+ 12 - 5
projects/src/main/webapp/vmodules/problem/info/preWarn.jsp

@@ -66,14 +66,13 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
 
         <div class="right_title">
 
-            <div class="layui-collapse">
+            <div class="txt">前期手续办理超期 <div class="top-breadcrumb"></div></div>
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
-                <span class="txt">前期手续办理超期</span>
-                    <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
                         <form class="layui-form" lay-filter="searchForm">
 
@@ -142,7 +141,7 @@
         </div>
 
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div class="layui-form-item" style="display: flex">
                     <label class="juli">
                         问题总数<span class="lanse-first">{{numData.total}}个</span>
@@ -501,6 +500,8 @@
                 console.log("${sourceId}");
                 console.log("${hyfl}");
                 this.getData();
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
                 window.toDetail = this.toDetail;
                 window.showImage = this.showImage;
             },
@@ -913,6 +914,12 @@
             search : function(){
                 this.pageNo = 1;
                 this.getData();
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     });

+ 17 - 10
projects/src/main/webapp/vmodules/problem/track/list.jsp

@@ -27,11 +27,11 @@
         }
         .btn_add {
             padding: 3px 15px;
-            /*border-radius: 5px;*/
+            border-radius: 5px;
             cursor: pointer;
-            background: #5e8fe5;
+            background: #88ef42;
             color: #fff;
-            margin-bottom: 10px;
+            margin-bottom: 15px;
         }
         .layui-table-body::-webkit-scrollbar {
             width: 0px;
@@ -59,13 +59,12 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
-            <span class="txt">问题推送处理</span>
-<%--            <button class="btn btn_add" @click="add"><i class="layui-icon layui-icon-add-circle"></i> 问题填报</button>--%>
+            <div class="txt">问题推送处理 <div class="top-breadcrumb"></div></div>
 
-            <div class="layui-collapse">
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
                     <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -172,13 +171,13 @@
                     </div>
                 </div>
             </div>
-            <div >
-                <button class="layui-btn btn_add" @click="add">新增问题</button>
-            </div>
         </div>
 
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process">
+
+                <button class="layui-btn btn_add" @click="add" style="margin-bottom: 10px; padding-top: 3px; padding-bottom: 3px;">新增问题</button>
+
                 <table id="table1" lay-filter="test"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>
@@ -403,6 +402,8 @@
                     theme: layDateTheme,
                 });
                 this.getData();
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
                 //window.toDetail = this.toDetail;
                 window.showImage = this.showImage;
             },
@@ -751,6 +752,12 @@
             closeWin : function(){
                 window.history.back(-1);
 
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
 
         }

+ 28 - 21
projects/src/main/webapp/vmodules/subject/subInfo/tz/cb.jsp

@@ -106,19 +106,11 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
-            <div class="txt"
-                 style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center; font-weight: bold;">
-                储备项目库
-            </div>
-            <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
-                <button type="button" class="layui-btn" @click="exportDetailExcel">导出明细</button>
-                <button type="button" class="layui-btn" @click="exportTotalExcel">导出总表</button>
-                <button type="button" class="layui-btn" @click="exportMoreExcel">自定义导出</button>
-            </div>
-            <div class="layui-collapse">
+            <div class="txt">储备项目库 <div class="top-breadcrumb"></div></div>
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
                     <div class="layui-colla-content layui-show">
                         <form class="layui-form" lay-filter="searchForm" id="searchForm">
@@ -201,17 +193,13 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="layui-row">
-
-                            </div>
                         </form>
-
                     </div>
                 </div>
             </div>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div style="display: flex;margin-bottom: 3px">
                     <label class="juli">
                         储备项目总数
@@ -226,22 +214,22 @@
                     <label class="juli">
                         B类项目数
                         <span class="info-icon" title="B类项目:推进类项目,正在抓紧推进前期手续,预计6-12个月可开工项目">?</span>
-                        <span class="lanse-first" onclick="levelList('abcs','B类','B')">{{beginRate.bnum}}</span>
+                        <span class="lanse-first" onclick="levelList('abcs','B类','B')" style="color: #FFAD0D">{{beginRate.bnum}}</span>
                     </label>
                     <label class="juli" onclick="levelList('abcs','C类','C')">
                         C类项目数
                         <span class="info-icon" title="C类项目:意向类项目,还处于谋划论证阶段项目">?</span>
-                        <span class="lanse-first">{{beginRate.cnum}}</span>
+                        <span class="lanse-first" style="color: #E0534E">{{beginRate.cnum}}</span>
                     </label>
                     <label class="juli" onclick="levelList('abcs','D类','D')">
                         D类项目数
                         <span class="info-icon" title="D类项目">?</span>
-                        <span class="lanse-first">{{beginRate.dnum}}</span>
+                        <span class="lanse-first" style="color: #405dee">{{beginRate.dnum}}</span>
                     </label>
                     <label class="juli" onclick="levelList('abcs','其它类','UNKNOWN_CATEGORY')">
                         其它项目数
                         <span class="info-icon" title="其它类项目">?</span>
-                        <span class="lanse-first">{{beginRate.nnum}}</span>
+                        <span class="lanse-first" style="color: #ba22ec">{{beginRate.nnum}}</span>
                     </label>
                 </div>
                 <div style="display: flex;margin-bottom: 3px">
@@ -251,7 +239,7 @@
                         {{item.name}} <span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
-                <div style="margin-bottom: 3px">
+                <div class="second_line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
@@ -263,6 +251,17 @@
         </div>
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process" style="position: relative">
+                <div style="position: relative; display: inline-block" @mouseover="openExport" @mouseout="choseExport">
+                    <div class="export">
+                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
+                        <span>导出</span>
+                    </div>
+                    <div class="export-item" v-if="showExport" :style="{ top: '-93px' }">
+                        <button type="button" class="" @click="exportDetailExcel">导出明细</button>
+                        <button type="button" class="" @click="exportTotalExcel">导出总表</button>
+                        <button type="button" class="" @click="exportMoreExcel">自定义导出</button>
+                    </div>
+                </div>
                 <table id="table1" lay-filter="test"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>
@@ -470,6 +469,8 @@
                 }
 
                 this.getData();
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
                 window.toDetail = this.toDetail;
                 window.levelList = this.levelList;
                 $(".hiddenParams").show();
@@ -697,6 +698,12 @@
             },
             choseExport: function () {
                 this.showExport = false;
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     });

+ 26 - 188
projects/src/main/webapp/vmodules/subject/subInfo/tz/end.jsp

@@ -80,16 +80,11 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
-            <div class="txt" style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center;font-weight: bold;">投产项目库</div>
-     <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
-         <button type="button" class="layui-btn" @click="exportDetailExcel">导出明细</button>
-         <button type="button" class="layui-btn" @click="exportTotalExcel">导出总表</button>
-         <button type="button" class="layui-btn" @click="exportMoreExcel">自定义导出</button>
-     </div>
-            <div class="layui-collapse">
+            <div class="txt">投产项目库 <div class="top-breadcrumb"></div></div>
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
                     <%--						<%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -223,170 +218,6 @@
                                         </div>
                                     </div>
                                 </div>
-<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">--%>
-<%--                                    <div class="layui-form-item">--%>
-<%--                                        <label class="layui-form-label label-longers required">所属行业</label>--%>
-<%--                                        <div class="layui-input-block">--%>
-<%--                                            <div id="indusKind"></div>--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
-
-<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
-<%--                                    <div class="layui-form-item">--%>
-<%--                                        <label class="layui-form-label label-longers required">投资类型</label>--%>
-<%--                                        <div class="layui-input-block">--%>
-<%--                                            <select name="kindNature">--%>
-<%--                                                <option value="">请选择</option>--%>
-<%--                                                <c:forEach items="${TZXZ }" var="hy">--%>
-<%--                                                    <option value="${hy.code }">${hy.title }</option>--%>
-<%--                                                </c:forEach>--%>
-<%--                                            </select>--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
-            <%--                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">项目单位名称</label>
-                                        <div class="layui-input-block">
-                                            <input name="sbdw" class="layui-input" value="${unitName }">
-                                        </div>
-                                    </div>
-                                </div>--%>
-<%--                                <c:if test="${currUser.statusProj == 1 }">--%>
-<%--                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
-<%--                                        <div class="layui-form-item">--%>
-<%--                                            <label class="layui-form-label label-longers required">行业单位</label>--%>
-<%--                                            <div class="layui-input-block">--%>
-<%--                                                <select name="hydw" lay-search>--%>
-<%--                                                    <option value="">--请选择--</option>--%>
-<%--                                                    <c:forEach items="${HYDW }" var="hy">--%>
-<%--                                                        <option value="${ hy.id}">${hy.title }</option>--%>
-<%--                                                    </c:forEach>--%>
-<%--                                                </select>--%>
-<%--                                            </div>--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </c:if>--%>
-                                <%--									<c:if test="${isHydw}">--%>
-                                <%--										<div class="layui-col-xs3 layui-col-sm3 layui-col-md3">--%>
-                                <%--											<div class="layui-form-item">--%>
-                                <%--												<label class="layui-form-label required" >灯色:</label>--%>
-                                <%--												<div class="layui-input-block">--%>
-                                <%--													<div id="light"></div>--%>
-                                <%--												</div>--%>
-                                <%--											</div>--%>
-                                <%--										</div>--%>
-                                <%--									</c:if>--%>
-<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
-<%--                                    <div class="layui-form-item">--%>
-<%--                                        <label class="layui-form-label label-longers queryTimeType" style="width: 130px;">--%>
-<%--                                            <select name="queryTimeType">--%>
-<%--                                                <option value="">建设日期</option>--%>
-<%--                                                <option value="1">计划开工日期</option>--%>
-<%--                                                <option value="2">计划结束日期</option>--%>
-<%--                                                <option value="3">创建日期</option>--%>
-<%--                                            </select>--%>
-<%--                                        </label>--%>
-<%--                                        <div class="layui-input-block time_box" style="margin-left:120px">--%>
-<%--                                            <input type="text" id="startTime" name="rangeDate" placeholder="请选择时间段"--%>
-<%--                                                   autocomplete="off" class="layui-input" style="margin-left: 20px;">--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
-<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
-<%--                                    <div class="layui-form-item">--%>
-<%--                                        <label class="layui-form-label label-longers" style="width: 100px;">完成比例(%)</label>--%>
-<%--                                        <div class="layui-input-block time_box">--%>
-<%--                                            <input type="number" name="endBl" placeholder="请填写最小完成比例" autocomplete="off"--%>
-<%--                                                   class="layui-input">--%>
-<%--                                            <span class="split_txt">至</span>--%>
-<%--                                            <input type="number" name="endBlPlus" placeholder="请填写最大完成比例"--%>
-<%--                                                   autocomplete="off" class="layui-input">--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
-<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
-<%--                                    <div class="layui-form-item">--%>
-<%--                                        <label class="layui-form-label label-longers required">资金来源</label>--%>
-<%--                                        <div class="layui-input-block">--%>
-<%--                                            <select name="zjly" lay-search="">--%>
-<%--                                                <option value="">请选择</option>--%>
-<%--                                                <c:forEach items="${ZJLY }" var="zj">--%>
-<%--                                                    <option value="${zj.id }">${zj.title }</option>--%>
-<%--                                                </c:forEach>--%>
-<%--                                            </select>--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
-<%--                                <c:if test="${isHydw }">--%>
-<%--                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
-<%--                                        <div class="layui-form-item">--%>
-<%--                                            <label class="layui-form-label label-longers ">是否分管</label>--%>
-<%--                                            <div class="layui-input-block">--%>
-<%--                                                <select name="blSub">--%>
-<%--                                                    <option value="false">所有项目</option>--%>
-<%--                                                    <option value="true">是</option>--%>
-<%--                                                </select>--%>
-<%--                                            </div>--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </c:if>--%>
-<%--                                <c:if test="${admin }">--%>
-<%--                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
-<%--                                        <div class="layui-form-item">--%>
-<%--                                            <label class="layui-form-label label-longers required">在建库</label>--%>
-<%--                                            <div class="layui-input-block">--%>
-<%--                                                <select name="isHide">--%>
-<%--                                                    <option value="">所有</option>--%>
-<%--                                                    <option value="1">是</option>--%>
-<%--                                                    <option value="0">否</option>--%>
-<%--                                                </select>--%>
-<%--                                            </div>--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </c:if>--%>
-<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
-<%--                                    <div class="layui-form-item">--%>
-<%--                                        <label class="layui-form-label label-longers required">年份</label>--%>
-<%--                                        <div class="layui-input-block time_box">--%>
-<%--                                            <input type="text" id="year" readonly="readonly" name="year"--%>
-<%--                                                   class="layui-input">--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
-<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
-<%--                                    <div class="layui-form-item">--%>
-<%--                                        <label class="layui-form-label label-longers required">月份</label>--%>
-<%--                                        <div class="layui-input-block time_box">--%>
-<%--                                            <select id="month" name="month">--%>
-<%--                                                <option value="">请选择</option>--%>
-<%--                                                <option value="1">1月</option>--%>
-<%--                                                <option value="2">2月</option>--%>
-<%--                                                <option value="3">3月</option>--%>
-<%--                                                <option value="4">4月</option>--%>
-<%--                                                <option value="5">5月</option>--%>
-<%--                                                <option value="6">6月</option>--%>
-<%--                                                <option value="7">7月</option>--%>
-<%--                                                <option value="8">8月</option>--%>
-<%--                                                <option value="9">9月</option>--%>
-<%--                                                <option value="10">10月</option>--%>
-<%--                                                <option value="11">11月</option>--%>
-<%--                                                <option value="12">12月</option>--%>
-<%--                                            </select>--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
-<%--                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">--%>
-<%--                                    <div class="layui-form-item">--%>
-<%--                                        <label class="layui-form-label label-longers">项目单位</label>--%>
-<%--                                        <div class="layui-input-block">--%>
-<%--                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"--%>
-<%--                                                   autocomplete="off"--%>
-<%--                                                   class="layui-input">--%>
-<%--                                        </div>--%>
-<%--                                    </div>--%>
-<%--                                </div>--%>
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParams" style="display: flex">
                                     <div class="layui-form-item">
                                         <button type="button" class="layui-btn layui-btn-normal" @click="search">查询
@@ -408,24 +239,10 @@
             </div>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div style="display: flex">
-                    <%--						<label class="juli">--%>
-                    <%--							开工率<span class="lanse-first">{{beginRate.beginRate}}%</span>--%>
-                    <%--							<div class="progress-div">--%>
-                    <%--								<div class="layui-progress">--%>
-                    <%--									<div class="layui-progress-bar" :style="'width:'+beginRate.beginRate+'%'"></div>--%>
-                    <%--								</div>--%>
-                    <%--							</div>--%>
-                    <%--						</label>--%>
                     <label class="juli">
-<%--                        投产项目总数<span class="lanse-first">{{endData||0}}</span>--%>
                         投产项目总数<span class="lanse-first">{{beginRate.num}}</span>
-<%--                        <div class="progress-div">
-                            <div class="layui-progress">
-                                <div class="layui-progress-bar" style=""></div>
-                            </div>
-                        </div>--%>
                     </label>
                         <label class="juli">
                             已入规<span class="lanse-first">{{beginRate.yrgNum}}</span>
@@ -479,7 +296,7 @@
                         {{item.name}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
-                <div style="margin-bottom: 3px">
+                <div class="second_line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
@@ -490,6 +307,19 @@
         </div>
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process" style="position: relative">
+
+                <div style="position: relative; display: inline-block" @mouseover="openExport" @mouseout="choseExport">
+                    <div class="export">
+                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
+                        <span>导出</span>
+                    </div>
+                    <div class="export-item" v-if="showExport" :style="{ top: '-93px' }">
+                        <button type="button" class="" @click="exportDetailExcel">导出明细</button>
+                        <button type="button" class="" @click="exportTotalExcel">导出总表</button>
+                        <button type="button" class="" @click="exportMoreExcel">自定义导出</button>
+                    </div>
+                </div>
+
                 <table id="table1" lay-filter="test"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>
@@ -859,6 +689,8 @@
                 <%--	})--%>
                 <%--}--%>
                 this.getData();
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
                 window.toDetail = this.toDetail;
                 $(".hiddenParams").show();
             },
@@ -1350,6 +1182,12 @@
             choseExport: function () {
                 this.showExport = false;
                 console.log('移出了')
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     });

+ 24 - 10
projects/src/main/webapp/vmodules/subject/subInfo/tz/main.jsp

@@ -86,18 +86,13 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
             <%--            <span class="txt">重点项目信息台账</span>--%>
             <%--        <span class="txt" style="width: 100%;text-align: center">在建项目库</span>--%>
-            <div class="txt" style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center;font-weight: bold;">在建项目库</div>
-                <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
-                    <button type="button" class="layui-btn" @click="exportDetailExcel">导出明细</button>
-                    <button type="button" class="layui-btn" @click="exportTotalExcel">导出总表</button>
-                    <button type="button" class="layui-btn" @click="exportMoreExcel">自定义导出</button>
-                </div>
-            <div class="layui-collapse">
+            <div class="txt">在建项目库 <div class="top-breadcrumb"></div></div>
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
                     <%--                    <h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -224,7 +219,7 @@
             </div>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                                 <div style="display: flex;margin-bottom: 3px">
                                     <label class="juli">
                                         在建项目总数<span class="lanse-first">{{beginRate.num}}</span>
@@ -363,7 +358,7 @@
                         {{item.name}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
-                <div style="margin-bottom: 3px">
+                <div class="second_line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
@@ -374,6 +369,17 @@
         </div>
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process" style="position: relative;">
+                <div style="position: relative; display: inline-block" @mouseover="openExport" @mouseout="choseExport">
+                    <div class="export">
+                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
+                        <span>导出</span>
+                    </div>
+                    <div class="export-item" v-if="showExport" :style="{ top: '-93px' }">
+                        <button type="button" class="" @click="exportDetailExcel">导出明细</button>
+                        <button type="button" class="" @click="exportTotalExcel">导出总表</button>
+                        <button type="button" class="" @click="exportMoreExcel">自定义导出</button>
+                    </div>
+                </div>
                 <table id="table1" lay-filter="test" style="position: relative;"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>
@@ -877,6 +883,8 @@
                     console.log('移出了')
                 })
                 this.getData();
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
                 window.toDetail = this.toDetail;
                 window.toVideo = this.toVideo;
                 $(".hiddenParams").show();
@@ -1477,6 +1485,12 @@
             choseExport: function () {
                 this.showExport = false;
                 console.log('移出了')
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     });

+ 24 - 89
projects/src/main/webapp/vmodules/subject/subInfo/tz/new.jsp

@@ -106,16 +106,11 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
-            <div class="txt" style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center;font-weight: bold;">新建项目库</div>
-            <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
-                <button type="button" class="layui-btn" @click="exportDetailExcel">导出明细</button>
-                <button type="button" class="layui-btn" @click="exportTotalExcel">导出总表</button>
-                <button type="button" class="layui-btn" @click="exportMoreExcel">自定义导出</button>
-            </div>
-            <div class="layui-collapse">
+            <div class="txt">新建项目库 <div class="top-breadcrumb"></div></div>
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
                     <%--						<h2 class="layui-colla-title">筛选</h2>--%>
                     <div class="layui-colla-content layui-show">
@@ -226,7 +221,7 @@
             </div>
         </div>
         <div>
-            <div class="layui-row">
+            <div class="layui-row class_ls">
                 <div style="display: flex">
                     <label class="juli">
                         新建项目总数<span class="lanse-first">{{beginRate.num}}</span>
@@ -252,85 +247,6 @@
                             </div>
                         </div>
                     </label>
-  <%--                  <label class="juli" onclick="levelList('abcs','A类','A')">
-                        A类项目数
-                        <span class="lanse-first" >{{beginRate.aNum}}</span>
-                        <div class="progress-div">
-                            <div class="layui-progress">
-                                <div class="layui-progress-bar" :style="'width:'+beginRate.aRate"></div>
-                            </div>
-                        </div>
-                    </label>
-                    <label class="juli">
-                        B类项目数
-                        <span class="lanse-first" onclick="levelList('abcs','B类','B')">{{beginRate.bNum}}</span>
-                        <div class="progress-div">
-                            <div class="layui-progress">
-                                <div class="layui-progress-bar" :style="'width:'+beginRate.bRate"></div>
-                            </div>
-                        </div>
-                    </label>
-                    <label class="juli" onclick="levelList('abcs','C类','C')">
-                        C类项目数
-                        <span class="lanse-first">{{beginRate.cNum}}</span>
-                        <div class="progress-div">
-                            <div class="layui-progress">
-                                <div class="layui-progress-bar" :style="'width:'+beginRate.cRate"></div>
-                            </div>
-                        </div>
-                    </label>--%>
-<%--                    <label class="juli">
-                        &lt;%&ndash;                        已开工项目数&ndash;%&gt;转开工项目数
-                        <span class="lanse-first">{{beginRate.xjzh}}</span>
-                        <div class="progress-div">
-                            <div class="layui-progress">
-                                <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
-                            </div>
-                        </div>
-                    </label>--%>
-                    <%--                    <label class="juli">--%>
-                    <%--                        已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>--%>
-                    <%--                        <div class="progress-div">--%>
-                    <%--                            <div class="layui-progress">--%>
-                    <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>--%>
-                    <%--                            </div>--%>
-                    <%--                        </div>--%>
-                    <%--                    </label>--%>
-                    <%--                    <label class="juli">--%>
-                    <%--                        停工项目数<span class="lanse-first">{{beginRate.stopNum}}</span>--%>
-                    <%--                        <div class="progress-div">--%>
-                    <%--                            <div class="layui-progress" lay-filter="layui-progress-bar">--%>
-                    <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.stopRate"></div>--%>
-                    <%--                            </div>--%>
-                    <%--                        </div>--%>
-                    <%--                    </label>--%>
-<%--                    <label class="juli">
-                        &lt;%&ndash;                        开工率&ndash;%&gt;开工项目转化率
-                        <span class="lanse-first">{{beginRate.zjRate}}%</span>
-                        <div class="progress-div">
-                            <div class="layui-progress">
-                                <div class="layui-progress-bar" :style="'width:'+beginRate.zjRate"></div>
-                            </div>
-                        </div>
-                    </label>--%>
-                    <%--                    <label class="juli">--%>
-                    <%--                        竣工率--%>
-                    <%--                        --%>
-                    <%--                        <span class="lanse-first">{{beginRate.endRate}}</span>--%>
-                    <%--                        <div class="progress-div">--%>
-                    <%--                            <div class="layui-progress">--%>
-                    <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>--%>
-                    <%--                            </div>--%>
-                    <%--                        </div>--%>
-                    <%--                    </label>--%>
-                    <%--                    <label class="juli">--%>
-                    <%--                        投资进度<span class="lanse-first">{{beginRate.amtRate}}%</span>--%>
-                    <%--                        <div class="progress-div">--%>
-                    <%--                            <div class="layui-progress">--%>
-                    <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.amtRate+'%'"></div>--%>
-                    <%--                            </div>--%>
-                    <%--                        </div>--%>
-                    <%--                    </label>--%>
                 </div>
                 <div style="display: flex;margin-bottom: 3px">
 
@@ -343,7 +259,7 @@
                         {{item.name}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
-                <div style="margin-bottom: 3px">
+                <div class="second_line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
@@ -354,6 +270,17 @@
         </div>
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process" style="position: relative">
+                <div style="position: relative; display: inline-block" @mouseover="openExport" @mouseout="choseExport">
+                    <div class="export">
+                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
+                        <span>导出</span>
+                    </div>
+                    <div class="export-item" v-if="showExport" :style="{ top: '-93px' }">
+                        <button type="button" class="" @click="exportDetailExcel">导出明细</button>
+                        <button type="button" class="" @click="exportTotalExcel">导出总表</button>
+                        <button type="button" class="" @click="exportMoreExcel">自定义导出</button>
+                    </div>
+                </div>
                 <table id="table1" lay-filter="test"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>
@@ -808,6 +735,8 @@
                 <%--	})--%>
                 <%--}--%>
                 this.getData();
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
                 window.toDetail = this.toDetail;
                 window.levelList = this.levelList;
                 window.showImage = this.showImage;
@@ -1352,6 +1281,12 @@
             choseExport: function () {
                 this.showExport = false;
                 console.log('移出了')
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     });

+ 22 - 53
projects/src/main/webapp/vmodules/subject/subInfo/tz/xmzk.jsp

@@ -102,19 +102,11 @@
 <body>
 <div id="app"></div>
 <template id="template">
-    <div class="layui-layout layui-layout-admin">
+    <div class="layui-layout layui-layout-admin pd0">
         <!-- 内容区域 -->
         <div class="right_title">
-            <div class="txt"
-                 style="width: 100%; font-size: 35px; font-family: '方正小标宋', '仿宋', sans-serif; text-align: center; font-weight: bold;">
-                项目总库
-            </div>
-            <div class="layui-btn-container" style="margin-top: 20px;margin-left: 20px">
-<%--                <button type="button" class="layui-btn" @click="exportDetailExcel">导出明细</button>--%>
-                <button type="button" class="layui-btn" @click="exportTotalExcel">导出</button>
-                <button type="button" class="layui-btn" @click="exportMoreExcel">自定义导出</button>
-            </div>
-            <div class="layui-collapse">
+            <div class="txt">项目总库 <div class="top-breadcrumb"></div></div>
+            <div class="layui-collapse search_form">
                 <div class="layui-colla-item">
                     <div class="layui-colla-content layui-show">
                         <form class="layui-form" lay-filter="searchForm" id="searchForm">
@@ -213,50 +205,19 @@
                 </div>
             </div>
         </div>
-        <div>
-<%--            <div class="layui-row">--%>
-<%--                <div style="display: flex;margin-bottom: 3px">--%>
-<%--                    <label class="juli" onclick="levelList('abcs','A类','A')">--%>
-<%--                        储备项目总数--%>
-<%--                        <span class="info-icon" title="A类项目:成熟类项目,可研或初设已编制并完成初审,达到项目等资金的进度">?</span>--%>
-<%--                        <span class="lanse-first">{{beginRate.num}}</span>--%>
-<%--                    </label>--%>
-<%--                    <label class="juli" onclick="levelList('abcs','A类','A')">--%>
-<%--                        A类项目数--%>
-<%--                        <span class="info-icon" title="A类项目:成熟类项目,可研或初设已编制并完成初审,达到项目等资金的进度">?</span>--%>
-<%--                        <span class="lanse-first">{{beginRate.anum}}</span>--%>
-<%--                    </label>--%>
-<%--                    <label class="juli">--%>
-<%--                        B类项目数--%>
-<%--                        <span class="info-icon" title="B类项目:推进类项目,正在抓紧推进前期手续,预计6-12个月可开工项目">?</span>--%>
-<%--                        <span class="lanse-first" onclick="levelList('abcs','B类','B')">{{beginRate.bnum}}</span>--%>
-<%--                    </label>--%>
-<%--                    <label class="juli" onclick="levelList('abcs','C类','C')">--%>
-<%--                        C类项目数--%>
-<%--                        <span class="info-icon" title="C类项目:意向类项目,还处于谋划论证阶段项目">?</span>--%>
-<%--                        <span class="lanse-first">{{beginRate.cnum}}</span>--%>
-<%--                    </label>--%>
-
-<%--                </div>--%>
-<%--                <div style="display: flex;margin-bottom: 3px">--%>
-<%--                    <label class="juli"--%>
-<%--                           @click="levelList('subjects',item.name,item.code)"--%>
-<%--                           v-for="(item, index) in beginRate.jsddList" :key="index">--%>
-<%--                        {{item.name}} <span class="lanse-first">{{item.num}}</span>--%>
-<%--                    </label>--%>
-<%--                </div>--%>
-<%--                <div style="margin-bottom: 3px">--%>
-<%--                    <label class="juli"--%>
-<%--                           @click="levelList('indusKinds',item.name?item.name:item.code,item.split(',')[3])"--%>
-<%--                           v-for="(item, index) in beginRate.hyflList" :key="index">--%>
-<%--                        {{item.name?item.name:item.code}}--%>
-<%--                        <span class="lanse-first">{{item.num}}</span>--%>
-<%--                    </label>--%>
-<%--                </div>--%>
-<%--            </div>--%>
-        </div>
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process" style="position: relative">
+
+                <div style="position: relative; display: inline-block" @mouseover="openExport" @mouseout="choseExport">
+                    <div class="export">
+                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
+                        <span>导出</span>
+                    </div>
+                    <div class="export-item" v-if="showExport" :style="{ top: '-62px' }">
+                        <button type="button" class="" @click="exportTotalExcel">汇总导出</button>
+                        <button type="button" class="" @click="exportMoreExcel">自定义导出</button>
+                    </div>
+                </div>
                 <table id="table1" lay-filter="test"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>
@@ -634,6 +595,8 @@
                 <%--	})--%>
                 <%--}--%>
                 this.getData();
+                window.addEventListener('message', this.receiveMessage, false);
+                window.parent.postMessage('init loaded')
                 window.toDetail = this.toDetail;
                 window.levelList = this.levelList;
                 window.showImage = this.showImage;
@@ -1214,6 +1177,12 @@
             choseExport: function () {
                 this.showExport = false;
                 console.log('移出了')
+            },
+            receiveMessage (e) {
+                console.log('cb receiveMessage: ', e.data)
+                if (e.data.topBreadcrumb) {
+                    $(".top-breadcrumb").html(e.data.topBreadcrumb)
+                }
             }
         }
     });