重点库右边小菜单修改

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

@@ -322,6 +322,7 @@ public class SubInfoController extends BaseController {
                 //年度固定资产项目库 - 续建项目
                 return new ModelAndView("/vmodules/subject/subInfo/tz/year_extend.jsp");
             case "yearReserve":
+                //重点项目调度  -  储备项目（工信局系统）
                 //年度固定资产项目库 - 储备项目
                 return new ModelAndView("/vmodules/subject/subInfo/tz/year_reserve.jsp");
             case "prePj":

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoQueryApiController.java

@@ -65,24 +65,6 @@ public class SubInfoQueryApiController extends BaseController {
         ListMessage message = new ListMessage();
         try {
             Page pageData = subInfoQueryService.pageAll(page, getCurUser().getLoginUser(), queryVO);
-         /*   for (int i = 0; i < pageData.getList().size(); i++) {
-
-                Map<String, Object> map = (Map<String, Object>) pageData.getList().get(i);
-                //查询资金来源
-                String subId = map.get("id") == null ? "" : map.get("id") + "";
-                map.put("zjlyName", "--");
-                if (StringUtil.isNotEmpty(subId)) {
-                    List<SubSourceVO> list = subSourceDao.findBySubId(subId);
-                    String name = "";
-
-                    for (SubSourceVO subSourceVO : list) {
-                        name = name + (subSourceVO.getSourceName()==null?"--":subSourceVO.getSourceName()) + "</br>";
-                    }
-
-                    map.put("zjlyName", name);
-                }
-            }*/
-
             message.add(pageData.getList(), pageData.getTotalCount());
         } catch (Exception e) {
             logger.error("", e);

projects/src/main/webapp/vmodules/leftMenu.jsp

@@ -109,6 +109,38 @@
                     code: '1999',
                     txt: '重点项目调度',
                     child: [
+                        {
+                            txt: '储备项目',
+                            code: '1103',
+                            url: 'subject/subInfo/projTz?type=yearReserve',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_yearReserve_${loginUserId}")
+                            }
+                        },
+                        {
+                            txt: '新建项目',
+                            code: '1101',
+                            url: 'subject/subInfo/projTz?type=yearNew',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_yearNew_${loginUserId}")
+                            }
+                        },
+                        {
+                            txt: '续建项目',
+                            code: '1102',
+                            url: 'subject/subInfo/projTz?type=yearExtend',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_yearExtend_${loginUserId}")
+                            }
+                        },
+                        {
+                            txt: '汇总项目',
+                            code: '1101',
+                            url: 'subject/subInfo/projTz?type=yearSum',
+                            before: function () {
+                                window.localStorage.removeItem("TzQueryParam_yearSum_${loginUserId}")
+                            }
+                        },
                         <%--                    <c:forEach items="${zjlyList}" var="li" varStatus="lis">--%>
                         <%--                        {--%>
                         <%--                            txt: '${li.title}',--%>

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

@@ -1173,17 +1173,11 @@
                                 }
                             },
                             {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
+                            {field: 'subName', fixed: 'left', title: '项目所在地', minWidth: 200, templet: '#subName'},
+                            {field: 'subName', fixed: 'left', title: '项目建设内容', minWidth: 200, templet: '#subName'},
                             // {field: 'abc',type:'string', title: 'ABC',fixed: 'left', align:'center', width: 60, templet: "#abcSpan"},
                             /*                 {field: 'offset', title: '偏离状态', fixed: 'left', minWidth: 150},*/
-                            {
-                                field: 'offsetLight',
-                                title: '偏离状态',
-                                type: 'string',
-                                align: 'center',
-                                fixed: 'left',
-                                width: 100,
-                                templet: '#offsetLight'
-                            },
+                            // {field: 'offsetLight', title: '偏离状态', type: 'string', align: 'center', fixed: 'left', width: 100, templet: '#offsetLight'},
                             {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort: true},
                             {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
                             {field: 'state', title: '计划时间', width: 140, templet: '#date'},