diff --git a/.collaboration b/.collaboration index e1fe8865..425dfe87 100644 --- a/.collaboration +++ b/.collaboration @@ -21,16 +21,7 @@ }, { "ModuleName": "Table/任务表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T21:34:47.7977557+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\任务\\任务表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/任务类型", @@ -150,29 +141,11 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T21:52:52.9932456+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目标题.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T22:13:56.026548+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\任务列表.json" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/任务", @@ -184,16 +157,7 @@ }, { "ModuleName": "PCPage/任务-基本信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T22:23:10.1854904+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-基本信息.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-任务信息", @@ -265,17 +229,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T21:18:18.7494313+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -295,23 +249,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T22:25:24.2437512+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Notiflix_Forguncy.zip", - "Plugin\\PC组件包-ElementPlus-9_0_102_0.zip", - "Plugin\\加载动画-9_0_102_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\支持预览的附件上传-9_0_102_0.zip", - "Plugin\\设置当前行命令-9_0_102_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -452,16 +390,7 @@ }, { "ModuleName": "ServerCommand/新增工时", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T21:51:35.4733004+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工时\\新增工时.json" - ] + "ModuleType": 15 }, { "ModuleName": "TableView/子任务视图", @@ -485,16 +414,7 @@ }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T22:19:54.8915098+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json" - ] + "ModuleType": 1 }, { "ModuleName": "Table/项目版本", @@ -510,16 +430,7 @@ }, { "ModuleName": "ServerCommand/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T22:19:54.8912928+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\任务\\新增任务.json" - ] + "ModuleType": 15 }, { "ModuleName": "Image/caret-down-small.svg", @@ -696,30 +607,11 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T21:09:11.1804675+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目概况.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员统计", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T21:07:51.3443808+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目成员统计.json", - "Pages\\5f448cc5e408484e9837a0183cf1365.json" - ] + "ModuleType": 1 }, { "ModuleName": "Table/项目动态", @@ -731,25 +623,10 @@ }, { "ModuleName": "PCPage/项目概况-关键数据", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T20:59:26.7871058+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目概况-关键数据.json" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-04T21:30:39.4126166+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/CustomLibraries.json b/CustomLibraries.json index 2921198a..6976f5bf 100644 --- a/CustomLibraries.json +++ b/CustomLibraries.json @@ -1,5 +1,9 @@ { - "UserJSFileList": [], + "UserJSFileList": [ + { + "Name": "echart.js" + } + ], "UserCSSFileList": [ { "Name": "BaseCss.css" diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json index 93023a46..1ba3e084 100644 --- a/Pages/任务/任务-基本信息.json +++ b/Pages/任务/任务-基本信息.json @@ -309,7 +309,7 @@ "ShowConfirm": false } ], - "ID": "94365e35-3ef9-4149-a2df-e98a44f09957" + "ID": "0630f12f-0954-429d-b151-d4c3379bcc68" } ] } @@ -413,7 +413,7 @@ "ShowConfirm": false } ], - "ID": "0871fd28-94ff-46fb-b542-2cf0c4f6a266" + "ID": "68810207-ebdd-487f-a10d-409c81059adb" } ] } @@ -487,6 +487,45 @@ "noMatchText": "无匹配数据" } }, + "7,10": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "里程碑", + "GUID": "db3f399c-a26c-4dff-b179-5a2fc23f68cc" + }, + "CellType": { + "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon", + "Caption": "里程碑", + "Style": 2, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false + } + ], + "ID": "863fa873-d0e4-41b3-9e3d-4f8fcff541fa" + } + ] + } + ] + } + }, "9,2": { "BindingInfo": { "TableName": "任务表", @@ -517,7 +556,7 @@ "ShowConfirm": false } ], - "ID": "c55e5d4a-97b4-4e6e-8b7a-d8aa78f65319" + "ID": "b7e3a10f-6324-4692-99ab-8d5341ed4db1" } ] } @@ -621,13 +660,9 @@ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "任务表", "ShowConfirm": false - }, - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "保存成功" } ], - "ID": "b9598a54-750b-4c5e-926e-5d425ba6652e" + "ID": "a2c49f82-8143-4d4c-ba78-6eac297e56de" } ] } @@ -779,13 +814,9 @@ "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "任务表", "ShowConfirm": false - }, - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "保存成功" } ], - "ID": "63a1ae63-60cb-4cb3-ba30-221fb07cd401" + "ID": "f2465adb-9c5f-4c48-8164-b426d923a85c" } ] } @@ -849,7 +880,7 @@ "ShowConfirm": false } ], - "ID": "9f973b91-2a4a-47d6-bb08-94146fa29bf0" + "ID": "1cbef2be-7b77-4f18-9ca5-8d5cdcf6f31e" } ] } @@ -929,7 +960,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "='任务-基本信息'!状态变更回调" }, - "ID": "f233f0d9c8714211bef059460f93b60e" + "ID": "6f556d2d54004012aea37561bee799fb" }, { "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", @@ -1003,7 +1034,7 @@ } } ], - "ID": "dea7a981-168a-436c-bf5c-e0535d0cc227" + "ID": "8ac69fbc-5c0c-434d-8b31-3d0c925347de" }, { "CommandList": [ @@ -1018,12 +1049,12 @@ "BtnText": "知道了" } ], - "ID": "fefc6bea-e896-4d00-a71a-87383a9b80f8" + "ID": "ce930a28-b287-44ed-be92-d132e6c77ca2" } ] } ], - "ID": "c8864927-d70c-44cf-831d-4e69430ab258" + "ID": "011f4323-d3c5-4b46-a9a4-fb239e349d46" } ] } @@ -1236,7 +1267,8 @@ "11,2,1,15", "5,2,1,7", "7,2,1,7", - "13,2,1,15" + "13,2,1,15", + "7,10,1,7" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1268,4 +1300,4 @@ "Formula": "'任务-基本信息'!$B$16" } ] -}//o2x6k5AIOcTDBUhH7AQtp6OpfFj6cxpN85YFBePqPGmwEJ1bJIJUZyPD1CTzCroA5kgtj5Qlmt9PiaeuV30cw6enARnu1mhJa2QUx85CjyWInwObsHfda8bBtavYv/ffdTyyUNQz76TwUeOynsNGoiVdupUIB4bWvfFLnQyzyYiMaXPQcE5OTq6YPWfYtDzP34zl1Y9FuXczTx14B36XIgBEVDQm4uZU3xZ4r2CkOw+96c9XaEezLdTgY/Iqz0G/G1n52pJ0lQtNZqadqxEDXktbPAAjQANpSqmMi3rMUSWWNVgmCCursPpqfmP8+NpBUcplRm6G9B9QRfM84FukDtAvjkXYMG0Ui+JjQKd5yo9SDRGrz6GZyKgfzD9mqepNKuC6PH65nzuHpmBqp1vag/PvE0N/NRfJPQVLBS1LTg6TckGuADpcu5+CvWj/ysT+6BhM5K5jBh+l/q8LzeXa12atQ0OgqACgZ+erCpgWtbOKx49aIYVaU4XjsGG/HQiTRETv4zYktzRU00GPXtDyZ8RqQsknH/ku3gOGktn2OrS/i1Ad+NjjbcdIk7etLRDI2Re6djD0JE77NWSgsUwqWoruYnyS7guFRq/ExHAlicJnxC3gMyoZptYnT782x5gN/r/pYUH5JX+b+Kzer+D34bo0CNsD92/6FraWNWFttbJ/WLU27RksYc3p3FoUmYAcAfkkYBOwxRO9XFb5cfZRqNZmXDRBBzzdx/Bc25ZlNpYWmNZZhrSYvsNJBGwHX/M8oCUuOI2L0vE5u3gjPQHrCu/XUvGJ0Bii360UIOjaNR+ECRGlTsF1wnDjPS0SxEVt0lYniYlOb6YopR1IjUX+OgW4NOMYY9rwOlWmjzWVC4zcC1ESgBoVSyTTRVnR6ITgljFf355yLLEhGqUqYsEytw==|920 \ No newline at end of file +}//lJxK/IF2RXdu0gI3VU9K5Bxh4dwl1vtDInGI7pZZDfIcOD2j1SdgpUsD2jWmdhS8Ce3wSc+Ob9hN/FMuaHEWzswNh9Anh+3ZyF83L+odvXzoKOU7SpNxIhYf6wv4nqhf9v4oU8ZD8mTQhqF0md4U5RzGQ5LO01pi7EQWhS15rNivU4juq6cdSSjTXOEHgd4DPdeCHvAKOVkVPCxQ1epi0ZTlNO6HpsYsHQFBsXo0Rwpx127ZqoazIH/a8k7H69BxwtywnLs/dnegjTWjfnUzfCLOSBb24bZ65AfRTEhpc7/ltAjaO+y9zee+TBvyVbEkYQ94tvTmx2Ym4nL/a7pwT9zbT5zxv+O3patjXbaZ+KPRH3ePG5Cx8uEBQEhIt/YHXFHBlZnwVnxorvfNbYz1eGyflLHv4sEG4PEn5hNGkiFUobSERw/WtX74F3IVsV14ZDYdjR4Ies7eOPGwK3zti+yle/slHPaIGEPKyE9iiknUvbfke9nnsl3C3em1ild+UsL5x2qgnMRI3R/VhGaDOFhDbxqdXYWq8Aot98f1N2LvtuPYdVt6yebqbNCmcRROdRsvZseLCUkqjmv7TU5aUXCiziW5hfdSmSDI+ut043SbiTSkCqt6pwCumbeZ90hRR4RDeWoUr671lI35LsAlGtJ10UTJ9juBu+RxlRHR27cF3t8QCYK8C6wW4hUyyy73MXENCEErmyFQBxxeEEKztXrMXuJuokyjxIq9LRK/Ps83szJvdtPhy4UT3j03DJfUJWm/VlcyRtSGoZVyza15XrXtqPHdSNutqO3DdVjq3uc8qWCdpAUyugf7yXfV1aDe2QMkTWEtOhAoWZHCxXCDMT7G2d6ccodvtwYGtzxzf/YzWR6xWorcGjJ+52UGlZ799AxS3xYT+TW04gDb/Wnocg==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index 095e4209..cf269a18 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -103,7 +103,8 @@ }, "23": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, @@ -1003,14 +1004,6 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=新增任务!V13" } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "工时核定方式", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增任务!F6" - } } ], "ResultErrorCodeTo": { @@ -1053,7 +1046,7 @@ "ReloadData": true } ], - "ID": "c45105db-cad4-4275-96af-6ba93dee95ee" + "ID": "d705fb74-059e-4d0b-b545-024b7fd73485" }, { "CommandList": [ @@ -1068,7 +1061,7 @@ "BtnText": "知道了" } ], - "ID": "ab3be2ad-dda5-4344-b512-7c864ad88415" + "ID": "cf629de3-98db-4a5c-9c7b-5ce620627966" } ] } @@ -1592,4 +1585,4 @@ "Formula": "新增任务!$B$24" } ] -}//FrSGtKHQzcA0v5DKSl5KALsuDGqjatI2Xx6G+P1p4lyHnRFw7UcNu74fwBTYLl1yBSEhC6yCGlMSNwhDuzmxL5SdyfxaXzISHGTQH7YFTgC+d6oK30ucSXlid11CsfxLmPXXwrAYFVOfqh6Oczx5Bi46vGJCU3fWiFL1nR5A2EL1AAARc7f5Ejnk38HyKvwHdzP1eirR43cIrjbmEE+OCpHSTonBefaXbfOG5Id24xb1SW+0VDkXJiS15s2hMfnuhs5p2bW8RFuzDAlDAL1dat2IfLq+bjYzFZ7IgSc0bgrM5XKHr21n85SukskmU7UAJHPQB5GK8SUdMa1TDJydW1pMlnXtvCeXNSGnXKl8F/K79u8d6JlY87M2b2PZmMjKHkSi16bPwEQUFxWAPLxsSk2sZ1nleHMk9bZOCPsbTRB4r54vMY+4WUXEuK6+doLh7wwSki71t6L2MQWs5itinxrk7QWjH3Vt4vmJjN/7bqQRNnMT5zJzHa/F2s5+Eq+QwLqW99WOEXQVkJ77t9tAtlO/IY4yN7K8TfRpk3MlbZOyloQ4EiesMY6FWnQQq4CDU1yVsiTQ4GyvdLpH7pTP7M5iwCAg4Ef2IAKPkvRNnW/98XAYWqXrblADOpAbNfonJOXVMg+gBEebuRwAeoUo5kYX2V3Gf2oyZPOKv+72dyvRtiAJvHjsKJHXZz5do0P7laKXMlqth6Ol46TA5wM5acQzXifOrpjSu91183iQfA8ivEUzX5CIWG4idLtRY1qL08JcUEBUcyhC6uOrHenFaxziyxLyt/v0tjcLKN+A9zx8AWc+lPocvejabsm6KQkIjrSK44VsuuMZzVBzc52VGfGeYwDaUKyGTjBjMOrpownJ001h/KAv63AU3+H+eHrF1EseIKhTja4gmf8FWfCUXg==|920 \ No newline at end of file +}//rw5Ipc4xwLkil/Klxfvge10gYQg9oR0nK5RPvv9nYx4/WlkR/czjuXsO7gxzKZ7NIyxzNh/6IXsqkzbAbcjUL/BofQMx9gAY7HtMMZQ1saxDh4T4hJHp3DYrGmouWViCeHEebw57U+HEaQ8HFXDu59dp3bAP6Zb3Fc4eaRHYLK86F07lsEwPFR/QB1qLgkHQ2Hi+Xq0w78eIXM7RDYkuvWzLcQ06oNaRZmc+2Cqnsn7B7SoV0ZMdm0kHsnqbnNFOt2Hs272i6cETuSPYZ0PNpFC7xZ22sC9niQ8PV2bcpWV4pah4LaDIsRB9JUOFlOn5wHqKGCnSX6ay+0G1oDBa4ZcqI/gUtN0+9suEGhuIllsn4BXoOtA+QHZoLOhN9JoDnoxna9oT5eEqU1yFm2r5MBSGCSkb/tVJIDwwf+J6AqMrLNqdux5ESN8GaXY5bFsRvbG5s9qoCWijrlhlHvZI+OVdM46J0DhsWJOI8p0kd4koqSs0bA/M2r56l5t7Vcq+OFM/UDs6MAGuxjJCKRUCyroyQsO8tg/RSLhtNW5rMD5644hK4qTCjXAciwVEeCUTkm78/nDG4TNe5KpWTBJE5sIK4FYmf4WtV/9FaKKe+Rw/TvYRx/EQiedX257yg7BaFBaVpvnIl4ipxDz2SNMjm3wjiwbmooXZzQRl3lJ6Vt55iAe2Ohlr6FKMrDy49QGT+yCEfzOG4oKEiM9isAkbB7OKjWwoXUHJEELk5u4Ax9xgvt42HgkZDOjUdZaYxU1TkWgX7gjtJzn9bCq+Wq16Zka4fPTZi50nzfrT0b8jWt6MxmbKlLYYj8k6UGTLNWdIAzZ6E17a2CVlhPPNGNLcVY1jinwGJQoveKhQbECxoEaeD1WwsJx23wT8z9ixMJNq3uOdu4eiLIOeQK0yrwz2bg==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目标题.json b/Pages/项目首页/项目标题.json index 81a73ddb..0ad56a4c 100644 --- a/Pages/项目首页/项目标题.json +++ b/Pages/项目首页/项目标题.json @@ -268,25 +268,51 @@ "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", "Commands": [ { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!项目子页面" - }, - "Title": "加载中" - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目首页!项目子页面" + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=项目标题!页签值" + } + ] + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目子页面" + }, + "compareType": 1 }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目标题!页签值" - } + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!项目子页面" + }, + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目子页面" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目标题!页签值" + } + } + ] + } + ], + "ID": "f864e849-afd1-4821-b958-61e467418438" } ] } @@ -390,7 +416,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=项目标题!菜单回调" }, - "ID": "a38060fd7e9f42798d747ff0ecae0a30" + "ID": "ef68c2e6bd234c29bd1a7adf42036593" }, { "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", @@ -427,7 +453,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "f1055ef9-a395-40a1-8dda-4fe601dd3060" + "ID": "70635064-6d8e-464f-9c09-9bcc9221597a" }, { "Condition": { @@ -448,7 +474,7 @@ "PageName": "项目配置首页" } ], - "ID": "ce5519c3-2742-41a0-99c4-7b81aaaa1f28" + "ID": "acd4f64f-4863-4728-8e31-1f9a5b8692e2" }, { "Condition": { @@ -484,17 +510,17 @@ "Message": "操作完成" } ], - "ID": "fd9682d6-e164-4096-9033-68110bf25252" + "ID": "89e6d5f1-1e84-4e6b-8c63-313836328091" } ] } ], - "ID": "1c795272-1f44-4490-afd7-b86cb6907012" + "ID": "54bd01fa-c042-4686-95d3-8979ed4fd595" } ] } ], - "ID": "bea1506e-7f70-4ca6-bef6-d5241b14b64d" + "ID": "351c0e18-79e0-4044-a63c-c8cd534cd531" } ] } @@ -610,4 +636,4 @@ "Formula": "项目标题!$M$6" } ] -}//maQdtZ0mpsG00+UKrNxhqK16FsBoKSBiWnQtCAq1J2E6DXBFEAbjhV0gNow/P+IynvaWu1xdbyuZRCIdmyVn+Q0jM7vFJdG/3s30LAkvYIBFzkkPh/fCeao3I0Yp0sTDc352mNAbIXJA2SSICZ9VqZL7CXqUDq1YsLsCbKS8F99Dt7NWb1udZXCdTvaHR08SkOsMnGNk20ZBwdkrvlKqVSgw7yTOWrJY76oTaBJ6vRbAq5S5HDYT0p2VauK0QEKNUeV87x73USM1qqAQdcy4IEWK5OhhswN7EfozM5dHGpmmxRT597jDjjv5JICNxWWQYvT235nV79Sw5gofcjj4eSbi9GhxxxmIGrklK4IkluJSiUFZqIXkiJk4vwPtKcpUO5BLRZih29Ks69JndEpqkUsKNBVL+usrqI/kCkUFssx4ckeS2AXpiAqq5FCh1xe5SpTdxmNYMeP8BJMw7cQHqQPTnCXue72QqSCJm7vZKWuJ42Zoefv4wiNoOjWA37pJE3e5bIdamEnmFyzGibogs4d3bwOKQCOd2G0rDMEypri1UFHNxyD+byZZru+OG3IQdPGJBy5ZGTKWpVw8EFfhQ6+SRS03M8DEJQ1cp0GxhQiZAvaFVLaP7438XvCGoHXRaFiPcAE+yXJgZWKP0k+LtE7fvvGLBlOp4jQg4tae3pTMUjcg9HWWAxeYSGE25UQ6m8FJlx0iSCih/fDV88l+LfW0t3SbLK2pitcKHHPSGx1xbyt7LRi9wVCbiLogoOzyfeHt/0XjC1VJR+1CVvJrV/CG6Q83osp10QTzTxmRxm3jcRMz91NF6qCjMU5OyUQ2ewFVMDNZNBsdz9jI65UUlYRQWf5m7l5nMnoufEFC4C3Aaug9zvKjxVnOv3i+yL5whruN9kpoT+ziRYTTnJiu1g==|920 \ No newline at end of file +}//HzKmXAbCSZhnuPuIb1OfoCn5HoLFjzzBYMZqtTld1BN2qbmVC/yFz4ee1WX/A5AUu047UxmkLlSKH5aNa3ILxqRWMYd4typlxWm/zeLO1oeGc2TsBSel3mtN+RgvH9lXEQ+t1hDmTyLSBQWOvn6ATRXiCTp7vdqsK0hyM8CU7e8swxDJ7E6W1NCfd5nYzkODtZHzJJHucJo2swarEoMerONGLWhdacaI7JN4sDrrZxXSOO1kVLw0fVPYasgdmL4EeXgeW7IZRYptPe45+SLjgdnAyqXi8Z+bxWHbH5sf3SsoUeg5G7U1lJlKj5iyCAIABjdG8jjlHFYA2+R8csoSWlWOcPUk/Tvpzqh1l6nmouFRGgT/JVqtShqvIws/+p2ZQJUKA1E7Q4daxqlY+UiHpiOw5ABQzUt5wCYF4IoaUMJBHcXHqK4Y0pct+ctk8STvfmcS5yKBs4CO8hZuXkUISw+9L2lGawNF7Fm9SH10N4fNnmsRXzEeZj7/H2ua/rXbajyIPFXtEgzjo7fYpv+2nB5u7uS8wAiDQ2TRcB9PofY0z4t8RPfNCDhcF2nPwH0duVReml3nyoaGYECUzIwQvBQyooXOrY5zCDuUBSJfARVebQ6Cn7J3s41tUEWMjNpBTKcg8UoqAkeeOitP0WVlaKE05Q5hwgSiWu4VpaIdXfeIw/HBvUl7fptSfF/sDHcSNInX1CX7uxGLvJiDELxEuP3NMz0XiR3/9kMuqCdaPZmH8IZzS7cviGlQx12WS5DPsprs47II9s+ROoA2fu9vJLyfw1QQurmJGrE2CTXJas3CIU809/qZOsMGf0+KR3iwlBbP1IB4N3jg4ldJ85G/8nuD+X8nHllxMjLx1itkxebGuxp25pFWkHcvZYNOz5dv5a/xDWV8xY2sHy8n+xbsow==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/任务列表.json b/Pages/项目首页/项目首页子页面/任务列表.json index e41e88f1..0595c8d6 100644 --- a/Pages/项目首页/项目首页子页面/任务列表.json +++ b/Pages/项目首页/项目首页子页面/任务列表.json @@ -86,7 +86,8 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 32.0, + "Mode": 1 } }, "10": { @@ -246,10 +247,106 @@ "DefaultSize": 32.0 }, "Values": { - "1,9": "新增任务" + "1,35": "新增任务" }, "AttachInfos": { "1,1": { + "CssName": "singlebox", + "CellType": { + "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", + "Style": 3, + "PrimaryColor": "Accent 1 0", + "SecondaryColor": "Background 1 0", + "IsBounding": true, + "DataSource": "任务类型", + "ValueColumnBindingInfo": { + "TableName": "任务类型", + "ColumnName": "ID", + "GUID": "30ab61e5-5b3f-4e8c-8b88-8b2cfb0f9df5" + }, + "DisplayColumnBindingInfo": { + "TableName": "任务类型", + "ColumnName": "任务类型", + "GUID": "dc9fb9e4-4a87-4c15-bd4e-0f23d23ce634" + }, + "AddNullItemWhenBinding": true, + "NoneItemText": "全部" + } + }, + "1,11": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "3549df10-5cdb-4291-9562-3c59666f13c1" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "f96e2fce-47cd-428a-9e1d-c8d0c63aa41c" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据" + } + }, + "1,19": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -284,7 +381,7 @@ "resize": "none" } }, - "1,9": { + "1,35": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -384,11 +481,24 @@ }, "ColumnName": "parentValue" }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "b47a9a46-35a8-477a-9ad3-5076766198f6", + "RelationBinding": { + "RelatedTable": "任务状态", + "RelatedColumn": "状态码", + "DisplayColumn": "任务状态" + } + }, + "ColumnName": "状态" + }, { "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", - "GUID": "1ad808f6-ed7a-412d-82ff-15f65e87022d" + "GUID": "31782c0b-cb22-4334-b21e-ab52c15663a2" }, "ColumnName": "任务名称" }, @@ -420,32 +530,6 @@ }, "ColumnName": "结束时间" }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务类型", - "GUID": "af9091e6-0af3-4da3-ad19-6b6398185db3", - "RelationBinding": { - "RelatedTable": "任务类型", - "RelatedColumn": "ID", - "DisplayColumn": "任务类型" - } - }, - "ColumnName": "任务类型" - }, - { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "b97cb60e-dc8c-40a4-8d7d-c6384c259de6", - "RelationBinding": { - "RelatedTable": "任务状态", - "RelatedColumn": "状态码", - "DisplayColumn": "任务状态" - } - }, - "ColumnName": "任务状态" - }, { "BindingInfo": { "TableName": "任务表", @@ -472,24 +556,66 @@ } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务表", - "ColumnName": "项目ID", - "GUID": "8df0a7c7-5072-4f95-8e55-fa45d44d852b" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务列表!项目ID" - } + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "项目ID", + "GUID": "8df0a7c7-5072-4f95-8e55-fa45d44d852b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "任务类型", + "GUID": "eb33abef-da3d-4e6a-bf9c-dce00d2b6290" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!B2" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "执行者", + "GUID": "995a904c-9cbd-4ab4-8b1b-0ac8181771b5" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!L2" + } + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 6, + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "d6c8883f-9aa0-46a7-a4f9-e7ed3567a35d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=任务列表!T2" + } + } + ] }, + "NullFormulaValueQueryPolicy": 1, "CustomColumns": [ + "状态", "任务名称", "执行者", "开始时间", "结束时间", - "任务类型", - "任务状态", "总计划工时", "总实际工时", "参与人数" @@ -506,16 +632,16 @@ }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "执行者", - "Label": "执行者", + "DataColumnName": "状态", + "Label": "状态", "Fixed": "none", "Align": "center", "HeaderAlign": "center" }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "参与者", - "Label": "参与者", + "DataColumnName": "执行者", + "Label": "执行者", "Fixed": "none", "Align": "center", "HeaderAlign": "center" @@ -540,38 +666,30 @@ }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "任务状态", - "Label": "任务状态", + "DataColumnName": "总计划工时", + "Label": "总计划工时", "Fixed": "none", "Align": "center", "HeaderAlign": "center" }, - { - "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "总计划工时", - "Label": "总计划工时", - "Fixed": "none", - "Align": "left", - "HeaderAlign": "left" - }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", "DataColumnName": "总实际工时", "Label": "总实际工时", "Fixed": "none", - "Align": "left", - "HeaderAlign": "left" + "Align": "center", + "HeaderAlign": "center" }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", "DataColumnName": "参与人数", "Label": "参与人数", "Fixed": "none", - "Align": "left", - "HeaderAlign": "left" + "Align": "center", + "HeaderAlign": "center" } ], - "DefaultExpansion": "collapseAll", + "DefaultExpansion": "expandAll", "ShowLineNumberColumn": true, "LineNumberColumnSetting": { "Width": 35, @@ -612,9 +730,6 @@ }, "StyleDatas": { "Styles": [ - { - "FontSize": 13.333333333333332 - }, { "FontFamily": 0, "FontSize": 13.333333333333332 @@ -630,18 +745,23 @@ }, "CellStyles": { "1,1": 0, - "1,9": 1, - "1,10": 2, - "1,11": 2 + "1,10": 1, + "1,11": 0, + "1,19": 0, + "1,35": 0, + "1,36": 1, + "1,37": 1 }, "SheetStyle": { "FontFamily": 0 } }, "Spans": [ - "1,1,1,7", "3,1,1,37", - "1,9,1,3" + "1,35,1,3", + "1,1,1,9", + "1,11,1,7", + "1,19,1,15" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -677,4 +797,4 @@ "PaperSize": {}, "Margin": {} } -}//AxhBFHNFeua26PFXgxq4yOLFjMmnyzc5kwX/2DSYq+uU728H99bohPLec8F8KjgotIPZCyfGERuuOG+fRROZ2WZVqzQP3QguN06/mM/maYDdcUSyzCyU+M+LaN0hHyVhMsZ/BMPnNmd25ZP3hF68FNPRNNybmfsKsLSw5EJD5QZLz/zaVYO2tLN147WUcsc1AhTZv5DtfjTnI5POI0WsVuAZv/DyrxUc+dVlaoAokzIYGB3vWHT2HIgO4QEZ7c1iF3CmWaFtGO988q/TNlzRGDNq/pNhX+33IP/XpDskAKTlg2vZ2tp0wOqHgPdFNMiUW8OZdi/uEvw9hGjISnDNwE9zGdLcSj3E6n5/WQ9N80xtKnCCkhOoNWJCDyDzEuW6LZFqMyEfj+dTr+qrONbpJumET+gANGHpxV7Ge6599wtHcKvZXc/HfhZEPgOOmjtFu03aWoxl0x5m5XeIWOVL+GQWJpVc+OGvjY8W3QvM9/h/A3GYsqxQFMRbRxSg7t2O9jx+6yct73KeTR7kHIyam9X7EAL+XhSF2ynbKYaLrwYOTT/VsbOG7L2hXwaMuLeDp47Mytd4bPHOx4yL6GnuTS7hRVTkOUKzrKnAG0bAlM3IYg+6BEHjpPMNfpqQ2HQhFdSWrMPJrqh6L6yj3oiJDmmIVKR36oBYK7+i7FJ505+3G5v10M8eJWjGhEbwIzp3saVnJ3CP0wFTNGlXn9vQ7ovnBR0oQ871EVR9BKSgdDFw1JibBFr7dQie2qM38JbjCXJKabjAPl3J/tPtCZNKLMyeX619hNpmSxYrulJHYOi9Foj5u5qGbv1cBBE5FmVxDPSFr22YY13EJNKdBqs/iXeQ1BTEoFIZXBlE2StclAP6JeJc1hFQ0hvIUAjqzk/DMkrbEHBidEE39/Vn36/3FA==|920 \ No newline at end of file +}//3Y5QnvmL8aHv9i85lU4gc+pq6YGGU/fVk2WLVYh0xpo1vRoo7nskrrIVhm6WUMp1XNCAfuWWNWdfsuW8z9Xu5nAOUVsI4Vk7ckXTM2ab53BnM9kXlY8ia/Rp9KNqHii7KgPCJUfMW5TRhzu9GSjHwGpcQYXJ8KFsm7aGP9qpOgrlI3z9hLP0HGUnaJ1J1r3d9j14Bv3ouqYIydBYsQg7gpgozK14xuJ29GMxJ6WKYjWEjn/1FumrMaiUcbuLvlWmCsGmNdO6bWNaBC6ER6koa17oWcH6HZ5f5IwRvYrr2AgKa1bi+arM4buj2+W9dRGUSnidTPkRBCoxEmOW9xf2JAVzG3owtivFHiWiVWsIOJh5UVDwYamPYllLZsoxquF7LnZG1gAoqrvLCHGiOLmlk1lX07E1Ws9bdjq1j4vKgqfqPkcVkjFOTuMlPtcHlJpDZa2+fKWQdg+GmmYey0aIdGn5I4IKh5w/ARx7Hxzvx8rETOAuIQROLPGwgOiOiiOptzEdutt5pWlSZJCPY4Cl3+QK1OxNmMAd3B/ZB7e6zar3DNwkKjasX9ZX7S7NJjiDE9/mDSsES0WKKDMdINqVQWwjD6SYqqCxkSXj0TWGtg1nI1t1knYUvn2KcwS+wBBneqL07HZCrcZr5aYUOWWVoufGdZ0Ip5qmta/elCnybybc2n5+9NGqlb32/0izy/t8cicHoQRr3dSn4J+mAkMYzY9IrWKC099PUiFRDc7HavUWG+rBKEcm75uMVRFCy4KxvzSNGhFTGuZYRdD/RTAVLrRwGQ0F0c/KlTPXVkdvuVeTkpskJpptMI2+aPF/scD+jIg+LpKNK/EhG/XuB3VWbVGsdVrDRqe4z4ZMI28DbWo0dl5hMQyuQ141TUSR5rnW6E+Mt4lQHNN6+0AeVyeZLw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员统计.json b/Pages/项目首页/项目首页子页面/项目成员统计.json index 12247806..5512ab2d 100644 --- a/Pages/项目首页/项目首页子页面/项目成员统计.json +++ b/Pages/项目首页/项目首页子页面/项目成员统计.json @@ -195,7 +195,7 @@ "DefaultSize": 32.0 }, "Values": { - "0,0": "项目成员情况" + "0,0": "项目成员情况 (实际工时/计划工时)" }, "AttachInfos": { "1,0": { @@ -252,7 +252,7 @@ { "Formula": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目成员统计!实际工时&\"/\"&项目成员统计!计划工时" + "SerializeProperty": "=项目成员统计!实际工时&\"h/\"&项目成员统计!计划工时&\"h\"" }, "ColumnName": "工时情况" } @@ -341,4 +341,4 @@ "PaperSize": {}, "Margin": {} } -}//RARfYRhv/nkQyNV+oi6iGeQCIFfak51WDwy8FBbJCn/7vhE1QdoscNoStu3y0ZkUxZrNkuQ4Ft+4wUJxlXqC2pNlDcz0ldbjZ8Xeyh+UAjGdHUBshf9SdROBId0PZyZbd39sYlQAUs6T4Y/xdy16cMrXYRYcUIIEECrx6X8+mzBJ3pBS89GYG5QnF1E/90AYQY330H/ulhXKTYsAeRVQmihtDm5MyVI+jyT0tePuDve8RHgV298wFhM6aLK5A/Utl1/x+VQLrgM/3yi7VlK4XduU5PBdKVCKjzEsTqf6sMAXpqqnsAW1ZIzcdwsxJZpHkobrjSIW4b4Ft2POhZ7AQYvAMqoj6NfIcvrV964HpD3w9M3IVi5NZP97qkFo/5TJ/k+uBnoXbDRbscv+2u9GkjJPqrks0R2MGPhvv9PnxDzhjZEt6Qh9LPWTNXBY0W23jMQna7/99ZM+kgrOZJ07Mf5efX1M7fLCrlAYGMulDJOGdh6Klu57kRntwaX1N1AYVFEO2keQYTnoLB5xnEPwE1q4qEwbYgTBbm5suH8VtrE53hHChk8fQOGDEOYODNFoS4LEpOmulqWiBvpRqedIVrHk0pyEJVCP5CQu+R4W1XS7sqfE41O7bY5bXvCBkfJWy0LDtP2SYYsyf1KAXOhQY6OocA8JCXqwEqUgp7NzYYTUXW3fb1U56ivyH4IMO9hG8u2MKrEE75e7qTwnnmiyU7ztNufgry5I2k0kurT0HhEO3fkijicMS4GDdCgafx+JsB+HO71aQOFUARvlyjfhGQY3FNYBtkvPbsfkA/5hX1FMkttAjFVhPUUCsKtU4NdzHfPznxZXCLoCPgigicSKmdpPFw3YgUr1EliorqiL0/+NWJMIASeCUIv3t7Q0fUSKPsYSAxgfOoyqRwdEObentg==|920 \ No newline at end of file +}//m3GO64Vi1ojR+Y4rmsLDft/z+P55VBV0IX6wLCHEObQ5xiuBCuw6xigYdWYoa91aZLVvOywHh8jYr9BOG5ihjhqC/QMX3rw2QtJvzKA0RLtP01oaBNKPPQxzJWjTANbqNF9VrK2ai4b6dOifyzghuOwhwZe+e0gsGq1h8QfEzyOQVateEahdtl0Oz2ydwAi0lLP9WuKJ9DNlSJzECV54bcfj64FZr6Y9HQtXC1mAT/1Qjvvof0c/xI48NI7mrJLa1JMIhb+s/9JQERS32ohUZS1XnosqB3Z1q7Pm/xiFgeIZSS6jJygna57X/DWK24g06+mF+35FkLjEu0vVDkueJxvEhHsr8pMafpazB1I1ovmf6GN5FA9iQbbiqARkbFotGcTAj5w3c+zmvy0JNE8RtWQSuTngOV1P8H7ngP6B/1unDnxuRU+QBSDoOZBwrpMa3DH6LVkKq27PlctHgJottSBw5QD2/87mEKeq8q9IYR+gJ25EuOTHsPoHo2Msz5dqBu/+NQ6192YnPl5oxsN0BBdH/nF6tjVhLostYHAI4p18pkcFoAciq7HjPBk5tXYKwsFsbNaZPVg/vy5dps652BCpW+e2CX71WAY2bCl0ieCgq6u1BXA7zb0DuiWbfDzVPJAR0OJWqR4lEv8bTDA3XMEVjoWwqmMd3CeOCtHoZ8fQMLEfsnH4haBH8dxm5JTXO/2rMevH46qUAYd5ZI1B4UgTamo0Hz2hdQYVGG5Cq3VralN7DqCgwgIDnS+JnvXkUB1HRt4E4q98dgr2FpRXBsdAx9lYyqc37+Uq1GGWw8KAVXCOV5TM++xM4MJ8hQ5DNJ5stvQV0nQcUBTOh7uhVdcqIRVwiF4GCk4nrn+aiyAlDORm7f8hXtGoUP2rWkeOW+uGHB9DB74jP+VSEcqcQQ==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况-关键数据.json b/Pages/项目首页/项目首页子页面/项目概况-关键数据.json index 2c493146..9514a6ae 100644 --- a/Pages/项目首页/项目首页子页面/项目概况-关键数据.json +++ b/Pages/项目首页/项目首页子页面/项目概况-关键数据.json @@ -13,17 +13,24 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 27.0, - "Mode": 1 + "DesignLengthInPixel": 27.0 } }, "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 36.0 + } } }, - "Count": 4, + "InLogicalVisibleIndexes": [ + 4 + ], + "Count": 5, "DefaultSize": 15.0 }, "Cols": { @@ -70,12 +77,12 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 50.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "11": { @@ -83,19 +90,19 @@ "DesignLengthInPixel": 32.0 } }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, "13": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "16": { @@ -105,17 +112,22 @@ }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 50.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 } }, "21": { @@ -125,17 +137,12 @@ }, "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "23": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "25": { @@ -145,35 +152,40 @@ }, "26": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 } }, "27": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 } }, "29": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 50.0 } }, "30": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "31": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, "32": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 32.0 } }, - "34": { + "33": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } @@ -183,23 +195,240 @@ "DesignLengthInPixel": 32.0 } }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, "38": { "GridRowColumnDefinition": { "DesignLengthInPixel": 15.0 } + }, + "39": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 50.0 + } + }, + "40": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "42": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "43": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "46": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } } }, - "Count": 39, + "Count": 47, "DefaultSize": 32.0 }, "Values": { "1,1": "成员数", - "1,9": "任务数", - "1,17": "工时", - "1,25": "费用成本", - "1,33": "工时成本" + "1,11": "任务数", + "1,21": "工时", + "1,31": "费用成本", + "1,41": "工时成本" + }, + "Formulas": { + "1,19": "INT(V5/X5*100)", + "1,9": "INT(L5/N5*100)", + "1,29": "INT(AF5/AH5*100)", + "1,39": "INT(AP5/AR5*100)" }, "AttachInfos": { + "1,9": { + "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": "='项目概况-关键数据'!J2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!J2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "999e7e2c-baaa-480f-ac36-803a7c499747" + } + ] + } + ], + "type": 2, + "color": "Accent 1" + } + }, + "1,19": { + "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": "='项目概况-关键数据'!T2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!T2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "466b2394-a1eb-488c-854d-856d7b1d7e20" + } + ] + } + ], + "type": 2, + "color": "Accent 1" + } + }, + "1,29": { + "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": "='项目概况-关键数据'!AD2" + } + ] + }, + "value": "100", + "compareType": 2 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='项目概况-关键数据'!AD2" + }, + "TargetType": "ElementUI.ProgressCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetBackgroundColor", + "ParameterValues": { + "color": "Accent 4 0" + } + } + ], + "ID": "439d1412-8231-4bef-bbe6-61877dec22d8" + } + ] + } + ], + "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": "38485c3e-e065-44c4-bb81-76b43150f8ec" + } + ] + } + ], + "type": 2, + "color": "Accent 1" + } + }, "2,1": { "BindingInfo": { "TableName": "View_项目统计信息", @@ -207,115 +436,218 @@ "GUID": "fe9b0d76-1afd-4719-8184-fbe9f6dd3939" } }, - "2,9": { + "2,11": { "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "任务完成情况", "GUID": "9061c0f5-7531-42e6-add3-6b8672ff2020" } }, - "2,17": { + "2,21": { "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "工时情况", "GUID": "2552529c-1f38-4c95-87e4-caa444bc4d72" } }, - "2,25": { + "2,31": { "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "费用成本情况", "GUID": "830ce54a-f4cb-4fa5-b350-30f36058b4fc" } }, - "2,33": { + "2,41": { "BindingInfo": { "TableName": "View_项目统计信息", "ColumnName": "工时成本情况", "GUID": "27bf41c1-9428-4320-9df2-9dc4c5275d30" } + }, + "4,11": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "已完成任务数", + "GUID": "d65a8d37-e524-49ab-bd49-86f13e503225" + } + }, + "4,13": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总任务数量", + "GUID": "c2a48ef7-1357-4541-be25-0091b8cebcab" + } + }, + "4,21": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总实际工时", + "GUID": "017c57f9-de51-43a4-b62d-0c798a61297b" + } + }, + "4,23": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总计划工时", + "GUID": "a34f34a5-44bc-49df-a52b-254f1bf422ca" + } + }, + "4,31": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总成本", + "GUID": "2e8448b0-962e-4b42-bfca-93b8a6b5110b" + } + }, + "4,33": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算费用", + "GUID": "9648660b-0309-43bc-9ba6-4cc52d9d276d" + } + }, + "4,41": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "总核定工时", + "GUID": "a831ff86-744a-4fa9-9da1-af1ebc16ae03" + } + }, + "4,43": { + "BindingInfo": { + "TableName": "View_项目统计信息", + "ColumnName": "项目预算工时", + "GUID": "ec9f7b3b-7abe-454b-9f88-6a09f721fcfc" + } } }, "StyleDatas": { "Styles": [ { - "Foreground": 0 - }, - { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Foreground": 0 - }, - { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332 }, { - "FontFamily": 1, + "Foreground": 1 + }, + { + "FontFamily": 0, + "FontSize": 12.0 + }, + { + "FontFamily": 0, "FontSize": 13.333333333333332, - "Foreground": 0, + "Foreground": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1, "Formatter": 2 }, { "FontSize": 18.666666666666664 }, { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 18.666666666666664 } ], "Types": { "Strs": [ - "Text 1 50", "Body", + "Text 1 50", "[AUTO]General" ] }, "CellStyles": { - "1,1": 0, - "1,9": 1, + "0,29": 0, + "0,30": 0, + "0,39": 0, + "0,40": 0, + "1,1": 1, + "1,9": 2, "1,10": 2, - "1,11": 2, - "1,12": 2, - "1,13": 2, - "1,17": 3, - "1,18": 2, + "1,11": 3, + "1,12": 0, + "1,13": 0, + "1,14": 0, + "1,15": 0, "1,19": 2, "1,20": 2, - "1,21": 2, - "1,25": 3, - "1,26": 2, - "1,27": 2, - "1,28": 2, + "1,21": 4, + "1,22": 0, + "1,23": 0, + "1,24": 0, + "1,25": 0, "1,29": 2, "1,30": 2, - "1,31": 2, - "1,32": 2, - "1,33": 3, - "1,34": 2, - "1,35": 2, - "1,36": 2, - "1,37": 2, - "2,1": 4, - "2,9": 5, - "2,17": 5, - "2,25": 5, - "2,30": 5, - "2,31": 5, - "2,32": 5, - "2,33": 5 + "1,31": 4, + "1,32": 0, + "1,33": 0, + "1,34": 0, + "1,35": 0, + "1,36": 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,45": 0, + "2,1": 5, + "2,9": 0, + "2,10": 2, + "2,11": 6, + "2,20": 2, + "2,21": 6, + "2,29": 0, + "2,30": 2, + "2,31": 6, + "2,36": 6, + "2,37": 6, + "2,38": 6, + "2,39": 0, + "2,40": 2, + "2,41": 6, + "3,29": 0, + "3,30": 0, + "3,39": 0, + "3,40": 0, + "4,21": 0, + "4,22": 0, + "4,23": 0, + "4,24": 0, + "4,29": 0, + "4,30": 0, + "4,39": 0, + "4,40": 0 }, "SheetStyle": { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332 } }, "Spans": [ "2,1,1,5", - "2,9,1,5", - "2,17,1,5", - "2,25,1,5", - "2,33,1,5" + "2,11,1,5", + "2,21,1,5", + "2,31,1,5", + "2,41,1,5", + "1,19,2,1", + "4,11,1,2", + "4,13,1,2", + "1,9,2,1", + "1,29,2,1", + "1,39,2,1", + "4,31,1,2", + "4,33,1,2", + "4,23,1,2", + "4,21,1,2", + "4,41,1,2", + "4,43,1,2" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -367,7 +699,7 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Location": "205,0", - "Size": "190,79" + "Size": "250,79" }, { "Name": "769f904e-1d99-4edb-b1dc-4a48a3dcf371.png", @@ -380,8 +712,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "410,0", - "Size": "190,79" + "Location": "470,0", + "Size": "250,79" }, { "Name": "4cdb3ab8-4b9f-40b2-98ff-ca716a91f9cc.png", @@ -394,8 +726,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "615,0", - "Size": "190,79" + "Location": "735,0", + "Size": "250,79" }, { "Name": "6512132f-7136-446d-a971-e9f12489d7ab.png", @@ -408,8 +740,8 @@ }, "IsAutomaticStroke": false, "IsAutomaticFill": false, - "Location": "820,0", - "Size": "190,79" + "Location": "1000,0", + "Size": "250,79" } ] -}//WC5oyeg84TOBtmXup5Wr+9ZyPziInw9KN47RWsc2yEz4z+d1bbfU5KNgGehEpZJgVu8jm/iTMQDXjBMajy8GfXv3dari2HC3Kp1vClxP+CWJ8NwfgPhDRRvnceFq9rpu+lc2kTvoWwVrO9phxOdX8qvt2GvY+UMUIDorIjraPRZe/UUyFMZPz39x15R8zwpDucqpWoMj6FIYFQ7MkQAQpgIjhmdbm1Zadg/nre5wiHENIgRiw6t1yPX2bXjbHVEIoy+tFmP5SnqQSOVP3LspTVvPKsvn3WvQwGNBuwSEYF4oE5kvXJuowRxFNG5+1puF0TpxBRpIJExrVtADgzY7yDNXNO+mvFTyx2zg9agnqrsP9HDBgm+NqSm7XC7DPxJGwSo8SeoIbNlS88C0K7J6LPoxOhnaQ3kSdde/pTM+OAKmcIMMixHFzhu7tDBv/ZiMAONOAo9F1F9hYcJQLHTuF34AvllUPLkcWJ6vZCJONDjh0OxsEY7CM8xgAVYnoQZG5eoDuD5IvkCK8Cz5N9KWj4OrXk/WjQRurGr8tto451DLij/lmXa4++QOileNy/DGzT6qgzGJETdFxWY5cMNlV2dkk4Vg9odzcd1glK5oqm9vkOhXBSfhNAahrYSnwIYptJ++vsgozfMqJgv3YSUo2ZI8C0n3KUakWXYyDeR80jcc1Z9kBEpOY1rJP74NciEYiPzIXSnT43ep8fBslCBecRmqNPmoMp2iX190I9q0MjRMPlZhlp7p6vQ6S1638NiTUQlgZM1N+XSpnC6T2UXB7KfbErmN38k775/u8bO3ugRi1D0BQcwL6kFrdKErIQzeX+epd9VUMBDxqvVZpnzWeB89T4AgGg1z7cUHwk2ku7iunDwORN+7eG/XAwDbMN7upB5Sox9W5+hLWmW6AvLoew==|920 \ No newline at end of file +}//mXviaxBcmn1gLtTeJXxhmY85mHoKUyIAgGeSVxhh3K44z8VZqN1jJrN1JmuUQmlonHho9t3EVTSZ1n49lG+r6qtgbF32RR7a9zCClph+y8yUN7xzHXNQdC+jiT1/jpYmnZojVDrWOikJTSVQ1K2k8YPTna7CChXSJTgqFv5dweZU1Gz193Hq+uyKqhZLypI4rfOPiWvtyDnMkW9X3/W+yM3Y/zGbLf8rwuTzoDbOs6Lay5IsqUkmvKZqnGN88LysX4AzaZZm/wUiR3+7thh+8A+U2Iwvq8TSd1m8e5w0jE1f7ImBMJZwq4eyk9ffZbQdwK9wKHfVBcz4IqL+HYTNnFJ0kG/VLtNBXdVJ2o96b2vTNFZQ8XWB8M6Dz7fYxtQyS8wS4BeSAN5vP1w4g3C6eSGkk6qn8weNT9Ml3ddj1a7Zoqwffy33xyB/78IoEgd1it6164fxvWsw9A+aVcx6DoCtkmX/Q7Ze3wIdbTfQFMD4KkOuzE89axllYcuu+3DmeDGv22lNT2Yb3iqDDxmpfkhmFHJivsaxUr3IGY/B3QjsMt3xazYsde9aUaqsZMTMcYYJww4DI1JfwKdg18w/Vb0Zew80XGx7h1L2BJGU+ULxqcdJrlKeng2ZVVn7DEe5+VAd77ZFvV5BDEdipMh522YnLPpGBiocl/5hlmUYUD90TPdafZG4NAL6LqEPn8WlXpdVH1YRhIz+0eSPPooyvs8N2DLiR5QcEbhqoeQPW+FA129/KiUKwsMbbrn4Xb2rla9zOI50Kxaoljo7RBcLWb8kf97gLnPZf1+4SUa6YjXBIA2hjwLGbD2N4PmonXXz4dwhNJ78+t5nncyowKJ6MoxhFlOFm3eSXoTGo927+3E7B28Ltd+ECy9XQoz947GIZ8VPsovcrZEzz7HAO2X4yw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况.json b/Pages/项目首页/项目首页子页面/项目概况.json index 7f191db6..5dd31a38 100644 --- a/Pages/项目首页/项目首页子页面/项目概况.json +++ b/Pages/项目首页/项目首页子页面/项目概况.json @@ -14,7 +14,7 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 24.0 } }, "3": { @@ -25,29 +25,12 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 24.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 177.0, - "Mode": 1 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 188.0, - "Mode": 1 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0, + "DesignLengthInPixel": 278.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -57,14 +40,19 @@ } } }, - "9": { + "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 230.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 } } }, - "Count": 10, - "DefaultSize": 10.0 + "Count": 9, + "DefaultSize": 24.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -230,16 +218,6 @@ "DesignLengthInPixel": 10.0 } }, - "36": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "37": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "38": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -259,14 +237,25 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "42": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "43": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, - "Count": 42, + "Count": 44, "DefaultSize": 32.0 }, "Values": { "1,1": "项目概况-关键数据", - "3,1": "项目成员统计" + "3,1": "项目成员统计", + "5,1": "项目甘特图" }, "AttachInfos": { "1,1": { @@ -340,6 +329,12 @@ "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "项目成员统计" } + }, + "5,1": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "项目甘特图" + } } }, "StyleDatas": { @@ -355,6 +350,13 @@ "FontFamily": 1, "HorizontalAlignment": 2 }, + { + "Background": 3, + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Foreground": 4, + "HorizontalAlignment": 2 + }, { "FontFamily": 1 } @@ -363,7 +365,9 @@ "Strs": [ "Background 2 -10", "Body", - "Center" + "Center", + "Background 2 0", + "Text 1 50" ], "Borders": [ { @@ -377,69 +381,99 @@ "3,1": 2, "3,32": 1, "4,32": 1, + "5,1": 3, + "5,2": 4, + "5,3": 4, + "5,4": 4, + "5,5": 4, + "5,6": 4, + "5,7": 4, + "5,8": 4, + "5,9": 4, + "5,10": 4, + "5,11": 4, + "5,12": 4, + "5,13": 4, + "5,14": 4, + "5,15": 4, + "5,16": 4, + "5,17": 4, + "5,18": 4, + "5,19": 4, + "5,20": 4, + "5,21": 4, + "5,22": 4, + "5,23": 4, + "5,24": 4, + "5,25": 4, + "5,26": 4, + "5,27": 4, + "5,28": 4, + "5,29": 4, + "5,30": 4, "5,32": 1, "6,32": 1, - "7,1": 3, - "7,2": 3, - "7,3": 3, - "7,4": 3, - "7,5": 3, - "7,6": 3, - "7,7": 3, - "7,8": 3, - "7,9": 3, - "7,10": 3, - "7,11": 3, - "7,12": 3, - "7,13": 3, - "7,14": 3, - "7,15": 3, - "7,16": 3, - "7,17": 3, - "7,18": 3, - "7,19": 3, - "7,20": 3, - "7,21": 3, - "7,22": 3, - "7,23": 3, - "7,24": 3, - "7,25": 3, - "7,26": 3, - "7,27": 3, - "7,28": 3, - "7,29": 3, - "7,30": 3, + "7,1": 4, + "7,2": 4, + "7,3": 4, + "7,4": 4, + "7,5": 4, + "7,6": 4, + "7,7": 4, + "7,8": 4, + "7,9": 4, + "7,10": 4, + "7,11": 4, + "7,12": 4, + "7,13": 4, + "7,14": 4, + "7,15": 4, + "7,16": 4, + "7,17": 4, + "7,18": 4, + "7,19": 4, + "7,20": 4, + "7,21": 4, + "7,22": 4, + "7,23": 4, + "7,24": 4, + "7,25": 4, + "7,26": 4, + "7,27": 4, + "7,28": 4, + "7,29": 4, + "7,30": 4, "7,32": 1, - "8,1": 3, - "8,2": 3, - "8,3": 3, - "8,4": 3, - "8,5": 3, - "8,6": 3, - "8,7": 3, - "8,8": 3, - "8,9": 3, - "8,10": 3, - "8,11": 3, - "8,12": 3, - "8,13": 3, - "8,14": 3, - "8,15": 3, - "8,16": 3, - "8,17": 3, - "8,18": 3, - "8,19": 3, - "8,20": 3, - "8,21": 3, - "8,22": 3, - "8,23": 3, - "8,24": 3, - "8,25": 3, - "8,26": 3, - "8,27": 3, - "8,28": 3, - "8,29": 3, - "8,30": 3, + "8,1": 4, + "8,2": 4, + "8,3": 4, + "8,4": 4, + "8,5": 4, + "8,6": 4, + "8,7": 4, + "8,8": 4, + "8,9": 4, + "8,10": 4, + "8,11": 4, + "8,12": 4, + "8,13": 4, + "8,14": 4, + "8,15": 4, + "8,16": 4, + "8,17": 4, + "8,18": 4, + "8,19": 4, + "8,20": 4, + "8,21": 4, + "8,22": 4, + "8,23": 4, + "8,24": 4, + "8,25": 4, + "8,26": 4, + "8,27": 4, + "8,28": 4, + "8,29": 4, + "8,30": 4, "8,32": 1 }, "SheetStyle": { @@ -449,9 +483,9 @@ "Spans": [ "3,1,1,30", "7,1,1,30", - "5,1,1,30", "1,1,1,30", - "1,32,8,9" + "1,32,8,11", + "5,1,1,30" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -502,6 +536,260 @@ "PaperSize": {}, "Margin": {} }, + "Charts": [ + { + "ChartType": 29, + "DataOrientation": 1, + "Tag": { + "$type": "Forguncy.Model.ChartDataMapping, ServerDesignerCommon", + "DataSeriesMapping": [ + { + "ListViewColumnFormula": "计划工时" + }, + { + "ListViewColumnFormula": "实际工时" + } + ], + "ItemsMapping": { + "ListViewColumnFormula": "日期" + }, + "IsDataSourceEnabled": true, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "工时日期", + "GUID": "10a3d3b5-2d7b-4975-b0ae-33903c173bd8" + }, + "ColumnName": "日期" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总计划工时", + "GUID": "6cca1b7a-20fe-400e-a5d3-5c0a4d36d1b8" + }, + "ColumnName": "计划工时" + }, + { + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "总实际工时", + "GUID": "4f633881-9c35-4eec-b215-8ebc2f049faa" + }, + "ColumnName": "实际工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "dc07ea74-592d-4c0a-87a9-73ce7d1dd762" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目概况!项目ID" + } + }, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "工时日期", + "GUID": "269430ba-2938-48d8-8a44-e031da2bf2cd" + }, + "Order": 0 + } + ] + }, + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "79ea2292-e6a7-4656-9306-bc909173ccab" + }, + "DisplayEmptyCellsAs": 1, + "DisplayHidden": true, + "ChartColorPalette": { + "RepeatAlgorithmTint": [ + 0.0, + -40.0, + 20.0, + -20.0, + 40.0, + -50.0, + 30.0, + -30.0, + 50.0 + ], + "ColorList": [ + "Accent 1", + "Accent 2", + "Accent 3", + "Accent 4", + "Accent 5", + "Accent 6" + ] + }, + "XAxises": [ + { + "Items": [ + "2024-03-01T00:00:00", + "2024-03-02T00:00:00", + "2024-03-03T00:00:00", + "2024-03-04T00:00:00", + "2024-03-05T00:00:00", + "2024-03-06T00:00:00", + "2024-03-07T00:00:00", + "2024-03-08T00:00:00", + "2024-03-09T00:00:00", + "2024-03-10T00:00:00" + ], + "UseCustomItems": true, + "MajorTickPosition": 0, + "LabelFormatter": "m/d", + "ShowMajorGridlines": false, + "MajorGridlinesStroke": "Background 1 -15", + "MajorGridlinesStrokeThickness": 0.8, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "StyleInfo": { + "Fill": "transparent", + "FontFamily": "Body", + "FontStretch": "Normal", + "FontStyle": "Normal", + "FontWeight": "Normal", + "StrokeDashType": 8, + "Stroke": "Background 1 -15", + "StrokeThickness": 0.8 + } + } + ], + "YAxises": [ + { + "Visible": false, + "Orientation": 1, + "Items": [ + 0.0, + 5.0, + 10.0, + 15.0, + 20.0, + 25.0, + 30.0, + 35.0, + 40.0 + ], + "DisplayUnit": 1.0, + "MajorTickPosition": 0, + "LabelFormatter": "General", + "ShowMajorGridlines": false, + "MajorGridlinesStroke": "Background 1 -15", + "MajorGridlinesStrokeThickness": 0.8, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "StyleInfo": { + "Fill": "transparent", + "FontFamily": "Body", + "FontStretch": "Normal", + "FontStyle": "Normal", + "FontWeight": "Normal", + "StrokeDashType": 0, + "Stroke": "Background 1 -15", + "StrokeThickness": 0.0 + } + }, + { + "Visible": false, + "Orientation": 1, + "AxisPosition": 1, + "LabelFormatter": "General", + "ShowMajorGridlines": false + } + ], + "Legend": { + "Orientation": 0, + "Alignment": 1, + "IsAutomaticFill": false, + "StyleInfo": { + "Fill": "Transparent" + } + }, + "DataSeries": [ + { + "ChartType": 29, + "Values": [ + 23.0, + 23.0, + 23.0, + 23.0, + 23.0, + 12.0, + 12.0, + 12.0, + 12.0, + 12.0 + ], + "Name": "计划工时", + "MarkerSize": "7,7", + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "StyleInfo": { + "Fill": "Accent 1 0 51", + "Stroke": "Accent 1", + "StrokeThickness": 0.0 + } + }, + { + "ChartType": 29, + "Values": [ + 10.2, + 10.2, + 10.2, + 7.2, + 7.2, + 1.2, + 1.2, + 1.2, + 1.2, + 1.2 + ], + "Name": "实际工时", + "MarkerSize": "7,7", + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "StyleInfo": { + "Fill": "Accent 4 0 51", + "Stroke": "Accent 4 0", + "StrokeThickness": 0.0 + } + } + ], + "PlotArea": { + "IsAutomaticFill": false, + "StyleInfo": { + "Fill": "transparent" + } + }, + "StyleInfo": { + "Fill": "Background 1", + "FontSize": 13.333333333333332, + "Foreground": "Text 1 35", + "StrokeDashType": 8, + "Stroke": "Background 1 -15", + "StrokeThickness": 0.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Name": "Chart1", + "Location": "32,573", + "Size": "960,230" + } + ], "CustomNames": [ { "Name": "工时走势", @@ -511,10 +799,6 @@ "Name": "关键数据", "Formula": "项目概况!$B$2" }, - { - "Name": "任务情况", - "Formula": "项目概况!$B$6" - }, { "Name": "项目成员", "Formula": "项目概况!$B$4" @@ -524,4 +808,4 @@ "Formula": "项目概况!$AG$2" } ] -}//e1ce8ObNzKXiATkA/CFY/dZRzeA2IZHt4iRdDoL+Y0uzAUO84hAJPE8U002oioYuE4RF3mEmUSm2SYDSLQISeCNA43SmhbbvXZqBCbLILmINrQFmF54/pUtOMG/Hu+rmsPOpGPG6z7u1SaJIc1pBtO3HryIdhTjN5xHF54urg4T5O0y09dDicMktJJqGJt7Fq9ZCYTKS1CTeA+OJvr2Z4It3qs/w8j+6sDMINCObbjKmDzWMO0HqtyfbIJsrhrEvj6od1Dq7cZo6a+mGtJSIAAX8LRpzqZXmrtiMQJkkEQ4B3Vr+E4RsfTsNlfi33Nl6MhUHnL8QxHeCRq5p29DSfg94qQh//uZqOAhBRLBmFwWwAZosFbrBle+z9atyz6k7Wjj743adb795CT/LaXPOoHtMG+WTiSgF5qunMASPGc84j6ZHKExJTWxLKADGfsc5JBMn2hr1LJGckja2HuSpmN06lq9lh78hGb9lWsclq/pV+0emCmKj96l4iJmqs1wiIr2wYFQKhRLWqs/89vWRqzlHJgTn3UQzSTZCvn6NO9reAH//6OdUtaVvRlQGu+Jc2XUm+yHpST8CrYVIDByx8ByftE0JMh0tMm4EIyYx6l9hrJjBuP9fr+nqfrS/KJpZ2KjVlzJIvu5tAJKf21cZw9QkLOe4rShzlokEbU1RlXRQte6vA7Q308+M/miYz6NjA5327SPxbpARJCdWDlmyYfVuoxUhlnOkOJEwEczfNQB1T6NNVsu35rvWvherHfQSv1yYF3aXKJFN0g7/qZ/ynZ8CWsQa6QMYmmTzSEQwpPkKQ8YXrHV7vNySkwNeWZ5OqHF2wB6ygvOZUNq7RdrIofFSAMvYsYiXn5+r7HjUJ/LHyreudEjPey/y7jXb8X6s9nofr8mEPzE1IBg25A5vsA==|920 \ No newline at end of file +}//LYEQzA/Fz/rnXvIRWUy14WBnTS0tQBwMwLuqViGDHG4MngnBJCaUOSgSFx6BXreDr9lMFwq159GDPbiv31/aRnYoxDA/n9X1+ereZp7esgShOY46/libNmBLYKneOsUVll8WRBGk7BUvF/P0RsqpK7S7UbWBtlHdolwDyXl93a6S3B9RyHh9kWFlavTeQO/cLx2971ViNw/+tEY81PVu9SKH6BccthrS9p+3pJwqXEQGOmngmH6mw+UGDq3n2+NydAgDNgYRIuWYDzN/0pNrtim92jUoaoKgIZ7yn69Ehn44G1p2QR+jE6NDV26FZsq6PMQzRl8DeQueSaN2hSQF9xNRwzETxtLo1XvPnEVbYmskG+baKDbgSZIi/zRdaWQ1sKKVIhpuPb4LDbJaHPU1xqPa1ZRZDisjb1WOrU+N0SgpEmC2ZDRe94E/XYq9R4cq6sdxhIIC7IRfT1ScY/Db+ongMc+3u4MgQTdP26vNr9DECpwQYJ78Z/81hSza83WBHuVN/ss1rnFcf5jXu1poMF4M6KSlzFjk3OldYc6xzTqsW4sLUoMvaiSn9tXgazov5zRoO2JIog3TFJBpWH6KGIGZH+uzmuzpjEGw9bo5I1LhC2LKrXMGanymixwpZokIjdxmqJd6yimDF3ppi4evTTdq/ifn+lEqnfUQ+wONubSEF09QvPHZEMjjTDPZzRtAW5+YT3kN7J/MIKNMnT7XrIqOlNsDMebg8OeJ8wt+q7yU0o9ConxB1+flrAKTffuchdJ5T+Ou61u9ls/6O+ADJ/JJSeCDSTUOxkrs1X8W3T3pjDuuCjuq1KKx6cSSBvb1NNYV/wIz/zIiLH0sAnnrWhcIiDcIFO9l0UhST0I1dAwU66VuMnFkDi3l31aLsFAMpJZpk6KdUDFftmW3tENoAA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目甘特图.json b/Pages/项目首页/项目首页子页面/项目甘特图.json new file mode 100644 index 00000000..6046026a --- /dev/null +++ b/Pages/项目首页/项目首页子页面/项目甘特图.json @@ -0,0 +1,539 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 347.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 1, + 2, + 3, + 4, + 5, + 6 + ], + "Count": 7, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 31, + "DefaultSize": 32.0 + }, + "AttachInfos": { + "0,0": { + "CellType": { + "$type": "Gantt.GanttCellType, Gantt", + "GanttListViewInfo": { + "ListViewName": "表格1", + "GanttTaskSetColInfo": { + "IdCol": "ID", + "LevelCol": "层级", + "OrderCol": "次序", + "NameCol": "任务名称", + "DependsCol": "前置任务", + "StartCol": "开始时间", + "EndCol": "结束时间", + "DurationCol": "工期", + "DescriptionCol": "任务说明", + "CodeCol": "版本名称", + "ProgressCol": "进度", + "EndIsMilestoneCol": "里程碑", + "ActualStartCol": "开始报工日期", + "ActualEndCol": "最后报工日期", + "CollapsedCol": "分组名称", + "StatusCol": "任务状态", + "AssigsCol": "执行者.全名" + }, + "GanttStatusSetInfo": { + "WaitingCol": "-1", + "ActiveCol": "1", + "CompletedCol": "2", + "SuspendedCol": "0", + "FailedCol": "-2" + }, + "GanttCollapsedSetLevel": -1 + }, + "InitialCalculationMode": 1 + } + }, + "1,0": { + "ListViewInfo": { + "Name": "表格1", + "TableName": "任务表", + "RowIndex": 1, + "RowCount": 6, + "ColumnCount": 31, + "DetailListViewInfo": { + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + }, + "TopCondition": null, + "ListViewStyleName": "_RS_NewFashionListStyle2", + "ShowColumnHeaderInDesigner": true, + "ShowEditStatusIcon": true, + "UseSimpleBar": true, + "ColumnOperation": 2, + "CommitType": 1 + } + }, + "2,0": { + "NameUsedInJavaScript": "ID", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "506ec052-affb-4a50-b311-5dde9f2beee7" + } + }, + "2,2": { + "NameUsedInJavaScript": "父任务ID", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "父任务ID", + "GUID": "2d5608c0-bb3a-4545-bbcf-e12ae87f05e8" + } + }, + "2,3": { + "NameUsedInJavaScript": "次序", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "次序", + "GUID": "7e12b30b-d178-4323-8528-d6630e90260d" + } + }, + "2,4": { + "NameUsedInJavaScript": "层级", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "层级", + "GUID": "7575addd-67fb-4698-bcc2-260a37f54188" + } + }, + "2,6": { + "NameUsedInJavaScript": "任务名称", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "e3f7ae08-9356-4a2a-8e6c-15eac159a32f" + } + }, + "2,8": { + "NameUsedInJavaScript": "执行者.全名", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "执行者", + "GUID": "2ac0edd8-0330-47d6-8a32-e6a750d9bcfd", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + } + }, + "2,10": { + "NameUsedInJavaScript": "开始时间", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "开始时间", + "GUID": "26bfe21e-4d4b-4803-8282-478c95388b92" + } + }, + "2,12": { + "NameUsedInJavaScript": "结束时间", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "结束时间", + "GUID": "9f4b71ba-d1cc-43d0-a361-9ea102f869f7" + } + }, + "2,15": { + "NameUsedInJavaScript": "分组名称", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "分组ID", + "GUID": "de63958e-8e7c-4585-802e-6054442cb4f5", + "RelationBinding": { + "RelatedTable": "项目任务分组", + "RelatedColumn": "ID", + "DisplayColumn": "分组名称" + } + } + }, + "2,17": { + "NameUsedInJavaScript": "版本名称", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "64af25ec-9b58-44eb-946d-ad43531fd6e0", + "RelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "版本名称" + } + } + }, + "2,19": { + "NameUsedInJavaScript": "任务状态", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务状态", + "GUID": "ed3ad060-12e8-4be1-9310-ce9710779316" + } + }, + "2,21": { + "NameUsedInJavaScript": "前置任务", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "前置任务", + "GUID": "62ca8ff5-a0a6-44d9-be23-e4d86597b233" + } + }, + "2,23": { + "NameUsedInJavaScript": "工期", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "工期", + "GUID": "d5312461-f026-419f-9a68-7361b0102da9" + } + }, + "2,25": { + "NameUsedInJavaScript": "开始报工日期", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "开始报工日期", + "GUID": "b5ea2af6-9c4d-4470-a8c7-e4cd92ac4ef9" + } + }, + "2,27": { + "NameUsedInJavaScript": "最后报工日期", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "最后报工日期", + "GUID": "d19371c7-f344-4910-8d73-f549b694d0b7" + } + }, + "2,28": { + "NameUsedInJavaScript": "任务说明", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务说明", + "GUID": "4b41dacd-aa78-4b93-8c3b-699f38f56e35" + } + }, + "2,29": { + "NameUsedInJavaScript": "里程碑", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "里程碑", + "GUID": "6c233bf4-7a1d-427c-8ac3-e212f6b5813e" + } + }, + "2,30": { + "NameUsedInJavaScript": "进度", + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "进度", + "GUID": "b3338cc6-9924-4d62-9e87-b045de8583f1" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0 + } + ], + "Types": { + "Strs": [ + "Body" + ] + }, + "CellStyles": { + "1,2": 0, + "1,3": 0, + "1,6": 0, + "1,7": 0, + "1,8": 0, + "1,10": 0, + "1,12": 0, + "1,13": 0, + "1,14": 0, + "1,15": 0, + "1,16": 0, + "1,17": 0, + "1,18": 0, + "1,19": 0, + "1,20": 0, + "1,21": 0, + "1,23": 0, + "1,24": 0, + "1,28": 0, + "1,29": 0, + "2,2": 0, + "2,3": 0, + "2,6": 0, + "2,7": 0, + "2,8": 0, + "2,10": 0, + "2,12": 0, + "2,13": 0, + "2,14": 0, + "2,15": 0, + "2,16": 0, + "2,17": 0, + "2,18": 0, + "2,19": 0, + "2,20": 0, + "2,21": 0, + "2,23": 0, + "2,24": 0, + "2,28": 0, + "2,29": 0 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "0,0,1,31", + "3,0,4,31", + "2,0,1,2", + "2,4,1,2", + "2,6,1,2", + "2,8,1,2", + "2,10,1,2", + "2,12,1,3", + "2,15,1,2", + "2,17,1,2", + "2,19,1,2", + "2,23,1,2", + "2,25,1,2", + "2,21,1,2", + "1,0,1,2", + "1,4,1,2", + "1,6,1,2", + "1,8,1,2", + "1,10,1,2", + "1,12,1,3", + "1,15,1,2", + "1,17,1,2", + "1,19,1,2", + "1,21,1,2", + "1,23,1,2", + "1,25,1,2" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [], + "RelatedDataTableName": "任务表" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//MLIiD24S25Cde+unqusndsLatl7AGmgpndf8QEYJah6+W13T+1PFUTOcynXj1EKoZZro7Pcwcx3YStijS2yVMLwuZmMxEyWWcAFlwwVO/UmjWS9LqNS68zDs76XDzNr9yTAgL/XyadmoOi08fUXij+O0AgvDg5nVpXfjMMTDZWLTQUqKZGa2uVEonUGRejhyn6pMbap0pdELPSm7d11w+t6Gy04GeHP81rOkR8+qv1y+sdW9URqmz8Rp3wSGyiKDEh7cOWGhCbh6c8Jag9AdlBFvSihnwsIZmzNRMY756WpgdbU3R+zFo5vNZFtfm2opAE6Vd53fCfKYI+dcXNP+8NRh5cqKJkhx7UMj+vPPObjGqJjGzDH4QofiulMR38AXLbmmhfDmfn1MnO15XQcHyszBggRPOE05VGbEj3oByVM8FN9DLVOLup28nP61DblDLl6w89/PHdwhjzuXe43GUBPRqUkBGrzFXSl9PmClHQF0IoTA/skIpNLYRclVxbe5YjMVeFR4VG69OPfI2FD1SzssGQ8d2O+p1ojl3vJCkJktYwoPRjP0jebU8Ao9aahDMy/j51Vk4M1UT/fO7V7zujBfKEvojktaUaEQT3b3iNWVOPUDjiwkBkFtBVtQV2fkCzigbekcKReAL7KMnvYsLEssZ2zJ5YoDzC6iegXTGhLWHGxdV1fB/cb70Q1pqYYrtxD80nn67kdKOLuoxXeuo7n0/2POs6oimbFmXn1Eu7PE1yKqLUO87pKhB5H4boe8YFL8fkzwMuKIQr1BX7LFPBXR0Hn13yNFrkpzz37CcUBCOWKlw9VMgdc6OCbcvQcTa/jFJvBYTHSdZ47karXrZ2q8u0c4HJyAHj0wa8eOZLVWSxYn8E5/VKtw7yBWfk/E9nibu/LyjtoT5A2huqTysA==|920 \ No newline at end of file diff --git a/Plugin/甘特图-9_0_102_0.zip b/Plugin/甘特图-9_0_102_0.zip new file mode 100644 index 00000000..aab303ab Binary files /dev/null and b/Plugin/甘特图-9_0_102_0.zip differ diff --git a/ServerCommands/任务/新增任务.json b/ServerCommands/任务/新增任务.json index 24920394..f8940fb5 100644 --- a/ServerCommands/任务/新增任务.json +++ b/ServerCommands/任务/新增任务.json @@ -62,12 +62,6 @@ }, { "Name": "备注" - }, - { - "Name": "工时核定方式", - "DataValidationInfo": { - "IgnoreBlank": false - } } ] } @@ -87,7 +81,7 @@ "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", - "GUID": "65e8a5b2-d055-4d75-980e-64ec0ff052db" + "GUID": "de3bcaa7-aa75-4d79-9231-4da30533b74a" }, "ColumnName": "用户名" }, @@ -95,7 +89,7 @@ "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "全名", - "GUID": "8847c1cf-53e1-4aac-8562-95c7325cc4b9" + "GUID": "6917ca2f-a4c8-4e6e-83a1-da8d327f145c" }, "ColumnName": "全名" }, @@ -103,7 +97,7 @@ "BindingInfo": { "TableName": "用户信息视图", "ColumnName": "默认时薪", - "GUID": "23e39e20-adf1-40f6-ac99-7201bd166a5c" + "GUID": "32e094df-b3d7-41fb-b64a-bedb6e0dbd3b" }, "ColumnName": "默认时薪" } @@ -114,7 +108,7 @@ "ColumnBindingInfo": { "TableName": "用户信息视图", "ColumnName": "用户名", - "GUID": "5aeb92ea-1ea6-4872-9c4e-5fe7d75f5c08" + "GUID": "92e828b4-ed0b-4537-8274-16bfe9f17ad7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -122,7 +116,80 @@ } } }, - "ID": "e3847d67f1ab4509a4c983a05b0bd7f9" + "ID": "f6ffae1d6c224289b79d71d3369d42e2" + }, + { + "$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": "=父任务ID" + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "层级", + "ParameterValue": "1", + "ID": "c54f363fdd1243ab9ebb70c447e54aa0" + } + ], + "ID": "07198417-17b5-4c22-804e-87768a0591a6" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "父任务", + "TableValue": { + "TableName": "任务表", + "TableValueType": 1, + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "层级", + "GUID": "71447dd9-ed15-40d3-8c95-35af02be1228" + }, + "ColumnName": "层级" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务表", + "ColumnName": "ID", + "GUID": "a11173ee-ce04-46d5-a2fe-57bac8f3d19f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务ID" + } + }, + "TopCount": "1" + }, + "ID": "b61ebbfdb99e4ab4b532f442c4ccf95c" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "层级", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=父任务.层级+1" + }, + "ID": "50af90520fcd4a5aa3def7f06c79bf0d" + } + ], + "ID": "d3597ad2-8653-445c-bccf-d7ba5b7cb895" + } + ] }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -137,7 +204,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "3ac652c3-66fb-47bd-874b-4320475a21d1" + "GUID": "b04306d4-7201-4eb8-948a-4e21ccd3c19b" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -148,7 +215,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "父任务ID", - "GUID": "1f07338e-2288-4d61-959b-89f635363cd4" + "GUID": "78b4a98e-eac4-47aa-aa4e-1fc168873d15" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -159,7 +226,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务名称", - "GUID": "3718b0bd-070e-4600-8715-dcf3e24c94ac" + "GUID": "9236bf4b-f458-443b-9d42-b22de80d2623" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -170,7 +237,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "执行者", - "GUID": "4a4488e5-8299-45b0-9af2-990e4cc76a12" + "GUID": "7de19a46-9ff6-41eb-b644-bd6fc0022884" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -181,7 +248,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "开始时间", - "GUID": "683a964b-4e37-4fc2-95c8-a32a5ef49b98" + "GUID": "12545857-1a69-491a-afe2-69d52ba3adb1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -192,7 +259,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "结束时间", - "GUID": "2b2ffb2b-b60b-444f-9cf4-1d1205f43e1a" + "GUID": "f9d9e102-8ddc-430a-83c9-6759918c3bf7" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -203,7 +270,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务类型", - "GUID": "db0eb559-32bc-4d77-b592-a7d1a1f9dfef" + "GUID": "74a0db34-6116-4c14-9275-820e0e7bedf1" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -214,7 +281,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "分组ID", - "GUID": "a2f9ca94-58eb-4d71-9c2c-1389173fc4da" + "GUID": "afa4c154-4cf6-497b-b55f-799bf4d3782a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -225,7 +292,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "版本", - "GUID": "7537bed4-54aa-4089-9ab2-3858bf5f84d4" + "GUID": "1aa2c146-4c85-4bf1-afef-f5ed637646fc" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -236,7 +303,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务说明", - "GUID": "52850429-1eb2-4bbc-ada8-4aa509476764" + "GUID": "18b091f5-71e5-452e-9a52-7a608c1de521" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -247,7 +314,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "备注", - "GUID": "9e46dee4-005a-4bee-a4f7-ee41d5e3ca5a" + "GUID": "4bd247ec-5f3c-410a-86ac-5f5900174fa2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -257,21 +324,21 @@ { "BindingInfo": { "TableName": "任务表", - "ColumnName": "工时核定方式", - "GUID": "0e919c63-7450-4099-8a2f-209f57f04de8" + "ColumnName": "任务状态", + "GUID": "bfd5eced-642a-4fa0-a515-d004107749c3" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=工时核定方式" - } + "Value": "0" }, { "BindingInfo": { "TableName": "任务表", - "ColumnName": "任务状态", - "GUID": "85821a7c-ba18-42b2-b9d7-ba0dd5a11e00" + "ColumnName": "层级", + "GUID": "745dab60-5ec4-45f1-b77a-4547247937af" }, - "Value": "0" + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=层级" + } } ], "ParamNameToSaveNewRowValue": "新任务" @@ -297,7 +364,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务ID", - "GUID": "361b6b3c-69df-408f-a21b-4886f6b7a4f0" + "GUID": "f7aff15e-7a00-4c45-bb96-2c3fda9c9640" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -308,7 +375,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "6bd951db-7e72-46fe-a0b0-2237549dd27f" + "GUID": "e616fd0b-0315-4818-be45-20c6cf69073c" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -319,7 +386,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务时薪", - "GUID": "f239856b-04dd-4447-b3e5-4513ed30d85d" + "GUID": "61bbc717-8d82-45cf-8176-8e06d009bf30" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -340,7 +407,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "2c28402f-de3d-469d-87d3-1f655cd25b9b" + "GUID": "e39baf44-b9b5-4142-800d-78993fb0d0a6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -351,7 +418,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "50c7025d-2a5a-4673-a963-a24315307d2a" + "GUID": "5d49127d-ef06-420e-ab9c-66b073739b36" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -362,7 +429,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "035de14f-955c-484a-9d86-716840bcfffb" + "GUID": "1957de38-d49e-4123-a364-b267cd6ff3c5" }, "Value": "%CurrentUser%" } diff --git a/ServerCommands/工时/新增工时.json b/ServerCommands/工时/新增工时.json index 884155d6..036f916a 100644 --- a/ServerCommands/工时/新增工时.json +++ b/ServerCommands/工时/新增工时.json @@ -92,15 +92,23 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "bb20fdc3-0297-49f1-ab7e-1fd6a72d1b4f" + "GUID": "1b1dfe53-8569-419b-9ac7-4bb4e54e5cb3" }, "ColumnName": "项目ID" }, + { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务名称", + "GUID": "2f0ff2cf-b0cf-49ba-99c2-9b8636152c54" + }, + "ColumnName": "任务名称" + }, { "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "8209e318-8db6-4b0b-be51-ac7f7708da86" + "GUID": "93ff9848-29c1-4cf6-a3cd-d33eb1d033c4" }, "ColumnName": "任务状态" }, @@ -108,7 +116,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务状态", - "GUID": "69980b59-ccac-40f8-b175-9d1ce3a0cd0f", + "GUID": "da675aa2-3619-422b-817f-eed8c7c118c7", "RelationBinding": { "RelatedTable": "任务状态", "RelatedColumn": "状态码", @@ -121,7 +129,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "7477f4b3-4261-410f-92f3-ec4f17977e56", + "GUID": "038a41fb-93fa-46f8-b259-87eb94cc28ad", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -134,7 +142,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "26218662-d3c9-4467-8302-886d229b9e1e", + "GUID": "f4212e88-f2aa-4d8f-8ba8-b7c518505bb7", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -147,7 +155,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "7f5ccbe0-4bcf-4fff-bed9-5099a6c7f24d", + "GUID": "31040160-fc88-459c-b67b-8621acbc0920", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -160,7 +168,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "项目ID", - "GUID": "19794bfa-cb8a-4893-95f0-07303a3cbe29", + "GUID": "17b7e0ce-f6c5-4095-93e6-637aa62440a7", "RelationBinding": { "RelatedTable": "项目表", "RelatedColumn": "ID", @@ -173,7 +181,7 @@ "BindingInfo": { "TableName": "任务表", "ColumnName": "任务类型", - "GUID": "7c7d1161-864d-46c5-89da-5eaaf1eec879", + "GUID": "f6fb60c7-0ba6-450b-9cda-28eb2412e296", "RelationBinding": { "RelatedTable": "任务类型", "RelatedColumn": "ID", @@ -188,7 +196,7 @@ "ColumnBindingInfo": { "TableName": "任务表", "ColumnName": "ID", - "GUID": "dd9dcf5f-2c56-43e7-b1fd-fac6aa05a3ca" + "GUID": "6ffb7caa-1cd8-4373-b2bf-8a03556c1866" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -198,7 +206,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "665750151a594df6a048b8d95bed1ea7" + "ID": "65eeed85453c408b9c335f8ac4e85d28" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -211,7 +219,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "cda3345e-0eb7-4d5f-adf7-3f52ca9f73c5" + "GUID": "20d5971e-0ac3-4236-9e5f-0e67e2034b35" }, "ColumnName": "参与人" }, @@ -219,7 +227,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "5a9a96a5-57b7-4711-b44e-1acbf70974c8", + "GUID": "b0fb9e47-ca43-45d0-bb54-cf7ac8edce15", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 5, @@ -232,7 +240,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "任务时薪", - "GUID": "605be2d4-7bb3-4ae7-b001-9f80d68f9112" + "GUID": "93b2f1d8-fd53-468a-9211-87f51b6a5494" }, "ColumnName": "任务默认时薪" }, @@ -240,7 +248,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "岗位ID", - "GUID": "697c882c-f66c-46bd-a196-cde86291560a", + "GUID": "299a3d18-2733-483d-bcd6-09e057c343ef", "RelationBinding": { "RelatedTable": "项目岗位", "RelatedColumn": "ID", @@ -253,7 +261,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "5c2bd0b7-bb61-40de-922f-cae4993b46a6", + "GUID": "599afbfc-245b-40b1-b078-adb9ca71abef", "AttachType": { "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", "UserColumnAttachType": 5, @@ -268,7 +276,7 @@ "ColumnBindingInfo": { "TableName": "任务成员表", "ColumnName": "ID", - "GUID": "60c34cb9-850e-4626-99ba-dfe39eb6e2f5" + "GUID": "c3e31a28-6692-46cf-a097-e63289906379" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -278,7 +286,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "f9be7598e218438fbcba12f354a21d2e" + "ID": "6ca889a1800540019e98e291149fc59b" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -303,10 +311,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(任务成员.任务默认时薪>0,任务成员.任务默认时薪,IF(任务成员.岗位默认时薪>0,任务成员.岗位默认时薪,IF(任务成员.参与人默认时薪>0,任务成员.参与人默认时薪,0)))" }, - "ID": "fd0a6ff93fc147caa102137da708d9f7" + "ID": "ce6cf79cab824510adc4dc16a3bcd8e4" } ], - "ID": "3129685c-5bf4-4a4a-a664-03b157dfa923" + "ID": "cf01cfae-00b2-4226-81de-8f2891a6a106" }, { "CommandList": [ @@ -317,10 +325,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=指定时薪单价" }, - "ID": "fcccbd0c8c854b9d9a39cf048258230b" + "ID": "42acba22a57f436eabba47314ae73ffb" } ], - "ID": "f8493f97-96b1-47a1-98da-41c713e152cb" + "ID": "abd1969f-ed96-4aca-9321-9151b218e8f2" } ] }, @@ -387,7 +395,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "faf92a52-90dd-434f-8e4c-2dd18c788ae4" + "GUID": "0e13d951-a44b-40e4-8ab7-50409bfa7785" }, "ColumnName": "总工时" } @@ -400,7 +408,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", - "GUID": "849f349b-6d13-452a-869c-cdef36e3ad9e" + "GUID": "574064e4-3b8f-49d2-a025-1f94902658b5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -412,7 +420,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "9d6cdc4d-5c2f-4e04-8880-cc49a0d8201a" + "GUID": "57c95084-14b9-46ba-86f0-c80a7b6a1126" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -422,7 +430,7 @@ ] } }, - "ID": "00e2481e06a9420ba8b4f0891da835ab", + "ID": "fecda59716454e74ae70599e1629520a", "Comments": "检查工时是否超支" }, { @@ -454,7 +462,7 @@ } } ], - "ID": "00c78b96-462f-4720-903d-f55cabbc3c4d" + "ID": "5200f5d4-6a3d-4335-8c94-22fe0f56e9d9" } ] }, @@ -468,7 +476,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "39ac01fa-1c11-4e3f-89b8-e300b9e98826", + "GUID": "43c04868-12c7-4e9d-b126-070d0e426dc6", "RelationBinding": { "RelatedTable": "任务成员表", "RelatedColumn": "ID", @@ -481,7 +489,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "e403c34a-b579-4e3a-9a1d-749817405d38", + "GUID": "2a0d738b-1e15-4fc1-835f-1a191e17f002", "RelationBinding": { "RelatedTable": "任务成员表", "RelatedColumn": "ID", @@ -494,7 +502,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "5384b183-3576-4c98-afec-a35e3d97d1ea" + "GUID": "366dc09c-6a7e-4c9c-9bae-48e1d9eab780" }, "ColumnName": "总工时" } @@ -507,7 +515,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "ID", - "GUID": "d786e2e8-d965-49f2-aca3-34474923e79c" + "GUID": "f9e17555-63a1-4c0f-8b80-06b4297cbbb5" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -519,7 +527,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "385c56d4-82c3-4a97-9bdb-73664b687909" + "GUID": "9512823f-431d-4f44-9cab-ba2d773d3a44" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -530,14 +538,14 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "0542b89aba6649e2b3e7fb9764f0b2da", + "ID": "bae0ed2a25ca4484be3ddf991fcda719", "Comments": "检查预算是否超支" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "总消耗金额", "ParameterValue": "0", - "ID": "7338661c547b45b684a0a8d6f28991f4" + "ID": "04a622af684046f7adf496cc660cde6f" }, { "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", @@ -557,7 +565,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=总消耗金额+(Item.任务时薪*Item.总工时)" }, - "ID": "510cee3e14ef407090c6ab0033375081" + "ID": "cde704fd082f4796baeda7390f2f1be0" } ] }, @@ -590,18 +598,18 @@ } } ], - "ID": "35413fc8-74a0-4834-8353-3c5f5ef12f92" + "ID": "1878cff1-12c6-4431-9842-425e61ab9080" } ] } ], "Comments": "如果提交的工时类型等于项目工时的核定方式", - "ID": "e158e76c-f48d-4e31-8480-4ae8c3da237b" + "ID": "a1aa118d-86a6-49ab-a2b3-687ff5801dd8" } ] } ], - "ID": "5284f69c-4cdd-4e2c-be87-25e8940c2d77" + "ID": "59cfd3a4-2c87-4442-9db8-456f30f553e1" } ] }, @@ -612,7 +620,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工时数" }, - "ID": "126980c6dce445b589b0d837ea8352a4" + "ID": "c47706cfdef74a61943d8b52147e01e3" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -621,7 +629,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=DATEDIF(开始日期,结束日期,\"d\")+1" }, - "ID": "dd576b98745d4a67bfe42ae84e9d9481" + "ID": "e9869319ddf04a8395ae0b9cb8c5d2c4" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -645,7 +653,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=开始日期+(index-1)" }, - "ID": "29f235cfbf2743818c18336764a24557" + "ID": "6e7b4d4141a24bac944dedf38ee89b94" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -658,7 +666,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", - "GUID": "bad45eaa-11c6-4e3a-8904-a714c109029d" + "GUID": "a0006a9d-3fba-4cf5-a20a-d2a0909d5175" }, "ColumnName": "总工时" } @@ -671,7 +679,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "adc3a145-9b6a-47f7-8400-83443bdb81f5" + "GUID": "98f3f236-67bc-4db2-9af7-407e52bdcd74" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -683,7 +691,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "02481477-98e3-44c2-bba1-40488f4e1386" + "GUID": "9a1d5408-9353-4ab0-bef4-91af355df584" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -695,7 +703,7 @@ "ColumnBindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "25577926-1f1a-4312-8dae-6171772e81a5" + "GUID": "6fae6e04-e2b8-4d6c-b594-3bd02c5883d2" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -706,7 +714,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "94c6dba001f14a0498de4ff9d2d7f3a6" + "ID": "2292424aae1d4f5591ddd78ce5ac22ab" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -735,10 +743,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(工时数/分配天数,1)" }, - "ID": "bda1df1ee564481e8c2ab06427335a4b" + "ID": "44b51db4c6be470dbc468d4a9abfa061" } ], - "ID": "5b6a4078-4152-455d-8cf3-5e1809864231" + "ID": "c747fe81-4983-455c-804e-5a06b510ea92" }, { "CommandList": [ @@ -749,10 +757,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时,1)" }, - "ID": "16ceb6f64bb747038fbe75470891dcf1" + "ID": "de7c26c08e4e4086bfa6f4d8dbcaa4fe" } ], - "ID": "80d4e798-38ef-42d1-9948-cf6b6eb49e4e" + "ID": "9ddfab82-413d-4919-b60d-ceba3261f3a4" } ] }, @@ -779,10 +787,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(OR(任务成员.参与人负荷=\"\",任务成员.参与人负荷=0,任务成员.参与人负荷>24),24,任务成员.参与人负荷)" }, - "ID": "774578bbf7f24e13a6f4a2714f8aad3a" + "ID": "03f94c6a676740b799eddd0aafce2fe5" } ], - "ID": "1d85c7d6-544e-45f1-b16d-abe79cdb5a91" + "ID": "19850e9c-364c-4615-82c1-3212b54d5020" }, { "Condition": { @@ -801,10 +809,10 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "执行人负荷", "ParameterValue": "24", - "ID": "0d70f908359547a9ba6cc11028ae963c" + "ID": "f998993f4e8f4778a448ca19dc771a2b" } ], - "ID": "b385c012-060b-4bc8-a6dd-e8f8f2b7b129" + "ID": "721ef813-1ff8-4615-ba94-840f66c8a4d7" } ] }, @@ -815,7 +823,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=IF(统计工时.总工时=\"\",0,统计工时.总工时)+计算本次分配工时" }, - "ID": "8d198be5380848faa3522373af16a625" + "ID": "36354abf29e44a4e9790b6db43c12fa9" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -844,7 +852,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=ROUNDUP(待分配工时-计算本次分配工时,1)" }, - "ID": "eed86e76439f40daaed2031e95250400" + "ID": "8e34730a7bb547b880d26b1e4d60fc06" }, { "$type": "Forguncy.Model.ServerTransactionCommand, ServerDesignerCommon", @@ -859,7 +867,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "成员ID", - "GUID": "437fa8e5-d746-4865-8281-0161a9af4f2d" + "GUID": "8266eb64-4b8a-4afd-9759-13f1f82196ce" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -870,7 +878,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "项目ID", - "GUID": "976d41d6-8274-497e-ac49-dd574d3d5a7c" + "GUID": "ee34836d-306f-42a0-bde4-0a2bc7694a53" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -881,7 +889,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "任务ID", - "GUID": "f8a12139-e96c-4641-abb9-52ce7c8e45f0" + "GUID": "a67924a7-4ca8-4222-9e98-ca876183acd0" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -892,7 +900,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时日期", - "GUID": "f86a3778-9a64-4191-aba8-2a6b977adfa2" + "GUID": "ff819755-816a-43ad-aead-2d444ab8aa54" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -903,7 +911,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时类型", - "GUID": "234454f0-5b5a-48d6-8e49-ff07e4417be0" + "GUID": "f00ff5d6-4fcc-4e2c-88e7-f819d60b9cdb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -914,7 +922,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行人", - "GUID": "d4859e62-67be-48ec-b8ae-9643cbf7c2ab" + "GUID": "01ab262b-fbde-4b83-821e-2f15525cca71" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -925,7 +933,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "执行内容", - "GUID": "6cab4748-35d8-48f9-9ecd-1efcf362a60c" + "GUID": "056d35e2-7717-4c08-8d4e-e490f094a187" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -936,7 +944,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "工时", - "GUID": "af198079-26a2-4240-af0c-7e2150ec998f" + "GUID": "b05891a8-766c-4818-9a2e-25c84c0b091e" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -947,7 +955,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "时薪单价", - "GUID": "9f43f009-5b33-441c-b236-84e261a64334" + "GUID": "249e9008-82d0-488e-81b0-bf68cf697e06" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -958,7 +966,7 @@ "BindingInfo": { "TableName": "任务工时表", "ColumnName": "提成系数", - "GUID": "55cce1b6-dac1-492a-a705-fa244d90312e" + "GUID": "977fd2b4-c778-44f7-911f-ee60bbcd4f45" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -977,7 +985,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "82b781bb-f51d-466b-87bb-ab01e5cfa334" + "GUID": "1dce04a1-51d2-410b-9115-53e1589784cb" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -988,7 +996,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "cd538298-4070-48bf-847e-9303cdbff30b" + "GUID": "21b4a9e2-8067-4aec-9dc9-8fcbfa5eef37" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -999,7 +1007,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "405f8c04-8f4e-4838-a3d7-a702276d39c6" + "GUID": "786a9666-0199-4ef9-a809-a706cc48c49a" }, "Value": "%CurrentUser%" } @@ -1008,7 +1016,7 @@ ] } ], - "ID": "75a82e2b-36d8-4aa8-a328-972ebcba58a5" + "ID": "a9b2f9bf-bf1b-4b47-b2f5-6fb94007b74e" }, { "CommandList": [ @@ -1021,7 +1029,7 @@ } } ], - "ID": "d9e80b15-3bba-45c5-af43-43277a33af2d" + "ID": "b3d9653e-c27b-4386-bc26-1e318e26152b" } ] } @@ -1035,7 +1043,7 @@ "Message": "提交工时成功" } ], - "ID": "aa5ff36f-0104-4d9c-9f42-dd83b07d3249" + "ID": "f58f6674-6d7e-4c47-abf1-b77049cab318" }, { "CommandList": [ @@ -1048,7 +1056,7 @@ } } ], - "ID": "0bc9dcbe-d789-465e-9505-df798ec54639" + "ID": "b931b8ce-b61c-475b-bbfd-c3e23b546548" } ] } diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json index ee769591..ae02eb10 100644 --- a/Tables/任务/任务表.json +++ b/Tables/任务/任务表.json @@ -25,6 +25,13 @@ "Name": "父任务ID", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "层级", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -39,13 +46,6 @@ "Name": "执行者", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", - "DatabaseColumnType": "nvarchar", - "MaxLength": -1, - "Name": "参与者", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", "DatabaseColumnType": "datetime", @@ -95,13 +95,6 @@ "Name": "备注", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", - "DatabaseColumnType": "bigint", - "MaxLength": -1, - "Name": "工时核定方式", - "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.Model.Tables.AttachmentBindingColumn, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", @@ -123,6 +116,41 @@ "Name": "任务状态", "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "前置任务", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "工期", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "次序", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "bit", + "MaxLength": -1, + "Name": "里程碑", + "ColumnType": "System.Boolean, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon", + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "进度", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", @@ -169,6 +197,24 @@ "DetailTableSchema": "dbo", "Name": "参与人数", "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.StatisticColumn, ServerDesignerCommon", + "AggregateFunction": 2, + "DataColumnName": "工时日期", + "DetailTableName": "任务工时表", + "DetailTableSchema": "dbo", + "Name": "最后报工日期", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.Model.Tables.StatisticColumn, ServerDesignerCommon", + "AggregateFunction": 3, + "DataColumnName": "工时日期", + "DetailTableName": "任务工时表", + "DetailTableSchema": "dbo", + "Name": "开始报工日期", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" } ], "ExternalDatabaseInfo": { @@ -247,17 +293,6 @@ "RelationTypeOnDelete": 0, "RelationTypeOnUpdate": 0, "IsDetailTableRelation": true - }, - { - "PrimarySchema": null, - "PrimaryTable": "工时核定方式", - "PrimaryColumn": "ID", - "ForeignSchema": null, - "ForeignTable": "任务表", - "ForeignColumn": "工时核定方式", - "RelationTypeOnDelete": 0, - "RelationTypeOnUpdate": 0, - "IsDetailTableRelation": true } ] } \ No newline at end of file diff --git a/UserFile/echart.js b/UserFile/echart.js new file mode 100644 index 00000000..b323497f --- /dev/null +++ b/UserFile/echart.js @@ -0,0 +1,67 @@ +// 改变页面图表样式 +let bgColor = "#fff"; +let color = ["#0090FF", "#ffc300", "#f64662", "#ec610a", "#00c9b1", "#6730ec"]; + +function hexToRgba(hex, opacity) { + return ( + "rgba(" + + parseInt("0x" + hex.slice(1, 3)) + + "," + + parseInt("0x" + hex.slice(3, 5)) + + "," + + parseInt("0x" + hex.slice(5, 7)) + + "," + + opacity + + ")" + ); +} +// 修改折线图样式 +Forguncy.Helper.preSetEchartOption = (op, page, chart) => { + console.log(op); + op.series = op.series.map((element, index) => { + if (element.type == "line") { + var s1 = {}; + s1.smooth = true; + element.symbol = "emptyCircle"; + element.symbolSize = 8; + s1.zlevel = 3; + s1.showSymbol = false; + s1.lineStyle = { + normal: { + color: color[index], + shadowBlur: 5, + shadowColor: hexToRgba(color[index], 0.1), + shadowOffsetY: 6 + } + }; + s1.areaStyle = { + normal: { + color: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 0, + color: hexToRgba(color[index], 0.3) + }, + { + offset: 1, + color: hexToRgba(color[index], 0.1) + } + ], + false + ), + shadowColor: hexToRgba(color[index], 0.1), + shadowBlur: 10 + } + }; + + element = { ...element, ...s1 }; + } + return element; + }); + + return op; +}; \ No newline at end of file