From de61b733db02209cbced65459810ebc0351ac212 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Fri, 16 Sep 2022 14:21:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?app2.0=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=AD=A6?=
=?UTF-8?q?=E7=94=9F=E6=97=A5=E5=B8=B8=E8=A7=84=E7=AE=A1=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Learun.Application.WebApi.csproj | 1 +
.../Acc_StuDayRoutineApi.cs | 108 +++++
.../LearunApp-2.2.0/pages.json | 13 +
.../Acc_StuDayRoutine/list.vue | 385 ++++++++++++++++++
.../Acc_StuDayRoutine/single.vue | 331 +++++++++++++++
5 files changed, 838 insertions(+)
create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_StuDayRoutineApi.cs
create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue
create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
index a50c8539e..e2fc1214b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
@@ -198,6 +198,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_StuDayRoutineApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_StuDayRoutineApi.cs
new file mode 100644
index 000000000..b1db35bd3
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_StuDayRoutineApi.cs
@@ -0,0 +1,108 @@
+using Nancy;
+using Learun.Util;
+using System.Collections.Generic;
+using System;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+
+namespace Learun.Application.WebApi
+{
+ ///
+ /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园
+ /// Copyright (c) 2013-2018 北京泉江科技有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2022-09-16 14:43
+ /// 描 述:学生日常规管理
+ ///
+ public class Acc_StuDayRoutineApi : BaseApi
+ {
+ private Acc_StuDayRoutineIBLL acc_StuDayRoutineIBLL = new Acc_StuDayRoutineBLL();
+
+ ///
+ /// 注册接口
+ ///
+ public Acc_StuDayRoutineApi()
+ : base("/Learun/adms/LogisticsManagement/Acc_StuDayRoutine")
+ {
+ Get["/pagelist"] = GetPageList;
+ Get["/form"] = GetForm;
+ Post["/delete"] = DeleteForm;
+ Post["/save"] = SaveForm;
+ }
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表分页数据
+ ///
+ ///
+ ///
+ public Response GetPageList(dynamic _)
+ {
+ ReqPageParam parameter = this.GetReqData();
+ var data = acc_StuDayRoutineIBLL.GetPageList(parameter.pagination, parameter.queryJson);
+ var jsonData = new
+ {
+ rows = data,
+ total = parameter.pagination.total,
+ page = parameter.pagination.page,
+ records = parameter.pagination.records
+ };
+ return Success(jsonData);
+ }
+ ///
+ /// 获取表单数据
+ ///
+ ///
+ ///
+ public Response GetForm(dynamic _)
+ {
+ string keyValue = this.GetReqData();
+ var Acc_StuDayRoutineData = acc_StuDayRoutineIBLL.GetAcc_StuDayRoutineEntity(keyValue);
+ var jsonData = new
+ {
+ Acc_StuDayRoutine = Acc_StuDayRoutineData,
+ };
+ return Success(jsonData);
+ }
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ ///
+ ///
+ public Response DeleteForm(dynamic _)
+ {
+ string keyValue = this.GetReqData();
+ acc_StuDayRoutineIBLL.DeleteEntity(keyValue);
+ return Success("删除成功!");
+ }
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ ///
+ ///
+ public Response SaveForm(dynamic _)
+ {
+ ReqFormEntity parameter = this.GetReqData();
+ Acc_StuDayRoutineEntity entity = parameter.strEntity.ToObject();
+ acc_StuDayRoutineIBLL.SaveEntity(parameter.keyValue, entity);
+ return Success("保存成功!");
+ }
+ #endregion
+
+ #region 私有类
+
+ ///
+ /// 表单实体类
+ ///
+ private class ReqFormEntity
+ {
+ public string keyValue { get; set; }
+ public string strEntity { get; set; }
+ }
+ #endregion
+
+ }
+}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
index f4cf4d1ae..4f49600f8 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
@@ -1045,6 +1045,19 @@
"style": {
"navigationBarTitleText": "详情"
}
+ },
+ //学生日常规管理
+ {
+ "path": "pages/LogisticsManagement/Acc_StuDayRoutine/list",
+ "style": {
+ "navigationBarTitleText": "学生日常规管理"
+ }
+ },
+ {
+ "path": "pages/LogisticsManagement/Acc_StuDayRoutine/single",
+ "style": {
+ "navigationBarTitleText": "详情"
+ }
}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue
new file mode 100644
index 000000000..42cbea6bc
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/list.vue
@@ -0,0 +1,385 @@
+
+
+
+
+
+ {{ tips }}
+
+
+
+
+
+
+
+
+ 专业部:
+ {{ displayListItem(item, 'DeptNo') }}
+
+
+ 专业:
+ {{ displayListItem(item, 'MajorNo') }}
+
+
+ 班级:
+ {{ displayListItem(item, 'ClassNo') }}
+
+
+ 学生姓名:
+ {{ displayListItem(item, 'StuNo') }}
+
+
+
+ 日期:
+ {{ displayListItem(item, 'Date') }}
+
+
+
+ 奖分:
+ {{ displayListItem(item, 'AddScore') }}
+
+
+ 扣分:
+ {{ displayListItem(item, 'MinusScore') }}
+
+
+
+ 奖扣分原因:
+ {{ displayListItem(item, 'Reason') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置查询条件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue
new file mode 100644
index 000000000..0b4b5d4b8
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue
@@ -0,0 +1,331 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交保存
+
+
+ 取消编辑
+
+
+
+
+
+
+
\ No newline at end of file
From 109d5bf79e051157d666a31b3c9b81daa0fb2d8c Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Fri, 16 Sep 2022 18:19:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91webapi?=
=?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=AE=BF=E8=88=8D=E7=89=A9=E5=93=81?=
=?UTF-8?q?=E6=8D=9F=E5=9D=8F=E4=B8=8A=E6=8A=A5=E6=8E=A5=E5=8F=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/Acc_GoodsDemageController.cs | 4 +-
.../Learun.Application.WebApi.csproj | 1 +
.../LogisticsManagement/Acc_GoodsDemageApi.cs | 109 ++++++++++++++++++
3 files changed, 111 insertions(+), 3 deletions(-)
create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs
index 770cd848a..5494939a2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs
@@ -104,9 +104,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
{
Acc_GoodsDemageEntity entity = strEntity.ToObject();
var loginUserInfo = LoginUserInfo.Get();
- entity.F_CreateAccount = loginUserInfo.account;
- entity.F_CreateUserId = loginUserInfo.userId;
- entity.F_CreateDate = DateTime.Now;
+ entity.F_CreateAccount = loginUserInfo.account;//上报学生学号
acc_GoodsDemageIBLL.SaveEntity(keyValue,entity);
return Success("保存成功!");
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
index e2fc1214b..44223121a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj
@@ -198,6 +198,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs
new file mode 100644
index 000000000..f91e166c1
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs
@@ -0,0 +1,109 @@
+using Nancy;
+using Learun.Util;
+using System.Collections.Generic;
+using System;
+using Learun.Application.TwoDevelopment.LogisticsManagement;
+
+namespace Learun.Application.WebApi
+{
+ ///
+ /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园
+ /// Copyright (c) 2013-2018 北京泉江科技有限公司
+ /// 创 建:超级管理员
+ /// 日 期:2022-09-16 14:43
+ /// 描 述:宿舍物品损坏上报
+ ///
+ public class Acc_GoodsDemageApi : BaseApi
+ {
+ private Acc_GoodsDemageIBLL acc_GoodsDemageIBLL = new Acc_GoodsDemageBLL();
+
+ ///
+ /// 注册接口
+ ///
+ public Acc_GoodsDemageApi()
+ : base("/Learun/adms/LogisticsManagement/Acc_GoodsDemage")
+ {
+ Get["/pagelist"] = GetPageList;
+ Get["/form"] = GetForm;
+ Post["/delete"] = DeleteForm;
+ Post["/save"] = SaveForm;
+ }
+ #region 获取数据
+
+ ///
+ /// 获取页面显示列表分页数据
+ ///
+ ///
+ ///
+ public Response GetPageList(dynamic _)
+ {
+ ReqPageParam parameter = this.GetReqData();
+ var data = acc_GoodsDemageIBLL.GetPageList(parameter.pagination, parameter.queryJson);
+ var jsonData = new
+ {
+ rows = data,
+ total = parameter.pagination.total,
+ page = parameter.pagination.page,
+ records = parameter.pagination.records
+ };
+ return Success(jsonData);
+ }
+ ///
+ /// 获取表单数据
+ ///
+ ///
+ ///
+ public Response GetForm(dynamic _)
+ {
+ string keyValue = this.GetReqData();
+ var Acc_GoodsDemageData = acc_GoodsDemageIBLL.GetAcc_GoodsDemageEntity(keyValue);
+ var jsonData = new
+ {
+ Acc_GoodsDemage = Acc_GoodsDemageData,
+ };
+ return Success(jsonData);
+ }
+ #endregion
+
+ #region 提交数据
+
+ ///
+ /// 删除实体数据
+ ///
+ ///
+ ///
+ public Response DeleteForm(dynamic _)
+ {
+ string keyValue = this.GetReqData();
+ acc_GoodsDemageIBLL.DeleteEntity(keyValue);
+ return Success("删除成功!");
+ }
+ ///
+ /// 保存实体数据(新增、修改)
+ ///
+ ///
+ ///
+ public Response SaveForm(dynamic _)
+ {
+ ReqFormEntity parameter = this.GetReqData();
+ Acc_GoodsDemageEntity entity = parameter.strEntity.ToObject();
+ entity.F_CreateAccount = LoginUserInfo.Get().account;
+ acc_GoodsDemageIBLL.SaveEntity(parameter.keyValue, entity);
+ return Success("保存成功!");
+ }
+ #endregion
+
+ #region 私有类
+
+ ///
+ /// 表单实体类
+ ///
+ private class ReqFormEntity
+ {
+ public string keyValue { get; set; }
+ public string strEntity { get; set; }
+ }
+ #endregion
+
+ }
+}
From fd31e65979a1d3fa910d494dd83ce5c81cb820a8 Mon Sep 17 00:00:00 2001
From: liangkun
Date: Mon, 19 Sep 2022 11:50:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?app=E4=B8=8A=E4=BC=A0=E6=8F=92=E4=BB=B6?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../LearunApp-2.2.0/common/customform.js | 4 ++--
.../LearunApp-2.2.0/common/mixins.js | 8 ++++++++
.../LearunApp-2.2.0/components/learun-app/upload-file.vue | 6 ++++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js
index 9952a5154..85892fae6 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js
@@ -314,8 +314,8 @@ export default {
var uploadUid = '';
for (const item of val) {
- if (item.uid) {
- uploadUid = item.uid
+ if (item.folderId) {
+ uploadUid = item.folderId
continue
}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js
index a1edafd79..00875baae 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js
@@ -229,6 +229,14 @@ export default {
return await this.HTTP_GET('learun/adms/annexes/wxfileinfo', fileId)
},
+ //删除指定id的文件信息
+ async DELETE_FILE(fileId) {
+ if (!fileId) {
+ return null
+ }
+
+ return await this.HTTP_POST('learun/adms/annexes/wxdelete', fileId);
+ },
//获取文件夹下文件列表
async FETCH_FILEList(folderId) {
if (!folderId) {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue
index 9d1a0b39d..bdeb390ce 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue
@@ -23,7 +23,7 @@
-
+
@@ -66,7 +66,7 @@ export default {
return ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf'].includes(typeString)
},
- async delFile(index) {
+ async delFile(index,fileId) {
if (!(await this.CONFIRM('删除文件', '确定要删除该文件吗?', true))) {
return
}
@@ -75,6 +75,8 @@ export default {
this.$emit('input', newList)
this.$emit('change')
this.$emit('del')
+ //物理删除
+ this.DELETE_FILE(fileId);
},
chooseFile() {
From 6e50ea1c0f0b48c1b46b5eb83ad5b72c7e728c91 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Tue, 20 Sep 2022 09:26:10 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A-?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../EducationalAdministration/Views/StuVolunteerPhone/server.js | 2 +-
.../Learun.Application.Web/Content/ueditor/config/config.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js
index f983d3a35..e98b2216b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js
@@ -2,7 +2,7 @@
var serverurl = "http://localhost:31173";
//当前项目地址
//var currentUrl = "http://192.168.50.127:8009";//本地
-var currentUrl = "http://219.139.155.38:443";//线上
+var currentUrl = "http://wxd3f.cyzjzx.com";//线上
//地址栏传参
function request(d) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/config/config.json b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/config/config.json
index f399b8510..ae2ae4dfe 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/config/config.json
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/config/config.json
@@ -8,7 +8,7 @@
"imageCompressEnable": true, /* 是否压缩图片,默认是true */
"imageCompressBorder": 1600, /* 图片压缩最长边限制 */
"imageInsertAlign": "none", /* 插入的图片浮动方式 */
- "imageUrlPrefix": "http://219.139.155.38:443/ueditor/", /* 图片访问路径前缀 */
+ "imageUrlPrefix": "http://wxd3f.cyzjzx.com/ueditor/", /* 图片访问路径前缀 */
"imagePathFormat": "upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
/* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
/* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */