diff --git a/.collaboration b/.collaboration index 65912276..148caf6e 100644 --- a/.collaboration +++ b/.collaboration @@ -454,17 +454,7 @@ }, { "ModuleName": "PCPage/页面反馈录入", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T11:29:30.1754694+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\页面反馈录入.json", - "Pages\\项目\\项目反馈\\页面反馈录入.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页", @@ -2244,19 +2234,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T13:35:01.860487+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -2316,17 +2294,7 @@ }, { "ModuleName": "PCPage/工作台首页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T12:45:17.7352369+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工作台\\工作台首页.json", - "Pages\\工作台\\工作台首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷 (2)", @@ -2338,42 +2306,18 @@ }, { "ModuleName": "PCPage/工作台_关键信息", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T12:34:22.7063829+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommands/工作台", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T12:35:07.5781579+08:00", "ModuleType": 20 }, { "ModuleName": "ServerCommand/获取关键统计信息", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T12:36:29.5285676+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/工作台_快捷入口", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T13:00:51.4332433+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/工作台/工作台_关键信息.json b/Pages/工作台/工作台_关键信息.json new file mode 100644 index 00000000..f3da85e1 --- /dev/null +++ b/Pages/工作台/工作台_关键信息.json @@ -0,0 +1,354 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + } + }, + "Count": 5, + "DefaultSize": 24.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 140.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 140.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 140.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 140.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 12, + "DefaultSize": 24.0 + }, + "Values": { + "1,1": "项目数量", + "1,4": "任务数量", + "1,7": "反馈数量", + "1,10": "总工时", + "3,1": "-", + "3,4": "-", + "3,7": "-", + "3,10": "-" + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 1, + "HorizontalAlignment": 2 + }, + { + "BorderRight": 0 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 1, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "BorderRight": 0 + }, + { + "Foreground": 1, + "HorizontalAlignment": 2 + }, + { + "FontSize": 26.666666666666664, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 0, + "FontSize": 26.666666666666664, + "HorizontalAlignment": 2 + } + ], + "Types": { + "Strs": [ + "Body", + "Text 1 50", + "Center", + "Background 2 0" + ], + "Borders": [ + { + "Color": 3 + } + ] + }, + "CellStyles": { + "0,4": 0, + "0,5": 0, + "0,6": 0, + "0,7": 0, + "0,8": 0, + "0,9": 0, + "0,10": 0, + "1,1": 1, + "1,2": 2, + "1,4": 3, + "1,5": 4, + "1,6": 0, + "1,7": 3, + "1,8": 4, + "1,9": 0, + "1,10": 3, + "2,1": 5, + "2,2": 2, + "2,4": 3, + "2,5": 4, + "2,6": 0, + "2,7": 3, + "2,8": 4, + "2,9": 0, + "2,10": 3, + "3,1": 6, + "3,2": 2, + "3,4": 7, + "3,5": 4, + "3,6": 0, + "3,7": 7, + "3,8": 4, + "3,9": 0, + "3,10": 7, + "4,4": 0, + "4,5": 0, + "4,6": 0, + "4,7": 0, + "4,8": 0, + "4,9": 0, + "4,10": 0 + }, + "SheetStyle": { + "FontFamily": 0, + "FontSize": 13.333333333333332 + } + }, + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.SubscribeNotificationCommand, ServerDesignerCommon", + "Name": "系统信息更新", + "MergeCommand": true, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=KEY" + } + ] + }, + "value": "工作台关键数据更新" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工作台_关键信息!统计_项目数量" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工作台_关键信息!VALUE.项目数量" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工作台_关键信息!统计_任务数量" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工作台_关键信息!VALUE.任务数量" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工作台_关键信息!统计_反馈数量" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工作台_关键信息!VALUE.反馈数量" + } + }, + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工作台_关键信息!统计_总工时" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=工作台_关键信息!VALUE.总工时" + } + } + ] + } + ], + "ID": "06779d53-9dc9-4296-abf2-5f8c7929c43a" + } + ] + } + ], + "ID": "2ad19547d4fd4720aa883e02ab19f814" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "获取关键统计信息", + "RequestAsync": true, + "CheckDataValidation": false + } + ], + "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": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "BackgroundPictures": [ + { + "FitToBrowserWidth": true, + "FitToBrowserHeight": true, + "Name": "efc4de8b-fd31-4a44-8faf-0ce845dbc6d3.png", + "DisplayName": "背景图1", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Size": "748,113" + } + ], + "CustomNames": [ + { + "Name": "统计_反馈数量", + "Formula": "工作台_关键信息!$H$4" + }, + { + "Name": "统计_任务数量", + "Formula": "工作台_关键信息!$E$4" + }, + { + "Name": "统计_项目数量", + "Formula": "工作台_关键信息!$B$4" + }, + { + "Name": "统计_总工时", + "Formula": "工作台_关键信息!$K$4" + } + ] +}//CVcBRSWWfg5eCVpjkBJZNEXjUcztbK62Mbv0a0Iz8t1lCA0f7Z39cuwclb53qFO7oyX8LN7y/Zd9cbfYSEJLdr0hhS9wwsu/vFhW4Og0o2MduIIOexCFve+BwNP8OFCfc7vq/Yk/AfFzvQYrcSTAJawS6u1uh0q5mzW6fATk9HieM70QA7yGM5bjBQS5F30ieiOod9yF/rxSroFB68pBr4Pxg8gbbyF68jV8rlNj6q0En/JOeR90u0EgeU7FQdkRuxRdltNalgdsdyCuzkUO+NjA/TsTqZXZ4GVzZGQwiBdeoMjquC3nBM4ny3AFs/+fqQB0ynOGWntpA0StZr37aYIEMz8GuHTpysSroKrYgqSdwMcl7dxtFUq7sgGvM83l8oP9YFoHyYvEd2TzN5eJGY81tkiZKdaTy2HhpWhUDYg4CK3gdyUgtrMHfVivijuGoIgU1mCzimq6pO4o6E5k7i39h8Z2p5QPmqmnyWEiXh49a7BjFtxMwx9hogQmDvC2tbXx+z2KXFZsjNZXO535qRMLrroLT91S2TdJRAYpC81NY1OhJThGgsBaHjSOW24MewVQycgObPHHNAYdVz55C003dvzNT2Vz/mFABRbRI5TSrpAzPv0APA49UmSsfVOc29ek6qdWvYBGITgMHhNXu3E+gIWSAfIciFZ5XOHJY3ZR9qVbNLc8arVUrscn981j35Zgub8UR6peH0eh7GZbfRW80oebMxVjr7Pp0HjKQampqhZlXA0Q1CNd8rjVmLcTsGNBmSiJDAWIEjS269U0yLYW8masncaRpMuRFSpwqmPiXgX6+nX9poVv7q/pDxDIxMWGRBrwdjS8B3bdAj50pfiYwn4tQ36ScmkZ+cYJmp2J3wJp7UPpvImxkPVf5QwUQ+g4mgNs2ChEpeKvlZP8fQ==|920 \ No newline at end of file diff --git a/Pages/工作台/工作台_关键信息.rd b/Pages/工作台/工作台_关键信息.rd new file mode 100644 index 00000000..944357e0 --- /dev/null +++ b/Pages/工作台/工作台_关键信息.rd @@ -0,0 +1,23 @@ +{ + "PageType": 0, + "ColumnCount": 12, + "RowCount": 5, + "CustomNames": [ + { + "Name": "统计_反馈数量", + "Formula": "工作台_关键信息!$H$4" + }, + { + "Name": "统计_任务数量", + "Formula": "工作台_关键信息!$E$4" + }, + { + "Name": "统计_项目数量", + "Formula": "工作台_关键信息!$B$4" + }, + { + "Name": "统计_总工时", + "Formula": "工作台_关键信息!$K$4" + } + ] +} \ No newline at end of file diff --git a/Pages/工作台/工作台_快捷入口.json b/Pages/工作台/工作台_快捷入口.json new file mode 100644 index 00000000..413d832c --- /dev/null +++ b/Pages/工作台/工作台_快捷入口.json @@ -0,0 +1,173 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 45.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + } + }, + "Count": 3, + "DefaultSize": 24.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + } + }, + "Count": 10, + "DefaultSize": 161.0 + }, + "Values": { + "1,1": "新增项目", + "1,3": "新增报工", + "1,5": "新增反馈", + "1,7": "工时统计" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "新增项目", + "TemplateKey": "_RS_Main1" + } + }, + "1,3": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "新增报工", + "TemplateKey": "_RS_Success1" + } + }, + "1,5": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "新增反馈", + "TemplateKey": "_RS_Warning1" + } + }, + "1,7": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "工时统计", + "TemplateKey": "_RS_Error1" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0 + }, + { + "FontFamily": 0, + "Formatter": 1 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General" + ] + }, + "CellStyles": { + "0,3": 0, + "0,5": 0, + "0,7": 0, + "0,8": 0, + "1,3": 1, + "1,5": 1, + "1,7": 1, + "1,8": 1, + "2,3": 0, + "2,5": 0, + "2,7": 0, + "2,8": 0 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "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": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "BackgroundPictures": [ + { + "FitToBrowserWidth": true, + "FitToBrowserHeight": true, + "Name": "4cfabafd-91ab-4794-af6e-4d07a41ced6c.png", + "DisplayName": "背景图1", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Size": "748,93" + } + ] +}//QCpX9qXMl8hmoe3Joe1TOWWaT5Lo3OsCWCtJtJZKlizJzhRmwCNrCah8DzS2Nt+ToG0p20DowkI2WZyoaOQs3dzfPOakUJCWmzKOIxo2Rfklq2pfia385pHyhITMlCcWl6N8aWbj5aCTmCrWSkVDpQ3ehskiah32T0E3iRw7heaXS8+G33sFBxtocASLh/LMxOxaYPnefKXz5kkGniLwo1g1o1OkV3I5xgQwUWEJPri88GywvXBHzXyLNKxi/1tetJqW/LGdQcagVY7/2ZxmNAUM02BhzXKVbHnqbqI4AgmsSzTh4+QzJrpT9XMETQ3OhKbfDAnGfRfqf9CM1L8BwlkVZkOtm2vn5B9dCxQ5DAdwlhLGuf6i7AUsZdtdzuTGI8oK46R2M7kLNKLAXAQKIsLVmzzfG9za4KNXk1GJBi4gCevZxKQs0Fncqb1qlg9db/2WKwmc++ohWloLdEecrYloKn3D2Syia4PcOsgq2DCkQbTQrCw1yAV3qAooHIvhNrHxUb5GuXfU8cJp9nlMhrwxF6hgOyGgrwpOHp9n/VLu633yLi61q1WEnuHgitobj2HdH3/Q4Opz52UPEeG5PH8zZJNdNk2/4BEnKHMDjXwta9m4DFBAJ0++vYIOGUX98FO/Yw5vEYJhZflrIAjeh9epHvXxEM/o4MzOQeaPQXc/vaXDgznOHMsxATEiMGtZQrlv5i4hbV/s+0ASHbxHC/gAEVeWapeWuTB3xFbDIPI/lghtLmPzrskW3rV8ScNbbuGvuzMXnoUC2/rk6Rgwp71AxcbfNE501TqDWL7VYu116CSVE97lIPuEIduM32LX4VPMnYmuIkOWH2kqp3xkGIxPITyJ9P6+g47jy/BODIArqi/GmVnhBE9N+fvtvR8HS0yYDvlkHz47sp/ro46QDw==|920 \ No newline at end of file diff --git a/Pages/工作台/工作台_快捷入口.rd b/Pages/工作台/工作台_快捷入口.rd new file mode 100644 index 00000000..8883b56d --- /dev/null +++ b/Pages/工作台/工作台_快捷入口.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 10, + "RowCount": 3 +} \ No newline at end of file diff --git a/Pages/工作台/工作台首页.json b/Pages/工作台/工作台首页.json index 86d93bbf..b388b0f5 100644 --- a/Pages/工作台/工作台首页.json +++ b/Pages/工作台/工作台首页.json @@ -3,12 +3,13 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 15.0 } }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 96.0 + "DesignLengthInPixel": 102.0, + "Mode": 1 } }, "2": { @@ -18,7 +19,8 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 50.0 + "DesignLengthInPixel": 83.0, + "Mode": 1 } }, "4": { @@ -28,7 +30,7 @@ }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 220.0 + "DesignLengthInPixel": 300.0 } }, "6": { @@ -38,7 +40,7 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 220.0 + "DesignLengthInPixel": 254.0 } }, "8": { @@ -48,67 +50,33 @@ }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 220.0 + "DesignLengthInPixel": 254.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 15.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 + "DesignLengthInPixel": 32.0, + "IsHidden": true } } }, "InLogicalVisibleIndexes": [ - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18 + 11 ], - "Count": 19, - "DefaultSize": 32.0 + "Count": 12, + "DefaultSize": 10.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -311,7 +279,7 @@ }, "38": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 280.0 + "DesignLengthInPixel": 320.0 } }, "39": { @@ -324,37 +292,131 @@ "DefaultSize": 32.0 }, "Values": { - "1,1": "关键数据", + "1,1": "工作台_关键信息", "1,38": "公告栏", - "3,1": "快捷入口", + "3,1": "工作台_快捷入口", "5,1": "工时折线图", "5,38": "项目动态", "7,1": "工时排行榜(柱形图)", "9,1": "反馈统计(饼图+表格)" }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "工作台_关键信息", + "OverflowMode": 1 + } + }, + "3,1": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "工作台_快捷入口" + } + }, + "5,1": { + "CssName": "none-background", + "CellType": { + "$type": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType", + "EChartTitle": "报工趋势表", + "DataSourceBinding": "DataSources", + "DataSources": [ + { + "Name": "工时表", + "BindingTableOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "任务工时表", + "BindingInfos": [ + { + "GUID": "dcf5c7c2-1643-4eb4-b2a3-8e94ef7a14e2", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "82e97a2c-9e2f-42e4-937a-453518b48f70" + }, + "ColumnName": "日期" + }, + { + "GUID": "edd13b7b-55f0-41ed-919f-758450e718b6", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "786c776d-dcec-411f-8a24-0b19e5ac7564" + }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 2, + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "ID", + "GUID": "402f4224-6093-478a-89b5-d0b583da473a" + }, + "Value": "0" + }, + "NullFormulaValueQueryPolicy": 1, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时日期", + "GUID": "7e799144-4ee2-4128-b68c-8c6f41270a5f" + }, + "Order": 0 + } + ] + }, + "CustomColumns": [] + } + } + ], + "JSONDataSources": [], + "ImageDataSource": [], + "Config": "{\"option\":\"console.log(Context[\\\"工时表\\\"]);\\nconst {\\n \\\"日期\\\": xAxisData,\\n \\\"总工时\\\": yAxisData\\n} = ForguncyEchartsHelper.splitDataSource(Context[\\\"工时表\\\"]);\\n\\nfunction getDateFormat (value) {\\n // Excel 日期格式的起始日期是 1899-12-30 \\n const excelEpoch = new Date(Date.UTC(1899, 11, 30));\\n // 将整数日期转换为毫秒数 \\n const date = new Date(excelEpoch.getTime() + value * 24 * 60 * 60 * 1000);\\n const year = date.getUTCFullYear();\\n const month = (date.getUTCMonth() + 1).toString().padStart(2, '0');\\n const day = date.getUTCDate().toString().padStart(2, '0');\\n return `${year}-${month}-${day}`;\\n }\\n\\noption = {\\n backgroundColor: 'rgba(0, 0, 0, 0)',\\n title: {\\n text: '报工趋势图', // 设置标题文本 \\n left: 'center', // 标题居中 \\n top: 24, // 标题距离上方24px \\n textStyle: {\\n fontSize: 16, // 标题字体大小 \\n fontWeight: 'bold' // 标题字体加粗 \\n }\\n },\\n grid: {\\n top: 72,\\n left: '24px', // 让图表撑满宽度 \\n right: '24px', // 让图表撑满宽度 \\n bottom: '24px',\\n containLabel: true\\n },\\n xAxis: {\\n type: 'category',\\n data: xAxisData,\\n axisLabel: {\\n formatter: getDateFormat,\\n color: '#abacac' //设置x轴线文本颜色\\n },\\n axisLine: {\\n lineStyle: {\\n color: '#f5f6f6' // 设置 x 轴线条为浅灰色 \\n }\\n },\\n axisTick: {\\n lineStyle: {\\n color: '#f5f6f6' // 设置 x 轴刻度线为浅灰色 \\n }\\n },\\n },\\n yAxis: {\\n type: 'value',\\n axisLabel: {\\n color: '#abacac' // 设置 y 轴刻度文本为浅灰色 \\n },\\n axisLine: {\\n\\n lineStyle: {\\n color: '#f5f6f6' // 设置 y 轴线条为浅灰色 \\n }\\n },\\n axisTick: {\\n\\n lineStyle: {\\n color: '#f5f6f6' // 设置 y 轴刻度线为浅灰色 \\n }\\n },\\n splitLine: {\\n show: true,\\n lineStyle: {\\n color: '#f8fafc'\\n }\\n }\\n },\\n tooltip: {\\n trigger: 'axis',\\n formatter: function (params) {\\n const dateString = getDateFormat(params[0].name);\\n const value = Math.round(params[0].value,1);\\n return `日期：${dateString}
工时：${value}小时`;\\n },\\n backgroundColor: '#FFFFFF',\\n textStyle:{\\n color:'#000000'\\n }\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n lineStyle: {\\n width: 3, // 折线宽度设置为3 \\n shadowColor: 'rgba(0, 0, 0, 0.1)', // 阴影颜色 \\n shadowBlur: 10, // 阴影模糊尺寸 \\n shadowOffsetX: 0, // 阴影水平偏移 \\n shadowOffsetY: 4 // 阴影垂直偏移 \\n },\\n smooth: true, // 设置为平滑线 \\n symbolSize: 8, // 数据点大小设置为5 \\n symbol: 'circle', // 数据点形状设置为圆形 \\n itemStyle: {\\n color: '#2196f3' // 数据点颜色（折线渐变颜色下限） \\n },\\n areaStyle: {\\n // 设置折线下方的渐变 \\n color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [\\n {\\n offset: 0,\\n color: 'rgba(33,150,243,0.3)' // 渐变色开始，半透明蓝色 \\n },\\n {\\n offset: 1,\\n color: 'rgba(33,150,243,0)' // 渐变色结束，完全透明 \\n }\\n ])\\n }\\n }\\n ]\\n};\",\"graphTheme\":null,\"displayMode\":\"canvas\",\"jsCode\":\"\\n async ({Context,JSONContext,ImageContext,echarts,myChart,dat,Forguncy,d3,setInterval,setTimeout,ForguncyEchartsHelper,PublicResource})=>{\\n var datGUI=undefined;\\n var option={};\\n console.log(Context[\\\"工时表\\\"]);\\nconst { \\\"日期\\\": xAxisData, \\\"总工时\\\": yAxisData } = ForguncyEchartsHelper.splitDataSource(Context[\\\"工时表\\\"]);\\nfunction getDateFormat(value) {\\n // Excel 日期格式的起始日期是 1899-12-30 \\n const excelEpoch = new Date(Date.UTC(1899, 11, 30));\\n // 将整数日期转换为毫秒数 \\n const date = new Date(excelEpoch.getTime() + value * 24 * 60 * 60 * 1000);\\n const year = date.getUTCFullYear();\\n const month = (date.getUTCMonth() + 1).toString().padStart(2, '0');\\n const day = date.getUTCDate().toString().padStart(2, '0');\\n return `${year}-${month}-${day}`;\\n}\\noption = {\\n backgroundColor: 'rgba(0, 0, 0, 0)',\\n title: {\\n text: '报工趋势图',\\n left: 'center',\\n top: 24,\\n textStyle: {\\n fontSize: 16,\\n fontWeight: 'bold' // 标题字体加粗 \\n }\\n },\\n grid: {\\n top: 72,\\n left: '24px',\\n right: '24px',\\n bottom: '24px',\\n containLabel: true\\n },\\n xAxis: {\\n type: 'category',\\n data: xAxisData,\\n axisLabel: {\\n formatter: getDateFormat,\\n color: '#abacac' //设置x轴线文本颜色\\n },\\n axisLine: {\\n lineStyle: {\\n color: '#f5f6f6' // 设置 x 轴线条为浅灰色 \\n }\\n },\\n axisTick: {\\n lineStyle: {\\n color: '#f5f6f6' // 设置 x 轴刻度线为浅灰色 \\n }\\n },\\n },\\n yAxis: {\\n type: 'value',\\n axisLabel: {\\n color: '#abacac' // 设置 y 轴刻度文本为浅灰色 \\n },\\n axisLine: {\\n lineStyle: {\\n color: '#f5f6f6' // 设置 y 轴线条为浅灰色 \\n }\\n },\\n axisTick: {\\n lineStyle: {\\n color: '#f5f6f6' // 设置 y 轴刻度线为浅灰色 \\n }\\n },\\n splitLine: {\\n show: true,\\n lineStyle: {\\n color: '#f8fafc'\\n }\\n }\\n },\\n tooltip: {\\n trigger: 'axis',\\n formatter: function (params) {\\n const dateString = getDateFormat(params[0].name);\\n const value = Math.round(params[0].value, 1);\\n return `日期：${dateString}
工时：${value}小时`;\\n },\\n backgroundColor: '#FFFFFF',\\n textStyle: {\\n color: '#000000'\\n }\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n lineStyle: {\\n width: 3,\\n shadowColor: 'rgba(0, 0, 0, 0.1)',\\n shadowBlur: 10,\\n shadowOffsetX: 0,\\n shadowOffsetY: 4 // 阴影垂直偏移 \\n },\\n smooth: true,\\n symbolSize: 8,\\n symbol: 'circle',\\n itemStyle: {\\n color: '#2196f3' // 数据点颜色（折线渐变颜色下限） \\n },\\n areaStyle: {\\n // 设置折线下方的渐变 \\n color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [\\n {\\n offset: 0,\\n color: 'rgba(33,150,243,0.3)' // 渐变色开始，半透明蓝色 \\n },\\n {\\n offset: 1,\\n color: 'rgba(33,150,243,0)' // 渐变色结束，完全透明 \\n }\\n ])\\n }\\n }\\n ]\\n};\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" + } + } + }, "StyleDatas": { + "Styles": [ + { + "FontSize": 37.33333333333333, + "Foreground": 0 + } + ], "Types": { "Strs": [ + "Background 1 -15", "Body", "Center" ] }, + "CellStyles": { + "1,38": 0, + "5,38": 0, + "7,1": 0, + "9,1": 0 + }, "SheetStyle": { - "FontFamily": 0, - "HorizontalAlignment": 1 + "FontFamily": 1, + "HorizontalAlignment": 2 } }, "Spans": [ - "1,1,1,36", - "3,1,1,36", "1,38,3,1", - "5,1,1,36", "7,1,1,36", "9,1,1,36", - "5,38,5,1" + "5,38,5,1", + "1,1,1,36", + "3,1,1,36", + "5,1,1,36" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "MasterPageName": "FGC_母版页", + "PageOverflowMode": 2, "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -375,5 +437,73 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//bU73IvYsChkLajvILRoKM69DkyJH4wPerBmm5Y0WMiLUi9iFOF52YoXda0IMR91cmM9bOmBbPJfxAlBHVz5kWC3Ur8sZHCb+k6D9yDWZxFfW0wnghZvEuJCrRGiw6hKcGU/yjH8DOgQ1oF5++uZ2L1gzXFp1Ioebbk9Wn3Xh6/VkUV8lcgCCMq6/5e0WdY9bcsZARNFHsLOGmMOxAoEFROHrY6ggJv09Zi5/P0sM+8dIEe3qo0ILkNlvvFROI0z2Wotr5BgVIMjQUNt6oViLO6YPTUnHajuri3V3zqdv1tFx3JTHKzSi9JhvA3UwaJ4SvLQHyZqNnQsO5+7+DOX0PkV2DKOyOyE6bYk750ow1ZTihU81rqdfoJh8PPJKKfv9I5kFc1oCv3/1MWB6kMGgKnlOmbGc/Ph63z70pIZSCjXt4NEY7p33tPABd851GHMXd5k9lm7C5SSWNKW8N1DwVeIbjpjtm8/Wq4pbgHOUb/1s5I1BZLATxDMg8ngoPDeqrauq/3h/1C8gpreZNJsFDtx7T5brn0QUuSZ/JhS0i/9xxOmcK6ZKALvskC9EHfv6zLCgKADJe38ABQkLsaqyWSub5iXERzIH8mAcV2NpdT0O0sIn8n2K0oz4qcSwpMjBYr6zr5c2mK5xHbHxcgLEenMWB2l9rL4MMb0jzb0DTnBxBJ13lJbuzzA+KdoP+tHigraQneM+NdqgMi5q+Dsq/Ojyn35sBKjmqKeYwnyhG2RkDXn8L6iJU6CqsBwv00+wOnaTzT2WEtbQp9s9mG1iplccbRjw5caFkyC0wopTeBU4Dz0fhCXzrrqa83eISY335RHHaxaTKM1XGX3wBw76EH4wXQ4ghd3N0gPRXHmgJzp9B1rwVvCH86AtZ8ymzUi7jMLmYuntxuqdpJl4Z+gwkQ==|920 \ No newline at end of file + }, + "BackgroundPictures": [ + { + "FitToBrowserWidth": true, + "FitToBrowserHeight": true, + "Name": "f9665113-5057-40ef-8571-aa152a7302ce.png", + "DisplayName": "背景图1", + "StyleInfo": { + "Fill": "Background 2 0" + }, + "IsAutomaticFill": false, + "Size": "1530,1095" + }, + { + "Name": "0f5baa2c-2dec-44c7-8a3f-45868371fe7b.png", + "DisplayName": "背景图2", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Location": "24,220", + "Size": "1152,300" + }, + { + "Name": "7e86b317-11df-41f3-a863-d077d49a760b.png", + "DisplayName": "背景图3", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Location": "1186,15", + "Size": "320,195" + }, + { + "Name": "75cbd09e-882c-427a-a52b-ba015444352e.png", + "DisplayName": "背景图4", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Location": "1186,220", + "Size": "320,828" + }, + { + "Name": "9585c733-c922-4ba2-8923-e5c50a4f429c.png", + "DisplayName": "背景图5", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Location": "24,530", + "Size": "1152,254" + }, + { + "Name": "cc656816-79e5-4f40-957c-c72753c75e5d.png", + "DisplayName": "背景图6", + "StyleInfo": { + "CornerRadius": 10.0, + "Fill": "Background 1 0" + }, + "IsAutomaticFill": false, + "Location": "24,794", + "Size": "1152,254" + } + ] +}//xIECmB6dFVIANHA3mNSlK9cZkBJgCC+0TOHnbm9qkq9zMkHFoE15OwmexC6Uunz3nm87vNlM72wvr8+ZX9HM6l8BvJfzkbO39obumkEVaimEqW9VU43coW2RXvQzJjSDpFWjs7K7a1XnMSgFQt69iaaf/AjDET/iKWc3kUfEocnUpYr0UFaXNwpxq1UZxzEmGzC2YpMt8YeTTGvhi0px0gOEmyEfADNmBqdjOeqYICCHQmr+ujJYcB/Mfhp7lB4S94rXCA97peFLqPnP4jRcmwcmCoCNqcrmkOG0ixkYAs5cpnMZb48tiyp88hb+dMdOeI/CoHtqQY8ZhK2rJomy9v9jOfn4aPmAYP8QWNVEvBvwN/6+mTjG0rDgS+PKsTJ2PJGnnZcUHHmFRJfK6GOL5FBmXz4fr17mvYp6W7s6sSOqdabEJA/zAHpmcyfQkvmgCls/PocSDIW4Czpzxwg3NL77jYDwiR6PgsF95uiM66z2aPxS0UvCqTiuES/5O69QMHX2gJSvmcC6U/s8wBBDVYq0mcGQeL5xsE3pcr6pPavfEsJL1lN1dPaB7Ttayrd8Q79g+AaG27ariGttDRDaSElBVe6q33Ef1RTxm+jDAjZIo5hnVffmp705KDjfCdkRvcA7+0+SQivQpD88ZLJSwqgH/DLgHgmHGFW6XXJd1MDnvaaN3zIhczNzuK7YM59YslNUcS2XK0YRgv+H5HuNNUm0GM3ydyPsCz8nOrcRcZVWSupC3fhqHw1bD1tYxln2tkfAgDVM6F/0a6346GyU2ZhY8I19UCi+RPbfqMwH1wLa2iMG7z12xCchsjuTM7sgzBtDFQQjNpRJ+Ky2E3k7Ws2kFZ5kGPKZXMKUE7S+5Ki1Rmxj9HooTBqCk9hEaEies1p7ToTZatdt9m15WMRYNw==|920 \ No newline at end of file diff --git a/Pages/工作台/工作台首页.rd b/Pages/工作台/工作台首页.rd index 2bd7eebd..41733322 100644 --- a/Pages/工作台/工作台首页.rd +++ b/Pages/工作台/工作台首页.rd @@ -1,5 +1,5 @@ { "PageType": 0, "ColumnCount": 40, - "RowCount": 19 + "RowCount": 12 } \ No newline at end of file diff --git a/Pages/项目/项目反馈/页面反馈录入.json b/Pages/项目/项目反馈/页面反馈录入.json index d16df82a..02575626 100644 --- a/Pages/项目/项目反馈/页面反馈录入.json +++ b/Pages/项目/项目反馈/页面反馈录入.json @@ -962,7 +962,7 @@ "ReloadData": true } ], - "ID": "47f23193-aad5-4501-825d-3f4dfc33e797" + "ID": "2a60a40b-d671-4715-8c1b-2fb923174daa" }, { "CommandList": [ @@ -977,12 +977,12 @@ "BtnText": "知道了" } ], - "ID": "013f39ae-a5f8-4b15-97c9-e364fe7e5d2b" + "ID": "054e0cc0-4a73-4309-82f3-d9e766aeacbe" } ] } ], - "ID": "dcb02ece-e403-4393-a1e2-0fe183154c73" + "ID": "6033e13d-2441-49d7-a95c-28a5723fa2de" }, { "CommandList": [ @@ -994,12 +994,12 @@ "BtnText": "知道了" } ], - "ID": "ec88b549-d68d-4a08-bd01-3682d02d628b" + "ID": "cf9b6d41-6ed6-42b2-834f-ebfe37a18253" } ] } ], - "ID": "b82637d0-541b-42cc-93cf-2f5b70b5af9a" + "ID": "d4f54e42-819d-446b-a4e8-1973dc903e8a" }, { "CommandList": [ @@ -1013,7 +1013,7 @@ "Message": "保存完成" } ], - "ID": "803bc52b-4353-49e9-abe6-0d5d32ccb405" + "ID": "baa5d93f-5152-4e00-9d0f-0b3112ffd891" } ] } @@ -1501,6 +1501,10 @@ } ], "CustomNames": [ + { + "Name": "标题", + "Formula": "页面反馈录入!$D$14" + }, { "Name": "当前用户", "Formula": "页面反馈录入!$Q$23" @@ -1513,10 +1517,6 @@ "Name": "反馈类型", "Formula": "页面反馈录入!$D$10" }, - { - "Name": "功能说明", - "Formula": "#REF!" - }, { "Name": "任务ID", "Formula": "页面反馈录入!$D$6" @@ -1528,10 +1528,6 @@ { "Name": "需求描述", "Formula": "页面反馈录入!$D$18" - }, - { - "Name": "标题", - "Formula": "页面反馈录入!$D$14" } ] -}//hHIQqDMRKOnLPFbR22VHzBWJu1K517W2nLijVnOmpVXmXt7NFxE/ZkJJ7c7GbcRpUWE4qvZR813mQQM8AKoNjLJx94tymmv2pQnar1Y/+BGJnLCG9ejKEy8kExFVNNm1TIPpg8fOXGQHdIY4ZCKPkyuzE2ruFzt69ch7MRWucAdZor/aqP+ef+tSn/jjdyv8/ycArp4sHA6SRWSsBcN1TITdLIF6UtgJ1oSLEUP3Wzh+DP6TJIU17QfWn0OCQshz0u71EBsT6CxF1mhfw5eVtkRpPt5L6VvsDcGJOWeaVoKx3Asp7S5Z7Czlbw1uowUyMnHKtt5Xxpa9C/GzLAfxJVOxNQkcvE2adpZE5hZsjNA8U8zkZPZAzlOtPwVcIb5Ra0Is59I7lnT6bClN1vXdNXE88M05r/29upM5euZHs7AzVLesulvTypwGOmpSzvEk/gMcmqFNbiH83nJWBVkUn75mATW+XTB2CdibsbWY1wRW4HU5GEoJs05DPF3Y9EBf17X6XNahv31m/BuKBQcxsaqa8DGk/yPJe2AyzV6TeYHApMXUJp/0E2QsXaEGsAGPc4LTyAp1GZ+/Sl2ytzcjruExwu4yGPYW/bZMLWxD+uzsmaY4fB7Ps/ZfRlRkyBpqHvCmXpyTKMUjGXz6apOLwmO6UY5xVQzL8/nlduW1eb5Cclf+SLFCPykmLM7tto612IdHFRHXYeE1ETssPRaKqtyZl4TiLgfDWq4AhtzjekBsJnU+n2kmySZH2F898+bBMkpmihhEn+jN5u0dFvM+f4YyypbDeTYtUI/yd4JEscXlwED+oFtN5Dw3vJB1ufBxLEKMGaQGNrD3QHhfefbqgGXpwOC3ejPxcV26V97qcP5e6U9Osi76ZGZEyUWdtU6h3RCHPKmY/+3nRuNRFDRVNg==|920 \ No newline at end of file +}//PY2y46U5VVHMxy418GEhelX98ke6DGK3h4oXXTT8TY+wDIiJR5HDkXzudkXGwYgFPmFmG/LaBLI1KN1HUF/3JTmVyudpP8pS1/Frj2NeyS1TXrrlna7WSYC+QSWs/FH1+QGJC42wcnINufqSmKhn6zFWbEqMrsq2kHHV/fHcO+N9o1kbfuNzVbfs9leB0f8bP2XTdd1kLtd+c4CHDYRrStAkWj4cz4kVssXsBTEvC9fAG3F+78qTj6z3KYjbcbs5EfF0LrHY4lMUiH9kpP7Af01lw1sWeRABKkkWS0AijiAdvRSXQyzegV12ksuCuPq8WkeEFsNsgAkZh18a7Ckc6VaU0BpLrydXBIxbJqPfxSoDeG7FEWwf1PEzqIiwXyEWx6+Yn4wYvk0Kgqve/bHTYkvs2OGE3EIt9WeSG2dzW/hG+7AdcRaiwPH8oRjhr+nwI6IdKYj60mxDTd8bbgAWYT1lnmM/HJ/uOSgenhl0uw12VChvmzEF6uks7bDxTlbAkGhBXwesCDjLeB+A+D1nl9n/fRxOKeqVEAvuPWiKX9UPFvpJ8W4k188AaS1YB1nr44aaxyJ/qW/wJtqbokH0/mMymb18Ckg9e823Is2mu3v3EHcJCzw7xxY3gscML3vh9oHhl7pE+F0FrP5SADP+aCcl5qIpWjC/nxNMWcS1a7cjeCGQYzRLy7b/RgKLkElvBpCkfd/BmIDxs5+qroxhKL62tTUEHVT38jK7e4Y4X6WB0g9JWjXoW5k6K0cbGkFRcLCWWw3OK2a8W5QAzcapELjraDa1fDXKPDCiGRCLp91sQWBLYlpoOtPeOPdf07GRKVcNFkiP7WyjcocqTendzdaZkmJyL9FqoXfQcPU/lDU06mhB1yxvqxQzAaX6gUwKH5nOQqqQnzP4kmPWCj9vng==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/页面反馈录入.rd b/Pages/项目/项目反馈/页面反馈录入.rd index c6557cb5..97b2e6c9 100644 --- a/Pages/项目/项目反馈/页面反馈录入.rd +++ b/Pages/项目/项目反馈/页面反馈录入.rd @@ -3,6 +3,10 @@ "ColumnCount": 32, "RowCount": 24, "CustomNames": [ + { + "Name": "标题", + "Formula": "页面反馈录入!$D$14" + }, { "Name": "当前用户", "Formula": "页面反馈录入!$Q$23" @@ -15,10 +19,6 @@ "Name": "反馈类型", "Formula": "页面反馈录入!$D$10" }, - { - "Name": "功能说明", - "Formula": "#REF!" - }, { "Name": "任务ID", "Formula": "页面反馈录入!$D$6" @@ -30,10 +30,6 @@ { "Name": "需求描述", "Formula": "页面反馈录入!$D$18" - }, - { - "Name": "标题", - "Formula": "页面反馈录入!$D$14" } ] } \ No newline at end of file diff --git a/ServerCommands/工作台/获取关键统计信息.json b/ServerCommands/工作台/获取关键统计信息.json new file mode 100644 index 00000000..ce3745d8 --- /dev/null +++ b/ServerCommands/工作台/获取关键统计信息.json @@ -0,0 +1,156 @@ +{ + "Name": "获取关键统计信息", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "InvokeTriggerTestData": { + "UserName": "shamus" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前用户", + "ParameterValue": "%CurrentUser%", + "ID": "e0cade93ca5549a1b71ab8d176b8ae1a" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "统计项目数量", + "TableValue": { + "TableName": "项目表", + "TableValueType": 3 + }, + "ID": "3b3f016a4397463982b33206362e6118" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "统计任务数量", + "TableValue": { + "TableName": "任务表", + "TableValueType": 3 + }, + "ID": "7bc10a72c4d24e82930e82ae03f4c431" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "统计反馈数量", + "TableValue": { + "TableName": "需求反馈登记表", + "TableValueType": 3 + }, + "ID": "0b662b0e818646fcb60f291827ff9127" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "统计总工时", + "TableValue": { + "TableName": "任务工时表", + "OnlyGetValue": true, + "TableValueType": 0, + "BindingInfos": [ + { + "GUID": "6bb37e80-fd20-4c15-9f8a-bc67f3dba970", + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "548da623-6c11-42e6-bac3-421bf712f184" + }, + "ColumnName": "总工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "f75a81ab-42d8-4ac7-bcd6-5e896dc1b4db" + }, + "Value": "%CurrentUser.UserName%" + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "181ee5fa4cb2483c855bf0612af70c32" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "项目数量", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=统计项目数量" + } + }, + { + "Name": "任务数量", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=统计任务数量" + } + }, + { + "Name": "反馈数量", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=统计反馈数量" + } + }, + { + "Name": "总工时", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=统计总工时" + } + } + ], + "OutParamaterName": "返回对象" + }, + { + "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon", + "NotificationName": "系统信息更新", + "SendType": 1, + "UserNames": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=当前用户" + }, + "Params": [ + { + "Name": "KEY", + "Value": "工作台关键数据更新" + }, + { + "Name": "VALUE", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回对象" + } + } + ], + "ID": "d70b610755f84d07b875ccf1584c34f1" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "完成" + } + ] +} \ No newline at end of file diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css index c63f46cb..6a7f6d3e 100644 --- a/UserFile/BaseCss.css +++ b/UserFile/BaseCss.css @@ -1,3 +1,8 @@ +/* 去掉背景色 */ +.none-background > div{ + background: none !important; +} + /* 标签必填 */ .required label:before { content: '*';