diff --git a/.collaboration b/.collaboration index e6645d75..7ffb4080 100644 --- a/.collaboration +++ b/.collaboration @@ -1246,19 +1246,7 @@ }, { "ModuleName": "PCPage/工作台首页", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-08T22:28:15.0484855+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\工作台\\工作台首页.json", - "Pages\\工作台\\工作台首页.rd", - "Pages\\3868fc7f40b841649f14b5adba61954.json", - "Pages\\3868fc7f40b841649f14b5adba61954.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工作台_关键信息", @@ -1898,17 +1886,7 @@ }, { "ModuleName": "RdlReport/人员工时报表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-08T22:23:23.9409937+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\人员工时报表.json", - "Reports\\人员工时报表.rdlx" - ] + "ModuleType": 18 }, { "ModuleName": "RdlReport/项目工时报表", @@ -1918,20 +1896,6 @@ "ModuleName": "RdlReport/客户部门工时报表", "ModuleType": 18 }, - { - "ModuleName": "RdlReport/人员汇报报表", - "State": 2, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-08T22:26:57.2286108+08:00", - "ModuleType": 18, - "ToRemoveFiles": [ - "Reports\\人员汇报报表.json", - "Reports\\人员汇报报表.rdlx" - ] - }, { "ModuleName": "RdlReport/客户工时报表", "ModuleType": 18 @@ -2522,51 +2486,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-08T22:28:35.9665519+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "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.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_5_0.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\加载动画-10_0_2_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.zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\标签页和打开标签命令-10_0_2_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\\读取管理控制台日志-10_0_5_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\钉钉SDK2.0-10_0_5_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Pages/工作台/工作台首页.json b/Pages/工作台/工作台首页.json index 66fcbcc0..3bf3363c 100644 --- a/Pages/工作台/工作台首页.json +++ b/Pages/工作台/工作台首页.json @@ -764,7 +764,7 @@ } ], "ImageDataSource": [], - "Config": "{\"option\":\"var data = JSONContext.data; \\nconsole.log(data); \\nconst persons = [...new Set(data.map(item => item.person || \\\"未知成员\\\"))]; \\nconst projects = [...new Set(data.map(item => item.project || \\\"未知项目\\\"))]; \\n// 定义人员颜色 \\nconst personColors = ['#ff6666', '#66ccff', '#ffcc66', '#8bc34a', '#cc66ff', '#86665a', '#9742ca', '#ff6738']; \\n\\n// 计算每个项目关联的人员数量 \\nconst projectPersonCount = projects.reduce((acc, project) => { \\n acc[project] = data.filter(item => item.project === project).length; \\n return acc; \\n}, {}); \\n\\n// 处理数据，创建节点和边 \\nconst nodes = [ \\n // 添加人员节点 \\n ...persons.map((person, index) => ({ \\n name: person, \\n value: person, \\n category: 0, \\n symbolSize: 80, \\n itemStyle: { \\n color: personColors[index % personColors.length], \\n }, \\n label: { \\n position: 'inside', \\n fontSize: 16, \\n fontWeight: 'bold', \\n color: '#fff', \\n }, \\n })), \\n // 添加项目节点 \\n ...projects.map(project => ({ \\n name: project, \\n value: project, \\n category: 1, \\n // 根据关联人数动态设置大小，基础大小为60 \\n symbolSize: 60 + (projectPersonCount[project] * 15), \\n itemStyle: { \\n color: '#4b4b4b7a' \\n }, \\n label: { \\n position: 'inside', \\n fontSize: 14, \\n color: '#fff', \\n width: 70, \\n overflow: 'break', \\n lineHeight: 18, \\n // 添加关联人数显示 \\n formatter: function(params) { \\n return `${params.name}\\\\n(${projectPersonCount[params.name]}人)`; \\n } \\n }, \\n })) \\n]; \\n\\nconsole.log(nodes); \\n\\nconst links = data.map(rel => ({ \\n source: rel.person, \\n target: rel.project, \\n value: rel.project, \\n})); \\n\\noption = { \\n backgroundColor: \\\"rgba(0, 0, 0, 0)\\\", \\n title: { \\n text: '项目关系图', \\n subtext: '展示人员与项目之间的关系', \\n left: \\\"center\\\", \\n top: 24, \\n textStyle: { \\n fontSize: 16, \\n fontWeight: \\\"bold\\\", \\n }, \\n }, \\n tooltip: {}, \\n animationDuration: 1500, \\n animationEasingUpdate: 'quinticInOut', \\n series: [{ \\n name: '项目关系图', \\n type: 'graph', \\n layout: 'force', \\n data: nodes, \\n links: links, \\n top: 100, \\n categories: [ \\n { name: '人员' }, \\n { name: '项目' } \\n ], \\n roam: true, \\n label: { \\n show: true, \\n position: 'right', \\n formatter: '{b}' \\n }, \\n force: { \\n repulsion: 5000, \\n gravity: 1, \\n friction: 0.3, \\n layoutAnimation: false, \\n }, \\n draggable: false, \\n lineStyle: { \\n color: 'source', \\n curveness: 0.3, \\n width: 1 \\n }, \\n edgeLabel: { \\n show: false, \\n position: 'middle', \\n formatter: function (params) { \\n return params.data.value; \\n }, \\n fontSize: 12 \\n }, \\n emphasis: { \\n focus: 'adjacency', \\n lineStyle: { \\n width: 10 \\n } \\n } \\n }] \\n};\",\"graphTheme\":null,\"displayMode\":\"canvas\",\"jsCode\":\"\\n async ({Context,JSONContext,ImageContext,echarts,myChart,dat,Forguncy,d3,setInterval,setTimeout,ForguncyEchartsHelper,PublicResource})=>{\\n var datGUI=undefined;\\n var option={};\\n var data = JSONContext.data;\\nconsole.log(data);\\nconst persons = [...new Set(data.map(item => item.person || \\\"未知成员\\\"))];\\nconst projects = [...new Set(data.map(item => item.project || \\\"未知项目\\\"))];\\n// 定义人员颜色 \\nconst personColors = ['#ff6666', '#66ccff', '#ffcc66', '#8bc34a', '#cc66ff', '#86665a', '#9742ca', '#ff6738'];\\n// 计算每个项目关联的人员数量 \\nconst projectPersonCount = projects.reduce((acc, project) => {\\n acc[project] = data.filter(item => item.project === project).length;\\n return acc;\\n}, {});\\n// 处理数据，创建节点和边 \\nconst nodes = [\\n // 添加人员节点 \\n ...persons.map((person, index) => ({\\n name: person,\\n value: person,\\n category: 0,\\n symbolSize: 80,\\n itemStyle: {\\n color: personColors[index % personColors.length],\\n },\\n label: {\\n position: 'inside',\\n fontSize: 16,\\n fontWeight: 'bold',\\n color: '#fff',\\n },\\n })),\\n // 添加项目节点 \\n ...projects.map(project => ({\\n name: project,\\n value: project,\\n category: 1,\\n // 根据关联人数动态设置大小，基础大小为60 \\n symbolSize: 60 + (projectPersonCount[project] * 15),\\n itemStyle: {\\n color: '#4b4b4b7a'\\n },\\n label: {\\n position: 'inside',\\n fontSize: 14,\\n color: '#fff',\\n width: 70,\\n overflow: 'break',\\n lineHeight: 18,\\n // 添加关联人数显示 \\n formatter: function (params) {\\n return `${params.name}\\\\n(${projectPersonCount[params.name]}人)`;\\n }\\n },\\n }))\\n];\\nconsole.log(nodes);\\nconst links = data.map(rel => ({\\n source: rel.person,\\n target: rel.project,\\n value: rel.project,\\n}));\\noption = {\\n backgroundColor: \\\"rgba(0, 0, 0, 0)\\\",\\n title: {\\n text: '项目关系图',\\n subtext: '展示人员与项目之间的关系',\\n left: \\\"center\\\",\\n top: 24,\\n textStyle: {\\n fontSize: 16,\\n fontWeight: \\\"bold\\\",\\n },\\n },\\n tooltip: {},\\n animationDuration: 1500,\\n animationEasingUpdate: 'quinticInOut',\\n series: [{\\n name: '项目关系图',\\n type: 'graph',\\n layout: 'force',\\n data: nodes,\\n links: links,\\n top: 100,\\n categories: [\\n { name: '人员' },\\n { name: '项目' }\\n ],\\n roam: true,\\n label: {\\n show: true,\\n position: 'right',\\n formatter: '{b}'\\n },\\n force: {\\n repulsion: 5000,\\n gravity: 1,\\n friction: 0.3,\\n layoutAnimation: false,\\n },\\n draggable: false,\\n lineStyle: {\\n color: 'source',\\n curveness: 0.3,\\n width: 1\\n },\\n edgeLabel: {\\n show: false,\\n position: 'middle',\\n formatter: function (params) {\\n return params.data.value;\\n },\\n fontSize: 12\\n },\\n emphasis: {\\n focus: 'adjacency',\\n lineStyle: {\\n width: 10\\n }\\n }\\n }]\\n};\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" + "Config": "{\"option\":\"var data = JSONContext.data; \\nconsole.log(data); \\nconst persons = [...new Set(data.map(item => item.person || \\\"未知成员\\\"))]; \\nconst projects = [...new Set(data.map(item => item.project || \\\"未知项目\\\"))]; \\n// 定义人员颜色 \\nconst personColors = ['#ff6666', '#66ccff', '#ffcc66', '#8bc34a', '#cc66ff', '#86665a', '#9742ca', '#ff6738']; \\n\\n// 计算每个项目关联的人员数量 \\nconst projectPersonCount = projects.reduce((acc, project) => { \\n acc[project] = data.filter(item => item.project === project).length; \\n return acc; \\n}, {}); \\n\\n// 处理数据，创建节点和边 \\nconst nodes = [ \\n // 添加人员节点 \\n ...persons.map((person, index) => ({ \\n name: person, \\n value: person, \\n category: 0, \\n symbolSize: 80, \\n itemStyle: { \\n color: personColors[index % personColors.length], \\n }, \\n label: { \\n position: 'inside', \\n fontSize: 16, \\n fontWeight: 'bold', \\n color: '#fff', \\n }, \\n })), \\n // 添加项目节点 \\n ...projects.map(project => ({ \\n name: project, \\n value: project, \\n category: 1, \\n // 根据关联人数动态设置大小，基础大小为60 \\n symbolSize: 60 + (projectPersonCount[project] * 15), \\n itemStyle: { \\n color: '#4b4b4b7a' \\n }, \\n label: { \\n position: 'inside', \\n fontSize: 12, \\n color: '#fff', \\n width: 70, \\n overflow: 'break', \\n lineHeight: 18, \\n // 添加关联人数显示 \\n formatter: function(params) { \\n return `${params.name}\\\\n(${projectPersonCount[params.name]}人)`; \\n } \\n }, \\n })) \\n]; \\n\\nconsole.log(nodes); \\n\\nconst links = data.map(rel => ({ \\n source: rel.person, \\n target: rel.project, \\n value: rel.project, \\n})); \\n\\noption = { \\n backgroundColor: \\\"rgba(0, 0, 0, 0)\\\", \\n title: { \\n text: '项目关系图', \\n subtext: '展示人员与项目之间的关系', \\n left: \\\"center\\\", \\n top: 24, \\n textStyle: { \\n fontSize: 16, \\n fontWeight: \\\"bold\\\", \\n }, \\n }, \\n tooltip: {}, \\n animationDuration: 1500, \\n animationEasingUpdate: 'quinticInOut', \\n series: [{ \\n name: '项目关系图', \\n type: 'graph', \\n layout: 'force', \\n data: nodes, \\n links: links, \\n top: 100, \\n categories: [ \\n { name: '人员' }, \\n { name: '项目' } \\n ], \\n roam: true, \\n label: { \\n show: true, \\n position: 'right', \\n formatter: '{b}' \\n }, \\n force: { \\n repulsion: 5000, \\n gravity: 1, \\n friction: 0.3, \\n layoutAnimation: false, \\n }, \\n draggable: false, \\n lineStyle: { \\n color: 'source', \\n curveness: 0.3, \\n width: 1 \\n }, \\n edgeLabel: { \\n show: false, \\n position: 'middle', \\n formatter: function (params) { \\n return params.data.value; \\n }, \\n fontSize: 12 \\n }, \\n emphasis: { \\n focus: 'adjacency', \\n lineStyle: { \\n width: 10 \\n } \\n } \\n }] \\n};\",\"graphTheme\":null,\"displayMode\":\"canvas\",\"jsCode\":\"\\n async ({Context,JSONContext,ImageContext,echarts,myChart,dat,Forguncy,d3,setInterval,setTimeout,ForguncyEchartsHelper,ApplicationResource})=>{\\n var datGUI=undefined;\\n var option={};\\n var data = JSONContext.data;\\nconsole.log(data);\\nconst persons = [...new Set(data.map(item => item.person || \\\"未知成员\\\"))];\\nconst projects = [...new Set(data.map(item => item.project || \\\"未知项目\\\"))];\\n// 定义人员颜色 \\nconst personColors = ['#ff6666', '#66ccff', '#ffcc66', '#8bc34a', '#cc66ff', '#86665a', '#9742ca', '#ff6738'];\\n// 计算每个项目关联的人员数量 \\nconst projectPersonCount = projects.reduce((acc, project) => {\\n acc[project] = data.filter(item => item.project === project).length;\\n return acc;\\n}, {});\\n// 处理数据，创建节点和边 \\nconst nodes = [\\n // 添加人员节点 \\n ...persons.map((person, index) => ({\\n name: person,\\n value: person,\\n category: 0,\\n symbolSize: 80,\\n itemStyle: {\\n color: personColors[index % personColors.length],\\n },\\n label: {\\n position: 'inside',\\n fontSize: 16,\\n fontWeight: 'bold',\\n color: '#fff',\\n },\\n })),\\n // 添加项目节点 \\n ...projects.map(project => ({\\n name: project,\\n value: project,\\n category: 1,\\n // 根据关联人数动态设置大小，基础大小为60 \\n symbolSize: 60 + (projectPersonCount[project] * 15),\\n itemStyle: {\\n color: '#4b4b4b7a'\\n },\\n label: {\\n position: 'inside',\\n fontSize: 12,\\n color: '#fff',\\n width: 70,\\n overflow: 'break',\\n lineHeight: 18,\\n // 添加关联人数显示 \\n formatter: function (params) {\\n return `${params.name}\\\\n(${projectPersonCount[params.name]}人)`;\\n }\\n },\\n }))\\n];\\nconsole.log(nodes);\\nconst links = data.map(rel => ({\\n source: rel.person,\\n target: rel.project,\\n value: rel.project,\\n}));\\noption = {\\n backgroundColor: \\\"rgba(0, 0, 0, 0)\\\",\\n title: {\\n text: '项目关系图',\\n subtext: '展示人员与项目之间的关系',\\n left: \\\"center\\\",\\n top: 24,\\n textStyle: {\\n fontSize: 16,\\n fontWeight: \\\"bold\\\",\\n },\\n },\\n tooltip: {},\\n animationDuration: 1500,\\n animationEasingUpdate: 'quinticInOut',\\n series: [{\\n name: '项目关系图',\\n type: 'graph',\\n layout: 'force',\\n data: nodes,\\n links: links,\\n top: 100,\\n categories: [\\n { name: '人员' },\\n { name: '项目' }\\n ],\\n roam: true,\\n label: {\\n show: true,\\n position: 'right',\\n formatter: '{b}'\\n },\\n force: {\\n repulsion: 5000,\\n gravity: 1,\\n friction: 0.3,\\n layoutAnimation: false,\\n },\\n draggable: false,\\n lineStyle: {\\n color: 'source',\\n curveness: 0.3,\\n width: 1\\n },\\n edgeLabel: {\\n show: false,\\n position: 'middle',\\n formatter: function (params) {\\n return params.data.value;\\n },\\n fontSize: 12\\n },\\n emphasis: {\\n focus: 'adjacency',\\n lineStyle: {\\n width: 10\\n }\\n }\\n }]\\n};\\n\\n return {\\n option,\\n datGUI,\\n };\\n }\\n \"}" } } }, @@ -944,7 +944,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=工作台首页!B17" }, - "TargetType": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", + "TargetType": "EchartsCustomCellType.EchartsCustomCellTypeCellType, EchartsCustomCellType, Version=10.0.102.0, Culture=neutral, PublicKeyToken=null", "MethodName": "SetDataSource", "ParameterValues": { "dataSourceName": "data", @@ -1062,4 +1062,4 @@ "Size": "1473,1000" } ] -}//wY6AwUe78ipZmHxB1gOAqnI4p8OlAuL1SbHJKW0cEOAqwsV6/0q0aB6iuGC8oJlpXtqfNiffdRk+6xhJEfMAQK3Rv3k1S3r6lunV5W4eR2XyYHMamASjYQJ5Bbo/MQ5zHeLOeSNKS1jNIdKKj6SqyPn944troI88+76Om7Tzo2WurGUp1unx3nx161oZ52RaLWWC0PlkKbx1bANPTu7VcivA4JoTf8xsoHFwcEp26VqR8xCV16OzTF8Amg3cxN6e19jAwI9ZsmMmud4PhKOKN3zBpwFA3vqOrrsaQ0Dx3WXWk4wjjqg+s9Urv2XjsG4WEwaQBb8jzM8whxzhxRlV7L+CFtXt6TAAITlklmVzy7Fy8YUsxe0kqdHmRPDhCAohT5La7Brc1/EwVFJlHrbmHWYcYBL7ZiKwMaZNN6sBx9uark+9q1+QOXGvw8nBR5ThhnMoww/60G+2JtJDpCUG9FK0Llj3hE5E15cgCkbxl2q6NWyICALQBrNCmHnG5jJHmLH9BItfDs433QhULWt7cSlIZNr63ZbLmf0IgkNUy0iF+gkhc/1xR7qN6JDpzGTIDj4flixRsjB1gzQNJ89XYVWguDoZiPqtSM6p2pRrY5YMH9DJcMOlaZj9MYCC3LVJ1jiBNeqL/h4ayITDS6aWyIp4LB/ckIZ7wIqRizI669GSHfLS9/9XECGizqhWWgADPrimsXEwdN5O83khcI9dsmhwhDOtxOu4H0xm51i7sg5zvX5qCRltCmADOo3B4bNJT11eRxlVZuhS1Iyf5jOpGITXICz5OosdJwvTXa7JiNz1L3hALtv3o4Mfk4TK9O9NSn/8ZeWOMUPSKYqOB4m0YfFPRHJKMruqf89YM0d733v3rIQtYHLHZmGt19tFa/x4UQla63mPwTQzFBRnz4zl4w==|920 \ No newline at end of file +}//nvxiit6EGvyVq5JRlUpF7dIxkp3BVRs68WS4YYu/9COl5829n9BR1uBQjOeFLqE3S/mpqoKsgO3mOk0KWs2m9sowBqBjobYrqkO1ejM0d9hT9izsk1nAVqDfCmkIvkf20QR6bIvckwnNcLWS4RveqpktBuS5C8IWcbWRsRNswyYWvFlCmWZD7nnvJLPl0gICE5zIJfQkcHSDRqWlbSpap1iQwFbXYw3rrxhhTE15HsSIgmrxSmIbi6acSPhb4hWI4lW5R9E/Ier5FA2sDuX1VgCTASI5fLQhpAv/L2VDwP8EAP8x13qde8Hw8AOHTSoVm0rbs2zWvKNLAjb5KD6S1XdLmbxTcViiLlYFGyzvqzhLjWmlC7I3iYtgmP7g6ohga72R3bRuri90DbXfQ3SMpxsyjT8zZsll8FJvXls9BgNqGWGi7awXw5cFTI9Kg6sLHbh/1SiXec2FeBT6+HI39J1+IlGBnSlQNmfhJVrImZF9XTHLUoraHwlrI4raqBcLluRH26irA2Umsotaz1jwqudFAylUbWngUBUufLLRIsqlP4JAngxP/GePTxrPfVwtVWA+1l1/G6PW2cCSXe+suWQQSJgMttTRXGf8iwBx9xD9D0aV7BsyO3j07zKqC0Hu0i9MzvJmsXcaPERsrIoCBsIljL52VCKKzsjbTmIK4EMp11YNTdmeSuUx3hVD/a4l1Wfs5qodauTwX1/hqXInG8E0JfO+ZRMaHtM3Gxk3hYHLWg9KsCzOJagcPjNCYilV+CC8swX0SQnQoZdyCAbDnPvS+Z3edakkSiDLeQ9OnxTzuXa+uWXMIeQ3Y2tcithd5Du73GHN16K333kV/kC4R7M9E4zUtjPakoy9h0K9uO1iYDRFv4FoBg9nrR0109bZ+KrJokuXpcYz1QhXHC5Onw==|920 \ No newline at end of file diff --git a/Plugin/Echarts图表-10_0_3_0.zip b/Plugin/Echarts图表-10_0_102_0.zip similarity index 62% rename from Plugin/Echarts图表-10_0_3_0.zip rename to Plugin/Echarts图表-10_0_102_0.zip index 6c8d8b14..42aafe76 100644 Binary files a/Plugin/Echarts图表-10_0_3_0.zip and b/Plugin/Echarts图表-10_0_102_0.zip differ diff --git a/Plugin/JSON 序列化和反序列化-10_0_102_0.zip b/Plugin/JSON 序列化和反序列化-10_0_102_0.zip new file mode 100644 index 00000000..399d58c1 Binary files /dev/null and b/Plugin/JSON 序列化和反序列化-10_0_102_0.zip differ diff --git a/Plugin/JSON 序列化和反序列化-10_0_2_0.zip b/Plugin/JSON 序列化和反序列化-10_0_2_0.zip deleted file mode 100644 index 29be258e..00000000 Binary files a/Plugin/JSON 序列化和反序列化-10_0_2_0.zip and /dev/null differ diff --git a/Plugin/JSON数据源-10_0_102_0.zip b/Plugin/JSON数据源-10_0_102_0.zip new file mode 100644 index 00000000..f4b677d0 Binary files /dev/null and b/Plugin/JSON数据源-10_0_102_0.zip differ diff --git a/Plugin/JSON数据源-10_0_2_0.zip b/Plugin/JSON数据源-10_0_2_0.zip deleted file mode 100644 index ab1baef3..00000000 Binary files a/Plugin/JSON数据源-10_0_2_0.zip and /dev/null differ diff --git a/Plugin/Tiny富文本编辑器-10_0_2_0.zip b/Plugin/Tiny富文本编辑器-10_0_102_0.zip similarity index 95% rename from Plugin/Tiny富文本编辑器-10_0_2_0.zip rename to Plugin/Tiny富文本编辑器-10_0_102_0.zip index e24c8e5e..56a56e61 100644 Binary files a/Plugin/Tiny富文本编辑器-10_0_2_0.zip and b/Plugin/Tiny富文本编辑器-10_0_102_0.zip differ diff --git a/Plugin/加载动画-10_0_102_0.zip b/Plugin/加载动画-10_0_102_0.zip new file mode 100644 index 00000000..ba45588e Binary files /dev/null and b/Plugin/加载动画-10_0_102_0.zip differ diff --git a/Plugin/加载动画-10_0_2_0.zip b/Plugin/加载动画-10_0_2_0.zip deleted file mode 100644 index c6d3ab60..00000000 Binary files a/Plugin/加载动画-10_0_2_0.zip and /dev/null differ diff --git a/Plugin/发送HTTP请求命令-10_0_102_0.zip b/Plugin/发送HTTP请求命令-10_0_102_0.zip new file mode 100644 index 00000000..83811830 Binary files /dev/null and b/Plugin/发送HTTP请求命令-10_0_102_0.zip differ diff --git a/Plugin/发送HTTP请求命令-10_0_2_0.zip b/Plugin/发送HTTP请求命令-10_0_2_0.zip deleted file mode 100644 index 3b8ae15e..00000000 Binary files a/Plugin/发送HTTP请求命令-10_0_2_0.zip and /dev/null differ diff --git a/Plugin/富文本编辑器-10_0_2_0.zip b/Plugin/富文本编辑器-10_0_102_0.zip similarity index 76% rename from Plugin/富文本编辑器-10_0_2_0.zip rename to Plugin/富文本编辑器-10_0_102_0.zip index 17e57146..7005d79e 100644 Binary files a/Plugin/富文本编辑器-10_0_2_0.zip and b/Plugin/富文本编辑器-10_0_102_0.zip differ diff --git a/Plugin/支持预览的附件上传-10_0_2_0.zip b/Plugin/支持预览的附件上传-10_0_102_0.zip similarity index 97% rename from Plugin/支持预览的附件上传-10_0_2_0.zip rename to Plugin/支持预览的附件上传-10_0_102_0.zip index ceda7f20..58a0c520 100644 Binary files a/Plugin/支持预览的附件上传-10_0_2_0.zip and b/Plugin/支持预览的附件上传-10_0_102_0.zip differ diff --git a/Plugin/标签页和打开标签命令-10_0_102_0.zip b/Plugin/标签页和打开标签命令-10_0_102_0.zip new file mode 100644 index 00000000..3bef7874 Binary files /dev/null and b/Plugin/标签页和打开标签命令-10_0_102_0.zip differ diff --git a/Plugin/标签页和打开标签命令-10_0_2_0.zip b/Plugin/标签页和打开标签命令-10_0_2_0.zip deleted file mode 100644 index 97643faf..00000000 Binary files a/Plugin/标签页和打开标签命令-10_0_2_0.zip and /dev/null differ diff --git a/Plugin/用户管理命令 V2-10_0_102_0.zip b/Plugin/用户管理命令 V2-10_0_102_0.zip new file mode 100644 index 00000000..338fc65e Binary files /dev/null and b/Plugin/用户管理命令 V2-10_0_102_0.zip differ diff --git a/Plugin/用户管理命令 V2-10_0_5_0.zip b/Plugin/用户管理命令 V2-10_0_5_0.zip deleted file mode 100644 index 40d48391..00000000 Binary files a/Plugin/用户管理命令 V2-10_0_5_0.zip and /dev/null differ diff --git a/Plugin/设置当前行命令-10_0_102_0.zip b/Plugin/设置当前行命令-10_0_102_0.zip new file mode 100644 index 00000000..508b6bb8 Binary files /dev/null and b/Plugin/设置当前行命令-10_0_102_0.zip differ diff --git a/Plugin/设置当前行命令-10_0_2_0.zip b/Plugin/设置当前行命令-10_0_2_0.zip deleted file mode 100644 index e3ce85cd..00000000 Binary files a/Plugin/设置当前行命令-10_0_2_0.zip and /dev/null differ diff --git a/Plugin/设置焦点命令-10_0_102_0.zip b/Plugin/设置焦点命令-10_0_102_0.zip new file mode 100644 index 00000000..d246af75 Binary files /dev/null and b/Plugin/设置焦点命令-10_0_102_0.zip differ diff --git a/Plugin/设置焦点命令-10_0_2_0.zip b/Plugin/设置焦点命令-10_0_2_0.zip deleted file mode 100644 index 646869f7..00000000 Binary files a/Plugin/设置焦点命令-10_0_2_0.zip and /dev/null differ diff --git a/Reports/人员工时报表.rdlx b/Reports/人员工时报表.rdlx index ca17a8c1..1f0d52f9 100644 --- a/Reports/人员工时报表.rdlx +++ b/Reports/人员工时报表.rdlx @@ -1,11 +1,1295 @@ -人员工时报表.rdlx1cmtruetrue0cm0cm7.5cm1cmtrue + + + 人员工时报表.rdlx11 + + + + 7.579cm + + + 0cm + 0cm + 39cm + 7.579cm + + 工时表_DataSet + 人员工时报表 + Auto +
+ true + + + 2.274cm + + + 6 + + + + true + =" " & Format(Parameters!开始日期.Value, "yyyy-MM-dd") & "~" & Format(Parameters!结束日期.Value, "yyyy-MM-dd") & "人员工时统计表" + + + + + + + 1.011cm + + + + + + DimGray + + + + + + + + + + + + + + + true + 文本框1 + 项目 + + + + + + + + DimGray + + + + + + + + + + + + + + + true + 文本框12 + 版本 + + + + + + + + DimGray + + + + + + + + + + + + + + + true + 文本框2 + 任务 + + + + + + + + DimGray + + + + + + + + + + + + + + + true + 执行内容 + + + + + + + + DimGray + + + + + + + + + + + + + + + true + 文本框17 + 上报工时 + + + + + + + + DimGray + + + + + + + + + + + + + + + true + 文本框21 + 核定工时 + + + + + + +
+
+ + + =Fields!日期.Value + =Fields.Item("任务ID").Value + + + + + Ascending + =Fields.Item("执行人").Value + + + Ascending + =Fields.Item("项目ID").Value + + + Ascending + =Fields.Item("版本ID").Value + + + Ascending + =Fields.Item("任务名称").Value + + + + + 0.758cm + + + Restricted + + + + #e6e6e6 + + + true + 项目 + =Fields.Item("项目").Value + + + + + Restricted + + + + #e6e6e6 + + + true + 版本 + =Fields.Item("版本名称").Value + + + + + Restricted + + + + #e6e6e6 + + + true + 任务 + =Fields.Item("任务名称").Value + + + + + + + + #e6e6e6 + + + true + 执行内容 + =Fields!执行内容.Value + + + + + + + + #e6e6e6 + + + true + 上报工时 + =Fields.Item("上报工时").Value + + + + + + + + #e6e6e6 + + + true + 核定工时 + =Fields.Item("核定工时").Value + + + + + + +
+
+ + + 1.009cm + + + 4 + + + + true + 合计 + + + + + + + + true + 文本框45 + =Sum(Fields!上报工时.Value) + + + + + + + + true + 文本框46 + =Sum(Fields!核定工时.Value) + + + + + + +
+ + + 4.408cm + + + 3.428cm + + + 5.877cm + + + 17.629cm + + + 3.827cm + + + 3.831cm + + + + +
+ true + + + 1.011cm + + + + + + #cccccc + + + 1pt + + + true + =Fields.Item("执行人").Value & " " + + + + + 3 + + + + #cccccc + + + 1pt + + + true + 小计 + + + + + + + + #cccccc + + + 1pt + + + true + =Sum(Fields.Item("上报工时").Value) + + + + + + + + #cccccc + + + 1pt + + + true + =Sum(Fields.Item("核定工时").Value) + + + + + + +
+ + + =Fields.Item("执行人").Value + + + + +
+ true + + + 0.758cm + + + + + + DimGray + + + true + + + + + + + + + DimGray + + + true + + + + + + + + + DimGray + + + true + + + + + + + + + DimGray + + + true + + + + + + + + + DimGray + + + true + + + + + + + + + DimGray + + + true + + + + + + + true + + + +
+
+ + + 0.758cm + + + + + + true + + + + + + + + + true + + + + + + + + + true + + + + + + + + + true + 项目小计 + + + + + + + + true + =Sum(Fields!上报工时.Value) + + + + + + + + true + =Sum(Fields!核定工时.Value) + + + + + + +
+ + + =Fields!项目ID.Value + + + + +
+ + + + + 1cm + true + true + + + 0cm + 0.106cm + 7.5cm + 1cm + + true + b89954dd-a360-4909-926a-34ae179f314f 空白样式 -Clue&有绪0cm32.501cm7.5cm1cm1true + + Clue&有绪 + + + 0cm + 31.522cm + 7.5cm + 1cm + + 1 + true + b89954dd-a360-4909-926a-34ae179f314f 空白样式 -理清头绪 · 形成秩序 · 实现持续 -7.5cm0cm0cm39.818cm7.5cm工时表_DataSet人员工时报表Auto
true2.25cm6true=" " & Format(Parameters!开始日期.Value, "yyyy-MM-dd") & "~" & Format(Parameters!结束日期.Value, "yyyy-MM-dd") & "人员工时统计表"1cmtrue文本框1项目true文本框12版本true文本框2任务true执行内容true文本框17上报工时true文本框21核定工时
=Fields!日期.Value=Fields.Item("任务ID").ValueAscending=Fields.Item("执行人").ValueAscending=Fields.Item("项目ID").ValueAscending=Fields.Item("版本ID").ValueAscending=Fields.Item("任务名称").Value0.75cmTrueRestrictedtrue项目=Fields.Item("项目").ValueTrueRestrictedtrue版本=Fields.Item("版本名称").ValueTrueRestrictedtrue任务=Fields.Item("任务名称").Valuetrue执行内容=Fields!执行内容.Valuetrue上报工时=Fields.Item("上报工时").Valuetrue核定工时=Fields.Item("核定工时").Value
1cm4true合计true文本框45=Sum(Fields!上报工时.Value)true文本框46=Sum(Fields!核定工时.Value)
4.5cm3.5cm6.001cm17.999cm3.907cm3.911cm
true1cmtrue=Fields.Item("执行人").Value & " "3true小计true=Sum(Fields.Item("上报工时").Value)true=Sum(Fields.Item("核定工时").Value)
=Fields.Item("执行人").Value
true0.75cmtruetruetruetruetruetruetrue
0.75cmtruetruetruetrue项目小计true=Sum(Fields!上报工时.Value)true=Sum(Fields!核定工时.Value)
=Fields!项目ID.Value
1.25cmtruetrue0cm0cm40cm1.25cmtrue + + 理清头绪 · 形成秩序 · 实现持续 + + + + + + 1.25cm + true + true + + + 0cm + 0cm + 39.999cm + 1.25cm + + true + b89954dd-a360-4909-926a-34ae179f314f 空白样式 -="第 " & Globals!PageNumber & " 页 共 " & Globals!TotalPages & " 页"1cm1cm29.7cm42cm1cm1cm40.001cmDateTimetrueTrueDateTimetrue结束日期TrueIntegertrue项目IDTrue项目表_DataSet项目名称IDIntegertrue版本IDTrue版本表_DataSet名称加版本号IDString执行人Truetrue用户信息视图_DataSet全名用户名用户信息视图_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"},"执行人用户名":{"type":"string"},"项目ID":{"type":"integer"},"项目":{"type":"string"},"版本ID":{"type":"integer"},"版本名称":{"type":"string"},"任务ID":{"type":"integer"},"任务名称":{"type":"string"},"执行内容":{"type":"string"},"上报工时":{"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"}}}}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版本名称任务ID任务名称执行内容上报工时核定工时=Fields!日期.Value=IIF(IsNothing(Parameters!开始日期.Value), Fields!日期.Value, Parameters!开始日期.Value)GreaterThanOrEqual=Fields!日期.Value=IIF(IsNothing(Parameters!结束日期.Value), Fields!日期.Value, Parameters!结束日期.Value)LessThanOrEqual=Fields!项目ID.Value=IIF(IsNothing(Parameters!项目ID.Value), Fields!项目ID.Value, Parameters!项目ID.Value)Equal=Fields!版本ID.Value=IIF(IsNothing(Parameters!版本ID.Value), Fields!版本ID.Value, Parameters!版本ID.Value)Equal=Fields!执行人用户名.Value=IIF(IsNothing(Parameters!执行人.Value), Fields!执行人用户名.Value, Parameters!执行人.Value)In$.[*]工时表ID项目名称$.[*]项目表ID项目ID版本名称=Fields!项目ID.Value=Parameters!项目ID.ValueEqual$.[*]版本表用户名全名$.[*]用户信息视图DisplayTypeGalleySizeTypeFitToWidthPaperOrientationLandscapeParametersView{"controls":[{"left":365,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"项目ID","label":{"display":"top","text":"项目","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":605,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"版本ID","label":{"display":"top","text":"版本","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":845,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"执行人","label":{"display":"top","text":"执行人","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":1210,"top":35,"width":125,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":10,"top":5,"width":345,"height":75,"control":{"type":"date-range","binding":["开始日期","结束日期"],"maxRange":["years",1],"viewMode":"days","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"}}},{"left":1100,"top":35,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}}]}DefaultTheme.rdlx-theme \ No newline at end of file + + ="第 " & Globals!PageNumber & " 页 共 " & Globals!TotalPages & " 页" + + + + Landscape + 29.7cm + 42cm + 1cm + 1cm + 1cm + 1cm + + 39.999cm + + + + + DateTime + true + True + + + DateTime + true + 结束日期 + True + + + Integer + true + 项目ID + True + + + 项目表_DataSet + 项目名称 + ID + + + + + Integer + true + 版本ID + True + + + 版本表_DataSet + 名称加版本号 + ID + + + + + String + 执行人 + True + true + + + 用户信息视图_DataSet + 全名 + 用户名 + + + + + 用户信息视图_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"},"执行人用户名":{"type":"string"},"项目ID":{"type":"integer"},"项目":{"type":"string"},"版本ID":{"type":"integer"},"版本名称":{"type":"string"},"任务ID":{"type":"integer"},"任务名称":{"type":"string"},"执行内容":{"type":"string"},"上报工时":{"type":"number"},"核定工时":{"type":"number"}}}} + JSON + + + + + jsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/2c95e2a9-2e3a-492b-a2eb-f97669c8e580;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"项目名称":{"type":"string"}}}} + JSON + + + + + jsondoc=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"}}}} + JSON + + + + + jsondoc=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 + + + 版本名称 + + + 任务ID + + + 任务名称 + + + 执行内容 + + + 上报工时 + + + 核定工时 + + + + + =Fields!日期.Value + + =IIF(IsNothing(Parameters!开始日期.Value), Fields!日期.Value, Parameters!开始日期.Value) + + GreaterThanOrEqual + + + =Fields!日期.Value + + =IIF(IsNothing(Parameters!结束日期.Value), Fields!日期.Value, Parameters!结束日期.Value) + + LessThanOrEqual + + + =Fields!项目ID.Value + + =IIF(IsNothing(Parameters!项目ID.Value), Fields!项目ID.Value, Parameters!项目ID.Value) + + Equal + + + =Fields!版本ID.Value + + =IIF(IsNothing(Parameters!版本ID.Value), Fields!版本ID.Value, Parameters!版本ID.Value) + + Equal + + + =Fields!执行人用户名.Value + + =IIF(IsNothing(Parameters!执行人.Value), Fields!执行人用户名.Value, Parameters!执行人.Value) + + In + + + + $.[*] + 工时表 + + + + + + ID + + + 项目名称 + + + + $.[*] + 项目表 + + + + + + ID + + + 项目ID + + + 版本名称 + + + + + =Fields!项目ID.Value + + =Parameters!项目ID.Value + + Equal + + + + $.[*] + 版本表 + + + + + + 用户名 + + + 全名 + + + + $.[*] + 用户信息视图 + + + + + + DisplayType + Galley + + + SizeType + FitToPage + + + PaperOrientation + Landscape + + + ParametersView + {"controls":[{"left":365,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"项目ID","label":{"display":"top","text":"项目","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":605,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"版本ID","label":{"display":"top","text":"版本","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":845,"top":5,"width":230,"height":75,"control":{"type":"dropdown","binding":"执行人","label":{"display":"top","text":"执行人","color":"default","font":{"bold":false,"italic":false,"underline":false,"transform":"none"}}}},{"left":1210,"top":35,"width":125,"height":30,"control":{"type":"button","action":"preview","text":"","background":"accent"}},{"left":10,"top":5,"width":345,"height":75,"control":{"type":"date-range","binding":["开始日期","结束日期"],"maxRange":["years",1],"viewMode":"days","daysViewHeaderFormat":"","label":{"display":"top","text":"日期范围"},"showDefaultRanges":true}},{"left":1100,"top":35,"width":100,"height":30,"control":{"type":"button","action":"reset","background":"warning","text":""}}],"preferredLayout":"free-form","canvas":{"width":1350,"height":80}} + + + + DefaultTheme.rdlx-theme + + \ No newline at end of file diff --git a/Reports/人员汇报报表.json b/Reports/人员汇报报表.json deleted file mode 100644 index 93a46fc1..00000000 --- a/Reports/人员汇报报表.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "Name": "人员汇报报表", - "DataSources": [ - { - "Name": "汇报记录", - "GUID": "177f804b-d611-4ba0-aff8-f565fa456aaf", - "DataSourceSetting": { - "TableName": "汇报记录表", - "BindingInfos": [ - { - "GUID": "d60e5214-97c0-434a-aa93-7bc5d5d54d2d", - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "ID", - "GUID": "f8dc67cd-ed28-4d39-b37e-c72e84e0b532" - }, - "ColumnName": "ID" - }, - { - "GUID": "393c6a7e-45c6-4d6e-9cd5-84694b497fc7", - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "开始日期", - "GUID": "aa3098b3-58ea-4631-aeb9-be0f9a59ad65" - }, - "ColumnName": "开始日期" - }, - { - "GUID": "6d6bbfcf-0cd1-4849-91cd-a650b5108537", - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报对象", - "GUID": "a31f02b1-7689-4b1e-9965-f613dfc3206c" - }, - "ColumnName": "汇报对象" - }, - { - "GUID": "dd16a79e-6d77-4474-91e0-ce759f4305d9", - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报类型", - "GUID": "51cd3441-70e0-48d7-ac75-56b80c152ed2" - }, - "ColumnName": "汇报类型" - }, - { - "GUID": "7580ec71-f337-403a-a874-71da6358be98", - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "汇报人", - "GUID": "0257336a-360a-4352-a438-8a2a1e393341", - "AttachType": { - "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", - "UserColumnAttachType": 1 - } - }, - "ColumnName": "汇报人_全名" - }, - { - "GUID": "d2f1a602-19e5-4830-a397-2ccdb4f60afa", - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "内容", - "GUID": "64655edd-393d-48b6-9c0f-e23b73ce0532" - }, - "ColumnName": "内容" - }, - { - "GUID": "5d21595a-53d4-4770-a986-fb2df813bd83", - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "纯文本内容", - "GUID": "3727a5b2-d0a4-47ec-bef8-8be1ec213a15" - }, - "ColumnName": "纯文本内容" - }, - { - "GUID": "1c0a810f-9982-49ee-864a-14a7b62bbcff", - "BindingInfo": { - "TableName": "汇报记录表", - "ColumnName": "总工时", - "GUID": "8eb01738-867a-4d9a-9cc6-f0ab3ec2ed94" - }, - "ColumnName": "总工时" - } - ] - }, - "ColumnsType": [ - "integer", - "date-time", - "string", - "string", - "string", - "string", - "string", - "number" - ] - }, - { - "Name": "人员表", - "GUID": "037a95ad-b4f5-455f-9810-f458b6f0cc69", - "DataSourceSetting": { - "TableName": "用户信息视图", - "BindingInfos": [ - { - "GUID": "1bf5ad93-dacc-4e92-9d56-3524beb36163", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "dc3bded8-ef8e-4c22-9a2c-6e5bc2bf9e26" - }, - "ColumnName": "用户名" - }, - { - "GUID": "bfb9e097-3a8d-4549-b207-b7bbbecbdd5e", - "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "fade5b3d-28a5-4329-bca9-a585f35fdc75" - }, - "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_LoginUser" - ] - }, - { - "$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 841ba9ee..00000000 --- a/Reports/人员汇报报表.rdlx +++ /dev/null @@ -1 +0,0 @@ -人员汇报报表.rdlx2pt1cm1cm29.7cm21cm1cm1cm2ptString报表参数1Truejsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/177f804b-d611-4ba0-aff8-f565fa456aaf;schemadata={"type":"array","items":{"type":"object","properties":{"ID":{"type":"integer"},"开始日期":{"type":"date-time"},"汇报对象":{"type":"string"},"汇报类型":{"type":"string"},"汇报人_全名":{"type":"string"},"内容":{"type":"string"},"纯文本内容":{"type":"string"},"总工时":{"type":"number"}}}}JSONjsondoc=http://localhost:26489/Forguncy/ARDataSource/GetDataSource/037a95ad-b4f5-455f-9810-f458b6f0cc69;schemadata={"type":"array","items":{"type":"object","properties":{"用户名":{"type":"string"},"全名":{"type":"string"}}}}JSONID开始日期汇报对象汇报类型汇报人_全名内容纯文本内容总工时$.[*]汇报记录用户名全名$.[*]人员表DisplayTypePageSizeTypeDefaultPaperOrientationPortraitDefaultTheme.rdlx-theme \ No newline at end of file