diff --git a/.collaboration b/.collaboration index 45a5e2ed..6ea10b3c 100644 --- a/.collaboration +++ b/.collaboration @@ -9,47 +9,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1393822+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1393981+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394001+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -98,16 +68,7 @@ }, { "ModuleName": "TableView/View_项目统计信息", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394049+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\项目\\View_项目统计信息.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/项目任务树视图", @@ -227,137 +188,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394115+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394132+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394147+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394167+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394194+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394211+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394228+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394249+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394264+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -398,17 +269,7 @@ }, { "ModuleName": "Table/message_test", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1394294+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\message_test.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -657,21 +518,7 @@ }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:33:04.4255718+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目列表.json", - "Pages\\项目\\项目列表.rd", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json", - "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目成员详情", @@ -743,17 +590,7 @@ }, { "ModuleName": "PCPage/项目反馈", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:46:29.4425457+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目反馈.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目版本管理", @@ -1229,16 +1066,7 @@ }, { "ModuleName": "ServerCommandPrivate/后端新增项目反馈", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:47:36.2532052+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\项目反馈\\后端新增项目反馈.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/修改项目反馈状态", @@ -1673,19 +1501,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:33:36.9821179+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -1697,20 +1513,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:32:32.1398903+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\86eb9c3b-133d-4cb0-ba1b-06aa7189f6b7_Animation - 1718097457056.json", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -2114,17 +1917,7 @@ }, { "ModuleName": "PCPage/页面反馈录入", - "State": 1, - "LockedBy": { - "UserName": "超哥", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-06-20T09:46:29.442361+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目反馈\\页面反馈录入.json", - "Pages\\项目\\项目反馈\\页面反馈录入.rd" - ] + "ModuleType": 1 }, { "ModuleName": "ServerCommand/发起任务流程", diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index d4abd2c3..a63cf5b3 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json index eaffad42..6ba73d7e 100644 --- a/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json +++ b/Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json @@ -160,7 +160,7 @@ ] } ], - "ID": "6e26deff-53cd-4f80-8b7c-2eeaaa5dbffb" + "ID": "c6cad4c6-f5cc-422d-a18e-40580cb647c9" } ] } @@ -235,7 +235,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "01369907-e8c5-410c-a18c-8e41b78abfe3" + "ID": "92000342-36ce-4efe-a4f5-e1997e1e40d6" }, { "Condition": { @@ -265,7 +265,7 @@ "Message": "复制成功" } ], - "ID": "a62fd1bc-82ff-4348-a25f-6c9ca394079f" + "ID": "bc798263-d00b-4866-935a-06d520e312f9" }, { "Condition": { @@ -342,7 +342,7 @@ "Message": "操作成功" } ], - "ID": "5e1a32a5-f763-43ca-8c98-62920c0065b2" + "ID": "8befa681-950e-4640-916e-a640eed6b419" }, { "CommandList": [ @@ -357,17 +357,17 @@ "BtnText": "知道了" } ], - "ID": "6032f8bc-5a0e-411d-9f52-2f4971d49a34" + "ID": "8e06cd0d-0682-42b3-af57-1a130671fb52" } ] } ], - "ID": "a578b0c3-ac87-4674-82ae-98dd9224d848" + "ID": "a26b3264-3e12-4962-92a9-1dfa98d54e72" } ] } ], - "ID": "6163f312-20b5-4eb1-9aa0-b5bd9a7690da" + "ID": "2e39df4f-90ec-46a1-9eb5-95bf08f6e41e" } ] } @@ -439,4 +439,4 @@ "PaperSize": {}, "Margin": {} } -}//keq5f08vDhA+qftgKIaAgiRcDE15O9HULeb969pDDL582s/B1exOB4ie4aj+8imuepG/nCpWAxtiSpVDD2qcNsyZHV9HlWGA0lC7tPyFH3Oeno/zFfdYrnlobCu+50zxtHfA4ObWJg50pMycbUm1j2rdLC5gNx3/QgQyWWyKYquSUk+g4224X+c6PDYqt5aHRvJwPYUEmo8lW4QmNMF5TNNKlgx5O3CzGtJc/7aNOBHyuzgWd5LwTyVvuKrBxXlSbD7e+Cx+kkSyZHqbs/zw1JwY/+Lywil/E5ZB5vaCbOaJ9+UD+h0sQzkDvm5lklQQH0q6xeEB386j6cMcJPkUmLbOSl7cZ+pbs3SwBWGSdgK98IrmEWVi+W9mwUnWPoESIW2UqtxUJXiymmjST+Y1jGA/B1+iFYlSowYlWt9i5Kvnsg+Bnf0tnSwP8D1J0+KG08U80MD8Z7kiABSVl2M9z/eSqxQ9RJGvX8N5DZXOp6VU2uAsMsjXepDOrUz6603GfUkAUiwzB6Y+XX/QXBWX0IYDMidZA0kfDOipkRD+/e99PjJ7B6OKMlXmHaHPYKvR1zTdovRByYRH0XpLmxmZDsHHFWrcS+c++73ZAfhUWUTQQg7D4YtYESQIgPQaDc/9C6WDVW6CDqyal30A6hHgxne6t3IK56hX6lRCJ4zQNyV83c2GOiVe3gEHah1QttaPnrL7zcH1RSjJlOqJDY25Fxj9TuDaLj0AoNBJhVY2hSq5cOb7V6HSlj6EdvLD5nCvud9e0wO8EfKFXakf6loPU/MA05EXoyjjroerGSKCM4RqKh6RKnKcno8HqMdYlqjfa6FWM33plJVfUiU7LwCFZ0E8IwuhuK8MylJh5SpU0W0Hel7cVUF+wEshbtD8gP7YZjQ/HBJz6LF6R761CB6ClA==|920 \ No newline at end of file +}//Q0nwxyqGdjIt0/0IPmgpnqywYuGyhSf0SrgQq1FdtZW9psmeb1FLrF8CV1ArCaXzAlpncZFU9rmQFU0nH9Qynrow12VZfHvs76Ufud89/ojCM1HEeQsQERrVtzKy4r+a7Uft7ytEa3wgrk1NNMUfgB81wheZfeQ7h5sDFJEqGc1LflSqbGKepU2VFaU6aEFeBPjXct9MBKvX68/UJP9+gmzvMR3e37SNpSWxXLgxoZdacr1G1U/Cd9nbiMgTNeIj4YCKtK05JcpmEDetvQd2JpV5KnXZfaFs1iDhR91bPEnp+99+EP1IW9OmZmmcmh2W18wsGb+FFvrR6U37HGK83woPvYwPSI8696mZ1ilKtyFRgvaf/lZAM9kLpl6jvbNHlnYJK8nRopxYahiu8Nts9XDflihQzji8xa+ELCIa8ZwBgcBAvTeSUSdaUZ2YwKXKYFbQz+akWViXRa0ZY7Rr8U4u28avsP0NqKKC0PLKm+Cz0VgsYzETCnYiSYqb5TWCFg+/U3J49iPorKDr3TdhMTKXJXu3l1t4K2H7v5gGZgdnVnTRqwlMnHlK/lcEyIYbouwIlaYL7dk7rA3/trqafNM7KW9RpjpSncSiLRyWmSODKPgacJSw/5d/GNCTE0xTaH3YPVSe81SjVzgKg/UN1lfsPHK49vNSP0CV7sAwaZnIahIuGYHCSZTtVWFvrolx93dC7TlTd/Rn56M8zvoAFUB8mf3c+P7ToCETeNZ0P6mZ0xjMPlxp9gYhlZPFJOswihzpndptb/UubbycUbtMv/hFbYwkHO++AvsGMxYukjQ2wGxqYA4ddzzDTqOzkGcr7xng3S0nmaTVgN1Flo91hkBmGJjMX8m9MHtiQxH5we/qrdHcVncf+rPrKfGa1Uk3ZSOV9bJqrj+CmlKio/H5dw==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json index f6b9586b..d082b6ce 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.json +++ b/Pages/b90932e038f94707b54e571ff7cd84d.json @@ -23,7 +23,8 @@ }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 25.0 + "DesignLengthInPixel": 25.0, + "IsHidden": true } } }, @@ -49,11 +50,11 @@ }, "AttachInfos": { "0,0": { + "CssName": "img-cover", "CellType": { "$type": "Forguncy.ImageCellType, ServerDesignerCommon", "ToolTip": "操作", "TemplateKey": "上圆角封面", - "ImageSizeMode": 2, "ImagePath": "app-logo横幅.png" }, "TemplateCellSource": "项目封面" @@ -297,4 +298,4 @@ "Size": "20,20" } ] -}//hbbwyGqJlaKViuQLW2R2Z0CZyfXIIyxneqkIUlaYKhe6Gw76YdtyGlpY7GPSjEYoav2DJEtPvaFG86oWJVyw3oNnKmymvoNT8oBIWRUbST/PWohF3HVIXo4epZsmEtmoVinFDAuHvz9+djXK1y/YBmHYRoHAUqWHXVErujI/A/N4z/jYz6wplABHYD0+CqS76Lj5D9OwPeerQG7KtM0cqKLNuOIY1XN2xTXKKz4HVBv9YTRUoH1mkO1QHlmRcUQcOxwctvIDenFL/87zomSQJwXTS4DjEopgxBtmILSsRaDn83q0HmxCCZ8WUJm2S+7TtE05fLv7xey+3M2VxqRcrmLy+WulJw4BzUgHyeFuDNcz6Ri0NsxPA1GnwGW9BPKjRXQhDuvfqwj3NjW5bOHk2Zsi6X4HB4YG4fOOIBXgjbGKBS3Ydq8eMYWQUURfhgFzbl0bnDy7U4+2IgbGKt9Ye/5RC0ooLxVVGapYuauiQ65YvhsGKDXljjjSsf9r4DWFx5HX9sOMXRmFu6MSUUy3WRPOmO0KUUNfvfS0qJpe9bgcIYm2f8Um+xJPoHJMTqBlncD8xZHOtU/XyyZ5hRf+R9OT/Dt+z33J5jBRcICpB/xRZemuoh2YVJsGZ+gDdaxSjQbkWyBiOUSxEyzt7qK1WPhwrr+Pgh+XaDTcOVD+EnIj84tVqi6oI7oj1oA50wabpXGzAmRCPFG+5E6gUnrScpA5RfgJzo2xJlv0Xm1u8Lw6aXh9658CSkuQ9rQDJH1BYUQ4ZYEhQEnK4mDuw7uJ8Qa4zWT/GBuqVw9NiP+Z1Uln1IPSaYaHnGh2QlPQn7eGa26KuN1mGlYkTU6EJHnuSeWDYnJ43FN3WUipQasLx2Mh5zqZZwn2JF/rZyM3GiaxUCW1V/ogftLjeF/uPl1W7g==|920 \ No newline at end of file +}//QtdYkppUoKaTdY5U4MpWQMKVukV9hcHTZimoAEi24uteqY7AATApcs8Gok3kpqwVcVQ4aoAG5gR0JmvdVozaWUUZPQH47aYEPNOReH2mbCZL8R2HXOhyArL78Lrz/gblfsHjPByP/p3YGIKw/NVwarEaerHOFEIHJk7ZnGbxrJf6SOJp9Qx1sMjMNG9K5cIst7Q4zQ2eqOH100+/fPRYmGyfyHQEWjA4poAw3orfjM+jNtZq8YKzwK47pmBJnefi7d9MvOuEUU6WIPnSttBb77cFprxsPZg9zT51UyB2jYlD1xGi9h3Gj1Bao3Ztkgx9EzCrUGDKOrZLekGDOjLSv9KlnvHR6kSJikYV7+iCotKi/puX9sZ/aD1HUb5cbOTkztzj6t1Iwi8wkQ4xm1Iks2Kg43x+DuyPHZHfnOjtB6Xjgb5ajBjYumdNVf73zA4WP9BJPCtsXXH0/ahtIVo5RZ1dzZWm8cJDF4jMXxHdcxdSUwK5lntm86Dkyd1u4tbMKUkrPvn6LiDHWzxAp8h4/hzbCYb7PC1BTTM+arXZQOGpZEhmLM4xNNvH3ZRjLF2Y7ufzVE6c/gXeB4rnqqvC+59SC1yR1LVxZ6308JmQhFVHA58IqcuSdjZYnsnnim5f9Z/GH/1xjCV5S+LxX0bSM8dQ2MSR1BRYlyhyXecc5cNjTHf+TxTNwJ58FGLzrLJFkEEDzy9AC+ZTudFFMeYxfvf2I2v4OZWl5o68YqfVd8Rapp3iALmLAARY5R7yDmKLR4HuNd8lb2LLfoypUuDlo40vp6eibqxwle05o7Oue61UXs32njU21y8zL1skhQWvKHYiTJkn1Nw2vJGJasqxYlvXP5yd3/msJ9Aq0KGElucqF0JqV9Z7itfOYKXAqjbCKIeG7hjurn/t9I2RXuI41w==|920 \ No newline at end of file diff --git a/Pages/项目/项目列表.json b/Pages/项目/项目列表.json index 71c7e1b9..25e07772 100644 --- a/Pages/项目/项目列表.json +++ b/Pages/项目/项目列表.json @@ -84,7 +84,12 @@ }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 12.0, + "DesignLengthInPixel": 12.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0, "Mode": 2, "MinLength": { "Unit": 1 @@ -483,12 +488,12 @@ } } ], - "ID": "635727e3-a969-40bf-8833-042f29922657" + "ID": "d0b6ca5f-452b-49fa-b1cb-3b6334c8ca09" } ] } ], - "ID": "321bef2e-7b22-49cb-a855-d198fee975e3" + "ID": "4c6276f6-d101-4950-b717-1d566e42c564" } ] } @@ -825,7 +830,7 @@ "ID": "e40717925d4c4984a620af2a90c8fd5a" } ], - "ID": "d4448d5b-6410-485c-b6d8-96822bc15e73" + "ID": "948a0021-d423-4995-9172-7c836f647bf7" }, { "CommandList": [ @@ -836,7 +841,7 @@ "ID": "464a194e712840acbf20ae688bc8ba74" } ], - "ID": "4419163d-1656-4b20-be0c-748c6972df18" + "ID": "34b1efe7-edd5-4370-b819-fdc9f6b14006" } ] }, @@ -1127,7 +1132,7 @@ ] } ], - "ID": "14f0d91a-8acd-44de-a728-f27175002c62" + "ID": "5a5db4ed-67bd-4428-8244-d2129572d014" }, { "CommandList": [ @@ -1140,7 +1145,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "90792655-9715-4acb-a38a-682ee2c82790" + "ID": "7ce0c6a1-a744-41cf-ab94-72133575cadd" } ] } @@ -1735,4 +1740,4 @@ "Formula": "项目列表!$B$19" } ] -}//LW/qizgaLF3f25QKpPa9y/mtJwkHqXpbl8DTyqrCs4bgs7EWNSVDdp5T0Z1lx3UTkezCrbXY1Injx2OsnCo3G8ftfVjFJUxiFVtkcyOHUkwKT9I/n2LFcoHPbcjJAvaxI6pnj2jpDsgXwQ3grBrr4Vp0NZRnp3lxkLbdtBK0s+jaOdcMjZtGxBCZq1R4+y+rrhOmM38HcH7ldhiqjuovui3jUrmRAvPliJVgQSg32f/2lEFu5W2wSfcSiXWqNhdfIEZRTMM9hZTAAOnN/kwWW9QhXhiIn/ZcogmaRC0oMgBI3pmlVz4CRSl9LvhUc/yhvPqh/I19F1eZf+YBozAVilt+Da2XpfUvg+rVIIYy2ia9kFYQ8kIigcW5KDRx87RTbdFqAcujPXRuso9N5daa0dIk0/SlJ46ESmz1DF3VDy9IyZoWAVTx2M3w91vLIwfn437sLpxKrNbUmxICHJeBsUtyRMa1Mv6Vfs8uUhepQOoUWP0QVSHDmzA6e6jFeg4J/xzT0OJ0FfSgGY6OvukmnBvAUdW1WXQf8EOCjePXzf/YmWcmTqSJMFyh61TCHW4BlMICU76Gd0FIf0ALXhtj/7e4vkZ24pGQLkOyHnUsY3SERzLDFoV6zAlCSLgURq0g729VS0czN+BGyRHJFwsfw/BgxjnE7p7Dn7SPpPOj91fQuXczsddAMZVq066ONC0jVFXHWVxfDz3xnrFgvqjOy0mpwOtEuODbA9KRe2paFYnAZSSUrK1aA7I9Ws9/fZvD9hicnTVGHLHzylepcoTM7zt1OkMocH/q/zFXLOI7atFDW1X6NtW+nKsQW9xjjIcuqNP/Lem8HKfCTk4OsCkzRn9d+hpyCyBvdBWqGN35JhsC5HvIA2MN5nJN7xhFy38+6vk6AsB09x5nTxnjA+uqWQ==|920 \ No newline at end of file +}//fiwgzLITFWxChB+zpirj+Xtx/04R1c+3mRhugTCm8DmkdHnnKuGno7cywHMdcq4l0P9Oh+4j/u9cfKJ0B0FgC3RKd9+LcEBNu2BbD7hcpetx7CPNkgkKZ1yVTL8SN3gj3ZRnlMpFd3QhyU5nCNarx16rm3wgVe1zvf/qnBIY1+6xk7jQcCl/77lSSvVvO4lh93r6nsjY7i0rWV33a0Y6O4h1MV91gmExS1RnFlcmTWC5BcsGVQkpnqhkYv2W85lqnCGxDLX/VEFhS+6H4cCQYvjfCSuZ011NyR7X17NvgOgyOZxonq0S0a2Q3S9aoRbmVZ7qduPLk5f4B5a8MFoRFc7aTOHwX5Aeagxh4EAVgREqH3NpVv3pTK4YAUHjPPDxMQqf7gF7qXSVhIv6hdSVLBXI93kQxRLmVnehklPs1l+LbT70/HxCmMrvEGUnfcCYQxknXqAjbuVF6EM67faSQl43UEdULuvVK/rnG5pOSvUgw+5LNUP1n3L81fkVzEsF19cvMCPjc3MBl2Eom9Vwbt0hsfBtqT/5+OlE/7rrF1tb5kArP6HakQrAy7GymOyKfeyE7d8Gg8awgUngT2hIfb7ZezvZr7ath8M0FzSgomGaAQZ10kXjWh5apv5CoVERXbtv4w6fTqYCbFLWzjQ815f3IftjrN5SziN51XdrFUmDf7VqohIf+6imO0yxOrI3Wzy1UFP6DAclmyqHEL0W8wd9HmsMDWEuT8avUVye208rdjvaGh5sUkPP8VkHBVxftzHKoS7E6YBll458QU7kwQHaPY/R22BPM1BahvxTQnUXqhnKc5FJp7//5ApnZO3xKXk9nE3p7YOecrOXZhOfsEri9fC3e0dux77QyWFMZwaUiFQA0mh9QnYuGV2+BfYYoULlEg+jdHUgqFRg3PkBwQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/页面反馈录入.json b/Pages/项目/项目反馈/页面反馈录入.json index 0e5dce09..f0713eb4 100644 --- a/Pages/项目/项目反馈/页面反馈录入.json +++ b/Pages/项目/项目反馈/页面反馈录入.json @@ -8,12 +8,12 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 36.0 + "DesignLengthInPixel": 99.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 44.0 } }, "3": { @@ -73,99 +73,58 @@ }, "14": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true + "DesignLengthInPixel": 32.0 } }, "15": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true + "DesignLengthInPixel": 32.0 } }, "16": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0, - "IsHidden": true + "DesignLengthInPixel": 15.0 } }, "17": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0, - "IsHidden": true + "DesignLengthInPixel": 440.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } } }, "18": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true + "DesignLengthInPixel": 32.0 } }, "19": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "IsHidden": true + "DesignLengthInPixel": 32.0 } }, "20": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0, - "IsHidden": true + "DesignLengthInPixel": 36.0 } }, "21": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 35.0, - "IsHidden": true + "DesignLengthInPixel": 32.0 } }, "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "23": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "24": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 - } - }, - "25": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 440.0 - } - }, - "26": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "27": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "28": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 36.0 - } - }, - "29": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "30": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true } }, - "31": { + "23": { "GridRowColumnDefinition": { "DesignLengthInPixel": 20.0, "IsHidden": true @@ -173,18 +132,10 @@ } }, "InLogicalVisibleIndexes": [ - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 30, - 31 + 22, + 23 ], - "Count": 32, + "Count": 24, "DefaultSize": 32.0 }, "Cols": { @@ -352,16 +303,6 @@ } }, "31": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "32": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "33": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "Mode": 2, @@ -374,33 +315,29 @@ } } }, - "Count": 34, + "Count": 32, "DefaultSize": 32.0 }, "Values": { - "1,2": "反馈录入", - "3,3": "01", - "3,4": "功能模块", - "7,3": "02", - "7,4": "功能说明", - "11,3": "03", - "11,4": "反馈类型", - "13,4": 1, - "15,3": "04", - "15,4": "处理人", - "19,3": "05", - "19,4": "优化级", - "21,4": "2", - "23,3": "06", - "23,4": "需求描述", - "28,28": "提交", - "30,0": "项目ID", - "30,6": "反馈表ID", - "30,12": "当前用户", - "30,15": "%CurrentUser%" + "1,1": "反 馈 录 入", + "3,2": "01", + "3,3": "关联任务", + "7,2": "02", + "7,3": "功能说明", + "11,2": "03", + "11,3": "反馈类型", + "13,3": 1, + "15,2": "04", + "15,3": "需求描述", + "20,27": "提交", + "22,2": "项目ID", + "22,7": "反馈表ID", + "22,13": "当前用户", + "22,16": "%CurrentUser%", + "22,19": "%CurrentUser.Email%" }, "AttachInfos": { - "5,4": { + "5,3": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "关联任务", @@ -733,16 +670,19 @@ }, "CustomColumns": [] }, + "expandTrigger": 1, "placeholder": "请选择", "separator": "/", "tagType": "info", - "checkStrictly": true + "checkStrictly": true, + "filterable": true, + "clearable": true }, "DataValidationInfo": { "IgnoreBlank": false } }, - "9,4": { + "9,3": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "功能", @@ -772,19 +712,22 @@ } ], "type": "text", - "placeholder": "请填写功能名称", + "placeholder": "请描述遇到问题的功能", "resize": "none" } }, - "13,4": { + "13,3": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "反馈类型", "GUID": "55610aae-f9ff-44f1-9bdc-554ce1f2da07" }, + "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", - "Style": 1, + "Style": 3, + "PrimaryColor": "Background 2 -10", + "SecondaryColor": "Text 1 0", "CellDefaultValue": 1, "ItemSpace": 15, "IsBounding": true, @@ -803,146 +746,7 @@ }, "DataValidationInfo": {} }, - "17,4": { - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "处理人", - "GUID": "118fe0d9-10e0-4c04-b4ea-ad07ec3d2850" - }, - "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": "96756622-d0e8-4847-a05a-3b72342af278", - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "14a347ea-72e8-4f9b-8591-5f80ac36c8b2" - }, - "ColumnName": "value" - }, - { - "GUID": "317ddfae-c2a5-4ba1-99af-bd692690dd5c", - "BindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目成员", - "GUID": "573cf450-ecbe-4d33-a082-0e9112bc9ba6" - }, - "ColumnName": "label" - } - ], - "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目成员表", - "ColumnName": "项目ID", - "GUID": "6bbc5562-56fd-4683-801e-bc2a57543e60" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页面反馈录入!项目ID" - } - }, - "CustomColumns": [] - }, - "placeholder": "请选择", - "noDataText": "无数据", - "multiple": true, - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据" - }, - "DataValidationInfo": { - "IgnoreBlank": false - } - }, - "21,4": { - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "优先级", - "GUID": "d247a2c1-3c26-4b23-9332-bb16943a390d" - }, - "CellType": { - "$type": "ElementUI.SelectCellType, ElementUI", - "CommandList": [], - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "DefaultValue": "2", - "options": [ - { - "value": "1", - "label": "紧级" - }, - { - "value": "2", - "label": "普通" - } - ], - "placeholder": "请选择", - "noDataText": "无数据", - "filterInServerOptions": { - "matchMethod": "contains", - "loadingText": "加载中" - }, - "noMatchText": "无匹配数据" - } - }, - "25,4": { + "17,3": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "内容", @@ -966,7 +770,7 @@ ] } }, - "28,28": { + "20,27": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -987,7 +791,7 @@ "ParamName": "关联任务", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页面反馈录入!E6" + "SerializeProperty": "=页面反馈录入!任务ID" } }, { @@ -995,7 +799,7 @@ "ParamName": "反馈类型", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页面反馈录入!E14" + "SerializeProperty": "=页面反馈录入!反馈类型" } }, { @@ -1003,7 +807,7 @@ "ParamName": "功能", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页面反馈录入!E10" + "SerializeProperty": "=页面反馈录入!功能说明" } }, { @@ -1011,7 +815,7 @@ "ParamName": "内容", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页面反馈录入!E26" + "SerializeProperty": "=页面反馈录入!需求描述" } }, { @@ -1024,7 +828,11 @@ }, { "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "联系方式" + "ParamName": "联系方式", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=页面反馈录入!T23" + } } ], "ResultErrorCodeTo": { @@ -1044,66 +852,6 @@ "RefreshAfterFinish": true, "CheckDataValidation": true }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=页面反馈录入!反馈表ID" - } - ] - }, - "value": "%Null%" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "需求反馈登记表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "项目ID", - "GUID": "3bb66ce3-0121-4e50-acae-190c777a4559" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=页面反馈录入!项目ID" - } - }, - { - "BindingInfo": { - "TableName": "需求反馈登记表", - "ColumnName": "提交人", - "GUID": "c53ef84f-6de4-4210-8324-3f0c67274216" - }, - "Value": "%CurrentUser.UserName%" - } - ] - } - ], - "ID": "919d8e9c-a664-4449-b94c-9407c773350c" - }, - { - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "需求反馈登记表", - "ShowConfirm": false - } - ], - "ID": "954859da-6eaa-40ae-b98a-952845cc8255" - } - ], - "Disabled": true - }, { "$type": "ElementUI.Commands.ShowMessage, ElementUI", "Message": "提交成功！", @@ -1120,14 +868,14 @@ "TemplateKey": "_RS_Main1" } }, - "30,3": { + "22,4": { "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", "GUID": "4e356784-9a58-4a60-85ab-4ba5a9ad79c3" } }, - "30,9": { + "22,10": { "BindingInfo": { "TableName": "需求反馈登记表", "ColumnName": "ID", @@ -1138,59 +886,64 @@ "StyleDatas": { "Styles": [ { - "FontSize": 18.666666666666664, + "FontSize": 34.666666666666664, "FontWeight": 0, - "HorizontalAlignment": 1 + "Foreground": 1, + "HorizontalAlignment": 2 }, { - "FontFamily": 2, + "FontFamily": 3, "FontSize": 16.0, - "Foreground": 3, - "Formatter": 4, - "HorizontalAlignment": 5 + "Foreground": 4, + "Formatter": 5, + "HorizontalAlignment": 6 }, { - "FontFamily": 2, + "FontFamily": 3, "FontSize": 16.0, - "Foreground": 6 + "Foreground": 7 }, { - "FontFamily": 2 + "FontFamily": 3 }, { - "FontFamily": 2, + "FontFamily": 3, "FontSize": 14.666666666666666 }, { - "FontFamily": 2, + "FontFamily": 3, "FontSize": 16.0, - "Foreground": 6, - "Formatter": 7 + "Foreground": 7, + "Formatter": 8 }, { - "FontFamily": 2, - "HorizontalAlignment": 8 + "FontFamily": 3, + "HorizontalAlignment": 9 }, { - "FontFamily": 2, - "HorizontalAlignment": 5 + "FontFamily": 3, + "HorizontalAlignment": 6 }, { + "FontFamily": 3, "BorderBottom": 0, "BorderTop": 0, "BorderLeft": 0, "BorderRight": 0 }, { + "FontFamily": 3, "BorderBottom": 0, "BorderTop": 0, "BorderLeft": 0 }, { + "FontFamily": 3, "BorderBottom": 0, "BorderTop": 0 }, { + "FontFamily": 3, "BorderBottom": 0, "BorderTop": 0, "BorderRight": 0 @@ -1199,6 +952,7 @@ "Types": { "Strs": [ "Bold", + "Background 1 0", "Center", "Body", "Accent 1 0", @@ -1210,14 +964,15 @@ ], "Borders": [ { - "Color": 6 + "Color": 7 } ] }, "CellStyles": { - "1,2": 0, - "3,3": 1, - "3,4": 2, + "1,1": 0, + "3,2": 1, + "3,3": 2, + "3,4": 3, "3,5": 3, "3,6": 3, "3,7": 3, @@ -1243,7 +998,7 @@ "3,27": 3, "3,28": 3, "3,29": 3, - "3,30": 3, + "4,2": 3, "4,3": 3, "4,4": 3, "4,5": 3, @@ -1271,9 +1026,9 @@ "4,27": 3, "4,28": 3, "4,29": 3, - "4,30": 3, - "5,3": 3, - "5,4": 4, + "5,2": 3, + "5,3": 4, + "6,2": 3, "6,3": 3, "6,4": 3, "6,5": 3, @@ -1301,9 +1056,9 @@ "6,27": 3, "6,28": 3, "6,29": 3, - "6,30": 3, - "7,3": 1, - "7,4": 5, + "7,2": 1, + "7,3": 5, + "7,4": 3, "7,5": 3, "7,6": 3, "7,7": 3, @@ -1311,8 +1066,8 @@ "7,9": 3, "7,10": 3, "7,11": 3, - "7,12": 3, - "7,13": 6, + "7,12": 6, + "7,13": 3, "7,14": 3, "7,15": 3, "7,16": 3, @@ -1329,8 +1084,7 @@ "7,27": 3, "7,28": 3, "7,29": 3, - "7,30": 3, - "7,32": 2, + "8,2": 3, "8,3": 3, "8,4": 3, "8,5": 3, @@ -1358,11 +1112,9 @@ "8,27": 3, "8,28": 3, "8,29": 3, - "8,30": 3, - "8,32": 3, + "9,2": 3, "9,3": 3, - "9,4": 3, - "9,32": 4, + "10,2": 3, "10,3": 3, "10,4": 3, "10,5": 3, @@ -1390,9 +1142,9 @@ "10,27": 3, "10,28": 3, "10,29": 3, - "10,30": 3, - "11,3": 1, - "11,4": 5, + "11,2": 1, + "11,3": 5, + "11,4": 3, "11,5": 3, "11,6": 3, "11,7": 3, @@ -1418,8 +1170,8 @@ "11,27": 3, "11,28": 3, "11,29": 3, - "11,30": 3, - "12,3": 7, + "12,2": 7, + "12,3": 3, "12,4": 3, "12,5": 3, "12,6": 3, @@ -1446,168 +1198,104 @@ "12,27": 3, "12,28": 3, "12,29": 3, - "12,30": 3, - "12,32": 2, - "13,3": 7, - "13,4": 3, - "13,32": 3, - "14,3": 7, - "14,4": 3, - "14,5": 3, - "14,6": 3, - "14,7": 3, - "14,8": 3, - "14,9": 3, - "14,10": 3, - "14,11": 3, - "14,12": 3, - "14,13": 3, - "14,14": 3, - "14,15": 3, - "14,16": 3, - "14,17": 3, - "14,18": 3, - "14,19": 3, - "14,20": 3, - "14,21": 3, - "14,22": 3, - "14,23": 3, - "14,24": 3, - "14,25": 3, - "14,26": 3, - "14,27": 3, - "14,28": 3, - "14,29": 3, - "14,30": 3, - "14,32": 4, - "15,3": 1, - "16,3": 7, - "17,3": 7, - "18,3": 7, - "18,4": 3, - "18,5": 3, - "18,6": 3, - "18,7": 3, - "18,8": 3, - "18,9": 3, - "18,10": 3, - "18,11": 3, - "18,12": 3, - "18,13": 3, - "18,14": 3, - "18,15": 3, - "18,16": 3, - "18,17": 3, - "18,18": 3, - "18,19": 3, - "18,20": 3, - "18,21": 3, - "18,22": 3, - "18,23": 3, - "18,24": 3, - "18,25": 3, - "18,26": 3, - "18,27": 3, - "18,28": 3, - "18,29": 3, - "18,30": 3, - "19,3": 1, - "20,3": 7, - "21,3": 7, - "22,3": 7, - "22,4": 4, - "22,5": 4, - "22,6": 4, - "22,7": 4, - "22,8": 4, - "22,9": 4, - "22,10": 4, - "22,11": 4, - "22,12": 4, - "22,13": 4, - "22,14": 4, - "22,15": 4, - "22,16": 4, - "22,17": 4, - "22,18": 4, - "22,19": 4, - "22,20": 4, - "22,21": 4, - "22,22": 4, - "22,23": 4, - "22,24": 4, - "22,25": 4, - "22,26": 4, - "22,27": 4, - "22,28": 4, - "22,29": 4, - "22,30": 4, - "23,3": 1, - "23,4": 5, - "23,5": 3, - "23,6": 3, - "23,7": 3, - "23,8": 3, - "23,9": 3, - "23,10": 3, - "23,11": 3, - "23,12": 3, - "23,13": 3, - "23,14": 3, - "23,15": 3, - "23,16": 3, - "23,17": 3, - "23,18": 3, - "23,19": 3, - "23,20": 3, - "23,21": 3, - "23,22": 3, - "23,23": 3, - "23,24": 3, - "23,25": 3, - "23,26": 3, - "23,27": 3, - "23,28": 3, - "23,29": 3, - "23,30": 3, - "30,0": 8, - "30,1": 8, - "30,2": 8, - "30,3": 8, - "30,4": 8, - "30,5": 9, - "30,6": 8, - "30,7": 8, - "30,8": 8, - "30,9": 9, - "30,10": 10, - "30,11": 10, - "30,12": 8, - "30,13": 8, - "30,14": 8, - "30,15": 9, - "30,16": 10, - "30,17": 11 + "13,2": 7, + "13,3": 3, + "14,2": 7, + "14,3": 4, + "14,4": 4, + "14,5": 4, + "14,6": 4, + "14,7": 4, + "14,8": 4, + "14,9": 4, + "14,10": 4, + "14,11": 4, + "14,12": 4, + "14,13": 4, + "14,14": 4, + "14,15": 4, + "14,16": 4, + "14,17": 4, + "14,18": 4, + "14,19": 4, + "14,20": 4, + "14,21": 4, + "14,22": 4, + "14,23": 4, + "14,24": 4, + "14,25": 4, + "14,26": 4, + "14,27": 4, + "14,28": 4, + "14,29": 4, + "15,2": 1, + "15,3": 5, + "15,4": 3, + "15,5": 3, + "15,6": 3, + "15,7": 3, + "15,8": 3, + "15,9": 3, + "15,10": 3, + "15,11": 3, + "15,12": 3, + "15,13": 3, + "15,14": 3, + "15,15": 3, + "15,16": 3, + "15,17": 3, + "15,18": 3, + "15,19": 3, + "15,20": 3, + "15,21": 3, + "15,22": 3, + "15,23": 3, + "15,24": 3, + "15,25": 3, + "15,26": 3, + "15,27": 3, + "15,28": 3, + "15,29": 3, + "22,2": 8, + "22,3": 8, + "22,4": 8, + "22,5": 8, + "22,6": 9, + "22,7": 8, + "22,8": 8, + "22,9": 8, + "22,10": 9, + "22,11": 10, + "22,12": 10, + "22,13": 8, + "22,14": 8, + "22,15": 8, + "22,16": 9, + "22,17": 10, + "22,18": 11, + "22,19": 3, + "22,20": 3, + "22,21": 3, + "22,22": 3 }, "SheetStyle": { - "FontFamily": 2 + "FontFamily": 3 } }, "Spans": [ - "1,2,1,30", - "30,0,1,3", - "30,3,1,3", - "25,4,1,28", - "13,4,1,27", - "28,28,1,4", - "17,4,1,27", - "21,4,1,27", - "5,4,1,27", - "9,4,1,27", - "30,6,1,3", - "30,9,1,3", - "30,12,1,3", - "30,15,1,3" + "1,1,1,30", + "17,3,1,28", + "13,3,1,27", + "20,27,1,4", + "5,3,1,27", + "9,3,1,27", + "22,2,1,2", + "22,4,1,3", + "22,7,1,3", + "22,10,1,3", + "22,13,1,3", + "22,16,1,3", + "22,19,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1633,18 +1321,51 @@ "PaperSize": {}, "Margin": {} }, + "BackgroundPictures": [ + { + "Name": "f9b51ef2-5cbe-4834-ba15-33d3f174de37.png", + "DisplayName": "背景图1", + "ForguncyPictureName": "O1CN019ydWkT1WNumjyWmm0_!!6000000002777-0-tps-4000-912.jpg", + "ForguncyPictureSourceType": 0, + "StyleInfo": { + "CornerRadius": 9.54166666666612 + }, + "Location": "32,20", + "Size": "960,99" + } + ], "CustomNames": [ { "Name": "项目ID", - "Formula": "页面反馈录入!$D$31" + "Formula": "页面反馈录入!$E$23" }, { "Name": "反馈表ID", - "Formula": "页面反馈录入!$J$31" + "Formula": "页面反馈录入!$K$23" }, { "Name": "当前用户", - "Formula": "页面反馈录入!$P$31" + "Formula": "页面反馈录入!$Q$23" + }, + { + "Name": "任务ID", + "Formula": "页面反馈录入!$D$6" + }, + { + "Name": "反馈类型", + "Formula": "页面反馈录入!$D$14" + }, + { + "Name": "优先级", + "Formula": "#REF!" + }, + { + "Name": "需求描述", + "Formula": "页面反馈录入!$D$18" + }, + { + "Name": "功能说明", + "Formula": "页面反馈录入!$D$10" } ] -}//UilAdbuR0mUzEkklIxZS7zgYBwObwJ630pujZIm6QeTOT5noZt83pDwFzoXtrOwQ2TVnR2Fe8VHhX1jSF+BziCIGMuQjoz0hcBeOhPFW9ESJU3ufvxj7ZpbYvJy5nTwsu3ke0DZIqYpbF+czhyxApMQYb0QGw2MDMAVXxDNO1Id1T/gcCkBCsGumFGc7VSZbQP0tcXRQH2cF6IuaFX/WsmkgERkoI3w326oGqoievOmqz11R7dXZtn6FLhjIZ2B5PHUHNmTlkTmiHNYT08Touvx4kgtWvUeSP0qKXfTt5V91jjWRYb1xToiNUnvc3Upn5hSHWWobm+scaiSSJpD4ftncFjg1pTst8cOatQq9pXTedE7alK8omp6isLfgcJdcL2GLYyQPJhKPIumDC5gn8ymSJHjILirbpY5jdvgBHJj9iOkZ6UiuTB85LvExgPYrvVc+t57BZmVYH41AA+MJh81RyY43mIZLaBadCxfuL6bQ7EjydeeA63owELTA0i9Rdac+HfRSk9ESN6iHVXBUtCUDDXK4UjGow/E6XrzDuMmA2ZkSX1jea88QjbrgBQAmYDslMo+6uwzOHS3pwDn9QMzk+V+2Zr4l0MTGOI5FKF4hcJ35f9HclM89lNdwPxQ4d2EWSv+L1oqevCVAkd8iomznBRsvIgLqmNmnzEzBfZ6nmlhga4rzEeZL4fTGm5wgIV8vMj6es5EVA+zosTC0NOB48YLx1jGdhfKtqrrtzTfz9DIAdu9yMAi37yjlXUAyfxVPAQOBbuNr6t3VtSVq5DXrug89gslG2TiTiroJ5KafvzJ0Y04ispMb1nme/hCrm2pmEiYPFR0407K70bn2iqo+Eev3RID7oiEgFpDRsuJ5cTLwSSSIInNXcmC+j+JX3xa/BWMLc0BiinK2QDWIRg==|920 \ No newline at end of file +}//24tyr2Q+7LGWwNV22MQ3Sm3sEggzvBh8iJP8EUHbRcJnHeJwjc2UTm0GsXEsBFRZFxlphgMPKzYqpVNrtbU8ivwmjZ66jg3FHa7j2kaHsqDnjJFraOWR/HtLnYfo4AkBataujKDLKq4JsW8mNTYeayN5dxhIQ4jesOfsQmk4YVe57l4m8+iD7UV5X5tPtSpr0+Xmkp1XJ8m2Qb/zQ/Q9xpb9pQXwnBB/oK2+B+TnHtUJvFQNn8sqFNpc8IbUeJvTF5qBGeFij4v5+qhCqor0asPEyfoBUDGjDvNCiPuXYjZB5e2yI8OZt1OTk1gMe0Idl2ykHHVVgiWvsKQ5Gndd82w+F2zhhFIgqrnm8Sq9CPxyN94VR388R54ZnjDaoah9ZeCGmP6K4Xb61XXPPFGaQEa+zKHhB9DP2TzJjYTyCqC5oaZH4nucSiUeJqmoF5x6fF4JjtIHeDlX6QrnB/sbO9ar7EP8uZ6w75D3YLYNpa5BDr1rl4mrGL8JMvI8O8ElZFYB8ecmy5Gg/ibq5tgBLIISaPqv1hhXypvfCv2j5OGsKUmp2wa/MGEJPA2kcoFZHD1HJ5r8mk2Z0B7dbAzRGe4zUd7kudVdv2Oa3r0Iad/mBaVWScVBoOuHTe4ahC6jA9pvETWThfqNJnu6GxNzQn1JdQlBBJCcPrn59fYBjBHLGymqchDcLpNeaJLn21dZuAQH4wBQBWp5DturzdaThTIiRydssnV+06Dqo/xcJW2DsUssMS57LbZotAgbxsywNM3dfWEjK0ExU5JXLlfFzysbAHqXfeRlZhlm02I13PInH3hWn3gD8V31uSdXolGDJNrSb8cieJEGzIGcWd7BwmA9C1TP+3RQut/XPBS2jQZlS2JXgjv0Jw8ibs3/oha5EbH5LqEZxMst20u5g1t4oQ==|920 \ No newline at end of file diff --git a/Pages/项目/项目反馈/页面反馈录入.rd b/Pages/项目/项目反馈/页面反馈录入.rd index aa3acf63..bc1018d6 100644 --- a/Pages/项目/项目反馈/页面反馈录入.rd +++ b/Pages/项目/项目反馈/页面反馈录入.rd @@ -1,19 +1,39 @@ { "PageType": 0, - "ColumnCount": 34, - "RowCount": 32, + "ColumnCount": 32, + "RowCount": 24, "CustomNames": [ { "Name": "项目ID", - "Formula": "页面反馈录入!$D$31" + "Formula": "页面反馈录入!$E$23" }, { "Name": "反馈表ID", - "Formula": "页面反馈录入!$J$31" + "Formula": "页面反馈录入!$K$23" }, { "Name": "当前用户", - "Formula": "页面反馈录入!$P$31" + "Formula": "页面反馈录入!$Q$23" + }, + { + "Name": "任务ID", + "Formula": "页面反馈录入!$D$6" + }, + { + "Name": "反馈类型", + "Formula": "页面反馈录入!$D$14" + }, + { + "Name": "优先级", + "Formula": "#REF!" + }, + { + "Name": "需求描述", + "Formula": "页面反馈录入!$D$18" + }, + { + "Name": "功能说明", + "Formula": "页面反馈录入!$D$10" } ] } \ No newline at end of file diff --git a/ServerCommands/项目反馈/后端新增项目反馈.json b/ServerCommands/项目反馈/后端新增项目反馈.json index 6647f746..dd03a829 100644 --- a/ServerCommands/项目反馈/后端新增项目反馈.json +++ b/ServerCommands/项目反馈/后端新增项目反馈.json @@ -225,7 +225,7 @@ "ID": "36d524a116e94268a28ae43a78000681" } ], - "ID": "c870e438-4320-453a-b094-f9dfba65e9cb" + "ID": "23bdfe0c-4bc1-4b83-867a-863e7dcefe32" }, { "CommandList": [ @@ -239,7 +239,7 @@ "ID": "06423efe302442ee9dbab0c23a871517" } ], - "ID": "fed796c4-4a77-40db-a569-dd3d0484e5c6" + "ID": "9ae71c37-7c77-40c2-9f52-388611bc5b0c" } ] }, @@ -266,7 +266,7 @@ "ID": "a00a8dbe906243ee8faf281be3f7fed4" } ], - "ID": "bb9e390c-dd09-4b32-824e-152f7d900765" + "ID": "1bca7f7e-c859-4c96-bdc0-f3dbdee353c8" } ] }, @@ -417,7 +417,7 @@ ] } ], - "ID": "979f48e8-4d6e-4e95-9288-8596a002981e" + "ID": "d751c4ab-6958-4e15-a0ef-c95bbdc9a929" }, { "CommandList": [ @@ -432,7 +432,7 @@ ] } ], - "ID": "ddcf6b24-8059-4f58-a28b-c9af95818816" + "ID": "8f53a7c0-72da-4bb7-842c-3d03f3a2eae1" } ] } diff --git a/Tables/项目/View_项目统计信息.json b/Tables/项目/View_项目统计信息.json index 2ada2929..c492040d 100644 --- a/Tables/项目/View_项目统计信息.json +++ b/Tables/项目/View_项目统计信息.json @@ -71,6 +71,7 @@ }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, "DatabaseColumnType": "int", "MaxLength": -1, "Name": "项目成员数", @@ -177,7 +178,7 @@ "ConnectionId": "业务表", "SourceTableName": "View_项目统计信息", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH c1 AS(\r\nSELECT\r\n p.[ID] AS [项目ID],\r\n p.[项目名称] AS [项目标题],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[项目状态],\r\n ISNULL(SUM(t.计算提成), 0) AS [总成本],\r\n ISNULL(SUM(t.计划工时), 0) AS [总计划工时],\r\n ISNULL(SUM(t.上报工时), 0) AS [总上报工时],\r\n ISNULL(SUM(t.实际工时), 0) AS [总实际工时],\r\n COUNT(DISTINCT t.执行人) AS [项目成员数],\r\n COUNT(t.ID) AS [总任务数量]\r\nFROM\r\n [dbo].[项目表] p\r\n LEFT JOIN [View_任务工时统计] t ON p.ID = t.[项目ID]\r\nGROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[项目状态]\r\n)\r\n\r\nSELECT\r\nc1.[项目ID],\r\nc1.[项目标题],\r\nc1.[项目预算工时],\r\nc1.[项目预算费用],\r\nc1.[项目状态],\r\nc1.[总成本],\r\nc1.[总计划工时],\r\nc1.[总上报工时],\r\nc1.[总实际工时],\r\nc1.[项目成员数],\r\nc1.[总任务数量],\r\nSUM(\r\n CASE\r\n WHEN task.[任务状态] = 3 THEN 1\r\n ELSE 0\r\n END\r\n ) AS [已完成任务数],\r\n SUM(\r\n CASE\r\n WHEN ISNULL(task.[任务状态], 0) < 3 THEN 1\r\n ELSE 0\r\n END\r\n ) AS [未完成任务数],\r\n SUM(ISNULL(task.任务预算工时, 0)) AS [已分配任务工时]\r\nFROM c1\r\nLEFT JOIN [任务表] task ON c1.[项目ID] = task.[项目ID] AND [任务状态] > 1\r\nGROUP BY\r\nc1.[项目ID],\r\nc1.[项目标题],\r\nc1.[项目预算工时],\r\nc1.[项目预算费用],\r\nc1.[项目状态],\r\nc1.[总成本],\r\nc1.[总计划工时],\r\nc1.[总上报工时],\r\nc1.[总实际工时],\r\nc1.[项目成员数],\r\nc1.[总任务数量]", + "CreateViewSql": "-- 预先处理子查询，建立临时表 \r\nWITH cy AS (\r\n SELECT\r\n [项目ID],\r\n COUNT(DISTINCT [项目成员]) AS [项目成员数]\r\n FROM\r\n [项目成员表]\r\n GROUP BY\r\n [项目ID]\r\n), c1 AS (\r\n SELECT\r\n p.[ID] AS [项目ID],\r\n p.[项目名称] AS [项目标题],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[项目状态],\r\n ISNULL(SUM(t.计算提成), 0) AS [总成本],\r\n ISNULL(SUM(t.计划工时), 0) AS [总计划工时],\r\n ISNULL(SUM(t.上报工时), 0) AS [总上报工时],\r\n ISNULL(SUM(t.实际工时), 0) AS [总实际工时],\r\n ISNULL(cy.[项目成员数], 0) AS [项目成员数],\r\n COUNT(t.ID) AS [总任务数量]\r\n FROM\r\n [dbo].[项目表] p\r\n LEFT JOIN [View_任务工时统计] t ON p.ID = t.[项目ID]\r\n LEFT JOIN cy ON p.ID = cy.[项目ID]\r\n GROUP BY\r\n p.[ID],\r\n p.[项目名称],\r\n p.[项目预算工时],\r\n p.[项目预算费用],\r\n p.[项目状态],\r\n cy.[项目成员数]\r\n)\r\n\r\nSELECT\r\n c1.[项目ID],\r\n c1.[项目标题],\r\n c1.[项目预算工时],\r\n c1.[项目预算费用],\r\n c1.[项目状态],\r\n c1.[总成本],\r\n c1.[总计划工时],\r\n c1.[总上报工时],\r\n c1.[总实际工时],\r\n c1.[项目成员数],\r\n c1.[总任务数量],\r\n SUM(\r\n CASE\r\n WHEN task.[任务状态] = 3 THEN 1\r\n ELSE 0\r\n END\r\n ) AS [已完成任务数],\r\n SUM(\r\n CASE\r\n WHEN ISNULL(task.[任务状态], 0) < 3 THEN 1\r\n ELSE 0\r\n END\r\n ) AS [未完成任务数],\r\n SUM(ISNULL(task.任务预算工时, 0)) AS [已分配任务工时]\r\nFROM c1\r\nLEFT JOIN [任务表] task ON c1.[项目ID] = task.[项目ID] AND task.[任务状态] > 1\r\nGROUP BY\r\n c1.[项目ID],\r\n c1.[项目标题],\r\n c1.[项目预算工时],\r\n c1.[项目预算费用],\r\n c1.[项目状态],\r\n c1.[总成本],\r\n c1.[总计划工时],\r\n c1.[总上报工时],\r\n c1.[总实际工时],\r\n c1.[项目成员数],\r\n c1.[总任务数量]", "ViewInfo": { "ViewName": "View_项目统计信息", "IsUpdatable": true, diff --git a/Upload/ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.medium.png b/Upload/ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.medium.png new file mode 100644 index 00000000..cd5ae077 Binary files /dev/null and b/Upload/ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.medium.png differ diff --git a/Upload/ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.png b/Upload/ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.png new file mode 100644 index 00000000..2b2b677b Binary files /dev/null and b/Upload/ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.png differ diff --git a/Upload/ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.small.png b/Upload/ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.small.png new file mode 100644 index 00000000..4d31a89e Binary files /dev/null and b/Upload/ca3fa24b-82df-4af6-a1f2-aa221048f4fb_conver.small.png differ diff --git a/Upload/f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.png b/Upload/f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.png new file mode 100644 index 00000000..b5c0a920 Binary files /dev/null and b/Upload/f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.png differ diff --git a/Upload/f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.small.png b/Upload/f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.small.png new file mode 100644 index 00000000..6d24ad92 Binary files /dev/null and b/Upload/f1363a17-58ca-4373-8aea-72deeb26b1c2_深色LOGO 拷贝 3.small.png differ diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css index de36ae84..8b69a82c 100644 --- a/UserFile/BaseCss.css +++ b/UserFile/BaseCss.css @@ -1,3 +1,8 @@ +/* 图片满铺 */ +.img-cover .Fgc_2 { + background-size: cover; +} + /* 版本标签样式 */ .versionTag label { width: auto !important;