Commit Graph

Select branches

Hide Pull Requests

master

projects/line

projects/line-dy

projects/line-gtz

projects/line-lb

projects/line-test

projects/line-zhp

projects/line-zjl

projects/line-zwq

projects/mes

projects/mes-dy

projects/mes-gtz

projects/mes-lb

projects/mes-test

projects/mes-zhp

projects/mes-zjl

projects/mes-zwq

projects/mesxc

projects/mesxc-dev

projects/mesxc-dy

projects/mesxc-gtz

projects/mesxc-lb

projects/mesxc-test

projects/mesxc-zhp

projects/mesxc-zjl

projects/mesxc-zwq

projects/ry-line-test

projects/zg

projects/zg-test

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

#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

Mono Color

• fcb1885bf7 基础，物料，设备 helloDy 2023-11-07 15:53:01 +0800
• 123d45afa9 Merge pull request '更新仓库' (#65) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-07 15:49:59 +0800
• 97e6a665de 更新仓库 zwq 2023-11-07 15:49:33 +0800
• 6e1bf994c2 bug juzi 2023-11-07 15:49:07 +0800
• 298789bf24 Merge pull request 'projects/mes-zjl' (#64) from projects/mes-zjl into projects/mes-test juzi 2023-11-06 13:43:22 +0800
• 876f7d8f3c merge test juzi 2023-11-06 13:42:09 +0800
• 5695c3db90 成品发货 juzi 2023-11-06 13:37:52 +0800
• 9537c55f0e Merge pull request 'projects/mes-dy' (#63) from projects/mes-dy into projects/mes-test 高天泽 2023-11-06 12:57:09 +0800
• 1d38a560ec Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-06 12:55:03 +0800
• 0ae3c66dc3 基础核心 helloDy 2023-11-06 12:54:28 +0800
• e49084d85d Merge pull request '更新仓库管理' (#62) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-04 16:40:59 +0800
• 0deb38647e 更新仓库管理 zwq 2023-11-04 16:40:16 +0800
• 5521f07c18 Merge pull request 'projects/mes-zjl' (#61) from projects/mes-zjl into projects/mes-test juzi 2023-11-03 17:02:04 +0800
• 14d426b020 merge test juzi 2023-11-03 17:01:14 +0800
• 046a5eea32 成品发货 juzi 2023-11-03 16:59:07 +0800
• b468204f88 Merge pull request 'projects/mes-dy' (#60) from projects/mes-dy into projects/mes-test 高天泽 2023-11-03 15:38:59 +0800
• e5978d1700 merge helloDy 2023-11-03 11:16:30 +0800
• 91eb13af26 客商信息、人事相关 helloDy 2023-11-03 11:15:12 +0800
• fe29043ab1 Merge pull request 'projects/mes-lb' (#59) from projects/mes-lb into projects/mes-test g7hoo 2023-11-01 09:45:17 +0800
• 2075b42427 'merge' lb 2023-11-01 09:39:25 +0800
• c851188989 update before hand over lb 2023-11-01 09:37:47 +0800
• 0fa310609e update 设备备品备件+巡检 Melete 2023-10-31 22:34:10 +0800
• 57a4ca96e7 add lb 2023-10-31 17:49:39 +0800
• af868a7cd7 update 设备基础配置，设备保养 lb 2023-10-30 16:51:37 +0800
• cb1ad9edec Merge pull request 'projects/mes-zhp' (#57) from projects/mes-zhp into projects/mes-test 高天泽 2023-10-30 11:04:40 +0800
• 070e01c2c4 Merge pull request 'projects/line-lb' (#58) from projects/line-lb into projects/line-test g7hoo 2023-10-30 10:53:44 +0800
• 2665b6a0b0 Merge branch 'projects/line-test' into projects/line-lb lb 2023-10-30 10:52:08 +0800
• a71fb90e6a update DialogForm v-model lb 2023-10-30 10:51:41 +0800
• 34e8178ddc 解决合并冲突 ‘937886381’ 2023-10-30 10:50:21 +0800
• 6c094b2a2e 修改bug ‘937886381’ 2023-10-30 10:48:32 +0800
• 4a796130d0 update 设备采集配置 lb 2023-10-30 10:47:06 +0800
• 60f65e6f85 Merge pull request 'projects/mes-lb' (#56) from projects/mes-lb into projects/mes-test g7hoo 2023-10-30 10:37:41 +0800
• 3bf8150764 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-10-30 10:36:13 +0800
• bacf2eab0b update lb 2023-10-30 10:35:09 +0800
• 8155a78649 Merge pull request 'projects/mes-zjl' (#55) from projects/mes-zjl into projects/mes-test juzi 2023-10-30 10:33:43 +0800
• 013c08710c merge test juzi 2023-10-30 10:32:51 +0800
• 00fba0a83b 2023.10.30提测能源&班组 juzi 2023-10-30 10:26:54 +0800
• c71613f3fc Merge pull request 'projects/mes-dy' (#54) from projects/mes-dy into projects/mes-test 高天泽 2023-10-27 16:19:19 +0800
• 4615e975e8 merge helloDy 2023-10-27 16:17:28 +0800
• e961bf6cfa 物料模块 helloDy 2023-10-27 16:16:13 +0800
• 216aa6291d update 设备管理-基础配置-设备分组绑定 lb 2023-10-27 14:24:47 +0800
• 66660bfef7 update lb 2023-10-26 17:01:09 +0800
• d25261b256 move coreEquipment lb 2023-10-26 15:14:00 +0800
• 583b934511 delete some files lb 2023-10-26 14:07:36 +0800
• 55e023d0a8 Merge pull request 'projects/mes-lb' (#53) from projects/mes-lb into projects/mes-test g7hoo 2023-10-26 11:34:28 +0800
• 503e988f7b merge again lb 2023-10-26 11:32:29 +0800
• 06e8a72f80 merge mes-test lb 2023-10-26 11:30:07 +0800
• 6c348202a1 update extend process lb 2023-10-26 11:28:24 +0800
• 5ba186b0c6 update lb 2023-10-25 17:02:43 +0800
• e153d7e077 update 流程图 lb 2023-10-24 17:07:32 +0800
• 3c31e5d63a done 新建工序 lb 2023-10-24 15:56:15 +0800
• 619cf9e1ce Merge pull request 'projects/mes-zjl' (#52) from projects/mes-zjl into projects/mes-test juzi 2023-10-24 15:22:19 +0800
• 392c1ea09b merge test juzi 2023-10-24 15:21:27 +0800
• ac4565e587 班组&能源基础 juzi 2023-10-24 15:16:20 +0800
• 6006ae13d9 update flow lb 2023-10-24 11:17:07 +0800
• 74d5646d65 Merge pull request '包装管理' (#51) from projects/mes-zhp into projects/mes-test 高天泽 2023-10-23 08:57:17 +0800
• 2c3bdde403 包装管理 ‘937886381’ 2023-10-23 08:42:46 +0800
• 106d0ed89c merge server lb 2023-10-20 17:03:06 +0800
• cfbd00b560 update process lb 2023-10-20 16:42:28 +0800
• a787935263 add process flow and process node lb 2023-10-20 16:03:40 +0800
• 15da20fac7 add 添加一个缓存方案 lb 2023-10-20 14:22:46 +0800
• ac85c83cf9 Merge pull request 'update' (#50) from projects/line-lb into projects/line-test g7hoo 2023-10-19 17:07:10 +0800
• c2e987aee4 update lb 2023-10-19 17:06:15 +0800
• 6b4e906e75 update process flow lb 2023-10-19 16:40:36 +0800
• d121e408af add 工艺流程列表 lb 2023-10-19 11:13:37 +0800
• 0e4ed597cd Merge pull request 'update ui' (#49) from projects/line-lb into projects/line-test g7hoo 2023-10-18 09:15:36 +0800
• f8baaa8955 update ui lb 2023-10-17 17:02:53 +0800
• 3e7914ac91 update ui lb 2023-10-17 17:02:33 +0800
• 416d4bb390 update lb 2023-10-17 15:27:08 +0800
• fe7821cbd8 update 核心模块-厂务-设备 lb 2023-10-17 15:22:17 +0800
• 9c19a6197a Merge pull request 'update dashboard' (#48) from projects/line-lb into projects/line-test g7hoo 2023-10-17 09:44:37 +0800
• 074b35b6a6 update dashboard lb 2023-10-17 09:43:44 +0800
• 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-dy projects/line 高天泽 2023-10-17 08:53:53 +0800
• f7313c5911 Merge pull request 'lb' (#46) from lb into test g7hoo 2023-10-17 08:38:26 +0800
• a7e81ad8fb Merge branch 'test' into lb lb 2023-10-16 17:04:34 +0800
• 32cbf9076f update 更新设备类型上传 lb 2023-10-16 17:03:29 +0800
• 9a411cc663 Merge pull request 'dy' (#45) from dy into test hellody 2023-10-16 15:50:05 +0800
• 445a88e540 Merge branch 'test' into dy helloDy 2023-10-16 15:47:50 +0800
• 2b355aaf8f ui helloDy 2023-10-16 15:47:31 +0800
• f60a46ed1d update 设备信息上传 lb 2023-10-16 13:35:43 +0800
• 2688896660 Merge pull request 'dy' (#44) from dy into test hellody 2023-10-13 17:12:02 +0800
• 4a67e226e1 merge helloDy 2023-10-13 17:09:07 +0800
• 11ee0d6541 Merge branch 'test' into dy helloDy 2023-10-13 17:06:35 +0800
• 98b3237c9a Merge pull request 'lb' (#43) from lb into test g7hoo 2023-10-13 17:06:02 +0800
• 46aaa47e07 bug helloDy 2023-10-13 17:05:01 +0800
• ca0f62b2eb Merge branch 'test' into lb lb 2023-10-13 17:04:18 +0800
• 5534104e87 update equipment edit lb 2023-10-13 17:01:49 +0800
• b72fe1bfed update equipment edit lb 2023-10-13 16:08:31 +0800
• f4493bde1c Merge pull request 'dy' (#42) from dy into test hellody 2023-10-12 17:06:04 +0800
• d682ecc91c Merge branch 'test' into dy helloDy 2023-10-12 17:05:03 +0800
• 2b76ef7d23 bug helloDy 2023-10-12 17:04:03 +0800
• 9ec13b35b8 update equipment lb 2023-10-12 17:03:07 +0800
• 7acccd3de0 bugfix zentao lb 2023-10-12 15:40:05 +0800
• e40f45a79a Merge pull request 'zjl' (#41) from zjl into test juzi 2023-10-12 14:43:24 +0800
• 77083a84a1 merge test juzi 2023-10-12 14:41:59 +0800
• 9f53ea6981 10.12 juzi 2023-10-12 14:39:59 +0800
• 8f634d012c bugfix zentao lb 2023-10-12 11:08:51 +0800
• 03c573d5b2 Merge pull request 'zjl' (#40) from zjl into test juzi 2023-10-11 14:34:26 +0800
• 348714edaf merge test juzi 2023-10-11 14:33:37 +0800
• 814fe4605a UI样式修改能源&班组 juzi 2023-10-11 14:30:18 +0800