Merge remote-tracking branch 'origin/1.0' into 1.0

src/styles/themeA/login.scss

@@ -3,12 +3,32 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 100%;
-  background-image: url("../../assets/image/login-background.jpg");
+  width: 1920px;
+  height: 953px;
+  background-image: url("../../assets/image/login-bg.png");
   background-size: cover;
+  .el-checkbox__input.is-checked .el-checkbox__inner{
+    width: 14px;
+    height: 14px;
+    background: #214e90;
+    border-radius: 2px;
+    border-color: #214e90;
+  }
+  .el-checkbox .el-checkbox__inner:hover{
+    border: 1px solid #214e90!important;
+  }
+  .el-checkbox__input.is-focus .el-checkbox__inner{
+    border: 1px solid #214e90!important;
+  }
+  .el-checkbox__input.is-checked+.el-checkbox__label{
+    font-size: 14px;
+    font-family: Microsoft YaHei, Microsoft YaHei-400;
+    font-weight: 400;
+    color: #333333;
+  }
   .login_logoRow{
-    padding-top: 10px;
-    padding-bottom: 10px;
+    padding-top: 50px;
+    padding-bottom: 39px;
     display: flex;
     justify-content: center;
     width: 100%;
@@ -22,7 +42,7 @@
     width: 100%;
     display: flex;
     justify-content: center;
-    margin-top: 20px;
+    margin-bottom: 40px;
     .title {
       font-size: 24px;
       font-family: Microsoft YaHei, Microsoft YaHei-700;
@@ -46,7 +66,7 @@
     font-size: 16px;
   }
   .el-form-item {
-    margin-bottom: 4vh;
+    margin-bottom: 30px;
   }
 }
 
@@ -54,31 +74,23 @@
   position: absolute;
   backdrop-filter: blur(4px);
   display: inline;
-  flex-direction: column;
-  align-items: flex-end;
-  border-radius: 6px;
-  background: #ffffff no-repeat;
-  background-size: 59%;
-  background-position-y: 57px;
-  width: 650px;
-  height: 550px;
-  padding: 25px 25px 5px 25px;
+  width: 499px;
+  height: 560px;
+  background-image: url("../../assets/image/loginForm-bg.png");
+  border-radius: 20px;
   .login-form-content{
-    position: absolute;
-    top: 40%;
-    right: 28%;
-    width: 45%;
     display: flex;
     flex-direction: column;
     align-items: center;
     .el-form-item{
       width: 343px;
+      height: 44px;
       .el-input__inner{
         border-radius: 4px;
       }
     }
     .loginCode_formItem{
-      width: 80%;
+      width: 343px;
       display: flex;
       justify-content: space-between;
       //align-items: center;
@@ -86,18 +98,25 @@
       .el-form-item{
         width: 400px;
       }
+        .el-form-item__content{
+          width: 210px!important;
+        }
     }
     .blue-btn{
       width: 343px;
-      height: 40px;
+      height: 44px;
+      background: #214e90;
       border-radius: 4px;
-      font-size: 18px;
+      font-size: 16px;
+      font-family: Microsoft YaHei, Microsoft YaHei-700;
+      font-weight: 700;
+      color: #ffffff;
     }
   }
   .el-input {
-    height: 38px;
+    height: 44px;
     input {
-      height: 38px;
+      height: 44px;
     }
   }
   .input-icon {
@@ -113,10 +132,10 @@
 }
 .login-code {
   //width: 33%;
-  height: 38px;
+  height: 44px;
   //float: right;
   img {
-    height: 38px;
+    height: 44px;
     cursor: pointer;
     vertical-align: middle;
   }
@@ -138,7 +157,10 @@
   width: 343px;
   justify-content: space-between;
   .rem-code span{
-    color: $font-dark;
+    font-size: 14px!important;
+    font-family: Microsoft YaHei, Microsoft YaHei-400;
+    font-weight: 400!important;
+    color: #333333!important;
   }
   .el-link span{
     color: $color-theme;

src/views/courseInformation/courseManagement/courseCatalogues.vue

@@ -250,16 +250,16 @@
             <i class="close" title="删除该节" @click="delSec(itemChild.businessId)" />
 
             <!-- 资源按钮组 -->
-            <!--            <div style="display:inline-block;float:right">-->
-            <!--              <span v-show="processRes(2,itemChild.isTest)">-->
-            <!--                <i v-show="itemChild.videoUrl!==''" class="chapter-icon videoBtn" title="视频" @click="openUploadDialog('视频维护',itemChild,0,'只能上传以.mp4格式/.rmvb格式/.avi结尾的文件')" /> &lt;!&ndash; 视频 &ndash;&gt;-->
-            <!--                <i v-show="itemChild.videoUrl===''" class="chapter-icon videoBtnNo" title="视频未上传" @click="openUploadDialog('视频上传',itemChild,0,'只能上传以.mp4格式/.rmvb格式/.avi结尾的文件')" /> &lt;!&ndash; 视频未添加 &ndash;&gt;-->
-            <!--              </span>-->
+            <div style="display:inline-block;float:right">
+              <span v-show="!hasChild(itemChild)">
+                <i v-show="itemChild.videoUrl!==''" class="chapter-icon videoBtn" title="视频" @click="openUploadDialog('视频维护',itemChild,0,'只能上传以.mp4格式/.rmvb格式/.avi结尾的文件')" /> <!-- 视频 -->
+                <i v-show="itemChild.videoUrl===''" class="chapter-icon videoBtnNo" title="视频未上传" @click="openUploadDialog('视频上传',itemChild,0,'只能上传以.mp4格式/.rmvb格式/.avi结尾的文件')" /> <!-- 视频未添加 -->
+              </span>
             <!--              <span v-show="processRes(4,itemChild.isTest)">-->
             <!--                <i v-show="itemChild.pdfUrl!==''" class="chapter-icon pdfBtn" title="PDF" @click="openUploadDialog('PDF维护',itemChild,1,'只能上传以.pdf结尾的文件')" /> &lt;!&ndash; PDF &ndash;&gt;-->
             <!--                <i v-show="itemChild.pdfUrl===''" class="chapter-icon pdfBtnNo" title="PDF未上传" @click="openUploadDialog('PDF上传',itemChild,3,'只能上传以.pdf结尾的文件')" /> &lt;!&ndash; PDF未添加 &ndash;&gt;-->
             <!--              </span>-->
-            <!--            </div>-->
+            </div>
             <dl>
               <dt v-for="(subItem, subIndex) in itemChild.childList" class="sub-section">
                 <span>第{{ index+1 }}.{{ indexChild+1 }}.{{ subIndex+1 }}小节</span>
@@ -1236,6 +1236,10 @@ export default {
         }
       }
     },
+    // 判断节下是否有子节
+    hasChild(item) {
+      return item.childList && item.childList.length > 0
+    },
     // 上传资源
     handleChange(file, fileList) {
       this.resForm.filelist = fileList

src/views/courseInformation/courseManagement/info/index.vue

@@ -52,7 +52,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.lessonType === '0'" label="课程方案:" prop="classPlan" :rules="[{ required: status !== '3', message: '请选择课程方案', trigger: 'blur' }]">
+            <el-form-item v-if="form.lessonType === '0'" label="课程方案:" prop="classPlan" :rules="[{ required: status !== '3', message: '请选择课程方案', trigger: 'change' }]">
               <el-select
                 v-model="form.classPlan"
                 filterable
@@ -68,20 +68,20 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item v-else label="课程方案:" prop="classPlan" :rules="[{ required: status !== '3', message: '请选择课程方案', trigger: 'blur' }]">
-            <el-select
-              v-model="form.classPlan"
-              filterable
-              multiple
-              class="normalSelct"
-            >
-              <el-option
-                v-for="(items,index) in coursePlanOptionsC"
-                :key="index"
-                :label="items.dictLabel"
-                :value="items.dictValue"
-              />
-            </el-select>
+            <el-form-item v-else label="课程方案:" prop="classPlan" :rules="[{ required: status !== '3', message: '请选择课程方案', trigger: 'change' }]">
+              <el-select
+                v-model="form.classPlan"
+                filterable
+                multiple
+                class="normalSelct"
+              >
+                <el-option
+                  v-for="(items,index) in coursePlanOptionsC"
+                  :key="index"
+                  :label="items.dictLabel"
+                  :value="items.dictValue"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -105,7 +105,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.classPlan[0]!== '1'"  label="技术分类:" prop="tecClassify">
+            <el-form-item v-if="form.classPlan[0]!== '1'" label="技术分类:" prop="tecClassify">
               <el-select
                 v-model="form.tecClassify"
                 multiple
@@ -124,7 +124,7 @@
         <el-row :gutter="100">
           <!--          "-->
           <el-col :span="12">
-            <el-form-item label="课程讲师:" prop="lessonTeaName" :rules="[{ required: status !== '3', message: '请输入课程讲师', trigger: 'blur' }]">
+            <el-form-item label="课程讲师:" prop="lessonTeaName" :rules="[{ required: status !== '3', message: '请选择课程讲师', trigger: 'change' }]">
               <el-select
                 v-model="form.lessonTeaName"
                 filterable
@@ -147,7 +147,7 @@
         </el-row>
         <el-row :gutter="100">
           <el-col span="12">
-            <el-form-item label="难度" prop="difficultyClassify" :rules="[{ required: status !== '3', message: '请选择难度', trigger: 'blur' }]">
+            <el-form-item label="难度" prop="difficultyClassify" :rules="[{ required: status !== '3', message: '请选择难度', trigger: 'change' }]">
               <el-select
                 v-model="form.difficultyClassify"
                 filterable
@@ -534,7 +534,7 @@ export default {
       formData.append('temp', 'newInformation')
       uploadPublic(formData).then(res => {
         this.form.defaultUrl = res.data.businessId
-        this.imageUrl = res.data.path
+        this.imageUrl = res.data.url
       })
     },
     handleAvatarSuccess(res, file) {

src/views/courseInformation/examinationManagement/examinationPaper.vue

@@ -255,12 +255,12 @@
           <!--          分数-->
           <el-col :span="12">
             <el-form-item label="分数" prop="mark">
-              <el-input v-model="form.mark" placeholder="请输入分数" />
+              <el-input v-model="form.mark" placeholder="请输入分数" maxlength="3" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="题目编号" prop="number">
-              <el-input v-model="form.number" placeholder="请输入题目编号" />
+              <el-input v-model="form.number" placeholder="请输入题目编号" maxlength="10" />
             </el-form-item>
           </el-col>
         </el-row>

src/views/courseInformation/examinationManagement/questionManagement.vue

@@ -250,7 +250,6 @@ export default {
     bussinessId: {
       handler: function(val) {
         this.courseId = val
-        console.log('bussinessId111111111111111111', val)
       },
       immediate: true
     }

src/views/login/login.vue

 <template>
   <div class="login">
-<!--    v-loading="vLoading"-->
-    <el-form ref="loginForm"  :model="loginForm" :rules="rules" class="login-form">
+    <el-form ref="loginForm"  v-loading="vLoading" :model="loginForm" :rules="rules" class="login-form">
       <!--      <img class="fy-logo" src="../../assets/image/denglu_logo.png">-->
       <div class="login_logoRow">
         <div class="login_form_logo" />
       </div>
       <div class="loginTitleRow">
-        <div class="title">教学资源云平台</div>
+        <div class="title">教学资源云后台管理</div>
       </div>
       <div class="login-form-content">
         <el-form-item prop="username">
-          <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
+          <el-input v-model="loginForm.username" auto-complete="off" placeholder="账号">
             <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
           </el-input>
         </el-form-item>
         <el-form-item prop="password">
           <el-input
             v-model="loginForm.password"
-            type="password"
             auto-complete="off"
             placeholder="密码"
             @keypress.enter.native="handleLogin"
@@ -87,10 +85,9 @@
             :loading="loading"
             size="medium"
             type="primary"
-
+            :disabled="!verify"
             @click.native.prevent="handleLogin"
           >
-<!--            :disabled="!verify"-->
             <span v-if="!loading">{{ '登 录' }}</span>
             <span v-else>登 录 中...</span>
           </el-button>