diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.development b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.development
index 4cec97ce..2e16b6c9 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.development
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/.env.development
@@ -5,6 +5,6 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "https://mock.apifox.cn/m1/1913288-0-default"
+VUE_APP_URL = "http://jianguan.yyundong.com/api/dispatch"
 #VUE_APP_URL = "http://192.168.1.177:7109"
 #VUE_APP_URL = "http://8.130.39.13:8112"
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 910a239b..790b8710 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
@@ -22,7 +22,7 @@ export default {
   delBySids: function(params) {
     return request({
       url: '/yxtdispatchcenter/v1/dispatchpatrolplan/delBySids',
-      method: 'delete',
+      method: 'post',
       data: params
     })
   },
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplan.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplan.vue
index f244be90..ff6ba238 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplan.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplan.vue
@@ -1,28 +1,18 @@
 <template>
 	<div class="app-container">
-		<div v-show="viewState == 1">
-			<button-bar view-title="巡视工单管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+	  <div v-show="viewState == 1">
+			<button-bar ref="btnbar" view-title="巡视计划管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+			<div class="main-content">
 			<div class="searchcon">
 				<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
 				<div v-show="isSearchShow" class="search">
-					<el-form :inline="true" class="tab-header">
+					<el-form ref="queryParams" :model="queryParams.params" :inline="true" class="tab-header">
 						<el-form-item label="计划名称"><el-input v-model="queryParams.params.planname" placeholder="请输入计划名称" clearable /></el-form-item>
+						<el-form-item label="计划编号"><el-input v-model="queryParams.params.planno" placeholder="请输入计划名称" clearable /></el-form-item>
 						<el-form-item label="客户标识"><el-input v-model="queryParams.params.custid" placeholder="请输入客户标识" clearable /></el-form-item>
-						<el-form-item label="监管公司id"><el-input v-model="queryParams.params.supervisesid" placeholder="请输入监管公司id" clearable /></el-form-item>
-						<el-form-item label="1计划巡视、2专项巡视"><el-input v-model="queryParams.params.patroltype" placeholder="请输入1计划巡视、2专项巡视" clearable /></el-form-item>
-						<el-form-item label="计划开始日期"><el-input v-model="queryParams.params.startdate" placeholder="请输入计划开始日期" clearable /></el-form-item>
-						<el-form-item label="计划结束日期"><el-input v-model="queryParams.params.enddate" placeholder="请输入计划结束日期" clearable /></el-form-item>
-						<el-form-item label="用户联系人"><el-input v-model="queryParams.params.contactperson" placeholder="请输入用户联系人" clearable /></el-form-item>
-						<el-form-item label="用户联系人电话"><el-input v-model="queryParams.params.contactphone" placeholder="请输入用户联系人电话" clearable /></el-form-item>
-						<el-form-item label="计划编号"><el-input v-model="queryParams.params.planno" placeholder="请输入计划编号" clearable /></el-form-item>
-						<el-form-item label="模板id"><el-input v-model="queryParams.params.templateid" placeholder="请输入模板id" clearable /></el-form-item>
-						<el-form-item label="周期类型(固定间隔周期)"><el-input v-model="queryParams.params.cycletype" placeholder="请输入周期类型(固定间隔周期)" clearable /></el-form-item>
-						<el-form-item label="巡检周期"><el-input v-model="queryParams.params.cycle" placeholder="请输入巡检周期" clearable /></el-form-item>
-						<el-form-item label="周期值"><el-input v-model="queryParams.params.cyclevalue" placeholder="请输入周期值" clearable /></el-form-item>
-						<el-divider />
-						<div class="btn" style="text-align: center;">
-							<el-button type="primary" @click="dosearch">查询</el-button>
-							<el-button type="primary" @click="resetQuery">重置</el-button>
+						<div class="btn" style="margin-left: 500px;">
+							<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>
 						</div>
 					</el-form>
 				</div>
@@ -30,49 +20,53 @@
 			<!-- Start 项目列表头部 -->
 			<div class="listtop">
 				<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" /> -->
+				<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
 			</div>
 			<!-- End 项目列表头部 -->
 
 			<!-- Start 项目列表 -->
-			<div class="listcon">
-				<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
-					<el-table-column width="50px" type="selection" align="center" />
-					<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
-					<el-table-column label="SID" align="center">
-						<template slot-scope="scope">
-							<span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.sid }}</span>
-						</template>
-					</el-table-column>
+			<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="custname" width="200px" label="客户名称" align="center" />
+					<el-table-column prop="planno" width="250px" label="计划编号" align="center" />
 					<el-table-column prop="planname" label="计划名称" align="center" />
-					<el-table-column prop="custid" label="客户标识" align="center" />
-					<el-table-column prop="supervisesid" label="监管公司id" align="center" />
-					<el-table-column prop="patroltype" label="1计划巡视、2专项巡视" align="center" />
-					<el-table-column prop="startdate" label="计划开始日期" align="center" />
-					<el-table-column prop="enddate" label="计划结束日期" align="center" />
-					<el-table-column prop="contactperson" label="用户联系人" align="center" />
-					<el-table-column prop="contactphone" label="用户联系人电话" align="center" />
-					<el-table-column prop="planno" label="计划编号" align="center" />
-					<el-table-column prop="templateid" label="模板id" align="center" />
-					<el-table-column prop="cycletype" label="周期类型(固定间隔周期)" align="center" />
-					<el-table-column prop="cycle" label="巡检周期" align="center" />
-					<el-table-column prop="cyclevalue" label="周期值" align="center" />
+					<el-table-column prop="startdate" width="150px" label="计划开始日期" align="center" />
+					<el-table-column prop="enddate" width="150px" label="计划结束日期" align="center" />
+					<el-table-column fixed="right" label="操作"  align="center">
+                        <template slot-scope="scope">
+                          <i  class="el-icon-edit-outline"  @click="toEdit(scope.row)"></i>
+						  <i  class="el-icon-delete"  @click="doDel(scope.row)"></i>
+						  <i  class="el-icon-notebook-2"  @click="purchase(scope.row)"></i>
+                        </template>
+                      </el-table-column>
 				</el-table>
 			</div>
 			<!-- End 项目列表 -->
 			<div class="pages">
 				<div class="tit" />
 				<!--  翻页  -->
-				<!-- <pagination
+				<pagination
 					v-show="dataList.length > 0"
 					:total="queryParams.total"
 					:page.sync="queryParams.current"
 					:limit.sync="queryParams.size"
 					class="pagination"
 					@pagination="loadList"
-				/> -->
+				/>
 			</div>
 		</div>
+	  </div>
+
+
+        <el-drawer
+          title="我是外面的 Drawer"
+          :visible.sync="drawer"
+          size="60%">
+          <div>
+           <div>666</div>
+          </div>
+        </el-drawer>
 		<!-- End 查询和其列表部分 -->
 
 		<!-- 新增修改部分组件 -->
@@ -106,6 +100,7 @@ export default {
 			viewState: 1, // 1、列表 2、添加 3、修改 4、查看
 			isSearchShow: false,
 			tableLoading: false,
+			drawer: false,
 			dataList: [],
 			searchxianshitit: '显示查询条件',
 			queryParams: {
@@ -113,25 +108,34 @@ export default {
 				size: 10,
 				total: 0,
 				params: {
-					sids: [], // 用于导出的时候保存已选择SID
-				planname: '', // 计划名称
-				custid: '', // 客户标识
-				supervisesid: '', // 监管公司id
-				patroltype: '', // 1计划巡视、2专项巡视
-				startdate: '', // 计划开始日期
-				enddate: '', // 计划结束日期
-				contactperson: '', // 用户联系人
-				contactphone: '', // 用户联系人电话
-				planno: '', // 计划编号
-				templateid: '', // 模板id
-				cycletype: '', // 周期类型(固定间隔周期)
-				cycle: '', // 巡检周期
-				cyclevalue: '' // 周期值
+				   planname: '', // 计划名称
+				   custid: '', // 客户标识
+				   planno: '', // 计划编号
 				}
 			},
-			multipleSelection: []
+			multipleSelection: [],
+			btnList: [
+          {
+                  type: 'primary',
+                  size: 'small',
+                  icon: 'plus',
+                  btnKey: 'toAdd',
+                  btnLabel: '新增'
+                },
+                {
+                  type: 'info',
+                  size: 'small',
+                  icon: 'cross',
+                  btnKey: 'doClose',
+                  btnLabel: '关闭'
+                }
+              ]
 		}
 	},
+	mounted() {
+      // 初始化按钮
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
 	created() {
 		this.loadList()
 	},
@@ -144,21 +148,9 @@ export default {
 				case 'toAdd':
 					this.toAdd()
 					break
-				case 'toEdit':
-					this.toEdit()
-					break
-				case 'doSubmit':
-					this.doSubmit()
-					break
-				case 'doDel':
-					this.doDel()
-					break
-				case 'doImport':
-					this.doImport()
-					break
-				case 'doExport':
-					this.doExport()
-					break
+			   case 'doClose': // 关闭
+                    this.doClose()
+                    break
 				default:
 					break
 			}
@@ -172,21 +164,12 @@ export default {
             this.searchxianshitit = '显示查询条件'
           }
         },
-		toAdd(row) {
+		toAdd() {
 			this.viewState = 2
 			this.$refs['divadd'].showAdd()
 		},
-		toEdit() {
-			if (this.multipleSelection.length === 0) {
-				this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
-				return
-			}
-			if (this.multipleSelection.length > 1) {
-				this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
-				return
-			}
+		toEdit(row) {
 			this.viewState = 3
-			const row = this.multipleSelection[0]
 			this.$refs['divadd'].showEdit(row)
 		},
 		doSubmit(row) {
@@ -208,16 +191,12 @@ export default {
 				})
 		},
 		doDel(row) {
-			if (this.multipleSelection.length === 0) {
-				this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
-				return
-			}
 			const _this = this
 			const sids = []
 			this.multipleSelection.forEach(row => {
 				sids.push(row.sid)
 			})
-			const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'
+			const tip = '请确认是否删除该条记录?'
 			this.$confirm(tip, '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -247,44 +226,6 @@ export default {
 				})
 				.catch(() => {})
 		},
-		doImport(row) {
-			// 导入的代码
-			req
-				.importExcel(this.queryParams.params)
-				.then(resp => {
-					if (resp.success) { 
-						console.log(resp)
-					}
-				})
-				.catch(() => {})
-		},
-		doExport(row) {
-			// 导出的代码
-			const sids = []
-			this.multipleSelection.forEach(row => {
-				sids.push(row.sid)
-			})
-			this.queryParams.params.sids = sids
-			req
-				.exportExcel(this.queryParams.params)
-				.then(resp => {
-					if (resp.success) { 
-						var map = resp.data
-						const fileName = map.filename // 导出文件名
-						// // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
-						// // IE10以上支持blob但是依然不支持download
-						const link = document.createElement('a') // 创建a标签
-						link.download = fileName // a标签添加属性
-						link.style.display = 'none'
-						link.href = map.downurl
-						document.body.appendChild(link)
-						link.click() // 执行下载
-						URL.revokeObjectURL(link.href) // 释放url
-						document.body.removeChild(link) // 释放标签
-					}
-				})
-				.catch(() => {})
-		},
 		dosearch() {
 			this.queryParams.current = 1
 			this.loadList()
@@ -326,7 +267,14 @@ export default {
 		toInfo(row) {
 			this.$refs['divinfo'].showInfo(row)
 			this.viewState = 4
-		}
+		},
+		doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+        },
+	    purchase(row){
+			this.drawer=true
+		},
 	}
 }
 </script>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplanAdd.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplanAdd.vue
index 7392f8ad..28458fb1 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplanAdd.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplanAdd.vue
@@ -14,7 +14,8 @@
 		</div>
 		<!-- 标题按钮部分结束 -->
 		<!-- Start 新增修改部分 -->
-		<div class="listconadd">
+		<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" :inline="true"         label-position="right" class="demo-form-inline">
 				<div class="listtop">
@@ -25,93 +26,92 @@
 						<span><span class="icon">*</span>计划名称：</span>
 					</el-col>
 					<el-col :span="3" class="trightb">
-						<el-form-item prop="planname"><el-input v-model="formobj.planname" placeholder="计划名称" class="addinputw" clearable /></el-form-item>
+						<el-form-item prop="planname"><el-input size="small" v-model="formobj.planname" 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="4" class="trightb">
-						<el-form-item prop="custname"><el-input v-model="formobj.custname" placeholder="客户名称" class="addinputw" clearable /></el-form-item>
+					<el-col :span="3" class="trightb">
+						<el-form-item prop="custname"><el-input size="small" v-model="formobj.custname" 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="patroltype"><el-input v-model="formobj.patroltype" placeholder="巡视类型" 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="4" class="trightb">
-						<el-form-item prop="startdate"><el-input v-model="formobj.startdate" placeholder="计划开始日期" class="addinputw" clearable /></el-form-item>
+					<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-col>
-				</el-row>
-				<el-row>
 					<el-col :span="2" class="tleftb">
-						<span><span class="icon">*</span>计划编号：</span>
+						<span><span class="icon">*</span>巡视模板：</span>
 					</el-col>
-					<el-col :span="4" class="trightb">
-						<el-form-item prop="planno"><el-input v-model="formobj.planno" placeholder="计划编号" class="addinputw" clearable /></el-form-item>
+					<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-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="contactperson"><el-input v-model="formobj.contactperson" placeholder="联系人" 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="contactphone"><el-input v-model="formobj.contactphone" placeholder="用户联系人电话" 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="4" class="trightb">
-						<el-form-item prop="enddate"><el-input v-model="formobj.enddate" placeholder="计划结束日期" class="addinputw" clearable /></el-form-item>
+						<el-form-item prop="contactperson"><el-input  size="small"  v-model="formobj.contactperson" placeholder="联系人" class="addinputw" clearable /></el-form-item>
 					</el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="3" class="tleftb">
-						<span><span class="icon">*</span>巡视模板：</span>
+						<span><span class="icon">*</span>用户联系人电话：</span>
 					</el-col>
 					<el-col :span="3" class="trightb">
-						<el-form-item prop="templateid"><el-input v-model="formobj.templateid" placeholder="巡视模板" class="addinputw" clearable /></el-form-item>
+						<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="3" class="tleftb">
+					
+					<el-col :span="2" class="tleftb">
 						<span><span class="icon">*</span>周期类型：</span>
 					</el-col>
-					<el-col :span="3" class="trightb">
-						<el-form-item prop="cycletype"><el-input v-model="formobj.cycletype" placeholder="周期类型" class="addinputw" clearable /></el-form-item>
+					<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-col>
-					<el-col :span="3" class="tleftb">
+					<el-col :span="2" class="tleftb">
 						<span><span class="icon">*</span>巡检周期：</span>
 					</el-col>
-					<el-col :span="3" class="trightb">
-						<el-form-item prop="cycle"><el-input v-model="formobj.cycle" placeholder="巡检周期" class="addinputw" clearable /></el-form-item>
+					<el-col :span="2" class="trightb">
+						<el-form-item prop="cycle"><el-input size="small" v-model="formobj.cycle" placeholder="巡检周期" class="addinputw" clearable /></el-form-item>
 					</el-col>
-					<el-col :span="3" class="tleftb">
+					<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"><el-input size="small" v-model="formobj.cyclevalue" 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="cyclevalue"><el-input v-model="formobj.cyclevalue" placeholder="周期值" class="addinputw" clearable /></el-form-item>
+						<el-form-item prop="planno"><el-input size="small" v-model="formobj.planno" placeholder="计划编号" class="addinputw" clearable /></el-form-item>
 					</el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="3" class="tleftb">
-						<span><span class="icon">*</span>周期值：</span>
+						<span><span class="icon">*</span>计划开始日期：</span>
 					</el-col>
-					<el-col :span="3" class="trightb">
-						<el-form-item prop="cycletypekey"><el-input v-model="formobj.cycletypekey" placeholder="周期值" class="addinputw" clearable /></el-form-item>
+					<el-col :span="4" class="trightb">
+						<el-form-item prop="startdate">
+							<el-date-picker v-model="formobj.startdate" 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="enddate"><el-date-picker v-model="formobj.enddate" type="date" size="small" clearable value-format="yyyy-MM-dd" placeholder="计划开始日期" /></el-form-item>
 					</el-col>
 				</el-row>
 			</el-form>
+		</div>
 	    <div class="listtop">
 		  <div class="tit">巡视人员</div>
 		</div>
 		<div>
-            <el-table :data="formobj.workers" border style="width: 100%">
+            <el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%"
+			@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" />
@@ -122,17 +122,14 @@
 	    <div class="listtop">
 		  <div class="tit">任务模板</div>
 		</div>
-		<!-- <div>
-            <el-table v-loading="tableLoading2" :data="list2" border style="width: 100%;text-align: center;">
-              <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod2" align="center" />
-              <el-table-column prop="supplierName" label="供应商名称" align="center" />
-              <el-table-column prop="code" label="商品编码" width="120" align="center" />
-              <el-table-column prop="proName" label="商品名称" align="center" />
-              <el-table-column prop="number" label="单品数量" width="100" align="center" />
-              <el-table-column prop="orderAmount" label="订单商品价值" width="140" align="center" />
-              <el-table-column prop="actualArrivalNumber" label="实际到货数量" width="140" align="center" />
+		<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="c" label="巡视内容" align="center" />
             </el-table>
-        </div> -->
+        </div>
 		</div>
 		<!-- End 添加修改部分 -->
 	</div>
@@ -149,7 +146,7 @@ export default {
 			viewTitle: '',
 			searchxianshitit: '显示添加条件',
 			formobj: {
-				id: '',
+				id: '1',
 				sid: '',
 				planname: '', // 计划名称
 				custid: '', // 客户标识
@@ -165,8 +162,9 @@ export default {
 				cycletype: '', // 周期类型(固定间隔周期)
 				cycle: '', // 巡检周期
 				cyclevalue: '', // 周期值
-				workers:[
-				{
+				workers:[],
+			},
+			TabList:[{
 					principalname:'1',//巡视人名称
 					principalsid:'1',//巡视人sid
 					principalcontact:'1',//联系方式
@@ -174,9 +172,27 @@ export default {
 					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:'设备类型占位符_巡视标准占位符',
+				},
+			],
 			rules: {
 				planname: [{ required: true, message: '计划名称不能为空', trigger: 'blur' }], // 计划名称
 				custname: [{ required: true, message: '客户标识不能为空', trigger: 'blur' }], // 客户名称
@@ -237,12 +253,14 @@ export default {
 			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.sucess) {
+					if (resp.code==200) {
 						const vdata = resp.data
 						_this.formobj.id = vdata.id
 						_this.formobj.sid = vdata.sid // SID
@@ -290,7 +308,17 @@ export default {
 					return false
 				}
 			})
-		}
+		},
+		handleSelectionChange(val) {
+         this.formobj.workers = val;
+		 console.log(this.formobj);
+        },
+	     handleSelection(selection){
+		if (selection.length > 1){
+		  let del_row = selection.shift();
+          this.$refs.table.toggleRowSelection(del_row, false)
+	   	}
+	  }
 	}
 }
 </script>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchstandards/dispatchstandards.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchstandards/dispatchstandards.vue
index cef4d04c..da6d27f9 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchstandards/dispatchstandards.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchstandards/dispatchstandards.vue
@@ -1,27 +1,24 @@
 <template>
 	<div class="app-container">
 		<div v-show="viewState == 1">
-			<button-bar 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>
 							<div v-show="isSearchShow" class="search">
 					<el-form :inline="true" class="tab-header">
 						<el-form-item label="任务项名称"><el-input v-model="queryParams.params.taskname" placeholder="请输入任务项名称" clearable /></el-form-item>
 						<el-form-item label="任务项分类"><el-input v-model="queryParams.params.tasktype" placeholder="请输入任务项分类" clearable /></el-form-item>
-						<el-form-item label="任务描述"><el-input v-model="queryParams.params.taskdesc" placeholder="请输入任务描述" clearable /></el-form-item>
-						<el-form-item label="反馈形式（1选项 2图片 3文字）"><el-input v-model="queryParams.params.taskreturn" placeholder="请输入反馈形式（1选项 2图片 3文字）" clearable /></el-form-item>
-						<el-form-item label="任务项父级分类+"><el-input v-model="queryParams.params.tasktypeparent" placeholder="请输入任务项父级分类+" clearable /></el-form-item>
-						<el-divider />
 						<div class="btn" style="text-align: center;">
-							<el-button type="primary" @click="dosearch">查询</el-button>
-							<el-button type="primary" @click="resetQuery">重置</el-button>
+							<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>
 						</div>
 					</el-form>
 				</div>
 			</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 项目列表头部 -->
@@ -57,6 +54,7 @@
 				/>
 			</div>
 		</div>
+	</div>
 		<!-- End 查询和其列表部分 -->
 
 		<!-- 新增修改部分组件 -->
@@ -104,9 +102,29 @@ export default {
 				tasktypeparent: '' // 任务项父级分类+
 				}
 			},
-			multipleSelection: []
+			multipleSelection: [],
+			btnList: [
+            {
+                  type: 'primary',
+                  size: 'small',
+                  icon: 'plus',
+                  btnKey: 'toAdd',
+                  btnLabel: '新增'
+                },
+                {
+                  type: 'info',
+                  size: 'small',
+                  icon: 'cross',
+                  btnKey: 'doClose',
+                  btnLabel: '关闭'
+                }
+              ]
 		}
 	},
+	mounted() {
+      // 初始化按钮
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
 	created() {
 		this.loadList()
 	},
@@ -119,21 +137,9 @@ export default {
 				case 'toAdd':
 					this.toAdd()
 					break
-				case 'toEdit':
-					this.toEdit()
-					break
-				case 'doSubmit':
-					this.doSubmit()
-					break
-				case 'doDel':
-					this.doDel()
-					break
-				case 'doImport':
-					this.doImport()
-					break
-				case 'doExport':
-					this.doExport()
-					break
+			   case 'doClose': // 关闭
+                    this.doClose()
+                    break
 				default:
 					break
 			}
@@ -292,7 +298,11 @@ export default {
 		toInfo(row) {
 			this.$refs['divinfo'].showInfo(row)
 			this.viewState = 4
-		}
+		},
+		doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+        },
 	}
 }
 </script>
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchstandards/dispatchstandardsAdd.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchstandards/dispatchstandardsAdd.vue
index c879cbe4..7b1ae45c 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchstandards/dispatchstandardsAdd.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchstandards/dispatchstandardsAdd.vue
@@ -15,49 +15,38 @@
 		<!-- 标题按钮部分结束 -->
 		<!-- Start 新增修改部分 -->
 		<div class="listconadd">
-			<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
-				<div class="wlInfo"><span>(运维任务标准库)</span></div>
-				<el-row>
-					<el-col :span="4" class="tleftb">
-						<span><span class="icon">*</span>任务项名称</span>
-					</el-col>
-					<el-col :span="8" class="trightb">
-						<el-form-item prop="taskname"><el-input v-model="formobj.taskname" placeholder="任务项名称" class="addinputw" clearable /></el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="4" class="tleftb">
-						<span><span class="icon">*</span>任务项分类</span>
-					</el-col>
-					<el-col :span="8" class="trightb">
-						<el-form-item prop="tasktype"><el-input v-model="formobj.tasktype" placeholder="任务项分类" class="addinputw" clearable /></el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="4" class="tleftb">
-						<span><span class="icon">*</span>任务描述</span>
-					</el-col>
-					<el-col :span="8" class="trightb">
-						<el-form-item prop="taskdesc"><el-input v-model="formobj.taskdesc" placeholder="任务描述" class="addinputw" clearable /></el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="4" class="tleftb">
-						<span><span class="icon">*</span>反馈形式（1选项 2图片 3文字）</span>
-					</el-col>
-					<el-col :span="8" class="trightb">
-						<el-form-item prop="taskreturn"><el-input v-model="formobj.taskreturn" placeholder="反馈形式（1选项 2图片 3文字）" class="addinputw" clearable /></el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="4" class="tleftb">
-						<span><span class="icon">*</span>任务项父级分类+</span>
-					</el-col>
-					<el-col :span="8" class="trightb">
-						<el-form-item prop="tasktypeparent"><el-input v-model="formobj.tasktypeparent" placeholder="任务项父级分类+" class="addinputw" clearable /></el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
+			<el-form ref="form_obj">
+			<el-card class="box-card">
+			 <div class="wlInfo"><span>任务项信息</span></div>
+			  <div class="item">
+                <span class="item_text">任务项名称：</span>
+                <el-input v-model="formobj.taskname" placeholder="任务项名称" class="item_input" clearable />
+              </div>
+              <div class="item">
+                <span class="item_text">任务项分类：</span>
+                <el-input v-model="formobj.tasktype"  class="item_input"
+                 placeholder="任务项分类" />
+              </div>
+
+			  <div class="item">
+                <span class="item_text">反馈形式：</span>
+				<div class="item_input">
+					<template>
+                    <el-radio-group v-model="formobj.taskreturn">
+                      <el-radio :label="1">文字</el-radio>
+                      <el-radio :label="2">图片</el-radio>
+                      <el-radio :label="3">选项</el-radio>
+                    </el-radio-group>
+				</template>
+				</div>
+              </div>
+              <div class="item" style="height: 110px;">
+                <span class="item_text">任务描述：</span>
+                <el-input  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 6 }" v-model="formobj.taskdesc"  class="item_input" placeholder="任务描述" />
+              </div>
+			</el-card>
+		</el-form>
 		</div>
 		<!-- End 添加修改部分 -->
 	</div>
@@ -109,13 +98,13 @@ export default {
 			this.$nextTick(() => {
 				this.$refs['form_obj'].clearValidate()
 			})
-			this.viewTitle = '【新增】(运维任务标准库)'
+			this.viewTitle = '【新增】任务项'
 		},
 		showEdit(row) {
 			this.$nextTick(() => {
 				this.$refs['form_obj'].clearValidate()
 			})
-			this.viewTitle = '【修改】(运维任务标准库)'
+			this.viewTitle = '【修改】任务项'
 			const _this = this
 			req
 				.fetchBySid(row.sid)
@@ -139,31 +128,84 @@ export default {
 				})
 		},
 		saveOrUpdate() {
-			const _this = this
-			this.$refs['form_obj'].validate(valid => {
-				if (valid) {
-					this.submitdisabled = true
-					req
-						.saveOrUpdate(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
-				}
+			req
+			.saveOrUpdate(this.formobj)
+				.then(resp => {
+					if (resp.success) {
+						this.$message({ showClose: true, type: 'success', message: resp.msg })
+						this.handleReturn('true')
+					} else {
+						// 根据resp.code进行异常情况处理
+					}
+				})
+				.catch(() => {
 			})
 		}
 	}
 }
 </script>
 
-<style scoped></style>
+<style lang="scss">
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    min-width: 70%;
+    margin-top: 20px;
+    padding-bottom: 50px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        flex: 0.8;
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        flex: 4;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+      .item_left_input {
+        width: 20%;
+      }
+
+      .item_left_text {
+        height: 30px;
+        margin-left: 20px;
+        line-height: 30px;
+        color: #018AD2;
+        padding: 0px 15px;
+        border: 1.5px solid #018AD2;
+        border-radius: 5px;
+
+      }
+
+      .item_right {
+        flex: 1;
+        justify-items: center;
+
+        .item_right_list_text {
+          font-size: 16px;
+        }
+
+        .item_right_list_delect {
+          color: #5E94FF;
+          margin-left: 20px;
+          font-size: 16px;
+          text-decoration: underline;
+        }
+      }
+
+    }
+
+  }
+</style>