1.维修上报

王通
1 parent a92b3a2c
Showing 11 changed files with 356 additions and 83 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/entity/report/RepairReport.java
src/main/java/com/bsth/repository/RepairReportRepository.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/application-prod.properties
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/wxsb.html
 package com.bsth.controller.realcontrol;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -33,11 +26,7 @@ import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.bsth.util.ConfigUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
 @RestController
 @RequestMapping("/realSchedule")
@@ -725,67 +714,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @return
 	 */
 	@RequestMapping(value = "wxsb", method = RequestMethod.POST)
-	public Map<String, Object> deleteToHistory(@RequestParam Map<String, Object> param){
-		SysUser user = SecurityUtils.getCurrentUser();
-		String uname = user.getUserName();
-		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url"));
-		url.append("?nbbm=").append(param.get("nbbm")).append("&bxy=").append(uname).append("&bxbm=").append(param.get("bxType"));
-		// 分公司保存格式 分公司编码_公司编码
-		String val = BasicData.nbbm2FgsCompanyCodeMap.get(param.get("nbbm"));
-		String[] arr = val.split("_");
-		if (!"22".equals(arr[1])) {
-			Map<String, Object> res = new HashMap<String, Object>();
-			res.put("status", ResponseCode.ERROR);
-			res.put("msg", "除金高公司外暂未开通此功能");
-			
-			return res;
-		}
-		url.append("&fgs=").append(arr[0]);
-		
-		return request(url.toString());
+	public Map<String, Object> repairReport(@RequestParam Map<String, Object> param){
+		return scheduleRealInfoService.repairReport(param, true);
 	}
-	@SuppressWarnings("unchecked")
-	private static Map<String, Object> request(String url) {
-		Map<String, Object> res = new HashMap<String, Object>();
-		res.put("status", ResponseCode.SUCCESS);
-		InputStream in = null;
-		HttpURLConnection con = null;
-		try {
-			con = (HttpURLConnection)new URL(url).openConnection();
-			con.setRequestMethod("POST");
-			con.setRequestProperty("keep-alive", "true");
-			con.setRequestProperty("accept", "application/json");
-			con.setRequestProperty("content-type", "application/json");
-			con.setDoInput(true);
-			con.setReadTimeout(2500);
-			con.setConnectTimeout(2500);
-			
-			con.connect();
-			if (con.getResponseCode() == 200) {
-				in = con.getInputStream();
-				ByteArrayOutputStream bout = new ByteArrayOutputStream();
-				IOUtils.copy(in, bout); bout.close();
-				Map<String, Object> response = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
-				if (!"报修成功".equals(response.get("msg"))) {
-					res.put("status", ResponseCode.ERROR);
-					res.putAll(response);
-				}
-			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			res.put("status", ResponseCode.ERROR);
-			res.put("msg", "调用上报接口异常");
-		} finally {
-			try {
-				if (in != null) in.close();
-				if (con != null) con.disconnect();
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		
-		return res;
-	}
+	
 }
@@ -10,6 +10,7 @@ import com.bsth.data.gpsdata_v2.utils.GpsDataRecovery;
 import com.bsth.data.schedule.f_a_l.FirstAndLastHandler;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.report.RepairReport;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
@@ -83,6 +84,8 @@ public class DayOfSchedule {
     private static ScheduleComparator.DFSJ schDFSJComparator;
     private static Long sch_max_id=-1L;
+    
+    private Map<String, RepairReport> incode2report = new ConcurrentHashMap<String, RepairReport>();
     @Autowired
     LineConfigData lineConfigData;
@@ -1180,4 +1183,19 @@ public class DayOfSchedule {
             reCalcExecPlan(sch.getClZbh());
         }
     }
+    
+    /**
+     ** 用于重置维修上报计数，一般只应该在翻班的时候调用
+     */
+    public void resetRepairReport(String incode) {
+    	incode2report.remove(incode);
+    }
+    
+    public RepairReport getLastestRepairReport(String incode) {
+    	return incode2report.get(incode);
+    }
+    
+    public void setLastestRepairReport(RepairReport rr) {
+    	incode2report.put(rr.getIncode(), rr);
+    }
 }
 \ No newline at end of file
@@ -59,6 +59,7 @@ public class ScheduleRefreshThread extends Thread{
 							Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
 							for(String car : cars){
 								GpsCacheData.remove(car);
+								dayOfSchedule.resetRepairReport(car);
 							}
 							//清除驾驶员上报数据
 							pilotReport.clear(lineCode);
+package com.bsth.entity.report;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ ** 维修上报信息
+ * @author Hill
+ *
+ */
+@Entity
+@Table(name = "bsth_c_repair_report")
+public class RepairReport {
+
+	@Id
+	@GeneratedValue
+	private Integer id;
+	// 上报用户名
+	private String reportUser;
+	// 上报姓名
+	private String reportName;
+	// 班次ID
+	private Long schId;
+	// 内部编码
+	private String incode;
+	// 发车时间
+	private String departureTime;
+	// 报修类型
+	private String repairType;
+	// 报修时间
+	private Date reportDate;
+	// 报修状态 0 不报 1上报成功 -1上报失败
+	private int reportState;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getReportUser() {
+		return reportUser;
+	}
+
+	public void setReportUser(String reportUser) {
+		this.reportUser = reportUser;
+	}
+
+	public String getReportName() {
+		return reportName;
+	}
+
+	public void setReportName(String reportName) {
+		this.reportName = reportName;
+	}
+
+	public Long getSchId() {
+		return schId;
+	}
+
+	public void setSchId(Long schId) {
+		this.schId = schId;
+	}
+
+	public String getIncode() {
+		return incode;
+	}
+
+	public void setIncode(String incode) {
+		this.incode = incode;
+	}
+
+	public String getDepartureTime() {
+		return departureTime;
+	}
+
+	public void setDepartureTime(String departureTime) {
+		this.departureTime = departureTime;
+	}
+
+	public String getRepairType() {
+		return repairType;
+	}
+
+	public void setRepairType(String repairType) {
+		this.repairType = repairType;
+	}
+
+	public Date getReportDate() {
+		return reportDate;
+	}
+
+	public void setReportDate(Date reportDate) {
+		this.reportDate = reportDate;
+	}
+
+	public int getReportState() {
+		return reportState;
+	}
+
+	public void setReportState(int reportState) {
+		this.reportState = reportState;
+	}
+}
+package com.bsth.repository;
+
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.report.RepairReport;
+
+/**
+ * 
+ * @Interface: RepairReportRepository
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: 维修上报持久化层
+ * 
+ * @Author Hill
+ * 
+ * @Date 2019-09-25
+ *
+ * @Version
+ * 
+ */
+
+@Repository
+public interface RepairReportRepository extends BaseRepository<RepairReport, Integer> {
+	
+}
@@ -194,4 +194,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String, Object>> scheduleCorrectionReport(String gsdm, String fgsdm,
 			String line, String date, String date2);
 	Integer isCircleQdz(String clzbh,String sdr,String xlbm,String qdzCode);
+	
+	Map<String, Object> repairReport(Map<String, Object> map, boolean isActive);
 }
@@ -33,6 +33,7 @@ import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.realcontrol.SvgAttribute;
 import com.bsth.entity.report.MileageReport;
+import com.bsth.entity.report.RepairReport;
 import com.bsth.entity.report.ScheduleCorrectionReport;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
@@ -44,6 +45,7 @@ import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.CarDeviceRepository;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.RepairReportRepository;
 import com.bsth.repository.oil.DlbRepository;
 import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.oil.YlxxbRepository;
@@ -66,11 +68,14 @@ import com.bsth.service.sys.DictionaryService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.stuxuhai.jpinyin.PinyinException;
 import com.github.stuxuhai.jpinyin.PinyinFormat;
 import com.github.stuxuhai.jpinyin.PinyinHelper;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
+
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
@@ -82,8 +87,14 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -168,6 +179,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     CarsRepository carsRepository;
+    
+    @Autowired
+    RepairReportRepository repairReportRepository;
     Logger logger = LoggerFactory.getLogger(this.getClass());
     SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -1525,6 +1539,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> rs = new HashMap<>();
         List<ScheduleRealInfo> ts = new ArrayList<>();
         try {
+        	// 维修上报
+        	if (StringUtils.isNotBlank(map.get("repairTypes"))) {
+        		Map<String, Object> param = new HashMap<String, Object>();
+        		param.putAll(map);
+        		repairReport(param, false);
+        	}
+        	
             Long id = Long.parseLong(map.get("id"));
             String remarks = map.get("remarks");
@@ -6020,6 +6041,104 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Integer num2=num==0L?0:1;
         return num2;
     }
+    
+    @SuppressWarnings("unchecked")
+	private static Map<String, Object> request(String url) {
+		Map<String, Object> res = new HashMap<String, Object>();
+		res.put("status", ResponseCode.SUCCESS);
+		InputStream in = null;
+		HttpURLConnection con = null;
+		try {
+			con = (HttpURLConnection)new URL(url).openConnection();
+			con.setRequestMethod("POST");
+			con.setRequestProperty("keep-alive", "true");
+			con.setRequestProperty("accept", "application/json");
+			con.setRequestProperty("content-type", "application/json");
+			con.setDoInput(true);
+			con.setReadTimeout(2500);
+			con.setConnectTimeout(2500);
+			
+			con.connect();
+			if (con.getResponseCode() == 200) {
+				in = con.getInputStream();
+				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+				IOUtils.copy(in, bout); bout.close();
+				Map<String, Object> response = new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+				if (!"报修成功".equals(response.get("msg"))) {
+					res.put("status", ResponseCode.ERROR);
+					res.putAll(response);
+				}
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			res.put("status", ResponseCode.ERROR);
+			res.put("msg", "调用上报接口异常");
+		} finally {
+			try {
+				if (in != null) in.close();
+				if (con != null) con.disconnect();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
+		return res;
+	}
+    
+    /**
+     ** 维修记录上报
+     *  @param param 参数信息
+     *  @param isActive 主/被动上报
+     */
+    @Override
+    @Transactional
+    public Map<String, Object> repairReport(Map<String, Object> param, boolean isActive) {
+    	Map<String, Object> res = new HashMap<String, Object>();
+    	res.put("status", ResponseCode.SUCCESS);
+    	// 获取实际排班信息
+    	Long id = Long.parseLong((String)param.get("id"));
+        ScheduleRealInfo sch = dayOfSchedule.get(id);
+
+        if (null == sch) {
+            res.put("status", ResponseCode.ERROR);
+            res.put("msg", "不存在的班次！");
+            
+            return res;
+        }
+        
+        int reportState = -1;
+    	SysUser user = SecurityUtils.getCurrentUser();
+		String reportUser = user.getUserName(), reportName = user.getName(), incode = (String)param.get("clZbh"), repairTypes = (String)param.get("repairTypes");
+		// 分公司保存格式 分公司编码_公司编码
+		String val = BasicData.nbbm2FgsCompanyCodeMap.get(incode);
+		String[] arr = val.split("_");
+		StringBuilder url = new StringBuilder(ConfigUtil.get("http.report.url." + arr[1]));
+		url.append("?nbbm=").append(incode).append("&bxy=").append(reportUser).append("&bxbm=").append(repairTypes).append("&fgs=").append(arr[0]);
+		
+		RepairReport lrr = dayOfSchedule.getLastestRepairReport(incode);
+		// 非主动上报并且无上报记录或上次已上报或上次上报的同一个班次 则不用上报
+		if (!isActive && (lrr == null || lrr.getReportState() != 0 || lrr.getSchId().equals(id))) {
+			reportState = 0;
+		} else {
+			res = request(url.toString());
+			if (ResponseCode.SUCCESS.equals(res.get("status"))) reportState = 1;
+		}
+		// 持久化此次上报记录
+		RepairReport rr = new RepairReport();
+		rr.setReportUser(reportUser);
+		rr.setReportName(reportName);
+		rr.setSchId(id);
+		rr.setIncode(incode);
+		rr.setDepartureTime(sch.getFcsj());
+		rr.setRepairType(repairTypes);
+		rr.setReportDate(new Date());
+		rr.setReportState(reportState);
+		repairReportRepository.save(rr);
+		dayOfSchedule.setLastestRepairReport(rr);
+		
+		return res;
+    }
 }
 class AccountMap implements Comparator<Map<String, Object>> {
@@ -2,7 +2,7 @@ server.port=9088
 management.port= 9001
 management.address= 127.0.0.1
-spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
@@ -30,4 +30,11 @@ http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
 ## gateway send directive
 http.send.directive = http://10.10.200.79:8080/transport_server/message/
 ## wxsb
-http.report.url= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd_gps.do
 \ No newline at end of file
+#http.report.url.05= http://192.168.168.154:8088/ygjwsystem_j2ee/clbx/clbx_dd.do
+#http.report.url.22= http://192.168.168.154:8088/jgjwsystem_j2ee/clbx/clbx_dd.do
+#http.report.url.26= http://192.168.168.154:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
+#http.report.url.55= http://192.168.168.154:8088/snjwsystem_j2ee/clbx/clbx_dd.do
+http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
+http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
+http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
+http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
 \ No newline at end of file
@@ -370,6 +370,23 @@ span.fcsj-diff {
     padding-left: 12px;
 }
+.repair-type-checkbox-list {
+    height: 180px;
+    overflow: auto;
+    border: 1px solid #c4c4c4;
+    border-radius: 4px;
+    padding: 9px 0;
+}
+
+.repair-type-checkbox-list label {
+    display: block;
+    font-size: 14px;
+    border-bottom: 1px dashed #e6e3e3;
+    height: 30px;
+    line-height: 30px;
+    padding-left: 12px;
+}
+
 /*.sch-time-checkbox-list label input[type=checkbox] {
     width: 20px;
     height: 18px !important;
@@ -125,6 +125,21 @@
                 </div>
             </div>
         </div>
+		<div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label" >维修类型</label>
+					<div class="uk-form-controls repair-type-checkbox-list">
+                        {{each repairTypes as repair i}}
+                        <label>
+                            <input class="i-cbox" name="repairTypes[]" value="{{repair.code}}" type="checkbox" title="{{repair.name}}">
+                            {{repair.name}}
+                          </label>
+                        {{/each}}
+                    </div>
+                </div>
+            </div>
+        </div>
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
@@ -166,13 +181,23 @@
     <script>
         (function() {
             var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
+            var repairTypes = [{name:"轨迹不连续", code:"9101"}, {name:"无轨迹", code:"9102"}, {name:"收不到调度指令", code:"9103"}, {name:"调度指令延迟", code:"9105"}, {name:"信号漂移", code:"9104"}, {name:"其它GPS报修", code:"9109"}];
             var modal = '#schedule-fcxxwt-modal'
               ,sch;
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
                 sch=data.sch;
-                var formHtml = template('schedule-fcxxwt-form-temp', {sch: sch, adjustExps:adjustExps});
+                var formHtml = template('schedule-fcxxwt-form-temp', {sch: sch, adjustExps:adjustExps, repairTypes:repairTypes});
                 $('form', modal).html(formHtml);
+                $('input:checkbox').click(function(){
+	                var remark = $('[name=remarks]').val(), title = $(this).prop("title");
+                	if ($(this).prop('checked')) {
+                		if (remark.indexOf(title) > -1) return;
+	                	$('[name=remarks]').val((remark ? remark + ";" : "") + title);
+                	} else {
+                		$('[name=remarks]').val(remark.replace(";" + title, "").replace(title + ";", "").replace(title, ""));
+                	}
+                });
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', modal));
@@ -184,6 +209,20 @@
                 gb_common.personAutocomplete($('.jsy-autocom', modal));
                 //售票员
                 gb_common.personAutocomplete($('.spy-autocom', modal));
+                // 维修类型选中
+                var initRepair = function() {
+                	var remark = $('[name=remarks]').val(), items = remark.split(';');
+                	for (var i = 0;i < items.length;i++) {
+                		if (items[i].length > 2) {
+                			for (var j = 0;j < repairTypes.length;j++) {
+                				if (items[i] == repairTypes[j].name) {
+                					$('input:checkbox[value=' + repairTypes[j].code + ']').prop('checked', true);
+                				}
+                			}
+                		}
+                	}
+                }
+                initRepair();
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
@@ -201,6 +240,8 @@
                     var normalDestory = data.jhlc==0 && sch.bcType != 'in' && sch.bcType != 'out';
                     //修改里程
                     var editJhlc = data.jhlc != sch.jhlc && data.jhlc != 0;
+                    // 修改报修类型为字符串
+                    if (data.repairTypes) data.repairTypes = data.repairTypes.join(";");
                     if(!data.adjustExps && (data.status==-1 || normalDestory || editJhlc)){
                         notify_err("当前操作需要选择调整原因！");
                         return;
@@ -240,7 +281,7 @@
                 $('[name=adjustExps]', f).on('change', function(){
                     var rem=$('[name=remarks]', f);
-                    rem.val(rem.val() + $(this).val() + ',').trigger('input');
+                    rem.val((rem.val() ? rem.val() + ";" : "") + $(this).val()).trigger('input');
                 });
@@ -14,7 +14,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >车辆编码</label>
                     <div class="uk-form-controls">
-                        <input type="text" name="nbbm" value="{{clZbh}}" readonly>
+                        <input type="text" name="clZbh" value="{{clZbh}}" readonly>
                     </div>
                 </div>
             </div>
@@ -22,7 +22,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >报修类型</label>
                     <div class="uk-form-controls">
-                        <select name="bxType"></select>
+                        <select name="repairTypes"></select>
                     </div>
                 </div>
             </div>
@@ -44,12 +44,13 @@
                 var formHtml = template('schedule-wxsb-form-temp', sch);
                 $('form', modal).html(formHtml);
-                //班次类型字典
-                var bxtypes=[{code:"9101", des:"轨迹不连续"}, {code:"9102", des:"无轨迹"}, {code:"9103", des:"收不到调度指令"}, {code:"9104", des:"漂移"}, {code:"9109", des:"其它"}],opts='';
-                for(var i = 0;i < bxtypes.length;i++){
-                    opts+='<option value="'+bxtypes[i].code+'">'+bxtypes[i].des+'</option>';
+                //报修类型字典
+                var opts = new Array();
+                var repairTypes=[{name:"录像不连续", code:"9201"}, {name:"无录像", code:"9202"}, {name:"录像缺通告", code:"9203"}, {name:"无法调取录像", code:"9204"}, {name:"其它录像报修", code:"9209"}, {name:"黑屏", code:"9301"}, {name:"间歇性黑屏", code:"9302"}, {name:"中门视屏无", code:"9303"}, {name:"卡在启动界面", code:"9304"}, {name:"倒车视频无", code:"9305"}, {name:"启动后显示倒车", code:"9306"}, {name:"其它屏幕报修", code:"9309"}];
+                for(var i = 0;i < repairTypes.length;i++){
+                    opts.push('<option value="'+repairTypes[i].code+'">'+repairTypes[i].name+'</option>');
                 }
-                $('[name=bxType]', modal).html(opts);
+                $('[name=repairTypes]', modal).html(opts.join(""));
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);