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

• f341ec7b30 update router mode lb 2023-09-13 12:24:52 +0800
• 2c6a6b001c Merge pull request 'lb' (#22) from lb into test g7hoo 2023-09-12 11:13:59 +0800
• b17bc0e162 update build:prod PUBLIC_PATH lb 2023-09-12 11:12:05 +0800
• d595bf2660 Merge branch 'test' into lb lb 2023-09-12 11:10:45 +0800
• 529889fd07 update 工段设备绑定 dialogForm lb 2023-09-12 11:09:51 +0800
• 2f18299b0b add dialogForm of equipmentbind lb 2023-09-11 16:47:12 +0800
• d1c93cbf46 Merge pull request 'zhp' (#21) from zhp into test 高天泽 2023-09-11 16:11:04 +0800
• 7d959e8ad3 Merge branch 'test' into zhp ‘937886381’ 2023-09-11 16:09:42 +0800
• 6f0040a0ae 生产监控更新 ‘937886381’ 2023-09-11 16:09:07 +0800
• 347265853e Merge pull request 'dy' (#20) from dy into test 高天泽 2023-09-11 15:59:26 +0800
• f1bbdf82e5 冲突 helloDy 2023-09-11 15:55:58 +0800
• 645ba2843f 生产监控 helloDy 2023-09-11 15:53:43 +0800
• f2f3a9e850 update 设备全参数查询 lb 2023-09-11 15:24:11 +0800
• 14e06d9456 Merge pull request 'lb' (#19) from lb into test g7hoo 2023-09-11 15:05:16 +0800
• 4e05b3e3d6 merge from test lb 2023-09-11 15:04:16 +0800
• 6e678f7c68 Merge branch 'equipment-module-dev' into lb lb 2023-09-11 15:00:49 +0800
• b91b8c3d3c update 设备加工数量 lb 2023-09-11 14:57:55 +0800
• a445c8a61d Merge pull request 'zjl' (#17) from zjl into test juzi 2023-09-08 16:02:54 +0800
• df0dc6bfa0 能源分析 juzi 2023-09-08 16:01:54 +0800
• c44ec6f49c update 基本完成设备全参数查询 lb 2023-09-08 15:57:46 +0800
• 6197b606f1 update 设备全参数 lb 2023-09-07 17:01:22 +0800
• c7b32ab34e add 设备全参数测试数据 lb 2023-09-07 11:24:07 +0800
• e2527f2e30 remove 设备效率分析的查看趋势功能 lb 2023-09-06 16:38:46 +0800
• 76100ad07d update 设备全参数 lb 2023-09-06 16:37:22 +0800
• fa02c3933d remove 产品质量监控可视化 lb 2023-09-06 16:18:59 +0800
• d63d49ccc9 add pie chart lb 2023-09-06 15:09:48 +0800
• cd437ed7d3 update 效率分析 lb 2023-09-06 14:33:49 +0800
• 052f54833c update 更新效率分析 lb 2023-09-06 11:28:10 +0800
• e42b7035fe update 完成时序图模块 lb 2023-09-06 10:39:32 +0800
• a505f34abc update 设备产量时序图 lb 2023-09-06 09:56:05 +0800
• edc5d64acc update 更新设备效率分析 lb 2023-09-05 17:01:53 +0800
• e5fed36234 update 设备产量时序图 lb 2023-09-05 16:30:24 +0800
• 2dd40261a4 update 设备状态时序图 lb 2023-09-05 16:26:52 +0800
• e16b6f8ec4 update 设备状态时序图 lb 2023-09-05 16:07:50 +0800
• 9c59a7e715 能源分析 juzi 2023-09-05 15:45:59 +0800
• 55e8de1136 update 完成设备异常分析 lb 2023-09-04 15:24:22 +0800
• ffedc7c256 add 设备异常分析 lb 2023-09-04 14:50:52 +0800
• fbd78c6aa5 update 产品质量分析 lb 2023-09-04 14:35:13 +0800
• 6f71b6a7c0 add 产品质量分析-图形弹窗 lb 2023-09-04 13:54:37 +0800
• 55f90a7102 add 设备模块剩余部分页面 lb 2023-09-04 09:41:31 +0800
• b6df60a315 Merge branch 'equipment-module-dev' into lb lb 2023-09-01 17:05:27 +0800
• 31dbc025c8 done 设备数采相关 lb 2023-09-01 17:05:05 +0800
• 63206d4769 add mockdata & update设备采集配置** lb 2023-09-01 15:08:36 +0800
• b23b5256f9 update 设备数据采集 lb 2023-09-01 10:39:54 +0800
• 21fbd88a32 Merge branch 'equipment-module-dev' into lb lb 2023-08-31 16:58:49 +0800
• 0158a11644 update 设备分析-状态时序图 lb 2023-08-31 16:58:17 +0800
• 62256b57a5 update 设备全参数查询 lb 2023-08-31 16:11:41 +0800
• 0e6c01e578 update 设备状态和参数 lb 2023-08-31 15:12:34 +0800
• 0ec4238042 add 设备加工数量-图表，设备状态和参数，设备全参数查询 lb 2023-08-31 14:26:18 +0800
• fd0c14ff1c update 设备加工数量 lb 2023-08-30 16:24:44 +0800
• 72393caee1 update 设备加工数量 lb 2023-08-30 15:36:16 +0800
• 14eb83932e done 设备24小时生产记录 lb 2023-08-30 14:32:05 +0800
• 0f6418fcf9 update 基本完成设备近24小时数据 lb 2023-08-30 14:30:08 +0800
• 100d28fd68 add 设备加工数量 lb 2023-08-30 14:11:24 +0800
• bf52db3b6a update more 设备24小时记录 lb 2023-08-30 11:37:11 +0800
• 0f5e4b8368 update 设备24小时记录 lb 2023-08-30 10:27:49 +0800
• e37bb3f2ce add 设备状态时序图组件 lb 2023-08-29 14:47:32 +0800
• 84ed13d58f done equipmentAlarmLog lb 2023-08-29 10:17:27 +0800
• 383f98e1d9 add 设备监控 lb 2023-08-29 09:56:27 +0800
• 5aafefda26 Merge branch 'equipment-module-dev' into lb lb 2023-08-28 17:01:38 +0800
• 6975c52062 add 设备绑定分组 lb 2023-08-28 15:52:19 +0800
• 4ad325c02c done 设备分组报警 lb 2023-08-28 14:56:56 +0800
• 9dc580ddd2 update lb 2023-08-28 13:30:29 +0800
• 3656a92f63 add 设备分组报警 lb 2023-08-28 10:47:05 +0800
• 573192d27a add 设备工段绑定，设备分组 lb 2023-08-28 09:22:28 +0800
• 50318121dc Merge pull request '能源监控' (#15) from zjl into test juzi 2023-08-25 16:29:10 +0800
• 01fe2da523 能源监控 juzi 2023-08-25 16:27:46 +0800
• 3d24159743 update 完成设备信息 lb 2023-08-24 15:36:38 +0800
• 54d22292c1 update equipment drawer的逻辑 lb 2023-08-24 11:07:55 +0800
• 9556cdfb0e update 设备信息 lb 2023-08-23 15:15:29 +0800
• fc2037a10a update drawer lb 2023-08-22 17:00:43 +0800
• 4eb9b321db add EquipmentDrawer lb 2023-08-22 15:53:02 +0800
• 1b055ebfa4 add 设备资产 lb 2023-08-22 11:14:38 +0800
• fa2505d5a2 update EquipmentPIcs lb 2023-08-21 14:05:15 +0800
• d370948705 Merge pull request '能源配置&能源抄表' (#14) from zjl into test juzi 2023-08-21 11:14:03 +0800
• 6e39dd48ff 能源配置&能源抄表 juzi 2023-08-21 11:12:23 +0800
• a4c1438e59 update lb 2023-08-18 17:01:41 +0800
• 577fcb53d2 add equipment assets lb 2023-08-18 16:56:53 +0800
• 56191453af 调整目录结构，移动DialogForm组件，移动设备信息和设备类型至核心生产模块 lb 2023-08-18 15:39:34 +0800
• 84a055e605 Merge branch 'test' into lb lb 2023-08-18 15:21:10 +0800
• 2cf0e718f7 update 完成质量-最近24小时记录 lb 2023-08-18 14:41:52 +0800
• 54ce9639ab add 动态表结构处理相关工具 lb 2023-08-18 14:06:44 +0800
• 5cc3fb758e update 设备分组 lb 2023-08-17 09:37:39 +0800
• a312117ea3 update 设备信息 lb 2023-08-16 14:29:29 +0800
• fc94d0cccc update 设备类型 lb 2023-08-15 14:57:10 +0800
• c466cbb378 Merge pull request '能源类型' (#13) from zjl into test juzi 2023-08-14 16:26:32 +0800
• 18a9a4f51b 能源类型 juzi 2023-08-14 16:19:12 +0800
• c11c32d7ee update 设备类型 lb 2023-08-11 16:49:28 +0800
• 3900dcfbd8 add 设备相关 lb 2023-08-10 16:52:47 +0800
• 8f61e9a9d9 update recent 24 lb 2023-08-09 16:10:05 +0800
• 2a2ef5ab5c update recent 24 lb 2023-08-08 13:23:01 +0800
• ccfc4eacba update 检测统计数据 lb 2023-08-08 10:16:53 +0800
• 4c829d21f5 TODO: fix graphPage build*() lb 2023-08-07 17:05:09 +0800
• 6852bc8c85 add line chart lb 2023-08-07 16:38:52 +0800
• c755ecc105 update pie chart lb 2023-08-07 16:09:25 +0800
• 9947b2fa37 add pie chart lb 2023-08-07 15:23:19 +0800
• 48d208a539 update lb 2023-08-07 13:45:04 +0800
• 2febe5a12a update 检测统计数据 search time lb 2023-08-07 10:46:26 +0800
• 8fd1504dc0 update 检测统计 lb 2023-08-04 16:51:26 +0800
• 1c7e908d2e add DetailGraph lb 2023-08-04 16:37:12 +0800