From db86a7fa732b1c2c19cfcb6a6af7c213fa3853d2 Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Fri, 25 Apr 2025 13:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue              |  2 +-
 src/views/compilation/handbook/index.vue      | 20 ++++------
 src/views/compilation/knowledge/index.vue     |  2 +-
 src/views/components/ProjectDetails/Basic.vue |  4 +-
 .../components/ProjectDetails/Months.vue      | 40 +++++++++----------
 src/views/components/analysis/message.vue     |  2 +
 .../components/analysis/messagecompany.vue    |  2 +
 src/views/components/qiyexinxi/qiyexinxi.vue  |  2 +-
 .../components/zhengwuxinxi/zhengwuxinxi.vue  | 12 +++++-
 src/views/evalute/supervision/index.vue       |  2 +-
 src/views/manage-add/index.vue                |  6 +--
 src/views/manage-info/index.vue               | 19 ++++-----
 src/views/models/badlist/index.vue            | 10 ++++-
 13 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 8b554ae..895daa4 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -7,7 +7,7 @@
       </div>
     </div>
     <div class="right-menu">
-      <bearicon />
+      <!-- <bearicon /> -->
       <div class="avatar-container right-menu-item hover-effect" >
         <div class="avatar-wrapper">
           <div v-if="checkRole(['common'])">
diff --git a/src/views/compilation/handbook/index.vue b/src/views/compilation/handbook/index.vue
index 5a2a1ca..d9b6fd3 100644
--- a/src/views/compilation/handbook/index.vue
+++ b/src/views/compilation/handbook/index.vue
@@ -52,7 +52,7 @@
         >
       </div>
       <el-table v-loading="loading" :data="postList">
-        <el-table-column type="selection" width="55" align="center" /> -->
+        <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center">
           <template slot-scope="scope">
             <span>{{ scope.$index + 1 }}</span>
@@ -63,33 +63,29 @@
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button
-              
               type="text"
-              style="color: gray"
+             style="color: #409eff"
               @click="handlePreview(scope.row)"
               >预览</el-button
             >
             <el-button
-              
               type="text"
               style="color: #67c23a"
               @click="handleEdit(scope.row)"
               >编辑</el-button
             >
             <el-button
-              
-              type="text"
-              style="color: #f56c6c"
-              @click="handleDelete(scope.row)"
-              >删除</el-button
-            >
-            <el-button
-              size="mini"
               type="text"
               style="color: #409eff"
               @click="handleExport(scope.row.id)"
               >项目手册导出</el-button
             >
+            <el-button
+              type="text"
+              style="color: #f56c6c"
+              @click="handleDelete(scope.row)"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/compilation/knowledge/index.vue b/src/views/compilation/knowledge/index.vue
index 28dfda2..12aaf01 100644
--- a/src/views/compilation/knowledge/index.vue
+++ b/src/views/compilation/knowledge/index.vue
@@ -65,7 +65,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button size="medium" type="text" @click="getInfo(scope.row)">详情</el-button>
-            <el-button size="medium" type="text" @click="handleUpdate(scope.row)">编辑</el-button>
+            <el-button size="medium" type="text" @click="handleUpdate(scope.row)" style="color: #67c23a">编辑</el-button>
             <el-button size="medium" type="text" @click="handleDelete(scope.row)" style="color: red;">删除</el-button>
           </template>
         </el-table-column>
diff --git a/src/views/components/ProjectDetails/Basic.vue b/src/views/components/ProjectDetails/Basic.vue
index 78767b0..dc68376 100644
--- a/src/views/components/ProjectDetails/Basic.vue
+++ b/src/views/components/ProjectDetails/Basic.vue
@@ -30,7 +30,7 @@
             <div class="descriptionsdiv">
                 <el-descriptions class="margin-top" :column="3" border>
                     <el-descriptions-item v-for="(item, index) in descriptions" :key="index"
-                        :span="item.label === '项目法人单位简介' || item.label === '统一信用代码' ? 3 : 1">
+                        :span="item.label === '项目法人单位简介' || item.label === '统一社会信用代码' ? 3 : 1">
                         <template slot="label">
                             {{ item.label }}
                         </template>
@@ -411,7 +411,7 @@ export default {
                 { label: '施工许可证发放时间', value: data.issuingTime },
                 { label: '竣工验收时间', value: data.acceptanceTime },
                 { label: '建设进度', value: data.jsjd },
-                { label: '统一信用代码', value: data.tyshxydm },
+                { label: '统一社会信用代码', value: data.tyshxydm },
                 { label: '项目法人单位简介', value: data.unitIntroduction },
                 { label: '项目简介', value: data.introduction }
             ];
diff --git a/src/views/components/ProjectDetails/Months.vue b/src/views/components/ProjectDetails/Months.vue
index 0101644..93da9d3 100644
--- a/src/views/components/ProjectDetails/Months.vue
+++ b/src/views/components/ProjectDetails/Months.vue
@@ -76,7 +76,7 @@
 
 <script>
 // 查看详情信息
-import { getMonthInformationPage } from "@/api/ManageApi/index";
+// import { getMonthInformationPage } from "@/api/ManageApi/index";
 //在Apitwo里
 import { updateProjectProgress, deletemonth } from "@/api/manageApitwo/index";
 import { checkPermi, checkRole } from "@/utils/permission";
@@ -145,7 +145,7 @@ export default {
           row.isEditing = false;
           row.status = "已更新"; 
           
-          this.getMonthInformationPage();
+          // this.getMonthInformationPage();
         } else {
           this.$message.error(response.msg || "更新失败");
           Object.assign(row, row.originalData);
@@ -187,7 +187,7 @@ export default {
               // 如果当前页没有数据且不是第一页，则返回上一页
               if (this.tableData.length === 0 && this.current > 1) {
                 this.current -= 1;
-                this.getMonthInformationPage();
+                // this.getMonthInformationPage();
               }
             } else {
               this.$message.error(response.msg || "删除失败");
@@ -204,26 +204,26 @@ export default {
           });
         });
     },
-    async getMonthInformationPage() {
-      try {
-        const response = await getMonthInformationPage({ zwId: this.zwId });
+    // async getMonthInformationPage() {
+    //   try {
+    //     const response = await getMonthInformationPage({ zwId: this.zwId });
 
-        if (Array.isArray(response.data.records) && response.data.records.length > 0) {
-          this.tableData = response.data.records;
-          this.total = response.data.total || 0;
-        } else {
-          // 空数组保留为空数组
-          this.tableData = [];
-          this.total = 0;
-        }
-      } catch (error) {
-        console.error("获取月度进展信息失败:", error);
-        this.$message.error("获取月度进展信息失败");
-      }
-    },
+    //     if (Array.isArray(response.data.records) && response.data.records.length > 0) {
+    //       this.tableData = response.data.records;
+    //       this.total = response.data.total || 0;
+    //     } else {
+    //       // 空数组保留为空数组
+    //       this.tableData = [];
+    //       this.total = 0;
+    //     }
+    //   } catch (error) {
+    //     console.error("获取月度进展信息失败:", error);
+    //     this.$message.error("获取月度进展信息失败");
+    //   }
+    // },
   },
   created() {
-    this.getMonthInformationPage();
+    // this.getMonthInformationPage();
   },
 };
 </script>
diff --git a/src/views/components/analysis/message.vue b/src/views/components/analysis/message.vue
index a9ee8fe..102cd9a 100644
--- a/src/views/components/analysis/message.vue
+++ b/src/views/components/analysis/message.vue
@@ -15,7 +15,9 @@
             </el-table-column>
             <el-table-column prop="alertTime">
                 <template slot-scope="scope">
+                    <span :style="{ color: scope.row.isRead === 2 ? '#ccc' : 'inherit' }">
                     {{ formatDate(scope.row.alertTime) }}
+                    </span>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/src/views/components/analysis/messagecompany.vue b/src/views/components/analysis/messagecompany.vue
index 66c7a65..1541459 100644
--- a/src/views/components/analysis/messagecompany.vue
+++ b/src/views/components/analysis/messagecompany.vue
@@ -15,7 +15,9 @@
             </el-table-column>
             <el-table-column prop="alertTime">
                 <template slot-scope="scope">
+                    <span :style="{ color: scope.row.isRead === 2 ? '#ccc' : 'inherit' }">
                     {{ formatDate(scope.row.alertTime) }}
+                    </span>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/src/views/components/qiyexinxi/qiyexinxi.vue b/src/views/components/qiyexinxi/qiyexinxi.vue
index 15d9f44..8a61e65 100644
--- a/src/views/components/qiyexinxi/qiyexinxi.vue
+++ b/src/views/components/qiyexinxi/qiyexinxi.vue
@@ -87,7 +87,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="项目法人单位" align="center" prop="xmfrdwxz" width="200" />
-                <el-table-column label="统一信用代码" align="center" prop="tyshxydm" width="200" />
+                <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200" />
                 <el-table-column label="项目建设起止时间" align="center" width="200">
                     <template slot-scope="scope">
                         {{ scope.row.begainTime }} 至 {{ scope.row.endTime }}
diff --git a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
index 899441e..a59b5bb 100644
--- a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
+++ b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
@@ -25,7 +25,7 @@
                     </el-col>
                     <el-col :span="5">
                         <el-form-item label="现状分类">
-                            <el-select v-model="queryParams.xzfl" placeholder="现状分类" clearable>
+                            <el-select v-model="queryParams.xzfl" placeholder="请选择现状分类" clearable>
                                 <el-option v-for="dict in dict.type.xzfl" :key="dict.value" :label="dict.label"
                                     :value="dict.value" />
                             </el-select>
@@ -39,6 +39,14 @@
                     </el-col>
                 </el-row>
                 <el-row>
+                    <el-col :span="5">
+                        <el-form-item label="当前状态">
+                            <el-select v-model="queryParams.status" placeholder="选择当前状态" clearable>
+                                <el-option v-for="dict in dict.type.tbzt" :key="dict.value" :label="dict.label"
+                                    :value="dict.value" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="8">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
@@ -106,7 +114,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="项目法人单位" align="center" prop="xmfrdwxz" width="200" />
-                <el-table-column label="统一信用代码" align="center" prop="tyshxydm" width="200" />
+                <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200" />
                 <el-table-column label="项目建设起止时间" align="center" width="200">
                     <template slot-scope="scope">
                         {{ formatMonth(scope.row.begainTime) }} 至 {{ formatMonth(scope.row.endTime) }}
diff --git a/src/views/evalute/supervision/index.vue b/src/views/evalute/supervision/index.vue
index af5191c..b937dc9 100644
--- a/src/views/evalute/supervision/index.vue
+++ b/src/views/evalute/supervision/index.vue
@@ -42,7 +42,7 @@
         :data="tableData"
         style="width: 100%"
         @selection-change="handleSelectionChange"
-      >
+       >
         <!-- <el-table-column type="selection" align="center" /> -->
         <el-table-column label="序号" width="80" align="center">
           <template slot-scope="scope">
diff --git a/src/views/manage-add/index.vue b/src/views/manage-add/index.vue
index 31e317a..4f6fbe0 100644
--- a/src/views/manage-add/index.vue
+++ b/src/views/manage-add/index.vue
@@ -150,7 +150,7 @@ export default {
                 { id: 'basic', label: '基本信息' },
                 { id: 'programme', label: '规划信息' },
                 { id: 'buildings', label: '建筑信息' },
-                { id: 'models', label: '要素模型信息' },
+                { id: 'models', label: '五要素模型信息' },
                 { id: 'months', label: '月度进展信息' },
                 { id: 'companyenter', label: '企业入驻信息' },
                 { id: 'projectpicture', label: '项目画像' },
@@ -250,7 +250,7 @@ export default {
         showCompanySection() {
             const isCompany = this.checkRole(['company']);
             const isCommon = this.checkRole(['common']);
-            // 如果两个角色都存在，则隐藏企业端
+            // 隐藏企业端
             return isCompany && !isCommon;
         }
     },
@@ -344,7 +344,6 @@ export default {
                 })
                 .catch(error => {
                     this.$message.error('审核失败');
-                    console.error('审核错误:', error);
                 })
                 .finally(() => {
                     loading.close();
@@ -368,7 +367,6 @@ export default {
                 })
                 .catch(error => {
                     this.$message.error('修改失败');
-                    console.error('修改错误:', error);
                 })
                 .finally(() => {
                     loading.close();
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index 37b850e..301c930 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -232,8 +232,7 @@ export default {
         checkPermi,
         checkRole,
         loadData() {
-            // console.log('Loading data for project ID:', this.projectId);
-            this.loading = true; // 添加加载状态
+            this.loading = true; 
             getBasicInformationById(this.projectId).then(response => {
                 const data = response.data;
                 this.basicInformation = data.basicInformation;
@@ -243,8 +242,6 @@ export default {
                 this.qyrzInformation = data.qyrzInformation;
                 this.projectRemarks = data.projectRemarks;
 
-                // 确保数据已加载
-                // console.log('Loaded qyrzInformation111111111111:', this.qyrzInformation);
             }).finally(() => {
                 this.loading = false;
             });
@@ -263,9 +260,9 @@ export default {
             }
         },
         goBack() {
-            this.$router.go(-1); // 返回上一个页面
+            this.$router.go(-1); 
         },
-        // 处理来自子组件的数据更新
+        // 子组件的
         handleDataUpdate(dataKey, updatedData) {
             if (dataKey === 'projectOtherInfos' || dataKey === 'wysmxInformations') {
                 if (Array.isArray(updatedData)) {
@@ -289,7 +286,7 @@ export default {
         },
         // 暂存数据
         saveAll() {
-            // 创建全局加载动画
+            // 全局加载动画
             const loading = this.$loading({
                 lock: true,
                 text: '正在暂存中...',
@@ -297,19 +294,17 @@ export default {
                 background: 'rgba(0, 0, 0, 0.7)'
             });
 
-            const tempData = this.prepareSubmitData(); // 复用数据准备逻辑
+            const tempData = this.prepareSubmitData(); // 复用数据
 
             tempBasicInformation(tempData)
                 .then(response => {
-                    // 请求成功
                     this.$message.success('暂存成功');
                 })
                 .catch(error => {
-                    // 请求失败
                     this.$message.error('暂存失败');
                 })
                 .finally(() => {
-                    // 关闭加载动画
+                    // 关闭动画
                     loading.close();
                 });
         },
@@ -370,7 +365,7 @@ export default {
 
             // 准备数据并提交
             const submitData = this.prepareSubmitData();
-            // console.log('准备提交的完整数据:', JSON.stringify(submitData, null, 2)); // 打印完整数据
+            // console.log('准备提交的完整数据:', JSON.stringify(submitData, null, 2)); 
 
             fillBasicInformation(submitData)
                 .then(response => {
diff --git a/src/views/models/badlist/index.vue b/src/views/models/badlist/index.vue
index 34fa2d7..22114a9 100644
--- a/src/views/models/badlist/index.vue
+++ b/src/views/models/badlist/index.vue
@@ -39,6 +39,14 @@
                     </el-col>
                 </el-row>
                 <el-row>
+                    <el-col :span="5">
+                        <el-form-item label="当前状态">
+                            <el-select v-model="queryParams.status" placeholder="选择当前状态" clearable>
+                                <el-option v-for="dict in dict.type.tbzt" :key="dict.value" :label="dict.label"
+                                    :value="dict.value" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="8">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search"
@@ -97,7 +105,7 @@
 import { getBasicInformationPage, deleteBasicInformation } from "@/api/ManageApi/index";
 import { checkPermi, checkRole } from "@/utils/permission";
 export default {
-    dicts: ["xzfl"],
+    dicts: ["xzfl","tbzt"],
     data() {
         return {
             // 遮罩层