Commit Graph

Select branches

Hide Pull Requests

fix

main

master

mini-program

pc-master

portal

wx-program

wxmaster

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

0.0.1

Mono Color

• 5e8787d5e2 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 孙萌 2023-12-09 18:06:08 +08:00
• 8e2c86ae0a 1 孙萌 2023-12-09 18:05:58 +08:00
• 65d1d8dc34 修改东北弹框 pangdundun 2023-12-09 17:19:10 +08:00
• 8a07725056 修改和优化顶卷模块 pangdundun 2023-12-09 16:01:44 +08:00
• f94ae07f6e Merge pull request 'pc-master' (#65) from pc-master into portal xiaomeng 2023-12-09 06:54:11 +00:00
• 1370fdd036 修改顶卷膜权限 pangdundun 2023-12-07 17:32:49 +08:00
• f3bce25c73 修改右下角模块 pangdundun 2023-12-07 16:22:38 +08:00
• 3b38393e3b Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master pangdundun 2023-12-07 10:37:51 +08:00
• 434a5c2330 修改东北code pangdundun 2023-12-07 10:37:36 +08:00
• f1b90810cd 1 孙萌 2023-12-07 10:17:59 +08:00
• 8d08393653 feat(component): add new feature wmsjhappy@gmail.com 2023-12-07 09:23:04 +08:00
• e0ce09bf87 Merge pull request 'pc-master' (#64) from pc-master into portal xiaomeng 2023-12-07 00:57:05 +00:00
• d7251628c7 1 孙萌 2023-12-06 17:36:41 +08:00
• b59b193b7f 1 孙萌 2023-12-06 14:57:38 +08:00
• b49faf0d47 上风口新参数添加/实时数据status添加删除提交 孙萌 2023-12-06 11:19:40 +08:00
• 04be0ddef6 1 孙萌 2023-12-06 11:11:01 +08:00
• 6e70047bb5 Merge pull request 'pc-master' (#63) from pc-master into portal xiaomeng 2023-12-05 10:01:21 +00:00
• efdaa5ec80 1 孙萌 2023-12-05 18:00:10 +08:00
• 463cc3b16f Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 孙萌 2023-12-05 11:44:26 +08:00
• 542d2b79d4 1 孙萌 2023-12-05 11:44:18 +08:00
• 416dba2437 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master pangdundun 2023-12-05 10:40:04 +08:00
• 9486053800 新增东北大屏和大图 pangdundun 2023-12-05 10:39:57 +08:00
• 5edfe5088c 1 孙萌 2023-12-04 14:48:53 +08:00
• fe76509110 Merge pull request 'pc-master' (#61) from pc-master into portal xiaomeng 2023-12-02 03:19:48 +00:00
• b8a8121161 1 home孙 2023-12-02 11:13:17 +08:00
• afbe11382c 1 home孙 2023-12-02 11:12:43 +08:00
• 903774c38a ~ pangdundun 2023-12-01 21:27:32 +08:00
• 51f0da3ec1 ~ pangdundun 2023-12-01 21:22:42 +08:00
• a6fbcf1e2b 1 孙萌 2023-12-01 17:29:30 +08:00
• 3cc0212e71 Merge pull request '新页面补充' (#60) from pc-master into portal xiaomeng 2023-12-01 09:03:30 +00:00
• ceefde9f94 新页面补充 孙萌 2023-12-01 14:34:56 +08:00
• 6c2a632b5e Merge pull request '1' (#59) from pc-master into portal xiaomeng 2023-11-28 00:49:14 +00:00
• 277d8ebab6 1 孙萌 2023-11-28 08:46:08 +08:00
• 2b2f49cf22 Merge pull request 'pc-master' (#58) from pc-master into portal xiaomeng 2023-11-28 00:10:54 +00:00
• 2f6dff8a33 1 孙萌 2023-11-27 14:27:56 +08:00
• 29affcc0fc 1 孙萌 2023-11-27 11:16:55 +08:00
• f045c2e14f Merge pull request 'pc-master' (#57) from pc-master into portal xiaomeng 2023-11-24 08:16:36 +00:00
• d7141d4ad4 1 孙萌 2023-11-24 14:27:21 +08:00
• 769eef52ed 1 孙萌 2023-11-24 14:26:59 +08:00
• a0b544a46f 1 孙萌 2023-11-24 14:26:07 +08:00
• bf60c2e1e7 1 孙萌 2023-11-24 14:23:50 +08:00
• b9ee69355f ~ pangdundun 2023-11-24 10:13:41 +08:00
• 60dc3db7aa 1 孙萌 2023-11-24 10:12:06 +08:00
• f68728c789 Merge pull request 'pc-master' (#55) from pc-master into portal xiaomeng 2023-11-24 01:45:26 +00:00
• 57737265b5 1 孙萌 2023-11-24 09:42:41 +08:00
• 54d3b56851 1 孙萌 2023-11-24 08:41:29 +08:00
• e09f650f16 ~ pangdundun 2023-11-23 19:02:09 +08:00
• a3faab2336 fix(merge): merge mini-program liubaixun 2023-11-23 11:12:17 +08:00
• c4a8bd9b44 fix(rebuild): rebuild & merge liubaixun 2023-11-23 11:10:05 +08:00
• 74e0100ab7 控制器页面添加 孙萌 2023-11-22 17:28:49 +08:00
• 3a52be7747 土壤张力图标更换 孙萌 2023-11-22 08:40:54 +08:00
• 10969d9dc8 Merge pull request '1' (#51) from pc-master into portal xiaomeng 2023-11-21 09:10:03 +00:00
• eee23990c0 1 孙萌 2023-11-21 17:08:55 +08:00
• 407408feef Merge pull request 'pc-master' (#50) from pc-master into portal xiaomeng 2023-11-21 08:53:43 +00:00
• ca3731837d Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 孙萌 2023-11-21 16:51:51 +08:00
• 0d4f6e0762 1 孙萌 2023-11-21 16:51:45 +08:00
• 8419875cbe feat(add): add new feature wmsjhappy@gmail.com 2023-11-21 16:38:32 +08:00
• 2a60563eaf Merge pull request 'pc-master' (#49) from pc-master into portal xiaomeng 2023-11-21 08:34:50 +00:00
• 2ab755ab83 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master pangdundun 2023-11-21 16:31:37 +08:00
• 7578cf5629 ~ pangdundun 2023-11-21 16:31:31 +08:00
• 6e4c4a03f6 Merge pull request 'pc-master' (#48) from pc-master into portal xiaomeng 2023-11-21 08:11:11 +00:00
• 31a3ee0da4 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 孙萌 2023-11-21 16:08:35 +08:00
• 7075add91b 1 孙萌 2023-11-21 16:08:29 +08:00
• 9d5bc9ab01 Merge pull request '1' (#47) from pc-master into portal xiaomeng 2023-11-21 07:37:56 +00:00
• ac738959dc Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master pangdundun 2023-11-21 15:36:28 +08:00
• 3f04ee521b ~ pangdundun 2023-11-21 15:36:22 +08:00
• 44c1c8e2fb 1 孙萌 2023-11-21 14:51:31 +08:00
• 224a904cd7 Merge pull request 'pc-master' (#46) from pc-master into portal xiaomeng 2023-11-21 05:56:59 +00:00
• b1ba00f9c2 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 孙萌 2023-11-21 11:29:02 +08:00
• cb24bd0bb4 1 孙萌 2023-11-21 11:28:57 +08:00
• 45aed4098e ~ pangdundun 2023-11-21 10:47:40 +08:00
• d51add73ff Merge pull request '~' (#45) from pc-master into portal xiaomeng 2023-11-20 05:17:23 +00:00
• c2147e4e47 ~ pangdundun 2023-11-20 12:03:18 +08:00
• 582f57670d Merge pull request 'pc-master' (#44) from pc-master into portal xiaomeng 2023-11-20 02:49:24 +00:00
• 99c21c78ce Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master pangdundun 2023-11-20 10:46:42 +08:00
• 9db095d1e1 ~ pangdundun 2023-11-20 10:46:32 +08:00
• f88a36a07d 1 孙萌 2023-11-20 10:14:41 +08:00
• ba1b7594fc Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 孙萌 2023-11-20 09:22:35 +08:00
• 2fd78c1a21 1 孙萌 2023-11-20 09:22:29 +08:00
• e32baa9d0f Merge pull request 'pc-master' (#43) from pc-master into portal xiaomeng 2023-11-19 05:53:39 +00:00
• 0d2b98af85 ~ pangdundun 2023-11-18 22:07:59 +08:00
• cc2378663b ~ pangdundun 2023-11-18 18:54:40 +08:00
• 1c1f98f467 Merge pull request 'pc-master' (#42) from pc-master into portal xiaomeng 2023-11-18 05:26:03 +00:00
• 0b2d16e194 ~ pangdundun 2023-11-17 19:26:35 +08:00
• ede0dba799 修改跳转问题 pangdundun 2023-11-17 18:07:04 +08:00
• f92632a750 Merge pull request 'pc-master' (#41) from pc-master into portal xiaomeng 2023-11-17 06:29:05 +00:00
• 98dbf114ce ~ pangdundun 2023-11-17 14:27:32 +08:00
• a392c01e37 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master pangdundun 2023-11-17 14:21:16 +08:00
• 15bf2a4bf6 ~ pangdundun 2023-11-17 14:21:05 +08:00
• 4ffd0205d8 Merge pull request 'pc-master' (#40) from pc-master into portal xiaomeng 2023-11-17 05:30:24 +00:00
• adba9271e6 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 孙萌 2023-11-17 11:50:53 +08:00
• 5f671cbff8 1 孙萌 2023-11-17 11:50:46 +08:00
• 01ba76bf30 ~ pangdundun 2023-11-17 09:30:15 +08:00
• 0b30f8f73c Merge pull request '~' (#39) from pc-master into portal xiaomeng 2023-11-17 00:13:43 +00:00
• 47e0ba9c90 ~ pangdundun 2023-11-16 18:39:14 +08:00
• 5aebb33093 Merge pull request '~' (#38) from pc-master into portal xiaomeng 2023-11-16 07:44:49 +00:00
• 3140c05744 ~ pangdundun 2023-11-16 15:43:23 +08:00
• 773ced60cd Merge pull request 'pc-master' (#37) from pc-master into portal xiaomeng 2023-11-16 07:08:30 +00:00
• 79f70fd075 ~ pangdundun 2023-11-16 15:07:31 +08:00
• 7fc50fd211 风机问题修改 孙萌 2023-11-16 14:50:51 +08:00