lsc 1 yıl önce
ebeveyn
işleme
ce630b8068

+ 1 - 1
dist/index.html

@@ -18,7 +18,7 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.bbebb805faf7761cc4db1940156bfa20.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.e8cc91409e07a99fdbe3.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.f8f346e15dd24f18da996f822e902487.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.016881451ac448e81f67.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.bbebb805faf7761cc4db1940156bfa20.css.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.f8f346e15dd24f18da996f822e902487.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.f8f346e15dd24f18da996f822e902487.css.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.016881451ac448e81f67.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.016881451ac448e81f67.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.e8cc91409e07a99fdbe3.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 9 - 7
src/components/courseDetail.vue

@@ -1036,6 +1036,7 @@ export default {
       isFollow: "",
       followC: "",
       dialogVisibleQR: false,
+      checkStage:0
     };
   },
   methods: {
@@ -1063,7 +1064,7 @@ export default {
       if (this.courseDetail.state == 1) {
         if (this.classList.length) {
           this.goTo(
-            "/studyStudent?type=0&courseId=" +
+            "/studyStudent?type="+this.checkStage+"&courseId=" +
               this.id +
               "&userid=" +
               this.userid +
@@ -1082,7 +1083,7 @@ export default {
           );
         } else {
           this.goTo(
-            "/studyStudent?type=0&courseId=" +
+            "/studyStudent?type="+this.checkStage+"&courseId=" +
               this.id +
               "&userid=" +
               this.userid +
@@ -1101,7 +1102,7 @@ export default {
       } else if (this.courseDetail.state == 2) {
         if (this.classList.length) {
           this.goTo(
-            "/studystudentE2?type=0&courseId=" +
+            "/studystudentE2?type="+this.checkStage+"&courseId=" +
               this.id +
               "&userid=" +
               this.userid +
@@ -1120,7 +1121,7 @@ export default {
           );
         } else {
           this.goTo(
-            "/studystudentE2?type=0&courseId=" +
+            "/studystudentE2?type="+this.checkStage+"&courseId=" +
               this.id +
               "&userid=" +
               this.userid +
@@ -1139,7 +1140,7 @@ export default {
       } else if (this.courseDetail.state == 3) {
         if (this.classList.length) {
           this.goTo(
-            "/studystudentE3?type=0&courseId=" +
+            "/studystudentE3?type="+this.checkStage+"&courseId=" +
               this.id +
               "&userid=" +
               this.userid +
@@ -1158,7 +1159,7 @@ export default {
           );
         } else {
           this.goTo(
-            "/studystudentE3?type=0&courseId=" +
+            "/studystudentE3?type="+this.checkStage+"&courseId=" +
               this.id +
               "&userid=" +
               this.userid +
@@ -1184,13 +1185,14 @@ export default {
       }
     },
     goToStudyRate(i) {
+      this.checkStage = i
       if (this.tType == 2) {
         this.addUserRate(i);
       } else {
         if (this.classList.length > 0) {
           this.dialogVisibleSk = true;
         } else {
-          this.addUserRate(0);
+          this.addUserRate(i);
         }
       }
     },

+ 9 - 6
src/components/easy2/studyStudent.vue

@@ -9840,9 +9840,9 @@
         <div
           class="wheel"
           v-if="
-            fullUrl.indexOf(
+            fulltype == 2 && fullUrl.indexOf(
               'https://view.officeapps.live.com/op/view.aspx?src='
-            ) != -1 && fulltype == 2
+            ) != -1
           "
           style="width: 95%; margin: 0 auto"
         >
@@ -17110,18 +17110,19 @@ export default {
       this.fullDialogVisible = true;
       if (t == 6) {
         this.fulltype = 1;
-        this.fullUrl = f;
+        this.fullUrl = JSON.parse(JSON.stringify(f));
       } else if (t == 8) {
         this.fulltype = 2;
         this.fullUrl = f.url;
       } else if (
+        t == 3 && 
         f.url.split(".")[f.url.split(".").length - 1].toLocaleUpperCase() ==
         "PDF"
       ) {
-        this.showType = 3;
+        this.fulltype = 3;
         this.fullUrl = f.url;
-      } else {
-        this.showType = 2;
+      } else if(t == 3) {
+        this.fulltype = 2;
         this.fullUrl =
           "https://view.officeapps.live.com/op/view.aspx?src=" + f.url;
       }
@@ -19217,6 +19218,8 @@ export default {
   color: #fff;
   width: 25px;
   height: 25px;
+  min-width: 25px;
+  min-height: 25px;
   text-align: center;
   line-height: 25px;
   margin-right: 5px;

+ 9 - 728
src/components/easy3/studyStudent.vue

@@ -635,728 +635,6 @@
                 ></div>
               </div>
             </div>
-            <div
-              class="vedioBox"
-              v-if="
-                courseDetail.userid == userid ||
-                (courseDetail.course_teacher &&
-                  courseDetail.course_teacher.indexOf(userid) != -1)
-              "
-            >
-              <div
-                class="queTop"
-                style="
-                  padding: 15px 0 15px 37px;
-                  justify-content: space-between;
-                "
-              >
-                <div class="queTopTitle">工具栏</div>
-                <div class="queTopRight">
-                  <div
-                    class="queTopClose"
-                    v-if="isClose == 0"
-                    @click="isClose = 1"
-                  >
-                    展开
-                    <div class="closeImg">
-                      <img src="../../assets/icon/newIcon/close.png" alt="" />
-                    </div>
-                  </div>
-                  <div
-                    class="queTopClose"
-                    v-if="isClose == 1"
-                    @click="isClose = 0"
-                  >
-                    收缩
-                    <div class="openImg">
-                      <img src="../../assets/icon/newIcon/open.png" alt="" />
-                    </div>
-                  </div>
-                  <el-button
-                    style="margin: 0 30px 0 auto"
-                    type="primary"
-                    size="small"
-                    @click="addToolChoose"
-                    >确定</el-button
-                  >
-                </div>
-              </div>
-              <div
-                class="tool_work_box"
-                :style="isClose == 0 ? 'display:none' : 'display:block'"
-              >
-                <div class="tool_box">
-                  <div class="tool_type_box">
-                    <div class="chooseWho">
-                      <div
-                        :class="toolType == 0 ? 'isChooseActive' : ''"
-                        @click="(toolType = 0), $forceUpdate()"
-                      >
-                        互动类
-                      </div>
-                      <div
-                        :class="toolType == 1 ? 'isChooseActive' : ''"
-                        @click="(toolType = 1), $forceUpdate()"
-                      >
-                        思维类
-                      </div>
-                      <!-- <div
-                        :class="toolType == 6 ? 'isChooseActive' : ''"
-                        @click="(toolType = 6), $forceUpdate()"
-                      >
-                        协作类
-                      </div> -->
-                      <div
-                        :class="toolType == 2 ? 'isChooseActive' : ''"
-                        @click="(toolType = 2), $forceUpdate()"
-                      >
-                        测评类
-                      </div>
-                      <!-- <div
-                        :class="toolType == 7 ? 'isChooseActive' : ''"
-                        @click="(toolType = 7), $forceUpdate()"
-                      >
-                        评价类
-                      </div> -->
-                      <div
-                        :class="toolType == 3 ? 'isChooseActive' : ''"
-                        @click="(toolType = 3), $forceUpdate()"
-                      >
-                        编程类
-                      </div>
-                      <div
-                        :class="toolType == 5 ? 'isChooseActive' : ''"
-                        @click="(toolType = 5), $forceUpdate()"
-                      >
-                        学科类
-                      </div>
-                      <!-- <div :class="toolType == 5 ? 'isChooseActive' : ''
-                        " @click="(toolType = 5), $forceUpdate()">
-                        学科类
-                      </div>
-                      <div :class="toolType == 4 ? 'isChooseActive' : ''
-                        " @click="(toolType = 4), $forceUpdate()">
-                        其他
-                      </div> -->
-                    </div>
-                  </div>
-
-                  <div>
-                    <div class="toolSort" v-if="toolType == 0">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(10)">
-                          <img
-                            src="../../assets/icon/thirdToolList/time.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">倒计时</div>
-                        </div>
-                        <div class="check" @click="addTools2(10)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(10) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(65)">
-                          <img
-                            src="../../assets/icon/firstToolList/pickPeople.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">挑人</div>
-                        </div>
-                        <div class="check" @click="addTools2(65)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(65) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="toolSort" v-if="toolType == 1">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(7)">
-                          <img
-                            src="../../assets/icon/secondToolList/mindNetwork.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">思维网格</div>
-                        </div>
-                        <div class="check" @click="addTools2(7)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(7) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(1)">
-                          <img
-                            src="../../assets/icon/secondToolList/whiteBoard.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">电子白板</div>
-                        </div>
-                        <div class="check" @click="addTools2(1)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(1) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(52)">
-                          <img
-                            src="../../assets/icon/fourthToolList/text.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">文档</div>
-                        </div>
-                        <div class="check" @click="addTools2(52)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(52) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(3)">
-                          <img
-                            src="../../assets/icon/secondToolList/mindMapping.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">思维导图</div>
-                        </div>
-                        <div class="check" @click="addTools2(3)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(3) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(48)">
-                          <img
-                            src="../../assets/icon/fourthToolList/table.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">表格</div>
-                        </div>
-                        <div class="check" @click="addTools2(48)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(48) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="toolSort" v-if="toolType == 6">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(49)">
-                          <img
-                            src="../../assets/icon/fourthToolList/group.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">学生分组</div>
-                        </div>
-                        <div class="check" @click="addTools2(49)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(49) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="toolSort" v-if="toolType == 2">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(16)">
-                          <img
-                            src="../../assets/icon/thirdToolList/work.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">作业提交</div>
-                        </div>
-                        <div class="check" @click="addTools2(16)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(16) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(50)">
-                          <img
-                            src="../../assets/icon/thirdToolList/plwork.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">批量上传</div>
-                        </div>
-                        <div class="check" @click="addTools2(50)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(50) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="toolSort" v-if="toolType == 3">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(18)">
-                          <img
-                            src="../../assets/icon/thirdToolList/trainPlatform.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">训练平台</div>
-                        </div>
-                        <div class="check" @click="addTools2(18)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(18) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(21)">
-                          <img
-                            src="../../assets/icon/fourthToolList/program.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">编程平台</div>
-                        </div>
-                        <div class="check" @click="addTools2(21)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(21) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(22)">
-                          <img
-                            src="../../assets/icon/fourthToolList/AIprogram2.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">AI体验</div>
-                        </div>
-                        <div class="check" @click="addTools2(22)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(22) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(23)">
-                          <img
-                            src="../../assets/icon/fourthToolList/Pythonprogram.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">Python</div>
-                        </div>
-                        <div class="check" @click="addTools2(23)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(23) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(24)">
-                          <img
-                            src="../../assets/icon/fourthToolList/AIprogram.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">AI平台</div>
-                        </div>
-                        <div class="check" @click="addTools2(24)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(24) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(32)">
-                          <img
-                            src="../../assets/icon/thirdToolList/code.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">源码编辑</div>
-                        </div>
-                        <div class="check" @click="addTools2(32)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(32) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(57)">
-                          <img
-                            src="../../assets/icon/fourthToolList/cocopi.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">CocoPi</div>
-                        </div>
-                        <div class="check" @click="addTools2(57)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(57) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(63)">
-                          <img
-                            src="../../assets/icon/fourthToolList/Wood.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">海龟编程</div>
-                        </div>
-                        <div class="check" @click="addTools2(63)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(63) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      
-                    </div>
-                    <div class="toolSort" v-if="toolType == 7">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(40)">
-                          <img
-                            src="../../assets/icon/secondToolList/eval.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">个人评价</div>
-                        </div>
-                        <div class="check" @click="addTools2(40)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(40) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="toolSort" v-if="toolType == 5">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(28)">
-                          <img
-                            src="../../assets/icon/secondToolList/translation.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">翻译</div>
-                        </div>
-                        <div class="check" @click="addTools2(28)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(28) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(31)">
-                          <img
-                            src="../../assets/icon/secondToolList/networkPanel.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">数字画板</div>
-                        </div>
-                        <div class="check" @click="addTools2(31)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(31) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                          <div class="whiteBIcon" @click="addTools2(39)">
-                            <img
-                              src="../../assets/icon/secondToolList/GeoGebra.png"
-                              alt
-                            />
-                            <div style="margin: 5px 0">GeoGebra</div>
-                          </div>
-                          <div class="check" @click="addTools2(39)">
-                            <img
-                              src="../../assets/icon/checkNo.png"
-                              alt
-                              v-if="checktoolArray.indexOf(39) == -1"
-                            />
-                            <div class="checkDiv" v-else>
-                              <img
-                                src="../../assets/icon/checkedIs.png"
-                                alt
-                              /><span>已选择</span>
-                            </div>
-                          </div>
-                        </div>
-                        <div class="tool">
-                          <div class="whiteBIcon" @click="addTools2(66)">
-                            <img
-                              src="../../assets/icon/secondToolList/formulaEdi.png"
-                              alt
-                            />
-                            <div style="margin: 5px 0">公式编辑</div>
-                          </div>
-                          <div class="check" @click="addTools2(66)">
-                            <img
-                              src="../../assets/icon/checkNo.png"
-                              alt
-                              v-if="checktoolArray.indexOf(66) == -1"
-                            />
-                            <div class="checkDiv" v-else>
-                              <img
-                                src="../../assets/icon/checkedIs.png"
-                                alt
-                              /><span>已选择</span>
-                            </div>
-                          </div>
-                        </div>
-                        <div class="tool">
-                          <div class="whiteBIcon" @click="addTools2(67)">
-                            <img
-                              src="../../assets/icon/secondToolList/molStr.png"
-                              alt
-                            />
-                            <div style="margin: 5px 0">分子结构</div>
-                          </div>
-                          <div class="check" @click="addTools2(67)">
-                            <img
-                              src="../../assets/icon/checkNo.png"
-                              alt
-                              v-if="checktoolArray.indexOf(67) == -1"
-                            />
-                            <div class="checkDiv" v-else>
-                              <img
-                                src="../../assets/icon/checkedIs.png"
-                                alt
-                              /><span>已选择</span>
-                            </div>
-                          </div>
-                        </div>
-                        <div class="tool">
-                          <div class="whiteBIcon" @click="addTools2(68)">
-                            <img
-                              src="../../assets/icon/secondToolList/timeAxis.png"
-                              alt
-                            />
-                            <div style="margin: 5px 0">时间轴</div>
-                          </div>
-                          <div class="check" @click="addTools2(68)">
-                            <img
-                              src="../../assets/icon/checkNo.png"
-                              alt
-                              v-if="checktoolArray.indexOf(68) == -1"
-                            />
-                            <div class="checkDiv" v-else>
-                              <img
-                                src="../../assets/icon/checkedIs.png"
-                                alt
-                              /><span>已选择</span>
-                            </div>
-                          </div>
-                        </div>
-                    </div>
-                    <div class="toolSort" v-if="toolType == 4">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(26)">
-                          <img
-                            src="../../assets/icon/thirdToolList/courseDesign.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">课程设计</div>
-                        </div>
-                        <div class="check" @click="addTools2(26)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(26) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(25)">
-                          <img
-                            src="../../assets/icon/thirdToolList/evalua.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">目标管理</div>
-                        </div>
-                        <div class="check" @click="addTools2(25)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(25) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
             <div
               class="vedioBox"
               v-if="
@@ -10540,9 +9818,9 @@
         <div
           class="wheel"
           v-if="
-            fullUrl.indexOf(
+            fulltype == 2 && fullUrl.indexOf(
               'https://view.officeapps.live.com/op/view.aspx?src='
-            ) != -1 && fulltype == 2
+            ) != -1
           "
           style="width: 95%; margin: 0 auto"
         >
@@ -17685,18 +16963,19 @@ export default {
       this.fullDialogVisible = true;
       if (t == 6) {
         this.fulltype = 1;
-        this.fullUrl = f;
+        this.fullUrl = JSON.parse(JSON.stringify(f));
       } else if (t == 8) {
         this.fulltype = 2;
         this.fullUrl = f.url;
       } else if (
+        t == 3 && 
         f.url.split(".")[f.url.split(".").length - 1].toLocaleUpperCase() ==
         "PDF"
       ) {
-        this.showType = 3;
+        this.fulltype = 3;
         this.fullUrl = f.url;
-      } else {
-        this.showType = 2;
+      } else if(t == 3) {
+        this.fulltype = 2;
         this.fullUrl =
           "https://view.officeapps.live.com/op/view.aspx?src=" + f.url;
       }
@@ -19786,6 +19065,8 @@ export default {
   color: #fff;
   width: 25px;
   height: 25px;
+  min-width: 25px;
+  min-height: 25px;
   text-align: center;
   line-height: 25px;
   margin-right: 5px;

+ 7 - 4
src/components/studyStudent.vue

@@ -16344,18 +16344,19 @@ export default {
       this.fullDialogVisible = true;
       if (t == 6) {
         this.fulltype = 1;
-        this.fullUrl = f;
+        this.fullUrl = JSON.parse(JSON.stringify(f));
       } else if (t == 8) {
         this.fulltype = 2;
         this.fullUrl = f.url;
       } else if (
+        t == 3 && 
         f.url.split(".")[f.url.split(".").length - 1].toLocaleUpperCase() ==
         "PDF"
       ) {
-        this.showType = 3;
+        this.fulltype = 3;
         this.fullUrl = f.url;
-      } else {
-        this.showType = 2;
+      } else if(t == 3) {
+        this.fulltype = 2;
         this.fullUrl =
           "https://view.officeapps.live.com/op/view.aspx?src=" + f.url;
       }
@@ -18288,6 +18289,8 @@ export default {
   color: #fff;
   width: 25px;
   height: 25px;
+  min-width: 25px;
+  min-height: 25px;
   text-align: center;
   line-height: 25px;
   margin-right: 5px;

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor