Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/stuMan/eventsCalendar.vue

@@ -200,15 +200,19 @@
   }
   .eventsCalendar_box{
       
+  }
+  .eventsCalendar{
+    margin-bottom: 3px;
   }
   .hover_Suspended{
       position: relative;
       padding: 0 3px;
+      background-color: #fff;
+      border-radius: 10px;
+      font-size: 15px;
   }
   .hover_Suspended:hover{
       color: #F8A535;
-      background-color: #fff;
-      border-radius: 10px;
   }
   .hover_Suspended:hover .Suspended{
       display: block;
@@ -218,14 +222,15 @@
       bottom: 25px;
       left: 0;
       right: 0;
-      z-index: 2;
+      z-index: 95;
       display: none;
       padding: 10px;
       border-radius: 3px;
       background-color: #fff;
       box-shadow: 2px 5px 10px 0px rgba(36, 36, 36, 0.2);
+      font-size: 14px;
   }
-  .Suspended div{
+  .Suspended .Suspended-b{
         position: absolute;
         width: 0;
         height: 0;
@@ -241,10 +246,30 @@
         left: 20px;
   }
   .Suspended_text{
-      padding: 0;
+      padding:2px 0;
       margin: 0;
       color: #3f4254;
   }
+  .Suspended_text span{
+    width: 80px;
+    text-align: right;
+    margin-right: 5px;
+  }
+  .Suspended_text p{
+    color: #fff;
+    border-radius: 10px;
+    display: inline-block;
+    padding: 0 5px;
+  }
+  .Suspended_text p.grey{
+    background-color: grey;
+  }
+  .Suspended_text p.green{
+    background-color: green;
+  }
+  .Suspended_text p.red{
+    background-color: red;
+  }
 </style>
 <template>
   <div>
@@ -266,13 +291,16 @@
                                 <div class="hover_Suspended">
                                     {{items.ActivityName}}
                                     <div class="Suspended">
-                                        <div></div>
-                                        <p class="Suspended_text">标题: {{items.ActivityName}}</p>
-                                        <p class="Suspended_text">结束时间: {{items.StartTime}}~{{items.EndTime}}</p>
-                                        <p class="Suspended_text">活动类型: {{items.ActivityTypeName}}</p>
-                                        <p class="Suspended_text" v-show="!items.IsFree">价格: {{items.Price}}</p>
-                                        <p class="Suspended_text" v-show="items.LocationName">地址: {{items.LocationName}}</p>
-                                        <p class="Suspended_text">状态: {{items.ActivityStatus==1?'进行中':(items.ActivityStatus==2?'已结束':'')}}</p>
+                                        <div class="Suspended-b"></div>
+                                        <div class="Suspended_text"><span>标题 :</span>{{items.ActivityName}}</div>
+                                        <div class="Suspended_text"><span>时间 :</span>{{items.StartTime}}~{{items.EndTime}}</div>
+                                        <div class="Suspended_text"><span>类型 :</span>{{items.ActivityTypeName}}</div>
+                                        <div class="Suspended_text"><span>价格 :</span>{{!items.IsFree?items.Price:'免费'}}</div>
+                                        <div class="Suspended_text" v-show="items.LocationName"><span>地址 :</span> {{items.LocationName}}</div>
+                                        <div class="Suspended_text"><span>状态 :</span> 
+                                          <p :class="items.ActivityStatus==1?'green':(items.ActivityStatus==2?'red':'grey')">
+                                          {{items.ActivityStatus==1?'进行中':(items.ActivityStatus==2?'已结束':'未开始')}}</p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>

src/pages/teacher/teacherMonth.vue

@@ -175,7 +175,8 @@
         </template>
         <template v-slot:body-cell-FinishTimesPlanCount="props">
           <q-td :props="props">
-            <span style="color:blue;cursor:pointer;" title="点击查看跟进详细信息" @click="GoToDetails(props.row)"> {{props.row.FinishTimes}} /
+            <span style="color:blue;cursor:pointer;" title="点击查看跟进详细信息" @click="GoToDetails(props.row)">
+              {{props.row.FinishTimes}} /
               {{props.row.FollowCount}}</span>
           </q-td>
         </template>
@@ -244,6 +245,9 @@
             <q-td>
               {{lastRow.ActivityNum}}
             </q-td>
+            <q-td>
+              {{lastRow.AssessmentScore}}
+            </q-td>
             <q-td>
               {{lastRow.TotalScore}}
             </q-td>
@@ -422,6 +426,13 @@
             align: 'left',
             sortable: true
           },
+          {
+            name: 'AssessmentScore',
+            label: '考核得分',
+            field: 'AssessmentScore',
+            align: 'left',
+            sortable: true
+          },
           {
             name: 'TotalScore',
             label: '总分数',