From 9d98c7400314b729ca6b808ef3d19af19e6edeac Mon Sep 17 00:00:00 2001 From: cuckooent Date: Tue, 16 Sep 2025 09:27:21 +0800 Subject: [PATCH] =?UTF-8?q?{"Message":"1","MessageType":2,"Modules":[{"Sta?= =?UTF-8?q?te":1,"Type":1,"Name":"PCPage/=E9=A1=B9=E7=9B=AE=E6=A6=82?= =?UTF-8?q?=E5=86=B5"},{"State":1,"Type":1,"Name":"PCPage/=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8A=A5=E5=B7=A5"},{"State":1,"Type":12,"Name":"Cust?= =?UTF-8?q?omLibrary"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 42 +- .../任务容器页面/工时/新增报工.json | 38 +- .../项目首页/项目首页-容器页面/项目概况.json | 786 +++++++++++------- .../项目首页/项目首页-容器页面/项目概况.rd | 6 +- 4 files changed, 518 insertions(+), 354 deletions(-) diff --git a/.collaboration b/.collaboration index 69872cd7..365c102d 100644 --- a/.collaboration +++ b/.collaboration @@ -602,21 +602,7 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-09-16T09:21:59.5967702+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd", - "Pages\\eaf92441634a4701b4a255ccc7601ac.json", - "Pages\\eaf92441634a4701b4a255ccc7601ac.rd", - "Pages\\f9ec059d9c5d440eabbb7db442b15c9.json", - "Pages\\f9ec059d9c5d440eabbb7db442b15c9.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷", @@ -704,17 +690,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-09-16T09:16:23.8753163+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -2694,19 +2670,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-09-16T09:23:50.0175224+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\Load.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json index 3f9e0e72..6efdfffb 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json @@ -591,7 +591,7 @@ "BreakpointIdentity": "288ae14e-7ae8-4471-a9d8-d1117ba04e93" } ], - "ID": "5e369651-f961-4fe5-95bc-5b60e520ca49" + "ID": "80745e39-b0fb-452c-8511-72a7cffd1a71" } ], "BreakpointIdentity": "7f14170f-5452-40d1-ac31-92b4ec16a0ee" @@ -774,7 +774,7 @@ "BreakpointIdentity": "5a93ac16-d8bb-4810-99ca-aba9158ae768" } ], - "ID": "40e75690-9c5a-4254-8546-7b44d29b61ec" + "ID": "77f3d121-f29e-45eb-b4e0-fc965215c512" }, { "CommandList": [ @@ -918,7 +918,7 @@ "BreakpointIdentity": "f0c63aab-624f-4261-8c4a-bb5297b965e0" } ], - "ID": "da8f22eb-e99a-4700-8cb0-8f04b06a415a" + "ID": "44f6ad08-17ba-4449-a37d-3cd0c93948db" }, { "CommandList": [ @@ -932,7 +932,7 @@ "BreakpointIdentity": "b39da01c-4746-4b70-9f96-566c899c52c0" } ], - "ID": "4b975f2b-7996-4965-b25a-4aa254fd4a27" + "ID": "aed03210-4ddd-4f70-a918-2fcf832c2f43" } ], "BreakpointIdentity": "892e92c7-7bd0-41c2-9a8a-b79f74c2a848" @@ -948,13 +948,13 @@ "BreakpointIdentity": "45e1ac21-fa09-49b0-8f04-8e0f37b47cdd" } ], - "ID": "dec4a932-8a89-43a4-868f-286f16b8d8cb" + "ID": "546e734e-7aa2-4eb6-b640-43c7efbc843c" } ], "BreakpointIdentity": "0a4bc035-9eb0-4273-b7dc-8f8abc84129c" } ], - "ID": "026cacec-1468-4ddc-91c0-698b10a004fb" + "ID": "e623a5a1-73d0-4a6a-90a9-30b68ae16b7d" }, { "Condition": { @@ -1132,7 +1132,7 @@ "BreakpointIdentity": "bc782bdf-defb-4114-8feb-9acc88997380" } ], - "ID": "8e542b26-7041-487a-bde6-f56115766f5c" + "ID": "3cda75b9-e7cc-4a6b-bfe5-68494ab34988" }, { "CommandList": [ @@ -1142,13 +1142,13 @@ "BreakpointIdentity": "7336e69c-fccf-4984-b772-6f90bf0c2ac9" } ], - "ID": "3c93df20-f8fe-475e-8a6c-4163b3f5dadc" + "ID": "d6759962-17a8-4577-9e81-8dfab1492c2a" } ], "BreakpointIdentity": "ae9024a5-a15f-4fdd-aa20-843a2fb33efa" } ], - "ID": "24b541df-c9cd-4df0-a72e-8f19c39ce23f" + "ID": "3158a0cf-09e1-4463-b397-18f839fdeaf4" } ], "BreakpointIdentity": "2067e7f3-4a3c-443d-bb29-4717d6cc34a0" @@ -1204,13 +1204,13 @@ "BreakpointIdentity": "507b7a54-bc30-4b84-abee-fd163cd856ba" } ], - "ID": "a3945641-5736-41db-bf91-cf44aded3ffc" + "ID": "5e9981d6-40bf-487e-884b-96e7fcff14b3" } ], "BreakpointIdentity": "372608e7-4d70-481f-8afe-902ca1d1f546" } ], - "ID": "732aa3e2-83ac-43ea-9df0-0a52e679697a" + "ID": "1c8d7951-b200-4b78-a0e2-322728375b0b" } ], "BreakpointIdentity": "4bc6b6dc-b3c8-4ec9-9283-2bdf729ff1c2" @@ -1704,7 +1704,7 @@ "BreakpointIdentity": "9a5ead74-4e20-4bf5-88b4-bea61d050a2d" } ], - "ID": "623dbc43-5633-420e-9af6-6313520099b2" + "ID": "e561e0ed-5e4c-4956-8866-12c04b6a0bd6" }, { "CommandList": [ @@ -1720,13 +1720,13 @@ "BreakpointIdentity": "3697b31d-8759-4a2a-8b3f-fa4aacc0e369" } ], - "ID": "17383282-35f1-492c-8f9f-9b79f6e5f462" + "ID": "de16121a-5596-4586-8637-7490e3c74efd" } ], "BreakpointIdentity": "438a3a0d-f98e-418d-9a29-a59df3fd4510" } ], - "ID": "aa4eb46e-e563-4907-a74a-d0e7cb4f7b6d" + "ID": "978c9336-08e8-4810-992d-894cd4002ab8" } ], "BreakpointIdentity": "40cf13ed-3c5a-49f3-925c-f3203401639c" @@ -1814,7 +1814,7 @@ "BreakpointIdentity": "6c2551be-d3f1-407a-aa58-1ddfe5f912de" } ], - "ID": "9cdcf282-a650-4274-9e4d-cde681738c8b" + "ID": "118601ba-5697-460e-84f5-745839218a05" }, { "CommandList": [ @@ -1830,7 +1830,7 @@ "BreakpointIdentity": "542f964e-2ad1-41f2-b904-dae10b780399" } ], - "ID": "3c5908d4-753d-45e7-b052-b2059a10f099" + "ID": "c11ef773-48c3-452b-a2bf-654b23a2dd5a" } ], "BreakpointIdentity": "414200cd-0974-4b5d-a707-c9c9b91ceeea" @@ -2322,7 +2322,7 @@ "BreakpointIdentity": "5f419cb3-3648-4bd9-9b11-04d5c09db727" } ], - "ID": "cfb2be57-439c-479b-8862-cdbf5862fddb" + "ID": "76e9d47c-2a3e-4c79-a546-696b44755eaa" }, { "CommandList": [ @@ -2340,7 +2340,7 @@ "BreakpointIdentity": "bdc7ba4a-7ff5-4c48-a983-1394685a4bce" } ], - "ID": "92232962-5fc4-4223-b18e-f6e939529962" + "ID": "28f95711-59e2-4e9a-9275-70319cd06dd2" } ], "BreakpointIdentity": "b1871849-00b3-4090-a8fe-67a8292b2f59" @@ -2420,4 +2420,4 @@ "Formula": "新增报工!$B$28" } ] -}//FghPxEcAEhfBrD15h6HvaeRZs2keaPy1kKB6zZuNMEtqG3hOQAeNQabmZMi+nrk6EIYLF8ytD9oVod6zBDbSrYlRDHXmUrx8abdFoj/upN0v3bmp2qPMEgN0CI776rFMZ5ydiR/MzsyKheM/MQQTiUXhT+R8/k7Khi0LfbXMSnSOgKjux3dfekplA+oFjgk1vexsdDwHHVSc/MHFvrEixUyAfCnwtMu98t5BYvgtmw0kDY7vbEXlPesLU4kiscs2sBV4CyX+usFKuiNqd4RsO6Yt76U8g0pNUuy4OfMXmNWhiC/PwjRguVHYI9o8XGfPzS5M1jlwReROBS3R5xYHv99DYY0FGEf1TdZIfl/JjvKS1lTPU1QyU9yA8IMecu7gN34lf2Qq9IZkgwsCjlfxJGrhjoeG/WRnSBXyOg+3b3+X/Aon43+uE4fXFRdE1dGcdWsQfxoxCREja/DW7Z83NDCO51sluWGRBtMwOj0h/3B7hZ+o3H9vrRAYTu5R3jQR9yt3M5/8xWV1pZPaMiRLqXm96678GTomY4Kp7/enCMdcdypRTYQ0r6+ZK0Tv1UNPQgtKOz2B9FEbLKRhERPDEos9BWWL5R1xq1ko0VsHBzncgDiNmLAjDfhghSpxpQYG/OTgzP23q0J/sGeI7o+O41IO2wcrIgkndIgAv542ZcPdimlVIS7rG3+WQERh3Mv1nL1x0emIsVjfEkMWO6+bhFKzFEAcDScYpO1mDpdyVuY1K7+r4PLtGefoD41bbL+yJVWouQAbGQbBLrDTgDMosbFIJa4Evx5sIL3nSY8Qme2IJOcJd/gcag2EZUHWuu0/qrXLF9D0rMQChZlDCcO70Yq7V1yKHvcslV6oxgCrCap9mE/vws7aC+0pIxu++2MJJ6BOMUrnz3+LvJj+B5lBTg==|920 \ No newline at end of file +}//gFfmHaSWwD5aPcKwu2ijTkk6kewjj96JUlHdTGpvRuTaxHxjGSdHf+6Cajq4LlI5Ku2/RYD/gWL4IcIkkMKdFb0LBEJofcOZlMfQw6Y5k1yKeteQAORErgaMFX7VQ33HidRh3QlTosg8TBznuvLy48gfTN3ThPrK5aECGlbdcbu+x63ll9GoV9jZf9hgcFM9hBTkrviPqcpdcKcwaGrBX/y7gZ4YC9cSSpig47bocnoDUyXF6jS7SivNCfkcrj3dF5y5HZ/MikGpT+Lt0vUJjKupKdCW2tQMF9/TljSNIRAMfpz6KGoxLLj88TSLxcGU8pIJDX9VaulhgAtAr9jbKmkTrKGEKnIXp5p1K7mIW5SmPlQy8bvERFcIDW2N0bzMhNLWD7hhLEelUoAm1trNCWW8RB3v8Ggm+CrijcGcX+BY30i6x66ltSBQf8NT7JrvCISwxQ3BkBf64lt9N3yEfEniQ6g0kINu0l+Ue6ZzcR046TXgobQ3IKGCdiiyMVTGTBAcWi1MRQ97zItrz0fKyaMI3KMhPJSyKAnhLjpCrkPJMn7Hq5fmq6OvwlLS9Ix5Y+IKDKs5+mbZUkpaoTdt7o8JsqVn/0N70WOdzx87PVWg9WA/CjSjiLrqITszMgKcFvbdDZt1j9QUYRM5eh/9kcctEGAPZDMdEcM1JpfbdVY16MhmRd4IATfVCOfzXfTKoEzSTYJHNcRpDVvF/7iX2SNxuHSSDdSeHhZNlw/RE2mH1btVQ3WIA9H07VA/YzFyPqHXJSrjBz3I3CNpxLWF8UfO6sZaC0/Z4HfVEI12dw79WBR16mqlMOOAlN27Ex4C5yj3BkmgKXVLbeMnWIhPBTRKY20jBlgR6q1kxuplF5NdRxBiY+98mvfHs0cqCQE5nwzACjGSH4/loHA8vGo3UA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json index 473057ab..7f834e3d 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -18,91 +18,136 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 32.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 175.0 + "DesignLengthInPixel": 10.0 } }, "5": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 175.0 } }, "6": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 15.0 } }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 198.0 + "DesignLengthInPixel": 15.0 } }, "8": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 32.0 } }, "9": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 10.0 } }, "10": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 284.0 + "DesignLengthInPixel": 198.0 } }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 15.0 } }, "12": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 15.0 } }, "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 284.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "20": { "GridRowColumnDefinition": { "DesignLengthInPixel": 379.0, "Mode": 1 } }, - "14": { + "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 15.0 } }, - "15": { + "22": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 40.0 + "DesignLengthInPixel": 15.0 } }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 615.0 - } - }, - "17": { + "23": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "18": { + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 615.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { "GridRowColumnDefinition": { "DesignLengthInPixel": 45.0 } } }, "InLogicalVisibleIndexes": [ - 18 + 27 ], - "Count": 19, - "DefaultSize": 24.0 + "Count": 28, + "DefaultSize": 15.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -315,14 +360,14 @@ "Values": { "1,1": "项目概况-关键数据", "3,1": "三经理", - "4,1": "项目三经理成员", - "6,1": "项目成员", - "7,1": "项目成员统计", - "9,1": "工时上报趋势图", - "12,1": "项目进展", - "13,1": "项目甘特图", - "15,1": "反馈桑基图", - "16,1": "反馈统计(饼图+表格)" + "5,1": "项目三经理成员", + "8,1": "项目成员", + "10,1": "项目成员统计", + "13,1": "工时上报趋势图", + "18,1": "项目进展", + "20,1": "项目甘特图", + "23,1": "反馈桑基图", + "25,1": "反馈统计(饼图+表格)" }, "AttachInfos": { "1,1": { @@ -435,20 +480,20 @@ "LoadOnDemandCount": 30 } }, - "4,1": { + "5,1": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "项目三经理成员", "OverflowMode": 1 } }, - "7,1": { + "10,1": { "CellType": { "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", "PageName": "项目成员统计" } }, - "10,1": { + "15,1": { "CellType": { "$type": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType", "EChartTitle": "Echarts图表", @@ -527,7 +572,7 @@ "Config": "{\"option\":\"\\nconst {\\n \\\"日期\\\": xAxisData,\\n \\\"工时\\\": yAxisData\\n} = ForguncyEchartsHelper.splitDataSource(Context.report);\\nconsole.log(xAxisData);\\nconsole.log(yAxisData);\\n\\n\\noption = {\\n title:{\\n text:'工时上报趋势图',\\n show:false,\\n left: 'center'\\n },\\n color: ['#00bcd4', '#00DDFF', '#37A2FF', '#FF0087', '#FFBF00'],\\n tooltip: {\\n trigger: 'axis',\\n axisPointer: {\\n type: 'cross',\\n label: {\\n backgroundColor: '#6a7985'\\n }\\n }\\n },\\n grid:{\\n left:25,\\n right:25,\\n top:55,\\n bottom:30\\n },\\n xAxis: {\\n type: 'category',\\n data: xAxisData,\\n splitLine:{\\n show:false\\n }\\n },\\n yAxis: {\\n type: 'value',\\n splitLine:{\\n show:true,\\n lineStyle:{\\n width:0.5,\\n color:'#e6e6e6'\\n }\\n }\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n lineStyle: {\\n width: 3\\n },\\n areaStyle: {\\n opacity: 0.8,\\n color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [\\n {\\n offset: 0,\\n color: 'rgba(0,188,212,0.8)'\\n },\\n {\\n offset: 1,\\n color: 'rgba(0,188,212,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,ApplicationResource})=>{\\n var datGUI=undefined;\\n var option={};\\n const { \\\"日期\\\": xAxisData, \\\"工时\\\": yAxisData } = ForguncyEchartsHelper.splitDataSource(Context.report);\\nconsole.log(xAxisData);\\nconsole.log(yAxisData);\\noption = {\\n title: {\\n text: '工时上报趋势图',\\n show: false,\\n left: 'center'\\n },\\n color: ['#00bcd4', '#00DDFF', '#37A2FF', '#FF0087', '#FFBF00'],\\n tooltip: {\\n trigger: 'axis',\\n axisPointer: {\\n type: 'cross',\\n label: {\\n backgroundColor: '#6a7985'\\n }\\n }\\n },\\n grid: {\\n left: 25,\\n right: 25,\\n top: 55,\\n bottom: 30\\n },\\n xAxis: {\\n type: 'category',\\n data: xAxisData,\\n splitLine: {\\n show: false\\n }\\n },\\n yAxis: {\\n type: 'value',\\n splitLine: {\\n show: true,\\n lineStyle: {\\n width: 0.5,\\n color: '#e6e6e6'\\n }\\n }\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n lineStyle: {\\n width: 3\\n },\\n areaStyle: {\\n opacity: 0.8,\\n color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [\\n {\\n offset: 0,\\n color: 'rgba(0,188,212,0.8)'\\n },\\n {\\n offset: 1,\\n color: 'rgba(0,188,212,0)'\\n }\\n ])\\n },\\n }\\n ]\\n};\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" } }, - "12,30": { + "18,30": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -555,7 +600,7 @@ "UseCellForeColor": true } }, - "13,1": { + "20,1": { "CellType": { "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", "TemplatePageName": "f9ec059d9c5d440eabbb7db442b15c9", @@ -642,7 +687,7 @@ "TemplateKey": "竖排横线分割" } }, - "15,30": { + "23,30": { "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "CommandList": [ @@ -670,7 +715,7 @@ "UseCellForeColor": true } }, - "16,1": { + "25,1": { "CellType": { "$type": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType", "EChartTitle": "Echarts图表", @@ -777,22 +822,23 @@ "HorizontalAlignment": 1 }, { - "FontSize": 14.666666666666666, - "Foreground": 2, - "TextIndent": 10, - "HorizontalAlignment": 3 + "HorizontalAlignment": 2 + }, + { + "BorderBottom": 1 }, { "FontFamily": 4, - "FontSize": 14.666666666666666, - "Foreground": 2, - "TextIndent": 10, - "HorizontalAlignment": 3 + "HorizontalAlignment": 2 }, { "FontFamily": 4, "HorizontalAlignment": 1 }, + { + "FontFamily": 4, + "BorderBottom": 1 + }, { "FontFamily": 4 }, @@ -800,45 +846,48 @@ "FontFamily": 4, "BorderLeft": 0 }, - { - "FontFamily": 4, - "Foreground": 5 - }, { "FontFamily": 4, "FontSize": 13.333333333333332, - "Foreground": 6, + "Foreground": 5, "HorizontalAlignment": 1 }, { "FontFamily": 4, - "FontSize": 14.666666666666666, - "Foreground": 2, - "Formatter": 7, - "TextIndent": 10, - "HorizontalAlignment": 3 + "Formatter": 6, + "HorizontalAlignment": 2 }, { "FontFamily": 4, "FontSize": 37.33333333333333, "Foreground": 0, "HorizontalAlignment": 1 + }, + { + "FontSize": 14.666666666666666, + "FontWeight": 7, + "Foreground": 8 } ], "Types": { "Strs": [ "Background 1 -15", "Center", - "Background 1 0", "Left", + "Background 2 0", "Body", - "Accent 1 0", "Text 1 50", - "General" + "General", + "Bold", + "black" ], "Borders": [ { "Color": 0 + }, + { + "Style": 5, + "Color": 3 } ] }, @@ -849,173 +898,399 @@ "2,33": 0, "3,1": 2, "3,33": 0, + "4,1": 2, "4,33": 0, "5,33": 0, + "6,0": 3, "6,1": 3, + "6,2": 3, + "6,3": 3, + "6,4": 3, + "6,5": 3, + "6,6": 3, + "6,7": 3, + "6,8": 3, + "6,9": 3, + "6,10": 3, + "6,11": 3, + "6,12": 3, + "6,13": 3, + "6,14": 3, + "6,15": 3, + "6,16": 3, + "6,17": 3, + "6,18": 3, + "6,19": 3, + "6,20": 3, + "6,21": 3, + "6,22": 3, + "6,23": 3, + "6,24": 3, + "6,25": 3, + "6,26": 3, + "6,27": 3, + "6,28": 3, + "6,29": 3, + "6,30": 3, + "6,31": 3, + "6,32": 3, "6,33": 0, - "7,1": 4, "7,33": 0, "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,31": 4, - "8,32": 5, - "8,33": 6, - "9,1": 3, - "9,2": 5, - "9,3": 5, - "9,4": 5, - "9,5": 5, - "9,6": 5, - "9,7": 5, - "9,8": 5, - "9,9": 5, - "9,10": 5, - "9,11": 5, - "9,12": 5, - "9,13": 5, - "9,14": 5, - "9,15": 5, - "9,16": 5, - "9,17": 5, - "9,18": 5, - "9,19": 5, - "9,20": 5, - "9,21": 5, - "9,22": 5, - "9,23": 5, - "9,24": 5, - "9,25": 5, - "9,26": 5, - "9,27": 5, - "9,28": 5, - "9,29": 5, - "9,30": 5, - "9,31": 5, - "9,32": 5, - "9,33": 6, + "8,33": 0, + "9,1": 4, + "9,33": 0, "10,1": 5, - "10,32": 5, - "10,33": 6, - "11,32": 5, - "11,33": 6, - "12,1": 3, - "12,30": 7, - "12,32": 5, - "12,33": 6, - "13,1": 8, - "13,32": 5, - "13,33": 6, - "14,1": 8, - "14,2": 8, - "14,3": 8, - "14,4": 8, - "14,5": 8, - "14,6": 8, - "14,7": 8, - "14,8": 8, - "14,9": 8, - "14,10": 8, - "14,11": 8, - "14,12": 8, - "14,13": 8, - "14,14": 8, - "14,15": 8, - "14,16": 8, - "14,17": 8, - "14,18": 8, - "14,19": 8, - "14,20": 8, - "14,21": 8, - "14,22": 8, - "14,23": 8, - "14,24": 8, - "14,25": 8, - "14,26": 8, - "14,27": 8, - "14,28": 8, - "14,29": 8, - "14,30": 8, - "14,31": 8, - "14,32": 5, - "14,33": 6, - "15,0": 5, - "15,1": 9, - "15,2": 5, - "15,3": 5, - "15,4": 5, - "15,5": 5, - "15,6": 5, - "15,7": 5, - "15,8": 5, - "15,9": 5, - "15,10": 5, - "15,11": 5, - "15,12": 5, - "15,13": 5, - "15,14": 5, - "15,15": 5, - "15,16": 5, - "15,17": 5, - "15,18": 5, - "15,19": 5, - "15,20": 5, - "15,21": 5, - "15,22": 5, - "15,23": 5, - "15,24": 5, - "15,25": 5, - "15,26": 5, - "15,27": 5, - "15,28": 5, - "15,29": 5, - "15,30": 7, - "15,32": 5, - "15,33": 6, - "15,45": 5, - "16,1": 10, - "16,32": 5, - "16,33": 6 + "10,33": 0, + "11,0": 6, + "11,1": 6, + "11,2": 6, + "11,3": 6, + "11,4": 6, + "11,5": 6, + "11,6": 6, + "11,7": 6, + "11,8": 6, + "11,9": 6, + "11,10": 6, + "11,11": 6, + "11,12": 6, + "11,13": 6, + "11,14": 6, + "11,15": 6, + "11,16": 6, + "11,17": 6, + "11,18": 6, + "11,19": 6, + "11,20": 6, + "11,21": 6, + "11,22": 6, + "11,23": 6, + "11,24": 6, + "11,25": 6, + "11,26": 6, + "11,27": 6, + "11,28": 6, + "11,29": 6, + "11,30": 6, + "11,31": 6, + "11,32": 6, + "11,33": 0, + "12,1": 5, + "12,2": 5, + "12,3": 5, + "12,4": 5, + "12,5": 5, + "12,6": 5, + "12,7": 5, + "12,8": 5, + "12,9": 5, + "12,10": 5, + "12,11": 5, + "12,12": 5, + "12,13": 5, + "12,14": 5, + "12,15": 5, + "12,16": 5, + "12,17": 5, + "12,18": 5, + "12,19": 5, + "12,20": 5, + "12,21": 5, + "12,22": 5, + "12,23": 5, + "12,24": 5, + "12,25": 5, + "12,26": 5, + "12,27": 5, + "12,28": 5, + "12,29": 5, + "12,30": 5, + "12,31": 5, + "12,32": 7, + "12,33": 8, + "13,1": 4, + "13,2": 7, + "13,3": 7, + "13,4": 7, + "13,5": 7, + "13,6": 7, + "13,7": 7, + "13,8": 7, + "13,9": 7, + "13,10": 7, + "13,11": 7, + "13,12": 7, + "13,13": 7, + "13,14": 7, + "13,15": 7, + "13,16": 7, + "13,17": 7, + "13,18": 7, + "13,19": 7, + "13,20": 7, + "13,21": 7, + "13,22": 7, + "13,23": 7, + "13,24": 7, + "13,25": 7, + "13,26": 7, + "13,27": 7, + "13,28": 7, + "13,29": 7, + "13,30": 7, + "13,31": 7, + "13,32": 7, + "13,33": 8, + "14,1": 4, + "14,2": 7, + "14,3": 7, + "14,4": 7, + "14,5": 7, + "14,6": 7, + "14,7": 7, + "14,8": 7, + "14,9": 7, + "14,10": 7, + "14,11": 7, + "14,12": 7, + "14,13": 7, + "14,14": 7, + "14,15": 7, + "14,16": 7, + "14,17": 7, + "14,18": 7, + "14,19": 7, + "14,20": 7, + "14,21": 7, + "14,22": 7, + "14,23": 7, + "14,24": 7, + "14,25": 7, + "14,26": 7, + "14,27": 7, + "14,28": 7, + "14,29": 7, + "14,30": 7, + "14,31": 7, + "14,32": 7, + "14,33": 8, + "15,1": 7, + "15,32": 7, + "15,33": 8, + "16,0": 6, + "16,1": 6, + "16,2": 6, + "16,3": 6, + "16,4": 6, + "16,5": 6, + "16,6": 6, + "16,7": 6, + "16,8": 6, + "16,9": 6, + "16,10": 6, + "16,11": 6, + "16,12": 6, + "16,13": 6, + "16,14": 6, + "16,15": 6, + "16,16": 6, + "16,17": 6, + "16,18": 6, + "16,19": 6, + "16,20": 6, + "16,21": 6, + "16,22": 6, + "16,23": 6, + "16,24": 6, + "16,25": 6, + "16,26": 6, + "16,27": 6, + "16,28": 6, + "16,29": 6, + "16,30": 6, + "16,31": 6, + "16,32": 6, + "16,33": 8, + "17,32": 7, + "17,33": 8, + "18,1": 4, + "18,30": 7, + "18,32": 7, + "18,33": 8, + "19,1": 4, + "19,30": 7, + "19,32": 7, + "19,33": 8, + "20,1": 9, + "20,32": 7, + "20,33": 8, + "21,0": 6, + "21,1": 6, + "21,2": 6, + "21,3": 6, + "21,4": 6, + "21,5": 6, + "21,6": 6, + "21,7": 6, + "21,8": 6, + "21,9": 6, + "21,10": 6, + "21,11": 6, + "21,12": 6, + "21,13": 6, + "21,14": 6, + "21,15": 6, + "21,16": 6, + "21,17": 6, + "21,18": 6, + "21,19": 6, + "21,20": 6, + "21,21": 6, + "21,22": 6, + "21,23": 6, + "21,24": 6, + "21,25": 6, + "21,26": 6, + "21,27": 6, + "21,28": 6, + "21,29": 6, + "21,30": 6, + "21,31": 6, + "21,32": 6, + "21,33": 8, + "22,1": 9, + "22,2": 9, + "22,3": 9, + "22,4": 9, + "22,5": 9, + "22,6": 9, + "22,7": 9, + "22,8": 9, + "22,9": 9, + "22,10": 9, + "22,11": 9, + "22,12": 9, + "22,13": 9, + "22,14": 9, + "22,15": 9, + "22,16": 9, + "22,17": 9, + "22,18": 9, + "22,19": 9, + "22,20": 9, + "22,21": 9, + "22,22": 9, + "22,23": 9, + "22,24": 9, + "22,25": 9, + "22,26": 9, + "22,27": 9, + "22,28": 9, + "22,29": 9, + "22,30": 9, + "22,31": 9, + "22,32": 7, + "22,33": 8, + "23,0": 7, + "23,1": 10, + "23,2": 7, + "23,3": 7, + "23,4": 7, + "23,5": 7, + "23,6": 7, + "23,7": 7, + "23,8": 7, + "23,9": 7, + "23,10": 7, + "23,11": 7, + "23,12": 7, + "23,13": 7, + "23,14": 7, + "23,15": 7, + "23,16": 7, + "23,17": 7, + "23,18": 7, + "23,19": 7, + "23,20": 7, + "23,21": 7, + "23,22": 7, + "23,23": 7, + "23,24": 7, + "23,25": 7, + "23,26": 7, + "23,27": 7, + "23,28": 7, + "23,29": 7, + "23,30": 7, + "23,32": 7, + "23,33": 8, + "23,45": 7, + "24,0": 7, + "24,1": 10, + "24,2": 7, + "24,3": 7, + "24,4": 7, + "24,5": 7, + "24,6": 7, + "24,7": 7, + "24,8": 7, + "24,9": 7, + "24,10": 7, + "24,11": 7, + "24,12": 7, + "24,13": 7, + "24,14": 7, + "24,15": 7, + "24,16": 7, + "24,17": 7, + "24,18": 7, + "24,19": 7, + "24,20": 7, + "24,21": 7, + "24,22": 7, + "24,23": 7, + "24,24": 7, + "24,25": 7, + "24,26": 7, + "24,27": 7, + "24,28": 7, + "24,29": 7, + "24,30": 7, + "24,32": 7, + "24,33": 8, + "24,45": 7, + "25,1": 11, + "25,32": 7, + "25,33": 8 + }, + "RowStyles": { + "3": 12, + "4": 12, + "8": 12, + "9": 12, + "13": 12, + "14": 12, + "18": 12, + "19": 12, + "23": 12, + "24": 12 }, "SheetStyle": { "FontFamily": 4 } }, "Spans": [ - "7,1,1,31", - "1,1,1,31", - "4,1,1,31", "10,1,1,31", - "13,1,1,31", - "16,1,1,31", - "1,34,16,11" + "1,1,1,31", + "5,1,1,31", + "15,1,1,31", + "20,1,1,31", + "25,1,1,31", + "1,34,25,11", + "6,33,2,1", + "16,33,2,1", + "21,33,2,1" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1061,89 +1336,14 @@ "Fill": "Background 1 0" }, "IsAutomaticFill": false, - "Location": "0,895", - "Size": "1439,1346" - }, - { - "Name": "088a5640-85dd-4199-b030-c26f2e322fe2.png", - "DisplayName": "背景图1", - "StyleInfo": { - "CornerRadius": 4.0, - "Fill": "Accent 1 0", - "StrokeDashType": 8, - "Stroke": "black", - "StrokeThickness": 0.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "32,231", - "Size": "975,40" - }, - { - "Name": "cbbfd199-6524-4ff6-9af9-4fc0d365aafc.png", - "DisplayName": "背景图2", - "StyleInfo": { - "CornerRadius": 4.0, - "Fill": "Accent 1 0", - "StrokeDashType": 8, - "Stroke": "black", - "StrokeThickness": 0.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "32,470", - "Size": "975,40" - }, - { - "Name": "9b8a58b8-6510-44e8-b3a0-99b0fe46cc37.png", - "DisplayName": "背景图3", - "StyleInfo": { - "CornerRadius": 4.0, - "Fill": "Accent 1 0", - "StrokeDashType": 8, - "Stroke": "black", - "StrokeThickness": 0.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "32,1066", - "Size": "975,40" - }, - { - "Name": "BackgroundPicture4", - "DisplayName": "背景图4", - "StyleInfo": { - "CornerRadius": 4.0, - "Fill": "Accent 1 0", - "StrokeDashType": 8, - "Stroke": "black", - "StrokeThickness": 0.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "32,718", - "Size": "975,43" - }, - { - "Name": "0579a73c-8569-4603-a179-f21cf9bc1877.png", - "DisplayName": "背景图5", - "StyleInfo": { - "CornerRadius": 4.0, - "Fill": "Accent 1 0", - "StrokeDashType": 8, - "Stroke": "black", - "StrokeThickness": 0.0 - }, - "IsAutomaticStroke": false, - "IsAutomaticFill": false, - "Location": "32,1509", - "Size": "975,40" + "Location": "0,927", + "Size": "1439,1362" } ], "CustomNames": [ { "Name": "工时走势", - "Formula": "项目概况!$B$11" + "Formula": "项目概况!$B$16" }, { "Name": "关键数据", @@ -1151,11 +1351,11 @@ }, { "Name": "项目成员", - "Formula": "项目概况!$B$8" + "Formula": "项目概况!$B$11" }, { "Name": "项目动态", "Formula": "项目概况!$AI$2" } ] -}//Ma6KmS7D19e8usxZm/RN+gSmWln8tSdPBZgD2ch7Q0xByNeGGdRAfn05Hln46MukpepMJSg8u22z/uDqwN3IE7Z3hPmJe7ebF4UnhEkBkJ7zdyRnlA9LiQWILkDn17m8upvPn0Fc+RVHDgh1G6n5tgsllCfz3XUgxJ1L6JOg42qX+qNSjYy3H3ttYI3FnLWOuP2S1wKpdVTovDBOC8EWwLyNM93XV7mPBstdb2OY0MVNYX9HcvEb8sUbM9AD81zZq+07hPgKYfnAnGFyeJ9F5hI96pNGzpg+qXQgqRJL4s+Jk71vMb5meCcdpRutbWnApc+EQAhXo1c6dMFcyM05RCU0j3o8eQNm+bfMMMUZXf7yWg0oco0HdOhgqL42blignKGdXIHY2Q2zR87++QXDsCCJQ03enaNHgMd7JKYZXWgzLXGbqO+1/vIpMSiLbaq4mRMizcybx7cNdhAb4DEP0j/rt36pZ+vi3b08EPU3GcG1nFSVQmRfXcJ9hDy0hIXIb1CKgzxJOOObFErfsFLfaHvhSIWFlrqDr/aKeXCT09R1ntHKBTH0oVL6JmM/VdVBAFKERQpEuj867yFhsrNzfZGNm1xE94HZ31UtxVzjwXm0DDqNiAiWKVJgS3AWvB490WcNaOfbNWC5GUaxR7CWNkNG47ct17qQxnWNqwRG6lbyb7sRm1C6tpJloCC8jBbrevL1hEhQig9Jw0XTCI75tyvofn7EpORfKDqB8xGM3RDjtG/m+DmSg6lI1dZNOLCCeGKvYNAHQBmVlYfxDgoeNsnRwwrD1OMmXIiwqpAFLMKcau5csWQYAnivx1+8gUnCQM+LgRrVxdUCFcLtEPu3txxLtezZwK6sbWJaZvOvxmxnP9PYxcl8KLwsLsPqNp37VqhdOJjwGONO39eKy54hJg==|920 \ No newline at end of file +}//cbO7uo+Q8hiVScZ8xGH4mFNISpFcsdJRM/NNthVZAjwCaBHcqyXjJZLVwLOh55dpBd7MAcsuusu7BEwi6mJoCvN9Y94KrrZOHw3JMmL+bYWf/9eHicjZMx7PR/DM5uzZlj8v/MjVyeXsoA12DeeCat+PKit7N2CLqyASVmrOr6EHwqkhKfU/uXgoBzZeLr7PdxZyypP65q4gHFbRRw2vM4fZCOMltv1L4pmHo2SDsRnswaCuAnMJYPeA/Of8tPWNGMZZeTEd7omTWpfzw6Es8s6Iyhb/kB4NlrNmJi3VvWP4XglvVn2vnsOeteu6VgqJS5DtDBUzUVUxPrjw5IQefllGn7tMEwPOSAQRayHMQN3dDmPUowh3Sjf4jnUe6J9RPj+VYM1egktQUXQfzA0ll7/wbfv/LDSyPUEbT9nJJP8mOEvtMiDIOrLI5WRhvhDta3X8qQAmBRSyzsIioe7sbo3bi5/uXQk+/zKeS2otnHnI+tJMWLLIZqUIwhL6UbhhdwpYSNCwUykZY5br4e24a2khwxS9xofUnIeDL9quEvjz+h7z8IM0tNL/9BGFaSQg4tpxP74IiTch0GaHwvC7lcN/b117zen+6QZT9DCNKVTHF6PW6Ks8SEOaRWgakWinyKiWSAbYFK+asXj+R4GGy7E8XKvdIaI2u7V7WnIJeFfBXkGz4wNB77s9LStiYJuy9x32a3QSGeUUkFE8tTYdXvY+lMf2U6U9HoaU9Alcs85rpCh8bf8PgCbTMMkHc6SAJGHRF6rMTCAUpsOE/mQhyWuOUE4aC+uK5VLh2uJjjOLaf9fQCjYL/KExPXdRvK75cBIPpb+jDFNzW3ND/CDzDem+DDp61j7ruhA9g6/yQcJXkq0GavU28G9i/yGU2/pjSfqkPhUJYxm7V8XemzRK8Q==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd index c6e49697..44522a3a 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd @@ -1,11 +1,11 @@ { "PageType": 0, "ColumnCount": 46, - "RowCount": 19, + "RowCount": 28, "CustomNames": [ { "Name": "工时走势", - "Formula": "项目概况!$B$11" + "Formula": "项目概况!$B$16" }, { "Name": "关键数据", @@ -13,7 +13,7 @@ }, { "Name": "项目成员", - "Formula": "项目概况!$B$8" + "Formula": "项目概况!$B$11" }, { "Name": "项目动态",