Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelBI/Models/AssistSchool.cs

@@ -19,7 +19,7 @@ namespace TEAMModelBI.Models
         public int scale { get; set; }
         public string standard { get; set; }
         public string areaId { get; set; }
-        public List<SchoolTeacherRoles> assists { get; set; }
+        public List<SchoolTeacherRoles> assists { get; set; } = new List<SchoolTeacherRoles>();
         public int serial { get; set; } //软体
         public int service { get; set; } //服务
         public int hard { get; set; } //硬体

TEAMModelOS/ClientApp/src/assets/student-web/component_styles/course-list.less

@@ -71,6 +71,7 @@
     .list-item {
         height: auto;
         padding-left: 3%;
+        padding: 0;
 
         .basic-info {
             display: none;
@@ -84,6 +85,7 @@
 
         .list-item-info {
             width: 100% !important;
+            padding: 15px 30px 15px 30px;
 
             & > span{
                 float: right;
@@ -100,6 +102,18 @@
             color: rgb(143, 135, 135);
             font-size: 12px;
         }
+
+        .time-box {
+            // color: #515a6e;
+            // background-color: #F8F8F9;
+            width: 100%;
+            // padding: 10px 20px 10px 30px;
+            margin-top: 15px;
+
+            & > p{
+                margin-bottom: 5px;
+            }
+        }
     }
     .ivu-tabs-tabpane {
         padding-bottom: 100px;

TEAMModelOS/ClientApp/src/components/student-web/HomeView/CourseListView.vue

@@ -68,7 +68,7 @@
                                 <div v-if="fixList.length">
                                     <li
                                         class="list-item"
-                                        v-for="(fix, num) in fixList"
+                                        v-for="(fix, num) in showFixList"
                                         :class="{'list-item-selected': unique == fix.unique}"
                                         @click="clickCell(fix, num, 'list')"
                                         :key="`j+${num}`"
@@ -76,7 +76,15 @@
                                         <ul>
                                             <li class="list-item-info">
                                                 <p class="list-item-title">{{ fix.name }}</p>
-                                                <span class="basic-info" @click.capture.stop="showBaseInfo(fix)">
+                                                <!-- <template v-if="fix.time.length">
+                                                    <span class="basic-info" @click.capture.stop="fix.show = !fix.show" v-show="fix.show">
+                                                        <Icon type="ios-arrow-dropup" color="#03966A" size="18" />
+                                                    </span>
+                                                    <span class="basic-info" @click.capture.stop="fix.show = !fix.show" v-show="!fix.show">
+                                                        <Icon type="ios-arrow-dropdown" color="#03966A" size="18" />
+                                                    </span>
+                                                </template> -->
+                                                <span class="basic-info" @click.capture.stop="showBaseInfo(fix)" style="margin-right: 10px;">
                                                     <Icon type="md-information-circle" color="#03966A" size="18" />
                                                 </span>
                                                 <p style="margin-top: 10px;">
@@ -85,10 +93,25 @@
                                                     <span class="tag-style" v-show="fix.className" style="border-color: #499c8d; color: #499c8d;">{{ fix.className }}</span>
                                                     <span class="tag-style" style="border-color: #6b6ba9; color: #6b6ba9;">{{ fix.teaName }}</span>
                                                 </p>
-                                                <p style="margin-top: 10px; font-size: 12px;" v-if="fix.timeId">
+                                                <template v-if="fix.time && fix.time.length">
+                                                    <div class="time-box">
+                                                        <p v-for="(item, index) in fix.time" :key="index">
+                                                            {{ item.classTime }}
+                                                        </p>
+                                                    </div>
+                                                </template>
+                                                <!-- <p style="margin-top: 10px; font-size: 12px;" v-if="fix.timeId">
                                                     <span>{{ fix.classTime }}</span>
-                                                </p>
+                                                </p> -->
                                             </li>
+                                            <!-- <template v-if="fix.time.length">
+                                                <li class="time-box" v-show="fix.show">
+                                                    <p>{{ $t("studentWeb.courseContent.classTime") }}：</p>
+                                                    <p v-for="(item, index) in fix.time" :key="index">
+                                                        {{ item.classTime }}
+                                                    </p>
+                                                </li>
+                                            </template> -->
                                         </ul>
                                     </li>
                                 </div>
@@ -627,7 +650,8 @@ export default {
             showBasicInfo: false,
             showStuList: false,
             list: "stuList",
-            needParam: undefined
+            needParam: undefined,
+            showFixList: []
         };
     },
 
@@ -1087,6 +1111,38 @@ export default {
                 } */
             },
         },
+        fixList: {
+            deep: true,
+            handler(n, o) {
+                if(n.length) {
+                    n.forEach(item => {
+                        let num = this.showFixList.findIndex(show => {
+                            return show.id === item.id && show.teaId === item.teaId
+                        })
+                        if(num === -1) {
+                            let obj = {...item}
+                            obj.show = false
+                            obj.time = item.timeId ? [{
+                                timeId: item.timeId,
+                                classTime: item.classTime
+                            }] : []
+                            this.showFixList.push(obj)
+                        } else {
+                            let numChild = this.showFixList[num].time.findIndex(showChild => {
+                                return showChild.timeId === item.timeId
+                            })
+                            if(numChild === -1 && item.timeId) {
+                                let objChild = {
+                                    timeId: item.timeId,
+                                    classTime: item.classTime
+                                }
+                                this.showFixList[num].time.push(objChild)
+                            }
+                        }
+                    })
+                }
+            }
+        },
     },
 };
 </script>
@@ -1180,7 +1236,7 @@ export default {
             }
 
             &:nth-child(2) {
-                text-align: left;
+                // text-align: left;
             }
         }
         /*
@@ -1193,7 +1249,7 @@ export default {
                 width: 20%;
             }
             &:nth-child(2) {
-                text-align: left;
+                // text-align: left;
             }
         }
        /*  &:last-child {