From e869fe79e76f2194ba87d8e7875af7e1aa9c6298 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 25 十一月 2024 11:49:29 +0800
Subject: [PATCH] 分页打通，分页组件背景样式
---
src/views/projectEngineering/projectLibrary/index.vue | 187 ++++++++++++++++++++++++++++------------------
src/api/projectInfo.js | 10 +-
src/components/Pagination/index.vue | 4
3 files changed, 121 insertions(+), 80 deletions(-)
diff --git a/src/api/projectInfo.js b/src/api/projectInfo.js
index 52bb876..59c3fe8 100644
--- a/src/api/projectInfo.js
+++ b/src/api/projectInfo.js
@@ -3,7 +3,7 @@
// 鏌ヨ椤圭洰绠＄悊鍩虹淇℃伅鍒楄〃
export function listInfo(query) {
return request({
- url: '/code/info/list',
+ url: '/project/info/page',
method: 'get',
params: query
})
@@ -12,7 +12,7 @@
// 鏌ヨ椤圭洰绠＄悊鍩虹淇℃伅璇︾粏
export function getInfo(id) {
return request({
- url: '/code/info/' + id,
+ url: '/project/info/' + id,
method: 'get'
})
}
@@ -20,7 +20,7 @@
// 鏂板椤圭洰绠＄悊鍩虹淇℃伅
export function addInfo(data) {
return request({
- url: '/code/info',
+ url: '/project/info',
method: 'post',
data: data
})
@@ -29,7 +29,7 @@
// 淇敼椤圭洰绠＄悊鍩虹淇℃伅
export function updateInfo(data) {
return request({
- url: '/code/info',
+ url: '/project/info',
method: 'put',
data: data
})
@@ -38,7 +38,7 @@
// 鍒犻櫎椤圭洰绠＄悊鍩虹淇℃伅
export function delInfo(id) {
return request({
- url: '/code/info/' + id,
+ url: '/project/info/' + id,
method: 'delete'
})
}
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 56f5a6b..a10941c 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -46,7 +46,7 @@
},
layout: {
type: String,
- default: 'total, sizes, prev, pager, next, jumper'
+ default: '->,total, sizes, prev, pager, next, jumper'
},
background: {
type: Boolean,
@@ -105,7 +105,7 @@
<style scoped>
.pagination-container {
- background: #fff;
+ background: #F3F7FC;
padding: 32px 16px;
}
.pagination-container.hidden {
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 9abbf0d..96a5ae0 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -1,6 +1,7 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryParamsRef" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryParamsRef" size="small" :inline="true" v-show="showSearch"
+ label-width="68px">
<div class="slot">
<div class="left-section">
<el-form-item label="椤圭洰鍚嶇О" prop="projectName">
@@ -45,7 +46,8 @@
</el-form-item>
<el-popover :visible="popoverValue" :width="500" placement="bottom">
<template #reference>
- <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" @click="handlePopover" size="small">
+ <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" @click="handlePopover"
+ size="small">
鏇村绛涙煡鏉′欢
<span style="margin-left: 5px">
<el-icon v-if="!popoverValue" class="el-icon-arrow-down"></el-icon>
@@ -54,19 +56,22 @@
</el-button>
</template>
<span>绛涢�夋潯浠�</span>
- <el-form ref="moreQueryParamsRef" label-width="68px" label-position="right" :model="moreQueryParams">
+ <el-form ref="moreQueryParamsRef" label-width="68px" label-position="right" :model="queryParams">
<el-row>
<el-col :span="12">
<el-form-item label="椤圭洰绫诲瀷">
- <el-select v-model="moreQueryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option" size="small">
- <el-option v-for="items in sys_project_type" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option"
+ size="small">
+ <el-option v-for="items in sys_project_type" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="閲嶇偣鍒嗙被">
- <el-select v-model="moreQueryParams.importanceType" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_key_categories" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.importanceType" clearable placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="items in sys_key_categories" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -74,15 +79,18 @@
<el-row>
<el-col :span="12">
<el-form-item label="椤圭洰鏍囩">
- <el-select v-model="moreQueryParams.tag" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_project_tags" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.tag" clearable placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="items in sys_project_tags" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="椤圭洰鐘舵��">
- <el-select v-model="moreQueryParams.projectStatus" :disabled="isProjectCategory" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_project_status" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable
+ placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="items in sys_project_status" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -90,15 +98,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="椤圭洰鐮�">
- <el-select v-model="moreQueryParams.projectColorCode" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_project_code" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.projectColorCode" clearable placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="items in sys_project_code" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍏宠仈鐘舵��">
- <el-select v-model="moreQueryParams.assignmentStatus" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_association_status" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.assignmentStatus" clearable placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="items in sys_association_status" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -106,15 +116,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="璧勯噾绫诲瀷">
- <el-select v-model="moreQueryParams.investmentType" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_funding_type" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.investmentType" clearable placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="items in sys_funding_type" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="椤圭洰闃舵">
- <el-select v-model="moreQueryParams.projectPhase" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_project_phases" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.projectPhase" clearable placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="items in sys_project_phases" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -122,15 +134,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="鎶曡祫绫诲埆">
- <el-select v-model="moreQueryParams.investType" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_investment_type" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.investType" clearable placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="items in sys_investment_type" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="琛屾斂鍖哄垝">
- <el-select v-model="moreQueryParams.area" clearable placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="items in sys_administrative_divisions" :key="items.value" :label="items.label" :value="items.value" />
+ <el-select v-model="queryParams.area" clearable placeholder="璇烽�夋嫨" class="select-option">
+ <el-option v-for="items in sys_administrative_divisions" :key="items.value" :label="items.label"
+ :value="items.value"/>
</el-select>
</el-form-item>
</el-col>
@@ -138,7 +152,7 @@
<el-row style="text-align: center">
<el-col :span="24">
<el-form-item label-width="0">
- <el-button type="primary" @click="handleQueryFrom">纭� 璁�</el-button>
+ <el-button type="primary" @click="handleQuery">纭� 璁�</el-button>
<el-button @click="closePopover">鍙� 娑�</el-button>
</el-form-item>
</el-col>
@@ -148,11 +162,11 @@
</div>
<div class="right-section">
<div>
- <el-button @click="handleExport" size="small" >
+ <el-button @click="handleExport" size="small">
<svg-icon icon-class="exportIcon" style="margin-right: 8px"/>
瀵煎嚭鏁版嵁
</el-button>
- <el-button :disabled="isReserve" @click="handleImport" size="small" >
+ <el-button :disabled="isReserve" @click="handleImport" size="small">
<svg-icon icon-class="importIcon" style="margin-right: 8px"/>
瀵煎叆鏁版嵁
</el-button>
@@ -167,9 +181,9 @@
:columns="columns"
@queryTable="handleQuery"
></VisibilityToolbar>
-<!-- @update:columns="handleUpdateColumns"-->
-<!-- @update:sort="handleUpdateSort"-->
-<!-- @update:resetSort="handleResetSort"-->
+ <!-- @update:columns="handleUpdateColumns"-->
+ <!-- @update:sort="handleUpdateSort"-->
+ <!-- @update:resetSort="handleResetSort"-->
</div>
</div>
</el-form>
@@ -177,11 +191,13 @@
<el-table
style="margin-top: 20px"
v-loading="loading"
- :data="infoList"
+ :data="projectInfoList"
@selection-change="handleSelectionChange"
height="60vh"
- :show-overflow-tooltip = "true">
- <el-table-column type="selection" width="55" align="center" />
+ :show-overflow-tooltip="true">
+ <el-table-column type="selection" width="55" align="center"/>
+
+ <!-- 鍔ㄦ�佸垪 -->
<template v-for="item in columns">
<el-table-column
v-if="item.visible"
@@ -190,45 +206,62 @@
v-bind="item"
:min-width="item.minWidth"
>
- <template slot-scope="scope" v-if="item.slotName">
- <slot :name="item.slotName" :scope="scope"></slot>
+ <template slot-scope="scope">
+ <!-- 浣跨敤鍏峰悕鎻掓Ы -->
+ <template v-if="item.slotName">
+ <!-- projectStatus鎻掓Ы -->
+ <template v-if="item.slotName === 'projectStatus'">
+ <el-text class="mx-1">{{ '鑷畾涔夋牱寮�' }}</el-text>
+ </template>
+ <!-- projectColorCode鎻掓Ы -->
+ <template v-if="item.slotName === 'projectColorCode'">
+ <el-text class="mx-1 has-dot">{{ '鑷畾涔夋牱寮�' }}<span class="dot" style="margin-left: 5px"></span></el-text>
+ </template>
+ <!-- projectType鎻掓Ы -->
+ <template v-if="item.slotName === 'projectType'">
+ <el-text class="mx-1">{{ '鑷畾涔夋牱寮�' }}</el-text>
+ </template>
+ <!-- investType鎻掓Ы -->
+ <template v-if="item.slotName === 'investType'">
+ <el-text class="mx-1">{{ '鑷畾涔夋牱寮�' }}</el-text>
+ </template>
+ <!-- planStartTime鎻掓Ы -->
+ <template v-if="item.slotName === 'planStartTime'">
+ {{ '鑷畾涔夋牱寮�' }}
+ </template>
+ </template>
+ <!-- 榛樿鏄剧ず -->
+ <span v-else>{{ scope.row[item.id] }}</span>
</template>
</el-table-column>
</template>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+
+ <!-- 鎿嶄綔鍒� -->
+ <el-table-column label="鎿嶄綔" width="140" align="center" >
<template slot-scope="scope">
<el-button
- size="mini"
+ size="medium"
+ type="text"
+ icon="el-icon-view"
+ @click="handleDetail(scope.row)"
+ >
+ </el-button>
+ <el-button
+ size="medium"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['code:info:edit']"
- >淇敼</el-button>
+ >
+ </el-button>
<el-button
- size="mini"
+ size="medium"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['code:info:remove']"
- >鍒犻櫎</el-button>
+ >
+ </el-button>
</template>
</el-table-column>
-
- <template #projectStatus="{ scope }">
- <el-text class="mx-1">{{ getProjectStatus(scope.row) }}</el-text>
- </template>
- <template #projectColorCode="{ scope }">
- <el-text class="mx-1 has-dot">{{ '缁�' }}<span class="dot" style="margin-left: 5px"></span></el-text>
- </template>
- <template #projectType="{ scope }">
- <el-text class="mx-1">{{ getProjectType(scope.row) }}</el-text>
- </template>
- <template #investType="{ scope }">
- <el-text class="mx-1">{{ getInvesType(scope.row) }}</el-text>
- </template>
- <template #planStartTime="{ scope }">
- {{ scope.row.planStartTime ? scope.row.planStartTime.split('-')[0] + '骞�' : '' }}
- </template>
</el-table>
<pagination
@@ -249,9 +282,10 @@
</template>
<script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/projectInfo";
-import { current } from './list';
+import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectInfo";
+import {current} from './list';
import FileDialog from '../component/FileDialog';
+
export default {
name: "projectInfo",
components: {
@@ -280,12 +314,12 @@
// 鎬绘潯鏁�
total: 0,
// 椤圭洰绠＄悊鍩虹淇℃伅琛ㄦ牸鏁版嵁
- infoList: [],
+ projectInfoList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
- timeRange:[],
+ timeRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -310,10 +344,10 @@
// 琛ㄥ崟鏍￠獙
rules: {
projectName: [
- { required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+ {required: true, message: "椤圭洰鍚嶇О涓嶈兘涓虹┖", trigger: "blur"}
],
projectStatus: [
- { required: true, message: "椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)涓嶈兘涓虹┖", trigger: "change" }
+ {required: true, message: "椤圭洰鐘舵�� (0鏈紑宸ワ紝1宸插紑宸ワ紝2宸茬宸ワ紝3鏆傚仠)涓嶈兘涓虹┖", trigger: "change"}
],
}
};
@@ -325,7 +359,7 @@
item.serialNumber = index + 1;
return item;
});
- this.getList();
+ this.getList();
},
methods: {
// 鍏抽棴鏂囦欢澶勭悊寮规鐨勬柟娉�
@@ -338,15 +372,19 @@
handlePopover() {
this.popoverValue.value = !this.popoverValue.value;
},
+ closePopover() {
+
+ this.popoverValue.value = false;
+ },
/** 鏌ヨ椤圭洰绠＄悊鍩虹淇℃伅鍒楄〃 */
getList() {
this.loading = true;
console.log("鏌ヨ")
- // listInfo(this.queryParams).then(response => {
- // this.infoList = response.rows;
- // this.total = response.total;
- // });
- this.loading = false;
+ listInfo(this.queryParams).then(response => {
+ this.projectInfoList = response.data;
+ this.total = response.total;
+ });
+ this.loading = false;
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -407,7 +445,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -449,12 +487,13 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰绠＄悊鍩虹淇℃伅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰绠＄悊鍩虹淇℃伅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
return delInfo(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).catch(() => {
+ });
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
@@ -471,9 +510,10 @@
};
</script>
<style lang="scss" scoped>
- .select-option {
+.select-option {
width: 140px;
}
+
.slot {
display: flex;
}
@@ -485,6 +525,7 @@
.right-section {
display: flex;
margin-left: auto;
+
.add-btn {
margin: 0 10px;
}
--
Gitblit v1.8.0