From 93e9ae19f84c12222c7f89eae545e19af01023e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=9C=B2=E5=B0=A7?= <z13034679@126.com>
Date: Thu, 14 Sep 2023 21:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=A2=9E=E4=B8=93?=
 =?UTF-8?q?=E5=AE=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/html/yjbvote/Expert.html          | 62 ++++++++++++++++++-
 .../wwwroot/html/yjbvote/VoteResult.html      |  2 +
 .../ApiController/ProjectsService.cs          | 30 ++++++++-
 .../Vote.Services/Dto/ProjectsInput.cs        |  5 ++
 .../Vote.Services/Vote.Services.csproj        |  1 +
 20220330_Vote/Vote.Services/Vote.Services.xml |  6 ++
 6 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/Expert.html b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/Expert.html
index d278e5c..a7b7103 100644
--- a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/Expert.html
+++ b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/Expert.html
@@ -27,7 +27,34 @@
         <h3 style="text-align:center;">
             <el-button @click="load_vote">刷新数据</el-button>
             <el-button @click="show_expert_vote">查看项目投票情况</el-button>
+            <el-button @click="show_dialog">新增专家</el-button>
         </h3>
+        <el-dialog title="新增专家" :visible.sync="dialogVisible" width="20%">
+            <div class="blocks">
+                <el-input v-model="addexpertnum" placeholder="输入新增专家个数" style="width:100px"></el-input>
+                <el-button @click="add_expert">确定</el-button>
+            </div>
+        </el-dialog>
+        <!--<el-dialog v-model="dialogVisible" title="弹框" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" append-to-body width="60%">
+            <el-form :model="pageData.loginForm" ref="loginFormRef" label-position="top">
+                <el-form-item label="手机号码" label-width="80px" prop="phone" :rules="[{ required: true, trigger: 'blur', min: 11, max: 11, message: '请输入正确的手机号码' }]">
+                    <el-input v-model="pageData.loginForm.phone" autocomplete="off" />
+                </el-form-item>
+                <el-form-item label="验证码" label-width="80px" prop="code" :rules="[{ required: true, trigger: 'blur', min: 4, max: 4, message: '请输入验证码' }]">
+                    <el-input type="text" maxlength="4" placeholder="验证码" v-model="pageData.loginForm.code">
+                        <template slot="append" #append>
+                            <el-button :disabled="pageData.loginForm.disabled" @click="(v,v2)=>funHandles.getCode(v,pageData,loginFormRef)">{{ pageData.loginForm.valiBtn }}</el-button>
+                        </template>
+                    </el-input>
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">-->
+        <!--<el-button @click="dialogFormVisible = false">Cancel</el-button>-->
+        <!--<el-button type="primary" @click="(v,v2)=>funHandles.verifyKey(pageData,loginFormRef)">登录</el-button>
+                </span>
+            </template>
+        </el-dialog>-->
     </div>
 </body>
 <style scoped>
@@ -43,7 +70,9 @@
             return {
                 tableData: [],
                 loading: false,
-                token: ''
+                token: '',
+                dialogVisible: false,
+                addexpertnum: 0
             }
         },
         created: function () {
@@ -79,6 +108,8 @@
                     console.log(_this.tableData)
                     _this.loading = false;
                 }).catch(function (error) {
+                    if (error.response.status == 403)
+                        location = '../manage/login.html'
                     console.log(error)
                     _this.$message({
                         type: 'error',
@@ -108,6 +139,35 @@
                 };
                 return fmt;
             }
+            ,
+            show_dialog() {
+                this.dialogVisible = true
+            }
+            ,
+            add_expert() {
+                this.loading = true;
+                let _this = this;
+                axios({
+                    headers: { 'Content-Type': 'application/json;charset=UTF-8' },
+                    method: 'post',
+                    url: '/gb/yjb/api/projects/expert',
+                    data: { expertnum: this.addexpertnum },
+                    responseType: "json",
+                    headers: {
+                        Authorization: 'Bearer ' + _this.token
+                    }
+                }).then(function (response) {
+                    _this.loading = false;
+                    location.reload();
+                }).catch(function (error) {
+                    console.log(error)
+                    _this.$message({
+                        type: 'error',
+                        message: error.message
+                    })
+                    _this.loading = false;
+                })
+            }
         }
     })
 </script>
diff --git a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html
index 235c691..574622a 100644
--- a/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html
+++ b/20220330_Vote/Ewide.Web.Entry/wwwroot/html/yjbvote/VoteResult.html
@@ -109,6 +109,8 @@
                     //console.log(_this.tableData0)
                     _this.loading = false;
                 }).catch(function (error) {
+                    if (error.response.status == 403)
+                        location = '../manage/login.html'
                     console.log(error)
                     _this.$message({
                         type: 'error',
diff --git a/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs b/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs
index 88d2f2c..53fd14f 100644
--- a/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs
+++ b/20220330_Vote/Vote.Services/ApiController/ProjectsService.cs
@@ -7,11 +7,14 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Vote.Services.Dto;
+using Vote.Services.Entities;
+using static Vote.Services.Dto.ProjectsList2Output;
 
 namespace Vote.Services.ApiController
 {
@@ -177,7 +180,9 @@ namespace Vote.Services.ApiController
         {
             var list = await rep_Experts.DetachedEntities.GroupJoin(rep_VoteRecords.DetachedEntities, a => a.login_code, a => a.expert_login_code, (a, b) => new { a, b })
                 .SelectMany(a => a.b.DefaultIfEmpty(), (a, b) => new { a.a.Id, a.a.login_code, is_vote = b != null })
-                .Distinct().ToListAsync();
+                .Distinct()
+                .OrderBy(a => a.Id)
+                .ToListAsync();
             return list;
             //var query = from a in rep_Experts.DetachedEntities
             //            join b in rep_VoteRecords.DetachedEntities on a.login_code equals b.expert_login_code into temp
@@ -193,5 +198,28 @@ namespace Vote.Services.ApiController
 
         }
 
+        /// <summary>
+        /// 新增专家
+        /// </summary> 
+        /// <returns></returns> 
+        [HttpPost]
+        public async Task AddExpert(AddExpertInput args)
+        {
+            if (args == null || args.expertnum <= 0)
+                throw Oops.Oh("参数异常");
+            var list = new List<Experts>();
+            for (int i = 0; i < args.expertnum; i++)
+            {
+                var newid = Ulid.NewUlid().ToString();
+                var newidsimple = newid.ToUpper().Replace("I", "").Replace("L", "").Replace("0", "").Replace("O", "").Replace("1", "");
+                list.Add(new Experts
+                {
+                    Id = newid,
+                    login_code = newidsimple.Substring(newidsimple.Length - 6, 6),
+                    CreatedTime = DateTime.Now
+                });
+            }
+            await rep_Experts.InsertAsync(list);
+        }
     }
 }
diff --git a/20220330_Vote/Vote.Services/Dto/ProjectsInput.cs b/20220330_Vote/Vote.Services/Dto/ProjectsInput.cs
index a809e67..ff898db 100644
--- a/20220330_Vote/Vote.Services/Dto/ProjectsInput.cs
+++ b/20220330_Vote/Vote.Services/Dto/ProjectsInput.cs
@@ -111,5 +111,10 @@ namespace Vote.Services.Dto
                 return type.GetEnumDescription();
             }
         }
+        public class AddExpertInput
+        {
+            [Required]
+            public int expertnum { get; set; }
+        }
     }
 }
diff --git a/20220330_Vote/Vote.Services/Vote.Services.csproj b/20220330_Vote/Vote.Services/Vote.Services.csproj
index a22340d..77b197a 100644
--- a/20220330_Vote/Vote.Services/Vote.Services.csproj
+++ b/20220330_Vote/Vote.Services/Vote.Services.csproj
@@ -14,6 +14,7 @@
     <PackageReference Include="NPOI" Version="2.6.0" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
+    <PackageReference Include="Ulid" Version="1.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/20220330_Vote/Vote.Services/Vote.Services.xml b/20220330_Vote/Vote.Services/Vote.Services.xml
index 9dc6c79..b8bbdb7 100644
--- a/20220330_Vote/Vote.Services/Vote.Services.xml
+++ b/20220330_Vote/Vote.Services/Vote.Services.xml
@@ -244,6 +244,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Vote.Services.ApiController.ProjectsService.AddExpert(Vote.Services.Dto.ProjectsList2Output.AddExpertInput)">
+            <summary>
+            新增专家
+            </summary> 
+            <returns></returns> 
+        </member>
         <member name="T:Vote.Services.ApiController.WxService">
             <summary>
             微信