Merge remote-tracking branch 'origin/lggj' into lggj

王通
2 parents 3d7ead27 e2a60149
Showing 110 changed files with 3847 additions and 4805 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/realcontrol/NoticeController.java
src/main/java/com/bsth/data/notice/NoticeService.java
src/main/java/com/bsth/data/notice/NoticeServiceImpl.java
src/main/java/com/bsth/data/notice/entity/GG.java
src/main/java/com/bsth/data/notice/entity/Notice.java
src/main/java/com/bsth/data/notice/entity/QY.java
src/main/java/com/bsth/data/notice/entity/SJYX.java
src/main/java/com/bsth/data/notice/entity/TFSJ.java
src/main/java/com/bsth/data/notice/repository/NoticeRepository.java
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/java/com/bsth/data/zndd/carMonitor.java
src/main/java/com/bsth/data/zndd/voice/GJC.java
src/main/java/com/bsth/data/zndd/voice/UploadVideoServlet.java
src/main/java/com/bsth/data/zndd/voice/ZL.java
src/main/java/com/bsth/entity/zndd/StationSignsLogger.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/java/com/bsth/util/SignUtils.java
@@ -46,6 +46,7 @@ public class Constants {
 	public static final String STATION_AND_SECTION_COUNT = "/station/updateStationAndSectionCode";
 	public static final String OUT_URL = "/out/**";
+	public static final String NOTICE_URL = "/notice/**";
 	/**
 	 * 解除调度指令和班次的外键约束
 	 */
+package com.bsth.controller.realcontrol;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.BaseController;
+import com.bsth.data.BasicData;
+import com.bsth.data.notice.NoticeService;
+import com.bsth.data.notice.entity.Notice;
+import com.bsth.util.SignUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.WebRequest;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 公告
+ */
+@RestController
+@RequestMapping("/notice")
+public class NoticeController extends BaseController<Notice, Long>{
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+
+    @Autowired
+    NoticeService noticeService;
+
+    @InitBinder
+    public void initBinder(WebDataBinder binder, WebRequest request) {
+        //转换日期 注意这里的转化要和传进来的字符串的格式一直 如2015-9-9 就应该为yyyy-MM-dd
+        DateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));// CustomDateEditor为自定义日期编辑器
+    }
+
+
+    @RequestMapping(value = "/findList", method = RequestMethod.GET)
+    public Map<String, Object> findList(@RequestParam Map<String, String> map) {
+        return noticeService.findList(map);
+    }
+
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public Notice findById(@PathVariable("id") Long id) {
+        Notice notice = noticeService.findById(id);
+        return notice;
+    }
+
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public Map<String, Object> deleteInfo(Notice t) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            noticeService.deleteInfo(t);
+            map.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            map.put("status", ResponseCode.ERROR);
+        }
+        return map;
+    }
+
+
+    @RequestMapping(method = RequestMethod.POST)
+    public Map<String, Object> save(Notice t) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            t.setNOTICE_XLNAME(BasicData.lineCode2NameMap.get(t.getNOTICE_XL()));
+            t.setNOTICE_STATIONNAME(BasicData.stationCode2NameMap.get(t.getNOTICE_XL()+"_"+t.getNOTICE_XSFX()+"_"+t.getNOTICE_STATION()));
+            t.setCREATE_BY(t.getNOTICE_BBR());
+            t.setUPDATE_BY(t.getNOTICE_BBR());
+            noticeService.save(t);
+            map.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            map.put("status", ResponseCode.ERROR);
+        }
+        return map;
+    }
+
+    @RequestMapping(value = "/getNotice", method = RequestMethod.POST)
+    public Map<String, Object> getNotice(@RequestBody JSONObject jsonObject) {
+        Map<String, Object> map = new HashMap<>();
+        Map<String, String> params = new HashMap<>();
+        try{
+            if(!SignUtils.validation(Long.parseLong(jsonObject.getString("timestamp")),jsonObject.getString("sign"))){
+                map.put("status", "验证失败");
+                return map;
+            }
+            StringBuffer stations=new StringBuffer();
+            StringBuffer lineCodes=new StringBuffer();
+            JSONArray jsonArray = jsonObject.getJSONArray("stations");
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject line=jsonArray.getJSONObject(i);
+                String lineCode = line.get("lineCode").toString();
+                String stationCode = line.get("stationCode").toString();
+                stations.append(stationCode+",");
+                lineCodes.append(lineCode+",");
+            }
+            params.put("stations",stations.toString().substring(0,stations.toString().length()-1));
+            params.put("lineCodes",lineCodes.toString().substring(0,lineCodes.toString().length()-1));
+            return noticeService.getNotice(params);
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            map.put("status", ResponseCode.ERROR);
+            return map;
+        }
+    }
+
+}
+package com.bsth.data.notice;
+
+
+import com.bsth.data.notice.entity.Notice;
+import com.bsth.service.BaseService;
+
+import java.util.Map;
+
+public interface NoticeService extends BaseService<Notice, Long>{
+
+    Map<String, Object> findList(Map<String, String> map);
+
+    Map<String, Object> deleteInfo( Notice t);
+
+    Map<String, Object> getNotice(Map<String, String> map);
+}
+package com.bsth.data.notice;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
+import com.bsth.data.gpsdata_v2.entity.StationRoute;
+import com.bsth.data.notice.entity.*;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimaps;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Service
+public class NoticeServiceImpl extends BaseServiceImpl<Notice, Long> implements NoticeService {
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Override
+    public Map<String, Object> findList(Map<String, String> map) {
+        Map<String, Object> rs = new HashMap();
+        try {
+
+            String lineCodes = map.get("lineCodes") == null ? "" : map.get("lineCodes");
+            Date startDate = new Date();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String time = sdf.format(startDate);
+            String sql = "select * from bsth_t_notice where NOTICE_TIME >=\""+time+"\" and (NOTICE_XL in("+lineCodes+") "+" or NOTICE_QY is not null) and STATUS !=2 ";
+            List<Notice> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(Notice.class));
+            for (Notice notice : list) {
+                notice.setNOTICE_TFSJ(TFSJ.getDescription(notice.getNOTICE_TFSJ()));
+                notice.setNOTICE_SJYX(SJYX.getDescription(notice.getNOTICE_SJYX()));
+                notice.setNOTICE_QY(QY.getDescription(notice.getNOTICE_QY()));
+                notice.setNOTICE_GG(GG.getDescription(notice.getNOTICE_GG()));
+            }
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+        }
+        catch (Exception e){
+            log.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+        return rs;
+    }
+
+    @Override
+    public Map<String, Object> getNotice(Map<String, String> map) {
+        Map<String, Object> rs = new HashMap();
+        ListMultimap<String, String> result = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
+        try {
+
+            String stations = map.get("stations") == null ? "" : map.get("stations");
+            String lineCodes = map.get("lineCodes") == null ? "" : map.get("lineCodes");
+            Date startDate = new Date();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd  HH:mm:ss");
+            String time = sdf.format(startDate);
+            String sql = "select * from bsth_t_notice where NOTICE_TIME >=\""+time+"\" and (NOTICE_XL in("+lineCodes+") "+" or NOTICE_QY is not null) and STATUS !=2";
+            List<Notice> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(Notice.class));
+            for (Notice notice : list) {
+                if(notice.getNOTICE_TYPE()==1){
+                    StringBuffer sb=new StringBuffer();
+                    List<StationRoute> stationRoutes=GeoCacheData.getStationRoute(notice.getNOTICE_XL(),Integer.parseInt(notice.getNOTICE_XSFX()));
+                    /*申港3路开往鸿音路南芦公路方向，临时改道不经过鸿音路两港大道站点,请乘客合理安排出行。*/
+                    sb.append(notice.getNOTICE_XLNAME()+"开往"+stationRoutes.get(stationRoutes.size()-1).getName()+"方向，");
+                    sb.append("由于"+ TFSJ.getDescription(notice.getNOTICE_TFSJ()));
+                    if("1".equals(notice.getNOTICE_SJYX())){
+                        sb.append("不经过"+notice.getNOTICE_STATIONNAME()+"站点");
+                    }else if("2".equals(notice.getNOTICE_SJYX())){
+                        sb.append("可能出现"+ SJYX.getDescription(notice.getNOTICE_SJYX()));
+                    }
+                    sb.append("，请乘客合理安排出行。");
+                    result.put(notice.getNOTICE_XL(),sb.toString());
+                }else if(notice.getNOTICE_TYPE()==2){
+                    result.put("area", GG.getDescription(notice.getNOTICE_GG()));
+                }
+
+            }
+            rs.put("status", ResponseCode.SUCCESS);
+            Map m=result.asMap();
+            List list1=new ArrayList();
+            Set<String> keys=m.keySet();
+            for (String key : keys) {
+                Map m2=new HashMap();
+                m2.put("lineId",key);
+                m2.put("msg",m.get(key));
+                list1.add(m2);
+            }
+
+            rs.put("notice", list1);
+        }
+        catch (Exception e){
+            log.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+        return rs;
+    }
+    @Override
+    public Map<String, Object> deleteInfo(Notice rr) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            Long id = rr.getID();
+            String bbr = rr.getNOTICE_BBR();
+
+            jdbcTemplate.update("UPDATE bsth_t_notice SET STATUS = 2,NOTICE_BBR = ? WHERE ID = ? ",bbr,id);
+            map.put("status", ResponseCode.SUCCESS);
+        }catch(DataIntegrityViolationException de){
+            map.put("status", ResponseCode.ERROR);
+            map.put("msg", "“完整性约束”校验失败，请检查要删除的对象是否存在外键约束");
+        }
+        return map;
+    }
+}
+package com.bsth.data.notice.entity;
+
+public enum GG {
+    GG1("0", "雨天路滑，安全出行。"),
+    GG2("1", "高峰时段，道路拥堵，请乘客合理安排出行。"),
+    GG3("2", "请先下后上，注意乘车安全。");
+
+    private  String code;
+    private  String description;
+
+    GG(String code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+
+    public static String getDescription(String number){
+        String description ="";
+        for (GG e : GG.values()) {
+            if(e.code.equals(number)){
+                return e.description;
+            }
+        }
+        return description;
+    }
+
+}
+package com.bsth.data.notice.entity;
+
+import javax.persistence.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+@Entity
+@Table(name = "bsth_t_notice")
+public class Notice {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long ID;
+
+    /**  类型,1:突发事件，2：区域公告 */
+    private Integer NOTICE_TYPE;
+    /**  时间*/
+    private Date NOTICE_DATE;
+    /**  时间*/
+    private Date NOTICE_TIME;
+    /**  报备人*/
+    private String NOTICE_BBR;
+    /**  线路编码 */
+    private String NOTICE_XL;
+    /**  线路名*/
+    private String NOTICE_XLNAME;
+    /**  行驶方向*/
+    private String NOTICE_XSFX;
+    /**  站点*/
+    private String NOTICE_STATION;
+    /**  站点名*/
+    private String NOTICE_STATIONNAME;
+    /**  突发事件*/
+    private String NOTICE_TFSJ;
+    /**  事件影响*/
+    private String NOTICE_SJYX;
+    /**  区域*/
+    private String NOTICE_QY;
+    /**  公告*/
+    private String NOTICE_GG;
+
+
+    /**  访问接口时使用的状态码 操作类型，0：新增；1：修改；2：删除 */
+    private String STATUS;
+    /**  创建人*/
+    private String CREATE_BY;
+    /** 创建时间 */
+    @Column(updatable = false, name = "CREATE_DATE", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private Date CREATE_DATE;
+    /**  修改人*/
+    private String UPDATE_BY;
+    /**  修改时间*/
+    @Column(name = "UPDATE_DATE", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    private Date UPDATE_DATE;
+
+    public long getID() {
+        return ID;
+    }
+
+    public void setID(long ID) {
+        this.ID = ID;
+    }
+
+    public Integer getNOTICE_TYPE() {
+        return NOTICE_TYPE;
+    }
+
+    public void setNOTICE_TYPE(Integer NOTICE_TYPE) {
+        this.NOTICE_TYPE = NOTICE_TYPE;
+    }
+
+    public Date getNOTICE_DATE() {
+        return NOTICE_DATE;
+    }
+
+    public void setNOTICE_DATE(Date NOTICE_DATE) {
+        this.NOTICE_DATE = NOTICE_DATE;
+    }
+
+    public Date getNOTICE_TIME() {
+        return NOTICE_TIME;
+    }
+
+    public void setNOTICE_TIME(Date NOTICE_TIME) {
+        this.NOTICE_TIME = NOTICE_TIME;
+    }
+
+    public String getNOTICE_BBR() {
+        return NOTICE_BBR;
+    }
+
+    public void setNOTICE_BBR(String NOTICE_BBR) {
+        this.NOTICE_BBR = NOTICE_BBR;
+    }
+
+    public String getNOTICE_XL() {
+        return NOTICE_XL;
+    }
+
+    public void setNOTICE_XL(String NOTICE_XL) {
+        this.NOTICE_XL = NOTICE_XL;
+    }
+
+    public String getNOTICE_XLNAME() {
+        return NOTICE_XLNAME;
+    }
+
+    public void setNOTICE_XLNAME(String NOTICE_XLNAME) {
+        this.NOTICE_XLNAME = NOTICE_XLNAME;
+    }
+
+    public String getNOTICE_XSFX() {
+        return NOTICE_XSFX;
+    }
+
+    public void setNOTICE_XSFX(String NOTICE_XSFX) {
+        this.NOTICE_XSFX = NOTICE_XSFX;
+    }
+
+    public String getNOTICE_STATION() {
+        return NOTICE_STATION;
+    }
+
+    public void setNOTICE_STATION(String NOTICE_STATION) {
+        this.NOTICE_STATION = NOTICE_STATION;
+    }
+
+    public String getNOTICE_STATIONNAME() {
+        return NOTICE_STATIONNAME;
+    }
+
+    public void setNOTICE_STATIONNAME(String NOTICE_STATIONNAME) {
+        this.NOTICE_STATIONNAME = NOTICE_STATIONNAME;
+    }
+
+    public String getNOTICE_TFSJ() {
+        return NOTICE_TFSJ;
+    }
+
+    public void setNOTICE_TFSJ(String NOTICE_TFSJ) {
+        this.NOTICE_TFSJ = NOTICE_TFSJ;
+    }
+
+    public String getNOTICE_SJYX() {
+        return NOTICE_SJYX;
+    }
+
+    public void setNOTICE_SJYX(String NOTICE_SJYX) {
+        this.NOTICE_SJYX = NOTICE_SJYX;
+    }
+
+    public String getNOTICE_QY() {
+        return NOTICE_QY;
+    }
+
+    public void setNOTICE_QY(String NOTICE_QY) {
+        this.NOTICE_QY = NOTICE_QY;
+    }
+
+    public String getNOTICE_GG() {
+        return NOTICE_GG;
+    }
+
+    public void setNOTICE_GG(String NOTICE_GG) {
+        this.NOTICE_GG = NOTICE_GG;
+    }
+
+    public String getSTATUS() {
+        return STATUS;
+    }
+
+    public void setSTATUS(String STATUS) {
+        this.STATUS = STATUS;
+    }
+
+    public String getCREATE_BY() {
+        return CREATE_BY;
+    }
+
+    public void setCREATE_BY(String CREATE_BY) {
+        this.CREATE_BY = CREATE_BY;
+    }
+
+    public Date getCREATE_DATE() {
+        return CREATE_DATE;
+    }
+
+    public void setCREATE_DATE(Date CREATE_DATE) {
+        this.CREATE_DATE = CREATE_DATE;
+    }
+
+    public String getUPDATE_BY() {
+        return UPDATE_BY;
+    }
+
+    public void setUPDATE_BY(String UPDATE_BY) {
+        this.UPDATE_BY = UPDATE_BY;
+    }
+
+    public Date getUPDATE_DATE() {
+        return UPDATE_DATE;
+    }
+
+    public void setUPDATE_DATE(Date UPDATE_DATE) {
+        this.UPDATE_DATE = UPDATE_DATE;
+    }
+}
+package com.bsth.data.notice.entity;
+
+public enum QY {
+    QY0("0", "全部"),
+    QY1("1", "区域1"),
+    QY2("2", "区域2"),
+    QY3("3", "区域3");
+
+    private  String code;
+    private  String description;
+
+    QY(String code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+
+    public static String getDescription(String number){
+        String description ="";
+        for (QY e : QY.values()) {
+            if(e.code.equals(number)){
+                return e.description;
+            }
+        }
+        return description;
+    }
+
+}
+package com.bsth.data.notice.entity;
+
+public enum SJYX {
+    ZDHD("1", "临时改道"),
+    ELTQ("2", "班次延误");
+
+    private  String code;
+    private  String description;
+
+    SJYX(String code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+
+    public static String getDescription(String number){
+        String description ="";
+        for (SJYX e : SJYX.values()) {
+            if(e.code.equals(number)){
+                return e.description;
+            }
+        }
+        return description;
+    }
+
+}
+package com.bsth.data.notice.entity;
+
+public enum TFSJ {
+    ZDHD("1", "重大活动"),
+    ELTQ("2", "恶劣天气"),
+    JTSG("3", "交通事故"),
+    DLYD("4", "道路拥堵");
+
+    private  String code;
+    private  String description;
+
+    TFSJ(String code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+
+    public static String getDescription(String number){
+        String description ="";
+        for (TFSJ e : TFSJ.values()) {
+            if(e.code.equals(number)){
+                return e.description;
+            }
+        }
+        return description;
+    }
+
+}
+package com.bsth.data.notice.repository;
+
+import com.bsth.data.notice.entity.Notice;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * @Interface: NoticeRepository(站点公告Repository数据持久层接口)
+ * 
+ * @Author YM
+ * 
+ * @Date 2024-11-07
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Repository
+public interface NoticeRepository extends BaseRepository<Notice, Long> {
+
+}
@@ -11,6 +11,7 @@ import com.bsth.entity.zndd.StationPeopleLogger;
 import com.bsth.entity.zndd.StationSignsLogger;
 import com.bsth.service.schedule.utils.Md5Util;
 import com.bsth.util.HttpClientUtils;
+import com.bsth.util.SignUtils;
 import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
@@ -20,12 +21,12 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import java.io.*;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.stream.Collectors;
 /**
  * 对外接口
@@ -56,16 +57,12 @@ public class OutEntrance {
     @Autowired
     carMonitor carMonitor;
-    private static final String PASSWORD="e126853c7f6f43b4857fa8dfe3b28b5d90be9e68";
-
-
-
      //调度屏小程序接口。
      @RequestMapping(value = "/OutCar", method = RequestMethod.POST)
      public Map OutCarOutCar(@RequestParam Map m,@RequestBody StationSignsLogger ssLogger) {
          Map rtn = new HashMap<>();
          try {
-             if(!validation(ssLogger.getTimestamp(),ssLogger.getSign())){
+             if(!SignUtils.validation(ssLogger.getTimestamp(),ssLogger.getSign())){
                  rtn.put("status", "验证失败");
                  return rtn;
              }
@@ -75,9 +72,12 @@ public class OutEntrance {
              m.put("lineName",BasicData.lineCode2NameMap.get(ssLogger.getLineCode()));
              m.put("num",ssLogger.getNum());
              m.put("dir",ssLogger.getDir());
-
+             m.put("calleeId",ssLogger.getCalleeId());
              //线调页面推送
-             sendUtils.stationcf(m);
+             if(ssLogger.getNum()>15){
+                 sendUtils.stationcf(m);
+             }
+
              //查询班次情况自动回复
              //当前日期
@@ -96,19 +96,24 @@ public class OutEntrance {
              }else {
                  //筛选方向
                  List<ScheduleRealInfo> rs = dayOfSchedule.findByLineCode(ssLogger.getLineCode());
-                 //排序
-                 Collections.sort(rs,new ScheduleComparator.FCSJ());
-                 SimpleDateFormat sdf= new SimpleDateFormat("HH:ss");
-                 String sjtext = "";
-                 LocalTime t1 = LocalTime.parse(sdf.format(new Date()), DateTimeFormatter.ofPattern("HH:mm"));
-                 for (ScheduleRealInfo sr:rs) {
-                     LocalTime t2 = LocalTime.parse(sr.getFcsj(), DateTimeFormatter.ofPattern("HH:mm"));
-                     //判断上下行
-                     if(t1.isAfter(t2)){
-                         sjtext = sr.getFcsj();
+                 if(rs.size()>0){
+                     //排序
+                     Collections.sort(rs,new ScheduleComparator.FCSJ());
+                     SimpleDateFormat sdf= new SimpleDateFormat("HH:ss");
+                     String sjtext = "";
+                     LocalTime t1 = LocalTime.parse(sdf.format(new Date()), DateTimeFormatter.ofPattern("HH:mm"));
+                     for (ScheduleRealInfo sr:rs) {
+                         LocalTime t2 = LocalTime.parse(sr.getFcsj(), DateTimeFormatter.ofPattern("HH:mm"));
+                         //判断上下行
+                         if(t1.isAfter(t2)){
+                             sjtext = sr.getFcsj();
+                         }
                      }
+                     rtn.put("message","车辆预计"+sjtext+"发车，请耐心等待");
+                 }else {
+                     rtn.put("message","当日运营已结束");
                  }
-                 rtn.put("message","车辆预计"+sjtext+"发车，请耐心等待");
+
              }
              rtn.put("status",ResponseCode.SUCCESS);
@@ -121,12 +126,18 @@ public class OutEntrance {
     @RequestMapping(value = "/klyj", method = RequestMethod.POST)
-    public void klyj(@RequestBody JSONObject jsonObject) {
+    public Map klyj(@RequestBody JSONObject jsonObject) {
+        Map rtn = new HashMap<>();
         try {
-            if(!validation(Long.parseLong(jsonObject.getString("timestamp")),jsonObject.getString("sign"))){
-                return ;
+            if(!SignUtils.validation(Long.parseLong(jsonObject.getString("timestamp")),jsonObject.getString("sign"))){
+                rtn.put("status", "验证失败");
+                return rtn;
             }
             String num=jsonObject.getString("num");
+            if(Integer.parseInt(num)<15){
+                rtn.put("status",ResponseCode.SUCCESS);
+                return rtn;
+            }
             String image=jsonObject.getString("image");
             String img=uploadBase64Img(image);
             JSONArray jsonArray = jsonObject.getJSONArray("stations");
@@ -136,16 +147,17 @@ public class OutEntrance {
                 JSONObject line=jsonArray.getJSONObject(i);
                 String lineCode = line.get("lineCode").toString();
                 String stationCode = line.get("stationCode").toString();
-                StationRoute stationRoute=BasicData.stationCode2StationMap.get(lineCode+"_"+stationCode);
+                String dir = line.get("dir").toString();
+                /*StationRoute stationRoute=BasicData.stationCode2StationMap.get(lineCode+"_"+stationCode);*/
                 Map m = new HashMap();
                 m.put("image", img);
                 m.put("stationCode", stationCode);
-                m.put("lineCode", stationRoute.getLineCode());
-                m.put("stationName",BasicData.stationCode2NameMap.get(stationRoute.getLineCode()+"_"+stationRoute.getDirections()+"_"+stationRoute.getStationCode()));
-                m.put("lineName",BasicData.lineCode2NameMap.get(stationRoute.getLineCode()));
+                m.put("lineCode", lineCode);
+                m.put("stationName",BasicData.stationCode2NameMap.get(lineCode+"_"+dir+"_"+stationCode));
+                m.put("lineName",BasicData.lineCode2NameMap.get(lineCode));
                 m.put("num",num);
-                m.put("xlDir",stationRoute.getDirections());
-                List<ScheduleRealInfo> srList=dayOfSchedule.findByLineAndUpDown(stationRoute.getLineCode(),stationRoute.getDirections());
+                m.put("xlDir",dir);
+                List<ScheduleRealInfo> srList=dayOfSchedule.findByLineAndUpDown(lineCode,Integer.parseInt(dir));
                 List<ScheduleRealInfo> sl=new ArrayList<>();
                 for (ScheduleRealInfo scheduleRealInfo : srList) {//筛选出运营班次
                     if((scheduleRealInfo.getBcType().equals("normal")||scheduleRealInfo.getBcType().equals("region"))){
@@ -159,11 +171,15 @@ public class OutEntrance {
                     }
                 });
                 ScheduleRealInfo schedule = null;
+                ScheduleRealInfo schedule2 = null;
                 for (int i1 = 0; i1 < sl.size(); i1++) {//最近的已发车班次
                     ScheduleRealInfo scheduleRealInfo=sl.get(i1);
                     LocalTime fcsj=LocalTime.parse(scheduleRealInfo.getFcsj(),dateTimeFormatter);
-                    if((scheduleRealInfo.getBcType().equals("normal")||scheduleRealInfo.getBcType().equals("region")) &&scheduleRealInfo.getXlDir().equals(String.valueOf(stationRoute.getDirections())) && fcsj.isAfter(localTime)){
-                        schedule =sl.get(i1-1);;
+                    if(fcsj.isAfter(localTime)){
+                        schedule =sl.get(i1-1);
+                        if(i1<sl.size()){
+                            schedule2 =sl.get(i1);
+                        }
                         break;
                     }
                 }
@@ -172,13 +188,26 @@ public class OutEntrance {
                     m.put("sch",schedule);
                     m.put("uuid",AutomaticSch.UUID());
                     m.put("rq",localTime.format(dateTimeFormatter)); //检测到时间
+                    m.put("ids",AutomaticSch.UUID());
+                    m.put("type","KLYJ");
+                    LocalTime fcsj = LocalTime.parse(schedule2.getDfsj(),DateTimeFormatter.ofPattern("HH:mm"));
+                    LocalTime now = LocalTime.now();
+                    if(Duration.between(now,fcsj).toMinutes()==0){
+                        m.put("msg","下一个班次即将发车");
+                    }else {
+                        m.put("msg","下一个班次预计还有"+ Duration.between(now,fcsj).toMinutes() +"分钟发车");
+                    }
+
                     sendUtils.klyj(m);
                 }
             }
+            rtn.put("status",ResponseCode.SUCCESS);
         } catch (Exception e) {
-            e.printStackTrace();
+            rtn.put("status", ResponseCode.ERROR);
+            logger.error("",e);
         }
+        return rtn;
     }
     /*
@@ -233,8 +262,8 @@ public class OutEntrance {
     /**
      * 保存base64图片
-     * @param base64Str base64文件
-     * @param  上传地址（示例：D:\\1.png）
+     * @param  base base64文件
+     * @param  （示例：D:\\1.png）
      * @return
      */
     public  String uploadBase64Img(String base) throws Exception {
@@ -320,15 +349,5 @@ public class OutEntrance {
         return traffic.get("trafficStatus").toString();
     }
-    public boolean validation(long timestamp,String sign){
-        String md5String=Md5Util.getMd5(timestamp+PASSWORD);
-        if(!md5String.equals(sign)){
-            return false;
-        }
-        if(System.currentTimeMillis()-timestamp>60*1000){
-            return false;
-        }
-        return true;
-    }
 }
@@ -26,7 +26,7 @@ public class carMonitor {
     public List<Map> carMonitor(String lineCode,String directions,String station) {
         List<Map> list = new ArrayList<>(); //返回的接口数据
-        url = "http://127.0.0.1:9777/xxfb/jd/carMonitor?lineid="+lineCode+"&stopid="+station+"&direction="+directions;
+        url = "http://58.34.52.130:9777/xxfb/jd/carMonitor?lineid="+lineCode+"&stopid="+station+"&direction="+directions;
         InputStream in = null;
         OutputStream out = null;
         try {
+package com.bsth.data.zndd.voice;
+
+import java.util.*;
+
+public enum GJC {
+    CX(1, "撤销"),
+    QX(1, "取消"),
+    XZ(2, "新增"),
+    TJ(2, "添加"),
+    LJ(2, "临加"),
+    TZ(3, "调整"),
+    BC(4, "班次"),
+    PB(4, "排班"),
+    DF(5, "待发"),
+    SF(6, "实发"),
+    CC(7, "出场"),
+    KQ(8, "开启"),
+    GB(9, "关闭"),
+    ge(10, "个"),
+    dao(11, "到"),
+    de(12, "的");
+
+    private  int code;
+    private  String description;
+
+    GJC(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public static int getNumber(String description){
+        int number = 999;
+        for (GJC gjc : GJC.values()) {
+            if(gjc.description.equals(description)){
+                number = gjc.code;
+            }
+        }
+        return number;
+    }
+
+    public static Set<String> getDescription(int number){
+        Set<String> description = new HashSet<>();
+        for (GJC gjc : GJC.values()) {
+            if(gjc.code==number){
+                description.add(gjc.description);
+            }
+        }
+        return description;
+    }
+
+    public static Set<Integer> getGJC(String yy){
+        Set<Integer> set=new HashSet<>();
+        for (GJC gjc : GJC.values()) {
+            char[] arr=gjc.description.toCharArray();
+            for (char c : arr) {
+                if(UploadVideoServlet.getPinyin(yy).contains(UploadVideoServlet.getPinyin(String.valueOf(c)))){
+                    set.add(gjc.code);
+                }
+            }
+
+        }
+        return set;
+    }
+
+    public static int getCount(int i){
+        int count=0;
+        for (GJC gjc : GJC.values()) {
+            if(gjc.code==i){
+                count++;
+            }
+        }
+        return count;
+    }
+
+    public static void main(String[] args) {
+        List<Integer> list=new ArrayList<>();
+        list.add(1);
+        list.add(2);
+        list.add(4);
+        Set<String> ml=new HashSet<>();
+        nestedLoop(list,"",ml);
+        System.out.println(ml);
+    }
+
+    public static void nestedLoop(List<Integer> arr,String str,Set<String> ml) {
+        if(arr.size()>0){
+            Set<String> set=getDescription(arr.get(0));
+            for (String s : set) {
+                List list2=new ArrayList();
+                list2.addAll(arr);
+                list2.remove(0);
+                nestedLoop(list2,str+s,ml);
+            }
+        }else {
+            ml.add(str);
+        }
+    }
+
+
+}
@@ -121,44 +121,84 @@ public class UploadVideoServlet extends HttpServlet {
                 //定义输出类型
                 response.setHeader("Content-type", "text/html;charset=UTF-8");
                 PrintWriter writer = response.getWriter();
-                List<retun> list1 = new ArrayList<>();
                 String text = textList.get(0).toString();
-
-
-                //帮我添加一个夏硕路林兰路到鸿音路云端路的班次
-                String fcsj = null;//线路名，上下行，发车时间
-                String[]  ks = text.replace("，","").split("到");
-                String Station1= ks[0].split("个")[1];
-                String Station2= ks[1].split("的")[0];
-                //发车时间
-                fcsj = extractTimes(text);
-                //线路名称 - 线路编码和名称对照
-
-                Map<String, Object> param = new HashMap<>();
-                param.put("lineCode_eq", line);
-                param.put("directions_eq", 0);
-                param.put("destroy_eq", 0);
-                List<StationRoute> stationup = ((List<StationRoute>) stationRouteService.list(param));
-                //上行匹配
-                Map m = pyPp(stationup,Station1,Station2);
-                if (m.get("stationcode1") == null || m.get("stationcode2") == null){
-                    param.put("directions_eq",1);
-                    List<StationRoute> stationdown = ((List<StationRoute>) stationRouteService.list(param));
-                    //下行匹配
-                    Map smap = pyPp(stationdown,Station1,Station2);
-                    if (smap.get("stationcode1") == null || smap.get("stationcode2") == null){
-                        writer.write(text +","+"99999");
+                //text="新增出厂班次";
+                //text="帮我添加一个鸿音路南芦公路到临港大道枢纽站的班次";
+                if(isSimilarity(ZL.zdzdbc,text,null)){//帮我添加一个xx到xx站的班次(帮我添加一个鸿音路南芦公路到临港大道枢纽站的班次)
+                    String[]  ks = text.replace("，","").split("到");
+                    if(ks[0].split("个").length==1){
+                        writer.write(text+"_识别失败"+",999");
                         return;
                     }
-
-                    writer.write(text +","+smap.get("stationcode1")+","+smap.get("stationcode2")+","+1);
+                    if(ks[1].split("的").length==1){
+                        writer.write(text+"_识别失败"+",999");
+                        return;
+                    }
+                    String Station1= ks[0].split("个")[1];
+                    String Station2= ks[1].split("的")[0];
+
+                   /* String fcsj = null;//线路名，上下行，发车时间
+                    //发车时间
+                    fcsj = extractTimes(text);*/
+                    //线路名称 - 线路编码和名称对照
+
+                    Map<String, Object> param = new HashMap<>();
+                    param.put("lineCode_eq", line);
+                    param.put("directions_eq", 0);
+                    param.put("destroy_eq", 0);
+                    List<StationRoute> stationup = ((List<StationRoute>) stationRouteService.list(param));
+                    //上行匹配
+                    Map m = pyPp(stationup,Station1,Station2);
+                    if (m.get("stationcode1") == null || m.get("stationcode2") == null){
+                        param.put("directions_eq",1);
+                        List<StationRoute> stationdown = ((List<StationRoute>) stationRouteService.list(param));
+                        //下行匹配
+                        Map smap = pyPp(stationdown,Station1,Station2);
+                        if (smap.get("stationcode1") == null || smap.get("stationcode2") == null){
+                            writer.write(text +","+"999");
+                            return;
+                        }
+                        writer.write(text +",1,"+smap.get("stationcode1")+","+smap.get("stationcode2")+","+1);
+                        return;
+                    }
+                    writer.write(text +",1,"+m.get("stationcode1")+","+m.get("stationcode2")+","+0);
                     return;
                 }
-
-                writer.write(text +","+m.get("stationcode1")+","+m.get("stationcode2")+","+0);
-                return;
-
-                //打开0 关闭1 临加2  999异常
+                if(isSimilarity(ZL.LJCCBC,text,null)){//添加出厂班次
+                    writer.write(text+"_"+ZL.LJCCBC.getDescription()+",2");
+                    return;
+                }
+                if(isSimilarity(ZL.LJBC,text,null)){//添加班次
+                    writer.write(text+"_"+ZL.LJBC.getDescription()+",3");
+                    return;
+                }
+                if(isSimilarity(ZL.QXBC,text,null)){//取消班次
+                    writer.write(text+"_"+ZL.QXBC.getDescription()+",11");
+                    return;
+                }
+                if(isSimilarity(ZL.QXSF,text,null)){//取消实发
+                    writer.write(text+"_"+ZL.QXSF.getDescription()+",12");
+                    return;
+                }
+                if(isSimilarity(ZL.TZDF,text,"待")){//调整待发
+                    writer.write(text+"_"+ZL.TZDF.getDescription()+",21");
+                    return;
+                }
+                if(isSimilarity(ZL.TZSF,text,"实")){//调整实发
+                    writer.write(text+"_"+ZL.TZSF.getDescription()+",22");
+                    return;
+                }
+                if(isSimilarity(ZL.KQ,text,null)){//启动
+                    writer.write(text+"_"+ZL.KQ.getDescription()+",31");
+                    return;
+                }
+                if(isSimilarity(ZL.GB,text,null)){//关闭
+                    writer.write(text+"_"+ZL.GB.getDescription()+",41");
+                    return;
+                }
+                else {
+                    writer.write(text+"_识别失败"+",999");
+                }
             }
         } catch (Exception e) {
@@ -232,30 +272,45 @@ public class UploadVideoServlet extends HttpServlet {
     }
-
     public static String getPinyin(String chinese) {
         HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
         format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
         format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
-        StringBuilder pinyinBuilder = new StringBuilder();
-        char[] charArray = chinese.toCharArray();
-        for (char c : charArray) {
-            String[] pinyinArray = null;
-            try {
-                pinyinArray = PinyinHelper.toHanyuPinyinStringArray(c, format);
-            } catch (BadHanyuPinyinOutputFormatCombination e) {
-                e.printStackTrace();
+        StringBuilder sb = new StringBuilder();
+        char[] chars = chinese.toCharArray();
+        for (char c : chars) {
+            if (Character.isWhitespace(c)) {
+                continue;
             }
-            if (pinyinArray != null) {
-                pinyinBuilder.append(pinyinArray[0]);
+            if (c >= '\u4e00' && c <= '\u9fa5') {
+                try {
+                    String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(c, format);
+                    sb.append(pinyinArray[0]);
+                } catch (BadHanyuPinyinOutputFormatCombination e) {
+                    e.printStackTrace();
+                }
             } else {
-                pinyinBuilder.append(c);
+                sb.append(c);
             }
         }
-        return pinyinBuilder.toString();
+        return sb.toString();
     }
+
+    //去除标点符号
+    public static String removePunctuation(String input) {
+        String punctuationRegex = "[\\p{Punct}]";
+        input=input.replaceAll(punctuationRegex, "");
+        String regEx = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]";
+        Pattern p = Pattern.compile(regEx);
+        Matcher m = p.matcher(input);
+        return input.replaceAll(punctuationRegex, "").replaceAll(regEx, "");
+    }
+
+    public static void main(String[] args) {
+        System.out.println(calculateSimilarity("临加班次", "撤销班次"));
+    }
     public static Double calculateSimilarity(String str1, String str2) {
         String pinyinStr1 = getPinyin(str1);
         String pinyinStr2 = getPinyin(str2);
@@ -285,7 +340,40 @@ public class UploadVideoServlet extends HttpServlet {
-
-
+   /* public static boolean isSimilarity(Integer[] gjc,String str,String gjz){
+        Set<String> ml=new HashSet<>();
+        GJC.nestedLoop(Arrays.asList(gjc),"",ml);
+        for (String s : ml) {
+            if(calculateSimilarity(s,str)>= 0.75){//相似度
+                if(gjz==null){//不含关键字
+                    return true;
+                }else {
+                    if(UploadVideoServlet.getPinyin(str).contains(UploadVideoServlet.getPinyin(gjz))){
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }*/
+
+    public static boolean isSimilarity(ZL zl,String str,String gjz){
+        Integer[] ints=zl.getCodes();
+        Set<String> ml=new HashSet<>();
+        GJC.nestedLoop(Arrays.asList(ints),"",ml);
+        for (String s : ml) {
+            double d=calculateSimilarity(s,str);
+            if(d>= 0.75){//相似度
+                if(gjz==null){//不含关键字
+                    return true;
+                }else {
+                    if(UploadVideoServlet.getPinyin(str).contains(UploadVideoServlet.getPinyin(gjz))){
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }
 \ No newline at end of file
+package com.bsth.data.zndd.voice;
+
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public enum ZL {
+    LJBC(new Integer[]{2,4}, "临加班次"),
+    LJCCBC(new Integer[]{2,4,7}, "临加出场班次"),
+    TZDF(new Integer[]{3,5}, "调整待发"),
+    TZSF(new Integer[]{3,6}, "调整实发"),
+    QXBC(new Integer[]{1,4}, "取消班次"),
+    QXSF(new Integer[]{1,6}, "取消实发"),
+    KQ(new Integer[]{8}, "开启智能调度"),
+    GB(new Integer[]{9}, "关闭智能调度"),
+    zdzdbc(new Integer[]{10,11,12}, "添加一个xx到xx的班次");
+
+    private  Integer[] codes;
+    private  String description;
+
+    ZL(Integer[] codes, String description) {
+        this.codes = codes;
+        this.description = description;
+    }
+
+    public Integer[] getCodes() {
+        return codes;
+    }
+
+    public void setCodes(Integer[] codes) {
+        this.codes = codes;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public static boolean match(ZL zl,String str){
+        Integer[] ints=zl.codes;
+        List<Integer> list=  Arrays.asList(ints);
+        Set<String> ml=new HashSet<>();
+        GJC.nestedLoop(list,str,ml);
+        return false;
+    }
+
+
+}
@@ -28,6 +28,8 @@ public class StationSignsLogger {
     private String sign;
+    private String calleeId;
+
     public String getLineCode() {
@@ -101,4 +103,12 @@ public class StationSignsLogger {
     public void setSign(String sign) {
         this.sign = sign;
     }
+
+    public String getCalleeId() {
+        return calleeId;
+    }
+
+    public void setCalleeId(String calleeId) {
+        this.calleeId = calleeId;
+    }
 }
@@ -20,7 +20,7 @@ public abstract class BaseFilter implements Filter {
 			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.LOGIN, Constants.LOGIN_FAILURE,
 			Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL,
 			Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH, Constants.VEHICLE_DATA_SYNC_URL,
-			Constants.FILE_AUTH,Constants.OUT_URL};
+			Constants.FILE_AUTH,Constants.OUT_URL,Constants.NOTICE_URL};
 	@Override
 	public void destroy() {
@@ -39,7 +39,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ORIGINAL_LOGIN_PAGE, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
                 Constants.SERVICE_INTERFACE, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES,
-                Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.FILE_AUTH,Constants.OUT_URL);
+                Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.FILE_AUTH,Constants.OUT_URL,Constants.NOTICE_URL);
     }
     @Override
@@ -35,7 +35,7 @@ public class LoginInterceptor implements Filter {
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.ORIGINAL_LOGIN_PAGE, Constants.SERVICE_INTERFACE,
 			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.LOGIN,
 			Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,
-			Constants.STATION_AND_SECTION_COUNT, Constants.VEHICLE_DATA_SYNC_URL, Constants.FILE_AUTH ,Constants.OUT_URL};
+			Constants.STATION_AND_SECTION_COUNT, Constants.VEHICLE_DATA_SYNC_URL, Constants.FILE_AUTH ,Constants.OUT_URL,Constants.NOTICE_URL};
 	@Override
+package com.bsth.util;
+
+import com.bsth.service.schedule.utils.Md5Util;
+
+public class SignUtils {
+
+    private static final String PASSWORD="e126853c7f6f43b4857fa8dfe3b28b5d90be9e68";
+    public static boolean validation(long timestamp,String sign){
+        String md5String= Md5Util.getMd5(timestamp+PASSWORD);
+        if(!md5String.equals(sign)){
+            return false;
+        }
+        if(System.currentTimeMillis()-timestamp>60*1000){
+            return false;
+        }
+        return true;
+    }
+}
@@ -88,6 +88,7 @@
             <ul class="uk-list uk-list-large uk-list-divider">
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="report_register"> 报备登记</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_report_register"> 报备登记报表</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="station_notice"> 站牌公告</label></li>
             </ul>
         </div>
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="FreeSql" Version="3.2.821" />
-    <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.821" />
-    <PackageReference Include="FreeSql.Repository" Version="3.2.821" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-  </ItemGroup>
-
-</Project>
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.9.34622.214
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blueprint.Net.Server", "Blueprint.Net.Server.csproj", "{650D80E6-03AB-40D8-A1DD-C9A42DF92249}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{650D80E6-03AB-40D8-A1DD-C9A42DF92249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{650D80E6-03AB-40D8-A1DD-C9A42DF92249}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{650D80E6-03AB-40D8-A1DD-C9A42DF92249}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{650D80E6-03AB-40D8-A1DD-C9A42DF92249}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6CE115DF-4AF8-4EB9-8A99-04F0BED024AC}
-	EndGlobalSection
-EndGlobal
-using Microsoft.AspNetCore.Mvc;
-using System.Collections.Frozen;
-using System.Linq;
-using System.Xml.Linq;
-using static FreeSql.Internal.GlobalFilter;
-
-namespace Blueprint.Net.Server.Controllers
-{
-    [ApiController]
-    [Route("[controller]")]
-    public class BlueprintController(ILogger<BlueprintController> logger, IFreeSql fsql) : ControllerBase
-    {
-        private readonly ILogger<BlueprintController> _logger = logger;
-        private readonly IFreeSql _fsql = fsql;
-
-        [HttpGet("GetProjects")]
-        public async Task<ActionResult<IEnumerable<Project>>> GetProjects()
-        {
-            var projects = await _fsql.Select<Project>()
-                .IncludeMany(p => p.Workspaces, a => a.IncludeMany(b => b.Links))
-                .IncludeMany(p => p.Workspaces, a => a.IncludeMany(b => b.Cards))
-                .IncludeMany(p => p.Workspaces, a => a.IncludeMany(b => b.Cards, c => c.IncludeMany(d => d.Nodes)))
-                .ToListAsync();
-
-            List<long> linkIds = [];
-            List<long> workspaceIds = [];
-
-            foreach (var project in projects)
-            {
-                foreach (var workspace in project.Workspaces)
-                {
-                    workspaceIds.Add(workspace.Id);
-
-                }
-            }
-
-            var links = await _fsql.Select<Link>().Where(p => workspaceIds.Contains(p.WorkspaceId)).ToListAsync();
-
-            foreach (var link in links)
-            {
-                linkIds.Add(link.SourceId);
-                linkIds.Add(link.TargetId);
-            }
-
-            var nodeConnectInfos = await _fsql.Select<NodeConnectInfo>().Where(p => linkIds.Contains(p.Id)).ToListAsync();
-
-            foreach (var project in projects)
-            {
-                foreach (var workspace in project.Workspaces)
-                {
-
-                    foreach (var link in links.Where(p => p.WorkspaceId == workspace.Id))
-                    {
-                        link.Source = nodeConnectInfos.FirstOrDefault(p => p.Id == link.SourceId) ?? new();
-                        link.Target = nodeConnectInfos.FirstOrDefault(p => p.Id == link.TargetId) ?? new();
-
-                        workspace.Links.Add(link);
-                    }
-                }
-            }
-
-
-            return Ok(projects);
-        }
-
-        [HttpPost("Project")]
-        public async Task<ActionResult<Project>> Project([FromBody] Project project)
-        {
-
-            var projectRepo = _fsql.GetRepository<Project>();
-
-            projectRepo.DbContextOptions.EnableCascadeSave = true;
-
-            project = await projectRepo.InsertOrUpdateAsync(project);
-            projectRepo.Attach(project);
-
-            foreach (var workspaces in project.Workspaces)
-            {
-                foreach (var node in workspaces.Links)
-                {
-
-                    if (node.SourceId == 0)
-                    {
-                        node.SourceId = await _fsql.Insert(node.Source).ExecuteIdentityAsync();
-                        node.Source.Id = node.SourceId;
-                    }
-                    else
-                    {
-                        await _fsql.Update<NodeConnectInfo>().SetSource(node.Source).Where(p => p.Id == node.SourceId).ExecuteAffrowsAsync();
-                    }
-
-                    if (node.TargetId == 0)
-                    {
-                        node.TargetId = await _fsql.Insert(node.Target).ExecuteIdentityAsync();
-                        node.Target.Id = node.TargetId;
-                    }
-                    else
-                    {
-                        await _fsql.Update<NodeConnectInfo>().SetSource(node.Target).Where(p => p.Id == node.TargetId).ExecuteAffrowsAsync();
-                    }
-                }
-            }
-            await projectRepo.UpdateAsync(project);
-
-            return Ok(project);
-
-        }
-
-
-        [HttpDelete("DeleteProject/{id}")]
-        public async Task<IActionResult> DeleteProject(long id)
-        {
-
-            var repo = _fsql.GetRepository<Project>();
-
-            repo.DbContextOptions.EnableCascadeSave = true;
-
-            var project = await repo.Select
-                .IncludeMany(p => p.Workspaces, a => a.IncludeMany(b => b.Cards, c => c.IncludeMany(d => d.Nodes)))
-                .IncludeMany(p => p.Workspaces, a => a.IncludeMany(b => b.Links))
-                .Where(p => p.Id == id)
-                .FirstAsync();
-
-            var deleteIds = new List<long>();
-
-            foreach (var workspace in project.Workspaces)
-            {
-                foreach (var node in workspace.Links)
-                {
-                    deleteIds.Add(node.SourceId);
-                    deleteIds.Add(node.TargetId);
-                }
-            }
-            await _fsql.Delete<NodeConnectInfo>().Where(p => deleteIds.Contains(p.Id)).ExecuteAffrowsAsync();
-
-            var ret = await repo.DeleteAsync(project);
-            if (ret > 0)
-                return Ok();
-            return NotFound();
-        }
-        [HttpDelete("DeleteWorkspace/{id}")]
-        public async Task<IActionResult> DeleteWorkspace(long id)
-        {
-            var repo = _fsql.GetRepository<Workspace>();
-
-            repo.DbContextOptions.EnableCascadeSave = true;
-
-            var workspace = await repo.Select
-                .IncludeMany(p => p.Cards, a => a.IncludeMany(b => b.Nodes))
-                .IncludeMany(p => p.Links)
-                .Where(p => p.Id == id)
-                .FirstAsync();
-
-
-            var deleteIds = new List<long>();
-
-            foreach (var node in workspace.Links)
-            {
-                deleteIds.Add(node.SourceId);
-                deleteIds.Add(node.TargetId);
-            }
-            await _fsql.Delete<NodeConnectInfo>().Where(p => deleteIds.Contains(p.Id)).ExecuteAffrowsAsync();
-
-            var ret = await repo.DeleteAsync(workspace);
-            if (ret > 0)
-                return Ok();
-            return NotFound();
-        }
-
-        [HttpDelete("DeleteLink/{id}")]
-        public async Task<IActionResult> DeleteLink(long id)
-        {
-            var repo = _fsql.GetRepository<Link>();
-
-            repo.DbContextOptions.EnableCascadeSave = true;
-
-            var link = await repo.Select.Where(p => p.Id == id).FirstAsync();
-
-
-            var deleteIds = new List<long>
-            {
-                link.SourceId,
-                link.TargetId
-            };
-
-            await _fsql.Delete<NodeConnectInfo>().Where(p => deleteIds.Contains(p.Id)).ExecuteAffrowsAsync();
-
-            var ret = await repo.DeleteAsync(link);
-            if (ret > 0)
-                return Ok();
-            return NotFound();
-        }
-
-        [HttpDelete("DeleteCard/{id}")]
-        public async Task<IActionResult> DeleteCard(long id)
-        {
-            var repo = _fsql.GetRepository<Card>();
-
-            repo.DbContextOptions.EnableCascadeSave = true;
-
-            var card = await repo.Select.IncludeMany(p => p.Nodes).Where(p => p.Id == id).FirstAsync();
-
-            var ret = await repo.DeleteAsync(card);
-            if (ret > 0)
-                return Ok();
-            return NotFound();
-        }
-
-    }
-}
-using FreeSql.DataAnnotations;
-using System.ComponentModel.DataAnnotations;
-using System.Text.RegularExpressions;
-
-namespace Blueprint.Net.Server
-{
-    public class Card
-    {
-        [Column(IsIdentity = true, IsPrimary = true)] public long Id { get; set; }
-        public long WorkspaceId { get; set; }
-        public int X { get; set; }
-        public int Y { get; set; }
-        public string Label { get; set; }
-        public string Type { get; set; }
-        [Navigate(nameof(CardNodeInfo.CardId))] public List<CardNodeInfo> Nodes { get; set; } = [];
-        public List<string> TitleBarColor { get; set; } = [];
-    }
-
-    public class Link
-    {
-        [Column(IsIdentity = true, IsPrimary = true)] public long Id { get; set; }
-        public long WorkspaceId { get; set; }
-
-        [Navigate(nameof(SourceId))] public NodeConnectInfo Source { get; set; }
-
-        [Navigate(nameof(TargetId))] public NodeConnectInfo Target { get; set; }
-
-        public long SourceId { get; set; }
-        public long TargetId { get; set; }
-
-    }
-
-    public class NodeConnectInfo
-    {
-        [Column(IsIdentity = true, IsPrimary = true)] public long Id { get; set; }
-        public string Node { get; set; }
-        public int X { get; set; }
-        public int Y { get; set; }
-        public string Color { get; set; }
-        public string EnumType { get; set; }
-    }
-
-    public class CardNodeInfo
-    {
-        [Column(IsIdentity = true, IsPrimary = true)]  public long Id { get; set; }
-
-        public long CardId { get; set; }
-        public string Type { get; set; }
-        public int Level { get; set; }
-        public string EnumType { get; set; }
-        public string Color { get; set; }
-        public int? MultiConnected { get; set; }
-        public string Slot { get; set; }
-        public string Label { get; set; }
-        public string Value { get; set; }
-    }
-
-
-
-
-
-    public class Project
-    {
-        [Column(IsIdentity = true, IsPrimary = true)] public long Id { get; set; }
-        public string Name { get; set; }
-        [Navigate(nameof(Workspace.ProjectId))] public List<Workspace> Workspaces { get; set; } = [];
-    }
-
-    public class Workspace
-    {
-        [Column(IsIdentity = true, IsPrimary = true)] public long Id { get; set; }
-        public long ProjectId { get; set; }
-        public string Name { get; set; }
-        [Navigate(nameof(Card.WorkspaceId))] public List<Card> Cards { get; set; } = [];
-        [Navigate(nameof(Card.WorkspaceId))] public List<Link> Links { get; set; } = [];
-    }
-
-}
-
-namespace Blueprint.Net.Server
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            var builder = WebApplication.CreateBuilder(args);
-
-            // Add services to the container.
-
-            builder.Services.AddControllers();
-            // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-            builder.Services.AddEndpointsApiExplorer();
-            builder.Services.AddSwaggerGen();
-
-            builder.Services.AddSingleton(new FreeSql.FreeSqlBuilder()
-                .UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=blueprint.db")
-                .UseMonitorCommand(cmd => Console.WriteLine($"Sql：{cmd.CommandText}"))//监听SQL语句
-                .UseAutoSyncStructure(true) //自动同步实体结构到数据库，FreeSql不会扫描程序集，只有CRUD时才会生成表。
-                .Build());
-
-            var app = builder.Build();
-
-            // Configure the HTTP request pipeline.
-            if (app.Environment.IsDevelopment())
-            {
-                app.UseSwagger();
-                app.UseSwaggerUI();
-            }
-
-            app.UseAuthorization();
-
-            app.UseStaticFiles();
-
-            app.MapControllers();
-
-            app.Run();
-        }
-    }
-}
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:19130",
-      "sslPort": 0
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5277",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}
-{
-  "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v8.0",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETCoreApp,Version=v8.0": {
-      "Blueprint.Net.Server/1.0.0": {
-        "dependencies": {
-          "FreeSql": "3.2.821",
-          "FreeSql.Provider.Sqlite": "3.2.821",
-          "FreeSql.Repository": "3.2.821",
-          "Swashbuckle.AspNetCore": "6.4.0"
-        },
-        "runtime": {
-          "Blueprint.Net.Server.dll": {}
-        }
-      },
-      "FreeSql/3.2.821": {
-        "runtime": {
-          "lib/netstandard2.1/FreeSql.dll": {
-            "assemblyVersion": "3.2.821.0",
-            "fileVersion": "3.2.821.0"
-          }
-        },
-        "resources": {
-          "lib/netstandard2.1/zh-Hans/FreeSql.resources.dll": {
-            "locale": "zh-Hans"
-          }
-        }
-      },
-      "FreeSql.DbContext/3.2.821": {
-        "dependencies": {
-          "FreeSql": "3.2.821",
-          "Microsoft.Extensions.DependencyInjection": "8.0.0"
-        },
-        "runtime": {
-          "lib/net8.0/FreeSql.DbContext.dll": {
-            "assemblyVersion": "3.2.821.0",
-            "fileVersion": "3.2.821.0"
-          }
-        },
-        "resources": {
-          "lib/net8.0/zh-Hans/FreeSql.DbContext.resources.dll": {
-            "locale": "zh-Hans"
-          }
-        }
-      },
-      "FreeSql.Provider.Sqlite/3.2.821": {
-        "dependencies": {
-          "FreeSql": "3.2.821",
-          "System.Data.SQLite.Core": "1.0.115.5"
-        },
-        "runtime": {
-          "lib/netstandard2.0/FreeSql.Provider.Sqlite.dll": {
-            "assemblyVersion": "3.2.821.0",
-            "fileVersion": "3.2.821.0"
-          }
-        }
-      },
-      "FreeSql.Repository/3.2.821": {
-        "dependencies": {
-          "FreeSql.DbContext": "3.2.821"
-        },
-        "runtime": {
-          "lib/net8.0/FreeSql.Repository.dll": {
-            "assemblyVersion": "3.2.821.0",
-            "fileVersion": "3.2.821.0"
-          }
-        }
-      },
-      "Microsoft.Extensions.ApiDescription.Server/6.0.5": {},
-      "Microsoft.Extensions.DependencyInjection/8.0.0": {
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.0": {},
-      "Microsoft.OpenApi/1.2.3": {
-        "runtime": {
-          "lib/netstandard2.0/Microsoft.OpenApi.dll": {
-            "assemblyVersion": "1.2.3.0",
-            "fileVersion": "1.2.3.0"
-          }
-        }
-      },
-      "Stub.System.Data.SQLite.Core.NetStandard/1.0.115.5": {
-        "runtime": {
-          "lib/netstandard2.1/System.Data.SQLite.dll": {
-            "assemblyVersion": "1.0.115.5",
-            "fileVersion": "1.0.115.5"
-          }
-        },
-        "runtimeTargets": {
-          "runtimes/linux-x64/native/SQLite.Interop.dll": {
-            "rid": "linux-x64",
-            "assetType": "native",
-            "fileVersion": "0.0.0.0"
-          },
-          "runtimes/osx-x64/native/SQLite.Interop.dll": {
-            "rid": "osx-x64",
-            "assetType": "native",
-            "fileVersion": "0.0.0.0"
-          },
-          "runtimes/win-x64/native/SQLite.Interop.dll": {
-            "rid": "win-x64",
-            "assetType": "native",
-            "fileVersion": "1.0.115.5"
-          },
-          "runtimes/win-x86/native/SQLite.Interop.dll": {
-            "rid": "win-x86",
-            "assetType": "native",
-            "fileVersion": "1.0.115.5"
-          }
-        }
-      },
-      "Swashbuckle.AspNetCore/6.4.0": {
-        "dependencies": {
-          "Microsoft.Extensions.ApiDescription.Server": "6.0.5",
-          "Swashbuckle.AspNetCore.Swagger": "6.4.0",
-          "Swashbuckle.AspNetCore.SwaggerGen": "6.4.0",
-          "Swashbuckle.AspNetCore.SwaggerUI": "6.4.0"
-        }
-      },
-      "Swashbuckle.AspNetCore.Swagger/6.4.0": {
-        "dependencies": {
-          "Microsoft.OpenApi": "1.2.3"
-        },
-        "runtime": {
-          "lib/net6.0/Swashbuckle.AspNetCore.Swagger.dll": {
-            "assemblyVersion": "6.4.0.0",
-            "fileVersion": "6.4.0.0"
-          }
-        }
-      },
-      "Swashbuckle.AspNetCore.SwaggerGen/6.4.0": {
-        "dependencies": {
-          "Swashbuckle.AspNetCore.Swagger": "6.4.0"
-        },
-        "runtime": {
-          "lib/net6.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
-            "assemblyVersion": "6.4.0.0",
-            "fileVersion": "6.4.0.0"
-          }
-        }
-      },
-      "Swashbuckle.AspNetCore.SwaggerUI/6.4.0": {
-        "runtime": {
-          "lib/net6.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
-            "assemblyVersion": "6.4.0.0",
-            "fileVersion": "6.4.0.0"
-          }
-        }
-      },
-      "System.Data.SQLite.Core/1.0.115.5": {
-        "dependencies": {
-          "Stub.System.Data.SQLite.Core.NetStandard": "1.0.115.5"
-        }
-      }
-    }
-  },
-  "libraries": {
-    "Blueprint.Net.Server/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "FreeSql/3.2.821": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-bI/CTioEq4B9k5pqaZnXBSyJCIbHoUUTJGgQJF5osgq7/9kOxZo93hmZr8Vw6n5iFG5chx6wkcn4dnJJUsAEkA==",
-      "path": "freesql/3.2.821",
-      "hashPath": "freesql.3.2.821.nupkg.sha512"
-    },
-    "FreeSql.DbContext/3.2.821": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-wQWjKj7/2Iwzp5WxOE5WV/HmoVmj6fKPYGBxKB7JWxF7HudmXjeZS1Hll2ovQksqF/YujYf7SxGbDv5mU9qSGA==",
-      "path": "freesql.dbcontext/3.2.821",
-      "hashPath": "freesql.dbcontext.3.2.821.nupkg.sha512"
-    },
-    "FreeSql.Provider.Sqlite/3.2.821": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-vBvvq9mDz488XWYeNQSSt8t3FCKquS4DPab7hu7QVRF0ftXRAc6rRK5axFFJZjc5ABU7aIKtu1UiKQky8z/VnA==",
-      "path": "freesql.provider.sqlite/3.2.821",
-      "hashPath": "freesql.provider.sqlite.3.2.821.nupkg.sha512"
-    },
-    "FreeSql.Repository/3.2.821": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-cE/VG103FYXn2m63Xp7heYptPazNN+z+dUm9jZe2vNwV8LUCU3PbY04MD+liyQBCZ5WGCK70Pe4GXGfQzvRMLw==",
-      "path": "freesql.repository/3.2.821",
-      "hashPath": "freesql.repository.3.2.821.nupkg.sha512"
-    },
-    "Microsoft.Extensions.ApiDescription.Server/6.0.5": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-Ckb5EDBUNJdFWyajfXzUIMRkhf52fHZOQuuZg/oiu8y7zDCVwD0iHhew6MnThjHmevanpxL3f5ci2TtHQEN6bw==",
-      "path": "microsoft.extensions.apidescription.server/6.0.5",
-      "hashPath": "microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512"
-    },
-    "Microsoft.Extensions.DependencyInjection/8.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==",
-      "path": "microsoft.extensions.dependencyinjection/8.0.0",
-      "hashPath": "microsoft.extensions.dependencyinjection.8.0.0.nupkg.sha512"
-    },
-    "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==",
-      "path": "microsoft.extensions.dependencyinjection.abstractions/8.0.0",
-      "hashPath": "microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg.sha512"
-    },
-    "Microsoft.OpenApi/1.2.3": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-Nug3rO+7Kl5/SBAadzSMAVgqDlfGjJZ0GenQrLywJ84XGKO0uRqkunz5Wyl0SDwcR71bAATXvSdbdzPrYRYKGw==",
-      "path": "microsoft.openapi/1.2.3",
-      "hashPath": "microsoft.openapi.1.2.3.nupkg.sha512"
-    },
-    "Stub.System.Data.SQLite.Core.NetStandard/1.0.115.5": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-WfrqQg6WL+r4H1sVKTenNj6ERLXUukUxqcjH1rqPqXadeIWccTVpydESieD7cZ/NWQVSKLYIHuoBX5du+BFhIQ==",
-      "path": "stub.system.data.sqlite.core.netstandard/1.0.115.5",
-      "hashPath": "stub.system.data.sqlite.core.netstandard.1.0.115.5.nupkg.sha512"
-    },
-    "Swashbuckle.AspNetCore/6.4.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-eUBr4TW0up6oKDA5Xwkul289uqSMgY0xGN4pnbOIBqCcN9VKGGaPvHX3vWaG/hvocfGDP+MGzMA0bBBKz2fkmQ==",
-      "path": "swashbuckle.aspnetcore/6.4.0",
-      "hashPath": "swashbuckle.aspnetcore.6.4.0.nupkg.sha512"
-    },
-    "Swashbuckle.AspNetCore.Swagger/6.4.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-nl4SBgGM+cmthUcpwO/w1lUjevdDHAqRvfUoe4Xp/Uvuzt9mzGUwyFCqa3ODBAcZYBiFoKvrYwz0rabslJvSmQ==",
-      "path": "swashbuckle.aspnetcore.swagger/6.4.0",
-      "hashPath": "swashbuckle.aspnetcore.swagger.6.4.0.nupkg.sha512"
-    },
-    "Swashbuckle.AspNetCore.SwaggerGen/6.4.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-lXhcUBVqKrPFAQF7e/ZeDfb5PMgE8n5t6L5B6/BQSpiwxgHzmBcx8Msu42zLYFTvR5PIqE9Q9lZvSQAcwCxJjw==",
-      "path": "swashbuckle.aspnetcore.swaggergen/6.4.0",
-      "hashPath": "swashbuckle.aspnetcore.swaggergen.6.4.0.nupkg.sha512"
-    },
-    "Swashbuckle.AspNetCore.SwaggerUI/6.4.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-1Hh3atb3pi8c+v7n4/3N80Jj8RvLOXgWxzix6w3OZhB7zBGRwsy7FWr4e3hwgPweSBpwfElqj4V4nkjYabH9nQ==",
-      "path": "swashbuckle.aspnetcore.swaggerui/6.4.0",
-      "hashPath": "swashbuckle.aspnetcore.swaggerui.6.4.0.nupkg.sha512"
-    },
-    "System.Data.SQLite.Core/1.0.115.5": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-vADIqqgpxaC5xR6qOV8/KMZkQeSDCfmmWpVOtQx0oEr3Yjq2XdTxX7+jfE4+oO2xPovAbYiz6Q5cLRbSsDkq6Q==",
-      "path": "system.data.sqlite.core/1.0.115.5",
-      "hashPath": "system.data.sqlite.core.1.0.115.5.nupkg.sha512"
-    }
-  }
-}
 \ No newline at end of file
-{
-  "runtimeOptions": {
-    "tfm": "net8.0",
-    "frameworks": [
-      {
-        "name": "Microsoft.NETCore.App",
-        "version": "8.0.0"
-      },
-      {
-        "name": "Microsoft.AspNetCore.App",
-        "version": "8.0.0"
-      }
-    ],
-    "configProperties": {
-      "System.GC.Server": true,
-      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
-    }
-  }
-}
 \ No newline at end of file
-{"ContentRoots":["E:\\Code\\Blueprint\\Blueprint.Net.Server\\wwwroot\\"],"Root":{"Children":{"index.html":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"index.html"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}
 \ No newline at end of file
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}
-{
-  "format": 1,
-  "restore": {
-    "E:\\Code\\Blueprint\\Blueprint.Net.Server\\Blueprint.Net.Server.csproj": {}
-  },
-  "projects": {
-    "E:\\Code\\Blueprint\\Blueprint.Net.Server\\Blueprint.Net.Server.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\Blueprint.Net.Server.csproj",
-        "projectName": "Blueprint.Net.Server",
-        "projectPath": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\Blueprint.Net.Server.csproj",
-        "packagesPath": "C:\\Users\\anan\\.nuget\\packages\\",
-        "outputPath": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "C:\\Users\\anan\\AppData\\Roaming\\Godot\\mono\\GodotNuGetFallbackFolder",
-          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\anan\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Users\\anan\\AppData\\Roaming\\NuGet\\config\\Godot.Offline.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net8.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "C:\\Program Files\\dotnet\\library-packs": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net8.0": {
-            "targetAlias": "net8.0",
-            "projectReferences": {}
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        },
-        "restoreAuditProperties": {
-          "enableAudit": "true",
-          "auditLevel": "low",
-          "auditMode": "direct"
-        }
-      },
-      "frameworks": {
-        "net8.0": {
-          "targetAlias": "net8.0",
-          "dependencies": {
-            "FreeSql": {
-              "target": "Package",
-              "version": "[3.2.821, )"
-            },
-            "FreeSql.Provider.Sqlite": {
-              "target": "Package",
-              "version": "[3.2.821, )"
-            },
-            "FreeSql.Repository": {
-              "target": "Package",
-              "version": "[3.2.821, )"
-            },
-            "Swashbuckle.AspNetCore": {
-              "target": "Package",
-              "version": "[6.4.0, )"
-            }
-          },
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.AspNetCore.App": {
-              "privateAssets": "none"
-            },
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.201/PortableRuntimeIdentifierGraph.json"
-        }
-      }
-    }
-  }
-}
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
-    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\anan\.nuget\packages\;C:\Users\anan\AppData\Roaming\Godot\mono\GodotNuGetFallbackFolder;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
-    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.9.1</NuGetToolVersion>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\anan\.nuget\packages\" />
-    <SourceRoot Include="C:\Users\anan\AppData\Roaming\Godot\mono\GodotNuGetFallbackFolder\" />
-    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
-  </ItemGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.props')" />
-    <Import Project="$(NuGetPackageRoot)swashbuckle.aspnetcore\6.4.0\build\Swashbuckle.AspNetCore.props" Condition="Exists('$(NuGetPackageRoot)swashbuckle.aspnetcore\6.4.0\build\Swashbuckle.AspNetCore.props')" />
-  </ImportGroup>
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\anan\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
-  </PropertyGroup>
-</Project>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets')" />
-  </ImportGroup>
-</Project>
 \ No newline at end of file
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")]
-[
-  {
-    "ContainingType": "Blueprint.Net.Server.Controllers.BlueprintController",
-    "Method": "DeleteCard",
-    "RelativePath": "Blueprint/DeleteCard/{id}",
-    "HttpMethod": "DELETE",
-    "IsController": true,
-    "Order": 0,
-    "Parameters": [
-      {
-        "Name": "id",
-        "Type": "System.Int64",
-        "IsRequired": true
-      }
-    ],
-    "ReturnTypes": []
-  },
-  {
-    "ContainingType": "Blueprint.Net.Server.Controllers.BlueprintController",
-    "Method": "DeleteLink",
-    "RelativePath": "Blueprint/DeleteLink/{id}",
-    "HttpMethod": "DELETE",
-    "IsController": true,
-    "Order": 0,
-    "Parameters": [
-      {
-        "Name": "id",
-        "Type": "System.Int64",
-        "IsRequired": true
-      }
-    ],
-    "ReturnTypes": []
-  },
-  {
-    "ContainingType": "Blueprint.Net.Server.Controllers.BlueprintController",
-    "Method": "DeleteProject",
-    "RelativePath": "Blueprint/DeleteProject/{id}",
-    "HttpMethod": "DELETE",
-    "IsController": true,
-    "Order": 0,
-    "Parameters": [
-      {
-        "Name": "id",
-        "Type": "System.Int64",
-        "IsRequired": true
-      }
-    ],
-    "ReturnTypes": []
-  },
-  {
-    "ContainingType": "Blueprint.Net.Server.Controllers.BlueprintController",
-    "Method": "DeleteWorkspace",
-    "RelativePath": "Blueprint/DeleteWorkspace/{id}",
-    "HttpMethod": "DELETE",
-    "IsController": true,
-    "Order": 0,
-    "Parameters": [
-      {
-        "Name": "id",
-        "Type": "System.Int64",
-        "IsRequired": true
-      }
-    ],
-    "ReturnTypes": []
-  },
-  {
-    "ContainingType": "Blueprint.Net.Server.Controllers.BlueprintController",
-    "Method": "GetProjects",
-    "RelativePath": "Blueprint/GetProjects",
-    "HttpMethod": "GET",
-    "IsController": true,
-    "Order": 0,
-    "Parameters": [],
-    "ReturnTypes": [
-      {
-        "Type": "System.Collections.Generic.IEnumerable\u00601[[Blueprint.Net.Server.Project, Blueprint.Net.Server, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]]",
-        "MediaTypes": [
-          "text/plain",
-          "application/json",
-          "text/json"
-        ],
-        "StatusCode": 200
-      }
-    ]
-  },
-  {
-    "ContainingType": "Blueprint.Net.Server.Controllers.BlueprintController",
-    "Method": "Project",
-    "RelativePath": "Blueprint/Project",
-    "HttpMethod": "POST",
-    "IsController": true,
-    "Order": 0,
-    "Parameters": [
-      {
-        "Name": "project",
-        "Type": "Blueprint.Net.Server.Project",
-        "IsRequired": true
-      }
-    ],
-    "ReturnTypes": [
-      {
-        "Type": "Blueprint.Net.Server.Project",
-        "MediaTypes": [
-          "text/plain",
-          "application/json",
-          "text/json"
-        ],
-        "StatusCode": 200
-      }
-    ]
-  }
-]
 \ No newline at end of file
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Reflection;
-
-[assembly: System.Reflection.AssemblyCompanyAttribute("Blueprint.Net.Server")]
-[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
-[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+21310e5f9b84d697cb0feff5b5ab032eedbd8151")]
-[assembly: System.Reflection.AssemblyProductAttribute("Blueprint.Net.Server")]
-[assembly: System.Reflection.AssemblyTitleAttribute("Blueprint.Net.Server")]
-[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
-
-// 由 MSBuild WriteCodeFragment 类生成。
-
-5eddb37dc7a53e4fa87096743c7acd0b6360a57b70e21a4550930a7499bb9c12
-is_global = true
-build_property.TargetFramework = net8.0
-build_property.TargetPlatformMinVersion = 
-build_property.UsingMicrosoftNETSdkWeb = true
-build_property.ProjectTypeGuids = 
-build_property.InvariantGlobalization = 
-build_property.PlatformNeutralAssembly = 
-build_property.EnforceExtendedAnalyzerRules = 
-build_property._SupportedPlatformList = Linux,macOS,Windows
-build_property.RootNamespace = Blueprint.Net.Server
-build_property.RootNamespace = Blueprint.Net.Server
-build_property.ProjectDir = E:\Code\Blueprint\Blueprint.Net.Server\
-build_property.EnableComHosting = 
-build_property.EnableGeneratedComInterfaceComImportInterop = 
-build_property.RazorLangVersion = 8.0
-build_property.SupportLocalizedComponentNames = 
-build_property.GenerateRazorMetadataSourceChecksumAttributes = 
-build_property.MSBuildProjectDirectory = E:\Code\Blueprint\Blueprint.Net.Server
-build_property._RazorSourceGeneratorDebug = 
-// <auto-generated/>
-global using global::Microsoft.AspNetCore.Builder;
-global using global::Microsoft.AspNetCore.Hosting;
-global using global::Microsoft.AspNetCore.Http;
-global using global::Microsoft.AspNetCore.Routing;
-global using global::Microsoft.Extensions.Configuration;
-global using global::Microsoft.Extensions.DependencyInjection;
-global using global::Microsoft.Extensions.Hosting;
-global using global::Microsoft.Extensions.Logging;
-global using global::System;
-global using global::System.Collections.Generic;
-global using global::System.IO;
-global using global::System.Linq;
-global using global::System.Net.Http;
-global using global::System.Net.Http.Json;
-global using global::System.Threading;
-global using global::System.Threading.Tasks;
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Reflection;
-
-[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Swashbuckle.AspNetCore.SwaggerGen")]
-
-// 由 MSBuild WriteCodeFragment 类生成。
-
-e6649176d8592337858ccf92973fd389b3d88f5441cf720c89972060326574ca
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.csproj.AssemblyReference.cache
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.GeneratedMSBuildEditorConfig.editorconfig
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.AssemblyInfoInputs.cache
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.AssemblyInfo.cs
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.csproj.CoreCompileInputs.cache
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.MvcApplicationPartsAssemblyInfo.cs
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.MvcApplicationPartsAssemblyInfo.cache
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.sourcelink.json
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\appsettings.Development.json
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\appsettings.json
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\Blueprint.Net.Server.exe
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\Blueprint.Net.Server.deps.json
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\Blueprint.Net.Server.runtimeconfig.json
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\Blueprint.Net.Server.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\Blueprint.Net.Server.pdb
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\FreeSql.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\FreeSql.Provider.Sqlite.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\Microsoft.OpenApi.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\System.Data.SQLite.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\Swashbuckle.AspNetCore.Swagger.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\Swashbuckle.AspNetCore.SwaggerGen.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\Swashbuckle.AspNetCore.SwaggerUI.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\zh-Hans\FreeSql.resources.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\runtimes\linux-x64\native\SQLite.Interop.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\runtimes\osx-x64\native\SQLite.Interop.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\runtimes\win-x64\native\SQLite.Interop.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\runtimes\win-x86\native\SQLite.Interop.dll
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\staticwebassets.build.json
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\staticwebassets.development.json
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\staticwebassets\msbuild.Blueprint.Net.Server.Microsoft.AspNetCore.StaticWebAssets.props
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\staticwebassets\msbuild.build.Blueprint.Net.Server.props
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\staticwebassets\msbuild.buildMultiTargeting.Blueprint.Net.Server.props
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\staticwebassets\msbuild.buildTransitive.Blueprint.Net.Server.props
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\staticwebassets.pack.json
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\scopedcss\bundle\Blueprint.Net.Server.styles.css
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprin.F6C0E272.Up2Date
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.dll
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\refint\Blueprint.Net.Server.dll
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.pdb
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\Blueprint.Net.Server.genruntimeconfig.cache
-E:\Code\Blueprint\Blueprint.Net.Server\obj\Debug\net8.0\ref\Blueprint.Net.Server.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\FreeSql.DbContext.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\FreeSql.Repository.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\zh-Hans\FreeSql.DbContext.resources.dll
-E:\Code\Blueprint\Blueprint.Net.Server\bin\Debug\net8.0\Blueprint.Net.Server.staticwebassets.runtime.json
-8acfbde84a0808a05ea09472133bf8a326d26f20e0ddb65a94244d389946671b
-{"documents":{"E:\\Code\\Blueprint\\*":"https://raw.githubusercontent.com/anan1213095357/Blueprint/b65316686ddc54c7cc975c98021932eb8cd587e0/*"}}
 \ No newline at end of file
-{
-  "Version": 1,
-  "Hash": "Pejh5880OWDtzUDeaYI0R3uZI5plIRGeOY+LIYo1sp8=",
-  "Source": "Blueprint.Net.Server",
-  "BasePath": "_content/Blueprint.Net.Server",
-  "Mode": "Default",
-  "ManifestType": "Build",
-  "ReferencedProjectsConfiguration": [],
-  "DiscoveryPatterns": [
-    {
-      "Name": "Blueprint.Net.Server\\wwwroot",
-      "Source": "Blueprint.Net.Server",
-      "ContentRoot": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\wwwroot\\",
-      "BasePath": "_content/Blueprint.Net.Server",
-      "Pattern": "**"
-    }
-  ],
-  "Assets": [
-    {
-      "Identity": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\wwwroot\\index.html",
-      "SourceId": "Blueprint.Net.Server",
-      "SourceType": "Discovered",
-      "ContentRoot": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\wwwroot\\",
-      "BasePath": "_content/Blueprint.Net.Server",
-      "RelativePath": "index.html",
-      "AssetKind": "All",
-      "AssetMode": "All",
-      "AssetRole": "Primary",
-      "AssetMergeBehavior": "PreferTarget",
-      "AssetMergeSource": "",
-      "RelatedAsset": "",
-      "AssetTraitName": "",
-      "AssetTraitValue": "",
-      "CopyToOutputDirectory": "Never",
-      "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "wwwroot\\index.html"
-    }
-  ]
-}
 \ No newline at end of file
-{"ContentRoots":["E:\\Code\\Blueprint\\Blueprint.Net.Server\\wwwroot\\"],"Root":{"Children":{"index.html":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"index.html"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}
 \ No newline at end of file
-{
-  "Files": [
-    {
-      "Id": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\wwwroot\\index.html",
-      "PackagePath": "staticwebassets\\index.html"
-    },
-    {
-      "Id": "obj\\Debug\\net8.0\\staticwebassets\\msbuild.Blueprint.Net.Server.Microsoft.AspNetCore.StaticWebAssets.props",
-      "PackagePath": "build\\Microsoft.AspNetCore.StaticWebAssets.props"
-    },
-    {
-      "Id": "obj\\Debug\\net8.0\\staticwebassets\\msbuild.build.Blueprint.Net.Server.props",
-      "PackagePath": "build\\Blueprint.Net.Server.props"
-    },
-    {
-      "Id": "obj\\Debug\\net8.0\\staticwebassets\\msbuild.buildMultiTargeting.Blueprint.Net.Server.props",
-      "PackagePath": "buildMultiTargeting\\Blueprint.Net.Server.props"
-    },
-    {
-      "Id": "obj\\Debug\\net8.0\\staticwebassets\\msbuild.buildTransitive.Blueprint.Net.Server.props",
-      "PackagePath": "buildTransitive\\Blueprint.Net.Server.props"
-    }
-  ],
-  "ElementsToRemove": []
-}
 \ No newline at end of file
-<Project>
-  <ItemGroup>
-    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\index.html))">
-      <SourceType>Package</SourceType>
-      <SourceId>Blueprint.Net.Server</SourceId>
-      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
-      <BasePath>_content/Blueprint.Net.Server</BasePath>
-      <RelativePath>index.html</RelativePath>
-      <AssetKind>All</AssetKind>
-      <AssetMode>All</AssetMode>
-      <AssetRole>Primary</AssetRole>
-      <RelatedAsset></RelatedAsset>
-      <AssetTraitName></AssetTraitName>
-      <AssetTraitValue></AssetTraitValue>
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\index.html))</OriginalItemSpec>
-    </StaticWebAsset>
-  </ItemGroup>
-</Project>
 \ No newline at end of file
-<Project>
-  <Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
-</Project>
 \ No newline at end of file
-<Project>
-  <Import Project="..\build\Blueprint.Net.Server.props" />
-</Project>
 \ No newline at end of file
-<Project>
-  <Import Project="..\buildMultiTargeting\Blueprint.Net.Server.props" />
-</Project>
 \ No newline at end of file
-{
-  "version": 3,
-  "targets": {
-    "net8.0": {
-      "FreeSql/3.2.821": {
-        "type": "package",
-        "compile": {
-          "lib/netstandard2.1/FreeSql.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "runtime": {
-          "lib/netstandard2.1/FreeSql.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "resource": {
-          "lib/netstandard2.1/zh-Hans/FreeSql.resources.dll": {
-            "locale": "zh-Hans"
-          }
-        }
-      },
-      "FreeSql.DbContext/3.2.821": {
-        "type": "package",
-        "dependencies": {
-          "FreeSql": "3.2.821",
-          "Microsoft.Extensions.DependencyInjection": "8.0.0"
-        },
-        "compile": {
-          "lib/net8.0/FreeSql.DbContext.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "runtime": {
-          "lib/net8.0/FreeSql.DbContext.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "resource": {
-          "lib/net8.0/zh-Hans/FreeSql.DbContext.resources.dll": {
-            "locale": "zh-Hans"
-          }
-        }
-      },
-      "FreeSql.Provider.Sqlite/3.2.821": {
-        "type": "package",
-        "dependencies": {
-          "FreeSql": "3.2.821",
-          "System.Data.SQLite.Core": "1.0.115.5"
-        },
-        "compile": {
-          "lib/netstandard2.0/FreeSql.Provider.Sqlite.dll": {
-            "related": ".pdb"
-          }
-        },
-        "runtime": {
-          "lib/netstandard2.0/FreeSql.Provider.Sqlite.dll": {
-            "related": ".pdb"
-          }
-        }
-      },
-      "FreeSql.Repository/3.2.821": {
-        "type": "package",
-        "dependencies": {
-          "FreeSql.DbContext": "3.2.821"
-        },
-        "compile": {
-          "lib/net8.0/FreeSql.Repository.dll": {
-            "related": ".pdb"
-          }
-        },
-        "runtime": {
-          "lib/net8.0/FreeSql.Repository.dll": {
-            "related": ".pdb"
-          }
-        }
-      },
-      "Microsoft.Extensions.ApiDescription.Server/6.0.5": {
-        "type": "package",
-        "build": {
-          "build/Microsoft.Extensions.ApiDescription.Server.props": {},
-          "build/Microsoft.Extensions.ApiDescription.Server.targets": {}
-        },
-        "buildMultiTargeting": {
-          "buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.props": {},
-          "buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.targets": {}
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection/8.0.0": {
-        "type": "package",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
-        },
-        "compile": {
-          "lib/net8.0/Microsoft.Extensions.DependencyInjection.dll": {
-            "related": ".xml"
-          }
-        },
-        "runtime": {
-          "lib/net8.0/Microsoft.Extensions.DependencyInjection.dll": {
-            "related": ".xml"
-          }
-        },
-        "build": {
-          "buildTransitive/net6.0/_._": {}
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.0": {
-        "type": "package",
-        "compile": {
-          "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
-            "related": ".xml"
-          }
-        },
-        "runtime": {
-          "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": {
-            "related": ".xml"
-          }
-        },
-        "build": {
-          "buildTransitive/net6.0/_._": {}
-        }
-      },
-      "Microsoft.OpenApi/1.2.3": {
-        "type": "package",
-        "compile": {
-          "lib/netstandard2.0/Microsoft.OpenApi.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "runtime": {
-          "lib/netstandard2.0/Microsoft.OpenApi.dll": {
-            "related": ".pdb;.xml"
-          }
-        }
-      },
-      "Stub.System.Data.SQLite.Core.NetStandard/1.0.115.5": {
-        "type": "package",
-        "compile": {
-          "lib/netstandard2.1/System.Data.SQLite.dll": {
-            "related": ".dll.altconfig;.xml"
-          }
-        },
-        "runtime": {
-          "lib/netstandard2.1/System.Data.SQLite.dll": {
-            "related": ".dll.altconfig;.xml"
-          }
-        },
-        "runtimeTargets": {
-          "runtimes/linux-x64/native/SQLite.Interop.dll": {
-            "assetType": "native",
-            "rid": "linux-x64"
-          },
-          "runtimes/osx-x64/native/SQLite.Interop.dll": {
-            "assetType": "native",
-            "rid": "osx-x64"
-          },
-          "runtimes/win-x64/native/SQLite.Interop.dll": {
-            "assetType": "native",
-            "rid": "win-x64"
-          },
-          "runtimes/win-x86/native/SQLite.Interop.dll": {
-            "assetType": "native",
-            "rid": "win-x86"
-          }
-        }
-      },
-      "Swashbuckle.AspNetCore/6.4.0": {
-        "type": "package",
-        "dependencies": {
-          "Microsoft.Extensions.ApiDescription.Server": "6.0.5",
-          "Swashbuckle.AspNetCore.Swagger": "6.4.0",
-          "Swashbuckle.AspNetCore.SwaggerGen": "6.4.0",
-          "Swashbuckle.AspNetCore.SwaggerUI": "6.4.0"
-        },
-        "build": {
-          "build/Swashbuckle.AspNetCore.props": {}
-        }
-      },
-      "Swashbuckle.AspNetCore.Swagger/6.4.0": {
-        "type": "package",
-        "dependencies": {
-          "Microsoft.OpenApi": "1.2.3"
-        },
-        "compile": {
-          "lib/net6.0/Swashbuckle.AspNetCore.Swagger.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "runtime": {
-          "lib/net6.0/Swashbuckle.AspNetCore.Swagger.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "frameworkReferences": [
-          "Microsoft.AspNetCore.App"
-        ]
-      },
-      "Swashbuckle.AspNetCore.SwaggerGen/6.4.0": {
-        "type": "package",
-        "dependencies": {
-          "Swashbuckle.AspNetCore.Swagger": "6.4.0"
-        },
-        "compile": {
-          "lib/net6.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "runtime": {
-          "lib/net6.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
-            "related": ".pdb;.xml"
-          }
-        }
-      },
-      "Swashbuckle.AspNetCore.SwaggerUI/6.4.0": {
-        "type": "package",
-        "compile": {
-          "lib/net6.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "runtime": {
-          "lib/net6.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
-            "related": ".pdb;.xml"
-          }
-        },
-        "frameworkReferences": [
-          "Microsoft.AspNetCore.App"
-        ]
-      },
-      "System.Data.SQLite.Core/1.0.115.5": {
-        "type": "package",
-        "dependencies": {
-          "Stub.System.Data.SQLite.Core.NetStandard": "[1.0.115.5]"
-        }
-      }
-    }
-  },
-  "libraries": {
-    "FreeSql/3.2.821": {
-      "sha512": "bI/CTioEq4B9k5pqaZnXBSyJCIbHoUUTJGgQJF5osgq7/9kOxZo93hmZr8Vw6n5iFG5chx6wkcn4dnJJUsAEkA==",
-      "type": "package",
-      "path": "freesql/3.2.821",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "freesql.3.2.821.nupkg.sha512",
-        "freesql.nuspec",
-        "lib/net40/FreeSql.dll",
-        "lib/net40/FreeSql.pdb",
-        "lib/net40/FreeSql.xml",
-        "lib/net40/zh-Hans/FreeSql.resources.dll",
-        "lib/net45/FreeSql.dll",
-        "lib/net45/FreeSql.pdb",
-        "lib/net45/FreeSql.xml",
-        "lib/net45/zh-Hans/FreeSql.resources.dll",
-        "lib/net451/FreeSql.dll",
-        "lib/net451/FreeSql.pdb",
-        "lib/net451/FreeSql.xml",
-        "lib/net451/zh-Hans/FreeSql.resources.dll",
-        "lib/netstandard2.0/FreeSql.dll",
-        "lib/netstandard2.0/FreeSql.pdb",
-        "lib/netstandard2.0/FreeSql.xml",
-        "lib/netstandard2.0/zh-Hans/FreeSql.resources.dll",
-        "lib/netstandard2.1/FreeSql.dll",
-        "lib/netstandard2.1/FreeSql.pdb",
-        "lib/netstandard2.1/FreeSql.xml",
-        "lib/netstandard2.1/zh-Hans/FreeSql.resources.dll",
-        "logo.png",
-        "readme.md"
-      ]
-    },
-    "FreeSql.DbContext/3.2.821": {
-      "sha512": "wQWjKj7/2Iwzp5WxOE5WV/HmoVmj6fKPYGBxKB7JWxF7HudmXjeZS1Hll2ovQksqF/YujYf7SxGbDv5mU9qSGA==",
-      "type": "package",
-      "path": "freesql.dbcontext/3.2.821",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "freesql.dbcontext.3.2.821.nupkg.sha512",
-        "freesql.dbcontext.nuspec",
-        "lib/net40/FreeSql.DbContext.dll",
-        "lib/net40/FreeSql.DbContext.pdb",
-        "lib/net40/FreeSql.DbContext.xml",
-        "lib/net40/zh-Hans/FreeSql.DbContext.resources.dll",
-        "lib/net45/FreeSql.DbContext.dll",
-        "lib/net45/FreeSql.DbContext.pdb",
-        "lib/net45/FreeSql.DbContext.xml",
-        "lib/net45/zh-Hans/FreeSql.DbContext.resources.dll",
-        "lib/net5.0/FreeSql.DbContext.dll",
-        "lib/net5.0/FreeSql.DbContext.pdb",
-        "lib/net5.0/FreeSql.DbContext.xml",
-        "lib/net5.0/zh-Hans/FreeSql.DbContext.resources.dll",
-        "lib/net6.0/FreeSql.DbContext.dll",
-        "lib/net6.0/FreeSql.DbContext.pdb",
-        "lib/net6.0/FreeSql.DbContext.xml",
-        "lib/net6.0/zh-Hans/FreeSql.DbContext.resources.dll",
-        "lib/net7.0/FreeSql.DbContext.dll",
-        "lib/net7.0/FreeSql.DbContext.pdb",
-        "lib/net7.0/FreeSql.DbContext.xml",
-        "lib/net7.0/zh-Hans/FreeSql.DbContext.resources.dll",
-        "lib/net8.0/FreeSql.DbContext.dll",
-        "lib/net8.0/FreeSql.DbContext.pdb",
-        "lib/net8.0/FreeSql.DbContext.xml",
-        "lib/net8.0/zh-Hans/FreeSql.DbContext.resources.dll",
-        "lib/netcoreapp3.1/FreeSql.DbContext.dll",
-        "lib/netcoreapp3.1/FreeSql.DbContext.pdb",
-        "lib/netcoreapp3.1/FreeSql.DbContext.xml",
-        "lib/netcoreapp3.1/zh-Hans/FreeSql.DbContext.resources.dll",
-        "lib/netstandard2.0/FreeSql.DbContext.dll",
-        "lib/netstandard2.0/FreeSql.DbContext.pdb",
-        "lib/netstandard2.0/FreeSql.DbContext.xml",
-        "lib/netstandard2.0/zh-Hans/FreeSql.DbContext.resources.dll",
-        "lib/netstandard2.1/FreeSql.DbContext.dll",
-        "lib/netstandard2.1/FreeSql.DbContext.pdb",
-        "lib/netstandard2.1/FreeSql.DbContext.xml",
-        "lib/netstandard2.1/zh-Hans/FreeSql.DbContext.resources.dll",
-        "logo.png",
-        "readme.md"
-      ]
-    },
-    "FreeSql.Provider.Sqlite/3.2.821": {
-      "sha512": "vBvvq9mDz488XWYeNQSSt8t3FCKquS4DPab7hu7QVRF0ftXRAc6rRK5axFFJZjc5ABU7aIKtu1UiKQky8z/VnA==",
-      "type": "package",
-      "path": "freesql.provider.sqlite/3.2.821",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "freesql.provider.sqlite.3.2.821.nupkg.sha512",
-        "freesql.provider.sqlite.nuspec",
-        "lib/net40/FreeSql.Provider.Sqlite.dll",
-        "lib/net40/FreeSql.Provider.Sqlite.pdb",
-        "lib/net45/FreeSql.Provider.Sqlite.dll",
-        "lib/net45/FreeSql.Provider.Sqlite.pdb",
-        "lib/netstandard2.0/FreeSql.Provider.Sqlite.dll",
-        "lib/netstandard2.0/FreeSql.Provider.Sqlite.pdb",
-        "logo.png",
-        "readme.md"
-      ]
-    },
-    "FreeSql.Repository/3.2.821": {
-      "sha512": "cE/VG103FYXn2m63Xp7heYptPazNN+z+dUm9jZe2vNwV8LUCU3PbY04MD+liyQBCZ5WGCK70Pe4GXGfQzvRMLw==",
-      "type": "package",
-      "path": "freesql.repository/3.2.821",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "freesql.repository.3.2.821.nupkg.sha512",
-        "freesql.repository.nuspec",
-        "lib/net40/FreeSql.Repository.dll",
-        "lib/net40/FreeSql.Repository.pdb",
-        "lib/net45/FreeSql.Repository.dll",
-        "lib/net45/FreeSql.Repository.pdb",
-        "lib/net5.0/FreeSql.Repository.dll",
-        "lib/net5.0/FreeSql.Repository.pdb",
-        "lib/net6.0/FreeSql.Repository.dll",
-        "lib/net6.0/FreeSql.Repository.pdb",
-        "lib/net7.0/FreeSql.Repository.dll",
-        "lib/net7.0/FreeSql.Repository.pdb",
-        "lib/net8.0/FreeSql.Repository.dll",
-        "lib/net8.0/FreeSql.Repository.pdb",
-        "lib/netcoreapp3.1/FreeSql.Repository.dll",
-        "lib/netcoreapp3.1/FreeSql.Repository.pdb",
-        "lib/netstandard2.0/FreeSql.Repository.dll",
-        "lib/netstandard2.0/FreeSql.Repository.pdb",
-        "lib/netstandard2.1/FreeSql.Repository.dll",
-        "lib/netstandard2.1/FreeSql.Repository.pdb",
-        "logo.png",
-        "readme.md"
-      ]
-    },
-    "Microsoft.Extensions.ApiDescription.Server/6.0.5": {
-      "sha512": "Ckb5EDBUNJdFWyajfXzUIMRkhf52fHZOQuuZg/oiu8y7zDCVwD0iHhew6MnThjHmevanpxL3f5ci2TtHQEN6bw==",
-      "type": "package",
-      "path": "microsoft.extensions.apidescription.server/6.0.5",
-      "hasTools": true,
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "Icon.png",
-        "build/Microsoft.Extensions.ApiDescription.Server.props",
-        "build/Microsoft.Extensions.ApiDescription.Server.targets",
-        "buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.props",
-        "buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.targets",
-        "microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512",
-        "microsoft.extensions.apidescription.server.nuspec",
-        "tools/Newtonsoft.Json.dll",
-        "tools/dotnet-getdocument.deps.json",
-        "tools/dotnet-getdocument.dll",
-        "tools/dotnet-getdocument.runtimeconfig.json",
-        "tools/net461-x86/GetDocument.Insider.exe",
-        "tools/net461-x86/GetDocument.Insider.exe.config",
-        "tools/net461-x86/Microsoft.Win32.Primitives.dll",
-        "tools/net461-x86/System.AppContext.dll",
-        "tools/net461-x86/System.Buffers.dll",
-        "tools/net461-x86/System.Collections.Concurrent.dll",
-        "tools/net461-x86/System.Collections.NonGeneric.dll",
-        "tools/net461-x86/System.Collections.Specialized.dll",
-        "tools/net461-x86/System.Collections.dll",
-        "tools/net461-x86/System.ComponentModel.EventBasedAsync.dll",
-        "tools/net461-x86/System.ComponentModel.Primitives.dll",
-        "tools/net461-x86/System.ComponentModel.TypeConverter.dll",
-        "tools/net461-x86/System.ComponentModel.dll",
-        "tools/net461-x86/System.Console.dll",
-        "tools/net461-x86/System.Data.Common.dll",
-        "tools/net461-x86/System.Diagnostics.Contracts.dll",
-        "tools/net461-x86/System.Diagnostics.Debug.dll",
-        "tools/net461-x86/System.Diagnostics.DiagnosticSource.dll",
-        "tools/net461-x86/System.Diagnostics.FileVersionInfo.dll",
-        "tools/net461-x86/System.Diagnostics.Process.dll",
-        "tools/net461-x86/System.Diagnostics.StackTrace.dll",
-        "tools/net461-x86/System.Diagnostics.TextWriterTraceListener.dll",
-        "tools/net461-x86/System.Diagnostics.Tools.dll",
-        "tools/net461-x86/System.Diagnostics.TraceSource.dll",
-        "tools/net461-x86/System.Diagnostics.Tracing.dll",
-        "tools/net461-x86/System.Drawing.Primitives.dll",
-        "tools/net461-x86/System.Dynamic.Runtime.dll",
-        "tools/net461-x86/System.Globalization.Calendars.dll",
-        "tools/net461-x86/System.Globalization.Extensions.dll",
-        "tools/net461-x86/System.Globalization.dll",
-        "tools/net461-x86/System.IO.Compression.ZipFile.dll",
-        "tools/net461-x86/System.IO.Compression.dll",
-        "tools/net461-x86/System.IO.FileSystem.DriveInfo.dll",
-        "tools/net461-x86/System.IO.FileSystem.Primitives.dll",
-        "tools/net461-x86/System.IO.FileSystem.Watcher.dll",
-        "tools/net461-x86/System.IO.FileSystem.dll",
-        "tools/net461-x86/System.IO.IsolatedStorage.dll",
-        "tools/net461-x86/System.IO.MemoryMappedFiles.dll",
-        "tools/net461-x86/System.IO.Pipes.dll",
-        "tools/net461-x86/System.IO.UnmanagedMemoryStream.dll",
-        "tools/net461-x86/System.IO.dll",
-        "tools/net461-x86/System.Linq.Expressions.dll",
-        "tools/net461-x86/System.Linq.Parallel.dll",
-        "tools/net461-x86/System.Linq.Queryable.dll",
-        "tools/net461-x86/System.Linq.dll",
-        "tools/net461-x86/System.Memory.dll",
-        "tools/net461-x86/System.Net.Http.dll",
-        "tools/net461-x86/System.Net.NameResolution.dll",
-        "tools/net461-x86/System.Net.NetworkInformation.dll",
-        "tools/net461-x86/System.Net.Ping.dll",
-        "tools/net461-x86/System.Net.Primitives.dll",
-        "tools/net461-x86/System.Net.Requests.dll",
-        "tools/net461-x86/System.Net.Security.dll",
-        "tools/net461-x86/System.Net.Sockets.dll",
-        "tools/net461-x86/System.Net.WebHeaderCollection.dll",
-        "tools/net461-x86/System.Net.WebSockets.Client.dll",
-        "tools/net461-x86/System.Net.WebSockets.dll",
-        "tools/net461-x86/System.Numerics.Vectors.dll",
-        "tools/net461-x86/System.ObjectModel.dll",
-        "tools/net461-x86/System.Reflection.Extensions.dll",
-        "tools/net461-x86/System.Reflection.Primitives.dll",
-        "tools/net461-x86/System.Reflection.dll",
-        "tools/net461-x86/System.Resources.Reader.dll",
-        "tools/net461-x86/System.Resources.ResourceManager.dll",
-        "tools/net461-x86/System.Resources.Writer.dll",
-        "tools/net461-x86/System.Runtime.CompilerServices.Unsafe.dll",
-        "tools/net461-x86/System.Runtime.CompilerServices.VisualC.dll",
-        "tools/net461-x86/System.Runtime.Extensions.dll",
-        "tools/net461-x86/System.Runtime.Handles.dll",
-        "tools/net461-x86/System.Runtime.InteropServices.RuntimeInformation.dll",
-        "tools/net461-x86/System.Runtime.InteropServices.dll",
-        "tools/net461-x86/System.Runtime.Numerics.dll",
-        "tools/net461-x86/System.Runtime.Serialization.Formatters.dll",
-        "tools/net461-x86/System.Runtime.Serialization.Json.dll",
-        "tools/net461-x86/System.Runtime.Serialization.Primitives.dll",
-        "tools/net461-x86/System.Runtime.Serialization.Xml.dll",
-        "tools/net461-x86/System.Runtime.dll",
-        "tools/net461-x86/System.Security.Claims.dll",
-        "tools/net461-x86/System.Security.Cryptography.Algorithms.dll",
-        "tools/net461-x86/System.Security.Cryptography.Csp.dll",
-        "tools/net461-x86/System.Security.Cryptography.Encoding.dll",
-        "tools/net461-x86/System.Security.Cryptography.Primitives.dll",
-        "tools/net461-x86/System.Security.Cryptography.X509Certificates.dll",
-        "tools/net461-x86/System.Security.Principal.dll",
-        "tools/net461-x86/System.Security.SecureString.dll",
-        "tools/net461-x86/System.Text.Encoding.Extensions.dll",
-        "tools/net461-x86/System.Text.Encoding.dll",
-        "tools/net461-x86/System.Text.RegularExpressions.dll",
-        "tools/net461-x86/System.Threading.Overlapped.dll",
-        "tools/net461-x86/System.Threading.Tasks.Parallel.dll",
-        "tools/net461-x86/System.Threading.Tasks.dll",
-        "tools/net461-x86/System.Threading.Thread.dll",
-        "tools/net461-x86/System.Threading.ThreadPool.dll",
-        "tools/net461-x86/System.Threading.Timer.dll",
-        "tools/net461-x86/System.Threading.dll",
-        "tools/net461-x86/System.ValueTuple.dll",
-        "tools/net461-x86/System.Xml.ReaderWriter.dll",
-        "tools/net461-x86/System.Xml.XDocument.dll",
-        "tools/net461-x86/System.Xml.XPath.XDocument.dll",
-        "tools/net461-x86/System.Xml.XPath.dll",
-        "tools/net461-x86/System.Xml.XmlDocument.dll",
-        "tools/net461-x86/System.Xml.XmlSerializer.dll",
-        "tools/net461-x86/netstandard.dll",
-        "tools/net461/GetDocument.Insider.exe",
-        "tools/net461/GetDocument.Insider.exe.config",
-        "tools/net461/Microsoft.Win32.Primitives.dll",
-        "tools/net461/System.AppContext.dll",
-        "tools/net461/System.Buffers.dll",
-        "tools/net461/System.Collections.Concurrent.dll",
-        "tools/net461/System.Collections.NonGeneric.dll",
-        "tools/net461/System.Collections.Specialized.dll",
-        "tools/net461/System.Collections.dll",
-        "tools/net461/System.ComponentModel.EventBasedAsync.dll",
-        "tools/net461/System.ComponentModel.Primitives.dll",
-        "tools/net461/System.ComponentModel.TypeConverter.dll",
-        "tools/net461/System.ComponentModel.dll",
-        "tools/net461/System.Console.dll",
-        "tools/net461/System.Data.Common.dll",
-        "tools/net461/System.Diagnostics.Contracts.dll",
-        "tools/net461/System.Diagnostics.Debug.dll",
-        "tools/net461/System.Diagnostics.DiagnosticSource.dll",
-        "tools/net461/System.Diagnostics.FileVersionInfo.dll",
-        "tools/net461/System.Diagnostics.Process.dll",
-        "tools/net461/System.Diagnostics.StackTrace.dll",
-        "tools/net461/System.Diagnostics.TextWriterTraceListener.dll",
-        "tools/net461/System.Diagnostics.Tools.dll",
-        "tools/net461/System.Diagnostics.TraceSource.dll",
-        "tools/net461/System.Diagnostics.Tracing.dll",
-        "tools/net461/System.Drawing.Primitives.dll",
-        "tools/net461/System.Dynamic.Runtime.dll",
-        "tools/net461/System.Globalization.Calendars.dll",
-        "tools/net461/System.Globalization.Extensions.dll",
-        "tools/net461/System.Globalization.dll",
-        "tools/net461/System.IO.Compression.ZipFile.dll",
-        "tools/net461/System.IO.Compression.dll",
-        "tools/net461/System.IO.FileSystem.DriveInfo.dll",
-        "tools/net461/System.IO.FileSystem.Primitives.dll",
-        "tools/net461/System.IO.FileSystem.Watcher.dll",
-        "tools/net461/System.IO.FileSystem.dll",
-        "tools/net461/System.IO.IsolatedStorage.dll",
-        "tools/net461/System.IO.MemoryMappedFiles.dll",
-        "tools/net461/System.IO.Pipes.dll",
-        "tools/net461/System.IO.UnmanagedMemoryStream.dll",
-        "tools/net461/System.IO.dll",
-        "tools/net461/System.Linq.Expressions.dll",
-        "tools/net461/System.Linq.Parallel.dll",
-        "tools/net461/System.Linq.Queryable.dll",
-        "tools/net461/System.Linq.dll",
-        "tools/net461/System.Memory.dll",
-        "tools/net461/System.Net.Http.dll",
-        "tools/net461/System.Net.NameResolution.dll",
-        "tools/net461/System.Net.NetworkInformation.dll",
-        "tools/net461/System.Net.Ping.dll",
-        "tools/net461/System.Net.Primitives.dll",
-        "tools/net461/System.Net.Requests.dll",
-        "tools/net461/System.Net.Security.dll",
-        "tools/net461/System.Net.Sockets.dll",
-        "tools/net461/System.Net.WebHeaderCollection.dll",
-        "tools/net461/System.Net.WebSockets.Client.dll",
-        "tools/net461/System.Net.WebSockets.dll",
-        "tools/net461/System.Numerics.Vectors.dll",
-        "tools/net461/System.ObjectModel.dll",
-        "tools/net461/System.Reflection.Extensions.dll",
-        "tools/net461/System.Reflection.Primitives.dll",
-        "tools/net461/System.Reflection.dll",
-        "tools/net461/System.Resources.Reader.dll",
-        "tools/net461/System.Resources.ResourceManager.dll",
-        "tools/net461/System.Resources.Writer.dll",
-        "tools/net461/System.Runtime.CompilerServices.Unsafe.dll",
-        "tools/net461/System.Runtime.CompilerServices.VisualC.dll",
-        "tools/net461/System.Runtime.Extensions.dll",
-        "tools/net461/System.Runtime.Handles.dll",
-        "tools/net461/System.Runtime.InteropServices.RuntimeInformation.dll",
-        "tools/net461/System.Runtime.InteropServices.dll",
-        "tools/net461/System.Runtime.Numerics.dll",
-        "tools/net461/System.Runtime.Serialization.Formatters.dll",
-        "tools/net461/System.Runtime.Serialization.Json.dll",
-        "tools/net461/System.Runtime.Serialization.Primitives.dll",
-        "tools/net461/System.Runtime.Serialization.Xml.dll",
-        "tools/net461/System.Runtime.dll",
-        "tools/net461/System.Security.Claims.dll",
-        "tools/net461/System.Security.Cryptography.Algorithms.dll",
-        "tools/net461/System.Security.Cryptography.Csp.dll",
-        "tools/net461/System.Security.Cryptography.Encoding.dll",
-        "tools/net461/System.Security.Cryptography.Primitives.dll",
-        "tools/net461/System.Security.Cryptography.X509Certificates.dll",
-        "tools/net461/System.Security.Principal.dll",
-        "tools/net461/System.Security.SecureString.dll",
-        "tools/net461/System.Text.Encoding.Extensions.dll",
-        "tools/net461/System.Text.Encoding.dll",
-        "tools/net461/System.Text.RegularExpressions.dll",
-        "tools/net461/System.Threading.Overlapped.dll",
-        "tools/net461/System.Threading.Tasks.Parallel.dll",
-        "tools/net461/System.Threading.Tasks.dll",
-        "tools/net461/System.Threading.Thread.dll",
-        "tools/net461/System.Threading.ThreadPool.dll",
-        "tools/net461/System.Threading.Timer.dll",
-        "tools/net461/System.Threading.dll",
-        "tools/net461/System.ValueTuple.dll",
-        "tools/net461/System.Xml.ReaderWriter.dll",
-        "tools/net461/System.Xml.XDocument.dll",
-        "tools/net461/System.Xml.XPath.XDocument.dll",
-        "tools/net461/System.Xml.XPath.dll",
-        "tools/net461/System.Xml.XmlDocument.dll",
-        "tools/net461/System.Xml.XmlSerializer.dll",
-        "tools/net461/netstandard.dll",
-        "tools/netcoreapp2.1/GetDocument.Insider.deps.json",
-        "tools/netcoreapp2.1/GetDocument.Insider.dll",
-        "tools/netcoreapp2.1/GetDocument.Insider.runtimeconfig.json",
-        "tools/netcoreapp2.1/System.Diagnostics.DiagnosticSource.dll"
-      ]
-    },
-    "Microsoft.Extensions.DependencyInjection/8.0.0": {
-      "sha512": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==",
-      "type": "package",
-      "path": "microsoft.extensions.dependencyinjection/8.0.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "Icon.png",
-        "LICENSE.TXT",
-        "PACKAGE.md",
-        "THIRD-PARTY-NOTICES.TXT",
-        "buildTransitive/net461/Microsoft.Extensions.DependencyInjection.targets",
-        "buildTransitive/net462/_._",
-        "buildTransitive/net6.0/_._",
-        "buildTransitive/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.targets",
-        "lib/net462/Microsoft.Extensions.DependencyInjection.dll",
-        "lib/net462/Microsoft.Extensions.DependencyInjection.xml",
-        "lib/net6.0/Microsoft.Extensions.DependencyInjection.dll",
-        "lib/net6.0/Microsoft.Extensions.DependencyInjection.xml",
-        "lib/net7.0/Microsoft.Extensions.DependencyInjection.dll",
-        "lib/net7.0/Microsoft.Extensions.DependencyInjection.xml",
-        "lib/net8.0/Microsoft.Extensions.DependencyInjection.dll",
-        "lib/net8.0/Microsoft.Extensions.DependencyInjection.xml",
-        "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.dll",
-        "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.xml",
-        "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.dll",
-        "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.xml",
-        "microsoft.extensions.dependencyinjection.8.0.0.nupkg.sha512",
-        "microsoft.extensions.dependencyinjection.nuspec",
-        "useSharedDesignerContext.txt"
-      ]
-    },
-    "Microsoft.Extensions.DependencyInjection.Abstractions/8.0.0": {
-      "sha512": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==",
-      "type": "package",
-      "path": "microsoft.extensions.dependencyinjection.abstractions/8.0.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "Icon.png",
-        "LICENSE.TXT",
-        "PACKAGE.md",
-        "THIRD-PARTY-NOTICES.TXT",
-        "buildTransitive/net461/Microsoft.Extensions.DependencyInjection.Abstractions.targets",
-        "buildTransitive/net462/_._",
-        "buildTransitive/net6.0/_._",
-        "buildTransitive/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.Abstractions.targets",
-        "lib/net462/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
-        "lib/net462/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
-        "lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
-        "lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
-        "lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
-        "lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
-        "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
-        "lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
-        "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
-        "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
-        "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.dll",
-        "lib/netstandard2.1/Microsoft.Extensions.DependencyInjection.Abstractions.xml",
-        "microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg.sha512",
-        "microsoft.extensions.dependencyinjection.abstractions.nuspec",
-        "useSharedDesignerContext.txt"
-      ]
-    },
-    "Microsoft.OpenApi/1.2.3": {
-      "sha512": "Nug3rO+7Kl5/SBAadzSMAVgqDlfGjJZ0GenQrLywJ84XGKO0uRqkunz5Wyl0SDwcR71bAATXvSdbdzPrYRYKGw==",
-      "type": "package",
-      "path": "microsoft.openapi/1.2.3",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "lib/net46/Microsoft.OpenApi.dll",
-        "lib/net46/Microsoft.OpenApi.pdb",
-        "lib/net46/Microsoft.OpenApi.xml",
-        "lib/netstandard2.0/Microsoft.OpenApi.dll",
-        "lib/netstandard2.0/Microsoft.OpenApi.pdb",
-        "lib/netstandard2.0/Microsoft.OpenApi.xml",
-        "microsoft.openapi.1.2.3.nupkg.sha512",
-        "microsoft.openapi.nuspec"
-      ]
-    },
-    "Stub.System.Data.SQLite.Core.NetStandard/1.0.115.5": {
-      "sha512": "WfrqQg6WL+r4H1sVKTenNj6ERLXUukUxqcjH1rqPqXadeIWccTVpydESieD7cZ/NWQVSKLYIHuoBX5du+BFhIQ==",
-      "type": "package",
-      "path": "stub.system.data.sqlite.core.netstandard/1.0.115.5",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "lib/netstandard2.0/System.Data.SQLite.dll",
-        "lib/netstandard2.0/System.Data.SQLite.dll.altconfig",
-        "lib/netstandard2.0/System.Data.SQLite.xml",
-        "lib/netstandard2.1/System.Data.SQLite.dll",
-        "lib/netstandard2.1/System.Data.SQLite.dll.altconfig",
-        "lib/netstandard2.1/System.Data.SQLite.xml",
-        "runtimes/linux-x64/native/SQLite.Interop.dll",
-        "runtimes/osx-x64/native/SQLite.Interop.dll",
-        "runtimes/win-x64/native/SQLite.Interop.dll",
-        "runtimes/win-x86/native/SQLite.Interop.dll",
-        "stub.system.data.sqlite.core.netstandard.1.0.115.5.nupkg.sha512",
-        "stub.system.data.sqlite.core.netstandard.nuspec"
-      ]
-    },
-    "Swashbuckle.AspNetCore/6.4.0": {
-      "sha512": "eUBr4TW0up6oKDA5Xwkul289uqSMgY0xGN4pnbOIBqCcN9VKGGaPvHX3vWaG/hvocfGDP+MGzMA0bBBKz2fkmQ==",
-      "type": "package",
-      "path": "swashbuckle.aspnetcore/6.4.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "build/Swashbuckle.AspNetCore.props",
-        "swashbuckle.aspnetcore.6.4.0.nupkg.sha512",
-        "swashbuckle.aspnetcore.nuspec"
-      ]
-    },
-    "Swashbuckle.AspNetCore.Swagger/6.4.0": {
-      "sha512": "nl4SBgGM+cmthUcpwO/w1lUjevdDHAqRvfUoe4Xp/Uvuzt9mzGUwyFCqa3ODBAcZYBiFoKvrYwz0rabslJvSmQ==",
-      "type": "package",
-      "path": "swashbuckle.aspnetcore.swagger/6.4.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll",
-        "lib/net5.0/Swashbuckle.AspNetCore.Swagger.pdb",
-        "lib/net5.0/Swashbuckle.AspNetCore.Swagger.xml",
-        "lib/net6.0/Swashbuckle.AspNetCore.Swagger.dll",
-        "lib/net6.0/Swashbuckle.AspNetCore.Swagger.pdb",
-        "lib/net6.0/Swashbuckle.AspNetCore.Swagger.xml",
-        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll",
-        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.pdb",
-        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.xml",
-        "lib/netstandard2.0/Swashbuckle.AspNetCore.Swagger.dll",
-        "lib/netstandard2.0/Swashbuckle.AspNetCore.Swagger.pdb",
-        "lib/netstandard2.0/Swashbuckle.AspNetCore.Swagger.xml",
-        "swashbuckle.aspnetcore.swagger.6.4.0.nupkg.sha512",
-        "swashbuckle.aspnetcore.swagger.nuspec"
-      ]
-    },
-    "Swashbuckle.AspNetCore.SwaggerGen/6.4.0": {
-      "sha512": "lXhcUBVqKrPFAQF7e/ZeDfb5PMgE8n5t6L5B6/BQSpiwxgHzmBcx8Msu42zLYFTvR5PIqE9Q9lZvSQAcwCxJjw==",
-      "type": "package",
-      "path": "swashbuckle.aspnetcore.swaggergen/6.4.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll",
-        "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.pdb",
-        "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.xml",
-        "lib/net6.0/Swashbuckle.AspNetCore.SwaggerGen.dll",
-        "lib/net6.0/Swashbuckle.AspNetCore.SwaggerGen.pdb",
-        "lib/net6.0/Swashbuckle.AspNetCore.SwaggerGen.xml",
-        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll",
-        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.pdb",
-        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.xml",
-        "lib/netstandard2.0/Swashbuckle.AspNetCore.SwaggerGen.dll",
-        "lib/netstandard2.0/Swashbuckle.AspNetCore.SwaggerGen.pdb",
-        "lib/netstandard2.0/Swashbuckle.AspNetCore.SwaggerGen.xml",
-        "swashbuckle.aspnetcore.swaggergen.6.4.0.nupkg.sha512",
-        "swashbuckle.aspnetcore.swaggergen.nuspec"
-      ]
-    },
-    "Swashbuckle.AspNetCore.SwaggerUI/6.4.0": {
-      "sha512": "1Hh3atb3pi8c+v7n4/3N80Jj8RvLOXgWxzix6w3OZhB7zBGRwsy7FWr4e3hwgPweSBpwfElqj4V4nkjYabH9nQ==",
-      "type": "package",
-      "path": "swashbuckle.aspnetcore.swaggerui/6.4.0",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "lib/net5.0/Swashbuckle.AspNetCore.SwaggerUI.dll",
-        "lib/net5.0/Swashbuckle.AspNetCore.SwaggerUI.pdb",
-        "lib/net5.0/Swashbuckle.AspNetCore.SwaggerUI.xml",
-        "lib/net6.0/Swashbuckle.AspNetCore.SwaggerUI.dll",
-        "lib/net6.0/Swashbuckle.AspNetCore.SwaggerUI.pdb",
-        "lib/net6.0/Swashbuckle.AspNetCore.SwaggerUI.xml",
-        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll",
-        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.pdb",
-        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.xml",
-        "lib/netstandard2.0/Swashbuckle.AspNetCore.SwaggerUI.dll",
-        "lib/netstandard2.0/Swashbuckle.AspNetCore.SwaggerUI.pdb",
-        "lib/netstandard2.0/Swashbuckle.AspNetCore.SwaggerUI.xml",
-        "swashbuckle.aspnetcore.swaggerui.6.4.0.nupkg.sha512",
-        "swashbuckle.aspnetcore.swaggerui.nuspec"
-      ]
-    },
-    "System.Data.SQLite.Core/1.0.115.5": {
-      "sha512": "vADIqqgpxaC5xR6qOV8/KMZkQeSDCfmmWpVOtQx0oEr3Yjq2XdTxX7+jfE4+oO2xPovAbYiz6Q5cLRbSsDkq6Q==",
-      "type": "package",
-      "path": "system.data.sqlite.core/1.0.115.5",
-      "files": [
-        ".nupkg.metadata",
-        ".signature.p7s",
-        "system.data.sqlite.core.1.0.115.5.nupkg.sha512",
-        "system.data.sqlite.core.nuspec"
-      ]
-    }
-  },
-  "projectFileDependencyGroups": {
-    "net8.0": [
-      "FreeSql >= 3.2.821",
-      "FreeSql.Provider.Sqlite >= 3.2.821",
-      "FreeSql.Repository >= 3.2.821",
-      "Swashbuckle.AspNetCore >= 6.4.0"
-    ]
-  },
-  "packageFolders": {
-    "C:\\Users\\anan\\.nuget\\packages\\": {},
-    "C:\\Users\\anan\\AppData\\Roaming\\Godot\\mono\\GodotNuGetFallbackFolder": {},
-    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
-  },
-  "project": {
-    "version": "1.0.0",
-    "restore": {
-      "projectUniqueName": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\Blueprint.Net.Server.csproj",
-      "projectName": "Blueprint.Net.Server",
-      "projectPath": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\Blueprint.Net.Server.csproj",
-      "packagesPath": "C:\\Users\\anan\\.nuget\\packages\\",
-      "outputPath": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\obj\\",
-      "projectStyle": "PackageReference",
-      "fallbackFolders": [
-        "C:\\Users\\anan\\AppData\\Roaming\\Godot\\mono\\GodotNuGetFallbackFolder",
-        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-      ],
-      "configFilePaths": [
-        "C:\\Users\\anan\\AppData\\Roaming\\NuGet\\NuGet.Config",
-        "C:\\Users\\anan\\AppData\\Roaming\\NuGet\\config\\Godot.Offline.Config",
-        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-      ],
-      "originalTargetFrameworks": [
-        "net8.0"
-      ],
-      "sources": {
-        "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-        "C:\\Program Files\\dotnet\\library-packs": {},
-        "https://api.nuget.org/v3/index.json": {}
-      },
-      "frameworks": {
-        "net8.0": {
-          "targetAlias": "net8.0",
-          "projectReferences": {}
-        }
-      },
-      "warningProperties": {
-        "warnAsError": [
-          "NU1605"
-        ]
-      },
-      "restoreAuditProperties": {
-        "enableAudit": "true",
-        "auditLevel": "low",
-        "auditMode": "direct"
-      }
-    },
-    "frameworks": {
-      "net8.0": {
-        "targetAlias": "net8.0",
-        "dependencies": {
-          "FreeSql": {
-            "target": "Package",
-            "version": "[3.2.821, )"
-          },
-          "FreeSql.Provider.Sqlite": {
-            "target": "Package",
-            "version": "[3.2.821, )"
-          },
-          "FreeSql.Repository": {
-            "target": "Package",
-            "version": "[3.2.821, )"
-          },
-          "Swashbuckle.AspNetCore": {
-            "target": "Package",
-            "version": "[6.4.0, )"
-          }
-        },
-        "imports": [
-          "net461",
-          "net462",
-          "net47",
-          "net471",
-          "net472",
-          "net48",
-          "net481"
-        ],
-        "assetTargetFallback": true,
-        "warn": true,
-        "frameworkReferences": {
-          "Microsoft.AspNetCore.App": {
-            "privateAssets": "none"
-          },
-          "Microsoft.NETCore.App": {
-            "privateAssets": "all"
-          }
-        },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.201/PortableRuntimeIdentifierGraph.json"
-      }
-    }
-  }
-}
 \ No newline at end of file
-{
-  "version": 2,
-  "dgSpecHash": "DA7OQW1R/bNe9e6/SrjHTvIq5zA0jn0hwqi81cixrmZ4iGKP5aTwTMcL2WpK4pbrz1wFsABnWSUlUdTKp7LCLw==",
-  "success": true,
-  "projectFilePath": "E:\\Code\\Blueprint\\Blueprint.Net.Server\\Blueprint.Net.Server.csproj",
-  "expectedPackageFiles": [
-    "C:\\Users\\anan\\.nuget\\packages\\freesql\\3.2.821\\freesql.3.2.821.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\freesql.dbcontext\\3.2.821\\freesql.dbcontext.3.2.821.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\freesql.provider.sqlite\\3.2.821\\freesql.provider.sqlite.3.2.821.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\freesql.repository\\3.2.821\\freesql.repository.3.2.821.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\microsoft.extensions.apidescription.server\\6.0.5\\microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\8.0.0\\microsoft.extensions.dependencyinjection.8.0.0.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\8.0.0\\microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\stub.system.data.sqlite.core.netstandard\\1.0.115.5\\stub.system.data.sqlite.core.netstandard.1.0.115.5.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\swashbuckle.aspnetcore\\6.4.0\\swashbuckle.aspnetcore.6.4.0.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.4.0\\swashbuckle.aspnetcore.swagger.6.4.0.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\6.4.0\\swashbuckle.aspnetcore.swaggergen.6.4.0.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.4.0\\swashbuckle.aspnetcore.swaggerui.6.4.0.nupkg.sha512",
-    "C:\\Users\\anan\\.nuget\\packages\\system.data.sqlite.core\\1.0.115.5\\system.data.sqlite.core.1.0.115.5.nupkg.sha512"
-  ],
-  "logs": []
-}
 \ No newline at end of file
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Card Editor</title>
-
-
-
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-        }
-
-        .container {
-            max-width: 800px;
-            margin: auto;
-            padding: 20px;
-        }
-
-        .json-output {
-            background-color: #f4f4f4;
-            border: 1px solid #ddd;
-            padding: 10px;
-            margin-top: 20px;
-        }
-
-        input, select, button {
-            padding: 8px;
-            margin-top: 5px;
-            width: 100%;
-        }
-
-        button {
-            cursor: pointer;
-        }
-
-        svg {
-            background-color: #333;
-            border: 1px solid #ccc;
-            padding: 30px;
-        }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <h1>Card Editor</h1>
-        <form id="cardForm">
-            <label for="id">Card ID:</label>
-            <input type="text" id="id" name="id" required>
-
-            <label for="label">Label:</label>
-            <input type="text" id="label" name="label" required>
-
-            <label for="type">Type:</label>
-            <input type="text" id="type" name="type" required>
-
-            <label for="titleBarColor">Title Bar Color (comma-separated):</label>
-            <input type="text" id="titleBarColor" name="titleBarColor" required>
-
-            <h3>Nodes</h3>
-            <div id="nodesContainer">
-                <!-- Node inputs will be added here -->
-            </div>
-            <button type="button" onclick="addNode()">Add Node</button>
-            <button type="submit">Update Card JSON</button>
-        </form>
-
-        <div class="json-output" id="jsonOutput"></div>
-
-        <!-- SVG container for drawing the card -->
-        <svg id="svgContainer" width="200" height="300"></svg>
-    </div>
-
-    <script  type="text/javascript">
-        var card = {
-            id: 'card0',
-            x: 0,
-            y: 0,
-            label: 'Start',
-            type: "start",
-            nodes: [{
-                type: "out",
-                level: 0,
-                label: 'call',
-                enumType: 'call',
-                color: '#fff',
-                multiConnected: 1
-            }],
-            titleBarColor: ['#84fab0', '#8fd3f4']
-        };
-
-        function updateForm() {
-            document.getElementById('id').value = card.id;
-            document.getElementById('label').value = card.label;
-            document.getElementById('type').value = card.type;
-            document.getElementById('titleBarColor').value = card.titleBarColor.join(', ');
-
-            const nodesContainer = document.getElementById('nodesContainer');
-            nodesContainer.innerHTML = '';
-            card.nodes.forEach((node, index) => {
-                addNode(node, index);
-            });
-        }
-
-        function addNode(node = {}, index = card.nodes.length) {
-            const container = document.createElement('div');
-            container.innerHTML = `
-                <label>Node ${index + 1}</label>
-                <select name="nodeType-${index}">
-                    <option value="in" ${node.type === 'in' ? 'selected' : ''}>In</option>
-                    <option value="out" ${node.type === 'out' ? 'selected' : ''}>Out</option>
-                </select>
-                <input type="number" placeholder="Level" value="${node.level || 0}" name="nodeLevel-${index}">
-                <input type="text" placeholder="Enum Type" value="${node.enumType || ''}" name="nodeEnumType-${index}">
-                <input type="text" placeholder="Label" value="${node.label || ''}" name="nodeLabel-${index}">
-                <input type="text" placeholder="Color" value="${node.color || ''}" name="nodeColor-${index}">
-                <input type="number" placeholder="Multi Connected" value="${node.multiConnected || 0}" name="nodeMultiConnected-${index}">
-                <button type="button" onclick="removeNode(${index})">Remove Node</button>
-            `;
-            document.getElementById('nodesContainer').appendChild(container);
-        }
-
-        function removeNode(index) {
-            card.nodes.splice(index, 1);
-            updateForm(); // Refresh the form and JSON output
-            drawCard();
-        }
-
-        document.getElementById('cardForm').onsubmit = function (event) {
-            event.preventDefault();
-            card.id = document.getElementById('id').value;
-            card.label = document.getElementById('label').value;
-            card.type = document.getElementById('type').value;
-            card.titleBarColor = document.getElementById('titleBarColor').value.split(',').map(color => color.trim());
-
-            card.nodes = [];
-            const nodes = document.querySelectorAll('#nodesContainer > div');
-            nodes.forEach((node, index) => {
-                card.nodes.push({
-                    type: document.querySelector(`[name="nodeType-${index}"]`).value,
-                    level: parseInt(document.querySelector(`[name="nodeLevel-${index}"]`).value),
-                    enumType: document.querySelector(`[name="nodeEnumType-${index}"]`).value,
-                    label: document.querySelector(`[name="nodeLabel-${index}"]`).value,
-                    color: document.querySelector(`[name="nodeColor-${index}"]`).value,
-                    multiConnected: parseInt(document.querySelector(`[name="nodeMultiConnected-${index}"]`).value)
-                });
-            });
-
-            updateJSONOutput();
-            drawCard();
-        };
-
-        function updateJSONOutput() {
-            document.getElementById('jsonOutput').textContent = JSON.stringify(card, null, 2);
-        }
-
-        function drawCard() {
-            const cardsContainer = document.getElementById('svgContainer');
-            cardsContainer.innerHTML = ''; // 清除现有的卡片
-
-            //创建标题栏渐变色
-            const defs = document.createElementNS('http://www.w3.org/2000/svg', 'defs');
-            const linearGradient = document.createElementNS('http://www.w3.org/2000/svg', 'linearGradient');
-            linearGradient.setAttribute('id', `titleGradient-${card.id}`);
-            linearGradient.setAttribute('x1', '0%'); // 渐变起点的x坐标
-            linearGradient.setAttribute('y1', '100%'); // 渐变起点的y坐标
-            linearGradient.setAttribute('x2', '100%'); // 渐变终点的x坐标
-            linearGradient.setAttribute('y2', '0%'); // 渐变终点的y坐标
-
-            const stop1 = document.createElementNS('http://www.w3.org/2000/svg', 'stop');
-            stop1.setAttribute('offset', '10%');
-            stop1.setAttribute('style', `stop-color: ${card.titleBarColor[0]}; stop-opacity: 1`);
-            linearGradient.appendChild(stop1);
-
-            const stop2 = document.createElementNS('http://www.w3.org/2000/svg', 'stop');
-            stop2.setAttribute('offset', '100%');
-            stop2.setAttribute('style', `stop-color: ${card.titleBarColor[1]}; stop-opacity: 1`);
-            linearGradient.appendChild(stop2);
-
-            defs.appendChild(linearGradient);
-            cardsContainer.appendChild(defs);
-
-
-
-            const nodeSpacing = 50;
-            const topBottomPadding = 20;
-            const titleBarHeight = 30; // 标题栏高度
-            const maxLevel = Math.max(...card.nodes.map(node => node.level)) + 1;
-            const cardHeight = maxLevel * nodeSpacing + topBottomPadding * 2 + titleBarHeight;
-
-            const group = document.createElementNS('http://www.w3.org/2000/svg', 'g');
-            group.setAttribute('class', 'draggable card-container');
-            group.setAttribute('data-id', card.id);
-            group.setAttribute('user-select', 'none');
-            group.setAttribute('transform', `translate(${card.x},${card.y})`);
-
-            const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-            rect.setAttribute('fill', '#222');
-            rect.setAttribute('width', 150);
-            rect.setAttribute('style', 'cursor: auto;');
-            rect.setAttribute('height', cardHeight);
-            rect.setAttribute('rx', 10); // 圆角
-            rect.setAttribute('ry', 10);
-            group.appendChild(rect);
-
-            // 使用path绘制带有指定圆角的矩形
-            // 创建标题栏
-            const titleBarWidth = 150;
-            const borderRadius = 10; // 圆角大小
-            const titleBar = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-            const dValue = `M 0,${borderRadius}
-                a ${borderRadius},${borderRadius} 0 0 1 ${borderRadius},-${borderRadius}
-                h ${titleBarWidth - borderRadius * 2}
-                a ${borderRadius},${borderRadius} 0 0 1 ${borderRadius},${borderRadius}
-                v ${titleBarHeight - borderRadius}
-                h -${titleBarWidth}
-                z`;
-            titleBar.setAttribute('class', 'card');
-            titleBar.setAttribute('d', dValue);
-            titleBar.setAttribute('fill', `url(#titleGradient-${card.id})`);
-            group.appendChild(titleBar);
-
-            const text = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-            text.setAttribute('x', titleBarWidth / 2);
-            text.setAttribute('y', titleBarHeight / 2);
-            text.setAttribute('text-anchor', 'middle');
-            text.setAttribute('alignment-baseline', 'middle');
-            text.textContent = card.label;
-            group.appendChild(text);
-
-            card.nodes.forEach((node, index) => {
-
-
-                const circle = document.createElementNS('http://www.w3.org/2000/svg', 'circle');
-                circle.setAttribute('class', 'node');
-                circle.setAttribute('cx', node.type === 'in' ? 0 : 150);
-                circle.setAttribute('cy', topBottomPadding + titleBarHeight + (node.level + 1) *
-                    nodeSpacing - (nodeSpacing / 2));
-                circle.setAttribute('r', 7);
-                circle.setAttribute('fill', node.color);
-                circle.setAttribute('data-card-id', card.id);
-                circle.setAttribute('data-node-id', `${card.id}-node${index + 1}`);
-                group.appendChild(circle);
-
-                let labelX = node.type === 'in' ? 12 : 138; // 基本的X坐标
-                const labelY = topBottomPadding + titleBarHeight + node.level * nodeSpacing + 21;
-
-                // 创建SVG文本元素
-                const multiConnectedLabel = document.createElementNS('http://www.w3.org/2000/svg',
-                    'text');
-                multiConnectedLabel.setAttribute('x', labelX);
-                multiConnectedLabel.setAttribute('y', labelY);
-                multiConnectedLabel.setAttribute('text-anchor', 'middle');
-                multiConnectedLabel.setAttribute('fill', '#aaa');
-                multiConnectedLabel.setAttribute('style', 'font-size: 8px;');
-                multiConnectedLabel.setAttribute('alignment-baseline', 'hanging');
-
-
-                // 计算文本的宽度（假定的，因为SVG没有直接获取文本宽度的方法）
-                let estimatedTextLength;
-                if (node.multiConnected == undefined) {
-                    estimatedTextLength = 20
-                    multiConnectedLabel.textContent = 'N';
-                } else {
-                    estimatedTextLength = node.multiConnected.length;
-                    multiConnectedLabel.textContent = node.multiConnected;
-                }
-
-                // 确保文本不会超出卡片右边界
-                if (labelX + estimatedTextLength / 2 > 150) {
-                    labelX = 150 - estimatedTextLength / 2;
-                    nodeLabel.setAttribute('x', labelX);
-                }
-
-                // 确保文本不会超出卡片左边界
-                if (labelX - estimatedTextLength / 2 < 0) {
-                    labelX = estimatedTextLength / 2;
-                    nodeLabel.setAttribute('x', labelX);
-                }
-
-                group.appendChild(multiConnectedLabel);
-
-                if (node.label != undefined) {
-                    // 计算文本标签的位置
-                    let labelX = node.type === 'in' ? 15 : 135; // 基本的X坐标
-                    const labelY = topBottomPadding + titleBarHeight + node.level * nodeSpacing + 40;
-
-                    // 创建SVG文本元素
-                    const nodeLabel = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-                    nodeLabel.setAttribute('x', labelX);
-                    nodeLabel.setAttribute('y', labelY); // 在节点下方留出一定空间
-                    nodeLabel.setAttribute('text-anchor', 'middle'); // 文本居中对齐
-                    nodeLabel.setAttribute('fill', '#aaa'); // 文本居中对齐
-                    nodeLabel.setAttribute('alignment-baseline', 'hanging');
-                    nodeLabel.textContent = node.label;
-
-                    // 计算文本的宽度（假定的，因为SVG没有直接获取文本宽度的方法）
-                    const estimatedTextLength = node.label.length * 10; // 估算每个字符6像素宽
-
-                    // 确保文本不会超出卡片右边界
-                    if (labelX + estimatedTextLength / 2 > 150) {
-                        labelX = 150 - estimatedTextLength / 2;
-                        nodeLabel.setAttribute('x', labelX);
-                    }
-
-                    // 确保文本不会超出卡片左边界
-                    if (labelX - estimatedTextLength / 2 < 0) {
-                        labelX = estimatedTextLength / 2;
-                        nodeLabel.setAttribute('x', labelX);
-                    }
-
-                    group.appendChild(nodeLabel);
-
-                }
-
-                switch (node.slot) {
-                    case 'input':
-                        const foreignObject = document.createElementNS('http://www.w3.org/2000/svg',
-                            'foreignObject');
-                        foreignObject.setAttribute('x', 0);
-                        foreignObject.setAttribute('y', topBottomPadding + titleBarHeight + node.level *
-                            nodeSpacing + 12);
-                        foreignObject.setAttribute('width', 130); // 保持原始宽度
-                        foreignObject.setAttribute('height', nodeSpacing - 24); // 保持原始高度，减去的24像素为上下内边距之和
-                        const input = document.createElement('input');
-                        input.type = 'text';
-                        if (node.value == undefined) {
-                            node.value = '';
-                        }
-                        input.value = node.value;
-                        input.addEventListener('input', function () {
-                            node.value = input.value;
-                        });
-                        // Set adjusted input styles
-                        input.style.width = '110px';
-                        input.style.height = '100%';
-                        input.style.marginLeft = '20px';
-                        input.style.borderRadius = '5px';
-                        input.style.border = '1px solid white';
-                        input.style.backgroundColor = '#222';
-                        input.style.color = 'white';
-                        input.style.fontSize = '1em';
-                        input.style.padding = '0px'; // 可能需要调整或去除内边距以适应固定尺寸
-                        input.style.boxSizing = 'border-box'; // 确保宽高包含内容、内边距和边框
-
-                        // Change border color on focus and blur
-                        input.addEventListener('focus', () => {
-                            input.style.outline = 'none'; // Remove default focus outline
-                            input.style.borderColor =
-                                'white'; // Keep border color white on focus
-                        });
-
-                        input.addEventListener('blur', () => {
-                            input.style.borderColor =
-                                'white'; // Revert to white when not focused
-                        });
-
-                        // 阻止事件冒泡
-                        input.addEventListener('click', function (event) {
-                            event.stopPropagation();
-                        });
-
-                        input.addEventListener('mousedown', function (event) {
-                            event.stopPropagation();
-                        });
-
-                        input.addEventListener('touchstart', function (event) {
-                            event.stopPropagation();
-                        });
-
-                        foreignObject.appendChild(input);
-                        group.appendChild(foreignObject);
-                        break;
-                }
-
-
-
-            });
-
-            const deleteIcon = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-            deleteIcon.setAttribute('class', 'card-delete-icon');
-            deleteIcon.setAttribute('x', 125);
-            deleteIcon.setAttribute('y', 5); // 使其贴近标题栏的右上角
-            deleteIcon.setAttribute('width', 20);
-            deleteIcon.setAttribute('height', 20);
-            deleteIcon.setAttribute('fill', 'transparent');
-            deleteIcon.setAttribute('data-card-id', card.id);
-            deleteIcon.setAttribute('style', 'cursor: pointer;');
-            group.appendChild(de,eIcon);
-
-            const delText = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-            delText.setAttribute('x', 135);
-            delText.setAttribute('y', 20); // 调整位置以垂直居中
-            delText.setAttribute('text-anchor', 'middle');
-            delText.setAttribute('fill', 'white');
-            delText.setAttribute('font-size', '16px'); // 适当调整字体大小以适应图标
-            delText.setAttribute('pointer-events', 'none'); // 确保点击事件只触发于删除图标上
-            delText.textContent = '×';
-            group.appendChild(delText);
-
-            cardsContainer.appendChild(group);
-
-            attachNodeEventListeners();
-        }
-
-
-
-
-
-        updateForm();
-        updateJSONOutput();
-        drawCard();
-    </script>
-</body>
-</html>
-<!--
-<!DOCTYPE html>
-<html lang="zh-cn">
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<title>Blueprint</title>
-		<style>
-			body,
-			html {
-				margin: 0;
-				padding: 0;
-				width: 100%;
-				height: 100%;
-				overflow: hidden;
-			}
-
-			/* 弹窗容器样式 */
-			#card-creation-modal {
-				border: 1px solid #444;
-				background: linear-gradient(145deg, #333, #555);
-				padding: 5px;
-				z-index: 100;
-				box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-				border-radius: 5px;
-				overflow: hidden;
-				margin: 0;
-				user-select: none;
-			}
-
-			#card-type-list {
-
-				padding-left: 0px;
-			}
-
-			/* 列表项基础样式 */
-			#card-type-list li {
-				list-style: none;
-				/* 去除列表项目符号 */
-				padding: 8px 15px;
-				/* 减少垂直内边距使其更紧凑 */
-				border-bottom: 1px solid #666;
-				/* 暗色底部边框线 */
-				color: #ddd;
-				/* 暗色系字体颜色 */
-				cursor: pointer;
-				/* 鼠标指针样式 */
-				margin-left: 0;
-				/* 消除左边间隙 */
-
-			}
-
-			/* 列表项高亮样式 */
-			#card-type-list li:hover,
-			#card-type-list li:focus {
-				background-color: #777;
-				/* 暗色背景颜色 */
-				color: #fff;
-				/* 高亮字体颜色 */
-			}
-
-			/* 最后一个列表项的底部边框 */
-			#card-type-list li:last-child {
-				border-bottom: none;
-			}
-
-			.grid-background {
-				background-color: #292929;
-				background-image:
-					linear-gradient(to right, black 1px, transparent 1px),
-					linear-gradient(to bottom, black 1px, transparent 1px),
-					linear-gradient(to right, #404040 1px, transparent 1px),
-					linear-gradient(to bottom, #404040 1px, transparent 1px);
-				background-size:
-					100px 100px,
-					100px 100px,
-					10px 10px,
-					10px 10px;
-				width: 100%;
-				height: 100%;
-			}
-
-			.draggable {
-				cursor: grab;
-			}
-
-			.node {
-
-				cursor: pointer;
-			}
-
-			.link {
-				stroke: black;
-				stroke-width: 2;
-			}
-
-			.card {
-				/* fill: lightgrey;
-			stroke: black; */
-
-				stroke-width: 1;
-				user-select: none;
-			}
-
-			text {
-				pointer-events: none;
-				user-select: none;
-			}
-		</style>
-	</head>
-
-	<body>
-		&lt;!&ndash; 弹窗容器 &ndash;&gt;
-		<div id="card-creation-modal"
-			style="display:none; position: absolute; border: 1px solid #ccc; background-color: #fff; padding: 10px; z-index: 100;">
-			&lt;!&ndash; 搜索结果列表 &ndash;&gt;
-			<ul id="card-type-list"></ul>
-		</div>
-
-
-
-		<svg style="width: 100%;height: 100%;" id="svgContainer" class="grid-background">
-			<g id="linksContainer"></g> &lt;!&ndash; 用于存放线条 &ndash;&gt;
-			<g id="cardsContainer"></g> &lt;!&ndash; 用于存放卡片 &ndash;&gt;
-		</svg>
-
-		<script>
-			let cards = [{
-					id: 'card0',
-					x: 0,
-					y: 0,
-					label: 'Start',
-					type: "start",
-					nodes: [{
-						type: "out",
-						level: 0,
-						enumType: 'call',
-						color: '#fff',
-						multiConnected: 1
-					}, ],
-					titleBarColor: ['#84fab0', '#8fd3f4']
-				},
-				{
-					id: 'card1',
-					x: 100,
-					y: 200,
-					label: 'Condition',
-					type: "condition",
-					nodes: [{
-							type: "in",
-							level: 0,
-							enumType: 'call',
-							color: '#fff'
-						},
-						{
-							type: "in",
-							level: 1,
-							enumType: 'int',
-							color: '#28C76F',
-							slot: 'input',
-							label: 'int',
-							multiConnected: 1
-						},
-						{
-							type: "in",
-							level: 2,
-							enumType: 'int',
-							color: '#28C76F',
-							slot: 'input',
-							label: 'int',
-							multiConnected: 1
-						},
-						{
-							type: "out",
-							level: 0,
-							enumType: 'call',
-							color: '#fff'
-						},
-						{
-							type: "out",
-							level: 1,
-							enumType: 'bool',
-							color: '#0396FF',
-							label: 'bool',
-							multiConnected: 1
-						},
-					],
-					titleBarColor: ['#fccb90', '#d57eeb']
-				},
-				{
-					id: 'card2',
-					x: 300,
-					y: 400,
-					label: 'BoolToString',
-					type: "call",
-					nodes: [{
-							type: "in",
-							level: 0,
-							enumType: 'call',
-							color: '#fff'
-						},
-						{
-							type: "in",
-							level: 1,
-							enumType: 'bool',
-							color: '#0396FF',
-							label: 'bool',
-							multiConnected: 1
-						},
-						{
-							type: "out",
-							level: 0,
-							enumType: 'call',
-							color: '#fff'
-						},
-						{
-							type: "out",
-							level: 1,
-							enumType: 'string',
-							color: '#DE4313',
-							label: 'string',
-							multiConnected: 1
-						}
-					],
-					titleBarColor: ['#3C8CE7', '#00EAFF']
-
-				},
-				{
-					id: 'card3',
-					x: 100,
-					y: 300,
-					label: 'Print',
-					type: "print",
-					nodes: [{
-							type: "in",
-							level: 0,
-							enumType: 'call',
-							color: '#fff'
-						},
-						{
-							type: "in",
-							level: 1,
-							enumType: 'string',
-							color: '#DE4313',
-							label: 'string',
-							multiConnected: 1
-						}
-					],
-					titleBarColor: ['#f6d365', '#fda085']
-				}
-			];
-
-
-			let links = [];
-			let currentLink = null;
-			let isDragging = false;
-			let isLinking = false;
-			let dragOffsetX, dragOffsetY;
-			let currentCard;
-
-			function init() {
-				drawLinks();
-				drawCards();
-				attachEventListeners();
-			}
-
-			function drawCards() {
-				const cardsContainer = document.getElementById('cardsContainer');
-				cardsContainer.innerHTML = ''; // 清除现有的卡片
-
-				cards.forEach(card => {
-
-					//创建标题栏渐变色
-					const defs = document.createElementNS('http://www.w3.org/2000/svg', 'defs');
-					const linearGradient = document.createElementNS('http://www.w3.org/2000/svg', 'linearGradient');
-					linearGradient.setAttribute('id', `titleGradient-${card.id}`);
-					linearGradient.setAttribute('x1', '0%'); // 渐变起点的x坐标
-					linearGradient.setAttribute('y1', '100%'); // 渐变起点的y坐标
-					linearGradient.setAttribute('x2', '100%'); // 渐变终点的x坐标
-					linearGradient.setAttribute('y2', '0%'); // 渐变终点的y坐标
-
-					const stop1 = document.createElementNS('http://www.w3.org/2000/svg', 'stop');
-					stop1.setAttribute('offset', '10%');
-					stop1.setAttribute('style', `stop-color: ${card.titleBarColor[0]}; stop-opacity: 1`);
-					linearGradient.appendChild(stop1);
-
-					const stop2 = document.createElementNS('http://www.w3.org/2000/svg', 'stop');
-					stop2.setAttribute('offset', '100%');
-					stop2.setAttribute('style', `stop-color: ${card.titleBarColor[1]}; stop-opacity: 1`);
-					linearGradient.appendChild(stop2);
-
-					defs.appendChild(linearGradient);
-					cardsContainer.appendChild(defs);
-
-
-
-					const nodeSpacing = 50;
-					const topBottomPadding = 20;
-					const titleBarHeight = 30; // 标题栏高度
-					const maxLevel = Math.max(...card.nodes.map(node => node.level)) + 1;
-					const cardHeight = maxLevel * nodeSpacing + topBottomPadding * 2 + titleBarHeight;
-
-					const group = document.createElementNS('http://www.w3.org/2000/svg', 'g');
-					group.setAttribute('class', 'draggable card-container');
-					group.setAttribute('data-id', card.id);
-					group.setAttribute('user-select', 'none');
-					group.setAttribute('transform', `translate(${card.x},${card.y})`);
-
-					const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-					rect.setAttribute('fill', '#222');
-					rect.setAttribute('width', 150);
-					rect.setAttribute('style', 'cursor: auto;');
-					rect.setAttribute('height', cardHeight);
-					rect.setAttribute('rx', 10); // 圆角
-					rect.setAttribute('ry', 10);
-					group.appendChild(rect);
-
-					// 使用path绘制带有指定圆角的矩形
-					// 创建标题栏
-					const titleBarWidth = 150;
-					const borderRadius = 10; // 圆角大小
-					const titleBar = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-					const dValue = `M 0,${borderRadius}
-                a ${borderRadius},${borderRadius} 0 0 1 ${borderRadius},-${borderRadius}
-                h ${titleBarWidth - borderRadius * 2}
-                a ${borderRadius},${borderRadius} 0 0 1 ${borderRadius},${borderRadius}
-                v ${titleBarHeight - borderRadius}
-                h -${titleBarWidth}
-                z`;
-					titleBar.setAttribute('class', 'card');
-					titleBar.setAttribute('d', dValue);
-					titleBar.setAttribute('fill', `url(#titleGradient-${card.id})`);
-					group.appendChild(titleBar);
-
-					const text = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-					text.setAttribute('x', titleBarWidth / 2);
-					text.setAttribute('y', titleBarHeight / 2);
-					text.setAttribute('text-anchor', 'middle');
-					text.setAttribute('alignment-baseline', 'middle');
-					text.textContent = card.label;
-					group.appendChild(text);
-
-					card.nodes.forEach((node, index) => {
-
-
-						const circle = document.createElementNS('http://www.w3.org/2000/svg', 'circle');
-						circle.setAttribute('class', 'node');
-						circle.setAttribute('cx', node.type === 'in' ? 0 : 150);
-						circle.setAttribute('cy', topBottomPadding + titleBarHeight + (node.level + 1) *
-							nodeSpacing - (nodeSpacing / 2));
-						circle.setAttribute('r', 7);
-						circle.setAttribute('fill', node.color);
-						circle.setAttribute('data-card-id', card.id);
-						circle.setAttribute('data-node-id', `${card.id}-node${index + 1}`);
-						group.appendChild(circle);
-
-						let labelX = node.type === 'in' ? 12 : 138; // 基本的X坐标
-						const labelY = topBottomPadding + titleBarHeight + node.level * nodeSpacing + 21;
-
-						// 创建SVG文本元素
-						const multiConnectedLabel = document.createElementNS('http://www.w3.org/2000/svg',
-							'text');
-						multiConnectedLabel.setAttribute('x', labelX);
-						multiConnectedLabel.setAttribute('y', labelY);
-						multiConnectedLabel.setAttribute('text-anchor', 'middle');
-						multiConnectedLabel.setAttribute('fill', '#aaa');
-						multiConnectedLabel.setAttribute('style', 'font-size: 8px;');
-						multiConnectedLabel.setAttribute('alignment-baseline', 'hanging');
-
-
-						// 计算文本的宽度（假定的，因为SVG没有直接获取文本宽度的方法）
-						let estimatedTextLength;
-						if (node.multiConnected == undefined) {
-							estimatedTextLength = 20
-							multiConnectedLabel.textContent = 'N';
-						} else {
-							estimatedTextLength = node.multiConnected.length;
-							multiConnectedLabel.textContent = node.multiConnected;
-						}
-
-						// 确保文本不会超出卡片右边界
-						if (labelX + estimatedTextLength / 2 > 150) {
-							labelX = 150 - estimatedTextLength / 2;
-							nodeLabel.setAttribute('x', labelX);
-						}
-
-						// 确保文本不会超出卡片左边界
-						if (labelX - estimatedTextLength / 2 < 0) {
-							labelX = estimatedTextLength / 2;
-							nodeLabel.setAttribute('x', labelX);
-						}
-
-						group.appendChild(multiConnectedLabel);
-
-						if (node.label != undefined) {
-							// 计算文本标签的位置
-							let labelX = node.type === 'in' ? 15 : 135; // 基本的X坐标
-							const labelY = topBottomPadding + titleBarHeight + node.level * nodeSpacing + 40;
-
-							// 创建SVG文本元素
-							const nodeLabel = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-							nodeLabel.setAttribute('x', labelX);
-							nodeLabel.setAttribute('y', labelY); // 在节点下方留出一定空间
-							nodeLabel.setAttribute('text-anchor', 'middle'); // 文本居中对齐
-							nodeLabel.setAttribute('fill', '#aaa'); // 文本居中对齐
-							nodeLabel.setAttribute('alignment-baseline', 'hanging');
-							nodeLabel.textContent = node.label;
-
-							// 计算文本的宽度（假定的，因为SVG没有直接获取文本宽度的方法）
-							const estimatedTextLength = node.label.length * 10; // 估算每个字符6像素宽
-
-							// 确保文本不会超出卡片右边界
-							if (labelX + estimatedTextLength / 2 > 150) {
-								labelX = 150 - estimatedTextLength / 2;
-								nodeLabel.setAttribute('x', labelX);
-							}
-
-							// 确保文本不会超出卡片左边界
-							if (labelX - estimatedTextLength / 2 < 0) {
-								labelX = estimatedTextLength / 2;
-								nodeLabel.setAttribute('x', labelX);
-							}
-
-							group.appendChild(nodeLabel);
-
-						}
-
-						switch (node.slot) {
-							case 'input':
-								const foreignObject = document.createElementNS('http://www.w3.org/2000/svg',
-									'foreignObject');
-								foreignObject.setAttribute('x', 0);
-								foreignObject.setAttribute('y', topBottomPadding + titleBarHeight + node.level *
-									nodeSpacing + 12);
-								foreignObject.setAttribute('width', 130); // 保持原始宽度
-								foreignObject.setAttribute('height', nodeSpacing - 24); // 保持原始高度，减去的24像素为上下内边距之和
-								const input = document.createElement('input');
-								input.type = 'text';
-								if (node.value == undefined) {
-									node.value = '';
-								}
-								input.value = node.value;
-								input.addEventListener('input', function() {
-									node.value = input.value;
-								});
-								// Set adjusted input styles
-								input.style.width = '110px';
-								input.style.height = '100%';
-								input.style.marginLeft = '20px';
-								input.style.borderRadius = '5px';
-								input.style.border = '1px solid white';
-								input.style.backgroundColor = '#222';
-								input.style.color = 'white';
-								input.style.fontSize = '1em';
-								input.style.padding = '0px'; // 可能需要调整或去除内边距以适应固定尺寸
-								input.style.boxSizing = 'border-box'; // 确保宽高包含内容、内边距和边框
-
-								// Change border color on focus and blur
-								input.addEventListener('focus', () => {
-									input.style.outline = 'none'; // Remove default focus outline
-									input.style.borderColor =
-										'white'; // Keep border color white on focus
-								});
-
-								input.addEventListener('blur', () => {
-									input.style.borderColor =
-										'white'; // Revert to white when not focused
-								});
-
-								// 阻止事件冒泡
-								input.addEventListener('click', function(event) {
-									event.stopPropagation();
-								});
-
-								input.addEventListener('mousedown', function(event) {
-									event.stopPropagation();
-								});
-
-								input.addEventListener('touchstart', function(event) {
-									event.stopPropagation();
-								});
-
-								foreignObject.appendChild(input);
-								group.appendChild(foreignObject);
-								break;
-						}
-
-
-
-					});
-
-					const deleteIcon = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-					deleteIcon.setAttribute('class', 'card-delete-icon');
-					deleteIcon.setAttribute('x', 125);
-					deleteIcon.setAttribute('y', 5); // 使其贴近标题栏的右上角
-					deleteIcon.setAttribute('width', 20);
-					deleteIcon.setAttribute('height', 20);
-					deleteIcon.setAttribute('fill', 'transparent');
-					deleteIcon.setAttribute('data-card-id', card.id);
-					deleteIcon.setAttribute('style', 'cursor: pointer;');
-					group.appendChild(deleteIcon);
-
-					const delText = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-					delText.setAttribute('x', 135);
-					delText.setAttribute('y', 20); // 调整位置以垂直居中
-					delText.setAttribute('text-anchor', 'middle');
-					delText.setAttribute('fill', 'white');
-					delText.setAttribute('font-size', '16px'); // 适当调整字体大小以适应图标
-					delText.setAttribute('pointer-events', 'none'); // 确保点击事件只触发于删除图标上
-					delText.textContent = '×';
-					group.appendChild(delText);
-
-					cardsContainer.appendChild(group);
-				});
-
-				attachNodeEventListeners();
-			}
-
-
-
-			function drawLinks() {
-				const linksContainer = document.getElementById('linksContainer');
-				linksContainer.innerHTML = ''; // 清除现有的线条
-				// 清除旧的删除图标
-				document.querySelectorAll('.delete-icon').forEach(icon => icon.remove());
-
-				links.forEach((link, index) => {
-					const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-					//path.setAttribute('class', 'link');
-					path.setAttribute('stroke', link.target.color)
-					path.setAttribute('stroke-width', 5)
-					path.setAttribute('fill', 'none');
-
-
-					const isCallType = link.source.enumType === 'call';
-					if (isCallType) {
-						path.setAttribute('stroke-dasharray', '10');
-						path.setAttribute('stroke-dashoffset', '0');
-
-						// Add animation element to the path for dashed lines
-						const animate = document.createElementNS('http://www.w3.org/2000/svg', 'animate');
-						animate.setAttribute('attributeName', 'stroke-dashoffset');
-						animate.setAttribute('dur', '0.5s');
-						animate.setAttribute('repeatCount', 'indefinite');
-						animate.setAttribute('from', '20');
-						animate.setAttribute('to', '0');
-						path.appendChild(animate);
-					}
-
-
-					let dist;
-					// 使用动态计算的控制点距离来定义曲线,根据源点和终点的X坐标差异动态计算控制点的距离
-					if (link.source.type === 'out') {
-						if (link.source.x - link.target.x > 0) {
-							dist = 200; // 如果终点在源点的左侧，控制点距离更远
-						} else {
-							dist = Math.abs(link.target.x - link.source.x) * 0.3; // 否则，根据两点间的距离调整控制点距离
-						}
-						const d =
-							`M${link.source.x} ${link.source.y} C${link.source.x + dist} ${link.source.y} ${link.target.x - dist} ${link.target.y} ${link.target.x} ${link.target.y}`;
-						path.setAttribute('d', d);
-						linksContainer.appendChild(path);
-					} else {
-						if (link.target.x - link.source.x > 0) {
-							dist = 200; // 如果终点在源点的右侧，控制点距离更远
-						} else {
-							dist = Math.abs(link.target.x - link.source.x) * 0.3; // 否则，根据两点间的距离调整控制点距离
-						}
-						const d =
-							`M${link.source.x} ${link.source.y} C${link.source.x - dist} ${link.source.y} ${link.target.x + dist} ${link.target.y} ${link.target.x} ${link.target.y}`;
-						path.setAttribute('d', d);
-						linksContainer.appendChild(path);
-					}
-
-
-					// 计算中点
-					const midX = (link.source.x + link.target.x) / 2;
-					const midY = (link.source.y + link.target.y) / 2;
-
-					// 绘制删除图标
-					const deleteIcon = document.createElementNS('http://www.w3.org/2000/svg', 'circle');
-					deleteIcon.setAttribute('class', 'delete-icon');
-					deleteIcon.setAttribute('cx', midX);
-					deleteIcon.setAttribute('cy', midY);
-					deleteIcon.setAttribute('style', "cursor: pointer;");
-					deleteIcon.setAttribute('r', 10);
-					deleteIcon.setAttribute('fill', 'red');
-					deleteIcon.setAttribute('data-link-level', index); // 用于标识该删除图标对应的线
-					linksContainer.appendChild(deleteIcon);
-
-					// 可以选择添加一个×文本在圆圈中间
-					const text = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-					text.setAttribute('x', midX);
-					text.setAttribute('y', midY + 5); // 轻微调整以垂直居中
-					text.setAttribute('text-anchor', 'middle');
-					text.setAttribute('fill', 'white');
-					text.setAttribute('font-size', '15px');
-					text.setAttribute('pointer-events', 'none'); // 确保点击事件只触发于圆圈上
-					text.textContent = '×';
-					linksContainer.appendChild(text);
-
-				});
-			}
-
-			// 定义变量来追踪是否正在拖动以及拖动的起始位置
-			let isPanning = false;
-			let startPan = {
-				x: 0,
-				y: 0
-			};
-
-			// 用于调整SVG视图窗口的变量
-			let currentPan = {
-				x: 0,
-				y: 0
-			};
-
-			function attachEventListeners() {
-
-				const svgContainer = document.getElementById('svgContainer');
-				document.querySelectorAll('.link').forEach(link => {
-					link.addEventListener('contextmenu', function(e) {
-						e.preventDefault(); // 阻止默认的右键菜单
-						const linkId = e.target.getAttribute('data-link-id'); // 确保你在绘制线条时添加了 data-link-id 属性
-						showContextMenu(e.clientX, e.clientY, linkId);
-					});
-				});
-				document.getElementById('svgContainer').addEventListener('click', function(e) {
-					if (e.target.classList.contains('delete-icon')) {
-						// 获取点击的删除图标对应的线的索引
-						const linkIndex = e.target.getAttribute('data-link-level');
-						// 从数组中移除该线
-						links.splice(linkIndex, 1);
-						// 重新绘制剩余的线和删除图标
-						drawLinks();
-						drawCards(); // 如果你的线条与卡片有关联，可能需要重新绘制卡片以更新视图
-					} else if (e.target.classList.contains('card-delete-icon')) {
-						// 获取点击的删除图标对应的卡片ID
-						const cardId = e.target.getAttribute('data-card-id');
-						// 从`cards`数组中移除对应的卡片
-						cards = cards.filter(card => card.id !== cardId);
-						// 同时移除所有与该卡片连接的线
-						links = links.filter(link => !(link.source.node.startsWith(cardId) || (link.target && link.target
-							.node.startsWith(cardId))));
-						// 重新绘制卡片和线
-						drawLinks();
-						drawCards();
-					} else {
-						let targetCardContainer = e.target.closest('.card-container');
-						if (targetCardContainer) {
-							const cardId = targetCardContainer.getAttribute('data-id');
-							// 将SVG元素移动到最后，使其在视觉上显示在最前面
-							targetCardContainer.parentNode.appendChild(targetCardContainer);
-
-							// 更新cards数组，将点击的卡片移动到数组的末尾
-							const cardIndex = cards.findIndex(card => card.id === cardId);
-							if (cardIndex > -1) {
-								const card = cards.splice(cardIndex, 1)[0];
-								cards.push(card);
-							}
-
-							// 这里不需要立即调用drawCards或drawLinks，
-							// 除非你需要根据cards数组的新顺序进行其他更新
-						}
-					}
-				});
-
-				svgContainer.addEventListener('contextmenu', function(e) {
-					e.preventDefault(); // 阻止右键菜单
-				});
-
-				svgContainer.addEventListener('mousedown', e => {
-
-					// 检查是否是鼠标右键点击
-
-					const target = e.target;
-					if (e.button === 2) {
-						isPanning = true;
-						startPan.x = e.clientX - currentPan.x;
-						startPan.y = e.clientY - currentPan.y;
-					} else if (target
-
-						.classList.contains('card') || target.tagName === 'text') {
-						const cardContainer = target.closest('.card-container');
-						const cardId = cardContainer.getAttribute('data-id');
-						startDragCard(e, cardId);
-					}
-				});
-				document.addEventListener('mousemove', e => {
-					if (isPanning) {
-						// 正确计算新的视图窗口位置
-						currentPan.x = e.clientX - startPan.x;
-						currentPan.y = e.clientY - startPan.y;
-
-						// 正确调整SVG的viewBox来实现拖动效果
-						// 这里需要更新的是开始拖动的点，而不是当前的点，因此我们反向更新
-						svgContainer.setAttribute('viewBox',
-							`${-currentPan.x} ${-currentPan.y} ${svgContainer.clientWidth} ${svgContainer.clientHeight}`
-						);
-						svgContainer.style.backgroundPosition = `${currentPan.x % 100}px ${currentPan.y % 100}px`;
-					} else if (isDragging) {
-						moveCard(e);
-					} else if (isLinking && currentLink) {
-						updateLink(e);
-					}
-				});
-
-				document.addEventListener('mouseup', e => {
-					if (e.button === 2) {
-						console.log(currentPan);
-						isPanning = false;
-					} else if (isDragging) {
-						endDragCard();
-					} else if (isLinking) {
-						endDragLink(e);
-					}
-				});
-			}
-
-			function startDragCard(e, cardId) {
-				isDragging = true;
-				const card = cards.find(c => c.id === cardId);
-				currentCard = card;
-
-				const svgRect = svgContainer.getBoundingClientRect();
-				dragOffsetX = e.clientX - svgRect.left - card.x;
-				dragOffsetY = e.clientY - svgRect.top - card.y;
-			}
-
-			function moveCard(e) {
-				const svgRect = svgContainer.getBoundingClientRect();
-				currentCard.x = e.clientX - svgRect.left - dragOffsetX;
-				currentCard.y = e.clientY - svgRect.top - dragOffsetY;
-
-				// Update link positions associated with the currentCard
-				links.forEach(link => {
-					if (link.source.node.startsWith(currentCard.id)) {
-						// 根据节点ID更新链接的源位置
-						const nodeIndex = parseInt(link.source.node.split('-node')[1]) - 1;
-						const nodeConfig = currentCard.nodes[nodeIndex]; // 获取当前节点的配置
-						const nodeSpacing = 50; // 节点间隔，应与drawCards函数中使用的相同
-						const topBottomPadding = 20; // 顶部和底部的边距，应与drawCards函数中使用的相同
-						link.source.x = currentCard.x + (nodeConfig.type === "in" ? 0 : 150); // 根据节点类型调整x坐标
-						link.source.y = 30 + currentCard.y + topBottomPadding + (nodeConfig.level + 1) * nodeSpacing - (
-							nodeSpacing / 2); // 根据节点的index调整y坐标
-					}
-					if (link.target && link.target.node.startsWith(currentCard.id)) {
-						// 根据节点ID更新链接的目标位置
-						const nodeIndex = parseInt(link.target.node.split('-node')[1]) - 1;
-						const nodeConfig = currentCard.nodes[nodeIndex]; // 获取当前节点的配置
-						link.target.x = currentCard.x + (nodeConfig.type === "in" ? 0 : 150); // 根据节点类型调整x坐标
-						link.target.y = 30 + currentCard.y + 20 + (nodeConfig.level + 1) * 50 - (50 /
-							2); // 根据节点的index调整y坐标
-					}
-				});
-
-				drawLinks(); // Redraw links to reflect updated positions
-				drawCards(); // Redraw cards and nodes
-			}
-
-
-
-			function endDragCard() {
-				isDragging = false;
-			}
-
-			function getNodeCurrentConnections(nodeId) {
-				let count = 0;
-				links.forEach(link => {
-					if (link.source.node === nodeId || (link.target && link.target.node === nodeId)) {
-						count++;
-					}
-				});
-				return count;
-			}
-
-			function startDragLink(e) {
-				e.stopPropagation(); // Prevent card drag
-
-				const nodeId = e.target.getAttribute('data-node-id');
-				const cardId = e.target.getAttribute('data-card-id');
-				const card = cards.find(c => c.id === cardId);
-				const nodeElement = e.target;
-				const node = card.nodes.find(n => `${card.id}-node${card.nodes.indexOf(n) + 1}` === nodeId);
-
-
-				// 检查源节点是否允许发起新的连接
-				const currentConnections = getNodeCurrentConnections(nodeId);
-				if (node.multiConnected !== -1 && currentConnections >= node.multiConnected) {
-					console.log('此节点不允许更多的连接。');
-					return; // 不允许创建新的连接
-				}
-				isLinking = true;
-
-				const svgRect = svgContainer.getBoundingClientRect();
-				const nodeX = e.clientX - svgRect.left;
-				const nodeY = e.clientY - svgRect.top;
-
-				currentLink = {
-					source: {
-						node: nodeId,
-						x: nodeX,
-						y: nodeY,
-						color: nodeElement.getAttribute('fill'),
-						type: node.type,
-						enumType: node.enumType
-					},
-					target: null
-				};
-			}
-
-			function updateLink(e) {
-				const svgRect = svgContainer.getBoundingClientRect();
-				currentLink.target = {
-					x: e.clientX - svgRect.left,
-					y: e.clientY - svgRect.top
-				};
-				drawCurrentLink();
-			}
-
-			function endDragLink(e) {
-				isLinking = false;
-				const svgRect = svgContainer.getBoundingClientRect();
-				const x = e.clientX - svgRect.left;
-				const y = e.clientY - svgRect.top;
-
-				// 默认情况下，假设目标节点就是e.target
-				let targetNode = e.target;
-
-				// 检查e.target是否是我们期望的节点类型，如果不是，则尝试使用document.elementFromPoint
-				if (!targetNode.classList.contains('node')) {
-					e.target.style.display = 'none';
-					targetNode = document.elementFromPoint(e.clientX, e.clientY);
-					e.target.style.display = '';
-				}
-
-				let validTargetFound = false;
-
-				// 进行节点的有效性判断
-				if (targetNode && targetNode.classList.contains('node')) {
-					const sourceNodeId = currentLink.source.node;
-					const targetNodeId = targetNode.getAttribute('data-node-id');
-
-					// 从节点ID分解出卡片ID和节点索引
-					const sourceNodeParts = sourceNodeId.split('-node');
-					const targetNodeParts = targetNodeId.split('-node');
-					const sourceCard = cards.find(card => card.id === sourceNodeParts[0]);
-					const targetCard = cards.find(card => card.id === targetNodeParts[0]);
-
-					// 根据节点ID找到对应的节点对象
-					const sourceNodeIndex = parseInt(sourceNodeParts[1]) - 1;
-					const targetNodeIndex = parseInt(targetNodeParts[1]) - 1;
-					const sourceNode = sourceCard.nodes[sourceNodeIndex];
-					const targetNodeObj = targetCard.nodes[targetNodeIndex];
-
-					// 检查目标节点是否允许接受新的连接
-					const targetCurrentConnections = getNodeCurrentConnections(targetNodeId);
-					if (targetNodeObj.multiConnected !== -1 && targetCurrentConnections >= targetNodeObj.multiConnected) {
-						console.log('目标节点不允许更多的连接。');
-						// 移除临时绘制的连接线
-						const tempLink = document.querySelector('.temp-link');
-						if (tempLink) {
-							tempLink.remove();
-						}
-						currentLink = null;
-						drawLinks();
-						return;
-					}
-					// 确保目标节点不是起始节点自身，避免自连接
-					if (currentLink.source.node !== targetNodeId && sourceNode.enumType === targetNodeObj.enumType) {
-						validTargetFound = true;
-						currentLink.source.enumType = sourceNode.enumType;
-						currentLink.source.x = currentLink.source.x - currentPan.x;
-						currentLink.source.y = currentLink.source.y - currentPan.y;
-						// 更新连接的目标信息，并保存该连接
-						links.push({
-							...currentLink,
-							target: {
-								node: targetNodeId,
-								x: x - currentPan.x,
-								y: y - currentPan.y,
-								color: sourceNode.color,
-								enumType: sourceNode.enumType
-							}
-						});
-					}
-				} else {
-					const sourceNodeId = currentLink.source.node;
-					const sourceNodeParts = sourceNodeId.split('-node');
-					const sourceCard = cards.find(card => card.id === sourceNodeParts[0]);
-					const sourceNodeIndex = parseInt(sourceNodeParts[1]) - 1;
-					const sourceNode = sourceCard.nodes[sourceNodeIndex];
-					currentLink.source.enumType = sourceNode.enumType;
-					showCardCreationModal(e.clientX, e.clientY, currentLink.source);
-
-				}
-
-				const tempLink = document.querySelector('.temp-link');
-				if (tempLink) {
-					tempLink.remove();
-				}
-				currentLink = null;
-				drawLinks();
-			}
-
-
-
-
-
-
-			// 更新drawCurrentLink函数，增加线宽
-			// 更新drawCurrentLink函数，增加线宽
-			function drawCurrentLink() {
-				const tempLink = document.querySelector('.temp-link');
-				if (tempLink) tempLink.remove();
-
-				if (!currentLink || !currentLink.target) return;
-
-				const svgContainer = document.getElementById('svgContainer');
-				const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-				path.setAttribute('class', 'temp-link');
-				// 设置等宽线属性
-				path.setAttribute('stroke', currentLink.source.color);
-				path.setAttribute('stroke-width', 5);
-				path.setAttribute('fill', 'none');
-
-				// 计算考虑了平移偏移的起点和终点
-				const adjustedSourceX = currentLink.source.x - currentPan.x;
-				const adjustedSourceY = currentLink.source.y - currentPan.y;
-				const adjustedTargetX = currentLink.target.x - currentPan.x;
-				const adjustedTargetY = currentLink.target.y - currentPan.y;
-
-				// 更新路径以使用调整后的坐标
-				if (currentLink.source.type === 'out') {
-					const d =
-						`M${adjustedSourceX},${adjustedSourceY} C${adjustedSourceX + 100},${adjustedSourceY} ${adjustedTargetX - 100},${adjustedTargetY} ${adjustedTargetX},${adjustedTargetY}`;
-					path.setAttribute('d', d);
-				} else {
-					const d =
-						`M${adjustedSourceX},${adjustedSourceY} C${adjustedSourceX - 100},${adjustedSourceY} ${adjustedTargetX + 100},${adjustedTargetY} ${adjustedTargetX},${adjustedTargetY}`;
-					path.setAttribute('d', d);
-				}
-
-				svgContainer.appendChild(path);
-			}
-
-			function attachNodeEventListeners() {
-				document.querySelectorAll('.node').forEach(node => {
-					node.addEventListener('mousedown', startDragLink);
-				});
-			}
-
-			function populateCardTypeList(mouseX, mouseY, sourceNode) {
-				const listElement = document.getElementById('card-type-list');
-				listElement.innerHTML = ''; // 清空现有列表项
-				const addedTypes = new Set();
-
-				cards.forEach(card => {
-					if (!addedTypes.has(card.type)) {
-						const listItem = document.createElement('li');
-						listItem.tabIndex = 0; // 使元素能够获得焦点，以便能够监听键盘事件
-						listItem.textContent = card.label; // 使用卡片的标签或类型
-						listItem.onclick = function() {
-							createNewCard(card, mouseX, mouseY, sourceNode);
-							hideCardCreationModal(); // 新建卡片后隐藏模态框
-						};
-						listItem.onkeydown = function(event) {
-							if (event.key === 'Enter') {
-								createNewCard(card, mouseX, mouseY, sourceNode);
-								hideCardCreationModal(); // 新建卡片后隐藏模态框
-							}
-						};
-						listElement.appendChild(listItem);
-						addedTypes.add(card.type);
-					}
-				});
-			}
-
-
-			function showCardCreationModal(mouseX, mouseY, sourceNode) {
-				populateCardTypeList(mouseX, mouseY, sourceNode); // 填充卡片类型列表
-				const modal = document.getElementById('card-creation-modal');
-				// 在这里添加取消按钮
-				if (!document.getElementById('cancel-btn')) {
-					const cancelButton = document.createElement('button');
-					cancelButton.id = 'cancel-btn';
-					cancelButton.textContent = '取消';
-					cancelButton.onclick = function() {
-						hideCardCreationModal();
-					};
-					modal.appendChild(cancelButton);
-				}
-
-
-
-				// 设置弹出框的位置
-				modal.style.left = mouseX + 'px';
-				modal.style.top = mouseY + 'px';
-				modal.style.display = 'block'; // 显示弹窗
-			}
-
-			function createNewCard(cardTemplate, mouseX, mouseY, sourceNode) {
-				const newCard = {
-					...cardTemplate,
-					nodes: JSON.parse(JSON.stringify(cardTemplate.nodes)), // 深拷贝nodes属性
-					id: 'card' + (cards.length + 1)
-				};
-				// 将每个node的value设置为空字符串
-				newCard.nodes.forEach(node => {
-					node.value = '';
-				});
-				newCard.x = mouseX - 75 - currentPan.x; // 调整为鼠标中心
-				newCard.y = mouseY - 15 - currentPan.y; // 调整为鼠标中心
-				cards.push(newCard); // 将新创建的卡片添加到卡片列表中
-
-				// 如果提供了sourceNode，找到新卡片的合适target node并创建连接
-				if (sourceNode) {
-					sourceNode.x -= currentPan.x;
-					sourceNode.y -= currentPan.y;
-					let targetNode = newCard.nodes.find(node => node.enumType === sourceNode.enumType && node.type === 'in');
-					if (targetNode) {
-						links.push({
-							source: sourceNode,
-							target: {
-								node: `${newCard.id}-node${newCard.nodes.indexOf(targetNode) + 1}`,
-								x: newCard.x + (targetNode.type === 'in' ? 0 : 150),
-								y: newCard.y + 30 + 20 + (targetNode.level + 1) * 50 - 25,
-								color: targetNode.color,
-								enumType: targetNode.enumType
-							}
-						});
-					}
-				}
-
-
-				drawLinks();
-				drawCards();
-			}
-
-
-
-			function hideCardCreationModal() {
-				const modal = document.getElementById('card-creation-modal');
-				modal.style.display = 'none'; // 隐藏弹窗
-			}
-
-			init();
-		</script>
-	</body>
-
-</html>-->
-<!DOCTYPE html>
-<html lang="zh-cn">
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-		<title>Blueprint</title>
-		<style>
-			body,
-			html {
-				margin: 0;
-				padding: 0;
-				width: 100%;
-				height: 100%;
-				overflow: hidden;
-			}
-
-			/* 弹窗容器样式 */
-			#card-creation-modal {
-				border: 1px solid #444;
-				background: linear-gradient(145deg, #333, #555);
-				padding: 5px;
-				z-index: 100;
-				box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-				border-radius: 5px;
-				overflow: hidden;
-				margin: 0;
-				user-select: none;
-			}
-
-			#card-type-list {
-
-				padding-left: 0px;
-			}
-
-			/* 列表项基础样式 */
-			#card-type-list li {
-				list-style: none;
-				/* 去除列表项目符号 */
-				padding: 8px 15px;
-				/* 减少垂直内边距使其更紧凑 */
-				border-bottom: 1px solid #666;
-				/* 暗色底部边框线 */
-				color: #ddd;
-				/* 暗色系字体颜色 */
-				cursor: pointer;
-				/* 鼠标指针样式 */
-				margin-left: 0;
-				/* 消除左边间隙 */
-
-			}
-
-			/* 列表项高亮样式 */
-			#card-type-list li:hover,
-			#card-type-list li:focus {
-				background-color: #777;
-				/* 暗色背景颜色 */
-				color: #fff;
-				/* 高亮字体颜色 */
-			}
-
-			/* 最后一个列表项的底部边框 */
-			#card-type-list li:last-child {
-				border-bottom: none;
-			}
-
-			.grid-background {
-				background-color: #292929;
-				background-image:
-					linear-gradient(to right, black 1px, transparent 1px),
-					linear-gradient(to bottom, black 1px, transparent 1px),
-					linear-gradient(to right, #404040 1px, transparent 1px),
-					linear-gradient(to bottom, #404040 1px, transparent 1px);
-				background-size:
-					100px 100px,
-					100px 100px,
-					10px 10px,
-					10px 10px;
-				width: 100%;
-				height: 100%;
-			}
-
-			.draggable {
-				cursor: grab;
-			}
-
-			.node {
-
-				cursor: pointer;
-			}
-
-			.link {
-				stroke: black;
-				stroke-width: 2;
-			}
-
-			.card {
-				/* fill: lightgrey;
-			stroke: black; */
-
-				stroke-width: 1;
-				user-select: none;
-			}
-
-			text {
-				pointer-events: none;
-				user-select: none;
-			}
-		</style>
-	</head>
-
-	<body>
-		<!-- 弹窗容器 -->
-		<div id="card-creation-modal"
-			style="display:none; position: absolute; border: 1px solid #ccc; background-color: #fff; padding: 10px; z-index: 100;">
-			<!-- 搜索结果列表 -->
-			<ul id="card-type-list"></ul>
-		</div>
-
-
-
-		<svg style="width: 100%;height: 100%;" id="svgContainer" class="grid-background">
-			<g id="linksContainer"></g> <!-- 用于存放线条 -->
-			<g id="cardsContainer"></g> <!-- 用于存放卡片 -->
-		</svg>
-
-		<script>
-			var cards = [{
-					id: 'card0',
-					x: 0,
-					y: 0,
-					label: 'Start',
-					type: "start",
-					nodes: [{
-						type: "out",
-						level: 0,
-						enumType: 'call',
-						color: '#fff',
-						multiConnected: 1
-					}, ],
-					titleBarColor: ['#84fab0', '#8fd3f4']
-				},
-				{
-					id: 'card1',
-					x: 100,
-					y: 200,
-					label: 'Condition',
-					type: "condition",
-					nodes: [{
-							type: "in",
-							level: 0,
-							enumType: 'call',
-							color: '#fff'
-						},
-						{
-							type: "in",
-							level: 1,
-							enumType: 'int',
-							color: '#28C76F',
-							slot: 'input',
-							label: 'int',
-							multiConnected: 1
-						},
-						{
-							type: "in",
-							level: 2,
-							enumType: 'int',
-							color: '#28C76F',
-							slot: 'input',
-							label: 'int',
-							multiConnected: 1
-						},
-						{
-							type: "out",
-							level: 0,
-							enumType: 'call',
-							color: '#fff'
-						},
-						{
-							type: "out",
-							level: 1,
-							enumType: 'bool',
-							color: '#0396FF',
-							label: 'bool',
-							multiConnected: 1
-						},
-					],
-					titleBarColor: ['#fccb90', '#d57eeb']
-				},
-				{
-					id: 'card2',
-					x: 300,
-					y: 400,
-					label: 'BoolToString',
-					type: "call",
-					nodes: [{
-							type: "in",
-							level: 0,
-							enumType: 'call',
-							color: '#fff'
-						},
-						{
-							type: "in",
-							level: 1,
-							enumType: 'bool',
-							color: '#0396FF',
-							label: 'bool',
-							multiConnected: 1
-						},
-						{
-							type: "out",
-							level: 0,
-							enumType: 'call',
-							color: '#fff'
-						},
-						{
-							type: "out",
-							level: 1,
-							enumType: 'string',
-							color: '#DE4313',
-							label: 'string',
-							multiConnected: 1
-						}
-					],
-					titleBarColor: ['#3C8CE7', '#00EAFF']
-
-				},
-				{
-					id: 'card3',
-					x: 100,
-					y: 300,
-					label: 'Print',
-					type: "print",
-					nodes: [{
-							type: "in",
-							level: 0,
-							enumType: 'call',
-							color: '#fff'
-						},
-						{
-							type: "in",
-							level: 1,
-							enumType: 'string',
-							color: '#DE4313',
-							label: 'string',
-							multiConnected: 1
-						}
-					],
-					titleBarColor: ['#f6d365', '#fda085']
-				}
-			];
-
-
-			var links = [];
-			var currentLink = null;
-			var isDragging = false;
-			var isLinking = false;
-			var dragOffsetX, dragOffsetY;
-			var currentCard;
-
-			function init() {
-				drawLinks();
-				drawCards();
-				attachEventListeners();
-			}
-
-			function drawCards() {
-				const cardsContainer = document.getElementById('cardsContainer');
-				cardsContainer.innerHTML = ''; // 清除现有的卡片
-
-				cards.forEach(card => {
-
-					//创建标题栏渐变色
-					const defs = document.createElementNS('http://www.w3.org/2000/svg', 'defs');
-					const linearGradient = document.createElementNS('http://www.w3.org/2000/svg', 'linearGradient');
-					linearGradient.setAttribute('id', `titleGradient-${card.id}`);
-					linearGradient.setAttribute('x1', '0%'); // 渐变起点的x坐标
-					linearGradient.setAttribute('y1', '100%'); // 渐变起点的y坐标
-					linearGradient.setAttribute('x2', '100%'); // 渐变终点的x坐标
-					linearGradient.setAttribute('y2', '0%'); // 渐变终点的y坐标
-
-					const stop1 = document.createElementNS('http://www.w3.org/2000/svg', 'stop');
-					stop1.setAttribute('offset', '10%');
-					stop1.setAttribute('style', `stop-color: ${card.titleBarColor[0]}; stop-opacity: 1`);
-					linearGradient.appendChild(stop1);
-
-					const stop2 = document.createElementNS('http://www.w3.org/2000/svg', 'stop');
-					stop2.setAttribute('offset', '100%');
-					stop2.setAttribute('style', `stop-color: ${card.titleBarColor[1]}; stop-opacity: 1`);
-					linearGradient.appendChild(stop2);
-
-					defs.appendChild(linearGradient);
-					cardsContainer.appendChild(defs);
-
-
-
-					const nodeSpacing = 50;
-					const topBottomPadding = 20;
-					const titleBarHeight = 30; // 标题栏高度
-					const maxLevel = Math.max(...card.nodes.map(node => node.level)) + 1;
-					const cardHeight = maxLevel * nodeSpacing + topBottomPadding * 2 + titleBarHeight;
-
-					const group = document.createElementNS('http://www.w3.org/2000/svg', 'g');
-					group.setAttribute('class', 'draggable card-container');
-					group.setAttribute('data-id', card.id);
-					group.setAttribute('user-select', 'none');
-					group.setAttribute('transform', `translate(${card.x},${card.y})`);
-
-					const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-					rect.setAttribute('fill', '#222');
-					rect.setAttribute('width', 150);
-					rect.setAttribute('style', 'cursor: auto;');
-					rect.setAttribute('height', cardHeight);
-					rect.setAttribute('rx', 10); // 圆角
-					rect.setAttribute('ry', 10);
-					group.appendChild(rect);
-
-					// 使用path绘制带有指定圆角的矩形
-					// 创建标题栏
-					const titleBarWidth = 150;
-					const borderRadius = 10; // 圆角大小
-					const titleBar = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-					const dValue = `M 0,${borderRadius}
-                a ${borderRadius},${borderRadius} 0 0 1 ${borderRadius},-${borderRadius}
-                h ${titleBarWidth - borderRadius * 2}
-                a ${borderRadius},${borderRadius} 0 0 1 ${borderRadius},${borderRadius}
-                v ${titleBarHeight - borderRadius}
-                h -${titleBarWidth}
-                z`;
-					titleBar.setAttribute('class', 'card');
-					titleBar.setAttribute('d', dValue);
-					titleBar.setAttribute('fill', `url(#titleGradient-${card.id})`);
-					group.appendChild(titleBar);
-
-					const text = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-					text.setAttribute('x', titleBarWidth / 2);
-					text.setAttribute('y', titleBarHeight / 2);
-					text.setAttribute('text-anchor', 'middle');
-					text.setAttribute('alignment-baseline', 'middle');
-					text.textContent = card.label;
-					group.appendChild(text);
-
-					card.nodes.forEach((node, index) => {
-
-
-						const circle = document.createElementNS('http://www.w3.org/2000/svg', 'circle');
-						circle.setAttribute('class', 'node');
-						circle.setAttribute('cx', node.type === 'in' ? 0 : 150);
-						circle.setAttribute('cy', topBottomPadding + titleBarHeight + (node.level + 1) *
-							nodeSpacing - (nodeSpacing / 2));
-						circle.setAttribute('r', 7);
-						circle.setAttribute('fill', node.color);
-						circle.setAttribute('data-card-id', card.id);
-						circle.setAttribute('data-node-id', `${card.id}-node${index + 1}`);
-						group.appendChild(circle);
-
-						var labelX = node.type === 'in' ? 12 : 138; // 基本的X坐标
-						const labelY = topBottomPadding + titleBarHeight + node.level * nodeSpacing + 21;
-
-						// 创建SVG文本元素
-						const multiConnectedLabel = document.createElementNS('http://www.w3.org/2000/svg',
-							'text');
-						multiConnectedLabel.setAttribute('x', labelX);
-						multiConnectedLabel.setAttribute('y', labelY);
-						multiConnectedLabel.setAttribute('text-anchor', 'middle');
-						multiConnectedLabel.setAttribute('fill', '#aaa');
-						multiConnectedLabel.setAttribute('style', 'font-size: 8px;');
-						multiConnectedLabel.setAttribute('alignment-baseline', 'hanging');
-
-
-						// 计算文本的宽度（假定的，因为SVG没有直接获取文本宽度的方法）
-						var estimatedTextLength;
-						if (node.multiConnected == undefined) {
-							estimatedTextLength = 20
-							multiConnectedLabel.textContent = 'N';
-						} else {
-							estimatedTextLength = node.multiConnected.length;
-							multiConnectedLabel.textContent = node.multiConnected;
-						}
-
-						// 确保文本不会超出卡片右边界
-						if (labelX + estimatedTextLength / 2 > 150) {
-							labelX = 150 - estimatedTextLength / 2;
-							nodeLabel.setAttribute('x', labelX);
-						}
-
-						// 确保文本不会超出卡片左边界
-						if (labelX - estimatedTextLength / 2 < 0) {
-							labelX = estimatedTextLength / 2;
-							nodeLabel.setAttribute('x', labelX);
-						}
-
-						group.appendChild(multiConnectedLabel);
-
-						if (node.label != undefined) {
-							// 计算文本标签的位置
-							var labelX = node.type === 'in' ? 15 : 135; // 基本的X坐标
-							const labelY = topBottomPadding + titleBarHeight + node.level * nodeSpacing + 40;
-
-							// 创建SVG文本元素
-							const nodeLabel = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-							nodeLabel.setAttribute('x', labelX);
-							nodeLabel.setAttribute('y', labelY); // 在节点下方留出一定空间
-							nodeLabel.setAttribute('text-anchor', 'middle'); // 文本居中对齐
-							nodeLabel.setAttribute('fill', '#aaa'); // 文本居中对齐
-							nodeLabel.setAttribute('alignment-baseline', 'hanging');
-							nodeLabel.textContent = node.label;
-
-							// 计算文本的宽度（假定的，因为SVG没有直接获取文本宽度的方法）
-							const estimatedTextLength = node.label.length * 10; // 估算每个字符6像素宽
-
-							// 确保文本不会超出卡片右边界
-							if (labelX + estimatedTextLength / 2 > 150) {
-								labelX = 150 - estimatedTextLength / 2;
-								nodeLabel.setAttribute('x', labelX);
-							}
-
-							// 确保文本不会超出卡片左边界
-							if (labelX - estimatedTextLength / 2 < 0) {
-								labelX = estimatedTextLength / 2;
-								nodeLabel.setAttribute('x', labelX);
-							}
-
-							group.appendChild(nodeLabel);
-
-						}
-
-						switch (node.slot) {
-							case 'input':
-								const foreignObject = document.createElementNS('http://www.w3.org/2000/svg',
-									'foreignObject');
-								foreignObject.setAttribute('x', 0);
-								foreignObject.setAttribute('y', topBottomPadding + titleBarHeight + node.level *
-									nodeSpacing + 12);
-								foreignObject.setAttribute('width', 130); // 保持原始宽度
-								foreignObject.setAttribute('height', nodeSpacing - 24); // 保持原始高度，减去的24像素为上下内边距之和
-								const input = document.createElement('input');
-								input.type = 'text';
-								if (node.value == undefined) {
-									node.value = '';
-								}
-								input.value = node.value;
-								input.addEventListener('input', function() {
-									node.value = input.value;
-								});
-								// Set adjusted input styles
-								input.style.width = '110px';
-								input.style.height = '100%';
-								input.style.marginLeft = '20px';
-								input.style.borderRadius = '5px';
-								input.style.border = '1px solid white';
-								input.style.backgroundColor = '#222';
-								input.style.color = 'white';
-								input.style.fontSize = '1em';
-								input.style.padding = '0px'; // 可能需要调整或去除内边距以适应固定尺寸
-								input.style.boxSizing = 'border-box'; // 确保宽高包含内容、内边距和边框
-
-								// Change border color on focus and blur
-								input.addEventListener('focus', () => {
-									input.style.outline = 'none'; // Remove default focus outline
-									input.style.borderColor =
-										'white'; // Keep border color white on focus
-								});
-
-								input.addEventListener('blur', () => {
-									input.style.borderColor =
-										'white'; // Revert to white when not focused
-								});
-
-								// 阻止事件冒泡
-								input.addEventListener('click', function(event) {
-									event.stopPropagation();
-								});
-
-								input.addEventListener('mousedown', function(event) {
-									event.stopPropagation();
-								});
-
-								input.addEventListener('touchstart', function(event) {
-									event.stopPropagation();
-								});
-
-								foreignObject.appendChild(input);
-								group.appendChild(foreignObject);
-								break;
-						}
-
-
-
-					});
-
-					const deleteIcon = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-					deleteIcon.setAttribute('class', 'card-delete-icon');
-					deleteIcon.setAttribute('x', 125);
-					deleteIcon.setAttribute('y', 5); // 使其贴近标题栏的右上角
-					deleteIcon.setAttribute('width', 20);
-					deleteIcon.setAttribute('height', 20);
-					deleteIcon.setAttribute('fill', 'transparent');
-					deleteIcon.setAttribute('data-card-id', card.id);
-					deleteIcon.setAttribute('style', 'cursor: pointer;');
-					group.appendChild(deleteIcon);
-
-					const delText = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-					delText.setAttribute('x', 135);
-					delText.setAttribute('y', 20); // 调整位置以垂直居中
-					delText.setAttribute('text-anchor', 'middle');
-					delText.setAttribute('fill', 'white');
-					delText.setAttribute('font-size', '16px'); // 适当调整字体大小以适应图标
-					delText.setAttribute('pointer-events', 'none'); // 确保点击事件只触发于删除图标上
-					delText.textContent = '×';
-					group.appendChild(delText);
-
-					cardsContainer.appendChild(group);
-				});
-
-				attachNodeEventListeners();
-			}
-
-
-
-			function drawLinks() {
-				const linksContainer = document.getElementById('linksContainer');
-				linksContainer.innerHTML = ''; // 清除现有的线条
-				// 清除旧的删除图标
-				document.querySelectorAll('.delete-icon').forEach(icon => icon.remove());
-
-				links.forEach((link, index) => {
-					const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-					//path.setAttribute('class', 'link');
-					path.setAttribute('stroke', link.target.color)
-					path.setAttribute('stroke-width', 5)
-					path.setAttribute('fill', 'none');
-
-
-					const isCallType = link.source.enumType === 'call';
-					if (isCallType) {
-						path.setAttribute('stroke-dasharray', '10');
-						path.setAttribute('stroke-dashoffset', '0');
-
-						// Add animation element to the path for dashed lines
-						const animate = document.createElementNS('http://www.w3.org/2000/svg', 'animate');
-						animate.setAttribute('attributeName', 'stroke-dashoffset');
-						animate.setAttribute('dur', '0.5s');
-						animate.setAttribute('repeatCount', 'indefinite');
-						animate.setAttribute('from', '20');
-						animate.setAttribute('to', '0');
-						path.appendChild(animate);
-					}
-
-
-					var dist;
-					// 使用动态计算的控制点距离来定义曲线,根据源点和终点的X坐标差异动态计算控制点的距离
-					if (link.source.type === 'out') {
-						if (link.source.x - link.target.x > 0) {
-							dist = 200; // 如果终点在源点的左侧，控制点距离更远
-						} else {
-							dist = Math.abs(link.target.x - link.source.x) * 0.3; // 否则，根据两点间的距离调整控制点距离
-						}
-						const d =
-							`M${link.source.x} ${link.source.y} C${link.source.x + dist} ${link.source.y} ${link.target.x - dist} ${link.target.y} ${link.target.x} ${link.target.y}`;
-						path.setAttribute('d', d);
-						linksContainer.appendChild(path);
-					} else {
-						if (link.target.x - link.source.x > 0) {
-							dist = 200; // 如果终点在源点的右侧，控制点距离更远
-						} else {
-							dist = Math.abs(link.target.x - link.source.x) * 0.3; // 否则，根据两点间的距离调整控制点距离
-						}
-						const d =
-							`M${link.source.x} ${link.source.y} C${link.source.x - dist} ${link.source.y} ${link.target.x + dist} ${link.target.y} ${link.target.x} ${link.target.y}`;
-						path.setAttribute('d', d);
-						linksContainer.appendChild(path);
-					}
-
-
-					// 计算中点
-					const midX = (link.source.x + link.target.x) / 2;
-					const midY = (link.source.y + link.target.y) / 2;
-
-					// 绘制删除图标
-					const deleteIcon = document.createElementNS('http://www.w3.org/2000/svg', 'circle');
-					deleteIcon.setAttribute('class', 'delete-icon');
-					deleteIcon.setAttribute('cx', midX);
-					deleteIcon.setAttribute('cy', midY);
-					deleteIcon.setAttribute('style', "cursor: pointer;");
-					deleteIcon.setAttribute('r', 10);
-					deleteIcon.setAttribute('fill', 'red');
-					deleteIcon.setAttribute('data-link-level', index); // 用于标识该删除图标对应的线
-					linksContainer.appendChild(deleteIcon);
-
-					// 可以选择添加一个×文本在圆圈中间
-					const text = document.createElementNS('http://www.w3.org/2000/svg', 'text');
-					text.setAttribute('x', midX);
-					text.setAttribute('y', midY + 5); // 轻微调整以垂直居中
-					text.setAttribute('text-anchor', 'middle');
-					text.setAttribute('fill', 'white');
-					text.setAttribute('font-size', '15px');
-					text.setAttribute('pointer-events', 'none'); // 确保点击事件只触发于圆圈上
-					text.textContent = '×';
-					linksContainer.appendChild(text);
-
-				});
-			}
-
-			// 定义变量来追踪是否正在拖动以及拖动的起始位置
-			var isPanning = false;
-			var startPan = {
-				x: 0,
-				y: 0
-			};
-
-			// 用于调整SVG视图窗口的变量
-			var currentPan = {
-				x: 0,
-				y: 0
-			};
-
-			function attachEventListeners() {
-
-				const svgContainer = document.getElementById('svgContainer');
-				document.querySelectorAll('.link').forEach(link => {
-					link.addEventListener('contextmenu', function(e) {
-						e.preventDefault(); // 阻止默认的右键菜单
-						const linkId = e.target.getAttribute('data-link-id'); // 确保你在绘制线条时添加了 data-link-id 属性
-						showContextMenu(e.clientX, e.clientY, linkId);
-					});
-				});
-				document.getElementById('svgContainer').addEventListener('click', function(e) {
-					if (e.target.classList.contains('delete-icon')) {
-						// 获取点击的删除图标对应的线的索引
-						const linkIndex = e.target.getAttribute('data-link-level');
-						// 从数组中移除该线
-						links.splice(linkIndex, 1);
-						// 重新绘制剩余的线和删除图标
-						drawLinks();
-						drawCards(); // 如果你的线条与卡片有关联，可能需要重新绘制卡片以更新视图
-					} else if (e.target.classList.contains('card-delete-icon')) {
-						// 获取点击的删除图标对应的卡片ID
-						const cardId = e.target.getAttribute('data-card-id');
-						// 从`cards`数组中移除对应的卡片
-						cards = cards.filter(card => card.id !== cardId);
-						// 同时移除所有与该卡片连接的线
-						links = links.filter(link => !(link.source.node.startsWith(cardId) || (link.target && link.target
-							.node.startsWith(cardId))));
-						// 重新绘制卡片和线
-						drawLinks();
-						drawCards();
-					} else {
-						var targetCardContainer = e.target.closest('.card-container');
-						if (targetCardContainer) {
-							const cardId = targetCardContainer.getAttribute('data-id');
-							// 将SVG元素移动到最后，使其在视觉上显示在最前面
-							targetCardContainer.parentNode.appendChild(targetCardContainer);
-
-							// 更新cards数组，将点击的卡片移动到数组的末尾
-							const cardIndex = cards.findIndex(card => card.id === cardId);
-							if (cardIndex > -1) {
-								const card = cards.splice(cardIndex, 1)[0];
-								cards.push(card);
-							}
-
-							// 这里不需要立即调用drawCards或drawLinks，
-							// 除非你需要根据cards数组的新顺序进行其他更新
-						}
-					}
-				});
-
-				svgContainer.addEventListener('contextmenu', function(e) {
-					e.preventDefault(); // 阻止右键菜单
-				});
-
-				svgContainer.addEventListener('mousedown', e => {
-
-					// 检查是否是鼠标右键点击
-
-					const target = e.target;
-					if (e.button === 2) {
-						isPanning = true;
-						startPan.x = e.clientX - currentPan.x;
-						startPan.y = e.clientY - currentPan.y;
-					} else if (target
-
-						.classList.contains('card') || target.tagName === 'text') {
-						const cardContainer = target.closest('.card-container');
-						const cardId = cardContainer.getAttribute('data-id');
-						startDragCard(e, cardId);
-					}
-				});
-				document.addEventListener('mousemove', e => {
-					if (isPanning) {
-						// 正确计算新的视图窗口位置
-						currentPan.x = e.clientX - startPan.x;
-						currentPan.y = e.clientY - startPan.y;
-
-						// 正确调整SVG的viewBox来实现拖动效果
-						// 这里需要更新的是开始拖动的点，而不是当前的点，因此我们反向更新
-						svgContainer.setAttribute('viewBox',
-							`${-currentPan.x} ${-currentPan.y} ${svgContainer.clientWidth} ${svgContainer.clientHeight}`
-						);
-						svgContainer.style.backgroundPosition = `${currentPan.x % 100}px ${currentPan.y % 100}px`;
-					} else if (isDragging) {
-						moveCard(e);
-					} else if (isLinking && currentLink) {
-						updateLink(e);
-					}
-				});
-
-				document.addEventListener('mouseup', e => {
-					if (e.button === 2) {
-						console.log(currentPan);
-						isPanning = false;
-					} else if (isDragging) {
-						endDragCard();
-					} else if (isLinking) {
-						endDragLink(e);
-					}
-				});
-			}
-
-			function startDragCard(e, cardId) {
-				isDragging = true;
-				const card = cards.find(c => c.id === cardId);
-				currentCard = card;
-
-				const svgRect = svgContainer.getBoundingClientRect();
-				dragOffsetX = e.clientX - svgRect.left - card.x;
-				dragOffsetY = e.clientY - svgRect.top - card.y;
-			}
-
-			function moveCard(e) {
-				const svgRect = svgContainer.getBoundingClientRect();
-				currentCard.x = e.clientX - svgRect.left - dragOffsetX;
-				currentCard.y = e.clientY - svgRect.top - dragOffsetY;
-
-				// Update link positions associated with the currentCard
-				links.forEach(link => {
-					if (link.source.node.startsWith(currentCard.id)) {
-						// 根据节点ID更新链接的源位置
-						const nodeIndex = parseInt(link.source.node.split('-node')[1]) - 1;
-						const nodeConfig = currentCard.nodes[nodeIndex]; // 获取当前节点的配置
-						const nodeSpacing = 50; // 节点间隔，应与drawCards函数中使用的相同
-						const topBottomPadding = 20; // 顶部和底部的边距，应与drawCards函数中使用的相同
-						link.source.x = currentCard.x + (nodeConfig.type === "in" ? 0 : 150); // 根据节点类型调整x坐标
-						link.source.y = 30 + currentCard.y + topBottomPadding + (nodeConfig.level + 1) * nodeSpacing - (
-							nodeSpacing / 2); // 根据节点的index调整y坐标
-					}
-					if (link.target && link.target.node.startsWith(currentCard.id)) {
-						// 根据节点ID更新链接的目标位置
-						const nodeIndex = parseInt(link.target.node.split('-node')[1]) - 1;
-						const nodeConfig = currentCard.nodes[nodeIndex]; // 获取当前节点的配置
-						link.target.x = currentCard.x + (nodeConfig.type === "in" ? 0 : 150); // 根据节点类型调整x坐标
-						link.target.y = 30 + currentCard.y + 20 + (nodeConfig.level + 1) * 50 - (50 /
-							2); // 根据节点的index调整y坐标
-					}
-				});
-
-				drawLinks(); // Redraw links to reflect updated positions
-				drawCards(); // Redraw cards and nodes
-			}
-
-
-
-			function endDragCard() {
-				isDragging = false;
-			}
-
-			function getNodeCurrentConnections(nodeId) {
-				var count = 0;
-				links.forEach(link => {
-					if (link.source.node === nodeId || (link.target && link.target.node === nodeId)) {
-						count++;
-					}
-				});
-				return count;
-			}
-
-			function startDragLink(e) {
-				e.stopPropagation(); // Prevent card drag
-
-				const nodeId = e.target.getAttribute('data-node-id');
-				const cardId = e.target.getAttribute('data-card-id');
-				const card = cards.find(c => c.id === cardId);
-				const nodeElement = e.target;
-				const node = card.nodes.find(n => `${card.id}-node${card.nodes.indexOf(n) + 1}` === nodeId);
-
-
-				// 检查源节点是否允许发起新的连接
-				const currentConnections = getNodeCurrentConnections(nodeId);
-				if (node.multiConnected !== -1 && currentConnections >= node.multiConnected) {
-					console.log('此节点不允许更多的连接。');
-					return; // 不允许创建新的连接
-				}
-				isLinking = true;
-
-				const svgRect = svgContainer.getBoundingClientRect();
-				const nodeX = e.clientX - svgRect.left;
-				const nodeY = e.clientY - svgRect.top;
-
-				currentLink = {
-					source: {
-						node: nodeId,
-						x: nodeX,
-						y: nodeY,
-						color: nodeElement.getAttribute('fill'),
-						type: node.type,
-						enumType: node.enumType
-					},
-					target: null
-				};
-			}
-
-			function updateLink(e) {
-				const svgRect = svgContainer.getBoundingClientRect();
-				currentLink.target = {
-					x: e.clientX - svgRect.left,
-					y: e.clientY - svgRect.top
-				};
-				drawCurrentLink();
-			}
-
-			function endDragLink(e) {
-				isLinking = false;
-				const svgRect = svgContainer.getBoundingClientRect();
-				const x = e.clientX - svgRect.left;
-				const y = e.clientY - svgRect.top;
-
-				// 默认情况下，假设目标节点就是e.target
-				var targetNode = e.target;
-
-				// 检查e.target是否是我们期望的节点类型，如果不是，则尝试使用document.elementFromPoint
-				if (!targetNode.classList.contains('node')) {
-					e.target.style.display = 'none';
-					targetNode = document.elementFromPoint(e.clientX, e.clientY);
-					e.target.style.display = '';
-				}
-
-				var validTargetFound = false;
-
-				// 进行节点的有效性判断
-				if (targetNode && targetNode.classList.contains('node')) {
-					const sourceNodeId = currentLink.source.node;
-					const targetNodeId = targetNode.getAttribute('data-node-id');
-
-					// 从节点ID分解出卡片ID和节点索引
-					const sourceNodeParts = sourceNodeId.split('-node');
-					const targetNodeParts = targetNodeId.split('-node');
-					const sourceCard = cards.find(card => card.id === sourceNodeParts[0]);
-					const targetCard = cards.find(card => card.id === targetNodeParts[0]);
-
-					// 根据节点ID找到对应的节点对象
-					const sourceNodeIndex = parseInt(sourceNodeParts[1]) - 1;
-					const targetNodeIndex = parseInt(targetNodeParts[1]) - 1;
-					const sourceNode = sourceCard.nodes[sourceNodeIndex];
-					const targetNodeObj = targetCard.nodes[targetNodeIndex];
-
-					// 检查目标节点是否允许接受新的连接
-					const targetCurrentConnections = getNodeCurrentConnections(targetNodeId);
-					if (targetNodeObj.multiConnected !== -1 && targetCurrentConnections >= targetNodeObj.multiConnected) {
-						console.log('目标节点不允许更多的连接。');
-						// 移除临时绘制的连接线
-						const tempLink = document.querySelector('.temp-link');
-						if (tempLink) {
-							tempLink.remove();
-						}
-						currentLink = null;
-						drawLinks();
-						return;
-					}
-					// 确保目标节点不是起始节点自身，避免自连接
-					if (currentLink.source.node !== targetNodeId && sourceNode.enumType === targetNodeObj.enumType) {
-						validTargetFound = true;
-						currentLink.source.enumType = sourceNode.enumType;
-						currentLink.source.x = currentLink.source.x - currentPan.x;
-						currentLink.source.y = currentLink.source.y - currentPan.y;
-						// 更新连接的目标信息，并保存该连接
-						links.push({
-							...currentLink,
-							target: {
-								node: targetNodeId,
-								x: x - currentPan.x,
-								y: y - currentPan.y,
-								color: sourceNode.color,
-								enumType: sourceNode.enumType
-							}
-						});
-					}
-				} else {
-					const sourceNodeId = currentLink.source.node;
-					const sourceNodeParts = sourceNodeId.split('-node');
-					const sourceCard = cards.find(card => card.id === sourceNodeParts[0]);
-					const sourceNodeIndex = parseInt(sourceNodeParts[1]) - 1;
-					const sourceNode = sourceCard.nodes[sourceNodeIndex];
-					currentLink.source.enumType = sourceNode.enumType;
-					showCardCreationModal(e.clientX, e.clientY, currentLink.source);
-
-				}
-
-				const tempLink = document.querySelector('.temp-link');
-				if (tempLink) {
-					tempLink.remove();
-				}
-				currentLink = null;
-				drawLinks();
-			}
-
-
-
-
-
-
-			// 更新drawCurrentLink函数，增加线宽
-			// 更新drawCurrentLink函数，增加线宽
-			function drawCurrentLink() {
-				const tempLink = document.querySelector('.temp-link');
-				if (tempLink) tempLink.remove();
-
-				if (!currentLink || !currentLink.target) return;
-
-				const svgContainer = document.getElementById('svgContainer');
-				const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-				path.setAttribute('class', 'temp-link');
-				// 设置等宽线属性
-				path.setAttribute('stroke', currentLink.source.color);
-				path.setAttribute('stroke-width', 5);
-				path.setAttribute('fill', 'none');
-
-				// 计算考虑了平移偏移的起点和终点
-				const adjustedSourceX = currentLink.source.x - currentPan.x;
-				const adjustedSourceY = currentLink.source.y - currentPan.y;
-				const adjustedTargetX = currentLink.target.x - currentPan.x;
-				const adjustedTargetY = currentLink.target.y - currentPan.y;
-
-				// 更新路径以使用调整后的坐标
-				if (currentLink.source.type === 'out') {
-					const d =
-						`M${adjustedSourceX},${adjustedSourceY} C${adjustedSourceX + 100},${adjustedSourceY} ${adjustedTargetX - 100},${adjustedTargetY} ${adjustedTargetX},${adjustedTargetY}`;
-					path.setAttribute('d', d);
-				} else {
-					const d =
-						`M${adjustedSourceX},${adjustedSourceY} C${adjustedSourceX - 100},${adjustedSourceY} ${adjustedTargetX + 100},${adjustedTargetY} ${adjustedTargetX},${adjustedTargetY}`;
-					path.setAttribute('d', d);
-				}
-
-				svgContainer.appendChild(path);
-			}
-
-			function attachNodeEventListeners() {
-				document.querySelectorAll('.node').forEach(node => {
-					node.addEventListener('mousedown', startDragLink);
-				});
-			}
-
-			function populateCardTypeList(mouseX, mouseY, sourceNode) {
-				const listElement = document.getElementById('card-type-list');
-				listElement.innerHTML = ''; // 清空现有列表项
-				const addedTypes = new Set();
-
-				cards.forEach(card => {
-					if (!addedTypes.has(card.type)) {
-						const listItem = document.createElement('li');
-						listItem.tabIndex = 0; // 使元素能够获得焦点，以便能够监听键盘事件
-						listItem.textContent = card.label; // 使用卡片的标签或类型
-						listItem.onclick = function() {
-							createNewCard(card, mouseX, mouseY, sourceNode);
-							hideCardCreationModal(); // 新建卡片后隐藏模态框
-						};
-						listItem.onkeydown = function(event) {
-							if (event.key === 'Enter') {
-								createNewCard(card, mouseX, mouseY, sourceNode);
-								hideCardCreationModal(); // 新建卡片后隐藏模态框
-							}
-						};
-						listElement.appendChild(listItem);
-						addedTypes.add(card.type);
-					}
-				});
-			}
-
-
-			function showCardCreationModal(mouseX, mouseY, sourceNode) {
-				populateCardTypeList(mouseX, mouseY, sourceNode); // 填充卡片类型列表
-				const modal = document.getElementById('card-creation-modal');
-				// 在这里添加取消按钮
-				if (!document.getElementById('cancel-btn')) {
-					const cancelButton = document.createElement('button');
-					cancelButton.id = 'cancel-btn';
-					cancelButton.textContent = '取消';
-					cancelButton.onclick = function() {
-						hideCardCreationModal();
-					};
-					modal.appendChild(cancelButton);
-				}
-
-
-
-				// 设置弹出框的位置
-				modal.style.left = mouseX + 'px';
-				modal.style.top = mouseY + 'px';
-				modal.style.display = 'block'; // 显示弹窗
-			}
-
-			function createNewCard(cardTemplate, mouseX, mouseY, sourceNode) {
-				const newCard = {
-					...cardTemplate,
-					nodes: JSON.parse(JSON.stringify(cardTemplate.nodes)), // 深拷贝nodes属性
-					id: 'card' + (cards.length + 1)
-				};
-				// 将每个node的value设置为空字符串
-				newCard.nodes.forEach(node => {
-					node.value = '';
-				});
-				newCard.x = mouseX - 75 - currentPan.x; // 调整为鼠标中心
-				newCard.y = mouseY - 15 - currentPan.y; // 调整为鼠标中心
-				cards.push(newCard); // 将新创建的卡片添加到卡片列表中
-
-				// 如果提供了sourceNode，找到新卡片的合适target node并创建连接
-				if (sourceNode) {
-					sourceNode.x -= currentPan.x;
-					sourceNode.y -= currentPan.y;
-					var targetNode = newCard.nodes.find(node => node.enumType === sourceNode.enumType && node.type === 'in');
-					if (targetNode) {
-						links.push({
-							source: sourceNode,
-							target: {
-								node: `${newCard.id}-node${newCard.nodes.indexOf(targetNode) + 1}`,
-								x: newCard.x + (targetNode.type === 'in' ? 0 : 150),
-								y: newCard.y + 30 + 20 + (targetNode.level + 1) * 50 - 25,
-								color: targetNode.color,
-								enumType: targetNode.enumType
-							}
-						});
-					}
-				}
-
-
-				drawLinks();
-				drawCards();
-			}
-
-
-
-			function hideCardCreationModal() {
-				const modal = document.getElementById('card-creation-modal');
-				modal.style.display = 'none'; // 隐藏弹窗
-			}
-
-			init();
-		</script>
-	</body>
-
-</html>
@@ -133,18 +133,19 @@ p {
 } */
 .container-fluid {
-  /* height: 52px; */
+  height: 52px;
+  width: 105px;
   padding: 14px 0;
   border-color: #40a3fc;
   background: #40a3fc;
-  /* border-radius: 26px; */
+  border-radius: 26px;
   box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.17);
   font-size: 1.2em;
   display: flex;
   justify-content: center;
   align-items: center;
-  margin: 0 10px;
   color: #fff !important;
+  margin-top:400px;
 }
 .login-form_ownid {
@@ -429,7 +430,7 @@ p {
 /*  */
 .invitation {
   padding: 40px 15px;
-  width: 420px;
+  width: 100%;
   background-color: #169bd5;
 }
@@ -442,7 +443,7 @@ p {
   background: url(../images/call_bg.png) no-repeat;
   background-position: center;
   background-size: initial;
-  border-radius: 20px;
+  /*border-radius: 20px;*/
   box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.3);
 }
@@ -1325,13 +1325,14 @@ var OperationPackge = {
   },
   p2p: {
     // 语音呼叫
-    makeVoiceCall: async function () {
+    makeVoiceCall: async function (calleeId) {
       // 关闭设置
       await OperationPackge.p2p.closeSeting();
       // 获取输入的用户
-      var oPeerId = await OperationPackge.p2p.getPeerUserId();
+      /*var oPeerId = await OperationPackge.p2p.getPeerUserId();*/
       // 查询输入用户合法性
-      Store.peerUserId = await OperationPackge.p2p.peerUserVaplidity(oPeerId);
+      console.log("呼叫:"+calleeId)
+      Store.peerUserId = await OperationPackge.p2p.peerUserVaplidity(calleeId);
       if (Store.peerUserId) {
         Store.repetitionClick = true;
         Store.network = Object.assign(Store.network, {
@@ -2783,9 +2784,10 @@ var OperationPackge = {
   Utils.inputChangId("#userInputs > input");
   // 语音呼叫
   $("#p2pAudioMakeCall").click(function () {
+    var calleeId=$(this).val();
     if (navigator.onLine && Store.lineworkRTC && Store.lineworkRTM) {
       if (!Store.repetitionClick) {
-        OperationPackge.p2p.makeVoiceCall();
+        OperationPackge.p2p.makeVoiceCall(calleeId);
       }
     } else {
       // 页面提示
@@ -32,7 +32,7 @@
     >
       <!--  -->
-      <div class="login d-flex flex-row align-items-stretch">
+      <div>
         <!-- 警告框 -->
         <div class="warning_box" id="warningBox"></div>
         <!--  --> 
@@ -726,4 +726,11 @@
     </div>
     <script src="/real_control_v2/call/assets/js/index.js"></script>
   </body>
+<script>
+  (function() {
+    const urlParams = new URLSearchParams(window.location.search);
+    const calleeId = urlParams.get('calleeId');
+    $("#p2pAudioMakeCall").val(calleeId);
+  })();
+</script>
 </html>
@@ -1006,6 +1006,72 @@ option.oil_station_opt {
     margin-right: 5px;
 }
+
+.multi_plat_msg_pops .tests {
+    display: block;
+}
+
+
+/** 智能调度 */
+.multi_plat_msg_pop_zndd {
+    position: absolute;
+    right: 12px;
+    bottom: 12px;
+    z-index: 99;
+}
+
+/** 催發 */
+.multi_plat_msg_pop_cf {
+    position: absolute;
+    right: 12px;
+    bottom: 12px;
+    z-index: 99;
+    background: #ffffff
+}
+
+.multi_plat_msg_pop_klyj {
+    position: absolute;
+    right: 12px;
+    bottom: 12px;
+    z-index: 99;
+    background: #ffffff
+}
+
+ .multi_plat_msg_pops {
+    color: grey;
+    margin: 7px 0;
+    padding: 7px 12px;
+    cursor: pointer;
+    min-width: 200px;
+    box-sizing: border-box;
+    min-height: 60px;
+    border-radius: 5px;
+    background-color: #e0effd;
+}
+
+
+.multi_plat_msg_pops .desc {
+    display: block;
+    font-size: 12px;
+    color: #ff9d9d;
+    text-align: right;
+    margin-right: 5px;
+}
+.multi_plat_msg_pops .time {
+    display: block;
+    font-size: 12px;
+    color: darkgray;
+    margin-right: 5px;
+}
+.multi_plat_msg_pops .reminder {
+    display: block;
+    font-size: 15px;
+    color: red;
+    margin-right: 5px;
+}
+
+
+
 /** 嵌入表单modal滚动条样式 */
 #formFragmentModal::-webkit-scrollbar {
     width: 10px;
+<div class="uk-modal" id="notice_add_mobal">
+	<div class="uk-modal-dialog" style="width: 600px;">
+		<a href="" class="uk-modal-close uk-close"></a>
+		<div class="uk-modal-header">
+			<h2>添加公告</h2>
+		</div>
+		<div class="uk-form uk-form-horizontal" id="report_register_form">
+			<form id="add_head_table">
+				<input type="hidden" name="NOTICE_BBR" id="NOTICE_BBR" value="">
+				<input type="hidden" name="NOTICE_XLNAME" id="NOTICE_XLNAME" value="">
+
+				<!-- 报备时间 -->
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							报备时间:
+						</label>
+						<div class="uk-form-controls">
+							<input type="text" class="form-control" name="NOTICE_DATE" id="NOTICE_DATE"  readonly="readonly">
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							公告截止:
+						</label>
+						<div class="uk-form-controls">
+							<input class="form-control" type="text" name="NOTICE_TIME" id="NOTICE_TIME">
+						</div>
+					</div>
+				</div>
+				<!-- 类型 -->
+				<div class="uk-grid uk-width-2-3 uk-container-center" hidden>
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							类型:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control typeSelect"  name="NOTICE_TYPE"  id="NOTICE_TYPE">
+								<option value="1">突发事件</option>
+								<option value="2">区域公告</option>
+							</select>
+						</div>
+					</div>
+				</div>
+			</form>
+
+			<!-- 突发事件-->
+			<form id="add_emergency_table" class="c_register_form" style="display:none; margin-top: 35px;">
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							线路:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control lineSelect"  name="NOTICE_XL"  id="NOTICE_XL">
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							方向:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control typeSelect"  name="NOTICE_XSFX"  id="NOTICE_XSFX" >
+								<option value="0">上行</option>
+								<option value="1">下行</option>
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							突发事件:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control typeSelect"  name="NOTICE_TFSJ"  id="NOTICE_TFSJ" >
+								<option value="1">重大活动</option>
+								<option value="2">恶劣天气</option>
+								<option value="3">交通事故</option>
+								<option value="3">道路拥堵</option>
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							事件影响:
+						</label>
+						<div class="uk-form-controls">
+						<select class="form-control typeSelect"  name="NOTICE_SJYX"  id="NOTICE_SJYX" >
+							<option value="1">临时改道</option>
+							<option value="2">班次延误</option>
+						</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							影响站点:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control lineSelect"  name="NOTICE_STATION"  id="NOTICE_STATION" >
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-modal-footer uk-text-right">
+					<span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
+					<button type="button" class="uk-button uk-modal-close">取消</button>
+					<button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button>
+				</div>
+			</form>
+			<!-- 区域公告-->
+			<form id="add_regional_table" class="c_register_form" style="display:none; margin-top: 35px;">
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							区域:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control lineSelect"  name="NOTICE_QY"  id="NOTICE_QY">
+								<option value='0'>全部</option>
+								<option value='1'>区域1</option>
+								<option value='2'>区域2</option>
+								<option value='3'>区域3</option>
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							公告信息:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control typeSelect"  name="NOTICE_GG"  id="NOTICE_GG"  style="max-width: 220px">
+								<option value="0">雨天路滑，安全出行。</option>
+								<option value="1">高峰时段，道路拥堵，请乘客合理安排出行。</option>
+								<option value="2">请先下后上，注意乘车安全。</option>
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-modal-footer uk-text-right">
+					<span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
+					<button type="button" class="uk-button uk-modal-close">取消</button>
+					<button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button>
+				</div>
+			</form>
+		</div>
+	</div>
+
+	<script>
+        (function () {
+            var modal = '#notice_add_mobal';
+            var tableActive = '',formActive = '';
+            var NOTICE_TYPE,
+				lineList = {},
+                user = {};
+			var stationRoutes = [];
+			//加载站点
+            $("#NOTICE_XL").on("change", function(){
+                var lineCode = $(this).val();
+				var direction = $('#NOTICE_XSFX').val();
+				loadStation(lineCode,direction);
+
+            });
+			$("#NOTICE_XSFX").on("change", function(){
+				var lineCode = $('#NOTICE_XL').val();
+				var direction = $(this).val();
+				loadStation(lineCode,direction);
+			});
+
+            $(modal).on('init', function (e, data) {
+                $('#NOTICE_DATE').datetimepicker({
+                    format : 'YYYY-MM-DD HH:mm:ss',
+                    locale : 'zh-cn'
+                });
+				$("#NOTICE_TIME").datetimepicker({
+					format : 'YYYY-MM-DD HH:mm:ss',
+					locale : 'zh-cn'
+				});
+				var dateTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss');
+				var d = new Date();
+				d.setTime(d.getTime() + 1*1000*60*60*24);
+				var dateTime2 = moment(d).format('YYYY-MM-DD HH:mm:ss');
+                $('#NOTICE_DATE').val(dateTime);
+				$("#NOTICE_TIME").val(dateTime2);
+                tableActive = "add_"+data.tableActive;
+                var typeInt = 1;
+				if (tableActive == 'add_emergency_table') {
+                    typeInt = 1;
+                } else if (tableActive == 'add_regional_table') {
+                    typeInt = 2;
+                }  else {
+                    UIkit.modal(modal).hide();
+                    notify_err('您所选的数据有问题，请重新选择！');
+                    return;
+				}
+                $('#NOTICE_TYPE').val(typeInt);
+                document.getElementById(tableActive).style.display = "";
+				user = data.user;
+				$('#NOTICE_BBR').val(user.userName+'/'+user.name);
+				//加载线路
+                lineList = data.lineList;
+				var options = '';
+				$.each(lineList, function (i,line) {
+					options += '<option value='+line.lineCode+'>'+line.name+'</option>';
+				});
+				$('#NOTICE_XL').html(options);
+				// 模拟change给公司分公司赋值
+				$('#NOTICE_XL').trigger("change");
+                changeType(tableActive);
+
+                $('#NOTICE_TYPE').on('change',function () {
+                    document.getElementById(tableActive).style.display = "none";
+                    NOTICE_TYPE = this.value;
+                    if (NOTICE_TYPE == 1) {
+                        tableActive = 'add_emergency_table';
+                    } else if (NOTICE_TYPE == 2) {
+                        tableActive = 'add_regional_table';
+                    }
+                    document.getElementById(tableActive).style.display = "";
+                    changeType(tableActive);
+                });
+            });
+
+			function loadStation(lineCode,direction){
+				//站点路由
+				stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(lineCode).sort(function (a, b) {
+					return a.stationRouteCode - b.stationRouteCode;
+				}), 'directions')[direction];
+				var options = '';
+				$.each(stationRoutes, function (i,station) {
+					options += '<option value='+station.stationCode+'>'+station.stationName+'</option>';
+				});
+				$('#NOTICE_STATION').html(options);
+				// 模拟change给公司分公司赋值
+				$('#NOTICE_STATION').trigger("change");
+			}
+            function changeType(tableActiveStr) {
+                formActive = $('#'+tableActiveStr);
+                //校验不过
+                formActive.on('err.field.fv', function () {
+                    $('#submitChildTaskBtn', modal).removeClass('disabled').removeAttr('disabled');
+                });
+
+                //校验
+                formActive.formValidation({framework: 'uikit', locale: 'zh_CN'});
+                //提交
+                formActive.on('success.form.fv', function (e) {
+                    e.preventDefault();
+                    var headData = $('#add_head_table').serializeJSON();
+                    var bodyData = $(formActive).serializeJSON();
+                    var params = {};
+                    Object.assign(params,headData,bodyData);
+                    params.STATUS = 0;
+                    gb_common.$post('/notice/', params, function (rs) {
+                        if(rs.status == 'SUCCESS'){
+                            UIkit.modal(modal).hide();
+                            notify_succ('新增成功！');
+                            manageJs.refreshDate();
+						} else
+                            notify_err('新增失败！');
+
+                    });
+                });
+            }
+
+            //submit
+            $('.submitBtn', modal).on('click', function () {
+                $(this).addClass('disabled').attr('disabled', 'disabled');
+                formActive.data('valid', false);
+                formActive.formValidation('validate');
+            });
+        })();
+	</script>
+</div>
 \ No newline at end of file
+
+.report-register-table1 dl dt:nth-of-type(1), .report-register-table1 dl dd:nth-of-type(1) {
+    width: 2%;
+}
+.report-register-table1 dl dt:nth-of-type(2), .report-register-table1 dl dd:nth-of-type(2) {
+    width: 4%;
+}
+.report-register-table1 dl dt:nth-of-type(3), .report-register-table1 dl dd:nth-of-type(3) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(4), .report-register-table1 dl dd:nth-of-type(4) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(5), .report-register-table1 dl dd:nth-of-type(5) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(6), .report-register-table1 dl dd:nth-of-type(6) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(7), .report-register-table1 dl dd:nth-of-type(7) {
+    width: 10%;
+}
+.report-register-table1 dl dt:nth-of-type(8), .report-register-table1 dl dd:nth-of-type(8) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(9), .report-register-table1 dl dd:nth-of-type(9) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(10), .report-register-table1 dl dd:nth-of-type(10) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(11), .report-register-table1 dl dd:nth-of-type(11) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(12), .report-register-table1 dl dd:nth-of-type(12) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(13), .report-register-table1 dl dd:nth-of-type(13) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(14), .report-register-table1 dl dd:nth-of-type(14) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(15), .report-register-table1 dl dd:nth-of-type(15) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(16), .report-register-table1 dl dd:nth-of-type(16) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(17), .report-register-table1 dl dd:nth-of-type(17) {
+    width: 7%;
+}
+.report-register-table1 dl dt:nth-of-type(18), .report-register-table1 dl dd:nth-of-type(18) {
+    width: 7%;
+}
+
+
+.report-register-table2 dl dt:nth-of-type(1), .report-register-table2 dl dd:nth-of-type(1) {
+    width: 2%;
+}
+.report-register-table2 dl dt:nth-of-type(2), .report-register-table2 dl dd:nth-of-type(2) {
+    width: 4%;
+}
+.report-register-table2 dl dt:nth-of-type(3), .report-register-table2 dl dd:nth-of-type(3) {
+    width: 7%;
+}
+.report-register-table2 dl dt:nth-of-type(4), .report-register-table2 dl dd:nth-of-type(4) {
+    width: 7%;
+}
+.report-register-table2 dl dt:nth-of-type(5), .report-register-table2 dl dd:nth-of-type(5) {
+    width: 7%;
+}
+.report-register-table2 dl dt:nth-of-type(6), .report-register-table2 dl dd:nth-of-type(6) {
+    width: 7%;
+}
+.report-register-table2 dl dt:nth-of-type(7), .report-register-table2 dl dd:nth-of-type(7) {
+    width: 7%;
+}
+.report-register-table2 dl dt:nth-of-type(8), .report-register-table2 dl dd:nth-of-type(8) {
+    width: 7%;
+}
+.report-register-table2 dl dt:nth-of-type(9), .report-register-table2 dl dd:nth-of-type(9) {
+    width: 7%;
+}
+.report-register-table2 dl dt:nth-of-type(10), .report-register-table2 dl dd:nth-of-type(10) {
+    width: 7%;
+}
+.report-register-table2 dl dt:nth-of-type(11), .report-register-table2 dl dd:nth-of-type(11) {
+    width: 7%;
+}
+
+.report-register-table3 dl dt:nth-of-type(1), .report-register-table3 dl dd:nth-of-type(1) {
+    width: 2%;
+}
+.report-register-table3 dl dt:nth-of-type(2), .report-register-table3 dl dd:nth-of-type(2) {
+    width: 4%;
+}
+.report-register-table3 dl dt:nth-of-type(3), .report-register-table3 dl dd:nth-of-type(3) {
+    width: 7%;
+}
+.report-register-table3 dl dt:nth-of-type(4), .report-register-table3 dl dd:nth-of-type(4) {
+    width: 7%;
+}
+.report-register-table3 dl dt:nth-of-type(5), .report-register-table3 dl dd:nth-of-type(5) {
+    width: 12%;
+}
+.report-register-table3 dl dt:nth-of-type(6), .report-register-table3 dl dd:nth-of-type(6) {
+    width: 7%;
+}
+.report-register-table3 dl dt:nth-of-type(7), .report-register-table3 dl dd:nth-of-type(7) {
+    width: 7%;
+}
+.report-register-table3 dl dt:nth-of-type(8), .report-register-table3 dl dd:nth-of-type(8) {
+    width: 7%;
+}
+.report-register-table3 dl dt:nth-of-type(9), .report-register-table3 dl dd:nth-of-type(9) {
+    width: 7%;
+}
+.report-register-table3 dl dt:nth-of-type(10), .report-register-table3 dl dd:nth-of-type(10) {
+    width: 7%;
+}
+
+.report-register-table4 dl dt:nth-of-type(1), .report-register-table4 dl dd:nth-of-type(1) {
+    width: 2%;
+}
+.report-register-table4 dl dt:nth-of-type(2), .report-register-table4 dl dd:nth-of-type(2) {
+    width: 4%;
+}
+.report-register-table4 dl dt:nth-of-type(3), .report-register-table4 dl dd:nth-of-type(3) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(4), .report-register-table4 dl dd:nth-of-type(4) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(5), .report-register-table4 dl dd:nth-of-type(5) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(6), .report-register-table4 dl dd:nth-of-type(6) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(7), .report-register-table4 dl dd:nth-of-type(7) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(8), .report-register-table4 dl dd:nth-of-type(8) {
+    width: 9%;
+}
+.report-register-table4 dl dt:nth-of-type(9), .report-register-table4 dl dd:nth-of-type(9) {
+    width: 12%;
+}
+.report-register-table4 dl dt:nth-of-type(10), .report-register-table4 dl dd:nth-of-type(10) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(11), .report-register-table4 dl dd:nth-of-type(11) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(12), .report-register-table4 dl dd:nth-of-type(12) {
+    width: 20%;
+}
+.report-register-table4 dl dt:nth-of-type(13), .report-register-table4 dl dd:nth-of-type(13) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(14), .report-register-table4 dl dd:nth-of-type(14) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(15), .report-register-table4 dl dd:nth-of-type(15) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(16), .report-register-table4 dl dd:nth-of-type(16) {
+    width: 7%;
+}
+.report-register-table4 dl dt:nth-of-type(17), .report-register-table4 dl dd:nth-of-type(17) {
+    width: 7%;
+}
+
+
+.report-register-table5 dl dt:nth-of-type(1), .report-register-table5 dl dd:nth-of-type(1) {
+    width: 2%;
+}
+.report-register-table5 dl dt:nth-of-type(2), .report-register-table5 dl dd:nth-of-type(2) {
+    width: 4%;
+}
+.report-register-table5 dl dt:nth-of-type(3), .report-register-table5 dl dd:nth-of-type(3) {
+    width: 7%;
+}
+.report-register-table5 dl dt:nth-of-type(4), .report-register-table5 dl dd:nth-of-type(4) {
+    width: 7%;
+}
+.report-register-table5 dl dt:nth-of-type(5), .report-register-table5 dl dd:nth-of-type(5) {
+    width: 7%;
+}
+
+
+.report-register-table6 dl dt:nth-of-type(1), .report-register-table6 dl dd:nth-of-type(1) {
+    width: 2%;
+}
+.report-register-table6 dl dt:nth-of-type(2), .report-register-table6 dl dd:nth-of-type(2) {
+    width: 4%;
+}
+.report-register-table6 dl dt:nth-of-type(3), .report-register-table6 dl dd:nth-of-type(3) {
+    width: 7%;
+}
+.report-register-table6 dl dt:nth-of-type(4), .report-register-table6 dl dd:nth-of-type(4) {
+    width: 7%;
+}
+.report-register-table6 dl dt:nth-of-type(5), .report-register-table6 dl dd:nth-of-type(5) {
+    width: 7%;
+}
+.report-register-table6 dl dt:nth-of-type(6), .report-register-table6 dl dd:nth-of-type(6) {
+    width: 7%;
+}
+.form-control {
+    display: block;
+    width: 100%;
+    height: 34px;
+    padding: 6px 12px;
+    font-size: 14px;
+    line-height: 1.42857;
+    color: #555555;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #c2cad8;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+    -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+    -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+    transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; }
 \ No newline at end of file
+<div class="uk-modal ct_move_modal" id="report-register-modal">
+    <!-- editable -->
+    <!--<link href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css" rel="stylesheet" type="text/css" />-->
+    <!-- Bootstrap style -->
+    <link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+    <!-- select2 下拉框插件 -->
+    <link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
+          rel="stylesheet" type="text/css" />
+    <link
+            href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css"
+            rel="stylesheet" type="text/css" />
+    <style>
+        /*ul.navigation_bar:before {*/
+        /*content: "报备类型";*/
+        /*position: absolute;*/
+        /*top: -9px;*/
+        /*font-size: 12px;*/
+        /*background: white;*/
+        /*padding: 0 4px;*/
+        /*color: #7d7b7b;*/
+        /*left: 10px;*/
+        /*}*/
+    </style>
+    <div class="uk-modal-dialog" style="width: 1800px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>报备登记报表</h2>
+        </div>
+
+
+        <div style="padding-left: 12px;margin: 10px 0">
+            <ul class="uk-subnav uk-subnav-pill navigation_bar">
+                <li id="first_last_late" class="uk-active"><a>首末班误点</a></li>
+                <li id="large_interval"><a>大间隔</a></li>
+                <li id="emergency"><a>突发事件</a></li>
+                <li id="detour"><a>绕改道</a></li>
+<!--                 <li id="accident"><a>事故</a></li> -->
+                <li id="rests"><a>其他</a></li>
+<!--                 <li id="consult"><a>咨询</a></li> -->
+            </ul>
+        </div>
+
+        <div class="uk-panel uk-panel-box uk-panel-box-primary" style="margin: 10px 0;">
+            <!--<form class="uk-form search-form">-->
+            <!--<fieldset data-uk-margin>-->
+            <span class="horizontal-field">线路</span>
+            <select name="line" id="line" style="width: 180px;"></select>
+            <span class="horizontal-field">时间</span>
+            <input class=" horizontal-field" type="text" id="date1" style="width: 180px;"/> -
+            <input class="horizontal-field" type="text" id="date2" style="width: 180px;"/>
+            &nbsp;
+            <button class="uk-button horizontal-field" id="query">检索</button>
+            <button class="uk-button horizontal-field" id="export">导出</button>
+            <!--</fieldset>-->
+            <!--</form>-->
+        </div>
+
+        <div class="ct_table_wrap" style="height: 510px">
+            <!-- 首末班误点-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table active" id="first_last_late_table">
+                <thead >
+                <tr role="row">
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="5%">报备人</th>
+                    <th width="5%">公司</th>
+                    <th width="5%">分公司</th>
+                    <th width="7%">线路</th>
+                    <th width="7%">延误站点</th>
+                    <th width="5%">延误时间</th>
+                    <th width="10%">首末班延误原因</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+            <!-- 大间隔-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="large_interval_table">
+                <thead >
+                <tr role="row">
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="5%">报备人</th>
+                    <th width="5%">公司</th>
+                    <th width="5%">分公司</th>
+                    <th width="7%">线路</th>
+                    <th width="7%">路段</th>
+                    <th width="7%">行驶方向</th>
+                    <th width="7%">站点</th>
+                    <th width="7%">大间隔时间</th>
+                    <th width="7%">大间隔原因</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+            <!-- 突发事件-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="emergency_table">
+                <thead >
+                <tr role="row">
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="5%">报备人</th>
+                    <th width="5%">公司</th>
+                    <th width="5%">分公司</th>
+                    <th width="7%">影响线路</th>
+                    <th width="7%">重大活动货突发事件</th>
+                    <th width="7%">影响时间</th>
+                    <th width="7%">影响班次数</th>
+                    <th width="7%">调整措施</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+            <!-- 事故-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="accident_table">
+                <thead >
+                <tr role="row">
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="5%">报备人</th>
+                    <th width="5%">公司</th>
+                    <th width="5%">分公司</th>
+                    <th width="5%">线路</th>
+                    <th width="5%">车辆自编号</th>
+                    <th width="5%">驾驶员</th>
+                    <th width="5%">事故发生时间</th>
+                    <th width="5%">事故发生地点</th>
+                    <th width="5%">行驶方向</th>
+                    <th width="5%">事故对象</th>
+                    <th width="5%">对象车牌号</th>
+                    <th width="5%">事故概况</th>
+                    <th width="5%">受伤人数</th>
+                    <th width="5%">死亡人数</th>
+                    <th width="5%">报告人</th>
+                    <th width="5%">报告人电话</th>
+                    <th width="5%">备注</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+            <!-- 绕改道-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="detour_table">
+                <thead class="">
+                <tr role="row">
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="5%">报备人</th>
+                    <th width="5%">公司</th>
+                    <th width="5%">分公司</th>
+                    <th width="5%">线路</th>
+                    <th width="5%">路段</th>
+                    <th width="5%">行驶方向</th>
+                    <th width="5%">跳站</th>
+                    <th width="7%">原因</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+            <!-- 其他-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="rests_table">
+                <tr role="row">
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="5%">报备人</th>
+                    <th width="5%">公司</th>
+                    <th width="5%">分公司</th>
+                    <th width="7%">线路</th>
+                    <th width="7%">报备内容</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+            <!-- 咨询-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="consult_table">
+                <thead >
+                <tr role="row">
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="5%">报备人</th>
+                    <th width="5%">公司</th>
+                    <th width="5%">分公司</th>
+                    <th width="7%">线路</th>
+                    <th width="7%">班线名称</th>
+                    <th width="7%">内容</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+        </div>
+
+        <div class="load-panel">
+            <i class="uk-icon-spinner uk-icon-spin"></i>
+            正在加载数据
+        </div>
+    </div>
+
+    <script id="first_last_late_table_body_list" type="text/html">
+        {{each data.list as obj i}}
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+        {{else}}
+        <tr>
+        {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;">{{obj.report_GSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_FGSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
+            <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SMBWD}}</td>
+        </tr>
+        {{/each}}
+    </script>
+    <script id="large_interval_table_body_list" type="text/html">
+        {{each data.list as obj i}}
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+            {{else}}
+        <tr>
+            {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;">{{obj.report_GSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_FGSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_ROAD}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XSFX}}</td>
+            <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DJGSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DJGYY}}</td>
+        </tr>
+        {{/each}}
+    </script>
+    <script id="emergency_table_body_list" type="text/html">
+        {{each data.list as obj i}}
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+            {{else}}
+        <tr>
+            {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;">{{obj.report_GSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_FGSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_TFSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_YXBC}}</td>
+            <td style="vertical-align: middle;">{{obj.report_TZCS}}</td>
+        </tr>
+        {{/each}}
+    </script>
+    <script id="accident_table_body_list" type="text/html">
+        {{each data.list as obj i}}
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+            {{else}}
+        <tr>
+            {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;">{{obj.report_GSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_FGSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_ZBH}}</td>
+            <td style="vertical-align: middle;">{{obj.report_JSY}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SGSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SGDD}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XSFX}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SGDX}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DXPZH}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SGGK}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SSRS}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SWRS}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BGR}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BGRDH}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BZ}}</td>
+        </tr>
+        {{/each}}
+    </script>
+    <script id="detour_table_body_list" type="text/html">
+        {{each data.list as obj i}}
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+            {{else}}
+        <tr>
+            {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;">{{obj.report_GSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_FGSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_ROAD}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XSFX}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SGGK}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BZ}}</td>
+        </tr>
+        {{/each}}
+    </script>
+    <script id="rests_table_body_list" type="text/html">
+        {{each data.list as obj i}}
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+            {{else}}
+        <tr>
+            {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;">{{obj.report_GSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_FGSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BZ}}</td>
+        </tr>
+        {{/each}}
+    </script>
+    <script id="consult_table_body_list" type="text/html">
+        {{each data.list as obj i}}
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+            {{else}}
+        <tr>
+            {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;">{{obj.report_GSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_FGSNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BZ}}</td>
+        </tr>
+        {{/each}}
+    </script>
+
+
+    <!-- common js -->
+    <script src="/assets/js/common.js"></script>
+    <!-- select2 下拉框 -->
+    <script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
+    <!-- moment.js 日期处理类库 -->
+    <script src="/assets/plugins/moment-with-locales.js" data-exclude=1></script>
+    <!-- 日期控件 -->
+    <script src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js"></script>
+    <!-- bootstrap -->
+    <script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js" data-exclude=1></script>
+    <!--<script src="/metronic_v4.5.4/plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js"></script>-->
+    <!-- editable.js -->
+    <!--<script src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js"></script>-->
+    <script>
+        var manageJs = (function () {
+            $('#export').attr('disabled', "true");
+
+            var modal = '#report-register-modal';
+            var activeDiv='first_last_late_table';
+            var lineList = gb_data_basic.activeLines;
+            var loading=false;
+
+            var line = $("#line").val();
+            var date1 = $("#date1").val();
+            var date2 = $("#date2").val();
+            var dataType = $("#dataType").val();
+            var lineName = $('#line option:selected').text();
+
+            $(modal).on('init', function (e,data) {
+
+                $("#date1").datetimepicker({
+                    format : 'YYYY-MM-DD',
+                    locale : 'zh-cn'
+                });
+                $("#date2").datetimepicker({
+                    format : 'YYYY-MM-DD',
+                    locale : 'zh-cn'
+                });
+                $('#date1').val(moment(new Date()).format('YYYY-MM-DD'));
+                $('#date2').val(moment(new Date()).format('YYYY-MM-DD'));
+                var data = [];
+                $.get('/user/companyData', function(result){
+                    for(var i = 0; i < result.length; i++){
+                        var companyCode = result[i].companyCode;
+                        var children = result[i].children;
+                        for(var j = 0; j < children.length; j++){
+                            var code = children[j].code;
+                            for(var k=0;k < lineList.length;k++ ){
+                                if(lineList[k]["brancheCompany"]==code && lineList[k]["company"]==companyCode){
+                                    data.push({id: lineList[k]["lineCode"], text: lineList[k]["name"]});
+                                }
+                            }
+                        }
+                    }
+                    initPinYinSelect2('#line',data,'');
+
+                });
+
+                //滚动条
+                $('.report-register-table-wrap', modal).perfectScrollbar();
+            });
+
+            $("#query").on("click",function(){
+                if(loading)
+                    return;
+                $('.load-panel', modal).show();
+                loading=true;
+                line = $("#line").val();
+                date1 = $("#date1").val();
+                date2 = $("#date2").val();
+                if(line == null || line == '' || line.length == 0){
+                    $('.load-panel', modal).hide();
+                    loading=false;
+                    layer.msg("请选择线路");
+                    return;
+                }
+                if(date1 == null || date1.trim().length == 0 || date2 == null || date2.trim().length == 0){
+                    $('.load-panel', modal).hide();
+                    loading=false;
+                    layer.msg("请选择时间");
+                    return;
+                } else if(date1 > date2){
+                    $('.load-panel', modal).hide();
+                    loading=false;
+                    layer.msg("时间区间不正确，第二个时间不能大于第一个时间");
+                    return;
+                }
+                var type = "query";
+                gb_common.$get("/reportRegister/findList", {lineCodes:line,date1:date1,date2:date2,type:type}, function (data) {
+                    if (data.status == "SUCCESS") {
+                        var list = data.list;
+                        var tableList1 = [], tableList2 = [], tableList3 = [], tableList4 = [], tableList5 = [],
+                            tableList6 = [], tableList7 = [];
+                        $.each(list, function (i, rr) {
+                            rr.report_DATE = formatDate(new Date(rr.report_DATE));
+                            if (rr.report_TYPE == 1) {
+                                tableList1.push(rr);
+                            } else if (rr.report_TYPE == 2) {
+                                tableList2.push(rr);
+                            } else if (rr.report_TYPE == 3) {
+                                tableList3.push(rr);
+                            } else if (rr.report_TYPE == 4) {
+                                tableList4.push(rr);
+                            } else if (rr.report_TYPE == 5) {
+                                tableList5.push(rr);
+                            } else if (rr.report_TYPE == 6) {
+                                tableList6.push(rr);
+                            } else if (rr.report_TYPE == 7) {
+                                tableList7.push(rr);
+                            }
+                        });
+                        var htmlStr = template('first_last_late_table_body_list', {'data':{'list': tableList1,'line':lineList}});
+                        $('#first_last_late_table .table_body', modal).html(htmlStr);
+                        htmlStr = template('large_interval_table_body_list', {'data':{'list': tableList2,'line':lineList}});
+                        $('#large_interval_table .table_body', modal).html(htmlStr);
+                        htmlStr = template('emergency_table_body_list', {'data':{'list': tableList3,'line':lineList}});
+                        $('#emergency_table .table_body', modal).html(htmlStr);
+                        htmlStr = template('accident_table_body_list', {'data':{'list': tableList4,'line':lineList}});
+                        $('#accident_table .table_body', modal).html(htmlStr);
+                        htmlStr = template('detour_table_body_list', {'data':{'list': tableList7,'line':lineList}});
+                        $('#detour_table .table_body', modal).html(htmlStr);
+                        htmlStr = template('rests_table_body_list', {'data':{'list': tableList5,'line':lineList}});
+                        $('#rests_table .table_body', modal).html(htmlStr);
+                        htmlStr = template('consult_table_body_list', {'data':{'list': tableList6,'line':lineList}});
+                        $('#consult_table .table_body', modal).html(htmlStr);
+                        $('.load-panel', modal).hide();
+                        loading=false;
+                        if(list.length == 0)
+                            $("#export").attr('disabled',"true");
+                        else
+                            $("#export").removeAttr("disabled");
+                    }
+                });
+            });
+
+            $("#export").on("click",function(){
+                line = $("#line").val();
+                date1 = $("#date1").val();
+                date2 = $("#date2").val();
+                var dateTime='';
+                if (date1 == date2) {
+                    dateTime = moment(date1).format("YYYYMMDD");
+                } else {
+                    dateTime = moment(date1).format("YYYYMMDD")
+                        +"-"+moment(date2).format("YYYYMMDD");
+                }
+                if(date1 == null || date1.trim().length == 0 || date2 == null || date2.trim().length == 0){
+                    layer.msg("请选择时间");
+                    return;
+                } else if(date1 > date2){
+                    layer.msg("时间区间不正确，第二个时间不能大于第一个时间");
+                    return;
+                }
+                lineName = $('#line option:selected').text();
+                var type = "export";
+                gb_common.$get("/reportRegister/findList", {lineCodes:line,lineName:lineName,date1:date1,date2:date2,type:type}, function (data) {
+                    if (data.status == "SUCCESS") {
+                        window.open("/downloadFile/download?fileName="
+                            +dateTime+"_"+lineName+"_报备登记");
+                    }
+                });
+            });
+
+
+            $(modal).on('click', '.navigation_bar li', function () {
+                $(this).parent().find('li.uk-active').removeClass('uk-active');
+                $(this).addClass('uk-active');
+                var typeName = $(this).attr('id');
+                var oldActiveDivId = $("#"+typeName+"_table").parent().find('.active');
+                var oldActiveDiv = document.getElementById(oldActiveDivId.attr('id'));
+                oldActiveDiv.style.display = "none";
+                oldActiveDivId.removeClass("active");
+
+                activeDiv = typeName+"_table";
+                $("#"+typeName+"_table").addClass("active");
+                var activeTable = document.getElementById(typeName+"_table");
+                activeTable.style.display = "";
+            });
+
+            var formatDate = function(now) {
+                var year=now.getFullYear();
+                var month=now.getMonth()+1;
+                var date=now.getDate();
+                var hour=now.getHours();
+                var minute=now.getMinutes();
+                var second=now.getSeconds();
+                return year+"-"+month+"-"+date+" "+hour+":"+minute+":"+second;
+            };
+
+        })();
+    </script>
+</div>
 \ No newline at end of file
+<style type="text/css">
+    .table-bordered {
+        border: 1px solid; }
+    .table-bordered > thead > tr > th,
+    .table-bordered > thead > tr > td,
+    .table-bordered > tbody > tr > th,
+    .table-bordered > tbody > tr > td,
+    .table-bordered > tfoot > tr > th,
+    .table-bordered > tfoot > tr > td {
+        border: 1px solid; }
+    .table-bordered > thead > tr > th,
+    .table-bordered > thead > tr > td {
+        border-bottom-width: 2px; }
+
+    .table > tbody + tbody {
+        border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+    <div class="page-title">
+        <h1>报备登记报表</h1>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <div class="portlet light porttlet-fit bordered">
+            <div class="portlet-title">
+                <form id="history" class="form-inline" action="">
+                    <div style="display: inline-block;">
+                        <span class="item-label" style="width: 80px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 180px;"></select>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">时间: </span>
+                        <input class="form-control" type="text" id="date1" style="width: 180px;"/> -
+                        <input class="form-control" type="text" id="date2" style="width: 180px;"/>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px">
+                        <span class="item-label" style="width: 140px;">类型： </span>
+                        <select class="form-control" name="code" id="code" style="width: 180px;">
+                            <!--<option value="0">所有类型</option>-->
+                            <option value="1">首末班误点</option>
+                            <option value="2">大间隔</option>
+                            <option value="3">突发事件</option>
+<!--                             <option value="4">事故</option> -->
+                            <option value="5">其他</option>
+<!--                             <option value="6">咨询</option> -->
+                        </select>
+                    </div>
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="筛选"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+                </form>
+            </div>
+            <div class="portlet-body">
+                <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;">
+                    <table class="table table-bordered table-hover table-checkable" id="forms">
+
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        $(function(){
+            $('#export').attr('disabled', "true");
+
+            // 关闭左侧栏
+            if (!$('body').hasClass('page-sidebar-closed'))
+                $('.menu-toggler.sidebar-toggler').click();
+
+            $("#date").datetimepicker({
+                format : 'YYYY-MM-DD',
+                locale : 'zh-cn'
+            });
+
+            $.get('/report/lineList',function(xlList){
+                var data = [];
+                $.get('/user/companyData', function(result){
+                    for(var i = 0; i < result.length; i++){
+                        var companyCode = result[i].companyCode;
+                        var children = result[i].children;
+                        for(var j = 0; j < children.length; j++){
+                            var code = children[j].code;
+                            for(var k=0;k < xlList.length;k++ ){
+                                if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+                                    data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+                                }
+                            }
+                        }
+                    }
+                    initPinYinSelect2('#line',data,'');
+
+                });
+            });
+
+
+            $('#code').select2({
+                ajax: {
+                    url: '/realSchedule/sreachVehic',
+                    dataType: 'json',
+                    delay: 150,
+                    data: function(params){
+                        return{nbbm: params.term};
+                    },
+                    processResults: function (data) {
+                        return {
+                            results: data
+                        };
+                    },
+                    cache: true
+                },
+                templateResult: function(repo){
+                    if (repo.loading) return repo.text;
+                    var h = '<span>'+repo.text+'</span>';
+                    h += (repo.lineName?'&nbsp;<span class="select2-desc">'+repo.lineName+'</span>':'');
+                    return h;
+                },
+                escapeMarkup: function (markup) { return markup; },
+                minimumInputLength: 1,
+                templateSelection: function(repo){
+                    return repo.text;
+                },
+                language: {
+                    noResults: function(){
+                        return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+                    },
+                    inputTooShort : function(e) {
+                        return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+                    },
+                    searching : function() {
+                        return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+                    }
+                }
+            });
+
+            var line = $("#line").val();
+            var date = $("#date").val();
+            var code = $("#code").val();
+            var lineName = $('#line option:selected').text();
+            $("#query").on("click",function(){
+                if($("#date").val() == null || $("#date").val().trim().length == 0){
+                    layer.msg("请选择时间");
+                    return;
+                }
+                line = $("#line").val();
+                date = $("#date").val();
+                code = $("#code").val();
+                lineName = $('#line option:selected').text();
+                var type = "query";
+                $(".hidden").removeClass("hidden");
+                var i = layer.load(2);
+                $get('/realSchedule/wxsb',{line:line,date:date,code:code,type:type},function(result){
+                    // 把数据填充到模版中
+                    var tbodyHtml = template('list_repair',{list:result});
+                    // 把渲染好的模版html文本追加到表格中
+                    $('#forms tbody').html(tbodyHtml);
+                    layer.close(i);
+
+                    if(result.length == 0)
+                        $("#export").attr('disabled',"true");
+                    else
+                        $("#export").removeAttr("disabled");
+
+                });
+            });
+
+            $("#export").on("click",function(){
+                var type = "export";
+                var i = layer.load(2);
+                $get('/realSchedule/wxsb', {line:line,date:date,code:code,type:type}, function(result){
+                    window.open("/downloadFile/download?fileName="
+                        +moment(date).format("YYYYMMDD")
+                        +"-"+lineName+"-维修上报记录");
+                    layer.close(i);
+                });
+            });
+
+        });
+    </script>
+    <script type="text/html" id="table1">
+        <thead>
+        <tr>
+            <th width="4%">序号</th>
+            <th width="5%">报备时间</th>
+            <th width="7%">线路</th>
+            <th width="7%">延误站点</th>
+            <th width="5%">延误时间</th>
+            <th width="10%">首末班延误原因</th>
+        </tr>
+        </thead>
+        <tbody>
+        {{each data.list as obj i}}
+        <tr>
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_GS}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_FGS}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
+            <td style="vertical-align: middle;">{{obj.report_YWSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SMBWD}}</td>
+        </tr>
+        {{/each}}
+        {{if list.length == 0}}
+        <tr>
+            <td colspan="8"><h6 class="muted">没有找到相关数据</h6></td>
+        </tr>
+        {{/if}}
+        </tbody>
+    </script>
+    <script type="text/html" id="table2">
+        <thead>
+        <tr>
+            <th width="4%">序号</th>
+            <th width="5%">报备时间</th>
+            <th width="7%">线路</th>
+            <th width="7%">路段</th>
+            <th width="7%">行驶方向</th>
+            <th width="7%">站点</th>
+            <th width="7%">大间隔时间</th>
+            <th width="7%">大间隔原因</th>
+        </tr>
+        </thead>
+        <tbody>
+        {{each list as obj i}}
+        <tr>
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_GS}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_FGS}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_ROAD}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XSFX}}</td>
+            <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DJGSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DJGYY}}</td>
+        </tr>
+        {{/each}}
+        {{if list.length == 0}}
+        <tr>
+            <td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
+        </tr>
+        {{/if}}
+        </tbody>
+    </script>
+    <script type="text/html" id="table3">
+        <thead>
+        <tr>
+            <th width="4%">序号</th>
+            <th width="5%">报备时间</th>
+            <th width="7%">影响线路</th>
+            <th width="7%">重大活动货突发事件</th>
+            <th width="7%">影响时间</th>
+            <th width="7%">影响班次数</th>
+            <th width="7%">调整措施</th>
+        </tr>
+        </thead>
+        <tbody>
+        {{each list as obj i}}
+        <tr>
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_GS}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_FGS}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_TFSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_YXBC}}</td>
+            <td style="vertical-align: middle;">{{obj.report_TZCS}}</td>
+        </tr>
+        {{/each}}
+        {{if list.length == 0}}
+        <tr>
+            <td colspan="9"><h6 class="muted">没有找到相关数据</h6></td>
+        </tr>
+        {{/if}}
+        </tbody>
+    </script>
+    <script type="text/html" id="table4">
+        <thead>
+        <tr>
+            <th width="3%">序号</th>
+            <th width="5%">报备时间</th>
+            <th width="7%">线路</th>
+            <th width="7%">车辆自编号</th>
+            <th width="7%">驾驶员</th>
+            <th width="7%">事故发生时间</th>
+            <th width="7%">事故发生地点</th>
+            <th width="7%">行驶方向</th>
+            <th width="7%">事故对象</th>
+            <th width="7%">对象车牌号</th>
+            <th width="7%">事故概况</th>
+            <th width="7%">受伤人数</th>
+            <th width="7%">死亡人数</th>
+            <th width="7%">报告人</th>
+            <th width="7%">报告人电话</th>
+            <th width="7%">备注</th>
+        </tr>
+        </thead>
+        <tbody>
+        {{each list as obj i}}
+        <tr>
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_GS}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_FGS}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_ZBH}}</td>
+            <td style="vertical-align: middle;">{{obj.report_JSY}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SGSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SGDD}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XSFX}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SGDX}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DXPZH}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SGGK}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SSRS}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SWRS}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BGR}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BGRDH}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BZ}}</td>
+        </tr>
+        {{/each}}
+        {{if list.length == 0}}
+        <tr>
+            <td colspan="16"><h6 class="muted">没有找到相关数据</h6></td>
+        </tr>
+        {{/if}}
+        </tbody>
+    </script>
+    <script type="text/html" id="table5">
+        <thead>
+        <tr>
+            <th width="4%">序号</th>
+            <th width="5%">报备时间</th>
+            <th width="7%">线路</th>
+            <th width="7%">报备内容</th>
+        </tr>
+        </thead>
+        <tbody>
+        {{each list as obj i}}
+        <tr>
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_GS}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_FGS}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BZ}}</td>
+        </tr>
+        {{/each}}
+        {{if list.length == 0}}
+        <tr>
+            <td colspan="4"><h6 class="muted">没有找到相关数据</h6></td>
+        </tr>
+        {{/if}}
+        </tbody>
+    </script>
+    <script type="text/html" id="table6">
+        <thead>
+        <tr>
+            <th width="4%">序号</th>
+            <th width="5%">报备时间</th>
+            <th width="7%">线路</th>
+            <th width="7%">班线名称</th>
+            <th width="7%">内容</th>
+        </tr>
+        </thead>
+        <tbody>
+        {{each list as obj i}}
+        <tr>
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_STATION}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BZ}}</td>
+        </tr>
+        {{/each}}
+        {{if list.length == 0}}
+        <tr>
+            <td colspan="5"><h6 class="muted">没有找到相关数据</h6></td>
+        </tr>
+        {{/if}}
+        </tbody>
+    </script>
+
+    <script>
+        (function () {
+            $('#export').attr('disabled', "true");
+
+            // 关闭左侧栏
+            if (!$('body').hasClass('page-sidebar-closed'))
+                $('.menu-toggler.sidebar-toggler').click();
+
+            $("#date1").datetimepicker({
+                format : 'YYYY-MM-DD',
+                locale : 'zh-cn'
+            });
+            $("#date2").datetimepicker({
+                format : 'YYYY-MM-DD',
+                locale : 'zh-cn'
+            });
+
+            $.get('/report/lineList',function(xlList){
+                var data = [];
+                $.get('/user/companyData', function(result){
+                    for(var i = 0; i < result.length; i++){
+                        var companyCode = result[i].companyCode;
+                        var children = result[i].children;
+                        for(var j = 0; j < children.length; j++){
+                            var code = children[j].code;
+                            for(var k=0;k < xlList.length;k++ ){
+                                if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+                                    data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+                                }
+                            }
+                        }
+                    }
+                    initPinYinSelect2('#line',data,'');
+
+                });
+            });
+            var line = $("#line").val();
+            var date1 = $("#date1").val();
+            var date2 = $("#date2").val();
+            var dataType = $("#dataType").val();
+            var lineName = $('#line option:selected').text();
+            $("#query").on("click",function(){
+                line = $("#line").val();
+                date1 = $("#date1").val();
+                date2 = $("#date2").val();
+                if(date1 == null || date1.trim().length == 0 || date2 == null || date2.trim().length == 0){
+                    layer.msg("请选择时间");
+                    return;
+                } else if(date1 > date2){
+                    layer.msg("时间区间不正确，第二个时间不能大于第一个时间");
+                    return;
+                }
+                dataType = $("#dataType").val();
+                lineName = $('#line option:selected').text();
+                var type = "query";
+                $(".hidden").removeClass("hidden");
+                var i = layer.load(2);
+                $get('/realSchedule/wxsb',{line:line,date:date,dataType:dataType,type:type},function(result){
+                    // 把数据填充到模版中
+                    var tbodyHtml = template('list_repair',{list:result});
+                    // 把渲染好的模版html文本追加到表格中
+                    $('#forms tbody').html(tbodyHtml);
+                    layer.close(i);
+
+                    if(result.length == 0)
+                        $("#export").attr('disabled',"true");
+                    else
+                        $("#export").removeAttr("disabled");
+
+                });
+            });
+
+            $("#export").on("click",function(){
+                var type = "export";
+                var i = layer.load(2);
+                $get('/realSchedule/wxsb', {line:line,date:date,code:code,type:type}, function(result){
+                    window.open("/downloadFile/download?fileName="
+                        +moment(date).format("YYYYMMDD")
+                        +"-"+lineName+"-维修上报记录");
+                    layer.close(i);
+                });
+            });
+
+        })();
+
+    </script>
+</div>
+<div class="uk-modal ct_move_modal" id="notice-modal">
+
+    <!-- editable -->
+    <!--<link href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css" rel="stylesheet" type="text/css" />-->
+    <!-- Bootstrap style -->
+    <link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+    <!-- select2 下拉框插件 -->
+    <!--<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />-->
+    <!--<link href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />-->
+
+    <style>
+    .lineSelect{
+        width:174px !important
+    }
+
+    /*ul.navigation_bar:before {
+        content: "报备类型";
+        position: absolute;
+        top: -9px;
+        font-size: 12px;
+        background: white;
+        padding: 0 4px;
+        color: #7d7b7b;
+        left: 10px;
+    }*/
+    </style>
+    <div class="uk-modal-dialog" style="width: 1800px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>站牌公告</h2>
+        </div>
+
+
+        <div style="padding-left: 12px;margin: 10px 0">
+            <ul class="uk-subnav uk-subnav-pill navigation_bar">
+                <li id="emergency"  class="uk-active"><a>线路公告</a></li>
+                <li id="regional"><a>区域公告</a></li>
+            </ul>
+        </div>
+
+        <div style="padding-left: 12px;margin: 10px 0">
+            <div class=" uk-subnav-pill management_bar" >
+                <button class="uk-button uk-button-primary" id="add">添加</button>
+                <button class="uk-button uk-button-danger" id="update">修改</button>
+                <button class="uk-button uk-button-danger" id="delete">删除</button>
+            </div>
+        </div>
+
+        <div class="ct_table_wrap" style="height: 510px">
+            <!-- 突发事件-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table active"  id="emergency_table">
+                <thead class="">
+                <tr role="row">
+                    <!--<th width="2%"><input type="radio" name="checkItems"></th>-->
+                    <th width="2%">#</th>
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="5%">报备人</th>
+                    <th width="5%">截止时间</th>
+                    <th width="8%">影响线路</th>
+                    <th width="4%">方向</th>
+                    <th width="8%">突发事件</th>
+                    <th width="8%">事件影响</th>
+                    <th width="8%">影响站点</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+            <!-- 绕改道-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="regional_table">
+                <thead class="">
+                <tr role="row">
+                    <!--<th width="2%"><input type="radio" name="checkItems"></th>-->
+                    <th width="2%">#</th>
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="5%">报备人</th>
+                    <th width="5%">截止时间</th>
+                    <th width="5%">公告区域</th>
+                    <th width="20%">公告信息</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+        </div>
+
+        <div class="load-panel">
+            <i class="uk-icon-spinner uk-icon-spin"></i>
+            正在加载数据
+        </div>
+    </div>
+
+
+
+    <script id="emergency_table_body" type="text/html">
+        {{each data.list as obj i}}
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+            <td style="vertical-align: middle;">
+                <!--<input type="radio" class="group-checkable icheck" name="idRadio" value="{{obj.id}}" data-lineCode="{{obj.report_XL}}">-->
+            </td>
+            {{else}}
+        <tr>
+            <td style="vertical-align: middle;">
+                <input type="radio" class="group-checkable icheck" name="idRadio" value="{{obj.id}}" data-lineCode="{{obj.notice_XL}}">
+            </td>
+            {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.notice_DATE}}</td>
+            <td style="vertical-align: middle;">{{obj.notice_BBR}}</td>
+            <td style="vertical-align: middle;">{{obj.notice_TIME}}</td>
+            <td style="vertical-align: middle;">{{obj.notice_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.notice_XSFX}}</td>
+            <td style="vertical-align: middle;">{{obj.notice_TFSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.notice_SJYX}}</td>
+            <td style="vertical-align: middle;">{{obj.notice_STATIONNAME}}</td>
+        </tr>
+        {{/each}}
+    </script>
+    <script id="regional_table_body" type="text/html">
+        {{each data.list as obj i}}
+
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+            <td style="vertical-align: middle;">
+                <!--<input type="radio" class="group-checkable icheck" name="idRadio" value="{{obj.id}}" data-lineCode="{{obj.report_XL}}">-->
+            </td>
+            {{else}}
+        <tr>
+            <td style="vertical-align: middle;">
+                <input type="radio" class="group-checkable icheck" name="idRadio" value="{{obj.id}}" data-lineCode="{{obj.notice_XL}}">
+            </td>
+            {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.notice_DATE}}</td>
+            <td style="vertical-align: middle">{{obj.notice_BBR}}</td>
+            <td style="vertical-align: middle">{{obj.notice_TIME}}</td>
+            <td style="vertical-align: middle">{{obj.notice_QY}}</td>
+            <td style="vertical-align: middle">{{obj.notice_GG}}</td>
+        </tr>
+        {{/each}}
+    </script>
+
+
+    <!-- common js -->
+    <!--<script src="/assets/js/common.js"></script>-->
+    <!--&lt;!&ndash; select2 下拉框 &ndash;&gt;-->
+    <!--<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>-->
+    <!-- moment.js 日期处理类库 -->
+    <script src="/assets/plugins/moment-with-locales.js" data-exclude=1></script>
+    <!-- 日期控件 -->
+    <script src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js"></script>
+    <!-- bootstrap -->
+    <script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js" data-exclude=1></script>
+    <!--<script src="/metronic_v4.5.4/plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js"></script>-->
+    <!-- editable.js -->
+    <!--<script src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js"></script>-->
+    <script>
+        var manageJs = (function () {
+            var modal = '#notice-modal';
+            var editType = false;//编辑状态,修改过东西
+            var lineCodes ='',// 选择的线路
+                companyMap = {},
+                user = {};//当前用户信息
+            var activeDiv='emergency_table';
+            var lineList = gb_data_basic.activeLines;
+
+            //当前用户信息
+            gb_common.$get('/user/currentUser', null,function (data) {
+                user = data;
+            });
+
+            $(modal).on('init', function (e,data) {
+                // 遍历出所有需要查询的线路
+                lineCodes = '';
+                $.each(lineList, function (i, g) {
+                    lineCodes += '"'+g.lineCode + '",';
+                });
+                console.log(lineCodes);
+                refreshDate();
+                //滚动条
+                $('.report-register-table-wrap', modal).perfectScrollbar();
+            });
+
+            var refreshDate = function() {
+                console.log("222");
+                $('.load-panel', modal).show();
+                loading=true;
+                gb_common.$get("/notice/findList", {lineCodes: lineCodes.substring(0, lineCodes.length - 1)}, function (data) {
+                    if (data.status == "SUCCESS") {
+                        var list = data.list;
+                        var tableList1 = [], tableList2 = [];
+                        $.each(list, function (i, rr) {
+                            console.log(rr);
+                            rr.notice_DATE = formatDate(new Date(rr.notice_DATE));
+                            rr.notice_TIME = formatDate(new Date(rr.notice_TIME));
+                            if (rr.notice_TYPE == 1) {
+                                rr.notice_XSFX=rr.notice_XSFX==0?'上行':'下行';
+                                tableList1.push(rr);
+                            } else if (rr.notice_TYPE == 2) {
+                                tableList2.push(rr);
+                            }
+                        });
+                        console.log(tableList1);
+                        console.log(tableList2);
+                        var htmlStr = template('emergency_table_body', {'data':{'list': tableList1,'line':lineList}});
+                        $('#emergency_table .table_body', modal).html(htmlStr);
+                        htmlStr = template('regional_table_body', {'data':{'list': tableList2,'line':lineList}});
+                        $('#regional_table .table_body', modal).html(htmlStr);
+                        $('.load-panel', modal).hide();
+                        loading=false;
+                    }
+                });
+            };
+
+
+            $("#add", modal).on('click', function () {
+                var activeDivId = $('.ct_table_wrap .active').attr('id');
+                open_modal('/real_control_v2/fragments/north/nav/station_notice/add.html', {'tableActive' : activeDivId,'companyMap':companyMap,'lineList':lineList,'user':user}, {
+                    bgclose: false,
+                    modal: false
+                });
+            });
+            $("#update", modal).on('click', function () {
+                var activeDivId = $('.ct_table_wrap .active').attr('id');
+                var id = $("#"+activeDivId+" .table_body input[name='idRadio']:checked", modal).val();
+                if(id){
+                    gb_common.$get('/notice/' + id,null, function (rs) {
+                        // 全转换为大写
+                        var rr = nameTo_(rs);
+                        open_modal('/real_control_v2/fragments/north/nav/station_notice/update.html', {'tableActive' : activeDivId,'lineList':lineList,'user':user,'rr':rr}, {
+                            bgclose: false,
+                            modal: false
+                        });
+                    });
+                } else {
+                    notify_succ('当前类型没有选中！');
+                }
+            });
+            $("#delete").on('click', function () {
+                var activeDivId = $('.ct_table_wrap .active').attr('id');
+                var id = $("#"+activeDivId+" .table_body input[name='idRadio']:checked", modal).val();
+                if(id){
+                    alt_confirm('确实要删除这个公告吗？', function () {
+                        gb_common.$post('/notice/delete',{ID:id,NOTICE_BBR:user.userName+'/'+user.name}, function (rs) {
+                            manageJs.refreshDate();
+                            notify_succ('删除成功！');
+                        });
+                    }, '确定删除');
+                } else {
+                    notify_succ('当前类型没有选中！');
+                }
+            });
+
+
+            $(modal).on('click', '.navigation_bar li', function () {
+                $(this).parent().find('li.uk-active').removeClass('uk-active');
+                $(this).addClass('uk-active');
+                var typeName = $(this).attr('id');
+                var oldActiveDivId = $("#"+typeName+"_table").parent().find('.active');
+                var oldActiveDiv = document.getElementById(oldActiveDivId.attr('id'));
+                oldActiveDiv.style.display = "none";
+                oldActiveDivId.removeClass("active");
+
+                activeDiv = typeName+"_table";
+                $("#"+typeName+"_table").addClass("active");
+                var activeTable = document.getElementById(typeName+"_table");
+                activeTable.style.display = "";
+            });
+
+            var formatDate = function(now) {
+                var year=now.getFullYear();
+                var month=now.getMonth()+1;
+                var date=now.getDate();
+                var hour=now.getHours();
+                var minute=now.getMinutes();
+                var second=now.getSeconds();
+                return year+"-"+month+"-"+date+" "+hour+":"+minute+":"+second;
+            };
+
+            function nameTo_(object) {
+                for (var i in object) {
+                    if (object.hasOwnProperty(i)) {
+                        var temp = object[i];
+                        var oldI = i;
+                        temp = object[i.toUpperCase()] = object[i];
+                        delete object[oldI];
+                        if (typeof temp === 'object' || Object.prototype.toString.call(temp) === '[object Array]') {
+                            nameTo_(temp);
+                        }
+                    }
+                }
+                return object;
+            }
+
+            return{
+                refreshDate:refreshDate
+            }
+        })();
+    </script>
+</div>
 \ No newline at end of file
+<div class="uk-modal ct_move_modal" id="report-register-modal">
+
+    <!-- editable -->
+    <!--<link href="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/css/bootstrap-editable.css" rel="stylesheet" type="text/css" />-->
+    <!-- Bootstrap style -->
+    <link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+    <!-- select2 下拉框插件 -->
+    <!--<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />-->
+    <!--<link href="/metronic_v4.5.4/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />-->
+
+    <style>
+    .lineSelect{
+        width:174px !important
+    }
+
+    /*ul.navigation_bar:before {
+        content: "报备类型";
+        position: absolute;
+        top: -9px;
+        font-size: 12px;
+        background: white;
+        padding: 0 4px;
+        color: #7d7b7b;
+        left: 10px;
+    }*/
+    </style>
+    <div class="uk-modal-dialog" style="width: 1800px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>站牌公告</h2>
+        </div>
+
+
+        <div style="padding-left: 12px;margin: 10px 0">
+            <ul class="uk-subnav uk-subnav-pill navigation_bar">
+                <li id="emergency"  class="uk-active"><a>突发事件</a></li>
+                <li id="regional"><a>区域公告</a></li>
+            </ul>
+        </div>
+
+        <div style="padding-left: 12px;margin: 10px 0">
+            <div class=" uk-subnav-pill management_bar" >
+                <button class="uk-button uk-button-primary" id="add">添加</button>
+                <button class="uk-button uk-button-danger" id="update">修改</button>
+                <button class="uk-button uk-button-danger" id="delete">删除</button>
+            </div>
+        </div>
+
+        <div class="ct_table_wrap" style="height: 510px">
+            <!-- 突发事件-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table active"  id="emergency_table">
+                <thead class="">
+                <tr role="row">
+                    <!--<th width="2%"><input type="radio" name="checkItems"></th>-->
+                    <th width="2%">#</th>
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="8%">影响线路</th>
+                    <th width="4%">方向</th>
+                    <th width="8%">突发事件</th>
+                    <th width="8%">产生影响</th>
+                    <th width="8%">影响站点</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+            <!-- 绕改道-->
+            <table class="table table-striped table-bordered table-hover table-checkable report-register-table" style="display:none" id="regional_table">
+                <thead class="">
+                <tr role="row">
+                    <!--<th width="2%"><input type="radio" name="checkItems"></th>-->
+                    <th width="2%">#</th>
+                    <th width="2%">序号</th>
+                    <th width="5%">报备时间</th>
+                    <th width="5%">公告区域</th>
+                    <th width="20%">公告信息</th>
+                </tr>
+                </thead>
+                <tbody class="table_body">
+                </tbody>
+            </table>
+        </div>
+
+        <div class="load-panel">
+            <i class="uk-icon-spinner uk-icon-spin"></i>
+            正在加载数据
+        </div>
+    </div>
+
+
+
+    <script id="emergency_table_body" type="text/html">
+        {{each data.list as obj i}}
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+            <td style="vertical-align: middle;">
+                <!--<input type="radio" class="group-checkable icheck" name="idRadio" value="{{obj.id}}" data-lineCode="{{obj.report_XL}}">-->
+            </td>
+            {{else}}
+        <tr>
+            <td style="vertical-align: middle;">
+                <input type="radio" class="group-checkable icheck" name="idRadio" value="{{obj.id}}" data-lineCode="{{obj.report_XL}}">
+            </td>
+            {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_GS}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_FGS}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_TFSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_YXSJ}}</td>
+            <td style="vertical-align: middle;">{{obj.report_YXBC}}</td>
+            <td style="vertical-align: middle;">{{obj.report_TZCS}}</td>
+        </tr>
+        {{/each}}
+    </script>
+    <script id="regional_table_body" type="text/html">
+        {{each data.list as obj i}}
+
+        {{if obj.status == 2}}
+        <tr style="background-color: #ff5f78">
+            <td style="vertical-align: middle;">
+                <!--<input type="radio" class="group-checkable icheck" name="idRadio" value="{{obj.id}}" data-lineCode="{{obj.report_XL}}">-->
+            </td>
+            {{else}}
+        <tr>
+            <td style="vertical-align: middle;">
+                <input type="radio" class="group-checkable icheck" name="idRadio" value="{{obj.id}}" data-lineCode="{{obj.report_XL}}">
+            </td>
+            {{/if}}
+            <td style="vertical-align: middle;">{{i + 1}}</td>
+            <td style="vertical-align: middle;">{{obj.report_DATE}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_BBR}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_GS}}</td>
+            <td style="vertical-align: middle;display:none">{{obj.report_FGS}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XLNAME}}</td>
+            <td style="vertical-align: middle;">{{obj.report_ROAD}}</td>
+            <td style="vertical-align: middle;">{{obj.report_XSFX}}</td>
+            <td style="vertical-align: middle;">{{obj.report_SGGK}}</td>
+            <td style="vertical-align: middle;">{{obj.report_BZ}}</td>
+        </tr>
+        {{/each}}
+    </script>
+
+
+    <!-- common js -->
+    <!--<script src="/assets/js/common.js"></script>-->
+    <!--&lt;!&ndash; select2 下拉框 &ndash;&gt;-->
+    <!--<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>-->
+    <!-- moment.js 日期处理类库 -->
+    <script src="/assets/plugins/moment-with-locales.js" data-exclude=1></script>
+    <!-- 日期控件 -->
+    <script src="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/js/bootstrap-datetimepicker.min.js"></script>
+    <!-- bootstrap -->
+    <script src="/metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js" data-exclude=1></script>
+    <!--<script src="/metronic_v4.5.4/plugins/bootstrap-wizard/jquery.bootstrap.wizard.min.js"></script>-->
+    <!-- editable.js -->
+    <!--<script src="/metronic_v4.5.4/plugins/bootstrap-editable/bootstrap-editable/js/bootstrap-editable.min.js"></script>-->
+    <script>
+        var manageJs = (function () {
+            var modal = '#report-register-modal';
+            var editType = false;//编辑状态,修改过东西
+            var lineCodes ='',// 选择的线路
+                companyMap = {},
+                user = {};//当前用户信息
+            var activeDiv='emergency_table';
+            var lineList = gb_data_basic.activeLines;
+
+            //当前用户信息
+            gb_common.$get('/user/currentUser', null,function (data) {
+                user = data;
+            });
+
+            $(modal).on('init', function (e,data) {
+                // get请求获取公司
+                /*gb_common.$get("/user/companyData",null,function(result){
+                    var len_ = lineList.length;
+                    if(len_>0) {
+                        // 遍历线路对应的公司
+                        for(var i = 0; i < result.length; i++){
+                            var companyCode = result[i].companyCode;
+                            var children = result[i].children;
+                            for(var j = 0; j < children.length; j++){
+                                var code = children[j].code;
+                                for(var k=0;k < lineList.length;k++ ){
+                                    if(lineList[k].brancheCompany==code && lineList[k].company==companyCode){
+                                        companyMap[lineList[k].lineCode] = companyCode+":"+code+"-"+result[i].companyName+":"+result[i].children[j].name;
+                                    }
+                                }
+                            }
+                        }
+
+
+                        // initPinYinSelect2($('.lineSelect'), paramsD, function (selector) {
+                        //     selector.select2("val", "");
+                        // });
+                    }
+                });*/
+                // 遍历出所有需要查询的线路
+                lineCodes = '';
+                $.each(lineList, function (i, g) {
+                    lineCodes += '"'+g.lineCode + '",';
+                });
+
+                refreshDate();
+                //滚动条
+                $('.report-register-table-wrap', modal).perfectScrollbar();
+            });
+
+            var refreshDate = function() {
+
+                $('.load-panel', modal).show();
+                loading=true;
+                gb_common.$get("/reportRegister/findList", {lineCodes: lineCodes.substring(0, lineCodes.length - 1)}, function (data) {
+                    if (data.status == "SUCCESS") {
+                        var list = data.list;
+                        var tableList1 = [], tableList2 = [];
+                        $.each(list, function (i, rr) {
+                            rr.report_DATE = formatDate(new Date(rr.report_DATE));
+                            if (rr.report_TYPE == 1) {
+                                tableList1.push(rr);
+                            } else if (rr.report_TYPE == 2) {
+                                tableList2.push(rr);
+                            }
+                        });
+                        var htmlStr = template('emergency_table_body', {'data':{'list': tableList1,'line':lineList}});
+                        $('#emergency_table .table_body', modal).html(htmlStr);
+                        htmlStr = template('regional_table_body', {'data':{'list': tableList2,'line':lineList}});
+                        $('#regional_table .table_body', modal).html(htmlStr);
+                        $('.load-panel', modal).hide();
+                        loading=false;
+                    }
+                });
+            };
+
+
+            $("#add", modal).on('click', function () {
+                var activeDivId = $('.ct_table_wrap .active').attr('id');
+                open_modal('/real_control_v2/fragments/north/nav/station_notice/add.html', {'tableActive' : activeDivId,'companyMap':companyMap,'lineList':lineList,'user':user}, {
+                    bgclose: false,
+                    modal: false
+                });
+            });
+            $("#update", modal).on('click', function () {
+                var activeDivId = $('.ct_table_wrap .active').attr('id');
+                var id = $("#"+activeDivId+" .table_body input[name='idRadio']:checked", modal).val();
+                if(id){
+                    gb_common.$get('/reportRegister/' + id,null, function (rs) {
+                        // 全转换为大写
+                        var rr = nameTo_(rs);
+                        open_modal('/real_control_v2/fragments/north/nav/report_register/update.html', {'tableActive' : activeDivId,'companyMap':companyMap,'lineList':lineList,'user':user,'rr':rr}, {
+                            bgclose: false,
+                            modal: false
+                        });
+                    });
+                } else {
+                    notify_succ('当前类型没有选中！');
+                }
+            });
+            $("#delete").on('click', function () {
+                var activeDivId = $('.ct_table_wrap .active').attr('id');
+                var id = $("#"+activeDivId+" .table_body input[name='idRadio']:checked", modal).val();
+                if(id){
+                    alt_confirm('确实要删除这个报备登记吗？', function () {
+                        // gb_common.$del('/reportRegister/' + id, function (rs) {
+                        gb_common.$post('/reportRegister/delete',{ID:id,REPORT_BBR:user.userName+'/'+user.name}, function (rs) {
+                            manageJs.refreshDate();
+                            notify_succ('删除成功！');
+                            if(rs.status2.CODE == '0')
+                                notify_succ('同步到服务热线系统成功！');
+                            else
+                                notify_err('同步到服务热线系统失败！');
+                        });
+                    }, '确定删除');
+                } else {
+                    notify_succ('当前类型没有选中！');
+                }
+            });
+
+
+            $(modal).on('click', '.navigation_bar li', function () {
+                $(this).parent().find('li.uk-active').removeClass('uk-active');
+                $(this).addClass('uk-active');
+                var typeName = $(this).attr('id');
+                var oldActiveDivId = $("#"+typeName+"_table").parent().find('.active');
+                var oldActiveDiv = document.getElementById(oldActiveDivId.attr('id'));
+                oldActiveDiv.style.display = "none";
+                oldActiveDivId.removeClass("active");
+
+                activeDiv = typeName+"_table";
+                $("#"+typeName+"_table").addClass("active");
+                var activeTable = document.getElementById(typeName+"_table");
+                activeTable.style.display = "";
+            });
+
+            var formatDate = function(now) {
+                var year=now.getFullYear();
+                var month=now.getMonth()+1;
+                var date=now.getDate();
+                var hour=now.getHours();
+                var minute=now.getMinutes();
+                var second=now.getSeconds();
+                return year+"-"+month+"-"+date+" "+hour+":"+minute+":"+second;
+            };
+
+            function nameTo_(object) {
+                for (var i in object) {
+                    if (object.hasOwnProperty(i)) {
+                        var temp = object[i];
+                        var oldI = i;
+                        temp = object[i.toUpperCase()] = object[i];
+                        delete object[oldI];
+                        if (typeof temp === 'object' || Object.prototype.toString.call(temp) === '[object Array]') {
+                            nameTo_(temp);
+                        }
+                    }
+                }
+                return object;
+            }
+
+            return{
+                refreshDate:refreshDate
+            }
+        })();
+    </script>
+</div>
 \ No newline at end of file
+<div class="uk-modal" id="notice_update_mobal">
+	<div class="uk-modal-dialog" style="width: 600px;">
+		<a href="" class="uk-modal-close uk-close"></a>
+		<div class="uk-modal-header">
+			<h2>修改公告</h2>
+		</div>
+		<div class="uk-form uk-form-horizontal" id="report_register_form">
+			<form id="add_head_table">
+				<input type="hidden" name="ID" id="ID">
+				<input type="hidden" name="NOTICE_BBR" id="NOTICE_BBR" value="">
+				<input type="hidden" name="NOTICE_XLNAME" id="NOTICE_XLNAME" value="">
+
+				<!-- 报备时间 -->
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							报备时间:
+						</label>
+						<div class="uk-form-controls">
+							<input type="text" class="form-control" name="NOTICE_DATE" id="NOTICE_DATE"  readonly="readonly">
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							公告截止:
+						</label>
+						<div class="uk-form-controls">
+							<input class="form-control" type="text" name="NOTICE_TIME" id="NOTICE_TIME">
+						</div>
+					</div>
+				</div>
+				<!-- 类型 -->
+				<div class="uk-grid uk-width-2-3 uk-container-center" hidden>
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							类型:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control typeSelect"  name="NOTICE_TYPE"  id="NOTICE_TYPE">
+								<option value="1">突发事件</option>
+								<option value="2">区域公告</option>
+							</select>
+						</div>
+					</div>
+				</div>
+			</form>
+			<!-- 突发事件-->
+			<form id="add_emergency_table" class="c_register_form" style="display:none; margin-top: 35px;">
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							线路:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control lineSelect"  name="NOTICE_XL"  id="NOTICE_XL">
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							方向:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control typeSelect"  name="NOTICE_XSFX"  id="NOTICE_XSFX" >
+								<option value="0">上行</option>
+								<option value="1">下行</option>
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							突发事件:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control typeSelect"  name="NOTICE_TFSJ"  id="NOTICE_TFSJ" >
+								<option value="1">重大活动</option>
+								<option value="2">恶劣天气</option>
+								<option value="3">交通事故</option>
+								<option value="3">道路拥堵</option>
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							事件影响:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control typeSelect"  name="NOTICE_SJYX"  id="NOTICE_SJYX" >
+								<option value="1">临时改道</option>
+								<option value="2">班次延误</option>
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							影响站点:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control lineSelect"  name="NOTICE_STATION"  id="NOTICE_STATION" >
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-modal-footer uk-text-right">
+					<span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
+					<button type="button" class="uk-button uk-modal-close">取消</button>
+					<button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button>
+				</div>
+			</form>
+			<!-- 区域公告-->
+			<form id="add_regional_table" class="c_register_form" style="display:none; margin-top: 35px;">
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							区域:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control lineSelect"  name="NOTICE_QY"  id="NOTICE_QY">
+								<option value='0'>全部</option>
+								<option value='1'>区域1</option>
+								<option value='2'>区域2</option>
+								<option value='3'>区域3</option>
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-grid uk-width-2-3 uk-container-center">
+					<div class="uk-form-row">
+						<label class="uk-form-label">
+							公告信息:
+						</label>
+						<div class="uk-form-controls">
+							<select class="form-control typeSelect"  name="NOTICE_GG"  id="NOTICE_GG"  style="max-width: 220px">
+								<option value="0">雨天路滑，安全出行。</option>
+								<option value="1">高峰时段，道路拥堵，请乘客合理安排出行。</option>
+								<option value="2">请先下后上，注意乘车安全。</option>
+							</select>
+						</div>
+					</div>
+				</div>
+				<div class="uk-modal-footer uk-text-right">
+					<span class="bind_gas_station_panel" style="position: absolute;left: 30px;text-decoration: underline;"></span>
+					<button type="button" class="uk-button uk-modal-close">取消</button>
+					<button type="submit" class="uk-button uk-button-primary submitBtn"><i class="uk-icon-check"></i> &nbsp;保存</button>
+				</div>
+			</form>
+		</div>
+	</div>
+
+	<script>
+        (function () {
+            var modal = '#notice_update_mobal';
+            var tableActive = '',formActive = '';
+            var NOTICE_TYPE,
+				lineList = {},
+                user = {},rr={};
+			//加载站点
+			$("#NOTICE_XL").on("change", function(){
+				var lineCode = $(this).val();
+				var direction = $('#NOTICE_XSFX').val();
+				loadStation(lineCode,direction);
+
+			});
+			$("#NOTICE_XSFX").on("change", function(){
+				var lineCode = $('#NOTICE_XL').val();
+				var direction = $(this).val();
+				loadStation(lineCode,direction);
+			});
+
+            $(modal).on('init', function (e, data) {
+				$('#NOTICE_DATE').datetimepicker({
+					format : 'YYYY-MM-DD HH:mm:ss',
+					locale : 'zh-cn'
+				});
+				$("#NOTICE_TIME").datetimepicker({
+					format : 'YYYY-MM-DD HH:mm:ss',
+					locale : 'zh-cn'
+				});
+                tableActive = "add_"+data.tableActive;
+                rr = data.rr;
+                var typeInt = 1;
+				if (tableActive == 'add_emergency_table') {
+					typeInt = 1;
+				} else if (tableActive == 'add_regional_table') {
+					typeInt = 2;
+				}  else {
+					UIkit.modal(modal).hide();
+					notify_err('您所选的数据有问题，请重新选择！');
+					return;
+				}
+				$('#NOTICE_TYPE').val(typeInt);
+                if(typeInt != rr.NOTICE_TYPE ) {
+                    UIkit.modal(modal).hide();
+                    notify_err('您所选的数据有问题，请重新选择！');
+                    return;
+				}
+                document.getElementById(tableActive).style.display = "";
+
+                // 先给input赋值
+                $('input,select', modal).each(function () {
+                    var domName = $(this).attr('name');
+                    if(domName == 'NOTICE_DATE'){
+                        $('#NOTICE_DATE').val(moment(new Date(rr[domName])).format('YYYY-MM-DD HH:mm:ss'));
+                    }else if(domName == 'NOTICE_TIME'){
+						$('#NOTICE_TIME').val(moment(new Date(rr[domName])).format('YYYY-MM-DD HH:mm:ss'));
+					}else{
+                        $(this).val(rr[domName]);
+                    }
+                });
+                lineList = data.lineList;
+                user = data.user;
+                $('#NOTICE_BBR').val(user.userName+'/'+user.name);
+				var options = '';
+				if(rr.NOTICE_XL!=undefined){
+					$.each(lineList, function (i,line) {
+						if(line.lineCode == rr.NOTICE_XL)
+							options += '<option value='+line.lineCode+' selected = "selected" >'+line.name+'</option>';
+						else
+							options += '<option value='+line.lineCode+'>'+line.name+'</option>';
+					});
+					$('#NOTICE_XL').html(options);
+					$('#NOTICE_XL').trigger("change");
+				}
+                changeType(tableActive);
+                $('#NOTICE_TYPE').on('change',function () {
+                    document.getElementById(tableActive).style.display = "none";
+					NOTICE_TYPE = this.value;
+					if (NOTICE_TYPE == 1) {
+						tableActive = 'add_emergency_table';
+					} else if (NOTICE_TYPE == 2) {
+						tableActive = 'add_regional_table';
+					}
+                    document.getElementById(tableActive).style.display = "";
+                    changeType(tableActive);
+                });
+            });
+			function loadStation(lineCode,direction){
+				//站点路由
+				stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(lineCode).sort(function (a, b) {
+					return a.stationRouteCode - b.stationRouteCode;
+				}), 'directions')[direction];
+				var options = '';
+				$.each(stationRoutes, function (i,station) {
+					if(station.stationCode == rr.NOTICE_STATION)
+						options += '<option value='+station.stationCode+' selected = "selected" >'+station.stationName+'</option>';
+					else
+						options += '<option value='+station.stationCode+'>'+station.stationName+'</option>';
+				});
+				$('#NOTICE_STATION').html(options);
+				// 模拟change给公司分公司赋值
+				$('#NOTICE_STATION').trigger("change");
+			}
+
+            function changeType(tableActiveStr) {
+                formActive = $('#'+tableActiveStr);
+                //校验不过
+                formActive.on('err.field.fv', function () {
+                    $('#submitChildTaskBtn', modal).removeClass('disabled').removeAttr('disabled');
+                });
+
+                //校验
+                formActive.formValidation({framework: 'uikit', locale: 'zh_CN'});
+                //提交
+                formActive.on('success.form.fv', function (e) {
+                    e.preventDefault();
+                    var headData = $('#add_head_table').serializeJSON();
+                    var bodyData = $(formActive).serializeJSON();
+                    var params = {};
+                    Object.assign(params,headData,bodyData);
+                    params.STATUS = '1';
+                    gb_common.$post('/notice/', params, function (rs) {
+                    if(rs.status == 'SUCCESS'){
+                        // $('#history-sch-maintain-modal').trigger('refresh', {'tableActive' : tableActive,'companyMap':companyMap,'lineList':lineList,'user':user});
+                        UIkit.modal(modal).hide();
+                        notify_succ('修改成功！');
+                        manageJs.refreshDate();
+                    } else
+                        notify_err('修改失败！');
+                    });
+                });
+            }
+
+            //submit
+            $('.submitBtn', modal).on('click', function () {
+                $(this).addClass('disabled').attr('disabled', 'disabled');
+                formActive.data('valid', false);
+                formActive.formValidation('validate');
+            });
+        })();
+	</script>
+</div>
 \ No newline at end of file
@@ -220,6 +220,12 @@
         "event": "form_report_register",
         "icon": "uk-icon-table"
       }
+    ,
+      {
+        "id": 5.3,
+        "text": "站牌公告",
+        "event": "station_notice"
+      }
     ]
   }
 ]
 \ No newline at end of file
@@ -28,6 +28,7 @@ var gb_schedule_table = (function () {
     };
     var show = function (cb) {
+        document.cookie = "checkedSch=";
         //从服务器获取班次数据
         $.get('/realSchedule/lines', {
             lines: gb_data_basic.line_idx
@@ -499,6 +500,7 @@ var gb_schedule_table = (function () {
             nextSch, tempDL;
         getDl(sch).addClass('intimity');
+        document.cookie = "checkedSch="+sch.id;
         $.each(schArr, function (i) {
             tempDL = $('dl[data-id=' + this.id + ']', contWrap);
             tempDL.addClass('relevance-active');
@@ -260,6 +260,9 @@ var gb_northToolbar = (function () {
         sch_edit_qjgz: function () {
             open_modal('/real_control_v2/zndd/qjgz/list.html', {}, modal_opts);
         },
+        station_notice: function () {
+            open_modal('/real_control_v2/fragments/north/nav/station_notice/manage.html', {}, modal_opts);
+        },
     };
     return {
@@ -2,18 +2,29 @@
  * 站点催发
  */
 var gb_klyj = (function () {
-    var $wrap = $('.multi_plat_msg_pop_cf');
-    var max = 5;
+    var $wrap = $('.multi_plat_msg_pop_zndd');
+    var max = 3;
     var dataMap = new Map();
     var popcf = function (data) {
         dataMap.set(data.uuid,data);
+        gb_dataZndd.setDataMap(data.uuid,data);
         //时间格式化
         var stm = moment(data.instructionsTime);
         data.timeStr = stm.format('HH时mm分ss秒');
         var htmlStr = template('klyj_plat_msg_template', data);
-        var items = $wrap.find('.multi_plat_msg_pops'), len = items.length;
-        if (len >= max)
-            $wrap.find('.multi_plat_msg_pops:lt(' + (len - max) + ')').remove();
+        var items = $wrap.find('.multi_plat_config'), len = items.length;
+        if (len >= max){
+            $wrap.find('.multi_plat_config:lt(' + (len - max) + ')').remove();
+        }
+
+
+        var $modal = $('#schedule-addsch-modal');
+        if (!$modal.hasClass('uk-open')) {
+            if (!gb_dataZndd.interval){
+                gb_dataZndd.interval  = gb_dataZndd.snt(data.ids);
+            }
+            gb_dataZndd.setTimelist(data.uuid) //自动调度定时器
+        }
         $wrap.append(htmlStr);
     };
@@ -24,14 +35,33 @@ var gb_klyj = (function () {
         open_modal("/real_control_v2/zndd/type/dkl.html", {
             data: data
         }, {center: true, bgclose: false, modal: true});
+        $(this).parent().remove();
     });
     var close = true; //关闭弹出框的时候不弹出
-    $wrap.on('click', '.multi_plat_msg_pops .msg-times', function () {
+    $wrap.on('click', '.multi_plat_config .msg-times', function () {
         $(this).parent().parent().remove();
         /*if (close)  close = false*/
     });
+    $wrap.on('click', '.images', function () {
+        var image = $(this).data('image');
+        var imgHtml = "<img src='" + image + "' style='width: " + 600 + "px;height:" + 300 + "px'/>";
+        layer.open({
+            type: 1,
+            offset: 'auto',
+            area: [600 + 'px', 300 + 'px'],
+            shadeClose: true,//点击外围关闭弹窗
+            scrollbar: true,//不现实滚动条
+            title: false, //不显示标题
+            content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+            cancel: function () {
+
+            }
+        })
+
+    });
+
     return {
         popcf: popcf
     }
@@ -2,8 +2,8 @@
  * 站点催发
  */
 var gb_stationcf = (function () {
-    var $wrap = $('.multi_plat_msg_pop_cf');
-    var max = 5;
+    var $wrap = $('.multi_plat_msg_pop_zndd');
+    var max = 3;
     var popcf = function (data) {
         //时间格式化
@@ -16,9 +16,9 @@ var gb_stationcf = (function () {
        /* gb_svg_chart.people(data.lineCode,stopNo,data.num,data.image);*/
         var htmlStr = template('cf_plat_msg_template', data);
-        var items = $wrap.find('.multi_plat_msg_pops'), len = items.length;
+        var items = $wrap.find('.multi_plat_config'), len = items.length;
         if (len >= max)
-            $wrap.find('.multi_plat_msg_pops:lt(' + (len - max) + ')').remove();
+            $wrap.find('.multi_plat_config:lt(' + (len - max) + ')').remove();
         $wrap.append(htmlStr);
     };
@@ -26,7 +26,8 @@ var gb_stationcf = (function () {
     $wrap.on('click', '.all', function () {
         var type = $(this).data('ip');
-        let pageUrl ="/real_control_v2/call/index.html";
+        var calleeId = $(this).data('call')
+        let pageUrl ="/real_control_v2/call/index.html?calleeId="+calleeId;
         //将片段路径写入 localStorage
         window.localStorage.setItem('real_control_form_embed_pageUrl', pageUrl);
         var index = layer.open({
@@ -47,11 +48,11 @@ var gb_stationcf = (function () {
         //layer.full(index);//全屏
     });
- /*   var close = true; //关闭弹出框的时候不弹出
-    $wrap.on('click', '.multi_plat_msg_pops .msg-times', function () {
+    var close = true; //关闭弹出框的时候不弹出
+    $wrap.on('click', '.multi_plat_config .msg-times', function () {
         $(this).parent().parent().remove();
-        /!*if (close)  close = false*!/
-    });*/
+        /*if (close)  close = false*/
+    });
     $wrap.on('click', '.images', function () {
         debugger
         var image = $(this).data('image');
 var gb_dataZndd = (function (){
-    var max = 1;
+    var max = 3;
     var $pop =$('.multi_plat_msg_pop_zndd'); 
     var codes = {
@@ -309,6 +309,7 @@ var gb_dataZndd = (function (){
     function TimeChick(ele){
         var thisall= $("#"+ele).parent();
+        var data=dataMap.get(ele);
         var sch = dataMap.get(thisall.data('uuid'));
         if (thisall.length == 0) return;
         var date = returnDate(thisall);
@@ -354,6 +355,12 @@ var gb_dataZndd = (function (){
                     UIkit.modal(modal).hide();
                 }
             });*/
+        } else if (type == "KLYJ"){
+            if(!$('#schedule-addsch-modal').hasClass('uk-open')){
+                open_modal("/real_control_v2/zndd/type/dkl.html", {
+                    data: data
+                }, {center: true, bgclose: false, modal: true});
+            }
         }
     }
     function checkTime(i){ //将0-9的数字前面加上0，例1变为01
@@ -366,8 +373,28 @@ var gb_dataZndd = (function (){
     }
+    function setDataMap(uuid,data){
+        dataMap.set(uuid,data);
+    }
+    function setTimelist(uuid){
+        timelist.push({ele:uuid,time:leftTime});
+    }
+    function removeTimelist(uuid){
+        for(var i = 0;i < timelist.length; i++) {
+            if (timelist[i].ele == uuid){
+                console.log("delete");
+                timelist.splice(i--, 1);
+            }
+        };
+    }
     return {
         sop : sop,
+        snt : snt,
+        setTimelist:setTimelist,
+        interval:interval,
+        leftTime:leftTime,
+        setDataMap:setDataMap,
+        removeTimelist:removeTimelist
     };
 })();
 \ No newline at end of file
@@ -8,7 +8,7 @@
     const zzdclone="已关闭无人调度";
     const error="'未匹配到对应操作,请重新下达指令!";
     const nosche="当天没有排班";
-    
+
     var HZRecorder = function (stream, config) {
         config = config || {};
@@ -183,48 +183,178 @@
             xhr.onreadystatechange = function() {
                 if (xhr.readyState == 3 && xhr.status == 200) {
-                    var responseText = xhr.responseText.split(",");
-                    //notify_succ("您说的是："+responseText[0]);
-
-                    console.log(responseText); // 这里会输出 "Hello, World!"
-
-                    debugger
                     let lineCode = gb_schedule_table.TablelineCode;
-                    //打开临加班次
-                    var folder = '/real_control_v2/fragments/line_schedule/context_menu';
-                    var modal_opts = {
-                        center: false,
-                        bgclose: false
-                    };
-                    /*var sch ={
-                        xlBm : lineCode,
-                        qdzCode : responseText[1],
-                        zdzCode : responseText[2],
-                        dir : responseText[3],
-                        yuyin:111,
-                    };*/
-                    let date =  {
-                        lineCode :lineCode,
-                        dir:responseText[3],
+                    const schId = getCookie('checkedSch');
+                    var responseText = xhr.responseText.split(",");
+                    if(responseText[1]=="1"){
+                        //notify_succ("您说的是："+responseText[0]);
+                        //console.log(responseText); // 这里会输出 "Hello, World!"
+                        //打开临加班次
+                        var folder = '/real_control_v2/fragments/line_schedule/context_menu';
+                        var modal_opts = {
+                            center: false,
+                            bgclose: false
+                        };
+                        let date =  {
+                            lineCode :lineCode,
+                            dir:responseText[4],
+                        }
+                        $.post('/logZndd/schlist',date,function(sch) {
+                            debugger
+                            sch.qdzCode = responseText[2];
+                            sch.zdzCode = responseText[3];
+                            sch.xlDir = responseText[4];
+                            sch.zdsjActual = moment(new Date()).format("HH:mm")
+                            open_modal(folder + '/temp_sch/main.html', {
+                                sch: sch
+                            }, modal_opts);
+                        });
+                    }
+                    else if(responseText[1]=="2"){//新增出场班次
+                        if(schId==''){
+                            notify_err("请选择班次");
+                            return;
+                        }
+                        var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
+                        sch = Object.assign({}, sch);
+                        var confirmBtn = $(this).parent().find('.uk-button-primary');
+                        var fun =gb_schedule_context_menu.add_temp_sch;
+                        sch.bcType='out';
+                        sch.qdzCode=getCarPark(sch)[0].code;
+                        sch.qdzName=getCarPark(sch)[0].name;
+                        fun(sch, function () {
+                            confirmBtn.trigger('click');
+                        });
+                        return;
+                    }
+                    else if(responseText[1]=="3"){//新增班次
+                        if(schId==''){
+                            notify_err("请选择班次");
+                            return;
+                        }
+                        var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
+                        var confirmBtn = $(this).parent().find('.uk-button-primary');
+                        var fun =gb_schedule_context_menu.add_temp_sch;
+                        fun(sch, function () {
+                            confirmBtn.trigger('click');
+                        });
+                        return;
+                    }
+                    if(responseText[1]=="11"){//取消班次
+                        if(schId==''){
+                            notify_err("请选择班次");
+                            return;
+                        }
+                        var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
+                        var confirmBtn = $(this).parent().find('.uk-button-primary');
+                        var fun =gb_schedule_context_menu.jhlb;
+                        fun(sch, function () {
+                            confirmBtn.trigger('click');
+                        });
+                        return;
+                    }
+                    else if(responseText[1]=="12"){//取消实发
+                        if(schId==''){
+                            notify_err("请选择班次");
+                            return;
+                        }
+                        var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
+                        var confirmBtn = $(this).parent().find('.uk-button-primary');
+                        var fun =gb_schedule_context_menu.cxsf;
+                        fun(sch, function () {
+                            confirmBtn.trigger('click');
+                        });
+                        return;
+                    }
+                    else if(responseText[1]=="21"){//调整待发
+                        if(schId==''){
+                            notify_err("请选择班次");
+                            return;
+                        }
+                        var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
+                        var confirmBtn = $(this).parent().find('.uk-button-primary');
+                        var fun =gb_schedule_context_menu.dftz;
+                        fun(sch, function () {
+                            confirmBtn.trigger('click');
+                        });
+                        return;
+                    }
+                    else if(responseText[1]=="22"){//调整实发
+                        if(schId==''){
+                            notify_err("请选择班次");
+                            return;
+                        }
+                        var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
+                        var confirmBtn = $(this).parent().find('.uk-button-primary');
+                        var fun =gb_schedule_context_menu.sftz;
+                        fun(sch, function () {
+                            confirmBtn.trigger('click');
+                        });
+                        return;
+                    }
+                    else if(responseText[1]=="31"){
+                        notify_succ("开启智能调度");
+                    }else if(responseText[1]=="41"){
+                        notify_succ("关闭智能调度");
+                    }else if(responseText[1]=="999"){
+                        console.log(responseText[0]);
+                        notify_err(error);
                     }
-                    $.post('/logZndd/schlist',date,function(sch) {
-                        debugger
-                        sch.qdzCode = responseText[1];
-                        sch.zdzCode = responseText[2];
-                        sch.xlDir = responseText[3];
-                        sch.zdsjActual = moment(new Date()).format("HH:mm")
-
-                        open_modal(folder + '/temp_sch/main.html', {
-                            sch: sch
-                        }, modal_opts);
-                    });
-
-
                 }
             };
+            function getCarPark(sch){
+                var st_park_data = gb_data_basic.get_stat_park_data()[sch.xlBm];
+                //停车场
+                var parks = gb_data_basic.simpleParksArray();
+                //线路标准
+                var information = gb_data_basic.getLineInformation(sch.xlBm);
+                //停车场排序，常用的放前面
+                return  sort_parks(parks, information, st_park_data);
+            }
+            /**
+             * 停车场排序
+             * @param parks 停车场 code 2 name
+             * @param information 线路标准
+             * @param st_park_data 站到场
+             */
+            function sort_parks(parks, information, st_park_data) {
+                var array = [], names=[];
+                for(var code in parks){
+                    array.push({code: code, name: parks[code]});
+                }
+
+                if(st_park_data && st_park_data.length > 0){
+                    $.each(st_park_data, function () {
+                        names.push(this.parkName);
+                    });
+                }
+                //debugger
+                array.sort(function (a, b) {
+                    if(a.code==information.carPark)
+                        return -1;
+                    if(b.code==information.carPark)
+                        return 1;
+
+                    var ai = names.indexOf(a.name),
+                        bi = names.indexOf(b.name);
+
+                    if(ai!=-1 && bi==-1)
+                        return -1;
+                    else if(ai==-1 && bi!=-1)
+                        return 1;
+                    else
+                        return $.trim(a.name).localeCompare($.trim(b.name), 'zh-CN');
+                });
+                return array;
+            }
+            const getCookie = (name) => {
+                const value = `; ${document.cookie}`;
+                const parts = value.split(`; ${name}=`);
+                if (parts.length === 2) return parts.pop().split(';').shift();
+            }
           /*  ti = 0;
                 timeInt =setInterval(function(){leftTimer(xhr);},1000); //开始倒计时*/
         }
@@ -236,7 +236,7 @@
 <script src="/real_control_v2/js/forms/form_embed.js" merge="custom_js"></script>
 <!-- 模态框扩展 -->
 <script src="/real_control_v2/js/modal_extend.js" merge="custom_js"></script>
-
+<script src="/real_control_v2/call/assets/js/index.js" merge="custom_js"></script>
 <!-- #### 安全驾驶 start ###  -->
 <div class="multi_plat_msg_pop_wrap" ></div>
 <script id="sd_plat_msg_template" type="text/html">
@@ -260,18 +260,25 @@
     </div>
 </script>
 <div class="multi_plat_msg_pop_cf" ></div>
-<script id="cf_plat_msg_template" type="text/html">
-    <div class="multi_plat_msg_pops uk-animation-slide-bottom" data-type="{{type}}" >
-        <div>
-            <div class="msg-times" style="cursor: pointer;" >x</div>
-            <span class="reminder">催发</span>
-            <span class="tests">{{lineName}}</span>
-            <span class="tests">{{stationName}}——{{dir == 0 ? '上行':'下行'}}</span>
-            <span class="tests">站点人数&nbsp;&nbsp;&nbsp;{{num}}</span>
-            <span class="time">催发时间：{{timeStr}}</span>
+
+<script  id="cf_plat_msg_template" type="text/html">
+    <div class="multi_plat_config"  data-type="{{type}}">
+        <div class="msg-popup warning-color">
+            <div class="msg-times" style="cursor: pointer;">×</div>
+            <div class="centerSpace msg-title" style="color: red">
+                催发
+            </div>
+            <div class="popup-msg-content">
+                <span>{{lineName}} {{dir == 0 ? '上行':'下行'}} {{stationName}}</span>
+            </div>
+            <div class="popup-msg-content">
+                <span>站点人数&nbsp;{{num}} &nbsp;&nbsp;催发时间&nbsp;{{timeStr}}</span>
+            </div>
+            <div class="popup-msg-contents" >
+                <button class="uk-button uk-button-primary all"   data-call="{{calleeId}}" data-ip="{{dir}}" value="{{dir}}">拨打站台电话</button>
+                <button class="uk-button uk-button-primary images"  data-image="{{image}}" value="{{dir}}">查看图片</button>
+            </div>
         </div>
-        <button class="all uk-button uk-modal-close" class="title" data-ip="{{dir}}" value="{{dir}}">拨打站台电话</button>
-        <button class="images uk-button uk-modal-close" data-image="{{image}}" value="{{dir}}">查看图片</button>
     </div>
 </script>
 <!-- #### 智能调度 start ###  -->
@@ -307,18 +314,27 @@
 <div  class="multi_plat_msg_pop_zndd">
     <!--<div id="timer"></div>-->
 </div>
-<script id="klyj_plat_msg_template" type="text/html">
-    <div class="multi_plat_msg_pops uk-animation-slide-bottom " data-type="{{type}}" >
-        <div>
-            <div class="msg-times" style="cursor: pointer;" >x</div>
-            <span class="reminder">大客流预警</span>
-            <span class="tests">{{lineName}}</span>
-            <span class="tests">{{stationName}}——{{dir == 0 ? '上行':'下行'}}</span>
-            <span class="tests">站点人数&nbsp;&nbsp;&nbsp;{{num}}</span>
-            <span class="time">预警时间：{{timeStr}}</span>
+
+<div class="multi_plat_msg_pop_klyj" ></div>
+<script  id="klyj_plat_msg_template" type="text/html">
+    <div class="multi_plat_config"  data-type="{{type}}" data-uuid="{{uuid}}">
+        <div id ={{uuid}}  class="timer"></div>
+        <div class="msg-popup warning-color">
+            <div class="msg-times" style="cursor: pointer;">×</div>
+            <div class="centerSpace msg-title" style="color: red">
+                大客流预警
+            </div>
+            <div class="popup-msg-content">
+                <span>{{lineName}} {{dir == 0 ? '上行':'下行'}} {{stationName}}</span>
+            </div>
+            <div class="popup-msg-content">
+                <span>站点人数&nbsp;{{num}} &nbsp;&nbsp;预警时间&nbsp;{{timeStr}}</span>
+            </div>
+            <div class="popup-msg-contents" >
+                <button class="uk-button uk-button-primary images"   data-image="{{image}}" value="{{dir}}">查看图片</button>
+                <button class="uk-button uk-button-primary ljbc"  data-uuid="{{uuid}}" data-linecode="{{sch.xlBm}}" data-id="{{sch.id}}">临加班次</button>
+            </div>
         </div>
-        <button class="images uk-button uk-modal-close" data-image="{{image}}" value="{{dir}}">查看图片</button>
-        <button class="ljbc uk-button uk-modal-close"  data-uuid="{{uuid}}" data-linecode="{{sch.xlBm}}" data-id="{{sch.id}}">临加班次</button>
     </div>
 </script>
@@ -118,6 +118,8 @@
                 $.post('/logZndd/thissch/'+sch.sch.id, function(res) {
                     //to and fro
+                    res.zdsjActual = moment(new Date().getTime() +(1000 * 60 *5)).format("HH:mm");
+                    res.zdsj = moment(new Date().getTime() + (1000 * 60 * 5)).format("HH:mm");
                     $('.toAndFroCont', modal).html(st_doms.two_way_dom)
                         .trigger('init', {sch: res, submitFun: submit_temp_schedule_form, stationRoutes: stationRoutes});
@@ -494,7 +496,6 @@
                 </div>
             </div>
         </div>
-
         <div class="uk-grid">
             <div class="uk-width-2-2">
                 <div class="uk-form-row">
@@ -502,6 +503,13 @@
                 </div>
             </div>
         </div>
+        <div class="uk-grid">
+            <div class="uk-width-4-2">
+                <div class="uk-form-row">
+                    <label class="uk-form-labels" ><h3>{{msg}}</h3></label>
+                </div>
+            </div>
+        </div>
     </div>
 </script>