From c03e3773fe5fb879e6bd111f073edc5451962d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=20=E8=8C=83?= <z13034679@126.com>
Date: Wed, 11 Jun 2025 13:52:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B2=E7=A7=91=EF=BC=8C=E6=9C=89=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E5=86=85=E5=AE=B9=E8=A6=81=E6=94=B9=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E3=80=821.=E8=83=BD=E6=BA=90=E4=BA=A4=E9=80=9A=E6=B0=B4?=
 =?UTF-8?q?=E5=88=A9=E4=B8=89=E4=B8=AA=E5=88=86=E7=B1=BB=E5=90=88=E6=88=90?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=EF=BC=9A=E8=83=BD=E6=BA=90=E3=80=81=E4=BA=A4?=
 =?UTF-8?q?=E9=80=9A=E3=80=81=E6=B0=B4=E5=88=A9=E5=B7=A5=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F1-14=E6=8E=92=E4=B8=8B=E5=8E=BB=E3=80=822.?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E4=B8=AD=EF=BC=8C=E6=B7=98=E6=B1=B0=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=8D=E5=90=8C=E6=84=8F=E3=80=82=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9D=A5=E5=BE=97=E5=8F=8A=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ewide.Web.Entry/wwwroot/html/yjbvote2025/index.html       | 4 ++--
 .../Vote.Services/ApiController/Projects2025Service.cs        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote2025/index.html b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote2025/index.html
index eda39fb..cf58f41 100644
--- a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote2025/index.html
+++ b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote2025/index.html
@@ -25,7 +25,7 @@ maximum-scale=1.0, user-scalable=no" />
                         <template>
                             <el-radio-group v-model="project.vote">
                                 <el-radio label="true">同意</el-radio>
-                                <el-radio label="false">淘汰</el-radio>
+                                <el-radio label="false">不同意</el-radio>
                             </el-radio-group>
                         </template>
                     </el-descriptions-item>
@@ -41,7 +41,7 @@ maximum-scale=1.0, user-scalable=no" />
                         <template>
                             <el-radio-group v-model="project.vote">
                                 <el-radio label="true">同意</el-radio>
-                                <el-radio label="false">淘汰</el-radio>
+                                <el-radio label="false">不同意</el-radio>
                             </el-radio-group>
                         </template>
                     </el-descriptions-item>
diff --git a/20220330_Vote/Vote.Services/ApiController/Projects2025Service.cs b/20220330_Vote/Vote.Services/ApiController/Projects2025Service.cs
index a413577..5b90cc0 100644
--- a/20220330_Vote/Vote.Services/ApiController/Projects2025Service.cs
+++ b/20220330_Vote/Vote.Services/ApiController/Projects2025Service.cs
@@ -62,7 +62,8 @@ namespace Vote.Services.ApiController
         [Microsoft.AspNetCore.Authorization.AllowAnonymous]
         public async Task<dynamic> List(ProjectsInput args)
         {
-            var typeList = new List<string> { "房建工程", "市政工程", "轨道交通工程", "能源工程", "交通工程", "水利工程" };
+            //var typeList = new List<string> { "房建工程", "市政工程", "轨道交通工程", "能源工程", "交通工程", "水利工程" };
+            var typeList = new List<string> { "房建工程", "市政工程", "轨道交通工程", "能源、交通、水利工程" };
             var data = await rep_Projects2025.DetachedEntities.Where(p => !p.IsDeleted)
                 .Where(args.type != null, a => (int)a.type == args.type)
                 .Where(args.is_no_inspection != null, a => (int)a.is_no_inspection == args.is_no_inspection)