重点库四库详情页面修改

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_extend.jsp

@@ -1112,12 +1112,21 @@
                     })
                 },
                 toDetail: function (obj) {
+                    //详情
+                    // var index = layer.open({
+                    //     type: 2,
+                    //     title: "",
+                    //     area: ['1000px', '800px'],
+                    //     content: App.getUrl("/subject/subInfo/detailView?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href + "&queryYear=" + obj.data.queryYear),
+                    // });
+                    // layui.layer.full(index);
+
                     //详情
                     var index = layer.open({
                         type: 2,
-                        title: "",
+                        title: '',
                         area: ['1000px', '800px'],
-                        content: App.getUrl("/subject/subInfo/detailView?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href + "&queryYear=" + obj.data.queryYear),
+                        content: App.getUrl("/subject/subInfo/detailView2?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href),
                     });
                     layui.layer.full(index);
                 },

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_new.jsp

@@ -1108,12 +1108,21 @@
                     })
                 },
                 toDetail: function (obj) {
+                    //详情
+                    // var index = layer.open({
+                    //     type: 2,
+                    //     title: "",
+                    //     area: ['1000px', '800px'],
+                    //     content: App.getUrl("/subject/subInfo/detailView?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href + "&queryYear=" + obj.data.queryYear),
+                    // });
+                    // layui.layer.full(index);
+
                     //详情
                     var index = layer.open({
                         type: 2,
-                        title: "",
+                        title: '',
                         area: ['1000px', '800px'],
-                        content: App.getUrl("/subject/subInfo/detailView?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href + "&queryYear=" + obj.data.queryYear),
+                        content: App.getUrl("/subject/subInfo/detailView2?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href),
                     });
                     layui.layer.full(index);
                 },

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve.jsp

@@ -1078,14 +1078,24 @@
                     })
                 },
                 toDetail: function (obj) {
+                    // //详情
+                    // var index = layer.open({
+                    //     type: 2,
+                    //     title: "",
+                    //     area: ['1000px', '800px'],
+                    //     content: App.getUrl("/subject/subInfo/detailView?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href + "&queryYear=" + obj.data.queryYear),
+                    // });
+                    // layui.layer.full(index);
+
                     //详情
                     var index = layer.open({
                         type: 2,
-                        title: "",
+                        title: '',
                         area: ['1000px', '800px'],
-                        content: App.getUrl("/subject/subInfo/detailView?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href + "&queryYear=" + obj.data.queryYear),
+                        content: App.getUrl("/subject/subInfo/detailView2?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href),
                     });
                     layui.layer.full(index);
+
                 },
                 print: function (obj) {
                     window.open(App.getUrl("/subject/apply/downPdf?subId=" + obj.data.id));

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve_sum.jsp

@@ -152,31 +152,6 @@
         </div>
         <div class="table_box" style="padding-top: 0;">
             <div class="table_process" style="position: relative;">
-                <div class="export" style="background: transparent" @mouseover="openExport" @mouseout="choseExport">
-                    <div class="export" style="right: 25px;top: 0">
-                        <img src="${WebSite.asset}/css/images/left/export.svg"/>
-                        <span>导出</span>
-                    </div>
-                    <div class="sanjiao"></div>
-                    <div class="export-item" v-if="showExport" style="right: 5px;top:-30px">
-                        <%--                        <button type="button" class="" @click="exportExcel">--%>
-                        <%--                            项目汇总--%>
-                        <%--                        </button>--%>
-                        <%--                        <button type="button" class=""--%>
-                        <%--                                @click="exportExcelByIndusKind">按所属行业--%>
-                        <%--                        </button>--%>
-                        <%--                        <button type="button" class=""--%>
-                        <%--                                @click="exportSchedulingExcel">项目调度表--%>
-                        <%--                        </button>--%>
-                        <%--                        <!-- <button type="button" class="" @click="exportExcel2">项目明细导出</button> -->--%>
-                        <%--                        <button type="button" class=""--%>
-                        <%--                                @click="exportMoreExcel">自定义--%>
-                        <%--                        </button>--%>
-                        <button type="button" class=""
-                                @click="exportProject">储备项目
-                        </button>
-                    </div>
-                </div>
                 <table id="table1" lay-filter="test" style="position: relative;"></table>
                 <div class="pagination-box" id="pagination"></div>
             </div>

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_sum.jsp

@@ -1123,12 +1123,21 @@
                     })
                 },
                 toDetail: function (obj) {
+                    //详情
+                    // var index = layer.open({
+                    //     type: 2,
+                    //     title: "",
+                    //     area: ['1000px', '800px'],
+                    //     content: App.getUrl("/subject/subInfo/detailView?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href + "&queryYear=" + obj.data.queryYear),
+                    // });
+                    // layui.layer.full(index);
+
                     //详情
                     var index = layer.open({
                         type: 2,
-                        title: "",
+                        title: '',
                         area: ['1000px', '800px'],
-                        content: App.getUrl("/subject/subInfo/detailView?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href + "&queryYear=" + obj.data.queryYear),
+                        content: App.getUrl("/subject/subInfo/detailView2?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href),
                     });
                     layui.layer.full(index);
                 },