From c30613b00e9d5b8e74a3d39a41111faaddbb1ee8 Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Fri, 11 Apr 2025 10:04:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E8=AF=BB=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |  2 +-
 .../ProjectDetails/Companyenter.vue           |  2 +-
 src/views/components/analysis/message.vue     | 26 +++++++++++++++----
 .../components/analysis/messagecompany.vue    | 26 +++++++++++++++----
 vue.config.js                                 |  4 +--
 5 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/.env.production b/.env.production
index 97cacc7..d0986ca 100644
--- a/.env.production
+++ b/.env.production
@@ -5,4 +5,4 @@ VUE_APP_TITLE = 苏州工业园区工业上楼管理系统
 ENV = 'production'
 
 # 苏州工业园区工业上楼管理系统/生产环境
-VUE_APP_BASE_API = 'http://39.101.188.84:7071'
+# VUE_APP_BASE_API = 'http://39.101.188.84:7071'
diff --git a/src/views/components/ProjectDetails/Companyenter.vue b/src/views/components/ProjectDetails/Companyenter.vue
index 75617e9..0d37f77 100644
--- a/src/views/components/ProjectDetails/Companyenter.vue
+++ b/src/views/components/ProjectDetails/Companyenter.vue
@@ -240,7 +240,7 @@ export default {
         ...this.form,
         rzqys: Number(this.form.rzqys),
         rysl: Number(this.form.rysl),
-        rzl: Number(this.form.r0zl),
+        rzl: Number(this.form.rzl),
         yczmj: Number(this.form.yczmj),
         kzczmj: Number(this.form.kzczmj),
         gycfpjzj: Number(this.form.gycfpjzj),
diff --git a/src/views/components/analysis/message.vue b/src/views/components/analysis/message.vue
index 3a4fe15..0dec8f3 100644
--- a/src/views/components/analysis/message.vue
+++ b/src/views/components/analysis/message.vue
@@ -7,6 +7,11 @@
                 </template>
             </el-table-column>
             <el-table-column prop="name" width="300">
+                <template slot-scope="scope">
+                    <span :style="{ color: scope.row.isRead === 2 ? 'gray' : 'inherit' }">
+                        {{ scope.row.name }}
+                    </span>
+                </template>
             </el-table-column>
             <el-table-column prop="date" width="100">
             </el-table-column>
@@ -25,10 +30,9 @@
         </el-dialog>
     </div>
 </template>
-
 <script>
 import { getAllMessages } from '@/api/ManageApi/index';
-import { markSmartReminderAsRead } from '@/api/ManageApi/index'; 
+import { markSmartReminderAsRead } from '@/api/ManageApi/index';
 
 export default {
     name: 'MessageTable',
@@ -52,15 +56,28 @@ export default {
             const response = await getAllMessages();
             if (response && response.code === 200 && response.data) {
                 this.tableData = this.processData(response.data);
+                this.sortTableData(); // 添加排序方法
             }
         },
         processData(data) {
             return data.map(item => ({
-                id: item.id, // 确保包含 id 字段
+                id: item.id,
                 name: item.content,
-                date: this.formatDate(item.createTime)
+                date: this.formatDate(item.createTime),
+                isRead: item.isRead // 确保包含 isRead 字段
             }));
         },
+        sortTableData() {
+            this.tableData.sort((a, b) => {
+                if (a.isRead === 2 && b.isRead !== 2) {
+                    return 1;
+                } else if (a.isRead !== 2 && b.isRead === 2) {
+                    return -1;
+                } else {
+                    return 0;
+                }
+            });
+        },
         getIcon(index) {
             return index === 0 ? require('@/assets/images/new@2x.png') : require('@/assets/images/other.png');
         },
@@ -88,7 +105,6 @@ export default {
                         if (response && response.code === 200) {
                             this.$message.success('消息已标记为已读');
                             this.dialogVisible = false;
-                            // 可以选择刷新数据或更新消息状态
                             this.getData(); // 刷新数据
                         } else {
                             this.$message.error('标记为已读失败');
diff --git a/src/views/components/analysis/messagecompany.vue b/src/views/components/analysis/messagecompany.vue
index e7b4036..93295e5 100644
--- a/src/views/components/analysis/messagecompany.vue
+++ b/src/views/components/analysis/messagecompany.vue
@@ -7,6 +7,11 @@
                 </template>
             </el-table-column>
             <el-table-column prop="name" width="300">
+                <template slot-scope="scope">
+                    <span :style="{ color: scope.row.isRead === 2 ? '#ccc' : 'inherit' }">
+                        {{ scope.row.name }}
+                    </span>
+                </template>
             </el-table-column>
             <el-table-column prop="date" width="100">
             </el-table-column>
@@ -25,10 +30,9 @@
         </el-dialog>
     </div>
 </template>
-
 <script>
 import { getAllMessagestwo } from '@/api/ManageApi/index';
-import { markSmartReminderAsRead } from '@/api/ManageApi/index'; 
+import { markSmartReminderAsRead } from '@/api/ManageApi/index';
 
 export default {
     name: 'MessageTable',
@@ -52,15 +56,28 @@ export default {
             const response = await getAllMessagestwo();
             if (response && response.code === 200 && response.data) {
                 this.tableData = this.processData(response.data);
+                this.sortTableData(); // 添加排序方法
             }
         },
         processData(data) {
             return data.map(item => ({
-                id: item.id, // 确保包含 id 字段
+                id: item.id,
                 name: item.content,
-                date: this.formatDate(item.createTime)
+                date: this.formatDate(item.createTime),
+                isRead: item.isRead // 确保包含 isRead 字段
             }));
         },
+        sortTableData() {
+            this.tableData.sort((a, b) => {
+                if (a.isRead === 2 && b.isRead !== 2) {
+                    return 1;
+                } else if (a.isRead !== 2 && b.isRead === 2) {
+                    return -1;
+                } else {
+                    return 0;
+                }
+            });
+        },
         getIcon(index) {
             return index === 0 ? require('@/assets/images/new@2x.png') : require('@/assets/images/other.png');
         },
@@ -88,7 +105,6 @@ export default {
                         if (response && response.code === 200) {
                             this.$message.success('消息已标记为已读');
                             this.dialogVisible = false;
-                            // 可以选择刷新数据或更新消息状态
                             this.getData(); // 刷新数据
                         } else {
                             this.$message.error('标记为已读失败');
diff --git a/vue.config.js b/vue.config.js
index 11b8b8c..bd9d4f8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,8 +37,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.0.107:7071/`,
-        target: `http://39.101.188.84:7071/`,
+        target: `http://192.168.0.107:7071/`,
+        // target: `http://39.101.188.84:7071/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''