Преглед изворни кода

Squashed commit of the following:
解决冲突
commit 56fae129f15a2bb34eace3eaae40e8bfcacf1bef
Author: xujunjie <645007605@qq.com>
Date: Fri Dec 29 12:01:47 2023 +0800

样式

commit 147d2984d2c2f7baad0ddd5ed7df44fa51755954
Author: Renxy <18510891294@163.com>
Date: Fri Dec 29 11:46:16 2023 +0800

删除测试

commit 20d164cb0c11c8bd5f6338ee1d988edb957663ad
Author: Renxy <18510891294@163.com>
Date: Fri Dec 29 11:39:03 2023 +0800

修改首页事件

commit b0d6c57bd7fd176370f7b21125a68ec70220ed1e
Author: Renxy <18510891294@163.com>
Date: Fri Dec 29 09:54:47 2023 +0800

修改项目选择布局

commit 85b0acd957a7517e58919d7b8073f3315ed4ce5f
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 21:05:41 2023 +0800

修改bug

commit 2c9251be07cfdc04fa5c9f2ede5e118b4966c09e
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 20:53:57 2023 +0800

修改样式

commit 162f1d7be56e641a1f2e8efab2d8f47df9ae254e
Merge: 76c76ee 893a62a
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 20:37:03 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 76c76eee90648566e499303283e7b6bf0236f8e5
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 20:36:58 2023 +0800

跳转到选中位置

commit 893a62a62723b736393bd2489e1f4b092d05041c
Merge: 59a99d3 fb7b4ba
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 19:39:26 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 59a99d3eb14a23d14fc9a61696cf11a478084491
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 19:39:24 2023 +0800

fix: 滚动条

commit fb7b4baeaa4ca152bf3e5a5a391f547ecf8da69d
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 19:31:30 2023 +0800

修改样式

commit 1a4585155c26b4e6f4f712fb1c119e15a78a6897
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 19:16:03 2023 +0800

修改样式

commit 238a6aa9fd96a56d404b6e60d248a50053988295
Merge: cde0c52 398b04e
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 19:01:43 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit cde0c524c2913baad1c0939b23869dc5300be029
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 19:01:39 2023 +0800

修改样式

commit 398b04e6301040103db2078d7c74adbf691a91ba
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 17:44:56 2023 +0800

style

commit f30386b9cadb1dcd329ab708953c511531df33c3
Merge: b05b51c 35e451f
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 17:30:22 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit b05b51c9fa71f996a70cc2c2772965a78d357d28
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 17:30:21 2023 +0800

style

commit 35e451f2fdb4ecf63f6fe98ba300d3b285568b51
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 17:15:44 2023 +0800

修改样式

commit 11f96b492c2388205a485e69b0d7ec76382e66bc
Merge: 7a57916 d6a4937
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 16:42:58 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop解决冲突
# Conflicts:
# src/pages/Projects/index.less

commit 7a579163dae22a496a1dc3018cad8882f4731ec3
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 16:41:30 2023 +0800

修改样式

commit d6a4937d2b17a95f579b4d414ccf4d4cdb1bd69f
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 16:16:55 2023 +0800

style

commit 6b7ac1ce557c5e0219feefdebcdc8b72b1b6456f
Merge: b29d5ef b390364
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 15:31:57 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit b29d5ef9a4aacb04a00b2ce07b7db4a9b326e527
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 15:31:51 2023 +0800

some styles

commit b390364a71824b4eec03d811db36fad9b7907bb6
Merge: 51814e4 c14e371
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 15:31:31 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 51814e456721c694f17f4705d3ac96449df94ecf
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 15:31:28 2023 +0800

修改home样式

commit c14e37164b6f1976b324642f9120434235272e3f
Merge: 72b07af c908233
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 28 15:24:53 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 72b07afdd074068f97837c2340fd57a4dd2c632c
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 28 15:24:47 2023 +0800

样式改动

commit c9082332d9c31a24bcf435fa4c5a3731151042d7
Merge: 05aae00 99f2657
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 15:22:11 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 05aae006d39bc0aecf45f6841ecb6e640dd58ad1
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 15:22:07 2023 +0800

修改首页样式

commit 99f2657e8fdc9befff69d3e3ed08c041411db15e
Merge: 664f561 09d3328
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 15:06:13 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 664f5614a822eb8667d3504c525032a1bd31f0df
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 15:06:11 2023 +0800

style

commit 09d3328dad17acac3bfa037087b3a587a78577a8
Merge: 3130379 fd1fa7a
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 14:42:56 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 313037973c49f54eeae04f34aa46463f8dca684d
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 14:42:50 2023 +0800

修改bug

commit fd1fa7a2e7828b34ed6244880f7c055b78a28004
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 14:39:11 2023 +0800

页面容器左右padding调整

commit f89a883620d620538f48582a4e95d516b93ec73c
Merge: 50c2d66 9a4c8fe
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 11:56:51 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 50c2d66676003894a46df4781be07e1dce2fc96c
Author: Renxy <18510891294@163.com>
Date: Thu Dec 28 11:56:46 2023 +0800

压图

commit 9a4c8fee4cab2a0bf5d26dd2992f369e662164ee
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 10:59:04 2023 +0800

test

commit 1a58a55122fa68cf56850391652e41b759d61b41
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 10:49:59 2023 +0800

style

commit f591be3b0b7bdbe5c6928a4ab9f585e085206c72
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 10:19:52 2023 +0800

fix: 设备自检和环境检测任务详情不显示Title

commit 1213df508230e6cbe2e3ac2a8031e41cddc95bd0
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 09:51:54 2023 +0800

style: 修复样式问题

commit df50f3a2a1e422a05ba6a187dd739656ab2c3ab8
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 28 09:24:58 2023 +0800

fix: 请求路径问题

commit 5e10ddf6099cf80e392c19198147418b2383397b
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 18:03:52 2023 +0800

style: 时间选择全局样式

commit 37249dc2651121a0f1ed83cd86654ed5eaef1bbe
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 17:57:55 2023 +0800

style: 时间选择公共样式

commit 7edbdc3bbea7969dc814c1a62a5755e4572593b5
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 17:29:21 2023 +0800

style: 时间选择样式

commit 5d2354cf25e6f687226b4b2df699f6131a0aa643
Merge: 8e0ed20 dc9353f
Author: Renxy <18510891294@163.com>
Date: Wed Dec 27 17:24:54 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 8e0ed20159907b0feba24f07eebc3dd137e799d1
Author: Renxy <18510891294@163.com>
Date: Wed Dec 27 17:24:50 2023 +0800

修改样式

commit dc9353f41cbbacf44e3ef18502c1a3f26fceb123
Merge: e02b662 0b0b7a9
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 17:13:57 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit e02b6625cfb803229d47e3d8b49785b88b407817
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 17:13:55 2023 +0800

fix: WRX-682

commit 0b0b7a95bc9a74700b1584f20b4e85d935ee7c07
Author: xujunjie <645007605@qq.com>
Date: Wed Dec 27 17:12:28 2023 +0800

样式修改

commit 85664499d98a2274fed56e423f5fab94726237ca
Merge: fabfa47 e6a3f1e
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 16:58:34 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit fabfa4763756ad846adf316c1f2975561b22a730
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 16:58:32 2023 +0800

fix

commit e6a3f1e7a2ba7b0b0492782a339a938dfee77125
Author: Renxy <18510891294@163.com>
Date: Wed Dec 27 16:57:22 2023 +0800

修改bug

commit 2d7ed8b9a734854c5a1cd878b4247e543fdb133c
Author: Renxy <18510891294@163.com>
Date: Wed Dec 27 16:39:31 2023 +0800

消息

commit bbf780168760c5e0a82d856700abe10fc0770abd
Merge: ddf7fe4 dd95ed8
Author: Renxy <18510891294@163.com>
Date: Wed Dec 27 15:04:41 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit ddf7fe416e08bdc2c1f5f9af8fec1fda52ecf443
Author: Renxy <18510891294@163.com>
Date: Wed Dec 27 15:04:35 2023 +0800

修改样式

commit dd95ed8be3fd314557953c5d71e6993c3c401786
Merge: 4230791 d90aeaa
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 14:16:59 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 4230791a3a75562e6aeca4c66c8dcc2207eeb81b
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 14:11:59 2023 +0800

fix: some thing

commit d90aeaaab0bfbfd3ce57eae835a02e0f20a3d178
Merge: 48ea93d cf5bdf8
Author: Renxy <18510891294@163.com>
Date: Wed Dec 27 11:09:52 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 48ea93defaa1959ca74590304e0eb91d6d2e88ce
Author: Renxy <18510891294@163.com>
Date: Wed Dec 27 11:09:28 2023 +0800

修改样式

commit cf5bdf8bd1a6150c10823ca7303d669fea7e20f0
Merge: 4c6487f 72497e0
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 09:48:55 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 4c6487fc2b905feefad98df15d00f2aebf1c3f28
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 27 09:48:52 2023 +0800

feat: 操作记录新增来源过滤

commit 72497e04cd890d3f54148b36b5a1631346fd8c02
Merge: 9804007 edaf72f
Author: Renxy <18510891294@163.com>
Date: Tue Dec 26 19:25:12 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 9804007736167043b97e29b8e2b89d5e7fad6e8f
Author: Renxy <18510891294@163.com>
Date: Tue Dec 26 19:25:07 2023 +0800

修改样式

commit f2f07a07222802fd33ae031f40bc98845927d8e4
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 18:15:46 2023 +0800

style: 调整按钮高度

commit edaf72f50354dcdd4c5c161b636e827b049c3f56
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 18:09:39 2023 +0800

style

commit fcc62a70a7eb923bc75e274dca33d1fec4f1755b
Merge: ee96636 2bddf4c
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 18:08:14 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit ee96636624cbae41f6f074b00b59e2d0f9913d75
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 18:08:13 2023 +0800

style: 调大任务列表和工单列表字体

commit 2bddf4c7d5beaa687a610f8f926eb70d6cf05592
Author: Renxy <18510891294@163.com>
Date: Tue Dec 26 17:44:36 2023 +0800

修改样式

commit 6666364f9249e92fa28a771646bb5087762fad2e
Merge: e9cd3b7 bd424ca
Author: Renxy <18510891294@163.com>
Date: Tue Dec 26 17:30:42 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit e9cd3b7fc2b05e1d2db4e56945b7417d871163ff
Author: Renxy <18510891294@163.com>
Date: Tue Dec 26 17:30:38 2023 +0800

修改样式

commit bd424ca2c3b0ad715ba1f2ea7fa8b7f297f4d5da
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 17:26:37 2023 +0800

style

commit 551bc069aeda659b4d3effd6d94499f75c18652e
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 17:15:04 2023 +0800

style: 工单流程时间对齐

commit 90e84a35316bd3e60d040e79f2f9f3807526dabb
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 17:05:43 2023 +0800

style

commit 44277539a69075323fbf5e2f049b7e54901dd743
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 16:42:55 2023 +0800

style: 工单流程样式修改

commit 034fa79e05e8a214212e5ad76f7607acec21375f
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 16:38:54 2023 +0800

style: 工单流程文字对齐

commit be074285aeb570818c81ba96bef7c0cf32858154
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 16:30:48 2023 +0800

style: 调整表格宽度

commit c7f5c0cc92dbd8921a539f7c2873df545f41c158
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 16:29:38 2023 +0800

style: 添加背景

commit 4ce51e908c020e227700ea7bf715876d90e833eb
Merge: f96d9cb 5d19828
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 16:24:57 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit f96d9cb82beefb747848f8465dad937def640920
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 16:24:55 2023 +0800

style: 适配新宽度

commit 5d19828ece97d6539ea7237496ec2a8cff9351dc
Merge: 7972f4e 53c22c7
Author: Renxy <18510891294@163.com>
Date: Tue Dec 26 16:22:55 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 7972f4e6faa6cb200f2f523e6b40e0ccf0db36c9
Author: Renxy <18510891294@163.com>
Date: Tue Dec 26 16:22:50 2023 +0800

修改样式

commit 2b9d9cb0354000b70344b4cf6c98a3dffd7058e6
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 16:15:20 2023 +0800

style: 适配新宽度

commit 53c22c78b8d4527ce47cf8795b794ce75da086d8
Merge: faca2b4 649b44e
Author: xujunjie <645007605@qq.com>
Date: Tue Dec 26 16:02:43 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit faca2b43b7e6e4c36922fe5ae4623ff8f9b34310
Author: xujunjie <645007605@qq.com>
Date: Tue Dec 26 16:02:41 2023 +0800

文案修改

commit 649b44e12e9442f10641db9ec0aebfce68001162
Merge: 17da15e 878ee49
Author: Renxy <18510891294@163.com>
Date: Tue Dec 26 13:56:47 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 17da15e23e0099d873549e2c1dfe41c409865328
Author: Renxy <18510891294@163.com>
Date: Tue Dec 26 13:56:43 2023 +0800

修改样式

commit 878ee49e47453ad88af05e4cd1e5de0c8039478a
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 11:53:44 2023 +0800

fix: 任务详情添加序号

commit 5e60b7c3f1052b13e62d7e0dbfd734085cd61d8a
Merge: f6e5d98 8c0c289
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 10:50:14 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit f6e5d98351f95bb1edefd31c57538bbd2bedf58a
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Tue Dec 26 10:50:09 2023 +0800

fix: 环境检测传感器数据不显示问题

commit 8c0c28991b8c2d0b68d60a984e9938a1ab90efab
Author: Renxy <18510891294@163.com>
Date: Mon Dec 25 16:14:08 2023 +0800

修改样式

commit 2c3c053f54cf91d01df5c377b2f610395b939866
Author: Renxy <18510891294@163.com>
Date: Mon Dec 25 15:54:54 2023 +0800

添加背景

commit 2c3b003cd7760d27ec44c06ee02f55f1b89c187f
Merge: 0c35efb d2b0b41
Author: Renxy <18510891294@163.com>
Date: Mon Dec 25 11:56:45 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 0c35efba150956675a5ce935708a22e6724e878f
Author: Renxy <18510891294@163.com>
Date: Mon Dec 25 11:56:40 2023 +0800

修改布局

commit d2b0b41d73177da8fdc75768364c73b17f036ea3
Merge: a857719 32c63c7
Author: xujunjie <645007605@qq.com>
Date: Fri Dec 22 15:41:11 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit a8577196891c00d6dd20ecb3285aed5705e7449c
Author: xujunjie <645007605@qq.com>
Date: Fri Dec 22 15:41:01 2023 +0800

unity通讯

commit 32c63c7028da701c34c2ad6502899cede8fe9195
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 15:33:12 2023 +0800

feat: 智慧运营-仪表校验

commit ad6e69d0b1380aa67fc061718f9066545e9581a6
Merge: a0f14e0 5616e70
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 15:10:17 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit a0f14e0af24e35ae1b72a448c4688dd101edec56
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 15:10:15 2023 +0800

feat: 系统自检-仪表校验

commit 5616e70bff3484b8bfa5ba68b4d28ed01cb4a624
Author: xujunjie <645007605@qq.com>
Date: Fri Dec 22 14:20:01 2023 +0800

rem计算转移至project页面

commit 8cdeb9e36368b09a000d487c2d00ed7db169cb16
Author: Renxy <18510891294@163.com>
Date: Fri Dec 22 14:18:28 2023 +0800

删除背景图

commit 6eb2a5d3faab975d36c137a4b895b38c95bf07d3
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 11:11:34 2023 +0800

工单流程样式修改

commit 1cb799a972c54b357b6c6d6f351b4e64b175afe0
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 10:58:57 2023 +0800

style: 弹窗子标题font size 调整

commit 84169c48ea015cd41eda6e0fb357d6be512e3bca
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 10:55:19 2023 +0800

style: 任务弹窗style

commit c24a509f1c910c52f22b9ecb917d9d0686e07580
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 10:20:29 2023 +0800

style: 卡片宽度

commit 9c161e177677c3a0318722e64e30df3b2dbcb98f
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 10:19:09 2023 +0800

style: 字体间距

commit e6e705bf29be4c885782d8d903ec2085253428ec
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 10:16:33 2023 +0800

style: 任务相关修改字体

commit e8c7e45fe175714e3a7ce6f67e8e688d1f277898
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 10:02:04 2023 +0800

style: 我的工单列表style

commit ece5a9aef7d830ab67a5f90986b309be376f0766
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 22 09:42:57 2023 +0800

style: 我的任务详情style

commit 695bbe3c76e0ab91d9de6b4ef7fc6441c60eb037
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 18:36:54 2023 +0800

fix: 跳转函数

commit 46b0d2eea6ee678c28e6765ae7029cc607e342e8
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 18:35:02 2023 +0800

style: 我的任务-任务列表样式

commit 55f1b9839c3a0056ed8ee07a9fcf446ed82d6501
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 18:24:15 2023 +0800

style: 我的任务列表

commit 71a026cb2ba04673595e438a90a8dcab71fa778e
Merge: 305e05e 20a2eee
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 18:07:41 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 305e05e8e5c8fc38ef573788ea2600ee133b3ebf
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 18:07:38 2023 +0800

style: 工单列表样式修改

commit 20a2eee0a6ecc6e547bcf954d07051a657a5e37d
Merge: df6679c 1e362ce
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 17:46:59 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit df6679c4f4c49afe880e7d13b1e8a65a8819c001
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 17:46:55 2023 +0800

update

commit 1e362ce7850fe0892dc685df4d4b1ea0df3ca2c2
Merge: 35813aa f8c2371
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 17:28:18 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 35813aa1d41249b2bc15b2d558e093de7a5adc15
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 17:28:16 2023 +0800

style: px to rem

commit f8c2371669fa215bb042a0b98853d380c2c19cd7
Merge: ed83611 2427a7b
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 21 17:24:13 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit ed836119e8a0016431b0d773678b0869a8c881a3
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 21 17:24:10 2023 +0800

样式修改

commit 2427a7b8ce57f367d711652b13f468648c97da43
Merge: ffc9ccb 9beda2c
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 17:23:47 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit ffc9ccb21bd63709ac54c804f375ce5d1f5d6724
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 17:23:45 2023 +0800

style: 任务页面及工单详情样式修改

commit 9beda2c5a8c770db7e4eceff1f6c7d74ef34424b
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 17:19:14 2023 +0800

update

commit 8207d0c4b0311d08ad6095e93f1d53ab41e232c2
Merge: bce8fea e324592
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 17:00:58 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit bce8fea704aebc182bafa506ffcd5901904e512f
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 17:00:51 2023 +0800

修改样式

commit e324592c2dbbee4a4348a47e1e5bda348e8b8f31
Merge: e336140 d7eb4f1
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 21 16:30:23 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit e33614022e996e5a999a9f00fe48472cdac0452a
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 21 16:29:55 2023 +0800

样式

commit d7eb4f1e2db720e59fbc881b0e336bd962b5cd4f
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 16:10:59 2023 +0800

update

commit ebbaf7783ed3218351f565e68539dcf522baa8a1
Merge: 45d58fa b10b7b1
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 16:06:20 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 45d58fabfb67eccc1696bf54affc9dd00ce11b40
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 16:06:14 2023 +0800

修改样式

commit b10b7b1465cb88360e5b5ee9a18056812918448b
Merge: 9ed9a4a d7ad2db
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 16:02:36 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 9ed9a4a7f78f9ad2cb7975a1219fd5481df07e7a
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 16:02:34 2023 +0800

style: 增大标题字体粗细

commit d7ad2db02050adf09659a3fb26d135215cf1df1e
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 15:57:28 2023 +0800

智慧运营样式

commit aadefd1699985992b29497a8f02bc136c433766b
Merge: 57015d9 84f4b1d
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 15:46:08 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 57015d99002d463a5bf4fff3e088fcb7ee212f61
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 15:46:04 2023 +0800

修改样式

commit 84f4b1d89f736646355db4a1cc2eeea8f923f9aa
Merge: 472d0c0 d097980
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 15:38:05 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 472d0c0742aff169f7cdf63d945105d3e33d801e
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 21 15:37:47 2023 +0800

style: 任务列表样式修改

commit d0979804ea38745f66efdabe8f5592f2aacf462c
Merge: d3110f4 38a2bb4
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 21 15:34:28 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit d3110f4080f76463dc978e3f05be8276a3ecd57c
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 21 15:34:23 2023 +0800

样式

commit 38a2bb4ba9332ac520ffde3a0e0c9e683d58139b
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 15:18:59 2023 +0800

修改样式

commit d225675fc5116686c51621daa5cc358c30f6e32d
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 15:14:50 2023 +0800

修改样式

commit b7950ca1796b4ae6457e1849c93e006198d14fd2
Merge: 2d9a4d0 54dc752
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 14:57:47 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 2d9a4d0d28add7c7c4f4a87e6a28a0713d5f30a8
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 14:57:43 2023 +0800

修改样式

commit 54dc752512e53d89c9a4765acd3f379f520d791e
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 21 14:00:57 2023 +0800

样式改动

commit d8a94e8777de9f4e7b85b49ce805994530838d08
Merge: 087374c 95b23f7
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 21 13:57:50 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 087374cec98b45ca966fdfef18aea12c3ab1c2cc
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 21 13:57:47 2023 +0800

样式

commit 1848b2e45a9a7d99ab6f3370375a205d486e811d
Merge: d79f87d 597d89f
Author: xujunjie <645007605@qq.com>
Date: Thu Dec 21 13:56:52 2023 +0800

Merge branch 'master' into develop

commit 95b23f70e69e590913b7ac849a79c1cb9377e7a9
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 11:27:57 2023 +0800

修改样式

commit 5d9dd5767fda2c734729fa7fe4aa7bc9642da0f5
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 11:04:38 2023 +0800

修改样式

commit 0fb04a46be1164ecd06e04afd12aa7dd0d746a88
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 10:30:41 2023 +0800

修改menu

commit d79f87d160095134cf7e0bd41a0bb2e98dbd8487
Author: Renxy <18510891294@163.com>
Date: Thu Dec 21 09:55:33 2023 +0800

修改系统日志样式

commit adfb788e727db792e6fee42066b17347eb71c7c9
Merge: 7c0d18a cb201c2
Author: Renxy <18510891294@163.com>
Date: Wed Dec 20 17:32:38 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 7c0d18ae43f31d0c396cec2a121bb8264bd2483d
Author: Renxy <18510891294@163.com>
Date: Wed Dec 20 17:32:33 2023 +0800

修改样式

commit cb201c2d0cd8f98805bd8769badff5e3e711d14f
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 20 17:14:31 2023 +0800

feat: 完成关闭工单

commit 401b516858eb7e27106b43b59adce1e758150f9d
Merge: 9b3aa6c b7ef8a4
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 20 15:26:54 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 9b3aa6c878956bf5e59622121d60d243d6cc72d8
Merge: 4a58a00 b846d64
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 20 15:24:36 2023 +0800

Merge branch 'feature/withdraw_order' into develop

commit b846d644c6d73ab67c810a95514ee1cfe85a381f
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Wed Dec 20 15:23:59 2023 +0800

feat: 添加关闭工单接口

commit b7ef8a4b34f1b6634e8aa151b8fef56be863160b
Author: xujunjie <645007605@qq.com>
Date: Wed Dec 20 13:52:57 2023 +0800

px替换为rem

commit edac4aeb89d7bc0340df048ddf9ef77db4a50cad
Author: xujunjie <645007605@qq.com>
Date: Tue Dec 19 15:35:03 2023 +0800

项目列表样式更新

commit f5edb5ce1f3ecdf2d5781941c7b282d2048169d2
Author: xujunjie <645007605@qq.com>
Date: Tue Dec 19 11:51:52 2023 +0800

rem设置

commit cba538d5d66be4ed7a02d627c013bcc8fd175c58
Author: Renxy <18510891294@163.com>
Date: Tue Dec 19 09:32:27 2023 +0800

修改样式

commit 1a4feb5380a031381aac1adf26a7b5e293f75526
Merge: 7b889d8 4a58a00
Author: Renxy <18510891294@163.com>
Date: Mon Dec 18 17:56:22 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 7b889d81c9d8fd032af47b41f2c4e17e8b202758
Author: Renxy <18510891294@163.com>
Date: Mon Dec 18 17:56:17 2023 +0800

修改path

commit 4a58a00c4f2b85592ae23963e753a2b76273fd05
Merge: 87b89f1 8963303
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Mon Dec 18 10:04:37 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 87b89f1573018dd246ab291454980d25779f40c9
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Mon Dec 18 10:04:35 2023 +0800

style

commit 8963303436e7f14bc68343fc7b9fa3ee5b4db52a
Merge: 5f37ceb 4c57566
Author: Renxy <18510891294@163.com>
Date: Fri Dec 15 18:06:26 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 5f37cebe03663f86c6da00891d9dd4813c3c97c9
Author: Renxy <18510891294@163.com>
Date: Fri Dec 15 18:06:22 2023 +0800

替换ui

commit 4c575663449a681d462af4f0e7ac0e63816bc802
Merge: 1d0909a 1238052
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 15 17:12:22 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 1d0909ad747e7a9497af8f903d25bdf033ce4c2b
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 15 17:12:15 2023 +0800

style: subtitle absolute position

commit 12380520269f2641e6baba55a6362333b7b9932d
Author: Renxy <18510891294@163.com>
Date: Fri Dec 15 16:52:05 2023 +0800

修改ui

commit 1ce8bcc29e3a7b54854ecb077cc657e313083128
Merge: c816c3f f435859
Author: Renxy <18510891294@163.com>
Date: Fri Dec 15 16:45:01 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit c816c3fad8a5fdff8d1b663ce96f9321d6dcdf49
Author: Renxy <18510891294@163.com>
Date: Fri Dec 15 16:44:56 2023 +0800

修改ui

commit f4358597551b551b0bbab59abaddb268d915cfec
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 15 16:43:30 2023 +0800

style update

commit 0599a65bd00a91a4b7a6df94690fc4e97631bc15
Merge: 1829145 0c87261
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 15 14:11:21 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 18291456986ab51c7e09a063e3cbc3d6ec0bc5de
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Fri Dec 15 14:11:18 2023 +0800

fix: 任务执行标识来源

commit 0c87261fae99698811179532d7b4392ed7f25cdd
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 18:14:44 2023 +0800

修改ui

commit 3ba9fb9c056d275696371fc6325ed576856d1e20
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 17:41:20 2023 +0800

修改ui

commit 4138f2e74eb7306bd1f801df0c8a69f233c24d9a
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 14 17:35:13 2023 +0800

feat: add withdraw order HTML element(not complate)

commit a2de50494f0201eed50b5efdbd28a65d40eb7db2
Author: Renxy <18510891294@163.com>
Date: Wed Dec 13 17:50:16 2023 +0800

text

commit 6aa8671acfeae14cc378f69da09447a2a0940558
Merge: 3c9e941 f4ef605
Author: Renxy <18510891294@163.com>
Date: Wed Dec 13 17:38:51 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 3c9e941247687003a48e9beac6b71a7892f3ecad
Author: Renxy <18510891294@163.com>
Date: Wed Dec 13 17:38:45 2023 +0800

替换首页UI、修改为rem

commit f4ef605392a7a72d2f763f290b0030b78d6ed7eb
Merge: 1dea320 49c3bf2
Author: xujunjie <645007605@qq.com>
Date: Tue Dec 12 17:07:28 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 1dea3207a775adc94633c3c79ff857d706d273a3
Author: xujunjie <645007605@qq.com>
Date: Tue Dec 12 17:05:56 2023 +0800

自动控制scada变量的接口替换

commit 4a93b0d92a85b80d92b130ef9ad9483795fac714
Author: xujunjie <645007605@qq.com>
Date: Tue Dec 12 17:05:48 2023 +0800

液位

commit 49c3bf2aeb95bd5539715c8122f7328be71bf49d
Merge: 6fd8f4a b8c0696
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 14:11:46 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit 6fd8f4a64fee64f4c6abeb2626679e2d0a240bc2
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 14:11:42 2023 +0800

修改文案

commit b8c0696339653189aebd3645ec99ebab322b4a62
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 7 18:24:49 2023 +0800

fix: remove test

commit c92ba106626c23e8b9e065dc909f4b38ba992f8e
Merge: e8b7797 4467d36
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 7 18:19:19 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit e8b7797705d256f831196450f55beaa3edfbd90f
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date: Thu Dec 7 18:19:17 2023 +0800

test: show UA

commit 4467d3666cccafcd8ab306fa3a18bd3e00ed5a9c
Author: Renxy <18510891294@163.com>
Date: Thu Dec 7 17:45:45 2023 +0800

删除液位

commit e8d120544649cb8c0d57fbcd7416693a9bd04819
Merge: a1db08e 3842bc7
Author: Renxy <18510891294@163.com>
Date: Thu Dec 7 14:53:28 2023 +0800

Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

commit a1db08eb8320255b698a0145e517d14f5d0a64f3
Author: Renxy <18510891294@163.com>
Date: Thu Dec 7 14:53:23 2023 +0800

去掉液位检测

# Conflicts:
# src/pages/Smart/ConditionDetection.js

Renxy пре 1 година
родитељ
комит
b9571aee9c

+ 1 - 1
src/pages/EqSelfInspection/components/Detail.js

@@ -1644,7 +1644,7 @@ function ReportDumCom(props) {
             pagination: false,
           }}
           backdrop="rgba(255,255,255,0.5)"
-          style={{ height: '90px' }}
+          style={{ height: '0.9rem' }}
           src={item.path}
         />
       ),

+ 7 - 4
src/pages/Smart/ConditionDetection.js

@@ -51,15 +51,18 @@ const ConditionDetection = (props) => {
 
       <div className="content-title">
         <div className={styles.circle}>
-          <CircleScore big>
+          {/* <CircleScore big>
             <span className={styles.circleText}>{score}</span>
-          </CircleScore>
+          </CircleScore> */}
+          <div className={styles.circleBox}>
+            <span className={styles.circleText}>{score}</span>
+          </div>
           {/* <p>{desc}</p> */}
           <p>膜车间当前运行状态{grade}</p>
         </div>
         <div className={styles.content}>
           <Row gutter={16}>
-            <Col span={12} style={{ padding: "0.2rem" }}>
+            <Col span={12} style={{ padding: '0.2rem' }}>
               <div className={`${styles.card} card-box`}>
                 <h3>
                   实时工况 <span>{real.score}分</span>
@@ -83,7 +86,7 @@ const ConditionDetection = (props) => {
                 </ul>
               </div>
             </Col>
-            <Col span={12} style={{ padding: "0.2rem" }}>
+            <Col span={12} style={{ padding: '0.2rem' }}>
               <div className={`${styles.card2} card-box`}>
                 <h3>
                   目标工况 <span>{best.score}分</span>

+ 12 - 1
src/pages/Smart/ConditionDetection.less

@@ -41,7 +41,18 @@
     margin-right: 0.12rem;
   }
 }
-
+.circleBox {
+  width: 1.94rem;
+  height: 1.94rem;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  background: url('@/assets/home-circle.png') no-repeat center;
+  background-size: 100% 100%;
+  font-size: 0.34rem;
+  font-weight: bold;
+}
 .card2 {
   .card;
   i {