页面调整

projects/pom.xml

@@ -24,6 +24,23 @@
 	</properties>
 
 	<dependencies>
+
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-api</artifactId>
+			<version>0.11.5</version>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-impl</artifactId>
+			<version>0.11.5</version>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-jackson</artifactId> <!-- If you use Jackson for JSON processing -->
+			<version>0.11.5</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>

projects/src/main/webapp/vmodules/subject/subInfo/report.jsp

@@ -45,11 +45,10 @@
 											<div class="layui-input-block">
 												<select name="status">
 													<option value="">请选择</option>
-													<option value="1">项目前期</option>
-													<option value="6">待开工</option>
-													<option value="7">施工中</option>
-													<option value="8">暂停施工</option>
-													<option value="A">已竣工</option>
+													<option value="1">储备</option>
+													<option value="2">新建</option>
+													<option value="3">在建</option>
+													<option value="9">投产</option>
 												</select>
 											</div>
 										</div>
@@ -313,23 +312,17 @@ new Vue({
 				for(var i=0;i<self.dataList.length;i++){
 					var tem = self.dataList[i];
 					switch(tem.status){
-					case '0':
-						tem.statusName = '暂存';
-						break;
 					case '1':
-						tem.statusName = '项目前期';
-						break;
-					case '6':
-						tem.statusName = '待开工';
+						tem.statusName = '储备';
 						break;
-					case '7':
-						tem.statusName = '施工中';
+					case '2':
+						tem.statusName = '新建';
 						break;
-					case '8':
-						tem.statusName = '暂停施工';
+					case '3':
+						tem.statusName = '在建';
 						break;
-					case 'A':
-						tem.statusName = '已竣工';
+					case '9':
+						tem.statusName = '投产';
 						break;
 					}
 				}

projects/src/main/webapp/vmodules/subject/subInfo/report_department.jsp

@@ -101,19 +101,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">审批部门</label>
-                                        <div class="layui-input-block">
-                                            <select name="department" lay-filter="department" lay-search>
-                                                <option value="">--请选择--</option>
-                                                <c:forEach items="${Junit}" var="hy">
-                                                    <option value="${hy.id }">${hy.title}</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
                                 <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">时间</label>

projects/src/main/webapp/vmodules/subject/subInfo/report_file.jsp

@@ -118,19 +118,6 @@
 										</div>
 									</div>
 								</div>
-								<div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-									<div class="layui-form-item">
-										<label class="layui-form-label">审批部门</label>
-										<div class="layui-input-block">
-											<select name="department"  lay-filter="department" lay-search>
-												<option value="">--请选择--</option>
-												<c:forEach items="${Junit}" var="hy">
-													<option value="${hy.id }">${hy.title}</option>
-												</c:forEach>
-											</select>
-										</div>
-									</div>
-								</div>
 								<div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
 									<div class="layui-form-item">
 										<label class="layui-form-label">时间</label>

projects/src/main/webapp/vmodules/subject/subInfo/report_project.jsp

@@ -118,19 +118,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">审批部门</label>
-                                        <div class="layui-input-block">
-                                            <select name="department" lay-filter="department" lay-search>
-                                                <option value="">--请选择--</option>
-                                                <c:forEach items="${Junit}" var="hy">
-                                                    <option value="${hy.id }">${hy.title}</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
                                 <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">时间</label>

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

@@ -683,11 +683,6 @@
         }}
         <span title="">
         <span class="qianse">总投资：</span><strong class="lanse">{{d.amtTotal}}</strong> 万元 <br/>
-		 <span class="qianse">已完成投资：</span><strong class="lanse">{{d.allAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.amtTotal, d.allAmt)}} %</i> )<br/>
-		<span class="qianse">年度计划投资：</span><strong class="lanse">{{d.yearPlanAmt}}</strong> 万元 <br/>
-		<span class="qianse">年度完成投资：</span><strong class="lanse">{{d.yearEndAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.yearPlanAmt, d.yearEndAmt)}} %</i> )
 
     </span>
     </script>
@@ -1573,17 +1568,21 @@
                     });
                 },
                 subInfoToSubFix: function () {
+
                     var self = this;
                     var param = this.getSearchParams();
-                    App.postJson("/api/subject/subInfo/subInfoToSubFix", {
-                        year: param.year,
-                        cat: 2      // 代表抓取新建项目
-                    }, function (res) {
-                        if (res.success) {
-                            App.msg.success("抓取成功");
-                            self.getData();
-                        }
-                    })
+
+                    App.msg.confirm("是否自动抓取？", function () {
+                        App.postJson("/api/subject/subInfo/subInfoToSubFix", {
+                            year: param.year,
+                            cat: 2      // 代表抓取新建项目
+                        }, function (res) {
+                            if (res.success) {
+                                App.msg.success("抓取成功");
+                                self.getData();
+                            }
+                        })
+                    });
                 },
                 downLoadTemplate: function () {
                     parent.window.location.href = App.getUrl(

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

@@ -683,12 +683,6 @@
         }}
         <span title="">
         <span class="qianse">总投资：</span><strong class="lanse">{{d.amtTotal}}</strong> 万元 <br/>
-		 <span class="qianse">已完成投资：</span><strong class="lanse">{{d.allAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.amtTotal, d.allAmt)}} %</i> )<br/>
-		<span class="qianse">年度计划投资：</span><strong class="lanse">{{d.yearPlanAmt}}</strong> 万元 <br/>
-		<span class="qianse">年度完成投资：</span><strong class="lanse">{{d.yearEndAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.yearPlanAmt, d.yearEndAmt)}} %</i> )
-
     </span>
     </script>
 
@@ -1572,17 +1566,21 @@
                     });
                 },
                 subInfoToSubFix: function () {
+
                     var self = this;
                     var param = this.getSearchParams();
-                    App.postJson("/api/subject/subInfo/subInfoToSubFix", {
-                        year: param.year,
-                        cat: 1      // 代表抓取新建项目
-                    }, function (res) {
-                        if (res.success) {
-                            App.msg.success("抓取成功");
-                            self.getData();
-                        }
-                    })
+
+                    App.msg.confirm("是否自动抓取？", function () {
+                        App.postJson("/api/subject/subInfo/subInfoToSubFix", {
+                            year: param.year,
+                            cat: 1      // 代表抓取新建项目
+                        }, function (res) {
+                            if (res.success) {
+                                App.msg.success("抓取成功");
+                                self.getData();
+                            }
+                        })
+                    });
                 },
                 downLoadTemplate: function () {
                     parent.window.location.href = App.getUrl(

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

@@ -684,12 +684,6 @@
         }}
         <span title="">
         <span class="qianse">总投资：</span><strong class="lanse">{{d.amtTotal}}</strong> 万元 <br/>
-		 <span class="qianse">已完成投资：</span><strong class="lanse">{{d.allAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.amtTotal, d.allAmt)}} %</i> )<br/>
-		<span class="qianse">年度计划投资：</span><strong class="lanse">{{d.yearPlanAmt}}</strong> 万元 <br/>
-		<span class="qianse">年度完成投资：</span><strong class="lanse">{{d.yearEndAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.yearPlanAmt, d.yearEndAmt)}} %</i> )
-
     </span>
     </script>
 
@@ -1574,15 +1568,17 @@
                 subInfoToSubFix: function () {
                     var self = this;
                     var param = this.getSearchParams();
-                    App.postJson("/api/subject/subInfo/subInfoToSubFix", {
-                        year: param.year,
-                        cat: 3  // 代表抓取储备项目
-                    }, function (res) {
-                        if (res.success) {
-                            App.msg.success("抓取成功");
-                            self.getData();
-                        }
-                    })
+                    App.msg.confirm("是否自动抓取？", function () {
+                        App.postJson("/api/subject/subInfo/subInfoToSubFix", {
+                            year: param.year,
+                            cat: 3  // 代表抓取储备项目
+                        }, function (res) {
+                            if (res.success) {
+                                App.msg.success("抓取成功");
+                                self.getData();
+                            }
+                        })
+                    });
                 },
                 uploadProject: function () {
                     $("#importExc").click();

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

@@ -683,12 +683,6 @@
         }}
         <span title="">
         <span class="qianse">总投资：</span><strong class="lanse">{{d.amtTotal}}</strong> 万元 <br/>
-		 <span class="qianse">已完成投资：</span><strong class="lanse">{{d.allAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.amtTotal, d.allAmt)}} %</i> )<br/>
-		<span class="qianse">年度计划投资：</span><strong class="lanse">{{d.yearPlanAmt}}</strong> 万元 <br/>
-		<span class="qianse">年度完成投资：</span><strong class="lanse">{{d.yearEndAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.yearPlanAmt, d.yearEndAmt)}} %</i> )
-
     </span>
     </script>
 
@@ -1578,17 +1572,21 @@
                     });
                 },
                 subInfoToSubFix: function () {
+
                     var self = this;
                     var param = this.getSearchParams();
-                    App.postJson("/api/subject/subInfo/subInfoToSubFix", {
-                        year: param.year,
-                        cat: 9      // 代表抓取新建项目
-                    }, function (res) {
-                        if (res.success) {
-                            App.msg.success("抓取成功");
-                            self.getData();
-                        }
-                    })
+
+                    App.msg.confirm("是否自动抓取？", function () {
+                        App.postJson("/api/subject/subInfo/subInfoToSubFix", {
+                            year: param.year,
+                            cat: 9      // 代表抓取新建项目
+                        }, function (res) {
+                            if (res.success) {
+                                App.msg.success("抓取成功");
+                                self.getData();
+                            }
+                        })
+                    });
                 },
                 downLoadTemplate: function () {
                     parent.window.location.href = App.getUrl(