diff --git a/.collaboration b/.collaboration index 322e7b2c..bfca2619 100644 --- a/.collaboration +++ b/.collaboration @@ -1182,45 +1182,7 @@ }, { "ModuleName": "PCPage/开发测试", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T17:12:07.3553992+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\系统\\开发测试.json", - "Pages\\系统\\开发测试.rd" - ] - }, - { - "ModuleName": "PCPage/任务工时统计", - "State": 2, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T17:18:15.3323533+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\统计\\任务工时统计.json", - "Pages\\统计\\任务工时统计.rd" - ] - }, - { - "ModuleName": "PCPage/人员工时统计", - "State": 2, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T17:18:23.7709048+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\统计\\人员工时统计.json", - "Pages\\统计\\人员工时统计.rd" - ] + "ModuleType": 1 }, { "ModuleName": "MasterPages/流程母版页面文件夹", @@ -1690,20 +1652,6 @@ "ModuleName": "TaskScheduler/每日根据报工自动生成工作日报", "ModuleType": 16 }, - { - "ModuleName": "RdlReport/工时报表", - "State": 2, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T17:21:46.5121403+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\工时报表.json", - "Reports\\工时报表.rdlx" - ] - }, { "ModuleName": "ProcessItem/项目立项流程", "ModuleType": 28 @@ -2282,50 +2230,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T18:26:27.996768+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin1.zip", - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0(1).zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAIFORGUNCY.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\ReadLogs.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0(1).zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_5_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\超哥富文本增强工具包-9_0_103_0(1).zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2535,33 +2440,9 @@ "ModuleName": "ServerCommand/服务端命令4", "ModuleType": 15 }, - { - "ModuleName": "PCPage/项目工时统计", - "State": 2, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T17:18:03.9080554+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\统计\\项目工时统计.json", - "Pages\\统计\\项目工时统计.rd" - ] - }, { "ModuleName": "PCPage/统计首页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T17:21:46.5123293+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\统计\\统计首页.json", - "Pages\\统计\\统计首页.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/统计", @@ -2577,42 +2458,18 @@ }, { "ModuleName": "PCPage/项目工时统计(backup)", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T17:18:03.9080827+08:00", "ModuleType": 1 }, { "ModuleName": "PCPage/任务工时统计(backup)", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T17:18:15.3323713+08:00", "ModuleType": 1 }, { "ModuleName": "PCPage/人员工时统计(backup)", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T17:18:23.7709235+08:00", "ModuleType": 1 }, { "ModuleName": "RdlReport/人员工时报表", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-10-16T17:21:46.512142+08:00", "ModuleType": 18 } ] \ No newline at end of file diff --git a/Pages/系统/开发测试.json b/Pages/系统/开发测试.json index 78420030..dce038e9 100644 --- a/Pages/系统/开发测试.json +++ b/Pages/系统/开发测试.json @@ -36,6 +36,11 @@ "DesignLengthInPixel": 32.0 } }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 19.0 + } + }, "8": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -101,20 +106,15 @@ "DesignLengthInPixel": 32.0 } }, - "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 19.0 - } - }, "21": { "GridRowColumnDefinition": { "DesignLengthInPixel": 44.0 } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } } }, "Count": 23, @@ -776,6 +776,7 @@ "type": "Default", "tagType": "info", "imgType": "cover", + "showOverflowTooltip": false, "key": "665d2e7d-fd13-48bd-a468-f83001c67249", "UIPermissions": [ { @@ -791,6 +792,7 @@ "dataColumnName": "创建时间", "sortable": true, "label": "创建时间", + "formatStr": "yyyy/MM/dd hh:mm:ss", "align": "center", "headerAlign": "center", "colfixed": "false", @@ -821,6 +823,7 @@ "tagType": "info", "imgType": "cover", "filter": true, + "showOverflowTooltip": false, "key": "4e4da726-f6e8-4f25-a72b-6faaf47cb6f7", "UIPermissions": [ { @@ -841,6 +844,7 @@ "type": "Default", "tagType": "info", "imgType": "cover", + "showOverflowTooltip": false, "key": "6cf729b8-310a-4cd6-b63a-8cb81d9d6a8e", "UIPermissions": [ { @@ -1131,4 +1135,4 @@ "PaperSize": {}, "Margin": {} } -}//p6L+nvLGE/YVigMuwvu23Dlc31u75e69H/wWLK+1FZ0ukRB8JQ/CEExgPjuqzt+41VsAt4L7NR/AhB2cSEqJhAESpiGPwOnHe3Bo1oIwETGiqZWpww6Y0z3zDNh5Nd5NKGmyAKLWFo0J0nLkYX15qK025FwfwrODqNEh9V7uhmFYKzyumIEAuXyHK6xi6iDoPuoL0Tp1Dmqu+/XVPZ2K6Snyzu1zUy37uQDba1rJkD5qDJf+Tskdaesp2Hq5G5xTp3xOu7/ZGIuucMsHB6fZaNc1EktMd/bEbn3TioQcad/KXqcH7vP4G8ef5fAef8dfDL2IKv6wNlEyc1CzrEmQeNm1Yn7aaAuab8Kx4RhITVhe295x3lqTuvHouR8NnSpRTg9Tez6nYfsJZxM6gmIPBokUK8IEmuSvXWii9L8TFAJHjSy9gpFpIb96uYSp232R3HWcoxz4hDYFMI2HiUqOr/B5Hrkj5n77m7heM0G6jmu2fSaYK9KYJy4Cd+hs6AGAs8RNSWmLJryfDvsMXED/u6N9Ee1rtNLX/fdZqXGr+9c/EaH6mD/oOlTNvGvj6mIDJcUJaPfGnDcTBGOL4FIphJVVbKlmdPtJmZxoomgeB7hh8Mo159s/6Yp01VVmqUMZ66sH5zb6z7Cc8z/4jKnecrw+bCN8tpCLmNw6g2/eQFhRD+KT3N4oTE4Gst8WSVR6+wghVRmON82B9xo+q+42Ap5wKEw0jd0bxlEFD8+UtIvOUyXRA6IWYuZNNUxbXvRUlNXh4y4HYuKt/zdpHkeepIgCoYxaP/KaOvNr4y2mioFL4FlTT56sx8MNKwAoXq/CumvHYjBFWA0iQ4C2RpzkICrHyiXTAUapajE8gpjZTg6mK/CKkEmN3s5WP8omA0AHfVQnQTXEiDoCN/Vxz9cx5w==|920 \ No newline at end of file +}//dRZ6JRSPjwniaGjFeXKOtQXYPQAlrWMfGmi9nqK9CT4FDfRTYswvO7pLN6W/2fyscq8PbQA9+myRVZuFEz1s0lyQ1edkUzCow5KrohoTGT1Anhe9S66Aq1W7JGYWCmMTV8elUvektO+YBRPex/sZh+7xP+EJmMNU5kNsdiyKXPfd2uLZkVXz9XiDxrRIbH+uYi0x7umnTm0B5ZDC8sS6ybV2hHVGQnT4gPxDxmXf07qqIeXtRlkHdEmdbqtCuOutw4OLvb4bD9+hjXwOe0WcpZL3nJW2BhpzjxqCiTmJjuW/GCK4td+ckk1xlbuLgq78yIbwEeTWJ5gtchVnDDNrfzipp4Q3j1ROZv75cPkZmwll9/cD5BOy0FD2bwcsJo3jEhrxEAsfX9jF5kIOLxD2O42vgMEqKp+ab8dHbneoAPhL52FgouNrPw3OCmUDHO6uReYtyNQ6bx6y1IkU63sWzkysmD0KlFsxVXtdHlKxPCW8ARoR+EWMsT3LcMvSCiDSyLGj+6l+wqETelytvWPSm19w846IOHAgZUXc20IOOFx+DvhwroLQ2KJP0qKr3vgqNhsfw5vuUsPHlMDeqCfHg7eABLB/juq/9AyiDQ2CJLwdUCoFCMZmsFmcxMRpVU6gLCHbV9ptRgp+FhRI0uq4XlmnERfkXymLdBUWofWmOQmktPNBLBKMXMCUGfQCJcwEH4pvVBl3t8Tmoiu85u2kAvnimFvl6ZxnmXmV09mQf4j9MLZP9o4AyIx7mBRY6QtYbGGUJCFNKXDvip9YFjvCFMDLLPpV8BD9LY8+Q2I6NB6WPvUIT/R/Y8CjJ+Pns3TGlgpiElJ//mCZqVe0RHEZqqcNxrDGltKYFGgfs7/o/O6OY1ZcRJ70LppWfgiaIYDEpg6zfE+1/dZa6dVP5KyIyw==|920 \ No newline at end of file diff --git a/Pages/统计/人员工时统计.json b/Pages/统计/人员工时统计(backup).json similarity index 89% rename from Pages/统计/人员工时统计.json rename to Pages/统计/人员工时统计(backup).json index d88f8eb0..b8a4f372 100644 --- a/Pages/统计/人员工时统计.json +++ b/Pages/统计/人员工时统计(backup).json @@ -403,16 +403,16 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!Z2" + "SerializeProperty": "='人员工时统计(backup)'!Z2" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", "RetrunParamNames": { "StartValue": { - "SerializeProperty": "=人员工时统计!开始日期" + "SerializeProperty": "='人员工时统计(backup)'!开始日期" }, "EndValue": { - "SerializeProperty": "=人员工时统计!结束日期" + "SerializeProperty": "='人员工时统计(backup)'!结束日期" } } } @@ -462,7 +462,7 @@ "ListViewName": "工时记录导出", "NewOtherName": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT(人员工时统计!开始日期,\"yyyymmdd\")&\"-\"&TEXT(人员工时统计!结束日期,\"yyyymmdd\")&\"人员工时信息导出\"" + "SerializeProperty": "=TEXT('人员工时统计(backup)'!开始日期,\"yyyymmdd\")&\"-\"&TEXT('人员工时统计(backup)'!结束日期,\"yyyymmdd\")&\"人员工时信息导出\"" } } ], @@ -488,7 +488,7 @@ "DisplayName": "执行人", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!B19" + "SerializeProperty": "='人员工时统计(backup)'!B19" }, "BackgroundValue": {} }, @@ -497,14 +497,14 @@ "DisplayName": "工时日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!D19" + "SerializeProperty": "='人员工时统计(backup)'!D19" }, "Format": "yyyy\"年\"m\"月\"d\"日\"", "BackgroundValue": { "DatabaseColumnName": "工时日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!D19" + "SerializeProperty": "='人员工时统计(backup)'!D19" } } }, @@ -513,7 +513,7 @@ "DisplayName": "项目名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!F19" + "SerializeProperty": "='人员工时统计(backup)'!F19" }, "BackgroundValue": {} }, @@ -522,7 +522,7 @@ "DisplayName": "版本", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!J19" + "SerializeProperty": "='人员工时统计(backup)'!J19" }, "BackgroundValue": {} }, @@ -531,7 +531,7 @@ "DisplayName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!H19" + "SerializeProperty": "='人员工时统计(backup)'!H19" }, "BackgroundValue": {} }, @@ -540,7 +540,7 @@ "DisplayName": "执行内容", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!M19" + "SerializeProperty": "='人员工时统计(backup)'!M19" }, "BackgroundValue": {} } @@ -551,7 +551,7 @@ "DisplayName": "上报工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!R19" + "SerializeProperty": "='人员工时统计(backup)'!R19" }, "Aggregator": 0, "TotalAggregator": 0 @@ -561,7 +561,7 @@ "DisplayName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!O19" + "SerializeProperty": "='人员工时统计(backup)'!O19" }, "Aggregator": 0, "TotalAggregator": 0, @@ -573,56 +573,56 @@ "DatabaseColumnName": "执行人", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!B19" + "SerializeProperty": "='人员工时统计(backup)'!B19" } }, { "DatabaseColumnName": "工时日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!D19" + "SerializeProperty": "='人员工时统计(backup)'!D19" } }, { "DatabaseColumnName": "项目名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!F19" + "SerializeProperty": "='人员工时统计(backup)'!F19" } }, { "DatabaseColumnName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!H19" + "SerializeProperty": "='人员工时统计(backup)'!H19" } }, { "DatabaseColumnName": "版本", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!J19" + "SerializeProperty": "='人员工时统计(backup)'!J19" } }, { "DatabaseColumnName": "执行内容", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!M19" + "SerializeProperty": "='人员工时统计(backup)'!M19" } }, { "DatabaseColumnName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!O19" + "SerializeProperty": "='人员工时统计(backup)'!O19" } }, { "DatabaseColumnName": "上报工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!R19" + "SerializeProperty": "='人员工时统计(backup)'!R19" } } ], @@ -663,7 +663,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!D2" + "SerializeProperty": "='人员工时统计(backup)'!D2" } }, { @@ -676,7 +676,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!成员" + "SerializeProperty": "='人员工时统计(backup)'!成员" } }, { @@ -689,7 +689,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!开始日期" + "SerializeProperty": "='人员工时统计(backup)'!开始日期" } }, { @@ -702,7 +702,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=人员工时统计!结束日期" + "SerializeProperty": "='人员工时统计(backup)'!结束日期" } }, { @@ -1004,15 +1004,15 @@ "1,3,1,8", "18,12,1,2", "18,14,1,3", + "18,9,1,3", + "18,17,1,4", "17,1,1,2", "17,3,1,2", "17,5,1,2", "17,7,1,2", + "17,9,1,3", "17,12,1,2", "17,14,1,3", - "18,9,1,3", - "17,9,1,3", - "18,17,1,4", "17,17,1,4" ], "PageInfo": { @@ -1042,15 +1042,15 @@ "CustomNames": [ { "Name": "成员", - "Formula": "人员工时统计!$O$2" + "Formula": "'人员工时统计(backup)'!$O$2" }, { "Name": "开始日期", - "Formula": "人员工时统计!$B$22" + "Formula": "'人员工时统计(backup)'!$B$22" }, { "Name": "结束日期", - "Formula": "人员工时统计!$E$22" + "Formula": "'人员工时统计(backup)'!$E$22" } ] -}//gg7dkARCcpORycI3Q2Ei0FonAR0SQOCsbQVkvWAgzbNgK+crH/wxVI0dXlHN2I88Ddl7/bkItpQxvCQxTzMIlbWEYeStdA0IF4oPJPsQQZoD6oEBkFR/DBOvdRLYQJVmDjDv50jWW5vLY8L+6Scfv8eSInrkpIqZV4PVyWfhozYzDnerpbGq+XktS1mL3YaYKizH/swJi+EaPgxb7lAXQZVJYEGBVg6JcApHtKFUyF0yMbzpah9ytBbGjZJKvRXVj8+ozttSfP+AieIS9N1AuRFWHloOVe1k04Ge6Xzj0z1vMn3cliJH2IhfxGceRAntsGW/gdxdsDzgX+/EpWDxrGMmVlkj3XFQm1DLibIXMOZ20tTD/SEJSnAClZ26tW1zhZNgpe6aYusnS/WgETJnujPXUUMhou24rzFnstgijZ0cNGog68EOmMbi43nQg3OIYN0bqGqkd0L7jny+K94jAU6gJ8VlBE+nazfYVJ7one4TKOhYHYf5UypRRVb0MfVvflUL3TWV7a0/fcu/RUf/3aaN99b0mpvxtFFJRO4LqtKFqU1s3E6gRkemWz0JJaqYhvxbrYj2ab7uoVpT54YY3AEVExz+7PS/ZkbQmTYA8SffGb1Ta0OvzX1j4q1ik0BoGXPAXGVxMpzH4ndiA8nqVzI44ylAKN2pOct+23Ns3vQFp5OZXY2aLg/7bh4Qz8/S96nJaamftAAfg9FgaNnFlI1KNUC46mbNNLNIiSmBvBNNPUxET9pOIXZvy+xlQkk2Zo3GZE59BVKaL6Bj1wWMfwYe4T8Wj/+1/9pypManX04UWy8jAdk3k1cIDOdeNQhirwrwQtOg0W/ue2RZKtyLedpUdt3VM5nmBqsXrV432rxU3KO58Wy5owjpNPK5Xvx0TuqPIggzi0f/IO2IWkPoNQ==|920 \ No newline at end of file +}//uW1lM4hvm1Mbf4TywXajienaurvlvXiq99oHWfxqAJAHi/yfIkDb57u+BO/QXnDR4a/+Sdwz8jaMbRaLDkqhsIHzvWvQAFO2dGpS1RlX/ilaCrep7kRe2NuhDnofTwX07v4U28NaanoiJWX4rvhgo1+bAOyicz/qHWvOQoiOVa4qW5gyFvq8gBl26rob4Li8UWVjfk0ksPGZsiI2x9eu2YKkiGgwKy7OByZSv9AdZWCzBvUa79NLHUK+DTgBX7KtHwaiRLxnnE5GWUPMHknkSmbd9+j8OM5fxW21to57r3isydKLw9pVXwQy8Q74O4rXR6vTY3mIrNhNe+ITCvSsm3oJry5Y1cQwlY+rswKBfHdZgFVteqK4tvxrufC35CcCPG0zuC70qkZomvxGJoP8f53Ftel7zIXa9TdnY7rJ9toKJN8yRfGOWw6S6ABUcY0n9rIxuhpAkghrIP28VRNtw8mZcrzQp2vPmKNlwSPOLp5KEJeh2t4VSeoc/wjQtW+Hcxg0BjwasNTw8AI7zk74FZNdQxXnucO8A78jfwsQ8mpKodgywK12XQTJynjGurESngPmoAbvLBRXEYcTMZD+2Hh4sc91EGuebk56oc3F0jCU2yJQhVzySalIRKUQ/zBEDFrDjfFkGtOl0FXGszx1Fp3bjrZGzzz58u+3IfYvraH4xV4LXneWK3v+NOzM2YmcgdgWzuBuVA7yO+MSrL0chC83QquqUj49+r+aYf3p1Kc6NRuH37SGBkZ6b0NCOGduCTQT5qPGKtpGp3hpet1U+0BEIaKIRUzRTA99i6tb6B5080jQSO/XV7H7jB7ubsKI65oFHUt6fYML6CCQKMH0tTaWL4FgdA7N7rFEXwH+xMlXGdWc7XRlrl2Qh+Ng4kCtyBdMd+XRRq0slPRfxvnaug==|920 \ No newline at end of file diff --git a/Pages/统计/人员工时统计.rd b/Pages/统计/人员工时统计(backup).rd similarity index 55% rename from Pages/统计/人员工时统计.rd rename to Pages/统计/人员工时统计(backup).rd index 3d40e36d..b0d1c7aa 100644 --- a/Pages/统计/人员工时统计.rd +++ b/Pages/统计/人员工时统计(backup).rd @@ -5,15 +5,15 @@ "CustomNames": [ { "Name": "成员", - "Formula": "人员工时统计!$O$2" + "Formula": "'人员工时统计(backup)'!$O$2" }, { "Name": "开始日期", - "Formula": "人员工时统计!$B$22" + "Formula": "'人员工时统计(backup)'!$B$22" }, { "Name": "结束日期", - "Formula": "人员工时统计!$E$22" + "Formula": "'人员工时统计(backup)'!$E$22" } ] } \ No newline at end of file diff --git a/Pages/统计/任务工时统计.json b/Pages/统计/任务工时统计(backup).json similarity index 92% rename from Pages/统计/任务工时统计.json rename to Pages/统计/任务工时统计(backup).json index 263d07a4..86c2f089 100644 --- a/Pages/统计/任务工时统计.json +++ b/Pages/统计/任务工时统计(backup).json @@ -446,16 +446,16 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!AB2" + "SerializeProperty": "='任务工时统计(backup)'!AB2" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", "RetrunParamNames": { "StartValue": { - "SerializeProperty": "=任务工时统计!开始日期" + "SerializeProperty": "='任务工时统计(backup)'!开始日期" }, "EndValue": { - "SerializeProperty": "=任务工时统计!结束日期" + "SerializeProperty": "='任务工时统计(backup)'!结束日期" } } } @@ -501,7 +501,7 @@ "ListViewName": "表格1", "NewOtherName": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=TEXT(任务工时统计!开始日期,\"yyyy-mm-dd\")&\"~\"&TEXT(任务工时统计!结束日期,\"yyyy-mm-dd\")&\"任务工时记录导出\"" + "SerializeProperty": "=TEXT('任务工时统计(backup)'!开始日期,\"yyyy-mm-dd\")&\"~\"&TEXT('任务工时统计(backup)'!结束日期,\"yyyy-mm-dd\")&\"任务工时记录导出\"" } } ], @@ -537,7 +537,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!D2" + "SerializeProperty": "='任务工时统计(backup)'!D2" } }, { @@ -550,7 +550,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!P2" + "SerializeProperty": "='任务工时统计(backup)'!P2" } }, { @@ -563,7 +563,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!开始日期" + "SerializeProperty": "='任务工时统计(backup)'!开始日期" } }, { @@ -576,7 +576,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=任务工时统计!结束日期" + "SerializeProperty": "='任务工时统计(backup)'!结束日期" } } ] @@ -872,11 +872,11 @@ "CustomNames": [ { "Name": "开始日期", - "Formula": "任务工时统计!$B$18" + "Formula": "'任务工时统计(backup)'!$B$18" }, { "Name": "结束日期", - "Formula": "任务工时统计!$E$18" + "Formula": "'任务工时统计(backup)'!$E$18" } ] -}//wd7hlqf3yoQVEChHo+BSR12lihjkBTaMKSMH6vcgLh1wzUgjwWN0gkeEkGs7xRJP7smhEqNBCWG2kjxSp1aepXgDGSO2ADkjnrshr04d1L5wBD51ze/V579UnnXeQmsvDTT1U4gZ9lST9g8zfX8ckiz+QZJcBl1CBHif5T7ZS01UgRVEHM7K8uaAT8izyb0LazBy/ORJ4jdOFd1Tm+w00hiYd59z2GiHcx+0PoT2Wo7IuA23c6fekWH5HRF/BgjC8Otq7zwpRUCkgnz7NPaFHf9RPaynbKm+Qx30daBwanHYcMWaI3PI/mn1hEHxZ4hZZ20vSPytPn/ygM949ri11yvQquY6XwO18ipz0+Kr0sYQIdK7Cy5vLABjc2el5NtsbCazbPzSBi8dLKgGf/DJDc1526rJ+n04s42L0lPLsBgEyUwVJCaXtgMc/pHaB81X7LmpDAoChzo1odqpr+V3reRBLHenmqQDYhty1owx8bF6HV5fogsnIV9oh/GPT22vRG1JhNEynExMIzIDTUUUGCfRltOzBo3OAp6PsIu+bsv6WblgLmTzHeyRitZWg9TVVo5z5cCVgl9uG/PrG3fh8CDuUXBuF6gV3kOnY8JZ9XjveqIHKeNtEMrJWDGorAHjPBzF1RFKO5kVwstkiqf36BbRbacNEJdDPn2IAvki9b9xWHgzrW7udBMmDnHGmrZMlWONnnlVEVtfHU6BZ4JpBXbaCoynbveUYWTDPiGHCC66CBVFoC4rBlQO0GHPyuPeqkZD8rYb0kr715FyXbOor8Zoecz5wRL3pgV6Y1Ur6qxuu8FtfWIjPW5qDE7jZrNffLRmthAs8QbHmEmByo6fABoFKDiPQMDPD7Gl9+QV0Et8lJgEU2o1Sx8xrPmhJhooFGxERzPJWLukxgHw+fjzyw==|920 \ No newline at end of file +}//3AdMZi7pWY+5tnbrnC969JwpkbKNbeVw2E7aOy0ej0Krzc9kKjWQYtbQ8wtrCwg4D5UKs3ANSBFjHecin5ePlr1gv6lBLDRPjbUBoAQFd43d76sJ8i7r0Q+K40rx3XjTZQQ0bsi4EzjAl2L7wV6XPd5cDuizo2/7BI2EbgMCAplno/h4QCPn9921FDxTvgohm39p9Epb316RgX3+xxvSTNv2Br+YHyyLUEyyi1uMauaiyvGuDFtMcI2MP8XW7jX5amUWnpYsxNaLWWuv6/NfQXNXcLhuk5JcgSN42/6E3EGUkbZi/mKdq5Y2uwWSN4jwTBkbQLYBBDIMKuIDbASTPs0xqFP4udOA9h7X4UC6WA8KzT4iA3Gh3CNuj3G/g6AiXAop9o3PsgqB+crTrYtzordHVOUmxc+H4r2kE99So5LtnZvzurnEcoR/wScTo7a6seitFgeEh+8fU2vTaRhsPRCbuEeCHisgGmQt510ilIVrJxxjFkwXMZLBTBi2j7nr8QMLKk+eZog6RDMUWc0gm/gzUW2lDyKl/iPjRqtIA2n/ApI78pW7zU68RU85+KR/ikC/VnqKzVyPFKqCRpFhql6Is1W/PS/OtLBK0lOsar88smWDqcecCwQOWul+IgKVF1geHDufynJpoKnh0DplGEOfEj8Ddp/zKElBCAuupv4p0JMia0fZGWuMCplPjBHUhnhd81G9Nw7blTIfl08G60EjwHIRPpxJflRNtK0lQGy1cDe4Mo3jGCaDmPbek0R42HWvZb+po93AVWRwBE+Ju5Nj8bakwGC6sV2cP7Ood/iDUZrj7GRndfZQB2ai0iCnLUomhZJ4bdRX0D0hhcrb9nn/5AOgZOKg6OX4I4Re4+rk669RF1Wey0008efq4y1E62z7X0GzLKH2tLMcVAF63g==|920 \ No newline at end of file diff --git a/Pages/统计/任务工时统计.rd b/Pages/统计/任务工时统计(backup).rd similarity index 60% rename from Pages/统计/任务工时统计.rd rename to Pages/统计/任务工时统计(backup).rd index 60570bfc..edfbd6c4 100644 --- a/Pages/统计/任务工时统计.rd +++ b/Pages/统计/任务工时统计(backup).rd @@ -5,11 +5,11 @@ "CustomNames": [ { "Name": "开始日期", - "Formula": "任务工时统计!$B$18" + "Formula": "'任务工时统计(backup)'!$B$18" }, { "Name": "结束日期", - "Formula": "任务工时统计!$E$18" + "Formula": "'任务工时统计(backup)'!$E$18" } ] } \ No newline at end of file diff --git a/Pages/统计/统计首页.json b/Pages/统计/统计首页.json index 30d7ddb5..5bfe7e9a 100644 --- a/Pages/统计/统计首页.json +++ b/Pages/统计/统计首页.json @@ -3,7 +3,7 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 + "DesignLengthInPixel": 16.0 } }, "1": { @@ -13,17 +13,12 @@ }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 10.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "5": { @@ -52,6 +47,16 @@ } }, "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -63,122 +68,6 @@ } } }, - "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 - } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - } - }, - "Count": 21, - "DefaultSize": 32.0 - }, - "Cols": { - "RowColumnAttachedInfos": { - "0": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 24.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "13": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -221,14 +110,121 @@ }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "InLogicalVisibleIndexes": [ + 23 + ], + "Count": 24, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 16.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.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 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } }, "22": { @@ -256,11 +252,6 @@ "DesignLengthInPixel": 32.0 } }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "28": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -310,17 +301,29 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } } }, - "Count": 38, + "Count": 43, "DefaultSize": 32.0 }, "Values": { - "1,7": "%PageTitle%", - "3,7": "项目工时统计" - }, - "Formulas": { - "1,7": "H4" + "1,7": "项目", + "1,18": "成员", + "1,39": "打开报表", + "3,7": "版本", + "3,18": "日期" }, "AttachInfos": { "0,0": { @@ -342,27 +345,54 @@ } ] }, - "value": "0", - "compareType": 1 + "value": "人员工时报表" }, "CommandList": [ { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "$type": "Forguncy.Model.OpenActiveReportCommand, ServerDesignerCommon", + "SessionGuid": "9d79fc94-b1fd-4ede-86ed-8516a9bc44a5", + "OpenReportName": "人员工时报表", + "PassParameters": [ { - "TargetCells": { + "TargetParameter": "开始日期", + "SourceValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计首页!H4" - }, - "Value": { + "SerializeProperty": "=统计首页!开始日期" + } + }, + { + "TargetParameter": "结束日期", + "SourceValue": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=统计首页!值" + "SerializeProperty": "=统计首页!结束日期" + } + }, + { + "TargetParameter": "项目ID", + "SourceValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=统计首页!J2" + } + }, + { + "TargetParameter": "版本ID", + "SourceValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=统计首页!J4" + } + }, + { + "TargetParameter": "执行人数组", + "SourceValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=统计首页!U2" } } - ] + ], + "OpenReportTitle": "人员工时详情报表" } ], - "ID": "4e305498-90ab-4206-8222-6731c8a98019" + "ID": "ff99d15d-4828-4c59-867f-33b30ba2a8e9" } ] } @@ -391,22 +421,22 @@ "expend": true, "children": [ { - "value": "项目工时统计", - "label": "项目工时统计", + "value": "项目工时报表", + "label": "项目工时报表", "CanVisitRoleList": [ "FGC_LoginUser" ] }, { - "value": "任务工时统计", - "label": "任务工时统计", + "value": "任务工时报表", + "label": "任务工时报表", "CanVisitRoleList": [ "FGC_LoginUser" ] }, { - "value": "人员工时统计", - "label": "人员工时统计", + "value": "人员工时报表", + "label": "人员工时报表", "CanVisitRoleList": [ "FGC_LoginUser" ] @@ -455,11 +485,320 @@ "activeTextColor": "Accent 1" } }, - "3,7": { + "1,9": { "CellType": { - "$type": "Forguncy.ContentContainerCellType, ServerDesignerCommon", - "PageName": "项目工时统计", - "OverflowMode": 1 + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目表", + "BindingInfos": [ + { + "GUID": "c439d303-fcbe-4a63-9440-6557254ad768", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "40fb3e5f-64f4-4833-8a3c-ed331babd482" + }, + "ColumnName": "value" + }, + { + "GUID": "111f4ad2-ee50-4142-b38a-45df9ffa488e", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "48b4d0e4-6f31-4195-9adf-e37b625163dd" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "multiple": true, + "collapseTags": true, + "filterable": true, + "filterInServerOptions": { + "defaultMaxOptionsCount": 10, + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "1,20": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "2fb67ffc-ff4b-4f9f-8aff-69bb4158b375", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "7d0ea843-9812-4cd0-ac07-552430e0eb65" + }, + "ColumnName": "value" + }, + { + "GUID": "72dd4b1c-2db0-4698-b1b5-8e7eefc76991", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "75dcabd8-8331-4b5d-8ee3-495478413215" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "multiple": true, + "collapseTags": true, + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "1,39": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "打开报表", + "TemplateKey": "_RS_Main1" + } + }, + "3,9": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目版本", + "BindingInfos": [ + { + "GUID": "730228ca-6c80-4199-9151-fe154ccfc7b6", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "ID", + "GUID": "f4cfecd6-6a0a-437a-b1f5-03fb4beb4755" + }, + "ColumnName": "value" + }, + { + "GUID": "4dc108ce-fae9-4b37-ad00-5fec483e74a4", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "名称加版本号", + "GUID": "d09043bd-3df4-4d92-8ce6-2cc953574075" + }, + "ColumnName": "label" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目版本", + "ColumnName": "项目ID", + "GUID": "10e6c191-91d0-47cf-836e-f9f111b80d79" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=统计首页!H2" + } + }, + "CustomColumns": [] + }, + "placeholder": "请选择", + "noDataText": "无数据", + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "3,20": { + "CellType": { + "$type": "ElementUI.DatePickerCellType, ElementUI", + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=统计首页!U4" + }, + "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSelectedRange", + "RetrunParamNames": { + "StartValue": { + "SerializeProperty": "=统计首页!开始日期" + }, + "EndValue": { + "SerializeProperty": "=统计首页!结束日期" + } + } + } + ], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "DefaultValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=EOMONTH(TODAY(),-1)+1&\",\"&EOMONTH(TODAY(),0)" + }, + "type": "daterange", + "placeholder": "请选择", + "startPlaceholder": "开始日期", + "rangeSeparator": "至", + "endPlaceholder": "结束日期", + "format": "yyyy年MM月DD日", + "firstDayOfWeek": 1, + "clearable": true, + "DefautWeekFormat": "yyyy 第 WW 周" + } + }, + "5,7": { + "CellType": { + "$type": "TabManager.TabCellType, TabManager", + "TemplateKey": "_RS_NewFashionStyle1" } } }, @@ -470,16 +809,22 @@ }, { "FontFamily": 1, - "FontSize": 18.666666666666664 + "FontSize": 13.333333333333332 }, { - "FontFamily": 1 + "FontFamily": 1, + "FontSize": 13.333333333333332, + "Formatter": 2 + }, + { + "FontSize": 13.333333333333332 } ], "Types": { "Strs": [ "Background 2 0", - "Body" + "Body", + "[AUTO]General" ], "Borders": [ { @@ -491,11 +836,91 @@ "0,5": 0, "1,5": 0, "1,7": 1, + "1,8": 1, + "1,9": 1, + "1,18": 1, + "1,19": 1, + "1,20": 1, + "1,38": 1, "2,5": 0, + "2,7": 1, + "2,8": 1, + "2,9": 1, + "2,10": 1, + "2,11": 1, + "2,12": 1, + "2,13": 1, + "2,14": 1, + "2,15": 1, + "2,16": 1, + "2,17": 1, + "2,18": 1, + "2,19": 1, + "2,20": 1, + "2,21": 1, + "2,22": 1, + "2,23": 1, + "2,24": 1, + "2,25": 1, + "2,28": 1, + "2,29": 1, + "2,30": 1, + "2,31": 1, + "2,32": 1, + "2,33": 1, + "2,34": 1, + "2,35": 1, + "2,36": 1, + "2,37": 1, + "2,38": 1, + "2,39": 2, + "2,40": 2, + "2,41": 1, + "2,42": 1, "3,5": 0, - "3,7": 2, + "3,7": 1, + "3,8": 1, + "3,9": 1, + "3,10": 1, + "3,11": 1, + "3,12": 1, + "3,13": 1, + "3,14": 1, + "3,15": 1, + "3,16": 1, + "3,18": 2, + "3,19": 1, + "3,20": 1, + "3,21": 1, + "3,22": 1, + "3,23": 1, + "3,24": 1, + "3,25": 1, + "3,26": 1, + "3,27": 1, + "3,28": 1, + "3,29": 1, + "3,30": 1, + "3,31": 1, + "3,32": 1, + "3,33": 1, + "3,34": 1, + "3,35": 1, + "3,36": 1, + "3,37": 1, + "3,38": 1, + "3,39": 2, + "3,40": 2, + "3,41": 1, + "3,42": 1, "4,5": 0, + "4,38": 1, + "4,39": 1, + "4,40": 1, + "4,41": 1, + "4,42": 1, "5,5": 0, + "5,7": 1, "6,5": 0, "7,5": 0, "8,5": 0, @@ -510,15 +935,93 @@ "17,5": 0, "18,5": 0, "19,5": 0, - "20,5": 0 + "20,5": 0, + "21,5": 0, + "22,5": 0, + "23,7": 1, + "23,12": 1, + "23,18": 1, + "23,19": 1, + "23,20": 1, + "23,21": 1, + "23,22": 1, + "23,23": 1, + "23,24": 1, + "23,25": 1, + "23,26": 1, + "23,27": 1, + "23,28": 1, + "23,29": 1, + "23,30": 1, + "23,31": 1, + "23,32": 1, + "23,33": 1, + "23,34": 1, + "23,35": 1, + "23,36": 1, + "23,37": 1, + "23,38": 1, + "23,39": 1, + "23,40": 1, + "23,41": 1, + "23,42": 1 + }, + "ColStyles": { + "7": 3, + "8": 3, + "9": 3, + "10": 3, + "11": 3, + "12": 3, + "13": 3, + "14": 3, + "15": 3, + "16": 3, + "17": 3, + "18": 3, + "19": 3, + "20": 3, + "21": 3, + "22": 3, + "23": 3, + "24": 3, + "25": 3, + "26": 3, + "27": 3, + "28": 3, + "29": 3, + "30": 3, + "31": 3, + "32": 3, + "33": 3, + "34": 3, + "35": 3, + "36": 3, + "37": 3, + "38": 3, + "39": 3, + "40": 3, + "41": 3, + "42": 3 }, "SheetStyle": { "FontFamily": 1 } }, "Spans": [ - "3,7,18,31", - "0,0,21,5" + "0,0,23,5", + "5,7,18,36", + "1,39,1,3", + "23,7,1,5", + "23,12,1,6", + "3,18,1,2", + "3,20,1,18", + "3,7,1,2", + "3,9,1,8", + "1,7,1,2", + "1,9,1,8", + "1,18,1,2", + "1,20,1,18" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -553,8 +1056,12 @@ }, "CustomNames": [ { - "Name": "标题", - "Formula": "统计首页!$H$2" + "Name": "开始日期", + "Formula": "统计首页!$H$24" + }, + { + "Name": "结束日期", + "Formula": "统计首页!$M$24" } ] -}//+v6tOD1vWhZNaBYfgX+TGSFj9UI75RqJ9rE9R1LFXocXg0X2eUOmFwTifwJ48aFOwYzaYq55LFuiH/W8D5o6ins3vwrLkBzoNIjW3sQH7EdW0MxgrvmT6ASipClv4QNEmNkgpTWZoCzmRUXOKc2FRLvuE2i/KPMxL7Lt/ttIV797en+mDxonpZ9gunTuhPvy72Ie5g0BfG3LMftxyTKaJIN1aVA+qGVV5x0WZ16fHoIVuhvUmd54wrRkjzZpOgSyHW1R5NbtRL5BKTp9+1zVCzYAcsMW3WtnOWVdHWqVxloziKNwgqqC3lxCXh012eXzzif1t9yd3bnPAT1Plfu5erZAmJ2GReyqPp8ewkxFDq4qJVJsdfW6VLtOAjIfZAmqWxuGw8GAB/tVde48ktJAnNtPJg4ErOQ4mkidwl1kj9fZx6sQkoBcl+e3jvHPT/NmOicNmmNqscFPdz4T91BV0f268S6f4kqLOGODjgm+m10tLMNrLbHjBeUeAyQIg4zM9uLQjWGjKGINCLfnyc59asgeiqMoBVzqLSz1NHTFXkkDHKnZPXgo9pQJk3bFI0MjezLaykmAite86Vo9r6R3thG/jTMaxafo3fs5Mr6+7+92W5ehYZXU/oSbkktdaqInYbXeLIAMhz3kktrGLCzGXrQWm2ncKUUDKCAqhGdb+R3xDHfnVfe3LG0QZNdgBfr9mn0k8qdaJ0TFGawaJDvq0A9MGs45daZ2xl/NXQjtrafmWM5+Soo7/pfee/ccKB474qCORg5hyti1CexckScgXwtWU5o1SjdfPzQzfuLrlPyPGz7PKdlTTUTyVT6o6Neiz/jUwV410I760g+t9bcNki+mggd5c73e7XmO3gpJcK2H8kiw7Va7fWKTQqyLkfWpaY2iX8ojjqTsMN7h6Z2ALw==|920 \ No newline at end of file +}//pYJ5eU/m4ikvqlWRmND495Dt5uJ3e9qycWabOptcVFTaEyZtzJv16AZpURtJqBl+wDR5WiJKZA/9hbUjpMXcDjqqP7N3t+EGa+6OX/cpSppihUBx3WNG8ZWtrHmzdhze6mszLoNOBTIAYSyOb+Oghbm8A0Zq9gHDfzIfcXNEMyshxbLQQBMaozWIKrNBwMKZsJZIPb4q/CQVHiY+q7Fu/PRUrzZUkDqtah/Fh6gsSolk8WxqCGdTIkoAzgpC5wTpL65XpbJzMSYnOA64wf3W8PJRT//J2xASL3dz175ePrCg+Y+rCSj+cvo1vE5lGnEeYXcPJgYcOF9XEaOikVjumpzvVj+XeroRxWdNUcWuwZVVwWBcw7VQEj7moqo54lmTnm4PpdQlcHu2k9xW0eF/OOAP1RxqmrSIgAg6vEmub+yx9vBCJ5FZgDXyds5kUw++suEeGZjlAe5pO49qpMjA/chFDmPWdVlG71UZ5B5fyK2T5hcB+O0LWOcupvn7MpnEyxpyuCixz9Sb9rt3zKoiilt1jHW3kra6bFczech2mz7YLh2VxmcTdeNJQvHiAUh54OnGGshX7mOhsZvW+kK4jCg/sukKs3D94CJAjBKm10pkjDnO82/Jy8bO4Ej3e6aMuC+8bblCuQhpMLk9APnj3QF1NGjlJF443Grsi+u2XR4IXHHfhGcPNyqd2L8rgovf6C8LMa7Hc73zRid+5gshOnjW7CWOZRR2jNkGqst6vQQSfcaw9heCwVm0tMDDNi/aq5F7B8ze7WMeiSdinmBVx5N28DPX7AN5v+5ZL4ZR+eZ9sc/EiZxuJ1yxMe9g/UU5WcWc2A2gwkPWJNpAO1Nq/eglGliOh61JiQt9vCBvSNtLSPSf4MUVWOSNSmkSrdB0q0efNki+ODE7l5Kspse/+w==|920 \ No newline at end of file diff --git a/Pages/统计/统计首页.rd b/Pages/统计/统计首页.rd index d0635e92..237ef607 100644 --- a/Pages/统计/统计首页.rd +++ b/Pages/统计/统计首页.rd @@ -1,14 +1,15 @@ { "PageType": 0, - "ColumnCount": 38, - "RowCount": 21, - "Formulas": { - "1,7": "H4" - }, + "ColumnCount": 43, + "RowCount": 24, "CustomNames": [ { - "Name": "标题", - "Formula": "统计首页!$H$2" + "Name": "开始日期", + "Formula": "统计首页!$H$24" + }, + { + "Name": "结束日期", + "Formula": "统计首页!$M$24" } ] } \ No newline at end of file diff --git a/Pages/统计/项目工时统计.json b/Pages/统计/项目工时统计(backup).json similarity index 90% rename from Pages/统计/项目工时统计.json rename to Pages/统计/项目工时统计(backup).json index 72521089..88df0d9b 100644 --- a/Pages/统计/项目工时统计.json +++ b/Pages/统计/项目工时统计(backup).json @@ -394,7 +394,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!D2" + "SerializeProperty": "='项目工时统计(backup)'!D2" } }, "CustomColumns": [] @@ -497,7 +497,7 @@ "ListViewName": "工时记录导出", "NewOtherName": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=YEAR(项目工时统计!D4)&\"年\"&MONTH(项目工时统计!D4)&\"月份工时记录导出\"" + "SerializeProperty": "=YEAR('项目工时统计(backup)'!D4)&\"年\"&MONTH('项目工时统计(backup)'!D4)&\"月份工时记录导出\"" } } ], @@ -520,16 +520,16 @@ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", "TargetPageElement": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!D4" + "SerializeProperty": "='项目工时统计(backup)'!D4" }, "TargetType": "ElementUI.DatePickerCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", "MethodName": "GetSelectedRange", "RetrunParamNames": { "StartValue": { - "SerializeProperty": "=项目工时统计!开始日期" + "SerializeProperty": "='项目工时统计(backup)'!开始日期" }, "EndValue": { - "SerializeProperty": "=项目工时统计!结束日期" + "SerializeProperty": "='项目工时统计(backup)'!结束日期" } } } @@ -580,13 +580,13 @@ "DisplayName": "项目名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!E21" + "SerializeProperty": "='项目工时统计(backup)'!E21" }, "BackgroundValue": { "DatabaseColumnName": "项目ID", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!B21" + "SerializeProperty": "='项目工时统计(backup)'!B21" } } }, @@ -595,7 +595,7 @@ "DisplayName": "版本", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!H21" + "SerializeProperty": "='项目工时统计(backup)'!H21" } }, { @@ -603,7 +603,7 @@ "DisplayName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!K21" + "SerializeProperty": "='项目工时统计(backup)'!K21" }, "BackgroundValue": {} }, @@ -612,7 +612,7 @@ "DisplayName": "执行人", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!U21" + "SerializeProperty": "='项目工时统计(backup)'!U21" }, "BackgroundValue": {} } @@ -623,7 +623,7 @@ "DisplayName": "上报工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!R21" + "SerializeProperty": "='项目工时统计(backup)'!R21" }, "Aggregator": 0, "TotalAggregator": 0, @@ -634,7 +634,7 @@ "DisplayName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!O21" + "SerializeProperty": "='项目工时统计(backup)'!O21" }, "Aggregator": 0, "TotalAggregator": 0, @@ -646,63 +646,63 @@ "DatabaseColumnName": "项目ID", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!B21" + "SerializeProperty": "='项目工时统计(backup)'!B21" } }, { "DatabaseColumnName": "项目名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!E21" + "SerializeProperty": "='项目工时统计(backup)'!E21" } }, { "DatabaseColumnName": "版本", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!H21" + "SerializeProperty": "='项目工时统计(backup)'!H21" } }, { "DatabaseColumnName": "任务名称", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!K21" + "SerializeProperty": "='项目工时统计(backup)'!K21" } }, { "DatabaseColumnName": "执行内容", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!M21" + "SerializeProperty": "='项目工时统计(backup)'!M21" } }, { "DatabaseColumnName": "核定工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!O21" + "SerializeProperty": "='项目工时统计(backup)'!O21" } }, { "DatabaseColumnName": "上报工时", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!R21" + "SerializeProperty": "='项目工时统计(backup)'!R21" } }, { "DatabaseColumnName": "执行人", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!U21" + "SerializeProperty": "='项目工时统计(backup)'!U21" } }, { "DatabaseColumnName": "日期", "ColumnCell": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!W21" + "SerializeProperty": "='项目工时统计(backup)'!W21" } } ], @@ -741,7 +741,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!D2" + "SerializeProperty": "='项目工时统计(backup)'!D2" } }, { @@ -758,7 +758,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!Q2" + "SerializeProperty": "='项目工时统计(backup)'!Q2" } }, { @@ -771,7 +771,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!成员" + "SerializeProperty": "='项目工时统计(backup)'!成员" } }, { @@ -794,7 +794,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!开始日期" + "SerializeProperty": "='项目工时统计(backup)'!开始日期" } }, { @@ -807,7 +807,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目工时统计!结束日期" + "SerializeProperty": "='项目工时统计(backup)'!结束日期" } } ] @@ -1128,6 +1128,7 @@ "20,20,1,2", "20,7,1,3", "20,22,1,3", + "3,3,1,23", "19,1,1,3", "19,4,1,3", "19,7,1,3", @@ -1136,8 +1137,7 @@ "19,14,1,3", "19,17,1,3", "19,20,1,2", - "19,22,1,3", - "3,3,1,23" + "19,22,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1166,15 +1166,15 @@ "CustomNames": [ { "Name": "成员", - "Formula": "项目工时统计!$AD$2" + "Formula": "'项目工时统计(backup)'!$AD$2" }, { "Name": "开始日期", - "Formula": "项目工时统计!$B$24" + "Formula": "'项目工时统计(backup)'!$B$24" }, { "Name": "结束日期", - "Formula": "项目工时统计!$E$24" + "Formula": "'项目工时统计(backup)'!$E$24" } ] -}//MS+jCh5Xh4jj00Mkul1KFKPwldDsMn6+ZcgtuKVLpOExymnl2zm412qIxL9LWzoFdTqSJBbgkL2rAjVgkLs8sctIsKZgDGH/uZcLrYMnAOxYuAQgSan8dLMJUOvAstqwUon1aV4Bq/K6COY2lJHNUYvjMntrBEji6TlaZ1CXfZNkbMejURbAXeYDvo1W0Z71zdUCkRMRzEDDZ0eQ5YjM6iy3d+40qL8gjBFFnDmzrKJlcxGrMAgyam8ppq5mAw6AYwj7uivpsMc++pBxK+HxyvbHlRFQnom3mjbd2hxUck65EzVCHpuHvvAD/oTXmttHx0ROsIFR1+qLqYmKw9ocTCBjl18jugGY+4JkArZDt+EtiGdBnuqRNcDl20ydWFmNowznk/I0V474VzltnxlN8RxH0sQkp3/RDy967H2fv9aO719i2CcCAZ9cu2i5jQ3sr1a9bdsJeUzkSDK6YuSDMIXktkdzaIYifHIIC4Hzs+v3kToNNpxmlGfR0QGJwOT9DkrVrpyarZVwGxRVH/dDWAQ2Ko1m+aJphBiE/1Xv4V5GFXhmvpNzGITTGjw/eZerMSGW1G1pjBxMHUISROpI1oelvsHqQffhUB+BqBZF4BGNMxHsnkza/fWtwFfZ6eD50dzwcOomybM10P1gND+ZzCtGtOdikJaPFpYSs+oc1Tl9U3uqW6RPlL/1mZ0pPs9YWr4zcADxFRQveGr9PN/v9EmD0T3+f2M6kWLMKV6jOfdxc7EQo+cA4uvKddVzcaH2SV6gE/soHI0hw/BGQSeugwpOJJ8/O1vLvKmhu/sRZ8gP1aXyeh4ZJGbo3rJWXFWJg5qvNb4nPyVx3KVG+Wo+wIL5XectiV+edURQT6yacuB2ueyhB79y2uCkMv2LWkoKcqu6KyganxAayXI+bJjHZQ==|920 \ No newline at end of file +}//O7u5eprYUyNLhjYPO4f+e64cijD/nBX+yz02pE4wmSasnO3gebDaLcAJj7yh/zELwP1YYujaH9ny1BrqYfbHZwwF7dNtYNoWnYgVS099W23G6Z7PlhyVqolLXDS1wmdrGvTALDeDyfD3VB0Jena4kXymfTSKhzyj2CqkZ0V2aPYNZGrrmcpqhz+iHH4tWVY9qb7qhkpQSm7ifHDhf83QyVaEqq3Yui21ijpteL+1d/x76hzc+gcZDbFXKcrY8++Beh0bLPZa2Z47sZmWG0AJQpfPVbK4G6ziXxjcplXh9VfR34HyLnNGBeDpfD/8OmFaYuwBxB2WEBbBppgG8+Zv3BGOmvE/jOawbqRg0A0zrZtDC6t6Jq0W+UkCPpOhv2JQGUHrwxVt5sH2+xcMfD6c6ov8v6Z4sHFLm7EBneYPPmBaHJk9pPnktfqUH/0G6xMmO0YNi+ryaTi6FJBv57TEKxXIJu4kvYeQRWTVjaIpl8CWNAnbm1vA9nQF7EyFr1D4LXkS9svJjLKfjqKRX/nEjM8I1/6HCI3nlr1LRCtXZs8iTsXG6G/aZrOHX9GUi0WZRloFdX990DI3lM9jOZvGI8dYXbbbAakXc9buWfe33yn69uJk4i9eGZYbw4sDBRNqNtMuxAqXHaOGi8a51f5jiyWJRnTUF5Doqnz/zh8ZFKj+KpIUHr0rhuhAsLHew+JwWxHN59E9VLSD7ZEipln0R5744/kU4zHlWwactHDJU6ehmRdihXgepLM+niJWbcXAIn+nVmB50tfnXy96Ok2TOQyI4wt854jwCSHtz5BBUkqwqwYFABgSdaQCVpzMRq8sqtAeDYGO/pDxIX8xCyFo2QxwhrJPx/UTrad95Ks/11m/23H2cZcefcAj4x0b3Fcn/1c6mMLxX5yqse4ys37wLQ==|920 \ No newline at end of file diff --git a/Pages/统计/项目工时统计.rd b/Pages/统计/项目工时统计(backup).rd similarity index 55% rename from Pages/统计/项目工时统计.rd rename to Pages/统计/项目工时统计(backup).rd index fda8b7c3..05b90990 100644 --- a/Pages/统计/项目工时统计.rd +++ b/Pages/统计/项目工时统计(backup).rd @@ -5,15 +5,15 @@ "CustomNames": [ { "Name": "成员", - "Formula": "项目工时统计!$AD$2" + "Formula": "'项目工时统计(backup)'!$AD$2" }, { "Name": "开始日期", - "Formula": "项目工时统计!$B$24" + "Formula": "'项目工时统计(backup)'!$B$24" }, { "Name": "结束日期", - "Formula": "项目工时统计!$E$24" + "Formula": "'项目工时统计(backup)'!$E$24" } ] } \ No newline at end of file diff --git a/Plugin/内容编辑器-9_0_103_0.zip b/Plugin/内容编辑器-9_0_103_0.zip deleted file mode 100644 index 439281c8..00000000 Binary files a/Plugin/内容编辑器-9_0_103_0.zip and /dev/null differ diff --git a/Plugin/标签页和打开标签命令-10_0_2_0.zip b/Plugin/标签页和打开标签命令-10_0_2_0.zip new file mode 100644 index 00000000..0fac68d9 Binary files /dev/null and b/Plugin/标签页和打开标签命令-10_0_2_0.zip differ diff --git a/Reports/人员工时报表.json b/Reports/人员工时报表.json new file mode 100644 index 00000000..795828a1 --- /dev/null +++ b/Reports/人员工时报表.json @@ -0,0 +1,387 @@ +{ + "Name": "人员工时报表", + "DataSources": [ + { + "Name": "工时表", + "GUID": "eaf0055e-b7c7-4fd9-9f79-abb67577832d", + "DataSourceSetting": { + "TableName": "View_任务工时统计", + "BindingInfos": [ + { + "GUID": "2cc7ad7a-32a0-4eba-a169-22acc6d417d0", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "c3ca6f17-89d4-4080-a320-bba11cfaf96a" + }, + "ColumnName": "日期" + }, + { + "GUID": "b6a9ac13-f35a-425d-ba99-75fa3b4c5259", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "a7be55f3-b9cb-4290-856f-8cf2cb5b6ef1", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "执行人" + }, + { + "GUID": "2752e70e-b3ec-48b0-8668-e8ab46709b00", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "b18bd52a-a01c-4ba3-8af8-fa9439c06c84" + }, + "ColumnName": "项目ID" + }, + { + "GUID": "6b2843b9-aae7-4217-b424-f48f89a010a1", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "58a96f0c-4abb-46c6-b34e-4b4ba6f76dad", + "RelationBinding": { + "RelatedTable": "项目表", + "RelatedColumn": "ID", + "DisplayColumn": "项目名称" + } + }, + "ColumnName": "项目" + }, + { + "GUID": "6c7f269f-a22b-4145-aa5f-ff3d0b03e6e0", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "2a376900-56ec-4636-8375-897cb018bec8", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "版本" + } + }, + "ColumnName": "版本ID" + }, + { + "GUID": "9377cfa8-fad7-4504-a482-6d17b61f916b", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "5e392f5e-fa5f-4178-9dc6-47fa3e963cf3", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "版本", + "NextRelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "名称加版本号" + } + } + }, + "ColumnName": "版本" + }, + { + "GUID": "5199bec2-64ba-4aad-800d-f9d2d7ffc583", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "825456f4-f846-4a2a-a415-3920d7d4be48", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "任务名称" + } + }, + "ColumnName": "任务" + }, + { + "GUID": "d986b9e7-0152-4510-be6e-a76a3a448708", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行内容", + "GUID": "a05b2b99-305e-457a-aea5-33a862bd3fc6" + }, + "ColumnName": "执行内容" + }, + { + "GUID": "0f4e50ce-b137-4efa-b9ed-abd53ad923a5", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "计划工时", + "GUID": "65e0ccab-4af0-4ba9-a36a-eda6a070610d" + }, + "ColumnName": "计划工时" + }, + { + "GUID": "038b76d4-5990-427c-a7e7-a65376ba5859", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "上报工时", + "GUID": "e10f795f-d132-40d2-ace9-07ac13514d9a" + }, + "ColumnName": "上报工时" + }, + { + "GUID": "74d72ac1-0373-4a66-9e25-846cd05d10d1", + "BindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "核定工时", + "GUID": "63fb43f0-95af-4e84-9d66-2243e248a524" + }, + "ColumnName": "核定工时" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 3, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "810f6154-fc71-43e5-ae59-86ad464bef04" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=开始日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "CompareType": 5, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "097ea6bc-cf6e-4af0-9454-6cb766129b8e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=结束日期" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "项目ID", + "GUID": "ae0f2281-c1ec-406f-aa19-e03868c8d159" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "任务ID", + "GUID": "039ef573-57ab-4305-81e6-27d96de05aae", + "RelationBinding": { + "RelatedTable": "任务平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "版本" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=版本ID" + } + }, + { + "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", + "CompareType": 8, + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "执行人", + "GUID": "a01525e0-5b16-400d-9933-3af5d8230939" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=执行人数组" + } + } + ] + }, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "View_任务工时统计", + "ColumnName": "日期", + "GUID": "48f9a9ee-6c50-42d0-8483-2b5fe1e7c3cd" + }, + "Order": 0 + } + ] + } + }, + "ColumnsType": [ + "date-time", + "string", + "integer", + "string", + "integer", + "string", + "string", + "string", + "number", + "number", + "number" + ] + }, + { + "Name": "项目表", + "GUID": "2c95e2a9-2e3a-492b-a2eb-f97669c8e580", + "DataSourceSetting": { + "TableName": "项目表", + "BindingInfos": [ + { + "GUID": "fce01d85-e7bb-4241-aa0c-b49a1ef70ed4", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "ID", + "GUID": "e19ac829-669c-4af5-95bf-91fb1fcee9a3" + }, + "ColumnName": "ID" + }, + { + "GUID": "6ec54d74-affc-47b0-88db-7d8cef10d75a", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目名称", + "GUID": "0bd6fee7-9b55-4f7b-8e52-51ef89d9af45" + }, + "ColumnName": "项目名称" + }, + { + "GUID": "58bc4df2-349e-4175-a7f5-7d336e47dc27", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目代号", + "GUID": "8922ca23-f9e5-4272-aa55-6b2a7e864f4c" + }, + "ColumnName": "项目代号" + }, + { + "GUID": "0881d871-6882-47b5-8a47-cf6b88972220", + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "项目简介", + "GUID": "4643269b-5887-4007-9142-2dbb23458e88" + }, + "ColumnName": "项目简介" + } + ] + }, + "ColumnsType": [ + "integer", + "string", + "string", + "string" + ] + }, + { + "Name": "版本表", + "GUID": "f9f2ca80-339c-47ab-b41a-078a0a32de1d", + "DataSourceSetting": { + "TableName": "项目版本", + "BindingInfos": [ + { + "GUID": "9d8b1dc1-590e-40dc-b821-701329d22d73", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "ID", + "GUID": "4623e79b-5bf3-4c98-ac3d-3bcb029f9ed6" + }, + "ColumnName": "ID" + }, + { + "GUID": "67f36a47-b896-44db-bc34-97fdeea45b64", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "项目ID", + "GUID": "968b4f74-ddcc-4e63-bd80-43cc09ee3632" + }, + "ColumnName": "项目ID" + }, + { + "GUID": "6aee4b23-f034-4f0e-a7be-1c17620fab46", + "BindingInfo": { + "TableName": "项目版本", + "ColumnName": "名称加版本号", + "GUID": "dd94321a-b078-4a86-9ff5-a08739c67a2f" + }, + "ColumnName": "名称加版本号" + } + ] + }, + "ColumnsType": [ + "integer", + "integer", + "string" + ] + }, + { + "Name": "用户信息视图", + "GUID": "514ebb17-c46f-48fc-9097-169e0c003849", + "DataSourceSetting": { + "TableName": "用户信息视图", + "BindingInfos": [ + { + "GUID": "2e348c3b-a275-4c7c-bfc8-daf493377601", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "8cd94fe5-68dd-4a6e-b6b8-115bb93cc90e" + }, + "ColumnName": "用户名" + }, + { + "GUID": "5def5fc4-c963-4ef0-a543-aeb63f2b2e57", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "6c483485-c047-40ea-9166-9829e479d193" + }, + "ColumnName": "全名" + } + ] + }, + "ColumnsType": [ + "string", + "string" + ] + } + ], + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionResource, Forguncy.RbacPermission.Core", + "activeReportType": 1 + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core", + "activeReportPermissionType": 1, + "roleNames": [ + "FGC_Anonymous" + ] + }, + { + "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core", + "activeReportPermissionType": 2, + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "ReportType": 1 +} \ No newline at end of file diff --git a/Reports/人员工时报表.rdlx b/Reports/人员工时报表.rdlx new file mode 100644 index 00000000..70ff9e57 --- /dev/null +++ b/Reports/人员工时报表.rdlx @@ -0,0 +1 @@ +人员工时报表.rdlx5.25cm0cm0cm39.501cm5.25cm工时表_DataSetAuto
true1.5cm7true人员工时详情表0.75cmtrue文本框1项目true文本框2任务true文本框12版本true文本框25执行内容true文本框13计划工时true文本框17上报工时true文本框21核定工时
0.75cmtrue项目=Fields.Item("项目").Valuetrue任务=Fields.Item("任务").Valuetrue版本=Fields.Item("版本").Valuetrue=Fields.Item("执行内容").Valuetrue计划工时=Fields.Item("计划工时").Valuetrue上报工时=Fields.Item("上报工时").Valuetrue核定工时=Fields.Item("核定工时").Value
0.75cmtruetruetruetrue合计true=Sum(Fields.Item("计划工时").Value)true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
7.499cm6.5cm4.498cm10.502cm3.5cm3.5cm3.502cm
true0.75cm7true=((Fields.Item("执行人").Value & "：") & Round(Sum(Fields.Item("上报工时").Value), 1)) & "小时"
0.75cmtruetruetruetruetrue=Sum(Fields.Item("计划工时").Value)true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
=Fields.Item("执行人").Value
1cm1cm29.7cm42cm1cm1cm39.501cmDateTimetrueTrueDateTimetrue结束日期TrueInteger项目IDTruetrue项目表_DataSet项目名称IDIntegertrue版本IDTrue版本表_DataSet名称加版本号IDtrueStringtrue执行人True用户信息视图_DataSet全名用户名jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/eaf0055e-b7c7-4fd9-9f79-abb67577832d;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"执行人":{"type":"string"},"项目ID":{"type":"integer"},"项目":{"type":"string"},"版本ID":{"type":"integer"},"版本":{"type":"string"},"任务":{"type":"string"},"执行内容":{"type":"string"},"计划工时":{"type":"number"},"上报工时":{"type":"number"},"核定工时":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/2c95e2a9-2e3a-492b-a2eb-f97669c8e580;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"type":"string"},"项目代号":{"type":"string"},"项目简介":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/f9f2ca80-339c-47ab-b41a-078a0a32de1d;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目ID":{"type":"integer"},"名称加版本号":{"type":"string"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/514ebb17-c46f-48fc-9097-169e0c003849;schemadata={"type":"array","items":{"type":"object","properties":{"用户名":{"type":"string"},"全名":{"type":"string"}}}}JSON日期执行人项目ID项目版本ID版本任务执行内容计划工时上报工时核定工时=Fields!日期.Value=Parameters!开始日期.ValueGreaterThanOrEqual=Fields!日期.Value=Parameters!结束日期.ValueLessThanOrEqual=Fields!项目ID.Value=Parameters!项目ID.ValueEqual=Fields!版本ID.Value=Parameters!版本ID.ValueEqual=Fields!执行人.Value=Parameters!执行人.ValueEqual$.[*]工时表ID项目名称项目代号项目简介$.[*]项目表ID项目ID名称加版本号=Fields!项目ID.Value=Parameters!项目ID.ValueEqual$.[*]版本表用户名全名$.[*]用户信息视图DisplayTypeGalleySizeTypeFitToPagePaperOrientationLandscapeParametersView{"controls":[{"left":15,"top":15,"width":200,"height":60,"control":{"type":"date-time","binding":"开始日期","label":{"display":"top","text":"","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}},"daysViewHeaderFormat":""}},{"left":15,"top":75,"width":200,"height":60,"control":{"type":"date-time","binding":"结束日期","label":{"display":"top","text":"结束日期","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}},"daysViewHeaderFormat":""}},{"left":15,"top":135,"width":200,"height":60,"control":{"type":"dropdown","binding":"项目ID","label":{"display":"top","text":"项目","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":15,"top":195,"width":200,"height":60,"control":{"type":"dropdown","binding":"版本ID","label":{"display":"top","text":"版本","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":15,"top":255,"width":200,"height":60,"control":{"type":"dropdown","binding":"执行人","label":{"display":"top","text":"执行人","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":15,"top":325,"width":200,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}}]}DefaultTheme.rdlx-theme \ No newline at end of file diff --git a/Reports/工时报表.json b/Reports/工时报表.json deleted file mode 100644 index 966e3071..00000000 --- a/Reports/工时报表.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "Name": "工时报表", - "DataSources": [ - { - "Name": "工时表", - "GUID": "eaf0055e-b7c7-4fd9-9f79-abb67577832d", - "DataSourceSetting": { - "TableName": "View_任务工时统计", - "BindingInfos": [ - { - "GUID": "72592a16-f236-4ae1-9640-3828706da6eb", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "日期", - "GUID": "c3ca6f17-89d4-4080-a320-bba11cfaf96a" - }, - "ColumnName": "日期" - }, - { - "GUID": "e20ffb35-4008-47ba-aa32-947b82a29718", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "887dd194-cd9d-4c48-9dd6-0eaf343ff7da" - }, - "ColumnName": "成员" - }, - { - "GUID": "d9a93a5f-71c8-46bb-842b-4f9aeb431ac6", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "项目ID", - "GUID": "58a96f0c-4abb-46c6-b34e-4b4ba6f76dad", - "RelationBinding": { - "RelatedTable": "项目表", - "RelatedColumn": "ID", - "DisplayColumn": "项目名称" - } - }, - "ColumnName": "项目" - }, - { - "GUID": "8aeb1b52-e7a0-468c-8b7a-033408e6b087", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "任务ID", - "GUID": "825456f4-f846-4a2a-a415-3920d7d4be48", - "RelationBinding": { - "RelatedTable": "任务表", - "RelatedColumn": "ID", - "DisplayColumn": "任务名称" - } - }, - "ColumnName": "任务" - }, - { - "GUID": "3be4f05e-5cbb-4a43-81a4-3eafb7558081", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "计划工时", - "GUID": "65e0ccab-4af0-4ba9-a36a-eda6a070610d" - }, - "ColumnName": "计划工时" - }, - { - "GUID": "3a1744fd-d084-45a2-a1c2-e36d4b624be7", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "上报工时", - "GUID": "e10f795f-d132-40d2-ace9-07ac13514d9a" - }, - "ColumnName": "上报工时" - }, - { - "GUID": "68caa1af-8708-4ac2-8e25-a693a4df7bc0", - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "核定工时", - "GUID": "63fb43f0-95af-4e84-9d66-2243e248a524" - }, - "ColumnName": "核定工时" - } - ] - }, - "ColumnsType": [ - "date-time", - "string", - "string", - "string", - "number", - "number", - "number" - ] - } - ], - "PermissionData": { - "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionData, Forguncy.RbacPermission.Core", - "permissionResource": { - "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionResource, Forguncy.RbacPermission.Core", - "activeReportType": 1 - }, - "permissionBindings": [ - { - "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core", - "activeReportPermissionType": 1, - "roleNames": [ - "FGC_Anonymous" - ] - }, - { - "$type": "Forguncy.RbacPermission.Core.Impl.ActiveReport.ActiveReportPermissionBinding, Forguncy.RbacPermission.Core", - "activeReportPermissionType": 2, - "roleNames": [ - "FGC_LoginUser" - ] - } - ] - }, - "ReportType": 1 -} \ No newline at end of file diff --git a/Reports/工时报表.rdlx b/Reports/工时报表.rdlx deleted file mode 100644 index e0c01b77..00000000 --- a/Reports/工时报表.rdlx +++ /dev/null @@ -1 +0,0 @@ -工时报表.rdlx3.5cm0cm0cm4.001cm1.5cmDimGraytrue用户名20cm0cm5.001cm1.5cmDimGraytrue项目20cm0cm2.5cm1.5cmDimGraytrue任务22.5cm2.5cm2.5cm2.5cm2.5cm2.5cm0.75cm0cm0cm2.5cm0.75cmDimGraytrue计划工时=Sum(Fields.Item("计划工时").Value)0cm0cm2.5cm0.75cmDimGraytrue上报工时=Sum(Fields.Item("上报工时").Value)0cm0cm2.5cm0.75cmDimGraytrue实际工时=Sum(Fields.Item("核定工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("计划工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("上报工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("核定工时").Value)0.75cm0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("计划工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("上报工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("核定工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("计划工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("上报工时").Value)0cm0cm2.5cm0.75cmDimGraytrue=Sum(Fields.Item("核定工时").Value)=Fields!日期.ValueAscending=Fields!日期.Value0.75cm0cm0cm7.5cm0.75cmDimGraytrue日期=Fields.Item("日期").Value0.75cm0cm0cm2.5cm0.75cmDimGraytrue计划工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue上报工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue实际工时0.75cm0cm0cm7.5cm0.75cmDimGraytrue汇总0.75cm0cm0cm2.5cm0.75cmDimGraytrue计划工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue上报工时0.75cm0cm0cm2.5cm0.75cmDimGraytrue实际工时=Fields!用户名.ValueAscending=Fields!用户名.Value3.502cm0cm0cm4.001cm0.75cmDimGraytrue用户名=Fields.Item("成员").ValueTrue=Fields!项目.Value4.502cm0cm0cm5.001cm0.75cmDimGraytrue项目=Fields.Item("项目").ValueTrue=Fields!任务.Value4.498cm0cm0cm2.5cm0.75cmDimGraytrue任务=Fields.Item("任务").Value文本框6文本框23.502cm0cm0cm4.001cm0.75cmDimGraytrue汇总4.502cm0cm0cm5.001cm0.75cmDimGraytrue4.498cm0cm0cm2.5cm0.75cmDimGraytrue2true0.5cm0.499cm27.502cm3cm2WizardModel{"layoutOptions":{"totals":{"totalsForRowGroups":true,"subtotalsForRowGroups":false,"totalsForColumnGroups":true,"subtotalsForColumnGroups":false,"showTotalsBeforeGroup":false},"features":{"expandCollapseGroups":true,"collapsedGroups":false,"enableUserSort":false,"steppedRowGroups":false,"showValuesAsRows":false}},"columnHierarchy":[{"group":{"name":"矩表1_日期_分组","field":{"name":"日期","expr":"=Fields!日期.Value"},"sorting":{"value":"=Fields!日期.Value","direction":"Ascending"},"itemName":"文本框1","itemValue":"=Fields.Item(\"日期\").Value","format":"d"},"children":[],"startBodyIndex":0,"endBodyIndex":2}],"rowHierarchy":[{"group":{"name":"矩表1_用户名_分组","field":{"name":"用户名","expr":"=Fields!用户名.Value"},"sorting":{"value":"=Fields!用户名.Value","direction":"Ascending"},"itemName":"文本框2","itemValue":"=Fields.Item(\"成员\").Value","format":""},"children":[{"group":{"name":"矩表1_项目_分组","field":{"name":"项目","expr":"=Fields!项目.Value"},"sorting":null,"itemName":"文本框6","itemValue":"=Fields.Item(\"项目\").Value","format":""},"children":[{"group":{"name":"矩表1_任务_分组","field":{"name":"任务","expr":"=Fields!任务.Value"},"sorting":null,"itemName":"文本框7","itemValue":"=Fields!任务.Value","format":""},"children":[],"startBodyIndex":0,"endBodyIndex":0}],"startBodyIndex":null,"endBodyIndex":null}],"startBodyIndex":null,"endBodyIndex":null}],"body":[[{"itemName":"文本框3","field":{"name":"计划工时","expr":"=Sum(Fields!计划工时.Value)"},"aggregate":"Sum","format":"n1"},{"itemName":"文本框4","field":{"name":"上报工时","expr":"=Sum(Fields!上报工时.Value)"},"aggregate":"Sum","format":"n1"},{"itemName":"文本框5","field":{"name":"实际工时","expr":"=Sum(Fields!实际工时.Value)"},"aggregate":"Sum","format":"n1"}]]}工时表_DataSet1cm1cm29.7cm42cm1cm1cm28.001cmjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/eaf0055e-b7c7-4fd9-9f79-abb67577832d;schemadata={"type":"array","items":{"type":"object","properties":{"日期":{"type":"date-time"},"成员":{"type":"string"},"项目":{"type":"string"},"任务":{"type":"string"},"计划工时":{"type":"number"},"上报工时":{"type":"number"},"核定工时":{"type":"number"}}}}JSON日期成员项目任务计划工时上报工时核定工时$.[*]工时表DisplayTypeGalleySizeTypeFitToPagePaperOrientationLandscapeParametersView{"controls":[{"left":15,"top":15,"width":275,"height":60,"control":{"type":"date-range","binding":["",""],"maxRange":["none"],"viewMode":"default","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}}]}DefaultTheme.rdlx-theme \ No newline at end of file