From 8dbdc55399fea65da198339076a622ac6cf9d5eb Mon Sep 17 00:00:00 2001 From: ccongli <1441652193@qq.com> Date: Tue, 29 Aug 2023 16:21:28 +0800 Subject: [PATCH] =?UTF-8?q?Data=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=87=E9=9B=86=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Basic/ApiBaseController.cs | 12 +- vol-net6/VOL.Data/Class1.cs | 7 + .../data/IData_DeviceRepository.cs | 18 ++ .../data/IData_ProduceRepository.cs | 18 ++ .../IServices/data/IData_DeviceService.cs | 12 ++ .../IServices/data/IData_ProduceService.cs | 12 ++ .../data/Partial/IData_DeviceService.cs | 13 ++ .../data/Partial/IData_ProduceService.cs | 13 ++ .../data/Data_DeviceRepository.cs | 24 +++ .../data/Data_ProduceRepository.cs | 24 +++ .../Services/data/Data_DeviceService.cs | 27 +++ .../Services/data/Data_ProduceService.cs | 27 +++ .../data/Partial/Data_DeviceService.cs | 41 +++++ .../data/Partial/Data_ProduceService.cs | 41 +++++ vol-net6/VOL.Data/VOL.Data.csproj | 21 +++ .../DomainModels/data/Data_Device.cs | 125 +++++++++++++ .../DomainModels/data/Data_Produce.cs | 137 +++++++++++++++ .../DomainModels/data/partial/Data_Device.cs | 21 +++ .../DomainModels/data/partial/Data_Produce.cs | 21 +++ .../data/Data_DeviceMapConfig.cs | 16 ++ .../data/Data_ProduceMapConfig.cs | 16 ++ .../Controllers/Data/DataCaptureController.cs | 30 ++++ .../Controllers/Data/Data_DeviceController.cs | 21 +++ .../Data/Data_ProduceController.cs | 21 +++ .../Data/Partial/Data_DeviceController.cs | 33 ++++ .../Data/Partial/Data_ProduceController.cs | 33 ++++ .../Order/Partial/SellOrderController.cs | 2 +- vol-net6/VOL.WebApi/VOL.WebApi.csproj | 1 + vol-net6/VOL.WebApi/VOL.WebApi.csproj.user | 4 +- vol-net6/VOL.sln | 6 + .../src/extension/data/device/Data_Device.js | 75 ++++++++ .../extension/data/produce/Data_Produce.js | 75 ++++++++ vol-vue3/src/router/viewGird.js | 165 ++++++++++-------- .../src/views/data/device/Data_Device.vue | 71 ++++++++ .../src/views/data/produce/Data_Produce.vue | 75 ++++++++ 35 files changed, 1179 insertions(+), 79 deletions(-) create mode 100644 vol-net6/VOL.Data/Class1.cs create mode 100644 vol-net6/VOL.Data/IRepositories/data/IData_DeviceRepository.cs create mode 100644 vol-net6/VOL.Data/IRepositories/data/IData_ProduceRepository.cs create mode 100644 vol-net6/VOL.Data/IServices/data/IData_DeviceService.cs create mode 100644 vol-net6/VOL.Data/IServices/data/IData_ProduceService.cs create mode 100644 vol-net6/VOL.Data/IServices/data/Partial/IData_DeviceService.cs create mode 100644 vol-net6/VOL.Data/IServices/data/Partial/IData_ProduceService.cs create mode 100644 vol-net6/VOL.Data/Repositories/data/Data_DeviceRepository.cs create mode 100644 vol-net6/VOL.Data/Repositories/data/Data_ProduceRepository.cs create mode 100644 vol-net6/VOL.Data/Services/data/Data_DeviceService.cs create mode 100644 vol-net6/VOL.Data/Services/data/Data_ProduceService.cs create mode 100644 vol-net6/VOL.Data/Services/data/Partial/Data_DeviceService.cs create mode 100644 vol-net6/VOL.Data/Services/data/Partial/Data_ProduceService.cs create mode 100644 vol-net6/VOL.Data/VOL.Data.csproj create mode 100644 vol-net6/VOL.Entity/DomainModels/data/Data_Device.cs create mode 100644 vol-net6/VOL.Entity/DomainModels/data/Data_Produce.cs create mode 100644 vol-net6/VOL.Entity/DomainModels/data/partial/Data_Device.cs create mode 100644 vol-net6/VOL.Entity/DomainModels/data/partial/Data_Produce.cs create mode 100644 vol-net6/VOL.Entity/MappingConfiguration/data/Data_DeviceMapConfig.cs create mode 100644 vol-net6/VOL.Entity/MappingConfiguration/data/Data_ProduceMapConfig.cs create mode 100644 vol-net6/VOL.WebApi/Controllers/Data/DataCaptureController.cs create mode 100644 vol-net6/VOL.WebApi/Controllers/Data/Data_DeviceController.cs create mode 100644 vol-net6/VOL.WebApi/Controllers/Data/Data_ProduceController.cs create mode 100644 vol-net6/VOL.WebApi/Controllers/Data/Partial/Data_DeviceController.cs create mode 100644 vol-net6/VOL.WebApi/Controllers/Data/Partial/Data_ProduceController.cs create mode 100644 vol-vue3/src/extension/data/device/Data_Device.js create mode 100644 vol-vue3/src/extension/data/produce/Data_Produce.js create mode 100644 vol-vue3/src/views/data/device/Data_Device.vue create mode 100644 vol-vue3/src/views/data/produce/Data_Produce.vue diff --git a/vol-net6/VOL.Core/Controllers/Basic/ApiBaseController.cs b/vol-net6/VOL.Core/Controllers/Basic/ApiBaseController.cs index adec094..90efdad 100644 --- a/vol-net6/VOL.Core/Controllers/Basic/ApiBaseController.cs +++ b/vol-net6/VOL.Core/Controllers/Basic/ApiBaseController.cs @@ -62,7 +62,7 @@ namespace VOL.Core.Controllers.Basic /// [ApiActionPermission(Enums.ActionPermissionOptions.Search)] [HttpPost, Route("GetDetailPage")] - [ApiExplorerSettings(IgnoreApi = true)] + [ApiExplorerSettings(IgnoreApi = false)] // 设置swagger文档不忽略改接口 public virtual ActionResult GetDetailPage([FromBody] PageDataOptions loadData) { return Content(InvokeService("GetDetailPage", new object[] { loadData }).Serialize()); @@ -167,7 +167,7 @@ namespace VOL.Core.Controllers.Basic /// [ApiActionPermission(Enums.ActionPermissionOptions.Delete)] [HttpPost, Route("Del")] - [ApiExplorerSettings(IgnoreApi = true)] + [ApiExplorerSettings(IgnoreApi = false)] // 设置swagger文档不忽略改接口 public virtual ActionResult Del([FromBody] object[] keys) { _baseWebResponseContent = InvokeService("Del", new object[] { keys, true }) as WebResponseContent; @@ -181,7 +181,7 @@ namespace VOL.Core.Controllers.Basic /// [ApiActionPermission(Enums.ActionPermissionOptions.Audit)] [HttpPost, Route("Audit")] - [ApiExplorerSettings(IgnoreApi = true)] + [ApiExplorerSettings(IgnoreApi = false)] // 设置swagger文档不忽略改接口 public virtual ActionResult Audit([FromBody] object[] id, int? auditStatus, string auditReason) { _baseWebResponseContent = InvokeService("Audit", new object[] { id, auditStatus, auditReason }) as WebResponseContent; @@ -195,7 +195,7 @@ namespace VOL.Core.Controllers.Basic /// [ApiActionPermission(Enums.ActionPermissionOptions.Add)] [HttpPost, Route("Add")] - [ApiExplorerSettings(IgnoreApi = true)] + [ApiExplorerSettings(IgnoreApi = false)] // 设置swagger文档不忽略改接口 public virtual ActionResult Add([FromBody] SaveModel saveModel) { _baseWebResponseContent = InvokeService("Add", @@ -212,8 +212,8 @@ namespace VOL.Core.Controllers.Basic /// /// [ApiActionPermission(Enums.ActionPermissionOptions.Update)] - [HttpPost, Route("Update")] - [ApiExplorerSettings(IgnoreApi = true)] + [HttpPost, Route("Update")] + [ApiExplorerSettings(IgnoreApi = false)] // 设置swagger文档不忽略改接口 public virtual ActionResult Update([FromBody] SaveModel saveModel) { _baseWebResponseContent = InvokeService("Update", new object[] { saveModel }) as WebResponseContent; diff --git a/vol-net6/VOL.Data/Class1.cs b/vol-net6/VOL.Data/Class1.cs new file mode 100644 index 0000000..330ac58 --- /dev/null +++ b/vol-net6/VOL.Data/Class1.cs @@ -0,0 +1,7 @@ +namespace VOL.Data +{ + public class Class1 + { + + } +} \ No newline at end of file diff --git a/vol-net6/VOL.Data/IRepositories/data/IData_DeviceRepository.cs b/vol-net6/VOL.Data/IRepositories/data/IData_DeviceRepository.cs new file mode 100644 index 0000000..51406a6 --- /dev/null +++ b/vol-net6/VOL.Data/IRepositories/data/IData_DeviceRepository.cs @@ -0,0 +1,18 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IData_DeviceRepository编写接口 + */ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using VOL.Core.BaseProvider; +using VOL.Entity.DomainModels; +using VOL.Core.Extensions.AutofacManager; +namespace VOL.Data.IRepositories +{ + public partial interface IData_DeviceRepository : IDependency,IRepository + { + } +} diff --git a/vol-net6/VOL.Data/IRepositories/data/IData_ProduceRepository.cs b/vol-net6/VOL.Data/IRepositories/data/IData_ProduceRepository.cs new file mode 100644 index 0000000..3882874 --- /dev/null +++ b/vol-net6/VOL.Data/IRepositories/data/IData_ProduceRepository.cs @@ -0,0 +1,18 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹IData_ProduceRepository编写接口 + */ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using VOL.Core.BaseProvider; +using VOL.Entity.DomainModels; +using VOL.Core.Extensions.AutofacManager; +namespace VOL.Data.IRepositories +{ + public partial interface IData_ProduceRepository : IDependency,IRepository + { + } +} diff --git a/vol-net6/VOL.Data/IServices/data/IData_DeviceService.cs b/vol-net6/VOL.Data/IServices/data/IData_DeviceService.cs new file mode 100644 index 0000000..9b84bad --- /dev/null +++ b/vol-net6/VOL.Data/IServices/data/IData_DeviceService.cs @@ -0,0 +1,12 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + */ +using VOL.Core.BaseProvider; +using VOL.Entity.DomainModels; + +namespace VOL.Data.IServices +{ + public partial interface IData_DeviceService : IService + { + } +} diff --git a/vol-net6/VOL.Data/IServices/data/IData_ProduceService.cs b/vol-net6/VOL.Data/IServices/data/IData_ProduceService.cs new file mode 100644 index 0000000..d82fae9 --- /dev/null +++ b/vol-net6/VOL.Data/IServices/data/IData_ProduceService.cs @@ -0,0 +1,12 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + */ +using VOL.Core.BaseProvider; +using VOL.Entity.DomainModels; + +namespace VOL.Data.IServices +{ + public partial interface IData_ProduceService : IService + { + } +} diff --git a/vol-net6/VOL.Data/IServices/data/Partial/IData_DeviceService.cs b/vol-net6/VOL.Data/IServices/data/Partial/IData_DeviceService.cs new file mode 100644 index 0000000..85d1fe6 --- /dev/null +++ b/vol-net6/VOL.Data/IServices/data/Partial/IData_DeviceService.cs @@ -0,0 +1,13 @@ +/* +*所有关于Data_Device类的业务代码接口应在此处编写 +*/ +using VOL.Core.BaseProvider; +using VOL.Entity.DomainModels; +using VOL.Core.Utilities; +using System.Linq.Expressions; +namespace VOL.Data.IServices +{ + public partial interface IData_DeviceService + { + } + } diff --git a/vol-net6/VOL.Data/IServices/data/Partial/IData_ProduceService.cs b/vol-net6/VOL.Data/IServices/data/Partial/IData_ProduceService.cs new file mode 100644 index 0000000..c7c8b38 --- /dev/null +++ b/vol-net6/VOL.Data/IServices/data/Partial/IData_ProduceService.cs @@ -0,0 +1,13 @@ +/* +*所有关于Data_Produce类的业务代码接口应在此处编写 +*/ +using VOL.Core.BaseProvider; +using VOL.Entity.DomainModels; +using VOL.Core.Utilities; +using System.Linq.Expressions; +namespace VOL.Data.IServices +{ + public partial interface IData_ProduceService + { + } + } diff --git a/vol-net6/VOL.Data/Repositories/data/Data_DeviceRepository.cs b/vol-net6/VOL.Data/Repositories/data/Data_DeviceRepository.cs new file mode 100644 index 0000000..2f3ab54 --- /dev/null +++ b/vol-net6/VOL.Data/Repositories/data/Data_DeviceRepository.cs @@ -0,0 +1,24 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹Data_DeviceRepository编写代码 + */ +using VOL.Data.IRepositories; +using VOL.Core.BaseProvider; +using VOL.Core.EFDbContext; +using VOL.Core.Extensions.AutofacManager; +using VOL.Entity.DomainModels; + +namespace VOL.Data.Repositories +{ + public partial class Data_DeviceRepository : RepositoryBase , IData_DeviceRepository + { + public Data_DeviceRepository(VOLContext dbContext) + : base(dbContext) + { + + } + public static IData_DeviceRepository Instance + { + get { return AutofacContainerModule.GetService(); } } + } +} diff --git a/vol-net6/VOL.Data/Repositories/data/Data_ProduceRepository.cs b/vol-net6/VOL.Data/Repositories/data/Data_ProduceRepository.cs new file mode 100644 index 0000000..d06fa89 --- /dev/null +++ b/vol-net6/VOL.Data/Repositories/data/Data_ProduceRepository.cs @@ -0,0 +1,24 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹Data_ProduceRepository编写代码 + */ +using VOL.Data.IRepositories; +using VOL.Core.BaseProvider; +using VOL.Core.EFDbContext; +using VOL.Core.Extensions.AutofacManager; +using VOL.Entity.DomainModels; + +namespace VOL.Data.Repositories +{ + public partial class Data_ProduceRepository : RepositoryBase , IData_ProduceRepository + { + public Data_ProduceRepository(VOLContext dbContext) + : base(dbContext) + { + + } + public static IData_ProduceRepository Instance + { + get { return AutofacContainerModule.GetService(); } } + } +} diff --git a/vol-net6/VOL.Data/Services/data/Data_DeviceService.cs b/vol-net6/VOL.Data/Services/data/Data_DeviceService.cs new file mode 100644 index 0000000..6642633 --- /dev/null +++ b/vol-net6/VOL.Data/Services/data/Data_DeviceService.cs @@ -0,0 +1,27 @@ +/* + *Author：jxx + *Contact：283591387@qq.com + *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 + *所有业务编写全部应在Partial文件夹下Data_DeviceService与IData_DeviceService中编写 + */ +using VOL.Data.IRepositories; +using VOL.Data.IServices; +using VOL.Core.BaseProvider; +using VOL.Core.Extensions.AutofacManager; +using VOL.Entity.DomainModels; + +namespace VOL.Data.Services +{ + public partial class Data_DeviceService : ServiceBase + , IData_DeviceService, IDependency + { + public Data_DeviceService(IData_DeviceRepository repository) + : base(repository) + { + Init(repository); + } + public static IData_DeviceService Instance + { + get { return AutofacContainerModule.GetService(); } } + } + } diff --git a/vol-net6/VOL.Data/Services/data/Data_ProduceService.cs b/vol-net6/VOL.Data/Services/data/Data_ProduceService.cs new file mode 100644 index 0000000..fbc8bd7 --- /dev/null +++ b/vol-net6/VOL.Data/Services/data/Data_ProduceService.cs @@ -0,0 +1,27 @@ +/* + *Author：jxx + *Contact：283591387@qq.com + *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖 + *所有业务编写全部应在Partial文件夹下Data_ProduceService与IData_ProduceService中编写 + */ +using VOL.Data.IRepositories; +using VOL.Data.IServices; +using VOL.Core.BaseProvider; +using VOL.Core.Extensions.AutofacManager; +using VOL.Entity.DomainModels; + +namespace VOL.Data.Services +{ + public partial class Data_ProduceService : ServiceBase + , IData_ProduceService, IDependency + { + public Data_ProduceService(IData_ProduceRepository repository) + : base(repository) + { + Init(repository); + } + public static IData_ProduceService Instance + { + get { return AutofacContainerModule.GetService(); } } + } + } diff --git a/vol-net6/VOL.Data/Services/data/Partial/Data_DeviceService.cs b/vol-net6/VOL.Data/Services/data/Partial/Data_DeviceService.cs new file mode 100644 index 0000000..330cada --- /dev/null +++ b/vol-net6/VOL.Data/Services/data/Partial/Data_DeviceService.cs @@ -0,0 +1,41 @@ +/* + *所有关于Data_Device类的业务代码应在此处编写 +*可使用repository.调用常用方法，获取EF/Dapper等信息 +*如果需要事务请使用repository.DbContextBeginTransaction +*也可使用DBServerProvider.手动获取数据库相关信息 +*用户信息、权限、角色等使用UserContext.Current操作 +*Data_DeviceService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter +*/ +using VOL.Core.BaseProvider; +using VOL.Core.Extensions.AutofacManager; +using VOL.Entity.DomainModels; +using System.Linq; +using VOL.Core.Utilities; +using System.Linq.Expressions; +using VOL.Core.Extensions; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Http; +using VOL.Data.IRepositories; + +namespace VOL.Data.Services +{ + public partial class Data_DeviceService + { + private readonly IHttpContextAccessor _httpContextAccessor; + private readonly IData_DeviceRepository _repository;//访问数据库 + + [ActivatorUtilitiesConstructor] + public Data_DeviceService( + IData_DeviceRepository dbRepository, + IHttpContextAccessor httpContextAccessor + ) + : base(dbRepository) + { + _httpContextAccessor = httpContextAccessor; + _repository = dbRepository; + //多租户会用到这init代码，其他情况可以不用 + //base.Init(dbRepository); + } + } +} diff --git a/vol-net6/VOL.Data/Services/data/Partial/Data_ProduceService.cs b/vol-net6/VOL.Data/Services/data/Partial/Data_ProduceService.cs new file mode 100644 index 0000000..1d3eab6 --- /dev/null +++ b/vol-net6/VOL.Data/Services/data/Partial/Data_ProduceService.cs @@ -0,0 +1,41 @@ +/* + *所有关于Data_Produce类的业务代码应在此处编写 +*可使用repository.调用常用方法，获取EF/Dapper等信息 +*如果需要事务请使用repository.DbContextBeginTransaction +*也可使用DBServerProvider.手动获取数据库相关信息 +*用户信息、权限、角色等使用UserContext.Current操作 +*Data_ProduceService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter +*/ +using VOL.Core.BaseProvider; +using VOL.Core.Extensions.AutofacManager; +using VOL.Entity.DomainModels; +using System.Linq; +using VOL.Core.Utilities; +using System.Linq.Expressions; +using VOL.Core.Extensions; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Http; +using VOL.Data.IRepositories; + +namespace VOL.Data.Services +{ + public partial class Data_ProduceService + { + private readonly IHttpContextAccessor _httpContextAccessor; + private readonly IData_ProduceRepository _repository;//访问数据库 + + [ActivatorUtilitiesConstructor] + public Data_ProduceService( + IData_ProduceRepository dbRepository, + IHttpContextAccessor httpContextAccessor + ) + : base(dbRepository) + { + _httpContextAccessor = httpContextAccessor; + _repository = dbRepository; + //多租户会用到这init代码，其他情况可以不用 + //base.Init(dbRepository); + } + } +} diff --git a/vol-net6/VOL.Data/VOL.Data.csproj b/vol-net6/VOL.Data/VOL.Data.csproj new file mode 100644 index 0000000..1a8c46c --- /dev/null +++ b/vol-net6/VOL.Data/VOL.Data.csproj @@ -0,0 +1,21 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + + diff --git a/vol-net6/VOL.Entity/DomainModels/data/Data_Device.cs b/vol-net6/VOL.Entity/DomainModels/data/Data_Device.cs new file mode 100644 index 0000000..f103520 --- /dev/null +++ b/vol-net6/VOL.Entity/DomainModels/data/Data_Device.cs @@ -0,0 +1,125 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果数据库字段发生变化，请在代码生器重新生成此Model + */ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using VOL.Entity.SystemModels; + +namespace VOL.Entity.DomainModels +{ + [Entity(TableCnName = "设备运行",TableName = "Data_Device")] + public partial class Data_Device:BaseEntity + { + /// + ///ID + /// + [Key] + [Display(Name ="ID")] + [Column(TypeName="int")] + [Editable(true)] + [Required(AllowEmptyStrings=false)] + public int id { get; set; } + + /// + ///电机温度 + /// + [Display(Name ="电机温度")] + [DisplayFormat(DataFormatString="10,2")] + [Column(TypeName="decimal")] + [Editable(true)] + public decimal? temperature { get; set; } + + /// + ///母线电压 + /// + [Display(Name ="母线电压")] + [DisplayFormat(DataFormatString="10,2")] + [Column(TypeName="decimal")] + [Editable(true)] + public decimal? potential { get; set; } + + /// + ///实际电流 + /// + [Display(Name ="实际电流")] + [DisplayFormat(DataFormatString="10,2")] + [Column(TypeName="decimal")] + [Editable(true)] + public decimal? current { get; set; } + + /// + ///加工程序号 + /// + [Display(Name ="加工程序号")] + [MaxLength(60)] + [Column(TypeName="nvarchar(60)")] + [Editable(true)] + public string processno { get; set; } + + /// + ///运行模式 + /// + [Display(Name ="运行模式")] + [Column(TypeName="short")] + [Editable(true)] + public short? run_mode { get; set; } + + /// + /// + /// + [Display(Name ="CreateID")] + [Column(TypeName="int")] + [Editable(true)] + public int? CreateID { get; set; } + + /// + /// + /// + [Display(Name ="Creator")] + [MaxLength(255)] + [Column(TypeName="nvarchar(255)")] + [Editable(true)] + public string Creator { get; set; } + + /// + ///记录时间 + /// + [Display(Name ="记录时间")] + [Column(TypeName="datetime")] + [Editable(true)] + public DateTime? CreateDate { get; set; } + + /// + /// + /// + [Display(Name ="ModifyID")] + [Column(TypeName="int")] + [Editable(true)] + public int? ModifyID { get; set; } + + /// + /// + /// + [Display(Name ="Modifier")] + [MaxLength(255)] + [Column(TypeName="nvarchar(255)")] + [Editable(true)] + public string Modifier { get; set; } + + /// + /// + /// + [Display(Name ="ModifyDate")] + [Column(TypeName="datetime")] + [Editable(true)] + public DateTime? ModifyDate { get; set; } + + + } +} \ No newline at end of file diff --git a/vol-net6/VOL.Entity/DomainModels/data/Data_Produce.cs b/vol-net6/VOL.Entity/DomainModels/data/Data_Produce.cs new file mode 100644 index 0000000..8d78f92 --- /dev/null +++ b/vol-net6/VOL.Entity/DomainModels/data/Data_Produce.cs @@ -0,0 +1,137 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果数据库字段发生变化，请在代码生器重新生成此Model + */ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using VOL.Entity.SystemModels; + +namespace VOL.Entity.DomainModels +{ + [Entity(TableCnName = "生产数据",TableName = "Data_Produce")] + public partial class Data_Produce:BaseEntity + { + /// + ///ID + /// + [Key] + [Display(Name ="ID")] + [Column(TypeName="int")] + [Editable(true)] + [Required(AllowEmptyStrings=false)] + public int id { get; set; } + + /// + ///待机时长 + /// + [Display(Name ="待机时长")] + [Column(TypeName="int")] + [Editable(true)] + public int? standby_time { get; set; } + + /// + ///运行时长 + /// + [Display(Name ="运行时长")] + [Column(TypeName="int")] + [Editable(true)] + public int? run_time { get; set; } + + /// + ///运行状态 + /// + [Display(Name ="运行状态")] + [Column(TypeName="sbyte")] + [Editable(true)] + public sbyte? status { get; set; } + + /// + ///当班产量 + /// + [Display(Name ="当班产量")] + [Column(TypeName="int")] + [Editable(true)] + public int? turnout { get; set; } + + /// + ///工单 1 产量 + /// + [Display(Name ="工单 1 产量")] + [Column(TypeName="int")] + [Editable(true)] + public int? turnout_one { get; set; } + + /// + ///工单 2 产量 + /// + [Display(Name ="工单 2 产量")] + [Column(TypeName="int")] + [Editable(true)] + public int? turnout_two { get; set; } + + /// + ///工单 3 产量 + /// + [Display(Name ="工单 3 产量")] + [Column(TypeName="int")] + [Editable(true)] + public int? turnout_three { get; set; } + + /// + /// + /// + [Display(Name ="CreateID")] + [Column(TypeName="int")] + [Editable(true)] + public int? CreateID { get; set; } + + /// + /// + /// + [Display(Name ="Creator")] + [MaxLength(255)] + [Column(TypeName="nvarchar(255)")] + [Editable(true)] + public string Creator { get; set; } + + /// + ///记录时间 + /// + [Display(Name ="记录时间")] + [Column(TypeName="datetime")] + [Editable(true)] + public DateTime? CreateDate { get; set; } + + /// + /// + /// + [Display(Name ="ModifyID")] + [Column(TypeName="int")] + [Editable(true)] + public int? ModifyID { get; set; } + + /// + /// + /// + [Display(Name ="Modifier")] + [MaxLength(255)] + [Column(TypeName="nvarchar(255)")] + [Editable(true)] + public string Modifier { get; set; } + + /// + /// + /// + [Display(Name ="ModifyDate")] + [Column(TypeName="datetime")] + [Editable(true)] + public DateTime? ModifyDate { get; set; } + + + } +} \ No newline at end of file diff --git a/vol-net6/VOL.Entity/DomainModels/data/partial/Data_Device.cs b/vol-net6/VOL.Entity/DomainModels/data/partial/Data_Device.cs new file mode 100644 index 0000000..4e6fdba --- /dev/null +++ b/vol-net6/VOL.Entity/DomainModels/data/partial/Data_Device.cs @@ -0,0 +1,21 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果数据库字段发生变化，请在代码生器重新生成此Model + */ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using VOL.Entity.SystemModels; + +namespace VOL.Entity.DomainModels +{ + + public partial class Data_Device + { + //此处配置字段(字段配置见此model的另一个partial),如果表中没有此字段请加上 [NotMapped]属性，否则会异常 + } +} \ No newline at end of file diff --git a/vol-net6/VOL.Entity/DomainModels/data/partial/Data_Produce.cs b/vol-net6/VOL.Entity/DomainModels/data/partial/Data_Produce.cs new file mode 100644 index 0000000..f02ed98 --- /dev/null +++ b/vol-net6/VOL.Entity/DomainModels/data/partial/Data_Produce.cs @@ -0,0 +1,21 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果数据库字段发生变化，请在代码生器重新生成此Model + */ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using VOL.Entity.SystemModels; + +namespace VOL.Entity.DomainModels +{ + + public partial class Data_Produce + { + //此处配置字段(字段配置见此model的另一个partial),如果表中没有此字段请加上 [NotMapped]属性，否则会异常 + } +} \ No newline at end of file diff --git a/vol-net6/VOL.Entity/MappingConfiguration/data/Data_DeviceMapConfig.cs b/vol-net6/VOL.Entity/MappingConfiguration/data/Data_DeviceMapConfig.cs new file mode 100644 index 0000000..43c5c72 --- /dev/null +++ b/vol-net6/VOL.Entity/MappingConfiguration/data/Data_DeviceMapConfig.cs @@ -0,0 +1,16 @@ +using VOL.Entity.MappingConfiguration; +using VOL.Entity.DomainModels; +using Microsoft.EntityFrameworkCore.Metadata.Builders; + +namespace VOL.Entity.MappingConfiguration +{ + public class Data_DeviceMapConfig : EntityMappingConfiguration + { + public override void Map(EntityTypeBuilder + builderTable) + { + //b.Property(x => x.StorageName).HasMaxLength(45); + } + } +} + diff --git a/vol-net6/VOL.Entity/MappingConfiguration/data/Data_ProduceMapConfig.cs b/vol-net6/VOL.Entity/MappingConfiguration/data/Data_ProduceMapConfig.cs new file mode 100644 index 0000000..93629b0 --- /dev/null +++ b/vol-net6/VOL.Entity/MappingConfiguration/data/Data_ProduceMapConfig.cs @@ -0,0 +1,16 @@ +using VOL.Entity.MappingConfiguration; +using VOL.Entity.DomainModels; +using Microsoft.EntityFrameworkCore.Metadata.Builders; + +namespace VOL.Entity.MappingConfiguration +{ + public class Data_ProduceMapConfig : EntityMappingConfiguration + { + public override void Map(EntityTypeBuilder + builderTable) + { + //b.Property(x => x.StorageName).HasMaxLength(45); + } + } +} + diff --git a/vol-net6/VOL.WebApi/Controllers/Data/DataCaptureController.cs b/vol-net6/VOL.WebApi/Controllers/Data/DataCaptureController.cs new file mode 100644 index 0000000..0ed452a --- /dev/null +++ b/vol-net6/VOL.WebApi/Controllers/Data/DataCaptureController.cs @@ -0,0 +1,30 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Authorization; +using System; +using VOL.Core.Filters; + +namespace VOL.WebApi.Controllers.Data +{ + /// + /// 数据采集API类 + /// + [Route("api/Data_Capture")] + [AllowAnonymous] + public class DataCaptureController : Controller + { + + /// + /// 测试采集接口 + /// + /// IActionResult + //[ApiTask] + [HttpGet, HttpPost, Route("test")] + public IActionResult Test() + { + return Content(DateTime.Now.ToString("yyyy-MM-dd HH:mm:sss")); + + } + + } +} diff --git a/vol-net6/VOL.WebApi/Controllers/Data/Data_DeviceController.cs b/vol-net6/VOL.WebApi/Controllers/Data/Data_DeviceController.cs new file mode 100644 index 0000000..d6fd483 --- /dev/null +++ b/vol-net6/VOL.WebApi/Controllers/Data/Data_DeviceController.cs @@ -0,0 +1,21 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果要增加方法请在当前目录下Partial文件夹Data_DeviceController编写 + */ +using Microsoft.AspNetCore.Mvc; +using VOL.Core.Controllers.Basic; +using VOL.Entity.AttributeManager; +using VOL.Data.IServices; +namespace VOL.Data.Controllers +{ + [Route("api/Data_Device")] + [PermissionTable(Name = "Data_Device")] + public partial class Data_DeviceController : ApiBaseController + { + public Data_DeviceController(IData_DeviceService service) + : base(service) + { + } + } +} + diff --git a/vol-net6/VOL.WebApi/Controllers/Data/Data_ProduceController.cs b/vol-net6/VOL.WebApi/Controllers/Data/Data_ProduceController.cs new file mode 100644 index 0000000..59af1b0 --- /dev/null +++ b/vol-net6/VOL.WebApi/Controllers/Data/Data_ProduceController.cs @@ -0,0 +1,21 @@ +/* + *代码由框架生成,任何更改都可能导致被代码生成器覆盖 + *如果要增加方法请在当前目录下Partial文件夹Data_ProduceController编写 + */ +using Microsoft.AspNetCore.Mvc; +using VOL.Core.Controllers.Basic; +using VOL.Entity.AttributeManager; +using VOL.Data.IServices; +namespace VOL.Data.Controllers +{ + [Route("api/Data_Produce")] + [PermissionTable(Name = "Data_Produce")] + public partial class Data_ProduceController : ApiBaseController + { + public Data_ProduceController(IData_ProduceService service) + : base(service) + { + } + } +} + diff --git a/vol-net6/VOL.WebApi/Controllers/Data/Partial/Data_DeviceController.cs b/vol-net6/VOL.WebApi/Controllers/Data/Partial/Data_DeviceController.cs new file mode 100644 index 0000000..3c9513c --- /dev/null +++ b/vol-net6/VOL.WebApi/Controllers/Data/Partial/Data_DeviceController.cs @@ -0,0 +1,33 @@ +/* + *接口编写处... +*如果接口需要做Action的权限验证，请在Action上使用属性 +*如: [ApiActionPermission("Data_Device",Enums.ActionPermissionOptions.Search)] + */ +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Http; +using VOL.Entity.DomainModels; +using VOL.Data.IServices; + +namespace VOL.Data.Controllers +{ + public partial class Data_DeviceController + { + private readonly IData_DeviceService _service;//访问业务代码 + private readonly IHttpContextAccessor _httpContextAccessor; + + [ActivatorUtilitiesConstructor] + public Data_DeviceController( + IData_DeviceService service, + IHttpContextAccessor httpContextAccessor + ) + : base(service) + { + _service = service; + _httpContextAccessor = httpContextAccessor; + } + } +} diff --git a/vol-net6/VOL.WebApi/Controllers/Data/Partial/Data_ProduceController.cs b/vol-net6/VOL.WebApi/Controllers/Data/Partial/Data_ProduceController.cs new file mode 100644 index 0000000..62cc1c2 --- /dev/null +++ b/vol-net6/VOL.WebApi/Controllers/Data/Partial/Data_ProduceController.cs @@ -0,0 +1,33 @@ +/* + *接口编写处... +*如果接口需要做Action的权限验证，请在Action上使用属性 +*如: [ApiActionPermission("Data_Produce",Enums.ActionPermissionOptions.Search)] + */ +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Http; +using VOL.Entity.DomainModels; +using VOL.Data.IServices; + +namespace VOL.Data.Controllers +{ + public partial class Data_ProduceController + { + private readonly IData_ProduceService _service;//访问业务代码 + private readonly IHttpContextAccessor _httpContextAccessor; + + [ActivatorUtilitiesConstructor] + public Data_ProduceController( + IData_ProduceService service, + IHttpContextAccessor httpContextAccessor + ) + : base(service) + { + _service = service; + _httpContextAccessor = httpContextAccessor; + } + } +} diff --git a/vol-net6/VOL.WebApi/Controllers/Order/Partial/SellOrderController.cs b/vol-net6/VOL.WebApi/Controllers/Order/Partial/SellOrderController.cs index b3cd145..28cfc73 100644 --- a/vol-net6/VOL.WebApi/Controllers/Order/Partial/SellOrderController.cs +++ b/vol-net6/VOL.WebApi/Controllers/Order/Partial/SellOrderController.cs @@ -44,7 +44,7 @@ namespace VOL.Order.Controllers [HttpPost] [ApiActionPermission("SellOrder", Core.Enums.ActionPermissionOptions.Search)] - [Route("getServiceDate"), FixedToken]//FixedToken请求此接口只要token合法就能能过//AllowAnonymous + [Route("getServiceDate"), FixedToken]//FixedToken 接口token永不过期 //AllowAnonymous 无需验证即可访问 public IActionResult GetServiceDate() { return Content(Service.GetServiceDate()); diff --git a/vol-net6/VOL.WebApi/VOL.WebApi.csproj b/vol-net6/VOL.WebApi/VOL.WebApi.csproj index 243612c..d507653 100644 --- a/vol-net6/VOL.WebApi/VOL.WebApi.csproj +++ b/vol-net6/VOL.WebApi/VOL.WebApi.csproj @@ -31,6 +31,7 @@ + diff --git a/vol-net6/VOL.WebApi/VOL.WebApi.csproj.user b/vol-net6/VOL.WebApi/VOL.WebApi.csproj.user index 401c7a8..b466ae3 100644 --- a/vol-net6/VOL.WebApi/VOL.WebApi.csproj.user +++ b/vol-net6/VOL.WebApi/VOL.WebApi.csproj.user @@ -6,8 +6,8 @@ VOL.WebApi E:\jxx\Vue.NetCore\.Net6版本\VOL.WebApi\Properties\PublishProfiles\FolderProfile1.pubxml - MvcControllerEmptyScaffolder - root/Common/MVC/Controller + ApiControllerEmptyScaffolder + root/Common/Api ProjectDebugger diff --git a/vol-net6/VOL.sln b/vol-net6/VOL.sln index 6a43447..f14ffce 100644 --- a/vol-net6/VOL.sln +++ b/vol-net6/VOL.sln @@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VOL.Order", "VOL.Order\VOL. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VOL.WebApi", "VOL.WebApi\VOL.WebApi.csproj", "{4DB3C91B-93FE-4937-8B58-DDD3F57D4607}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VOL.Data", "VOL.Data\VOL.Data.csproj", "{FA76EAA8-C355-4E13-B15C-FF925919F861}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,6 +53,10 @@ Global {4DB3C91B-93FE-4937-8B58-DDD3F57D4607}.Debug|Any CPU.Build.0 = Debug|Any CPU {4DB3C91B-93FE-4937-8B58-DDD3F57D4607}.Release|Any CPU.ActiveCfg = Release|Any CPU {4DB3C91B-93FE-4937-8B58-DDD3F57D4607}.Release|Any CPU.Build.0 = Release|Any CPU + {FA76EAA8-C355-4E13-B15C-FF925919F861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA76EAA8-C355-4E13-B15C-FF925919F861}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA76EAA8-C355-4E13-B15C-FF925919F861}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA76EAA8-C355-4E13-B15C-FF925919F861}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vol-vue3/src/extension/data/device/Data_Device.js b/vol-vue3/src/extension/data/device/Data_Device.js new file mode 100644 index 0000000..8935403 --- /dev/null +++ b/vol-vue3/src/extension/data/device/Data_Device.js @@ -0,0 +1,75 @@ +/***************************************************************************************** +** Author:jxx 2022 +** QQ:283591387 +**完整文档见：http://v2.volcore.xyz/document/api 【代码生成页面ViewGrid】 +**常用示例见：http://v2.volcore.xyz/document/vueDev +**后台操作见：http://v2.volcore.xyz/document/netCoreDev +*****************************************************************************************/ +//此js文件是用来自定义扩展业务代码，可以扩展一些自定义页面或者重新配置生成的代码 + +let extension = { + components: { + //查询界面扩展组件 + gridHeader: '', + gridBody: '', + gridFooter: '', + //新建、编辑弹出框扩展组件 + modelHeader: '', + modelBody: '', + modelFooter: '' + }, + tableAction: '', //指定某张表的权限(这里填写表名,默认不用填写) + buttons: { view: [], box: [], detail: [] }, //扩展的按钮 + methods: { + //下面这些方法可以保留也可以删除 + onInit() { //框架初始化配置前， + //示例：在按钮的最前面添加一个按钮 + // this.buttons.unshift({ //也可以用push或者splice方法来修改buttons数组 + // name: '按钮', //按钮名称 + // icon: 'el-icon-document', //按钮图标vue2版本见iview文档icon，vue3版本见element ui文档icon(注意不是element puls文档) + // type: 'primary', //按钮样式vue2版本见iview文档button，vue3版本见element ui文档button + // onClick: function () { + // this.$Message.success('点击了按钮'); + // } + // }); + + //示例：设置修改新建、编辑弹出框字段标签的长度 + // this.boxOptions.labelWidth = 150; + }, + onInited() { + //框架初始化配置后 + //如果要配置明细表,在此方法操作 + //this.detailOptions.columns.forEach(column=>{ }); + }, + searchBefore(param) { + //界面查询前,可以给param.wheres添加查询参数 + //返回false，则不会执行查询 + return true; + }, + searchAfter(result) { + //查询后，result返回的查询数据,可以在显示到表格前处理表格的值 + return true; + }, + addBefore(formData) { + //新建保存前formData为对象，包括明细表，可以给给表单设置值，自己输出看formData的值 + return true; + }, + updateBefore(formData) { + //编辑保存前formData为对象，包括明细表、删除行的Id + return true; + }, + rowClick({ row, column, event }) { + //查询界面点击行事件 + // this.$refs.table.$refs.table.toggleRowSelection(row); //单击行时选中当前行; + }, + modelOpenAfter(row) { + //点击编辑、新建按钮弹出框后，可以在此处写逻辑，如，从后台获取数据 + //(1)判断是编辑还是新建操作： this.currentAction=='Add'; + //(2)给弹出框设置默认值 + //(3)this.editFormFields.字段='xxx'; + //如果需要给下拉框设置默认值，请遍历this.editFormOptions找到字段配置对应data属性的key值 + //看不懂就把输出看：console.log(this.editFormOptions) + } + } +}; +export default extension; diff --git a/vol-vue3/src/extension/data/produce/Data_Produce.js b/vol-vue3/src/extension/data/produce/Data_Produce.js new file mode 100644 index 0000000..8935403 --- /dev/null +++ b/vol-vue3/src/extension/data/produce/Data_Produce.js @@ -0,0 +1,75 @@ +/***************************************************************************************** +** Author:jxx 2022 +** QQ:283591387 +**完整文档见：http://v2.volcore.xyz/document/api 【代码生成页面ViewGrid】 +**常用示例见：http://v2.volcore.xyz/document/vueDev +**后台操作见：http://v2.volcore.xyz/document/netCoreDev +*****************************************************************************************/ +//此js文件是用来自定义扩展业务代码，可以扩展一些自定义页面或者重新配置生成的代码 + +let extension = { + components: { + //查询界面扩展组件 + gridHeader: '', + gridBody: '', + gridFooter: '', + //新建、编辑弹出框扩展组件 + modelHeader: '', + modelBody: '', + modelFooter: '' + }, + tableAction: '', //指定某张表的权限(这里填写表名,默认不用填写) + buttons: { view: [], box: [], detail: [] }, //扩展的按钮 + methods: { + //下面这些方法可以保留也可以删除 + onInit() { //框架初始化配置前， + //示例：在按钮的最前面添加一个按钮 + // this.buttons.unshift({ //也可以用push或者splice方法来修改buttons数组 + // name: '按钮', //按钮名称 + // icon: 'el-icon-document', //按钮图标vue2版本见iview文档icon，vue3版本见element ui文档icon(注意不是element puls文档) + // type: 'primary', //按钮样式vue2版本见iview文档button，vue3版本见element ui文档button + // onClick: function () { + // this.$Message.success('点击了按钮'); + // } + // }); + + //示例：设置修改新建、编辑弹出框字段标签的长度 + // this.boxOptions.labelWidth = 150; + }, + onInited() { + //框架初始化配置后 + //如果要配置明细表,在此方法操作 + //this.detailOptions.columns.forEach(column=>{ }); + }, + searchBefore(param) { + //界面查询前,可以给param.wheres添加查询参数 + //返回false，则不会执行查询 + return true; + }, + searchAfter(result) { + //查询后，result返回的查询数据,可以在显示到表格前处理表格的值 + return true; + }, + addBefore(formData) { + //新建保存前formData为对象，包括明细表，可以给给表单设置值，自己输出看formData的值 + return true; + }, + updateBefore(formData) { + //编辑保存前formData为对象，包括明细表、删除行的Id + return true; + }, + rowClick({ row, column, event }) { + //查询界面点击行事件 + // this.$refs.table.$refs.table.toggleRowSelection(row); //单击行时选中当前行; + }, + modelOpenAfter(row) { + //点击编辑、新建按钮弹出框后，可以在此处写逻辑，如，从后台获取数据 + //(1)判断是编辑还是新建操作： this.currentAction=='Add'; + //(2)给弹出框设置默认值 + //(3)this.editFormFields.字段='xxx'; + //如果需要给下拉框设置默认值，请遍历this.editFormOptions找到字段配置对应data属性的key值 + //看不懂就把输出看：console.log(this.editFormOptions) + } + } +}; +export default extension; diff --git a/vol-vue3/src/router/viewGird.js b/vol-vue3/src/router/viewGird.js index a047b90..080bb0b 100644 --- a/vol-vue3/src/router/viewGird.js +++ b/vol-vue3/src/router/viewGird.js @@ -3,132 +3,157 @@ let viewgird = [ { path: '/Sys_Log', name: 'sys_Log', - component: () => import('@/views/system/Sys_Log.vue' ) + component: () => import('@/views/system/Sys_Log.vue') }, { path: '/Sys_User', name: 'Sys_User', - component: () => import('@/views/system/Sys_User.vue' ) + component: () => import('@/views/system/Sys_User.vue') }, { path: '/permission', name: 'permission', - component: () => import('@/views/system/Permission.vue' ) + component: () => import('@/views/system/Permission.vue') }, - + { path: '/Sys_Dictionary', name: 'Sys_Dictionary', - component: () => import('@/views/system/Sys_Dictionary.vue' ) + component: () => import('@/views/system/Sys_Dictionary.vue') }, { path: '/Sys_Role', name: 'Sys_Role', - component: () => import('@/views/system/Sys_Role.vue' ) - }, { + component: () => import('@/views/system/Sys_Role.vue') + }, + { path: '/Sys_Role1', name: 'Sys_Role1', - component: () => import('@/views/system/Sys_Role1.vue' ) - } - , { + component: () => import('@/views/system/Sys_Role1.vue') + }, + { path: '/Sys_DictionaryList', name: 'Sys_DictionaryList', - component: () => import('@/views/system/Sys_DictionaryList.vue' ) - } - , { + component: () => import('@/views/system/Sys_DictionaryList.vue') + }, + { path: '/SellOrder', name: 'SellOrder', - component: () => import('@/views/order/SellOrder.vue' ) - }, { + component: () => import('@/views/order/SellOrder.vue') + }, + { path: '/SellOrder2', name: 'SellOrder2', - component: () => import('@/views/order/SellOrder2.vue' ) - }, { + component: () => import('@/views/order/SellOrder2.vue') + }, + { path: '/SellOrder3', name: 'SellOrder3', - component: () => import('@/views/order/SellOrder3.vue' ) - }, { + component: () => import('@/views/order/SellOrder3.vue') + }, + { path: '/vSellOrderImg', name: 'vSellOrderImg', - component: () => import('@/views/order/vSellOrderImg.vue' ) + component: () => import('@/views/order/vSellOrderImg.vue') }, { path: '/App_Appointment', name: 'App_Appointment', - component: () => import('@/views/order/App_Appointment.vue' ) + component: () => import('@/views/order/App_Appointment.vue') }, { path: '/App_Appointment2', //二级表头 name: 'App_Appointment2', - component: () => import('@/views/order/App_Appointment2.vue' ) + component: () => import('@/views/order/App_Appointment2.vue') }, { path: '/App_TransactionAvgPrice', name: 'App_TransactionAvgPrice', - component: () => import('@/views/appmanager/App_TransactionAvgPrice.vue' ), + component: () => import('@/views/appmanager/App_TransactionAvgPrice.vue'), meta: { keepAlive: false } - } - , { + }, + { path: '/App_Expert', name: 'App_Expert', - component: () => import('@/views/appmanager/App_Expert.vue' ) - } - , { + component: () => import('@/views/appmanager/App_Expert.vue') + }, + { path: '/App_Expert2', name: 'App_Expert2', - component: () => import('@/views/appmanager/App_Expert2.vue' ) - } - , { + component: () => import('@/views/appmanager/App_Expert2.vue') + }, + { path: '/App_Transaction', name: 'App_Transaction', - component: () => import('@/views/appmanager/App_Transaction.vue' ) - } - , { + component: () => import('@/views/appmanager/App_Transaction.vue') + }, + { path: '/App_Transaction2', name: 'App_Transaction2', - component: () => import('@/views/appmanager/App_Transaction2.vue' ) - }, { + component: () => import('@/views/appmanager/App_Transaction2.vue') + }, + { path: '/App_ReportPrice', name: 'App_ReportPrice', - component: () => import('@/views/appmanager/App_ReportPrice.vue' ) - }, { + component: () => import('@/views/appmanager/App_ReportPrice.vue') + }, + { path: '/App_News', name: 'App_News', - component: () => import('@/views/appmanager/App_News.vue' ) - }, { + component: () => import('@/views/appmanager/App_News.vue') + }, + { path: '/App_NewsEditor', name: 'App_NewsEditor', - component: () => import('@/views/appmanager/App_NewsEditor.vue' ) - } ,{ - path: '/FormDesignOptions', - name: 'FormDesignOptions', - component: () => import('@/views/system/form/FormDesignOptions.vue') - } ,{ - path: '/FormCollectionObject', - name: 'FormCollectionObject', - component: () => import('@/views/system/form/FormCollectionObject.vue') - } ,{ - path: '/Sys_WorkFlow', - name: 'Sys_WorkFlow', - component: () => import('@/views/system/flow/Sys_WorkFlow.vue') - } ,{ - path: '/Sys_WorkFlowTable', - name: 'Sys_WorkFlowTable', - component: () => import('@/views/system/flow/Sys_WorkFlowTable.vue') - } ,{ - path: '/Sys_QuartzOptions', - name: 'Sys_QuartzOptions', - component: () => import('@/views/system/quartz/Sys_QuartzOptions.vue') - } ,{ - path: '/Sys_QuartzLog', - name: 'Sys_QuartzLog', - component: () => import('@/views/system/quartz/Sys_QuartzLog.vue') - } ,{ - path: '/Sys_Department', - name: 'Sys_Department', - component: () => import('@/views/system/system/Sys_Department.vue') - }] + component: () => import('@/views/appmanager/App_NewsEditor.vue') + }, + { + path: '/FormDesignOptions', + name: 'FormDesignOptions', + component: () => import('@/views/system/form/FormDesignOptions.vue') + }, + { + path: '/FormCollectionObject', + name: 'FormCollectionObject', + component: () => import('@/views/system/form/FormCollectionObject.vue') + }, + { + path: '/Sys_WorkFlow', + name: 'Sys_WorkFlow', + component: () => import('@/views/system/flow/Sys_WorkFlow.vue') + }, + { + path: '/Sys_WorkFlowTable', + name: 'Sys_WorkFlowTable', + component: () => import('@/views/system/flow/Sys_WorkFlowTable.vue') + }, + { + path: '/Sys_QuartzOptions', + name: 'Sys_QuartzOptions', + component: () => import('@/views/system/quartz/Sys_QuartzOptions.vue') + }, + { + path: '/Sys_QuartzLog', + name: 'Sys_QuartzLog', + component: () => import('@/views/system/quartz/Sys_QuartzLog.vue') + }, + { + path: '/Sys_Department', + name: 'Sys_Department', + component: () => import('@/views/system/system/Sys_Department.vue') + }, + { + path: '/Data_Device', + name: 'Data_Device', + component: () => import('@/views/data/device/Data_Device.vue') + }, + { + path: '/Data_Produce', + name: 'Data_Produce', + component: () => import('@/views/data/produce/Data_Produce.vue') + } +] export default viewgird diff --git a/vol-vue3/src/views/data/device/Data_Device.vue b/vol-vue3/src/views/data/device/Data_Device.vue new file mode 100644 index 0000000..c03622f --- /dev/null +++ b/vol-vue3/src/views/data/device/Data_Device.vue @@ -0,0 +1,71 @@ + + + diff --git a/vol-vue3/src/views/data/produce/Data_Produce.vue b/vol-vue3/src/views/data/produce/Data_Produce.vue new file mode 100644 index 0000000..78fc830 --- /dev/null +++ b/vol-vue3/src/views/data/produce/Data_Produce.vue @@ -0,0 +1,75 @@ + + +