From 4c00d4aaf015fc5afcea605d1144526a9de538fa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 一月 2025 11:47:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/projectEngineering/projectLibrary/index.vue |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index b2190a7..a5e95d3 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -92,7 +92,7 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="椤圭洰鐮�">
-                    <el-select v-model="queryParams.projectColorCode" clearable placeholder="璇烽�夋嫨" class="select-option"
+                    <el-select v-model="queryParams.coding" clearable placeholder="璇烽�夋嫨" class="select-option"
                                @change="handleQuery">
                       <el-option v-for="item in dict.type.sys_project_code" :key="item.value" :label="item.label"
                                  :value="item.value"/>
@@ -196,13 +196,14 @@
       v-loading="loading"
       :data="projectInfoList"
       @selection-change="handleSelectionChange"
-      height="60vh"
+      height="100%"
       sortable="custom"
-      :show-overflow-tooltip="true">
+      >
       <el-table-column type="selection" width="55" align="center"/>
       <!-- 鍔ㄦ�佸垪 -->
       <el-table-column
         v-for="item in columns"
+        :key="item.id"
         v-if="item.visible"
         :prop="item.id"
         :label="item.label"
@@ -215,9 +216,9 @@
             <template v-if="item.slotName === 'projectStatus'">
               <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
             </template>
-            <!-- projectColorCode鎻掓Ы -->
-            <template v-if="item.slotName === 'projectColorCode'">
-              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
+            <!-- coding鎻掓Ы -->
+            <template v-if="item.slotName === 'coding'">
+              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
             </template>
             <!-- projectType鎻掓Ы -->
             <template v-if="item.slotName === 'projectType'">
@@ -226,6 +227,10 @@
             <!-- investType鎻掓Ы -->
             <template v-if="item.slotName === 'investType'">
               <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
+            </template>
+            <!-- investType鎻掓Ы -->
+            <template v-if="item.slotName === 'importanceType'">
+              <dict-tag :options="dict.type.sys_key_categories" :value="scope.row.importanceType"/>
             </template>
             <!-- planStartTime -->
             <template v-if="item.slotName === 'planStartTime'">
@@ -270,7 +275,7 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
+      :page.sync="queryParams.currentPage"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
@@ -280,6 +285,7 @@
       :isImportOrExport="isImportOrExport"
       @fileDialogCancel="fileDialogCancel"
       :currentColumns="columns"
+      :dataIdList="ids"
     />
   </div>
 </template>
@@ -333,7 +339,7 @@
       timeRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        pageNum: 1,
+        currentPage: 1,
         pageSize: 10,
         projectName: null,
         projectCode: null,
@@ -344,7 +350,7 @@
         projectType: '', // 椤圭洰绫诲瀷
         importanceType: '', // 閲嶇偣鍒嗙被
         projectStatus: '', // 椤圭洰鐘舵��
-        projectColorCode: '', // 椤圭洰鐮�
+        coding: '', // 椤圭洰鐮�
         investmentType: '', // 璧勯噾绫诲瀷
         projectPhase: '', // 椤圭洰闃舵
         investType: '', // 鎶曡祫绫诲埆
@@ -366,6 +372,7 @@
     };
   },
   created() {
+    this.queryParams.importanceType = this.$route.query.importanceType;
     const projectCategory = this.$route.query.projectCategory;
     if (!projectCategory || projectCategory === '1') {
       this.isReserve = true;
@@ -526,7 +533,7 @@
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.currentPage = 1;
       this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */

--
Gitblit v1.8.0