!31 基础Index改名

Merge pull request !31 from hbzgyjh/auto-5488917-develop-1629704016740

src/api/project/project.js

@@ -6,7 +6,7 @@ const projectApi = {
 //   update: 'sys/menu/update',
 //   del: 'sys/menu/delete',
 //   updateStatus: 'sys/menu/updateStatus',
-  list: 'project/projectList'
+  list: 'project/pageList'
 }
 
 // export function menuAdd (params) {
@@ -41,11 +41,7 @@ export function getProjectList (params) {
   return request({
     url: projectApi.list,
     method: 'get',
-    data: params,
+    params: params
-    headers: {
-        'Authorization':'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdhYTViMGZiLTkyOWQtNDhhZS04ODU1LWJkNzM5MjdlOTNiZCJ9.CZzowaB-w2krGpNttPZBNLfq1mw775Lh-sx1K8onfgSwNzA6bw-P7CqC4vgH29xjDv3ey4zEFDzV9pHnrAGrDA'
-    }
-    //Authorization: "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdhYTViMGZiLTkyOWQtNDhhZS04ODU1LWJkNzM5MjdlOTNiZCJ9.CZzowaB-w2krGpNttPZBNLfq1mw775Lh-sx1K8onfgSwNzA6bw-P7CqC4vgH29xjDv3ey4zEFDzV9pHnrAGrDA"
   })
 }
 // export function menuUpdateStatus (params) {

src/components/Table/index.js

@@ -178,7 +178,7 @@ export default {
           // } catch (e) {
           //   this.localPagination = false
           // }
-          this.localDataSource = r.entities // 返回结果中的数组数据
+          this.localDataSource = r.rows // 返回结果中的数组数据
           this.localLoading = false
         })
       }

src/config/router.config.js

@@ -65,6 +65,33 @@ export const asyncRouterMap = [
           }
         ]
       },
+      // 项目管理
+      {
+        path: '/project',
+        redirect: '/project/projectList',
+        component: RouteView,
+        meta: { title: '项目管理', icon: bxAnaalyse, permission: [ 'from' ] },
+        children: [
+          {
+            path: '/project/projectList',
+            name: 'projectList',
+            component: () => import('@/views/project/ProjectList'),
+            meta: { title: '自主项目', keepAlive: true, permission: [ 'form' ] }
+          },
+          {
+            path: '/form/step-form',
+            name: 'StepForm',
+            component: () => import('@/views/form/stepForm/StepForm'),
+            meta: { title: '系统推荐', keepAlive: true, permission: [ 'form' ] }
+          },
+          {
+            path: '/form/advanced-form',
+            name: 'AdvanceForm',
+            component: () => import('@/views/form/advancedForm/AdvancedForm'),
+            meta: { title: '终端培训', keepAlive: true, permission: [ 'form' ] }
+          }
+        ]
+      },
       // forms
       {
         path: '/form',

src/views/project/ProjectList.vue

@@ -74,8 +74,8 @@
               class="table-page-search-submitButtons"
               :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
             >
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button type="primary" icon="search"  @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button>
+              <a-button style="margin-left: 8px" icon="redo" @click="() => (queryParam = {})">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -84,6 +84,7 @@
 
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="handleEdit()">新建</a-button>
+      <a-button type="primary" icon="minus" @click="handleEdit()">删除</a-button>
       <!-- <a-button type="dashed" @click="tableOption">{{ (optionAlertShow && '关闭') || '开启' }} alert</a-button> -->
       <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
@@ -150,58 +151,65 @@ export default {
       // 表头
       columns: [
         {
-          title: '#',
+          title: '序号',
+          width: 60,
           scopedSlots: { customRender: 'serial' },
         },
         {
           title: '项目名称',
           dataIndex: 'projectName',
+          key: 'projectName'
         },
         {
           title: '时间',
           dataIndex: 'description',
         },
         {
-          title: '服务调用次数',
+          title: '人数',
           dataIndex: 'callNo',
-          sorter: true,
+          // sorter: true,
           needTotal: true,
-          customRender: (text) => text + ' 次',
+          // customRender: (text) => text + ' 次',
         },
         {
-          title: '状态',
+          title: '项目类型',
+          dataIndex: 'description',
+        },
+        {
+          title: '项目状态',
+          dataIndex: 'description',
+        },
+        {
+          title: '创建人员',
           dataIndex: 'projectStatus',
-          needTotal: true,
         },
         {
-          title: '更新时间',
+          title: '创建时间',
           dataIndex: 'updatedAt',
           sorter: true,
         },
+        // {
+        //   title: '操作',
+        //   dataIndex: 'action',
+        //   width: '150px',
+        //   scopedSlots: { customRender: 'action' },
+        // },
         {
           title: '操作',
-          dataIndex: 'action',
+          key: 'operation',
-          width: '150px',
+          width: 100,
-          scopedSlots: { customRender: 'action' },
+          align: 'center',
-        },
+          scopedSlots: { customRender: 'action' }
+        }
       ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: (parameter) => {
-        console.log('loadData.parameter', parameter)
-        return getProjectList(Object.assign(parameter, this.queryParam)).then((res) => {
-          return res.rows
-        })
-      },
 
-      // // 加载数据方法 必须为 Promise 对象
+      // 加载数据方法 必须为 Promise 对象
-      // loadData: (parameter) => {
+      loadData: parameter => {
-      //   console.log('loadData.parameter', parameter)
+        return getProjectList(Object.assign(parameter, this.queryParam))
-      //   return request({
+          .then(res => {
-      //     url: '/dawa/project/pageList',
+            return res
-      //     method: get,
+          })
-      //     data: this.queryParam,
+      },
-      //   })
-      // },
 
       selectedRowKeys: [],
       selectedRows: [],