diff --git a/src/api/modules/process.js b/src/api/modules/process.js
index 84c010f..9412cc5 100644
--- a/src/api/modules/process.js
+++ b/src/api/modules/process.js
@@ -20,7 +20,7 @@ export default {
   //部署接口
   deploy (data) {
     return request({
-      url: '/api/lawss/activiti/get_list_by_instance',
+      url: '/api/deploy',
       method: 'get',
       params: data
     })
@@ -28,9 +28,9 @@ export default {
   //获取流程配置列表
   getModelListPage (data){
     return request({
-      url: '/api/modelList',
+      url: '/api/modelListPage',
       method: 'get',
-      data: data
+      params: data
     })
   },
   //新增模板
@@ -40,6 +40,14 @@ export default {
       method: 'get',
       data: data
     })
-  }
+  },
+  //删除模板
+  deleteModel (data){
+    return request({
+      url: '/api/deleteModel',
+      method: 'get',
+      params: data
+    })
+  },
 
 }
diff --git a/src/store/index.js b/src/store/index.js
index 8074c0e..0cb18ac 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -15,7 +15,8 @@ export default new Vuex.Store({
   },
   getters: {
     menuData: (state) => state.menuData,
-    menuName: (state) => state.menuName
+    menuName: (state) => state.menuName,
+    userInfo: (state) => state.userInfo,
   },
   mutations: {
     saveUserInfo (state, data) {
diff --git a/src/utils/date.js b/src/utils/date.js
index 463ce10..a9390ae 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -28,7 +28,9 @@ export function formatDate (value, fmt) {
     }
     return fmt
   } else {
+    console.log(typeof value)
     value = value.trim()
+    value = value.replace('T', ' ')
     return value.substr(0, fmt.length)
   }
 }
diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue
index 051655a..7a59bc2 100644
--- a/src/views/userCenter/processCenter/finishProcess.vue
+++ b/src/views/userCenter/processCenter/finishProcess.vue
@@ -4,21 +4,21 @@
         <vxe-table  ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
           <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
             <template #default="{ row, rowIndex }">
-              {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
+              {{ rowIndex + (q.current - 1) * q.size + 1 }}
             </template>
           </vxe-column>
           <vxe-column show-overflow show-header-overflow field="prcNum"
                       title="流程编号"></vxe-column>
           <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="labelOneName"
+          <vxe-column show-overflow show-header-overflow field="creatUser"
                       title="发起人"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="name" title="当前处理人"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="labelOneName"
+          <vxe-column show-overflow show-header-overflow field="taskAssignee" title="当前处理人"></vxe-column>
+          <vxe-column show-overflow show-header-overflow field="taskBackAssignee"
                       title="上一处理人"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="name" title="创建时间"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="labelOneName"
+          <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
+          <vxe-column show-overflow show-header-overflow field="overTime"
                       title="完成时间"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="name" title="状态"></vxe-column>
+          <vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
           <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
             <template #default="{ row }">
               <el-button @click.native.prevent="view(scope.$index, tableData)" type="text" size="small">
@@ -27,8 +27,8 @@
             </template>
           </vxe-column>
         </vxe-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo"
-                       :page-sizes="[5, 10, 20]" :page-size="q.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
+                       :page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
                        :total="total" />
       </div>
     </div>
@@ -42,8 +42,8 @@ export default {
     data() {
         return {
           q:{
-            pageNo:1,
-            pageSize:10
+            current:1,
+            size:10
           },
           total: 0,
           tableData: []
@@ -61,20 +61,21 @@ export default {
       },
     methods: {
       loadData() {
-          this.$api.processCenter.finishProcessPage({...this.q,...this.searchForm}).then(res=>{
-              this.tableData = res.data.list
-              this.total = res.count
-          })
+        let userId=this.$store.getters.userInfo.usid
+        this.$api.processCenter.finishProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{
+            this.tableData = res.data.list
+            this.total = res.data.count
+        })
       },
       // 单页数据量
       handleSizeChange(val) {
-        this.q.pageSize = val;
-        this.q.pageNo = 1;
+        this.q.size = val;
+        this.q.current = 1;
         this.loadData();
       },
       // 第几页
       handleCurrentChange(val) {
-        this.q.pageNo = val;
+        this.q.current = val;
         this.loadData();
       },
       view() {
diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue
index 9c83da5..5c20619 100644
--- a/src/views/userCenter/processCenter/gencyProcess.vue
+++ b/src/views/userCenter/processCenter/gencyProcess.vue
@@ -4,15 +4,15 @@
       <vxe-table  ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
         <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
           <template #default="{ row, rowIndex }">
-            {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
+            {{ rowIndex + (q.current - 1) * q.size + 1 }}
           </template>
         </vxe-column>
         <vxe-column show-overflow show-header-overflow field="prcNum"
                     title="流程编号"></vxe-column>
         <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称"></vxe-column>
-        <vxe-column show-overflow show-header-overflow field="labelOneName"
+        <vxe-column show-overflow show-header-overflow field="creatUserName"
                     title="发起人"></vxe-column>
-        <vxe-column show-overflow show-header-overflow field="name" title="创建时间"></vxe-column>
+        <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
         <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
           <template #default="{ row }">
             <el-button @click.native.prevent="handle(scope.$index, tableData)" type="text" size="small">
@@ -21,8 +21,8 @@
           </template>
         </vxe-column>
       </vxe-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo"
-                     :page-sizes="[5, 10, 20]" :page-size="q.pageSize" layout="total, sizes, prev, pager, next, jumper"
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
+                     :page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
                      :total="total" />
     </div>
   </div>
@@ -36,8 +36,8 @@ export default {
   data() {
     return {
       q:{
-        pageNo:1,
-        pageSize:10
+        current:1,
+        size:10
       },
       total: 0,
       tableData: []
@@ -58,20 +58,21 @@ export default {
     },
     methods: {
       loadData() {
-        this.$api.processCenter.gencyProcessPage({...this.q,...this.searchForm}).then(res=>{
+        let userId=this.$store.getters.userInfo.usid
+        this.$api.processCenter.gencyProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{
           this.tableData = res.data.list
-          this.total = res.count
+          this.total = res.data.count
         })
       },
     // 单页数据量
     handleSizeChange(val) {
-      this.q.pageSize = val;
-      this.q.pageNo = 1;
+      this.q.size = val;
+      this.q.current = 1;
       this.loadData();
     },
     // 第几页
     handleCurrentChange(val) {
-      this.q.pageNo = val;
+      this.q.current = val;
       this.loadData();
     },
     handle() {
diff --git a/src/views/userCenter/processCenter/monitorProcesses.vue b/src/views/userCenter/processCenter/monitorProcesses.vue
index 680c68a..d698825 100644
--- a/src/views/userCenter/processCenter/monitorProcesses.vue
+++ b/src/views/userCenter/processCenter/monitorProcesses.vue
@@ -4,7 +4,7 @@
         <vxe-table  ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 380px)'">
           <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
             <template #default="{ row, rowIndex }">
-              {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
+              {{ rowIndex + (q.current - 1) * q.size + 1 }}
             </template>
           </vxe-column>
           <vxe-column show-overflow show-header-overflow field="prcNum"
@@ -12,13 +12,13 @@
           <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称"></vxe-column>
           <vxe-column show-overflow show-header-overflow field="labelOneName"
                       title="发起人"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="name" title="当前处理人"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="labelOneName"
+          <vxe-column show-overflow show-header-overflow field="taskAssignee" title="当前处理人"></vxe-column>
+          <vxe-column show-overflow show-header-overflow field="taskBackAssignee"
                       title="上一处理人"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="name" title="创建时间"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="labelOneName"
+          <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
+          <vxe-column show-overflow show-header-overflow field="overTime"
                       title="完成时间"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="name" title="状态"></vxe-column>
+          <vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
           <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
             <template #default="{ row }">
               <el-button @click.native.prevent="view(row, tableData)" type="text" size="small">
@@ -27,8 +27,8 @@
             </template>
           </vxe-column>
         </vxe-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo"
-                       :page-sizes="[5, 10, 20]" :page-size="q.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
+                       :page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
                        :total="total" />
       </div>
 
@@ -42,8 +42,8 @@ export default {
     data() {
         return {
           q:{
-            pageNo:1,
-            pageSize:10
+            current:1,
+            size:10
           },
           total: 0,
           tableData: []
@@ -61,20 +61,21 @@ export default {
     },
     methods: {
       loadData() {
-        this.$api.processCenter.monitorProcessesPage({...this.q,...this.searchForm}).then(res=>{
+        let userId=this.$store.getters.userInfo.usid
+        this.$api.processCenter.monitorProcessesPage({...this.q,...this.searchForm,userId:userId}).then(res=>{
           this.tableData = res.data.list
-          this.total = res.count
+          this.total = res.data.count
         })
       },
       // 单页数据量
       handleSizeChange(val) {
-        this.q.pageSize = val;
-        this.q.pageNo = 1;
+        this.q.size = val;
+        this.q.current = 1;
         this.loadData();
       },
       // 第几页
       handleCurrentChange(val) {
-        this.q.pageNo = val;
+        this.q.current = val;
         this.loadData();
       },
         view() {
diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue
index 0e516a2..0812b9a 100644
--- a/src/views/userCenter/processCenter/sentProcess.vue
+++ b/src/views/userCenter/processCenter/sentProcess.vue
@@ -5,7 +5,7 @@
                  v-table-min-height="'calc(100vh - 380px)'">
         <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
           <template #default="{ row, rowIndex }">
-            {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
+            {{ rowIndex + (q.current - 1) * q.size + 1 }}
           </template>
         </vxe-column>
         <vxe-column show-overflow show-header-overflow field="prcNum"
@@ -17,9 +17,9 @@
         <vxe-column show-overflow show-header-overflow field="taskBackAssignee"
                     title="上一处理人"></vxe-column>
         <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
-        <vxe-column show-overflow show-header-overflow field="endTime"
+        <vxe-column show-overflow show-header-overflow field="overTime"
                     title="完成时间"></vxe-column>
-        <vxe-column show-overflow show-header-overflow field="isEnd" title="状态"></vxe-column>
+        <vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
         <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
           <template #default="{ row,index }">
             <el-button type="text" size="small">
@@ -31,8 +31,8 @@
           </template>
         </vxe-column>
       </vxe-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo"
-                     :page-sizes="[5, 10, 20]" :page-size="q.pageSize" layout="total, sizes, prev, pager, next, jumper"
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.current"
+                     :page-sizes="[5, 10, 20]" :page-size="q.size" layout="total, sizes, prev, pager, next, jumper"
                      :total="total"/>
     </div>
 
@@ -49,8 +49,8 @@ export default {
       color: 'rgb(236, 128, 141)',
       icolor: 'rgb(119,136,153)',
       q: {
-        pageNo: 1,
-        pageSize: 10
+        current: 1,
+        size: 10
       },
       total: 0,
       tableData: []
@@ -68,20 +68,21 @@ export default {
   },
   methods: {
     loadData() {
-      this.$api.processCenter.sentProcessPage({...this.q,...this.searchForm}).then(res=>{
+      let userId=this.$store.getters.userInfo.usid
+      this.$api.processCenter.sentProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{
         this.tableData = res.data.list
-        this.total = res.count
+        this.total = res.data.count
       })
     },
     // 单页数据量
     handleSizeChange(val) {
-      this.q.pageSize = val;
-      this.q.pageNo = 1;
+      this.q.size = val;
+      this.q.current = 1;
       this.loadData();
     },
     // 第几页
     handleCurrentChange(val) {
-      this.q.pageNo = val;
+      this.q.current = val;
       this.loadData();
     },
     view() {
diff --git a/src/views/userCenter/processConfig/ProcessMapping.vue b/src/views/userCenter/processConfig/ProcessMapping.vue
index d509c6a..83f8461 100644
--- a/src/views/userCenter/processConfig/ProcessMapping.vue
+++ b/src/views/userCenter/processConfig/ProcessMapping.vue
@@ -17,7 +17,7 @@
             return {
                 modelId : '',
                 name: '',
-                actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId='
+                actUrl: 'http://10.0.10.87:7060/bat-wkflow/modeler.html?modelId='
             }
         },
         created() {
diff --git a/src/views/userCenter/processConfig/index.vue b/src/views/userCenter/processConfig/index.vue
index 45942d6..a972c4c 100644
--- a/src/views/userCenter/processConfig/index.vue
+++ b/src/views/userCenter/processConfig/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="content-height configBox">
     <div class="title">
-      <span>报告管理</span>
+      <span>流程配置</span>
     </div>
     <div class="search">
       <el-row>
@@ -29,12 +29,17 @@
     <div class="table">
       <vxe-table  ref="xTable" :data="tableList" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 320px)'">
         <vxe-column show-overflow show-header-overflow field="name" title="流程名称"></vxe-column>
-        <vxe-column show-overflow show-header-overflow field="categoryName" title="流程类型"></vxe-column>
-        <vxe-column show-overflow show-header-overflow field="createTime" title="创建时间"></vxe-column>
-        <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
+<!--        <vxe-column show-overflow show-header-overflow field="categoryName" title="流程类型"></vxe-column>-->
+        <vxe-column show-overflow show-header-overflow field="createTime" title="创建时间">
+          <template #default="{ row }">
+              {{row.createTime?formatDate(row.createTime,"yyyy-mm-dd HH:mm:ss"):''}}
+          </template>
+        </vxe-column>
+        <vxe-column show-overflow show-header-overflow title="操作" width="250" fixed="right">
           <template #default="{ row }">
               <el-button type="text" @click="editRow(row)">编辑</el-button>
-             <el-button type="text" @click="deploy(row)">部署</el-button>
+              <el-button type="text" @click="deploy(row)">部署</el-button>
+              <el-button type="text" @click="deleteRow(row)">删除</el-button>
           </template>
         </vxe-column>
       </vxe-table>
@@ -89,12 +94,13 @@
 
 <script>
 import EditProcess from './components/EditProcess'
-
+import { formatDate } from '@/utils/date'
 export default {
   name: 'ProcessClassification',
   components: { EditProcess },
   data () {
     return {
+      formatDate,
       formData: {
         name: '',
         desc: ''
@@ -112,7 +118,24 @@ export default {
       title: '添加流程'
     }
   },
+  created() {
+    this.queryTablePage()
+  },
   methods: {
+    deleteRow(row) {
+      this.$confirm('确认删除该条数据？', '删除', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        confirmButtonClass: 'common-button-primary',
+
+        type: 'warning'
+      }).then(() => {
+        this.$api.process.deleteModel({modelId: row.id}).then(res => {
+          this.$message.success(res.data.message)
+          this.queryTablePage()
+        })
+      })
+    },
     handleCurrentChange(page) {
       this.q.current = page
       this.queryTablePage()
@@ -148,11 +171,11 @@ export default {
     },
     queryTablePage() {
       this.$api.process.getModelListPage({...this.q,...this.searchForm}).then(res=>{
-        this.tableList = res.result.records
-        this.total = res.result.total
+        this.tableList = res.data.result.records
+        this.total = res.data.result.total
+
       }).catch(err=>{
-        console.log("dddddddddddddddd")
-        this.tableList =[ {name:1}]
+
       })
 
     },
@@ -165,7 +188,7 @@ export default {
     },
     confirmDialog() {
       this.$api.process.addModel(this.formData).then(res=> {
-        this.$message.success(res.message)
+        this.$message.success("新增成功")
         this.visible = false
         this.queryTablePage()
       })