lsc 1 anno fa
parent
commit
8b68c8958a

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.d8724ef663c2d50ca0ec3b1e0de02b08.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.2f3360444db7df1cd2d7.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.4ea0b4507ed5c5288caffe0b3519d335.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.ff63e117c5e6e8c325cf.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.4ea0b4507ed5c5288caffe0b3519d335.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.4ea0b4507ed5c5288caffe0b3519d335.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.d8724ef663c2d50ca0ec3b1e0de02b08.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.d8724ef663c2d50ca0ec3b1e0de02b08.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.2f3360444db7df1cd2d7.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.ff63e117c5e6e8c325cf.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.ff63e117c5e6e8c325cf.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 16 - 13
src/components/pages/addCourse.vue

@@ -413,9 +413,9 @@
                 </div>
               </div>
               <div class="rb_c_box_right">
-                <div class="rb_c_box_btn">
+                <!-- <div class="rb_c_box_btn">
                   <button class="c_pub_button_add pub_btn_paste_img" @click="pasteTask" v-if="steps == 3">智能粘贴</button>
-                </div>
+                </div> -->
                 <div class="basic_box">
                   <div style="
                   display: flex;
@@ -449,6 +449,7 @@
                       ">
                       <img src="../../assets/icon/new/addStage.png" alt />
                     </div>
+                    <button class="c_pub_button_add pub_btn_paste_img" @click="pasteTask" v-if="steps == 3" style="margin: 0 0 0 auto;">智能粘贴</button>
                   </div>
 
                   <div style="margin: 0 0 40px 0; padding: 0 20px 0 20px"
@@ -3049,7 +3050,7 @@ export default {
       lineType: 0,
       chapCount: 0,
       courseName: "",
-      isTeacherSee: true,
+      isTeacherSee: false,
       courseText: "",
       preTime: 0,
       formLabelWidth: "100px",
@@ -3523,7 +3524,7 @@ export default {
     },
     navSteps(s) {
       if (this.courseName == "") {
-        this.$message.error("请将信息填写完整");
+        this.$message.error("请补充填写课程名称");
         return;
       }
       if (this.cidType == 0) {
@@ -3602,13 +3603,13 @@ export default {
               }
             }
           } else {
-            this.$message.error("请将信息填写完整");
+            this.$message.error("请补充填写课程名称");
             return;
           }
         } else if (this.steps == 3) {
           if (this.cid == "" || this.cid == undefined) {
             if (this.courseName == "") {
-              this.$message.error("请将信息填写完整");
+              this.$message.error("请补充填写课程名称");
               return;
             } else {
               this.addWork();
@@ -3616,7 +3617,7 @@ export default {
             }
           } else {
             if (this.courseName == "") {
-              this.$message.error("请将信息填写完整");
+              this.$message.error("请补充填写课程名称");
               return;
             } else {
               if (this.userid != this.courseUserid && this.role != "1") {
@@ -3642,7 +3643,7 @@ export default {
             }
             this.steps++;
           } else {
-            this.$message.error("请将信息填写完整");
+            this.$message.error("请补充填写课程名称");
             return;
           }
         } else if (this.steps == 2) {
@@ -3657,7 +3658,7 @@ export default {
         } else if (this.steps == 3) {
           if (this.cid == "" || this.cid == undefined) {
             if (this.courseName == "") {
-              this.$message.error("请将信息填写完整");
+              this.$message.error("请补充填写课程名称");
               return;
             } else {
               this.addWork();
@@ -3665,7 +3666,7 @@ export default {
             }
           } else {
             if (this.courseName == "") {
-              this.$message.error("请将信息填写完整");
+              this.$message.error("请补充填写课程名称");
               return;
             } else {
               if (this.userid != this.courseUserid && this.role != "1") {
@@ -8017,6 +8018,7 @@ export default {
   overflow: auto;
   position: relative;
   height: 40px;
+  max-width: calc(100% - 175px);
 }
 
 .cru_selectBox::-webkit-scrollbar {
@@ -8249,7 +8251,7 @@ export default {
   box-sizing: border-box;
   position: relative;
   padding: 20px 15px;
-  height: 200px;
+  height: auto;
   overflow-y: auto;
   overflow-x: hidden;
 }
@@ -8347,7 +8349,7 @@ export default {
   flex-direction: column;
   flex-wrap: nowrap;
   width: calc(100% - 400px);
-  padding: 0 100px 0 0;
+  padding: 0 0 0 0;
   box-sizing: border-box;
 }
 
@@ -9263,6 +9265,7 @@ ol {
   display: flex;
   flex-direction: row;
   align-items: center;
+  margin-right:10px;
 }
 
 .all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label {
@@ -10737,7 +10740,7 @@ ol {
 .rb_c_box_right>.basic_box {
   background: #F0F4FA;
   border-radius: 8px;
-  height: calc(100% - 50px);
+  height: calc(100% - 0px);
   overflow: auto;
 }
 </style>

+ 253 - 368
src/components/pages/course.vue

@@ -2,135 +2,94 @@
   <div class="pb_content" style="height: auto; width: 94%; margin: 10px auto;background: unset;">
     <div style="width:100%;padding:0 21px;background:#fff;border-radius: 5px;">
       <div class="pb_head top">
-      <div style="
+        <div style="
     display: flex;
     align-items: center;
 ">
-        <span class="sub_head">课程管理</span>
-        <span
-          class="subClick"
-          @click="
+          <span class="sub_head">课程管理</span>
+          <span class="subClick" @click="
             goTo(
               '/works?userid=' +
-                userid +
-                '&oid=' +
-                oid +
-                '&org=' +
-                org +
-                '&role=' +
-                role
+              userid +
+              '&oid=' +
+              oid +
+              '&org=' +
+              org +
+              '&role=' +
+              role
             )
-          "
-          >评价管理</span
-        >
-      </div>
-      <div class="student_button">
-        <!-- <el-button type="primary" class="bgColor" @click="openCourse">协同编辑</el-button> -->
-        <el-button type="primary" class="bgColor" @click="goToCourse3()"
-          >创建极简式课程</el-button
-        >
-        <el-button type="primary" class="bgColor" @click="goToCourse2()"
-          >创建任务式课程</el-button
-        >
-        <el-button type="primary" class="bgColor" @click="goToCourse()"
-          >创建阶段式课程</el-button
-        >
-      </div>
-    </div>
-    <div class="reBox">
-      <div class="reTop">
-        <div>分类筛选</div>
-        <div>
-          <!-- @click="getCourse" -->
-          <div class="search">
-            <img src="../../assets/icon/search.png" alt="" />
-          </div>
-          <input
-            class="sInput"
-            type="text"
-            placeholder="请输入关键字"
-            v-model="courseName"
-            @input="getCourse()"
-          />
+            ">评价管理</span>
+        </div>
+        <div class="student_button">
+          <!-- <el-button type="primary" class="bgColor" @click="openCourse">协同编辑</el-button> -->
+          <el-button type="primary" class="bgColor" @click="goToCourse3()">创建极简式课程</el-button>
+          <el-button type="primary" class="bgColor" @click="goToCourse2()">创建任务式课程</el-button>
+          <el-button type="primary" class="bgColor" @click="goToCourse()">创建阶段式课程</el-button>
         </div>
       </div>
-      <div
-        class="pType_box all_choose"
-        v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'"
-      >
-        <span>类型</span>
-        <el-radio-group
-          v-model="pTypeCheckName"
-          style="display: flex; align-items: center"
-        >
-          <div
-            class="all_choose"
-            style="width: 100px"
-            v-for="(item, index) in CourseType2"
-            :key="index"
-          >
-            <el-radio
-              :label="item.name"
-              @click.native.prevent="CourseType2Click(item.name)"
-              >{{ item.name }}</el-radio
-            >
+      <div class="reBox">
+        <div class="reTop">
+          <div>分类筛选</div>
+          <div class="reTopCh">
+            <el-select v-model="groupA" @change="search" v-if="role == '1'">
+              <el-option value="4" label="全部"></el-option>
+              <el-option value="2" label="我的课程"></el-option>
+              <el-option value="3" label="协同课程"></el-option>
+              <el-option value="1" label="他人课程"></el-option>
+            </el-select>
+            <el-select v-model="groupA" @change="search" v-else>
+              <el-option value="0" label="全部"></el-option>
+              <el-option value="2" label="我的课程"></el-option>
+              <el-option value="3" label="协同课程"></el-option>
+            </el-select>
+            <div class="searchI">
+              <!-- @click="getCourse" -->
+              <div class="search">
+                <img src="../../assets/icon/search.png" alt="" />
+              </div>
+              <input class="sInput" type="text" placeholder="请输入关键字" v-model="courseName" @input="getCourse()" />
+            </div>
           </div>
-        </el-radio-group>
-      </div>
-      <div class="choose">
-        <div
-          class="all_choose"
-          v-for="(item, index) in CourseType[0]"
-          :key="index"
-          :style="{ margin: !CourseTypeJson[item.id].length && 0 }"
-        >
-          <span
-            v-if="
-              CourseTypeJson[item.id].length &&
+        </div>
+        <div class="pType_box all_choose" v-if="oid == '69893dca-1d47-11ed-8c78-005056b86db5'">
+          <span>类型</span>
+          <el-radio-group v-model="pTypeCheckName" style="display: flex; align-items: center">
+            <div class="all_choose" style="width: 100px" v-for="(item, index) in CourseType2" :key="index">
+              <el-radio :label="item.name" @click.native.prevent="CourseType2Click(item.name)">{{ item.name }}</el-radio>
+            </div>
+          </el-radio-group>
+        </div>
+        <div class="choose">
+          <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index"
+            :style="{ margin: !CourseTypeJson[item.id].length && 0 }">
+            <span v-if="CourseTypeJson[item.id].length &&
               (oid == '69893dca-1d47-11ed-8c78-005056b86db5'
                 ? pTypeCheck.indexOf(item.id) != -1
                 : true)
-            "
-            >{{ item.name }}:</span
-          >
-          <div
-            class="typeCss"
-            v-if="
-              CourseTypeJson[item.id].length &&
+              ">{{ item.name }}:</span>
+            <div class="typeCss" v-if="CourseTypeJson[item.id].length &&
               (oid == '69893dca-1d47-11ed-8c78-005056b86db5'
                 ? pTypeCheck.indexOf(item.id) != -1
                 : true)
-            "
-          >
-            <div
-              class="cName"
-              @click="getCourse2(item.name, '', item.id, 1)"
-              :class="typeE.indexOf(item.id) != -1 ? 'isCType' : ''"
-            >
-              全部
-            </div>
-            <div
-              v-for="(item1, index1) in CourseTypeJson[item.id]"
-              :key="index + '-' + index1"
-              :label="item1.id"
-              @click="getCourse2(item.name, item.id, item1.id, 2)"
-            >
-              <div
-                class="cName"
-                :class="
-                  typea == item1.id || typeb == item1.id || typed == item1.id
+              ">
+              <div class="cName" @click="getCourse2(item.name, '', item.id, 1)"
+                :class="typeE.indexOf(item.id) != -1 ? 'isCType' : ''">
+                全部
+              </div>
+              <div v-for="(item1, index1) in CourseTypeJson[item.id]" :key="index + '-' + index1" :label="item1.id"
+                @click="getCourse2(item.name, item.id, item1.id, 2)">
+                <div class="cName" :class="typea == item1.id || typeb == item1.id || typed == item1.id
                     ? 'isCType'
                     : ''
-                "
-              >
-                {{ item1.name }}
+                  ">
+                  {{ item1.name }}
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-    </div>
     <div class="line"></div>
     <div class="pb_content_body" style="height: 100%;width: 100%;background: #e6eaf0;margin: 0 auto;">
       <div class="student_head" v-if="false">
@@ -142,25 +101,12 @@
               <el-option value="1" label="他人课程"></el-option>
             </el-select>
           </div>
-          <div
-            class="all_choose"
-            v-for="(item, index) in CourseType[0]"
-            :key="index"
-          >
+          <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index">
             <span v-if="CourseTypeJson[item.id].length">{{ item.name }}</span>
-            <el-select
-              v-if="CourseTypeJson[item.id].length"
-              v-model="courseTypeId[item.id]"
-              placeholder="请选择"
-              @change="getTypeName"
-            >
+            <el-select v-if="CourseTypeJson[item.id].length" v-model="courseTypeId[item.id]" placeholder="请选择"
+              @change="getTypeName">
               <el-option label="全部" value="1">全部</el-option>
-              <el-option
-                v-for="item1 in CourseTypeJson[item.id]"
-                :key="item1.id"
-                :label="item1.name"
-                :value="item1.id"
-              >
+              <el-option v-for="item1 in CourseTypeJson[item.id]" :key="item1.id" :label="item1.name" :value="item1.id">
               </el-option>
             </el-select>
           </div>
@@ -169,14 +115,8 @@
 
         <div class="student_right">
           <div class="head_left">
-            <el-input
-              v-model="courseName"
-              class="student_input"
-              placeholder="请输入课程名称"
-            ></el-input>
-            <el-button class="course_button" @click="searchCourse"
-              >查询</el-button
-            >
+            <el-input v-model="courseName" class="student_input" placeholder="请输入课程名称"></el-input>
+            <el-button class="course_button" @click="searchCourse">查询</el-button>
           </div>
         </div>
       </div>
@@ -191,29 +131,20 @@
             </div>
             <div class="xtCourse" v-else>协同课程</div> -->
             <div class="myCourse" v-if="item.userid == userid">我的课程</div>
-            <div
-              class="myCourse"
-              style="background: #4187f0"
-              v-else-if="
-                !item.course_teacher ||
-                (item.course_teacher &&
-                  item.course_teacher.indexOf(userid) == -1)
-              "
-            >
+            <div class="myCourse" style="background: #4187f0" v-else-if="!item.course_teacher ||
+              (item.course_teacher &&
+                item.course_teacher.indexOf(userid) == -1)
+              ">
               他人课程
             </div>
             <div class="xtCourse" v-else>协同课程</div>
             <div class="tup">
-              <img
-                :src="
-                  item.cover != null && item.cover != ''
-                    ? JSON.parse(item.cover).length > 0
-                      ? JSON.parse(item.cover)[0].url
-                      : mr
+              <img :src="item.cover != null && item.cover != ''
+                  ? JSON.parse(item.cover).length > 0
+                    ? JSON.parse(item.cover)[0].url
                     : mr
-                "
-                alt
-              />
+                  : mr
+                " alt />
             </div>
             <!-- <div class="bottom_box">
               <div>{{ item.title }}</div>
@@ -227,78 +158,58 @@
               <div class="kc_t" v-if="item.isCourseType == 2 || groupA == 1">
                 负责老师:{{ item.uname }}
               </div>
-                <div class="kc_time">
-                  <span style="color: #717C8D">创建日期:</span>{{ item.time }}
-                </div>
-                <div class="kc_time">
-                  <span style="color: #717C8D">修改日期:</span>{{ item.utime }}
-                </div>
+              <div class="kc_time">
+                <span style="color: #717C8D">创建日期:</span>{{ item.time }}
+              </div>
+              <div class="kc_time">
+                <span style="color: #717C8D">修改日期:</span>{{ item.utime }}
+              </div>
             </div>
             <div class="three_bottom">
               <!-- v-if="role == '1'" -->
               <div @click="get(item)">预览</div>
               <!-- <div @click="jump(item.courseId)" v-else>评课</div> -->
-              <div
-                v-if="
-                  ((item.userid == userid) ||
-                    (item.course_teacher &&
-                      item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
-                  item.state == 1
-                "
-                @click="goToCourse(item.courseId)"
-              >
+              <div v-if="((item.userid == userid) ||
+                  (item.course_teacher &&
+                    item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
+                item.state == 1
+                " @click="goToCourse(item.courseId)">
                 修改
               </div>
-              <div
-                v-if="
-                  ((item.userid == userid) ||
-                    (item.course_teacher &&
-                      item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
-                  item.state == 2
-                "
-                @click="goToCourse2(item.courseId)"
-              >
+              <div v-if="((item.userid == userid) ||
+                  (item.course_teacher &&
+                    item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
+                item.state == 2
+                " @click="goToCourse2(item.courseId)">
                 修改
               </div>
-              <div
-                v-if="
-                  ((item.userid == userid) ||
-                    (item.course_teacher &&
-                      item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
-                  item.state == 3
-                "
-                @click="goToCourse3(item.courseId)"
-              >
+              <div v-if="((item.userid == userid) ||
+                  (item.course_teacher &&
+                    item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
+                item.state == 3
+                " @click="goToCourse3(item.courseId)">
                 修改
               </div>
-              <div
-                v-if="groupA == '0'"
-                @click="
-                  goTo(
-                    '/works?cid=' +
-                      item.courseId +
-                      '&userid=' +
-                      userid +
-                      '&oid=' +
-                      oid +
-                      '&org=' +
-                      org +
-                      '&role=' +
-                      role
-                  )
-                "
-              >
+              <div v-if="groupA == '0'" @click="
+                goTo(
+                  '/works?cid=' +
+                  item.courseId +
+                  '&userid=' +
+                  userid +
+                  '&oid=' +
+                  oid +
+                  '&org=' +
+                  org +
+                  '&role=' +
+                  role
+                )
+                ">
                 评价
               </div>
-              <div
-                @click="copyCourse(item.courseId)"
-              >
+              <div @click="copyCourse(item.courseId)">
                 复制
               </div>
-              <div
-                v-if="item.isCourseType == 1 || role == '1'"
-                @click="deleteCourse(item.courseId)"
-              >
+              <div v-if="item.isCourseType == 1 || role == '1'" @click="deleteCourse(item.courseId)">
                 删除
               </div>
               <!-- <div class="more">
@@ -317,27 +228,14 @@
       </div>
     </div>
     <div class="student_page">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :page-size="pageSize"
-        :total="total"
-        v-if="page && course.length"
-        style="padding-bottom: 20px"
-        @current-change="handleCurrentChange"
-      ></el-pagination>
+      <el-pagination background layout="prev, pager, next" :page-size="pageSize" :total="total"
+        v-if="page && course.length" style="padding-bottom: 20px" @current-change="handleCurrentChange"></el-pagination>
     </div>
     <el-dialog :visible.sync="dialogVisible1" size="tiny">
       <img width="100%" :src="dialogImageUrl" alt />
     </el-dialog>
-    <el-dialog
-      title="查看提问"
-      :visible.sync="dialogVisible"
-      :append-to-body="true"
-      width="750px"
-      :before-close="handleClose"
-      class="dialog_diy"
-    >
+    <el-dialog title="查看提问" :visible.sync="dialogVisible" :append-to-body="true" width="750px" :before-close="handleClose"
+      class="dialog_diy">
       <div>
         <div class="a_addBox">
           <CourseProblem :problemCourse="problemCourse"></CourseProblem>
@@ -347,32 +245,17 @@
         <el-button @click="dialogVisible = false">关 闭</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      title="查看协同课程"
-      :visible.sync="dialogVisibleCourse"
-      :append-to-body="true"
-      width="850px"
-      :before-close="handleClose"
-      class="dialog_diy"
-    >
+    <el-dialog title="查看协同课程" :visible.sync="dialogVisibleCourse" :append-to-body="true" width="850px"
+      :before-close="handleClose" class="dialog_diy">
       <div class="ct_box">
-        <div
-          class="out_box"
-          v-for="(item, index) in courseTeam"
-          :key="index"
-          style="margin-left: 15px"
-        >
+        <div class="out_box" v-for="(item, index) in courseTeam" :key="index" style="margin-left: 15px">
           <div class="tup">
-            <img
-              :src="
-                item.cover != null && item.cover != ''
-                  ? JSON.parse(item.cover).length > 0
-                    ? JSON.parse(item.cover)[0].url
-                    : mr
+            <img :src="item.cover != null && item.cover != ''
+                ? JSON.parse(item.cover).length > 0
+                  ? JSON.parse(item.cover)[0].url
                   : mr
-              "
-              alt
-            />
+                : mr
+              " alt />
           </div>
           <div class="bottom_box">
             <div>{{ item.title }}</div>
@@ -381,20 +264,18 @@
           </div>
           <div class="three_bottom">
             <div @click="jump(item.courseId)">查看内容</div>
-            <div
-              @click="
-                goTo(
-                  '/course/addCourse?cid=' +
-                    item.courseId +
-                    '&userid=' +
-                    userid +
-                    '&oid=' +
-                    oid +
-                    '&org=' +
-                    org
-                )
-              "
-            >
+            <div @click="
+              goTo(
+                '/course/addCourse?cid=' +
+                item.courseId +
+                '&userid=' +
+                userid +
+                '&oid=' +
+                oid +
+                '&org=' +
+                org
+              )
+              ">
               编辑
             </div>
           </div>
@@ -533,26 +414,26 @@ export default {
       if (courseId) {
         this.$router.push(
           "/course/addCourse?cid=" +
-            courseId +
-            "&userid=" +
-            this.userid +
-            "&oid=" +
-            this.oid +
-            "&org=" +
-            this.org +
-            "&role=" +
-            this.role
+          courseId +
+          "&userid=" +
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role
         );
       } else {
         this.$router.push(
           "/course/addCourse?userid=" +
-            this.userid +
-            "&oid=" +
-            this.oid +
-            "&org=" +
-            this.org +
-            "&role=" +
-            this.role
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role
         );
       }
       // this.$router.push(path);
@@ -561,26 +442,26 @@ export default {
       if (courseId) {
         this.$router.push(
           "/course/addCourseT?cid=" +
-            courseId +
-            "&userid=" +
-            this.userid +
-            "&oid=" +
-            this.oid +
-            "&org=" +
-            this.org +
-            "&role=" +
-            this.role
+          courseId +
+          "&userid=" +
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role
         );
       } else {
         this.$router.push(
           "/course/addCourseT?userid=" +
-            this.userid +
-            "&oid=" +
-            this.oid +
-            "&org=" +
-            this.org +
-            "&role=" +
-            this.role
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role
         );
       }
     },
@@ -588,26 +469,26 @@ export default {
       if (courseId) {
         this.$router.push(
           "/course/addCourseE?cid=" +
-            courseId +
-            "&userid=" +
-            this.userid +
-            "&oid=" +
-            this.oid +
-            "&org=" +
-            this.org +
-            "&role=" +
-            this.role
+          courseId +
+          "&userid=" +
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role
         );
       } else {
         this.$router.push(
           "/course/addCourseE?userid=" +
-            this.userid +
-            "&oid=" +
-            this.oid +
-            "&org=" +
-            this.org +
-            "&role=" +
-            this.role
+          this.userid +
+          "&oid=" +
+          this.oid +
+          "&org=" +
+          this.org +
+          "&role=" +
+          this.role
         );
       }
     },
@@ -658,7 +539,7 @@ export default {
       this.page = val;
       this.getCourse();
     },
-    init() {},
+    init() { },
     handleClose(done) {
       done();
     },
@@ -790,7 +671,7 @@ export default {
             }
           }
         }
-      } else if (typeid == "34629bcc-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629bcc-d02f-11ec-8c78-005056b86db5' ) {
+      } else if (typeid == "34629bcc-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629bcc-d02f-11ec-8c78-005056b86db5') {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
             if (this.oid == "69893dca-1d47-11ed-8c78-005056b86db5") {
@@ -1006,8 +887,8 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectAllType", params)
         .then((res) => {
-          if(this.oid == "69893dca-1d47-11ed-8c78-005056b86db5"){
-            res.data[0] = [...res.data[0],...res.data[4]]
+          if (this.oid == "69893dca-1d47-11ed-8c78-005056b86db5") {
+            res.data[0] = [...res.data[0], ...res.data[4]]
           }
           this.CourseType = res.data;
           this.CourseType2 = [
@@ -1015,24 +896,24 @@ export default {
             { name: "智行课程", id: [] },
             { name: "智创课程", id: [] },
           ];
-          
+
           for (var cti = 0; cti < res.data[0].length; cti++) {
             if (
               res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" ||
               res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5"
             ) {
               this.CourseType2[0].id.push(res.data[0][cti].id);
-            }else if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5" ||
-              res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
+            } else if (res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5" ||
+              res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5") {
               this.CourseType2[1].id.push(res.data[0][cti].id);
             } else if (res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5") {
               this.CourseType2[2].id.push(res.data[0][cti].id);
             }
-            if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5"){
+            if (res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5") {
               res.data[0][cti].name = "年级";
-            }else if(res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
+            } else if (res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5") {
               res.data[0][cti].name = "学科";
-            }else if(res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5"){
+            } else if (res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5") {
               res.data[0][cti].name = "主题";
             }
           }
@@ -1223,28 +1104,29 @@ export default {
     margin-right: 25px !important;
   } */
 }
-.dialog_diy >>> .el-dialog__header {
+
+.dialog_diy>>>.el-dialog__header {
   background: #3d67bc !important;
   padding: 15px 20px;
 }
 
-.dialog_diy >>> .el-dialog__title {
+.dialog_diy>>>.el-dialog__title {
   color: #fff;
 }
 
-.dialog_diy >>> .el-dialog__headerbtn {
+.dialog_diy>>>.el-dialog__headerbtn {
   top: 19px;
 }
 
-.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close {
+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close {
   color: #fff;
 }
 
-.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover {
+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close:hover {
   color: #fff;
 }
 
-.student_head >>> .el-button--primary {
+.student_head>>>.el-button--primary {
   background-color: #2268bc;
 }
 
@@ -1264,13 +1146,13 @@ export default {
 }
 
 .top {
-    display: flex;
-    justify-content: space-between;
-    width: 100% !important;
-    box-sizing: border-box;
-    margin: 0px auto;
-    padding: 10px 5px;
-    height: 54px;
+  display: flex;
+  justify-content: space-between;
+  width: 100% !important;
+  box-sizing: border-box;
+  margin: 0px auto;
+  padding: 10px 5px;
+  height: 54px;
 }
 
 .bgColor {
@@ -1316,7 +1198,7 @@ export default {
   align-items: center;
 }
 
-.el-table >>> .even_row {
+.el-table>>>.even_row {
   background-color: #f1f1f1;
 }
 
@@ -1429,7 +1311,7 @@ export default {
   justify-content: center;
 }
 
-.el_cards >>> .el-card__body {
+.el_cards>>>.el-card__body {
   height: 100%;
 }
 
@@ -1445,7 +1327,7 @@ export default {
   display: flex;
 }
 
-.wordUpload > .buttonUp {
+.wordUpload>.buttonUp {
   margin-right: 5px;
 }
 
@@ -1470,7 +1352,7 @@ export default {
   border: 1px solid #3682fc00;
 }
 
-.out_box:hover{
+.out_box:hover {
   border: 1px solid #3681FC;
 }
 
@@ -1480,7 +1362,7 @@ export default {
 
 .bottom_box {
   display: flex;
-  padding: 10px ;
+  padding: 10px;
   flex-direction: column;
   box-sizing: border-box;
   height: 121px;
@@ -1488,7 +1370,7 @@ export default {
   justify-content: space-evenly;
 }
 
-.bottom_box > div:nth-child(1) {
+.bottom_box>div:nth-child(1) {
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -1507,7 +1389,7 @@ export default {
   box-sizing: border-box;
 }
 
-.tup > img {
+.tup>img {
   width: 100%;
   height: 100%;
   object-fit: contain;
@@ -1518,7 +1400,8 @@ export default {
   font-size: 14px;
   color: #717C8D;
 }
-.kc_time + .kc_time {
+
+.kc_time+.kc_time {
   margin-top: 0;
 }
 
@@ -1542,22 +1425,22 @@ export default {
   box-sizing: border-box;
 }
 
-.three_bottom > div {
+.three_bottom>div {
   cursor: pointer;
   width: 100%;
   text-align: center;
 }
 
-.three_bottom > div + div{
+.three_bottom>div+div {
   border-left: 1px solid #ddd;
 }
 
-.three_bottom > div:hover {
+.three_bottom>div:hover {
   color: #3681FC;
   font-weight: bold;
 }
 
-.three_bottom  .deleteB{
+.three_bottom .deleteB {
   color: #E96E6E;
 }
 
@@ -1570,7 +1453,7 @@ export default {
   display: flex;
 }
 
-.student_input >>> .el-input__inner {
+.student_input>>>.el-input__inner {
   height: 40px;
   width: 190px;
   font-size: 13px;
@@ -1734,17 +1617,17 @@ export default {
   display: none;
 }
 
-.more div > span + span {
+.more div>span+span {
   margin-top: 10px;
 }
 
-.more div > span {
+.more div>span {
   display: block;
   width: 100%;
   text-align: center;
 }
 
-.more div > span:hover {
+.more div>span:hover {
   color: #79a2ff;
 }
 
@@ -1755,12 +1638,12 @@ export default {
 }
 
 .reBox {
-    width: 100%;
-    /* padding-left: 20px; */
-    margin: 0 auto;
-    box-sizing: border-box;
-    overflow: hidden;
-    padding: 10px 15px 0;
+  width: 100%;
+  /* padding-left: 20px; */
+  margin: 0 auto;
+  box-sizing: border-box;
+  overflow: hidden;
+  padding: 10px 15px 0;
 }
 
 .reTop {
@@ -1774,7 +1657,7 @@ export default {
   justify-content: space-between;
 }
 
-.reTop > div:nth-child(1) {
+.reTop>div:nth-child(1) {
   font-weight: bold;
   /* width: 40px; */
   /* border-bottom: 1px solid #205cc6; */
@@ -1782,27 +1665,30 @@ export default {
   color: #205cc6;
   /* font-size: 20px; */
 }
-
-.reTop > div:nth-child(2) {
+.reTop .reTopCh{
+  display: flex;
+}
+.reTop .searchI {
   display: flex;
   flex-direction: row;
   align-items: center;
   border: 1px solid #ccced3;
-  width: 300px;
+  width: 250px;
   border-radius: 8px;
   padding: 5px 0;
   /* margin-bottom: 10px; */
   background: #fafafa;
+  margin: 0 0 0 10px;
 }
 
 .search {
   width: 20px;
   padding: 0 5px;
-  display:flex;
+  display: flex;
   align-items: center;
 }
 
-.search > img {
+.search>img {
   width: 100%;
   height: 100%;
 }
@@ -1843,17 +1729,17 @@ export default {
   width: 100%;
 }
 
-.all_choose > span {
+.all_choose>span {
   min-width: 80px;
   display: block;
   letter-spacing: 14px;
 }
 
-.all_choose > span:nth-child(1) {
+.all_choose>span:nth-child(1) {
   font-weight: bold;
 }
 
-.all_choose >>> .el-checkbox-group {
+.all_choose>>>.el-checkbox-group {
   display: flex;
   flex-direction: row;
   width: 820px;
@@ -1864,14 +1750,14 @@ export default {
   margin-top: 3px;
 }
 
-.all_choose > .el-checkbox-group >>> .el-checkbox {
+.all_choose>.el-checkbox-group>>>.el-checkbox {
   margin-bottom: 10px;
   display: flex;
   flex-direction: row;
   align-items: center;
 }
 
-.all_choose > .el-checkbox-group > .el-checkbox >>> .el-checkbox__label {
+.all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label {
   min-width: 80px;
   overflow: hidden;
   width: 80px;
@@ -1879,7 +1765,7 @@ export default {
   white-space: nowrap;
 }
 
-.all_choose > .el-checkbox-group > .el-checkbox >>> .el-checkbox__label:hover {
+.all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label:hover {
   width: auto;
 }
 
@@ -1901,9 +1787,8 @@ export default {
 .pType_box {
   margin-top: 0;
 }
-.pType_box
-  >>> .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
-  .el-radio__inner {
+
+.pType_box>>>.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner {
   -webkit-box-shadow: none !important;
   box-shadow: none !important;
 }

+ 47 - 33
src/components/pages/easy/addCourse.vue

@@ -117,12 +117,7 @@
               <div class="right_title">课程简要描述</div>
               <div style="width: 95%; padding: 15px 0px 15px 20px">
                 <div style="width: 55%">
-                  <textarea rows="8" class="binfo_input" cols v-model="courseText" :placeholder="'1、课程内容说明' +
-                    '\n' +
-                    '2、课程学习知识目标' +
-                    '\n' +
-                    '3、课程学习技能目标'
-                    "></textarea>
+                  <textarea rows="8" class="binfo_input" cols v-model="courseText"></textarea>
                 </div>
               </div>
             </div>
@@ -3093,18 +3088,7 @@
             </div>
           </div>
           <div class="info_btnBox">
-            <button class="c_pub_button_return pub_btn_return_img" @click="
-              goTo(
-                '/course?userid=' +
-                userid +
-                '&oid=' +
-                oid +
-                '&org=' +
-                org +
-                '&role=' +
-                role
-              )
-              ">
+            <button class="c_pub_button_return pub_btn_return_img" @click="lastSteps">
               返回课程
             </button>
             <button class="c_pub_button_confirm pub_btn_finish_img" @click="nextSteps" v-if="this.steps == 1">
@@ -4122,7 +4106,7 @@ export default {
       lineType: 0,
       chapCount: 0,
       courseName: "",
-      isTeacherSee: true,
+      isTeacherSee: false,
       courseText: "",
       preTime: 0,
       formLabelWidth: "100px",
@@ -4586,28 +4570,57 @@ export default {
       return _guid;
     },
     lastSteps() {
-      this.goTo(
-        "/course?userid=" +
-        this.userid +
-        "&oid=" +
-        this.oid +
-        "&org=" +
-        this.org +
-        "&role=" +
-        this.role
-      );
+      this
+        .$confirm("是否保存?", "提示", {
+          confirmButtonText: "保存",
+          cancelButtonText: "不保存",
+          type: "warning",
+        })
+        .then(() => {
+          if (this.cid == "" || this.cid == undefined) {
+            if (this.courseName == "") {
+              this.$message.error("请补充填写课程名称");
+              return;
+            } else {
+              this.addWork();
+            }
+          } else {
+            if (this.courseName == "") {
+              this.$message.error("请补充填写课程名称");
+              return;
+            } else {
+              if (this.userid != this.courseUserid && this.role != "1") {
+                this.updateWork2();
+              } else {
+                this.updateWork();
+              }
+            }
+          }
+        })
+        .catch(() => {
+          this.goTo(
+            "/course?userid=" +
+            this.userid +
+            "&oid=" +
+            this.oid +
+            "&org=" +
+            this.org +
+            "&role=" +
+            this.role
+          );
+        });
     },
     nextSteps() {
       if (this.cid == "" || this.cid == undefined) {
         if (this.courseName == "") {
-          this.$message.error("请将信息填写完整");
+          this.$message.error("请补充填写课程名称");
           return;
         } else {
           this.addWork();
         }
       } else {
         if (this.courseName == "") {
-          this.$message.error("请将信息填写完整");
+          this.$message.error("请补充填写课程名称");
           return;
         } else {
           if (this.userid != this.courseUserid && this.role != "1") {
@@ -9234,7 +9247,7 @@ export default {
   box-sizing: border-box;
   position: relative;
   padding: 20px 15px;
-  height: 200px;
+  height: auto;
   overflow-y: auto;
   overflow-x: hidden;
 }
@@ -9332,7 +9345,7 @@ export default {
   flex-direction: column;
   flex-wrap: nowrap;
   width: calc(100% - 400px);
-  padding: 0 100px 0 0;
+  padding: 0 0 0 0;
   box-sizing: border-box;
 }
 
@@ -10193,6 +10206,7 @@ ol {
   display: flex;
   flex-direction: row;
   align-items: center;
+  margin-right:10px;
 }
 
 .all_choose>.el-checkbox-group>.el-checkbox>>>.el-checkbox__label {

+ 21 - 11
src/components/pages/grade/index.vue

@@ -53,23 +53,20 @@
                 border-radius: 5px;
               ">
         <div class="pb_head top">
-          <span>查看班级</span>
+          <span>查看班级-{{getGrade(cid)}} </span>
           <div class="student_button" style="border-radius: 4px;">
             <el-button type="primary" class="bgColor" @click="ctype = 1, getClass()">返回</el-button>
           </div>
         </div>
         <div class="student_head">
-          <div class="head_left">
-            <el-input v-model="sPhoneUser" class="student_input" placeholder="请输入班级"></el-input>
-            <el-select disabled v-model="cid" placeholder="请选择班级" class="student_input" @change="searchStudent"
-              style="margin:0 10px">
-              <el-option label="全部年级" value=""></el-option>
-              <el-option v-for="(item, index) in classJuri" :key="index" :label="item.name" :value="item.id"></el-option>
-            </el-select>
+          <div class="student_search">
+            <span>
+              <el-input v-model="sPhoneUser"  placeholder="请输入班级" style="margin:0 10px 0 0"></el-input>
+            </span>
             <el-button class="student_button" @click="searchStudent">查询</el-button>
           </div>
-          <div class="head_right">
-            <el-button @click="addStudent">添加班级</el-button>
+          <div>
+            <el-button @click="addStudent" class="student_button">添加班级</el-button>
           </div>
         </div>
       </div>
@@ -316,6 +313,19 @@
       this.getClass2();
       this.getSchoolName();
     },
+    computed: {
+      getGrade() {
+        return function (gid) {
+          let name = ''
+          this.classJuri.forEach(element => {
+            if (element.id == gid) {
+              name = element.name
+            }
+          });
+          return name ? name : '暂无'
+        }
+      }
+    },
     mounted() {
       this.$nextTick(function () {
         this.tableHeight =
@@ -673,7 +683,7 @@
       },
       deleteClassStudent(id) {
         let params = [{ uid: id, cid: this.cid }];
-        this.$confirm("确定移除此班级在本年级吗?", "提示", {
+        this.$confirm("确定在本年级移除此班级吗?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",

+ 46 - 34
src/components/pages/task/addCourse.vue

@@ -140,13 +140,6 @@
                     class="binfo_input"
                     cols
                     v-model="courseText"
-                    :placeholder="
-                      '1、课程内容说明' +
-                      '\n' +
-                      '2、课程学习知识目标' +
-                      '\n' +
-                      '3、课程学习技能目标'
-                    "
                   ></textarea>
                 </div>
               </div>
@@ -5043,18 +5036,7 @@
           <div class="info_btnBox">
             <button
               class="c_pub_button_return pub_btn_return_img"
-              @click="
-                goTo(
-                  '/course?userid=' +
-                    userid +
-                    '&oid=' +
-                    oid +
-                    '&org=' +
-                    org +
-                    '&role=' +
-                    role
-                )
-              "
+              @click="lastSteps"
             >
               返回课程
             </button>
@@ -6720,7 +6702,7 @@ export default {
       lineType: 0,
       chapCount: 0,
       courseName: "",
-      isTeacherSee: true,
+      isTeacherSee: false,
       courseText: "",
       preTime: 0,
       formLabelWidth: "100px",
@@ -7184,28 +7166,57 @@ export default {
       return _guid;
     },
     lastSteps() {
-      this.goTo(
-        "/course?userid=" +
-          this.userid +
-          "&oid=" +
-          this.oid +
-          "&org=" +
-          this.org +
-          "&role=" +
-          this.role
-      );
+      this
+        .$confirm("是否保存?", "提示", {
+          confirmButtonText: "保存",
+          cancelButtonText: "不保存",
+          type: "warning",
+        })
+        .then(() => {
+          if (this.cid == "" || this.cid == undefined) {
+            if (this.courseName == "") {
+              this.$message.error("请补充填写课程名称");
+              return;
+            } else {
+              this.addWork();
+            }
+          } else {
+            if (this.courseName == "") {
+              this.$message.error("请补充填写课程名称");
+              return;
+            } else {
+              if (this.userid != this.courseUserid && this.role != "1") {
+                this.updateWork2();
+              } else {
+                this.updateWork();
+              }
+            }
+          }
+        })
+        .catch(() => {
+          this.goTo(
+            "/course?userid=" +
+            this.userid +
+            "&oid=" +
+            this.oid +
+            "&org=" +
+            this.org +
+            "&role=" +
+            this.role
+          );
+        });
     },
     nextSteps() {
       if (this.cid == "" || this.cid == undefined) {
         if (this.courseName == "") {
-          this.$message.error("请将信息填写完整");
+          this.$message.error("请补充填写课程名称");
           return;
         } else {
           this.addWork();
         }
       } else {
         if (this.courseName == "") {
-          this.$message.error("请将信息填写完整");
+          this.$message.error("请补充填写课程名称");
           return;
         } else {
           if (this.userid != this.courseUserid && this.role != "1") {
@@ -11790,7 +11801,7 @@ export default {
   box-sizing: border-box;
   position: relative;
   padding: 20px 15px;
-  height: 200px;
+  height: auto;
   overflow-y: auto;
   overflow-x: hidden;
 }
@@ -11888,7 +11899,7 @@ export default {
   flex-direction: column;
   flex-wrap: nowrap;
   width: calc(100% - 400px);
-  padding: 0 100px 0 0;
+  padding: 0 0 0 0;
   box-sizing: border-box;
 }
 
@@ -12750,6 +12761,7 @@ ol {
   display: flex;
   flex-direction: row;
   align-items: center;
+  margin-right:10px;
 }
 
 .all_choose > .el-checkbox-group > .el-checkbox >>> .el-checkbox__label {

Some files were not shown because too many files changed in this diff