页面更新

ruoyi-ui/src/api/tool/gen.js

@@ -81,6 +81,14 @@ export function listAllColumnsByTableId(data) {
     data
   })
 }
+// 查询表HR详细信息
+export function genTableColumnList(query) {
+  return request({
+    url: '/boman-gen/genTableColumn/list',
+    method: 'get',
+    params: query
+  })
+}
 
 // 修改代码生成信息
 export function updateGenTable(data) {

ruoyi-ui/src/assets/icons/svg/spot.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1618986939606" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2162" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 320a192.064 192.064 0 0 1 0 384 192 192 0 0 1 0-384z" fill="" p-id="2163"></path></svg>

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -114,7 +114,7 @@
       }
     }
     .nest-menu .is-active{
-      span{
+      &>span{
         color: #fff!important;
       }
       background-color: #3C8DBC!important;

ruoyi-ui/src/router/index.js

@@ -57,12 +57,89 @@ export const constantRoutes = [
     path: '',
     component: Layout,
     redirect: 'index',
+    meta: { title: '首页', icon: '', noCache: true, affix: true },
     children: [
       {
         path: 'index',
         component: (resolve) => require(['@/views/index'], resolve),
         name: '首页',
         meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+      },
+      {
+        path: 'index1',
+        name: '流程工作台',
+        hidden: false,
+        alwaysShow: true,
+        meta: { title: '流程工作台', icon: 'spot', noCache: true },
+        children: [{
+          path: 'index1',
+          hidden: false,
+          component: (resolve) => require(['@/views/index'], resolve),
+          name: '待我审批',
+          meta: { title: '待我审批', icon: '', noCache: false},
+        },{
+          path: 'index2',
+          hidden: false,
+          component: (resolve) => require(['@/views/index'], resolve),
+          name: '已办理',
+          meta: { title: '已办理', icon: '', noCache: false},
+        },{
+          path: 'index3',
+          hidden: false,
+          component: (resolve) => require(['@/views/index'], resolve),
+          name: '已延时',
+          meta: { title: '已延时', icon: '', noCache: false},
+        },{
+          path: 'index4',
+          hidden: false,
+          component: (resolve) => require(['@/views/index'], resolve),
+          name: '我的流程',
+          meta: { title: '我的流程', icon: '', noCache: false},
+        }]
+      },{
+        path: 'index2',
+        name: '工作协助',
+        hidden: false,
+        alwaysShow: true,
+        meta: { title: '工作协助', icon: 'spot', noCache: true },
+        children: [{
+          path: 'index1',
+          hidden: false,
+          component: (resolve) => require(['@/views/index'], resolve),
+          name: '批注',
+          meta: { title: '批注', icon: '', noCache: false},
+        },{
+          path: 'index2',
+          hidden: false,
+          component: (resolve) => require(['@/views/index'], resolve),
+          name: '微邮',
+          meta: { title: '微邮', icon: '', noCache: false},
+        }]
+      },{
+        path: 'index3',
+        name: '交办事项',
+        hidden: false,
+        alwaysShow: true,
+        meta: { title: '交办事项', icon: 'spot', noCache: true },
+        children: [{
+          path: 'index1',
+          hidden: false,
+          component: (resolve) => require(['@/views/index'], resolve),
+          name: '待我处理',
+          meta: { title: '待我处理', icon: '', noCache: false},
+        },{
+          path: 'index2',
+          hidden: false,
+          component: (resolve) => require(['@/views/index'], resolve),
+          name: '我的安排',
+          meta: { title: '我的安排', icon: '', noCache: false },
+        },{
+          path: 'index3',
+          hidden: false,
+          component: (resolve) => require(['@/views/index'], resolve),
+          name: '历史事务',
+          meta: { title: '历史事务', icon: '', noCache: false},
+        }]
       }
     ]
   },

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -369,6 +369,7 @@
     setGenTable,
     delGenTable,
     listAllColumnsByTableId,
+	genTableColumnList,
     tableSql,
     zxImplement,
     getReload,
@@ -549,10 +550,11 @@
           this.dictOptions = response.data;
         });
         // 关联字段
-        listAllColumnsByTableId({
-          tableId
+        genTableColumnList({
+          tableId,
+          htmlType: 'HR'
         }).then(response => {
-          this.columList = response.data;
+          this.columList = response.rows;
         });
         // 关联表数据
         listTable(this.glbParams).then(response => {