Commit Graph

Select branches

Hide Pull Requests

dev

master

修改登录-勿用

#1

#2

#3

#4

Mono Color

• 088c3bdd65 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 沈鸿 2025-05-23 17:03:53 +08:00
• 473e09ee29 合作社修改 沈鸿 2025-05-23 17:03:49 +08:00
• 602e72f2bf Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 13713575202 2025-05-23 16:58:59 +08:00
• 761ae3eb6f xiabin 13713575202 2025-05-23 16:58:57 +08:00
• 61be13b963 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 姚俊旭 2025-05-23 16:42:59 +08:00
• 74aa210c5f 政务大屏数据处理。 姚俊旭 2025-05-23 16:42:43 +08:00
• 185a09f152 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 沈鸿 2025-05-23 16:40:42 +08:00
• 1c56ca1d0f 土地资源管理 沈鸿 2025-05-23 16:40:36 +08:00
• c6b5b7b94b Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 13713575202 2025-05-23 14:33:06 +08:00
• 1502ba1d63 夏滨修改数据为真实数据 13713575202 2025-05-23 14:33:04 +08:00
• beb22c91f9 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 沈鸿 2025-05-23 13:05:51 +08:00
• cf7762c281 三级菜单效果修改 沈鸿 2025-05-23 13:02:15 +08:00
• 92cf909ee6 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 姚俊旭 2025-05-22 16:14:04 +08:00
• 5bdde25ceb 电商平台开发页面 姚俊旭 2025-05-22 16:11:32 +08:00
• 304be8b129 政务云智慧大屏-部分细节调整 2090205686@qq.com 2025-05-22 16:10:22 +08:00
• 07dbd6398d xiabin 13713575202 2025-05-22 15:47:44 +08:00
• 33956d49cb 冲突合并 2090205686@qq.com 2025-05-22 15:43:17 +08:00
• f62526a22b 产出品管理页面调整 2090205686@qq.com 2025-05-22 15:40:33 +08:00
• 29db0c4024 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 13713575202 2025-05-22 15:37:07 +08:00
• 11c56eabe4 xiabin 13713575202 2025-05-22 15:37:05 +08:00
• a8aef9a012 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 沈鸿 2025-05-22 15:12:45 +08:00
• 01fdb0c07c 政务云土地资源路由修改，运营云数据使用本地 沈鸿 2025-05-22 15:12:38 +08:00
• 79ac695e43 合并冲突处理 2090205686@qq.com 2025-05-22 14:59:20 +08:00
• f609ab304c 生产经营主体页面调整 2090205686@qq.com 2025-05-22 14:54:50 +08:00
• 9eca7214bb Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 13713575202 2025-05-22 14:43:59 +08:00
• fc6d3a5cd4 夏滨修改 农产品溯源，溯源列表 13713575202 2025-05-22 14:43:57 +08:00
• 9f8508398d Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 沈鸿 2025-05-22 13:54:39 +08:00
• 35554268b9 运营云PC-公共品牌管理-新增品牌制度管理 沈鸿 2025-05-22 13:54:28 +08:00
• 93f13af072 政务大屏产出品管理 大屏修改优化 姚俊旭 2025-05-22 11:17:06 +08:00
• 1d983eba78 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 沈鸿 2025-05-22 10:39:13 +08:00
• 85285d80c1 公共品牌新增 沈鸿 2025-05-22 10:38:36 +08:00
• b653e6a28b 隐藏土地交易 姚俊旭 2025-05-22 10:08:35 +08:00
• efa30129c5 大屏土地资源修改 姚俊旭 2025-05-22 09:09:35 +08:00
• 1c338e34a6 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 2090205686@qq.com 2025-05-21 17:21:07 +08:00
• b5d6451b39 环境监测页面添加拟动态数据 2090205686@qq.com 2025-05-21 17:21:03 +08:00
• 24f4a42ca4 修改菜单BUG 姚俊旭 2025-05-21 17:13:19 +08:00
• 78255cea06 随机数据生成 田间监测 姚俊旭 2025-05-21 15:36:06 +08:00
• af11fa876b 页面回滚病虫害页面 姚俊旭 2025-05-21 14:51:24 +08:00
• 05d99fb7e0 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 2090205686@qq.com 2025-05-21 14:33:39 +08:00
• 9e193feb0e 智能灌溉和智能浸种开发完成，含右侧展示组件，原文件结构调整，路由调整 2090205686@qq.com 2025-05-21 14:33:34 +08:00
• a60301fba5 模拟数据变动 姚俊旭 2025-05-21 14:31:53 +08:00
• 2da225162e Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 沈鸿 2025-05-21 13:45:08 +08:00
• dd1cd7cf03 运营云公共品牌 沈鸿 2025-05-21 13:44:54 +08:00
• f72e2a2f14 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 2090205686@qq.com 2025-05-21 10:46:54 +08:00
• 0e2a09d77b 页面文件夹调整，路由调整 2090205686@qq.com 2025-05-21 10:46:48 +08:00
• 15637ac3ee Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 姚俊旭 2025-05-21 10:16:49 +08:00
• 21661bf0c9 1 姚俊旭 2025-05-21 10:16:21 +08:00
• 7f86f02178 智能配肥 姚俊旭 2025-05-21 10:14:25 +08:00
• fd44ba2206 合并dev分支 master 13713575202 2025-05-21 09:13:30 +08:00
• 608ddee02c 合并冲突 13713575202 2025-05-21 09:00:50 +08:00
• 30743bd4e0 xiabin 13713575202 2025-05-21 09:00:10 +08:00
• 2e057d7014 合并冲突 2090205686@qq.com 2025-05-20 17:51:57 +08:00
• 95ce33be37 智慧种植-生产管理模块开发 2090205686@qq.com 2025-05-20 17:49:10 +08:00
• 338c0cf779 icons 设备组件完善。环境监测页面完成 姚俊旭 2025-05-20 17:34:11 +08:00
• d485768e8f Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 沈鸿 2025-05-20 13:33:04 +08:00
• 624fb109d2 使用申请 沈鸿 2025-05-20 13:32:43 +08:00
• 71abc7497e 冲突合并 2090205686@qq.com 2025-05-20 13:31:23 +08:00
• c4304f8da7 智慧种植模块一体育苗页面开发，new政务数据大屏路由调整 2090205686@qq.com 2025-05-20 13:25:47 +08:00
• 417ad4bdcc Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev Xulinchuan 2025-05-20 13:08:14 +08:00
• ca887983dd 电商交易相关代码 Xulinchuan 2025-05-20 13:05:37 +08:00
• d5bd7072e1 xiabin 13713575202 2025-05-20 13:02:59 +08:00
• 7b9c9e70a3 node版本 18 13713575202 2025-05-20 11:51:08 +08:00
• 575ec062cb Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 13713575202 2025-05-20 10:47:29 +08:00
• 438b388178 xiabin 13713575202 2025-05-20 10:47:27 +08:00
• 939566e7d8 农业环境监测修改 姚俊旭 2025-05-20 09:48:38 +08:00
• 32a1830f9d hls插件 姚俊旭 2025-05-20 09:34:01 +08:00
• c50655e1e9 Merge remote-tracking branch 'origin/dev' into dev 姚俊旭 2025-05-20 09:32:54 +08:00
• 7c8a206519 hls插件 姚俊旭 2025-05-20 09:31:30 +08:00
• 9e74b959d7 政务大屏修改 沈鸿 2025-05-20 08:53:11 +08:00
• 2272c21814 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 沈鸿 2025-05-19 13:45:24 +08:00
• 9e0ccac1e5 政务云大屏修改 沈鸿 2025-05-19 13:45:13 +08:00
• 5909699ca8 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 2090205686@qq.com 2025-05-19 13:44:40 +08:00
• 48bdf3923e 本地初始化项目 2090205686@qq.com 2025-05-19 13:44:35 +08:00
• b52ef2f1d8 Merge remote-tracking branch 'origin/dev' into dev 姚俊旭 2025-05-19 13:41:56 +08:00
• 47b8e18b56 智慧种植页面首页 田间监测页面 姚俊旭 2025-05-19 13:41:18 +08:00
• edbbf59a3b 智慧种植页面首页 田间监测页面 姚俊旭 2025-05-19 13:38:34 +08:00
• 91756e6a8a Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 2090205686@qq.com 2025-05-19 13:20:39 +08:00
• bb9d4314d7 农产品溯源页面地图调整 2090205686@qq.com 2025-05-19 13:20:29 +08:00
• 1af489ab4b Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 沈鸿 2025-05-19 11:56:06 +08:00
• 49cc00695f 投入品监管 沈鸿 2025-05-19 11:55:58 +08:00
• 9a1093f8f0 Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev 2090205686@qq.com 2025-05-16 17:46:48 +08:00
• 1986442641 生产经营主体和农产品溯源调整(未完) 2090205686@qq.com 2025-05-16 17:43:53 +08:00
• a8c4bd456e 合并dev分支 13713575202 2025-05-16 11:02:44 +08:00
• 66e5c1503d 强制覆盖代码，原代码不变，部分新代码影响框架正常运行，舍弃 13713575202 2025-05-16 10:57:59 +08:00
• 07c91bd943 修改头部和菜单导航栏，添加部分路由。 姚俊旭 2025-05-15 17:34:49 +08:00
• 8a492ffc81 加入原master分支的sub-admin代码 13713575202 2025-05-15 15:52:11 +08:00
• abd0075895 最新dev分支合并到master分支 master分支已备份 13713575202 2025-05-15 15:49:42 +08:00
• 41955b2edf xiabin 13713575202 2025-05-15 15:29:44 +08:00
• 313705c4c0 合并所有平台 13713575202 2025-05-15 15:15:40 +08:00
• 58cb3ebbf4 xiabin 13713575202 2025-05-15 10:59:34 +08:00
• 326cb70a0d xiabin 13713575202 2025-05-15 10:21:25 +08:00
• 3cfc916505 更改进入子组件黑屏问题 13713575202 2025-05-14 17:10:21 +08:00
• 837b31076d xiabin修改 13713575202 2025-05-14 15:48:58 +08:00
• a40f04df31 xiabin修改app.js 13713575202 2025-05-14 15:37:48 +08:00
• 8e782722a5 xiabin 13713575202 2025-05-14 15:31:55 +08:00
• b78bf38587 xiabin 13713575202 2025-05-14 15:23:32 +08:00
• 729c2ccd2e 夏滨接入子应用 13713575202 2025-05-14 15:15:40 +08:00
• 3cb8d54fe3 xiaibn 13713575202 2025-05-13 09:32:02 +08:00
• 0f87afbd32 xiabin 13713575202 2025-05-12 17:46:49 +08:00
• 5e3bd23a18 文字修改 zenghua.wang 2025-04-30 17:17:05 +08:00