From 639fe365904fc2f4e474577980f122f0f19ba0bf Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Tue, 13 Oct 2020 10:53:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=95=B0=E6=8D=AE=E6=BA=90=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Thermography/Thermography.js              |   4 +-
 .../Thermography/form/form.js                 |   6 +-
 .../Thermography/measure/measure.js           |   4 +-
 .../ThermographyApi.cs                        |   2 +-
 .../CodeGeneratorModule/CodeGeneratorWx.cs    |   8 +-
 .../LearunApp-2.2.0/config.js                 |   9 +-
 .../LearunApp-2.2.0/pages.json                |   4 +-
 .../Thermography/list.vue                     | 367 ++++++++++++++++++
 .../Thermography/single.vue                   | 269 +++++++++++++
 9 files changed, 657 insertions(+), 16 deletions(-)
 create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/list.vue
 create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Thermography/single.vue

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
         /// 注册接口
         /// <summary>
         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 @@
+<template>
+  <view class="page">
+    <!-- 主列表页 -->
+    <view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx;">
+      <!-- 顶部条目/分页信息栏 -->
+      <l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner>
+
+      <!-- 滚动列表，跨端支持上拉/下拉 -->
+      <l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list">
+        <l-customlist :tips="loadState" showTips>
+          <!-- 单条记录 -->
+          <view class="customlist-item" v-for="item of list" :key="item.ID">
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">班级：</text>
+              {{ displayListItem(item, 'ClassNo') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">测温人：</text>
+              {{ displayListItem(item, 'MeasurerID') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">被测温人：</text>
+              {{ displayListItem(item, 'PersonBeingMeasured') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">测量时间：</text>
+              {{ displayListItem(item, 'MeasureDate') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">测温时间段：</text>
+              {{ displayListItem(item, 'MeasureTime') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">状态：</text>
+              {{ displayListItem(item, 'Status') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">温度：</text>
+              {{ displayListItem(item, 'Temperature') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">处理结果：</text>
+              {{ displayListItem(item, 'ProcessingResult') }}
+            </view>
+
+            <view class="customlist-item-field">
+              <text class="customlist-item-field-title">备注：</text>
+              {{ displayListItem(item, 'Remark') }}
+            </view>
+
+
+            <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" />
+          </view>
+        </l-customlist>
+      </l-scroll-list>
+    </view>
+
+    <!-- 关闭侧边抽屉按钮 -->
+    <view @click="sideOpen = false" :class="sideOpen ? 'show' : ''" class="sideclose">
+      <l-icon type="pullright" color="blue" />
+    </view>
+
+    <!-- 侧边栏，用于设置查询条件 -->
+    <scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y>
+      <view v-if="ready" class="padding">
+
+        <l-customlist-sidepage-datefilter
+          v-model="dateRange"
+          @change="searchChange"
+          title="按时间日期查询: "
+          ref="datefilter"
+          class="margin-bottom"
+        />
+
+        <l-select
+          v-model="queryData.ClassNo"
+          @change="searchChange"
+          :range="dataSource.ClassNo"
+          title ="班级"
+          placeholder="按班级查询"
+        />
+        <l-select
+          v-model="queryData.PersonBeingMeasured"
+          @change="searchChange"
+          :range="dataSource.PersonBeingMeasured"
+          title ="被测温人"
+          placeholder="按被测温人查询"
+        />
+        <l-select
+          v-model="queryData.MeasureTime"
+          @change="searchChange"
+          :range="dataSource.MeasureTime"
+          title ="测温时间段"
+          placeholder="按测温时间段查询"
+        />
+        <l-select
+          v-model="queryData.Status"
+          @change="searchChange"
+          :range="dataSource.Status"
+          title ="状态"
+          placeholder="按状态查询"
+        />
+
+        <!-- 重置查询条件按钮 -->
+        <view class="padding-tb">
+          <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button>
+        </view>
+      </view>
+    </scroll-view>
+
+    <l-customlist-add v-if="!sideOpen" @click="action('add')" />
+
+  </view>
+</template>
+
+
+<script>
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-10-12 17:22
+ * 描  述：班级自诊打卡
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/EducationalAdministration/Thermography/list", "style": { "navigationBarTitleText": "表单列表页" } }
+ * 
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改）
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件）
+ */
+import moment from 'moment'
+import get from 'lodash/get'
+import set from 'lodash/set'
+import pickBy from 'lodash/pickBy'
+import mapValues from 'lodash/mapValues'
+
+export default {
+  data() {
+    return {
+      // 数据项的数据类型、结构
+      scheme: {
+        ClassNo: { type: 'select', dataSource: '1', dataSourceId: 'bjsj,classname,classno' },
+        MeasurerID: { type: 'select', dataSource: '1', dataSourceId: 'BaseUser,f_realname,f_account' },
+        PersonBeingMeasured: { type: 'select', dataSource: '1', dataSourceId: 'StuInfoBasic,stuname,stuno' },
+        MeasureDate: { type: 'datetime', dateformat: '0' },
+        MeasureTime: { type: 'select', itemCode: 'MeasureTime', dataSource: '0' },
+        Status: { type: 'select', itemCode: 'TemperatureMeasure', dataSource: '0' },
+        Temperature: { type: 'text' },
+        ProcessingResult: { type: 'textarea' },
+        Remark: { type: 'textarea' },
+      },
+
+      // 查询条件
+      searchData: {},
+      defaultQueryData: {},
+      queryData: {
+        ClassNo: '',
+        PersonBeingMeasured: '',
+        MeasureTime: '',
+        Status: '',
+      },
+
+      // 数据源
+      dataSource: {
+        ClassNo: [],
+        MeasurerID: [],
+        PersonBeingMeasured: [],
+        MeasureTime: Object.values(this.GET_GLOBAL('dataDictionary').MeasureTime).map(t => ({ value: t.value, text: t.text })),
+        Status: Object.values(this.GET_GLOBAL('dataDictionary').TemperatureMeasure).map(t => ({ value: t.value, text: t.text })),
+      },
+
+      // 时间查询参数
+      dateRange: null,
+
+      // 页面相关参数
+      ready: false,
+      tips: '加载中...',
+      loadState: '向下翻以加载更多',
+      sideOpen: false,
+
+      // 列表与分页信息
+      page: 1,
+      total: 2,
+      list: []
+    }
+  },
+
+  async onLoad() {
+    await this.init()
+  },
+  onUnload() {
+    this.OFF('EducationalAdministrationThermography-list-change')
+  },
+
+  methods: {
+    // 页面初始化
+    async init() {
+      this.ON('EducationalAdministrationThermography-list-change', this.refreshList)
+
+      // 拉取加载列表和数据源
+      await Promise.all([
+        this.FETCH_DATASOURCE('bjsj').then(data => {
+          this.dataSource.ClassNo = data.data.map(t => ({ text: t.classname, value: t.classno }))
+        }),
+        this.FETCH_DATASOURCE('BaseUser').then(data => {
+          this.dataSource.MeasurerID = data.data.map(t => ({ text: t.f_realname, value: t.f_account }))
+        }),
+        this.FETCH_DATASOURCE('StuInfoBasic').then(data => {
+          this.dataSource.PersonBeingMeasured = data.data.map(t => ({ text: t.stuname, value: t.stuno }))
+        }),
+        
+
+
+        () => {}
+      ])
+      await this.fetchList()
+      // 初始化查询条件
+      this.defaultQueryData = this.COPY(this.queryData)
+      this.ready = true
+    },
+
+    // 拉取列表
+    async fetchList() {
+      if (this.page > this.total) { return }
+
+      const result = await this.HTTP_GET(
+        '/EducationalAdministration/Thermography/pagelist',
+        {
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序)
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序
+          pagination: { rows: 10, page: this.page, sidx: 'ID', sord: 'DESC' },
+          queryJson: JSON.stringify(this.searchData)
+        },
+        '加载数据时出错'
+      )
+
+      if (!result) { return }
+
+      this.total = result.total
+      this.page = result.page + 1
+      this.list = this.list.concat(result.rows)
+
+      this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页，共 ${result.records} 项`
+      this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多'
+    },
+
+    // 刷新清空列表
+    async refreshList() {
+      this.page = 1
+      this.total = 2
+      this.list = []
+
+      await this.fetchList()
+    },
+
+    // 列表下拉
+    pullDown() {
+      this.refreshList().then(() => {
+        this.$refs.list.stopPullDown()
+      })
+    },
+
+    // 设置搜索条件
+    async searchChange() {
+      const result = {}
+
+      // 时间查询相关参数
+      if (this.dateRange) {
+        result.StartTime = this.dateRange.start
+        result.EndTime = this.dateRange.end
+      }
+
+      // 将其他查询项添加到查询 JSON 中
+      const queryObj = pickBy(this.queryData, t => (Array.isArray(t) ? t.length > 0 : t))
+      Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t)))
+
+      this.searchData = result
+      await this.refreshList()
+    },
+
+    // 点击「清空查询条件」按钮
+    reset() {
+      this.$refs.datefilter.changeDateRange('all')
+      this.queryData = this.COPY(this.defaultQueryData)
+      this.searchChange()
+    },
+
+    // 点击「编辑」、「查看」、「添加」、「删除」按钮
+    async action(type, id = '') {
+      switch (type) {
+        case 'view':
+          this.NAV_TO(`./single?type=view&id=${id}`)
+          return
+
+        case 'add':
+          this.NAV_TO('./single?type=create')
+          return
+
+        case 'edit':
+          this.NAV_TO(`./single?type=edit&id=${id}`)
+          return
+
+        case 'delete':
+          if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) {
+            return
+          }
+
+          this.HTTP_POST('/EducationalAdministration/Thermography/delete', id, '删除失败').then(success => {
+            if(!success) { return }
+            this.TOAST('删除成功', 'success')
+            this.refreshList()
+          })
+          return
+
+        default:
+          return
+      }
+    },
+
+    // 显示列表中的标题项
+    displayListItem(item, field) {
+      const fieldItem = this.scheme[field]
+      const value = item[field]
+
+      switch (fieldItem.type) {
+        case 'currentInfo':
+        case 'organize':
+          return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType), `${value}.name`, '')
+
+        case 'radio':
+        case 'select':
+          const selectItem = this.dataSource[field].find(t => t.value === String(value))
+          return get(selectItem, 'text', '')
+
+        case 'checkbox':
+          if (!value || value.split(',').length <= 0) { return '' }
+          const checkboxItems = value.split(',')
+          return this.dataSource[field].filter(t => checkboxItems.includes(t.value)).map(t => t.text).join('，')
+
+        case 'datetime':
+          if (!value) { return '' }
+          return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' : 'YYYY-MM-DD HH:mm')
+
+        default: return value === null || value === undefined ? '' : value
+      }
+    }
+
+  }
+}
+</script>
+
+
+<style lang="less" scoped>
+@import '~@/common/css/sidepage.less';
+@import '~@/common/css/customlist.less';
+</style>
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 @@
+<template>
+  <view class="page">
+    <view v-if="ready">
+      <l-select
+        @input="setValue('Thermography.ClassNo', $event)"
+        :value="getValue('Thermography.ClassNo')"
+        :disabled="!edit"
+        :range="dataSource.Thermography.ClassNo"
+        title="班级"
+      />
+      <l-select
+        @input="setValue('Thermography.MeasurerID', $event)"
+        :value="getValue('Thermography.MeasurerID')"
+        :disabled="!edit"
+        :range="dataSource.Thermography.MeasurerID"
+        title="测温人"
+      />
+      <l-select
+        @input="setValue('Thermography.PersonBeingMeasured', $event)"
+        :value="getValue('Thermography.PersonBeingMeasured')"
+        :disabled="!edit"
+        :range="dataSource.Thermography.PersonBeingMeasured"
+        title="被测温人"
+      />
+      <l-date-picker
+        @input="setValue('Thermography.MeasureDate', $event)"
+        :value="getValue('Thermography.MeasureDate')"
+        :disabled="!edit"
+        title="测量时间"
+      />
+      <l-select
+        @input="setValue('Thermography.MeasureTime', $event)"
+        :value="getValue('Thermography.MeasureTime')"
+        :disabled="!edit"
+        :range="dataSource.Thermography.MeasureTime"
+        title="测温时间段"
+      />
+      <l-select
+        @input="setValue('Thermography.Status', $event)"
+        :value="getValue('Thermography.Status')"
+        :disabled="!edit"
+        :range="dataSource.Thermography.Status"
+        title="状态"
+      />
+      <l-input
+        @input="setValue('Thermography.Temperature', $event)"
+        :value="getValue('Thermography.Temperature')"
+        :disabled="!edit"
+        title="温度"
+      />
+      <l-textarea
+        @input="setValue('Thermography.ProcessingResult', $event)"
+        :value="getValue('Thermography.ProcessingResult')"
+        :readonly="!edit"
+        title="处理结果"
+      />
+      <l-textarea
+        @input="setValue('Thermography.Remark', $event)"
+        :value="getValue('Thermography.Remark')"
+        :readonly="!edit"
+        title="备注"
+      />
+    </view>
+
+    <view v-if="ready" class="bg-white margin-tb padding"  style="padding-top: 0; overflow: hidden;">
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block>
+        提交保存
+      </l-button>
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block>
+        编辑本页
+      </l-button>
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block>
+        取消编辑
+      </l-button>
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block>
+        删除
+      </l-button>
+    </view>
+  </view>
+</template>
+
+
+<script>
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-10-12 17:22
+ * 描  述：班级自诊打卡
+ */
+
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/EducationalAdministration/Thermography/single", "style": { "navigationBarTitleText": "表单详情页" } }
+ * 
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改）
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件）
+ */
+
+import get from 'lodash/get'
+import set from 'lodash/set'
+import moment from 'moment'
+import customPageMixins from '@/common/custompage.js'
+
+export default {
+  mixins: [customPageMixins],
+
+  data() {
+    return {
+      // 页面相关参数
+      id: null,
+      mode: null,
+      edit: null,
+      ready: false,
+
+      // 表单数据
+      current: {},
+      origin: {},
+
+      // 表单项数据结构
+      scheme: {
+        Thermography: {
+          ClassNo: { type: 'select', title: '班级', dataSource: '1', dataSourceId: 'bjsj,classname,classno' },
+          MeasurerID: { type: 'select', title: '测温人', dataSource: '1', dataSourceId: 'BaseUser,f_realname,f_account' },
+          PersonBeingMeasured: { type: 'select', title: '被测温人', dataSource: '1', dataSourceId: 'StuInfoBasic,stuname,stuno' },
+          MeasureDate: { type: 'datetime', title: '测量时间', dateformat: '0' },
+          MeasureTime: { type: 'select', title: '测温时间段', itemCode: 'MeasureTime', dataSource: '0' },
+          Status: { type: 'select', title: '状态', itemCode: 'TemperatureMeasure', dataSource: '0' },
+          Temperature: { type: 'text', title: '温度' },
+          ProcessingResult: { type: 'textarea', title: '处理结果' },
+          Remark: { type: 'textarea', title: '备注' },
+        },
+
+      },
+
+      // 数据源
+      dataSource: {
+        Thermography: {
+          ClassNo: [],
+          MeasurerID: [],
+          PersonBeingMeasured: [],
+          MeasureTime: Object.values(this.GET_GLOBAL('dataDictionary').MeasureTime).map(t => ({ value: t.value, text: t.text })),
+          Status: Object.values(this.GET_GLOBAL('dataDictionary').TemperatureMeasure).map(t => ({ value: t.value, text: t.text })),
+        },
+
+      }
+    }
+  },
+
+  async onLoad({ type, id }) {
+    await this.init(type, id)
+  },
+
+  methods: {
+    // 页面初始化
+    async init(type, id) {
+      this.LOADING('加载数据中...')
+
+      this.id = id
+      this.mode = type
+      this.edit = ['create', 'edit'].includes(this.mode)
+
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据
+      await Promise.all([
+        this.FETCH_DATASOURCE('bjsj').then(result => {
+          this.dataSource.Thermography.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno }))
+        }),
+        this.FETCH_DATASOURCE('BaseUser').then(result => {
+          this.dataSource.Thermography.MeasurerID = result.data.map(t => ({ text: t.f_realname, value: t.f_account }))
+        }),
+        this.FETCH_DATASOURCE('StuInfoBasic').then(result => {
+          this.dataSource.Thermography.PersonBeingMeasured = result.data.map(t => ({ text: t.stuname, value: t.stuno }))
+        }),
+
+
+        () => {}
+      ])
+      await this.fetchForm()
+
+      this.ready = true
+      this.HIDE_LOADING()
+    },
+
+    // 加载表单数据
+    async fetchForm() {
+      if (this.mode === 'create') {
+        this.origin = await this.getDefaultForm()
+      } else {
+        const result = await this.HTTP_GET('/EducationalAdministration/Thermography/form', this.id)
+        this.origin = await this.formatFormData(result)
+      }
+      this.current = this.COPY(this.origin)
+    },
+
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮
+    async action(type) {
+      switch (type) {
+        case 'edit':
+          this.edit = true
+          break
+
+        case 'reset':
+          this.current = this.COPY(this.origin)
+          this.edit = false
+          break
+
+        case 'save':
+          const verifyResult = this.verifyForm()
+          if (verifyResult.length > 0) {
+            this.CONFIRM('表单验证失败', verifyResult.join('\n'))
+            return
+          }
+
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) {
+            return
+          }
+
+          this.LOADING('正在提交...')
+          const postData = await this.getPostData()
+
+          this.HTTP_POST('/EducationalAdministration/Thermography/save', postData, '表单提交保存失败').then(success => {
+            this.HIDE_LOADING()
+            if (!success) {
+              return
+            }
+
+            this.EMIT('EducationalAdministrationThermography-list-change')
+            this.NAV_BACK()
+            this.TOAST('提交保存成功')
+          })
+          break
+
+        case 'delete':
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) {
+            return
+          }
+
+          this.LOADING('提交删除中...')
+          this.HTTP_POST('/EducationalAdministration/Thermography/delete', this.id, '删除失败').then(success => {
+            this.HIDE_LOADING()
+            if (!success) {
+              return
+            }
+
+            this.EMIT('EducationalAdministrationThermography-list-change')
+            this.NAV_BACK()
+            this.this.TOAST('删除成功', 'success')
+          })
+          break
+
+        default: break
+      }
+    },
+
+    // 获取表单值
+    getValue(path) {
+      return get(this.current, path)
+    },
+
+    // 设置表单值
+    setValue(path, val) {
+      set(this.current, path, val)
+    }
+  }
+}
+</script>
+
+