diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java
index 5d81ce90..9dc9e7d8 100644
--- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java
+++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java
@@ -26,12 +26,15 @@
 package com.wh.pojo.purchasenew;
 
 
+import com.wh.pojo.purchasenewproduct.PurchasenewProductVo;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: warehouse(仓储) <br/>
  * File: PurchasenewVo.java <br/>
@@ -72,5 +75,6 @@ public class PurchasenewDetailsVo implements Vo {
     private String storehouseId; // 仓库id
     @ApiModelProperty("状态")
     private String status; // 状态
-
+    @ApiModelProperty("商品列表数据")
+    List<PurchasenewProductVo> products;
 }
\ No newline at end of file
diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java
index 606b0db6..38147132 100644
--- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java
+++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java
@@ -34,6 +34,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+
 /**
  * Project: warehouse(仓储) <br/>
  * File: PurchasenewProductVo.java <br/>
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/WarehouseApplication.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/WarehouseApplication.java
index 6066784d..344ba05f 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/WarehouseApplication.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/WarehouseApplication.java
@@ -11,7 +11,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @MapperScan("com.wh.mapper")
 @SpringBootApplication(scanBasePackages = {
         "com.yxt.common.base.config",
-        "com.wh",
         "com.wh.*"
 })
 public class WarehouseApplication {
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/RightsController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/RightsController.java
index 9253bc63..4a82e132 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/RightsController.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/RightsController.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-@RestController
+@RestController("com.wh.controller.RightsController")
 @CrossOrigin
 @RequestMapping("/rights")
 public class RightsController {
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenewproduct/PurchasenewProductMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenewproduct/PurchasenewProductMapper.java
index b21dc23e..fd40ac7b 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenewproduct/PurchasenewProductMapper.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenewproduct/PurchasenewProductMapper.java
@@ -62,4 +62,12 @@ public interface PurchasenewProductMapper extends BaseMapper<PurchasenewProduct>
 	
 	@Select("select * from purchasenew_product")
 	List<PurchasenewProductVo> selectListVo();
+
+	/**
+	 * 根据采购订单的sid查询 对应的商品列表
+	 * @param sid
+	 * @return
+	 */
+	@Select("select * from purchasenew_product where main_sid=#{sid}")
+	List<PurchasenewProductVo> fetchDetailsVoByPurchaseSid(String sid);
 }
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
index 85687dd9..e46b2b15 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java
@@ -9,6 +9,7 @@ import com.wh.mapper.purchasenew.PurchasenewMapper;
 import com.wh.pojo.purchasenew.*;
 import com.wh.pojo.purchasenewproduct.PurchasenewProduct;
 import com.wh.pojo.purchasenewproduct.PurchasenewProductDto;
+import com.wh.pojo.purchasenewproduct.PurchasenewProductVo;
 import com.wh.service.api.instorehouse.InStorehouseMainService;
 import com.wh.service.purchasenewproduct.PurchasenewProductService;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -148,7 +149,10 @@ public class PurchasenewService extends MybatisBaseService<PurchasenewMapper, Pu
             return null;
         }
         PurchasenewDetailsVo vo = new PurchasenewDetailsVo();
+       //根据采购订单的sid查询 对应的商品列表
+        List<PurchasenewProductVo> purchasenewProductVos = purchasenewProductService.fetchDetailsVoByPurchaseSid(sid);
         BeanUtil.copyProperties(entity, vo);
+        vo.setProducts(purchasenewProductVos);
         return vo;
     }
     @Transactional
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenewproduct/PurchasenewProductService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenewproduct/PurchasenewProductService.java
index 1ab6b80f..d82fb379 100644
--- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenewproduct/PurchasenewProductService.java
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenewproduct/PurchasenewProductService.java
@@ -39,6 +39,8 @@ import com.yxt.common.base.utils.PagerUtil;
 
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Project: warehouse(仓储) <br/>
  * File: PurchasenewProductService.java <br/>
@@ -123,4 +125,14 @@ public class PurchasenewProductService extends MybatisBaseService<PurchasenewPro
 		return rb;
 
 	}
+
+	/**
+	 * 根据采购订单的sid查询 对应的商品列表
+	 * @param sid
+	 * @return
+	 */
+
+	public List<PurchasenewProductVo> fetchDetailsVoByPurchaseSid(String sid) {
+		return baseMapper.fetchDetailsVoByPurchaseSid(sid);
+	}
 }
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/resources/application.yml b/warehousing-system/project/wh-manage/src/main/resources/application.yml
index d464ae3d..f5dd3907 100644
--- a/warehousing-system/project/wh-manage/src/main/resources/application.yml
+++ b/warehousing-system/project/wh-manage/src/main/resources/application.yml
@@ -21,7 +21,7 @@ mybatis-plus:
       id-type: 0
       db-type: mysql
   configuration:
-    map-underscore-to-camel-case: false
+    map-underscore-to-camel-case: true
     cache-enabled: true
     call-setters-on-nulls: true
     mybatis-plus:
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTVo.java
new file mode 100644
index 00000000..062767ee
--- /dev/null
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTVo.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: supervise-dispatchcenter(工单系统) <br/>
+ * File: DispatchModleTemplateVo.java <br/>
+ * Class: com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateVo <br/>
+ * Description: 模型模板对照 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-05-28 10:30:03 <br/>
+ *
+ * @author djz
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "模型模板对照DispatchModleTVo 视图数据对象", description = "模型模板对照DispatchModleTVo 视图数据对象")
+public class DispatchModleTVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("模板id")
+    private String templateid; // 模板id
+    @ApiModelProperty("任务项标准库id")
+    private String taskid; // 任务项标准库id
+    @ApiModelProperty("任务项标准库名称")
+    private String taskname; // 任务项标准库名称
+    @ApiModelProperty("任务描述")
+    private String taskdesc;
+}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDto.java
index 32ae898f..45cc8628 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDto.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDto.java
@@ -49,7 +49,7 @@ import java.util.List;
  */
 @Data
 @ApiModel(value = "模型模板对照 数据传输对象", description = "模型模板对照 数据传输对象")
-public class DispatchModleTemplateDto implements Dto {
+public class  DispatchModleTemplateDto implements Dto {
 
     private String sid; // sid
 
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeign.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeign.java
index 753a5fe3..9fdb6081 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeign.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeign.java
@@ -59,7 +59,7 @@ public interface DispatchModleTemplateFeign {
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     @ResponseBody
-    public ResultBean<PagerVo<DispatchModleTemplateVo>> listPage(@RequestBody PagerQuery<DispatchModleTemplateQuery> pq);
+    public ResultBean<PagerVo<DispatchModleTVo>> listPage(@RequestBody PagerQuery<DispatchModleTemplateQuery> pq);
 
     @ApiOperation("新增或修改")
     @PostMapping("/save")
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeignFallback.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeignFallback.java
index 7266aa42..5021e8c7 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeignFallback.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeignFallback.java
@@ -49,7 +49,7 @@ import java.util.List;
 public class DispatchModleTemplateFeignFallback implements DispatchModleTemplateFeign {
 
 	@Override
-	public ResultBean<PagerVo<DispatchModleTemplateVo>> listPage(PagerQuery<DispatchModleTemplateQuery> pq){
+	public ResultBean<PagerVo<DispatchModleTVo>> listPage(PagerQuery<DispatchModleTemplateQuery> pq){
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口supervise-dispatchcenter/dispatchmodletemplate/listPage无法访问");
 	}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateVo.java
index fa0f9305..d071b562 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateVo.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateVo.java
@@ -58,4 +58,5 @@ public class DispatchModleTemplateVo implements Vo {
     @ApiModelProperty("任务项标准库id")
     private List<String> taskid; // 任务项标准库id
 
+
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarm.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarm.java
index b4cff481..ff2cfce7 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarm.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarm.java
@@ -80,8 +80,12 @@ public class DispatchOpmAlarm extends BaseEntity {
     private String alarmcontent; // 告警内容
 	@ApiModelProperty("告警原因")
     private String alarmreason; // 告警原因
-    @ApiModelProperty("告警1一级、2二级key")
-    private String warnlevelkey;
+//    @ApiModelProperty("告警1一级、2二级key")
+//    private String warnlevelkey;
     @ApiModelProperty("告警类型key")
     private String alarmtypekey;
+    @ApiModelProperty("客户标识")
+    private String custname;
+    @ApiModelProperty("告警1一级、2二级value")
+    private String warnlevelvalue="一级";
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmDetailsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmDetailsVo.java
index 10c2f3ff..8d89f06b 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmDetailsVo.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmDetailsVo.java
@@ -81,8 +81,12 @@ public class DispatchOpmAlarmDetailsVo implements Vo {
     private String alarmcontent; // 告警内容
 	@ApiModelProperty("告警原因")
     private String alarmreason; // 告警原因
-    @ApiModelProperty("告警1一级、2二级key")
-    private String warnlevelkey;
+//    @ApiModelProperty("告警1一级、2二级key")
+//    private String warnlevelkey;
     @ApiModelProperty("告警类型key")
     private String alarmtypekey;
+    @ApiModelProperty("客户标识")
+    private String custname;
+    @ApiModelProperty("告警1一级、2二级value")
+    private String warnlevelvalue="一级";
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmDto.java
index 49d5f1ac..a95b4b22 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmDto.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmDto.java
@@ -81,8 +81,12 @@ public class DispatchOpmAlarmDto implements Dto {
     private String alarmcontent; // 告警内容
 	@ApiModelProperty("告警原因")
     private String alarmreason; // 告警原因
-    @ApiModelProperty("告警1一级、2二级key")
-    private String warnlevelkey;
+//    @ApiModelProperty("告警1一级、2二级key")
+//    private String warnlevelkey;
     @ApiModelProperty("告警类型key")
     private String alarmtypekey;
+    @ApiModelProperty("客户标识")
+    private String custname;
+    @ApiModelProperty("告警1一级、2二级value")
+    private String warnlevelvalue="一级";
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmQuery.java
index fca05724..e3dd8001 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmQuery.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmQuery.java
@@ -79,8 +79,12 @@ public class DispatchOpmAlarmQuery implements Query {
     private String alarmcontent; // 告警内容
 	@ApiModelProperty("告警原因")
     private String alarmreason; // 告警原因
-    @ApiModelProperty("告警1一级、2二级key")
-    private String warnlevelkey;
+//    @ApiModelProperty("告警1一级、2二级key")
+//    private String warnlevelkey;
     @ApiModelProperty("告警类型key")
     private String alarmtypekey;
+    @ApiModelProperty("客户标识")
+    private String custname;
+    @ApiModelProperty("告警1一级、2二级value")
+    private String warnlevelvalue="一级";
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmVo.java
index b71b32b6..ee413125 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmVo.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarm/DispatchOpmAlarmVo.java
@@ -81,8 +81,12 @@ public class DispatchOpmAlarmVo implements Vo {
     private String alarmcontent; // 告警内容
 	@ApiModelProperty("告警原因")
     private String alarmreason; // 告警原因
-    @ApiModelProperty("告警1一级、2二级key")
-    private String warnlevelkey;
+//    @ApiModelProperty("告警1一级、2二级key")
+//    private String warnlevelkey;
     @ApiModelProperty("告警类型key")
     private String alarmtypekey;
+    @ApiModelProperty("客户标识")
+    private String custname;
+    @ApiModelProperty("告警1一级、2二级value")
+    private String warnlevelvalue="一级";
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHis.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHis.java
index 47176dba..1e07b4b1 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHis.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHis.java
@@ -78,8 +78,12 @@ public class DispatchOpmAlarmHis extends BaseEntity {
     private String alarmcontent; // 告警内容
 	@ApiModelProperty("告警原因")
     private String alarmreason; // 告警原因
-    @ApiModelProperty("告警1一级、2二级key")
-    private String warnlevelkey;
+//    @ApiModelProperty("告警1一级、2二级key")
+//    private String warnlevelkey;
     @ApiModelProperty("告警类型key")
     private String alarmtypekey;
+    @ApiModelProperty("客户标识")
+    private String custname;
+    @ApiModelProperty("告警1一级、2二级value")
+    private String warnlevelvalue="一级";
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisDetailsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisDetailsVo.java
index 5f872fa4..68ae8dd0 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisDetailsVo.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisDetailsVo.java
@@ -79,8 +79,12 @@ public class DispatchOpmAlarmHisDetailsVo implements Vo {
     private String alarmcontent; // 告警内容
 	@ApiModelProperty("告警原因")
     private String alarmreason; // 告警原因
-    @ApiModelProperty("告警1一级、2二级key")
-    private String warnlevelkey;
+//    @ApiModelProperty("告警1一级、2二级key")
+//    private String warnlevelkey;
     @ApiModelProperty("告警类型key")
     private String alarmtypekey;
+    @ApiModelProperty("客户标识")
+    private String custname;
+    @ApiModelProperty("告警1一级、2二级value")
+    private String warnlevelvalue="一级";
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisDto.java
index 8b2e6efd..9ca86a97 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisDto.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisDto.java
@@ -79,8 +79,12 @@ public class DispatchOpmAlarmHisDto implements Dto {
     private String alarmcontent; // 告警内容
 	@ApiModelProperty("告警原因")
     private String alarmreason; // 告警原因
-    @ApiModelProperty("告警1一级、2二级key")
-    private String warnlevelkey;
+//    @ApiModelProperty("告警1一级、2二级key")
+//    private String warnlevelkey;
     @ApiModelProperty("告警类型key")
     private String alarmtypekey;
+    @ApiModelProperty("客户标识")
+    private String custname;
+    @ApiModelProperty("告警1一级、2二级value")
+    private String warnlevelvalue="一级";
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisQuery.java
index 6be062ce..7681bce0 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisQuery.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisQuery.java
@@ -77,8 +77,12 @@ public class DispatchOpmAlarmHisQuery implements Query {
     private String alarmcontent; // 告警内容
 	@ApiModelProperty("告警原因")
     private String alarmreason; // 告警原因
-    @ApiModelProperty("告警1一级、2二级key")
-    private String warnlevelkey;
+//    @ApiModelProperty("告警1一级、2二级key")
+//    private String warnlevelkey;
     @ApiModelProperty("告警类型key")
     private String alarmtypekey;
+    @ApiModelProperty("客户标识")
+    private String custname;
+    @ApiModelProperty("告警1一级、2二级value")
+    private String warnlevelvalue="一级";
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisVo.java
index 1640d04c..ad2bce53 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisVo.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchopmalarmhis/DispatchOpmAlarmHisVo.java
@@ -79,8 +79,12 @@ public class DispatchOpmAlarmHisVo implements Vo {
     private String alarmcontent; // 告警内容
 	@ApiModelProperty("告警原因")
     private String alarmreason; // 告警原因
-    @ApiModelProperty("告警1一级、2二级key")
-    private String warnlevelkey;
+//    @ApiModelProperty("告警1一级、2二级key")
+//    private String warnlevelkey;
     @ApiModelProperty("告警类型key")
     private String alarmtypekey;
+    @ApiModelProperty("客户标识")
+    private String custname;
+    @ApiModelProperty("告警1一级、2二级value")
+    private String warnlevelvalue="一级";
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfo.java
index 56a7380e..cd363662 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfo.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfo.java
@@ -81,4 +81,6 @@ public class DispatchOrderinfo extends BaseEntity {
     private String ordertypekey;
     @ApiModelProperty("告警信息的id")
     private String alarmid;
+    @ApiModelProperty("模板sid")
+    private String templatesid;
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDetailsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDetailsVo.java
index 14a8d270..c2815019 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDetailsVo.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDetailsVo.java
@@ -81,4 +81,6 @@ public class DispatchOrderinfoDetailsVo implements Vo {
     private String orderdegreekey;
     @ApiModelProperty("描述（数据字典）：1-计划巡视,专项巡视、告警巡视；key")
     private String ordertypekey;
+    @ApiModelProperty("模板sid")
+    private String templatesid;
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoQuery.java
index 7f4f9d38..2ddc1a1a 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoQuery.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoQuery.java
@@ -87,4 +87,6 @@ public class DispatchOrderinfoQuery implements Query {
     private String orderdegreekey;
     @ApiModelProperty("描述（数据字典）：1-计划巡视,专项巡视、告警巡视；key")
     private String ordertypekey;
+    @ApiModelProperty("模板sid")
+    private String templatesid;
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoVo.java
index ce2b841a..35e4cb16 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoVo.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoVo.java
@@ -81,4 +81,6 @@ public class DispatchOrderinfoVo implements Vo {
     private String orderdegreekey;
     @ApiModelProperty("描述（数据字典）：1-计划巡视,专项巡视、告警巡视；key")
     private String ordertypekey;
+    @ApiModelProperty("模板sid")
+    private String templatesid;
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsQuery.java
index 8b009b9a..d19ba8c7 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsQuery.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsQuery.java
@@ -63,4 +63,6 @@ public class DispatchStandardsQuery implements Query {
     private String tasktypekey;
     @ApiModelProperty("反馈形式（1选项 2图片 3文字）key")
     private String taskreturnkey;
+    @ApiModelProperty("模板id")
+    private String templateid;
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsVo.java
index 325b5bf0..fe46231c 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsVo.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsVo.java
@@ -65,4 +65,6 @@ public class DispatchStandardsVo implements Vo {
     private String tasktypekey;
     @ApiModelProperty("反馈形式（1选项 2图片 3文字）key")
     private String taskreturnkey;
+    @ApiModelProperty("选中状态")
+    private String selected;
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.java
index 625475e3..634c2ac9 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.java
@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTVo;
 import com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -57,7 +58,7 @@ public interface DispatchModleTemplateMapper extends BaseMapper<DispatchModleTem
 	//@Update("update dispatch_modle_template set name=#{msg} where id=#{id}")
 	//IPage<DispatchModleTemplateVo> voPage(IPage<DispatchModleTemplate> page, @Param(Constants.WRAPPER) QueryWrapper<DispatchModleTemplate> qw);
 	
-	IPage<DispatchModleTemplateVo> selectPageVo(IPage<DispatchModleTemplate> page, @Param(Constants.WRAPPER) Wrapper<DispatchModleTemplate> qw);
+	IPage<DispatchModleTVo> selectPageVo(IPage<DispatchModleTemplate> page, @Param(Constants.WRAPPER) Wrapper<DispatchModleTemplate> qw);
 	
 	List<DispatchModleTemplateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<DispatchModleTemplate> qw);
 	
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.xml b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.xml
index f9fbcf14..b8c956a5 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.xml
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.xml
@@ -3,8 +3,9 @@
 <mapper namespace="com.yxt.supervise.dispatchcenter.biz.dispatchmodletemplate.DispatchModleTemplateMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateVo">
-		SELECT * FROM dispatch_modle_template <where> ${ew.sqlSegment} </where>
+	<select id="selectPageVo" resultType="com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTVo">
+		SELECT dmt.*,ds.taskname,ds.taskdesc  FROM dispatch_modle_template dmt
+		    left join dispatch_standards ds on ds.sid=dmt.taskid  <where> ${ew.sqlSegment} </where>
 	</select>
 	
 	<select id="selectListAllVo" resultType="com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateVo">
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java
index fcd38a02..1d516e3a 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java
@@ -28,18 +28,13 @@ package com.yxt.supervise.dispatchcenter.biz.dispatchmodletemplate;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplate;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateQuery;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateVo;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateDetailsVo;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateDto;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateFeign;
 
 /**
  * Project: yxt_dispatchcenter(工单系统) <br/>
@@ -65,9 +60,9 @@ public class DispatchModleTemplateRest implements DispatchModleTemplateFeign {
 	@Override
 	@ApiOperation("根据条件分页查询数据的列表")
 	@PostMapping("/listPage")
-	public ResultBean<PagerVo<DispatchModleTemplateVo>> listPage(@RequestBody PagerQuery<DispatchModleTemplateQuery> pq){
+	public ResultBean<PagerVo<DispatchModleTVo>> listPage(@RequestBody PagerQuery<DispatchModleTemplateQuery> pq){
 		ResultBean rb = ResultBean.fireFail();
-		PagerVo<DispatchModleTemplateVo> pv = dispatchModleTemplateService.listPageVo(pq);
+		PagerVo<DispatchModleTVo> pv = dispatchModleTemplateService.listPageVo(pq);
 		return rb.success().setData(pv);
 	}
 
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java
index 41e0656f..f3fcaf2f 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java
@@ -28,6 +28,7 @@ package com.yxt.supervise.dispatchcenter.biz.dispatchmodletemplate;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.*;
 import com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsVo;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -35,17 +36,13 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplate;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateQuery;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateVo;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateDetailsVo;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateDto;
-import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleTemplateFeign;
 
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: yxt_dispatchcenter(工单系统) <br/>
@@ -67,21 +64,24 @@ public class DispatchModleTemplateService extends MybatisBaseService<DispatchMod
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
 		QueryWrapper<DispatchModleTemplate> qw = new QueryWrapper<>();
 		if (StringUtils.isNotBlank(query.getTemplateid())) {
-			qw.like("templateid", query.getTemplateid());
+			qw.eq("dmt.templateid", query.getTemplateid());
 		}
 		return qw;
 	}
 	
-	public PagerVo<DispatchModleTemplateVo> listPageVo(PagerQuery<DispatchModleTemplateQuery> pq) {
+	public PagerVo<DispatchModleTVo> listPageVo(PagerQuery<DispatchModleTemplateQuery> pq) {
 		DispatchModleTemplateQuery query = pq.getParams();
 		QueryWrapper<DispatchModleTemplate> qw = createQueryWrapper(query);
 		IPage<DispatchModleTemplate> page = PagerUtil.queryToPage(pq);
-		IPage<DispatchModleTemplateVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<DispatchModleTemplateVo> p = PagerUtil.pageToVo(pagging, null);
+		IPage<DispatchModleTVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<DispatchModleTVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
 	
 	public void saveOrUpdateDto(DispatchModleTemplateDto dto){
+		Map<String,Object> map=new HashMap<>();
+		map.put("templateid",dto.getTemplateid());
+		baseMapper.deleteByMap(map);
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarm/DispatchOpmAlarmService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarm/DispatchOpmAlarmService.java
index 0ee9f4e8..eced281f 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarm/DispatchOpmAlarmService.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarm/DispatchOpmAlarmService.java
@@ -64,14 +64,14 @@ public class DispatchOpmAlarmService extends MybatisBaseService<DispatchOpmAlarm
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
 		QueryWrapper<DispatchOpmAlarm> qw = new QueryWrapper<>();
-		if (StringUtils.isNotBlank(query.getWarnlevelkey())) {
-			qw.like("warnlevelkey", query.getWarnlevelkey());
+		if (StringUtils.isNotBlank(query.getWarnlevel())) {
+			qw.like("warnlevelkey", query.getWarnlevel());
 		}
 		if (StringUtils.isNotBlank(query.getAlarmtypekey())) {
-			qw.like("alarmtypekey", query.getWarnlevelkey());
+			qw.like("alarmtypekey", query.getAlarmtypekey());
 		}
 		if (StringUtils.isNotBlank(query.getCustid())) {
-			qw.like("custid", query.getWarnlevelkey());
+			qw.like("custid", query.getCustid());
 		}
 		if (StringUtils.isNotBlank(query.getWarneterid())) {
 			qw.like("warneterid", query.getWarneterid());
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsMapper.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsMapper.java
index f1aa4631..94e51542 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsMapper.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsMapper.java
@@ -26,6 +26,7 @@
 package com.yxt.supervise.dispatchcenter.biz.dispatchstandards;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -62,4 +63,6 @@ public interface DispatchStandardsMapper extends BaseMapper<DispatchStandards> {
 	
 	@Select("select * from dispatch_standards")
 	List<DispatchStandardsVo> selectListVo();
+
+	IPage<DispatchStandardsVo> listPageForTemplate(IPage<DispatchStandards> page,@Param("templateid") String templateid,@Param(Constants.WRAPPER) QueryWrapper<DispatchStandards> qw);
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsMapper.xml b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsMapper.xml
index 096ce472..deaf6a55 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsMapper.xml
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsMapper.xml
@@ -10,4 +10,12 @@
 	<select id="selectListAllVo" resultType="com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsVo">
 		SELECT * FROM dispatch_standards <where> ${ew.sqlSegment} </where>
 	</select>
+	<select id="listPageForTemplate"
+			resultType="com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsVo">
+		SELECT d.*,
+		IFNULL((SELECT 1 FROM dispatch_modle_template WHERE taskid= d.sid
+		                                                AND templateid=#{templateid}),0) selected
+		FROM dispatch_standards d  <where> ${ew.sqlSegment} </where>
+	</select>
+
 </mapper>
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsRest.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsRest.java
index c1b97479..6151cb93 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsRest.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsRest.java
@@ -71,6 +71,14 @@ public class DispatchStandardsRest implements DispatchStandardsFeign {
 		return rb.success().setData(pv);
 	}
 
+	@ApiOperation("模板根据条件分页查询数据的列表")
+	@PostMapping("/listPageForTemplate")
+	public ResultBean<PagerVo<DispatchStandardsVo>> listPageForTemplate(@RequestBody PagerQuery<DispatchStandardsQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<DispatchStandardsVo> pv = dispatchStandardsService.listPageForTemplate(pq);
+		return rb.success().setData(pv);
+	}
+
 	@Override
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java
index 6f43f438..76fc81bd 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java
@@ -122,4 +122,18 @@ public class DispatchStandardsService extends MybatisBaseService<DispatchStandar
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	/**
+	 * 模板根据条件分页查询数据的列表
+	 * @param pq
+	 * @return
+	 */
+	public PagerVo<DispatchStandardsVo> listPageForTemplate(PagerQuery<DispatchStandardsQuery> pq) {
+		DispatchStandardsQuery query = pq.getParams();
+		QueryWrapper<DispatchStandards> qw = createQueryWrapper(query);
+		IPage<DispatchStandards> page = PagerUtil.queryToPage(pq);
+		IPage<DispatchStandardsVo> pagging = baseMapper.listPageForTemplate(page,query.getTemplateid(), qw);
+		PagerVo<DispatchStandardsVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
 }
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplateService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplateService.java
index d66b5f1d..66819feb 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplateService.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplateService.java
@@ -64,6 +64,12 @@ public class DispatchTemplateService extends MybatisBaseService<DispatchTemplate
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
 		QueryWrapper<DispatchTemplate> qw = new QueryWrapper<>();
+		if(StringUtils.isNotBlank(query.getTemplatename())){
+			qw.like("templatename",query.getTemplatename());
+		}
+		if(StringUtils.isNotBlank(query.getOrdertypekey())){
+			qw.like("ordertypekey",query.getOrdertypekey());
+		}
 		return qw;
 	}
 	
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarm.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarm.js
new file mode 100644
index 00000000..1deacdbc
--- /dev/null
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarm.js
@@ -0,0 +1,91 @@
+import request from '@/utils/request'
+// 汇总工单数据
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarm/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+  // 保存新增记录
+  saveOrUpdate: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarm/save',
+      method: 'post',
+      data: params
+    })
+  },
+  // 通过sid删除一条或多条记录
+  delBySids: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarm/delBySids',
+      method: 'post',
+      data: params
+    })
+  },
+  // 通过sid查询一条记录
+  fetchBySid: function(sid) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarm/fetchDetailsBySid/' + sid
+    })
+  },
+  // 提交
+  doSubmit: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarm/doSubmit',
+      method: 'post',
+      data: params
+    })
+  },
+  // 导入
+  importExcel: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarm/importExcel',
+      method: 'post',
+      data: params
+    })
+  },
+  // 导出
+  exportExcel: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarm/exportExcel',
+      method: 'post',
+      data: params
+    })
+  },
+  // 告警新增
+    saveOrUpdates: function(params) {
+      return request({
+        url: '/yxtdispatchcenter/v1/dispatchopmalarm/save',
+        method: 'post',
+        data: params
+      })
+    },
+      // 查询分页列表
+  listPages: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarm/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+      // 查询任务项列表信息
+  listPageA: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+      // 查询运维人员信息
+  listPageB: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchworker/listPage',
+      method: 'post',
+      data: params
+    })
+  }
+}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarmhis.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarmhis.js
new file mode 100644
index 00000000..fcb12b19
--- /dev/null
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchalarmhis.js
@@ -0,0 +1,91 @@
+import request from '@/utils/request'
+// 汇总工单数据
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+  // 保存新增记录
+  saveOrUpdate: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/save',
+      method: 'post',
+      data: params
+    })
+  },
+  // 通过sid删除一条或多条记录
+  delBySids: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/delBySids',
+      method: 'post',
+      data: params
+    })
+  },
+  // 通过sid查询一条记录
+  fetchBySid: function(sid) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/fetchDetailsBySid/' + sid
+    })
+  },
+  // 提交
+  doSubmit: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/doSubmit',
+      method: 'post',
+      data: params
+    })
+  },
+  // 导入
+  importExcel: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/importExcel',
+      method: 'post',
+      data: params
+    })
+  },
+  // 导出
+  exportExcel: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/exportExcel',
+      method: 'post',
+      data: params
+    })
+  },
+  // 告警新增
+    saveOrUpdates: function(params) {
+      return request({
+        url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/save',
+        method: 'post',
+        data: params
+      })
+    },
+      // 查询分页列表
+  listPages: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchopmalarmhis/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+      // 查询任务项列表信息
+  listPageA: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+      // 查询运维人员信息
+  listPageB: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchworker/listPage',
+      method: 'post',
+      data: params
+    })
+  }
+}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js
index e60b1821..e0e9c85c 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchmodletemplate.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/listPage',
+      url: '/yxtdispatchcenter/v1/dispatchtemplate/listPage',
       method: 'post',
       data: params
     })
@@ -13,7 +13,7 @@ export default {
   // 保存新增记录
   saveOrUpdate: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/save',
+      url: '/yxtdispatchcenter/v1/dispatchtemplate/save',
       method: 'post',
       data: params
     })
@@ -21,7 +21,7 @@ export default {
   // 通过sid删除一条或多条记录
   delBySids: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/delBySids',
+      url: '/yxtdispatchcenter/v1/dispatchtemplate/delBySids',
       method: 'post',
       data: params
     })
@@ -29,13 +29,13 @@ export default {
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/fetchDetailsBySid/' + sid
+      url: '/yxtdispatchcenter/v1/dispatchtemplate/fetchDetailsBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/doSubmit',
+      url: '/yxtdispatchcenter/v1/dispatchtemplate/doSubmit',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js
index 2d491fa6..006877d5 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchorderinfo.js
@@ -75,9 +75,9 @@ export default {
       // 查询任务项列表信息
   listPageA: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchorderstandards/listPage',
+      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/listPage',
       method: 'post',
-      data: params,
+      data: params
     })
   },
       // 查询运维人员信息
@@ -85,7 +85,7 @@ export default {
     return request({
       url: '/yxtdispatchcenter/v1/dispatchworker/listPage',
       method: 'post',
-      data: params,
+      data: params
     })
-  },
+  }
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolplan.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolplan.js
index 790b8710..5909727e 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolplan.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchpatrolplan.js
@@ -55,5 +55,21 @@ export default {
       method: 'post',
       data: params
     })
+  },
+  // 查询任务项列表信息
+  listPageA: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchmodletemplate/listPage',
+      method: 'post',
+      data: params
+    })
+  },
+  // 查询运维人员信息
+  listPageB: function(params) {
+    return request({
+      url: '/yxtdispatchcenter/v1/dispatchplanworker/listPage',
+      method: 'post',
+      data: params
+    })
   }
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchstandards.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchstandards.js
index c332f9ea..62af7f8d 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchstandards.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/api/yxtdispatchcenter/dispatchstandards.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/yxtdispatchcenter/v1/dispatchstandards/listPage',
+      url: '/yxtdispatchcenter/v1/dispatchstandards/listPageForTemplate',
       method: 'post',
       data: params
     })
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/layout/components/Sidebar/index.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/layout/components/Sidebar/index.vue
index d01854dc..13a826fc 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/layout/components/Sidebar/index.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/layout/components/Sidebar/index.vue
@@ -99,13 +99,13 @@ export default {
           name: "",
           children: [
             {
-              path: "/dispatchworker/index",
+              path: "/alarm/realalarm",
               component: "DispatchWorkerIndex",
               name: "DispatchWorkerIndex",
               meta: { title: "实时告警",icon: "el-icon-help"  },
             },
             {
-              path: "/dispatchworker/dispatchtemplate",
+              path: "/alarm/historyalarm",
               component: "DispatchTemplate",
               name: "DispatchTemplate",
               meta: { title: "历史告警",icon: "el-icon-help"  },
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/index.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/index.js
index e3b54d75..7eed7894 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/index.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/index.js
@@ -83,7 +83,7 @@ export const constantRoutes = [
     redirect: '/dispatchorderinfo/index',
     meta: {
       title: '巡视工单管理'
-    }, 
+    },
     children: [{
       path: '/dispatchorderinfo/index',
       component: () => import('@/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue'),
@@ -133,14 +133,14 @@ export const constantRoutes = [
       title: '告警管理'
     },
     children: [{
-      path: '/dispatchworker/index',
-      component: () => import('@/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue'),
+      path: '/alarm/realalarm',
+      component: () => import('@/views/yxtdispatchcenter/alarm/realalarm.vue'),
       name: 'DispatchWorkerIndex',
       meta: { title: '实时告警' }
     },
     {
-      path: '/dispatchworker/dispatchtemplate',
-      component: () => import('@/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue'),
+      path: '/alarm/historyalarm',
+      component: () => import('@/views/yxtdispatchcenter/alarm/historyalarm.vue'),
       name: 'DispatchTemplate',
       meta: { title: '历史告警' }
     }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/modules/codemenu.js b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/modules/codemenu.js
index 20b1a9ce..7f48d1d7 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/modules/codemenu.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/router/modules/codemenu.js
@@ -80,7 +80,7 @@ const codemenu = [
     },
     children: [{
       path: '/dispatchtemplate/index',
-      component: () => import('@/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue'),
+      component: () => import('@/views/yxtdispatchcenter/alarm/historyalarm.vue'),
       name: 'DispatchTemplateIndex',
       meta: { title: '运维任务模板' }
     }]
@@ -94,7 +94,7 @@ const codemenu = [
     },
     children: [{
       path: '/dispatchworker/index',
-      component: () => import('@/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue'),
+      component: () => import('@/views/yxtdispatchcenter/alarm/realalarm.vue'),
       name: 'DispatchWorkerIndex',
       meta: { title: '工单运维人员情况' }
     }]
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/alarmInfo.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/alarmInfo.vue
new file mode 100644
index 00000000..6976d125
--- /dev/null
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/alarmInfo.vue
@@ -0,0 +1,88 @@
+<template>
+	<div>
+		<!-- 标题按钮部分开始 -->
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>详情</div>
+			<!-- start 详情按钮 -->
+			<div><el-button itype="info" size="small" @click="handleReturn()">返回</el-button></div>
+			<!-- end 详情按钮 -->
+		</div>
+		<!-- 标题按钮部分结束 -->
+		<div class="listconadd">
+			<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd">
+			<el-row>
+				<el-col :span="4" class="tleftb">客户名称</el-col>
+				<el-col :span="8" class="trightb"> <el-form-item prop="custname">{{formobj.custname}}</el-form-item></el-col>
+			</el-row>
+			<el-row>
+				<el-col :span="4" class="tleftb">告警设备</el-col>
+				<el-col :span="8" class="trightb"><el-form-item prop="custname">{{ formobj.warneterid }}</el-form-item></el-col>
+			</el-row>
+			<el-row>
+				<el-col :span="4" class="tleftb">告警位置</el-col>
+				<el-col :span="8" class="trightb"><el-form-item prop="custname">{{ formobj.warnobjectmpsn }}</el-form-item></el-col>
+			</el-row>
+			<el-row>
+				<el-col :span="4" class="tleftb">告警说明</el-col>
+				<el-col :span="8" class="trightb"><el-form-item prop="custname">{{ formobj.warnremarks }}</el-form-item></el-col>
+			</el-row>
+			<el-row>
+				<el-col :span="4" class="tleftb">告警等级</el-col>
+				<el-col :span="8" class="trightb"><el-form-item prop="custname">{{ formobj.warnlevelvalue }}</el-form-item></el-col>
+			</el-row>
+		</el-form>
+		</div>
+	</div>
+</template>
+
+<script>
+import req from '@/api/yxtdispatchcenter/dispatchalarm'
+export default {
+	name: 'DispatchWorkerInfo',
+	data() {
+		return {
+			formobj: {
+        id:"",
+        sid:"",
+        warneterid:"",
+        custname:"",
+        warnobjectmpsn:"",
+        warnremarks:"",
+        warnlevelvalue:""
+      }
+		}
+	},
+	methods: {
+		handleReturn() {
+			//this.formobj = {}
+			this.$emit('doback')
+		},
+		showInfo(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      const _this = this
+				req
+					.fetchBySid(row.sid)
+					.then(resp => {
+						if (resp.success) {
+							const vdata = resp.data
+              _this.formobj.id = vdata.id
+              _this.formobj.sid = vdata.sid // SID
+              _this.formobj.custname = vdata.custname // 工单id
+              _this.formobj.warneterid = vdata.warneterid // 巡视人名称
+              _this.formobj.warnobjectmpsn = vdata.warnobjectmpsn // 巡视人sid
+              _this.formobj.warnremarks = vdata.warnremarks // 联系方式
+              _this.formobj.warnlevelvalue = vdata.warnlevelvalue // 是否负责人
+						}
+					})
+				.catch(e => {
+          this.formobj = row
+				})
+		}
+	}
+}
+</script>
+
+<style scoped></style>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/historyalarm.vue
similarity index 90%
rename from yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue
rename to yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/historyalarm.vue
index b9a26d08..8871e63a 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/historyalarm.vue
@@ -42,13 +42,11 @@
 			<div>
 				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
 					<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
-					<el-table-column prop="ordername" label="企业名称" align="center" />
-					<el-table-column prop="custname" label="客户名称" align="center" />
-					<el-table-column prop="orderdegreekey" label="告警说明" width="400px" align="center" />
-					<el-table-column prop="ordertypekey" label="告警等级" align="center" />
-					<el-table-column prop="orderdegree" :formatter="formatorderdegree" label="等级" align="center" />
-					<el-table-column prop="receiveperson" label="现场联系人" align="center" />
-					<el-table-column prop="receivetel" label="现场联系人电话" align="center" />
+          <el-table-column prop="custname" label="客户名称" width="300px"  align="center" />
+          <el-table-column prop="warneterid" label="告警设备" width="300px" align="center" />
+          <el-table-column prop="warnobjectmpsn" label="告警位置" width="300px" align="center" />
+          <el-table-column prop="warnremarks" label="告警说明" width="300px" align="center" />
+          <el-table-column prop="warnlevelvalue" label="告警等级" align="center" />
 					<el-table-column fixed="right" label="操作"  align="center">
                         <template slot-scope="scope">
 						   <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
@@ -83,21 +81,17 @@
         </el-drawer>
 		</div>
 		<!-- End 查询和其列表部分 -->
-		<!-- 新增修改部分组件 -->
-		<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-
 		<!-- 详情部分组件 -->
 		<div-info v-show="viewState == 4" ref="divinfo" @doback="resetState" />
 	</div>
 </template>
 
 <script>
-import req from '@/api/yxtdispatchcenter/dispatchorderinfo'
+import req from '@/api/yxtdispatchcenter/dispatchalarmhis'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
-import divAdd from './dispatchworkerAdd'
-import divInfo from './dispatchworkerInfo'
+import divInfo from './alarmInfo'
 
 export default {
 	name: 'DispatchOrderinfoIndex',
@@ -105,7 +99,6 @@ export default {
 		ButtonBar,
 		Pagination,
 		pageye,
-		divAdd,
 		divInfo
 	},
 	data() {
@@ -191,7 +184,7 @@ export default {
 				.then(resp => {
 					console.log(resp)
 					this.btndisabled = false
-					if (resp.success) { 
+					if (resp.success) {
 						// 加提交后的逻辑
 					} else {
 						// 根据resp.code进行异常情况处理
@@ -266,7 +259,7 @@ export default {
 				.listPage(this.queryParams)
 				.then(resp => {
 					_this.tableLoading = false
-					if (resp.success) { 
+					if (resp.success) {
 						const data = resp.data
 						_this.queryParams.total = data.total
 						_this.dataList = data.records
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/realalarm.vue
similarity index 90%
rename from yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue
rename to yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/realalarm.vue
index 63df65b6..84c6f98b 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/alarm/realalarm.vue
@@ -8,7 +8,6 @@
 				<div v-show="isSearchShow" class="search">
 					<el-form ref="queryParams" :model="queryParams.params"  :inline="true" class="tab-header">
 						<el-form-item label="客户名称"><el-input v-model="queryParams.params.custname" placeholder="请输入客户名称" clearable /></el-form-item>
-						<el-form-item label="工单名称"><el-input v-model="queryParams.params.ordername" placeholder="请输入工单名称" clearable /></el-form-item>
 						<el-form-item label="等级">
 						<el-select
                           v-model="queryParams.params.orderdegree"
@@ -41,16 +40,16 @@
 			<!-- Start 项目列表 -->
 			<div>
 				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
-					<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
-					<el-table-column prop="ordername" label="工单名称" align="center" />
-					<el-table-column prop="custname" label="客户名称" align="center" />
-					<el-table-column prop="orderdegree" :formatter="formatorderdegree" label="等级" align="center" />
-					<el-table-column prop="receiveperson" label="现场联系人" align="center" />
-					<el-table-column prop="receivetel" label="现场联系人电话" align="center" />
+          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column prop="custname" label="客户名称" width="300px"  align="center" />
+          <el-table-column prop="warneterid" label="告警设备" width="300px" align="center" />
+          <el-table-column prop="warnobjectmpsn" label="告警位置" width="300px" align="center" />
+          <el-table-column prop="warnremarks" label="告警说明" width="300px" align="center" />
+          <el-table-column prop="warnlevelvalue" label="告警等级" align="center" />
 					<el-table-column fixed="right" label="操作"  align="center">
-                        <template slot-scope="scope">
-							<el-tooltip class="item" effect="dark" content="编辑" placement="top-end">
-								<i  class="el-icon-edit-outline"  @click="toEdit(scope.row)"></i>
+              <template slot-scope="scope">
+							<el-tooltip class="item" effect="dark" content="详情" placement="top-end">
+								<i  class="el-icon-edit-outline"  @click="toInfo(scope.row)"></i>
                            </el-tooltip>
 						   <el-tooltip class="item" effect="dark" content="生成工单" placement="top-start">
 							<i  class="el-icon-notebook-2" @click="purchase(scope.row)"></i>
@@ -192,7 +191,8 @@
 		</div>
         </el-drawer>
 		<!-- 新增修改部分组件 -->
-		<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    <!-- 新增修改部分组件 -->
+    <div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
 
 		<!-- 详情部分组件 -->
 		<div-info v-show="viewState == 4" ref="divinfo" @doback="resetState" />
@@ -200,12 +200,12 @@
 </template>
 
 <script>
-import req from '@/api/yxtdispatchcenter/dispatchorderinfo'
+import req from '@/api/yxtdispatchcenter/dispatchalarm'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
-import divAdd from './dispatchworkerAdd'
-import divInfo from './dispatchworkerInfo'
+import divInfo from './alarmInfo'
+import divAdd from '@/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd'
 
 export default {
 	name: 'DispatchOrderinfoIndex',
@@ -213,7 +213,7 @@ export default {
 		ButtonBar,
 		Pagination,
 		pageye,
-		divAdd,
+    divAdd,
 		divInfo
 	},
 	data() {
@@ -227,6 +227,7 @@ export default {
 			formobj:{
 				id: '',
 				sid: '',
+        alarmid:"",
 				custid: '', // 客户ID
 				custname: '', // 客户名称
 				supervisesid: '', // 监管公司id
@@ -300,14 +301,10 @@ export default {
 			}
 		},
 		toAdd() {
-			// this.viewState = 2
-			// this.$refs['divadd'].showAdd()
-			this.drawer=true
 
 		},
 		toEdit(row) {
-			this.viewState = 3
-			this.$refs['divadd'].showEdit(row)
+
 		},
 		doSubmit(row) {
 			// 提交的代码
@@ -317,7 +314,7 @@ export default {
 				.then(resp => {
 					console.log(resp)
 					this.btndisabled = false
-					if (resp.success) { 
+					if (resp.success) {
 						// 加提交后的逻辑
 					} else {
 						// 根据resp.code进行异常情况处理
@@ -393,7 +390,7 @@ export default {
 				.listPage(this.queryParams)
 				.then(resp => {
 					_this.tableLoading = false
-					if (resp.success) { 
+					if (resp.success) {
 						const data = resp.data
 						_this.queryParams.total = data.total
 						_this.dataList = data.records
@@ -436,9 +433,11 @@ export default {
 		 }
         },
 		purchase(row){
-			this.drawer=true
-			this.formobj = Object.assign({}, row);
-		},
+      alert('功能开发中');
+      return;
+      this.viewState = 3
+      this.$refs['divadd'].showEdit(row)
+		}
 	}
 }
 </script>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue
index 55132c5e..8b3300de 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue
@@ -7,8 +7,8 @@
 				<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
 					<div v-show="isSearchShow" class="search">
 					<el-form ref="queryParams" :model="queryParams.params" :inline="true" class="tab-header">
-						<el-form-item label="模板名称"><el-input v-model="queryParams.params.templateid" placeholder="请输入模板名称" clearable /></el-form-item>
-						<el-form-item label="任务类型"><el-input v-model="queryParams.params.taskid" placeholder="请输入任务类型" clearable /></el-form-item>
+						<el-form-item label="模板名称"><el-input v-model="queryParams.params.templatename" placeholder="请输入模板名称" clearable /></el-form-item>
+						<el-form-item label="任务类型"><el-input v-model="queryParams.params.ordertype" placeholder="请输入任务类型" clearable /></el-form-item>
 						<div class="btn" style="text-align: center;">
 							<el-button type="primary" size="small" icon="el-icon-search"  @click="dosearch">查询</el-button>
 							<el-button type="primary" size="small" icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
@@ -27,8 +27,8 @@
 			<div>
 				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" >
 					<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
-					<el-table-column prop="templateid" label="模板名称" align="center" />
-					<el-table-column prop="taskid" label="任务类型" align="center" />
+					<el-table-column prop="templatename" label="模板名称" align="center" />
+					<el-table-column prop="ordertype" label="任务类型" align="center" />
 					<el-table-column fixed="right" label="操作"  align="center">
                         <template slot-scope="scope">
 						   <el-tooltip class="item" effect="dark" content="维护" placement="top-end">
@@ -87,9 +87,9 @@
 
 			<!-- Start 项目列表 -->
 			<div>
-				<el-table v-loading="tableLoading"  :data="arrList" border style="width: 100%" @selection-change="handleSelectionChange">
-					<el-table-column width="50px" type="selection" align="center" />
-					<el-table-column prop="taskname" label="任务项名称" align="center" />
+				<el-table ref="multipleTable" v-loading="tableLoading"  :data="arrList" border style="width: 100%" @selection-change="handleSelectionChange">
+					<el-table-column width="50px" type="selection"  align="center" aria-selected="true" />
+					<el-table-column prop="taskname" label="任务项名称1" align="center" />
 					<el-table-column prop="tasktype" label="任务项分类" align="center" />
 					<el-table-column prop="taskdesc" label="任务描述" align="center" />
 					<el-table-column prop="taskreturn" :formatter="formatPrivilegeType"  label="反馈形式" align="center" />
@@ -156,8 +156,8 @@ export default {
 				total: 0,
 				params: {
 					sids: [], // 用于导出的时候保存已选择SID
-				templateid: '', // 模板id
-				taskid: '' // 任务项标准库id
+				  templatename: '', // 模板id
+          ordertype: '' // 任务项标准库id
 				}
 			},
 			btnList: [
@@ -176,22 +176,23 @@ export default {
                   btnLabel: '关闭'
                 }
               ],
-			  queryParams2: {
-				current: 1,
-				size: 10,
-				total: 0,
-				params: {
-					sids: [], // 用于导出的时候保存已选择SID
-				taskname: '', // 任务项名称
-				tasktype: '', // 任务项分类
-				taskdesc: '', // 任务描述
-				taskreturn: '', // 反馈形式（1选项 2图片 3文字）
-				tasktypeparent: '' // 任务项父级分类+
-				}
+      queryParams2: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            templateid: "",
+            sids: [], // 用于导出的时候保存已选择SID
+            taskname: '', // 任务项名称
+            tasktype: '', // 任务项分类
+            taskdesc: '', // 任务描述
+            taskreturn: '', // 反馈形式（1选项 2图片 3文字）
+            tasktypeparent: '' // 任务项父级分类+
+          }
 			},
 			UseList:{
-				templateid:'',
-				taskid:[]
+				templateid: '',
+        ordertype: []
 			}
 		}
 	},
@@ -232,9 +233,8 @@ export default {
 			req
 				.doSubmit(this.queryParams.params)
 				.then(resp => {
-					console.log(resp)
 					this.btndisabled = false
-					if (resp.success) { 
+					if (resp.success) {
 						// 加提交后的逻辑
 					} else {
 						// 根据resp.code进行异常情况处理
@@ -294,7 +294,7 @@ export default {
 				.listPage(this.queryParams)
 				.then(resp => {
 					_this.tableLoading = false
-					if (resp.success) { 
+					if (resp.success) {
 						const data = resp.data
 						_this.queryParams.total = data.total
 						_this.dataList = data.records
@@ -313,13 +313,22 @@ export default {
 				.listPage(this.queryParams2)
 				.then(resp => {
 					_this.tableLoading = false
-					if (resp.success) { 
+					if (resp.success) {
 						const data = resp.data
 						_this.queryParams2.total = data.total
 						_this.arrList = data.records
 					} else {
 						// 根据resp.code进行异常情况处理
 					}
+
+          this.$nextTick(() => {
+            _this.arrList.forEach(item => {
+              if (item.selected==1) {
+                // multipleTable 是这个表格的ref属性 true为选中状态
+                this.$refs.multipleTable.toggleRowSelection(item, true);
+              }
+            })
+          })
 				})
 				.catch(() => {
 					_this.tableLoading = false
@@ -343,9 +352,11 @@ export default {
         this.$router.go(-1)
         },
 		toMaintain(row){
-			this.loadLists()
-			this.dialogVisible=true
-			this.UseList.templateid=row.templateid
+      console.log(row);
+      this.queryParams2.params.templateid=row.sid;
+      this.UseList.templateid=row.sid;
+      this.loadLists();
+      this.dialogVisible=true;
 		},
 		formatPrivilegeType: function( row, column) {
          if(row.taskreturn === '1'){
@@ -367,10 +378,9 @@ export default {
 			this.UseList.taskid.forEach(item=>{
 				arrList.push(item.sid)
 			})
-			console.log(arrList);
-			this.UseList.taskid=arrList
+      this.UseList.taskid=arrList
 			req.save(this.UseList).then((res)=>{
-					if (res.success) { 
+					if (res.success) {
 						this.$message({ type: 'success', message: res.msg, showClose: true })
 						this.dialogVisible=false
 					} else {
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplateAdd.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplateAdd.vue
index 65f6203e..f46d3af6 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplateAdd.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplateAdd.vue
@@ -25,7 +25,7 @@
 						<span><span class="icon">*</span>模板名称：</span>
 					</el-col>
 					<el-col :span="8" class="trightb">
-						<el-form-item prop="templateid"><el-input v-model="formobj.templateid" placeholder="模板名称" class="addinputw" clearable /></el-form-item>
+						<el-form-item prop="templatename"><el-input v-model="formobj.templatename" placeholder="模板名称" class="addinputw" clearable /></el-form-item>
 					</el-col>
 				</el-row>
 				<el-row>
@@ -33,7 +33,7 @@
 						<span><span class="icon">*</span>任务类型：</span>
 					</el-col>
 					<el-col :span="8" class="trightb">
-						<el-form-item prop="taskid"><el-input v-model="formobj.taskid" placeholder="任务类型" class="addinputw" clearable /></el-form-item>
+						<el-form-item prop="ordertype"><el-input v-model="formobj.ordertype" placeholder="任务类型" class="addinputw" clearable /></el-form-item>
 					</el-col>
 				</el-row>
 			</el-form>
@@ -55,12 +55,12 @@ export default {
 			formobj: {
 				id: '',
 				sid: '',
-				templateid: '', // 模板id
-				taskid: '' // 任务项标准库id
+        templatename: '', // 模板名称
+				ordertype: '' // 模板类型
 			},
 			rules: {
-				templateid: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }], // 模板id
-				taskid: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }] // 任务项标准库id
+        templatename: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }], // 模板id
+        ordertype: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }] // 任务项标准库id
 			}
 		}
 	},
@@ -71,9 +71,9 @@ export default {
 			this.formobj.id = ''
 			this.formobj.sid = '' // SID
 
-				this.templateid = '' // 模板id
-				this.taskid = '' // 任务项标准库id
-			
+				this.templatename = '' // 模板id
+				this.ordertype = '' // 任务项标准库id
+
 			this.$refs['form_obj'].resetFields()
 			this.$emit('doback')
 		},
@@ -91,8 +91,8 @@ export default {
 			const vdata = row
 			this.formobj.id = vdata.id
 			this.formobj.sid = vdata.sid // SID
-			this.formobj.templateid = vdata.templateid // 模板id
-			this.formobj.taskid = vdata.taskid // 任务项标准库id 
+			this.formobj.templatename = vdata.templatename // 模板id
+			this.formobj.ordertype = vdata.ordertype // 任务项标准库id
 		},
 		saveOrUpdate() {
 			const _this = this
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue
index 76843b9c..79516e90 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue
@@ -58,7 +58,7 @@
 							<i  class="el-icon-delete"  @click="doDel(scope.row)"></i>
                            </el-tooltip>
 						   <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
-							<i  class="el-icon-notebook-2" @click="purchase(scope.row)"></i>
+							<i  class="el-icon-notebook-2" @click="toInfo(scope.row)"></i>
                            </el-tooltip>
                         </template>
                       </el-table-column>
@@ -80,7 +80,7 @@
 		</div>
 		</div>
 		<!-- End 查询和其列表部分 -->
-		<el-drawer
+<!--		<el-drawer
           title="汇总工单数据详情"
           :visible.sync="drawer"
           size="86%">
@@ -95,7 +95,7 @@
             <el-descriptions-item label="现场联系人电话">{{ TableList.receivetel }}</el-descriptions-item>
           </el-descriptions>
 		</div>
-        </el-drawer>
+        </el-drawer>-->
 		<!-- 新增修改部分组件 -->
 		<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
 
@@ -202,9 +202,8 @@ export default {
 			req
 				.doSubmit(this.queryParams.params)
 				.then(resp => {
-					console.log(resp)
 					this.btndisabled = false
-					if (resp.success) { 
+					if (resp.success) {
 						// 加提交后的逻辑
 					} else {
 						// 根据resp.code进行异常情况处理
@@ -254,7 +253,7 @@ export default {
 				.listPage(this.queryParams)
 				.then(resp => {
 					_this.tableLoading = false
-					if (resp.success) { 
+					if (resp.success) {
 						const data = resp.data
 						_this.queryParams.total = data.total
 						_this.dataList = data.records
@@ -296,9 +295,10 @@ export default {
 			return ''
 		 }
         },
-		purchase(row){	
-			this.drawer=true
-			this.TableList=row
+		purchase(row){
+			// this.drawer=true
+      this.viewState = 4
+			this.TableList= row
 		},
 	}
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue
index 869773fb..2a074188 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue
@@ -16,8 +16,7 @@
 		<!-- Start 新增修改部分 -->
 		<div class="main-content">
 			<div class="searchcon">
-			<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
-			<el-form v-show="isSearchShow" ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="demo-form-inline">
+			  <el-form v-show="isSearchShow" ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="demo-form-inline">
 				<div class="listtop">
 		           <div class="tit">巡视工单信息</div>
 		        </div>
@@ -50,7 +49,7 @@
 						<span><span class="icon">*</span>模板：</span>
 					</el-col>
 					<el-col :span="3" class="trightb">
-						<el-select
+						<el-select   @change="changeValue($event)"
                           v-model="formobj.templatesid"
                           class="addinputw"
                           placeholder="模板"
@@ -59,8 +58,8 @@
                           <el-option
                             v-for="(item, i) in dataList"
                             :key="i"
-                            :label="item.templateid"
-                            :value="item.templateid"
+                            :label="item.templatename"
+                            :value="item.sid"
                           />
                         </el-select>
 					</el-col>
@@ -116,16 +115,14 @@
 					</el-col>
 				</el-row>
 			</el-form>
-		</div>
-		<div class="listtop">
+		  </div>
+		  <div class="listtop">
 		  <div class="tit">巡视人员</div>
 		  <el-button class="span" type="primary" @click.stop="add()">新增</el-button>
 		</div>
-		<div>
-            <el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%"
-			@selection-change="handleSelectionChange" @select="handleSelection" stripe >
+		  <div>
+            <el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%" stripe >
 			>
-			  <el-table-column type="selection" width="55"/>
               <el-table-column fixed width="100" type="index" label="序号"  align="center" />
 			  <el-table-column label="操作" wid align="center" width="150">
                   <template slot-scope="scope">
@@ -155,14 +152,13 @@
 			  </el-table-column>
             </el-table>
         </div>
-		<div class="listtop">
+		  <div class="listtop">
 		  <div class="tit">任务模板</div>
 		</div>
-		<div>
+		  <div>
             <el-table  :data="list" border style="width: 100%;text-align: center;">
               <el-table-column fixed width="100" type="index" label="序号"  align="center" />
-              <el-table-column prop="tasktype" width="200" label="设备类别" align="center" />
-              <el-table-column prop="taskname" label="任务模板名称" width="200" align="center" />
+              <el-table-column prop="taskname" label="任务名称" width="200" align="center" />
               <el-table-column prop="taskdesc" label="巡视内容" align="center" />
             </el-table>
         </div>
@@ -184,6 +180,7 @@ export default {
 			formobj: {
 				id: '',
 				sid: '',
+        alarmid: "",
 				custid: '', // 客户ID
 				custname: '', // 客户名称
 				supervisesid: '', // 监管公司id
@@ -222,8 +219,8 @@ export default {
 				size: 100,
 				total: 0,
 				params: {
-				sids: [], 
-				templateid: '', 
+				sids: [],
+				templateid: '',
 				taskid: ''
 				}
 			},
@@ -232,21 +229,26 @@ export default {
 				size: 10,
 				total: 0,
 				params: {
-					orderId:''
+					orderid:'',
+          templateid:''
 				}
-			},
+			}
 		}
 	},
 	mounted(){
 	  req2.listPage(this.queryParams).then(resp => {
-		if (resp.success) { 
-			const data = resp.data
-			this.dataList = data.records
-		}
+        if (resp.success) {
+          const data = resp.data
+          this.dataList = data.records
+        }
 	   })
 	},
 	created() {},
 	methods: {
+    changeValue(value){
+      this.queryParamsA.params.templateid= value;
+      this.ShowList();
+    },
 		handleReturn(isreload) {
 			if (isreload === 'true') this.$emit('reloadlist')
 			this.formobj.id = ''
@@ -265,7 +267,7 @@ export default {
 			this.formobj.operationcontent = '' // 处理情况
 			this.formobj.receiveperson = '' // 现场联系人
 			this.formobj.receivetel = '' // 现场联系人电话
-			this.queryParamsA.params.orderId=''
+			this.queryParamsA.params.orderid=''
 			this.$refs['form_obj'].resetFields()
 			this.$emit('doback')
 		},
@@ -310,6 +312,8 @@ export default {
 						_this.formobj.ordercontent = vdata.ordercontent // 工单内容
 						_this.formobj.receiveperson = vdata.receiveperson // 现场联系人
 						_this.formobj.receivetel = vdata.receivetel // 现场联系人电话
+            _this.formobj.templatesid = vdata.templatesid // 模板sid
+            this.queryParamsA.params.templateid= vdata.templatesid // 模板sid
 						// _this.formobj.workers = vdata.workers // 现场联系人电话
 					} else {
 						// 根据resp.code进行异常情况处理
@@ -318,15 +322,12 @@ export default {
 				.catch(e => {
 					this.formobj = row
 				})
-				this.queryParamsA.params.orderId=row.sid
+				this.queryParamsA.params.orderid= row.sid
 				this.ShowList()
 				this.ShowYunwei()
 		},
 		saveOrUpdate() {
-			if (this.formobj.workers.length === 0) {
-				this.$message({ showClose: true, type: 'error', message: '请选择一条巡视人员进行添加' })
-				return
-			}
+      this.formobj.workers=this.$refs.table.data;
 			const _this = this
 			this.$refs['form_obj'].validate(valid => {
 				if (valid) {
@@ -338,7 +339,7 @@ export default {
 							if (resp.success) {
 								_this.$message({ showClose: true, type: 'success', message: resp.msg })
 								_this.handleReturn('true')
-								_this.queryParamsA.params.orderId=''
+								_this.queryParamsA.params.orderid=''
 							} else {
 								// 根据resp.code进行异常情况处理
 							}
@@ -353,12 +354,12 @@ export default {
 		},
 		handleSelectionChange(val) {
          this.formobj.workers = val;
-        },
-	     handleSelection(selection){
-		if (selection.length > 1){
-		  let del_row = selection.shift();
-          this.$refs.table.toggleRowSelection(del_row, false)
-	   	}
+    },
+	  handleSelection(selection){
+        if (selection.length > 1){
+          let del_row = selection.shift();
+              this.$refs.table.toggleRowSelection(del_row, false)
+          }
 	   },
 	   add() {
         this.TabList.push({
@@ -378,15 +379,20 @@ export default {
 	 // 查询运维人员信息
 	 ShowYunwei(){
 		req.listPageB(this.queryParamsA).then((res)=>{
-			console.log(res);
+      this.TabList= res.data.records
 		})
 	 },
 	 // 查询任务项列表信息
 	 ShowList(){
+
+     var templateid=this.queryParamsA.params.templateid;
+     if (templateid==''){
+        return;
+      }
 		req.listPageA(this.queryParamsA).then((res)=>{
 			this.list = res.data.records
 		})
-	 },
+	 }
     }
 }
 </script>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoInfo.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoInfo.vue
index 14acf5ff..3906dd5b 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoInfo.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoInfo.vue
@@ -10,61 +10,146 @@
 		</div>
 		<!-- 标题按钮部分结束 -->
 		<div class="listconadd">
-			<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd">
-				<div class="wlInfo"><span>汇总工单数据</span></div>
-			<el-row>
-				<el-col :span="4" class="tleftb">客户ID</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.custid }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">客户名称</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.custname }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">监管公司id</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.supervisesid }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">用法说明：工单编号规则。</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.orderno }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">工单名称</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.ordername }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">描述：1-一般；2-重要； 3-紧急；4-督办。</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.orderdegree }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">描述：1-计划巡视；</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.ordertype }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">工单内容</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.ordercontent }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">到达现场时间</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.arrivetime }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">完成时间</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.planfinishtime }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">处理情况</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.operationcontent }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">现场联系人</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.receiveperson }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">现场联系人电话</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.receivetel }}</span></el-form-item></el-col>
-			</el-row>
-		</el-form>
+      <div class="searchcon">
+        <el-form ref="form_obj" :model="formobj"   label-position="right" class="demo-form-inline">
+          <div class="listtop">
+            <div class="tit">巡视工单信息</div>
+          </div>
+          <el-row>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>客户名称：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="custname">{{formobj.custname}}</el-form-item>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>工单编号：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="orderno">{{formobj.orderno}}</el-form-item>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>工单名称：</span>
+            </el-col>
+            <el-col :span="2" class="trightb">
+              <el-form-item prop="ordername">{{formobj.ordername}}</el-form-item>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>工单内容：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="ordercontent">{{formobj.ordercontent}}</el-form-item>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>模板：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-select   @change="changeValue($event)"
+                           v-model="formobj.templatesid"
+                           class="addinputw"  :disabled="true"
+                           placeholder="模板"
+                           size="small"
+              >
+                <el-option
+                  v-for="(item, i) in dataList"
+                  :key="i"
+                  :label="item.templatename"
+                  :value="item.sid"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>现场联系人：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="receiveperson">{{formobj.receiveperson}}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>现场联系人电话：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="receivetel">{{formobj.receivetel}}</el-form-item>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>巡视类型：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-select
+                v-model="formobj.ordertype"
+                class="addinputw"
+                placeholder="类型" :disabled="true"
+                size="small"
+              >
+                <el-option
+                  v-for="(item, i) in arr"
+                  :key="i"
+                  :label="item.type"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>等级：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-select
+                v-model="formobj.orderdegree"
+                class="addinputw"
+                placeholder="等级" :disabled="true"
+                size="small"
+              >
+                <el-option
+                  v-for="(item, i) in arrList"
+                  :key="i"
+                  :label="item.type"
+                  :value="item.type"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="listtop">
+        <div class="tit">巡视人员</div>
+      </div>
+      <div>
+        <el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%" stripe >
+          >
+          <el-table-column fixed width="100" type="index" label="序号"  align="center" />
+          <el-table-column prop="principalname" label="巡视人名称" align="center" >
+            <template slot-scope="scope">
+              {{scope.row.principalname}}</el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="principalcontact" label="联系方式"  align="center" >
+            <template slot-scope="scope">i
+              {{scope.row.principalcontact}}</el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="workteam" label="班组组织" align="center" >
+            <template slot-scope="scope">{{scope.row.workteam}}</el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="executorname" label="是否负责人" width="150px"  align="center" >
+            <template slot-scope="scope">
+              <el-radio v-model="scope.row.executorname" label="是" :disabled="true">是</el-radio>
+              <el-radio v-model="scope.row.executorname" label="否"  :disabled="true">否</el-radio>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="listtop">
+        <div class="tit">任务模板</div>
+      </div>
+      <div>
+        <el-table  :data="list" border style="width: 100%;text-align: center;">
+          <el-table-column fixed width="100" type="index" label="序号"  align="center" />
+          <el-table-column prop="taskname" label="任务名称" width="200" align="center" />
+          <el-table-column prop="taskdesc" label="巡视内容" align="center" />
+        </el-table>
+      </div>
 		</div>
 	</div>
 </template>
@@ -75,7 +160,31 @@ export default {
 	name: 'DispatchOrderinfoInfo',
 	data() {
 		return {
-			formobj: {}
+			formobj: {},
+      list:[],
+      TabList:[],
+      dataList:[],
+      arr:[{value:1,type:'计划巡视'},{value:2,type:'专项巡视'},{value:3,type:'告警巡视'}],
+      arrList:[{value:1,type:'一般'},{value:2,type:'重要'},{value:3,type:'紧急'},{value:4,type:'督办'}],
+      queryParams: {
+      current: 1,
+        size: 100,
+        total: 0,
+        params: {
+        sids: [],
+          templateid: '',
+          taskid: ''
+      }
+    },
+    queryParamsA: {
+      current: 1,
+        size: 10,
+        total: 0,
+        params: {
+        orderid:'',
+          templateid:''
+      }
+    }
 		}
 	},
 	methods: {
@@ -84,32 +193,59 @@ export default {
 			this.$emit('doback')
 		},
 		showInfo(row) {
-				req
-					.fetchBySid(row.sid)
-					.then(resp => {
-						if (resp.success) {
-							const vdata = resp.data
-							_this.formobj.id = vdata.id
-							_this.formobj.sid = vdata.sid // SID
-							_this.formobj.custid = vdata.custid // 客户ID
-							_this.formobj.custname = vdata.custname // 客户名称
-							_this.formobj.supervisesid = vdata.supervisesid // 监管公司id
-							_this.formobj.orderno = vdata.orderno // 用法说明：工单编号规则。
-							_this.formobj.ordername = vdata.ordername // 工单名称
-							_this.formobj.orderdegree = vdata.orderdegree // 描述：1-一般；2-重要； 3-紧急；4-督办。
-							_this.formobj.ordertype = vdata.ordertype // 描述：1-计划巡视；
-							_this.formobj.ordercontent = vdata.ordercontent // 工单内容
-							_this.formobj.arrivetime = vdata.arrivetime // 到达现场时间
-							_this.formobj.planfinishtime = vdata.planfinishtime // 完成时间
-							_this.formobj.operationcontent = vdata.operationcontent // 处理情况
-							_this.formobj.receiveperson = vdata.receiveperson // 现场联系人
-							_this.formobj.receivetel = vdata.receivetel // 现场联系人电话
-						}
-					})
-				.catch(e => {
-					_this.formobj = row
-				})
-		}
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.searchxianshitit = '显示添加条件'
+      this.isSearchShow = true
+      this.viewTitle = '【修改】工单数据'
+      const _this = this
+      req
+        .fetchBySid(row.sid)
+        .then(resp => {
+          if (resp.code==200) {
+            const vdata = resp.data
+            _this.formobj.id = vdata.id
+            _this.formobj.sid = vdata.sid // SID
+            _this.formobj.custid = vdata.custid // 客户ID
+            _this.formobj.custname = vdata.custname // 客户名称
+            _this.formobj.supervisesid = vdata.supervisesid // 监管公司id
+            _this.formobj.orderno = vdata.orderno // 工单编号
+            _this.formobj.ordername = vdata.ordername // 工单名称
+            _this.formobj.orderdegree = vdata.orderdegree // 描述：1-一般；2-重要； 3-紧急；4-督办。
+            _this.formobj.ordertype = vdata.ordertype // 描述：1-计划巡视；
+            _this.formobj.ordercontent = vdata.ordercontent // 工单内容
+            _this.formobj.receiveperson = vdata.receiveperson // 现场联系人
+            _this.formobj.receivetel = vdata.receivetel // 现场联系人电话
+            _this.formobj.templatesid = vdata.templatesid // 模板sid
+            this.queryParamsA.params.templateid= vdata.templatesid // 模板sid
+            // _this.formobj.workers = vdata.workers // 现场联系人电话
+          } else {
+            // 根据resp.code进行异常情况处理
+          }
+        })
+        .catch(e => {
+          this.formobj = row
+        })
+      this.queryParamsA.params.orderid= row.sid
+      this.ShowList()
+      this.ShowYunwei()
+		},
+    ShowYunwei(){
+      req.listPageB(this.queryParamsA).then((res)=>{
+        this.TabList= res.data.records
+      })
+    },
+    // 查询任务项列表信息
+    ShowList(){
+      var templateid=this.queryParamsA.params.templateid;
+      if (templateid==''){
+        return;
+      }
+      req.listPageA(this.queryParamsA).then((res)=>{
+        this.list = res.data.records
+      })
+    }
 	}
 }
 </script>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplan.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplan.vue
index 2f48171c..01c9bccd 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplan.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplan.vue
@@ -42,7 +42,7 @@
 							<i  class="el-icon-delete"  @click="doDel(scope.row)"></i>
                            </el-tooltip>
 						   <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
-							<i  class="el-icon-notebook-2" @click="purchase(scope.row)"></i>
+							<i  class="el-icon-notebook-2" @click="toInfo(scope.row)"></i>
                            </el-tooltip>
                         </template>
                       </el-table-column>
@@ -83,7 +83,7 @@
             <el-descriptions-item label="计划开始日期">{{ TableList.startdate }}</el-descriptions-item>
             <el-descriptions-item label="计划结束日期">{{ TableList.enddate }}</el-descriptions-item>
           </el-descriptions>
-		</div>	
+		</div>
         </el-drawer>
 		<!-- End 查询和其列表部分 -->
 
@@ -128,7 +128,7 @@ export default {
 				params: {
 				   planname: '', // 计划名称
 				   custid: '', // 客户标识
-				   planno: '', // 计划编号
+				   planno: '' // 计划编号
 				}
 			},
 			multipleSelection: [],
@@ -199,7 +199,7 @@ export default {
 				.then(resp => {
 					console.log(resp)
 					this.btndisabled = false
-					if (resp.success) { 
+					if (resp.success) {
 						// 加提交后的逻辑
 					} else {
 						// 根据resp.code进行异常情况处理
@@ -249,7 +249,7 @@ export default {
 				.listPage(this.queryParams)
 				.then(resp => {
 					_this.tableLoading = false
-					if (resp.success) { 
+					if (resp.success) {
 						const data = resp.data
 						_this.queryParams.total = data.total
 						_this.dataList = data.records
@@ -278,10 +278,8 @@ export default {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
         },
-	    purchase(row){
-			this.drawer=true
-			this.TableList=row
-			console.log(row);
+	  purchase(row){
+			this.viewState=4
 		},
 	}
 }
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue
index 8afda781..ac078bf0 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue
@@ -38,13 +38,25 @@
 						<span><span class="icon">*</span>巡视类型：</span>
 					</el-col>
 					<el-col :span="2" class="trightb">
-						<el-form-item prop="patroltype"><el-input size="small" v-model="formobj.patroltype" placeholder="巡视类型" class="addinputw" clearable /></el-form-item>
+              <el-select
+                v-model="formobj.patroltype"
+                class="addinputw"
+                placeholder="类型"
+                size="small"
+              >
+                <el-option
+                  v-for="(item, i) in arr"
+                  :key="i"
+                  :label="item.type"
+                  :value="item.value"
+                />
+              </el-select>
 					</el-col>
 					<el-col :span="2" class="tleftb">
 						<span><span class="icon">*</span>巡视模板：</span>
 					</el-col>
 					<el-col :span="2" class="trightb">
-						<el-select
+						<el-select @change="changeValue($event)"
                           v-model="formobj.templateid"
                           class="addinputw"
                           placeholder="巡视模板"
@@ -53,8 +65,8 @@
                           <el-option
                             v-for="(item, i) in dataList"
                             :key="i"
-                            :label="item.templateid"
-                            :value="item.taskid"
+                            :label="item.templatename"
+                            :value="item.sid"
                           />
                         </el-select>
 					</el-col>
@@ -72,22 +84,20 @@
 					<el-col :span="3" class="trightb">
 						<el-form-item prop="contactphone"><el-input  size="small"  v-model="formobj.contactphone" placeholder="用户联系人电话" class="addinputw" clearable /></el-form-item>
 					</el-col>
-					
+
 					<el-col :span="2" class="tleftb">
 						<span><span class="icon">*</span>周期类型：</span>
 					</el-col>
 					<el-col :span="2" class="trightb">
-						<el-select
-                          v-model="formobj.cycletype"
+						<el-select v-model="formobj.cycletype"
                           class="addinputw"
                           placeholder="周期类型"
-						  size="small"
-                        >
+						  size="small" >
                           <el-option
                             v-for="(item, i) in period"
                             :key="i"
                             :label="item.type"
-                            :value="item.type"
+                            :value="item.value"
                           />
                         </el-select>
 					</el-col>
@@ -133,10 +143,8 @@
 		  <el-button class="span" type="primary" @click.stop="add()">新增</el-button>
 		</div>
 		<div>
-			<el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%"
-			@selection-change="handleSelectionChange" stripe >
+			<el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%" stripe >
 			>
-			  <el-table-column type="selection" width="55"/>
               <el-table-column fixed width="100" type="index" label="序号"  align="center" />
 			  <el-table-column label="操作" wid align="center" width="150">
                   <template slot-scope="scope">
@@ -172,7 +180,6 @@
 		<div>
             <el-table  :data="list" border style="width: 100%;text-align: center;">
               <el-table-column fixed width="100" type="index" label="序号"  align="center" />
-              <el-table-column prop="tasktype" width="200" label="设备类别" align="center" />
               <el-table-column prop="taskname" label="任务模板名称" width="200" align="center" />
               <el-table-column prop="taskdesc" label="巡视内容" align="center" />
             </el-table>
@@ -216,11 +223,13 @@ export default {
 			dataList:[],
 			TabList:[],
 			list:[],
+      arr:[{value:'1',type:'计划巡视'},{value:'2',type:'专项巡视'},{value:'3',type:'告警巡视'}],
+      arrList:[{value:'1',type:'一般'},{value:'2',type:'重要'},{value:'3',type:'紧急'},{value:'4',type:'督办'}],
 			rules: {
 				planname: [{ required: true, message: '计划名称不能为空', trigger: 'blur' }], // 计划名称
 				custname: [{ required: true, message: '客户标识不能为空', trigger: 'blur' }], // 客户名称
 				supervisesid: [{ required: true, message: '监管公司id不能为空', trigger: 'blur' }], // 监管公司id
-				patroltype: [{ required: true, message: '1计划巡视、2专项巡视不能为空', trigger: 'blur' }], // 计划类型
+				patroltype: [{ required: true, message: '巡视类型不能为空', trigger: 'blur' }], // 计划类型
 				startdate: [{ required: true, message: '计划开始日期不能为空', trigger: 'blur' }], // 计划开始日期
 				enddate: [{ required: true, message: '计划结束日期不能为空', trigger: 'blur' }], // 计划结束日期
 				contactperson: [{ required: true, message: '用户联系人不能为空', trigger: 'blur' }], // 用户联系人
@@ -231,14 +240,14 @@ export default {
 				cycle: [{ required: true, message: '巡检周期不能为空', trigger: 'blur' }], // 巡检周期
 				cyclevalue: [{ required: true, message: '周期值不能为空', trigger: 'blur' }] // 周期值
 			},
-			period:[{value:1,type:'日'},{value:2,type:'月'}],
+			period:[{value:'1',type:'日'},{value:'2',type:'月'}],
 			queryParams: {
 				current: 1,
 				size: 100,
 				total: 0,
 				params: {
-				sids: [], 
-				templateid: '', 
+				sids: [],
+				templateid: '',
 				taskid: ''
 				}
 			},
@@ -247,14 +256,15 @@ export default {
 				size: 10,
 				total: 0,
 				params: {
-					orderId:''
+          planid:'',
+          templateid:''
 				}
-			},
+			}
 		}
 	},
 	mounted(){
 	  req2.listPage(this.queryParams).then(resp => {
-		if (resp.success) { 
+		if (resp.success) {
 			const data = resp.data
 			this.dataList = data.records
 		}
@@ -262,6 +272,10 @@ export default {
 	},
 	created() {},
 	methods: {
+    changeValue(value){
+      this.queryParamsA.params.templateid= value;
+      this.ShowList();
+    },
 		handleReturn(isreload) {
 			if (isreload === 'true') this.$emit('reloadlist')
 			this.formobj.id = ''
@@ -280,7 +294,7 @@ export default {
 			this.formobj.cycletype = '' // 周期类型(固定间隔周期)
 			this.formobj.cycle = '' // 巡检周期
 			this.formobj.cyclevalue = '' // 周期值
-			this.queryParamsA.params.orderId=''
+			this.queryParamsA.params.planid=''
 			this.$refs['form_obj'].resetFields()
 			this.$emit('doback')
 		},
@@ -316,7 +330,8 @@ export default {
 						_this.formobj.id = vdata.id
 						_this.formobj.sid = vdata.sid // SID
 						_this.formobj.planname = vdata.planname // 计划名称
-						_this.formobj.custname = vdata.custid // 客户标识
+            _this.formobj.custname = vdata.custname // 客户标识
+            _this.formobj.custid = vdata.custid // 客户标识
 						_this.formobj.supervisesid = vdata.supervisesid // 监管公司id
 						_this.formobj.patroltype = vdata.patroltype // 1计划巡视、2专项巡视
 						_this.formobj.startdate = vdata.startdate // 计划开始日期
@@ -335,15 +350,14 @@ export default {
 				.catch(e => {
 					this.formobj = row
 				})
-			this.queryParamsA.params.orderId=row.sid
+      this.queryParamsA.params.templateid=row.templateid
+      this.queryParamsA.params.planid=row.sid
 			this.ShowList()
+      this.ShowYunwei();
 		},
 		saveOrUpdate() {
-			if (this.formobj.workers.length === 0) {
-				this.$message({ showClose: true, type: 'error', message: '请选择一条巡视人员进行添加' })
-				return
-			}
 			const _this = this
+      this.formobj.workers=this.$refs.table.data;
 			this.$refs['form_obj'].validate(valid => {
 				if (valid) {
 					this.submitdisabled = true
@@ -354,7 +368,7 @@ export default {
 							if (resp.success) {
 								_this.$message({ showClose: true, type: 'success', message: resp.msg })
 								_this.handleReturn('true')
-								_this.queryParamsA.params.orderId=''
+								_this.queryParamsA.params.planid=''
 							} else {
 								// 根据resp.code进行异常情况处理
 							}
@@ -392,16 +406,20 @@ export default {
 	   	}
 	  },
 	  	 // 查询运维人员信息
-	 ShowYunwei(){
-		req3.listPageB(this.queryParamsA).then((res)=>{
-			console.log(res);
-		})
-	 },
+    ShowYunwei(){
+      req.listPageB(this.queryParamsA).then((res)=>{
+        this.TabList= res.data.records
+      })
+    },
 	  ShowList(){
-		req3.listPageA(this.queryParamsA).then((res)=>{
-			this.list = res.data.records
-		})
-	 },
+        var templateid=this.queryParamsA.params.templateid;
+        if (templateid==''){
+          return;
+        }
+        req.listPageA(this.queryParamsA).then((res)=>{
+          this.list = res.data.records
+        })
+	 }
 	}
 }
 </script>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanInfos.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanInfos.vue
index c62d62c8..9a9d6fb8 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanInfos.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanInfos.vue
@@ -3,68 +3,179 @@
 		<!-- 标题按钮部分开始 -->
 		<div class="tab-header webtop">
 			<!-- 标题 -->
-			<div>(巡视计划包含客户信息、仓库等)详情</div>
+			<div>巡视计划详情</div>
 			<!-- start 详情按钮 -->
 			<div><el-button itype="info" size="small" @click="handleReturn()">返回</el-button></div>
 			<!-- end 详情按钮 -->
 		</div>
 		<!-- 标题按钮部分结束 -->
 		<div class="listconadd">
-			<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd">
-				<div class="wlInfo"><span>(巡视计划包含客户信息、仓库等)</span></div>
-			<el-row>
-				<el-col :span="4" class="tleftb">计划名称</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.planname }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">客户标识</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.custid }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">监管公司id</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.supervisesid }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">1计划巡视、2专项巡视</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.patroltype }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">计划开始日期</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.startdate }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">计划结束日期</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.enddate }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">用户联系人</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.contactperson }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">用户联系人电话</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.contactphone }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">计划编号</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.planno }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">模板id</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.templateid }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">周期类型(固定间隔周期)</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.cycletype }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">巡检周期</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.cycle }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">周期值</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.cyclevalue }}</span></el-form-item></el-col>
-			</el-row>
-		</el-form>
+      <div class="searchcon">
+        <el-form ref="form_obj" :model="formobj"   :inline="true"         label-position="right" class="demo-form-inline">
+          <div class="listtop">
+            <div class="tit">巡视计划信息</div>
+          </div>
+          <el-row>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>计划名称：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="custname">{{formobj.planname}} </el-form-item>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>客户名称：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="custname">{{formobj.custname}} </el-form-item>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>巡视类型：</span>
+            </el-col>
+            <el-col :span="2" class="trightb">
+              <el-select :disabled="true"
+                v-model="formobj.patroltype"
+                class="addinputw"
+                placeholder="类型"
+                size="small"
+              >
+                <el-option
+                  v-for="(item, i) in arr"
+                  :key="i"
+                  :label="item.type"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>巡视模板：</span>
+            </el-col>
+            <el-col :span="2" class="trightb">
+              <el-select
+                :disabled="true"
+                @change="changeValue($event)"
+                         v-model="formobj.templateid"
+                         class="addinputw"
+                         placeholder="巡视模板"
+                         size="small"
+              >
+                <el-option
+                  v-for="(item, i) in dataList"
+                  :key="i"
+                  :label="item.templatename"
+                  :value="item.sid"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>用户联系人：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="contactperson">{{formobj.contactperson}}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>用户联系人电话：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="contactphone">{{formobj.contactphone}}</el-form-item>
+            </el-col>
+
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>周期类型：</span>
+            </el-col>
+            <el-col :span="2" class="trightb">
+              <el-select
+                :disabled="true"
+                v-model="formobj.cycletype"
+                         class="addinputw"
+                         placeholder="周期类型"
+                         size="small" >
+                <el-option
+                  v-for="(item, i) in period"
+                  :key="i"
+                  :label="item.type"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>巡检周期：</span>
+            </el-col>
+            <el-col :span="2" class="trightb">
+              <el-form-item prop="cycle">{{formobj.cycle}}</el-form-item>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>周期值：</span>
+            </el-col>
+            <el-col :span="2" class="trightb">
+              <el-form-item prop="cyclevalue">{{formobj.cyclevalue}}</el-form-item>
+            </el-col>
+            <el-col :span="2" class="tleftb">
+              <span><span class="icon">*</span>计划编号：</span>
+            </el-col>
+            <el-col :span="3" class="trightb">
+              <el-form-item prop="planno">{{formobj.planno}}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>计划开始日期：</span>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item prop="startdate">
+                {{formobj.startdate }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>计划结束日期：</span>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item prop="enddate">{{formobj.enddate}}</el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="listtop">
+        <div class="tit">巡视人员</div>
+      </div>
+      <div>
+        <el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%" stripe >
+          >
+          <el-table-column fixed width="100" type="index" label="序号"  align="center" />
+          <el-table-column prop="principalname" label="巡视人名称" align="center" >
+            <template slot-scope="scope">
+             {{scope.row.principalname}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="principalcontact" label="联系方式"  align="center" >
+            <template slot-scope="scope">
+              {{scope.row.principalcontact}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="workteam" label="班组组织" align="center" >
+            <template slot-scope="scope">
+             {{scope.row.workteam}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="executorname" label="是否负责人" width="150px"  align="center" >
+            <template slot-scope="scope">
+              <el-radio v-model="scope.row.executorname" label="是" :disabled="true">是</el-radio>
+              <el-radio v-model="scope.row.executorname" label="否" :disabled="true">否</el-radio>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="listtop">
+        <div class="tit">任务模板</div>
+      </div>
+      <div>
+        <el-table  :data="list" border style="width: 100%;text-align: center;">
+          <el-table-column fixed width="100" type="index" label="序号"  align="center" />
+          <el-table-column prop="taskname" label="任务模板名称" width="200" align="center" />
+          <el-table-column prop="taskdesc" label="巡视内容" align="center" />
+        </el-table>
+      </div>
 		</div>
 	</div>
 </template>
@@ -75,7 +186,32 @@ export default {
 	name: 'DispatchPatrolPlanInfo',
 	data() {
 		return {
-			formobj: {}
+			formobj: {},
+    dataList:[],
+      TabList:[],
+      list:[],
+      arr:[{value:'1',type:'计划巡视'},{value:'2',type:'专项巡视'},{value:'3',type:'告警巡视'}],
+      arrList:[{value:'1',type:'一般'},{value:'2',type:'重要'},{value:'3',type:'紧急'},{value:'4',type:'督办'}],
+      period:[{value:'1',type:'日'},{value:'2',type:'月'}],
+      queryParams: {
+        current: 1,
+        size: 100,
+        total: 0,
+        params: {
+          sids: [],
+          templateid: '',
+          taskid: ''
+        }
+      },
+      queryParamsA: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          planid:'',
+          templateid:''
+        }
+      }
 		}
 	},
 	methods: {
@@ -84,32 +220,61 @@ export default {
 			this.$emit('doback')
 		},
 		showInfo(row) {
-				req
-					.fetchBySid(row.sid)
-					.then(resp => {
-						if (resp.success) {
-							const vdata = resp.data
-							_this.formobj.id = vdata.id
-							_this.formobj.sid = vdata.sid // SID
-							_this.formobj.planname = vdata.planname // 计划名称
-							_this.formobj.custid = vdata.custid // 客户标识
-							_this.formobj.supervisesid = vdata.supervisesid // 监管公司id
-							_this.formobj.patroltype = vdata.patroltype // 1计划巡视、2专项巡视
-							_this.formobj.startdate = vdata.startdate // 计划开始日期
-							_this.formobj.enddate = vdata.enddate // 计划结束日期
-							_this.formobj.contactperson = vdata.contactperson // 用户联系人
-							_this.formobj.contactphone = vdata.contactphone // 用户联系人电话
-							_this.formobj.planno = vdata.planno // 计划编号
-							_this.formobj.templateid = vdata.templateid // 模板id
-							_this.formobj.cycletype = vdata.cycletype // 周期类型(固定间隔周期)
-							_this.formobj.cycle = vdata.cycle // 巡检周期
-							_this.formobj.cyclevalue = vdata.cyclevalue // 周期值
-						}
-					})
-				.catch(e => {
-					_this.formobj = row
-				})
-		}
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.searchxianshitit = '显示添加条件'
+      this.isSearchShow = true
+      this.viewTitle = '【修改】计划'
+      const _this = this
+      req
+        .fetchBySid(row.sid)
+        .then(resp => {
+          if (resp.code==200) {
+            const vdata = resp.data
+            _this.formobj.id = vdata.id
+            _this.formobj.sid = vdata.sid // SID
+            _this.formobj.planname = vdata.planname // 计划名称
+            _this.formobj.custname = vdata.custname // 客户标识
+            _this.formobj.custid = vdata.custid // 客户标识
+            _this.formobj.supervisesid = vdata.supervisesid // 监管公司id
+            _this.formobj.patroltype = vdata.patroltype // 1计划巡视、2专项巡视
+            _this.formobj.startdate = vdata.startdate // 计划开始日期
+            _this.formobj.enddate = vdata.enddate // 计划结束日期
+            _this.formobj.contactperson = vdata.contactperson // 用户联系人
+            _this.formobj.contactphone = vdata.contactphone // 用户联系人电话
+            _this.formobj.planno = vdata.planno // 计划编号
+            _this.formobj.templateid = vdata.templateid // 模板id
+            _this.formobj.cycletype = vdata.cycletype // 周期类型(固定间隔周期)
+            _this.formobj.cycle = vdata.cycle // 巡检周期
+            _this.formobj.cyclevalue = vdata.cyclevalue // 周期值
+          } else {
+            // 根据resp.code进行异常情况处理
+          }
+        })
+        .catch(e => {
+          this.formobj = row
+        })
+      this.queryParamsA.params.templateid=row.templateid
+      this.queryParamsA.params.planid=row.sid
+      this.ShowList()
+      this.ShowYunwei();
+		},
+    // 查询运维人员信息
+    ShowYunwei(){
+      req.listPageB(this.queryParamsA).then((res)=>{
+        this.TabList= res.data.records
+      })
+    },
+    ShowList(){
+      var templateid=this.queryParamsA.params.templateid;
+      if (templateid==''){
+        return;
+      }
+      req.listPageA(this.queryParamsA).then((res)=>{
+        this.list = res.data.records
+      })
+    }
 	}
 }
 </script>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworkerAdd.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworkerAdd.vue
deleted file mode 100644
index cc488270..00000000
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworkerAdd.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<template>
-	<div>
-		<!-- 标题按钮部分开始 -->
-		<div class="tab-header webtop">
-			<!-- 标题 -->
-			<div>{{ viewTitle }}</div>
-			<!-- start 添加修改按钮 -->
-			<div>
-				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
-				<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
-			</div>
-			<!-- end 添加修改按钮 -->
-			<!-- end 详情按钮 -->
-		</div>
-		<!-- 标题按钮部分结束 -->
-		<!-- Start 新增修改部分 -->
-		<div class="main-content">
-			<div class="searchcon">
-			<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="demo-form-inline">
-				<div class="listtop">
-		           <div class="tit">巡视工单信息</div>
-		      </div>
-				<el-row>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>客户标识：</span>
-					</el-col>
-					<el-col :span="2" class="trightb">
-						<el-form-item prop="custid"><el-input size="small" v-model="formobj.custid" placeholder="客户标识" class="addinputw" clearable /></el-form-item>
-					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>告警设备id：</span>
-					</el-col>
-					<el-col :span="3" class="trightb">
-						<el-form-item prop="warneterid"><el-input size="small"  v-model="formobj.warneterid" placeholder="设备id" class="addinputw" clearable /></el-form-item>
-					</el-col>
-					<el-col :span="3" class="tleftb">
-						<span><span class="icon">*</span>告警对象监测点：</span>
-					</el-col>
-					<el-col :span="3" class="trightb">
-						<el-form-item prop="warnobjectmpsn"><el-input size="small" v-model="formobj.warnobjectmpsn" placeholder="告警监测点" class="addinputw" clearable /></el-form-item>
-					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>告警说明：</span>
-					</el-col>
-					<el-col :span="2" class="trightb">
-						<el-form-item prop="warnremarks"><el-input size="small" v-model="formobj.warnremarks" placeholder="告警说明" class="addinputw" clearable /></el-form-item>
-					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>告警内容：</span>
-					</el-col>
-					<el-col :span="3" class="trightb">
-						<el-form-item prop="alarmcontent"><el-input size="small" v-model="formobj.alarmcontent" placeholder="告警内容" class="addinputw" clearable /></el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>告警原因：</span>
-					</el-col>
-					<el-col :span="2" class="trightb">
-						<el-form-item prop="alarmreason"><el-input size="small" v-model="formobj.alarmreason" placeholder="告警原因" class="addinputw" clearable /></el-form-item>
-					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>处理人：</span>
-					</el-col>
-					<el-col :span="2" class="trightb">
-						<el-form-item prop="operationuser"><el-input size="small" v-model="formobj.operationuser" placeholder="处理人" class="addinputw" clearable /></el-form-item>
-					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>处理人名称：</span>
-					</el-col>
-					<el-col :span="2" class="trightb">
-						<el-form-item prop="operationuserrname"><el-input size="small" v-model="formobj.operationuserrname" placeholder="处理人名称" class="addinputw" clearable /></el-form-item>
-					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>处理说明：</span>
-					</el-col>
-					<el-col :span="3" class="trightb">
-						<el-form-item prop="operationcontent"><el-input size="small" v-model="formobj.operationcontent" placeholder="处理人名称" class="addinputw" clearable /></el-form-item>
-					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>处理时间：</span>
-					</el-col>
-					<el-col :span="3" class="trightb">
-						<el-form-item prop="operationtime">
-							<el-date-picker v-model="formobj.operationtime" type="date" size="small"  clearable value-format="yyyy-MM-dd" placeholder="处理时间" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-			<el-row>
-				   <el-col :span="3" class="tleftb">
-						<span><span class="icon">*</span>首次告警时间：</span>
-					</el-col>
-					<el-col :span="4" class="trightb">
-						<el-form-item prop="firsttime">
-							<el-date-picker v-model="formobj.firsttime" type="date" size="small"  clearable value-format="yyyy-MM-dd" placeholder="首次告警时间" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="3" class="tleftb">
-						<span><span class="icon">*</span>最后告警时间：</span>
-					</el-col>
-					<el-col :span="4" class="trightb">
-						<el-form-item prop="lasttime">
-							<el-date-picker v-model="formobj.lasttime" type="date" size="small"  clearable value-format="yyyy-MM-dd" placeholder="最后告警时间" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>告警状态：</span>
-					</el-col>
-					<el-col :span="2" class="trightb">
-						<el-select
-                          v-model="formobj.warnlevelkey"
-                          class="addinputw"
-                          placeholder="类型"
-						  size="small"
-                        >
-                          <el-option
-                            v-for="(item, i) in arr"
-                            :key="i"
-                            :label="item.type"
-                            :value="item.value"
-                          />
-                        </el-select>
-					</el-col>
-					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>处理状态：</span>
-					</el-col>
-					<el-col :span="2" class="trightb">
-						<el-select
-                          v-model="formobj.operationstatus"
-                          class="addinputw"
-                          placeholder="等级"
-						  size="small"
-                        >
-                          <el-option
-                            v-for="(item, i) in arrList"
-                            :key="i"
-                            :label="item.type"
-                            :value="item.value"
-                          />
-                        </el-select>
-					</el-col>
-			</el-row>
-			</el-form>
-		</div>
-	</div>
-	</div>
-</template>
-
-<script>
-import req from '@/api/yxtdispatchcenter/dispatchorderinfo'
-export default {
-	name: 'DispatchOrderinfoAdd',
-	data() {
-		return {
-			submitdisabled: false,
-			isSearchShow: true,
-			viewTitle: '',
-			searchxianshitit: '显示添加条件',
-			formobj: {
-				id: '',
-				sid: '',
-				custid: '', // 客户id
-				alarmreason: '', // 告警原因
-				warneterid: '', // 告警设备id
-				warnremarks:'',// 告警说明
-				warnobjectmpsn: '', // 工单名称
-				operationuser: '', // 处理人 
-				operationuserrname: '', // 处理人名称
-				operationtime: '', // 处理时间
-				operationcontent: '', // 处理说明
-				firsttime: '', // 首次告警时间
-				lasttime: '', // 最后告警时间
-				warnlevelkey: '', // 告警状态
-				operationstatus: '', // 处理状态 
-				alarmcontent: '', // 告警内容
-				alarmtypekey: '1', // 告警类型key
-			},
-			arr:[{value:1,type:'一级'},{value:2,type:'二级'}],
-			arrList:[{value:1,type:'待处理'},{value:2,type:'已处理'},{value:3,type:'处理中'},{value:4,type:'忽略处理'}],
-			rules: {
-				custid: [{ required: true, message: '客户ID不能为空', trigger: 'blur' }], // 客户ID
-				custname: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }], // 客户名称
-				supervisesid: [{ required: true, message: '监管公司id不能为空', trigger: 'blur' }], // 监管公司id
-				orderno: [{ required: true, message: '用法说明：工单编号规则。不能为空', trigger: 'blur' }], // 用法说明：工单编号规则。
-				ordername: [{ required: true, message: '工单名称不能为空', trigger: 'blur' }], // 工单名称
-				orderdegree: [{ required: true, message: '描述不能为空', trigger: 'blur' }], // 描述：1-一般；2-重要； 3-紧急；4-督办。
-				ordertype: [{ required: true, message: '描述不能为空', trigger: 'blur' }], // 描述：1-计划巡视；
-				ordercontent: [{ required: true, message: '工单内容不能为空', trigger: 'blur' }], // 工单内容
-				// arrivetime: [{ required: true, message: '到达现场时间不能为空', trigger: 'blur' }], // 到达现场时间
-				// planfinishtime: [{ required: true, message: '完成时间不能为空', trigger: 'blur' }], // 完成时间
-				operationcontent: [{ required: true, message: '处理情况不能为空', trigger: 'blur' }], // 处理情况
-				receiveperson: [{ required: true, message: '现场联系人不能为空', trigger: 'blur' }], // 现场联系人
-				receivetel: [{ required: true, message: '现场联系人电话不能为空', trigger: 'blur' }] // 现场联系人电话
-			}
-		}
-	},
-	created() {},
-	methods: {
-		handleReturn(isreload) {
-			if (isreload === 'true') this.$emit('reloadlist')
-			this.formobj.id = ''
-			this.formobj.sid = '' // SID
-
-				this.formobj.sid='',
-				this.formobj.custid= '', // 客户id
-				this.formobj.alarmreason= '', // 告警原因
-				this.formobj.warneterid= '', // 告警设备id
-				this.formobj.orderno= '', // 工单编号
-				this.formobj.warnobjectmpsn='', // 工单名称
-				this.formobj.operationuser= '', // 处理人 
-				this.formobj.operationuserrname= '', // 处理人名称
-				this.formobj.operationtime= '', // 处理时间
-				this.formobj.operationcontent= '', // 处理说明
-				this.formobj.firsttime= '', // 首次告警时间
-				this.formobj.lasttime='', // 最后告警时间
-				this.formobj.warnlevelkey= '', // 告警状态
-				this.formobj.operationstatus='', // 处理状态 
-				this.formobj.alarmcontent= '', // 告警内容
-				this.formobj.alarmtypekey= '', // 告警类型key
-			
-			this.$refs['form_obj'].resetFields()
-			this.$emit('doback')
-		},
-		// 搜索条件效果
-		 clicksearchShow() {
-          this.isSearchShow = !this.isSearchShow
-          if (this.isSearchShow) {
-            this.searchxianshitit = '隐藏添加条件'
-          } else {
-            this.searchxianshitit = '显示添加条件'
-          }
-        },
-		showAdd() {
-			this.$nextTick(() => {
-				this.$refs['form_obj'].clearValidate()
-			})
-			this.viewTitle = '【新增】告警信息'
-		},
-		showEdit(row) {
-			this.$nextTick(() => {
-				this.$refs['form_obj'].clearValidate()
-			})
-			this.searchxianshitit = '显示添加条件'
-			this.isSearchShow = true
-			this.viewTitle = '【修改】告警信息'
-			const _this = this
-			req
-				.fetchBySid(row.sid)
-				.then(resp => {
-					if (resp.code==200) {
-						const vdata = resp.data
-						_this.formobj.id = vdata.id
-						_this.formobj.sid = vdata.sid // SID
-						_this.formobj.custid = vdata.custid // 客户ID
-						_this.formobj.custname = vdata.custname // 客户名称
-						_this.formobj.supervisesid = vdata.supervisesid // 监管公司id
-						_this.formobj.orderno = vdata.orderno // 工单编号
-						_this.formobj.ordername = vdata.ordername // 工单名称
-						_this.formobj.orderdegree = vdata.orderdegree // 描述：1-一般；2-重要； 3-紧急；4-督办。
-						_this.formobj.ordertype = vdata.ordertype // 描述：1-计划巡视；
-						_this.formobj.ordercontent = vdata.ordercontent // 工单内容
-						_this.formobj.receiveperson = vdata.receiveperson // 现场联系人
-						_this.formobj.receivetel = vdata.receivetel // 现场联系人电话
-					} else {
-						// 根据resp.code进行异常情况处理
-					}
-				})
-				.catch(e => {
-					this.formobj = row
-				})
-		},
-		saveOrUpdate() {
-			const _this = this
-			this.$refs['form_obj'].validate(valid => {
-				if (valid) {
-					this.submitdisabled = true
-					req
-						.saveOrUpdates(this.formobj)
-						.then(resp => {
-							this.submitdisabled = false
-							if (resp.success) {
-								_this.$message({ showClose: true, type: 'success', message: resp.msg })
-								_this.handleReturn('true')
-							} else {
-								// 根据resp.code进行异常情况处理
-							}
-						})
-						.catch(() => {
-							this.submitdisabled = false
-						})
-				} else {
-					return false
-				}
-			})
-		},
-		handleSelectionChange(val) {
-         this.formobj.workers = val;
-        },
-	     handleSelection(selection){
-		if (selection.length > 1){
-		  let del_row = selection.shift();
-          this.$refs.table.toggleRowSelection(del_row, false)
-	   	}
-	  }
-	}
-}
-</script>
-
-<style scoped></style>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworkerInfo.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworkerInfo.vue
deleted file mode 100644
index e7ddcd3d..00000000
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworkerInfo.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-	<div>
-		<!-- 标题按钮部分开始 -->
-		<div class="tab-header webtop">
-			<!-- 标题 -->
-			<div>工单运维人员情况详情</div>
-			<!-- start 详情按钮 -->
-			<div><el-button itype="info" size="small" @click="handleReturn()">返回</el-button></div>
-			<!-- end 详情按钮 -->
-		</div>
-		<!-- 标题按钮部分结束 -->
-		<div class="listconadd">
-			<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd">
-				<div class="wlInfo"><span>工单运维人员情况</span></div>
-			<el-row>
-				<el-col :span="4" class="tleftb">工单id</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.orderid }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">巡视人名称</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.principalname }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">巡视人sid</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.principalsid }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">联系方式</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.principalcontact }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">是否负责人</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.executorname }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">班组组织。</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.workteam }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">响应状态（接受、拒绝）</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.assignstate }}</span></el-form-item></el-col>
-			</el-row>
-			<el-row>
-				<el-col :span="4" class="tleftb">响应时间（接受、拒绝）</el-col>
-				<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.assigntime }}</span></el-form-item></el-col>
-			</el-row>
-		</el-form>
-		</div>
-	</div>
-</template>
-
-<script>
-import req from '@/api/yxtdispatchcenter/dispatchworker'
-export default {
-	name: 'DispatchWorkerInfo',
-	data() {
-		return {
-			formobj: {}
-		}
-	},
-	methods: {
-		handleReturn() {
-			this.formobj = {}
-			this.$emit('doback')
-		},
-		showInfo(row) {
-				req
-					.fetchBySid(row.sid)
-					.then(resp => {
-						if (resp.success) {
-							const vdata = resp.data
-							_this.formobj.id = vdata.id
-							_this.formobj.sid = vdata.sid // SID
-							_this.formobj.orderid = vdata.orderid // 工单id
-							_this.formobj.principalname = vdata.principalname // 巡视人名称
-							_this.formobj.principalsid = vdata.principalsid // 巡视人sid
-							_this.formobj.principalcontact = vdata.principalcontact // 联系方式
-							_this.formobj.executorname = vdata.executorname // 是否负责人
-							_this.formobj.workteam = vdata.workteam // 班组组织。
-							_this.formobj.assignstate = vdata.assignstate // 响应状态（接受、拒绝）
-							_this.formobj.assigntime = vdata.assigntime // 响应时间（接受、拒绝）
-						}
-					})
-				.catch(e => {
-					_this.formobj = row
-				})
-		}
-	}
-}
-</script>
-
-<style scoped></style>