From 2fe7eb79670f8d9a64a501596b18c4e098278c89 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 三月 2025 11:50:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/index.vue | 164 ++++++++++++++++++++----------------------------------
1 files changed, 60 insertions(+), 104 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index ac4390f..2698103 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -323,7 +323,7 @@
</template>
<script>
-import {listProject, getProject, delProject, addProject, updateProject,getHiddenList,addList} from "@/api/projectEngineering/projectInfo";
+import {listProject, getProject, delProject, addProject, updateProject,getHiddenList,addList,getAll} from "@/api/projectEngineering/projectInfo";
import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';
import Cookies from "js-cookie";
@@ -426,39 +426,24 @@
if (projectPhase) {
this.isProjectCategory = true;
}
- // const columns = current.map((item, index) => {
- // item.index = index + 1;
- // item.key = index;
- // item.serialNumber = index + 1;
- // if(item.id ==='usedStatus' ){
- // if(projectPhase !== '6') {
- // item.visible = false
- // } else {
- // item.visible = true
- // }
- // }
- // return item;
- // });
- // this.columns = columns;
- // this.defaultColumns = JSON.parse(JSON.stringify(columns));
- this.hiddenList();
-
+ this.hiddenColumnsList();
+ this.pageHiddenColumnsList();
this.getList(this.$route.query.projectPhase == '5' || this.$route.query.projectPhase == '6' ? null : this.$route.query.projectPhase);
},
beforeDestroy() {
this.removeStore();
},
methods: {
- hiddenList(){
- getHiddenList().then(res =>{
+
+ //鏌ヨ鍚庣鎵�鏈夎〃澶存暟鎹�
+ hiddenColumnsList(){
+ getAll().then(res =>{
const projectPhase = this.$route.query.projectPhase;
//杞崲
res.data.forEach((item,index)=>{
item.index = index + 1;
item.key = index;
- item.serialNumber = item.sort;
item.label = item.name;
- // item.slotName = item.columns;
if(item.display === '0'){
item.visible = false
}else {
@@ -472,13 +457,45 @@
}
}
});
-
- this.defaultColumns = res.data;
this.columnsNew = res.data;
- console.log(this.columnsNew)
+ })
+ },
+ pageHiddenColumnsList(){
+ getHiddenList(this.pageQueryParams).then(res =>{
+ this.buildColumns(res.data);
this.hiddenTotal = res.total;
})
-
+ },
+ //闅愯棌鍒楄〃缈婚〉
+ handlePage(page){
+ this.pageQueryParams.currentPage = page;
+ getHiddenList(this.pageQueryParams).then(res =>{
+ this.buildColumns(res.data);
+ })
+ },
+ buildColumns(data){
+ const projectPhase = this.$route.query.projectPhase;
+ //杞崲
+ data.forEach((item,index)=>{
+ item.index = index + 1;
+ item.key = index;
+ item.label = item.name;
+ // item.slotName = item.columns;
+ if(item.display === '0'){
+ item.visible = false
+ }else {
+ item.visible = true;
+ }
+ if(item.columns ==='usedStatus' ){
+ if(projectPhase !== '6') {
+ item.visible = false
+ } else {
+ item.visible = true
+ }
+ }
+ });
+ //鍒嗛〉鏁版嵁浼犲叆鏄鹃殣缁勪欢
+ this.defaultColumns = data;
},
// async getProjectSubType(projectType, projectSubType) {
// if (!projectType || !projectSubType) {
@@ -522,40 +539,7 @@
localStorage.removeItem("policyInfoForm")
localStorage.removeItem("documentsInfoForm")
},
- //闅愯棌鍒楄〃缈婚〉
- handlePage(page){
- this.pageQueryParams.currentPage = page;
- getHiddenList(this.pageQueryParams).then(res =>{
- this.buildColumns(res.data);
- })
- },
- buildColumns(data){
- const projectPhase = this.$route.query.projectPhase;
- //杞崲
- data.forEach((item,index)=>{
- item.index = index + 1;
- item.key = index;
- item.serialNumber = item.sort;
- item.label = item.name;
- // item.slotName = item.columns;
- if(item.display === '0'){
- item.visible = false
- }else {
- item.visible = true;
- }
- if(item.columns ==='usedStatus' ){
- if(projectPhase !== '6') {
- item.visible = false
- } else {
- item.visible = true
- }
- }
- });
- this.columnsNew = data;
- this.defaultColumns = data;
-
- },
save(){
const list =current.map((item, index) => {
item.name = item.label;
@@ -580,69 +564,41 @@
},
// 閲嶇疆鎺掑簭鐨勬柟娉�
handleResetSort() {
- this.hiddenList()
- // const projectPhase = this.$route.query.projectPhase;
- // this.defaultColumns= currentRest.map((item, index) => {
- // item.index = index + 1;
- // item.key = index;
- // item.serialNumber = index + 1
- // if(item.id ==='usedStatus' ){
- // if(projectPhase !== '6') {
- // item.visible = false
- // } else {
- // item.visible = true
- // }
- // }
- // return item;
- // });
-
-
- // this.columnsNew = currentRest.map((item, index) => {
- // item.index = index + 1;
- // item.key = index;
- // item.serialNumber = index + 1
- // if(item.id ==='usedStatus' ){
- // if(projectPhase !== '6') {
- // item.visible = false
- // } else {
- // item.visible = true
- // }
- // }
- // return item;
- // });
- //寮哄埗table娓叉煋
-
- // this.defaultColumns = this.resetColumns;
- //
- //
- // this.columnsNew = this.resetColumns;
-
+ this.hiddenColumnsList();
+ this.pageHiddenColumnsList();
this.tableKey = this.tableKey + 1;
},
// 鏇存柊鍒楃殑鏂规硶
handleUpdateColumns(row) {
- // this.currentColumns = row;
- row.key = Number(row.key)
+ //鏇挎崲鍏冪礌
this.columnsNew = this.columnsNew.map(item => {
- if (item.key === row.key) {
+ if (item.columns === row.columns) {
return row;
}
return item;
});
+
},
handleUpdateSort(row) {
- console.log(this.columnsNew, '鎺掑簭鍓嶇殑鍒�');
+ //鏇挎崲琛ㄥご鍏冪礌
this.columnsNew = this.columnsNew.map(item => {
- if (item.key === row.key) {
+ if (item.columns === row.columns) {
return row;
}
return item;
});
- this.defaultColumns = this.columnsNew.sort((a, b) => a.index - b.index);
- this.columnsNew.sort((a, b) => a.serialNumber - b.serialNumber);
+ //鏇挎崲浼犲叆鏄鹃殣缁勪欢鏁版嵁
+ this.defaultColumns = this.defaultColumns.map(item => {
+ if (item.columns === row.columns) {
+ return row;
+ }
+ return item;
+ });
+ this.defaultColumns = this.defaultColumns.sort((a, b) => a.sort - b.sort);
+ this.columnsNew.sort((a, b) => a.sort - b.sort);
+
//寮哄埗table娓叉煋
this.tableKey = this.tableKey + 1;
- console.log(this.columnsNew, '鎺掑簭鍚庣殑鍒�');
},
// 鍏抽棴鏂囦欢澶勭悊寮规鐨勬柟娉�
fileDialogCancel() {
--
Gitblit v1.8.0