Explorar el Código

Squashed commit of the following:
merge
commit bc4916bbb2c50bcc02a1468dc6992fc248e92ca9
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 15:12:37 2023 +0800

修改url

commit 04540d19c6cdd277570ff1d3c72e0d1678d915d3
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 15:06:47 2023 +0800

修改url

commit b633368b1438411d08ec3ed2c79ceb0df8caff8c
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 14:51:08 2023 +0800

Squashed commit of the following:
merge
commit 67c1c249be25266e723c85d0528c4a763faa9cd7
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 14:49:14 2023 +0800

修改路由

commit 15967b6a4cf9296166be9d7db40292a111b1b18d
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 14:25:48 2023 +0800

修改域名

commit ba0dd0d66eea0b451a292c64480cfa31ef2c2fa5
Author: Renxy <18510891294@163.com>
Date: Thu Dec 14 09:22:21 2023 +0800

Squashed commit of the following:
cad
commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
Author: Renxy <18510891294@163.com>
Date: Wed Dec 13 09:58:52 2023 +0800

上传图纸添加path字段

commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 17:34:30 2023 +0800

修改bug

commit 44539389d68a26a8e5484d403694d8d1ccd30093
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 17:02:44 2023 +0800

修改bug

commit b4798de286df4e15cd179483a1595282e48b468f
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 16:36:31 2023 +0800

修改cadbug

commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 14:13:24 2023 +0800

创建子审批

commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 17:16:32 2023 +0800

update

commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
Merge: b2ba74b 879f068
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 16:17:58 2023 +0800

Merge branch 'cad' into develop
解决冲突
# Conflicts:
# src/pages/Home/index.js

commit 879f068f14d5e4fa58cb677a86a7b27021247882
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 16:15:05 2023 +0800

修改cad修改antd前缀

commit a63c9413d969e359e621ff32ccb5246b0e574416
Author: Renxy <18510891294@163.com>
Date: Thu Dec 7 17:48:01 2023 +0800

cad审批

# Conflicts:
# src/pages/Cad/components/CreateChildrenModal.js
# src/pages/Cad/components/CreateModal.js

commit 8957b0fefd2d65de8b96e307bb7f8826fa9bef0a
Author: Renxy <18510891294@163.com>
Date: Wed Dec 13 09:58:52 2023 +0800

上传图纸添加path字段

commit 7ee0e51cbd578e252205b76f30dc99a08bd1b3d2
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 17:34:30 2023 +0800

修改bug

commit 44539389d68a26a8e5484d403694d8d1ccd30093
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 17:02:44 2023 +0800

修改bug

commit b4798de286df4e15cd179483a1595282e48b468f
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 16:36:31 2023 +0800

修改cadbug

commit 4851121dc2c2ccf4d409c19ec46ec768e6494a67
Author: Renxy <18510891294@163.com>
Date: Tue Dec 12 14:13:24 2023 +0800

创建子审批

commit b8e82187be7101126ec928b3c5fb6579faa8ee5e
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 17:16:32 2023 +0800

update

commit 7ac00c0961f3fe94597ce02eb58334ec227d0ecc
Merge: b2ba74b 879f068
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 16:17:58 2023 +0800

Merge branch 'cad' into develop
解决冲突
# Conflicts:
# src/pages/Home/index.js

commit 879f068f14d5e4fa58cb677a86a7b27021247882
Author: Renxy <18510891294@163.com>
Date: Mon Dec 11 16:15:05 2023 +0800

修改cad修改antd前缀

commit a63c9413d969e359e621ff32ccb5246b0e574416
Author: Renxy <18510891294@163.com>
Date: Thu Dec 7 17:48:01 2023 +0800

cad审批

# Conflicts:
# src/pages/Cad/detail.js
# src/pages/Cad/index.js

Renxy hace 1 año
padre
commit
a7e1da3f6d
Se han modificado 2 ficheros con 4 adiciones y 6 borrados
  1. 2 4
      src/pages/Cad/detail.js
  2. 2 2
      src/pages/Cad/index.js

+ 2 - 4
src/pages/Cad/detail.js

@@ -9,16 +9,14 @@ const CadDeTail = () => {
     state: { path },
   } = location;
 
-  console.log('-----path-------', path);
-
   useEffect(() => {
     const content = document.getElementById('container');
     ZwCloud2D.ZwEditor.ZwInit(content);
 
     ZwCloud2D.ZwDataProcessor.ZwSetConnectUrl(
-      'http://47.111.24.13:5121',
+      'https://cad.greentech.com.cn',
       'ws://47.111.24.13:5121',
-      'http://47.111.24.13:5121',
+      'https://cad.greentech.com.cn',
     );
     ZwCloud2D.ZwDataProcessor.ZwSetLoadDwg(path);
     ZwCloud2D.ZwDataProcessor.ZwLoad();

+ 2 - 2
src/pages/Cad/index.js

@@ -187,9 +187,9 @@ const CadDemo = () => {
 
   useEffect(() => {
     ZwCloud2D.ZwDataProcessor.ZwSetConnectUrl(
-      'http://47.111.24.13:5121', //47.111.24.13
+      'https://cad.greentech.com.cn', //47.111.24.13
       'ws://47.111.24.13:5121',
-      'http://47.111.24.13:5121',
+      'https://cad.greentech.com.cn',
     );
   }, []);