Browse Source

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table

zengyicheng 3 years ago
parent
commit
bbb2b62503
1 changed files with 57 additions and 65 deletions
  1. 57 65
      src/components/pages/addCourse.vue

+ 57 - 65
src/components/pages/addCourse.vue

@@ -8,6 +8,9 @@
             flex-direction: row;
             justify-content: flex-start;
             align-items: center;
+            width: 100%;
+            background: #fff;
+            border-radius: 10px;
           "
         >
           <div
@@ -16,7 +19,7 @@
               flex-direction: row;
               justify-content: flex-start;
               align-items: center;
-              width: 25%;
+              width: 100%;
               border-radius: 80px;
               box-shadow: 0px 1px 2px 3px #f2f2f2;
               margin: 30px 20px 20px 45px;
@@ -36,42 +39,28 @@
               >
               <el-breadcrumb-item>添加项目</el-breadcrumb-item>
             </el-breadcrumb>
-          </div>
-          <div
-            v-if="steps == 1"
-            style="
-              font-size: 25px;
-              color: #dedede;
-              font-weight: bold;
-              margin-top: 12px;
-            "
-          >
-            第一步
-          </div>
-          <div
-            v-if="steps == 2"
-            style="
-              font-size: 25px;
-              color: #dedede;
-              font-weight: bold;
-              margin-top: 12px;
-            "
-          >
-            第二步
-          </div>
-          <div
-            v-if="steps == 3"
-            style="
-              font-size: 25px;
-              color: #dedede;
-              font-weight: bold;
-              margin-top: 12px;
-            "
-          >
-            第三步
+            <div
+              v-if="steps == 1 || steps == 2 || steps == 3"
+              style="
+                font-size: 25px;
+                color: #dedede;
+                font-weight: bold;
+                margin-left: auto;
+              "
+            >
+              {{
+                steps == 1
+                  ? "第一步"
+                  : steps == 2
+                  ? "第二步"
+                  : steps == 3
+                  ? "第三步"
+                  : ""
+              }}
+            </div>
           </div>
         </div>
-        <div style="display: flex">
+        <div style="display: flex; margin-top: 20px">
           <div class="stepBg" :class="steps == 3 ? 'isHeight' : ''">
             <div v-if="steps == 1" class="first" @click="navSteps(1)">
               <div><img src="../../assets/icon/first.png" alt="" /></div>
@@ -109,9 +98,8 @@
 
           <div
             style="
-              width: 65%;
-              margin: 10px;
-              background: #f1f1f1;
+              width: calc(100% - 17% - 25px);
+              background: #fff;
               border-radius: 10px;
               min-height: 550px;
               min-width: 800px;
@@ -211,11 +199,11 @@
           </div>
           <div
             style="
-              width: 65%;
-              margin: 10px;
-              background: #f1f1f1;
+              width: calc(100% - 17% - 25px);
+              background: #fff;
               border-radius: 10px;
               min-height: 550px;
+              min-width: 800px;
             "
             v-if="this.steps == 2"
           >
@@ -302,11 +290,11 @@
           </div>
           <div
             style="
-              border: 3px solid #9ec6fb;
-              width: 65%;
-              margin: 10px;
-              border-radius: 5px;
+              width: calc(100% - 17% - 25px);
+              background: #fff;
+              border-radius: 10px;
               min-height: 550px;
+              min-width: 800px;
             "
             v-if="this.steps == 3"
           >
@@ -366,7 +354,7 @@
                       rows="6"
                       class="binfo_input"
                       cols=""
-                      style="width: 80% !important"
+                      style="width: 80% !important; height: 90px"
                       v-model="unitJson[unitIndex].dyText"
                     ></textarea>
                   </div>
@@ -761,11 +749,11 @@
           </div>
           <div
             style="
-              width: 65%;
-              margin: 10px;
-              background: #f1f1f1;
+              width: calc(100% - 17% - 25px);
+              background: #fff;
               border-radius: 10px;
               min-height: 550px;
+              min-width: 800px;
             "
             v-if="this.steps == 4"
           >
@@ -785,7 +773,7 @@
             </div>
           </div>
         </div>
-        <div class="line"></div>
+        <!-- <div class="line"></div> -->
 
         <div class="info_btnBox">
           <button
@@ -814,7 +802,7 @@
       :append-to-body="true"
       width="25%"
       :before-close="handleClose"
-      class="dialog_diy2"
+      class="dialog_diy2 customWidth"
     >
       <div>请复制该链接邀请协同编辑</div>
       <div>http://www.boomyon.com/index-zhang.com</div>
@@ -829,6 +817,7 @@
       :append-to-body="true"
       width="25%"
       :before-close="handleClose"
+      class="dialog_diy2 customWidth"
     >
       <el-form>
         <el-form-item label="文档标题">
@@ -926,7 +915,7 @@ export default {
       checkedCities: [],
       isIndeterminate: true,
       steps: 1,
-	  nbOrder:0,
+      nbOrder: 0,
       courseName: "",
       isTeacherSee: false,
       courseText: "",
@@ -1043,7 +1032,7 @@ export default {
       if (this.steps == 4) {
         // window.location.href =
         //   "./course.vue?userid=" + this.userid + "&oid=" + this.oid;
-		  this.goTo('/course?userid=' + this.userid + '&oid=' + this.oid);
+        this.goTo("/course?userid=" + this.userid + "&oid=" + this.oid);
       } else {
         this.steps--;
       }
@@ -1097,10 +1086,10 @@ export default {
         if (this.cid == "" || this.cid == undefined) {
           this.addWork();
           this.steps++;
-        }else{
-			this.updateWork();
-			this.steps++;
-		}
+        } else {
+          this.updateWork();
+          this.steps++;
+        }
       }
     },
     unitSet(i) {
@@ -1470,8 +1459,8 @@ export default {
           console.error(err);
         });
     },
-	updateWork(){
-		let params = [
+    updateWork() {
+      let params = [
         {
           cid: this.cid,
           title: this.courseName,
@@ -1499,7 +1488,7 @@ export default {
           this.$message.error("修改失败");
           console.error(err);
         });
-	},
+    },
     guid() {
       var _num,
         i,
@@ -1629,7 +1618,7 @@ export default {
               res.data[0][0].is_teacher_look == 0 ? true : false;
             this.myWord = res.data[0][0].template;
             this.templateC.id = "123";
-			this.nbOrder = res.data[0][0].ordernumber;
+            this.nbOrder = res.data[0][0].ordernumber;
           })
           .catch((err) => {
             console.error(err);
@@ -1680,7 +1669,7 @@ export default {
 }
 
 .pb_content {
-  background: #fff;
+  /* background: #fff; */
   height: 100%;
   margin: 20px 20px 20px 20px;
 }
@@ -2455,7 +2444,7 @@ ol {
 }
 
 .stepBg {
-  margin: 0 25px 0 25px;
+  margin: 0 25px 0 0;
   width: 17%;
   min-width: 230px;
   border-radius: 10px;
@@ -2464,10 +2453,11 @@ ol {
   justify-content: flex-start;
   align-items: center;
   flex-wrap: nowrap;
+  background: #fff;
 }
 
 .stepBg > div {
-  height: 12%;
+  height: 80px;
   width: 85%;
   cursor: pointer;
   margin: 10px 0;
@@ -2500,7 +2490,6 @@ ol {
 .thirdNo,
 .fourNo {
   background: #e7e7e7;
-  height: 90px;
   color: #adadad;
   display: flex;
   flex-direction: row;
@@ -2651,4 +2640,7 @@ ol {
   cursor: pointer;
   margin: 10px 0;
 }
+.customWidth >>> .el-dialog{
+  min-width:500px !important;
+}
 </style>