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

src/components/course/class-form.vue

@@ -52,6 +52,19 @@
     background-color: #e6e3fe;
     color: #8175FB;
   }
+  .CLM-Form .Emp_Line {
+    width: 3px;
+    height: 10px;
+    background-color: #3FC4FF;
+    margin-right: 10px;
+  }
+
+  .CLM-Form .EmpLine_title {
+    display: flex;
+    align-items: center;
+    font-size: 12px;
+    margin-bottom:20px;
+  }
 
 </style>
 <template>
@@ -61,7 +74,10 @@
         <div class="text-h6">{{optionTitle}}</div>
       </q-card-section>
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
-        <div class="text-caption q-mb-lg q-px-md text-grey-6">基本信息</div>
+        <div class="EmpLine_title">
+          <div class="Emp_Line"></div>
+          <div>基本信息</div>
+        </div>
         <div class="row wrap">
           <div class="col-6">
             <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.ClassName" ref="ClassName"
@@ -178,8 +194,11 @@
            </q-field>
           </div>
         </div>
-        <div class="text-caption q-mb-lg q-px-md text-grey-6">上课设置</div>
-        <div class="row wrap" style="margin-bottom:30px;">
+        <div class="EmpLine_title" style="margin:10px 0;">
+          <div class="Emp_Line"></div>
+          <div>上课设置</div>
+        </div>
+        <div class="row wrap" style="margin:30px 0;">
           <div class="col-6">
             <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.ClassStyle"
               ref="ClassStyle" :options="classSetList" label="排课安排" :dense="false" class="col-6 q-pr-lg q-pr-lg"

src/pages/system/role.vue

@@ -20,10 +20,8 @@
         separator="none" title="角色信息" :data="data" :columns="columns" row-key="name">
         <template v-slot:body-cell-Status="props">
           <q-td :props="props">
-            <q-td :props="props">
-              <q-toggle size="md" color="primary" :false-value="1" :true-value="0" v-model="props.row.Status"
-                title="注意：关闭后，分类将无法正常使用." @input="DeleteRole(props.row)" />
-            </q-td>
+            <q-toggle size="md" color="primary" :false-value="1" :true-value="0" v-model="props.row.Status"
+              title="注意：关闭后，分类将无法正常使用." @input="DeleteRole(props.row)" />
           </q-td>
         </template>
         <template v-slot:bottom>