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

TEAMModelOS/ClientApp/src/common/CollapseMenuLayout.less

@@ -51,7 +51,6 @@
 }
 
 .unit-logo-box {
-    /*margin-bottom: 10px;*/
     height: 83px;
     line-height: 55px;
 }

TEAMModelOS/ClientApp/src/common/CollapseMenuLayout.vue

@@ -194,8 +194,8 @@
                             {
                                 icon: '',
                                 name: '作业活动',
-                                router: '/home/404',
-                                tag:'×'
+                                router: '/home/manageHomeWork',
+                                tag:'T'
                             },
                             {
                                 icon: '',

TEAMModelOS/ClientApp/src/router/routes.js

@@ -195,6 +195,11 @@ export const routes = [
                 name: 'createLearnUnit',
                 component: resolve => require(['@/view/selflearning/CreateLearnUnit.vue'], resolve)
             },
+            {
+                path: 'createHomeWork',
+                name: 'createHomeWork',
+                component: resolve => require(['@/view/selflearning/CreateHomeWork.vue'], resolve)
+            },
             {
                 path: 'createOrderLearn',
                 name: 'createOrderLearn',
@@ -225,6 +230,11 @@ export const routes = [
                 name: 'manageSelfLearn',
                 component: resolve => require(['@/view/selflearning/ManageSelfLearn.vue'], resolve)
             },
+            {
+                path: 'manageHomeWork',
+                name: 'manageHomeWork',
+                component: resolve => require(['@/view/selflearning/ManageHomeWork.vue'], resolve)
+            },
             {
                 path: 'activityReport',
                 name: 'activityReport',

TEAMModelOS/ClientApp/src/view/selflearning/CreateHomeWork.less

@@ -0,0 +1,67 @@
+@main-bgColor: rgb(40,40,40); //主背景颜色
+@borderColor: #424242;
+@primary-textColor: #fff; //文本主颜色
+@second-textColor: #a5a5a5; //文本副级颜色
+@primary-fontSize: 14px;
+@second-fontSize: 16px;
+
+.create-self-container {
+    width: 100%;
+    height: 100%;
+
+    .create-self-header {
+        width: 100%;
+        height: 45px;
+        line-height: 45px;
+        padding: 0px 15px;
+        border-bottom: 1px solid @borderColor;
+    }
+
+    .create-self-main{
+        width:100%;
+        height:~"calc(100% - 45px)";
+        display:flex;
+        flex-direction:row;
+    }
+}
+.create-self-header {
+    &-label {
+        color: #fff;
+        font-size: 16px;
+    }
+}
+.btn-save {
+    color: rgb(107, 223, 195);
+    float: right;
+    cursor: pointer;
+    margin-top: 6px;
+    margin-right: 15px;
+}
+.create-self-main {
+    .self-base-info-box {
+        width: 350px;
+        height: 100%;
+        border-right: 1px solid @borderColor;
+        padding-left: 15px;
+
+        .self-base-info-header {
+            width: 100%;
+            height: 40px;
+            color: @second-textColor;
+            line-height: 40px;
+            border-bottom: 1px solid @borderColor;
+        }
+    }
+
+    .self-content-box {
+        width: ~"calc(100% - 350px)";
+        height: 100%;
+        padding-left: 15px;
+        .self-content-box-header{
+            height:40px;
+            line-height:40px;
+            color:@second-textColor;
+            border-bottom:1px solid @borderColor;
+        }
+    }
+}

TEAMModelOS/ClientApp/src/view/selflearning/CreateHomeWork.vue

@@ -0,0 +1,43 @@
+<template>
+    <div class="create-self-container">
+        <div class="create-self-header">
+            <span class="create-self-header-label">创建作业活动</span>
+            <Button class="btn-save" type="text" :loading="isLoading" ghost icon="ios-albums-outline" @click="saveData">保存数据</Button>
+        </div>
+        <div class="create-self-main">
+            <div class="self-base-info-box">
+                <div class="self-base-info-header">
+                    <span>基础信息</span>
+                </div>
+            </div>
+            <div class="self-content-box">
+                <!--<div class="self-content-box-header">
+                    <span>自学内容</span>
+                </div>-->
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                isLoading: false,
+
+            }
+        },
+        methods: {
+            saveData() {
+                this.isLoading = true
+                setTimeout(() => {
+                    this.isLoading = false
+                },2000)
+            }
+        }
+    }
+</script>
+<style lang="less" scoped>
+    @import "./CreateHomeWork.less";
+</style>
+<style>
+</style>

TEAMModelOS/ClientApp/src/view/selflearning/ManageHomeWork.less

@@ -0,0 +1,41 @@
+@main-bgColor: rgb(40,40,40); //主背景颜色
+@borderColor: #424242;
+@primary-textColor: #fff; //文本主颜色
+@second-textColor: #a5a5a5; //文本副级颜色
+@primary-fontSize: 14px;
+@second-fontSize: 16px;
+
+.self-learn-container {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: row;
+
+    .self-learn-list-box {
+        width: 350px;
+        height: 100%;
+        padding-left: 15px;
+        border-right: 1px solid @borderColor;
+    }
+}
+
+.self-learn-list-box {
+    .list-box-header {
+        height: 45px;
+        line-height: 45px;
+        border-bottom: 1px solid @borderColor;
+
+        span {
+            color: @second-textColor;
+        }
+    }
+}
+
+.to-create-icon {
+    float: right;
+    margin-right: 20px;
+    margin-top: 12px;
+    cursor: pointer;
+    color: white;
+    font-size: 18px;
+}

TEAMModelOS/ClientApp/src/view/selflearning/ManageHomeWork.vue

@@ -0,0 +1,31 @@
+<template>
+    <div class="self-learn-container">
+        <div class="self-learn-list-box">
+            <div class="list-box-header">
+                <span>作业活动列表</span>
+                <Icon type="md-add" class="to-create-icon" @click="goToCreate" />
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+
+            }
+        },
+        methods: {
+            goToCreate() {
+                this.$router.push({
+                    name: 'createHomeWork'
+                })
+            }
+        }
+    }
+</script>
+<style lang="less" scoped>
+    @import "./ManageHomeWork.less";
+</style>
+<style>
+</style>