zengyicheng пре 3 година
родитељ
комит
38e42213b9

+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.4addec4151f9ef309cc04452c2507298.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.17ca74dd45d81e40ec58.js></script><script type=text/javascript src=./static/js/app.1d374865021205543c0d.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.4bbe3a6119f78109aa722f2ff5850610.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.17ca74dd45d81e40ec58.js></script><script type=text/javascript src=./static/js/app.f9c9e373f8b39f7654e1.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/css/app.4bbe3a6119f78109aa722f2ff5850610.css


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/css/app.4bbe3a6119f78109aa722f2ff5850610.css.map


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/app.1d374865021205543c0d.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/app.f9c9e373f8b39f7654e1.js


+ 18 - 3
src/components/liveProjectDetail.vue

@@ -546,13 +546,27 @@
                 </div> -->
                 <div class="nextStepOne" @click="isBlock = 4">返回</div>
               </div>
-              <div
+              <!-- <div
                 class="nextStepOne"
                 style="float: right"
                 @click="getImg"
                 v-if="toolCount == 1 || toolCount == 3 || toolCount == 7"
               >
                 截图
+              </div> -->
+              <div
+                class="nextStepOne"
+                style="float: right"
+                @click="addImg($event)"
+                v-if="toolCount == 1 || toolCount == 3 || toolCount == 7"
+              >
+                上传文件
+                <input
+                  type="file"
+                  accept="image/png,image/gif,image/jpeg"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                />
               </div>
             </div>
             <!-- <div v-if="toolCount == 0" style="height: 100%">
@@ -1065,6 +1079,7 @@ export default {
                   uid: file.uid,
                 });
                 _this.imgChange(null, null, type);
+                _this.addSWork();
               } else if (type == 2) {
                 _this.upload[0].upVedio.push({
                   name: file.name,
@@ -1168,8 +1183,8 @@ export default {
       let params = {
         uid: this.userid,
         cid: this.cid,
-        // upload: JSON.stringify(this.upload),
-        upload: JSON.stringify(this.imgFileUp),
+        upload: JSON.stringify(this.upload),
+        // upload: JSON.stringify(this.imgFileUp),
       };
       this.ajax
         .get(this.$store.state.api + "insertSWork", params)

+ 42 - 38
src/components/liveRoom.vue

@@ -15,18 +15,30 @@
               />
             </div>
             <div class="right_box">
-              <div class="right_box_title">{{ studentMessage.name ? studentMessage.name : "暂无名称" }}</div>
+              <div class="right_box_title">
+                {{ studentMessage.name ? studentMessage.name : "暂无名称" }}
+              </div>
               <div class="people">
                 <div>
-                  <span>班级:</span><span>{{ studentMessage.cname ? studentMessage.cname : "暂无班级" }}</span>
+                  <span>班级:</span
+                  ><span>{{
+                    studentMessage.cname ? studentMessage.cname : "暂无班级"
+                  }}</span>
                 </div>
                 <div style="margin-left: 50px">
-                  <span>所属学校:</span><span>{{ studentMessage.sname ? studentMessage.sname : "暂无学校" }}</span>
+                  <span>所属学校:</span
+                  ><span>{{
+                    studentMessage.sname ? studentMessage.sname : "暂无学校"
+                  }}</span>
                 </div>
               </div>
               <div>
                 <span>手机号码:</span
-                ><span>{{ studentMessage.phonenumber ? studentMessage.phonenumber : "暂无手机号" }}</span>
+                ><span>{{
+                  studentMessage.phonenumber
+                    ? studentMessage.phonenumber
+                    : "暂无手机号"
+                }}</span>
               </div>
             </div>
           </div>
@@ -46,7 +58,9 @@
                     '/liveProjectDetail?courseId=' +
                       item.courseid +
                       '&userid=' +
-                      userid + '&oid=' + oid
+                      userid +
+                      '&oid=' +
+                      oid
                   )
                 "
               >
@@ -58,28 +72,13 @@
                   "
                   alt=""
                 /> -->
-				<img
-                  :src="
-                    mpj
-                  "
-                  alt=""
-                />
+                <img :src="mpj" alt="" />
               </div>
               <div class="projct_nav">
-                <div
-                  style="font-size: 18px"
-                  @click="
-                    goTo(
-                      '/courseDetail?courseId=' +
-                        item.courseid +
-                        '&userid=' +
-                        userid + '&oid=' + oid
-                    )
-                  "
-                >
+                <div style="font-size: 18px">
                   {{ item.title }}
                 </div>
-				<div style="color: #2FDB88">
+                <div style="color: #2fdb88">
                   <!-- 共{{ JSON.parse(item.chapters).length }}讲 -->
                   共4讲
                 </div>
@@ -101,13 +100,19 @@ export default {
     return {
       myCourse: [
         //   {cover:[],title:"认识种子的起源",chapters:[],createTime:new Date().getTime()},
-          {cover:[],courseid:"9a4e8dbe-132e-438e-97db-b07eb01fa04c",title:"湖心亭看雪可可乐博模拟展示课件",chapters:[],createTime:new Date().getTime()},
+        {
+          cover: [],
+          courseid: "9a4e8dbe-132e-438e-97db-b07eb01fa04c",
+          title: "湖心亭看雪可可乐博模拟展示课件",
+          chapters: [],
+          createTime: new Date().getTime(),
+        },
       ],
       studentMessage: [],
       tx: require("../assets/avatar.png"),
       mpj: require("../assets/icon/pptImg.png"),
       userid: this.$route.query.userid,
-      oid:this.$route.query.oid,
+      oid: this.$route.query.oid,
     };
   },
   methods: {
@@ -126,9 +131,8 @@ export default {
         .catch((err) => {
           this.isLoading = false;
           console.error(err);
-        }); 
+        });
     },
-    
   },
   created() {
     this.selectSDetail();
@@ -188,18 +192,18 @@ export default {
   width: 100%;
 }
 .project_box {
-      display: flex;
-    width: 100%;
-    flex-direction: row;
-    flex-wrap: wrap;
+  display: flex;
+  width: 100%;
+  flex-direction: row;
+  flex-wrap: wrap;
 }
 .three_box_inthis {
   display: flex;
-    width: 21%;
-    flex-direction: column;
-    align-items: flex-start;
-    border: 1px solid #ccc;
-    margin: 15px;
+  width: 21%;
+  flex-direction: column;
+  align-items: flex-start;
+  border: 1px solid #ccc;
+  margin: 15px;
 }
 .projct_nav {
   margin-left: 5px;
@@ -213,8 +217,8 @@ export default {
   cursor: pointer;
 }
 
-.projct_nav > div{
-	margin-bottom: 5px;
+.projct_nav > div {
+  margin-bottom: 5px;
 }
 
 .myProject {

Неке датотеке нису приказане због велике количине промена