Commit Graph

Select branches

Hide Pull Requests

master

projects/lb-new260304

projects/lb-pre-ver

projects/line

projects/line-gtz

projects/line-new

projects/line-new-zhp

projects/line-new-zjl

projects/line-new-zwq

projects/line-test

projects/line-zhp

projects/line-zjl

projects/line-zwq

projects/mes

projects/mes-gtz

projects/mes-test

projects/mes-zhp

projects/mes-zjl

projects/mes-zwq

projects/mesxc

projects/mesxc-dev

projects/mesxc-gtz

projects/mesxc-test

projects/mesxc-zhp

projects/mesxc-zjl

projects/mesxc-zwq

projects/qhd-line-test

projects/qhd-line-zhp

projects/qhd-line-zjl

projects/ry-line-test

projects/ry-line-zhp

projects/ssdl-gtz

projects/ssdl-test

projects/ssdl-zhp

projects/ssdl-zwq

projects/zg

projects/zg-test

projects/zg-zjl

projects/zg-zwq

#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

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#45

#450

#451

#452

#453

#454

#455

#456

#457

#458

#459

#46

#460

#461

#462

#463

#464

#465

#466

#467

#468

#469

#47

#470

#471

#472

#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

Mono Color

• 392c1ea09b merge test juzi 2023-10-24 15:21:27 +08:00
• ac4565e587 班组&能源基础 juzi 2023-10-24 15:16:20 +08:00
• 6006ae13d9 update flow lb 2023-10-24 11:17:07 +08:00
• 74d5646d65 Merge pull request '包装管理' (#51) from projects/mes-zhp into projects/mes-test 高天泽 2023-10-23 08:57:17 +08:00
• 2c3bdde403 包装管理 ‘937886381’ 2023-10-23 08:42:46 +08:00
• 106d0ed89c merge server lb 2023-10-20 17:03:06 +08:00
• cfbd00b560 update process lb 2023-10-20 16:42:28 +08:00
• a787935263 add process flow and process node lb 2023-10-20 16:03:40 +08:00
• 15da20fac7 add 添加一个缓存方案 lb 2023-10-20 14:22:46 +08:00
• ac85c83cf9 Merge pull request 'update' (#50) from projects/line-lb into projects/line-test g7hoo 2023-10-19 17:07:10 +08:00
• c2e987aee4 update lb 2023-10-19 17:06:15 +08:00
• 6b4e906e75 update process flow lb 2023-10-19 16:40:36 +08:00
• d121e408af add 工艺流程列表 lb 2023-10-19 11:13:37 +08:00
• 0e4ed597cd Merge pull request 'update ui' (#49) from projects/line-lb into projects/line-test g7hoo 2023-10-18 09:15:36 +08:00
• f8baaa8955 update ui lb 2023-10-17 17:02:53 +08:00
• 3e7914ac91 update ui lb 2023-10-17 17:02:33 +08:00
• 416d4bb390 update lb 2023-10-17 15:27:08 +08:00
• fe7821cbd8 update 核心模块-厂务-设备 lb 2023-10-17 15:22:17 +08:00
• 9c19a6197a Merge pull request 'update dashboard' (#48) from projects/line-lb into projects/line-test g7hoo 2023-10-17 09:44:37 +08:00
• 074b35b6a6 update dashboard lb 2023-10-17 09:43:44 +08:00
• 9be57ad750 Merge pull request 'test' (#47) from test into master master projects/mes-gtz projects/line-zwq projects/line-zjl projects/line-zhp projects/line-gtz projects/line 高天泽 2023-10-17 08:53:53 +08:00
• f7313c5911 Merge pull request 'lb' (#46) from lb into test g7hoo 2023-10-17 08:38:26 +08:00
• a7e81ad8fb Merge branch 'test' into lb lb 2023-10-16 17:04:34 +08:00
• 32cbf9076f update 更新设备类型上传 lb 2023-10-16 17:03:29 +08:00
• 9a411cc663 Merge pull request 'dy' (#45) from dy into test hellody 2023-10-16 15:50:05 +08:00
• 445a88e540 Merge branch 'test' into dy helloDy 2023-10-16 15:47:50 +08:00
• 2b355aaf8f ui helloDy 2023-10-16 15:47:31 +08:00
• f60a46ed1d update 设备信息上传 lb 2023-10-16 13:35:43 +08:00
• 2688896660 Merge pull request 'dy' (#44) from dy into test hellody 2023-10-13 17:12:02 +08:00
• 4a67e226e1 merge helloDy 2023-10-13 17:09:07 +08:00
• 11ee0d6541 Merge branch 'test' into dy helloDy 2023-10-13 17:06:35 +08:00
• 98b3237c9a Merge pull request 'lb' (#43) from lb into test g7hoo 2023-10-13 17:06:02 +08:00
• 46aaa47e07 bug helloDy 2023-10-13 17:05:01 +08:00
• ca0f62b2eb Merge branch 'test' into lb lb 2023-10-13 17:04:18 +08:00
• 5534104e87 update equipment edit lb 2023-10-13 17:01:49 +08:00
• b72fe1bfed update equipment edit lb 2023-10-13 16:08:31 +08:00
• f4493bde1c Merge pull request 'dy' (#42) from dy into test hellody 2023-10-12 17:06:04 +08:00
• d682ecc91c Merge branch 'test' into dy helloDy 2023-10-12 17:05:03 +08:00
• 2b76ef7d23 bug helloDy 2023-10-12 17:04:03 +08:00
• 9ec13b35b8 update equipment lb 2023-10-12 17:03:07 +08:00
• 7acccd3de0 bugfix zentao lb 2023-10-12 15:40:05 +08:00
• e40f45a79a Merge pull request 'zjl' (#41) from zjl into test juzi 2023-10-12 14:43:24 +08:00
• 77083a84a1 merge test juzi 2023-10-12 14:41:59 +08:00
• 9f53ea6981 10.12 juzi 2023-10-12 14:39:59 +08:00
• 8f634d012c bugfix zentao lb 2023-10-12 11:08:51 +08:00
• 03c573d5b2 Merge pull request 'zjl' (#40) from zjl into test juzi 2023-10-11 14:34:26 +08:00
• 348714edaf merge test juzi 2023-10-11 14:33:37 +08:00
• 814fe4605a UI样式修改能源&班组 juzi 2023-10-11 14:30:18 +08:00
• bb6bfc5ab6 Merge pull request 'lb' (#39) from lb into test g7hoo 2023-10-11 10:33:08 +08:00
• 0162f338ba Merge branch 'test' into lb lb 2023-10-11 10:30:25 +08:00
• 8f99915720 add 设备看板 lb 2023-10-11 10:29:26 +08:00
• 744e5d80be Merge pull request 'dy' (#38) from dy into test hellody 2023-10-10 17:08:40 +08:00
• d3b119ad9b Merge branch 'test' into dy helloDy 2023-10-10 17:07:02 +08:00
• 69bdab75d4 bug helloDy 2023-10-10 17:06:39 +08:00
• af5e0333ed update ui lb 2023-10-10 15:30:37 +08:00
• b2ee61b8cb update 改为抽屉展示 lb 2023-10-10 14:22:00 +08:00
• 723d83cc02 update 设备分组 lb 2023-10-10 09:40:22 +08:00
• 769830c448 update 设备分组 lb 2023-10-09 17:01:19 +08:00
• 907db90e93 update 设备分组的抽屉 lb 2023-10-09 16:27:44 +08:00
• 6e390bf12a update lb 2023-10-09 13:32:33 +08:00
• b39f0625a1 update lb 2023-10-09 11:37:19 +08:00
• e985c73e00 update gantt lb 2023-10-08 17:14:18 +08:00
• 180fcf5ad8 Merge pull request 'dy' (#37) from dy into test hellody 2023-10-08 17:03:04 +08:00
• b1c0d21888 Merge branch 'test' into dy helloDy 2023-10-08 16:59:31 +08:00
• 96d52fafee pdf helloDy 2023-10-08 16:59:09 +08:00
• 4f7889ff60 done time sequence demo lb 2023-10-08 15:53:38 +08:00
• bc2c5a4787 update time sequence status lb 2023-10-08 15:00:38 +08:00
• ab8e9cb2a5 update lb 2023-10-08 14:30:50 +08:00
• 57960ff8bf update print page lb 2023-10-08 10:18:08 +08:00
• b9e39dacf1 bugfix zentao lb 2023-10-08 09:30:43 +08:00
• 80ad95be6e add print module lb 2023-10-07 14:29:43 +08:00
• 7dfaae02a8 Merge pull request 'lb' (#36) from lb into test g7hoo 2023-09-27 17:00:53 +08:00
• cf2d7af94b delete echarts lb 2023-09-27 17:00:33 +08:00
• a48b31dcbe Merge branch 'test' into lb lb 2023-09-27 16:58:28 +08:00
• 96b0a9e503 update 产品质量分析 lb 2023-09-27 16:53:27 +08:00
• 9c257aa24a update demo lb 2023-09-27 15:14:13 +08:00
• 7ab5f1b812 update demo lb 2023-09-27 14:42:38 +08:00
• 5c796cd44f add custom echarts demo lb 2023-09-27 14:01:48 +08:00
• fe0b5538a8 update 设备产量时序图 lb 2023-09-27 11:17:07 +08:00
• 90695acefd update 检测信息记录 lb 2023-09-27 10:14:24 +08:00
• a90c5cca0c Merge pull request 'zjl' (#35) from zjl into test juzi 2023-09-27 09:38:02 +08:00
• 4d7e3c0e04 merge test juzi 2023-09-27 09:36:20 +08:00
• ee40707d2c 修改bug及能源分析样式 juzi 2023-09-27 09:33:28 +08:00
• 20808c0975 update 产量时序图 lb 2023-09-26 17:00:46 +08:00
• 87f56dd9ac update responsejson lb 2023-09-26 15:12:41 +08:00
• 24ffea330d update 设备产量分析 lb 2023-09-26 14:56:00 +08:00
• a4594426c3 bugfix lb 2023-09-26 14:38:30 +08:00
• c899bb37e3 update quality inspection record lb 2023-09-26 11:03:34 +08:00
• 47e91d821b Merge pull request 'lb' (#34) from lb into test g7hoo 2023-09-25 17:14:23 +08:00
• d907d2f341 Merge branch 'test' into lb lb 2023-09-25 17:13:47 +08:00
• 1116531aff update lb 2023-09-25 16:58:35 +08:00
• 8dc5bbb4d8 update lb 2023-09-25 16:53:31 +08:00
• c24d22aedd update lb 2023-09-25 16:34:05 +08:00
• bbbfa9644d bugfix lb 2023-09-25 15:47:39 +08:00
• db4ecc91d6 Merge pull request 'dy' (#33) from dy into test hellody 2023-09-22 16:59:55 +08:00
• 699810f40a Merge branch 'test' into dy helloDy 2023-09-22 16:54:40 +08:00
• d454f20bd6 bug helloDy 2023-09-22 16:54:16 +08:00
• 56f209a27e Merge branch 'test' into lb lb 2023-09-22 16:29:50 +08:00
• 980f3468b7 update homepage lb 2023-09-22 16:29:31 +08:00
• 95da2191dd Merge pull request 'zjl' (#32) from zjl into test juzi 2023-09-22 11:09:34 +08:00