bf

yiming
1 parent 3ffdbbf2
Showing 14 changed files with 111 additions and 274 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.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/line/mapper/BsthTLineMapper.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/templates/include.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
@@ -109,7 +109,9 @@ public class BsthTLineAddController extends BaseController
             return ajaxResult;
         }
         //不存在新增
-        BsthTLine bl=bsthTLineService.selectBsthTLineExamineByLineName(bsthTLine.getLineName());
+        BsthTLine bl=new BsthTLine();
+        bl.setLineName(bsthTLine.getLineName());
+        bl=bsthTLineService.selectBsthTLineExamineByLineName(bl);
         if(bl==null){
             bsthTLine.setLineUpdateType("3");
             return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
@@ -142,11 +144,8 @@ public class BsthTLineAddController extends BaseController
     @ResponseBody
     public AjaxResult editSave(BsthTLine bsthTLine)
     {
-
         User loginUser = ShiroUtils.getSysUser();
         bsthTLine.setUpdateBy(loginUser.getUserName());
-        bsthTLine.setLineUpdateType("3");
-        bsthTLine.setExamineStatus("0");
         return toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
     }
@@ -165,9 +164,9 @@ public class BsthTLineAddController extends BaseController
     @PostMapping( "/isExist")
     @ResponseBody
-    public AjaxResult isExist(String lineName)
+    public AjaxResult isExist(BsthTLine bsthTLine)
     {
-        BsthTLine bsthTLine=bsthTLineService.selectBsthTLineExamineByLineName(lineName);
+        bsthTLine=bsthTLineService.selectBsthTLineExamineByLineName(bsthTLine);
         AjaxResult ajaxResult=new AjaxResult();
         Long id=bsthTLine!=null?bsthTLine.getId():null;
         ajaxResult.put("id",id);
@@ -241,7 +241,7 @@ public class BsthTLineController extends BaseController
         bsthTLine.setLineName(name);
         BsthTLine bsthTLineOld=bsthTLineService.selectBsthTLineList(bsthTLine).get(0);
-        BsthTLine bsthTLineNew=bsthTLineService.selectBsthTLineExamineByLineName(name);
+        BsthTLine bsthTLineNew=bsthTLineService.selectBsthTLineExamineByLineName(bsthTLine);
         List<BsthTLine> bsthTLines=new ArrayList<>();
         bsthTLines.add(bsthTLineOld);
         bsthTLines.add(bsthTLineNew);
 package com.ruoyi.project.system.line.controller;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -95,158 +97,10 @@ public class BsthTLineExamineController extends BaseController
     }
-  /*      @GetMapping("/getListForMap")
-        @ResponseBody
-        public List<BsthTLine> getListForMap() {
-            return bsthTLineService.selectBsthTLineList(null);
-        }
-
-        *//**
-         * 导出【请填写功能名称】列表
-         *//*
-    @RequiresPermissions("system:line:export")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(BsthTLine bsthTLine) throws NoSuchFieldException {
-
-        List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine);
-        
-        List<DictData> dicts = dictDataService.selectDictDataList(null);
-        
-        Map<String,List<DictData>> dictMap = new HashMap();
-
-        List<String> titles=new ArrayList<>();
-        
-        for(DictData d : dicts) {
-        	
-        	if(dictMap.get(d.getDictType()) == null) {
-        		dictMap.put(d.getDictType(), new ArrayList<DictData>());
-        	}
-        	
-        	dictMap.get(d.getDictType()).add(d);
-        }
-        
-        for(BsthTLine line:list) {
-        	
-        	 Field[] field = line.getClass().getDeclaredFields();
-
-            String isWarrant=bsthTLine.getIsWarrant();
-            if("0".equals(isWarrant)){//现实
-                for (Field f : field) {
-                    String fName=f.getName();
-                    if(!"isWarrantStartTime".equals(fName) && !"isWarrantEndTime".equals(fName) && !"warrantVehiclesLarge".equals(fName) && !"warrantVehiclesMiddle".equals(fName) && !"number_of_manage".equals(fName)){
-                        titles.add(fName);
-                    }
-                }
-            }else if("1".equals(isWarrant)){//权证
-                for (Field f : field) {
-                    String fName=f.getName();
-                    if(!"vehiclesNumber".equals(fName) && !"numberVehiclesLarge".equals(fName) && !"numberVehiclesMiddle".equals(fName) ){
-                        titles.add(fName);
-                    }
-                }
-            }
-
-        	 
-        	for(int j=0 ; j<field.length ; j++){ //遍历所有属性
-                String name = field[j].getName(); //获取属性的名字
-                
-                String type = name;
-                
-                if(name.equals( "isLogicDelete") || name.equals( "inoutDistrict")|| name.equals( "isMetro") || name.equals( "hasTimelists")|| name.equals( "isWarrant")) {
-                	type = "trueFalse";
-                }
-                
-
-                
-                
-                
-                if(dictMap.get(type) != null) {
-                	name = name.substring(0,1).toUpperCase() + name.substring(1); 
-                	
-                	
-	                try {
-						Method param = line.getClass().getMethod("get"+name);
-
-		                String value = (String) param.invoke(line);
-		                
-		                if(value != null && value.split(",").length > 0) {
-		                	String result = "";
-		                	for(String str:value.split(",")) {
-		                		for(DictData d:dictMap.get(type)) {
-									if(d.getDictValue().equals(str)) {
-										result += d.getDictLabel() + ",";
-									}
-								}
-		                	}
-		                	
-		                	Method m = line.getClass().getMethod("set"+name, new Class[] {String.class});
-		                	
-		                	if(!result.isEmpty()) {
-				                m.invoke(line,new Object[] {new String(result.substring(0,result.length()-1))});
-		                	}else {
-				                m.invoke(line,new Object[] {new String(value)});
-		                	}
-		                }
-						
-					} catch (Exception e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-                
-                }
-
-                
-                
-        	}
-        	
-        	
-        }
-
-
-        ExcelUtil<BsthTLine> util = new ExcelUtil<BsthTLine>(BsthTLine.class);
-        util.setTitles(titles);
-        return util.exportExcel(list, "line");
-    }
-
-
-
-
-    
-    @GetMapping("/getUserLineInfo")
+    @PostMapping( "/remove")
     @ResponseBody
-    public AjaxResult getUserLineInfo()
+    public AjaxResult remove(String ids)
     {
-    	User loginUser = ShiroUtils.getSysUser();
-    	
-    	loginUser = userService.selectUserById(loginUser.getUserId());
-    	
-    	return success(loginUser.getLineinfoData());
+        return toAjax(bsthTLineService.deleteBsthTLineExamineById(ids));
     }
-    
-
-    
-    @PostMapping("/findByName")
-    @ResponseBody
-    public BsthTLine findByName(String name)
-    {	
-    	BsthTLine bsthTLine = new BsthTLine();
-    	
-    	bsthTLine.setLineName(name);
-    	
-    	return bsthTLineService.selectBsthTLineList(bsthTLine).get(0);
-    }
-    
-    @PostMapping("/updateUserLineInfo")
-    @ResponseBody
-    public AjaxResult updateUserLineInfo(String lineInfo)
-    {
-    	User loginUser = ShiroUtils.getSysUser();
-    	
-    	loginUser.setLineinfoData(lineInfo);
-    	
-    	return toAjax(userService.updateUser(loginUser));
-    }*/
-
 }
@@ -86,8 +86,9 @@ public class BsthTLineHistoryController extends BaseController
     public String edit(@PathVariable("id") Long id, ModelMap mmap)
     {
         BsthTLine bsthTLine = bsthTLineService.selectBsthTLineById(id);
-        String lineName=bsthTLine.getLineName();
-        BsthTLine bsthTLineExamine=bsthTLineService.selectBsthTLineExamineByLineName(lineName);
+        BsthTLine bl=new BsthTLine();
+        bl.setLineName(bsthTLine.getLineName());
+        BsthTLine bsthTLineExamine=bsthTLineService.selectBsthTLineExamineByLineName(bl);
         if(bsthTLineExamine!=null){
             bsthTLine=bsthTLineExamine;
         }
@@ -110,9 +111,9 @@ public class BsthTLineHistoryController extends BaseController
         AjaxResult ajaxResult;
         User loginUser = ShiroUtils.getSysUser();
         bsthTLine.setUpdateBy(loginUser.getUserName());
-        String lineName=bsthTLine.getLineName();
-
-        BsthTLine bsthTLineExamine=bsthTLineService.selectBsthTLineExamineByLineName(lineName);
+        BsthTLine bl=new BsthTLine();
+        bl.setLineName(bsthTLine.getLineName());
+        BsthTLine bsthTLineExamine=bsthTLineService.selectBsthTLineExamineByLineName(bl);
         if(bsthTLineExamine!=null){//有没审核的直接覆盖
             bsthTLine.setId(bsthTLineExamine.getId());
             ajaxResult= toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
@@ -120,8 +121,6 @@ public class BsthTLineHistoryController extends BaseController
             bsthTLine.setExamineType("1");
             ajaxResult= toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
         }
-        BsthTLine bl=new BsthTLine();
-        bl.setLineName(lineName);
         bl.setUpdateStatus("1");
         //重复提交删除上一次通过未执行的申请
@@ -37,7 +37,7 @@ public interface BsthTLineMapper
 	BsthTLine selectBsthTLineExamineById(Long id);
-	BsthTLine selectBsthTLineExamineByLineName(String lineName);
+	BsthTLine selectBsthTLineExamineByLineName(BsthTLine bsthTLine);
 	int updateBsthTLineExamine(BsthTLine bsthTLine);
@@ -54,7 +54,7 @@ public interface IBsthTLineService
 	int examine(BsthTLine bsthTLine);
-	BsthTLine selectBsthTLineExamineByLineName(String lineName);
+	BsthTLine selectBsthTLineExamineByLineName(BsthTLine bsthTLine);
 	boolean lineNameIsExist(String lineName);
@@ -400,9 +400,8 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 					i=bsthTLineMapper.saveEditHistory(bsthTLine);
 					//删除审核表记录
 					bsthTLineMapper.deleteBsthTLineExamineById(new String[]{id});
-					if(bsthTLine.getStartDate()==null){//未选时间立刻启用
-						this.updateToLineInfo(bsthTLine.getId().toString());
-					}
+					this.updateToLineInfo(bsthTLine.getId().toString());
+
 				}else{//未通过
 					//修改审核表状态
 					bl=new BsthTLine();
@@ -417,14 +416,16 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 	}
 	@Override
-	public BsthTLine selectBsthTLineExamineByLineName(String lineName){
-		return bsthTLineMapper.selectBsthTLineExamineByLineName(lineName);
+	public BsthTLine selectBsthTLineExamineByLineName(BsthTLine bsthTLine){
+		return bsthTLineMapper.selectBsthTLineExamineByLineName(bsthTLine);
 	}
 	@Override
 	public boolean lineNameIsExist(String lineName) {
 		boolean flag=true;
-		if(bsthTLineMapper.selectBsthTLineByLineName(lineName)!=null || bsthTLineMapper.selectBsthTLineExamineByLineName(lineName)!=null){
+		BsthTLine bsthTLine=new BsthTLine();
+		bsthTLine.setLineName(lineName);
+		if(bsthTLineMapper.selectBsthTLineByLineName(lineName)!=null || bsthTLineMapper.selectBsthTLineExamineByLineName(bsthTLine)!=null){
 			flag=false;
 		}
 		return flag;
@@ -882,6 +882,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			resultMap="BsthTLineResult">
 		<include refid="selectBsthTLineExamineVo" />
 		where line_name= #{lineName}
+		<if test="examineType != null "> and examine_type = #{examineType}</if>
 	</select>
@@ -16,6 +16,16 @@
 <link th:href="@{/css/animate.css}" rel="stylesheet" />
 <link th:href="@{/css/style.css?v=20200903}" rel="stylesheet" />
 <link th:href="@{/ruoyi/css/ry-ui.css?v=4.6.0}" rel="stylesheet" />
+	<style>
+		label.error {
+			position: absolute;
+			left: 40px;
+			top: 30px;
+			color: #ef392b;
+			font-size: 12px;
+			z-index: 99;
+		}
+	</style>
 </head>
 <!-- 通用JS -->
@@ -460,13 +460,12 @@
                     </select>
                 </div>
                 <!---------------------------------->
-                <!--<label class="col-sm-1 control-label">启用时间：</label>
+                <label class="col-sm-1 control-label">启用时间：</label>
                 <div class="col-sm-2">
                     <div class="input-group date">
-                        <input name="startDate" class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="startDate" type="text" class="form-control"  placeholder="yyyy-MM-dd HH:mm:ss">
                     </div>
-                </div>-->
+                </div>
                 <!---------------------------------->
                 <label class="col-sm-1 control-label">备注：</label>
                 <div class="col-sm-2">
@@ -529,6 +528,13 @@
                         return $('#isWarrant').val()==='1';
                     },
                 },
+                remark:{
+                    required:true,
+                },
+                startDate:{
+                    required:true,
+                },
+
             },
             messages: {
                 isWarrantStartTime: {
@@ -536,6 +542,12 @@
                 },
                 isWarrantEndTime: {
                     required: "请选择日期",
+                },
+                remark: {
+                    required: "请写入备注",
+                },
+                startDate: {
+                    required: "请选择时间",
                 }
             },focusCleanup: true
         });
@@ -589,8 +601,7 @@
         });
         $("input[name='startDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
+            format: "yyyy-mm-dd hh:ii:ss",
             autoclose: true
         });
@@ -605,8 +616,9 @@
             autoclose: true
         });
+
         function isExist(lineName){
-            var data={'lineName':lineName};
+            var data={'lineName':lineName,'examineType':'0'};
             $.post(prefix + "/isExist",data,function (result){
                 if(result.id!=null){
                     layer.confirm("是否修改上一次的记录",{
@@ -651,7 +663,7 @@
                 }
             }
-            var index =parent.layer.open({
+            var index=parent.layer.open({
                 type: 2,
                 area: [width + 'px', height + 'px'],
                 fix: false,
@@ -660,15 +672,21 @@
                 shade: 0.3,
                 title: title,
                 content: url,
-                btn: ['修改', '删除'],
+                btn: ['保存','提交','删除'],
                 // 弹层外区域关闭
                 shadeClose: true,
                 yes: callback,
-                btn2: function(index, layero){
+                btn2:  function(index, layero) {
+                    var iframeWin = layero.find('iframe')[0];
+                    iframeWin.contentWindow.submitHandlerCommit(index, layero);
+                    return false;
+                },
+                btn3: function(index, layero){
                     $.operate.remove(id)
                 }
             });
             parent.layer.full(index);
+
         }
@@ -479,15 +479,12 @@
 					</select>
 				</div>
 				<!---------------------------------->
-				<!--<label class="col-sm-1 control-label">启用时间：</label>
+				<label class="col-sm-1 control-label">启用时间：</label>
 				<div class="col-sm-2">
 					<div class="input-group date">
-						<input name="startDate" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd')}"
-							   class="form-control" placeholder="yyyy-MM-dd" type="text" autocomplete="off">
-						<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+						<input name="startDate" type="text" class="form-control"  placeholder="yyyy-MM-dd HH:mm:ss" th:value="${#dates.format(bsthTLine.startDate, 'yyyy-MM-dd HH:mm:ss')}">
 					</div>
-
-				</div>-->
+				</div>
 				<!---------------------------------->
 				<label class="col-sm-1 control-label">备注：</label>
 				<div class="col-sm-2">
@@ -544,68 +541,6 @@
 						$(".file-input").before(obj);
 					});
-
-			/*$.get("/system/line/getUserLineInfo",
-							function(data) {
-								if (data.msg != null) {
-									var objs = JSON.parse(data.msg);
-
-									for (var i = 0; i < objs.length; i++) {
-
-										if ($($("input[name=" + objs[i].name
-												+ "]"))) {
-											if (objs[i].checked) {
-												getParent(
-														$($("input[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").show();
-											} else {
-												getParent(
-														$($("input[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").hide();
-											}
-										}
-
-										if ($($("select[name=" + objs[i].name
-												+ "]"))) {
-											if (objs[i].checked) {
-												getParent(
-														$($("select[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").show();
-											} else {
-												getParent(
-														$($("select[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").hide();
-											}
-										}
-
-										if ($($("textarea[name=" + objs[i].name
-												+ "]"))) {
-											if (objs[i].checked) {
-												getParent(
-														$($("textarea[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").show();
-											} else {
-												getParent(
-														$($("textarea[name="
-																+ objs[i].name
-																+ "]")),
-														"form-group").hide();
-											}
-										}
-
-									}
-								}
-							});*/
 		})
 		function getParent(obj, className) {
@@ -630,6 +565,12 @@
 						return $('#isWarrant').val()==='1';
 					},
 				},
+				remark:{
+					required:true,
+				},
+				startDate:{
+					required:true,
+				}
 			},
 			messages: {
 				isWarrantStartTime: {
@@ -637,6 +578,12 @@
 				},
 				isWarrantEndTime: {
 					required: "请选择日期",
+				},
+				remark: {
+					required: "请写入备注",
+				},
+				startDate: {
+					required: "请选择时间",
 				}
 			},
 			focusCleanup : true
@@ -650,8 +597,7 @@
 			}
 			if ($.validate.form()) {
-				$.operate.save(prefix + "/edit", $('#form-line-edit')
-						.serialize());
+				$.operate.save(prefix + "/edit", $('#form-line-edit').serialize()+'&examineStatus=0');
 			}
 		}
@@ -698,9 +644,8 @@
 		});
 		$("input[name='startDate']").datetimepicker({
-			format : "yyyy-mm-dd",
-			minView : "month",
-			autoclose : true
+			format: "yyyy-mm-dd hh:ii:ss",
+			autoclose: true
 		});
 		$("input[name='isWarrantStartTime']").datetimepicker({
@@ -23,14 +23,21 @@
 							</li>
 							<li><label>线路名称：</label> <input type="text" name="lineName" />
 							</li>
-							<li ><label>申请开始：</label>
+							<li ><label>申请时间：</label>
+							<li class="select-time">
+								<input type="text" class="time-input" id="createTimeStr" placeholder="开始时间" name="params[beginTime]" lay-key="1">
+								<span>-</span>
+								<input type="text" class="time-input" id="createTimeEnd" placeholder="结束时间" name="params[endTime]" lay-key="2">
+							</li>
+							</li>
+							<!--<li ><label>申请开始：</label>
 								<input name="createTimeStr" id="createTimeStr" class="form-control" placeholder="yyyy-MM-dd" type="text"
 										   autocomplete="off">
 							</li>
 							<li><label>申请结束：</label>
 									<input name="createTimeEnd" id="createTimeEnd" class="form-control" placeholder="yyyy-MM-dd" type="text"
 										   autocomplete="off">
-							</li>
+							</li>-->
 							<li>
 								<el-button size="mini" type="primary" icon="el-icon-search"  onClick="$.table.search();">搜索</el-button>
 								<el-button size="mini" icon="el-icon-refresh"  onClick="$.form.reset();">重置</el-button>
@@ -166,8 +173,8 @@
 		function queryParams(params) {
 			var search = $.table.queryParams(params);
 			search.examineStatus='1';
-			var createTimeStr=$('#createTimeStr').val();
-			var createTimeEnd=$('#createTimeEnd').val();
+			var createTimeStr=$('#createTimeStr').val()!=''?$('#createTimeStr').val()+' 23:59':'';
+			var createTimeEnd=$('#createTimeEnd').val()!=''?$('#createTimeEnd').val()+' 23:59':'';
 			search.createTimeStr=createTimeStr;
 			search.createTimeEnd=createTimeEnd;
 			search.company=$('#company').select2('val');
@@ -179,6 +186,7 @@
 			var options = {
 				url: prefix + "/list",
 				detailUrl: prefix + "/detail/{id}",
+				removeUrl: prefix + "/remove",
 				queryParams: queryParams,
 				modalName: "线路档案信息审核",
 				columns: [],
@@ -381,21 +389,20 @@
 					}
 				});
 			},
-			btn2:function () {
-				var url=prefix+'/examine'
-				var data={'id':id,'examineType':examineType,'examineStatus':'1'}
-				$.post(url, data, function(result) {
-					if (result.code == web_status.SUCCESS) {
-						$.table.refresh();
-						$.modal.alertSuccess(result.msg)
-					}else {
-						$.modal.alertError(result.msg);
-					}
-				});
+			btn2: function(index, layero){
+				remove(id)
 			}
 		});
 		layer.full(index);
 	}
+
+	function remove(id) {
+		table.set();
+		var url = $.common.isEmpty(id) ? table.options.removeUrl : table.options.removeUrl.replace("{id}", id);
+		var data = { "ids": id };
+		$.operate.submit(url, "post", "json", data);
+	}
+
 	$("input[name='createTimeStr']").datetimepicker({
 		format: "yyyy-mm-dd",
 		minView: "month",
@@ -681,7 +681,7 @@
 		function submitHandler() {
 			if ($.validate.form()) {
-				$.operate.save(prefix + "/edit", $('#form-line-edit').serialize());
+				$.operate.save(prefix + "/edit", $('#form-line-edit').serialize()+'&examineStatus=0');
 			}
 		}
 		function submitHandlerCommit() {
@@ -28,7 +28,7 @@
                         size="large"
                         :timestamp="line.startDate" @click.native="change(index);">
                     {{line.lineUpdateType}}(
-                    {{line.startReason}})
+                    {{line.remark}})
                 </el-timeline-item>
             </el-timeline>
         </el-col>
@@ -812,6 +812,8 @@
         },
         methods: {
             change(index) {
+                this.tab='first';//每次点击默认选中第一个
+                //变更前后数据不同标红
                 var l;
                 var ol;
                 if (index == 0) {
@@ -834,11 +836,12 @@
 						}
 					}
                 }
-
+                //修改点击时间点的颜色
                 for (var i in this.lines) {
                     this.lines[i].timeLineType = "primary";
                 }
                 this.lines[index].timeLineType = "success";
+
             },
         }