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

src/components/question/question-form.vue

+<style>
+  .edit_stem{
+    font-size: 14px;
+    color: #646873;
+    line-height: 34px;
+    margin-bottom: 16px;
+    overflow: hidden;
+    padding: 4px 0;
+    cursor: default;
+  }
+</style>
 <template>
   <q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale">
-    <q-card style="width: 800px;max-width:900px;">
+    <q-card style="width: 1400px;max-width:900px;">
       <q-card-section>
         <div class="text-h6">{{objOption.CourseId==0?'新增问题信息':'修改问题信息'}}</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="text-caption q-mb-lg q-px-md text-grey-6">问题信息</div> -->
         <div class="row wrap">
           <div class="col-12" v-if="objOption.QuestionId==0">
             题型
@@ -24,7 +35,7 @@
               </q-list>
             </q-btn-dropdown>
           </div>
-          <div class="col-12" style="color:blue;font-weight:800;">
+          <div class="edit_stem">
             {{questionName}}
           </div>
           <br />

src/components/questiontype/single.vue

 <!--单选题-->
-<style>
-
-</style>
 <template>
   <div class="singleQuestion">
     <table v-if="data&&data.length>0">
       <tr v-for="(item,index) in data">
         <td>
-          <el-checkbox v-model="item.IsAnswer" @change="ChangeItem(item)">{{item.Name}}</el-checkbox>
+          <!-- <el-checkbox v-model="item.IsAnswer" @change="ChangeItem(item)">{{item.Name}}</el-checkbox> -->
+          <div class="Answer_List" @click="ChangeItem(item)" :class="{'Is_Answer':item.IsAnswer}">
+            {{item.Name}}
+          </div>
         </td>
         <td>
           <UeEditor v-model="item.Content" :config="config"></UeEditor>
@@ -55,6 +55,7 @@
     },
     created() {
       this.initConfig();
+      console.log(this.data,'dataaa');
     },
     methods: {
       initConfig() {

src/components/school/schoolarea/school-form.vue

@@ -182,6 +182,14 @@
       },
       //保存校区
       saveSchool() {
+        if(this.objOption.ManagerId==0){
+          this.$q.notify({
+            type: 'negative',
+            position: "top",
+            message: `请选择校区联系人`
+          })
+          return;
+        }
         this.saveLoading = true;
         this.$refs.SName.validate()
         this.$refs.SAddress.validate()

src/layouts/MainLayout.vue

@@ -289,6 +289,7 @@
 </script>
 
 <style>
+  @import url('~assets/css/common.css');
   .full-width {
     height: 100%;
   }