bf

yiming
1 parent 8ed54c91
Showing 10 changed files with 407 additions and 81 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineExamineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
bsthLineProfiles/src/main/resources/application-druid.yml
bsthLineProfiles/src/main/resources/application.yml
bsthLineProfiles/src/main/resources/templates/system/line/line.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/line.html
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/line.html
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 import java.io.File;
 import java.lang.reflect.Field;
@@ -49,12 +50,16 @@ public class BsthTLineAddController extends BaseController
     @Autowired
     private IUserService userService;
-    
+
     @RequiresPermissions("system:line:view")
     @GetMapping()
-    public String line()
+    public ModelAndView line()
     {
-        return prefix + "/line";
+
+        ModelAndView mv=new ModelAndView(prefix + "/line");
+        List<Map> companyList=bsthTLineService.selectCompany();
+        mv.addObject("companyList",companyList);
+        return mv;
     }
     @GetMapping("/map")
@@ -15,9 +15,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 import java.util.List;
+import java.util.Map;
 /**
@@ -41,14 +43,16 @@ public class BsthTLineExamineController extends BaseController
-
     @RequiresPermissions("system:line:view")
     @GetMapping()
-    public String line()
+    public ModelAndView line()
     {
-        return prefix + "/line";
-    }
+        ModelAndView mv=new ModelAndView(prefix + "/line");
+        List<Map> companyList=bsthTLineService.selectCompany();
+        mv.addObject("companyList",companyList);
+        return mv;
+    }
     @GetMapping("/map")
     public String map()
@@ -30,6 +30,7 @@ import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.security.ShiroUtils;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.web.servlet.ModelAndView;
 /**
  * 【请填写功能名称】Controller
@@ -53,13 +54,17 @@ public class BsthTLineHistoryController extends BaseController
     @Autowired
     private IUserService userService;
+
     @RequiresPermissions("system:lineHistory:view")
     @GetMapping()
-    public String line()
+    public ModelAndView line()
     {
-        return prefix + "/line";
-    }
+        ModelAndView mv=new ModelAndView(prefix + "/line");
+        List<Map> companyList=bsthTLineService.selectCompany();
+        mv.addObject("companyList",companyList);
+        return mv;
+    }
     /**
      * 变更分页
 package com.ruoyi.project.system.user.controller;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.UsernamePasswordToken;
@@ -18,6 +27,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -26,13 +38,15 @@ import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.shiro.service.PasswordService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.service.PermissionService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.project.system.config.service.IConfigService;
 import com.ruoyi.project.system.menu.domain.Menu;
 import com.ruoyi.project.system.menu.service.IMenuService;
-import com.ruoyi.project.system.menu.service.MenuServiceImpl;
 import com.ruoyi.project.system.user.domain.User;
+import io.jsonwebtoken.lang.Assert;
+
 /**
  * 登录验证
  *
@@ -56,6 +70,7 @@ public class LoginController extends BaseController
     @Autowired
     private RuoYiConfig ruoYiConfig;
+
     @GetMapping("/login")
     public String login(HttpServletRequest request, HttpServletResponse response)
     {
@@ -74,44 +89,72 @@ public class LoginController extends BaseController
         if(token != null) {
-            login("admin","admin123",false);
-
-            // 取身份信息
-            User user = getSysUser();
-            // 根据用户id取出菜单
-            List<Menu> menus = menuService.selectMenusByUser(user);
-            mmap.put("menus", menus);
-            mmap.put("user", user);
-            mmap.put("sideTheme", "theme-dark");
-            mmap.put("skinName", "skin-blue");
-            mmap.put("ignoreFooter", configService.selectConfigByKey("sys.index.ignoreFooter"));
-            mmap.put("copyrightYear", ruoYiConfig.getCopyrightYear());
-            mmap.put("demoEnabled", ruoYiConfig.isDemoEnabled());
-            mmap.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
-            mmap.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
-
-            // 菜单导航显示风格
-            String menuStyle = configService.selectConfigByKey("sys.index.menuStyle");
-            // 移动端，默认使左侧导航菜单，否则取默认配置
-            String indexStyle = ServletUtils.checkAgentIsMobile(ServletUtils.getRequest().getHeader("User-Agent")) ? "index" : menuStyle;
-
-            // 优先Cookie配置导航菜单
-            Cookie[] cookies = ServletUtils.getRequest().getCookies();
-            for (Cookie cookie : cookies)
-            {
-                if (StringUtils.isNotEmpty(cookie.getName()) && "nav-style".equalsIgnoreCase(cookie.getName()))
-                {
-                    indexStyle = cookie.getValue();
-                    break;
+            User user = tokenService.getUser(token);
+            if (user == null && token != null) {
+
+                String dataJsonStr = sendPost("http://180.169.154.251:18080/information/authenticate/loginAuthentication",token);
+
+
+                JSONObject jsonObject = JSON.parseObject(dataJsonStr);
+
+
+                JSONObject dataJson = jsonObject.getJSONObject("data");
+
+                Assert.notNull(dataJson, "获取用户信息异常");
+
+
+                JSONArray jsonMenu = dataJson.getJSONArray("userAuthList").getJSONObject(0).getJSONArray("roleList").getJSONObject(0).getJSONArray("resourceList");
+
+
+                Map<Long,Menu> menuMap = new HashMap<Long,Menu>();
+
+                String ids = "";
+
+                for(Object json:jsonMenu) {
+                    ids += ((JSONObject)json).getLongValue("menuId") + ",";
                 }
-            }
-            return "index";
+                ids.substring(0,ids.length() -1);
-        }else {
-            return "login";
-        }
+                List<Menu> allMenus = menuService.selectMenuNormalByMenuIds(ids.split(","));
+
+
+                login("admin","admin123",false);
+                user = getSysUser();
+                user.setToken(token);
+//    	        user.setPermissions(permissionService.getMenuPermission());
+                tokenService.createToken(user);
+
+
+                //String username = dataJson.getString("account");
+//    	        String username = "admin";
+//    	        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+//    	        SysUser sysUser = sysUserService.selectUserByUserName(username);
+
+//    	        user.setPermissions(permissionService.getMenuPermission(sysUser));
+//    	        user.setUser(sysUser);
+
+
+                mmap.put("menus", allMenus);
+                mmap.put("user", user);
+                mmap.put("ignoreFooter", configService.selectConfigByKey("sys.index.ignoreFooter"));
+                mmap.put("copyrightYear", ruoYiConfig.getCopyrightYear());
+                mmap.put("demoEnabled", ruoYiConfig.isDemoEnabled());
+                mmap.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
+                mmap.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
+
+                // 菜单导航显示风格
+                String menuStyle = configService.selectConfigByKey("sys.index.menuStyle");
+                // 移动端，默认使左侧导航菜单，否则取默认配置
+                String indexStyle = ServletUtils.checkAgentIsMobile(ServletUtils.getRequest().getHeader("User-Agent")) ? "index" : menuStyle;
+
+
+                return "index";
+
+            }
+
+        }
 //        User loginUser = tokenService.getUser(ServletUtils.getRequest());
@@ -121,7 +164,32 @@ public class LoginController extends BaseController
 //            subject.login(token);
 //            return success();
+        return "index";
+    }
+
+    public String sendPost(String url,String token) {
+        String strresponse = null;
+        try{
+            HttpClient hc = HttpClientBuilder.create().build();//获取DefaultHttpClient请求
+            HttpPost hp = new HttpPost(url);
+            JSONObject jsonParam = new JSONObject();
+            jsonParam.put("token", token);
+            jsonParam.put("systemCode", "SYS0015");
+            //设置数据为utf-8编码
+            StringEntity entity = new StringEntity(jsonParam.toString(),"utf-8");
+            //设置请求编码
+            entity.setContentEncoding("utf-8");
+            //设置请求类型
+            entity.setContentType("application/json");
+            hp.setEntity(entity);
+            //请求并得到结果
+            HttpResponse result = hc.execute(hp);
+            strresponse = EntityUtils.toString(result.getEntity(),"utf-8").trim();
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+        return strresponse;
     }
@@ -194,4 +262,4 @@ public class LoginController extends BaseController
     {
         return "error/unauth";
     }
-}
 \ No newline at end of file
+}
@@ -5,18 +5,22 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
+#            master:
+#                url: jdbc:mysql://localhost:3306/linedata?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: Aa123456
+            # 主库数据源
             master:
                 url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: 1995627a
-                #password: Aa123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -36,7 +40,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -44,8 +48,8 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
+                login-username:
+                login-password:
             filter:
                 stat:
                     enabled: true
@@ -28,7 +28,7 @@ server:
     max-threads: 800
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
- 
+
 # 日志配置
 logging:
   level:
@@ -56,7 +56,7 @@ spring:
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
-  profiles: 
+  profiles:
     active: druid
   # 文件上传
   servlet:
@@ -93,7 +93,7 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-        
+
   token:
     # 令牌自定义标识
     header: Authorization
@@ -112,11 +112,11 @@ mybatis:
     configLocation: classpath:mybatis/mybatis-config.xml
 # PageHelper分页插件
-pagehelper: 
+pagehelper:
   helperDialect: mysql
   reasonable: true
   supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql
 # Shiro
 shiro:
@@ -128,12 +128,12 @@ shiro:
     # 首页地址
     indexUrl: /index
     # 验证码开关
-    captchaEnabled: false
+    captchaEnabled: true
     # 验证码类型 math 数组计算 char 字符
     captchaType: math
   cookie:
     # 设置Cookie的域名 默认空，即当前访问的域名
-    domain: 
+    domain:
     # 设置cookie的有效访问路径
     path: /
     # 设置HttpOnly属性
@@ -155,7 +155,7 @@ shiro:
     kickoutAfter: false
 # 防止XSS攻击
-xss: 
+xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
@@ -169,7 +169,7 @@ swagger:
   enabled: true
 # 代码生成
-gen: 
+gen:
   # 作者
   author: ruoyi
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
@@ -257,9 +257,9 @@
 			}
 			companies=Array.from(new Set(companies));
 			companySelect();
-			fCompanySelect(false);
+			fCompanySelect();
 			$('#company').on('change.select2', function (e) {
-				fCompanySelect(true)
+				fCompanySelect()
 			});
 		});
@@ -285,7 +285,7 @@
 	}
-	function fCompanySelect(flag){
+	function fCompanySelect(){
 		$('#fCompany').empty();
 		var company=$('#company').select2('val');
 		var arr = new Array();
@@ -3,6 +3,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 <th:block th:include="include :: header('线路档案信息')" />
+<th:block th:include="include :: select2-css" />
 </head>
 <body class="gray-bg">
 	<div class="container-div" id="context">
@@ -11,9 +12,13 @@
 				<form id="formId">
 					<div class="select-list">
 						<ul>
-							<li><label>公司：</label> <input type="text" name="company" />
+							<li><label>公司：</label>
+								<select id='company' >
+								</select>
 							</li>
-							<li><label>分公司：</label> <input type="text" name="fCompany" />
+							<li><label>分公司：</label>
+								<select id='fCompany' >
+								</select>
 							</li>
 							<li><label>线路名称：</label> <input type="text" name="lineName" />
 							</li>
@@ -39,6 +44,7 @@
 		</div>
 	</div>
 	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: select2-js" />
 	<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
 		aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog">
@@ -67,22 +73,83 @@
 	<script th:inline="javascript">
+		var companyList=[[${companyList}]];
+		var companies=new Array();
+		var fCompanies=new Array();
 		$(function() {
-			stations=data.stations;
+			for(let i in companyList){
+				companies[i]=companyList[i].company;
+				fCompanies[i]=companyList[i].fCompany;
+			}
+			companies=Array.from(new Set(companies));
+			companySelect();
+			fCompanySelect();
+			$('#company').on('change.select2', function (e) {
+				fCompanySelect()
+			});
+		});
+
+		function companySelect(){
 			var arr = new Array();
-			for (var i = 0; i < stations.length; i++) {
-				var station=new Object();
-				station.id=stations[i];
-				station.text=stations[i];
-				station.value=stations[i];
-				arr.push(station);
+			var company=new Object();
+			company.id='';
+			company.text='';
+			company.value='';
+			arr.push(company)
+			for (var i = 0; i < companies.length; i++) {
+				company=new Object();
+				company.id=companies[i];
+				company.text=companies[i];
+				company.value=companies[i];
+				arr.push(company);
 			}
 			$("#company").select2({
 				data: arr,
 				placeholder:'请选择',
 				allowClear:true
 			})
-		});
+		}
+
+
+		function fCompanySelect(){
+			$('#fCompany').empty();
+			var company=$('#company').select2('val');
+			var arr = new Array();
+			var fCompany=new Object();
+			fCompany.id='';
+			fCompany.text='';
+			fCompany.value='';
+			arr.push(fCompany)
+			if(company==''){
+				for(let i in companyList){
+					var companyName=companyList[i].company;
+					var fCompanyName=companyList[i].fCompany;
+					fCompany=new Object();
+					fCompany.id=fCompanyName;
+					fCompany.text=fCompanyName;
+					fCompany.value=fCompanyName;
+					arr.push(fCompany);
+				}
+			}else {
+				for(let i in companyList){
+					var companyName=companyList[i].company;
+					var fCompanyName=companyList[i].fCompany;
+					if(companyName==company){
+						fCompany=new Object();
+						fCompany.id=fCompanyName;
+						fCompany.text=fCompanyName;
+						fCompany.value=fCompanyName;
+						arr.push(fCompany);
+					}
+				}
+			}
+
+			$("#fCompany").select2({
+				data: arr,
+				placeholder:'请选择',
+				allowClear:true
+			});
+		}
 		function add(obj){
 			if($(obj)[0].className.indexOf("disabled") == -1)
@@ -199,7 +266,12 @@
 				}
 			}
 		}
-
+		function queryParams(params) {
+			var search = $.table.queryParams(params);
+			search.company=$('#company').select2('val');
+			search.fCompany=$('#fCompany').select2('val');
+			return search;
+		}
 		var editFlag = [[${@permission.hasPermi('system:lineReport:edit')}]];
 		var removeFlag = [[${@permission.hasPermi('system:lineReport:remove')}]];
@@ -4,6 +4,7 @@
 <head>
 <th:block th:include="include :: header('线路档案信息')" />
 <th:block th:include="include :: datetimepicker-css" />
+<th:block th:include="include :: select2-css" />
 </head>
 <body class="gray-bg">
 	<div class="container-div" id="context">
@@ -12,9 +13,13 @@
 				<form id="formId">
 					<div class="select-list">
 						<ul>
-							<li><label>公司：</label> <input type="text" name="company" />
+							<li><label>公司：</label>
+								<select id='company' >
+								</select>
 							</li>
-							<li><label>分公司：</label> <input type="text" name="fCompany" />
+							<li><label>分公司：</label>
+								<select id='fCompany' >
+								</select>
 							</li>
 							<li><label>线路名称：</label> <input type="text" name="lineName" />
 							</li>
@@ -44,6 +49,7 @@
 	</div>
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: datetimepicker-js" />
+	<th:block th:include="include :: select2-js" />
 	<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
 		aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog">
@@ -71,7 +77,83 @@
 	<script th:inline="javascript">
+		var companyList=[[${companyList}]];
+		var companies=new Array();
+		var fCompanies=new Array();
+		$(function() {
+			for(let i in companyList){
+				companies[i]=companyList[i].company;
+				fCompanies[i]=companyList[i].fCompany;
+			}
+			companies=Array.from(new Set(companies));
+			companySelect();
+			fCompanySelect();
+			$('#company').on('change.select2', function (e) {
+				fCompanySelect()
+			});
+		});
+
+		function companySelect(){
+			var arr = new Array();
+			var company=new Object();
+			company.id='';
+			company.text='';
+			company.value='';
+			arr.push(company)
+			for (var i = 0; i < companies.length; i++) {
+				company=new Object();
+				company.id=companies[i];
+				company.text=companies[i];
+				company.value=companies[i];
+				arr.push(company);
+			}
+			$("#company").select2({
+				data: arr,
+				placeholder:'请选择',
+				allowClear:true
+			})
+		}
+
+		function fCompanySelect(){
+			$('#fCompany').empty();
+			var company=$('#company').select2('val');
+			var arr = new Array();
+			var fCompany=new Object();
+			fCompany.id='';
+			fCompany.text='';
+			fCompany.value='';
+			arr.push(fCompany)
+			if(company==''){
+				for(let i in companyList){
+					var companyName=companyList[i].company;
+					var fCompanyName=companyList[i].fCompany;
+					fCompany=new Object();
+					fCompany.id=fCompanyName;
+					fCompany.text=fCompanyName;
+					fCompany.value=fCompanyName;
+					arr.push(fCompany);
+				}
+			}else {
+				for(let i in companyList){
+					var companyName=companyList[i].company;
+					var fCompanyName=companyList[i].fCompany;
+					if(companyName==company){
+						fCompany=new Object();
+						fCompany.id=fCompanyName;
+						fCompany.text=fCompanyName;
+						fCompany.value=fCompanyName;
+						arr.push(fCompany);
+					}
+				}
+			}
+
+			$("#fCompany").select2({
+				data: arr,
+				placeholder:'请选择',
+				allowClear:true
+			});
+		}
 		new Vue({
 			el: '#context',
@@ -88,6 +170,8 @@
 			var createTimeEnd=$('#createTimeEnd').val();
 			search.createTimeStr=createTimeStr;
 			search.createTimeEnd=createTimeEnd;
+			search.company=$('#company').select2('val');
+			search.fCompany=$('#fCompany').select2('val');
 			return search;
 		}
@@ -3,6 +3,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 <th:block th:include="include :: header('线路档案信息')" />
+<th:block th:include="include :: select2-css" />
 </head>
 <body class="gray-bg">
 	<div class="container-div" id="context">
@@ -11,9 +12,13 @@
 				<form id="formId">
 					<div class="select-list">
 						<ul>
-							<li><label>公司：</label> <input type="text" name="company" />
+							<li><label>公司：</label>
+								<select id='company' >
+								</select>
 							</li>
-							<li><label>分公司：</label> <input type="text" name="fCompany" />
+							<li><label>分公司：</label>
+								<select id='fCompany' >
+								</select>
 							</li>
 							<li><label>线路名称：</label> <input type="text" name="lineName" />
 							</li>
@@ -34,6 +39,7 @@
 		</div>
 	</div>
 	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: select2-js" />
 	<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
 		aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog">
@@ -61,7 +67,83 @@
 	<script th:inline="javascript">
+		var companyList=[[${companyList}]];
+		var companies=new Array();
+		var fCompanies=new Array();
+		$(function() {
+			for(let i in companyList){
+				companies[i]=companyList[i].company;
+				fCompanies[i]=companyList[i].fCompany;
+			}
+			companies=Array.from(new Set(companies));
+			companySelect();
+			fCompanySelect();
+			$('#company').on('change.select2', function (e) {
+				fCompanySelect()
+			});
+		});
+
+		function companySelect(){
+			var arr = new Array();
+			var company=new Object();
+			company.id='';
+			company.text='';
+			company.value='';
+			arr.push(company)
+			for (var i = 0; i < companies.length; i++) {
+				company=new Object();
+				company.id=companies[i];
+				company.text=companies[i];
+				company.value=companies[i];
+				arr.push(company);
+			}
+			$("#company").select2({
+				data: arr,
+				placeholder:'请选择',
+				allowClear:true
+			})
+		}
+
+		function fCompanySelect(){
+			$('#fCompany').empty();
+			var company=$('#company').select2('val');
+			var arr = new Array();
+			var fCompany=new Object();
+			fCompany.id='';
+			fCompany.text='';
+			fCompany.value='';
+			arr.push(fCompany)
+			if(company==''){
+				for(let i in companyList){
+					var companyName=companyList[i].company;
+					var fCompanyName=companyList[i].fCompany;
+					fCompany=new Object();
+					fCompany.id=fCompanyName;
+					fCompany.text=fCompanyName;
+					fCompany.value=fCompanyName;
+					arr.push(fCompany);
+				}
+			}else {
+				for(let i in companyList){
+					var companyName=companyList[i].company;
+					var fCompanyName=companyList[i].fCompany;
+					if(companyName==company){
+						fCompany=new Object();
+						fCompany.id=fCompanyName;
+						fCompany.text=fCompanyName;
+						fCompany.value=fCompanyName;
+						arr.push(fCompany);
+					}
+				}
+			}
+
+			$("#fCompany").select2({
+				data: arr,
+				placeholder:'请选择',
+				allowClear:true
+			});
+		}
 		new Vue({
 			el: '#context',
@@ -75,6 +157,8 @@
 			var search = $.table.queryParams(params);
 			search.examineStatus ='true';
 			search.examineType='0';
+			search.company=$('#company').select2('val');
+			search.fCompany=$('#fCompany').select2('val');
 			return search;
 		}