diff --git a/warehousing-system/project_web/src/components/Home.vue b/warehousing-system/project_web/src/components/Home.vue
index e60f7c4c..27634def 100644
--- a/warehousing-system/project_web/src/components/Home.vue
+++ b/warehousing-system/project_web/src/components/Home.vue
@@ -131,10 +131,8 @@ export default {
   },
   methods: {
     logout () {
-      // 1.删除session中的记录
-      window.sessionStorage.clear()
-      // 2.要求跳转到用户登录页面
-      this.$router.push('/login')
+      window.opener = null
+      window.open('about:blank', '_top').close()
     },
     async getMenuList () {
       // 1.查询左侧菜单
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureAdd.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureAdd.vue
index 1a2b5f3f..4a49ad7c 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureAdd.vue
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureAdd.vue
@@ -334,17 +334,17 @@
 
         })
       },
-      doCommoditylDel(index) {
+        doCommoditylDel(index) {
 
-        const tip = '请确认是否删除所选记录?'
-        this.$confirm(tip, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.formobj.commodityList.splice(index, 1);
-        })
-      },
+          const tip = '请确认是否删除所选记录?'
+          this.$confirm(tip, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.formobj.commodityList.splice(index, 1);
+          })
+        },
 
       // 序号
       indexMethod(index) {
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 be3a89cb..72bad52a 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="模板id"><el-input v-model="queryParams.params.templateid" placeholder="请输入模板id" clearable /></el-form-item>
-						<el-form-item label="任务项标准库id"><el-input v-model="queryParams.params.taskid" placeholder="请输入任务项标准库id" clearable /></el-form-item>
+						<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>
 						<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>
@@ -25,16 +25,19 @@
 
 			<!-- Start 项目列表 -->
 			<div>
-				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
+				<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="模板id" align="center" />
-					<el-table-column prop="taskid" label="任务项标准库id" align="center" />
+					<el-table-column prop="templateid" label="模板名称" align="center" />
+					<el-table-column prop="taskid" 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">
+						   <el-tooltip class="item" effect="dark" content="维护" placement="top-end">
+								<i  class="el-icon-coin"  @click="toMaintain(scope.row)"></i>
+                           </el-tooltip>
+						   <el-tooltip class="item" effect="dark" content="编辑" placement="top">
 								<i  class="el-icon-edit-outline"  @click="toEdit(scope.row)"></i>
                            </el-tooltip>
-						   <el-tooltip class="item" effect="dark" content="删除" placement="top">
+						   <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
 							<i  class="el-icon-delete"  @click="doDel(scope.row)"></i>
                            </el-tooltip>
                         </template>
@@ -55,8 +58,62 @@
 				/>
 			</div>
 		</div>
+	 </div>
+		<!-- 弹出关联项 -->
+		<el-dialog
+           title="关联任务项"
+           :visible.sync="dialogVisible"
+           width="70%"
+           >
+		   <div class="main-content">
+			<div class="searchcon">
+				<div  class="search">
+					<el-form :inline="true" class="tab-header">
+						<el-form-item label="任务项名称"><el-input v-model="queryParams2.params.taskname" placeholder="请输入任务项名称" clearable /></el-form-item>
+						<el-form-item label="任务项分类"><el-input v-model="queryParams2.params.tasktype" placeholder="请输入任务项分类" clearable /></el-form-item>
+						<div class="btn" style="margin-left: 400px;">
+							<el-button type="primary" size="small" icon="el-icon-search"   @click="dosearchs">查询</el-button>
+							<el-button type="primary" size="small" icon="el-icon-refresh"  @click="resetQuerys">重置</el-button>
+						</div>
+					</el-form>
+				</div>
+			</div>
+			<!-- Start 项目列表头部 -->
+			<div class="listtop">
+				<div class="tit">数据列表</div>
+				<pageye v-show="arrList.length > 0" :total="queryParams2.total" :page.sync="queryParams2.current" :limit.sync="queryParams2.size" class="pagination" @pagination="loadLists" />
+			</div>
+			<!-- End 项目列表头部 -->
+
+			<!-- 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-column prop="tasktype" label="任务项分类" align="center" />
+					<el-table-column prop="taskdesc" label="任务描述" align="center" />
+					<el-table-column prop="taskreturn" :formatter="formatPrivilegeType"  label="反馈形式" align="center" />
+				</el-table>
+				<div style="margin-top: 20px; margin-left: 800px;">
+                  <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+                  <el-button size="small" type="primary" @click="confirm">关 联</el-button>
+                </div>
+			</div>
+			<!-- End 项目列表 -->
+			<div class="pages">
+				<div class="tit" />
+				<!--  翻页  -->
+				<pagination
+					v-show="arrList.length > 0"
+					:total="queryParams2.total"
+					:page.sync="queryParams2.current"
+					:limit.sync="queryParams2.size"
+					class="pagination"
+					@pagination="loadLists"
+				/>
+			</div>
 		</div>
-		<!-- End 查询和其列表部分 -->
+         </el-dialog>
 
 		<!-- 新增修改部分组件 -->
 		<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
@@ -68,6 +125,7 @@
 
 <script>
 import req from '@/api/yxtdispatchcenter/dispatchmodletemplate'
+import req2 from '@/api/yxtdispatchcenter/dispatchstandards'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
@@ -89,7 +147,9 @@ export default {
 			viewState: 1, // 1、列表 2、添加 3、修改 4、查看
 			isSearchShow: false,
 			tableLoading: false,
+			dialogVisible: false,
 			dataList: [],
+			arrList: [],
 			queryParams: {
 				current: 1,
 				size: 10,
@@ -102,7 +162,7 @@ export default {
 			},
 			multipleSelection: [],
 			btnList: [
-          {
+             {
                   type: 'primary',
                   size: 'small',
                   icon: 'plus',
@@ -116,7 +176,21 @@ export default {
                   btnKey: 'doClose',
                   btnLabel: '关闭'
                 }
-              ]
+              ],
+			  queryParams2: {
+				current: 1,
+				size: 10,
+				total: 0,
+				params: {
+					sids: [], // 用于导出的时候保存已选择SID
+				taskname: '', // 任务项名称
+				tasktype: '', // 任务项分类
+				taskdesc: '', // 任务描述
+				taskreturn: '', // 反馈形式（1选项 2图片 3文字）
+				tasktypeparent: '' // 任务项父级分类+
+				}
+			},
+			multipleSelection:[]
 		}
 	},
 	mounted() {
@@ -195,12 +269,22 @@ export default {
 			this.queryParams.current = 1
 			this.loadList()
 		},
+		dosearchs() {
+			this.queryParams2.current = 1
+			this.loadLists()
+		},
 		resetQuery() {
 			this.queryParams.params = {}
 			this.queryParams.params.sid = '' // sid
 			this.queryParams.params.name = '' // 登录名
 			this.dosearch()
 		},
+		resetQuerys() {
+			this.queryParams2.params = {}
+			this.queryParams2.params.sid = '' // sid
+			this.queryParams2.params.name = '' // 登录名
+			this.dosearchs()
+		},
 		loadList() {
 			const _this = this
 			this.tableLoading = true
@@ -220,6 +304,25 @@ export default {
 					_this.tableLoading = false
 				})
 		},
+		loadLists() {
+			const _this = this
+			this.tableLoading = true
+			req2
+				.listPage(this.queryParams2)
+				.then(resp => {
+					_this.tableLoading = false
+					if (resp.success) { 
+						const data = resp.data
+						_this.queryParams2.total = data.total
+						_this.arrList = data.records
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
+					_this.tableLoading = false
+				})
+		},
 		handleSelectionChange(val) {
 			this.multipleSelection = val
 		},
@@ -237,6 +340,27 @@ export default {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
         },
+		toMaintain(row){
+			this.loadLists()
+			this.dialogVisible=true
+		},
+		formatPrivilegeType: function( row, column) {
+         if(row.taskreturn === '1'){
+             return '文字'
+         } else if(row.taskreturn === '2') {
+             return '图片'
+         } else if (row.taskreturn === '3') {
+             return '选项'
+         } else {
+             return ''
+         }
+        },
+		confirm(){
+			if (this.multipleSelection.length === 0) {
+				this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
+				return
+			}
+		}
 	}
 }
 </script>
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 f91e604d..65f6203e 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
@@ -22,18 +22,18 @@
 		      </div>
 				<el-row>
 					<el-col :span="4" class="tleftb">
-						<span><span class="icon">*</span>模板id：</span>
+						<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="模板id" class="addinputw" clearable /></el-form-item>
+						<el-form-item prop="templateid"><el-input v-model="formobj.templateid" placeholder="模板名称" class="addinputw" clearable /></el-form-item>
 					</el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="4" class="tleftb">
-						<span><span class="icon">*</span>任务项标准库id：</span>
+						<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="任务项标准库id" class="addinputw" clearable /></el-form-item>
+						<el-form-item prop="taskid"><el-input v-model="formobj.taskid" placeholder="任务类型" class="addinputw" clearable /></el-form-item>
 					</el-col>
 				</el-row>
 			</el-form>
@@ -59,8 +59,8 @@ export default {
 				taskid: '' // 任务项标准库id
 			},
 			rules: {
-				templateid: [{ required: true, message: '模板id不能为空', trigger: 'blur' }], // 模板id
-				taskid: [{ required: true, message: '任务项标准库id不能为空', trigger: 'blur' }] // 任务项标准库id
+				templateid: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }], // 模板id
+				taskid: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }] // 任务项标准库id
 			}
 		}
 	},
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchstandardsAdds.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchstandardsAdds.vue
index 34e41768..13a0949c 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchstandardsAdds.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchstandardsAdds.vue
@@ -24,8 +24,19 @@
               </div>
               <div class="item">
                 <span class="item_text">任务项分类：</span>
-                <el-input v-model="formobj.tasktype"  class="item_input"
-                 placeholder="任务项分类" />
+				 <el-select
+                    v-model="formobj.tasktype"
+                    class="item_input"
+                    placeholder="请选择任务项"
+				    size="small"
+                  >
+                    <el-option
+                      v-for="(item, i) in arr"
+                      :key="i"
+                      :label="item.type"
+                      :value="item.type"
+                    />
+                </el-select>
               </div>
 
 			  <div class="item">
@@ -75,7 +86,8 @@ export default {
 				taskdesc: [{ required: true, message: '任务描述不能为空', trigger: 'blur' }], // 任务描述
 				taskreturn: [{ required: true, message: '反馈形式（1选项 2图片 3文字）不能为空', trigger: 'blur' }], // 反馈形式（1选项 2图片 3文字）
 				tasktypeparent: [{ required: true, message: '任务项父级分类+不能为空', trigger: 'blur' }] // 任务项父级分类+
-			}
+			},
+			arr:[{value:1,type:'电力电缆检查'},{value:2,type:'变压器外观'},{value:3,type:'集污器、冷却风扇'},{value:4,type:'通讯柜'}],
 		}
 	},
 	created() {},
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 e50867c8..76843b9c 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
@@ -33,7 +33,7 @@
 			</div>
 			<!-- Start 项目列表头部 -->
 			<div class="listtop">
-				<div class="tit">汇总工单数据列表</div>
+				<div class="tit">巡视工单列表</div>
 				<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
 			</div>
 			<!-- End 项目列表头部 -->
@@ -45,7 +45,7 @@
 					<el-table-column prop="orderno" label="工单编号" 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="orderdegree"  label="等级" align="center" />
 					<el-table-column prop="ordercontent" label="工单内容" align="center" />
 					<el-table-column prop="receiveperson" label="现场联系人" align="center" />
 					<el-table-column prop="receivetel" label="现场联系人电话" align="center" />
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 6f019fc5..a826d7f7 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
@@ -37,7 +37,7 @@
 					<el-col :span="2" class="tleftb">
 						<span><span class="icon">*</span>工单名称：</span>
 					</el-col>
-					<el-col :span="3" class="trightb">
+					<el-col :span="2" class="trightb">
 						<el-form-item prop="ordername"><el-input size="small" v-model="formobj.ordername" placeholder="工单名称" class="addinputw" clearable /></el-form-item>
 					</el-col>
 					<el-col :span="2" class="tleftb">
@@ -46,6 +46,24 @@
 					<el-col :span="3" class="trightb">
 						<el-form-item prop="ordercontent"><el-input size="small" v-model="formobj.ordercontent" 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-select
+                          v-model="formobj.templatesid"
+                          class="addinputw"
+                          placeholder="模板"
+						  size="small"
+                        >
+                          <el-option
+                            v-for="(item, i) in dataList"
+                            :key="i"
+                            :label="item.templateid"
+                            :value="item.taskid"
+                          />
+                        </el-select>
+					</el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="2" class="tleftb">
@@ -92,7 +110,7 @@
                             v-for="(item, i) in arrList"
                             :key="i"
                             :label="item.type"
-                            :value="item.value"
+                            :value="item.type"
                           />
                         </el-select>
 					</el-col>
@@ -101,17 +119,40 @@
 		</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>
+			@selection-change="handleSelectionChange" @select="handleSelection" stripe >
 			>
 			  <el-table-column type="selection" width="55"/>
               <el-table-column fixed width="100" type="index" label="序号"  align="center" />
-              <el-table-column prop="principalname" label="巡视人名称" align="center" />
-              <el-table-column prop="principalcontact" label="联系方式"  align="center" />
-              <el-table-column prop="workteam" label="班组组织" align="center" />
-              <el-table-column prop="executorname" label="是否负责人" width="150px"  align="center" />
+			  <el-table-column label="操作" wid align="center" width="150">
+                  <template slot-scope="scope">
+                    <el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
+                  </template>
+                </el-table-column>
+              <el-table-column prop="principalname" label="巡视人名称" align="center" >
+				<template slot-scope="scope">
+                    <el-input v-model="scope.row.principalname" placeholder="" clearable></el-input>
+                  </template>
+			  </el-table-column>
+              <el-table-column prop="principalcontact" label="联系方式"  align="center" >
+				<template slot-scope="scope">
+                    <el-input v-model="scope.row.principalcontact" placeholder="" clearable></el-input>
+                  </template>
+			  </el-table-column>
+              <el-table-column prop="workteam" label="班组组织" align="center" >
+				<template slot-scope="scope">
+                    <el-input v-model="scope.row.workteam" placeholder="" clearable></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="是">是</el-radio>
+                    <el-radio v-model="scope.row.executorname" label="否">否</el-radio>
+                  </template>
+			  </el-table-column>
             </el-table>
         </div>
 		<div class="listtop">
@@ -120,8 +161,8 @@
 		<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="a" width="200" label="设备类别" align="center" />
-              <el-table-column prop="b" label="任务模板名称" width="200" align="center" />
+              <el-table-column prop="taskid" width="200" label="设备类别" align="center" />
+              <el-table-column prop="templateid" label="任务模板名称" width="200" align="center" />
               <el-table-column prop="c" label="巡视内容" align="center" />
             </el-table>
         </div>
@@ -131,6 +172,7 @@
 
 <script>
 import req from '@/api/yxtdispatchcenter/dispatchorderinfo'
+import req2 from '@/api/yxtdispatchcenter/dispatchmodletemplate'
 export default {
 	name: 'DispatchOrderinfoAdd',
 	data() {
@@ -147,6 +189,7 @@ export default {
 				supervisesid: '', // 监管公司id
 				orderno: '', // 工单编号
 				ordername: '', // 工单名称
+				templatesid: '', // 模板sid
 				orderdegree: '', // 描述：1-一般；2-重要； 3-紧急；4-督办。
 				ordertype: '', // 描述：1-计划巡视；
 				ordercontent: '', // 工单内容
@@ -156,35 +199,9 @@ export default {
 			},
 			arr:[{value:1,type:'计划巡视'},{value:2,type:'专项巡视'},{value:3,type:'告警巡视'}],
 			arrList:[{value:1,type:'一般'},{value:2,type:'重要'},{value:3,type:'紧急'},{value:4,type:'督办'}],
-			TabList:[{
-					principalname:'1',//巡视人名称
-					principalsid:'1',//巡视人sid
-					principalcontact:'1',//联系方式
-					executorname:'1',//是否负责人
-					executornamekey:'1',//是否负责人key
-					workteam:'1',//班组组织
-					workteamid:'110',//班组组织id
-				},{
-					principalname:'1',//巡视人名称
-					principalsid:'1',//巡视人sid
-					principalcontact:'1',//联系方式
-					executorname:'1',//是否负责人
-					executornamekey:'1',//是否负责人key
-					workteam:'1',//班组组织
-					workteamid:'110',//班组组织id
-				}],
-			list:[
-				{
-					a:'变压器',
-					b:'变压器巡视',
-					c:'设备类型占位符_巡视标准占位符占位符占位符占位符占位符占位符占位符',
-				},
-				{
-					a:'感应器',
-					b:'感应器巡视',
-					c:'设备类型占位符_巡视标准占位符',
-				},
-			],
+			TabList:[],
+			dataList:[],
+			list:[],
 			rules: {
 				custid: [{ required: true, message: '客户ID不能为空', trigger: 'blur' }], // 客户ID
 				custname: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }], // 客户名称
@@ -199,29 +216,48 @@ export default {
 				operationcontent: [{ required: true, message: '处理情况不能为空', trigger: 'blur' }], // 处理情况
 				receiveperson: [{ required: true, message: '现场联系人不能为空', trigger: 'blur' }], // 现场联系人
 				receivetel: [{ required: true, message: '现场联系人电话不能为空', trigger: 'blur' }] // 现场联系人电话
-			}
+			},
+			queryParams: {
+				current: 1,
+				size: 100,
+				total: 0,
+				params: {
+				sids: [], 
+				templateid: '', 
+				taskid: ''
+				}
+			},
 		}
 	},
+	mounted(){
+	  req2.listPage(this.queryParams).then(resp => {
+		if (resp.success) { 
+			const data = resp.data
+			this.dataList = data.records
+			this.list = data.records
+		}
+	   })
+	},
 	created() {},
 	methods: {
 		handleReturn(isreload) {
 			if (isreload === 'true') this.$emit('reloadlist')
 			this.formobj.id = ''
 			this.formobj.sid = '' // SID
-
-				this.custid = '' // 客户ID
-				this.custname = '' // 客户名称
-				this.supervisesid = '' // 监管公司id
-				this.orderno = '' // 用法说明：工单编号规则。
-				this.ordername = '' // 工单名称
-				this.orderdegree = '' // 描述：1-一般；2-重要； 3-紧急；4-督办。
-				this.ordertype = '' // 描述：1-计划巡视；
-				this.ordercontent = '' // 工单内容
-				this.arrivetime = '' // 到达现场时间
-				this.planfinishtime = '' // 完成时间
-				this.operationcontent = '' // 处理情况
-				this.receiveperson = '' // 现场联系人
-				this.receivetel = '' // 现场联系人电话
+			this.formobj.custid = '' // 客户ID
+			this.formobj.custname = '' // 客户名称
+			this.formobj.supervisesid = '' // 监管公司id
+			this.formobj.orderno = '' // 用法说明：工单编号规则。
+			this.formobj.ordername = '' // 工单名称
+			this.formobj.orderdegree = '' // 描述：1-一般；2-重要； 3-紧急；4-督办。
+			this.formobj.ordertype = '' // 描述：1-计划巡视；
+			this.formobj.templatesid = '' // 模板；
+			this.formobj.ordercontent = '' // 工单内容
+			this.formobj.arrivetime = '' // 到达现场时间
+			this.formobj.planfinishtime = '' // 完成时间
+			this.formobj.operationcontent = '' // 处理情况
+			this.formobj.receiveperson = '' // 现场联系人
+			this.formobj.receivetel = '' // 现场联系人电话
 			
 			this.$refs['form_obj'].resetFields()
 			this.$emit('doback')
@@ -276,6 +312,10 @@ export default {
 				})
 		},
 		saveOrUpdate() {
+			if (this.formobj.workers.length === 0) {
+				this.$message({ showClose: true, type: 'error', message: '请选择一条巡视人员进行添加' })
+				return
+			}
 			const _this = this
 			this.$refs['form_obj'].validate(valid => {
 				if (valid) {
@@ -307,9 +347,24 @@ export default {
 		  let del_row = selection.shift();
           this.$refs.table.toggleRowSelection(del_row, false)
 	   	}
-	  }
-	}
-}
+	   },
+	   add() {
+        this.TabList.push({
+
+        })
+      },
+	  doCommoditylDel(index) {
+         const tip = '请确认是否删除所选记录?'
+         this.$confirm(tip, '提示', {
+           confirmButtonText: '确定',
+           cancelButtonText: '取消',
+           type: 'warning'
+         }).then(() => {
+           this.TabList.splice(index, 1);
+         })
+         },
+         	}
+         }
 </script>
 
 <style scoped></style>
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 7fd8e954..6d090484 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
@@ -44,7 +44,19 @@
 						<span><span class="icon">*</span>巡视模板：</span>
 					</el-col>
 					<el-col :span="2" class="trightb">
-						<el-form-item prop="templateid"><el-input size="small" v-model="formobj.templateid" placeholder="巡视模板" class="addinputw" clearable /></el-form-item>
+						<el-select
+                          v-model="formobj.templateid"
+                          class="addinputw"
+                          placeholder="巡视模板"
+						  size="small"
+                        >
+                          <el-option
+                            v-for="(item, i) in dataList"
+                            :key="i"
+                            :label="item.templateid"
+                            :value="item.taskid"
+                          />
+                        </el-select>
 					</el-col>
 					<el-col :span="2" class="tleftb">
 						<span><span class="icon">*</span>用户联系人：</span>
@@ -65,7 +77,19 @@
 						<span><span class="icon">*</span>周期类型：</span>
 					</el-col>
 					<el-col :span="2" class="trightb">
-						<el-form-item prop="cycletype"><el-input size="small"  v-model="formobj.cycletype" placeholder="周期类型" class="addinputw" clearable /></el-form-item>
+						<el-select
+                          v-model="formobj.cycletype"
+                          class="addinputw"
+                          placeholder="周期类型"
+						  size="small"
+                        >
+                          <el-option
+                            v-for="(item, i) in period"
+                            :key="i"
+                            :label="item.type"
+                            :value="item.type"
+                          />
+                        </el-select>
 					</el-col>
 					<el-col :span="2" class="tleftb">
 						<span><span class="icon">*</span>巡检周期：</span>
@@ -137,6 +161,7 @@
 
 <script>
 import req from '@/api/yxtdispatchcenter/dispatchpatrolplan'
+import req2 from '@/api/yxtdispatchcenter/dispatchmodletemplate'
 export default {
 	name: 'DispatchPatrolPlanAdd',
 	data() {
@@ -164,6 +189,7 @@ export default {
 				cyclevalue: '', // 周期值
 				workers:[],
 			},
+			dataList:[],
 			TabList:[{
 					principalname:'1',//巡视人名称
 					principalsid:'1',//巡视人sid
@@ -207,9 +233,28 @@ export default {
 				cycletype: [{ required: true, message: '周期类型(固定间隔周期)不能为空', trigger: 'blur' }], // 周期类型(固定间隔周期)
 				cycle: [{ required: true, message: '巡检周期不能为空', trigger: 'blur' }], // 巡检周期
 				cyclevalue: [{ required: true, message: '周期值不能为空', trigger: 'blur' }] // 周期值
-			}
+			},
+			period:[{value:1,type:'日'},{value:2,type:'月'}],
+			queryParams: {
+				current: 1,
+				size: 100,
+				total: 0,
+				params: {
+				sids: [], 
+				templateid: '', 
+				taskid: ''
+				}
+			},
 		}
 	},
+	mounted(){
+	  req2.listPage(this.queryParams).then(resp => {
+		if (resp.success) { 
+			const data = resp.data
+			this.dataList = data.records
+		}
+	   })
+	},
 	created() {},
 	methods: {
 		handleReturn(isreload) {
@@ -286,6 +331,10 @@ export default {
 				})
 		},
 		saveOrUpdate() {
+			if (this.formobj.workers.length === 0) {
+				this.$message({ showClose: true, type: 'error', message: '请选择一条巡视人员进行添加' })
+				return
+			}
 			const _this = this
 			this.$refs['form_obj'].validate(valid => {
 				if (valid) {
@@ -311,7 +360,6 @@ export default {
 		},
 		handleSelectionChange(val) {
          this.formobj.workers = val;
-		 console.log(this.formobj);
         },
 	     handleSelection(selection){
 		if (selection.length > 1){
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/dispatchworker/dispatchtemplate.vue
index 70cdcc46..b9a26d08 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/dispatchworker/dispatchtemplate.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="app-container">
 		<div v-show="viewState == 1">
-			<button-bar ref="btnbar" view-title="历史报警" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+			<button-bar ref="btnbar" view-title="历史告警" :btndisabled="btndisabled" @btnhandle="btnHandle" />
 			<div class="main-content">
 			<div class="searchcon">
 				<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
@@ -33,7 +33,7 @@
 			</div>
 			<!-- Start 项目列表头部 -->
 			<div class="listtop">
-				<div class="tit">汇总工单数据列表</div>
+				<div class="tit">历史告警列表</div>
 				<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
 			</div>
 			<!-- End 项目列表头部 -->
@@ -49,6 +49,13 @@
 					<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 fixed="right" label="操作"  align="center">
+                        <template slot-scope="scope">
+						   <el-tooltip class="item" effect="dark" content="查看" placement="top-start">
+							<i  class="el-icon-notebook-2" @click="purchase(scope.row)"></i>
+                           </el-tooltip>
+                        </template>
+                      </el-table-column>
 				</el-table>
 			</div>
 			<!-- End 项目列表 -->
@@ -65,6 +72,15 @@
 				/>
 			</div>
 		</div>
+				<!-- End 查询和其列表部分 -->
+		<el-drawer
+          title="历史告警详情"
+          :visible.sync="drawer"
+          size="56%">
+		  <div class="main-content">
+			666
+		</div>
+        </el-drawer>
 		</div>
 		<!-- End 查询和其列表部分 -->
 		<!-- 新增修改部分组件 -->
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/dispatchworker/dispatchworker.vue
index 7073ba1d..2404eca3 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/dispatchworker/dispatchworker.vue
@@ -33,7 +33,7 @@
 			</div>
 			<!-- Start 项目列表头部 -->
 			<div class="listtop">
-				<div class="tit">汇总工单数据列表</div>
+				<div class="tit">实时报警列表</div>
 				<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
 			</div>
 			<!-- End 项目列表头部 -->
@@ -76,7 +76,7 @@
 		</div>
 		<!-- End 查询和其列表部分 -->
 		<el-drawer
-          title="汇总工单数据详情"
+          title="实时报警详情"
           :visible.sync="drawer"
           size="56%">
 		  <div class="main-content">