Browse Source

小程序掌上评教列表页面

大厂分支
zhichao lei 4 years ago
parent
commit
e6686e15d6
11 changed files with 481 additions and 8 deletions
  1. +0
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.css
  2. +0
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.html
  3. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.js
  4. +0
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css
  5. +0
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html
  6. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js
  7. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs
  8. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs
  9. +4
    -1
      Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
  10. +253
    -0
      Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue
  11. +217
    -0
      Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.css → Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.css View File


Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.html → Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.html View File


Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeach.js → Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeach.js View File

@@ -36,7 +36,7 @@
if (param.multipleData) {
_postParam.queryJson = JSON.stringify(multipleData);
}
learun.httpget(config.webapi + '/learun/eval/studentlist', _postParam, (data) => {
learun.httpget(config.webapi + 'learun/adms/eval/studentlist', _postParam, (data) => {
$page.find('.lr-badge').text('0');
if (data) {
$page.find('.lr-badge').text(data.records);
@@ -61,14 +61,14 @@
learun.layer.warning("当前项目已评教!");
return;
}
learun.nav.go({ path: 'EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, EmpNo: item.EmpNo, LessonNo: item.LessonNo } });
learun.nav.go({ path: 'EducationalAdministration/EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, EmpNo: item.EmpNo, LessonNo: item.LessonNo } });
},
btnClick: function (item, $item, $page) {// 左滑按钮点击事件
if (item.UID == undefined || item.UID === '') {
learun.layer.warning("当前项目未评教!");
return;
}
learun.nav.go({ path: 'EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, StuNo: item.StuNo } });
learun.nav.go({ path: 'EducationalAdministration/EvaluationTeach/EvaluationTeahcers', title: '评价教师', type: 'right', param: { VID: item.VID, StuNo: item.StuNo } });
},
rowBtns: ['<a class="lr-btn-success">查看</a>'] // 列表行左滑按钮
};

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css → Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.css View File


Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html → Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.html View File


Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js → Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EvaluationTeach/EvaluationTeahcers/EvaluationTeahcers.js View File

@@ -4,7 +4,7 @@
init: function($page, param) {
var path = config.webapi;
learun.layer.loading(true, "加载数据中...");
learun.httpget(path + "/learun/eval/paper", {
learun.httpget(path + "learun/adms/eval/paper", {
VID: param.VID
}, (res) => {
learun.layer.loading(false);
@@ -92,7 +92,7 @@
return
}
// return
learun.httpget(path + "/learun/eval/savepaper",
learun.httpget(path + "learun/adms/eval/savepaper",
{
VID: param.VID,
LessonNo: param.LessonNo,

+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EvalApi.cs View File

@@ -17,7 +17,7 @@ namespace Learun.Application.WebApi.Modules
public class EvalApi : BaseApi
{
public EvalApi()
: base("/learun/eval")
: base("/learun/adms/eval")
{
Get["/paper"] = GetPaper;// 获取组织机构数据映射表
Get["/studentlist"] = GetStudentList;


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs View File

@@ -75,7 +75,7 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
strSql.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and a.StuNo='" + queryParam["StuNo"] + "') aa ");
strSql.Append("left join (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID ");
strSql.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo ");
return this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql.ToString());
return this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql.ToString(),pagination);
}
catch (Exception ex)
{


+ 4
- 1
Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json View File

@@ -186,7 +186,10 @@
{ "path": "pages/PersonnelManagement/ContactsDetails/single", "style": { "navigationBarTitleText": "详情" } },
//听课记录
{ "path": "pages/LogisticsManagement/ListenClassRecord/list", "style": { "navigationBarTitleText": "听课记录" } },
{ "path": "pages/LogisticsManagement/ListenClassRecord/single", "style": { "navigationBarTitleText": "详情" } }
{ "path": "pages/LogisticsManagement/ListenClassRecord/single", "style": { "navigationBarTitleText": "详情" } },
//掌上评教
{ "path": "pages/EducationalAdministration/EvaluationTeach/list", "style": { "navigationBarTitleText": "课程列表" } },
{ "path": "pages/EducationalAdministration/EvaluationTeach/single", "style": { "navigationBarTitleText": "评教" } }
],



+ 253
- 0
Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/list.vue View File

@@ -0,0 +1,253 @@
<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.VID">
  
            <view class="customlist-item-field">
              <text class="customlist-item-field-title">学年:</text>
              {{ displayListItem(item, 'AcademicYearNo') }}
            </view>
  
            <view class="customlist-item-field">
              <text class="customlist-item-field-title">学期:</text>
              {{ displayListItem(item, 'Semester') }}
            </view>
  
            <view class="customlist-item-field">
              <text class="customlist-item-field-title">教师姓名:</text>
              {{ displayListItem(item, 'EmpName') }}
            </view>
  
            <view class="customlist-item-field">
              <text class="customlist-item-field-title">课程名称:</text>
              {{ displayListItem(item, 'LessonName') }}
</view>
            <view class="customlist-item-field">
              <text class="customlist-item-field-title">评教状态:</text>
              {{ displayListItem(item, 'UID') }}
            </view>
  
  
            <l-customlist-action @view="action('view', item)" />
          </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">
  
  
        <!-- 重置查询条件按钮 -->
        <view class="padding-tb">
          <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button>
        </view>
      </view>
    </scroll-view>
  
  
  </view>
</template>
  
  
<script>
/*
 * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
 * Copyright (c) 2013-2020 上海力软信息技术有限公司
 * 创建人:超级管理员
 * 日  期:2020-10-16 15:39
 * 描  述:工作日志
 */
  
/**
 * 本段代码由移动端代码生成器输出,移动端须 2.2.0 版本及以上可以使用
 * 请在移动端 /pages.json 中的 pages 字段中添加一条记录:
 * { "path": "pages/EducationalAdministration/Journal/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: {
        AcademicYearNo: { type: 'text' },
        Semester: { type: 'text'},
        EmpName: { type: 'text'},
        LessonName: { type: 'text' },
        UID: { type: 'bit' },
      },
  
      // 查询条件
      searchData: {},
      defaultQueryData: {},
      queryData: {
      },
  
      // 数据源
      dataSource: {
        JTypeId: [],
      },
  
      // 页面相关参数
      ready: false,
      tips: '加载中...',
      loadState: '向下翻以加载更多',
      sideOpen: false,
  
      // 列表与分页信息
      page: 1,
      total: 2,
      list: []
    }
  },
  
  async onLoad() {
    await this.init()
  },
  onUnload() {
    this.OFF('EducationalAdministrationJournalSend-list-change')
  },
  
  methods: {
    // 页面初始化
    async init() {
      this.ON('EducationalAdministrationJournalSend-list-change', this.refreshList)
  
      // 拉取加载列表和数据源
      await Promise.all([
  
  
        () => {}
      ])
      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(
        '/eval/studentlist',
        {
          // 这里 sidx 表示排序字段,sord 表示排序方式(DESC=降序,ASC=升序)
          // 代码生成器生成时默认按照主键排序,您可以修改成按创建时间的字段降序
          pagination: { rows: 10, page: this.page, sidx: '', 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 = {}
  
      // 将其他查询项添加到查询 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.queryData = this.COPY(this.defaultQueryData)
      this.searchChange()
    },
  
    // 点击「编辑」、「查看」、「添加」、「删除」按钮
    async action(type, item) {
this.NAV_TO(`./single?type=view&id=${item.VID}&EmpNo=${item.EmpNo}&LessonNo=${item.LessonNo}`)
    },
  
    // 显示列表中的标题项
    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')
case 'bit':
return (value != undefined && value!== '') ? "已评" : "未评"
  
        default: return value === null || value === undefined ? '' : value
      }
    }
  
  }
}
</script>
  
  
<style lang="less" scoped>
@import '~@/common/css/sidepage.less';
@import '~@/common/css/customlist.less';
</style>

+ 217
- 0
Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EvaluationTeach/single.vue View File

@@ -0,0 +1,217 @@
<template>
  <view class="page">
    <view v-if="ready">
      <l-input
        @input="setValue('JournalSend.JTitle', $event)"
        :value="getValue('JournalSend.JTitle')"
        :disabled="!edit"
        title="上课是否迟到"
      />
      <l-select
        @input="setValue('JournalSend.JTypeId', $event)"
        :value="getValue('JournalSend.JTypeId')"
        :disabled="!edit"
        :range="dataSource.JournalSend.JTypeId"
        title="是否拖堂"
      />
      <l-organize-picker
        @input="setValue('JournalSend.JReceiveId', $event)"
        :value="getValue('JournalSend.JReceiveId')"
        :readonly="!edit"
        type="user"
        title="作业量是否合理"
      />
      <l-textarea
        @input="setValue('JournalSend.JContent', $event)"
        :value="getValue('JournalSend.JContent')"
        :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-16 15:39
 * 描  述:工作日志
 */
  
/**
 * 本段代码由移动端代码生成器输出,移动端须 2.2.0 版本及以上可以使用
 * 请在移动端 /pages.json 中的 pages 字段中添加一条记录:
 * { "path": "pages/EducationalAdministration/JournalSend/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: {
        JournalSend: {
          JTitle: { type: 'text', title: '日志主题' },
          JTypeId: { type: 'select', title: '日志类型', dataSource: '0' },
          JReceiveId: { type: 'organize', title: '接收人', dataType: 'user' },
          JContent: { type: 'textarea', title: '日志内容' },
        },
  
      },
  
      // 数据源
      dataSource: {
        JournalSend: {
          JTypeId: [],
        },
  
      }
    }
  },
  
  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([
  
  
        () => {}
      ])
      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('/eval/paper', {VID:this.id})
console.log(result);
        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.id)
  
          this.HTTP_POST('/EducationalAdministration/Journal/save', postData, '表单提交保存失败').then(success => {
            this.HIDE_LOADING()
            if (!success) {
              return
            }
  
            this.EMIT('EducationalAdministrationJournalSend-list-change')
            this.NAV_BACK()
            this.TOAST('提交保存成功')
          })
          break
  
        case 'delete':
          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗?', true))) {
            return
          }
  
          this.LOADING('提交删除中...')
          this.HTTP_POST('/EducationalAdministration/Journal/delete', this.id, '删除失败').then(success => {
            this.HIDE_LOADING()
            if (!success) {
              return
            }
  
            this.EMIT('EducationalAdministrationJournalSend-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>

Loading…
Cancel
Save