首页跳转路径异常问题修复，我的收藏组件数据显示bug修复

src/router/routes.js

@@ -13,7 +13,6 @@ const frameIn = [
         redirect: { name: 'dashboard' },
         component: layoutHeaderAside,
         children: [
-
             // 首页
             {
                 path: 'dashboard',
@@ -75,6 +74,15 @@ const frameIn = [
                 hidden: true,
                 component: _import('/system/function/redirect')
             },
+            {
+                path: '/notice',
+                name: 'notice',
+                meta: {
+                    title: '公告管理',
+                    auth: true
+                },
+                component: _import('/platform/system/news/list')
+            },
             {
                 path: '/message',
                 name: 'message',
@@ -83,6 +91,151 @@ const frameIn = [
                     auth: true
                 },
                 component: _import('/platform/message/inner/receive')
+            },
+            {
+                path: '/receiveMessage',
+                name: 'receiveMessage',
+                meta: {
+                    title: '未读消息',
+                    auth: true
+                },
+                component: _import('/platform/message/inner/receive')
+            },
+            // 办公管理
+            {
+                path: 'myFavorites',
+                name: 'myFavorites',
+                meta: {
+                    title: '我的收藏',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmInitiatedProcess/favorites')
+            },
+            {
+                path: 'myCompleted',
+                name: 'myCompleted',
+                meta: {
+                    title: '我的办结',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmInitiatedProcess/myCompleted')
+            },
+            {
+                path: 'myDrafts',
+                name: 'myDrafts',
+                meta: {
+                    title: '我的暂存',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmInitiatedProcess/myDraft')
+            },
+            {
+                path: 'myRequest',
+                name: 'myRequest',
+                meta: {
+                    title: '我的请求',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmInitiatedProcess/myRequest')
+            },
+            {
+                path: 'newProcess',
+                name: 'newProcess',
+                meta: {
+                    title: '新建流程',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmInitiatedProcess/newProcess')
+            },
+            {
+                path: 'delegateMatters',
+                name: 'delegateMatters',
+                meta: {
+                    title: '转办代理',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmReceivedProcess/pendingManage/delegateMatters')
+            },
+            {
+                path: 'pendingMatters',
+                name: 'pendingMatters',
+                meta: {
+                    title: '待办事宜',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmReceivedProcess/pendingManage/pending')
+            },
+            {
+                path: 'pendingYuan',
+                name: 'pendingYuan',
+                meta: {
+                    title: '原待办',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmReceivedProcess/pendingManage/pendingYuan')
+            },
+            {
+                path: 'transferOffice',
+                name: 'transferOffice',
+                meta: {
+                    title: '转办事宜',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmReceivedProcess/pendingManage/transferOffice')
+            },
+            {
+                path: 'completedMatters',
+                name: 'completedMatters',
+                meta: {
+                    title: '办结事宜',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmReceivedProcess/completed')
+            },
+            {
+                path: 'handledTasks',
+                name: 'handledTasks',
+                meta: {
+                    title: '已办事宜',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmReceivedProcess/handled')
+            },
+            {
+                path: 'pending',
+                name: 'pending',
+                meta: {
+                    title: '待办',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmReceivedProcess/pending')
+            },
+            {
+                path: 'revoke',
+                name: 'revoke',
+                meta: {
+                    title: '废除',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmReceivedProcess/revoke')
+            },
+            {
+                path: 'handled1',
+                name: 'handled1',
+                meta: {
+                    title: '已办1',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmReceivedTask/handled')
+            },
+            {
+                path: 'handled2',
+                name: 'handled2',
+                meta: {
+                    title: '已办2',
+                    auth: true
+                },
+                component: _import('/platform/office/bpmReceivedTask/handled2')
             }
         ]
     }
@@ -184,12 +337,12 @@ const frameOut = [
         component: _import('/system/iframe')
     },
     {
-      path: '/sealCompleted',
-      name: 'sealCompleted',
-      meta: {
-        title: 'sealCompleted'
-      },
-      component: _import('/remindPage/sealCompleted')
+        path: '/sealCompleted',
+        name: 'sealCompleted',
+        meta: {
+            title: 'sealCompleted'
+        },
+        component: _import('/remindPage/sealCompleted')
     }
 ]
 
@@ -205,7 +358,7 @@ const ziliao = [
             title: ' 医学实验室标准化智慧管理平台'
         },
         // component: _import('/system/ziliao'),
-        component: _import('/component/ziliao'),
+        component: _import('/component/ziliao')
         // requireAuth: false
     }
 ]

src/router/utils.js

@@ -6,16 +6,16 @@ const meta = { auth: true }
 /**
  * 动态布局
  */
-function getLayout() {
-  return layoutHeaderAside
+function getLayout () {
+    return layoutHeaderAside
 }
 /**
  * 错误页面
  */
 const errorPage = {
-  path: '*',
-  redirect: '/404',
-  hidden: true
+    path: '*',
+    redirect: '/404',
+    hidden: true
 }
 const errorUrl = '/system/error/404'
 
@@ -31,126 +31,126 @@ const defaultRouterAlias = '/router-alias/'
 
 // 异步挂载的路由
 // 动态需要根据权限加载的路由表 该路由表通过后台获取
-export function generateRoutes(menus) {
-  const asyncRouterMap = []
-  for (const menu of menus) {
-    asyncRouterMap.push(generateTopRoute(menu))
-  }
-  asyncRouterMap.push(errorPage)
-  return asyncRouterMap
+export function generateRoutes (menus) {
+    const asyncRouterMap = []
+    for (const menu of menus) {
+        asyncRouterMap.push(generateTopRoute(menu))
+    }
+    asyncRouterMap.push(errorPage)
+    return asyncRouterMap
 }
 
 /**
  * 构建第一级路由
  * @param {*} menu
  */
-function generateTopRoute(menu) {
-  const router = {
-    id: menu[idKey],
-    parentId: menu[parentIdKey],
-    path: '/' + menu[nameKey],
-    alias: defaultRouterAlias + menu[nameKey],
-    name: menu[nameKey],
-    component: getLayout(menu[layoutKey]),
-    meta: {
-      title: menu[labelKey],
-      icon: menu[iconKey] || 'file-o',
-      name: menu[nameKey],
-      defaultUrl: menu[urlKey],
-      ...meta
-    }
-  }
-  if (menu[childrenKey] && menu[childrenKey].length > 0) {
-    router.children = generateSubRoutes(menu[childrenKey])
-  } else { // 添加顶部默认节点
-    router.children = [{
-      id: menu[idKey],
-      parentId: menu[parentIdKey],
-      path: 'index',
-      name: menu[nameKey] + 'index',
-      alias: defaultRouterAlias + menu[nameKey],
-      component: getComputedUrl(menu[urlKey]),
-      meta: {
-        title: menu[labelKey],
-        icon: menu[iconKey] || 'file-o',
+function generateTopRoute (menu) {
+    const router = {
+        id: menu[idKey],
+        parentId: menu[parentIdKey],
+        path: '/' + menu[nameKey],
+        alias: defaultRouterAlias + menu[nameKey],
         name: menu[nameKey],
-        defaultUrl: menu[urlKey],
-        ...meta
-      }
-    }]
-  }
-  return router
+        component: getLayout(menu[layoutKey]),
+        meta: {
+            title: menu[labelKey],
+            icon: menu[iconKey] || 'file-o',
+            name: menu[nameKey],
+            defaultUrl: menu[urlKey],
+            ...meta
+        }
+    }
+    if (menu[childrenKey] && menu[childrenKey].length > 0) {
+        router.children = generateSubRoutes(menu[childrenKey])
+    } else { // 添加顶部默认节点
+        router.children = [{
+            id: menu[idKey],
+            parentId: menu[parentIdKey],
+            path: 'index',
+            name: menu[nameKey] + 'index',
+            alias: defaultRouterAlias + menu[nameKey],
+            component: getComputedUrl(menu[urlKey]),
+            meta: {
+                title: menu[labelKey],
+                icon: menu[iconKey] || 'file-o',
+                name: menu[nameKey],
+                defaultUrl: menu[urlKey],
+                ...meta
+            }
+        }]
+    }
+    return router
 }
 
 /**
  * 构建子路由
  * @param {*} menus
  */
-function generateSubRoutes(menus) {
-  const pool = []
-  const push = function(menus, namePrefix = []) {
-    menus.forEach(menu => {
-      const router = {
-        id: menu[idKey],
-        parentId: menu[parentIdKey],
-        path: [...namePrefix, menu[nameKey]].join('/'),
-        name: [...namePrefix, menu[nameKey]].join('-'),
-        alias: defaultRouterAlias + menu[nameKey],
-        component: getComputedUrl(menu[urlKey]),
-        meta: {
-          title: menu[labelKey],
-          icon: menu[iconKey] || 'file-o',
-          name: menu[nameKey],
-          defaultUrl: menu[urlKey],
-          ...meta
-        }
-      }
+function generateSubRoutes (menus) {
+    const pool = []
+    const push = function (menus, namePrefix = []) {
+        menus.forEach(menu => {
+            const router = {
+                id: menu[idKey],
+                parentId: menu[parentIdKey],
+                path: [...namePrefix, menu[nameKey]].join('/'),
+                name: [...namePrefix, menu[nameKey]].join('-'),
+                alias: defaultRouterAlias + menu[nameKey],
+                component: getComputedUrl(menu[urlKey]),
+                meta: {
+                    title: menu[labelKey],
+                    icon: menu[iconKey] || 'file-o',
+                    name: menu[nameKey],
+                    defaultUrl: menu[urlKey],
+                    ...meta
+                }
+            }
 
-      if (menu[childrenKey] && menu[childrenKey].length > 0) {
-        push(menu[childrenKey], [...namePrefix, menu[nameKey]])
-      } else {
-        pool.push({
-          ...router
+            if (menu[childrenKey] && menu[childrenKey].length > 0) {
+                push(menu[childrenKey], [...namePrefix, menu[nameKey]])
+            } else {
+                pool.push({
+                    ...router
+                })
+            }
         })
-      }
-    })
-  }
-  push(menus)
-  return pool
+    }
+    push(menus)
+    return pool
 }
 
 /**
  * 是否是iframe
  * @param {*} url
  */
-function isHttp(url) {
-  if (url === null || url === undefined || url === '') return false
-  return !!(url.indexOf('http') !== -1 || url.indexOf('https') !== -1)
+function isHttp (url) {
+    if (url === null || url === undefined || url === '') return false
+    return !!(url.indexOf('http') !== -1 || url.indexOf('https') !== -1)
 }
 /**
  * 获取 组件url
  * @param {*} menu
  */
-function getComputedUrl(url) {
-  if (!url) return _import(errorUrl)
-  try {
-    if (isHttp(url)) {
-      return _import('/system/iframe/index')
-    } else if (url.indexOf('/d/') > -1) { // 数据模版
-      return _import('/platform/data/dataTemplate/template-list')
-    } else {
-      return _import(convertUrl(url)) || _import(errorUrl)
-    }
-  } catch (error) {
+function getComputedUrl (url) {
+    if (!url) return _import(errorUrl)
+    try {
+        if (isHttp(url)) {
+            return _import('/system/iframe/index')
+        } else if (url.indexOf('/d/') > -1) { // 数据模版
+            return _import('/platform/data/dataTemplate/template-list')
+        } else {
+            return _import(convertUrl(url)) || _import(errorUrl)
+        }
+    } catch (error) {
     // console.warn(error)
-    return _import(errorUrl)
-  }
+        return _import(errorUrl)
+    }
 }
 /**
  * 转换url 避免多余‘/’
  * @param {*} url
  */
-function convertUrl(url) {
-  const newUrl = '/' + url
-  return newUrl === '/' ? '/' : newUrl.replace(/\/\//g, '/').replace(/\/$/, '')
+function convertUrl (url) {
+    const newUrl = '/' + url
+    return newUrl === '/' ? '/' : newUrl.replace(/\/\//g, '/').replace(/\/$/, '')
 }

src/views/platform/office/bpmInitiatedProcess/newProcess.vue

@@ -1,115 +1,112 @@
 <template>
-<ibps-layout ref="layout">
-    <div slot="west">
-      <ibps-type-tree
-        :width="width"
-        :height="height"
-        title="流程分类"
-        category-key="FLOW_TYPE"
-        @node-click="handleNodeClick"
-        @expand-collapse="handleExpandCollapse"
-      />
-    </div>
-    <ibps-crud
-      ref="crud"
-      :height="height"
-      :data="listData"
-      :toolbars="listConfig.toolbars"
-      :search-form="listConfig.searchForm"
-      :pk-key="pkKey"
-      :columns="listConfig.columns"
-      :pagination="pagination"
-      :loading="loading"
-      :index-row="false"
-      @action-event="handleAction"
-      @sort-change="handleSortChange"
-      @column-link-click="handleLinkClick"
-      @pagination-change="handlePaginationChange"
-    >
-      <template slot="favoritesIcon" slot-scope="scope">
-        <el-tooltip v-if="scope.row.favorites" class="item" effect="dark" content="已收藏" placement="bottom">
-          <i class="ibps-icon-star" style="margin-left:7px;" @click="handleTips(scope.row.favorites,scope.row.id)" />
-        </el-tooltip>
-        <el-tooltip v-else class="item" effect="dark" content="未收藏" placement="bottom">
-          <i class="ibps-icon-star-o" style="margin-left:7px;" @click="handleTips(scope.row.favorites,scope.row.id)" />
-        </el-tooltip>
-      </template>
-      <template slot="statusCloum" slot-scope="scope">
-        <el-tag>{{ scope.row.status|optionsFilter(statusOptions,'value','key') }}</el-tag>
-      </template>
-    </ibps-crud>
-    <bpmn-formrender
-      :visible="dialogFormVisible"
-      :def-id="defId"
-      @callback="search"
-      @close="visible => dialogFormVisible = visible"
-  />
-  </ibps-layout>
- <!-- <div>
     <ibps-layout ref="layout">
-     <div slot="west">
-        <ibps-type-tree
-          :width="width"
-          :height="height"
-          title="任务分类"
-          category-key="FLOW_TYPE"
-          @node-click="handleNodeClick"
-          @expand-collapse="handleExpandCollapse"
+        <div slot="west">
+            <ibps-type-tree
+                :width="width"
+                :height="height"
+                title="流程分类"
+                category-key="FLOW_TYPE"
+                @node-click="handleNodeClick"
+                @expand-collapse="handleExpandCollapse"
+            />
+        </div>
+        <ibps-crud
+            ref="crud"
+            :height="height"
+            :data="listData"
+            :toolbars="listConfig.toolbars"
+            :search-form="listConfig.searchForm"
+            :pk-key="pkKey"
+            :columns="listConfig.columns"
+            :pagination="pagination"
+            :loading="loading"
+            :index-row="false"
+            @action-event="handleAction"
+            @sort-change="handleSortChange"
+            @column-link-click="handleLinkClick"
+            @pagination-change="handlePaginationChange"
+        >
+            <template slot="favoritesIcon" slot-scope="scope">
+                <el-tooltip v-if="scope.row.favorites" class="item" effect="dark" content="已收藏" placement="bottom">
+                    <i class="ibps-icon-star" style="margin-left:7px;" @click="handleTips(scope.row.favorites,scope.row.id)" />
+                </el-tooltip>
+                <el-tooltip v-else class="item" effect="dark" content="未收藏" placement="bottom">
+                    <i class="ibps-icon-star-o" style="margin-left:7px;" @click="handleTips(scope.row.favorites,scope.row.id)" />
+                </el-tooltip>
+            </template>
+            <template slot="statusCloum" slot-scope="scope">
+                <el-tag>{{ scope.row.status|optionsFilter(statusOptions,'value','key') }}</el-tag>
+            </template>
+        </ibps-crud>
+        <bpmn-formrender
+            :visible="dialogFormVisible"
+            :def-id="defId"
+            @callback="search"
+            @close="visible => dialogFormVisible = visible"
         />
-    </div>
-    <ibps-card-list
-      ref="crud"
-      :title="title"
-      :height="height"
-      :data="listData"
-      :pagination="pagination"
-      :pk-key="pkKey"
-      :toolbars="listConfig.toolbars"
-      :search-form="listConfig.searchForm"
-      :columns="listConfig.columns"
-      :loading="loading"
-      :index-row="false"
-      @action-event="handleAction"
-      @sort-change="handleSortChange"
-      @pagination-change="handlePaginationChange"
-    >
-      <template slot="item-symbol">
-        <p style="width:60px;height:60px;border: 2px solid #409eff;border-radius: 100%;font-size: 48px;color:#409eff;font-size:30px;line-height: 60px;">启动</p>
-      </template>
+    </ibps-layout>
+    <!-- <div>
+        <ibps-layout ref="layout">
+            <div slot="west">
+                <ibps-type-tree
+                    :width="width"
+                    :height="height"
+                    title="任务分类"
+                    category-key="FLOW_TYPE"
+                    @node-click="handleNodeClick"
+                    @expand-collapse="handleExpandCollapse"
+                />
+            </div>
+            <ibps-card-list
+                ref="crud"
+                :title="title"
+                :height="height"
+                :data="listData"
+                :pagination="pagination"
+                :pk-key="pkKey"
+                :toolbars="listConfig.toolbars"
+                :search-form="listConfig.searchForm"
+                :columns="listConfig.columns"
+                :loading="loading"
+                :index-row="false"
+                @action-event="handleAction"
+                @sort-change="handleSortChange"
+                @pagination-change="handlePaginationChange"
+            >
+                <template slot="item-symbol">
+                    <p style="width:60px;height:60px;border: 2px solid #409eff;border-radius: 100%;font-size: 48px;color:#409eff;font-size:30px;line-height: 60px;">启动</p>
+                </template>
+                <template slot="item-detail-name">
+                    <span />
+                </template>
+                <template slot="item-detail-partyTypeName">
+                    <span />
+                </template>
+                <template slot="item-detail-createTime">
+                    <span />
+                </template>
+                <template slot="item-detail-taskName">
+                    <span />
+                </template>
+                <template slot="item-detail-completeTime">
+                    <span />
+                </template>
+                <template slot="item-detail-curNode">
+                    <span />
+                </template>
+                <template slot="item-detail-status">
+                    <span />
+                </template>
 
-
-      <template slot="item-detail-name">
-          <span></span>
-      </template>
-      <template slot="item-detail-partyTypeName">
-        <span></span>
-      </template>
-      <template slot="item-detail-createTime">
-        <span></span>
-      </template>
-      <template slot="item-detail-taskName">
-        <span></span>
-      </template>
-      <template slot="item-detail-completeTime">
-        <span></span>
-      </template>
-      <template slot="item-detail-curNode">
-        <span></span>
-      </template>
-      <template slot="item-detail-status">
-        <span></span>
-      </template>
-
-
-    </ibps-card-list>
-    <bpmn-formrender
-      :visible="dialogFormVisible"
-      :def-id="defId"
-      @callback="search"
-      @close="visible => dialogFormVisible = visible"
-    />
-   </ibps-layout>
-  </div> -->
+            </ibps-card-list>
+            <bpmn-formrender
+                :visible="dialogFormVisible"
+                :def-id="defId"
+                @callback="search"
+                @close="visible => dialogFormVisible = visible"
+            />
+        </ibps-layout>
+    </div> -->
 </template>
 <script>
 import { newProcess, saveFavorites, removeFavorites } from '@/api/platform/office/bpmInitiated'
@@ -120,224 +117,224 @@ import IbpsTypeTree from '@/business/platform/cat/type/tree'
 import BpmnFormrender from '@/business/platform/bpmn/form/dialog'
 
 export default {
-  components: {
-    IbpsTypeTree,
-    BpmnFormrender,
-    'ibps-type-tree': () => import('@/business/platform/cat/type/tree'),
-    'ibps-card-list': () => import('@/components/ibps-card-list/list'),
-    'form-builder': () => import('@/business/platform/form/formbuilder/dialog'),
-    'formrender-preview': () => import('@/business/platform/form/formrender/preview/index')
-  },
-  mixins: [FixHeight],
-  data() {
-    return {
-      width: 220,
-      height: 500,
-      title: '启动工作流程',
-      createText: '创建表单',
-      query: '',
-      typeId: '',
-      pkKey: 'id', // 主键  如果主键不是pk需要传主键
-      loading: false,
-      dialogFormVisible: false,
-      copyDialogFormVisible: false,
-      rightsDialogFormVisible: false,
-      formbuilderDialogVisible: false,
-      formrenderDialogVisible: false,
-      importFormVisible: false,
-      formPrintDialogVisible: false,
-      defId: '', // 编辑dialog需要使用
-      statusOptions: [],
-      editId: '',
-      formKey: '',
-      name:"",
-      searchField: '',
-      searchName: 'Q^name_^SL',
-      listData: [],
-      listConfig: {
-        // 工具栏
-        toolbars: [
-          { key: 'search' },
-           {
-             key: 'saveFavorites',
-            label: '收藏',
-             icon: 'ibps-icon-star'
-          }, {
-            key: 'removeFavorites',
-            label: '取消',
-            icon: 'ibps-icon-star-o'
-         }
-        ],
-        // 查询条件
-        searchForm: {
-          forms: [
-            { prop: 'Q^name_^SL', label: '流程名称' }
-          ]
-        },
-        // 表格字段配置.
-        columns: [
-         { prop: 'favorites', label: '收藏', slotName: 'favoritesIcon', width: '60' },
-          { prop: 'name', label: '任务名称', link: 'dialog' },
-          // { prop: 'createTime', label: '创建时间', width: 140 },
-          { prop: 'typeName', label: '所属分类', width: 180 },
-          { prop: 'status', label: '状态', slotName: 'statusCloum', width: 150 },
-          { prop: 'version', label: '版本号', width: 80 }
-        ]
-      },
-      pagination: {},
-      sorts: {}
-    }
-  },
-  created() {
-    this.loadData()
-    this.findBpmDefinitionState()
-  },
-  methods: {
-    findBpmDefinitionState() {
-      findBpmDefinitionState().then(response => {
-        this.statusOptions = response.data
-      })
-    },
-    handleTips(favorites, id) {
-      if (favorites) {
-        this.tips('removeFavorites', '确认取消流程收藏吗？', id)
-      } else {
-        this.tips('saveFavorites', '确认流程收藏吗？', id)
-      }
-    },
-    /**
-     * 加载数据
-     */
-    loadData() {
-      this.loading = true
-      newProcess(this.getFormatParams()).then(response => {
-       //debugger
-        this.listData = response.data.dataResult;
-        this.name = response.data.dataResult.name
-        ActionUtils.handleListData(this, response.data)
-
-        //this.name = this.$refs['layout'].data.name
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-      })
-    },
-    /**
-     * 获取格式化参数
-     */
-    getFormatParams() {
-      const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
-      if (this.$utils.isNotEmpty(this.typeId)) {
-        params['Q^TYPE_ID_^S'] = this.typeId
-      }
-      return ActionUtils.formatParams(
-        params,
-        this.pagination,
-        this.sorts)
+    components: {
+        IbpsTypeTree,
+        BpmnFormrender,
+        'ibps-type-tree': () => import('@/business/platform/cat/type/tree'),
+        'ibps-card-list': () => import('@/components/ibps-card-list/list'),
+        'form-builder': () => import('@/business/platform/form/formbuilder/dialog'),
+        'formrender-preview': () => import('@/business/platform/form/formrender/preview/index')
     },
-    /**
-     * 处理分页事件
-     */
-    handlePaginationChange(page) {
-      ActionUtils.setPagination(this.pagination, page)
-      this.loadData()
-    },
-    /**
-     * 处理排序
-     */
-    handleSortChange(sort) {
-      ActionUtils.setSorts(this.sorts, sort)
-      this.loadData()
-    },
-    search() {
-      this.loadData()
-    },
-    /**
-     * 重置查询条件
-     */
-    reset() {
-      this.$refs['crud'].handleReset()
-    },
-    /**
-     * 点击表格
-     */
-    handleLinkClick(data) {
-      debugger
-      this.defId = data.id || ''
-      this.dialogFormVisible = true
-    },
-    /**
-     * 处理按钮事件
-     */
-    handleAction(command, position, selection, data) {
-      switch (command) {
-        case 'search':// 查询
-          ActionUtils.setFirstPagination(this.pagination)
-          this.search()
-          break
-        case 'add':// 添加
-          this.handleEdit()
-          break
-        case 'edit':// 编辑
-          this.handleEdit(selection)
-          break
-        case 'saveFavorites':// 收藏
-          ActionUtils.selectedMultiRecord(selection).then((id) => {
-            this.tips('saveFavorites', '确认流程收藏吗？', id)
-          }).catch(() => { })
-          break
-        case 'removeFavorites':// 取消
-          ActionUtils.selectedMultiRecord(selection).then((id) => {
-            this.tips('removeFavorites', '确认取消流程收藏吗？', id)
-          }).catch(() => { })
-          break
-        default:
-          break
-      }
+    mixins: [FixHeight],
+    data () {
+        return {
+            width: 220,
+            height: 500,
+            title: '启动工作流程',
+            createText: '创建表单',
+            query: '',
+            typeId: '',
+            pkKey: 'id', // 主键  如果主键不是pk需要传主键
+            loading: false,
+            dialogFormVisible: false,
+            copyDialogFormVisible: false,
+            rightsDialogFormVisible: false,
+            formbuilderDialogVisible: false,
+            formrenderDialogVisible: false,
+            importFormVisible: false,
+            formPrintDialogVisible: false,
+            defId: '', // 编辑dialog需要使用
+            statusOptions: [],
+            editId: '',
+            formKey: '',
+            name: '',
+            searchField: '',
+            searchName: 'Q^name_^SL',
+            listData: [],
+            listConfig: {
+                // 工具栏
+                toolbars: [
+                    { key: 'search' },
+                    {
+                        key: 'saveFavorites',
+                        label: '收藏',
+                        icon: 'ibps-icon-star'
+                    }, {
+                        key: 'removeFavorites',
+                        label: '取消',
+                        icon: 'ibps-icon-star-o'
+                    }
+                ],
+                // 查询条件
+                searchForm: {
+                    forms: [
+                        { prop: 'Q^name_^SL', label: '流程名称' }
+                    ]
+                },
+                // 表格字段配置.
+                columns: [
+                    { prop: 'favorites', label: '收藏', slotName: 'favoritesIcon', width: '60' },
+                    { prop: 'name', label: '任务名称', link: 'dialog' },
+                    // { prop: 'createTime', label: '创建时间', width: 140 },
+                    { prop: 'typeName', label: '所属分类', width: 180 },
+                    { prop: 'status', label: '状态', slotName: 'statusCloum', width: 150 },
+                    { prop: 'version', label: '版本号', width: 80 }
+                ]
+            },
+            pagination: {},
+            sorts: {}
+        }
     },
-    /**
-     * 编辑
-     */
-    handleEdit(id) {
-      this.defId = id
-      this.dialogFormVisible = true
+    created () {
+        this.loadData()
+        this.findBpmDefinitionState()
     },
-    tips(tip, title, id) {
-      this.$confirm(title, '消息', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (tip === 'saveFavorites') {
-          saveFavorites({ defIds: id }).then(response => {
-            ActionUtils.successMessage('收藏成功！')
+    methods: {
+        findBpmDefinitionState () {
+            findBpmDefinitionState().then(response => {
+                this.statusOptions = response.data
+            })
+        },
+        handleTips (favorites, id) {
+            if (favorites) {
+                this.tips('removeFavorites', '确认取消流程收藏吗？', id)
+            } else {
+                this.tips('saveFavorites', '确认流程收藏吗？', id)
+            }
+        },
+        /**
+         * 加载数据
+         */
+        loadData () {
+            this.loading = true
+            newProcess(this.getFormatParams()).then(response => {
+                // debugger
+                this.listData = response.data.dataResult
+                this.name = response.data.dataResult.name
+                ActionUtils.handleListData(this, response.data)
+
+                // this.name = this.$refs['layout'].data.name
+                this.loading = false
+            }).catch(() => {
+                this.loading = false
+            })
+        },
+        /**
+         * 获取格式化参数
+         */
+        getFormatParams () {
+            const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
+            if (this.$utils.isNotEmpty(this.typeId)) {
+                params['Q^TYPE_ID_^S'] = this.typeId
+            }
+            return ActionUtils.formatParams(
+                params,
+                this.pagination,
+                this.sorts)
+        },
+        /**
+         * 处理分页事件
+         */
+        handlePaginationChange (page) {
+            ActionUtils.setPagination(this.pagination, page)
             this.loadData()
-          })
-        } else {
-          removeFavorites({ defIds: id }).then(response => {
-            ActionUtils.successMessage('取消收藏成功！')
+        },
+        /**
+         * 处理排序
+         */
+        handleSortChange (sort) {
+            ActionUtils.setSorts(this.sorts, sort)
+            this.loadData()
+        },
+        search () {
             this.loadData()
-          })
+        },
+        /**
+         * 重置查询条件
+         */
+        reset () {
+            this.$refs['crud'].handleReset()
+        },
+        /**
+         * 点击表格
+         */
+        handleLinkClick (data) {
+            debugger
+            this.defId = data.id || ''
+            this.dialogFormVisible = true
+        },
+        /**
+         * 处理按钮事件
+         */
+        handleAction (command, position, selection, data) {
+            switch (command) {
+                case 'search':// 查询
+                    ActionUtils.setFirstPagination(this.pagination)
+                    this.search()
+                    break
+                case 'add':// 添加
+                    this.handleEdit()
+                    break
+                case 'edit':// 编辑
+                    this.handleEdit(selection)
+                    break
+                case 'saveFavorites':// 收藏
+                    ActionUtils.selectedMultiRecord(selection).then((id) => {
+                        this.tips('saveFavorites', '确认流程收藏吗？', id)
+                    }).catch(() => { })
+                    break
+                case 'removeFavorites':// 取消
+                    ActionUtils.selectedMultiRecord(selection).then((id) => {
+                        this.tips('removeFavorites', '确认取消流程收藏吗？', id)
+                    }).catch(() => { })
+                    break
+                default:
+                    break
+            }
+        },
+        /**
+         * 编辑
+         */
+        handleEdit (id) {
+            this.defId = id
+            this.dialogFormVisible = true
+        },
+        tips (tip, title, id) {
+            this.$confirm(title, '消息', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                if (tip === 'saveFavorites') {
+                    saveFavorites({ defIds: id }).then(response => {
+                        ActionUtils.successMessage('收藏成功！')
+                        this.loadData()
+                    })
+                } else {
+                    removeFavorites({ defIds: id }).then(response => {
+                        ActionUtils.successMessage('取消收藏成功！')
+                        this.loadData()
+                    })
+                }
+            }).catch(() => {})
+        },
+        handleNodeClick (typeId) {
+            this.typeId = typeId
+            this.loadData()
+        },
+        handleExpandCollapse (isExpand) {
+            this.width = isExpand ? 230 : 30
         }
-      }).catch(() => {})
-    },
-    handleNodeClick(typeId) {
-      this.typeId = typeId
-      this.loadData()
-    },
-    handleExpandCollapse(isExpand) {
-      this.width = isExpand ? 230 : 30
-    }
 
-  }
+    }
 }
 </script>
 <style scoped>
-.ibps-layout >>>  .container-component{
-    position: absolute;
-    top: 0px;
-    right: 0;
-    bottom: 0px;
-    left: 220px!important;}
-.ibps-card-list-container >>> .ibps-card-list--picture-card{display: block;}
+    .ibps-layout >>>  .container-component{
+        position: absolute;
+        top: 0px;
+        right: 0;
+        bottom: 0px;
+        left: 220px!important;}
+    .ibps-card-list-container >>> .ibps-card-list--picture-card{display: block;}
 </style>

src/views/system/dashboard/components/util.js

@@ -223,7 +223,7 @@ export function buildComponent (name, column) {
                     })
                 },
                 openPlate (url) {
-                    this.$router.push(defaultRouterAlias + url)
+                    this.$router.push(`/${url}`)
                 },
                 /**
                  * 处理更多
@@ -236,7 +236,7 @@ export function buildComponent (name, column) {
                         })
                         return
                     }
-                    this.$router.push(defaultRouterAlias + this.attrs.colUrl)
+                    this.$router.push(`/${this.attrs.colUrl}`)
                 },
                 // 未读消息
                 handleClick (option) {

src/views/system/dashboard/templates/bpmApprove.vue

@@ -19,7 +19,7 @@
                             <p>{{ item.dataContent }}</p>
                         </div>
                         <div class="item-body">
-                            <h2><count-to :end-val="parseInt(item.dataText,10)" :duration="4000" /></h2>
+                            <h2><count-to :end-val="parseInt(item.dataText,10)" :duration="2000" /></h2>
                         </div>
                         <p class="item-tip">{{ item.dataContent | firstStr }}</p>
                     </div>

src/views/system/dashboard/templates/myFavorites.vue

@@ -15,7 +15,7 @@
             >
                 <ibps-list v-if="data && data.length >0" class="ibps-pr-10">
                     <ibps-list-item
-                        v-for="(d,index) in data"
+                        v-for="(d,index) in data[0].data"
                         :key="index"
                         @click.native="handleFlowClick({defId:d.id})"
                     >
@@ -37,5 +37,4 @@
             </el-scrollbar>
         </div>
     </el-card>
-
 </template>