260331 提交

Waste.Application/AccountInfo/AccountService.cs

@@ -1,4 +1,5 @@
 using Furion.DependencyInjection;
+using Microsoft.AspNetCore.Mvc;
 using Nirvana.Common;
 using SqlSugar;
 using System;
@@ -45,6 +46,7 @@ namespace Waste.Application
                 return new ResultInfo { code = ResultState.FAIL, message = "账户已禁用" };
             }
             var password = Md5.md5(DESEncrypt.Encrypt(Md5.md5(model.pwd, 32).ToLower(), userdata.Secret).ToLower(), 32).ToLower();
+
             if (password != userdata.Password)
             {
                 return new ResultInfo { code = ResultState.FAIL, message = "密码不正确" };

Waste.Application/Business/BusinessService.cs

@@ -128,7 +128,7 @@ namespace Waste.Application
             //针对非平台类型,则可以查看下面所有的子账户设备
             if (currentUser.AccountType != (int)AccountType.platform)
             {
-                var sql = $" code !={currentUser.BusinessCode} and code like '{currentUser.BusinessCode}'+'%' and id = x.id";
+                var sql = $" code !='{currentUser.BusinessCode}' and code like '{currentUser.BusinessCode}%' and id = x.id";
                 temquery = temquery.Where(x => SqlFunc.Subqueryable<W_Business>().Where(sql).Any());
             }
             string sorts = string.Format("{0} {1}", param.sort, param.order);
@@ -541,12 +541,19 @@ namespace Waste.Application
             DateTime yestodaytime = DateTime.Now.AddDays(-1);
             if (currentUser.AccountType != (int)AccountType.platform)
             {
-                string basesql = $"code like '{currentUser.BusinessCode}'+'%' and id = x.id";
+                //string basesql = $"code like '{currentUser.BusinessCode} %' and id = x.id";
-                string sql = $" code !={currentUser.BusinessCode} and {basesql}";
+                //string sql = $" code !={currentUser.BusinessCode} and {basesql}";
-                string devicesql = $"code like '{currentUser.BusinessCode}'+'%' and id = x.businessid"; 
+                //string devicesql = $"code like '{currentUser.BusinessCode} %' and id = x.businessid"; 
-                int businesscnt = await dbClient.Queryable<W_Business>().Where(x => SqlFunc.Subqueryable<W_Business>().Where(sql).Any()).CountAsync();
+                int businesscnt = await dbClient.Queryable<W_Business>().Where(x => SqlFunc.Subqueryable<W_Business>()
-                int devcnt = await repository.Change<W_Device>().Context.Queryable<W_Device>().Where(x => SqlFunc.Subqueryable<W_Business>().Where(devicesql).Any()).CountAsync();
+                .Where(e=>SqlFunc.StartsWith(e.Code,currentUser.BusinessCode))
-                var tempquery = repository.Change<W_DeviceStatistics>().Context.Queryable<W_DeviceStatistics>().Where(x => SqlFunc.DateIsSame(x.CreateTime, yestodaytime) && SqlFunc.Subqueryable<W_Business>().Where(devicesql).Any());
+                .Where(e=>x.Code != currentUser.BusinessCode)
+                .Where(e=>e.Id == x.Id)
+                .Any())             
+                    .CountAsync();
+                int devcnt = await repository.Change<W_Device>().Context.Queryable<W_Device>()
+                    .Where(x=>SqlFunc.Subqueryable<W_Business>().Where(e=>SqlFunc.StartsWith(e.Code,currentUser.BusinessCode) && e.Id == x.Businessid).Any())
+                    .CountAsync();
+                var tempquery = repository.Change<W_DeviceStatistics>().Context.Queryable<W_DeviceStatistics>().Where(x => SqlFunc.DateIsSame(x.CreateTime, yestodaytime) && SqlFunc.Subqueryable<W_Business>().Where(e => SqlFunc.StartsWith(e.Code, currentUser.BusinessCode) && e.Id == x.Businessid).Any());
                 int count = await tempquery.Clone().SumAsync(x => x.DayCount);
                 decimal weight = await tempquery.Clone().SumAsync(x => x.DayWeight);
                 decimal pureweight = await tempquery.Clone().SumAsync(x => x.DayPureWeight);

Waste.Application/ThirdApiInfo/Dtos/ProductInfoDto.cs

@@ -110,6 +110,11 @@ namespace Waste.Application.ThirdApiInfo
         /// </summary>
         public string image { get; set; }
 
+        /// <summary>
+        /// 新增：操作权限控制（必须传 true/false，其他值或未传会报错）
+        /// </summary>
+        public bool uploadPermission { get; set; }  // 直接 bool，不可空
+
         public string Video { get; set; }
     }
 }

Waste.Application/ThirdApiInfo/IOpenService.cs

@@ -59,5 +59,7 @@ namespace Waste.Application.ThirdApiInfo
         /// <returns></returns>
         Task<ResultInfo> AddProductAsync(ProductInfoDto data);
         Task<PageParms<W_Product>> GetProductAsync(QueryParams param);
+
+        Task<ResultInfo> DeleteProductAsync(string id);
     }
 }

Waste.Application/ThirdApiInfo/OpenAppService.cs

@@ -327,6 +327,12 @@ namespace Waste.Application.ThirdApiInfo
         [HttpPost]
         public async Task<ResultInfo> AddProductAsync(ProductInfoDto data)
         {
+            // 1. 检查权限（false 直接返回无权限）
+            if (!data.uploadPermission)  // 等效于 data.uploadPermission == false
+            {
+                return new ResultInfo(ResultState.FAIL, "没有操作权限");
+            }
+
             return await _openService.AddProductAsync(data);
         }
 
@@ -335,5 +341,22 @@ namespace Waste.Application.ThirdApiInfo
         {
             return await _openService.GetProductAsync(param);
         }
+
+        /// <summary>
+        /// 删除产品数据（管理后台专用，无需权限校验）
+        /// </summary>
+        [HttpPost]
+        [Route("api/open/deleteproduct")]
+        public async Task<ResultInfo> DeleteProduct(string id)
+        {
+            // 1. 检查ID是否为空
+            if (string.IsNullOrEmpty(id))
+            {
+                return new ResultInfo(ResultState.FAIL, "ID不能为空");
+            }
+
+            // 2. 调用删除服务
+            return await _openService.DeleteProductAsync(id);
+        }
     }
 }

Waste.Application/ThirdApiInfo/OpenService.cs

@@ -597,7 +597,16 @@ namespace Waste.Application.ThirdApiInfo
         private async Task<ResultInfo> UpdateDevInfo(GetDevInfoRequestDto data, GetDevInfoResponseDto returndata, W_Device device, string type, string weight, string typename = "", string name = "")
         {
             //returndata.type = TrashType(type);
-            returndata.type = int.Parse(type);
+            int result = 0;
+            bool isSuccess = int.TryParse(type, out result);
+            if (isSuccess)
+            {
+                returndata.type = int.Parse(type);
+            }
+            else
+            {
+                returndata.type = TrashType(type);
+            }
 
             returndata.Weight = weight.ToDouble();
             //计算净重,毛重-皮重=净重，如果净重小于等于0则不上报保存
@@ -637,7 +646,7 @@ namespace Waste.Application.ThirdApiInfo
                 ResultId = returndata.ResultId,
                 Tare = device.Tare,
                 trash = returndata.trash,
-                wastetype = typename.IsNullOrEmpty() == false ? typename : TrashTypeTitle(type),
+                wastetype = typename.IsNullOrEmpty() == false ? typename : type,
                 weight = weight
             });
 
@@ -663,7 +672,7 @@ namespace Waste.Application.ThirdApiInfo
                 WasteSType = "",
                 Time = DateTime.Now,
                 TrashCode = returndata.trash,
-                WasteType = typename.IsNullOrEmpty() == false ? typename : TrashTypeTitle(type),
+                WasteType = typename.IsNullOrEmpty() == false ? typename : type,
                 Weight = weight.ToDecimal(),
                 faccode = device.FacEcode,
                 ecode = device.Ecode,
@@ -682,6 +691,7 @@ namespace Waste.Application.ThirdApiInfo
         /// <returns></returns>
         public async Task<ResultInfo> AddProductAsync(ProductInfoDto data)
         {
+            //return new ResultInfo(ResultState.SUCCESS, "测试信息：直接返回");
             try
             {
                 if (await dbClient.Queryable<W_Product>().AnyAsync(x => x.Uuid == data.uuid))
@@ -724,6 +734,7 @@ namespace Waste.Application.ThirdApiInfo
                         }
                     }
                 }
+                //return new ResultInfo(ResultState.SUCCESS, imageUrl);
                 W_Product insertdata = new W_Product
                 {
                     Id = Guid.NewGuid().ToString(),
@@ -801,5 +812,35 @@ namespace Waste.Application.ThirdApiInfo
                 return new PageParms<W_Product>();
             }
         }
+
+        public async Task<ResultInfo> DeleteProductAsync(string id)
+        {
+            try
+            {
+                // 1. 检查数据是否存在
+                var exists = await dbClient.Queryable<W_Product>()
+                    .Where(x => x.Id == id)
+                    .AnyAsync();
+
+                if (!exists)
+                {
+                    return new ResultInfo(ResultState.FAIL, "数据不存在");
+                }
+
+                // 2. 执行删除
+                var result = await dbClient.Deleteable<W_Product>()
+                    .Where(x => x.Id == id)
+                    .ExecuteCommandAsync();
+
+                return result > 0
+                    ? new ResultInfo(ResultState.SUCCESS, "删除成功")
+                    : new ResultInfo(ResultState.FAIL, "删除失败");
+            }
+            catch (Exception ex)
+            {
+                // 3. 错误处理
+                return new ResultInfo(ResultState.FAIL, $"系统错误: {ex.Message}");
+            }
+        }
     }
 }

Waste.Application/Waste.Application.xml

@@ -3101,6 +3101,11 @@
             
             </summary>
         </member>
+        <member name="P:Waste.Application.ThirdApiInfo.ProductInfoDto.uploadPermission">
+            <summary>
+            新增：操作权限控制（必须传 true/false，其他值或未传会报错）
+            </summary>
+        </member>
         <member name="T:Waste.Application.ThirdApiInfo.DevHeartRequestDto">
             <summary>
             心跳包上报数据
@@ -3590,6 +3595,11 @@
             <param name="data"></param>
             <returns></returns>
         </member>
+        <member name="M:Waste.Application.ThirdApiInfo.OpenAppService.DeleteProduct(System.String)">
+            <summary>
+            删除产品数据（管理后台专用，无需权限校验）
+            </summary>
+        </member>
         <member name="T:Waste.Application.ThirdApiInfo.OpenService">
             <summary>
             设备对接接口

Waste.Web.Entry/Pages/Device/Product.cshtml

@@ -52,6 +52,9 @@
                 {
                     field: 'unit', title: '重量单位'
                 },
+                {
+                    field: 'idvalues', title: '单价@总价'
+                },
                 {
                     field: 'upperlimit', title: '上限'
                 },
@@ -61,6 +64,14 @@
                 {
                     field: 'createtime', title: '创建时间'
                 },
+                {
+                    field: 'id',  // 改为绑定id字段
+                    title: '操作',
+                    templet: function(d) {
+                        return `<a class="layui-btn layui-btn-danger layui-btn-xs"
+                                    onclick="deleteProduct('${d.id}')">删除</a>`;
+                    }
+                }
                 ]],
                 parseData: function(n) {
                    console.log("接口返回的原始数据：", n);
@@ -84,4 +95,34 @@
                 });
             });
         </script>
+        <script>
+            // 删除函数
+            function deleteProduct(id) {
+                layer.confirm('确认删除这条记录？', { icon: 3 }, function() {
+                    $.post('/api/open/deleteproduct', { id: id }, function(res) {
+                        if (res.status.code === 1) {
+                            layer.msg('删除成功', { icon: 1 });
+                            layui.common.reloadtable("list"); // 刷新表格
+                        } else {
+                            layer.msg(res.status.message, { icon: 2 });
+                        }
+                    });
+                });
+            }
+            function deleteProduct(id) {
+                layer.confirm('确认删除这条记录？', { icon: 3 }, function() {
+                    $.post('/api/open/deleteproduct', { id: id }, function(res) {
+                        // 修改点：直接使用 res.code 和 res.message
+                        if (res.code === 0) {  // 注意这里判断的是 0（成功）
+                            layer.msg('删除成功', { icon: 1 });
+                            layui.common.reloadtable("list");
+                        } else {
+                            layer.msg(res.message || '删除失败', { icon: 2 });
+                        }
+                    }).fail(function() {
+                        layer.msg('请求失败，请检查网络', { icon: 2 });
+                    });
+                });
+            }
+        </script>
 }

Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\webpublish\waste.ybhdmob.com</_PublishTargetUrl>
-    <History>True|2025-03-27T03:41:02.3228124Z||;True|2025-03-21T16:54:06.1039552+08:00||;True|2025-03-21T13:31:54.3916167+08:00||;True|2025-03-21T11:58:37.1884032+08:00||;True|2025-03-21T11:35:39.8283713+08:00||;True|2025-03-20T15:55:31.1151589+08:00||;True|2025-02-11T14:49:30.5446930+08:00||;True|2025-02-11T14:35:29.4332908+08:00||;True|2025-02-11T13:59:02.5624245+08:00||;True|2024-12-26T15:55:05.3910632+08:00||;True|2024-12-26T09:11:18.0562918+08:00||;True|2024-12-20T17:09:33.5985280+08:00||;True|2024-12-20T16:58:49.8519733+08:00||;True|2024-12-20T16:47:57.5264148+08:00||;True|2024-12-20T15:15:52.6034211+08:00||;True|2024-12-20T15:04:37.1611174+08:00||;True|2024-12-20T15:03:11.1199173+08:00||;True|2024-12-20T14:56:32.0361934+08:00||;True|2024-12-20T14:52:27.0845075+08:00||;True|2024-12-18T09:25:19.6828490+08:00||;True|2024-12-16T15:45:38.9731146+08:00||;True|2024-02-22T09:28:06.5641782+08:00||;True|2024-02-22T09:23:28.6539914+08:00||;True|2024-02-21T13:50:30.0887271+08:00||;True|2023-01-09T14:37:17.3219940+08:00||;False|2023-01-09T14:36:37.2025779+08:00||;True|2022-09-14T10:54:14.3430113+08:00||;True|2022-08-24T10:11:56.9315738+08:00||;True|2022-07-28T16:27:26.4646475+08:00||;True|2022-07-26T18:02:16.8734313+08:00||;True|2022-07-26T17:47:48.4802128+08:00||;True|2022-07-26T10:16:29.8933802+08:00||;True|2022-07-26T09:36:14.5292489+08:00||;True|2022-07-12T17:26:37.8289741+08:00||;True|2022-07-07T15:15:35.7942932+08:00||;True|2022-07-07T14:38:14.6580938+08:00||;True|2022-07-07T14:32:33.3480279+08:00||;True|2022-07-06T08:59:01.5108509+08:00||;True|2022-06-21T14:41:45.3390865+08:00||;False|2022-06-21T14:31:42.6318272+08:00||;True|2022-06-21T14:07:42.4016410+08:00||;True|2022-06-20T15:37:14.0002383+08:00||;True|2022-06-20T08:32:15.3735483+08:00||;True|2022-06-18T10:39:25.0997617+08:00||;True|2022-06-15T11:23:32.6444305+08:00||;True|2022-06-07T10:26:48.8057155+08:00||;True|2022-05-19T14:38:58.4564787+08:00||;True|2022-05-19T10:00:43.2712891+08:00||;True|2022-05-17T18:00:53.2618269+08:00||;True|2022-05-17T17:55:33.2053115+08:00||;True|2022-05-17T17:38:48.8279756+08:00||;True|2022-05-16T16:44:49.1758100+08:00||;True|2022-03-30T10:54:32.5565057+08:00||;True|2022-03-30T10:53:48.9972377+08:00||;True|2022-03-30T10:50:31.5745775+08:00||;True|2022-03-30T10:47:50.1605527+08:00||;True|2022-03-30T10:15:59.9812921+08:00||;True|2022-03-29T09:29:45.1039655+08:00||;True|2022-03-29T09:21:47.0149226+08:00||;True|2022-03-28T10:33:44.7419612+08:00||;True|2022-03-28T10:22:40.9448563+08:00||;True|2022-03-28T10:19:15.1438519+08:00||;True|2022-01-20T10:39:53.2000547+08:00||;True|2021-11-23T17:45:59.0399234+08:00||;True|2021-11-23T14:52:52.6108389+08:00||;True|2021-11-23T13:47:55.8909321+08:00||;True|2021-11-23T13:46:38.7796888+08:00||;True|2021-11-23T13:42:14.9551976+08:00||;True|2021-11-23T13:40:54.9093258+08:00||;True|2021-11-23T13:31:49.0003794+08:00||;True|2021-11-23T13:29:43.7414639+08:00||;True|2021-10-12T15:18:06.6012215+08:00||;True|2021-10-12T15:11:17.7752651+08:00||;True|2021-10-12T14:54:39.0578509+08:00||;True|2021-10-12T11:25:18.7098128+08:00||;True|2021-09-18T15:34:20.7386778+08:00||;True|2021-09-15T11:09:28.0068993+08:00||;True|2021-09-07T12:19:33.4635211+08:00||;True|2021-09-07T11:36:13.4563799+08:00||;True|2021-09-03T15:41:46.2819586+08:00||;True|2021-08-31T17:16:16.0336390+08:00||;True|2021-08-31T16:05:30.7224440+08:00||;True|2021-08-23T09:44:46.2114418+08:00||;True|2021-08-19T20:32:56.2854974+08:00||;True|2021-08-18T14:01:33.0411246+08:00||;True|2021-08-17T10:05:15.4299188+08:00||;True|2021-08-13T19:32:53.6307075+08:00||;True|2021-08-13T19:29:50.5876782+08:00||;True|2021-08-13T19:14:14.2545106+08:00||;True|2021-08-13T15:24:09.4521125+08:00||;True|2021-08-13T14:59:40.4579407+08:00||;True|2021-08-13T10:02:29.7650246+08:00||;True|2021-08-13T09:45:10.6245894+08:00||;True|2021-08-12T20:11:21.5851106+08:00||;True|2021-08-12T20:00:42.4820498+08:00||;True|2021-08-12T18:44:08.3079650+08:00||;True|2021-08-12T18:35:47.4730766+08:00||;True|2021-08-12T18:32:10.9361388+08:00||;True|2021-08-12T18:30:21.4006961+08:00||;True|2021-08-12T18:13:00.9624470+08:00||;</History>
+    <History>True|2026-03-12T07:20:40.7737418Z||;True|2025-08-25T15:19:00.0896034+08:00||;True|2025-08-25T15:03:38.3327291+08:00||;True|2025-08-21T19:39:49.6555608+08:00||;True|2025-08-21T19:30:00.9282558+08:00||;True|2025-07-10T19:45:46.7153594+08:00||;True|2025-03-28T14:03:08.8350996+08:00||;True|2025-03-27T11:41:02.3228124+08:00||;True|2025-03-21T16:54:06.1039552+08:00||;True|2025-03-21T13:31:54.3916167+08:00||;True|2025-03-21T11:58:37.1884032+08:00||;True|2025-03-21T11:35:39.8283713+08:00||;True|2025-03-20T15:55:31.1151589+08:00||;True|2025-02-11T14:49:30.5446930+08:00||;True|2025-02-11T14:35:29.4332908+08:00||;True|2025-02-11T13:59:02.5624245+08:00||;True|2024-12-26T15:55:05.3910632+08:00||;True|2024-12-26T09:11:18.0562918+08:00||;True|2024-12-20T17:09:33.5985280+08:00||;True|2024-12-20T16:58:49.8519733+08:00||;True|2024-12-20T16:47:57.5264148+08:00||;True|2024-12-20T15:15:52.6034211+08:00||;True|2024-12-20T15:04:37.1611174+08:00||;True|2024-12-20T15:03:11.1199173+08:00||;True|2024-12-20T14:56:32.0361934+08:00||;True|2024-12-20T14:52:27.0845075+08:00||;True|2024-12-18T09:25:19.6828490+08:00||;True|2024-12-16T15:45:38.9731146+08:00||;True|2024-02-22T09:28:06.5641782+08:00||;True|2024-02-22T09:23:28.6539914+08:00||;True|2024-02-21T13:50:30.0887271+08:00||;True|2023-01-09T14:37:17.3219940+08:00||;False|2023-01-09T14:36:37.2025779+08:00||;True|2022-09-14T10:54:14.3430113+08:00||;True|2022-08-24T10:11:56.9315738+08:00||;True|2022-07-28T16:27:26.4646475+08:00||;True|2022-07-26T18:02:16.8734313+08:00||;True|2022-07-26T17:47:48.4802128+08:00||;True|2022-07-26T10:16:29.8933802+08:00||;True|2022-07-26T09:36:14.5292489+08:00||;True|2022-07-12T17:26:37.8289741+08:00||;True|2022-07-07T15:15:35.7942932+08:00||;True|2022-07-07T14:38:14.6580938+08:00||;True|2022-07-07T14:32:33.3480279+08:00||;True|2022-07-06T08:59:01.5108509+08:00||;True|2022-06-21T14:41:45.3390865+08:00||;False|2022-06-21T14:31:42.6318272+08:00||;True|2022-06-21T14:07:42.4016410+08:00||;True|2022-06-20T15:37:14.0002383+08:00||;True|2022-06-20T08:32:15.3735483+08:00||;True|2022-06-18T10:39:25.0997617+08:00||;True|2022-06-15T11:23:32.6444305+08:00||;True|2022-06-07T10:26:48.8057155+08:00||;True|2022-05-19T14:38:58.4564787+08:00||;True|2022-05-19T10:00:43.2712891+08:00||;True|2022-05-17T18:00:53.2618269+08:00||;True|2022-05-17T17:55:33.2053115+08:00||;True|2022-05-17T17:38:48.8279756+08:00||;True|2022-05-16T16:44:49.1758100+08:00||;True|2022-03-30T10:54:32.5565057+08:00||;True|2022-03-30T10:53:48.9972377+08:00||;True|2022-03-30T10:50:31.5745775+08:00||;True|2022-03-30T10:47:50.1605527+08:00||;True|2022-03-30T10:15:59.9812921+08:00||;True|2022-03-29T09:29:45.1039655+08:00||;True|2022-03-29T09:21:47.0149226+08:00||;True|2022-03-28T10:33:44.7419612+08:00||;True|2022-03-28T10:22:40.9448563+08:00||;True|2022-03-28T10:19:15.1438519+08:00||;True|2022-01-20T10:39:53.2000547+08:00||;True|2021-11-23T17:45:59.0399234+08:00||;True|2021-11-23T14:52:52.6108389+08:00||;True|2021-11-23T13:47:55.8909321+08:00||;True|2021-11-23T13:46:38.7796888+08:00||;True|2021-11-23T13:42:14.9551976+08:00||;True|2021-11-23T13:40:54.9093258+08:00||;True|2021-11-23T13:31:49.0003794+08:00||;True|2021-11-23T13:29:43.7414639+08:00||;True|2021-10-12T15:18:06.6012215+08:00||;True|2021-10-12T15:11:17.7752651+08:00||;True|2021-10-12T14:54:39.0578509+08:00||;True|2021-10-12T11:25:18.7098128+08:00||;True|2021-09-18T15:34:20.7386778+08:00||;True|2021-09-15T11:09:28.0068993+08:00||;True|2021-09-07T12:19:33.4635211+08:00||;True|2021-09-07T11:36:13.4563799+08:00||;True|2021-09-03T15:41:46.2819586+08:00||;True|2021-08-31T17:16:16.0336390+08:00||;True|2021-08-31T16:05:30.7224440+08:00||;True|2021-08-23T09:44:46.2114418+08:00||;True|2021-08-19T20:32:56.2854974+08:00||;True|2021-08-18T14:01:33.0411246+08:00||;True|2021-08-17T10:05:15.4299188+08:00||;True|2021-08-13T19:32:53.6307075+08:00||;True|2021-08-13T19:29:50.5876782+08:00||;True|2021-08-13T19:14:14.2545106+08:00||;True|2021-08-13T15:24:09.4521125+08:00||;True|2021-08-13T14:59:40.4579407+08:00||;True|2021-08-13T10:02:29.7650246+08:00||;True|2021-08-13T09:45:10.6245894+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

Waste.Web.Entry/Waste.Web.Entry.csproj.user

@@ -4,7 +4,7 @@
     <RazorPage_SelectedScaffolderID>RazorPageScaffolder</RazorPage_SelectedScaffolderID>
     <RazorPage_SelectedScaffolderCategoryPath>root/Common/RazorPage</RazorPage_SelectedScaffolderCategoryPath>
     <NameOfLastUsedPublishProfile>E:\liuzl_ybhdmob\巨天垃圾分类\Waste\Waste.Web.Entry\Properties\PublishProfiles\waste.ybhdmob.com.pubxml</NameOfLastUsedPublishProfile>
-    <ActiveDebugProfile>Waste.Web.Entry</ActiveDebugProfile>
+    <ActiveDebugProfile>IIS Express</ActiveDebugProfile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>

Waste.Web.Entry/bundleconfig.json

@@ -1,8 +1,8 @@
 [
   {
-    // 要输出的捆绑文件名称。 可以包含中的相对路径bundleconfig.json文件。 必填
+    // Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ơ<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>԰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>bundleconfig.json<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     "outputFileName": "wwwroot/css/login.min.css",
-    // 要将捆绑在一起的文件的数组。 这些是配置文件的相对路径。 可选，* 空值会在空的输出文件。 组合支持模式。
+    // Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>顣 <EFBFBD><EFBFBD>Щ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD>* <EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD>ڿյ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD><EFBFBD>ģʽ<EFBFBD><EFBFBD>
     "inputFiles": [
       "wwwroot/js/css/layui.css",
       "wwwroot/css/admin.css",
@@ -17,23 +17,23 @@
       "wwwroot/js/layui.js",
       "wwwroot/js/lay/modules/common.js"
     ],
-    // "输出类型缩减选项。
+    // "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD>
-    // "可选，默认值-minify": { "enabled": true },
+    // "<EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>ֵ-minify": { "enabled": true },
     "minify": {
       "enabled": false,
       "renameLocals": true
     },
-    //  指示是否生成捆绑的文件的源映射的标志。 可选，默认-false
+    //  ָʾ<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD>Դӳ<EFBFBD><EFBFBD>ı<EFBFBD>־<EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>-false
     "sourceMap": false,
-    // "指示是否将生成的文件添加到项目文件的标志。" "可选，默认-false",
+    // "ָʾ<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɵ<EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD>ӵ<EFBFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD>ļ<EFBFBD><EFBFBD>ı<EFBFBD>־<EFBFBD><EFBFBD>" "<22><>ѡ<EFBFBD><D1A1>Ĭ<EFBFBD><C4AC>-false",
     "includeInProject": true
-    // 用于存储生成的源代码映射文件的根路径。
+    // <EFBFBD><EFBFBD><EFBFBD>ڴ洢<EFBFBD><EFBFBD><EFBFBD>ɵ<EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӳ<EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD>ĸ<EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     //"sourceMapRootPath": ""
   },
   {
-    // 要输出的捆绑文件名称。 可以包含中的相对路径bundleconfig.json文件。 必填
+    // Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ơ<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>԰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>bundleconfig.json<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     "outputFileName": "wwwroot/css/index.min.css",
-    // 要将捆绑在一起的文件的数组。 这些是配置文件的相对路径。 可选，* 空值会在空的输出文件。 组合支持模式。
+    // Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>顣 <EFBFBD><EFBFBD>Щ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD>* <EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD>ڿյ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD><EFBFBD>ģʽ<EFBFBD><EFBFBD>
     "inputFiles": [
       "wwwroot/js/css/layui.css",
       "wwwroot/css/admin.css",
@@ -46,23 +46,23 @@
       "wwwroot/js/layui.js",
       "wwwroot/js/lay/modules/common.js"
     ],
-    // "输出类型缩减选项。
+    // "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD>
-    // "可选，默认值-minify": { "enabled": true },
+    // "<EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>ֵ-minify": { "enabled": true },
     "minify": {
       "enabled": true,
       "renameLocals": true
     },
-    //  指示是否生成捆绑的文件的源映射的标志。 可选，默认-false
+    //  ָʾ<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD>Դӳ<EFBFBD><EFBFBD>ı<EFBFBD>־<EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>-false
     "sourceMap": false,
-    // "指示是否将生成的文件添加到项目文件的标志。" "可选，默认-false",
+    // "ָʾ<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɵ<EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD>ӵ<EFBFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD>ļ<EFBFBD><EFBFBD>ı<EFBFBD>־<EFBFBD><EFBFBD>" "<22><>ѡ<EFBFBD><D1A1>Ĭ<EFBFBD><C4AC>-false",
     "includeInProject": true
-    // 用于存储生成的源代码映射文件的根路径。
+    // <EFBFBD><EFBFBD><EFBFBD>ڴ洢<EFBFBD><EFBFBD><EFBFBD>ɵ<EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӳ<EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD>ĸ<EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     //"sourceMapRootPath": ""
   },
   {
-    // 要输出的捆绑文件名称。 可以包含中的相对路径bundleconfig.json文件。 必填
+    // Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ơ<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>԰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD>bundleconfig.json<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     "outputFileName": "wwwroot/css/page.min.css",
-    // 要将捆绑在一起的文件的数组。 这些是配置文件的相对路径。 可选，* 空值会在空的输出文件。 组合支持模式。
+    // Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>顣 <EFBFBD><EFBFBD>Щ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD>* <EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD><EFBFBD>ڿյ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD><EFBFBD>ģʽ<EFBFBD><EFBFBD>
     "inputFiles": [
       "wwwroot/js/css/layui.css",
       "wwwroot/css/admin.css",
@@ -85,17 +85,17 @@
       "wwwroot/js/main.js",
       "wwwroot/js/global.js"
     ],
-    // "输出类型缩减选项。
+    // "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD>
-    // "可选，默认值-minify": { "enabled": true },
+    // "<EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>ֵ-minify": { "enabled": true },
     "minify": {
       "enabled": true,
       "renameLocals": true
     },
-    //  指示是否生成捆绑的文件的源映射的标志。 可选，默认-false
+    //  ָʾ<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD>Դӳ<EFBFBD><EFBFBD>ı<EFBFBD>־<EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD>Ĭ<EFBFBD><EFBFBD>-false
     "sourceMap": false,
-    // "指示是否将生成的文件添加到项目文件的标志。" "可选，默认-false",
+    // "ָʾ<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɵ<EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD>ӵ<EFBFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD>ļ<EFBFBD><EFBFBD>ı<EFBFBD>־<EFBFBD><EFBFBD>" "<22><>ѡ<EFBFBD><D1A1>Ĭ<EFBFBD><C4AC>-false",
     "includeInProject": true
-    // 用于存储生成的源代码映射文件的根路径。
+    // <EFBFBD><EFBFBD><EFBFBD>ڴ洢<EFBFBD><EFBFBD><EFBFBD>ɵ<EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӳ<EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD>ĸ<EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
     //"sourceMapRootPath": ""
   }
 ]

Waste.Web.Entry/wwwroot/js/lay/modules/common.js

@@ -597,6 +597,7 @@
                     icon: 'layui-icon-refresh'
                 }, "filter", "print", "exports"],
                 limit: 10,
+                limits: [10, 20, 50, 100, 500, 1500], // 添加这行：定义每页条数可选列表
                 loading: true,
                 autoSort: false,
                 contentType: 'application/json',

Waste.Web.Entry/wwwroot/js/login.min.js

@@ -10392,6 +10392,7 @@ layui.define(['jquery', 'layer', 'table', 'tableSelect','flow'], function (expor
                     icon: 'layui-icon-refresh'
                 }, "filter", "print", "exports"],
                 limit: 10,
+                limits: [10, 20, 50, 100, 500, 1500], // 添加这行：定义每页条数可选列表
                 loading: true,
                 autoSort: false,
                 contentType: 'application/json',