Jelajahi Sumber

Merge branch 'develop3.0' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0

CrazyIter 4 tahun lalu
induk
melakukan
6e38ca05c3

+ 0 - 95
TEAMModelOS/ClientApp/src/components/selflearn/ActivityInfo.vue

@@ -1,95 +0,0 @@
-<template>
-    <div class="activity-info-container dark-iview-split">
-        <Split v-model="split1">
-            <div slot="left" class="activity-target-list">
-                <div class="activity-target-header">
-                    <span>
-                        学习对象
-                    </span>
-                    <div class="tools-box">
-                        <Icon type="ios-undo" class="action-btn-icon" title="撤回" />
-                        <Icon type="ios-send" class="action-btn-icon" title="分享" />
-                        <Icon type="md-create" class="action-btn-icon" title="编辑" />
-                    </div>
-                </div>
-                <div @click="selectActivity(index)" v-for="(item,index) in activityList" :class="index == currentActivityIndex ? 'activity-target-item block-bg block-bg-active':'block-bg activity-target-item'">
-                    <p class="target-name">
-                        {{item.classroomName}}
-                        <span class="activity-status">进行中</span>
-                    </p>
-                    
-                    <p style="margin-top:6px;">
-                        <span class="info-label"><Icon type="md-flag" style="margin-right:5px;" size="16" />活动类型:</span>
-                        <span class="info-value">{{item.type}}</span>
-                    </p>
-                    <p style="margin-top:6px;" v-if="item.type == '自主学习'">
-                        <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />开始时间:</span>
-                        <span class="info-value">{{item.startTime}}</span>
-                    </p>
-                    <p style="margin-top:6px;" v-else>
-                        <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />结束时间:</span>
-                        <span class="info-value">{{item.endTime}}</span>
-                    </p>
-                </div>
-
-
-
-            </div>
-            <div slot="right" class="activity-detail-info">
-                <LearnProgress v-if="!showAnswer" @goToAnswer="goToAnswer"></LearnProgress>
-                <!--<AnswerDetail v-else @closeAnswerDetail="closeAnswerDetail"></AnswerDetail>-->
-                <AnswerRecord v-else @closeAnswerDetail="closeAnswerDetail"></AnswerRecord>
-            </div>
-        </Split>
-    </div>
-</template>
-<script>
-    import LearnProgress from '@/view/selflearning/LearnProgress.vue'
-    import AnswerDetail from './AnswerDetail.vue'
-    import AnswerRecord from './AnswerRecord.vue'
-    export default {
-        components: {
-            LearnProgress,AnswerDetail,AnswerRecord
-        },
-        data() {
-            return {
-                showAnswer: false,
-                currentActivityIndex:0,
-                split1: 0.25,
-                activityList: [
-                    {
-                        classroomName:'一年级一班',
-                        classroomCode: '123',
-                        type:'自主学习',
-                        startTime: '2019-05-06',
-                        endTime:'2020-05-07'
-                    },
-                    {
-                        classroomName:'一年级二班',
-                        classroomCode: '123',
-                        type:'课前预习',
-                        startTime: '2019-05-06',
-                        endTime:'2020-05-07'
-                    },
-                ]
-            }
-        },
-        methods: {
-            selectActivity(index) {
-                this.currentActivityIndex = index
-            },
-            goToAnswer() {
-                this.showAnswer = true
-            },
-            closeAnswerDetail() {
-                this.showAnswer = false
-            }
-        }
-    }
-</script>
-<style lang="less" scoped>
-    @import "ActivityInfo.less";
-</style>
-<style>
-
-</style>

+ 1 - 1
TEAMModelOS/ClientApp/src/view/learnactivity/ManualCreate.vue

@@ -208,7 +208,7 @@
                 let findCountParams = {
                     "collectionName": "ItemInfo",
                     "queryDict": {
-                        'code': this.deleteAll(this.manualFilter.code),
+                        'code': this.manualFilter.code.indexOf('all') !== -1 ? [this.$store.state.userInfo.TEAMModelId, this.$store.state.userInfo.schoolCode]:this.manualFilter.code,
                         'periodCode': this.deleteAll(this.manualFilter.periodCode),
                         'level': this.deleteAll(this.manualFilter.level),
                         'type': this.deleteAll(this.manualFilter.type),

+ 1 - 1
TEAMModelOS/ClientApp/src/view/newcourse/CourseClassroom.vue

@@ -31,7 +31,7 @@
         <div class="course-classroom-info" v-if="JSON.stringify(courseInfo) !== '{}'">
             <div class="course-classroom-info-header" style="padding-right:50px;">
                 <span class="course-classroom-label">{{$t('courseManage.classroom.studentList')}}</span>
-                <div  v-if="courseInfo.classes" style="float:right;">
+                <div  v-if="courseInfo.classes" style="float:right;color:white;">
                     <Button v-show="updated" type="primary" size="small" style="float:right;margin-left:30px;margin-top:8px;" @click="saveGroup">保存分组</Button>
                     <Button size="small" style="float:right;margin-top:8px;" @click="customGroup">{{$t('courseManage.classroom.autoGroupBtn')}}</Button>
                     <div style="float:right;margin-right:30px;" v-show="courseInfo.classes[curClassIndex].code == $store.state.userInfo.TEAMModelId">

+ 11 - 3
TEAMModelOS/ClientApp/src/view/newcourse/CourseTable.less

@@ -20,9 +20,6 @@
 .week-day-cell {
     height: 76px;
     position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: center;
     cursor: pointer;
 }
 
@@ -55,4 +52,15 @@
     .label {
         margin-right: 5px;
     }
+}
+.course-name {
+    padding-top: 12px;
+    font-size: 18px;
+    font-weight: 800;
+    font-family: cursive;
+}
+
+.classroom-name {
+    color: #a5a5a5;
+    font-size: 12px;
 }

TEAMModelOS/ClientApp/src/components/selflearn/ActivityInfo.less → TEAMModelOS/ClientApp/src/view/selfstudy/ActivityInfo.less


+ 222 - 0
TEAMModelOS/ClientApp/src/view/selfstudy/ActivityInfo.vue

@@ -0,0 +1,222 @@
+<template>
+    <div class="activity-info-container dark-iview-split">
+        <Split v-model="split1">
+            <div slot="left" class="activity-target-list">
+                <div class="activity-target-header">
+                    <span>
+                        学习对象
+                    </span>
+                    <div class="tools-box">
+                        <Icon type="ios-undo" class="action-btn-icon" title="撤回" />
+                        <Icon type="ios-send" class="action-btn-icon" title="分享" />
+                        <Icon type="md-create" class="action-btn-icon" title="编辑" />
+                    </div>
+                </div>
+                <div @click="selectActivity(index)" v-for="(item,index) in activityList" :class="index == currentActivityIndex ? 'activity-target-item block-bg block-bg-active':'block-bg activity-target-item'">
+                    <p class="target-name">
+                        {{item.classroomName}}
+                        <span class="activity-status">进行中</span>
+                    </p>
+
+                    <p style="margin-top:6px;">
+                        <span class="info-label"><Icon type="md-flag" style="margin-right:5px;" size="16" />活动类型:</span>
+                        <span class="info-value">{{item.type}}</span>
+                    </p>
+                    <p style="margin-top:6px;" v-if="item.type == '自主学习'">
+                        <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />开始时间:</span>
+                        <span class="info-value">{{item.startTime}}</span>
+                    </p>
+                    <p style="margin-top:6px;" v-else>
+                        <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />结束时间:</span>
+                        <span class="info-value">{{item.endTime}}</span>
+                    </p>
+                </div>
+
+
+
+            </div>
+            <div slot="right" class="activity-detail-info">
+                <LearnProgress v-if="!showAnswer" @goToAnswer="goToAnswer"></LearnProgress>
+                <!--<AnswerDetail v-else @closeAnswerDetail="closeAnswerDetail"></AnswerDetail>-->
+                <AnswerRecord v-else @closeAnswerDetail="closeAnswerDetail"></AnswerRecord>
+            </div>
+        </Split>
+        <Modal v-model="publishStatus"
+               title="发布自主学习活动"
+               class-name="dark-iview-modal dark-iview-form publish-modal"
+               @on-ok="confirmPublish">
+            <Form ref="activityInfo" :model="activityInfo" label-colon label-position="left" :label-width="90" :rules="ruleValidate">
+                <FormItem label="发布对象" prop="target">
+                    <Select v-model="activityInfo.target" multiple>
+                        <Option v-for="item in classList" :value="item.classroomCode" :key="item.classroomCode">{{ item.classroomName }}</Option>
+                    </Select>
+                </FormItem>
+                <FormItem label="发布方式" prop="publishType">
+                    <RadioGroup v-model="activityInfo.publishType" style="color:white;">
+                        <Radio :label="item.value" v-for="item in publishTypeList">
+                            <span>{{ item.label }}</span>
+                        </Radio>
+                    </RadioGroup>
+                </FormItem>
+                <FormItem label="发布时间" v-if="activityInfo.publishType == 1" prop="startTime">
+                    <DatePicker type="datetime" placeholder="设置开始时间" style="width: 100%;" @on-change="setStartTime"></DatePicker>
+                </FormItem>
+                <FormItem label="活动类型" prop="type">
+                    <RadioGroup v-model="activityInfo.type" style="color:white;">
+                        <Radio :label="item.value" v-for="item in activityTypeList">
+                            <span>{{ item.label }}</span>
+                        </Radio>
+                    </RadioGroup>
+                </FormItem>
+                <FormItem label="截止时间" v-if="activityInfo.type == 1" prop="endTime">
+                    <DatePicker type="datetime" placeholder="设置截止时间" style="width: 100%;" @on-change="setEndTime"></DatePicker>
+                </FormItem>
+                <FormItem label="闯关模式" prop="isOrder">
+                    <RadioGroup v-model="activityInfo.isOrder" style="color:white;">
+                        <Radio label="1" style="width:82px;">
+                            <span>是</span>
+                        </Radio>
+                        <Radio label="0">
+                            <span>否</span>
+                        </Radio>
+                    </RadioGroup>
+                </FormItem>
+            </Form>
+        </Modal>
+    </div>
+</template>
+<script>
+    import LearnProgress from '@/view/selflearning/LearnProgress.vue'
+    import AnswerDetail from './AnswerDetail.vue'
+    import AnswerRecord from './AnswerRecord.vue'
+    export default {
+        components: {
+            LearnProgress,AnswerDetail,AnswerRecord
+        },
+        data() {
+            return {
+                publishTypeList: [
+                    {
+                        value: '0',
+                        label:'立即发布'
+                    },
+                    {
+                        value: '1',
+                        label:'定时发布'
+                    }
+                ],
+                activityTypeList: [
+                    {
+                        value: '0',
+                        label:'自主学习'
+                    },
+                    {
+                        value: '1',
+                        label:'课前预习'
+                    },
+                ],
+                ruleValidate: {
+                    target: [
+                        { required: true, type: 'array', message: '请选择发布对象', trigger: 'change' }
+                    ],
+                    publishType: [
+                        { required: true, message: '请选择发布方式', trigger: 'change' }
+                    ],
+                    type: [
+                        { required: true, message: '请选择活动类型', trigger: 'change' }
+                    ],
+                    isOrder: [
+                        { required: true, message: '请选择活动模式', trigger: 'change' }
+                    ],
+                    startTime: [
+                        { required: true, type:'number', message: '请设置发布时间', trigger: 'change' }
+                    ],
+                    endTime: [
+                        { required: true, type:'number',message: '请设置结束时间', trigger: 'change' }
+                    ]
+                },
+                classList: [],
+                activityInfo: {
+                    type: '',
+                    endTime: undefined,
+                    target: [],
+                    publishType: '',
+                    startTime: undefined,
+                    isOrder:1
+                },
+                publishStatus: false,
+                showAnswer: false,
+                currentActivityIndex:0,
+                split1: 0.25,
+                activityList: [
+                    {
+                        classroomName:'一年级一班',
+                        classroomCode: '123',
+                        type:'自主学习',
+                        startTime: '2019-05-06',
+                        endTime:'2020-05-07'
+                    },
+                    {
+                        classroomName:'一年级二班',
+                        classroomCode: '123',
+                        type:'课前预习',
+                        startTime: '2019-05-06',
+                        endTime:'2020-05-07'
+                    },
+                ]
+            }
+        },
+        methods: {
+            confirmPublish() {
+                this.$refs.activityInfo.validate((valid) => {
+                    if (valid) {
+                        console.log(this.activityInfo)
+                    } else {
+                        //this.publishStatus = true
+                        this.$Message.error('请完善信息再发布!')
+                    }
+                })
+                
+            },
+            /**
+             * 查找教师课程下的教室(班级)
+             * */
+            findClassroom() {
+                if (this.classList.length == 0) {
+                    let requestData = this.$store.state.userInfo.TEAMModelId
+                    this.$api.learnActivity.FindClassroomByTeacherId(requestData).then(
+                        res => {
+                            if (res.error == null) {
+                                this.classList = res.result.data
+
+                            } else {
+                                this.$Message.error('API ERROR!')
+                            }
+                        },
+                        err => {
+
+                        }
+                    )
+                }
+            },
+            selectActivity(index) {
+                this.currentActivityIndex = index
+            },
+            goToAnswer() {
+                this.showAnswer = true
+            },
+            closeAnswerDetail() {
+                this.showAnswer = false
+            }
+        },
+        created() {
+            this.findClassroom()
+        }
+    }
+</script>
+<style lang="less" scoped>
+    @import "ActivityInfo.less";
+</style>
+<style>
+
+</style>

TEAMModelOS/ClientApp/src/components/selflearn/AnswerDetail.less → TEAMModelOS/ClientApp/src/view/selfstudy/AnswerDetail.less


TEAMModelOS/ClientApp/src/components/selflearn/AnswerDetail.vue → TEAMModelOS/ClientApp/src/view/selfstudy/AnswerDetail.vue


TEAMModelOS/ClientApp/src/components/selflearn/AnswerRecord.less → TEAMModelOS/ClientApp/src/view/selfstudy/AnswerRecord.less


TEAMModelOS/ClientApp/src/components/selflearn/AnswerRecord.vue → TEAMModelOS/ClientApp/src/view/selfstudy/AnswerRecord.vue


TEAMModelOS/ClientApp/src/components/selflearn/OrderLearnInfo.less → TEAMModelOS/ClientApp/src/view/selfstudy/OrderLearnInfo.less


TEAMModelOS/ClientApp/src/components/selflearn/OrderLearnInfo.vue → TEAMModelOS/ClientApp/src/view/selfstudy/OrderLearnInfo.vue


TEAMModelOS/ClientApp/src/components/selflearn/OrderLearnList.less → TEAMModelOS/ClientApp/src/view/selfstudy/OrderLearnList.less


TEAMModelOS/ClientApp/src/components/selflearn/OrderLearnList.vue → TEAMModelOS/ClientApp/src/view/selfstudy/OrderLearnList.vue


+ 9 - 130
TEAMModelOS/ClientApp/src/view/selfstudy/SelfLearn.vue

@@ -46,48 +46,7 @@
                @on-ok="confirmDelete">
             <p>确认删除<span style="color:blue;padding:0px 5px;font-weight:600;" v-if="deleteStatus">{{ listType == 'order' ? orderLearnList[currentLearnIndex].name : unitList[currentUnitIndex].name}}</span>?</p>
         </Modal>
-        <Modal v-model="publishStatus"
-               title="发布自主学习活动"
-               class-name="dark-iview-modal dark-iview-form publish-modal"
-               @on-ok="confirmPublish">
-            <Form ref="activityInfo" :model="activityInfo" label-colon label-position="left" :label-width="90" :rules="ruleValidate">
-                <FormItem label="发布对象" prop="target">
-                    <Select v-model="activityInfo.target" multiple>
-                        <Option v-for="item in classList" :value="item.classroomCode" :key="item.classroomCode">{{ item.classroomName }}</Option>
-                    </Select>
-                </FormItem>
-                <FormItem label="发布方式" prop="publishType">
-                    <RadioGroup v-model="activityInfo.publishType" style="color:white;">
-                        <Radio :label="item.value" v-for="item in publishTypeList">
-                            <span>{{ item.label }}</span>
-                        </Radio>
-                    </RadioGroup>
-                </FormItem>
-                <FormItem label="发布时间" v-if="activityInfo.publishType == 1" prop="startTime">
-                    <DatePicker type="datetime" placeholder="设置开始时间" style="width: 100%;" @on-change="setStartTime"></DatePicker>
-                </FormItem>
-                <FormItem label="活动类型" prop="type">
-                    <RadioGroup v-model="activityInfo.type" style="color:white;">
-                        <Radio :label="item.value" v-for="item in activityTypeList">
-                            <span>{{ item.label }}</span>
-                        </Radio>
-                    </RadioGroup>
-                </FormItem>
-                <FormItem label="截止时间" v-if="activityInfo.type == 1" prop="endTime">
-                    <DatePicker type="datetime" placeholder="设置截止时间" style="width: 100%;" @on-change="setEndTime"></DatePicker>
-                </FormItem>
-                <FormItem label="闯关模式" prop="isOrder">
-                    <RadioGroup v-model="activityInfo.isOrder" style="color:white;">
-                        <Radio label="1" style="width:82px;">
-                            <span>是</span>
-                        </Radio>
-                        <Radio label="0">
-                            <span>否</span>
-                        </Radio>
-                    </RadioGroup>
-                </FormItem>
-            </Form>
-        </Modal>
+        
     </div>
 </template>
 <script>
@@ -95,11 +54,11 @@
     import Loading from '@/common/Loading.vue'
     import QuestionList from '@/components/learnactivity/QuestionList.vue'
     import ContentFileList from '@/components/learnactivity/ContentFileList.vue'
-    import OrderLearnList from '@/components/selflearn/OrderLearnList.vue'
-    import UnitList from '@/components/selflearn/UnitList.vue'
-    import OrderLearnInfo from '@/components/selflearn/OrderLearnInfo.vue'
-    import UnitInfo from '@/components/selflearn/UnitInfo.vue'
-    import ActivityInfo from '@/components/selflearn/ActivityInfo.vue'
+    import OrderLearnList from './OrderLearnList.vue'
+    import UnitList from './UnitList.vue'
+    import OrderLearnInfo from './OrderLearnInfo.vue'
+    import UnitInfo from './UnitInfo.vue'
+    import ActivityInfo from './ActivityInfo.vue'
     
     export default {
         components: {
@@ -107,60 +66,11 @@
         },
         data() {
             return {
-                activityInfo: {
-                    type: '',
-                    endTime: undefined,
-                    target: [],
-                    publishType: '',
-                    startTime: undefined,
-                    isOrder:1
-                },
-                ruleValidate: {
-                    target: [
-                        { required: true, type: 'array', message: '请选择发布对象', trigger: 'change' }
-                    ],
-                    publishType: [
-                        { required: true, message: '请选择发布方式', trigger: 'change' }
-                    ],
-                    type: [
-                        { required: true, message: '请选择活动类型', trigger: 'change' }
-                    ],
-                    isOrder: [
-                        { required: true, message: '请选择活动模式', trigger: 'change' }
-                    ],
-                    startTime: [
-                        { required: true, type:'number', message: '请设置发布时间', trigger: 'change' }
-                    ],
-                    endTime: [
-                        { required: true, type:'number',message: '请设置结束时间', trigger: 'change' }
-                    ]
-                },
-                classList: [],
-                publishTypeList: [
-                    {
-                        value: '0',
-                        label:'立即发布'
-                    },
-                    {
-                        value: '1',
-                        label:'定时发布'
-                    }
-                ],
-                activityTypeList: [
-                    {
-                        value: '0',
-                        label:'自主学习'
-                    },
-                    {
-                        value: '1',
-                        label:'课前预习'
-                    },
-                ],
+                
                 currentTabIndex: 1,
                 listType: 'order',//order: 编序式教材 unit:学习单元
                 isLoading: false,
                 sasString: '',
-                publishStatus: false,
                 deleteStatus: false,
                 editStatus: false,
                 orderLearnList: [],
@@ -193,44 +103,14 @@
             setEndTime(date, data) {
                 this.activityInfo.endTime = new Date(date).getTime()
             },
-            /**
-             * 查找教师课程下的教室(班级)
-             * */
-            findClassroom() {
-                if (this.classList.length == 0) {
-                    let requestData = this.$store.state.userInfo.TEAMModelId
-                    this.$api.learnActivity.FindClassroomByTeacherId(requestData).then(
-                        res => {
-                            if (res.error == null) {
-                                this.classList = res.result.data
-
-                            } else {
-                                this.$Message.error('API ERROR!')
-                            }
-                        },
-                        err => {
-
-                        }
-                    )
-                }
-            },
+            
             /**
              * 发布活动
             */
             publishActivity() {
                 this.publishStatus = true
             },
-            confirmPublish() {
-                this.$refs.activityInfo.validate((valid) => {
-                    if (valid) {
-                        console.log(this.activityInfo)
-                    } else {
-                        //this.publishStatus = true
-                        this.$Message.error('请完善信息再发布!')
-                    }
-                })
-                
-            },
+            
             selectTab(index) {
                 this.currentTabIndex = index
             },
@@ -406,7 +286,6 @@
         },
         created() {
             this.findOrderLearn()
-            this.findClassroom()
         }
     }
 </script>

TEAMModelOS/ClientApp/src/components/selflearn/UnitInfo.less → TEAMModelOS/ClientApp/src/view/selfstudy/UnitInfo.less


TEAMModelOS/ClientApp/src/components/selflearn/UnitInfo.vue → TEAMModelOS/ClientApp/src/view/selfstudy/UnitInfo.vue


TEAMModelOS/ClientApp/src/components/selflearn/UnitList.less → TEAMModelOS/ClientApp/src/view/selfstudy/UnitList.less


TEAMModelOS/ClientApp/src/components/selflearn/UnitList.vue → TEAMModelOS/ClientApp/src/view/selfstudy/UnitList.vue


TEAMModelOS/ClientApp/src/components/selflearn/WholeClassAnswer.less → TEAMModelOS/ClientApp/src/view/selfstudy/WholeClassAnswer.less


TEAMModelOS/ClientApp/src/components/selflearn/WholeClassAnswer.vue → TEAMModelOS/ClientApp/src/view/selfstudy/WholeClassAnswer.vue