diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.js index 69ae0b102..754315bea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.js @@ -96,7 +96,7 @@ if (param.begin && param.end) { _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end, MeasurerID: learun.storage.get('userinfo').baseinfo.account }); } - learun.httpget(config.webapi + 'learun/EducationalAdministration/Thermography/pagelist', _postParam, (data) => { + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Thermography/pagelist', _postParam, (data) => { $page.find('.lr-badge').text('0'); if (data) { $page.find('.lr-badge').text(data.records); @@ -160,7 +160,7 @@ learun.layer.confirm('确定要删除该笔数据吗?', function (_index) { if (_index === '1') { learun.layer.loading(true, '正在删除该笔数据'); - learun.httppost(config.webapi + 'learun/EducationalAdministration/Thermography/delete', item.ID, (data) => { + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Thermography/delete', item.ID, (data) => { if (data) {// 删除数据成功 page.grid.reload(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js index deca14bea..1c8c7b148 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js @@ -61,7 +61,7 @@ // learun.layer.confirm('确定要删除该笔数据吗?', function (_index) { // if (_index === '1') { // learun.layer.loading(true, '正在删除该笔数据'); - // learun.httppost(config.webapi + 'learun/EducationalAdministration/Thermography/delete', keyValue, (data) => { + // learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Thermography/delete', keyValue, (data) => { // learun.layer.loading(false); // if (data) {// 删除数据成功 // learun.nav.closeCurrent(); @@ -88,7 +88,7 @@ _postData.keyValue = keyValue; _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet()); learun.layer.loading(true, '正在提交数据'); - learun.httppost(config.webapi + 'learun/EducationalAdministration/Thermography/save', _postData, (data) => { + learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Thermography/save', _postData, (data) => { learun.layer.loading(false); if (data) {// 表单数据保存成功 if (keyValue) { @@ -115,7 +115,7 @@ $header.find('.lr-form-header-btnlist').show(); // 获取表单数据 learun.layer.loading(true, '获取表单数据'); - learun.httpget(config.webapi + 'learun/EducationalAdministration/Thermography/form', keyValue, (data) => { + learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Thermography/form', keyValue, (data) => { if (data) { for (var id in data) { if (data[id].length) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js index 8f54c0981..559104786 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js @@ -69,7 +69,7 @@ if (_index === '1') { learun.layer.loading(true, '正在提交'); learun.httppost( - config.webapi + '/Learun/EducationalAdministration/Thermography/save', + config.webapi + '/learun/adms/EducationalAdministration/Thermography/save', { keyValue: data.ID, strEntity: JSON.stringify(data) @@ -97,7 +97,7 @@ } ) }; - learun.httpget(config.webapi + "/Learun/EducationalAdministration/Thermography/listOfStudent", _postParam, (data) => { + learun.httpget(config.webapi + "/learun/adms/EducationalAdministration/Thermography/listOfStudent", _postParam, (data) => { if (data) { studentCheckData(data, param); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ThermographyApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ThermographyApi.cs index 2401f559e..657e44224 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ThermographyApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ThermographyApi.cs @@ -22,7 +22,7 @@ namespace Learun.Application.WebApi /// 注册接口 /// public ThermographyApi() - : base("/Learun/EducationalAdministration/Thermography") + : base("/Learun/adms/EducationalAdministration/Thermography") { Get["/pagelist"] = GetPageList; Get["/list"] = GetList; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/CodeGeneratorModule/CodeGeneratorWx.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/CodeGeneratorModule/CodeGeneratorWx.cs index a06368548..204d1c612 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/CodeGeneratorModule/CodeGeneratorWx.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/CodeGeneratorModule/CodeGeneratorWx.cs @@ -3458,8 +3458,8 @@ namespace Learun.Application.Base.CodeGeneratorModule if (int.Parse(item.dataSource) == 0) { return; } var dataSourceInfo = item.dataSourceId?.Split(','); - dsReqAdd(" this.FETCH_DATASOURCE('" + dataSourceInfo[0] + "').then(data => {"); - dsReqAdd(" this.dataSource." + item.field + " = data.map(t => ({ text: t." + + dsReqAdd(" this.FETCH_DATASOURCE('" + dataSourceInfo[0] + "').then(result => {"); + dsReqAdd(" this.dataSource." + item.field + " = result.data.map(t => ({ text: t." + dataSourceInfo[1] + ", value: t." + dataSourceInfo[2] + " }))"); dsReqAdd(" }),"); }); @@ -4115,7 +4115,7 @@ namespace Learun.Application.Base.CodeGeneratorModule dsReqAdd(" this.FETCH_DATASOURCE('" + fieldItem.dataSourceId + "').then(result => {"); dsReqAdd(" this.dataSource." + item.table + "." + fieldItem.field + - " = result.map(t => ({ text: t." + fieldItem.showField + ", value: t." + + " = result.data.map(t => ({ text: t." + fieldItem.showField + ", value: t." + fieldItem.saveField + " }))"); dsReqAdd(" }),"); } @@ -4145,7 +4145,7 @@ namespace Learun.Application.Base.CodeGeneratorModule { dsReqAdd(" this.FETCH_DATASOURCE('" + dataSourceInfo[0] + "').then(result => {"); dsReqAdd(" this.dataSource." + item.table + "." + item.field + - " = result.map(t => ({ text: t." + dataSourceInfo[1] + ", value: t." + + " = result.data.map(t => ({ text: t." + dataSourceInfo[1] + ", value: t." + dataSourceInfo[2] + " }))"); dsReqAdd(" }),"); } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index c6afe4a56..d0b03f1a6 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -6,12 +6,15 @@ export default { // 是否允许用户注册 "enableSignUp": true, // 请求数据的接口地址;可以配置多个,开发环境下登录页会出现选择菜单供您选择 - "apiHost": [ - "https://wx.qjkjedu.com/learun/adms" - ], + // "apiHost": [ + // "https://wx.qjkjedu.com/learun/adms" + // ], // "apiHost": [ // "http://192.168.2.202:8083/learun/adms" // ], + "apiHost": [ + "http://localhost:8088/learun/adms" + ], // 开发环境下自动填充登录账号密码,与接口地址一一对应,只在开发环境下显示 "devAccount": [ { username: "System", password: "0000" } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index 6ad8aafad..f84b1529d 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -132,7 +132,9 @@ { "path": "pages/crm/order/single", "style": { "navigationBarTitleText": "订单详情" } }, // 考勤记录 { "path": "pages/LogisticsManagement/ADR_Record/list", "style": { "navigationBarTitleText": "考勤里列表" } }, - { "path": "pages/LogisticsManagement/ADR_Record/single", "style": { "navigationBarTitleText": "考勤详情" } } + { "path": "pages/LogisticsManagement/ADR_Record/single", "style": { "navigationBarTitleText": "考勤详情" } }, + { "path": "pages/EducationalAdministration/Thermography/list", "style": { "navigationBarTitleText": "列表" } }, + { "path": "pages/EducationalAdministration/Thermography/single", "style": { "navigationBarTitleText": "详情" } } ], // 全局样式 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/list.vue new file mode 100644 index 000000000..a15bcd04d --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/list.vue @@ -0,0 +1,367 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue new file mode 100644 index 000000000..0f90b1f2c --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue @@ -0,0 +1,269 @@ + + + + + +