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

src/api/courseManagement/indexApi.js

@@ -147,3 +147,23 @@ export function uploadVideo(data) {
     data
   })
 }
+// 课程管理-章节查询PDF信息
+export function findPdfInfo(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/bfile/findPdfInfo',
+    method: 'post',
+    data,
+    headers: {}
+  })
+}
+// 课程管理-章节查询PDF_url信息
+export function findPdfUrl(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/bfile/findPdfUrl ',
+    method: 'post',
+    data,
+    headers: {}
+  })
+}

src/views/contentManagement/centralCase/index.vue

@@ -336,11 +336,11 @@ export default {
   width:100%;
   height:100%;
   ::v-deep .el-table th .cell{
-    justify-content: center!important;
+    justify-content: left!important;
   }
   ::v-deep .el-table td .cell{
-    margin: 10px;
-    text-align: center!important;
+    margin:  10px 0 10px 0;
+    text-align: left!important;
   }
 }
 #courseManage .table_box{

src/views/contentManagement/centralCase/info/index.vue

@@ -14,7 +14,7 @@
                 <el-input
                   v-model.trim="form.title"
                   :disabled="secondFromDisabled"
-                  placeholder="请输入案例标题"
+                  placeholder="请输入标题"
                   size="small"
                   class="normalInput"
                 />
@@ -316,7 +316,7 @@ export default {
 }
 
 .btn-box{
-  margin-top: 30px;
+  margin-top: 50px;
   margin-bottom: 30px;
 }
 

src/views/contentManagement/developmentCourse/index.vue

@@ -111,19 +111,19 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="正文" prop="text" :show-overflow-tooltip="true" width="300px">
+        <el-table-column label="正文" prop="text" :show-overflow-tooltip="true" width="500px">
           <template slot-scope="scope">
             {{ scope.row.text || '-' }}
           </template>
         </el-table-column>
 
-        <el-table-column label="日期" prop="developDate" :show-overflow-tooltip="true">
+        <el-table-column label="日期" prop="developDate" :show-overflow-tooltip="true" width="120px">
           <template slot-scope="scope">
             <span>{{ scope.row.developDate | transformDateByFormat('YYYY-MM-DD') }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="状态" prop="flag">
+        <el-table-column label="状态" prop="flag" width="90px">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.flag"
@@ -168,7 +168,7 @@
       @pagination="getList"
     />
     <!-- 添加或修改发展表配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
         <el-form-item label="标题" prop="title">
           <el-input v-model.trim="form.title" show-word-limit :maxlength="50" placeholder="请输入标题" />
@@ -176,15 +176,8 @@
         <el-form-item label="正文" prop="text">
           <el-input v-model.trim="form.text" type="textarea" :rows="6" show-word-limit :maxlength="200" placeholder="请输入正文" />
         </el-form-item>
-        <el-form-item label="日期" prop="developDate">
-          <el-date-picker
-            v-model="form.developDate"
-            style="width: 330px"
-            value-format="yyyy-MM-dd"
-            type="date"
-            placeholder="选择日期"
-          />
-        </el-form-item>
+        <el-row>
+          <el-col span="8">
         <el-form-item label="封面" prop="img">
           <el-upload
             :show-file-list="false"
@@ -204,6 +197,19 @@
           <!--            <img width="100%" :src="form.url" alt="">-->
           <!--          </el-dialog>-->
         </el-form-item>
+          </el-col>
+          <el-col span="12">
+            <el-form-item label="日期" prop="developDate">
+              <el-date-picker
+                v-model="form.developDate"
+                style="width: 310px"
+                value-format="yyyy-MM-dd"
+                type="date"
+                placeholder="选择日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
         <el-form-item label="状态">
           <el-radio-group v-model="form.flag">
@@ -536,12 +542,16 @@ export default {
 <style lang="scss" scoped>
 .app-container {
 
-  ::v-deep .el-table th .cell{
-    //justify-content: center!important;
-  }
-  ::v-deep .el-table td .cell{
+  //::v-deep .el-table th(2) .cell{
+  //  justify-content: center!important;
+  //}
+  //::v-deep .el-table td(2) .cell{
+  //  margin: 10px;
+  //  text-align: center!important;
+  //}
+  ::v-deep .el-table td:nth-child(2) .cell {
     margin: 10px;
-    //text-align: center!important;
+    text-align: center!important;
   }
 
   font-size: 18px;

src/views/contentManagement/newsInformation/index.vue

@@ -74,7 +74,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="left" prop="title" label="新闻标题" width="600" show-overflow-tooltip />
+          <el-table-column align="left" prop="title" label="标题" width="600" show-overflow-tooltip />
 
           <el-table-column align="left" prop="releaseDate" label="发布日期" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -425,11 +425,11 @@ export default {
   height:100%;
 
   ::v-deep .el-table th .cell{
-    justify-content: center!important;
+    justify-content: left!important;
   }
   ::v-deep .el-table td .cell{
-    margin: 10px;
-    text-align: center!important;
+    margin:  10px 0 10px 0;
+    text-align: left!important;
   }
 }
 #courseManage .table_box{

src/views/contentManagement/newsInformation/info/index.vue

@@ -358,7 +358,7 @@ export default {
 }
 
 .btn-box{
-  margin-top: 30px;
+  margin-top: 50px;
   margin-bottom: 30px;
   //position: absolute;
   //bottom: 50px;

src/views/courseInformation/courseManagement/index.vue

@@ -257,7 +257,7 @@
               <span>已发布</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作" width="190">
+          <el-table-column align="center" label="操作" width="250">
             <template slot-scope="scope">
               <el-button
                 :class="commonField.updateClass"
@@ -271,6 +271,12 @@
                 :size="commonField.size"
                 @click="loadCurCat(scope.$index)"
               >目录</el-button>
+              <el-button
+                :class="commonField.updateClass"
+                :type="commonField.typeParent"
+                :size="commonField.size"
+                @click="handleExamination(scope.$index)"
+              >考试管理</el-button>
               <el-button
                 :class="commonField.updateClass"
                 :type="commonField.typeParent"
@@ -749,6 +755,12 @@ export default {
         })
       }
     },
+    // 跳转考试管理
+    handleExamination(index) {
+      this.$router.push({
+        path: '/courseInformation/examinationManagement/index'
+      })
+    },
     // 下载模板
     exportmould() {
       // eduUtil.ajaxGetUtil(globalUrl + 'excelWithoutAuth', {