diff --git a/.collaboration b/.collaboration index 85256c28..5e0fa851 100644 --- a/.collaboration +++ b/.collaboration @@ -9,47 +9,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577304+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577515+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577536+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -218,137 +188,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577653+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577692+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577719+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577749+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577768+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.857779+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.857781+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577827+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577859+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -389,17 +269,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8577895+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -676,17 +546,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T11:26:02.0183949+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目标题.json", - "Pages\\项目\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面", @@ -698,19 +558,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T10:48:11.7983945+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目工时", @@ -722,17 +570,7 @@ }, { "ModuleName": "PCPage/项目概况-关键数据", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T10:21:41.5354845+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况-关键数据.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况-关键数据.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", @@ -836,17 +674,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T11:27:57.3253535+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -862,19 +690,7 @@ }, { "ModuleName": "PCPage/任务-工时", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T10:58:33.6351373+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务-工时.rd", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.json", - "Pages\\94f8bae36aee4ae7aec2a063ca731b1.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-进展", @@ -1098,17 +914,7 @@ }, { "ModuleName": "MasterPCPage/FGC_母版页", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:20:21.3191786+08:00", - "ModuleType": 3, - "ToRemoveFiles": [ - "MasterPages\\FGC_母版页.json", - "MasterPages\\FGC_母版页.rd" - ] + "ModuleType": 3 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1648,19 +1454,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:19:26.5186111+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -1672,33 +1466,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.8580075+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\443d5833-c737-4769-9a2e-104182d6e821_新生成的图片.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\6f34b1f7-5fa5-40fd-8cd1-103a63ff37b9_新生成的图片.png", - "Upload\\8131abcf-935a-4aa7-b774-45523e96717c_新生成的图片.png", - "Upload\\86eb9c3b-133d-4cb0-ba1b-06aa7189f6b7_Animation - 1718097457056.json", - "Upload\\88aea4ae-f850-4b94-b2ca-4fb74595161c_新生成的图片.png", - "Upload\\897e9d75-6bb0-4d81-937d-af672e7c9c49_新生成的图片.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.medium.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.png", - "Upload\\ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.small.png", - "Upload\\d5185fbc-ff70-4662-9ab0-6dd3c736ff39_新生成的图片.png", - "Upload\\e8bc81ba-c90b-4bf3-82dd-1ca73c73d426_新生成的图片.png", - "Upload\\ec25d4da-d567-435d-ae65-6c2c5b062c1d_新生成的图片.png", - "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.png", - "Upload\\f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.small.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -2114,16 +1882,7 @@ }, { "ModuleName": "TableView/项目平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:48:17.857756+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\项目平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/任务成员视图", @@ -2131,16 +1890,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T10:45:58.6327779+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Pages/任务/任务类型管理", @@ -2324,17 +2074,7 @@ }, { "ModuleName": "UserControlPage/任务统计信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T10:37:59.0162149+08:00", - "ModuleType": 31, - "ToRemoveFiles": [ - "UserControlPages\\任务统计信息.json", - "UserControlPages\\任务统计信息.rd" - ] + "ModuleType": 31 }, { "ModuleName": "Image/下载.svg", @@ -2350,16 +2090,7 @@ }, { "ModuleName": "ServerCommand/生成项目封面", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:49:17.8222542+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\AI\\生成项目封面.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/测试回复JSON", @@ -2495,21 +2226,7 @@ }, { "ModuleName": "PCPage/TODO-FULL", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:14:52.0474783+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\TODO\\TODO-FULL.json", - "Pages\\TODO\\TODO-FULL.rd", - "Pages\\6746a656596b44bb908448c6ffc1502.json", - "Pages\\6746a656596b44bb908448c6ffc1502.rd", - "Pages\\c273b140d3b24036903f81cf5f56c0f.json", - "Pages\\c273b140d3b24036903f81cf5f56c0f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "UserControlPage/关键数据(图标)", @@ -2533,17 +2250,7 @@ }, { "ModuleName": "PCPage/设置时间", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:24:45.3879521+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\TODO\\设置时间.json", - "Pages\\TODO\\设置时间.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本详情", @@ -2559,22 +2266,10 @@ }, { "ModuleName": "ServerCommands/TODO", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:27:10.185339+08:00", "ModuleType": 20 }, { "ModuleName": "ServerCommand/取TODO数量", - "State": 3, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-26T09:27:30.0993738+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index b60457be..4078fda3 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json index 42140c2f..13c8a70f 100644 --- a/MasterPages/FGC_母版页.json +++ b/MasterPages/FGC_母版页.json @@ -158,7 +158,8 @@ }, "Formulas": { "6,0": "ODATA(\"ACT_RU_TASK_View/$count?$filter=类型 ne '抄送'\")", - "1,7": "ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(母版_当前用户),\"null\",\"'\"&母版_当前用户&\"'\")&\" and 完成 ne 1\")" + "1,7": "IFS(TODO数量=0,\"\",TODO数量<100,TODO数量,TODO数量>99,\"99+\")", + "6,2": "ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(母版_当前用户),\"null\",\"'\"&母版_当前用户&\"'\")&\" and 完成 ne 1\")" }, "AttachInfos": { "1,0": { @@ -1106,7 +1107,7 @@ "IsOpenInNewTab": true } ], - "ID": "aa83bcaa-4a18-457e-90e5-8f2d5f622e3c" + "ID": "aaacc036-bc51-43c6-9c62-99d0bb39ece8" }, { "CommandList": [ @@ -1127,12 +1128,12 @@ ] } ], - "ID": "084be8dd-5486-43c2-af7f-b45696269616" + "ID": "eb41c364-2009-4f40-bbbd-13bba9f3200a" } ] } ], - "ID": "83783262-db1f-4323-9289-fb0cfb53f6d1" + "ID": "d0928379-02ab-4492-8a65-8cc88d4ad7e0" }, { "Condition": { @@ -1182,7 +1183,7 @@ ] } ], - "ID": "3df7a797-7b44-444c-8615-a3840c3ef31a" + "ID": "b4698616-13da-4638-a7fa-bd0e042e3800" }, { "Condition": { @@ -1216,7 +1217,7 @@ ] } ], - "ID": "d05da404-ac8b-48e9-be5d-fb3f7d5e8f38" + "ID": "009253b2-56dc-4763-97a2-621b61e06611" }, { "Condition": { @@ -1252,7 +1253,7 @@ ] } ], - "ID": "2fbba576-62e9-4328-8e10-23b8e2f53e43" + "ID": "bf601108-d496-42c1-8fa0-d94c336ce2b7" }, { "Condition": { @@ -1287,17 +1288,17 @@ ] } ], - "ID": "566ddc48-ff84-4d1f-a271-b559af1ecf79" + "ID": "e98aed3c-9d72-4532-a274-8b5ccaeb8ced" } ] } ], - "ID": "6e138fa6-e0d4-415b-97fb-00ccb85069e1" + "ID": "8923104d-176b-4242-a19e-5d02697e515c" } ] } ], - "ID": "43911a4b-07b3-4f71-8c84-dc5f1ac8d93b" + "ID": "7ffe579e-5ce5-4516-ad22-61dd3f5dfa8b" } ] } @@ -1553,7 +1554,7 @@ "IsOpenInNewTab": true } ], - "ID": "e8fd761e-20f7-4bd6-a8a4-5767ef43677f" + "ID": "faf2f570-3100-4dda-b3db-682bf06954d1" }, { "CommandList": [ @@ -1574,12 +1575,12 @@ ] } ], - "ID": "9ea1eeda-5cfd-429b-924f-5b79978b75c5" + "ID": "49ad54c1-9519-4703-b440-2cf6706426d3" } ] } ], - "ID": "aebba06b-42c3-4572-9209-48b631669f6f" + "ID": "a706d6ed-26db-468e-8c81-9cb08a9eda04" }, { "Condition": { @@ -1629,7 +1630,7 @@ ] } ], - "ID": "f45b2f48-ae46-49c0-95b3-476872bb0749" + "ID": "c87a655a-ad81-4f91-8aba-0c7d8d4b88b7" }, { "Condition": { @@ -1663,7 +1664,7 @@ ] } ], - "ID": "c19b30b0-681a-476e-99ee-b13a1c93ac26" + "ID": "15f13d6f-9809-4b27-8f83-aa8880cd5f4a" }, { "Condition": { @@ -1699,7 +1700,7 @@ ] } ], - "ID": "a7d88b05-5b81-4205-80bb-d26c86b600c9" + "ID": "f3e3a6d8-e005-48aa-95be-fb03486aad5a" }, { "Condition": { @@ -1734,17 +1735,17 @@ ] } ], - "ID": "888a252f-8927-45d0-88cb-adca14054f74" + "ID": "61e50c9f-8f2d-40a7-9c2a-a03f543558b7" } ] } ], - "ID": "fe3d0307-b4d0-495c-8013-b55f611b1e5f" + "ID": "bd3ce79d-248f-4cc2-9d2f-d99a11933a81" } ] } ], - "ID": "a2e80706-3e84-4e4d-bab6-08e8f3fddf5b" + "ID": "d7912cd6-bd6a-4f5b-9b85-0bd745be4195" } ] } @@ -1756,7 +1757,7 @@ "Disabled": true } ], - "ID": "4ba7decc-828a-466c-a064-880958523078" + "ID": "1d6351e6-dbc9-4fe3-9d48-9e837de0040f" }, { "Condition": { @@ -1863,7 +1864,7 @@ "IsOpenInNewTab": true } ], - "ID": "034e5a4e-5f6a-4952-8542-05d1bd2f05eb" + "ID": "361ac1a5-8a56-485f-a8d2-b96aa6f99c70" }, { "CommandList": [ @@ -1884,12 +1885,12 @@ ] } ], - "ID": "3cd4e34a-ec9a-4b20-8515-a63ed0815e58" + "ID": "8b653ef8-34ea-409c-add8-ab0529d0c8a7" } ] } ], - "ID": "976061ad-f08f-44e3-be8d-cc88914944ac" + "ID": "265a59f0-ab42-47de-aa9f-176264c2f905" }, { "Condition": { @@ -1939,7 +1940,7 @@ ] } ], - "ID": "58bec0a6-8283-4127-9354-6da9f92cbbce" + "ID": "60b45293-a132-4cc9-a48a-47923ee63140" }, { "Condition": { @@ -1973,7 +1974,7 @@ ] } ], - "ID": "a2b11b4a-83b1-4448-9e60-2607838e6464" + "ID": "257fc73f-975e-4b4d-aa4b-08a4dd8af4d7" }, { "Condition": { @@ -2009,7 +2010,7 @@ ] } ], - "ID": "8c4ce1b1-5224-4a51-839f-a5d15b15d7fd" + "ID": "9dbaeadd-f22d-4fdc-8627-0387d65d6a62" }, { "Condition": { @@ -2044,17 +2045,17 @@ ] } ], - "ID": "5fa8579f-edc6-4150-ad28-7b52703b68b9" + "ID": "241a27e7-6c53-4773-93b0-feddbb35ae74" } ] } ], - "ID": "40aa70c7-c3bf-42b4-a917-b85d3e199d19" + "ID": "28be6c49-3a92-4c3d-b4d8-b42246143bf0" } ] } ], - "ID": "ef2d4f84-ebf1-46d1-afba-17d9a283e001" + "ID": "d2496ad9-a00a-4897-9913-e6e25478ada7" } ] } @@ -2311,7 +2312,7 @@ "IsOpenInNewTab": true } ], - "ID": "3fa7f881-7c9a-40f3-b40f-78d457d85232" + "ID": "a7a48be7-9126-44bc-bc4c-a34bb31745db" }, { "CommandList": [ @@ -2332,12 +2333,12 @@ ] } ], - "ID": "04c60534-a6f3-4dd8-8269-d271cb0e6bdd" + "ID": "e2318d92-70bb-4457-952f-c1af915e0d9c" } ] } ], - "ID": "3215578f-50df-4c22-bcdb-55a06154fc3c" + "ID": "00851ff0-d435-4d91-9f3f-e0a8546b9bcb" }, { "Condition": { @@ -2387,7 +2388,7 @@ ] } ], - "ID": "5bffc432-b9f6-41a7-ac0c-d1cb1c4e8f7a" + "ID": "28b37ee9-8e4e-4087-b253-f626072dff5b" }, { "Condition": { @@ -2421,7 +2422,7 @@ ] } ], - "ID": "60822d68-a0fe-480d-b0aa-f3353572f222" + "ID": "a45a38b2-e52c-4684-b2a5-5c4215743332" }, { "Condition": { @@ -2457,7 +2458,7 @@ ] } ], - "ID": "2cb840ae-5775-4c73-af3f-d849768fa5f5" + "ID": "79ed9572-5ad4-4fc5-8a03-c0361054f176" }, { "Condition": { @@ -2492,17 +2493,17 @@ ] } ], - "ID": "ff63ca8f-1576-4e50-a221-6c13bbe05c7c" + "ID": "d63bdc22-ced4-464e-802a-3fd5a15f20ed" } ] } ], - "ID": "8a4918c9-72d5-48cf-bc4b-9d95e497bed7" + "ID": "b9e76f33-3d01-476f-ba76-ac1c71fba94a" } ] } ], - "ID": "8c1c8194-768e-41d7-995b-54b822f3bbbc" + "ID": "479278e1-0731-43ec-8b24-b51c2ca11189" } ] } @@ -2514,7 +2515,7 @@ "Disabled": true } ], - "ID": "07b11a7b-5fd8-44f0-8e68-b90bd22cb558" + "ID": "d0d70988-716b-4429-9416-150e0f7e1601" }, { "Condition": { @@ -2621,7 +2622,7 @@ "IsOpenInNewTab": true } ], - "ID": "570c9424-fd27-4e74-8008-57d323583522" + "ID": "ad488c50-a9c1-48bf-8762-e147d73cc5fb" }, { "CommandList": [ @@ -2642,12 +2643,12 @@ ] } ], - "ID": "bbdb57f3-0287-4be7-b04f-f3bc3b82d32f" + "ID": "588d6b99-763c-4bc7-abb8-994f5b626aa4" } ] } ], - "ID": "61c3f4a0-0e96-4968-b04a-420a4adec719" + "ID": "5247b0b1-5a24-4772-b29a-b1dac992619e" }, { "Condition": { @@ -2697,7 +2698,7 @@ ] } ], - "ID": "c31f8610-7a2d-484c-b4e9-2499d07e7ede" + "ID": "e5abaa0f-546a-4596-95aa-5814b470769f" }, { "Condition": { @@ -2731,7 +2732,7 @@ ] } ], - "ID": "b0fe5f75-6857-4165-95dc-d7ae62d0d073" + "ID": "614bf1b6-6c76-4ed7-a02b-660ec24790d6" }, { "Condition": { @@ -2767,7 +2768,7 @@ ] } ], - "ID": "f7579db4-fb9d-4781-a443-6057291624f8" + "ID": "2ed52f09-b530-4887-a086-58a8939a820a" }, { "Condition": { @@ -2802,17 +2803,17 @@ ] } ], - "ID": "201fc328-98b5-4032-80b9-d0325251844b" + "ID": "b7bf76e0-5ead-4790-abed-695232ca8d02" } ] } ], - "ID": "b0a5ecc7-155c-4775-a96e-db3f7d922221" + "ID": "e71f7900-787d-4718-94b0-fe56f257711e" } ] } ], - "ID": "b49531ec-faf2-4ad4-9c3d-91b51a936283" + "ID": "7c33301d-f882-48ae-aa5d-c53e363dae97" } ] } @@ -3069,7 +3070,7 @@ "IsOpenInNewTab": true } ], - "ID": "0871c45a-964d-48e4-9c8b-658c5616f585" + "ID": "a7c214fd-16a8-4987-8621-537452034321" }, { "CommandList": [ @@ -3090,12 +3091,12 @@ ] } ], - "ID": "ee738eb8-3a38-4506-8f85-b68295fd5a05" + "ID": "1874d424-28e2-462d-a236-793f00366983" } ] } ], - "ID": "17668714-a635-473c-bc36-1cac600672e0" + "ID": "2618a304-276c-4af8-aee8-6d3ccb7c13f5" }, { "Condition": { @@ -3145,7 +3146,7 @@ ] } ], - "ID": "448cabbd-14a3-4e4b-9725-7cb00e135a91" + "ID": "657a304e-d008-4ade-b730-68abc878f0a6" }, { "Condition": { @@ -3179,7 +3180,7 @@ ] } ], - "ID": "58fb5090-590d-42ab-80fb-6bac2dfafe4a" + "ID": "16263be6-30a3-435b-ab94-87dbda1f6919" }, { "Condition": { @@ -3215,7 +3216,7 @@ ] } ], - "ID": "89e5128d-2f6c-4f7c-99ca-64207389d402" + "ID": "8b57da85-18ac-4290-b609-d58e79f9a63f" }, { "Condition": { @@ -3250,17 +3251,17 @@ ] } ], - "ID": "68179cc0-1bef-438a-83ae-be30df2999df" + "ID": "21228604-6f06-4341-a594-95bb65a861c6" } ] } ], - "ID": "5de39cf8-3711-4034-85ad-579d90e01025" + "ID": "d620f479-33da-44a0-8160-f85edf030e09" } ] } ], - "ID": "fbf2effd-a318-4bd3-8692-7cb09ddb2a6e" + "ID": "37897511-f257-466f-955f-6da411b759b0" } ] } @@ -3272,7 +3273,7 @@ "Disabled": true } ], - "ID": "894ab013-1200-4c20-86ff-818348b02765" + "ID": "c690f7d1-5456-4f41-8e47-577194a610d4" }, { "Condition": { @@ -3379,7 +3380,7 @@ "IsOpenInNewTab": true } ], - "ID": "efaa19e6-26aa-4bf4-880c-1f69fbd1952b" + "ID": "6c0f9552-d0c5-4336-b8e9-bfefa220a3f2" }, { "CommandList": [ @@ -3400,12 +3401,12 @@ ] } ], - "ID": "500450ad-1629-4903-be97-50c498833f57" + "ID": "0a87e13b-3ead-4dbf-9e62-28db19feceff" } ] } ], - "ID": "1fb4c37c-04ae-4b3e-b3d4-daca7716fc45" + "ID": "72b4ccf4-ca6a-42ef-8425-daabf68f9556" }, { "Condition": { @@ -3455,7 +3456,7 @@ ] } ], - "ID": "3989427a-ffbc-4fd3-a62d-a2e7c8640f4b" + "ID": "3b34d567-5eaa-4ff7-9b6c-723192b71b83" }, { "Condition": { @@ -3489,7 +3490,7 @@ ] } ], - "ID": "d297e420-b4d4-4688-bc00-ac01edfdf0cf" + "ID": "070c3b6a-cdc2-4dd4-9b45-cf26d05025ae" }, { "Condition": { @@ -3525,7 +3526,7 @@ ] } ], - "ID": "046bf8a1-63f7-4f9f-9b0b-1cdf6302ae34" + "ID": "c9878cf1-3ff6-4b3b-b332-22811c5a7c9b" }, { "Condition": { @@ -3560,17 +3561,17 @@ ] } ], - "ID": "cf7da190-1a98-4269-bac2-affa49995287" + "ID": "f2d32116-4795-4458-8840-be85574845c0" } ] } ], - "ID": "4e75d43d-e42b-45b1-a660-f906e5b02018" + "ID": "c93e66ab-1e3c-404a-8d4f-9ee66ba1919c" } ] } ], - "ID": "75f98672-d869-4c1d-ad52-2576854290d1" + "ID": "2dd1317b-b794-4ccf-8211-a658b9280c88" } ] } @@ -3827,7 +3828,7 @@ "IsOpenInNewTab": true } ], - "ID": "ba33fb82-d408-4348-afbd-a362e8b332ed" + "ID": "7ecf1a33-29d1-4b6e-a5f2-e6fd189c3078" }, { "CommandList": [ @@ -3848,12 +3849,12 @@ ] } ], - "ID": "a2c51013-dd77-485c-9434-d0695a3741dc" + "ID": "bb0e2b46-ac15-4543-b9fc-eca60dd6b403" } ] } ], - "ID": "246370c2-424c-410a-9947-078c04c567ce" + "ID": "12ca2360-34b4-4e56-9399-d91354b60903" }, { "Condition": { @@ -3903,7 +3904,7 @@ ] } ], - "ID": "d73a6f8b-5e48-4076-8719-a47ab0df352b" + "ID": "79b44dd8-9825-4a29-8a2d-791cdd33f110" }, { "Condition": { @@ -3937,7 +3938,7 @@ ] } ], - "ID": "699edaa6-866d-4ea5-9ee7-f87764b8a86d" + "ID": "dca841a7-d5d2-4c79-8a16-5bb4a558ecd3" }, { "Condition": { @@ -3973,7 +3974,7 @@ ] } ], - "ID": "e835e179-7e0a-4470-a713-b3bbd9596e77" + "ID": "40ab3479-23ce-4fdb-b515-987bc387f32a" }, { "Condition": { @@ -4008,17 +4009,17 @@ ] } ], - "ID": "2ad00181-cac4-4c6e-aa19-12478b4b656a" + "ID": "833a6035-57ed-4d4f-a194-65209c692957" } ] } ], - "ID": "abaf61f4-be3e-4cd6-a157-f0c7d9e76d42" + "ID": "b7deee22-fbae-46b8-81b0-0550104b1231" } ] } ], - "ID": "0ce2ab94-5517-4838-a4da-cf98c7d88f4c" + "ID": "1d3af8ed-2a64-47f7-8aa5-b720007b7b25" } ] } @@ -4030,12 +4031,12 @@ "Disabled": true } ], - "ID": "587a84bb-6bd6-4b31-9b16-3cde37749728" + "ID": "7447cfd9-4809-47ea-b4a1-75b34030706f" } ] } ], - "ID": "1708db9c-c2df-45be-a253-d81362bf0428" + "ID": "e4943edd-53d1-4824-8e69-3788b1f746c8" }, { "Condition": { @@ -4118,12 +4119,12 @@ } } ], - "ID": "01c1596d-1726-47fc-b9fe-fd795cffae15" + "ID": "831d5467-8479-432b-ac37-2769c6dbe1e3" } ] } ], - "ID": "7dbcf494-6487-4708-a893-296b0df6d1c2" + "ID": "4edb6dd5-5739-4dc7-a152-7ffcecff0844" } ] } @@ -4204,6 +4205,10 @@ { "Name": "当前版本号", "Formula": "FGC_母版页!$B$2" + }, + { + "Name": "TODO数量", + "Formula": "FGC_母版页!$C$7" } ] -}//8++eZizAhL4e8h4n+nwk13kAdm0ItTFBLsLmYBdqFOJW8+ApouBOkPhkxeuf4HcFkfr/4orTHI1VraNg3ODY/oSMhzu22ViHJs61n/5aFOlDODU1sy/j2TSOx4HGw0qRbW/iwccX7C9iszKjmHWjjCsJJTcPRtfTfGXOirbIx9qH+oOl/xOVgFG1uDIXIxcLIjcbpi89MQFy9vFvhbbfbo1GT15OIutk52GQD6A1gl0MPTo06VQLWKIWWbLLqG4bkLTFpsebeFzeLkXgq/i+BfiLr3InzC0XrubDSrCj1Peuuj0JSVsbqiPhJlM9ihU/yZ7hhGOChkY46OVmoMslCd1VAoxq0xsVlau16XvgJmPOiEhLiO8Ohsz1rGoDd1Frp7CLA6Q9aAIEI8s1J+oK0L4Gicm/x88Toe3YPfvxvn8mBXlAh0kP14f5YSA20EBsJVKdJvhvPR+fFXkaTi9msjrk0le3cojFNZDasojzcIBQlwPLh+giBRdOmutc2XE4KXwxoXZv949SaZ7v44HN+kepYkqMZ3tj+Zp/L+QsE2k3ykPAo4ZQwzRFmcOKCnEQ+8sE+9tTQ2xf5MvT6R74SPs85Is9cWF1EAFRk/f/RP1QLh5FaDmgNbXfVjlzgou6vi4OmXjnM56gwHDV1HYuUu5zqRoh0S4KjpslWOjjFjalTrd3VyPl4joT/Xf30/pGbKbooqL1yi2JX6ZBE3gP0ZOVHqDVNQUDMKSaXx4nq07GpZJ43yfE5EpHYELuMZk0EZ9EUXo10WkebitTC45EGXBkmxu+vfQnKpJsyAmBulgdgyhYD/8vm77UWSDhFRebsXEIj/8ZWEA2au6jn2gwNz7lZ77KU2XPgfR1rCLBD2mahChYtcaA8gaLMD1hyZAuB22cpu6N+jKSHzG9u6lCsw==|920 \ No newline at end of file +}//pHHTX8V/IMJGwhPbnhLuZMbxzA/gTsPnYVtJSXn56nzX4cnt2ri/gbkww9SpbUqQT2KnxaNnzCnRSECiOOXlaNCMRmwTSXQijksTGuRYQs6pabUN+h9p3Niv22Q56det4+WpQvsqSFpCCs2I8t6dHxYLXqMjv2BxMjZIbDWtEgMaxurS8heNr4NSv0Uwtm07mUzgdjjLs2pRdM3F5NBxbyiPwAiUd04HEseGKIiGFWFQ2bNU2XA2xJTwd7ZcuaD2Zr754n/2EvWhLLSv4DYFCpbjyskgVO6qEPx0DeCKOgGvFSyeRgd95VNjEHmf5FaBiujrLPt9tyqu9izY/9mr/GfGkms0Mw6DI+u84zuJM2IsilYAH5W0/SfanNc/ImzdNSt+NIm5oEJJ7HWpCj/9rvM7tpXtMnxRjsdbQo2D7gM+UaXQsQJeMjVS19UqEu7kklrEkpZDPEI264d0aBlI/32VDBxMSTm+lnO9R38/3Urrm+XgdYu+OIyBVFx2DruC3W8M7lJ9LWZBV9IVkSA2krF5LjC1ToqojMCv3kjWiLOAJwcryDd+gUi3qv6s7TfqtKWAJ+Yi+O58AjPzJApmRc0EorQUkPjOUT8yCr/E0WlT3Xk5HW2c47UGk3tqT2Vu16gyx5NN1nzzobejj3M8t9yRw4TuPvDk8Q46eh/i0Tvlr4jovLjCzgcaZPjMU64RrYsgUUc3LkDXTPaqKQmIsD/g8TNq23v5TAPL7AKDK3VpdUEzsCIAE5wMlV7fj4yQXQPm60S8sjwLbiPV9ZGOkRpPdVBhVHiuyCciFCT5JDAP2IJm293vphDpMKoh49p2/HHQ9IlZfdVfgu9H14PFW+v4XIfkODW2Cd/9RNXJbG0RyQHo5loexfnsjGR9wbeg+CptbhGDRYcE6HnYv7J6Kg==|920 \ No newline at end of file diff --git a/MasterPages/FGC_母版页.rd b/MasterPages/FGC_母版页.rd index 2a737777..0a97d501 100644 --- a/MasterPages/FGC_母版页.rd +++ b/MasterPages/FGC_母版页.rd @@ -4,7 +4,8 @@ "RowCount": 7, "Formulas": { "6,0": "ODATA(\"ACT_RU_TASK_View/$count?$filter=类型 ne '抄送'\")", - "1,7": "ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(母版_当前用户),\"null\",\"'\"&母版_当前用户&\"'\")&\" and 完成 ne 1\")" + "1,7": "IFS(TODO数量=0,\"\",TODO数量<100,TODO数量,TODO数量>99,\"99+\")", + "6,2": "ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(母版_当前用户),\"null\",\"'\"&母版_当前用户&\"'\")&\" and 完成 ne 1\")" }, "CustomNames": [ { @@ -22,6 +23,10 @@ { "Name": "当前版本号", "Formula": "FGC_母版页!$B$2" + }, + { + "Name": "TODO数量", + "Formula": "FGC_母版页!$C$7" } ] } \ No newline at end of file diff --git a/Pages/6746a656596b44bb908448c6ffc1502.json b/Pages/6746a656596b44bb908448c6ffc1502.json index 6147ce76..57723bd0 100644 --- a/Pages/6746a656596b44bb908448c6ffc1502.json +++ b/Pages/6746a656596b44bb908448c6ffc1502.json @@ -115,7 +115,7 @@ ] } ], - "ID": "9e22c057-55b7-43ae-9994-14b3f94e944c" + "ID": "720cffa3-f5f1-4706-aeba-6d4fb5c65d91" } ] } @@ -166,7 +166,7 @@ ] } ], - "ID": "af1c9a16-d2c5-4fb5-bf31-c2bfb36e44c6" + "ID": "b353c7f3-4d7f-4cde-87da-cfdd028621ae" } ] } @@ -248,7 +248,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "b1f05492-a152-42df-9c31-7660e748e6e4" + "ID": "43d449fb-45ae-4b07-97fd-6ef31345d520" }, { "Condition": { @@ -280,7 +280,7 @@ ] } ], - "ID": "4639f4af-f31b-4554-8d48-59c8f0aa923d" + "ID": "8996423b-c198-4d3d-adbd-566658156ded" }, { "Condition": { @@ -312,12 +312,12 @@ "MethodName": "ExecuteCommand" } ], - "ID": "f8b51393-2092-4cbb-a582-12e8846d93ab" + "ID": "5213302b-5fba-4397-ba30-da7bff81ba13" } ] } ], - "ID": "3c916062-369a-48a7-93fc-a9c6824cce6f" + "ID": "4a51b915-96c5-4059-9681-06f9e7a5dbb3" } ] } @@ -434,4 +434,4 @@ "PaperSize": {}, "Margin": {} } -}//X9Ti4ZIGxGakE6PqW2a6/6Mi1BD0T7ezo/QI5xou6liuAUZjvrLwqjZ/8gkwLZcOdHwBCc7XJWelArf3HMnRI/upga4EgD/jCzUHCl6CNIngCxEd00Fi/EjICwjYw1ODevSJblnNGYSncILAgkKlS+3ZKbxqHlIDLWm2RIIgtRKNO0xT8JiSg82tZjZnfVODeRSDw+aPMiFd4rqPT96GaXzBCcMILwGLo0yHoC/CXg94j9u1mjP20+Megb0Zj962GgRtWYk2RCbzSPpT9nSU6dq9FNe3JkxYwf307/qlYyvONLXcK5QzaoIUGpj6H3yG8lNx9X4XSmRgDDV5h8ndY4JUHAKRggghP3MVr5PjDZn83ZmPkkX6gFDUSRzk47jhWQ7j6P0nQCRodEfHLob1cGrBvO1P29aecXPaKIUcPQ255vhKBT+m+dqJlLTj7XRapQghQtIu1G4x3pMg2q6epv3xGO2YSVcRsn+J7mjWRh8VPy9MgEZGGX+kkNyIrFdw1OLbmC7xnJr/j2DC4ODxR/3R2OCOIWtUKojvk8BFETlvH7ZbiFYKBmzdxhFnlK1RobCANUJtY9B5C3lpCIIe1+XK6NF3bEgDkLiRT4/m1J3xHQYF4Ez/bngdxqJ/bXhLKTp8qifESsWMrlYtQdHNVrgBXMbLiWlK5Ib6y4CFfjPy2hc0gH7Q0g+d1kwsHQ9Ns5OhrLUgr+Dbt9X/IGIhru1bXxffsqnflB+lUdmdngoMbuAJmIEcdwi0E/Riwa/XTQsC1YUH31EeY5xMvDN6C18FzHjFwxqA+tL8QPrkDwagD4KtXTdtmY7vJBcYqp6HnCnTPQEORdS3k5M1+5QVE1IWNe4L2D97ZPyss2CLEHIbFH2aLZkN6L8JMKAUIiyOB/D582ES2Ouev/ws2br2tw==|920 \ No newline at end of file +}//M9RvBKLrtl7b+v9jZNuEBQ2LqjtOfFE1Z2loZTROroKBhDrBxdgF8TzbGSuqYrORS7+xk2muNYbGTWPNBdEgvTq5Xwq3JFCIwgyOJsR8FdImJrEZ2EH94rjcKLTNZfo/G5JInJi0s0bNbDnG7jhApvGEQAtEn/BE7i6Z0kyEHbiwsa/yRCiif5rCFr/0YzIUSAQUV6WRGAEuXvL5HTB6qHku0f8ySj0qTBH7WnRWTxF2exftGZpc+S5+N/OWVh2mTw4x16yKrIws3H6s773cGhqYKLSp7uDpqZtuis1JAQqs2e1kGpT/g9bh1BJYUIUVNXHSFqiBu4hLv8Cezms6izkvkSPC0ytWDmkUWT7nZC20Gh/G775sPpET8eqp537X/Ekoc+dsC7NfT5S1ccAuWAxacrwtYyfvV7Qgf5wsoDinbPVrh+4G7c3k47HIss5wdpDEPr6M5MhoJvMSGkQuwYMyPW6a0Q8oKM/X6Bw4qoBtrA+G31TcEdbJfhMgMW2RTies/2wAgutQVNRHT8P3Yfh4u2pCQlBf343ypuqJVKDnUf0P26BNNRhtEd0rvWTHH5LWzCqeW41u7Jhlt65qH2ylQDMl+OlrNb4/NlY8BmKf3R7zCwtMPU2Jz3KTj4JheZ028LcKTeuaEOyzs/VtsNTurvKCccknDaywZZ61cTPKBREs1mQmdGPK2euYLaeYhv37c/agakSqJo0OH3ECKU3dSOrL1pGwdRO44irSNvhF0zNFHbFQ0yFf0So5LOD2YTiukuOQs2SasJGeyFew3VWlopvNwT4mU8+msbym5x1oRRviFudDwMnyqfBJ3hMl6om0RUvpUG2ZWeUcCriaW53DIdmYCYiu9Pzedf1SWpcNPpXYwKr2iOAs4cJOGjEOdSWrXYtHny97M9W6wx5Z/A==|920 \ No newline at end of file diff --git a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json index 8307342d..47319d18 100644 --- a/Pages/94f8bae36aee4ae7aec2a063ca731b1.json +++ b/Pages/94f8bae36aee4ae7aec2a063ca731b1.json @@ -145,7 +145,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "e9eb5424-46ee-4386-8c3e-bbacac963fc9" + "ID": "467a9037-3731-425f-830b-e12f039309df" }, { "CommandList": [ @@ -174,7 +174,7 @@ "ConfirmText": "您确定要删除吗？" } ], - "ID": "90f6866a-8868-4a9f-b74b-c41e0e2669a7" + "ID": "9af337a5-a015-46fd-9efa-fe846a7fc91c" }, { "CommandList": [ @@ -184,17 +184,17 @@ "Message": "该报工已请款，无法删除" } ], - "ID": "151abdd5-07b3-4835-9bd5-1ac9ec6f2924" + "ID": "93448722-1c18-4368-ab73-5c3f9b3946e0" } ] } ], - "ID": "3f759ecb-e2b8-4da9-ad45-cc740c472762" + "ID": "85edc3c9-90e0-454d-8a21-1e9e5b9bcf7a" } ] } ], - "ID": "462b7730-cb49-4f2b-8e2a-29a397fee9c1" + "ID": "d3348302-9a7c-43c2-ac71-43a254e89139" } ] } @@ -262,4 +262,4 @@ "PaperSize": {}, "Margin": {} } -}//Dbr5kFtdQN0vodI8Z+qOvl8g3A4HX9ScivXZnJiOvAlvISd7bngrG5PocRRlzRvLCdAyRfDiq7CNstwGXBTQAsU72k4scV+y9zS7MNa9Zgi6izWSwV2OgrSQl3xAiwJgcNkXWeaTYa9jOY8Xd+JYRA1fVYcvjHyzMIiAu2vHFY1mJDhrbCWfoIwufaHJRR0Nq/5LX+k0imhK7qExU5JRwh2IK78/hyGSujVG/oGD4a43fcoQcF/PGlC0eSHtzQOOhzRAXjn6aQOYtAzbMCHlHpkGCmiY0umbSUatEuUM/dUDQ60siGhcnbmPe/H2rLHD7e5ILjki2n1PcehTNIvetuc2hy6/ja9VICwU5Upq30vkCH48U+KdnJRB9+3sSZ5meGQAUMQjEZsjKbZiASWWV5vMfP2RlrBiNOS9wZF1S5IXiwFf8VQHVcLgBNrAOiDizVTGTOkdAfhRZjmInP/QsjYokT6VDqPLw5KQk7SZY2rYtH0QdVvyXf8z/8EoqjDyWxqcROqx8gStVYHYh2a3Jy7tfV39pHUif4bvFouJK9lvFrcsh1BflLpYZGyrM436K53ju0cya5YzxghRwzkOXXVqBxUc9Wrgam5mv8+sbbMJPFBycxiz///GJUPTlDjmy0U+9Y0K/TPQt4JC+Ns0NKW4boILxoUZWBP/wKGKj2uBQoMz2YFqfxUOrPN12gMho24DPLPLcEXW56MUN7GTDOZp5XcwxQ44U4NgcwlVSs8Pw9zturLAtZuRea2ttESg7xw4j2yAXNgLX01ZbstfWeudoeZQ6yvQOLDvE6sx9YGJyOv+wBYtaHay+KDMZOpGzsqwyRC+rj5BC7OYbqJTtfyOLmt4+D9EfswX2rXOUfLIDyPusbCclilVm7rl1hYudL4F5CcQkg/V+S+l6ciMfQ==|920 \ No newline at end of file +}//Af283opIP4RPq8jhmUNOnY+w5X/xew7jOgxSoxLNV7UFVPLnFTInpV49XzBN+LWBIWks/aikF8otLCxsouc1lJcjk+4/Xzb8FV1VK/jOySFnUXe8+QQCak3W/+UYK++Uh3fQvvqVHLVbhUznexpJ7IddBzxRoVg3/eyYDwP73arwpuliip9wLqhk0IHPqHINcvdtDnJUIf4kVd0CPMEgE0uqbfF1wCuLPSPysFvvZsHQlho05rPWdFQb21p450c1DjgOQGgu2uV2+YQw5JOyIqJBmM4aN/Ux2d1e+ZE9cMT/l/VZUn2QMT1yatVCylddLXNR0NrncknlXYJvPjdSwTOS61uvekN9aOivCxmCbKQBddRDeqwbUo8UwYahpOLkKX0Ag8L+zLoE5vp8Qh5O/n1Z451us5J3cEuf/CQmByhASmbcDLdxQenZZl766YPKWoFmbYBSfdcUDfa/PQmqEwERNaMh1PSPrsAnfpncvul2fGOuXHtqaaSiDFxmiPhYUDBRNDB5C+vLScziY9RVSY7oMiQcrAWzNoXBQfPj9V979PIV0RVkcOxOaJnF2fW1XGlYEPaNNYv9IlPlH88KBVxJGM1A+4Fos+rT09nSDC1tX0ugWbi6u3ggR8iEvgqzm24gLc/ckMy/LTU7B2zSRjCfdcb6fDk8QtDb8OqBJtFHLUd6ke9iMqLX4IbYuwZRoypxfdMZHUGVvybbIqj0OfHknghxD+J7wOs3+4erL4UI+mLIL6ds5aMWVli4J92GiWEYeO7K19mBZuFLDa5BuXd1GTD8LTUCPTU+3VOKznxtGuPIVVCfqqmp7lBuF/RoIGH5zqf3FheAxru8pS0YDIM8yOsfoA20DvVR4Fy+isNpHZRpo7l62WlQFXGEyA0k8QKtbrkL16fiDZ0Y2nKd4g==|920 \ No newline at end of file diff --git a/Pages/TODO/TODO-FULL.json b/Pages/TODO/TODO-FULL.json index 71027020..dfdd694f 100644 --- a/Pages/TODO/TODO-FULL.json +++ b/Pages/TODO/TODO-FULL.json @@ -233,7 +233,7 @@ }, "28": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "29": { @@ -242,12 +242,17 @@ } }, "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } } }, - "Count": 31, + "Count": 32, "DefaultSize": 32.0 }, "Values": { @@ -621,6 +626,19 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "='TODO-FULL'!筛选日期" } + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "TODO", + "ColumnName": "内容", + "GUID": "944dec4e-1d43-4ba2-8e36-3f4280695fc9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='TODO-FULL'!B2" + } } ] }, @@ -798,9 +816,9 @@ "4350b42c-00f4-4684-a74f-51bb5a63012b" ] }, - "10,28": { + "10,29": { "CellType": { - "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", @@ -865,11 +883,14 @@ "Message": "提交成功" } ], - "ToolTip": "提交", - "Size": 24, - "ImagePath": "Application/121_send_1.svg", - "BuiltIn": true, - "UseCellForeColor": true + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/121_send_1.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 18.0 }, "RulesGuidList": [ "8766d157-3d69-42f9-af85-b01211b7dc46" @@ -978,7 +999,7 @@ "Text 1 50", "Body", "Center", - "Accent 1 0", + "Background 1 0", "black", "Background 2 0" ], @@ -1015,6 +1036,7 @@ "2,28": 4, "2,29": 4, "2,30": 4, + "2,31": 4, "3,6": 3, "3,7": 3, "3,8": 3, @@ -1034,7 +1056,7 @@ "8,10": 0, "9,10": 0, "10,10": 0, - "10,28": 7, + "10,29": 7, "11,10": 0, "12,2": 3, "12,10": 0, @@ -1073,21 +1095,21 @@ "3,6,2,4", "1,1,1,9", "6,1,1,9", - "1,19,1,11", + "1,19,1,12", "3,10,2,1", - "4,12,5,18", + "4,12,5,19", "1,12,1,6", "10,10,1,1", "13,1,1,3", "10,12,1,16", - "10,28,1,2", "13,4,1,3", "14,1,1,2", "12,3,1,4", "8,1,3,9", "14,4,1,3", "14,7,1,3", - "13,12,1,3" + "13,12,1,3", + "10,29,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1188,4 +1210,4 @@ "Formula": "'TODO-FULL'!$M$14" } ] -}//HQaLCvBj01gtIzw5YfEvjsa/jiJRpp4u3tnFvaqmX+Lnl8GIfYQlN9a5HB92KyHuR8fKVSZ/JV5V+TfXsawjFU0y6Ks8Gei/75C0tPXwLtBaq7nhshXKRZMHCsAuVnweZHmNeM4dy3pmAVcHfZmiYVkOQ1xmluYjvvNz6Qc5uo8Zk5gMqyccxpIMmtzyzo88nq5me0TJ0RQUfxM25FWq8Y5T6zya/SJYgIgWFQxumsW3gMoczxn20EgH31AoVN1xrNJfuQ6zTAxoDhGJf3kYkXoIMkUiuoMbicl+gtReeEj5Kbhu6qQlJ566aq8QViISkWk3JeP6pd0agQaghduTy0hzyyZY5ElI0wLGH6DAS8kEkOWfDb8YD2fx36PGIpaZDLhTOu1JUePm8Tf6f3Q7yUVr+LEOJzKIwSkNXDn6YwZ6Jw/Ka8JvZu6HTQfF9I/nnv/ia4Rpdca+DfY5yzEcBDO2jwxKWVUP8R2wZMtuUdMZbTgiLcDpUeq1xpDazQcLXXA7GKAObsJZynu5nM3xhp6JHre4JKKLczh367S1Kote1u72/4x9nxX0qK07v16wnrypUQep4WJjyds3PO6/a8zhJrcsxOBoCuhjeDHi6w94zbnhOxi61xTebObQa9KbY78sQjIaLbUfok4W2d1HMNfJkRlIcj2G4UWoHuzs1URLeySIedpqnQ+k5lzJWAuSchBG3M6rJUJpaWDnXtJwr82FbglkIjbSdrYbtfhRiJ4WPH4NfnM3vyqyUWpIuUhEsDD02i0Z2whnUbSXDl4pgwPYSkn4oZCh4MuXcczPi/wMmEGwUHsn0LF6SYWOy985wFqrb3tWCdWAH/1jMDdHSDFx/bfhdqECo6h8JwecoYbWRCb5sLj4qjA+lHaw1++HOc3BZBNglaTd41a8PmvMqw==|920 \ No newline at end of file +}//qp9DsFP4laPqinyPwsNIXNVSCIRyudp2HcDH+UzOVuL+VVQVTJHBwpxDvyS56IKiCoUTPkEnmG2lH8veLY9cUuiutdqbnqq9ztH/W00TRYpWAxMpeUp1iFGGyp5eEAPP4kXdd7arbBCVPcL8ziKly3MbNAvruyt7gk5+WZRF9+n43qzqP+I6g2/eyNRJ90BsBeofZ7b3nKnuMPpvFejtn4ixuo7wXj0jkx3pWmCME08eHTZXjBdu+6FemjPPtfCI1E5spJyo1uJu1ZdXHvWRtP2uadCf2AC4VF35C/ATlGopy4jU3ucfMfxeRGAaJvCIyeAxHii7XI4/yTaEEyWDLjR3D4jon4tBQ8cN3NeLlp4WZubXrGbNK8Ju711b1hP+JDvxa9ChtXoxgzBWA3tTu2oCThQkPE5kKHkA43ADWBvBOhvHY+ORyKKsAlhuyrydOa9piXybWuIg4nTXhOL6Ls65zF8S9U84Bz2u54oOEeqW+KXWQvSREg5tkIdDMVOoaD0LJIv2j8r9V3knlJtVHtc8Y/qbTR8/KU+RtLQpUHho5bx/GdGODt9P001YibFXpzX3nf0ykPaH0aN4EesRRxPArdjr/xsu08sTA9ATAUJb0wjya3M3wFDPWKXnRUDziezi8Wfcx6BLqVSqzo0pnvRuhObJcjc2eIrvVuiHJomtQuz3vKTWic8gmEXUQbrH3zaPbhiHXJsrqMLKdX9bWEXX3ilTXvAOI+mqOWeDvo33kRgUylmB/vG6xRdnuIJOLinntL+/T8neMbISae0a6VhBZugNZxUfsqRTwvl7pCU2xwIQ4yEjUPoGKehihlSuF1TLhLicX/rQcmgNDojezzgt5mbthUX4Yup+cxXI60sjryQm05SMGL7q9s5TCy5+JZJRjz3JAy6qqwpmhRxOBQ==|920 \ No newline at end of file diff --git a/Pages/TODO/TODO-FULL.rd b/Pages/TODO/TODO-FULL.rd index 319cdaa2..44a30a79 100644 --- a/Pages/TODO/TODO-FULL.rd +++ b/Pages/TODO/TODO-FULL.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 31, + "ColumnCount": 32, "RowCount": 15, "Formulas": { "13,4": "IFERROR(ODATA(\"TODO/$count?$filter=用户 eq \"&IF(ISBLANK(当前用户),\"null\",\"'\"&当前用户&\"'\")&\" and 完成 eq 1\"),0)", diff --git a/Pages/TODO/设置时间.json b/Pages/TODO/设置时间.json index 5797b310..1f36d16a 100644 --- a/Pages/TODO/设置时间.json +++ b/Pages/TODO/设置时间.json @@ -13,12 +13,12 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "4": { @@ -28,7 +28,7 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 35.0 } }, "6": { @@ -86,21 +86,6 @@ "DesignLengthInPixel": 32.0 } }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -115,9 +100,24 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, - "Count": 11, + "Count": 14, "DefaultSize": 32.0 }, "Values": { @@ -181,12 +181,12 @@ ] } ], - "ID": "2e3b88b8-28b4-47ba-8614-428e25c2fb0a" + "ID": "a352c644-db7f-4af6-b659-cf650cdc44da" } ] } ], - "ID": "cca6b56c-804f-48aa-8612-cf0165d1f0b8" + "ID": "8e8d03da-50fc-48df-af32-6e1650805c9b" } ] } @@ -211,7 +211,7 @@ ] } ], - "type": "date", + "type": "datetime", "startPlaceholder": "开始日期", "rangeSeparator": "至", "endPlaceholder": "结束日期", @@ -317,9 +317,9 @@ } }, "Spans": [ - "2,1,1,9", - "7,1,1,9", - "5,1,1,9", + "2,1,1,12", + "7,1,1,12", + "5,1,1,12", "9,1,1,3" ], "PageInfo": { @@ -351,4 +351,4 @@ "Formula": "设置时间!$B$10" } ] -}//xNfFIyOX5TKrHm5XxxIfHyTqG5vTRyJ5aYGpUYwAunemYJ9q+QhVcCELJWxhu6qKjrfOiSDysGc3zB86SQvuRHnahDzyWIBfj0wLcMKvdwhG0Fqj7JjWZ/EvfMNQ8Ho4UZFzdisJwbPn0D8D0o2MQeijWNcz7t4WS1S0mgf/4kZyeIxE9TJIjaK4qxwtWK4AF48LGB+UmTZnXmil2wUdNrck349tLojrhpuxbt6jMc2qn3ATaHPQYibXKNthqqFkVZtIrInGFA8byJBnpB1QXNbabt0+lWLnPYCNfY4L2I9kZP2du49iPEKW80ZkWFAaoAv5L8GSCHvlUFGMaRn9jCJbJO958xIOYrJhlQf8GgqLnwk6sPKU3TmMYyCA2sYLOja4h0aAvFBwihOXDg9tyT/+huEcVxn9XLVrooqYdTqOwBU7NJlnY3HSlJLeV9q72nwuBJnJWEcAxILqSFcSXwGWjPOZM1XMsm/WRmn4q+oNh/+sRrMkLLeKrwieKIQuNPcIKtZ5bgTeaMWD6VhMnSVN7Y1u+74xJ+A4eCHtilx56SWR8T7V380jeqW9tPWn/LMM0D0CvfPltTwsQMmMXFPvTtYo0cnuSjYF7jS+QQhHzWsrG9Ldvm2OUBmtsQnf8q+QCBSsKtfuPESUFRD4YBoFkG3SpO1JUjSZc7ReVMTj/YjVjGrvDxbX7bHVi+wXnky+wFUNzLKuL4Pe5BUxy8RtK7rwzPzCE/savEXZnEYlOwSDEHSDK3buQexqX176dq5BL4s3mHWR+eaPlSZAMDRoPww1laPB1ZTlWKmNv++Nt1mjAYyth/QqinIs9hr3CqCdSoFsFPynY7CFWMtT7jnixnjoLzuTZapUtMk/y4d7ZFOzFez46TEQVK0Od+1hyw6e04r5x9Q4E459am6qDA==|920 \ No newline at end of file +}//R1h6jFmm5hJQVLAJZ1p1FWedwon90aWgUnalanm+UcJGmV+GNWzRSVP8pw75VnvGTggRr0IkEPPGqgPrYFQaUW5oNdEdSQq31/EH70uFfd3z+EYU7sNcDoYinTzIpoM/AynFzJMf4EiQptK8SDX7tcbd4IKlbJByWBuGC3o4rmDTtt9SDYVVq4/1svuz8x9sjg0FC0ZNTJzptHBtOwSTH+3P2tW0IAj81Jz03nWpKj17lxi1tio/5ze3AAKPRtp34GUNpxRcrsF2qngw0zlBpCttfK0QG9y9uKxkJM98OX9ZcV/CYrusTLzf7HrnS2kWx+SGGzzDxft8JjE+zYdM1ahyPrd0nTIJqjkS/ifIaWkRE1Ov7arUMczpot3wv1IdldZQ6ecVVwmwHuXwYx9N3l6h3IkT/ZcV4OKL3gSR674kCLKGq7EygnpotC6LLvAS7O68qj/RZ3YMle3Ys6El7k9NfOI6a0f2OkesXrDYNV8x1zO4bowLWGS+e8GGb4EupGYLn9w7W3wOjnnITA1NKpLgjI2pn5hLUYZ83Q7N7SBwKF4nlIL4Qyk+IP+WbO4vnmujHmpoKCYfjUKtTstGHraJAEzZcdn54a2o7R1HWI/ZWnApdZ/5vRAREbWZECbqeCjYI8dUyBmviS4S47k6V54mlHMqsw1YI0r8iWBFPcAxrxILlRmvMLJjLewkZ4X2wcAHteS8VdhzgDlI/a/nyTIXTU+Gw6kUsT722pRGMYQT2iWhlJ6qXjns47wE2vsIaBFV0rLEokGXcMfT9oqd3ssOPkiDRuOIw93sZg3FjIHGfX+hDw0xo6eAl1XLhM21nJ4Z3Ot5ZM9gJh4bCWMepWRP3deh3sO36RiCK1Wx0nwNiYMsB4T1ghTz+wt1XwQcLJI2jfx1sxbXez/lOjPhIw==|920 \ No newline at end of file diff --git a/Pages/TODO/设置时间.rd b/Pages/TODO/设置时间.rd index 0f7c93d0..fca2df6e 100644 --- a/Pages/TODO/设置时间.rd +++ b/Pages/TODO/设置时间.rd @@ -1,6 +1,6 @@ { "PageType": 0, - "ColumnCount": 11, + "ColumnCount": 14, "RowCount": 10, "CustomNames": [ { diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index effd1ba1..6257f344 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -155,7 +155,7 @@ ] } ], - "ID": "97462546-890a-4e07-b32a-1ff4b62208af" + "ID": "6525f5f3-1976-442e-8ee5-2e2b6f80ec1e" } ] } @@ -229,7 +229,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "ac2d2b13-7401-4be4-a634-3ba0c2efdb71" + "ID": "95934175-3b08-4457-95f3-df8eb511a256" }, { "Condition": { @@ -259,7 +259,7 @@ "Message": "复制成功" } ], - "ID": "3eead184-460b-40f7-85ef-2a2f8269a695" + "ID": "ff755b5d-5727-407b-88e6-f6a98d5d151a" }, { "Condition": { @@ -336,7 +336,7 @@ "Message": "操作成功" } ], - "ID": "4ddec243-aa0b-44ca-b71a-2d0c9d5d40f1" + "ID": "f6050abc-1ca7-4703-8bcf-56c89e2e1561" }, { "CommandList": [ @@ -351,17 +351,17 @@ "BtnText": "知道了" } ], - "ID": "67674224-ad36-4868-bde0-c01ed7fb9edd" + "ID": "2706da8f-13a6-4834-94ed-f573536f4b85" } ] } ], - "ID": "2e0451b0-9167-486c-b999-3319b191599f" + "ID": "d05065ca-d802-4b06-a02f-020ea0dff2ba" } ] } ], - "ID": "d0e47e42-61ec-48a2-8c8c-0a43c1bd8058" + "ID": "e3b08bba-4285-4d01-9d2e-c6a171d08a4f" } ] } @@ -456,4 +456,4 @@ "Size": "24,24" } ] -}//ehZpETvXTg3OZ7SlQ1P1pwFJTQPrrU0O5TxDbB6KCHsi81IKqoiQA0SeL9UkgnlkHB6rVw2wQptSddKmMSWeXPzLa1uGwPkOemw2mllEHvb884PQSvPOif0FdfCy9Wx13+vxAQwDMiFootqcLUy0ItJI1AD900+OTXqMK2I6eb+MbdE4b8xf/hpst8UfxHRX5IxnTYyAmWAv9S8tYkN3PoCiaFZEwv5H751cV550sZyHrjKVZFKJ2NRo+X8TsqZ3qW8RvF0lhPksSjXZ/qtVVNPKq/w4UPbcACPMeGwVYIla0oN/BYrsnI84m+SzL12TRjxWn63U0NrP5Mlu5pn/Lnqt82HdVBubjU/TJhrrEvTgLfOSVzJkssyVmkl3eqku+HrMgg86ko/ItOwax+T1xgQUfNVKPNEIvEsarXilUuNZA51ng9oXiDtR94j9h21lwnU7sA7ycmpfPeGvSu34ZL6cAv7xDVGlrDLiXkIPWXwRGsVy82XeTGyogPnwIZhjhA8uLCbdECaDfwkI5xd7fZF7W55FuHwTtR53f09evWcRZbuO+cpeT59D79lI5uWtpzlfh2XT763aTqDwAf5MlnxI8jk2OykWQ5398+s/N8XApUM0RpK4yu1Z3I5KLR2laoXBh2R4HZ7iKwKcJNaNCVRY8Dy9R1Ak6SOcN6luOef2uKHJgFR8gWBvuHZUcjxgIbhJxGfY9Tuu6gc2tJ1LtWLhFMF/DfDHjGD+cL3tCNClmyNB+7HZnon7FQlFTq30Ggb475F4+T/AKNoYcTQfHmLMGL7fUooAoMNyXA3VP/YtbiEtLd6y0qKnJzc4uCI3f6J0sYHLQ5dEDmEvT9ZFmyoAj71mCLZVeytT+ibKPD/pr+c9+Hg+FJAOPgEC2mpAVYYGc1QmrPQyfVKc08296Q==|920 \ No newline at end of file +}//SIR4o/fV35vwuGO/oH2ZcPgXxGcLX1KUbJoeTlJV8OWNldBjeFX4oECobwbI/ZrMJiDb5cZtO7/E27UV7+mw5YFqPHWIsIRBnP3iKCam6yjyNNul0Sc46KREujar3hBP1pcsvzrYnZ969C0n0mfFzkRMhpBJie5bOGGJn9Prtr94zj3INeRl98S1GU0a87c5NjfM9RRIhNGhbwVDGJy2cQh7323tl5CzwepOonM/h4bJg49FB5qE14Y30JLxHRlRbVyl7sZ2P93o9gboEBxwbbhtQVTuSIqqPbtrItEvh3zCZ55MLwmWmhZ5JevlFcNnuSDYL+Ayo9jY8Zwm93E0cxe+gHv3zMDyrf4i18DcytxutFJlHEalrkI4sznqO+4bKHeSpFIT2YYJ2IQBSSqX9ILIVdeJ/f1TIwHOx8V6iunYbr+GnKtkSp+RWv1VaKIin1d1GJrKOnpjR4oJxlEXai9+RSUMBCMSFJNCC/A6MGe+2k4IEMIuyjAlfOL8d71lsPBqx8HKk9+e+vdfD2IeSqY8weuUEQCcx2HHWF+s0PuBYkfw7QDQoDWXzjavfcwbvWc1F/DatTMGkuQ2l1wBYu1lFKL8ECfpYBSqeFQ2fXa6WUA2mvFJWLapAA7vcADNfTyRpICbjYIpYniMMWYMm0UxATMKR20bEVAqIjghXaAJdXvGN4RLJFbVsw1hGKdFfmfuYq6bJ+nmuMFuYinzFGhSPtGtfcgcXfOjiFGq7pVVc4ygHg8opbvYEF8LXzJqMUY6H3wW3U0W+RHSyWsSpE0seaux/E/aD0pgXdiB9xXeO8EYavkp1fn0bE3tHcNtq8lxKE0hG0t6cVWkrOlELgGAZwYNb0Z6/zumiNlWgblfwLcj3iv/BA6+dYxfZEo8rNUXaZYsfe/+ZRlXPW9vTA==|920 \ No newline at end of file diff --git a/Pages/c273b140d3b24036903f81cf5f56c0f.json b/Pages/c273b140d3b24036903f81cf5f56c0f.json index 0a60d683..8edda22d 100644 --- a/Pages/c273b140d3b24036903f81cf5f56c0f.json +++ b/Pages/c273b140d3b24036903f81cf5f56c0f.json @@ -6,16 +6,16 @@ "DesignLengthInPixel": 12.0 } }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 12.0 - } - }, "1": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 12.0 + } + }, "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 @@ -35,6 +35,11 @@ "DesignLengthInPixel": 12.0 } }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, "2": { "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 @@ -52,16 +57,6 @@ } } }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 12.0 - } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 - } - }, "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 36.0 @@ -71,6 +66,11 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0 } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 12.0 + } } }, "Count": 7, @@ -187,7 +187,7 @@ } } ], - "ID": "88aa5d9c-06c7-4ad6-b79c-b3a6581695f4" + "ID": "4beed9af-0aa4-49b3-97e7-8a9af97c7f84" }, { "Condition": { @@ -241,12 +241,12 @@ } } ], - "ID": "197be595-40fb-4899-9d4a-5a72c032fe97" + "ID": "9596a74b-9454-430f-97f3-9df4338b5a74" } ] } ], - "ID": "dc2d3e06-9e33-4aa5-ba63-f4e3ef129a1b" + "ID": "a6335d4f-136f-4602-a3e4-4d4ec742bddb" } ] } @@ -350,4 +350,4 @@ "PaperSize": {}, "Margin": {} } -}//Xq2WIKP/oSnK6cZPKhA387br3VeUa8xjBZXMZt8wuupZkskQIR7b8/3P9B1r/yDrixdpG3vYX6Yk+JHdmM26PjX4YvGp5jyn/FTrUxldj+XZ29x4JTagvuB8/C2KVmZ5xTT3ekBL8vygg3lVnecoB1mJlDocVLPd0xHVWAa/uizo2sCBfPjqdK3H9KWP/0HE6wamu0axYdCoq7LIn7mT3tjwf7vczrfXP8i/IMmt9Esktc1WD/sB3L/bGWItRdDJNQf/yMPZ5VZbqV+x60RTpfZHuy3Hz5Zu6FrJI6lUKxCxChPdemte+tAWd9OEvoPHOlh1OsaL2Xockge6GVfiLeSZAwIsGzXF/fF0kHl/buMaY58uQZhhqtg8GsL3mJ8xbi3+qR3R/48A3LeFg9UahlCYWfvv7fIrMfTEqp9xuH7k091BLz66m2fvn1936CkBktRCxutYSQ8+f50rBz7zu4rSmePKpFk6QkNTldz0eY92IH/Gzmj/WMpcmJ6xpF7TWX0SROpqcTV9zpr0We3sj2xGUwThW0u54Vioc9oiAvolT9jNl4LFkwpR9h7vobiLhZDF/J9j6kZTqQ1lO4PR5xnWBWB/lwhmvbO5O2mwchPJwnRS9b2B+Lpk9t9XiqdVyepXI1eB3FkgAXSLNv4M+JSKWliLu6jiKMT0BU+OQRA/PqwCB3EsFJhTrurqxKYrDlIUyT9gol98f1uWh1vw16WeriwQpTvI2yvqA1KgttM+Ji8pEWEFqzXM8+tTLZpJbGCRc+EfkOKvcmjFyqDjVK6dpQ85foe8q7HfjZQPSP4exnc13d5kX/em1aVEiwqW28QOen/2ZPBO7FaLIkWBkSLUkKOs2vZQ9o4eYFL3w2JbLOmERy0YZem/8qi5RNrKb/FVeITqOP9CLcee19GCDA==|920 \ No newline at end of file +}//Hfa5Jp39CWC7Gentku+b+ksJ4FdEJAAKiS53y0mqjoVuqKvW9UnpgIuATF2xmQVlPhtVEjFLAesmCR9k7HtOs4w44YXvalWASNcAlqDAZLP9Bgww2kz/txAQlc213p/9QL0NA8NnKB9ssm57NuTm/ZNYTEqSA3942eWNTjcNuneVYZujNzGoxBhAkp10kB9j0mUeGCN+MaruaM++d3UxvqlcPcd/jAW/LQ1F1WyEnI63pgAlXgvEFwOOpFQu0Hf4idp5HOT4q85/RHcyslmh6aprQrzVGHCNuJOYD4YURye8rqa4qsznSlVK22c3XU2VQLRn2IndrqBfqeF78Eu74p+PKi0JQCc8waSAOlqNc4gjcZ5li0SaxTr89pFCDD9Dl2Z6rBvw8mTbJc9N5+R027YQ8BQXzX6/H3ZA7ysh9Vk8Az/WiGEjhneqJYLT5kBB1aGm2C8devQGwJ9Pzue8iOLBZ1mg4JBn2Nr6k4+fPV6KI5P9EkNgUrSyzyaATTjnWrK1tjTTiIJQGfw2ha4GIs52eN2Z+gVByHvITItnd6wty7LyeWWZzAhjWoDlHaLt14yiHJjqXnBmnIh/36LAYKG6tXHyaY4nCrylZMk1j5bnZaIMzbIubUXGeEGx4Vaktc6Ww5X2mmzSLIalezhaMfjTr8lkbxHVIXsNzjCphgpKOSYt/ZpmmUz1a6ZYPE/dRvmLLTmGEq83xg0P2Z9nb5coyKBwFNsNcdR1O1+iUEIz/X/Dm1LBg0Qz+hGjRCxrJcuymJtjtq6LUggMWXg3lv113TliEtUJgSNwu3gsI3/bJS6+wNqZ2KZmMgT5ScYQbN69EUcJDF70HX/R8nq7XyFiL7EyJqTtO0kkYNOEjemENamQIc2yiWw9NUQGac3eGJBt3rqdbj2nXR1k9TpArw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.json b/Pages/项目/项目首页/项目标题.json index 6723d78b..6989cc31 100644 --- a/Pages/项目/项目首页/项目标题.json +++ b/Pages/项目/项目首页/项目标题.json @@ -83,15 +83,25 @@ "DesignLengthInPixel": 22.0 } }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 29.0 + } + }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 513.0, - "Mode": 1 + "DesignLengthInPixel": 10.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 28.0, + "DesignLengthInPixel": 159.0, + "Mode": 1 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 455.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -101,14 +111,16 @@ } } }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 91.0 - } - }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 28.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "13": { @@ -128,23 +140,28 @@ }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 10.0 } }, - "8": { + "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 29.0 + "DesignLengthInPixel": 91.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 } } }, - "Count": 17, + "Count": 19, "DefaultSize": 10.0 }, "Values": { "1,5": "加载中...", - "1,11": "进行中", - "1,13": "刷新", - "1,15": "菜单" + "1,13": "进行中", + "1,15": "刷新", + "1,17": "菜单" }, "AttachInfos": { "1,1": { @@ -245,7 +262,7 @@ ] } ], - "ID": "a9ac9164-8dfa-4e10-81d2-7bd88f873dc2" + "ID": "825bda65-f164-487f-8106-070287bc76be" } ] } @@ -282,7 +299,72 @@ "UseCellForeColor": true } }, - "1,11": { + "1,10": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "工时分配方式", + "GUID": "7cf1f9c5-7493-4578-b99b-6eae9e41c2e5", + "RelationBinding": { + "RelatedTable": "工时分配方式", + "RelatedColumn": "ID", + "DisplayColumn": "分配方式" + } + }, + "CellType": { + "$type": "ElementUI.Tag, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "ColorList": [ + { + "color": "Accent 1" + }, + { + "color": "Accent 2" + }, + { + "color": "Accent 3" + }, + { + "color": "Accent 4" + }, + { + "color": "Accent 5" + }, + { + "color": "Accent 6" + } + ], + "separator": ",", + "size": "small", + "effect": "light", + "allowAdd": false, + "addButtonSettings": { + "width": 100, + "text": "添加标签" + }, + "ReadOnly": true + } + }, + "1,13": { "BindingInfo": { "TableName": "项目表", "ColumnName": "项目状态", @@ -322,7 +404,7 @@ "b24876da-8ff2-4736-8ffe-09e4d86a7a9d" ] }, - "1,13": { + "1,15": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -347,7 +429,7 @@ "IconSize": 14.0 } }, - "1,15": { + "1,17": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -355,7 +437,7 @@ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", "PopupDisplayMode": 1, "Placement": { - "SerializeProperty": "=项目标题!P2" + "SerializeProperty": "=项目标题!R2" }, "ClosePopupCallbackCommand": { "Commands": [ @@ -402,7 +484,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "e0285f38-44c2-4116-a682-4d8f0adc2bfb" + "ID": "3e4701b7-8215-44cd-b4fc-65111b80ad3b" }, { "Condition": { @@ -424,7 +506,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "db366eaa-82f0-4105-9824-f64780163aca" + "ID": "005c3106-953f-4a11-b02a-484384073c9c" }, { "Condition": { @@ -471,7 +553,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "253f3d9a-f2ef-4638-b708-c53a302d351c" + "ID": "520749c1-6109-49a0-b43d-726f6bed036b" }, { "CommandList": [ @@ -481,12 +563,12 @@ "Message": "只允许项目经理进行申请" } ], - "ID": "2b6b9795-e62d-46cd-883c-3d153c6a41fd" + "ID": "332b1cdd-0413-4658-99c3-449f125cb8ab" } ] } ], - "ID": "c83926f2-44c1-46a7-826c-a80880ab16ab" + "ID": "016d94a0-6149-41a6-a52e-68f4d976a399" }, { "Condition": { @@ -522,7 +604,7 @@ "Message": "操作完成" } ], - "ID": "660c226c-2cc7-4c86-954a-ed65e83c95c2" + "ID": "b67b39c6-7449-4359-a23e-d3c81c2899ad" }, { "Condition": { @@ -618,12 +700,12 @@ "IsOpenInNewTab": true } ], - "ID": "b94417e5-4cf6-4c8e-a3f8-0ca266181d20" + "ID": "955887a5-420e-47cd-bca3-05fe2b0e37d5" } ] } ], - "ID": "43816a7a-d115-4b08-84d4-3c9d7a616cab" + "ID": "0e9c3256-f2da-46f6-850f-2841b0d39be6" }, { "CommandList": [ @@ -633,12 +715,12 @@ "Message": "当前项目未开启收集需求功能，请开启后分享！" } ], - "ID": "82d497e3-0ff8-4762-89db-780d5a5febf2" + "ID": "6bf74eb3-78a2-410e-9f59-e0263fda98e0" } ] } ], - "ID": "9766539e-f07d-4abc-8e29-509a0b9c12f7" + "ID": "86fe7544-fb17-4bf6-bd62-eacc308cd2fd" }, { "Condition": { @@ -671,12 +753,12 @@ "LoadBindingDataOption": 2 } ], - "ID": "5190c63a-c396-425c-aae7-3a4ba99b873d" + "ID": "9ef4f3e2-f806-4711-a1bb-4292d768c567" } ] } ], - "ID": "0f6bff74-2586-4aa2-8992-3953414c7963" + "ID": "01d5ab00-d2ef-40ea-bbd4-0aefd4b94523" } ] } @@ -750,7 +832,7 @@ ] } ], - "ID": "23256f2c-0885-45de-82d6-43f52943627c" + "ID": "3a7babbe-a846-4cb6-b973-a587227ca59f" } ] } @@ -821,6 +903,10 @@ { "Foreground": 1 }, + { + "FontSize": 13.333333333333332, + "HorizontalAlignment": 2 + }, { "FontFamily": 0, "FontSize": 13.333333333333332, @@ -839,36 +925,41 @@ ] }, "CellStyles": { - "0,11": 0, "0,13": 0, - "0,14": 0, + "0,15": 0, + "0,16": 0, "1,1": 1, "1,2": 1, "1,5": 2, "1,8": 3, + "1,9": 3, + "1,10": 4, "1,11": 4, - "1,12": 0, - "1,13": 4, - "1,14": 4, - "1,15": 4, + "1,13": 5, + "1,14": 0, + "1,15": 5, + "1,16": 5, + "1,17": 5, "2,2": 1, - "2,5": 5, - "2,10": 5, + "2,5": 6, + "2,11": 6, + "2,12": 6, "3,2": 1, - "3,5": 5, - "3,7": 5, - "3,9": 5, - "3,10": 5, - "4,11": 0, + "3,5": 6, + "3,7": 6, + "3,10": 6, + "3,11": 6, + "3,12": 6, "4,13": 0, - "4,14": 0 + "4,15": 0, + "4,16": 0 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "2,5,2,5", + "2,5,2,7", "1,1,3,1", "1,3,3,1" ], @@ -962,7 +1053,7 @@ "CustomNames": [ { "Name": "项目菜单", - "Formula": "项目标题!$P$2" + "Formula": "项目标题!$R$2" }, { "Name": "项目首页导航栏", @@ -973,4 +1064,4 @@ "Formula": "项目标题!$F$2" } ] -}//VDUpFtGABbDKuKTOYc2GzvB7qkDV09OmYJCt0Ay9ZwUrwrHJ1Jzvbr9KnS6YhbxmnmIeJyQDghiCxSUQmT/FCFsCiMqgnR30ZGt3wfgs59LHX4BVhWptLEUj2xYCES9f4fyh8mbjXKUkm4RbhYFfx8AUVnGQ3GCWABjVI7QLhgN3Cb/GwlRGFK3KjzRpqjMNZ8aDaca9Cq63+sZATuplqwMHlDhZ3zTRvtFH6/wS92YXA7L2DE6Rcj/Zfsr0qh/jOhvWh+mWVYWS+LpaTGIYksIh75aLTAe2Tw4HfGkZKJp4oD/4nxxMKiqA/hbvZ7YGfef0CEC5QrU0wftKvzUqgrl71/LSpypREdQcKHdoLTmJSRaZwwVO0VquzRI22IS45RMEkkyJTzFyetzzLKLvZCVMGOR+HAvHvFp+Dn4NEZSTc+4UgalXrEO2BvrN3iy7caZVu8h3sslv3kte1pJR8XLZs+E0BFvbmOy7z2hd/DBYe9z7jPQ0IcIGz7Tkc3zj63uhK+fckhIuaHn2EBZ6imJphhSrSH189Ri3pDalINOViFEVxF6g/hKNmkpBuKNmsq5IWIs+2doQLNgaXBW3UeWrI+r1UFUrN3sNMlGxnv6cLkx69UTotwwk9govzyRK1NmK5A6ibTyq4Qptv5uzR984s8n6vNmHlIAJywb6j7rwteA1E6foF9Mddt15NC258QUGpkq/iuNMkvlO+355+FkJaSYcrJFLFoZ/LtvMFa5ZgfBcXhOEAb9kpBinNwpx3AU4aDq/8Xd31tWBeRviACTc8QYu9+q3tLaBkUwQpb23yTVfWCcZ71gyhtkn5Kfrfr5sC+x9XApn5/3v3CKWP1zEOKu8fvKH/HVAO3qWVB+WNTR/W22K0QPjX8SVTwwXWT/CdaNkr6a+sWoirkYduA==|920 \ No newline at end of file +}//V1piIyUV9Ix5g8PblsbQUcF4+vQIZ+XAD7uTtrEkmWzUkvfLc3kDHdTyUVTXrYaj4pV96l59k5lVVYG/2kIAGT6GnQtkknfeJJZ4pioiofh7FV9g3AH3ZPMlQbjz+NC2W/HgTYcE6TbiG8yiL/6zo/gOwHy+tkZs1qHJFMMr5aQ1s37crb/h8vp/FiN6olFEnYOfmyfEPqpbdteqELd4dy+YRZBNcIDexYa5Wl2dmFJSyZcMFIexe1UanJVSbBXQXSBfBbKO08pSCZXR1p3j2BDcM4rx3E9T6BBNzgpVJn0glNMOGVamx7motRWuU3YmElJlF21+CWh5AXacPfi3lLQh1RBj2uZKKyk40AhisGZviU9Q+om67FYJ+/v8LD3xcZoyuUDlQOAF83OKhPKfHQfgRt4J9aakKz7WIIb03Jnz84XXLqGp+JdH6Sx1iM3EI1liEHYus/Q6jwamRhLBdBz/6yygh9sHCP0SwCrEymIMzHnHAVOOXR7ND8VnztcuS/JRhyq89P7laEnGgKqKRc70Rht8Zlgu28kX1GfrEEPPa4P4Qfoc0dlnBVxKGYWYchLj5zTtJs5wRL2xHPefRCeSUkbkU8hebfgZ8dQK/+yFBM+YFoB/3Lc/zcBT6bssoaSKFlTQXlPpuw+C+j+59YJDw7OaI1WbtEU3cjcCwdx1IoDgezNiGyH6XsVlXJX3V23yYI6B+wKkroZ3flcSi7UsJOg8knsjIRVdMxSzQwjXTnh02Xd+Rk3D81eFpjHMm8uNYiXWx65Uy9uI+gpB+1Z6lNjSFYg5vnKzs1TuKm/ujHq8eMaWy8SEaRgZrosfw9UCGHYpr4tWxOILfjjNfFckcCyY3krG6eySOjJegPG2YDUOrM2dRnMU5wNW+20TzCW0CvNQE/6BsR8jUw8Qyw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目标题.rd b/Pages/项目/项目首页/项目标题.rd index cfda1f3a..36391036 100644 --- a/Pages/项目/项目首页/项目标题.rd +++ b/Pages/项目/项目首页/项目标题.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 17, + "ColumnCount": 19, "RowCount": 6, "CustomNames": [ { "Name": "项目菜单", - "Formula": "项目标题!$P$2" + "Formula": "项目标题!$R$2" }, { "Name": "项目首页导航栏", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index e0fa4efa..cf8767a7 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -484,7 +484,7 @@ "value": "0" }, "CommandList": [], - "ID": "1f8c7e8c-4831-405b-a648-781e297a4f78" + "ID": "b72643c7-2919-4f16-bfd1-6c1beb58d436" }, { "Condition": { @@ -500,11 +500,11 @@ "value": "0" }, "CommandList": [], - "ID": "81113058-c93f-410f-b6e6-153ce6fc105f" + "ID": "1bd08fcc-1768-4e65-9546-29469e0331cd" }, { "CommandList": [], - "ID": "02717598-047b-440a-9270-dbf94b1ae4b7" + "ID": "adf044a6-a226-421c-a070-f4c230c26abf" } ] }, @@ -702,7 +702,7 @@ } } ], - "ID": "66530cf0-c9fe-4c40-9b89-f60b68586c5c" + "ID": "b5c83930-3ca3-48e4-b24f-cc4d572873ab" }, { "CommandList": [ @@ -714,12 +714,12 @@ } } ], - "ID": "e974be97-1142-4328-a211-76a7641e3722" + "ID": "930f5ab9-0d35-47e4-be5d-02507a79bfe6" } ] } ], - "ID": "95d43f98-afee-400e-b0de-f951dd816de7" + "ID": "115e9bd4-00be-421a-8df9-a4458bcdaf78" } ] }, @@ -775,7 +775,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "71655adc-8ec2-437a-8f2d-b2b048ef2286" + "ID": "f5a6514f-0579-4ad3-a740-ed2de15d4089" }, { "CommandList": [ @@ -790,12 +790,12 @@ "BtnText": "知道了" } ], - "ID": "2d293bcd-256c-481d-a9b3-30ba22e77553" + "ID": "5e22974a-7779-411f-bf59-62dafda7cbff" } ] } ], - "ID": "e17264a8-c848-43c2-a7ec-b5757f85a760" + "ID": "3418f47a-75d5-409a-9658-e3b613a3dcad" }, { "CommandList": [ @@ -817,12 +817,12 @@ ] } ], - "ID": "b9655315-9853-45eb-aa86-50bee2b27972" + "ID": "e0c32092-83d9-424c-a814-bb5416868b13" } ] } ], - "ID": "2ec0af1b-4534-4588-af03-da00f511b617" + "ID": "7f07f825-1e32-4ecf-8dc2-5efa34a26f36" }, { "CommandList": [ @@ -837,12 +837,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "185263c2-3b6d-4c26-aeb7-2fe0b2637d8d" + "ID": "696bd83d-5807-4abb-9b73-f0808ac48309" } ] } ], - "ID": "eea17056-076c-450e-8455-e0ac55f8ea1c" + "ID": "7b90a11f-f2eb-446a-aa56-e756bcc12080" }, { "CommandList": [ @@ -852,7 +852,7 @@ "Message": "只有该项目管理员可新增任务" } ], - "ID": "b5216715-9ab8-407b-9887-c28165737bf9" + "ID": "ab9c6942-3c5e-4f97-9a36-4967a370bc78" } ] } @@ -1034,7 +1034,7 @@ "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "eb8e99e0-3096-4a65-b200-e75e55c96ade", + "GUID": "a01bdd6f-74e2-4c92-ba82-15832ae6b026", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "ID", @@ -1043,7 +1043,7 @@ "ColumnName": "value" }, { - "GUID": "e474c331-7ed9-4df6-a5e1-9d832250e5b2", + "GUID": "f53509c8-b0c3-40ea-9da8-29175d58043d", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -1052,7 +1052,7 @@ "ColumnName": "parentValue" }, { - "GUID": "36b881eb-403f-4021-ae50-9562109e4ea7", + "GUID": "40007de2-aff3-443b-b832-381fbb6bb7d9", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -1066,7 +1066,7 @@ "ColumnName": "状态" }, { - "GUID": "6db2db95-1473-457d-974d-4575d8827228", + "GUID": "b147ee01-ff20-421d-9f7f-7bf0d6a06249", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -1075,7 +1075,7 @@ "ColumnName": "任务名称" }, { - "GUID": "ce3b2943-e2dd-470f-b9fa-17277446f0fe", + "GUID": "af34978c-3a47-482e-8220-1badf7d60a22", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -1088,7 +1088,7 @@ "ColumnName": "执行者" }, { - "GUID": "29b423ed-d4f8-4877-a1dd-3608783ded66", + "GUID": "1d0473bc-3825-4874-8031-8722c548b5ac", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "开始时间", @@ -1097,7 +1097,7 @@ "ColumnName": "开始时间" }, { - "GUID": "23d6863b-ce04-4dfb-b6d1-e0226f470ca2", + "GUID": "f028e8cd-92e7-47bd-adbf-a9e7392e9b43", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "结束时间", @@ -1106,7 +1106,7 @@ "ColumnName": "结束时间" }, { - "GUID": "1b19befb-b40e-4af8-a159-44f27a18ccf0", + "GUID": "0d5980e3-e61b-43fa-9b6d-9e5d28cb85c7", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务预算工时", @@ -1115,16 +1115,16 @@ "ColumnName": "总计划" }, { - "GUID": "50809d5f-9f68-4613-8e58-db7b29e10ace", + "GUID": "36f96962-f30f-4ca9-9455-45049e81186f", "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "动态可核定工时", - "GUID": "9cf417f9-ee6f-4f0f-91f4-b658f5668dd8" + "ColumnName": "可核定工时", + "GUID": "6512e4aa-c8c0-48a6-852f-088d41b8f015" }, - "ColumnName": "剩余" + "ColumnName": "可核定工时" }, { - "GUID": "5b0b2454-68b9-44cb-91ed-ff0fabe5f7c8", + "GUID": "077f9251-9f0c-4449-9cbb-f7aa2e44aa81", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "成员数量", @@ -1224,7 +1224,7 @@ "开始时间", "结束时间", "总计划", - "剩余", + "可核定工时", "成员数量" ] }, @@ -1284,8 +1284,8 @@ }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "剩余", - "Label": "剩余", + "DataColumnName": "可核定工时", + "Label": "可报工", "FormatStr": "0.0 \"小时\"", "Fixed": "none", "Align": "center", @@ -1400,7 +1400,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "f1a71d5a-1827-44b4-9513-1b8dc71fcfb7" + "ID": "93aa4648-7675-484d-96e0-ffff158849d4" }, { "CommandList": [ @@ -1410,12 +1410,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "62aa16fc-ae78-4c74-8a19-14095b46d275" + "ID": "0fc88b19-80de-43d2-9408-fb776576b957" } ] } ], - "ID": "b927b921-cfcd-4f11-933d-a851ee8d60ef" + "ID": "b7477efb-c7fe-4921-8503-037407c48654" }, { "Condition": { @@ -1441,7 +1441,7 @@ } } ], - "ID": "3cf31de2-b349-4306-bc4f-f05d9c40facb" + "ID": "b6e3679d-9d13-4a6b-9e13-c758e2053299" }, { "CommandList": [ @@ -1480,12 +1480,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "704929ca-bebf-4ec2-9344-77372c9c0e6d" + "ID": "15d9be64-dea8-40a0-aeec-f1d01e0004a2" } ] } ], - "ID": "1667fdbf-3aa5-4ebb-8646-074e8e1aa6bb" + "ID": "5aaad183-be62-491f-b7c2-b7cf4f84cd48" } ] } @@ -1954,4 +1954,4 @@ "Formula": "任务列表!$I$13" } ] -}//4SP39frCvtdADeZEZ003ZMebHbJ83waT4N1OVf2PLt9rbzeqd6aHwSCvyDJ6aEwPKZUOZuty19Ahbe9b0RTRukQKI+tDkdO9rarQUYrzCHen9NxjkX6HNJXyR46C/rA0k6PnrH/BSOI+Ber1a2f1uZAHIttxbNWgiER78VVahaEJJJCGWz/35ndtCtgM/XzrQNn1+MDnZ2nktEKNhcXOhxAAO1XaMlbh3be3Fkj8C286U0xiQgUvPneO6eWZN1lnmv+ckr3VXOhJEbJpm17v8a6tJMsGmLmRWqNB+UQPewDZpn8jXgQPFuvjJxK/xIUW9ctO6Xy6LyD6VjYJ+h9rpbb78KhwKE0dd2zx0pJaREP/QpfRplE9HaOwlM+3SgYEgOXEGGIEn8jzOtJwF5jLqR+WgQhKvCfcjc7ob6dobD3I1SsdTy0EjzRlreEzVEXaO+LpgPmP9hLO+9KcgC5PKMgE5GGhi/JFMMPzuu7ozKe3IZPn2r1jYgeDkzSeJHUzSYh/LiF855PaHwHB05pKzwWdcrvyFHSvwZwBVMF8fIBWwS+SFiHL9BpqQnVluyrjqKYeUmBqa8qgCZFUeXV2O0/+b0h/QogL3PJa9sgSZ/1Ldn8sKJSoFDIC0QZPyCkswnYhacreWvD+5zvDDkyO27rDoThNMfJDqQ8giG0gW66Z48PWGeoN5/5K9Ms9w8zNqYsRbABaNdyNB7k35PhqdMxHOlotNuAYdJoBIeRQMGM9IMhoxpeeirTvQeA/Qx2xWEfZo9X51iV9KV8qh6ZZ+u46jFQQ+jFgTGNOv9eCrsGnPFlrwPZf7a3WRZ4ErIZORnnMwE7OqXBImuYElQN99gBt8YkpYIXaxW7O4ynBLcFIkbd3fkLfNhYIGsOvQC/lq5CHFTLZfQ5wWAf23X72IQ==|920 \ No newline at end of file +}//7OmvDHJqtUesF2VXJU32kdIPaCnQHqSsEvDeVQu+lEPCpW1AHKq4xSn261F75K/AY67IKOIL22L0XuOKyPk8jL43iFDqLl3fjJS9VXac9feIg9F5E1amJ1JMv1fN77mIfAxt/KkVVkPxhG0wATZ8O3qnHjwnq349i3+yrBhE4p8fEeeF9RfyQ0Xr7rNM3q0idDYnZp9ug3UU1hBISIwBEyoLblkdzPj5IfuwN92drQUNs71JPGsqcEClVaELtV3ojLV97DKFnLp8KGRn2rahBhqAvoGs/waUug/KlOBJqkG6qbdnyCYpL7hkn4LxD1icpP9NkwUp9GLdE+5WCIkEknE5TS2YChAZjiSCREqpRfLeu6ZUUlYZzEsmUm74TRM6ZCet4mQF6OGPsZ5SrhQMJ7ivir7g+zSX41PedxYL2ICiw3jKV6qtFq7POcZi54K2iX7JeMYXHatjuZWaTNqqgWcbHjGtSdIrohYEaaPoEmyBEJsy1XbDDgQA4Mb5dj7Okm0j7OvAMI8rNxD5+717DFBG7GdYtgSrPnIDg+b6VaeWETIHQHfqY2OGNXLQE1Oy+vx2Yg4yq6WrOBYXv5H/XshCZuNyR1xhJfC6Rlbkyj/MIaUBmyVFWJd/JmbXp49kIFkJBBDjRFf6VR8Zfe8BTHF9lbbv9mE3RzG6ejJuiUsX64xa7hxbNxAU5ZKegc1GLvsc2m1oGVc2KqqL5vdyX1b2PupzPo3kaDeEJf7jOyG0ht/wt+/oX9xBuTKdibpMA5swXdrylyDFVvyAmC0OrMzt/EmKYpjmDrZojOQ2TJOYPLvdNihcUvtgpwSHBPie7KsJOiNPA0/RCdvEwMU0DOloCLWP29iurKqkPOFaKGcmOPXpgeQWtTdSxXoKcf5iy6VSNc1Y5c2EkaA8+7umPQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json index 947e9c57..4460eb6d 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-基本信息.json @@ -185,6 +185,7 @@ "5,10": "父任务", "7,1": "执行者", "7,10": "预算工时", + "7,11": 0, "9,1": "类型", "9,10": "任务分组", "11,1": "开始日期", @@ -296,7 +297,7 @@ ] } ], - "ID": "a242451f-a557-4e7b-8c01-8793362c0654" + "ID": "128387c8-48fb-4efc-b3ca-8d3aa36d7666" } ] } @@ -435,7 +436,7 @@ } } ], - "ID": "1010c29b-a774-4c7f-ba40-8a10c47c086b" + "ID": "f88bf8ac-3981-4c2b-9955-309aa67db446" }, { "CommandList": [ @@ -450,12 +451,12 @@ "BtnText": "知道了" } ], - "ID": "91cf60e7-d627-4c42-af64-aaceb14c0ef8" + "ID": "7d934e81-ba73-4bc6-8560-6c67e9df710d" } ] } ], - "ID": "6f9e114a-e940-41e9-9fa5-3de061342b6c" + "ID": "23440047-26f6-45c0-aa4c-e239624de8f0" } ] } @@ -468,7 +469,7 @@ } ], "Comments": "小于进行中", - "ID": "2284d4a2-57cf-4581-9c9a-2e9b29370302" + "ID": "4a5115a5-91b1-4b69-b536-62cf3c2c42d4" }, { "CommandList": [ @@ -478,7 +479,7 @@ "Message": "任务尚未审批完成，不可修改状态" } ], - "ID": "bd53cca5-0999-4223-aeb7-7949f727687f" + "ID": "00dd7c16-ed51-4794-8dd9-01f471fed68f" } ] } @@ -576,7 +577,7 @@ ] } ], - "ID": "824948ea-7cc7-4f4a-8591-abe1fe93d8e5" + "ID": "385a668b-678b-4844-b730-9c5c148da13e" } ] } @@ -756,7 +757,7 @@ ] } ], - "ID": "073d6a29-5b0f-4de8-b2dd-d1137d85f4e8" + "ID": "3d0ed7b3-0d05-454d-90d6-6b022de26f16" } ] } @@ -1027,7 +1028,7 @@ "BtnText": "知道了" } ], - "ID": "1a11de86-ba2b-4df4-88d4-62f3c81c4c82" + "ID": "5c281bcb-e45f-49f2-b29e-3514953df19d" } ] }, @@ -1041,7 +1042,7 @@ "Title": "计算中" } ], - "ID": "8650c192-2e1f-4cc3-b91d-6ac1ff9b876e" + "ID": "1233b415-0b1f-480f-bf1e-e6d285bd46db" }, { "CommandList": [ @@ -1056,12 +1057,12 @@ "BtnText": "知道了" } ], - "ID": "af1367d9-b163-4e0c-b65f-cccdf7e197e5" + "ID": "9cf60052-c790-4448-b719-8f505e8eaf32" } ] } ], - "ID": "14ccabf9-e86c-4d92-aaae-22b18fb5d39c" + "ID": "a8a5d748-ad79-4b72-a6f9-68a612323650" }, { "CommandList": [ @@ -1097,12 +1098,12 @@ ] } ], - "ID": "c7e3a51a-6a24-430d-9113-b37089a0caa8" + "ID": "d05ffd73-c602-4e11-b06b-e5fbbb9178a1" } ] } ], - "ID": "9aabb3f6-758c-440a-befa-82c13d78ea2e" + "ID": "114eb3ab-0d5f-4248-8689-29759aeea1e6" } ] } @@ -1121,7 +1122,12 @@ ] } ], + "DefaultValue": 0, "min": "0", + "max": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF('任务-基本信息'!父任务ID=\"\",'任务-基本信息'!H14,'任务-基本信息'!K14)" + }, "step": 1, "precision": 1, "placeholder": "请选择", @@ -1207,7 +1213,7 @@ ] } ], - "ID": "4ff655d0-bbaf-440a-a4bc-0b0a2bbe6e97" + "ID": "2858df27-a05b-4af5-a525-a1096c37764f" } ] } @@ -1361,7 +1367,7 @@ ] } ], - "ID": "84a67961-8f1b-4655-80cd-c029e3383514" + "ID": "cf14cb64-1930-4500-b506-1df5b66f0c74" } ] } @@ -1525,7 +1531,7 @@ ] } ], - "ID": "398f35aa-9a6e-4204-899f-408f1cc3a044" + "ID": "8f237d61-24a0-4515-86a5-4b62abe36e9b" } ] } @@ -1633,7 +1639,7 @@ ] } ], - "ID": "ec39f745-5ae7-41d7-971d-86b2e91ed002" + "ID": "b8df65b5-eb9c-4c98-87cc-9be1b54e787d" } ] } @@ -1666,6 +1672,31 @@ "DefautWeekFormat": "yyyy 第 WW 周" } }, + "13,7": { + "CellComment": { + "Comments": "取项目的可分配工时" + }, + "BindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "项目可分配工时", + "GUID": "228a4ed5-3b78-4409-9ff8-6961bd364cb2" + } + }, + "13,10": { + "CellComment": { + "Comments": "取父任务的可分配工时" + }, + "BindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "父任务ID", + "GUID": "85dfc097-f3b8-4735-9b31-f0b961e08613", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "可分配工时" + } + } + }, "13,11": { "BindingInfo": { "TableName": "任务表", @@ -1955,7 +1986,8 @@ "11,11,1,7", "7,11,1,7", "13,11,1,7", - "5,11,1,7" + "5,11,1,7", + "13,7,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1985,7 +2017,7 @@ } } ], - "ID": "901e3b7a-41ec-45fa-8234-baa8d5a08840" + "ID": "61536c94-52d4-462e-b042-da1b569a362a" } ] } @@ -2006,7 +2038,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "任务表", + "RelatedDataTableName": "项目平行视图", "ConditionFormatRulesCollection": { "Rules": [ { @@ -2188,4 +2220,4 @@ "Formula": "'任务-基本信息'!$C$8" } ] -}//BOV3Lv1hORndSCGTquVMg9MICCnVtftxm7aiNBOl/smekFeYe7rS4I3DtUmZ8ypl4KNfkhPuSZHsiwuD1tkSCfN/rPkKmLVjz2VmYfpuG6F6RHny1QiWUuhCLBDdm+cYuYj0fwW3P/mvj0VB6Mi1t6UNOA2GGX6r7KExLMlByF36vSqIiI0XyFZwkDmzCFhSmc00viZoWuVKYyzoW2td8zrbJLHVNWjbsiNQV398MGGlmNW5B+ArJaAbIjnwkHVqJaoM45Oqy1q2jd05NLBmPchKXeyiB/9S+Dy7KiohZjk/Z6BhgDOfddfLD8pCQByvNuVB6g5qn+DTgB2vOkSSmji2edOIOTQBcY5euxpn14yZuWp50Ntb0PxT53b9vBG6JsppYYaQ/QiDanHT+U4FtKuv+W0MOTBcTXKYtgfK1MZQARWtrYgKOjEkZ4LqwLnztIqGHbkRO1snF1AnI2s1YF/CXQ2qbE4J4YYxv7RlEqtjt4uj06eMwklT8BsVYbtrAurcy25D4o6nCQL+Ft1GF4hH9BYViS13UplkozhXVMTazNmhiruYGP1Bg+lyinjIlk1fWPSVM4DzsFk/ge0m5i2yxpuHEyWrNJezBVWCqyPHVxZ72SOOvqy1U9iGMVi5LpK9bNFmxzizzroibcdwG+5U6KxQ1NYnv3zsezfuhRv6AlO3r56ZiDOtPR3MbJG1f3zMjuvCH6s1PFzJCY5CO3ePkqsVkAF5r70dxntoaXHNhO9qJSvAvgOUCrv5LU0MV9OaLY7JMwzLS2+lpc3Q43VLWKE6RKqOcmMjgo93jyLXMseieEwdb70istNq3pwwesFTnq4C2UT7IfmVSwvKYhCBJaT6hGDFfOIXVZnhqaD1oVpLrbsrAFQLWujjQB7e/DanzxtX0mwKkwDK6gAqJg==|920 \ No newline at end of file +}//jsSRaejQnfsHa9hTGQi3PHGtMJKnu420xpgsty+jUm+H2aP1rr6tIXLr20//r2F9FUvTLzIs2sH7oorCb1p45waQnOgWTpGhVpDKApqNGZ35OBM83u002U2eWfnMBl/6obFrgeN6gUxXoW9KxFhb/KY8a5m9ElHz4Qzl/Txpz4oqbjZpIBwIRp1S9ANvtnKrQkbzbgq8gzXxEgaOMiiZ5VdVmMe8W6Ez0/BhLZG44xPomRKgVd9F6Mql3sNV/zDwdR5ISRlM/ZfJdvHSdvvuIPxw2FFuRBN4rBs6RyyTx+A//Ax9NxqxwZ8s6iQZ+5/yNHn5/kdE7AQCR9lr5TMRaVY51evlNl1bIq/wDQGWD9tkhKSOjAdC3loYW8y1J0VNxEjn+WKGQLXHKhXaY3Va+uLyXB/EBsedvOc6wG9ALZiTDMz9xctjdCjpnFa+/lwYF55QTkvZi7QHzUPoH7iMxUJ2HaYVT/rsscmUwl4rnjRsCE0ATt16W4IFQXCZROQMw1IZNzLqk919/Hp2jdSj5WYBISGuCnDhRa6stXm4ZD2DUTn/n3ekXYRTK0M8iTipajS/Xr4sdE/ZaOg2Z6UyUV//FJ2oW9LQd3I3RcgiqnvNVkmrIJIWCovhXesBBzcbHFpgYbcP99Y0dR+kZEglMJ/45dfDGuu2zDV8fAGJEZ9CPaw5snGFXWF/x/lC4SmjehwuwNWOoVsUXhY9Hk5FdbzQzUE+CsEVRIAviZFcahCZJWyEBT/qHc8+25YgnI9FQcxOJM7rjCU04MkMtZcfEbU19bek4w9pwj7pEaCxhO3W+gr85J5QK9+8tJ9X7lzPZrc5J2t454XKsCfkacW2yfjydWiT4ixae7xP7pA+qhDZ2r1dNSgwMbaW3Ls9O87Dfmprioc6QfXBRVKmphOwwA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json index 3b2cffe7..bf8edfd4 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务-工时.json @@ -306,8 +306,8 @@ "4,4": { "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "已分配工时", - "GUID": "3a1a5570-daf8-4c9f-a8cc-61ba96c060c0" + "ColumnName": "本任务已分配工时", + "GUID": "327fab3c-b572-43ba-80fc-d0b1fbd9eec5" }, "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", @@ -336,7 +336,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "e1061455-570e-43a3-9203-8b7ab139139d" + "ID": "60c32cca-b06d-45ce-93ad-778ec1f341f7" }, { "CommandList": [ @@ -375,12 +375,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "07a5286f-50e4-444e-b014-83eaf1032255" + "ID": "1be7e38f-1335-49da-a9c0-276cf671bb23" } ] } ], - "ID": "7ae17abb-2db0-4d5e-97bb-8a03f75bbd33" + "ID": "7091111b-fc24-477f-94b4-f92431f118b4" } ] } @@ -435,7 +435,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "90439d65-2081-46a3-ae26-7aabdcf7b031" + "ID": "7d0e39d6-7b1e-4e15-8a58-c09d01fc5d63" }, { "CommandList": [ @@ -445,12 +445,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "7c6b9f20-8c3b-4d01-835d-f29c35dea266" + "ID": "2c7a0a8a-aa77-4115-ad6a-5c1d30075ee8" } ] } ], - "ID": "a4c9d0db-b26b-4979-a68c-974e28b2f31c" + "ID": "e8f676b1-292d-412e-992e-6ef8297eef79" }, { "CommandList": [ @@ -489,12 +489,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "eefa0780-0344-483c-9e13-edeb4408b400" + "ID": "68ff040c-1bc4-43ad-9fb6-766221b9b1b4" } ] } ], - "ID": "d873f6bd-4ff7-49da-93b4-1a2f5a99b6d6" + "ID": "bece63a1-eec8-498c-94bf-e9a9950eb842" } ] } @@ -517,8 +517,8 @@ "8,4": { "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "实际工时", - "GUID": "67129f34-c488-4414-98be-114feed2eab1" + "ColumnName": "本任务实际工时", + "GUID": "44b3e8bc-f0e1-4877-b4df-6f80e4b1e7a9" }, "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", @@ -547,7 +547,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "9f0f0f0d-3291-43a4-bc26-0208d72c22a5" + "ID": "ff3e2755-7fb1-40f7-ac28-5a587ff6cb48" }, { "CommandList": [ @@ -586,12 +586,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "cb9ed4d6-8f0d-4e32-9e67-220fd45f7278" + "ID": "5862701f-9913-4644-9188-a709713a985f" } ] } ], - "ID": "4a6ebe53-19f4-480b-be3c-32b5ab533d93" + "ID": "4b32ea75-1c1e-40f8-869c-084dbd38520f" } ] } @@ -671,7 +671,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "8bd2fa0d-748e-4397-a7d6-3ac2b0faeea6" + "ID": "93740fc1-aa70-4d4a-b728-1df934d53e8c" }, { "CommandList": [ @@ -681,12 +681,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "bdc024d7-e2dc-4e8d-b4a1-4c0470bdae51" + "ID": "fc86eb26-e4e0-4827-a663-e1a59adaf0a1" } ] } ], - "ID": "d8681786-7248-45e5-a43a-4171cd9e8a33" + "ID": "ccb56027-7564-422a-b3a7-f3cbc996d8d2" }, { "CommandList": [ @@ -725,17 +725,17 @@ "LoadBindingDataOption": 1 } ], - "ID": "16549271-a1b7-4158-847b-044a7431c5a0" + "ID": "a636a26b-895d-41d6-9dcf-42508c9a65f1" } ] } ], - "ID": "3f78bf69-de4c-4a72-b3ca-5394701697e9" + "ID": "2e6c078b-dd61-48c2-8709-53e508a444c9" } ] } ], - "ID": "e0c1c981-6f00-4648-b3a6-ba254ec34a07" + "ID": "d610214f-2743-44d0-a9ad-677ef7528134" }, { "CommandList": [ @@ -745,7 +745,7 @@ "Message": "当前任务状态，允许上报工时" } ], - "ID": "369d4c27-dd5f-4233-b314-ade63633dfc6" + "ID": "a8dd2400-89a3-4e3d-ba40-bbaf5c9eae58" } ] } @@ -976,7 +976,7 @@ ] } ], - "ID": "51bae809-8f5d-4b56-be74-38169edbe6c7" + "ID": "9c85a4b1-9f0f-4096-bbd8-24e05228308f" }, { "CommandList": [ @@ -996,7 +996,7 @@ ] } ], - "ID": "f1e7b8f3-0d0e-4bb4-8ee4-b81a10bb6ffc" + "ID": "f13a17d6-1a89-437b-b72e-3bdcb461d271" } ] } @@ -1346,4 +1346,4 @@ "Formula": "'任务-工时'!$V$14" } ] -}//BfhfAHow86Xp0AvPA/fDJTkpLpu2weHV+lrEJUwsP4AHRznabPw1T2GSUhAAO67cRiNoKcdlNvie736BhqkAedl7kNpdtG6Gzm1l6ZmOOQXnqeviVeNILGD+SGtonARBse89FGeNzvdP6QfKStBQc5tXMwpVhJYyNvPZU/cCZiWsG3pkVc7aXsZpjLcZGOy3FjGZ+U3YjQeAPZAlb2d4Kic8JNE0Ud07KruK3MvN0fbqh94l0ByQLIdBqwrjmT4ypDciByW2SPwIt/+rcC/WTodYKnmQQI4nFnsBKA+65CHG/9OL6uUv80Zeyt1da/dIZJ3NAtytDmYlrfaFcec03VeuZNwkqoufrxZZgLpi3nsrRbyNRWPevuibct/YsR+VbrJPkeYo5wj3PgAImOaXoHZXLcZXMpUu1HjA118f4W/+UwsJMpCHOlhJ9pwtqKd5NZ5qdR0H5RWBn37KBaY88fqMvOPDrYZb6ctvLNeVMt1r9e2CM+R+1CKfNpkE7TmwqA4vsUeY+vtpKsp/SLicL6rGOyL6DspRTJ7uR/dvqbTNn3iTsJD0gd5H1PgBrO+RX0qEsJradk5bGFmoF9wG/7izN0gfxj4y+uiS4utOpxqomy8PdIVRjX8YT5SHd/pN6k6UlEpvSY3VhcXJTYS3MMl+K/99Ysy91Hn+9Jcm3dP884gZKG88PeQnbzy+Blt6ZPBinMJXSBBYwu5XS5bwedAhyKJX7EP6muLR8uHix4jvjYG4MvhG7Ml/U+YVoNuwIfr4HX7XrZuIu9TgJ32ki6Ukpp8vP0uSA4OEzmiETCSDfysMBt4u6N4F0aV+pzis8sckkEFk4HNyeIXUq45EProFfgxOuJ7sWYU3S22VKYXkzhAINBn2C2MqREFss4yZI2O/kM5pBe5SbTRf1UOy2Q==|920 \ No newline at end of file +}//dpaOgagWptnC10f1HPhZI3fg4jCPa7s+BdnT0S6JPb6OT/4rdV7Q2Xlc52VXd2sGOrUDU/zw3GuaKpd12pRJNJNAm8b1Dzpv3HnbBngbIUkq6pImu3aaOU7d+m7nRSc/E3KYEE5/gT0qzNXynvfI8b1KAHWXjLtilF1Y/DoC/JzuFVnPvjvPR1y43tu7X1nfENKWF5+AFlKWqdOKPtxZxJPlrMZrXOSnpgMJRpGwiE4rtcEwwAl3GAdDlPQb0NOlkN1+sB4Luj2NOmFKZfkdTK3vktqoHUKQDALHu2LUgy87A1fUzsRw9D12fEkzHQveQoubn7gdCOKey88zG5z844/iLQD7qoXJzEPQzns0GQQPQEnrlMEfQA53QAhAMqMZuhn/fuhUFZrRnH6Qic7POUAjDUWPF2XggkwT7PfYL4VWAMK65zx12sB0BVwxJLnjmIjQ4X61M0l6lrEglCywtRJd2Mqa236XLBsSngKJr0PGkvjhRLiwbTj9VEeeVbB6/vHBK538MzBeMaVYJcZE4vvxh9tRGHQhjDuQLqucfBVKb1TTdLO/1AGdoRY/6UyuzfhdZdQjMIC+O1DfL1a5Ip2AbwGxnLeH/dwoYz23JpqUAu06C32S2vOYhmGK3jXisiF3B21Mrj2VJ+l2jtHkbYIfKtE52G3WFEFXwJCYJVyYnJFAViFc2Nb9fV3K/jmCTjoHLRGepUwkVH0a/9FKjFJPna3TOn9+d5P9BYJaHOdTopPQMVAuAN4iT7D//Qqwf6p7FM2ocAC7AZDmwdmuHgC9SZoQSiitXTVACeED98Du/z3zDkv+mUAwFF8mOmnsCEjV/A80Ni1w3UanKxqF4hlVREjfVkBz9ZO2w49O4JDSjQ3hEdUtXxRWOsFjONPUHAfyCnUKzep7OL7W9NL85Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json index 866652f6..b4c290a1 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.json @@ -39,12 +39,12 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 60.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "4": { @@ -59,77 +59,80 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 50.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 10.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 50.0, + "Mode": 1 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 50.0 } }, "13": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 50.0, + "Mode": 1 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 15.0 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 15.0 } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 50.0 } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 50.0, + "Mode": 1 } }, "21": { @@ -144,27 +147,28 @@ }, "23": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 15.0 } }, "24": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 50.0 } }, "25": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "26": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 50.0, + "Mode": 1 } }, "27": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "28": { @@ -179,77 +183,80 @@ }, "30": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 50.0 } }, "31": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 10.0 } }, "32": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 50.0, + "Mode": 1 } }, "33": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "34": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "35": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "36": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 50.0 } }, "37": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "38": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 50.0, + "Mode": 1 } }, "39": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 15.0 } }, "40": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 15.0 } }, "41": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "42": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 50.0 } }, "43": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "44": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 50.0, + "Mode": 1 } }, "45": { @@ -264,141 +271,60 @@ }, "47": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 15.0 } }, "48": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 50.0 } }, "49": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "50": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 50.0, + "Mode": 1 } }, "51": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "52": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "53": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "54": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "55": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 - } - }, - "56": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "57": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "58": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "59": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "60": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "61": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "62": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "63": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 - } - }, - "64": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "65": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "66": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "67": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "68": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } } }, - "Count": 72, + "Count": 55, "DefaultSize": 15.0 }, "Values": { "1,1": "成员", - "1,7": 100, - "1,9": "预算工时", - "1,17": "已分配", - "1,25": "可分配", - "1,33": "已核定", - "1,41": "可核定", - "1,47": 100, - "1,49": "预算成本", - "1,55": 0, - "1,57": "已消耗", - "1,65": "未消耗", - "2,49": 100 + "1,6": 100, + "1,8": "预算工时", + "1,14": "已分配", + "1,20": "可分配", + "1,26": "已核定", + "1,32": "可核定", + "1,36": 100, + "1,38": "预算成本", + "1,42": 0, + "1,44": "已消耗", + "1,50": "未消耗", + "2,50": "-" }, "Formulas": { - "1,15": "IFERROR(ROUNDUP(R3/J3*100,0),0)", - "1,23": "IFERROR(ROUNDUP(Z3/J3*100,0),0)", - "1,31": "IFERROR(ROUNDUP(AH3/R3*100,0),0)", - "1,39": "IFERROR(ROUNDUP(AP3/R3*100,0),0)" + "2,50": "AM3-AS3", + "1,18": "IFERROR(ROUNDUP(U3/I3*100,0),0)", + "1,30": "IFERROR(ROUNDUP(AG3/O3*100,0),0)", + "1,42": "IFERROR(ROUNDUP(AS3/AM3*100,0),0)", + "1,24": "IFERROR(ROUNDUP(AA3/O3*100,0),0)", + "1,48": "IFERROR(ROUNDUP(AY3/AM3*100,0),0)", + "1,12": "IFERROR(ROUNDUP(O3/I3*100,0),0)" }, "AttachInfos": { - "1,7": { + "1,6": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -412,7 +338,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!H2" + "SerializeProperty": "='项目概况-关键数据'!G2" } ] }, @@ -424,7 +350,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!H2" + "SerializeProperty": "='项目概况-关键数据'!G2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", @@ -433,7 +359,271 @@ } } ], - "ID": "66ac90f7-c656-48d5-8d61-5ac84a9e544c" + "ID": "73c40685-5a6e-4885-bca0-056dcaf5a52a" + } + ] + } + ], + "type": 2, + "color": "Accent 3 0" + } + }, + "1,12": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!M2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!M2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "1d984694-c036-479d-a0e6-2b9b61bbc5bd" + } + ] + } + ], + "type": 2, + "color": "Accent 3 0" + } + }, + "1,18": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!S2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!S2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "8aebfad8-babc-4ed3-b38f-d5eb8fa9a445" + } + ] + } + ], + "type": 2, + "color": "Accent 3 0" + } + }, + "1,24": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!Y2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!Y2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "a7b3e376-f3e8-4f2a-9116-907f63886a13" + } + ] + } + ], + "type": 2, + "color": "Accent 3 0" + } + }, + "1,30": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!AE2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!AE2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "2369b962-eddd-40f9-b4e8-cda2ce6fbd9a" + } + ] + } + ], + "type": 2, + "color": "Accent 3 0" + } + }, + "1,36": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!AK2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!AK2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "cd2c4a6c-14e3-4a74-98f6-1043d6c9058b" + } + ] + } + ], + "type": 2, + "color": "Accent 1 0" + } + }, + "1,42": { + "CellType": { + "$type": "ElementUI.ProgressCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='项目概况-关键数据'!AQ2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!AQ2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "10df201f-1744-418a-b8a8-bee27f5b774f" } ] } @@ -442,7 +632,7 @@ "color": "Accent 1" } }, - "1,15": { + "1,48": { "CellType": { "$type": "ElementUI.ProgressCellType, ElementUI", "CommandList": [ @@ -456,7 +646,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "='项目概况-关键数据'!P2" + "SerializeProperty": "='项目概况-关键数据'!AW2" } ] }, @@ -468,7 +658,7 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!P2" + "SerializeProperty": "='项目概况-关键数据'!AW2" }, "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "SetBackgroundColor", @@ -477,271 +667,7 @@ } } ], - "ID": "e7a56a50-d467-4054-ad22-cd11a1c5f53a" - } - ] - } - ], - "type": 2, - "color": "Accent 1" - } - }, - "1,23": { - "CellType": { - "$type": "ElementUI.ProgressCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='项目概况-关键数据'!X2" - } - ] - }, - "value": "100", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!X2" - }, - "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetBackgroundColor", - "ParameterValues": { - "color": "Accent 4 0" - } - } - ], - "ID": "1131ccfd-5d30-429b-ac15-fafd5936f89c" - } - ] - } - ], - "type": 2, - "color": "Accent 1" - } - }, - "1,31": { - "CellType": { - "$type": "ElementUI.ProgressCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='项目概况-关键数据'!AF2" - } - ] - }, - "value": "100", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!AF2" - }, - "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetBackgroundColor", - "ParameterValues": { - "color": "Accent 4 0" - } - } - ], - "ID": "ab2cdb45-d345-4d19-9b4a-f31f10657243" - } - ] - } - ], - "type": 2, - "color": "Accent 1" - } - }, - "1,39": { - "CellType": { - "$type": "ElementUI.ProgressCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='项目概况-关键数据'!AN2" - } - ] - }, - "value": "100", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!AN2" - }, - "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetBackgroundColor", - "ParameterValues": { - "color": "Accent 4 0" - } - } - ], - "ID": "c56736ee-238d-43ab-9368-19a6bd5b7a22" - } - ] - } - ], - "type": 2, - "color": "Accent 1" - } - }, - "1,47": { - "CellType": { - "$type": "ElementUI.ProgressCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='项目概况-关键数据'!AV2" - } - ] - }, - "value": "100", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!AV2" - }, - "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetBackgroundColor", - "ParameterValues": { - "color": "Accent 4 0" - } - } - ], - "ID": "19c4c16c-fcdd-48ef-972e-858614fc55f8" - } - ] - } - ], - "type": 2, - "color": "Accent 1" - } - }, - "1,55": { - "CellType": { - "$type": "ElementUI.ProgressCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='项目概况-关键数据'!BD2" - } - ] - }, - "value": "100", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!BD2" - }, - "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetBackgroundColor", - "ParameterValues": { - "color": "Accent 4 0" - } - } - ], - "ID": "bf7e9e0c-47e6-40bf-be9b-7641e1f30c3d" - } - ] - } - ], - "type": 2, - "color": "Accent 1" - } - }, - "1,63": { - "CellType": { - "$type": "ElementUI.ProgressCellType, ElementUI", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "='项目概况-关键数据'!BL2" - } - ] - }, - "value": "100", - "compareType": 2 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", - "TargetPageElement": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='项目概况-关键数据'!BL2" - }, - "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", - "MethodName": "SetBackgroundColor", - "ParameterValues": { - "color": "Accent 4 0" - } - } - ], - "ID": "29740066-593c-4493-9dc6-1aae086342f9" + "ID": "d1c82ad1-5c04-4308-8d7a-c40e9384ad0c" } ] } @@ -757,40 +683,54 @@ "GUID": "fe9b0d76-1afd-4719-8184-fbe9f6dd3939" } }, - "2,9": { + "2,8": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目预算工时", "GUID": "af4d7ca4-a6a8-4e94-b02f-1d8a0fdb070b" } }, - "2,17": { + "2,14": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目已分配工时", "GUID": "dfd4d65b-b273-4e08-979d-08f88f756788" } }, - "2,25": { + "2,20": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目可分配工时", "GUID": "c1b01a67-6f3f-4f1a-8535-06942fe7f124" } }, - "2,33": { + "2,26": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目总核定工时", "GUID": "ca06b778-4855-46ef-a81d-30289727bf94" } }, - "2,41": { + "2,32": { "BindingInfo": { "TableName": "项目平行视图", "ColumnName": "项目可核定工时", "GUID": "cf06885e-1f35-4806-a6e6-2f12ce865989" } + }, + "2,38": { + "BindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "项目预算费用", + "GUID": "bda2172c-8f02-4a0f-958e-216b79c4d6c0" + } + }, + "2,44": { + "BindingInfo": { + "TableName": "项目平行视图", + "ColumnName": "已消耗成本", + "GUID": "380b6a2c-ed60-4a0c-aacf-69f22f85dbf4" + } } }, "StyleDatas": { @@ -829,6 +769,12 @@ { "FontFamily": 0, "FontSize": 18.666666666666664 + }, + { + "FontFamily": 0, + "FontSize": 18.666666666666664, + "Formatter": 4, + "HorizontalAlignment": 3 } ], "Types": { @@ -836,14 +782,24 @@ "Body", "Text 1 50", "[AUTO]General", - "Left" + "Left", + " ¥#,##0; ¥-#,##0" ] }, "CellStyles": { - "0,23": 0, + "0,18": 0, + "0,19": 0, "0,24": 0, + "0,25": 0, + "0,28": 0, + "0,29": 0, + "0,30": 0, "0,31": 0, "0,32": 0, + "0,33": 0, + "0,34": 0, + "0,35": 0, + "0,36": 0, "0,37": 0, "0,38": 0, "0,39": 0, @@ -859,115 +815,91 @@ "0,49": 0, "0,50": 0, "0,51": 0, - "0,52": 0, - "0,53": 0, - "0,54": 0, - "0,55": 0, - "0,56": 0, - "0,57": 0, - "0,58": 0, - "0,59": 0, - "0,60": 0, - "0,61": 0, - "0,62": 0, - "0,63": 0, - "0,64": 0, - "0,65": 0, - "0,66": 0, - "0,67": 0, - "0,68": 0, "1,1": 1, + "1,6": 2, "1,7": 2, - "1,8": 2, - "1,9": 3, - "1,10": 0, - "1,11": 0, - "1,15": 2, - "1,16": 2, - "1,17": 4, - "1,18": 0, - "1,19": 0, - "1,23": 2, + "1,8": 3, + "1,12": 2, + "1,13": 2, + "1,14": 4, + "1,18": 2, + "1,19": 2, + "1,20": 4, + "1,21": 0, + "1,22": 0, + "1,23": 0, "1,24": 2, - "1,25": 4, - "1,26": 0, - "1,27": 0, + "1,25": 2, + "1,26": 4, "1,28": 0, "1,29": 0, - "1,30": 0, + "1,30": 2, "1,31": 2, - "1,32": 2, - "1,33": 4, + "1,32": 4, + "1,33": 0, "1,34": 0, "1,35": 0, - "1,37": 0, - "1,38": 0, - "1,39": 2, - "1,40": 2, - "1,41": 4, - "1,42": 0, - "1,43": 0, - "1,44": 0, + "1,36": 2, + "1,37": 2, + "1,38": 4, + "1,39": 0, + "1,40": 0, + "1,41": 0, + "1,42": 2, + "1,43": 2, + "1,44": 4, "1,45": 0, "1,46": 0, - "1,47": 2, + "1,47": 0, "1,48": 2, - "1,49": 4, - "1,50": 0, + "1,49": 2, + "1,50": 4, "1,51": 0, - "1,52": 0, - "1,53": 0, - "1,54": 0, - "1,55": 2, - "1,56": 2, - "1,57": 4, - "1,58": 0, - "1,59": 0, - "1,60": 0, - "1,61": 0, - "1,62": 0, - "1,63": 2, - "1,64": 2, - "1,65": 4, - "1,66": 0, - "1,67": 0, - "1,68": 0, "2,1": 5, - "2,8": 2, - "2,9": 6, - "2,16": 2, - "2,17": 6, - "2,24": 2, - "2,25": 6, + "2,7": 2, + "2,8": 6, + "2,13": 2, + "2,14": 6, + "2,19": 2, + "2,20": 6, + "2,21": 7, + "2,22": 7, + "2,23": 7, + "2,25": 2, + "2,26": 6, "2,28": 7, "2,29": 7, - "2,30": 7, - "2,32": 2, - "2,33": 6, - "2,37": 7, - "2,38": 7, - "2,40": 2, - "2,41": 6, - "2,44": 0, - "2,45": 7, + "2,31": 2, + "2,32": 6, + "2,33": 0, + "2,34": 7, + "2,35": 7, + "2,37": 2, + "2,38": 8, + "2,39": 0, + "2,40": 7, + "2,41": 7, + "2,43": 2, + "2,44": 8, + "2,45": 0, "2,46": 7, - "2,48": 2, - "2,49": 6, - "2,52": 0, - "2,53": 7, - "2,54": 7, - "2,56": 2, - "2,57": 6, - "2,60": 0, - "2,61": 7, - "2,62": 7, - "2,64": 2, - "2,65": 6, - "2,68": 0, - "3,23": 0, + "2,47": 7, + "2,49": 2, + "2,50": 8, + "2,51": 0, + "3,18": 0, + "3,19": 0, "3,24": 0, + "3,25": 0, + "3,28": 0, + "3,29": 0, + "3,30": 0, "3,31": 0, "3,32": 0, + "3,33": 0, + "3,34": 0, + "3,35": 0, + "3,36": 0, "3,37": 0, "3,38": 0, "3,39": 0, @@ -982,24 +914,7 @@ "3,48": 0, "3,49": 0, "3,50": 0, - "3,51": 0, - "3,52": 0, - "3,53": 0, - "3,54": 0, - "3,55": 0, - "3,56": 0, - "3,57": 0, - "3,58": 0, - "3,59": 0, - "3,60": 0, - "3,61": 0, - "3,62": 0, - "3,63": 0, - "3,64": 0, - "3,65": 0, - "3,66": 0, - "3,67": 0, - "3,68": 0 + "3,51": 0 }, "SheetStyle": { "FontFamily": 0, @@ -1007,23 +922,23 @@ } }, "Spans": [ - "2,1,1,3", - "2,9,1,3", - "2,17,1,3", - "2,25,1,3", - "2,33,1,3", - "2,57,1,3", - "2,65,1,3", - "1,7,2,1", - "1,15,2,1", - "1,23,2,1", - "1,31,2,1", - "2,41,1,3", - "1,39,2,1", - "2,49,1,3", - "1,55,2,1", - "1,63,2,1", - "1,47,2,1" + "2,1,1,2", + "2,8,1,1", + "2,14,1,1", + "2,20,1,1", + "2,26,1,1", + "2,50,1,1", + "1,6,2,1", + "1,12,2,1", + "1,18,2,1", + "1,24,2,1", + "2,32,1,1", + "1,30,2,1", + "1,42,2,1", + "1,48,2,1", + "1,36,2,1", + "2,44,1,1", + "2,38,1,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1043,7 +958,7 @@ }, "RowBreakLines": [], "RepeatRangeSettings": [], - "RelatedDataTableName": "View_项目统计信息" + "RelatedDataTableName": "项目平行视图" }, "PrintInfo": { "PaperSize": {}, @@ -1062,63 +977,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Size": "126,79" - }, - { - "Name": "6154fb52-2385-4d1d-abc8-01b77955c5f6.png", - "DisplayName": "背景图2", - "StyleInfo": { - "CornerRadius": 6.0, - "Fill": "Background 1 0", - "Stroke": "Background 2 0", - "StrokeThickness": 1.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "141,0", - "Size": "186,79" - }, - { - "Name": "769f904e-1d99-4edb-b1dc-4a48a3dcf371.png", - "DisplayName": "背景图3", - "StyleInfo": { - "CornerRadius": 6.0, - "Fill": "Background 1 0", - "Stroke": "Background 2 0", - "StrokeThickness": 1.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "342,0", - "Size": "186,79" - }, - { - "Name": "4cdb3ab8-4b9f-40b2-98ff-ca716a91f9cc.png", - "DisplayName": "背景图4", - "StyleInfo": { - "CornerRadius": 6.0, - "Fill": "Background 1 0", - "Stroke": "Background 2 0", - "StrokeThickness": 1.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "543,0", - "Size": "186,79" - }, - { - "Name": "6512132f-7136-446d-a971-e9f12489d7ab.png", - "DisplayName": "背景图5", - "StyleInfo": { - "CornerRadius": 6.0, - "Fill": "Background 1 0", - "Stroke": "Background 2 0", - "StrokeThickness": 1.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "744,0", - "Size": "186,79" + "Size": "122,79" }, { "Name": "BackgroundPicture5", @@ -1126,13 +985,14 @@ "StyleInfo": { "CornerRadius": 6.0, "Fill": "Background 1 0", - "Stroke": "Background 2 0", + "StrokeDashType": 8, + "Stroke": "Accent 3 60", "StrokeThickness": 1.0 }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "945,0", - "Size": "186,79" + "Location": "757,0", + "Size": "140,79" }, { "Name": "BackgroundPicture6", @@ -1140,41 +1000,98 @@ "StyleInfo": { "CornerRadius": 6.0, "Fill": "Background 1 0", - "Stroke": "Background 2 0", + "StrokeDashType": 8, + "Stroke": "Accent 1 60", "StrokeThickness": 1.0 }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "1146,0", - "Size": "186,79" + "Location": "912,0", + "Size": "140,79" }, { - "Name": "BackgroundPicture7", + "Name": "4cc3f375-967f-4c20-a1f5-a9b66f2839a3.png", "DisplayName": "背景图8", "StyleInfo": { "CornerRadius": 6.0, "Fill": "Background 1 0", - "Stroke": "Background 2 0", + "Stroke": "Accent 1 60", "StrokeThickness": 1.0 }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "1347,0", - "Size": "186,79" + "Location": "1067,0", + "Size": "140,79" }, { - "Name": "BackgroundPicture8", + "Name": "0614937a-7d96-4e0b-8b1c-c4701fcede46.png", "DisplayName": "背景图9", "StyleInfo": { "CornerRadius": 6.0, "Fill": "Background 1 0", - "Stroke": "Background 2 0", + "Stroke": "Accent 1 60", "StrokeThickness": 1.0 }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "1548,0", - "Size": "186,79" + "Location": "1222,0", + "Size": "140,79" + }, + { + "Name": "5e5fa821-6101-44d1-959a-dadbff8ab75c.png", + "DisplayName": "背景图10", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Accent 3 60", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "602,0", + "Size": "140,79" + }, + { + "Name": "f7949427-df0d-4238-b237-9779c890c230.png", + "DisplayName": "背景图11", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Accent 3 60", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "447,0", + "Size": "140,79" + }, + { + "Name": "619723af-23eb-4785-b07a-2fda558230c9.png", + "DisplayName": "背景图12", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Accent 3 60", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "292,0", + "Size": "140,79" + }, + { + "Name": "93fa6676-89a7-49d3-b9f3-09e3adffd54c.png", + "DisplayName": "背景图13", + "StyleInfo": { + "CornerRadius": 6.0, + "Fill": "Background 1 0", + "Stroke": "Accent 3 60", + "StrokeThickness": 1.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "137,0", + "Size": "140,79" } ] -}//gqGkq7X5iY8yG7cVdMTyV2M5I4A4M0b2DnSkXP4sQJNznhYeXPBgQOsuk0MgFESPhKeUTzYtNmX+xbMYTuJ9zC7G77VZQ02BvGOt/fKs/4eJCPwvGgyp7vGL97/C/YHIgBMKr0jaQEXlMhkM7cuAfV7yI8bufH+ui4ekEsD4KNTzOBdXY6XZA7J3vIgAHb2qJ0xFTQNqszqAc9Wa6O0xSpFjLVIAVcqHfDBW1CPzsBFT6x3Z7VzYOTnsUl8lj/OtcfMsevxWzwIs/zKGTgkjSYXeYX8wW/MSEYqthEtm1YOTSYzkqU4eY5fg4/HxbwYZKcrlMwGM4E8KM6LlXdpqLHYB3gakKnqY2CZjJ1lUrzNogd4g8yxFa5nfFth+QlUwcDsPQLLHAzad59GDpyDU/BZ6IrxAIk1FqKqyt7RRnhUxOUOc4ib4lJV+J9kIJIDxdrfGX+U1e1lpOWYyX0uWE5GW3a7nvUsAVfElozQAEbbCcr9WhSS9UTAP8QaenMWoeChedwPEmAgkv99xH/iSS2fxiZam+ytT0OLX+2PdsqLcLtP1qsRiB0fjuM9AvBygyaoIh7vIZTXfNLLQNUp5LwkZqbIxg1km6drQOgVLSiOc2O50JcCoJKoaynkyEdgVBLCKeTF+l2cxn5SceulsSt39HBicEYDwC0d7bT21JokA6QvsmhzPaZya6b9SE+WRYKCpDtDyY1OsXsP88nPJ1YyD4Dtr2HJEgaWucLZn0J2yw9xGMkqtMq7exsAF3RrMveeLotrS+aBBo3AGGVm3+e9qfRnxLJu2L0YrQpoy584H1DpuHvZzJ3NRRNdCbTvwl3vBIfJ/bUwr5jiYsk6+W5xzlArnW/e4TkQR8/qpKGe6P0BvvPjYC+x8qdCOS050kD8hTVVFWBuHjRRn3+KqOg==|920 \ No newline at end of file +}//A4J+CMkLjL+ySOnUvVErvjgMIFlk8LqaBDfrfo/DAfVu6YasPZXdmpnPIoixoVYrZwblpwY7tRKHDlejZMOfgtUAXBAnXPLxhCVI53VXjBdNLb9ooLQAYRPn9VHEMoZwJbDdAWrDP2TlO4RYYmTyKXrM76xn1Cr+a8vx2iLO8rs9ln23bherxpYIGF83SFR7JMlHfWa1CMw3/seBR/RjsJGRNjK9ECSETqyzS8xFfbEh/iOr9kKixKARum61cG6ZozFkTJmY5qdF5Ptp4iFApHyqVs/vXkeLZJmdE6K+ISncI6lCLsvNpE2JyEH4OaZAWBhbeelMcAHGQ98Yu+DFX4ZMZVYi/zaAkUccznnmgyui8M1bPY8spXBZg/gzxJI5khsMJnftYKDnNMkjyF8V3/bkbrGnMn0fwQjSzkcV/g68sNlXZXA91lwhwfS55nPkQhrcNoWmDMlTMqeoIxdGX5nriJR4mJPxCjdV9qfaj0W0VgQTBXfy/DW3c/sIBmWWynwUiaFTDX0blhZiU6al4hdd+hc6uj4bUC1p5GuvmVIbjXsF0OYRbshXC6hnqSCyW8MgTX1xYoTbDLb4xTGfFzepLTV/xoRNW4VT0cPgMNjFWTeRNGU5ZMkQIgwcHxLeHEtssDfHdMGBp8ATBgg6k2NLKyInw1P0EyzfvuyH2DXmbFo/mzNxHHkewt6HCBYkKaoT93pLtt5WqGC6S/tYQ7svGHJQbYc5kIq+2s0gElAD1cR8fAszE7jseEdjXm0P+3pu1NdYqUHprM3u6oDi+LmfG5TV30M0iF3RSjU9myS7m50hXF1lVqVlCJWYjq5CqY/wek1LKnc1JOTjpjA93Tj3/vTWwfbNZue3XC0Ufhc+hdojSTmViyqU6CMgMZPx0cgT94x1h62+hzA9r6QGcA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd index fee9044b..8fb4c07c 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况-关键数据.rd @@ -1,11 +1,14 @@ { "PageType": 0, - "ColumnCount": 72, + "ColumnCount": 55, "RowCount": 4, "Formulas": { - "1,15": "IFERROR(ROUNDUP(R3/J3*100,0),0)", - "1,23": "IFERROR(ROUNDUP(Z3/J3*100,0),0)", - "1,31": "IFERROR(ROUNDUP(AH3/R3*100,0),0)", - "1,39": "IFERROR(ROUNDUP(AP3/R3*100,0),0)" + "2,50": "AM3-AS3", + "1,18": "IFERROR(ROUNDUP(U3/I3*100,0),0)", + "1,30": "IFERROR(ROUNDUP(AG3/O3*100,0),0)", + "1,42": "IFERROR(ROUNDUP(AS3/AM3*100,0),0)", + "1,24": "IFERROR(ROUNDUP(AA3/O3*100,0),0)", + "1,48": "IFERROR(ROUNDUP(AY3/AM3*100,0),0)", + "1,12": "IFERROR(ROUNDUP(O3/I3*100,0),0)" } } \ No newline at end of file diff --git a/ServerCommands/AI/生成项目封面.json b/ServerCommands/AI/生成项目封面.json index 6d93a3cd..51b5014f 100644 --- a/ServerCommands/AI/生成项目封面.json +++ b/ServerCommands/AI/生成项目封面.json @@ -30,418 +30,478 @@ } ], "InvokeTriggerTestData": { - "UserName": "Administrator" + "UserName": "Administrator", + "RequestTimeout": 200 } } ], "Commands": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "当前用户", - "ParameterValue": "%CurrentUser%", - "ID": "9c163f975ec2446891416edb45305743" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "项目", - "TableValue": { - "TableName": "项目表", - "TableValueType": 1, - "BindingInfos": [ + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ { - "GUID": "73c17c0d-0abf-4448-8a7b-4eb92a3a5eed", - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目名称", - "GUID": "2e422ab6-d64e-4a2e-9ff2-9878808d3c5c" - }, - "ColumnName": "项目名称" + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前用户", + "ParameterValue": "%CurrentUser%", + "ID": "b9907689a4444b30ab6f2863f9702dda" }, { - "GUID": "970b4260-56c5-4764-8170-b78c8b716aaa", - "BindingInfo": { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目", + "TableValue": { "TableName": "项目表", - "ColumnName": "项目简介", - "GUID": "cc7282d1-923f-4221-b499-88fbf12d02ab" - }, - "ColumnName": "项目简介" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "deb5d689-0982-43f4-a5c0-7daeebaee349" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - "TopCount": "1" - }, - "ID": "5d735635c3964441b5e2a6c2c00d14d8" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目" - } - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "简介字数", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=LEN(项目.项目简介)" - }, - "ID": "1c3d13eac3964aeaa4e075aaa233ebc1" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ + "TableValueType": 1, + "BindingInfos": [ { - "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目.项目名称" - } - }, - "value": "%Null%", - "compareType": 1 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目.项目简介" - } - }, - "value": "%Null%", - "compareType": 1 - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", - "ParamObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=简介字数" - } - }, - "value": "12", - "compareType": 2 - } - ] + "GUID": "0c6372c7-35b2-4d8f-9a28-fddaf84330ec", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "2e422ab6-d64e-4a2e-9ff2-9878808d3c5c" }, - "CommandList": [ - { - "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", - "OperationParamaterPairs": [ - { - "Name": "role", - "Value": "user" - }, - { - "Name": "content", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"我的项目名称为：\"&项目.项目名称&\"，项目简介：\"&项目.项目简介&\"。请你发挥创意，帮我生成一段英文描述词，回复中请不要携带任何引导语、说明语，只能返回你生成的图片描述。\"" - } - } - ], - "OutParamaterName": "user" + "ColumnName": "项目名称" + }, + { + "GUID": "20c6bf15-496b-4ac0-822a-9c3df517f53c", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目简介", + "GUID": "cc7282d1-923f-4221-b499-88fbf12d02ab" + }, + "ColumnName": "项目简介" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "deb5d689-0982-43f4-a5c0-7daeebaee349" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + "TopCount": "1" + }, + "ID": "e91db780eb764a39bb3c08fe95083c24" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "简介字数", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=LEN(项目.项目简介)" }, - { - "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", - "InParamater": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=user" - }, - "Operation": 15, - "OutParamaterName": "消息列表" - }, - { - "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY", - "URL": "https://openai.api2d.net", - "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh", - "ORGANIZATION": "", - "IsDataSource": "json", - "MessageJSON": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=消息列表" - }, - "Parameter": { - "Model": 38, - "Temperature": 1.0, - "TopP": 1.0, - "MaxTokens": 100, - "SystemContent": "我需要为我的项目生成一张封面图片，需要你帮我生成Prompt英文关键词，用来描述这张图片，以便AI能够准确生成，你可以根据我提供的项目信息，来生成合适的图片描述，以职业、商务、工作主题为主，风格为真实摄影，场景可以是办公楼、办公室、工作场景等，灯光明亮自然，可以抽象一些，而且不要包含明显人物。需要注意的是，你的回复应该只包含我需要的描述，不需要任何其他引导性、说明性文字。", - "Response_format": "text" - }, - "Tools": [], - "ResultTo": "result", - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "Prompt", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result.content" - }, - "ID": "655e2ed0116d42d1910e21f5c52be130" - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "生成图片", - "Parameters": [ + "ID": "1c3d13eac3964aeaa4e075aaa233ebc1" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "Prompt", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=Prompt" - } - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "图片地址", - "ResultTo": { - "SerializeProperty": "图片地址" - } - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "ShowConfirm": false, - "RowsToUpdate": 1, - "RowsToUpdateCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目表", - "ColumnName": "ID", - "GUID": "e97813c0-1ef7-4799-9af9-b2e4b8af270a" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "项目封面", - "GUID": "b723f549-8cc0-4816-981e-9754b294aa55" + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目.项目名称" + } }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=图片地址" - } + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目.项目简介" + } + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=简介字数" + } + }, + "value": "12", + "compareType": 2 } ] }, - { - "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", - "OperationParamaterPairs": [ - { - "Name": "页面名称", - "Value": "项目首页" + "CommandList": [ + { + "$type": "MustachePlugin.Render, MustachePlugin", + "DataSrouce": "我的软件需要一个封面图片，项目的名称叫“{{项目名称}}”，简介：{{项目简介}}，请根据项目信息，推测它所在的行业和适合作为封面的场景，为我生成Prompt。我希望图片不要太花哨，颜色要纯净、高级。", + "UseCustomsDataHash": true, + "CustomsDataHash": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目" }, - { - "Name": "打开方式", - "Value": "跳转页面" - }, - { - "Name": "打开样式" - }, - { - "Name": "主题", - "Value": "成功" - }, - { - "Name": "传值", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "Name": "目标单元格", - "Value": "项目ID" - } - ], - "OutParamaterName": "参数对象" - }, - { - "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", - "NotificationName": "提醒通知", - "SendType": 1, - "UserNames": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户" + "SetMaxRecursionDepth": 512, + "ResultTo": "输出结果" }, - "Params": [ - { - "Name": "标题", - "Value": "任务完成" - }, - { - "Name": "内容", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"项目\"&项目.项目名称&\"的封面已经生成完毕，记得看看哦~\"" + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "role", + "Value": "user" + }, + { + "Name": "content", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=输出结果" + } } + ], + "OutParamaterName": "user" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=user" }, - { - "Name": "类型", - "Value": "打开页面", - "Remark": "分为：打开页面、执行命令..." + "Operation": 15, + "OutParamaterName": "消息列表" + }, + { + "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY", + "URL": "https://openai.api2d.net", + "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh", + "IsDataSource": "json", + "MessageJSON": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=消息列表" }, - { - "Name": "参数对象", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参数对象" + "Parameter": { + "Model": 38, + "Temperature": 1.0, + "TopP": 1.0, + "MaxTokens": 100, + "SystemContent": "你是一个专业的图片Prompt创意专家，你需要根据我给出的要求，生成一段英文Prompt，用于给AI生成图片。Prompt中你需要用英文关键词，对主题、场景、风格、灯光、角度、颜色、质感等等做详细描述，你的回复中只能包含最终生成的Prompt，不能有任何引导语、描述语。", + "Response_format": "text" + }, + "Tools": [], + "ResultTo": "result", + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "Prompt", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.content" + }, + "ID": "4cf035c0b1844b09a0afa97dd93b2a68" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "生成图片", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "Prompt", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Prompt" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "图片地址", + "ResultTo": { + "SerializeProperty": "图片地址" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "e97813c0-1ef7-4799-9af9-b2e4b8af270a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目封面", + "GUID": "b723f549-8cc0-4816-981e-9754b294aa55" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=图片地址" + } + } + ] + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "页面名称", + "Value": "项目首页" + }, + { + "Name": "打开方式", + "Value": "跳转页面" + }, + { + "Name": "打开样式" + }, + { + "Name": "主题", + "Value": "成功" + }, + { + "Name": "传值", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "Name": "目标单元格", + "Value": "项目ID" + } + ], + "OutParamaterName": "参数对象" + }, + { + "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", + "NotificationName": "提醒通知", + "SendType": 1, + "UserNames": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + }, + "Params": [ + { + "Name": "标题", + "Value": "任务完成" + }, + { + "Name": "内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"项目\"&项目.项目名称&\"的封面已经生成完毕，记得看看哦~\"" + } + }, + { + "Name": "类型", + "Value": "打开页面", + "Remark": "分为：打开页面、执行命令..." + }, + { + "Name": "参数对象", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参数对象" + } + } + ], + "ID": "2f75ccf37baf40af82ba7be5d052a5d6" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=图片地址" + } } - } - ], - "ID": "ae02abcafdb8482c9e99573b675aec20" - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "0", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=图片地址" + ] } - } - ] - } - ], - "ID": "97b5376b-8bfd-44f6-bd0d-55541e7f79cb" - }, - { - "CommandList": [ - { - "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", - "OperationParamaterPairs": [ - { - "Name": "页面名称", - "Value": "项目首页" - }, - { - "Name": "打开方式", - "Value": "跳转页面" - }, - { - "Name": "打开样式" - }, - { - "Name": "主题", - "Value": "成功" - }, - { - "Name": "传值", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目ID" - } - }, - { - "Name": "目标单元格", - "Value": "项目ID" - } - ], - "OutParamaterName": "参数对象" - }, - { - "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", - "NotificationName": "提醒通知", - "SendType": 1, - "UserNames": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=当前用户" + ], + "ID": "8313122a-ccd7-4205-a4c0-ccaa96b07fd9" }, - "Params": [ - { - "Name": "标题", - "Value": "生成项目图片失败" - }, - { - "Name": "内容", - "Value": "项目资料不全，请在项目简介中尽量详细说明项目背景、使用场景、使用人群等。" - }, - { - "Name": "类型", - "Value": "打开页面", - "Remark": "分为：打开页面、执行命令..." - }, - { - "Name": "参数对象", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参数对象" + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "项目资料不全，请在项目简介中尽量详细说明项目背景、使用场景、使用人群等。" } - } - ], - "ID": "b606031976ae49b1b07826ec41fdf9d8" - }, - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "项目资料不全，请在项目简介中尽量详细说明项目背景、使用场景、使用人群等。" - } - ], - "ID": "b4971823-fbd5-4791-afaf-9a2a62cba4de" + ], + "ID": "64bb754c-3f26-4d67-a73b-9c5e23c57a1b" + } + ] + } + ], + "ID": "dc5669cc-9c9a-4cb6-91cd-77e47f09e9c9" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "项目不存在" + } + ], + "ID": "1d51bd03-17f8-43f5-a9f2-b0de38ec89df" + } + ] + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "日志表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "409f3d0c-1e3c-409f-89fa-e35284eed38d" + }, + "Value": "AI生成项目封面" + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "427eb193-17cd-49c5-8b8a-c81d83289c47" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" } - ] - } - ], - "ID": "a30e9036-f58e-4e47-ba13-b6ad5e4a622f" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", - "ErrorCode": "400", - "Message": "项目不存在" - } - ], - "ID": "07d6d91c-0be5-4f83-9d70-ad51a869f295" - } - ] + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "6c1b5b7d-3076-4feb-8917-2e3ba41e4bb2" + }, + "Value": "错误" + } + ] + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "页面名称", + "Value": "项目首页" + }, + { + "Name": "打开方式", + "Value": "跳转页面" + }, + { + "Name": "打开样式" + }, + { + "Name": "主题", + "Value": "成功" + }, + { + "Name": "传值", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "Name": "目标单元格", + "Value": "项目ID" + } + ], + "OutParamaterName": "参数对象" + }, + { + "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", + "NotificationName": "提醒通知", + "SendType": 1, + "UserNames": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + }, + "Params": [ + { + "Name": "标题", + "Value": "生成项目图片失败" + }, + { + "Name": "内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + }, + { + "Name": "类型", + "Value": "打开页面", + "Remark": "分为：打开页面、执行命令..." + }, + { + "Name": "参数对象", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参数对象" + } + } + ], + "ID": "cfd62bd647df4e64ba3428d7f54370d9" + } + ] + } } ] } \ No newline at end of file diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json index d3f76180..6b1995c0 100644 --- a/Tables/任务/任务平行视图.json +++ b/Tables/任务/任务平行视图.json @@ -726,6 +726,14 @@ "Name": "子任务实际工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "已消耗成本", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "int", @@ -754,7 +762,7 @@ }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", - "Formula": "=IF([任务类型]=3,[本任务可核定工时],[可分配工时])", + "Formula": "=IF([任务类型]<>3,[本任务可核定工时],[可分配工时])", "Name": "动态可核定工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, @@ -789,7 +797,7 @@ "ConnectionId": "业务表", "SourceTableName": "任务平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH [任务递归CTE] AS (-- CTE to gather all tasks and their child tasks\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.[任务预算工时],\r\n\t\tCAST ( t.ID AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\t0 AS Depth \r\n\tFROM\r\n\t\t任务表 t \r\n\tWHERE\r\n\t\tt.[父任务ID] IS NULL\r\n\t\t\r\n\t\tUNION ALL\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.任务预算工时,\r\n\t\tCAST ( cte.TaskPath + '->' + CAST ( t.ID AS VARCHAR ( 50 ) ) AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\tcte.Depth + 1 AS Depth \r\n\tFROM\r\n\t\t任务表 t\r\n\t\tINNER JOIN [任务递归CTE] cte ON t.[父任务ID] = cte.ID\r\n\t),\r\n\t汇总工时 AS (-- Gather plan hours and actual hours from 任务工时表\r\n\tSELECT\r\n\t\t[任务ID],\r\n\t\tSUM ( CASE WHEN 工时类型 = '计划' THEN 工时 ELSE 0 END ) AS 计划工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 工时 ELSE 0 END ) AS 核定工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 上报工时 ELSE 0 END ) AS 实际工时汇总 \r\n\tFROM\r\n\t\t任务工时表 \r\n\tGROUP BY\r\n\t\t[任务ID] \r\n\t),\r\n\t任务汇总 AS (-- Sum up task hours with recursive sum of child tasks\r\n\tSELECT\r\n\t\tcte.ID,\r\n\t\tISNULL( SUM ( c.任务预算工时 ), 0 ) AS 子任务分配工时 \r\n\tFROM\r\n\t\t[任务递归CTE] cte\r\n\t\tLEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID AND c.[任务状态]>=1\r\n\tGROUP BY\r\n\t\tcte.ID \r\n\t),\r\n\t子任务核定工时汇总 AS (\r\n SELECT\r\n cte.ID,\r\n ISNULL(SUM(汇总.核定工时汇总), 0) AS 子任务核定工时汇总\r\n FROM\r\n [任务递归CTE] cte\r\n LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n GROUP BY\r\n cte.ID\r\n),\r\n子任务实际工时汇总 AS (\r\n SELECT\r\n cte.ID,\r\n ISNULL(SUM(汇总.实际工时汇总), 0) AS 子任务实际工时汇总\r\n FROM\r\n [任务递归CTE] cte\r\n LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n GROUP BY\r\n cte.ID\r\n),\r\n\t任务成员 AS ( \r\n\tSELECT \r\n\t[任务ID],\r\n\tSTRING_AGG ([任务成员],',') AS 任务成员,\r\n\tcount(*) AS [成员数量] \r\n\tFROM [任务成员表] \r\n\tGROUP BY [任务ID] \r\n\t)\r\n-- Final view definition\r\nSELECT\r\n t.*,\r\n (CASE WHEN t.[任务状态]>=1 THEN t.任务预算工时 ELSE 0 END )AS 总分配工时,\r\n ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0) AS 已分配工时,\r\n\t\tISNULL(汇总.计划工时汇总, 0) AS 本任务已分配工时,\r\n\t\tISNULL(任务汇总.子任务分配工时, 0) AS 子任务已分配工时,\r\n t.任务预算工时 - (ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0)) AS 可分配工时,\r\n ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 总核定工时,\r\n\t\tISNULL(汇总.核定工时汇总, 0) AS 本任务核定工时,\r\n\t\tISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务核定工时,\r\n (t.任务预算工时 - (ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0))) AS 可核定工时,\r\n\t\tISNULL(汇总.计划工时汇总, 0) - ISNULL(汇总.核定工时汇总, 0) AS 本任务可核定工时,\r\n\t\tISNULL(任务汇总.子任务分配工时, 0) - ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务可核定工时,\r\n ISNULL(汇总.实际工时汇总, 0) + ISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 实际工时,\r\n\t\tISNULL(汇总.实际工时汇总, 0) AS 本任务实际工时,\r\n\t\tISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 子任务实际工时,\r\n 成员.[成员数量],\r\n 成员.[任务成员]\r\nFROM\r\n 任务表 t\r\n LEFT JOIN 汇总工时 汇总 ON t.ID = 汇总.[任务ID]\r\n LEFT JOIN 任务汇总 任务汇总 ON t.ID = 任务汇总.ID\r\n LEFT JOIN 子任务核定工时汇总 子任务核定工时汇总 ON t.ID = 子任务核定工时汇总.ID\r\n LEFT JOIN 子任务实际工时汇总 子任务实际工时汇总 ON t.ID = 子任务实际工时汇总.ID\r\n LEFT JOIN 任务成员 成员 ON t.ID = 成员.[任务ID];", + "CreateViewSql": "WITH [任务递归CTE] AS (-- CTE to gather all tasks and their child tasks\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.[任务预算工时],\r\n\t\tCAST ( t.ID AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\t0 AS Depth \r\n\tFROM\r\n\t\t任务表 t \r\n\tWHERE\r\n\t\tt.[父任务ID] IS NULL\r\n\t\t\r\n\t\tUNION ALL\r\n\tSELECT\r\n\t\tt.ID,\r\n\t\tt.[父任务ID],\r\n\t\tt.任务预算工时,\r\n\t\tCAST ( cte.TaskPath + '->' + CAST ( t.ID AS VARCHAR ( 50 ) ) AS VARCHAR ( MAX ) ) AS TaskPath,\r\n\t\tcte.Depth + 1 AS Depth \r\n\tFROM\r\n\t\t任务表 t\r\n\t\tINNER JOIN [任务递归CTE] cte ON t.[父任务ID] = cte.ID\r\n\t),\r\n\t汇总工时 AS (-- Gather plan hours and actual hours from 任务工时表\r\n\tSELECT\r\n\t\t[任务ID],\r\n\t\tSUM ( CASE WHEN 工时类型 = '计划' THEN 工时 ELSE 0 END ) AS 计划工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 工时 ELSE 0 END ) AS 核定工时汇总,\r\n\t\tSUM ( CASE WHEN 工时类型 = '实际' THEN 上报工时 ELSE 0 END ) AS 实际工时汇总,\r\n\t\tSUM (CASE WHEN 工时类型 = '实际' THEN [时薪单价]*[提成系数]*[工时] ELSE 0 END) AS 收益汇总\r\n\t \r\n\tFROM\r\n\t\t任务工时表 \r\n\tGROUP BY\r\n\t\t[任务ID] \r\n\t),\r\n\t任务汇总 AS (-- Sum up task hours with recursive sum of child tasks\r\n\tSELECT\r\n\t\tcte.ID,\r\n\t\tISNULL( SUM ( c.任务预算工时 ), 0 ) AS 子任务分配工时 \r\n\tFROM\r\n\t\t[任务递归CTE] cte\r\n\t\tLEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID AND c.[任务状态]>=1\r\n\tGROUP BY\r\n\t\tcte.ID \r\n\t),\r\n\t子任务核定工时汇总 AS (\r\n SELECT\r\n cte.ID,\r\n ISNULL(SUM(汇总.核定工时汇总), 0) AS 子任务核定工时汇总\r\n FROM\r\n [任务递归CTE] cte\r\n LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n GROUP BY\r\n cte.ID\r\n),\r\n子任务实际工时汇总 AS (\r\n SELECT\r\n cte.ID,\r\n ISNULL(SUM(汇总.实际工时汇总), 0) AS 子任务实际工时汇总\r\n FROM\r\n [任务递归CTE] cte\r\n LEFT JOIN 任务表 c ON c.[父任务ID] = cte.ID\r\n LEFT JOIN 汇总工时 汇总 ON c.ID = 汇总.[任务ID]\r\n GROUP BY\r\n cte.ID\r\n),\r\n\t任务成员 AS ( \r\n\tSELECT \r\n\t[任务ID],\r\n\tSTRING_AGG ([任务成员],',') AS 任务成员,\r\n\tcount(*) AS [成员数量] \r\n\tFROM [任务成员表] \r\n\tGROUP BY [任务ID] \r\n\t)\r\n-- Final view definition\r\nSELECT\r\n t.*,\r\n (CASE WHEN t.[任务状态]>=1 THEN t.任务预算工时 ELSE 0 END )AS 总分配工时,\r\n ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0) AS 已分配工时,\r\n\t\tISNULL(汇总.计划工时汇总, 0) AS 本任务已分配工时,\r\n\t\tISNULL(任务汇总.子任务分配工时, 0) AS 子任务已分配工时,\r\n t.任务预算工时 - (ISNULL(汇总.计划工时汇总, 0) + ISNULL(任务汇总.子任务分配工时, 0)) AS 可分配工时,\r\n ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 总核定工时,\r\n\t\tISNULL(汇总.核定工时汇总, 0) AS 本任务核定工时,\r\n\t\tISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务核定工时,\r\n (t.任务预算工时 - (ISNULL(汇总.核定工时汇总, 0) + ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0))) AS 可核定工时,\r\n\t\tISNULL(汇总.计划工时汇总, 0) - ISNULL(汇总.核定工时汇总, 0) AS 本任务可核定工时,\r\n\t\tISNULL(任务汇总.子任务分配工时, 0) - ISNULL(子任务核定工时汇总.子任务核定工时汇总, 0) AS 子任务可核定工时,\r\n ISNULL(汇总.实际工时汇总, 0) + ISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 实际工时,\r\n\t\tISNULL(汇总.实际工时汇总, 0) AS 本任务实际工时,\r\n\t\tISNULL(子任务实际工时汇总.子任务实际工时汇总, 0) AS 子任务实际工时,\r\n\t\tISNULL(汇总.收益汇总, 0) AS 已消耗成本,\r\n 成员.[成员数量],\r\n 成员.[任务成员]\r\nFROM\r\n 任务表 t\r\n LEFT JOIN 汇总工时 汇总 ON t.ID = 汇总.[任务ID]\r\n LEFT JOIN 任务汇总 任务汇总 ON t.ID = 任务汇总.ID\r\n LEFT JOIN 子任务核定工时汇总 子任务核定工时汇总 ON t.ID = 子任务核定工时汇总.ID\r\n LEFT JOIN 子任务实际工时汇总 子任务实际工时汇总 ON t.ID = 子任务实际工时汇总.ID\r\n LEFT JOIN 任务成员 成员 ON t.ID = 成员.[任务ID];", "ViewInfo": { "ViewName": "任务平行视图", "QueryColumns": [ diff --git a/Tables/项目/项目平行视图.json b/Tables/项目/项目平行视图.json index 838aa6f7..2325aae8 100644 --- a/Tables/项目/项目平行视图.json +++ b/Tables/项目/项目平行视图.json @@ -494,28 +494,11 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "Required": true, "DatabaseColumnType": "float", "MaxLength": -1, "Name": "项目总分配工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "Required": true, - "DatabaseColumnType": "float", - "MaxLength": -1, - "Name": "项目已分配工时", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "Required": true, - "DatabaseColumnType": "float", - "MaxLength": -1, - "Name": "项目可分配工时", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "Required": true, @@ -539,6 +522,28 @@ "MaxLength": -1, "Name": "项目实际工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "已消耗成本", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "项目已分配工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "项目可分配工时", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -547,7 +552,7 @@ "ConnectionId": "业务表", "SourceTableName": "项目平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n\tp.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n (\r\n SELECT\r\n STRING_AGG([项目成员], ',')\r\n FROM\r\n [项目成员表]\r\n WHERE\r\n [项目ID] = p.ID\r\n ) AS 项目成员,\r\n ISNULL(SUM(t.[总分配工时]), 0) AS 项目总分配工时,\r\n ISNULL(SUM(t.[已分配工时]), 0) AS 项目已分配工时,\r\n ISNULL(SUM(t.[可分配工时]), 0) AS 项目可分配工时,\r\n ISNULL(SUM(t.[总核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[实际工时]), 0) AS 项目实际工时\r\n\r\nFROM [dbo].[项目表] p\r\nLEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\nGROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\np.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier;", + "CreateViewSql": "WITH c1 AS (\r\n SELECT\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier,\r\n (\r\n SELECT STRING_AGG([项目成员], ',')\r\n FROM [项目成员表]\r\n WHERE [项目ID] = p.ID\r\n ) AS 项目成员,\r\n p.[项目预算工时] AS 项目总分配工时,\r\n ISNULL(SUM(t.[总核定工时]), 0) AS 项目总核定工时,\r\n ISNULL(SUM(t.[本任务可核定工时]), 0) AS 项目可核定工时,\r\n ISNULL(SUM(t.[实际工时]), 0) AS 项目实际工时,\r\n\t\t\t\tISNULL(SUM(t.[已消耗成本]), 0) AS 已消耗成本\r\n FROM [dbo].[项目表] p\r\n LEFT JOIN [任务平行视图] t ON p.ID = t.[项目ID]\r\n GROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目代号],\r\n p.[项目简介],\r\n p.[项目封面],\r\n p.[项目经理],\r\n p.[项目分组],\r\n p.[所属客户],\r\n p.[所属客户部门],\r\n p.[工时分配方式],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[公开],\r\n p.[严格模式],\r\n p.[计划开始日期],\r\n p.[计划完成日期],\r\n p.[项目方案],\r\n p.[预算方案],\r\n p.[网络资源],\r\n p.[开启反馈收集],\r\n p.[项目状态],\r\n p.[立项流程示例ID],\r\n p.[删除],\r\n p.FGC_Creator,\r\n p.FGC_CreateDate,\r\n p.FGC_LastModifier\r\n)\r\nSELECT\r\n c1.*,\r\n x.项目已分配工时,\r\n c1.[项目预算工时] - x.项目已分配工时 AS 项目可分配工时\r\nFROM c1\r\nOUTER APPLY (\r\n SELECT ISNULL(SUM(t.[总分配工时]), 0) AS 项目已分配工时\r\n FROM [任务平行视图] t \r\n WHERE c1.ID = t.[项目ID] AND t.[父任务ID] IS NULL\r\n) x", "ViewInfo": { "ViewName": "项目平行视图", "QueryColumns": [ diff --git a/Upload/3f4beb7f-df0f-40a0-8457-c833a332f924_新生成的图片.png b/Upload/3f4beb7f-df0f-40a0-8457-c833a332f924_新生成的图片.png new file mode 100644 index 00000000..e57738e2 Binary files /dev/null and b/Upload/3f4beb7f-df0f-40a0-8457-c833a332f924_新生成的图片.png differ diff --git a/Upload/6955d4b4-16ef-4ec6-87cd-d021d48c27c4_新生成的图片.png b/Upload/6955d4b4-16ef-4ec6-87cd-d021d48c27c4_新生成的图片.png new file mode 100644 index 00000000..e57738e2 Binary files /dev/null and b/Upload/6955d4b4-16ef-4ec6-87cd-d021d48c27c4_新生成的图片.png differ diff --git a/Upload/ea205b17-51f0-4c25-8484-6026eeffc4fc_新生成的图片.png b/Upload/ea205b17-51f0-4c25-8484-6026eeffc4fc_新生成的图片.png new file mode 100644 index 00000000..151b9cec Binary files /dev/null and b/Upload/ea205b17-51f0-4c25-8484-6026eeffc4fc_新生成的图片.png differ diff --git a/Upload/f5e49362-3d64-4cf5-b8ca-b3bb89bdd7fa_新生成的图片.png b/Upload/f5e49362-3d64-4cf5-b8ca-b3bb89bdd7fa_新生成的图片.png new file mode 100644 index 00000000..151b9cec Binary files /dev/null and b/Upload/f5e49362-3d64-4cf5-b8ca-b3bb89bdd7fa_新生成的图片.png differ diff --git a/UserControlPages/任务统计信息.json b/UserControlPages/任务统计信息.json index c2f8efc8..090c80d5 100644 --- a/UserControlPages/任务统计信息.json +++ b/UserControlPages/任务统计信息.json @@ -126,7 +126,7 @@ }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 18.0, + "DesignLengthInPixel": 23.0, "IsHidden": true } }, @@ -234,7 +234,7 @@ }, "24": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 18.0, + "DesignLengthInPixel": 15.0, "IsHidden": true } }, @@ -270,47 +270,11 @@ }, "30": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0, + "DesignLengthInPixel": 20.0, "IsHidden": true } }, "31": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true - } - }, - "32": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 110.0, - "IsHidden": true - } - }, - "33": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 18.0, - "IsHidden": true - } - }, - "34": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true - } - }, - "35": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true - } - }, - "36": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0, - "IsHidden": true - } - }, - "37": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0, "Mode": 2, @@ -348,39 +312,29 @@ 27, 28, 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36 + 30 ], - "Count": 38 + "Count": 32 }, "Values": { - "2,2": "总工时/已分配", + "2,2": "可分配工时", "2,8": "已分配工时(本任务)", - "2,14": "可分配工时(全部)", - "2,20": "已核定工时(本任务)", - "2,26": "可核定工时(本任务)", - "2,32": "实际工时(本任务)", + "2,14": "已核定工时(本任务)", + "2,20": "可核定工时(本任务)", + "2,26": "实际工时(本任务)", "4,2": 0, "4,8": 0, "4,14": 0, "4,20": 0, "4,26": 0, - "4,32": 0, "8,8": "已分配工时(子任务)", - "8,14": "可分配工时(子任务)", - "8,20": "已核定工时(子任务)", - "8,26": "可核定工时(子任务)", - "8,32": "实际工时(子任务)", + "8,14": "已核定工时(子任务)", + "8,20": "可核定工时(子任务)", + "8,26": "实际工时(子任务)", "10,8": 0, "10,14": 0, "10,20": 0, - "10,26": 0, - "10,32": 0 + "10,26": 0 }, "Formulas": { "2,4": "IF(C14,E14,D14)" @@ -415,8 +369,8 @@ "4,2": { "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "已分配工时_总分配工时", - "GUID": "a6f10e31-86d0-4074-834c-99702cf400a0" + "ColumnName": "可分配工时", + "GUID": "2395fd02-81a2-4e51-8a89-3bfd4b4710ad" } }, "4,8": { @@ -430,16 +384,6 @@ ] }, "4,14": { - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "可分配工时", - "GUID": "a83e1841-87ea-43f7-a886-2446df3deeb0" - }, - "RulesGuidList": [ - "514b34fb-6b2f-4811-b5ab-a03d9a471bd5" - ] - }, - "4,20": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "本任务核定工时", @@ -449,7 +393,7 @@ "514b34fb-6b2f-4811-b5ab-a03d9a471bd5" ] }, - "4,26": { + "4,20": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "本任务可核定工时", @@ -459,7 +403,7 @@ "514b34fb-6b2f-4811-b5ab-a03d9a471bd5" ] }, - "4,32": { + "4,26": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "本任务实际工时", @@ -489,16 +433,6 @@ ] }, "10,14": { - "BindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "可分配工时", - "GUID": "30c20aff-5bbf-42af-9d42-a834566effbf" - }, - "RulesGuidList": [ - "514b34fb-6b2f-4811-b5ab-a03d9a471bd5" - ] - }, - "10,20": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "子任务核定工时", @@ -508,7 +442,7 @@ "514b34fb-6b2f-4811-b5ab-a03d9a471bd5" ] }, - "10,26": { + "10,20": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "子任务可核定工时", @@ -518,7 +452,7 @@ "514b34fb-6b2f-4811-b5ab-a03d9a471bd5" ] }, - "10,32": { + "10,26": { "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "子任务实际工时", @@ -540,7 +474,7 @@ { "Location": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务统计信息!G:AK" + "SerializeProperty": "=任务统计信息!G:AE" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -628,6 +562,8 @@ "0,3": 0, "0,4": 0, "0,5": 0, + "0,6": 0, + "0,7": 0, "0,8": 0, "0,9": 0, "0,10": 0, @@ -644,23 +580,19 @@ "0,21": 0, "0,22": 0, "0,23": 0, - "0,24": 0, "0,25": 0, "0,26": 0, "0,27": 0, "0,28": 0, "0,29": 0, - "0,31": 0, - "0,32": 0, - "0,33": 0, - "0,34": 0, - "0,35": 0, - "0,36": 0, + "0,30": 0, "1,1": 0, "1,2": 0, "1,3": 0, "1,4": 0, "1,5": 0, + "1,6": 0, + "1,7": 0, "1,8": 0, "1,9": 0, "1,10": 0, @@ -677,23 +609,19 @@ "1,21": 0, "1,22": 0, "1,23": 0, - "1,24": 0, "1,25": 0, "1,26": 0, "1,27": 0, "1,28": 0, "1,29": 0, - "1,31": 0, - "1,32": 0, - "1,33": 0, - "1,34": 0, - "1,35": 0, - "1,36": 0, + "1,30": 0, "2,1": 0, "2,2": 1, "2,3": 2, "2,4": 2, "2,5": 2, + "2,6": 2, + "2,7": 0, "2,8": 2, "2,9": 2, "2,10": 3, @@ -710,23 +638,19 @@ "2,21": 2, "2,22": 3, "2,23": 2, - "2,24": 2, "2,25": 0, "2,26": 2, "2,27": 2, "2,28": 3, "2,29": 2, - "2,31": 0, - "2,32": 2, - "2,33": 2, - "2,34": 3, - "2,35": 2, - "2,36": 2, + "2,30": 2, "3,1": 0, "3,2": 2, "3,3": 2, "3,4": 2, "3,5": 2, + "3,6": 2, + "3,7": 0, "3,8": 2, "3,9": 2, "3,10": 2, @@ -743,23 +667,20 @@ "3,21": 2, "3,22": 2, "3,23": 2, - "3,24": 2, "3,25": 0, "3,26": 2, "3,27": 2, "3,28": 2, "3,29": 2, - "3,31": 0, - "3,32": 2, - "3,33": 2, - "3,34": 2, - "3,35": 2, - "3,36": 2, + "3,30": 2, "4,1": 0, "4,2": 4, "4,4": 5, "4,5": 5, + "4,6": 5, + "4,7": 0, "4,8": 5, + "4,9": 0, "4,10": 5, "4,11": 5, "4,12": 5, @@ -772,17 +693,14 @@ "4,20": 5, "4,22": 5, "4,23": 5, - "4,24": 5, "4,25": 0, "4,26": 5, "4,28": 5, "4,29": 5, - "4,31": 0, - "4,32": 5, - "4,34": 5, - "4,35": 5, - "4,36": 5, + "4,30": 5, "5,1": 0, + "5,6": 5, + "5,7": 0, "5,8": 5, "5,9": 5, "5,10": 5, @@ -799,18 +717,14 @@ "5,21": 5, "5,22": 5, "5,23": 5, - "5,24": 5, "5,25": 0, "5,26": 5, "5,27": 5, "5,28": 5, "5,29": 5, - "5,31": 0, - "5,32": 5, - "5,33": 5, - "5,34": 5, - "5,35": 5, - "5,36": 5, + "5,30": 5, + "6,6": 0, + "6,7": 0, "6,8": 0, "6,9": 0, "6,10": 0, @@ -827,18 +741,12 @@ "6,21": 0, "6,22": 0, "6,23": 0, - "6,24": 0, "6,25": 0, "6,26": 0, "6,27": 0, "6,28": 0, "6,29": 0, - "6,31": 0, - "6,32": 0, - "6,33": 0, - "6,34": 0, - "6,35": 0, - "6,36": 0, + "6,30": 0, "7,0": 0, "7,6": 0, "7,7": 0, @@ -866,12 +774,6 @@ "7,29": 0, "7,30": 0, "7,31": 0, - "7,32": 0, - "7,33": 0, - "7,34": 0, - "7,35": 0, - "7,36": 0, - "7,37": 0, "8,0": 0, "8,6": 2, "8,7": 0, @@ -885,22 +787,16 @@ "8,15": 2, "8,16": 3, "8,17": 2, - "8,18": 2, + "8,18": 0, "8,19": 0, "8,20": 2, "8,21": 2, - "8,22": 3, - "8,23": 2, - "8,24": 0, - "8,25": 0, "8,26": 2, "8,27": 2, - "8,32": 2, - "8,33": 2, - "8,34": 3, - "8,35": 2, - "8,36": 2, - "8,37": 0, + "8,28": 3, + "8,29": 2, + "8,30": 2, + "8,31": 0, "9,0": 0, "9,6": 2, "9,7": 0, @@ -914,26 +810,21 @@ "9,15": 2, "9,16": 2, "9,17": 2, - "9,18": 2, + "9,18": 0, "9,19": 0, "9,20": 2, "9,21": 2, - "9,22": 2, - "9,23": 2, - "9,24": 0, - "9,25": 0, "9,26": 2, "9,27": 2, - "9,32": 2, - "9,33": 2, - "9,34": 2, - "9,35": 2, - "9,36": 2, - "9,37": 0, + "9,28": 2, + "9,29": 2, + "9,30": 2, + "9,31": 0, "10,0": 0, "10,6": 5, "10,7": 0, "10,8": 5, + "10,9": 0, "10,10": 5, "10,11": 5, "10,12": 5, @@ -941,21 +832,16 @@ "10,14": 5, "10,16": 5, "10,17": 5, - "10,18": 5, + "10,18": 0, "10,19": 0, "10,20": 5, - "10,22": 5, - "10,23": 5, - "10,24": 0, - "10,25": 0, "10,26": 5, - "10,32": 5, - "10,34": 5, - "10,35": 5, - "10,36": 5, - "10,37": 0, + "10,28": 5, + "10,29": 5, + "10,30": 5, + "10,31": 0, "11,0": 0, - "11,6": 0, + "11,6": 5, "11,7": 0, "11,8": 5, "11,9": 5, @@ -973,25 +859,21 @@ "11,21": 5, "11,22": 5, "11,23": 5, - "11,24": 5, + "11,24": 0, "11,25": 0, "11,26": 5, "11,27": 5, "11,28": 5, "11,29": 5, - "11,30": 0, + "11,30": 5, "11,31": 0, - "11,32": 5, - "11,33": 5, - "11,34": 5, - "11,35": 5, - "11,36": 5, - "11,37": 0, "12,1": 0, "12,2": 0, "12,3": 0, "12,4": 0, "12,5": 0, + "12,6": 0, + "12,7": 0, "12,8": 0, "12,9": 0, "12,10": 0, @@ -1008,22 +890,18 @@ "12,21": 0, "12,22": 0, "12,23": 0, - "12,24": 0, "12,25": 0, "12,26": 0, "12,27": 0, "12,28": 0, "12,29": 0, - "12,31": 0, - "12,32": 0, - "12,33": 0, - "12,34": 0, - "12,35": 0, - "12,36": 0, + "12,30": 0, "13,1": 0, "13,3": 2, "13,4": 2, "13,5": 0, + "13,6": 0, + "13,7": 0, "13,8": 0, "13,9": 0, "13,10": 0, @@ -1040,46 +918,36 @@ "13,21": 0, "13,22": 0, "13,23": 0, - "13,24": 0, "13,25": 0, "13,26": 0, "13,27": 0, "13,28": 0, "13,29": 0, - "13,31": 0, - "13,32": 0, - "13,33": 0, - "13,34": 0, - "13,35": 0, - "13,36": 0 + "13,30": 0 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "2,8,1,2", "2,14,1,2", "2,20,1,2", + "2,2,1,2", "2,26,1,2", "4,14,1,2", - "2,2,1,2", - "2,32,1,2", - "4,8,1,2", "4,20,1,2", "4,26,1,2", - "4,32,1,2", - "8,8,1,2", "8,14,1,2", "8,20,1,2", "8,26,1,2", - "8,32,1,2", - "10,8,1,2", "10,14,1,2", "10,20,1,2", "10,26,1,2", - "10,32,1,2", "5,1,7,5", + "2,8,1,2", + "4,8,1,2", + "8,8,1,2", + "10,8,1,2", "4,2,1,2" ], "PageInfo": { @@ -1130,7 +998,7 @@ ] } ], - "ID": "f25cac48-8de5-4469-a88e-fb29ddea7c17" + "ID": "8f8a6db6-9df3-4274-9385-6a8b18393d48" }, { "CommandList": [ @@ -1154,7 +1022,7 @@ ] } ], - "ID": "c7f8cff5-2fff-4738-a187-3f19de4d657a" + "ID": "9011c319-31e1-45f6-9a40-d580ce7ee909" } ], "Disabled": true @@ -1199,7 +1067,7 @@ ] } ], - "ID": "399610f5-ccf7-4e18-8a6e-8bfac65bd7e5" + "ID": "be882799-6647-4a64-9290-86af92056e9e" }, { "CommandList": [ @@ -1223,7 +1091,7 @@ ] } ], - "ID": "3085cabd-d46f-41f9-a8fa-94f16a33680b" + "ID": "699d90a7-b0d9-49d7-9535-2cd1e6ec3420" } ], "Disabled": true @@ -1269,8 +1137,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "229,12", - "Size": "188,100", + "Location": "211,12", + "Size": "0,100", "BoxShadowString": "1 6 0 14 #06000000" }, { @@ -1284,7 +1152,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "435,12", + "Location": "234,12", "Size": "188,100", "BoxShadowString": "1 6 0 14 #06000000" }, @@ -1299,7 +1167,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "641,12", + "Location": "440,12", "Size": "188,100", "BoxShadowString": "1 6 0 14 #06000000" }, @@ -1314,7 +1182,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "847,12", + "Location": "646,12", "Size": "188,100", "BoxShadowString": "1 6 0 14 #06000000" }, @@ -1329,8 +1197,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "229,136", - "Size": "188,100", + "Location": "211,136", + "Size": "0,100", "BoxShadowString": "1 6 0 14 #06000000" }, { @@ -1344,7 +1212,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "435,136", + "Location": "234,136", "Size": "188,100", "BoxShadowString": "1 6 0 14 #06000000" }, @@ -1359,7 +1227,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "641,136", + "Location": "440,136", "Size": "188,100", "BoxShadowString": "1 6 0 14 #06000000" }, @@ -1374,7 +1242,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "847,136", + "Location": "646,136", "Size": "188,100", "BoxShadowString": "1 6 0 14 #06000000" }, @@ -1405,7 +1273,7 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "1050,12", + "Location": "849,12", "Size": "188,100", "BoxShadowString": "1 6 0 14 #06000000" }, @@ -1420,9 +1288,9 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "1050,136", + "Location": "849,136", "Size": "188,100", "BoxShadowString": "1 6 0 14 #06000000" } ] -}//5gePlVnzL13l4D786emTheUR7nA01DuN3mAn48RfQtOUHqOZ+zRZjaioqMmbMihyDprp8PaBNrRBF23YzRHKHBbUiW6/F+mAGXaO00hPSFJ/lgXFsk3svRYF/jxNX0Iok/xSnWRWAdJ6vRV+5RCnK6tdjEkZC5Ae2be/+FXiMARrAEQtC9BEBYwjwvt3U8vJGWtUiZIbz0gMMLO6MmcAP03+pEgt0Cmv6qXg//2uzxsNVp5Q++0w4gfs2eBasijd0GL+LVzy9bU3TIJK9+cQhTFG+YTKJX6nvRRwjsF2CTap8tWc3snUNC+WS0YeP3n1aimSat8Ixqbgs3Yz5vDnys5ljDG1fsKFCm1TMK3SRJ8IPXcdkl+HQenxgtlCrjBrPt0UrUumtMDPkOFiA9dc1aTl1rwNuTdWGf3a6p1ft4WtDUtQbfzhBX1XiaR99xXZwnX4JKBVGfIpm3cAxuJZBq4kAvInAHhwuEH8qkq8zYfNOh1ccB6Z+7c5eWB9LTKhrsRvWxJlYOyx61sXL5AfJ8lSM1dakvpsExqGgLIPEAxN6rR7CaAN/MTvAG1Z27Ntvn2ENtvowK8DC63XhUgbPLmHpSRw8qbu5k8/G7KeAx2X05Xysl+X9e6VU7Fsm1ScFXRHijva0FNuxTis3QegbLU0zIfytoJVNNZCX6H1ljFt6ahu/KN+8fZg5iJH7cZ4muppnx2E2LiMldTKLcvbNrs3NWa4nPBJfI80H0dvO8TfHFxXptzkxNnrqoUDbSnYa6024zev7IcYT9R0QaiBWjEkzMxRbuGrLBXfF8hBusIMSsY7+u9hSTxocy3z3yYI6QUNrZhKFwF6UnpUXtRGp20PJGenNN/jFr4KHAU8fiAirmXlXzixymAsiTMHDCw0KNq33QsJgLuH3GdfFRd+sg==|920 \ No newline at end of file +}//WZTvCW7xW3H4VFuHLyZNLWJR49FkCpSjr9oGrk3riKD4gRMTqPSa4RJz6ciHnBIQZC3Cr44ko0XI6b3j8++u0UoKMaWktwpTFsNGs2WXEBNUzGeXaK8K94/Ult7uF86Tuf/oNNNfdU/R9IVgUl/7WcxDX3PwZ9FHfxlWdoc7jyLVN3o3kugLnhFshlbzsT/TaNFlg0xSsy/ZzF7BiXiiOvJQyB4b7YVGov70dtHCnnpesrirNMkmu6stTKKTdNveD8keIxwQnU+SAfwbn6u+0oZQ6g3ROIZOEi4YpaxfKYHE0agNu2/qmPktoelkuwnbj9D44AroPEqUoYhN9eG+dpy9gU/fJG9HE9TRhCHOcLrg0609w+mcbfH9Hov4hazo+3R1nmuZSimnDx0sxCOAIQC2tCk/rc/bQ7atjMfx9w+VZpoaMzzP2mLYeL3hYgxLYAv8ELBWUtMxk+3y8uSbtfUC7Kl9T2zGyYCKRSNzq5IndSGgrTg2GnVdmKMsPVDZri4yBEF2qwKcK2tbcwBYz1LkSyaynYVNp5SSQAoc89wZJWIvem/d0TNj8Z+JYT9lXCKDILtVhw9KFoi9HVRwX/P7wDRbuZeZeAKvuGQaZbAPVIwaHuzgJuTV3acVyOC5puGeJR+HkN6g5cpb695IBDJ2gy3Nj45v7X6DfdGbym+mNv41Um032xTygwXcwPDJjh9RI2byLs6vjTAdQKMd7HqEs4XPFYG2eeyc/84gYPsoWNjJBlbWlnqkL5aYxSo3X8ZThaqAjANNrJ1ZvbI8KK/agjPWPxntgR4cEVKeCXNttY/k7N2WgZCsGAWDl96Aoi5ZUqqyYCqNhXnu6seD2R9YyPOaCwZkRNE9NZRGY2/PvN5K6h+hAe+6tEvYNo3lxqUBotSWpzLal/TCtM2C8w==|920 \ No newline at end of file diff --git a/UserControlPages/任务统计信息.rd b/UserControlPages/任务统计信息.rd index 7fa94651..407d381f 100644 --- a/UserControlPages/任务统计信息.rd +++ b/UserControlPages/任务统计信息.rd @@ -1,6 +1,6 @@ { "PageType": 3, - "ColumnCount": 38, + "ColumnCount": 32, "RowCount": 14, "Formulas": { "2,4": "IF(C14,E14,D14)" diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css index 825b8707..4f764c54 100644 --- a/UserFile/BaseCss.css +++ b/UserFile/BaseCss.css @@ -1,4 +1,17 @@ - +.todo-img label { + background: #ff0000; + width: auto; + height: 16px; + border-radius: 20px; + line-height: 16px; + right: -8px; + top: -2px; + position: absolute; + padding-left: 3px; + padding-right: 3px; + min-width: 16px; + min-height: 16px; +} /* 调整时间线边距 */ .el-timeline { @@ -6,17 +19,40 @@ } /* 子元素溢出 */ -.overflowvisible{ +.overflowvisible { overflow: visible !important; } /* 图片满铺 */ -.img-cover > * > :first-child { +.img-cover>*> :first-child { background-size: cover; } -.img-cover .fgc-align{ + +.img-cover .fgc-align { overflow: hidden !important; width: 100% !important; + height: 100% !important; + display: block; +} + +.img-cover .fgc-align__inner { + height: 100% !important; + display: block; +} + +.img-cover label.fgc-whitespace-pre { + background: #0000007a; + height: 100% !important; + padding: 15px; + text-align: left; + transition-duration: 0.3s; + opacity: 0; + overflow: hidden !important; + text-overflow: ellipsis; + white-space: normal !important; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + display: -webkit-box !important; } /* 动态文字 */ @@ -50,15 +86,16 @@ } /* 优化EL头像 */ -.el-avatar-custom div:first-child{ +.el-avatar-custom div:first-child { align-items: center; } /* 优化弹出窗口背景和圆角 */ -#fgc-popup-dialog{ +#fgc-popup-dialog { border-radius: 8px !important; overflow: hidden; } + /* .FUI-dialog-cover.FUI-show{ backdrop-filter: blur(3px); } */ @@ -72,10 +109,12 @@ .pms-menu-row ul { text-align: center; } + .pms-menu-row ul li { width: auto !important; margin: 0 10px; } + .pms-menu-row ul li a { padding: 0px 10px !important; } @@ -95,96 +134,109 @@ /* 工具栏bar撑满圆角 */ .toolbar .menuContainer { - border-radius: 5px; - padding: 5px 0; - height: 100%; -} -.toolbar .menuContainer > ul { - display: flex; - flex-direction: row; - flex-wrap: nowrap; - align-content: center; - align-items: center; - height: 100%; + border-radius: 5px; + padding: 5px 0; + height: 100%; } -.toolbar-left .menuContainer > ul{ - justify-content: flex-start; +.toolbar .menuContainer>ul { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + align-content: center; + align-items: center; + height: 100%; } -.toolbar-right .menuContainer > ul{ - justify-content: flex-end; +.toolbar-left .menuContainer>ul { + justify-content: flex-start; } -.toolbar .menuContainer > ul > li { - width: auto !important; - padding: 5px 0; - margin: 0 10px !important; - height: auto; +.toolbar-right .menuContainer>ul { + justify-content: flex-end; } -.toolbar .menuContainer > ul > li > a { +.toolbar .menuContainer>ul>li { + width: auto !important; + padding: 5px 0; + margin: 0 10px !important; + height: auto; +} + +.toolbar .menuContainer>ul>li>a { padding-left: 12px !important; line-height: 0px !important; min-height: 26px; background: #efefef; transition-duration: 0.3s; } -.toolbar .menuContainer > ul > li > a:hover { + +.toolbar .menuContainer>ul>li>a:hover { background: #d8d8d8; } -.toolbar .menuContainer > ul > li > a > i { - margin: 0 !important; +.toolbar .menuContainer>ul>li>a>i { + margin: 0 !important; } -.toolbar .menuContainer > ul > li > ul { - margin-top: 0px; +.toolbar .menuContainer>ul>li>ul { + margin-top: 0px; } -.toolbar .menuContainer > ul > li > ul li:last-child > a { - border-radius: 0 0 3px 3px; +.toolbar .menuContainer>ul>li>ul li:last-child>a { + border-radius: 0 0 3px 3px; } -.toolbar .menuContainer > ul > li > ul li:first-child > a { - border-radius: 3px 3px 0 0; +.toolbar .menuContainer>ul>li>ul li:first-child>a { + border-radius: 3px 3px 0 0; } -.toolbar .fgc-plugin-menu-arrow{ +.toolbar .fgc-plugin-menu-arrow { display: none; } /* 定义淡入动画 */ @keyframes fadeIn { from { - opacity: 0; /* 开始时元素完全透明 */ + opacity: 0; + /* 开始时元素完全透明 */ } + to { - opacity: 1; /* 结束时元素完全不透明 */ + opacity: 1; + /* 结束时元素完全不透明 */ } } /* 应用淡入动画的CSS类 */ .fade-in { - opacity: 0; /* 初始状态为不可见 */ - animation-name: fadeIn; /* 使用定义的fadeIn动画 */ - animation-duration: 3s; /* 动画持续时间为2秒 */ - animation-fill-mode: forwards; /* 动画完成后保持最后一帧的样式 */ + opacity: 0; + /* 初始状态为不可见 */ + animation-name: fadeIn; + /* 使用定义的fadeIn动画 */ + animation-duration: 3s; + /* 动画持续时间为2秒 */ + animation-fill-mode: forwards; + /* 动画完成后保持最后一帧的样式 */ } -.animation-delay-1{ + +.animation-delay-1 { animation-delay: 1s; } -.animation-delay-2{ - animation-delay: 3s; -} -.animation-delay-3{ + +.animation-delay-2 { animation-delay: 3s; } -.max-height-150{ - max-height: 140px; - overflow: auto !important; +.animation-delay-3 { + animation-delay: 3s; } + +.max-height-150 { + max-height: 140px; + overflow: auto !important; +} + /* 淡入淡出*/ .fade-effect { transition: opacity 1s ease, transform 1s ease; @@ -194,7 +246,8 @@ .hidden { opacity: 0; - transform: translateY(20px); /* 向下移动20像素 */ + transform: translateY(20px); + /* 向下移动20像素 */ } /* 聊天气泡框 */ @@ -210,14 +263,17 @@ transform: rotate(0deg); opacity: 1; } + 25% { transform: rotate(90deg); opacity: 0.6; } + 50% { transform: rotate(180deg); opacity: 1; } + 100% { transform: rotate(360deg); opacity: 0.6; @@ -226,17 +282,18 @@ /* 应用动画的CSS类 */ .rotate-slow { - animation: rotate-and-fade 10s linear infinite; /* 持续时间10秒，线性速率，无限循环 */ + animation: rotate-and-fade 10s linear infinite; + /* 持续时间10秒，线性速率，无限循环 */ } /* 图文列表中按钮 */ .repeater-item:hover .hover-btn { - transition: all 0.5s; - opacity: 1; + transition: all 0.5s; + opacity: 1; } .repeater-item .hover-btn { - opacity: 0; + opacity: 0; } /* 隐藏未注册提示条 */