Prechádzať zdrojové kódy

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

zengyicheng 2 rokov pred
rodič
commit
fec25636f0

+ 32 - 28
src/components/pages/addCourse.vue

@@ -448,7 +448,19 @@
                 >
                   <div class="e_add_top">
                     <div class="e_add_title">
-                      <span>当前使用目标管理</span>
+                      <el-button
+                        type="primary"
+                        size="small"
+                        @click="dialogVisiblemb = true"
+                        >添加</el-button
+                      >
+                      <el-button
+                        type="primary"
+                        size="small"
+                        @click="deleteEva()"
+                        >清除</el-button
+                      >
+                      <!-- <span>当前使用目标管理</span>
                       <span>{{ eTitle ? eTitle : "请添加目标" }}</span>
                       <img
                         src="../../assets/line.png"
@@ -459,7 +471,7 @@
                           bottom: -10px;
                           left: 155px;
                         "
-                      />
+                      /> -->
                     </div>
                     <div
                       style="
@@ -468,7 +480,7 @@
                         align-items: center;
                       "
                     >
-                      <el-button
+                      <!-- <el-button
                         type="primary"
                         size="small"
                         @click="dialogVisiblemb = true"
@@ -479,7 +491,7 @@
                         size="small"
                         @click="deleteEva()"
                         >清除内容</el-button
-                      >
+                      > -->
                       <!-- <div class="e_add_delete" @click="deleteEva()">
                           <img src="../../assets/icon/delete.png" alt="" />
                         </div> -->
@@ -1014,7 +1026,7 @@
                     </div>
                     <div class="add_info_box">
                       <button class="info_btn" @click="addImg($event)">
-                        添加教学视频
+                        添加视频
                         <!-- capture="camera" -->
                         <input
                           type="file"
@@ -1027,7 +1039,7 @@
                         />
                       </button>
                       <button class="info_btn" @click="addImg($event)">
-                        添加教学附件
+                        添加文档
                         <input
                           type="file"
                           accept="application/pdf, application/.ppt, .ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document"
@@ -1053,7 +1065,7 @@
                         添加链接
                       </button>
                       <button class="info_btn" @click="addImg($event)">
-                        附件上传
+                        其他附件
                         <input
                           type="file"
                           accept="*"
@@ -1229,7 +1241,7 @@
                                     item1.type == 3 ||
                                     item1.type == 7
                                   "
-                                  >{{ item1.text }}-</span
+                                  >{{ item1.text}}-</span
                                 >
                                 <input
                                   v-if="
@@ -2825,11 +2837,6 @@
                                 left: 155px;
                               "
                             />
-                            <!-- <el-input
-                        v-model="eTitle"
-                        placeholder="请输入名称"
-                        @change="setMindData"
-                            ></el-input>-->
                           </div>
                         </div>
                         <div class="e_add_content" style="width: 100%">
@@ -4287,8 +4294,9 @@
         <Table v-model="tableJson.text" @change="change"></Table>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleTable = false">取 消</el-button>
-        <el-button type="primary" @click="addTableJson">确定</el-button>
+        <!-- <el-button @click="dialogVisibleTable = false">取 消</el-button>
+        <el-button type="primary" @click="addTableJson">确定</el-button> -->
+        <el-button type="primary" @click="addTableJson">上传模板</el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -5861,24 +5869,23 @@ export default {
                 _this.unitJson[unitIndex].chapterInfo[0].taskJson[
                   itemTaskIndex
                 ].chapterData.push({
-                  // name: file.name,
-                  name: string+''+(_this.unitJson[unitIndex].chapterInfo[0].taskJson[
-                  itemTaskIndex
-                ].chapterData.length+1),
+                  name: file.name,
+                  // name: string+''+(_this.unitJson[unitIndex].chapterInfo[0].taskJson[
+                //   itemTaskIndex
+                // ].chapterData.length+1),
                   url: data.Location,
                   uid: file.uid,
                   type: type,
-                  text: string,
+                  text:  string+''+(_this.unitJson[unitIndex].chapterInfo[0].taskJson[
+                  itemTaskIndex
+                ].chapterData.length+1),
                 });
                 _this.imgChange1(null, null, type, itemTaskIndex);
               } else if (type == 4) {
                 _this.unitJson[_this.unitIndex].chapterInfo[0].taskJson[
                   itemTaskIndex
                 ].fileList1.push({
-                  // name: file.name,
-                  name: string+''+(_this.unitJson[unitIndex].chapterInfo[0].taskJson[
-                  itemTaskIndex
-                ].chapterData.length+1),
+                  name: file.name,
                   url: data.Location,
                   uid: file.uid,
                 });
@@ -5887,10 +5894,7 @@ export default {
                 _this.unitJson[_this.unitIndex].chapterInfo[0].taskJson[
                   itemTaskIndex
                 ].homeworkList.push({
-                  // name: file.name,
-                  name: string+''+(_this.unitJson[unitIndex].chapterInfo[0].taskJson[
-                  itemTaskIndex
-                ].chapterData.length+1),
+                  name: file.name,
                   url: data.Location,
                   uid: file.uid,
                 });

+ 2 - 1
src/components/pages/scourse.vue

@@ -18,6 +18,7 @@
           <div class="student_search">
             <span>项目筛选</span>
             <el-select v-model="groupA" @change="search">
+              <el-option value="3" label="全部项目"></el-option>
               <el-option value="0" label="我的项目"></el-option>
               <el-option value="1" label="协同项目"></el-option>
               <el-option value="2" label="他人项目"></el-option>
@@ -188,7 +189,7 @@ export default {
       now: "",
       courseDetail: {},
       addCourse: {},
-      groupA: "0",
+      groupA: "3",
       classX: "",
       course: [],
       courseName: "",

+ 1 - 1
src/components/pages/student/addCourse.vue

@@ -2215,7 +2215,7 @@
           <div class="people_top_right">
             <div class="people_search">
               <el-input
-                placeholder="搜索完整的姓名/账号"
+                placeholder="搜索完整的姓名/账号(不含邮箱后缀)"
                 v-model="searchTN"
                 @keyup.enter.native="getTeacher"
               ></el-input>

+ 1 - 1
src/components/pages/studio/addCourse.vue

@@ -2215,7 +2215,7 @@
           <div class="people_top_right">
             <div class="people_search">
               <el-input
-                placeholder="搜索完整的姓名/账号"
+                placeholder="搜索完整的姓名/账号(不含邮箱后缀)"
                 v-model="searchTN"
                 @keyup.enter.native="getTeacher"
               ></el-input>