From ba3121d61e24732e50595e021da44dc00e09d30b Mon Sep 17 00:00:00 2001 From: cuckooent Date: Sat, 14 Sep 2024 22:08:22 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":12,"Name":"CustomLibrary"},{"State":1,"Type":1,"Na?= =?UTF-8?q?me":"PCPage/=E5=B7=A5=E4=BD=9C=E5=8F=B0=5F=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"},{"State":1,"Type":15,"Name":"ServerCommand?= =?UTF-8?q?/=E8=8E=B7=E5=8F=96=E5=85=B3=E9=94=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 37 ++------------------- Pages/工作台/工作台_关键信息.json | 22 ++++++------ ServerCommands/工作台/获取关键统计信息.json | 14 ++++---- UserFile/BaseCss.css | 4 +++ 4 files changed, 26 insertions(+), 51 deletions(-) diff --git a/.collaboration b/.collaboration index a5010bc7..fda22ea5 100644 --- a/.collaboration +++ b/.collaboration @@ -2230,19 +2230,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-14T22:04:44.1322304+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\Load.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -2314,17 +2302,7 @@ }, { "ModuleName": "PCPage/工作台_关键信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-14T22:06:23.079085+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工作台\\工作台_关键信息.json", - "Pages\\工作台\\工作台_关键信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommands/工作台", @@ -2332,16 +2310,7 @@ }, { "ModuleName": "ServerCommand/获取关键统计信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-14T22:07:57.7401806+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\工作台\\获取关键统计信息.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/工作台_快捷入口", diff --git a/Pages/工作台/工作台_关键信息.json b/Pages/工作台/工作台_关键信息.json index ea9ded9f..1d670737 100644 --- a/Pages/工作台/工作台_关键信息.json +++ b/Pages/工作台/工作台_关键信息.json @@ -87,6 +87,11 @@ "DesignLengthInPixel": 140.0 } }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, @@ -98,11 +103,6 @@ "Value": 1.0 } } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 140.0 - } } }, "Count": 13, @@ -113,6 +113,7 @@ "1,4": "任务数量", "1,7": "反馈数量", "1,10": "总工时", + "1,11": " ", "3,1": "-", "3,4": "-", "3,7": "-", @@ -198,7 +199,6 @@ "2,8": 4, "2,9": 0, "2,10": 3, - "2,11": 3, "3,1": 6, "3,2": 2, "3,4": 7, @@ -208,7 +208,6 @@ "3,8": 4, "3,9": 0, "3,10": 7, - "3,11": 7, "4,4": 0, "4,5": 0, "4,6": 0, @@ -223,6 +222,9 @@ "FontSize": 13.333333333333332 } }, + "Spans": [ + "1,11,3,1" + ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "PageLoadedCommandList": [ @@ -293,7 +295,7 @@ ] } ], - "ID": "2d74cd85-6ad0-4ba3-8b26-beda46537ca8" + "ID": "1aef115a-7f5d-41ce-8550-0de61e396a8f" } ] } @@ -339,7 +341,7 @@ "Fill": "Background 1 0" }, "IsAutomaticFill": false, - "Size": "888,113" + "Size": "783,113" } ], "CustomNames": [ @@ -360,4 +362,4 @@ "Formula": "工作台_关键信息!$K$4" } ] -}//uT2RMhe41QPOM8qR2L7eZ9jU7fVZSPNDyWk3FSP4e/tTidpjuRmRl8928baWgqRbu2WJUm4+HWtbZDJ+IxJ3bU4OWI5E9eXdWFE6+izVYnAil3izRrKp1wmAbjiADYC6LmtaYwsC0LgnDe4ViZfrx5TUDRWtqAuToq8mFbh6E0WTsnpM4YUfnZpipjEn0c+MNwcmwYIZCnDnbKbljnlJzhbsfnJ453dzt7y527gYMtInOr9FWc3pzdVDl4ptJ7HDrOS0OMLDpZCS7Mlqh8dnTBjK6rthjvTSJgroFnU7V3TcGpywhom4o6GARszNxgam01qoNpA6ZCtwSzVMR/WpMJR/gTJaeLcfk9RK+LvOfGhP8Misbh4hX97JpYVmDtlhhqoPUo16k/z1nZVZoO0nXqS61Msbz1ygByeTlGgWfICPXMHeRp2Ur1uhSp/57FQJc8IF2dknxmynjoWtL2EdNubAoGaygA/SYwSm09OXZm/WsBow7ycsexII/iCBVS8TDEe32Bl5dU0zufqj0MMrdGpWOm08/14wqlJ+hWpSTTdoTYyY4T4Z8qeONXLM3mEaTNMwqHv5Uy7yY+VfMFUR2lA9kPV8xr3nW97R+hvb1XI9Y7XMkvwtZRFg4LH3AWy7EO8i3pO45HnX5n+/v9xuBcHc96D5sRxcA64DMqVbrFZqpz2cPhzIDfXSIFsnJofE0E7J9qOjAz5EsM5Jh5lThKMlgdTJY6y7w2Vp2aauUDWIKql1AYJRNjIm9HjzDIObrNqoOHbSRIrDmFxHWPOc+XbFRoKQp9WJzZ60TYiFG7H8Wrckywhmeu3R/aFNa73X3wC65YW4l5t7nMe9eTJ719bJPKHu7oy+z3EgJQ/xzeoyv3ripK9+zOc5KMQqBX/jN/szy+bG0MtQfieztSFqDg==|920 \ No newline at end of file +}//pWIEv6U7U+PZJN5z8PxedMhZDAspj0ldmTGqBAVmR3sbofZmtUXG+npZ+dRibVzPp5Dwwe9tkxLghphrRnKVXIY8iSIa+DGx8Cz6qZG4bAVhPx0uBIhJzzCgUvXBKEfVXM48GLZX/g74jPC7vsiaoVnmD8Up+m/dwW9dmBqRMpEFJLa7l3UE0SxC8D4zAV48PnKUf5ANUUCA8063j9fFSnBBkhGVO1JoWPWry+3b3N9V3P71rLH7ONnPF8jJ6qeCK2opFQjv9Mg7Vzzoj1p/z41t7llXJKBV6mUyuM3g6MsZ0okmL4QhHIPRCD8PcloUgkos/wY5OSTExSzb2ys8AzWCpr5LiEe5rQ6nIEujk/LzYGThV3qhPaI/+nCx0VEJ4y4crzDrLTiJaZJavGY0OoScXR30Akv4aYslY8F6aqMMEoswip8K45zQWvdbtnelvjUmZQAAxdsaCWP6cohb33rrghRZA+ZXSZXy5D4nmWRNYcUmyngcmJZXqhnYQiiwvLFCEjujzgeQ1dDnlgznBeIMZodxGpuUM+JnK1aDgRG/FgCgCcbBlsRhqBDealwLhkoIuN5X59J/vaFBdb87TwRq5LhyD3gZmHEzQIqsk3DpbdvqLJO757HCnBRq+Aind+QVoHWVyAEnDXTafCol7FxdvYGTkT7jw08qWiF3Ju9usznqfrAtzzzaILfuOXbvefodEqplYZ0zLU2JNWCPkDPtbmU2ufQ2nY9Q8Xy5NXoPvDasXDsjO6c+dZE2GzGHR5R8w2XfvxHOHYy+Iu3yx/QfTbaxamfZohfF0Ci45KQZvd0XATE1caF9RwJrW30LWWnWVVthyp43t3zOdM+5YjYzz9GyFlb+ltpKXHApo7vvLCAdLooTyUcr3U+UyyX0n+FqLrvkfGHTZ77pc834Mw==|920 \ No newline at end of file diff --git a/ServerCommands/工作台/获取关键统计信息.json b/ServerCommands/工作台/获取关键统计信息.json index ce3745d8..969f7f31 100644 --- a/ServerCommands/工作台/获取关键统计信息.json +++ b/ServerCommands/工作台/获取关键统计信息.json @@ -30,7 +30,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "当前用户", "ParameterValue": "%CurrentUser%", - "ID": "e0cade93ca5549a1b71ab8d176b8ae1a" + "ID": "40945d862900457d8b005f051f6a51d6" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -68,7 +68,7 @@ "TableValueType": 0, "BindingInfos": [ { - "GUID": "6bb37e80-fd20-4c15-9f8a-bc67f3dba970", + "GUID": "774d9df0-288f-4dba-a808-8cdaaa62becb", "BindingInfo": { "TableName": "任务工时表", "ColumnName": "总工时", @@ -88,7 +88,7 @@ }, "NullFormulaValueQueryPolicy": 0 }, - "ID": "181ee5fa4cb2483c855bf0612af70c32" + "ID": "c925a8d7bf7c46328f4affc8196e8375" }, { "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", @@ -97,28 +97,28 @@ "Name": "项目数量", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计项目数量" + "SerializeProperty": "=IF(统计项目数量=\"\",0,统计项目数量)" } }, { "Name": "任务数量", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计任务数量" + "SerializeProperty": "=IF(统计任务数量=\"\",0,统计任务数量)" } }, { "Name": "反馈数量", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计反馈数量" + "SerializeProperty": "=IF(统计反馈数量=\"\",0,统计反馈数量)" } }, { "Name": "总工时", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计总工时" + "SerializeProperty": "=IF(统计总工时=\"\",0,统计总工时)" } } ], diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css index 6a7f6d3e..54bbc282 100644 --- a/UserFile/BaseCss.css +++ b/UserFile/BaseCss.css @@ -313,4 +313,8 @@ /* 隐藏未注册提示条 */ a[href="https://www.grapecity.com.cn/solutions/huozige?utm_source=exe&utm_medium=huozige"] { display: none; +} + +.fgc-page-elements-container { + transition: all cubic-bezier(0.26, 0.79, 0.58, 1) .3s; } \ No newline at end of file