From 3f9712a49418207cf5ced9cb66841bda517318bb Mon Sep 17 00:00:00 2001 From: "DESKTOP-P7DCA12\\ZhuanZ" <269252963@qq.com> Date: Tue, 10 Sep 2024 19:27:02 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E9=A6=96=E9=A1=B5"},{"State":1,"Type":1,"Name":"PCPage/?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=5F=E5=85=B3=E9=94=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 24 ++--------------- Pages/工作台/工作台_关键信息.json | 5 ++-- Pages/工作台/工作台_关键信息.rd | 44 +++++++++++++++---------------- Pages/工作台/工作台首页.json | 9 ++++++- Pages/工作台/工作台首页.rd | 8 +++--- 5 files changed, 38 insertions(+), 52 deletions(-) diff --git a/.collaboration b/.collaboration index d618071b..fda22ea5 100644 --- a/.collaboration +++ b/.collaboration @@ -2290,17 +2290,7 @@ }, { "ModuleName": "PCPage/工作台首页", - "State": 1, - "LockedBy": { - "UserName": "DESKTOP-P7DCA12\\ZhuanZ", - "Email": "269252963@qq.com" - }, - "LockDateTime": "2024-09-10T19:23:31.312565+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工作台\\工作台首页.json", - "Pages\\工作台\\工作台首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷 (2)", @@ -2312,17 +2302,7 @@ }, { "ModuleName": "PCPage/工作台_关键信息", - "State": 1, - "LockedBy": { - "UserName": "DESKTOP-P7DCA12\\ZhuanZ", - "Email": "269252963@qq.com" - }, - "LockDateTime": "2024-09-10T19:25:43.6013491+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工作台\\工作台_关键信息.json", - "Pages\\工作台\\工作台_关键信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommands/工作台", diff --git a/Pages/工作台/工作台_关键信息.json b/Pages/工作台/工作台_关键信息.json index f3da85e1..1b685c7a 100644 --- a/Pages/工作台/工作台_关键信息.json +++ b/Pages/工作台/工作台_关键信息.json @@ -219,7 +219,6 @@ { "$type": "Forguncy.Model.SubscribeNotificationCommand, ServerDesignerCommon", "Name": "系统信息更新", - "MergeCommand": true, "CommandList": [ { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -284,7 +283,7 @@ ] } ], - "ID": "06779d53-9dc9-4296-abf2-5f8c7929c43a" + "ID": "b77b2fb2-d82b-4906-b28c-ea5a7723b5bd" } ] } @@ -351,4 +350,4 @@ "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 +}//3bdG/eUyGYuc6YqdDG3qaEs607LLTggIEik0ltxHf+oXgFHUu4Ut0NJcNSe10EdpDGdtTS94jPGrlR+mk6ukFCjycgMakStL8vg5J/GebcyYoG4EghoDEqhxLbOEVfVwDkLtBBPx5nvdNjhHWaIctyQYw3mQI73BzvuJV4RQa+NGTwlQ36zIXX3TwlccBCmHMQlgXKMk2r7S50z1HV+1tXgXreEHosiCm5++REYZKCj2uMtY1ZWubjo7o3ZKF2pWHusoBlHoo7oFxogDd6QXurlcDTREg7RyUS+UYks4xexAZwf+FaGp1HALedoz5U3uDwXgLYv6hHVIdSeKy01SdXgZ/Y40tFAHTDEgyLSPAyV5rLJyDYPYOUaMyu6nIs1zS1dHiXmuJLgH1BWa79W0Gdw46eiwl6hymtXwNmaDLZ5QtHiUm7ZAqsW4iPHee8ky9SrzjAe0PmFiGKp8j/Lp5J0YU9eA1ub7mQTV5+sW03d1CAEE98R6iaEsWxKCGgSeopGJgHCal6/WsyTUmitAFSAgSdFuW38zzbAkpqpsbZPW6ifrfqWxw4Cr+wUvH7MlkfuRFvqnxao8SpschZqYxer6iX7Q6T6qxK1as+z/aep7Ulc41gSVXB3NmHlF0terpDJ8MI0UY9Pt81C78QVTa13dbt7XEyuMmI22rjaqiu4kMZ9GwmKTUTYOiHWMsfVb8lE9+OgFZQfVwuHE392K2cSWQBONXEGmljRqWIAlYMxAeYHWL77E2REAxE1PZ3JeiZPI2Ogz6Cyqn/FjBQesI7IuiAkP7gn64BZuwuYqfvlJtIKCuGaUijAuyuS24IpGcg95CZh3IPnAygFj2LYKu29bxQhYFPRRB9UT0YAEYKjS44pUZVdOE53OQLIU1X6Pd5cFYuuR7nodpipRR7tWxQ==|920 \ No newline at end of file diff --git a/Pages/工作台/工作台_关键信息.rd b/Pages/工作台/工作台_关键信息.rd index 944357e0..520a6bd6 100644 --- a/Pages/工作台/工作台_关键信息.rd +++ b/Pages/工作台/工作台_关键信息.rd @@ -1,23 +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" - } - ] +{ + "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 index b388b0f5..edd18765 100644 --- a/Pages/工作台/工作台首页.json +++ b/Pages/工作台/工作台首页.json @@ -417,6 +417,13 @@ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "MasterPageName": "FGC_母版页", "PageOverflowMode": 2, + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], "PermissionData": { "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", "permissionResource": { @@ -506,4 +513,4 @@ "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 +}//XPrzGVmiL6NAAnBWzSc7SC50b5oCw+Ec0D7QMjkyhbezrtL/1IwmQ2o0rvigYOYe85iX/b4TPOyNoFwQIkKh3TMqnhvLfB+0HPMaNEOuaZENYwCE9BYl4SDCZ+4zurIVnvIACb5xtAn0FfLlr9/VhXyzDVlAAU2cvEf+wTu+RlSj5AaZ0b2bOhfixj/HaFgaDqozQgBV3x3pFpRhQENZIqlejuAeU4gWlopJrAgVqRXrDTuyjos3gIbgVegeOSbh8kTfA1EG67wpJh5y52oJnSs6cmYhLlEZws88J8gZUx6t4nsiQK8jDfRMyxG8fJWZtgWKyJBDZcQjzqUhl7JlSmrsLPbbOIPuHzp+M2r9KWtv0q04jwDoLUbVLlPLV5nA1v9AnWJFtQ4JUszYUqTejgA6YODg2n84XsjR5e7oH4YT4k71ch2q4NHF/qFS+IOjR9XijWScYB4LUmwuA13Ab4GebxodFpZMdKj2i9GpcUccFsHGzlZBaj5es9hOxE8Ec4Fs/wNszSlBZw6gytTf6WlIvKAyE03hZW3pzl5eS1ju9czH7C2SP4kfclGktGRe83NpK5/5/OBlCb20XKTxTg8PlcC681x0ro7ON7La9b0Zo1fp3DBMRK9zo2Rw51SzFgAtjQqAbnaji99AeWAmpvFNDSgJcCWhw69oZarUH0i2IcV2ImSqq//E1/3+OMuZQCaApmm29k1DSrG2SstXP+XU4mNPXrmF210Sb/keOEqNvntHjinFm2EaGQiB+yQuCJAFHv3PWXi0RdmmqDOpHfNHVaavp163j+ARdZ0szs1jjRhM6mm2C8+SVBqoLtS1m3xaFHymZg1iVgh4+6oYpFYXTso0TXKOH9Eqrwp1XPDF7TnOEdt3Hi+W59ydkNeNmUXBaXHQvAmnrZlDCOnH8Q==|920 \ No newline at end of file diff --git a/Pages/工作台/工作台首页.rd b/Pages/工作台/工作台首页.rd index 41733322..86914c9b 100644 --- a/Pages/工作台/工作台首页.rd +++ b/Pages/工作台/工作台首页.rd @@ -1,5 +1,5 @@ -{ - "PageType": 0, - "ColumnCount": 40, - "RowCount": 12 +{ + "PageType": 0, + "ColumnCount": 40, + "RowCount": 12 } \ No newline at end of file