Squashed commit of the following:

merge dev
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

    去掉液位检测

commit 597d89f1992a61c778a3207b915dc46b5efa6d52
Merge: 32da99b 3842bc7
Author: xujunjie <645007605@qq.com>
Date:   Mon Dec 4 16:44:56 2023 +0800

    Merge branch 'develop'

commit 3842bc79c44af48282b7c39fda8243946296cc9b
Merge: 84881ce ec43651
Author: xujunjie <645007605@qq.com>
Date:   Mon Dec 4 16:44:08 2023 +0800

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

commit 84881ce8c92218e4d900a63f140f1a348234f300
Author: xujunjie <645007605@qq.com>
Date:   Mon Dec 4 16:44:04 2023 +0800

    修复进入系统自检时没有请求最新的数据

commit 32da99bd212d546c6088f609c13472d25f21c5ac
Merge: 4147907 ec43651
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date:   Mon Dec 4 16:16:24 2023 +0800

    Merge branch 'develop'

commit ec436517b07596fc8eba716378beac146f0f80ae
Merge: 7a44974 cdd294d
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date:   Mon Dec 4 12:01:39 2023 +0800

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

commit 7a4497419d1369db1654084c3aa07f24343f99ff
Author: ZhaoJun <jun.zhao@greentech.com.cn>
Date:   Mon Dec 4 12:01:37 2023 +0800

    fix: 图片加载失败

commit cdd294d7d30cbae15b253c509024454b4db221ba
Author: Renxy <18510891294@163.com>
Date:   Mon Dec 4 10:11:39 2023 +0800

    修改样式

.umirc.ts

@@ -24,6 +24,7 @@ export default defineConfig({
         'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0',
     },
   ],
+  headScripts: [`/rem.js`],
   proxy: {
     '/api': {
       // target: 'http://47.96.12.136:8888/',
@@ -43,6 +44,11 @@ export default defineConfig({
       path: '/home/:projectId',
       component: './Home',
     },
+    {
+      name: '项目选择',
+      path: '/projects',
+      component: './Projects',
+    },
     {
       name: '菜单栏',
       path: '/menu/:projectId',

package.json

@@ -18,7 +18,9 @@
     "echarts": "^5.4.3",
     "md5": "^2.3.0",
     "qs": "^6.11.2",
-    "react-zmage": "^0.8.5"
+    "react-id-swiper": "^4.0.0",
+    "react-zmage": "^0.8.5",
+    "swiper": "5.4.5"
   },
   "devDependencies": {
     "@types/react": "^18.0.33",

public/rem.js

@@ -0,0 +1,76 @@
+(function () {
+  var doc = document,
+    win = window;
+  var docEl = doc.documentElement;
+  var tid;
+  var rootItem, rootStyle;
+
+  function refreshRem() {
+    var width = localStorage.width;
+    if (!width) return;
+
+    //与淘宝做法不同，直接采用简单的rem换算方法1rem=100px
+    var rem = (width * 100) / 2560;
+    //兼容UC开始
+    rootStyle = 'html{font-size:' + rem + 'px !important}';
+    rootItem =
+      document.getElementById('rootsize') || document.createElement('style');
+    if (!document.getElementById('rootsize')) {
+      document.getElementsByTagName('head')[0].appendChild(rootItem);
+      rootItem.id = 'rootsize';
+    }
+    if (rootItem.styleSheet) {
+      rootItem.styleSheet.disabled || (rootItem.styleSheet.cssText = rootStyle);
+    } else {
+      try {
+        rootItem.innerHTML = rootStyle;
+      } catch (f) {
+        rootItem.innerText = rootStyle;
+      }
+    }
+    //兼容UC结束
+    docEl.style.fontSize = rem + 'px';
+  }
+  refreshRem();
+
+  win.addEventListener(
+    'resize',
+    function () {
+      clearTimeout(tid); //防止执行两次
+      tid = setTimeout(refreshRem, 300);
+    },
+    false,
+  );
+
+  win.addEventListener(
+    'pageshow',
+    function (e) {
+      if (e.persisted) {
+        // 浏览器后退的时候重新计算
+        clearTimeout(tid);
+        tid = setTimeout(refreshRem, 300);
+      }
+    },
+    false,
+  );
+
+  if (doc.readyState === 'complete') {
+    doc.body.style.fontSize = '16px';
+  } else {
+    doc.addEventListener(
+      'DOMContentLoaded',
+      function (e) {
+        doc.body.style.fontSize = '16px';
+      },
+      false,
+    );
+  }
+
+  window.refreshRem = refreshRem;
+  window.addEventListener('storage', (e) => {
+    console.log(e);
+    if (e.key == 'width') {
+      refreshRem();
+    }
+  });
+})();

script/PxToRem.js

@@ -0,0 +1,44 @@
+// 将项目中所有px单位除以100后替换成rem
+const fs = require('fs');
+const path = require('path');
+
+// 设置目标目录路径
+const targetDirectory = '../src';
+
+// 递归读取目录下的所有文件
+function readDirectory(dir) {
+  const files = fs.readdirSync(dir);
+
+  files.forEach((file) => {
+    const filePath = path.join(dir, file);
+    const stats = fs.statSync(filePath);
+
+    if (stats.isDirectory()) {
+      readDirectory(filePath); // 递归处理子目录
+    } else if (
+      path.extname(filePath) === '.less' ||
+      path.extname(filePath) === '.js'
+    ) {
+      convertCssFile(filePath); // 处理 CSS 文件
+    }
+  });
+}
+
+// 转换 CSS 文件中的 px 单位为 rem 单位
+function convertCssFile(filePath) {
+  const cssContent = fs.readFileSync(filePath, 'utf8');
+
+  // 使用正则表达式替换 px 单位
+  const remContent = cssContent.replace(/(\d*\.?\d+)px/g, (match, pxValue) => {
+    const remValue = parseFloat(pxValue) / 100;
+    return remValue + 'rem';
+  });
+
+  // 写入转换后的内容
+  fs.writeFileSync(filePath, remContent, 'utf8');
+
+  console.log(`Converted ${filePath}`);
+}
+
+// 启动脚本
+readDirectory(targetDirectory);

src/components/ManagementPage/BarChartModule.js

@@ -86,6 +86,10 @@ const defaultOption = {
         color: '#c9d2d2',
       },
     },
+    axisLabel: {
+      color: '#000000',
+      fontSize: '0.18rem',
+    },
     data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
   },
   yAxis: {
@@ -99,10 +103,16 @@ const defaultOption = {
     axisLine: {
       show: false,
     },
+    axisLabel: {
+      fontSize: '0.18rem',
+    },
   },
   legend: {
     icon: 'circle',
     right: '20%',
+    textStyle: {
+      fontSize: '0.24rem',
+    },
   },
   series: [
     {
@@ -112,6 +122,9 @@ const defaultOption = {
       label: {
         show: true,
         position: 'top',
+        textStyle: {
+          fontSize: '0.24rem',
+        },
       },
       barGap: '0',
       barMaxWidth: '10%',
@@ -123,6 +136,9 @@ const defaultOption = {
       label: {
         show: true,
         position: 'top',
+        textStyle: {
+          fontSize: '0.24rem',
+        },
       },
       barGap: '0',
       barMaxWidth: '10%',

src/components/ManagementPage/ManagementPage.less

@@ -2,7 +2,7 @@
 .searchWrapper2,
 .searchWrapper3 {
   width: 100%;
-  // padding: 0px 20px;
+  // padding: 0rem 0.2rem;
 }
 
 .searchWrapper2,
@@ -19,8 +19,8 @@
 .searchDate1,
 .searchDate3 {
   .datePicker {
-    width: 180px;
-    min-width: 0px !important;
+    width: 1.8rem;
+    min-width: 0rem !important;
   }
 }
 
@@ -41,16 +41,16 @@
 }
 
 .searchBtnWrapper1 {
-  margin-top: 20px;
+  margin-top: 0.2rem;
 }
 
 .searchBtnWrapper2,
 .searchBtnWrapper3 {
-  margin-left: 20px;
+  margin-left: 0.2rem;
 }
 
 .searchBtn {
-  margin-right: 20px;
+  margin-right: 0.2rem;
 }
 
 .exportBtn {

src/components/ManagementPage/PieChartModule.js

@@ -80,7 +80,7 @@ const defaultOption = {
         { value: 300, name: 'Video Ads' },
       ],
       label: {
-        fontSize: 18,
+        fontSize: '0.18rem',
       },
       emphasis: {
         itemStyle: {
@@ -89,7 +89,7 @@ const defaultOption = {
           shadowColor: 'rgba(0, 0, 0, 0.5)',
         },
         label: {
-          fontSize: 24,
+          fontSize: '0.24rem',
         },
       },
     },

src/components/ManagementPage/RadarChartModule.js

@@ -80,7 +80,7 @@ const defaultOption = {
   radar: {
     name: {
       textStyle: {
-        fontSize: 18,
+        fontSize: '0.18rem',
       },
     },
     splitArea: {

src/components/ManagementPage/TypeSelct.js

@@ -24,7 +24,7 @@ function TypeSelect(props) {
   };
 
   return (
-    <Form layout="inline" style={{ margin: '20px 0' }}>
+    <Form layout="inline" style={{ margin: '0.2rem 0' }}>
       <Form.Item label="成本类型">
         <Select style={{ width: 200 }} value={type} onChange={onChangeType}>
           <Option value={1}>能耗</Option>

src/components/ManagementPage/chartModule.js

@@ -125,7 +125,7 @@ const ChartModule = (props) => {
               ...option.series[item.type],
               name: item.name,
               data: item.data,
-              barWidth: dataList.length >= 4 ? 8 : 20,
+              // barWidth: dataList.length >= 4 ? 8 : 20,
             };
           });
         }
@@ -163,7 +163,7 @@ const ChartModule = (props) => {
         style={{
           width: chartType === 'gauge' ? '60%' : '100%',
           marginLeft: chartType === 'gauge' ? '20%' : '0',
-          height: typeList?.length <= 0 ? '100%' : 'calc(100% - 57px)',
+          height: typeList?.length <= 0 ? '100%' : 'calc(100% - 0.57rem)',
         }}
         ref={chartDomRef}
       />
@@ -202,7 +202,7 @@ const defaultOption = {
   tooltip: {
     trigger: 'axis',
     textStyle: {
-      fontSize: 24,
+      fontSize: '0.24rem',
     },
   },
   grid: {
@@ -215,10 +215,10 @@ const defaultOption = {
     boundaryGap: false,
     axisTick: { show: false },
     nameTextStyle: {
-      fontSize: 24,
+      fontSize: '0.24rem',
     },
     axisLabel: {
-      fontSize: 24,
+      fontSize: '0.24rem',
     },
     data: [
       '00:00',
@@ -237,12 +237,12 @@ const defaultOption = {
       name: '000',
       top: 20,
       nameTextStyle: {
-        fontSize: 24,
+        fontSize: '0.24rem',
         // align: 'left',
         padding: [0, 0, 20, 0],
       },
       axisLabel: {
-        fontSize: 24,
+        fontSize: '0.24rem',
       },
       axisLine: {
         show: false,
@@ -262,7 +262,7 @@ const defaultOption = {
       top: 20,
       position: 'right',
       nameTextStyle: {
-        fontSize: 24,
+        fontSize: '0.24rem',
         // align: 'left',
         padding: [0, 0, 20, 0],
       },
@@ -285,7 +285,7 @@ const defaultOption = {
       position: 'right',
       offset: 80,
       nameTextStyle: {
-        fontSize: 24,
+        fontSize: '0.24rem',
         // align: 'left',
         padding: [0, 0, 20, 0],
       },
@@ -359,8 +359,8 @@ const defaultOption = {
       data: [120, 200, 150, 80, 70, 110, 130],
       name: '实际出水量',
       type: 'bar',
-      barGap: 0.2,
-      barWidth: 30,
+      // barGap: 0.2,
+      // barWidth: 30,
     },
     {
       data: [
@@ -411,7 +411,7 @@ const defaultOption = {
       },
       title: {
         offsetCenter: [0, '25%'],
-        fontSize: 24,
+        fontSize: '0.24rem',
       },
       detail: {
         show: false,
@@ -427,7 +427,7 @@ const defaultOption = {
     data: ['进水水量', '预测出水量', '实际出水量'],
     lineStyle: {},
     textStyle: {
-      fontSize: 24,
+      fontSize: '0.24rem',
     },
   },
   // toolbox: {

src/components/ManagementPage/index.less

@@ -1,30 +1,33 @@
 .icon {
   float: left;
-  width: 7px;
-  height: 32px;
-  margin: 4px 0;
+  width: 0.1rem;
+  height: 0.1rem;
+  // margin: 0.04rem 0;
+  margin-top: 0.1rem;
   background-color: #366cda;
 }
+
 .title {
-  padding-left: 12px;
-  font-size: 30px;
-  font-weight: 400;
-  color: #4a4a4a;
-  line-height: 40px;
+  padding-left: 0.12rem;
+  line-height: 1;
+
+  font-size: 0.28rem;
+  font-family: Source Han Sans, Source Han Sans;
+  color: #615d5d;
 }
 .right {
   color: #366cda;
   float: right;
-  font-size: 20px;
+  font-size: 0.2rem;
   cursor: default;
 }
 
 .leftArrow {
-  border: solid 20px;
+  border: solid 0.2rem;
   border-color: transparent #366cda transparent transparent;
 }
 .rightArrow {
-  border: solid 20px;
+  border: solid 0.2rem;
   border-color: transparent transparent transparent #366cda;
 }
 .typeList {
@@ -39,10 +42,10 @@
       background: none;
     }
     .ant-tabs-nav .ant-tabs-tab {
-      padding: 2px 16px;
+      padding: 0.02rem 0.16rem;
       background-color: #2196f330;
       border: none;
-      margin: 0 6px;
+      margin: 0 0.06rem;
     }
     .ant-tabs-tab-active {
       background-color: #366cda !important;
@@ -58,7 +61,7 @@
       margin: 0;
     }
     // .ant-tabs-tab-prev-icon{
-    //   border: solid 20px ;
+    //   border: solid 0.2rem ;
     //   border-color: transparent #366CDA transparent  transparent ;
     //   i{
     //     width: 0;

src/components/ManagementPage/moduleTitle.js

@@ -1,6 +1,6 @@
 //模块标题
 /*
-style //样式不传默认上面10px
+style //样式不传默认上面0.1rem
 icon  dom节点
 title //名称
 rightText  //右侧文字
@@ -13,7 +13,7 @@ handleRightClick   //右侧点击方法
 import styles from './index.less';
 const ModuleTitle = ({ style, icon, title, rightText, handleRightClick }) => {
   return (
-    <div style={style ? style : { margin: '10px 0', paddingRight: '10px' }}>
+    <div style={style ? style : { margin: '0.1rem 0', paddingRight: '0.1rem' }}>
       {icon ? icon : <div className={styles.icon} />}
       <span className={styles.title}>{title}</span>
       {rightText && (

src/components/PageContent/index.js

@@ -1,5 +1,5 @@
 import { UnityAction } from '@/utils/utils';
-import { CloseOutlined, LeftOutlined } from '@ant-design/icons';
+import { CloseCircleFilled, LeftOutlined } from '@ant-design/icons';
 import { history } from '@umijs/max';
 import { ConfigProvider } from 'antd';
 import locale from 'antd/es/locale/zh_CN';
@@ -28,14 +28,14 @@ export default (props) => {
           <LeftOutlined
             onClick={handleReturn}
             className={styles.return}
-            style={{ top: tabs ? 42.5 : '' }}
+            style={{ top: tabs ? '0.4rem' : '' }}
           />
         )}
         {closeable && (
-          <CloseOutlined
+          <CloseCircleFilled
             onClick={handleClose}
             className={styles.close}
-            style={{ top: tabs ? 42.5 : '' }}
+            style={{ top: tabs ? '0.35rem' : '' }}
           />
         )}
 

src/components/PageContent/index.less

@@ -1,24 +1,23 @@
 .page {
   // background: #fff;
-  padding: 20px;
+  padding: 0.2rem 0.5rem;
   min-height: 100vh;
   position: relative;
 
   .close {
     position: absolute;
-    top: 26px;
-    right: 20px;
-    font-size: 34px;
-
-    color: #4a4a4a;
+    top: 0.175rem;
+    right: 0.2rem;
+    font-size: 0.34rem;
+    color: #bcbaba;
     cursor: pointer;
   }
   .return {
     position: absolute;
-    top: 26px;
-    left: 20px;
-    font-size: 34px;
-    color: #4a4a4a;
+    top: 0.26rem;
+    left: 0.2rem;
+    font-size: 0.34rem;
+    color: #bcbaba;
     cursor: pointer;
   }
 }

src/components/PageTitle/index.js

@@ -1,4 +1,4 @@
-import { LeftOutlined } from '@ant-design/icons';
+import { CaretLeftFilled } from '@ant-design/icons';
 import { history } from '@umijs/max';
 import styles from './index.less';
 
@@ -13,25 +13,35 @@ export default (props) => {
     }
   };
 
+  const isSubPage = returnable || onReturn;
+
   return (
     <div
-      className={`${styles.titleBox} ${tabs ? styles.tabs : ''}`}
-      onClick={handleOnClick}
+      className={`${styles.titleBox} ${tabs ? styles.tabs : ''} ${
+        isSubPage ? styles.subPage : ''
+      }`}
     >
-      {returnable || onReturn ? (
-        <LeftOutlined
-          style={{ fontSize: 36, cursor: 'pointer', marginRight: '20px' }}
+      {isSubPage && (
+        <CaretLeftFilled
+          style={{
+            fontSize: '0.3rem',
+            cursor: 'pointer',
+            marginRight: '0.15rem',
+            color: '#0139F1',
+          }}
+          onClick={handleOnClick}
         />
-      ) : (
-        <span className={styles.titleBar} />
       )}
 
-      <span
-        className={styles.title}
-        style={returnable ? { cursor: 'pointer' } : null}
-      >
-        {children}
-      </span>
+      {children && (
+        <span
+          className={`${styles.title}`}
+          style={returnable ? { cursor: 'pointer' } : null}
+          onClick={handleOnClick}
+        >
+          {children}
+        </span>
+      )}
     </div>
   );
 };

src/components/PageTitle/index.less

@@ -1,23 +1,43 @@
 .titleBox {
+  position: relative;
+  left: -0.2rem;
   display: flex;
   align-items: center;
+  padding-bottom: 0.2rem;
+  border-bottom: 1px solid rgba(188, 186, 186, 1);
+}
+.subPage {
+  border-bottom: 0 none;
 }
 .titleBar {
-  width: 7px;
-  height: 35px;
+  width: 0.07rem;
+  height: 0.35rem;
   background: #4a90e2;
   float: left;
-  margin-right: 18px;
+  margin-right: 0.1rem;
+}
+.subPage {
+  .title {
+    background: linear-gradient(
+      to bottom,
+      transparent 0%,
+      transparent 60%,
+      #ffe500 61%,
+      #ffe500 100%
+    );
+  }
 }
 .title {
   display: inline-block;
-  width: 100%;
-  font-size: 36px;
-  font-weight: 400;
-  color: #000000;
-  line-height: 50px;
+  padding: 0.05rem;
+  // width: 100%;
+  font-size: 0.36rem;
+  font-weight: 600;
+  color: #0139f1;
+  line-height: 0.32rem;
 }
 .tabs {
   position: absolute;
-  top: 52px;
+  top: 0.4rem;
+  left: 0.4rem;
 }

src/components/ScrollLoading/index.js

@@ -24,7 +24,10 @@ export default function ScrollLoading({
       <div
         ref={scrollContent}
         onScroll={handleScroll}
-        style={{ overflowY: 'scroll', height: `calc(100vh - ${height}px)` }}
+        style={{
+          overflowY: 'scroll',
+          height: `calc(100vh - ${height / 100}rem)`,
+        }}
       >
         {children}
       </div>

src/components/TabsContent/index.js

@@ -1,3 +1,4 @@
+import { Divider } from 'antd';
 import { useMemo, useState } from 'react';
 import styles from './index.less';
 
@@ -19,19 +20,31 @@ const TabsContent = (props) => {
         className={`${styles.tabsTitle} ${small ? styles.small : ''}`}
         style={center ? { justifyContent: 'center' } : {}}
       >
-        {items.map((item) => (
-          <div
-            key={item.key}
-            className={`${styles.tabsItem} ${
-              active == item.key ? styles.active : ''
-            }`}
-            onClick={() => {
-              setActive(item.key);
-              onChange(item.key);
-            }}
-          >
-            {item.label}
-          </div>
+        {items.map((item, index) => (
+          <>
+            <div
+              key={item.key}
+              className={`${styles.tabsItem} ${
+                active == item.key ? styles.active : ''
+              }`}
+              onClick={() => {
+                setActive(item.key);
+                onChange(item.key);
+              }}
+            >
+              {item.label}
+            </div>
+            {index !== items.length - 1 && (
+              <Divider
+                type="vertical"
+                style={{
+                  height: '0.5rem',
+                  width: '0.015rem',
+                  backgroundColor: '#BCBABA',
+                }}
+              />
+            )}
+          </>
         ))}
       </div>
       <div>{renderContent}</div>

src/components/TabsContent/index.less

@@ -1,38 +1,43 @@
 .tabsTitle {
   display: flex;
   align-items: center;
-  height: 80px;
-  margin-bottom: 10px;
-  width: 100%;
+  height: 0.8rem;
+  margin-bottom: 0.1rem;
+  // padding-left: 0.4rem;
+  // width: calc(100% - 0.4rem);
   overflow-x: auto;
   overflow-y: hidden;
+  border-bottom: 0.015rem solid #bcbaba;
   &::-webkit-scrollbar {
     display: none;
   }
 
-  > .tabsItem {
-    border-right: 1px solid #979797;
-  }
-  :last-child {
-    border-right: none;
-  }
+  // > .tabsItem {
+  //   border-right: 0.01rem solid #979797;
+  // }
+  // :last-child {
+  //   border-right: none;
+  // }
 }
 .tabsItem {
-  padding: 0 40px;
-  color: #4a4a4a;
-  font-size: 36px;
+  padding: 0 0.4rem;
+  color: #3f3f40;
+  font-size: 0.36rem;
   white-space: nowrap;
+  font-weight: 600;
 }
 .active {
-  color: #4a90e2;
+  color: #1755ff;
 }
 
 .small {
   height: inherit;
-  padding: 20px 0;
+  width: 100%;
+  border-bottom: none;
   .tabsItem {
-    font-size: 28px;
-    padding: 0 30px;
+    font-size: 0.28rem;
+    padding: 0 0.3rem;
+    font-weight: 600;
     &:last-child {
       padding-right: 0;
     }

src/components/ThresholdDetail/index.less

@@ -15,7 +15,7 @@
 
 .box {
   width: 100%;
-  height: 8px;
+  height: 0.08rem;
   position: relative;
   background-color: #12CEB3;
 
@@ -40,7 +40,7 @@
   .scaleBlackLeft,
   .scaleBlackRight {
     position: absolute;
-    width: 6px;
+    width: 0.06rem;
     height: 100%;
     background: #0D1A2B;
     top: 0;
@@ -48,26 +48,26 @@
   }
 
   .scaleBlackLeft {
-    left: -3px;
+    left: -0.03rem;
   }
 
   .scaleBlackRight {
-    right: -3px;
+    right: -0.03rem;
   }
 
   
 }
 .scale {
   position: absolute;
-  top: 18px;
+  top: 0.18rem;
   line-height: 1.2;
-  font-size: 24px;
+  font-size: 0.24rem;
   word-break: keep-all;
   transform: translateX(-50%);
 
   &.top {
     top: inherit;
-    bottom: 18px;
+    bottom: 0.18rem;
   }
 }
 .current {
@@ -76,13 +76,13 @@
   transform: translate(-50%, -50%);
   z-index: 10;
   // height: 120%;
-  width: 9px;
-  height: 22px;
+  width: 0.09rem;
+  height: 0.22rem;
   // background: url("@/assets/current.png") no-repeat center;
   background-size: 100% 100%;
   // .currentBar {
   //   height: 100%;
-  //   width: 4px;
+  //   width: 0.04rem;
   //   background-color: #fff;
   // }
 }

src/global.less

@@ -46,6 +46,19 @@ button {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+
+@font-face {
+  font-family: 'PangMenZhengDao-3';
+  src: url('@/assets/fonts/PangMenZhengDao-3.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'PangMenZhengDao';
+  src: url('@/assets/fonts/PangMenZhengDao.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
 body {
   color: #333;
   .ant-collapse-header {
@@ -53,26 +66,73 @@ body {
   }
   .ant-collapse-item {
     background-color: white !important;
-    border-radius: 6px !important;
+    border-radius: 0.06rem !important;
     border-bottom: none !important;
-    margin-bottom: 10px;
+    margin-bottom: 0.1rem;
   }
   .ant-select-dropdown .ant-select-item {
-    font-size: 26px;
+    font-size: 0.3rem;
   }
+
   .ant-picker-dropdown {
-    font-size: 24px;
+    font-size: 0.3rem;
   }
   .ant-picker-dropdown .ant-picker-content td {
-    width: 30px;
+    width: 0.3rem;
   }
   .ant-picker-dropdown .ant-picker-cell::before {
-    height: 30px;
+    height: 0.3rem;
   }
   .ant-picker-dropdown .ant-picker-cell .ant-picker-cell-inner {
-    min-width: 30px;
-    height: 30px;
-    line-height: 30px;
+    min-width: 0.3rem;
+    height: 0.3rem;
+    line-height: 0.3rem;
+  }
+  .ant-picker-dropdown .ant-picker-date-panel .ant-picker-content {
+    width: 4rem;
+  }
+  .ant-picker-dropdown .ant-picker-date-panel .ant-picker-content th {
+    width: 0.36rem;
+  }
+  .ant-picker-dropdown .ant-picker-content th {
+    height: 0.36rem;
+  }
+  .ant-picker-dropdown .ant-picker-content th,
+  .ant-picker-dropdown .ant-picker-content td {
+    min-width: 0.24rem;
+  }
+  .ant-picker-dropdown .ant-picker-cell {
+    padding: 0.06rem 0.06rem;
+  }
+
+  .ant-picker-dropdown .ant-picker-decade-panel,
+  .ant-picker-dropdown .ant-picker-year-panel,
+  .ant-picker-dropdown .ant-picker-quarter-panel,
+  .ant-picker-dropdown .ant-picker-month-panel,
+  .ant-picker-dropdown .ant-picker-week-panel,
+  .ant-picker-dropdown .ant-picker-date-panel,
+  .ant-picker-dropdown .ant-picker-time-panel {
+    width: 4.5rem;
+  }
+
+  .ant-modal-root .ant-modal-mask {
+    border-radius: 0.5rem;
+    background-color: rgba(0, 0, 0, 0.2);
+  }
+
+  .ant-modal-wrap {
+    &::-webkit-scrollbar {
+      display: none;
+    }
+    &::-webkit-scrollbar-thumb {
+      display: none;
+    }
+    &::-webkit-scrollbar-track {
+      display: none;
+    }
+    &::-webkit-scrollbar-thumb:hover {
+      display: none;
+    }
   }
 }
 
@@ -123,25 +183,42 @@ input[type='reset'] {
   outline: none;
 }
 
-.card-box {
-  border-radius: 8px;
-  box-shadow: 0px 0px 8px 2px rgba(191, 191, 191, 0.2);
-  border: 1px solid #eee;
+.box {
+  border-radius: 0.08rem;
+  box-shadow: 0rem 0rem 0.08rem 0.02rem rgba(191, 191, 191, 0.2);
+  border: 0.01rem solid #eee;
   background: rgba(255, 255, 255);
 }
+.card-box {
+  border-radius: 0.4rem 0 0.4rem 0;
+  background: #ffffff;
+  box-shadow: 0.01rem 0.06rem 0.1rem 0rem rgba(0, 0, 0, 0.1);
+}
+.card-select {
+  border: 3px solid #66ccff;
+}
+.value-number {
+  margin-bottom: 0.2rem;
+  font-size: 0.8rem;
+  font-family: PangMenZhengDao-3, PangMenZhengDao-3;
+  font-weight: 400;
+  color: #3b3b3b;
+  line-height: 0.62rem;
+  letter-spacing: 0.06rem;
+}
 
 .content-tab {
-  padding-left: 5px;
-  padding-top: 5px;
-  padding-right: 5px;
-  height: calc(100vh - 130px);
+  padding-left: 0.05rem;
+  padding-top: 0.05rem;
+  padding-right: 0.05rem;
+  height: calc(100vh - 1.3rem);
   overflow-x: hidden;
   overflow-y: auto;
 }
 .content-title {
-  padding-left: 5px;
-  padding-right: 5px;
-  height: calc(100vh - 110px);
+  padding-left: 0.05rem;
+  padding-right: 0.05rem;
+  height: calc(100vh - 1.15rem);
   overflow-x: hidden;
   overflow-y: auto;
 }
@@ -149,10 +226,10 @@ input[type='reset'] {
 .password-eye {
   display: inline-block;
   vertical-align: middle;
-  width: 30px;
-  height: 30px;
+  width: 0.3rem;
+  height: 0.3rem;
   background: url('@/assets/icon-eye1.png') no-repeat center;
-  background-size: 30px;
+  background-size: 0.3rem;
   &.open {
     background-image: url('@/assets/icon-eye2.png');
   }
@@ -162,17 +239,18 @@ input[type='reset'] {
   display: flex;
   width: 100%;
   overflow-x: auto;
-  border: 1px solid #979797;
+  border: 0.01rem solid #979797;
   &::-webkit-scrollbar {
     display: none;
   }
   .tabs-item {
     flex: 1;
-    padding: 16px 24px;
-    font-size: 24px;
+    text-align: center;
+    padding: 0.16rem 0.24rem;
+    font-size: 0.24rem;
     font-weight: 400;
     color: #4a4a4a;
-    border-right: 1px solid #979797;
+    border-right: 0.01rem solid #979797;
     white-space: nowrap;
     &:last-child {
       border-right: none;
@@ -186,21 +264,21 @@ input[type='reset'] {
 .section-title {
   display: flex;
   align-items: center;
-  font-size: 28px;
+  font-size: 0.28rem;
   font-weight: 400;
   color: #4a4a4a;
-  line-height: 40px;
+  line-height: 0.4rem;
   .section-line {
-    width: 4px;
-    height: 30px;
+    width: 0.04rem;
+    height: 0.3rem;
     background: #4a90e2;
-    margin-right: 8px;
+    margin-right: 0.08rem;
   }
 }
 
 *::-webkit-scrollbar {
-  width: 6px;
-  height: 6px;
+  width: 0.06rem;
+  height: 0.06rem;
 }
 
 *::-webkit-scrollbar-thumb {
@@ -217,12 +295,13 @@ input[type='reset'] {
 
 .ant-btn-primary {
   background: #4a90e2;
-  font-size: 16px;
+  font-size: 0.22rem;
   padding-top: 0;
   padding-bottom: 0;
 }
+
 .ant-table {
-  background-color: white !important;
+  background: #fff;
 }
 .ant-table-cell,
 .ant-table-placeholder {
@@ -241,45 +320,58 @@ input[type='reset'] {
   display: none;
 }
 .ant-table-thead {
-  background: #cbe0f6;
-}
-.ant-table-thead > tr > th,
-.ant-table-tbody > tr > td {
-  border-radius: 0 !important;
-  padding: 16px 18px !important;
-  font-size: 24px !important;
-  color: #4a4a4a !important;
-  line-height: 32px !important;
-  font-weight: normal !important;
+  background: rgba(23, 85, 255, 0.5);
+}
+.ant-table-wrapper .ant-table-thead > tr > th,
+.ant-table-wrapper .ant-table-tbody > tr > td {
+  border-radius: 0;
+  padding: 0.12rem 0.18rem;
+  font-size: 0.28rem;
+  color: rgba(97, 93, 93, 1);
+  line-height: 0.32rem;
+  font-weight: normal;
   vertical-align: middle;
-  border: none !important;
+  border-radius: 0 !important;
+}
+
+.ant-table-wrapper .ant-table-thead > tr > th {
+  border: 0 none !important;
+  color: #fff;
+}
+.ant-table-wrapper .ant-table-tbody > tr > td {
+  border-bottom: 1px solid rgba(188, 186, 186, 1);
 }
-.ant-table-tbody > tr:nth-child(even) {
-  background: rgba(145, 192, 238, 0.16);
+
+// .ant-table-tbody > tr:nth-child(even) {
+//   background: rgba(145, 192, 238, 0.16);
+// }
+
+.ant-table-cell::before {
+  display: none;
 }
 
 .ant-picker {
-  font-size: 26px;
+  font-size: 0.26rem;
   .ant-picker-input > input {
-    font-size: 24px;
+    font-size: 0.24rem;
   }
   .ant-picker-separator {
-    font-size: 24px;
+    font-size: 0.24rem;
   }
 }
 
 .ant-select-selection-item {
-  font-size: 26px;
+  font-size: 0.26rem;
 }
 .ant-select-selector {
-  height: 40px;
-  padding: 4px 11px;
+  // height: 0.4rem;
+  padding: 0.04rem 0.11rem;
 }
 
 .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
-  height: 40px;
-  padding: 4px 11px;
+  height: auto;
+  padding: 0.04rem 0.11rem;
 }
 .ant-select-single .ant-select-selector {
-  font-size: 26px;
+  font-size: 0.26rem;
 }

src/models/eqSelfInspection.js

@@ -198,18 +198,25 @@ export default {
           arr?.filter((item) => item.Status === 1)?.length || 0;
 
         //获取液位检测异常数量
-        const errorNum = data.FluidLevelList?.filter(
-          (item) => item.status == 1,
-        );
+        // const errorNum = data.FluidLevelList?.filter(
+        //   (item) => item.status == 1,
+        // );
         let num = 0;
         if (data?.extendWarningData?.length > 0) num += 1;
         if (data?.sensorWaringNum > 0) num += 1;
         if (data?.dumuList?.length > 0) num += 1;
         if (data?.FaultAnalysis?.length > 0) num += 1;
-        if (errorNum?.length > 0) num += errorNum;
+        // if (errorNum?.length > 0) num += errorNum;
         data.warningTotalNum = num;
 
-        if (data.extendWarningNum > 0) {
+        if (
+          data.extendWarningNum > 0 ||
+          data?.DrugFlowList?.filter((item) => item.status)?.length > 0 ||
+          data?.FluidLevelList?.filter((item) => item.status)?.length > 0 ||
+          data?.WaterInCheckList?.filter((item) => item.status)?.length > 0 ||
+          data?.PressureCompareList.length > 0 ||
+          data?.WaterQualityCompareList.length > 0
+        ) {
           // 判断是否有异常
           data.patrolStatus = 1;
         } else if (data.extendWarningData.length - data.extendWarningNum > 0) {
@@ -222,8 +229,7 @@ export default {
         data.faultAnalysisStatus = data?.FaultAnalysis?.length > 0 ? 1 : 0;
         // data.secureStatus =
         //   data?.dumuList?.length > 0 || data?.sensorWaringNum > 0 ? 1 : 0;
-        data.secureStatus =
-          data?.dumuList?.length > 0 || errorNum?.length > 0 ? 1 : 0;
+        data.secureStatus = data?.dumuList?.length > 0 ? 1 : 0;
         let secureChild = [];
         let dumuStatus = 0;
         if (data?.dumuList?.length > 0) {

src/pages/Center/MyTask/Detail/TaskDetail.js

@@ -9,7 +9,7 @@ import {
 } from '@/pages/TaskManage/constent';
 import { getDiagnosticDetail, getMandateDetail } from '@/services/TaskManage';
 import { useLocation } from '@@/exports';
-import { UpOutlined } from '@ant-design/icons';
+import { CaretDownFilled } from '@ant-design/icons';
 import { connect, useRequest } from '@umijs/max';
 import { Col, Collapse, Divider, Row, Table } from 'antd';
 import dayjs from 'dayjs';
@@ -39,10 +39,12 @@ function TaskDetail(props) {
       title: '详情',
       dataIndex: 'detail',
       key: 'key',
-      render: (value, record) => {
+      render: (value, _record, index) => {
         return (
           <div style={{ display: 'flex', alignItems: 'center' }}>
-            <div style={{ width: '100%' }}>{value.text}</div>
+            <div style={{ width: '100%' }}>
+              {index + 1}、{value.text}
+            </div>
           </div>
         );
       },
@@ -99,7 +101,7 @@ function TaskDetail(props) {
         {
           key: '1',
           label: (
-            <span style={{ color: '#5697e4' }}>
+            <span style={{ color: '#ffffff', marginRight: '0.05rem' }}>
               关联工单({workOrder.length})
             </span>
           ),
@@ -107,19 +109,19 @@ function TaskDetail(props) {
             return (
               <div key={record.Id} className={styles.workOrderCard}>
                 <div className={styles.leftInfo}>
-                  <Row style={{ marginBottom: '15px' }}>
-                    <Col className={styles.fontS24} span={12}>
+                  <Row style={{ marginBottom: '0.15rem' }}>
+                    <Col className={styles.fontS30} span={10}>
                       <>
                         工单类型：
                         {record.RecordType?.label?.replace('工单', '')}
                       </>
                     </Col>
-                    <Col className={styles.fontS24} span={12}>
+                    <Col className={styles.fontS30} span={14}>
                       时间：{record.CreateTime || '-'}
                     </Col>
                   </Row>
                   <Row>
-                    <Col className={styles.fontS24} span={12}>
+                    <Col className={styles.fontS30} span={10}>
                       工单状态：
                       <span style={{ color: '#5697e4' }}>
                         {typeof record.Status === 'number'
@@ -127,7 +129,7 @@ function TaskDetail(props) {
                           : record.Status?.label}
                       </span>
                     </Col>
-                    <Col className={styles.fontS24} span={12}>
+                    <Col className={styles.fontS30} span={14}>
                       工单负责人：
                       {typeof record.Responsible === 'number'
                         ? '-'
@@ -135,23 +137,41 @@ function TaskDetail(props) {
                     </Col>
                   </Row>
                 </div>
-                <Divider type="vertical" style={{ height: '40px' }} />
-                <div
-                  className={styles.rightButton}
-                  style={{ color: '#5697e4' }}
-                  onClick={() => {
-                    if (typeof record.RecordType === 'number') {
-                      return;
-                    }
-                    // @ts-ignore
-                    goTaskOrder(
-                      record.Id,
-                      record.RecordType?.value,
-                      tempMandate?.MandateClass.value,
-                    );
-                  }}
-                >
-                  查看工单
+                <Divider type="vertical" style={{ height: '0.4rem' }} />
+                <div className={styles.rightButtonContainer}>
+                  <div
+                    className={styles.rightButton}
+                    onClick={() => {
+                      if (typeof record.RecordType === 'number') {
+                        return;
+                      }
+                      // @ts-ignore
+                      goMyWorkOrder(
+                        record.Id,
+                        record.RecordType?.value,
+                        tempMandate?.MandateClass.value,
+                      );
+                    }}
+                  >
+                    查看
+                  </div>
+                  {/* <div
+                    className={styles.rightButton}
+                    style={{ color: '#5697e4' }}
+                    onClick={() => {
+                      if (typeof record.RecordType === 'number') {
+                        return;
+                      }
+                      // @ts-ignore
+                      goTaskOrder(
+                        record.Id,
+                        record.RecordType?.value,
+                        tempMandate?.MandateClass.value,
+                      );
+                    }}
+                  >
+                    关闭工单
+                  </div> */}
                 </div>
               </div>
             );
@@ -232,33 +252,36 @@ function TaskDetail(props) {
     setMandateTable(dataSource);
   }, [mandateChild]);
 
-  const goTaskOrder = (orderID, orderType, mandateClass) => {
+  const goMyWorkOrder = (orderID, orderType, mandateClass) => {
+    if (orderType === undefined) {
+      return;
+    }
     navigate(
-      `/task-manage/list/order-detail?project_id=${project_id}&order_id=${orderID}&order_type=${orderType}&mandate_class=${mandateClass}`,
+      `/center/my-task/work-order-detail?project_id=${project_id}&order_id=${orderID}&order_type=${orderType}&mandate_class=${mandateClass}`,
     );
   };
 
   return (
     <PageContent closeable={false}>
       <PageTitle returnable>任务详情</PageTitle>
-      <div className={`${styles.cardContainer} card-box`}>
+      <div className={`${styles.cardContainer}`}>
         <div className={styles.normalInfo}>
-          <Row className={styles.infoRow} justify="space-between">
-            <Col className={styles.fontS24}>
+          <Row className={styles.infoRow}>
+            <Col span={14} className={styles.fontS30}>
               时间：{mandateDetail?.CreateTime}
             </Col>
             {/*// @ts-ignore*/}
-            <Col className={styles.fontS24}>
+            <Col className={styles.fontS30}>
               {/*//@ts-ignore*/}
               任务类别：{mandateDetail?.MandateClass?.label}
             </Col>
           </Row>
-          <Row justify="space-between">
-            <Col className={styles.fontS24}>
+          <Row>
+            <Col span={14} className={styles.fontS30}>
               {/*//@ts-ignore*/}
               任务状态：{mandateDetail?.Status?.label}
             </Col>
-            <Col className={styles.fontS24}>
+            <Col className={styles.fontS30}>
               {/*// @ts-ignore*/}
               任务负责人：{mandateDetail?.ResponsiblePeople?.CName}
             </Col>
@@ -266,20 +289,32 @@ function TaskDetail(props) {
         </div>
         <div className={styles.detailInfo}>
           <Row className={styles.infoRow}>
-            <Col className={styles.fontS24} span={4}>
+            <Col
+              className={styles.fontS30}
+              span={4}
+              style={{ fontWeight: 600 }}
+            >
               任务总结
             </Col>
-            <Col className={styles.fontS24}>
+            <Col
+              span={20}
+              className={styles.fontS30}
+              style={{ color: 'rgba(97, 93, 93, 1)' }}
+            >
               {mandateDetail?.Summary ||
                 '根据水质相关数据．建议您调节以下参数，水厂运行可达较优状态'}
             </Col>
           </Row>
           {mandateDetail?.img && (
             <Row className={styles.infoRow}>
-              <Col className={styles.fontS24} span={4}>
+              <Col
+                className={styles.fontS30}
+                span={4}
+                style={{ fontWeight: 600 }}
+              >
                 预警图片
               </Col>
-              <Col className={styles.fontS24}>
+              <Col className={styles.fontS30}>
                 <ReactZmage
                   controller={{
                     // 关闭按钮
@@ -294,7 +329,7 @@ function TaskDetail(props) {
                     pagination: false,
                   }}
                   backdrop="rgba(255,255,255,0.5)"
-                  style={{ width: '350px' }}
+                  style={{ width: '3.5rem' }}
                   src={mandateDetail?.img}
                 />
               </Col>
@@ -303,10 +338,14 @@ function TaskDetail(props) {
 
           {mandateDetail?.Files.length > 0 && (
             <Row className={styles.infoRow}>
-              <Col className={styles.fontS24} span={4}>
+              <Col
+                className={styles.fontS30}
+                span={4}
+                style={{ fontWeight: 600 }}
+              >
                 截图
               </Col>
-              <Col className={styles.fontS24}>
+              <Col className={styles.fontS30}>
                 <ReactZmage
                   controller={{
                     // 关闭按钮
@@ -321,7 +360,7 @@ function TaskDetail(props) {
                     pagination: true,
                   }}
                   backdrop="rgba(255,255,255,0.5)"
-                  style={{ width: '350px' }}
+                  style={{ width: '3.5rem' }}
                   src={mandateDetail?.Files[0].url}
                   set={mandateDetail?.Files.map((item) => {
                     if (item) {
@@ -337,12 +376,17 @@ function TaskDetail(props) {
           )}
 
           <Row>
-            <Col className={styles.fontS24} span={4}>
+            <Col
+              className={styles.fontS30}
+              span={4}
+              style={{ fontWeight: 600 }}
+            >
               任务内容
             </Col>
-            <Col className={styles.fontS24} span={20}>
+            <Col className={styles.fontS30} span={20}>
               {/*{mandateDetail?.Detail}*/}
               <Table
+                className={styles.taskTable}
                 rowKey="key"
                 columns={columnDef}
                 dataSource={mandateTable}
@@ -356,8 +400,8 @@ function TaskDetail(props) {
             className={styles.collapseLabel}
             ghost
             expandIcon={({ isActive }) => (
-              <UpOutlined
-                style={{ color: '#5697e4' }}
+              <CaretDownFilled
+                style={{ color: '#ffffff' }}
                 rotate={isActive ? 180 : 0}
               />
             )}

src/pages/Center/MyTask/Detail/WorkOrderDetail.js

@@ -12,7 +12,7 @@ import {
 } from '@/services/TaskManage';
 import { useLocation } from '@@/exports';
 import { connect, useRequest } from '@umijs/max';
-import { Col, Row, Steps } from 'antd';
+import { Col, Divider, Row, Steps } from 'antd';
 import dayjs from 'dayjs';
 import { useEffect, useState } from 'react';
 import styles from './workOrderDetail.less';
@@ -297,52 +297,59 @@ const WorkOrderDetail = (props) => {
       <PageTitle returnable>工单详情</PageTitle>
       <div className={styles.selfCardBox}>
         <div className={styles.orderInfo}>
-          <SubTitle
-            title="工单信息"
-            // @ts-ignore
-            showStatus={orderInfo?.OrderStatus.value === 2}
-            radius
-          />
-          <div style={{ padding: '15px', letterSpacing: '1.5px' }}>
-            <Row className={styles.rowMargin}>
-              <Col className={styles.fontS28} span={15}>
-                {/* @ts-ignore */}
-                工单类型：
-                {OrderType.find((item) => item.value === order_type)?.label ||
-                  '-'}
-              </Col>
-              <Col className={styles.fontS28} span={9}>
-                {/* @ts-ignore */}
-                工单负责人：{orderInfo?.Repairman?.CName || '-'}
-              </Col>
-            </Row>
-            <Row className={styles.rowMargin}>
-              <Col className={styles.fontS28} span={15}>
-                {/*  @ts-ignore */}
-                工单状态：{orderInfo?.OrderStatus?.label}
-              </Col>
-              <Col className={styles.fontS28} span={9}>
-                {/* @ts-ignore */}
-                派单人员：{orderInfo?.DispatchMan?.CName || '-'}
-              </Col>
-            </Row>
-            <Row className={styles.rowMargin}>
-              <Col className={styles.fontS28}>
-                派单时间：{orderInfo?.CreateTime || '-'}
-              </Col>
-            </Row>
-            <Row className={styles.rowMargin}>
-              <Col className={styles.fontS28}>
-                计划完成时间：{orderInfo?.PlanTime || '-'}
-              </Col>
-            </Row>
-            <Row className={styles.rowMargin}>
-              <Col className={styles.fontS28}>
-                实际完成时间：{orderInfo?.RepairTime || '-'}
+          <SubTitle title="工单信息" radius />
+
+          <div style={{ padding: '0.15rem', letterSpacing: '0.015rem' }}>
+            <div
+              style={{
+                background: 'rgba(23, 85, 255, 0.06)',
+                padding: '0.2rem',
+                marginBottom: '0.2rem',
+              }}
+            >
+              <Row className={styles.rowMargin}>
+                <Col className={styles.fontS28} span={13}>
+                  {/* @ts-ignore */}
+                  工单类型：
+                  {OrderType.find((item) => item.value === order_type)?.label ||
+                    '-'}
+                </Col>
+                <Col className={styles.fontS28} span={9}>
+                  {/* @ts-ignore */}
+                  工单负责人：{orderInfo?.Repairman?.CName || '-'}
+                </Col>
+              </Row>
+              <Row className={styles.rowMargin}>
+                <Col className={styles.fontS28} span={13}>
+                  {/*  @ts-ignore */}
+                  工单状态：{orderInfo?.OrderStatus?.label}
+                </Col>
+                <Col className={styles.fontS28} span={9}>
+                  {/* @ts-ignore */}
+                  派单人员：{orderInfo?.DispatchMan?.CName || '-'}
+                </Col>
+              </Row>
+              <Row className={styles.rowMargin}>
+                <Col className={styles.fontS28}>
+                  派单时间：{orderInfo?.CreateTime || '-'}
+                </Col>
+              </Row>
+              <Row className={styles.rowMargin}>
+                <Col className={styles.fontS28} span={13}>
+                  计划完成时间：{orderInfo?.PlanTime || '-'}
+                </Col>
+              </Row>
+              <Row>
+                <Col className={styles.fontS28}>
+                  实际完成时间：{orderInfo?.RepairTime || '-'}
+                </Col>
+              </Row>
+            </div>
+
+            <Row style={{ padding: '0 0.2rem' }}>
+              <Col className={styles.fontS28} style={{ fontWeight: '600' }}>
+                工单详情：
               </Col>
-            </Row>
-            <Row>
-              <Col className={styles.fontS28}>工单详情：</Col>
               <Col className={styles.fontS28} span={18}>
                 {orderInfo?.Reason}
               </Col>
@@ -360,29 +367,36 @@ const WorkOrderDetail = (props) => {
         {order_type === 3 && (
           <div>
             <SubTitle title="维修内容" />
-            <div style={{ padding: '15px' }}>
-              <Row className={styles.rowMargin} justify={'space-around'}>
-                <Col className={styles.fontS28} span={8}>
-                  是否润滑/加油：{orderInfo?.Lubrication === 1 ? '是' : '否'}
-                </Col>
-                <Col className={styles.fontS28} span={8}>
-                  是否拆检：{orderInfo?.Check === 1 ? '是' : '否'}
-                </Col>
-                <Col className={styles.fontS28} span={8}>
-                  是否清洁：{orderInfo?.Clean === 1 ? '是' : '否'}
-                </Col>
-              </Row>
-              <Row justify={'space-around'}>
-                <Col className={styles.fontS28} span={8}>
-                  是否紧固：{orderInfo?.Fasten === 1 ? '是' : '否'}
-                </Col>
-                <Col className={styles.fontS28} span={8}>
-                  是否除锈：{orderInfo?.AntiCorrosive === 1 ? '是' : '否'}
-                </Col>
-                <Col className={styles.fontS28} span={8}>
-                  是否防腐：{orderInfo?.RustRemoval === 1 ? '是' : '否'}
-                </Col>
-              </Row>
+            <div style={{ padding: '0.15rem' }}>
+              <div
+                style={{
+                  padding: '0.15rem 0.2rem',
+                  background: 'rgba(23, 85, 255, 0.06)',
+                }}
+              >
+                <Row className={styles.rowMargin} justify={'space-around'}>
+                  <Col className={styles.fontS28} span={8}>
+                    是否润滑/加油：{orderInfo?.Lubrication === 1 ? '是' : '否'}
+                  </Col>
+                  <Col className={styles.fontS28} span={8}>
+                    是否拆检：{orderInfo?.Check === 1 ? '是' : '否'}
+                  </Col>
+                  <Col className={styles.fontS28} span={8}>
+                    是否清洁：{orderInfo?.Clean === 1 ? '是' : '否'}
+                  </Col>
+                </Row>
+                <Row justify={'space-around'}>
+                  <Col className={styles.fontS28} span={8}>
+                    是否紧固：{orderInfo?.Fasten === 1 ? '是' : '否'}
+                  </Col>
+                  <Col className={styles.fontS28} span={8}>
+                    是否除锈：{orderInfo?.AntiCorrosive === 1 ? '是' : '否'}
+                  </Col>
+                  <Col className={styles.fontS28} span={8}>
+                    是否防腐：{orderInfo?.RustRemoval === 1 ? '是' : '否'}
+                  </Col>
+                </Row>
+              </div>
             </div>
           </div>
         )}
@@ -390,8 +404,13 @@ const WorkOrderDetail = (props) => {
         {order_type === 5 && (
           <div>
             <SubTitle title="加药详情" />
-            <div style={{ padding: '15px' }}>
-              <Row>
+            <div style={{ padding: '0.15rem' }}>
+              <Row
+                style={{
+                  padding: '0.15rem 0.2rem',
+                  background: 'rgba(23, 85, 255, 0.06)',
+                }}
+              >
                 <Col className={styles.fontS28} span={8}>
                   药剂名称：{additionalInfo?.name || '-'}
                 </Col>
@@ -409,7 +428,20 @@ const WorkOrderDetail = (props) => {
         {stepInfo?.length > 0 && (
           <div>
             <SubTitle title="工单流程" />
-            <div style={{ padding: '15px 20px' }}>
+            <Divider
+              type="horizontal"
+              style={{
+                height: '0.02rem',
+                margin: 0,
+                padding: 0,
+                color: 'rgba(23, 85, 255, 0.50)',
+                background: 'rgba(23, 85, 255, 0.50)',
+              }}
+            />
+            <div
+              style={{ padding: '0.15rem 0.2rem' }}
+              className={styles.taskStep}
+            >
               <Steps
                 direction="vertical"
                 current={stepInfo?.length ? stepInfo.length - 1 : 0}

src/pages/Center/MyTask/Detail/taskDetail.less

@@ -1,61 +1,84 @@
 .cardContainer {
-  margin-top: 15px;
-  padding: 20px 20px;
+  * {
+    font-family: Source Han Sans, Source Han Sans;
+  }
+  margin-top: 0.15rem;
+  padding: 0.2rem 0.2rem;
   background-color: white;
 
   .normalInfo {
-    padding: 25px 15px;
-    background-color: #fdf2df;
+    padding: 0.25rem 0.15rem;
+    background-color: #fdefd9;
   }
 
   .infoRow {
-    margin-bottom: 25px;
+    margin-bottom: 0.25rem;
   }
 
   .detailInfo {
-    padding: 25px 15px;
-    border-bottom: 1px solid rgba(0, 0, 0, 10%);
+    padding: 0.25rem 0.15rem;
   }
 
   .relatedOrder {
-    padding: 0 15px;
-    margin-top: 15px;
+    padding: 0 0.15rem;
+    margin-top: 0.15rem;
 
     .collapseLabel {
       width: 100%;
 
-      .ant-collapse-arrow {
-        font-size: 24px;
-      }
-
       :global {
+        .ant-collapse-arrow {
+          font-size: 0.3rem;
+        }
+
         .ant-collapse-item {
           margin-bottom: 0;
         }
 
+        .ant-collapse-item:last-child > .ant-collapse-header {
+          border-radius: 0;
+        }
+
+        .ant-collapse-header .ant-collapse-expand-icon {
+          padding-inline-end: 0;
+        }
+
         .ant-collapse-header {
+          height: 0.5rem;
+          background: url('@/assets/TaskManage/viewOrder@2x.png') no-repeat
+            center;
+          background-size: 30% 100%;
           justify-content: center;
           flex-direction: row-reverse;
           align-items: center;
-          margin-top: 10px;
+          margin-top: 0.1rem;
+          border-bottom: 0.02rem solid #1755ff;
 
           .ant-collapse-header-text {
-            font-size: 24px;
+            font-size: 0.3rem;
             flex: unset;
             margin-inline-end: unset;
           }
 
           .ant-collapse-arrow {
-            font-size: 24px;
+            font-size: 0.32rem;
           }
         }
+
+        .ant-collapse-content-box {
+          padding: 0;
+        }
+
+        .ant-collapse-item > .ant-collapse-content > .ant-collapse-content-box {
+          padding-block: 0;
+        }
       }
 
       .workOrderCard {
-        margin-bottom: 20px;
-        padding: 20px 10px;
-        border-radius: 8px;
-        background-color: #e5effa;
+        margin-bottom: 0.1rem;
+        padding: 0.2rem;
+        border-radius: 0;
+        background-color: rgba(23, 85, 255, 0.06);
         display: flex;
         align-items: center;
 
@@ -63,63 +86,138 @@
           width: 80%;
         }
 
-        .rightButton {
-          flex: auto;
-          color: #5697e4;
-          font-size: 24px;
-          text-align: center;
+        .rightButtonContainer {
+          width: 20%;
           display: flex;
-          justify-content: center;
+          flex-direction: column;
+          justify-content: space-between;
           align-items: center;
         }
+
+        .rightButton {
+          background-color: #fff;
+          border-radius: 0.5rem;
+          width: 1.5rem;
+          height: 0.5rem;
+          letter-spacing: 0.05rem;
+          color: rgba(23, 85, 255, 1);
+          font-size: 0.3rem;
+          text-align: center;
+        }
       }
     }
   }
 
-  .workOrderCard {
-    margin-bottom: 25px;
-    padding: 20px 10px;
-    border-radius: 8px;
-    background-color: #e5effa;
-    display: flex;
-    align-items: center;
+  // .workOrderCard {
+  //   margin-bottom: 0.25rem;
+  //   padding: 0.2rem 0.1rem;
+  //   border-radius: 0.08rem;
+  //   background-color: #e5effa;
+  //   display: flex;
+  //   align-items: center;
+
+  //   .leftInfo {
+  //     width: 80%;
+  //   }
+
+  //   .rightButton {
+  //     flex: auto;
+  //     color: #5697e4;
+  //     font-size: 0.24rem;
+  //     text-align: center;
+  //     display: flex;
+  //     justify-content: center;
+  //     align-items: center;
+  //   }
+  // }
+}
 
-    .leftInfo {
-      width: 80%;
+.handleModal {
+  :global {
+    .ant-modal-close {
+      width: 0.36rem;
+      height: 0.36rem;
+    }
+    .ant-modal-close-x {
+      font-size: 0.36rem;
+      line-height: 0.36rem;
+    }
+    .ant-modal-title {
+      font-size: 0.28rem;
+    }
+    .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
+      height: 0.6rem;
+      padding-top: 0.15rem;
     }
+    .ant-form-item .ant-form-item-label > label {
+      font-size: 0.28rem;
+      height: 0.6rem;
+    }
+    .ant-input {
+      font-size: 0.28rem;
+      height: 0.6rem;
+    }
+    .ant-btn {
+      font-size: 0.28rem;
+      height: 0.6rem;
+      width: 1.2rem;
+    }
+    .ant-checkbox {
+      .ant-checkbox-inner {
+        width: 0.28rem;
+        height: 0.28rem;
+      }
+      .ant-checkbox-inner:after {
+        height: 0.16rem;
+        width: 0.09rem;
+      }
+    }
+    .ant-picker {
+      height: 0.6rem;
+    }
+  }
+}
 
-    .rightButton {
-      flex: auto;
-      color: #5697e4;
-      font-size: 24px;
-      text-align: center;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+.taskTable {
+  :global {
+    .ant-table-thead {
+      background: rgba(155, 151, 151, 0.2);
+    }
+    .ant-table-thead > tr > th {
+      color: rgba(59, 59, 59, 1);
+      font-weight: 600;
     }
   }
 }
 
+.fontS32 {
+  font-size: 0.32rem;
+}
+
+.fontS30 {
+  font-size: 0.3rem;
+}
+
 .fontS28 {
-  font-size: 28px;
+  font-size: 0.28rem;
 }
 
 .fontS24 {
-  font-size: 24px;
+  font-size: 0.24rem;
 }
 
 .fontS22 {
-  font-size: 22px;
+  font-size: 0.22rem;
 }
 
 .fontS20 {
-  font-size: 20px;
+  font-size: 0.2rem;
 }
 
 .fontS18 {
-  font-size: 18px;
+  font-size: 0.18rem;
 }
 
 .fontS16 {
-  font-size: 16px;
+  font-size: 0.16rem;
 }

src/pages/Center/MyTask/Detail/workOrderDetail.less

@@ -1,7 +1,10 @@
 .selfCardBox {
-  margin-top: 15px;
-  border-radius: 8px;
-  box-shadow: 2px 0 8px 0 rgba(0, 0, 0, 30%);
+  * {
+    font-family: Source Han Sans, Source Han Sans;
+  }
+  margin-top: 0.15rem;
+  margin-left: 0.15rem;
+  border-radius: 0.08rem;
   background-color: white;
 }
 
@@ -11,37 +14,55 @@
 }
 
 .rowMargin {
-  margin-bottom: 30px;
+  margin-bottom: 0.3rem;
 }
 
 .rowMarginTop {
-  margin-top: 30px;
+  margin-top: 0.3rem;
+}
+
+.taskStep {
+  margin-left: 15%;
+  width: 70%;
+  :global {
+    .ant-steps.ant-steps-vertical > .ant-steps-item .ant-steps-item-content {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 0.3rem;
+    }
+    .ant-steps.ant-steps-vertical
+      > .ant-steps-item
+      .ant-steps-item-description {
+      padding-bottom: 0;
+      padding-top: 0.18rem;
+    }
+  }
 }
 
 .fontS28 {
-  font-size: 28px;
+  font-size: 0.28rem;
 }
 
 .fontS26 {
-  font-size: 26px;
+  font-size: 0.26rem;
 }
 
 .fontS24 {
-  font-size: 24px;
+  font-size: 0.24rem;
 }
 
 .fontS22 {
-  font-size: 22px;
+  font-size: 0.22rem;
 }
 
 .fontS20 {
-  font-size: 20px;
+  font-size: 0.2rem;
 }
 
 .fontS18 {
-  font-size: 18px;
+  font-size: 0.18rem;
 }
 
 .fontS16 {
-  font-size: 16px;
+  font-size: 0.16rem;
 }

src/pages/Center/MyTask/List/TaskList.js

@@ -10,9 +10,9 @@ import {
   OrderType,
 } from '@/pages/TaskManage/constent';
 import { getMandateList } from '@/services/TaskManage';
-import { DownOutlined } from '@ant-design/icons';
+import { CaretDownFilled } from '@ant-design/icons';
 import { connect, useLocation, useNavigate, useRequest } from '@umijs/max';
-import { Col, Collapse, Divider, List, Row } from 'antd';
+import { Col, Collapse, List, Row } from 'antd';
 import dayjs from 'dayjs';
 import { useEffect, useState } from 'react';
 import styles from './taskList.less';
@@ -169,45 +169,62 @@ const MyTaskList = (props) => {
       {
         key: '1',
         label: (
-          <span style={{ color: '#5697e4' }}>关联工单({workOrder.length})</span>
+          <span style={{ color: '#ffffff', marginRight: '0.05rem' }}>
+            关联工单({workOrder.length})
+          </span>
         ),
         children: workOrder.map((order) => {
           return (
             <div key={order.Id} className={styles.workOrderCard}>
               <div className={styles.leftInfo}>
-                <Row style={{ marginBottom: '15px' }}>
-                  <Col className={styles.fontS24} span={12}>
+                <Row style={{ marginBottom: '0.15rem' }}>
+                  <Col className={styles.fontS30} span={11}>
                     工单类型：{order.RecordType?.label || '-'}
                   </Col>
-                  <Col className={styles.fontS24} span={12}>
+                  <Col className={styles.fontS30} span={13}>
                     时间：{order.CreateTime}
                   </Col>
                 </Row>
                 <Row>
-                  <Col className={styles.fontS24} span={12}>
+                  <Col className={styles.fontS30} span={11}>
                     工单状态：
                     <span style={{ color: '#5697e4' }}>
                       {order.Status?.label}
                     </span>
                   </Col>
-                  <Col className={styles.fontS24} span={12}>
+                  <Col className={styles.fontS30} span={13}>
                     工单负责人：{order.Responsible?.CName}
                   </Col>
                 </Row>
               </div>
-              <Divider type="vertical" style={{ height: '40px' }} />
-              <div
-                className={styles.rightButton}
-                style={{ color: '#5697e4' }}
-                onClick={() => {
-                  goMyWorkOrder(
-                    order.Id,
-                    order.RecordType?.value,
-                    item.MandateClass,
-                  );
-                }}
-              >
-                查看工单
+              <div className={styles.rightButtonContainer}>
+                <div
+                  className={styles.rightButton}
+                  style={{
+                    marginBottom: `${
+                      order.Status?.value === 0 ? '0.15rem' : '0'
+                    }`,
+                  }}
+                  onClick={() => {
+                    goMyWorkOrder(
+                      order.Id,
+                      order.RecordType?.value,
+                      item.MandateClass,
+                    );
+                  }}
+                >
+                  查看
+                </div>
+                {order.Status?.value === 0 && (
+                  <div
+                    className={styles.rightButton}
+                    onClick={() => {
+                      withdrawOrder(order);
+                    }}
+                  >
+                    关闭
+                  </div>
+                )}
               </div>
             </div>
           );
@@ -217,59 +234,79 @@ const MyTaskList = (props) => {
 
     return (
       <List.Item style={{ borderBottom: '0' }}>
-        <div className={`${styles.cardContainer} card-box`}>
-          <Row justify="space-between" style={{ marginBottom: '20px' }}>
-            <Col className={styles.fontS24}>时间:{formatItem.CreateTime}</Col>
-            <Col className={styles.fontS24}>
-              任务类别:{formatItem.MandateClass?.label}
-            </Col>
-            <Col className={styles.fontS24}>
-              任务负责人:{formatItem.ResponsiblePeople?.CName || '-'}
-            </Col>
-          </Row>
-          <Row
-            justify="space-between"
+        <div className={`${styles.cardContainer} `}>
+          <span
             style={{
-              paddingBottom: '10px',
-              borderBottom: '1px solid #D5D5D5',
+              width: '0.2rem',
+              height: '2.05rem',
+              position: 'absolute',
+              background: 'rgba(23, 85, 255, 0.20)',
             }}
-          >
-            <Col className={styles.fontS24}>
-              任务状态：{formatItem.Status?.label || '-'}
-            </Col>
-            <Col>
-              <div
-                className={styles.fontS24}
-                style={{
-                  backgroundColor: '#f5a623',
-                  color: 'white',
-                  width: '150px',
-                  height: '50px',
-                  display: 'flex',
-                  justifyContent: 'center',
-                  alignItems: 'center',
-                }}
-                onClick={() => {
-                  goMyTaskDetail(item);
-                }}
-              >
-                任务详情
-              </div>
-            </Col>
-          </Row>
-          <Row>
-            <Collapse
-              className={styles.collapseLabel}
-              ghost
-              expandIcon={({ isActive }) => (
-                <DownOutlined
-                  style={{ color: '#5697e4' }}
-                  rotate={isActive ? 180 : 0}
-                />
-              )}
-              items={collapseData}
-            />
-          </Row>
+          />
+          <div className={styles.cardInfo}>
+            <Row
+              justify="start"
+              style={{
+                padding: '0.2rem 0.2rem 0 0.4rem',
+                maxHeight: '0.7rem',
+              }}
+            >
+              <Col span={11} className={styles.fontS30}>
+                时间: {formatItem.CreateTime}
+              </Col>
+              <Col className={styles.fontS30}>
+                任务类别: {formatItem.MandateClass?.label}
+              </Col>
+            </Row>
+            <Row
+              justify="start"
+              style={{
+                padding: '0.2rem 0.2rem 0 0.4rem',
+                maxHeight: '0.75rem',
+              }}
+            >
+              <Col span={11} className={styles.fontS30}>
+                任务负责人: {formatItem.ResponsiblePeople?.CName || '-'}
+              </Col>
+              <Col span={8} className={styles.fontS30}>
+                任务状态: {formatItem.Status?.label || '-'}
+              </Col>
+              <Col>
+                <div
+                  className={styles.fontS30}
+                  style={{
+                    backgroundColor: '#f5a623',
+                    color: 'white',
+                    width: '1.7rem',
+                    letterSpacing: '0.025rem',
+                    height: '0.55rem',
+                    display: 'flex',
+                    justifyContent: 'center',
+                    alignItems: 'center',
+                    borderRadius: '0.5rem',
+                  }}
+                  onClick={() => {
+                    goMyTaskDetail(item);
+                  }}
+                >
+                  任务详情
+                </div>
+              </Col>
+            </Row>
+            <Row>
+              <Collapse
+                className={styles.collapseLabel}
+                ghost
+                expandIcon={({ isActive }) => (
+                  <CaretDownFilled
+                    style={{ color: '#ffffff' }}
+                    rotate={isActive ? 180 : 0}
+                  />
+                )}
+                items={collapseData}
+              />
+            </Row>
+          </div>
         </div>
       </List.Item>
     );

src/pages/Center/MyTask/List/WorkOrderList.js

@@ -52,26 +52,38 @@ const WorkOrderList = (props) => {
           key={workOrder.id || workOrder.Id}
           className={styles.workOrderCard}
         >
-          <Row justify="space-between" style={{ marginBottom: '20px' }}>
-            <Col className={styles.fontS24}>{workOrder?.CreateTime}</Col>
-            <Col className={styles.fontS24}>
-              工单负责人：{workOrder?.Repairman?.CName || '-'}
-            </Col>
-          </Row>
-          <Row justify="space-between">
-            <Col className={styles.fontS24}>
-              工单状态：{workOrder?.OrderStatus?.label}
-            </Col>
-            <Col className={styles.detailBtnContainer}>
-              <Button
-                type="primary"
-                style={{ height: '40px', fontSize: '24px' }}
-                onClick={() => goWorkOrderDetail(workOrder)}
-              >
-                工单详情
-              </Button>
-            </Col>
-          </Row>
+          <span
+            style={{
+              margin: '-0.2rem',
+              position: 'absolute',
+              height: '1.37rem',
+              width: '0.2rem',
+              background: 'rgba(23, 85, 255, 0.20)',
+            }}
+          ></span>
+          <div style={{ marginLeft: '0.1rem' }}>
+            <Row justify="space-between" style={{ marginBottom: '0.2rem' }}>
+              <Col className={styles.fontS24}>{workOrder?.CreateTime}</Col>
+              <Col className={styles.fontS24}>
+                工单负责人：{workOrder?.Repairman?.CName || '-'}
+              </Col>
+            </Row>
+            <Row justify="space-between">
+              <Col className={styles.fontS24}>
+                工单状态：{workOrder?.OrderStatus?.label}
+              </Col>
+              <Col className={styles.detailBtnContainer}>
+                <Button
+                  type="primary"
+                  style={{ height: '0.45rem', fontSize: '0.24rem' }}
+                  onClick={() => goWorkOrderDetail(workOrder)}
+                  shape="round"
+                >
+                  工单详情
+                </Button>
+              </Col>
+            </Row>
+          </div>
         </div>
       );
     });
@@ -148,7 +160,7 @@ const WorkOrderList = (props) => {
             <TabPane tab={item.label} key={String(item.value)}>
               <Spin spinning={loading}>
                 <div
-                  style={{ height: 'calc(100vh - 180px)', overflowY: 'auto' }}
+                  style={{ height: 'calc(100vh - 1.8rem)', overflowY: 'auto' }}
                 >
                   {workOrderListDOM}
                 </div>

src/pages/Center/MyTask/List/WorkOrderList.less

@@ -1,21 +1,35 @@
 .identifyTab :global {
+  .ant-tabs-nav {
+    margin: 0;
+  }
+
+  .ant-tabs-nav .ant-tabs-tab {
+    padding: 0.16rem 0;
+  }
+
   .ant-tabs-nav-list {
     justify-content: space-around;
     width: 100%;
     .ant-tabs-tab-btn {
-      font-size: 24px;
+      font-size: 0.24rem;
+      font-weight: 600;
     }
   }
 }
 
 .workOrderCard {
+  * {
+    font-family: Source Han Sans, Source Han Sans;
+  }
+  height: 1.37rem;
   background-color: white;
-  padding: 20px;
-  margin-top: 20px;
-  margin-bottom: 10px;
-  margin-left: 5px;
-  border-radius: 10px;
-  box-shadow: 0px 0px 8px 2px rgba(191, 191, 191, 0.2);
+  padding: 0.2rem;
+  margin-top: 0.2rem;
+  margin-bottom: 0.1rem;
+  margin-left: 0.05rem;
+  margin-right: 0.2rem;
+  box-shadow: 0rem 0rem 0.08rem 0.02rem rgba(191, 191, 191, 0.2);
+  position: relative;
 }
 
 .detailBtnContainer {
@@ -24,6 +38,13 @@
   align-items: center;
 }
 
+.loadMoreBtn {
+  margin: 0.2rem 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
 .fontS24 {
-  font-size: 24px;
+  font-size: 0.24rem;
 }

src/pages/Center/MyTask/List/taskList.less

@@ -1,62 +1,106 @@
 .cardContainer {
-  width: 100%;
-  padding: 20px 20px 10px 20px;
-  margin-left: 5px;
+  * {
+    font-family: Source Han Sans, Source Han Sans;
+  }
+
+  display: flex;
+  flex-grow: 1;
   background-color: white;
+  background: #ffffff;
+  box-shadow: 0rem 0rem 0.2rem 0 rgba(0, 0, 0, 0.15);
+
+  .cardInfo {
+    width: 100%;
+  }
 
   .collapseLabel {
     width: 100%;
-    .ant-collapse-arrow {
-      font-size: 24px;
-    }
+
     :global {
+      .ant-collapse-arrow {
+        font-size: 0.3rem;
+      }
+
       .ant-collapse-item {
         margin-bottom: 0;
       }
+
+      .ant-collapse-item:last-child > .ant-collapse-header {
+        border-radius: 0;
+      }
+
+      .ant-collapse-header .ant-collapse-expand-icon {
+        padding-inline-end: 0;
+      }
+
       .ant-collapse-header {
+        height: 0.5rem;
+        background: url('@/assets/TaskManage/viewOrder@2x.png') no-repeat center;
+        background-size: 30% 100%;
         justify-content: center;
         flex-direction: row-reverse;
         align-items: center;
-        margin-top: 10px;
+        margin-top: 0.1rem;
+        border-bottom: 0.02rem solid #1755ff;
 
         .ant-collapse-header-text {
-          font-size: 24px;
+          font-size: 0.3rem;
           flex: unset;
           margin-inline-end: unset;
         }
         .ant-collapse-arrow {
-          font-size: 24px;
+          font-size: 0.3rem;
         }
       }
+
+      .ant-collapse-content-box {
+        padding: 0;
+      }
+
+      .ant-collapse-item > .ant-collapse-content > .ant-collapse-content-box {
+        padding-block: 0;
+      }
     }
 
     .workOrderCard {
-      margin-bottom: 20px;
-      padding: 20px 10px;
-      border-radius: 8px;
-      background-color: #e5effa;
+      margin-bottom: 0.1rem;
+      padding: 0.2rem;
       display: flex;
       align-items: center;
+      background-color: rgba(23, 85, 255, 0.06);
 
       .leftInfo {
         width: 80%;
       }
 
-      .rightButton {
-        flex: auto;
-        color: #5697e4;
-        font-size: 24px;
-        text-align: center;
+      .rightButtonContainer {
+        width: 20%;
         display: flex;
-        justify-content: center;
+        flex-direction: column;
+        justify-content: space-between;
         align-items: center;
       }
+
+      .rightButton {
+        background-color: #fff;
+        border-radius: 0.5rem;
+        width: 1.5rem;
+        height: 0.5rem;
+        letter-spacing: 0.02rem;
+        color: rgba(23, 85, 255, 1);
+        font-size: 0.3rem;
+        text-align: center;
+      }
+    }
+
+    .workOrderCard:last-child {
+      margin-bottom: 0;
     }
   }
 }
 
 .topContainer {
-  // height: 120px;
+  // height: 1.2rem;
   .fixedTop {
     position: fixed;
     top: 0;
@@ -66,26 +110,80 @@
   }
 }
 
+.handleModal {
+  :global {
+    .ant-modal-close {
+      width: 0.36rem;
+      height: 0.36rem;
+    }
+    .ant-modal-close-x {
+      font-size: 0.36rem;
+      line-height: 0.36rem;
+    }
+    .ant-modal-title {
+      font-size: 0.28rem;
+    }
+    .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
+      height: 0.6rem;
+      padding-top: 0.15rem;
+    }
+    .ant-form-item .ant-form-item-label > label {
+      font-size: 0.28rem;
+      height: 0.6rem;
+    }
+    .ant-input {
+      font-size: 0.28rem;
+      height: 0.6rem;
+    }
+    .ant-btn {
+      font-size: 0.28rem;
+      height: 0.6rem;
+      width: 1.2rem;
+    }
+    .ant-checkbox {
+      .ant-checkbox-inner {
+        width: 0.28rem;
+        height: 0.28rem;
+      }
+      .ant-checkbox-inner:after {
+        height: 0.16rem;
+        width: 0.09rem;
+      }
+    }
+    .ant-picker {
+      height: 0.6rem;
+    }
+  }
+}
+
+.fontS32 {
+  font-size: 0.32rem;
+}
+
+.fontS30 {
+  font-size: 0.3rem;
+}
+
 .fontS28 {
-  font-size: 28px;
+  font-size: 0.28rem;
 }
 
 .fontS26 {
-  font-size: 26px;
+  font-size: 0.26rem;
 }
 
 .fontS24 {
-  font-size: 24px;
+  font-size: 0.24rem;
 }
 
 .fontS20 {
-  font-size: 20px;
+  font-size: 0.2rem;
 }
 
 .fontS18 {
-  font-size: 18px;
+  font-size: 0.18rem;
 }
 
 .fontS16 {
-  font-size: 16px;
+  font-size: 0.16rem;
 }

src/pages/Center/MyTask/index.js

@@ -2,7 +2,7 @@ import PageContent from '@/components/PageContent';
 import TabsContent from '@/components/TabsContent';
 import { MandateType, OrderType } from '@/pages/TaskManage/constent';
 import { getMandateList } from '@/services/TaskManage';
-import { RightOutlined } from '@ant-design/icons';
+import { CaretRightFilled } from '@ant-design/icons';
 import { connect, useLocation, useNavigate, useParams } from '@umijs/max';
 import { List, Spin } from 'antd';
 import { useEffect, useState } from 'react';
@@ -94,15 +94,15 @@ const MyTask = (props) => {
         }}
       >
         <List.Item.Meta
-          title={<span className={styles.fontS28}>{item.label}</span>}
+          title={<span className={styles.itemLabel}>{item.label}</span>}
         />
 
-        <div className={styles.itemCount}>
+        {/* <div className={styles.itemCount}>
           <div className={styles.countNumber}>{mandateCount[index]}</div>
-          <div className={styles.fontS22}>任务数量</div>
-        </div>
+          <div className={styles.counterText}>任务数量</div>
+        </div> */}
 
-        <RightOutlined />
+        <CaretRightFilled style={{ fontSize: '0.34rem', color: '#BCBABA' }} />
       </List.Item>
     );
   };
@@ -116,13 +116,9 @@ const MyTask = (props) => {
         }}
       >
         <List.Item.Meta
-          title={<span className={styles.fontS28}>{item.label}</span>}
+          title={<span className={styles.itemLabel}>{item.label}</span>}
         />
-        {/* <div className={styles.itemCount}>
-          <div className={styles.countNumber}>{mandateCount[index]}</div>
-          <div className={styles.fontS22}>任务数量</div>
-        </div> */}
-        <RightOutlined />
+        <CaretRightFilled style={{ fontSize: '0.3rem', color: '#BCBABA' }} />
       </List.Item>
     );
   };
@@ -137,32 +133,36 @@ const MyTask = (props) => {
             label: `我的任务`,
             key: '1',
             children: (
-              <Spin spinning={loading}>
-                <List
-                  className={styles.taskList}
-                  bordered
-                  itemLayout="horizontal"
-                  dataSource={MandateType}
-                  renderItem={makeTaskList}
-                  pagination={false}
-                />
-              </Spin>
+              <div className={styles.container}>
+                <Spin spinning={loading}>
+                  <List
+                    className={styles.taskList}
+                    bordered
+                    itemLayout="horizontal"
+                    dataSource={MandateType}
+                    renderItem={makeTaskList}
+                    pagination={false}
+                  />
+                </Spin>
+              </div>
             ),
           },
           {
             label: `我的工单`,
             key: '2',
             children: (
-              <Spin spinning={false}>
-                <List
-                  className={styles.taskList}
-                  bordered
-                  itemLayout="horizontal"
-                  dataSource={OrderType}
-                  renderItem={makeWorkOrderList}
-                  pagination={false}
-                />
-              </Spin>
+              <div className={styles.container}>
+                <Spin spinning={false}>
+                  <List
+                    className={styles.taskList}
+                    bordered
+                    itemLayout="horizontal"
+                    dataSource={OrderType}
+                    renderItem={makeWorkOrderList}
+                    pagination={false}
+                  />
+                </Spin>
+              </div>
             ),
           },
         ]}

src/pages/Center/MyTask/index.less

@@ -1,26 +1,51 @@
+.container {
+  padding: 0 0.5rem;
+  justify-content: center;
+}
+
 .taskList {
   border: none;
-  max-height: calc(100vh - 140px);
-  overflow-y: scroll;
+  max-height: calc(100vh - 1.4rem);
+  overflow-y: auto;
 
   .listItem {
-    margin: 20px 20px 20px 5px;
-    height: 120px;
-    box-shadow: 0 0 6px 3px rgba(0, 150, 255, 10%);
-    border-radius: 10px;
+    margin: 0.2rem 0.2rem 0.2rem 0.05rem;
+    height: 1.67rem;
+    // width: 6.81rem;
+    padding: 0 0.4rem 0 1rem;
+    box-shadow: 0.01rem 0.01rem 0.15rem 0rem rgba(0, 0, 0, 0.1);
+    border-top-left-radius: 0.3rem;
+    border-bottom-right-radius: 0.3rem;
     background-color: #ffffff;
 
+    .itemLabel {
+      font-size: 0.34rem;
+      color: #615d5d;
+      font-weight: 500;
+      letter-spacing: 0.05rem;
+      font-family: Source Han Sans, Source Han Sans;
+    }
+
     .itemCount {
       display: flex;
       flex-direction: column;
-      align-items: center;
-      margin-right: 30px;
+      align-items: flex-end;
+      margin-right: 0.8rem;
 
       .countNumber {
-        color: #f5a623;
-        font-size: 32px;
-        font-weight: 500;
-        margin-bottom: 6px;
+        color: #3b3b3b;
+        font-size: 0.8rem;
+        line-height: 0.8rem;
+        font-weight: 600;
+        letter-spacing: 0.05rem;
+        font-family: PangMenZhengDao-3, PangMenZhengDao-3;
+      }
+      .counterText {
+        font-size: 0.22rem;
+        color: #9b9797;
+        text-align: center;
+        font-family: Source Han Sans, Source Han Sans;
+        letter-spacing: 0.05rem;
       }
     }
   }
@@ -28,52 +53,52 @@
 
 .ant-select-clear {
   opacity: 1 !important;
-  margin-top: -12px !important;
-  width: 24px !important;
-  height: 24px !important;
-  font-size: 24px !important;
+  margin-top: -0.12rem !important;
+  width: 0.24rem !important;
+  height: 0.24rem !important;
+  font-size: 0.24rem !important;
   color: black !important;
 }
 
 .antdSelect .ant-select-selection-item,
 .antdSelect .ant-select-selection-placeholder,
 .ant-select-item-option-content {
-  font-size: 28px;
+  font-size: 0.28rem;
   color: black;
-  margin-right: 10px;
+  margin-right: 0.1rem;
 }
 .ant-select-item-option {
-  padding: 8px !important;
+  padding: 0.08rem !important;
 }
 .ant-select-arrow {
-  font-size: 24px !important;
+  font-size: 0.24rem !important;
   color: black !important;
 }
 
 .fontS28 {
-  font-size: 28px;
+  font-size: 0.28rem;
 }
 
 .fontS26 {
-  font-size: 26px;
+  font-size: 0.26rem;
 }
 
 .fontS24 {
-  font-size: 24px;
+  font-size: 0.24rem;
 }
 
 .fontS22 {
-  font-size: 22px;
+  font-size: 0.22rem;
 }
 
 .fontS20 {
-  font-size: 20px;
+  font-size: 0.2rem;
 }
 
 .fontS18 {
-  font-size: 18px;
+  font-size: 0.18rem;
 }
 
 .fontS16 {
-  font-size: 16px;
+  font-size: 0.16rem;
 }

src/pages/Center/index.js

@@ -52,7 +52,10 @@ const Center = () => {
             toMyTask(1);
           }}
         >
-          <img src={taskIcon} style={{ marginRight: '20px' }} />
+          <img
+            src={taskIcon}
+            style={{ marginRight: '0.2rem', width: '0.5rem' }}
+          />
           我的任务
         </div>
         <div
@@ -61,7 +64,10 @@ const Center = () => {
             toMyTask(2);
           }}
         >
-          <img src={orderIcon} style={{ marginRight: '20px' }} />
+          <img
+            src={orderIcon}
+            style={{ marginRight: '0.2rem', width: '0.5rem' }}
+          />
           我的工单
         </div>
       </div>

src/pages/Center/index.less

@@ -1,59 +1,59 @@
 .page {
   // margin: auto;
   width: 100%;
-  padding: 0 200px;
+  padding: 0 2rem;
   background-color: #ffffff;
 }
 .box {
   background: rgba(255, 255, 255);
-  box-shadow: 0px 0px 8px 4px rgba(212, 212, 212, 0.5);
-  border-radius: 20px;
+  box-shadow: 0rem 0rem 0.08rem 0.04rem rgba(212, 212, 212, 0.5);
+  border-radius: 0.2rem;
 }
 .head {
   .box;
   position: relative;
-  margin: 30px 0;
-  padding: 64px 76px;
+  margin: 0.3rem 0;
+  padding: 0.64rem 0.76rem;
   display: flex;
   .profile {
-    width: 150px;
-    height: 150px;
+    width: 1.5rem;
+    height: 1.5rem;
     background-image: url('@/assets/center/profile.png');
     background-size: 100%, 100%;
     background-repeat: no-repeat;
   }
   .textContent {
-    margin-left: 60px;
+    margin-left: 0.6rem;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
     .name {
-      font-size: 34px;
+      font-size: 0.34rem;
       font-family: PingFangSC, PingFang SC;
       font-weight: 400;
       color: #4a4a4a;
-      line-height: 48px;
+      line-height: 0.48rem;
     }
     .photo {
-      font-size: 28px;
+      font-size: 0.28rem;
       font-family: PingFangSC, PingFang SC;
       font-weight: 400;
       color: #4a4a4a;
-      line-height: 40px;
+      line-height: 0.4rem;
     }
   }
 }
 .center {
-  margin-bottom: 30px;
-  height: 150px;
+  margin-bottom: 0.3rem;
+  height: 1.5rem;
   display: flex;
   justify-content: space-between;
   .item {
     .box;
     width: 49%;
     text-align: center;
-    font-size: 32px;
-    line-height: 150px;
+    font-size: 0.32rem;
+    line-height: 1.5rem;
     font-family: PingFangSC, PingFang SC;
     font-weight: 400;
     color: #4a4a4a;
@@ -61,22 +61,22 @@
 }
 .bottomContent {
   .box;
-  padding: 10px 30px;
-  font-size: 32px;
+  padding: 0.1rem 0.3rem;
+  font-size: 0.32rem;
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   color: #4a4a4a;
   .lineItem {
-    height: 100px;
-    line-height: 100px;
-    border-bottom: 1px solid #d4d4d4;
+    height: 1rem;
+    line-height: 1rem;
+    border-bottom: 0.01rem solid #d4d4d4;
     .arr {
-      width: 28px;
-      height: 40px;
+      width: 0.28rem;
+      height: 0.4rem;
       background: url('@/assets/center/icon-arr.png') no-repeat center;
       background-size: 100% 100%;
       float: right;
-      margin-top: 30px;
+      margin-top: 0.3rem;
     }
   }
   .lineItem:last-child {
@@ -84,21 +84,21 @@
   }
 }
 .loginOut {
-  margin: 50px auto 0;
-  width: 329px;
-  height: 97px;
+  margin: 0.5rem auto 0;
+  width: 3.29rem;
+  height: 0.97rem;
   text-align: center;
   background: rgba(74, 144, 226);
-  border-radius: 49px;
-  font-size: 32px;
+  border-radius: 0.49rem;
+  font-size: 0.32rem;
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   color: #ffffff;
-  line-height: 97px;
+  line-height: 0.97rem;
 }
 .close {
   position: absolute;
-  top: 20px;
-  right: 20px;
-  font-size: 30px;
+  top: 0.2rem;
+  right: 0.2rem;
+  font-size: 0.3rem;
 }

src/pages/Controller/Device.js

@@ -34,7 +34,7 @@ function Hardware() {
 
     return `${styles.icon} ${statusClassName}`;
   });
-  const onHandleClick = item => {
+  const onHandleClick = (item) => {
     UnityAction.sendMsg('SingleDevLocate', JSON.stringify([item]));
   };
   useEffect(() => {
@@ -56,7 +56,7 @@ function Hardware() {
       {data?.list?.map((item) => (
         <div
           key={item.id}
-          className={`card-box ${styles.item}`}
+          className={`card-box ${styles.itemLong}`}
           style={{ justifyContent: 'space-between' }}
           onClick={() => onHandleClick(item)}
         >

src/pages/Controller/components/AirConditioner.js

@@ -2,10 +2,12 @@ import { queryIotList } from '@/services/controller';
 import { UnityAction } from '@/utils/utils';
 import { useParams, useRequest } from '@umijs/max';
 import { Spin } from 'antd';
+import { useEffect, useState } from 'react';
 import styles from '../index.less';
 
 const Work = (props) => {
   const { projectId } = useParams();
+  const [select, setSelect] = useState();
 
   const { data, loading } = useRequest(queryIotList, {
     defaultParams: [projectId],
@@ -20,36 +22,57 @@ const Work = (props) => {
     if (status == 3) return styles.error;
   };
 
+  const onHandleSelect = (item) => {
+    setSelect(item.id);
+    UnityAction.sendMsg('ACItem', String(item.id));
+  };
+
+  useEffect(() => {
+    UnityAction.addEventListener('ACItem', (id) => {
+      setSelect(id);
+    });
+
+    return () => UnityAction.off('ACItem');
+  }, []);
+
   return (
     <div>
-      <div className={`card-box ${styles.top}`}>
+      <div className={styles.top}>
         <div className={styles.left}>
           <img
             className={styles.img}
             src={require('@/assets/air-conditioner.png')}
           />
           <div>
-            <div className={styles.number}>{data?.pagination?.total}</div>
+            <div className="value-number">{data?.pagination?.total}</div>
             空调数量
           </div>
         </div>
         <div className={styles.right}>
-          <div className={styles.row}>
+          <div>
             <i className={styles.icon}></i> 在线：{data?.online_count}
           </div>
-          <div className={styles.row}>
+          <div>
             <i className={`${styles.icon} ${styles.offline}`}></i> 离线：
             {data?.offline_count}
           </div>
         </div>
       </div>
       <Spin spinning={loading}>
-        {data?.list?.map((item) => (
-          <div key={item.id} className={`card-box ${styles.item}`}>
-            <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>{' '}
-            {item.name}
-          </div>
-        ))}
+        <div className={styles.listContent}>
+          {data?.list?.map((item) => (
+            <div
+              key={item.id}
+              onClick={() => onHandleSelect(item)}
+              className={`card-box ${styles.item} ${
+                select == item.id ? 'card-select' : ''
+              }`}
+            >
+              <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>
+              {item.name}
+            </div>
+          ))}
+        </div>
       </Spin>
     </div>
   );

src/pages/Controller/components/Light.js

@@ -2,10 +2,12 @@ import { queryLightList } from '@/services/controller';
 import { UnityAction } from '@/utils/utils';
 import { useParams, useRequest } from '@umijs/max';
 import { Spin } from 'antd';
+import { useEffect, useState } from 'react';
 import styles from '../index.less';
 
 const Work = (props) => {
   const { projectId } = useParams();
+  const [select, setSelect] = useState();
 
   const { data, loading } = useRequest(queryLightList, {
     defaultParams: [projectId],
@@ -20,16 +22,29 @@ const Work = (props) => {
     if (status == 3) return styles.error;
   };
 
+  const onHandleSelect = (item) => {
+    setSelect(item.id);
+    UnityAction.sendMsg('lightItem', String(item.id));
+  };
+
+  useEffect(() => {
+    UnityAction.addEventListener('lightItem', (id) => {
+      setSelect(id);
+    });
+
+    return () => UnityAction.off('lightItem');
+  }, []);
+
   return (
     <div>
-      <div className={`card-box ${styles.top}`}>
+      <div className={styles.top}>
         <div className={styles.left}>
           <img
             className={styles.img}
             src={require('@/assets/air-conditioner.png')}
           />
           <div>
-            <div className={styles.number}>{data?.pagination?.total}</div>
+            <div className="value-number">{data?.pagination?.total}</div>
             照明数量
           </div>
         </div>
@@ -44,12 +59,20 @@ const Work = (props) => {
         </div>
       </div>
       <Spin spinning={loading}>
-        {data?.list?.map((item) => (
-          <div key={item.id} className={`card-box ${styles.item}`}>
-            <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>{' '}
-            {item.name}
-          </div>
-        ))}
+        <div className={styles.listContent}>
+          {data?.list?.map((item) => (
+            <div
+              key={item.id}
+              onClick={() => onHandleSelect(item)}
+              className={`card-box ${styles.item} ${
+                select == item.id ? 'card-select' : ''
+              }`}
+            >
+              <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>{' '}
+              {item.name}
+            </div>
+          ))}
+        </div>
       </Spin>
     </div>
   );

src/pages/Controller/index.js

@@ -12,22 +12,25 @@ const HardwareController = (props) => {
       <PageTitle>智能管控</PageTitle>
 
       <div
-        className={`card-box ${styles.item}`}
+        className={`card-box ${styles.itemLong}`}
         onClick={() => UnityAction.sendMsg('innerItem', 'scada')}
       >
         工艺监控
+        <div className={styles.arr}></div>
       </div>
       <div
-        className={`card-box ${styles.item}`}
+        className={`card-box ${styles.itemLong}`}
         onClick={() => UnityAction.sendMsg('innerItem', 'sensor')}
       >
         感知监控
+        <div className={styles.arr}></div>
       </div>
       <div
-        className={`card-box ${styles.item}`}
+        className={`card-box ${styles.itemLong}`}
         onClick={() => UnityAction.sendMsg('innerItem', 'locate')}
       >
         室内定位
+        <div className={styles.arr}></div>
       </div>
     </PageContent>
   );

src/pages/Controller/index.less

@@ -1,46 +1,70 @@
 .top {
   display: flex;
-  padding: 48px 60px 25px;
+  padding: 0.48rem 1.8rem 0.25rem 0;
+  font-family: Source Han Sans, Source Han Sans;
+  font-weight: 500;
+  color: #615d5d;
+  font-size: 0.32rem;
+  justify-content: space-around;
   .left {
-    width: 50%;
-    font-size: 28px;
+    // width: 50%;
     display: flex;
     align-items: center;
   }
   .img {
-    width: 152px;
-    margin-right: 45px;
-  }
-  .number {
-    font-size: 80px;
-    font-weight: bold;
-    margin-bottom: 10px;
-    color: #4A90E2;
+    width: 1.52rem;
+    margin-right: 0.45rem;
   }
   .right {
     display: flex;
+    align-items: flex-start;
     flex-direction: column;
     justify-content: space-around;
   }
-  .row {
-    font-size: 32px;
+}
+
+.listContent {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.itemLong {
+  padding: 0.6rem 0.4rem 0.6rem 1rem;
+  font-size: 0.34rem;
+  margin-top: 0.28rem;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-family: Source Han Sans, Source Han Sans;
+  color: #615d5d;
+  line-height: 0.34rem;
+  letter-spacing: 0.04rem;
+  box-shadow: 0.01rem 0.06rem 0.1rem 0rem rgba(0, 0, 0, 0.1);
+  .arr {
+    width: 0.14rem;
+    height: 0.22rem;
+    background: url('@/assets/arr-right2.png') no-repeat center;
+    background-size: 100% 100%;
   }
 }
 .item {
-  padding: 40px 60px;
-  
-  font-size: 32px;
-  margin-top: 28px;
+  padding: 0.4rem 0.6rem;
+  font-size: 0.32rem;
+  margin-top: 0.28rem;
   display: flex;
   align-items: center;
+  width: 48%;
+}
+.select {
+  border: 1px solid #66ccff;
 }
 .icon {
-  width: 20px;
-  height: 20px;
-  border-radius: 50%;
+  width: 0.2rem;
+  height: 0.2rem;
+  // border-radius: 50%;
   display: inline-block;
   background-color: #12ceb3;
-  margin-right: 44px;
+  margin-right: 0.44rem;
   vertical-align: middle;
   &.error {
     background-color: #fe5850;

src/pages/DeviceManager/detail.js

@@ -401,7 +401,7 @@ const SparePartDetail = () => {
   return (
     <PageContent closeable={false}>
       <PageTitle children={titles[type]} returnable />
-      <div className="content-title" style={{ marginTop: '10px' }}>
+      <div className="content-title" style={{ marginTop: '0.1rem' }}>
         {Number(type) !== PageType.warning && Number(type) !== PageType.base ? (
           <Table
             sticky={{ offsetHeader: 0 }}