From be1fd45fabe52e8c1fefadc507609ab165b4224e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B6=85=E5=93=A5?= Date: Fri, 14 Jun 2024 17:47:44 +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"}],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 12 +- .../项目首页/项目首页-容器页面/项目概况.json | 269 +++++++++++------- .../项目首页/项目首页-容器页面/项目概况.rd | 4 +- 3 files changed, 165 insertions(+), 120 deletions(-) diff --git a/.collaboration b/.collaboration index 73f30302..66e3e1cb 100644 --- a/.collaboration +++ b/.collaboration @@ -563,17 +563,7 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-14T16:58:47.7177254+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务列表", diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json index ba6e5857..5ab8901d 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.json @@ -23,12 +23,12 @@ "Mode": 1 } }, - "4": { + "5": { "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } }, - "5": { + "6": { "GridRowColumnDefinition": { "DesignLengthInPixel": 278.0, "Mode": 2, @@ -42,16 +42,16 @@ }, "7": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 252.0 + "DesignLengthInPixel": 24.0 } }, - "8": { + "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 224.0 } } }, - "Count": 9, + "Count": 8, "DefaultSize": 24.0 }, "Cols": { @@ -255,7 +255,7 @@ "Values": { "1,1": "项目概况-关键数据", "3,1": "项目成员统计", - "5,1": "项目甘特图" + "6,1": "项目甘特图" }, "AttachInfos": { "1,1": { @@ -332,13 +332,7 @@ "PageName": "项目成员统计" } }, - "5,1": { - "CellType": { - "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", - "PageName": "项目甘特图" - } - }, - "7,1": { + "4,1": { "CellType": { "$type": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType", "EChartTitle": "Echarts图表", @@ -348,34 +342,60 @@ "Name": "report", "BindingTableOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "View_任务工时统计", + "TableName": "任务工时表", "BindingInfos": [ { - "GUID": "bd626c2c-372e-424d-b89f-d7c23db034a0", + "GUID": "df33b2b4-44bc-4e19-b4a7-70b606e9a7e2", "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "a535f340-480b-43a0-a4a0-b45282bafe66" + "TableName": "任务工时表", + "ColumnName": "FGC_CreateDate", + "GUID": "f15caada-0eb9-46b3-8977-eb1ba59afee0" }, "ColumnName": "日期" }, { - "GUID": "b4232ed4-0fa3-4c42-ae3b-25834be77210", + "GUID": "895cd2ec-16b8-4f51-b109-144638c37bdc", "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "总上报工时", - "GUID": "fade0ace-a7b0-4c26-ae08-fd114f240264" + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "f743346b-9d46-4fd1-ac9d-3afd84f0df20" }, "ColumnName": "工时" } ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 1, + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "FGC_CreateDate", + "GUID": "ff1ec5e7-5922-4965-92e6-c91711b1760a" + }, + "Value": "%Null%" + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 2, + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "工时", + "GUID": "a15fb509-d69f-4ece-9402-02f534eec4b5" + }, + "Value": "0" + } + ] + }, + "NullFormulaValueQueryPolicy": 1, "OrderBySqlCondition": { "OrderByColumns": [ { "ColumnBindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "be6e1dd5-8f49-436b-9ffe-ec759bab6582" + "TableName": "任务工时表", + "ColumnName": "FGC_CreateDate", + "GUID": "a470ef38-019e-4ee7-923e-38213fb0c18c" }, "Order": 0 } @@ -387,7 +407,13 @@ ], "JSONDataSources": [], "ImageDataSource": [], - "Config": "{\"option\":\"\\nconst{\\n \\\"日期\\\":xAxisData,\\n \\\"工时\\\":yAxisData\\n} = ForguncyEchartsHelper.splitDataSource(Context.report);\\n\\noption = {\\n xAxis: {\\n type: 'time',\\n data: xAxisData,\\n axisLabel:{\\n formatter:\\\"{yyyy}-{MM}-{dd}\\\"\\n }\\n },\\n yAxis: {\\n type: 'value'\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n lineStyle:{\\n color: '#5470C6',\\n width: 5\\n }\\n }\\n ],\\n \\\"title\\\": {\\n \\\"left\\\": \\\"center\\\",\\n \\\"text\\\": \\\"报工趋势表\\\"\\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 const { \\\"日期\\\": xAxisData, \\\"工时\\\": yAxisData } = ForguncyEchartsHelper.splitDataSource(Context.report);\\noption = {\\n xAxis: {\\n type: 'time',\\n data: xAxisData,\\n axisLabel: {\\n formatter: \\\"{yyyy}-{MM}-{dd}\\\"\\n }\\n },\\n yAxis: {\\n type: 'value'\\n },\\n series: [\\n {\\n data: yAxisData,\\n type: 'line',\\n smooth: true,\\n lineStyle: {\\n color: '#5470C6',\\n width: 5\\n }\\n }\\n ],\\n \\\"title\\\": {\\n \\\"left\\\": \\\"center\\\",\\n \\\"text\\\": \\\"报工趋势表\\\"\\n }\\n};\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" + "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 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,PublicResource})=>{\\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 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 \"}" + } + }, + "6,1": { + "CellType": { + "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", + "PageName": "项目甘特图" } } }, @@ -404,15 +430,15 @@ "FontFamily": 1, "HorizontalAlignment": 2 }, + { + "FontFamily": 1 + }, { "FontFamily": 1, "FontSize": 13.333333333333332, "Foreground": 3, "HorizontalAlignment": 2 }, - { - "FontFamily": 1 - }, { "FontSize": 13.333333333333332 } @@ -435,81 +461,110 @@ "2,32": 1, "3,1": 2, "3,32": 1, + "4,1": 3, + "4,2": 3, + "4,3": 3, + "4,4": 3, + "4,5": 3, + "4,6": 3, + "4,7": 3, + "4,8": 3, + "4,9": 3, + "4,10": 3, + "4,11": 3, + "4,12": 3, + "4,13": 3, + "4,14": 3, + "4,15": 3, + "4,16": 3, + "4,17": 3, + "4,18": 3, + "4,19": 3, + "4,20": 3, + "4,21": 3, + "4,22": 3, + "4,23": 3, + "4,24": 3, + "4,25": 3, + "4,26": 3, + "4,27": 3, + "4,28": 3, + "4,29": 3, + "4,30": 3, "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,1": 4, + "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,32": 1, - "7,32": 1, - "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": 5, - "8,33": 5, - "8,34": 5, - "8,35": 5, - "8,36": 5, - "8,37": 5, - "8,38": 5, - "8,39": 5, - "8,40": 5, - "8,41": 5, - "8,42": 5 + "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,32": 5, + "7,33": 5, + "7,34": 5, + "7,35": 5, + "7,36": 5, + "7,37": 5, + "7,38": 5, + "7,39": 5, + "7,40": 5, + "7,41": 5, + "7,42": 5 }, "SheetStyle": { "FontFamily": 1 @@ -518,9 +573,9 @@ "Spans": [ "3,1,1,30", "1,1,1,30", - "1,32,7,11", - "5,1,1,30", - "7,1,1,30" + "1,32,6,11", + "6,1,1,30", + "4,1,1,30" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -574,7 +629,7 @@ "CustomNames": [ { "Name": "工时走势", - "Formula": "项目概况!$B$8" + "Formula": "项目概况!$B$5" }, { "Name": "关键数据", @@ -589,4 +644,4 @@ "Formula": "项目概况!$AG$2" } ] -}//ZAAs29kBASOoC6QuwZTTDU08fQDLKUJoAKVofLjezDmPArdIm3zisH/50khQq3SiNli4EGVgrkd/iWFz5GTPb9q2yRDGAArdBrhOHmBsHwFTN+vX8DIQwRahKnTWP6n2d80yiXat6MPgbDQdKOjAkST1wA9MfsoblhOYdBctFK8DQrEzyed/exRMV6VMPk9WNuKRkWfuJZrkfmXNadpi7edKW0tbn3cosPOKHdjVR1GLAz3ZS0eA4SWJ1HA6WADUlu9VTXABYVTxuFbK4IFnwJPLFWyZadRsQE7WOy5suyIcL28sMUTmF7pHFgrEzvUJ515Sp9JTK/Z1nYK8AIvp8VJfS+uJJHX1jpZocJUpEKhxP0ad7XbN7rYOshhGJw4xXyGQPxeV9h+DwDj0aeqVoWp8zDCgfZpXjhdfitC88sbXL1oJSGWIC0Sdf1ufcN5YBdovmQXjIoAIukUz9IT48xEh9K4p67wzQyhHMsPUt0IyNitC4LqQihWpOsBdkkDLpuBrXcLWe8o5/sBW4q0eLjvfoaSVKm6T3GGFrXKAJznqf2MxWvHvVfba/PaQbRO7rDqCWs2VIIqVqxIoXca9gWGgoSSojqRH1ymJ9M++TRVS22zFF2Av7gUT+oeo1U2yS6IUmb2w8z6gtTrXM6gg4uM48fmB3hd5n3xi5qlEgSqC11EwDnsHX2rcP4wpccfMgFA3Aq1FTLkIHTrFQrtZ4k1/kcWRWvhbUvOz7XhMVwdHennexxUp4GY+zbLPQsaXWyD0kW0oShy6NGDBJrqirqYlMQ02xD6MlIdc93bSiAYXTL6FRjjrtMwyEJN6ilBo0nwDU6mv3Npq24w+YURvEK5yV6KLIc6ZRj7dUd5poxgiQrGanYzWS2w5zOfqB+fQ758B/0kx0OAEmg7Ob4eNXg==|920 \ No newline at end of file +}//dLqf5ijt7kj8mn1O9IwFIAMzTEzVE+tjjGkGagW+Upl6sR6NCR4gGnSHKRO5zy+OGoemMCZ108EiomBZdC6DNvQGs3iDNelCFQsaqV+nDqnk8dGFHe2tcNf3u4P9XtfnZteyrhp1aap87iNgTQWnKqBA4aoPV68MZXo3KIV5ta2ZdLwt5Oa8NAq6m77jbBI5bKbWGmMaLW8pZ6iOXnc8ePE70khrAEUnRP6CjUwP3OrUZv2kehUDLOdUwhTl+RjU/+Ur9Q7hFGFOytzJNPbSbZhMWMc6CIQoUuY5NNEAJehT2py19HxNTY+2bBAUFaPe2SYGxVGoD354Sftd8DkO24ZxvXqGdNqszNOLeNeFcxGDT0uEJEsILqQWPfJHtiDfZ+sMflvX8Xy+23SFWKOUGD2v+BNEh+WKdOHCvj5lb9a3ltW6U5vS/WaZq9eBoypzdvyPtgvacX1145IeHfScczeTpCICI2A2np8gaEZ1efBw8xhAhoPPoifpIgmwtOm8gL7orVOApR9btTa3ry3lmcvRw46Z84DLbbeD5VqM8EQ5nfKX+7BFFwsB1IZ2Isui3oJTo9CwYfPAjdKZQnDwfPWkXjQzFN7niveGiQcLz9w9io3cwZBkHWU15sf6EYdV3j2sYN57vXt6leVE2ax21f0c4QCwJsqQhp8QcgmM4AszFkrCHigtDXpc98XpQ3hYeYRW5Aq6FxmJ79W2I7PQ0xP3SyKRzBlYSngHb2Sq9efa77t09kjBJ19t/eEG8NVVLf1S5MksF7aq+DzhdHreC7F5HmjpWn9B052F34tQwkgYp9xN8hB8Xe24Zos9LvtPOxxxkF1XfimU7eBTouC9fGjgtPMH1JgtSKpx63bBID+G21bfYkH90wj3Qn+H44sytoJT68yX7oXkBKR7u+VgOA==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd index 0526b78c..a2dabc11 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd +++ b/Pages/项目/项目首页/项目首页-容器页面/项目概况.rd @@ -1,11 +1,11 @@ { "PageType": 0, "ColumnCount": 44, - "RowCount": 9, + "RowCount": 8, "CustomNames": [ { "Name": "工时走势", - "Formula": "项目概况!$B$8" + "Formula": "项目概况!$B$5" }, { "Name": "关键数据",