leixin修改

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

@@ -1,5 +1,6 @@
 package com.rtrh.projects.web.controller.subject;
 
+import com.rtrh.projects.modules.system.service.ISubInduService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -22,14 +23,21 @@ public class GraphicProgressWebController extends BaseController {
 
 	@Autowired
 	private TSysTableService tSysTableService;
+
+	@Autowired
+	private ISubInduService subInduService;
+	@Autowired
+	private TSysTableService sysTableService;
 	
 	@GetMapping("/list")
 	public ModelAndView list(ModelMap model) {
-		model.put("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));
+//		model.put("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));
+		model.put("XMLX", sysTableService.getByKind(SysTableKind.XMLX));
 		model.put("JSDD", tSysTableService.getByKind(SysTableKind.JSDD));
-		model.put("HYFL", tSysTableService.getByKind(SysTableKind.HYFL));
+//		model.put("HYFL", tSysTableService.getByKind(SysTableKind.HYFL));
+		model.put("HYFL", subInduService.queryTreeALl());
 		model.put("JSXZ", tSysTableService.getByKind(SysTableKind.JSXZ));
-		return new ModelAndView("/vmodules/graphic/list.jsp");
+		return new ModelAndView("/vmodules/graphic/list.jsp", model);
 	}
 	
 	@GetMapping("detail")

projects/src/main/webapp/vmodules/graphic/list.jsp

@@ -64,7 +64,7 @@
 										<div class="layui-form-item">
 											<label class="layui-form-label required">行业类别</label>
 											<div class="layui-input-block">
-												<select name="indusKind" lay-search="">
+												<select name="indusKind"  v-model="indusKind" id="indusKind" lay-search="">
 													<option value="">请选择</option>
 													<c:forEach items="${HYFL }" var="hy">
 														<option value="${hy.id }">${hy.title }</option>
@@ -73,14 +73,6 @@
 											</div>
 										</div>
 									</div>
-									<div class="layui-col-xs3 layui-col-sm3 layui-col-md4">
-										<div class="layui-form-item" style="height:28px;">
-											<label class="layui-form-label required">项目类型</label>
-											<div class="layui-input-block">
-												<div id="kind" name="kind"></div>
-											</div>
-										</div>
-									</div>
 									<div class="layui-col-xs3 layui-col-sm3 layui-col-md4">
 										<div class="layui-form-item">
 											<label class="layui-form-label">进度范围(%)</label>
@@ -196,12 +188,11 @@ new Vue({
 		getData : function(){
 			var self = this;
 			var param = layui.form.getValue("searchForm");
-			param.kind = this.kind.getValue("value").sort().join(",");
+			param.kind = "";
 			param.pageNo = this.pageNo;
 			param.pageSize = this.pageSize;
 			param.orderBy = this.sort.field;
 			param.orderType = this.sort.type || null;
-
 			App.postJson("/api/graphicProgress/list",param, function(res){
 				self.dataList = res.rows;
 				self.loadPage(res.total);

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

@@ -268,7 +268,7 @@
                             url: 'sysTable/index'
                         },
                         {
-                            txt: '项目日志查询',
+                            txt: '操作日志查询',
                             code: '913',
                             url: 'subDataLog/index'
                         },

projects/src/main/webapp/vmodules/subject/log/list.jsp

@@ -18,7 +18,7 @@
     <div class="layui-layout layui-layout-admin">
         <!-- 内容区域 -->
         <div class="right_title">
-            <span class="txt">日志查询</span>
+            <span class="txt">操作日志查询</span>
 <%--            <button class="btn btn_add" @click="add"><i class="layui-icon layui-icon-add-circle"></i> 新增</button>--%>
             <div class="layui-collapse">
                 <div class="layui-colla-item">