Inicio Explorar Axuda
Rexistro Iniciar sesión
xujunjie
/
WorkloadWeb
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Squashed commit of the following:
merge
commit fb15ff1a9133a283c9a56d8b9d7cc5c7c317dd8f
Merge: cab6b57 76ac234
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:19:55 2022 +0800

Merge branch 'develop' into develop_0715

commit cab6b575840ce3a5b656f8e2d447f73b27ed214b
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:16:32 2022 +0800

修改地址

commit 4ee0a55c32cb62c4579396b6c8b311ce6e7eda7c
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 18:11:54 2022 +0800

修改查看直接弹出flowDetail流程

commit 682b16f9a2ff4928ac3abda552e095f994bcef92
Author: Renxy <18510891294@163.com>
Date: Thu Jul 28 09:58:33 2022 +0800

Squashed commit of the following:

commit fd25edb40085ee41b7eb73a91ea331192429fae9
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:12:50 2022 +0800

Squashed commit of the following:
merge
commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

commit 4958d8b32176363b868850bec33d27584cee8884
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 18:08:42 2022 +0800

修改显示

commit be1b8de22e9fd2cdf65c951ad2fb82fccebac5a2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 16:00:30 2022 +0800

Squashed commit of the following:
merge
commit f5add5c6a7c64414a36e11a71ec58735bb6bd325
Merge: 616012a ea19888
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 15:58:37 2022 +0800

Merge branch 'develop_0715' into develop
merge
# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/TimeNode.js

commit 616012a58ec3688f03eeec30dab89d12655a5454
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:05:31 2022 +0800

Squashed commit of the following:
merge
commit 9c3cb6985ba730337971e8a8537730a4e5119ef2
Author: Renxy <18510891294@163.com>
Date: Wed Jul 27 10:04:01 2022 +0800

查询节点版本接口添加node_type字段

commit 307abe6678a74bfa0a0b44a861e1ca024aa22fb2
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 18:08:24 2022 +0800

修改bom最新需求

commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js

commit 87ec2751172f4ab98a2a92772cf01fb832573ed8
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:14:47 2022 +0800

Squashed commit of the following:
merge
commit 6e8a9215ce092ffcd22b75571d4d079b95c3ee60
Author: Renxy <18510891294@163.com>
Date: Tue Jul 26 16:13:37 2022 +0800

bom版本树/审批流程

commit 27239b95ee0f334468e94847879025590de843f8
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:22:22 2022 +0800

merge develop

commit 3db0c23a140a307d70f902b122b25b431f78cfe5
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:46:20 2022 +0800

项目列表审核列表 流程缺失 修复

commit 70e7740d3f6a9af481f65aa1c4c6d660db9c66b6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 16:04:38 2022 +0800

工时审核 创建人缺失 修复

commit 0e349e10278422433f7478593c2b4809e4538279
Merge: 86c7844 6bcae78
Author: Renxy <18510891294@163.com>
Date: Mon Jul 25 14:19:54 2022 +0800

Merge branch 'develop_0715' into develop
解决冲突
# Conflicts:
# src/pages/PurchaseAdmin/PurchaseList/Detail/FlowModal.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/HistoryDrawer.js
# src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

commit 86c7844828487be838e1795aa76932f56c91d2f6
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Mon Jul 25 11:38:29 2022 +0800

项目详情 研发项目隐藏多余信息

commit fe90240aa44690d51acd871a06bc16a3b49ec1f2
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 16:05:56 2022 +0800

浏览器缓存配置修改

commit 66bd343da7766fccef3b791d6acf84f0ebc1cfd2
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 16:00:44 2022 +0800

Squashed commit of the following:
merge devlop_0715
commit 6c38bc02e3ad84491745076a2f5abf2241bbd06f
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:57:38 2022 +0800

修改地址

commit d06b6ae6af266634f7f742559402069e4296d585
Author: Renxy <18510891294@163.com>
Date: Fri Jul 22 15:56:03 2022 +0800

修改查看流程/历史版本

commit 9fdd0969977a5a10205684cb66d4d27b8fcb5a39
Author: Renxy <18510891294@163.com>
Date: Wed Jul 20 20:18:38 2022 +0800

多节点审批/业务节点权限控制

commit b7c21ca5d7abd551ef8913defacd2b834f53a5d3
Author: Renxy <18510891294@163.com>
Date: Fri Jul 15 16:44:49 2022 +0800

添加业务节点权限配置

commit 6061f798d045f760116c2221e3d384583e667655
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 15:51:23 2022 +0800

chart改动

commit b6e60eae15a717f2938873ed4c1b9a90531fca3b
Merge: ccff8a2 12407a8
Author: xujunjie <645007605@qq.com>
Date: Fri Jul 22 11:42:09 2022 +0800

Merge branch 'feature/mobile' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into feature/mobile

commit 12407a809c15673c8f288d29d927efa324f80928
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:22:06 2022 +0800

样式调整

commit e007db195a6063090284c29162cb29136d7f09c2
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Fri Jul 22 10:19:57 2022 +0800

手机移动端图标页面样式

commit ccff8a230e6ac92a43c4a4b628f513f4c382f856
Author: xujunjie <645007605@qq.com>
Date: Thu Jul 21 14:06:51 2022 +0800

移动端引入xflow

commit 6869f837608fad6527f19d6e7d40d854fafd0015
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date: Wed Jul 20 18:24:58 2022 +0800

update

commit 591b702812ac84f54506bb8a0a5b0c121c5d7f49
Author: xujunjie <645007605@qq.com>
Date: Tue Jul 19 09:13:24 2022 +0800

创建文件

Renxy %!s(int64=2) %!d(string=hai) anos
pai
76ac2344e5
achega
be06c296d6
Modificáronse 1 ficheiros con 8 adicións e 8 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 8 8
      public/luckysheet.html

+ 8 - 8
public/luckysheet.html
Ver ficheiro 

@@ -8,20 +8,20 @@
 
   <title>Document</title>
 
 
   <!-- 线上发布使用路径 -->
 
-  <link rel="stylesheet" href="/bom/Luckysheet/plugins/css/pluginsCss.css" />
 
+  <!-- <link rel="stylesheet" href="/bom/Luckysheet/plugins/css/pluginsCss.css" />
 
   <link rel="stylesheet" href="/bom/Luckysheet/plugins/plugins.css" />
 
   <link rel="stylesheet" href="/bom/Luckysheet/css/luckysheet.css" />
 
   <link rel="stylesheet" href="/bom/Luckysheet/assets/iconfont/iconfont.css" />
 
   <script src="/bom/Luckysheet/plugins/js/plugin.js"></script>
 
-  <script src="/bom/Luckysheet/luckysheet.umd.js"></script>
 
+  <script src="/bom/Luckysheet/luckysheet.umd.js"></script> -->
 
 
   <!-- 本地开发使用路径 -->
 
-  <!-- <link rel='stylesheet' href='http://localhost:3000/plugins/css/pluginsCss.css' />
 
-   <link rel='stylesheet' href='http://localhost:3000/plugins/plugins.css' />
 
-   <link rel='stylesheet' href='http://localhost:3000/css/luckysheet.css' />
 
-   <link rel='stylesheet' href='http://localhost:3000/assets/iconfont/iconfont.css' />
 
-   <script src="http://localhost:3000/plugins/js/plugin.js"></script>
 
-   <script src="http://localhost:3000/luckysheet.umd.js"></script> -->
 
+  <link rel='stylesheet' href='http://localhost:3000/plugins/css/pluginsCss.css' />
 
+  <link rel='stylesheet' href='http://localhost:3000/plugins/plugins.css' />
 
+  <link rel='stylesheet' href='http://localhost:3000/css/luckysheet.css' />
 
+  <link rel='stylesheet' href='http://localhost:3000/assets/iconfont/iconfont.css' />
 
+  <script src="http://localhost:3000/plugins/js/plugin.js"></script>
 
+  <script src="http://localhost:3000/luckysheet.umd.js"></script>
 
 </head>
 
 
 <body>