From f4b1244495eb0b3d64cba24f5e102f19f905ad89 Mon Sep 17 00:00:00 2001
From: qinjie <jqinjie@foxmail.com>
Date: Tue, 24 Aug 2021 10:36:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/lazy_use.js              |   4 +-
 src/views/project/ProjectList.vue | 195 ++++++++++--------------------
 2 files changed, 66 insertions(+), 133 deletions(-)

diff --git a/src/core/lazy_use.js b/src/core/lazy_use.js
index c06e94a..709faa4 100644
--- a/src/core/lazy_use.js
+++ b/src/core/lazy_use.js
@@ -44,7 +44,8 @@ import {
   Statistic,
   Descriptions,
   message,
-  notification
+  notification,
+  space
 } from 'ant-design-vue'
 import Viser from 'viser-vue'
 
@@ -97,6 +98,7 @@ Vue.use(PageHeader)
 Vue.use(Result)
 Vue.use(Statistic)
 Vue.use(Descriptions)
+Vue.use(space)
 
 Vue.prototype.$confirm = Modal.confirm
 Vue.prototype.$message = message
diff --git a/src/views/project/ProjectList.vue b/src/views/project/ProjectList.vue
index 8dad88a..d1cba82 100644
--- a/src/views/project/ProjectList.vue
+++ b/src/views/project/ProjectList.vue
@@ -1,133 +1,68 @@
 <template>
   <div>
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :md="8" :sm="24">
-            <a-form-item label="项目名">
-              <a-input v-model="queryParam.projectName" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="项目状态">
-              <a-select v-model="queryParam.status" placeholder="请选择" default-value="null" weight="20px">
-                <a-select-option value="null">全部</a-select-option>
-                <a-select-option value="1">运行中</a-select-option>
-                <a-select-option value="2">已结束</a-select-option>
-                <a-select-option value="1">未发布</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="开始时间">
-              <a-date-picker v-model="queryParam.stateDate" style="width: 100%" placeholder="请输入开始时间" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="结束时间">
-              <a-date-picker v-model="queryParam.endDate" style="width: 100%" placeholder="请输入结束时间" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="8" :sm="24">
-            <a-form-item label="培训方式">
-              <a-select v-model="queryParam.trainWay" placeholder="请选择" default-value="null" weight="20px">
-                <a-select-option value="null">全部</a-select-option>
-                <a-select-option value="1">培训</a-select-option>
-                <a-select-option value="2">考试</a-select-option>
-                <a-select-option value="3">培训-练习</a-select-option>
-                <a-select-option value="4">培训-练习-考试</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <!-- <template v-if="advanced">
-            <a-col :md="8" :sm="24">
-              <a-form-item label="调用次数">
-                <a-input-number v-model="queryParam.callNo" style="width: 100%" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="更新日期">
-                <a-date-picker v-model="queryParam.date" style="width: 100%" placeholder="请输入更新日期" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="使用状态">
-                <a-select v-model="queryParam.useStatus" placeholder="请选择" default-value="0">
-                  <a-select-option value="0">全部</a-select-option>
-                  <a-select-option value="1">关闭</a-select-option>
-                  <a-select-option value="2">运行中</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="8" :sm="24">
-              <a-form-item label="使用状态">
-                <a-select placeholder="请选择" default-value="0">
-                  <a-select-option value="0">全部</a-select-option>
-                  <a-select-option value="1">关闭</a-select-option>
-                  <a-select-option value="2">运行中</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </template> -->
-          <a-col :md="(!advanced && 8) || 24" :sm="24">
-            <span
-              class="table-page-search-submitButtons"
-              :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
-            >
-              <a-button type="primary" icon="search"  @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" icon="redo" @click="() => (queryParam = {})">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
+    <a-space direction="vertical" style="width: 100%;">
+      <a-space direction="horizontal">
+        项目名:
+        <a-input v-model="queryParam.projectName" style="width: 100%" />
+        项目状态:
+        <a-select v-model="queryParam.status" placeholder="请选择" default-value="null" style="width: 120px">
+          <a-select-option value="null">全部</a-select-option>
+          <a-select-option value="1">运行中</a-select-option>
+          <a-select-option value="2">已结束</a-select-option>
+          <a-select-option value="1">未发布</a-select-option>
+        </a-select>
+        开始时间:
+        <a-date-picker v-model="queryParam.stateDate" style="width: 100%" placeholder="请输入开始时间" />
+        结束时间:
+        <a-date-picker v-model="queryParam.endDate" style="width: 100%" placeholder="请输入结束时间" />
+        培训方式:
+        <a-select v-model="queryParam.trainWay" placeholder="请选择" default-value="null" style="width: 120px">
+          <a-select-option value="null">全部</a-select-option>
+          <a-select-option value="1">培训</a-select-option>
+          <a-select-option value="2">考试</a-select-option>
+          <a-select-option value="3">培训-练习</a-select-option>
+          <a-select-option value="4">培训-练习-考试</a-select-option>
+        </a-select>
 
-    <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">
-          <a-menu-item key="1"><a-icon type="delete" />删除</a-menu-item>
-          <a-menu-item key="2"><a-icon type="lock" />锁定</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /> </a-button>
-      </a-dropdown>
-    </div>
+        <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">查询</a-button>
+        <a-button icon="redo" @click="() => (queryParam = {})">重置</a-button>
+      </a-space>
+
+      <a-space direction="horizontal">
+        <a-button type="primary" icon="plus" @click="handleEdit()">新建</a-button>
+        <a-button type="primary" icon="minus" @click="handleEdit()">删除</a-button>
+      </a-space>
+
+      <s-table ref="table" size="default" rowKey="key" :columns="columns" :data="loadData" :rowSelection="options.rowSelection">
+        <span slot="serial" slot-scope="text, record, index">
+          {{ index + 1 }}
+        </span>
+        <span slot="action" slot-scope="text, record">
+          <template>
+            <a @click="handleEdit(record)">编辑</a>
+            <a-divider type="vertical" />
+          </template>
+          <a-dropdown>
+            <a class="ant-dropdown-link"> 更多
+              <a-icon type="down" />
+            </a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a href="javascript:;">详情</a>
+              </a-menu-item>
+              <a-menu-item v-if="$auth('table.disable')">
+                <a href="javascript:;">禁用</a>
+              </a-menu-item>
+              <a-menu-item v-if="$auth('table.delete')">
+                <a href="javascript:;">删除</a>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+      </s-table>
+
+    </a-space>
 
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="key"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
-    >
-      <span slot="serial" slot-scope="text, record, index">
-        {{ index + 1 }}
-      </span>
-      <span slot="action" slot-scope="text, record">
-        <template>
-          <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
-        </template>
-        <a-dropdown>
-          <a class="ant-dropdown-link"> 更多 <a-icon type="down" /> </a>
-          <a-menu slot="overlay">
-            <a-menu-item>
-              <a href="javascript:;">详情</a>
-            </a-menu-item>
-            <a-menu-item v-if="$auth('table.disable')">
-              <a href="javascript:;">禁用</a>
-            </a-menu-item>
-            <a-menu-item v-if="$auth('table.delete')">
-              <a href="javascript:;">删除</a>
-            </a-menu-item>
-          </a-menu>
-        </a-dropdown>
-      </span>
-    </s-table>
   </div>
 </template>
 
@@ -205,12 +140,8 @@ export default {
 
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return getProjectList(Object.assign(parameter, this.queryParam))
-          .then(res => {
-            return res
-          })
+        return getProjectList(Object.assign(parameter, this.queryParam)).then(res => { return res; })
       },
-
       selectedRowKeys: [],
       selectedRows: [],
 
@@ -262,7 +193,7 @@ export default {
     handleEdit(record) {
       this.$emit('onEdit', record)
     },
-    handleOk() {},
+    handleOk() { },
 
     onSelectChange(selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys