Browse Source

修改图文不能全屏

11wqe1 2 months ago
parent
commit
15d5d72c78

+ 29 - 28
src/components/easy2/studyStudent.vue

@@ -13884,7 +13884,34 @@
         </el-button>
         <div
           class="wheel"
-          v-if="
+          v-if="fulltype == 1"
+          style="
+            box-shadow: 0 0 6px 1px #f2f2f2;
+						height:100%;
+            width: 100%;
+            background: #f1f1f1;
+          "
+        >
+          <div class="title" style="width: 100%; box-sizing: border-box">
+            查看文档
+          </div>
+          <el-form class="textBox" style="height: 90%">
+            <el-form-item class="textTitle">
+              <div style="font-size: 22px">
+                {{ fullUrl.name }}
+              </div>
+            </el-form-item>
+            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
+            <div
+              v-html="fullUrl.url"
+              class="textContent"
+              style="height: auto"
+            ></div>
+          </el-form>
+        </div>
+        <div
+          class="wheel"
+          v-else-if="
             (fulltype == 2 || fulltype == 4) &&
               fullUrl.indexOf(
                 'https://view.officeapps.live.com/op/view.aspx?src='
@@ -13922,33 +13949,7 @@
           sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
           :src="fullUrl"
         ></iframe>
-        <div
-          class="wheel"
-          v-if="fulltype == 1"
-          style="
-            box-shadow: 0 0 6px 1px #f2f2f2;
-						height:100%;
-            width: 100%;
-            background: #f1f1f1;
-          "
-        >
-          <div class="title" style="width: 100%; box-sizing: border-box">
-            查看文档
-          </div>
-          <el-form class="textBox" style="height: 90%">
-            <el-form-item class="textTitle">
-              <div style="font-size: 22px">
-                {{ fullUrl.name }}
-              </div>
-            </el-form-item>
-            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
-            <div
-              v-html="fullUrl.url"
-              class="textContent"
-              style="height: auto"
-            ></div>
-          </el-form>
-        </div>
+ 
       </div>
       <!-- <div slot="footer">
         <el-button @click="fullDialogVisible = false">关 闭</el-button>

+ 32 - 28
src/components/easy3/studyStudent.vue

@@ -10511,9 +10511,36 @@
         >
           退出全屏
         </el-button>
+         <div
+          class="wheel"
+          v-if="fulltype == 1"
+          style="
+            box-shadow: 0 0 6px 1px #f2f2f2;
+						height:100%;
+            width: 100%;
+            background: #f1f1f1;
+          "
+        >
+          <div class="title" style="width: 100%; box-sizing: border-box">
+            查看文档
+          </div>
+          <el-form class="textBox" style="height: 90%">
+            <el-form-item class="textTitle">
+              <div style="font-size: 22px">
+                {{ fullUrl.name }}
+              </div>
+            </el-form-item>
+            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
+            <div
+              v-html="fullUrl.url"
+              class="textContent"
+              style="height: auto"
+            ></div>
+          </el-form>
+        </div>
         <div
           class="wheel"
-          v-if="
+          v-else-if="
             (fulltype == 2 || fulltype == 4) &&
             fullUrl.indexOf(
               'https://view.officeapps.live.com/op/view.aspx?src='
@@ -10551,33 +10578,7 @@
           sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
           :src="fullUrl"
         ></iframe>
-        <div
-          class="wheel"
-          v-if="fulltype == 1"
-          style="
-            box-shadow: 0 0 6px 1px #f2f2f2;
-						height:100%;
-            width: 100%;
-            background: #f1f1f1;
-          "
-        >
-          <div class="title" style="width: 100%; box-sizing: border-box">
-            查看文档
-          </div>
-          <el-form class="textBox" style="height: 90%">
-            <el-form-item class="textTitle">
-              <div style="font-size: 22px">
-                {{ fullUrl.name }}
-              </div>
-            </el-form-item>
-            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
-            <div
-              v-html="fullUrl.url"
-              class="textContent"
-              style="height: auto"
-            ></div>
-          </el-form>
-        </div>
+       
       </div>
       <!-- <div slot="footer">
         <el-button @click="fullDialogVisible = false">关 闭</el-button>
@@ -19905,7 +19906,10 @@ export default {
       this.fullDialogVisible = true;
       if (t == 6) {
         this.fulltype = 1;
+        console.log('checkFileFull1',f);
+        
         this.fullUrl = JSON.parse(JSON.stringify(f));
+        
       } else if (t == 8) {
         this.fulltype = 2;
         this.fullUrl = f.url;

+ 29 - 28
src/components/studyStudent.vue

@@ -10449,7 +10449,34 @@
         </el-button>
         <div
           class="wheel"
-          v-if="
+          v-if="fulltype == 1"
+          style="
+            box-shadow: 0 0 6px 1px #f2f2f2;
+            width: 100%;
+						height:100%;
+            background: #f1f1f1;
+          "
+        >
+          <div class="title" style="width: 100%; box-sizing: border-box">
+            查看文档
+          </div>
+          <el-form class="textBox" style="height: 90%">
+            <el-form-item class="textTitle">
+              <div style="font-size: 22px">
+                {{ fullUrl.name }}
+              </div>
+            </el-form-item>
+            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
+            <div
+              v-html="fullUrl.url"
+              class="textContent"
+              style="height: auto"
+            ></div>
+          </el-form>
+        </div>
+        <div
+          class="wheel"
+          v-else-if="
             (fulltype == 2 || fulltype == 4) &&
             fullUrl.indexOf(
               'https://view.officeapps.live.com/op/view.aspx?src='
@@ -10494,33 +10521,7 @@
           sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
           :src="fullUrl"
         ></iframe>
-        <div
-          class="wheel"
-          v-if="fulltype == 1"
-          style="
-            box-shadow: 0 0 6px 1px #f2f2f2;
-            width: 100%;
-						height:100%;
-            background: #f1f1f1;
-          "
-        >
-          <div class="title" style="width: 100%; box-sizing: border-box">
-            查看文档
-          </div>
-          <el-form class="textBox" style="height: 90%">
-            <el-form-item class="textTitle">
-              <div style="font-size: 22px">
-                {{ fullUrl.name }}
-              </div>
-            </el-form-item>
-            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
-            <div
-              v-html="fullUrl.url"
-              class="textContent"
-              style="height: auto"
-            ></div>
-          </el-form>
-        </div>
+
       </div>
       <!-- <div slot="footer">
         <el-button @click="fullDialogVisible = false">关 闭</el-button>

+ 29 - 28
src/components/studySutdentClass/studyStudent.vue

@@ -13692,9 +13692,36 @@
         >
           退出全屏
         </el-button>
+                <div
+          class="wheel"
+          v-if="fulltype == 1"
+          style="
+            box-shadow: 0 0 6px 1px #f2f2f2;
+						height:100%;
+            width: 100%;
+            background: #f1f1f1;
+          "
+        >
+          <div class="title" style="width: 100%; box-sizing: border-box">
+            查看文档
+          </div>
+          <el-form class="textBox" style="height: 90%">
+            <el-form-item class="textTitle">
+              <div style="font-size: 22px">
+                {{ fullUrl.name }}
+              </div>
+            </el-form-item>
+            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
+            <div
+              v-html="fullUrl.url"
+              class="textContent"
+              style="height: auto"
+            ></div>
+          </el-form>
+        </div>
         <div
           class="wheel"
-          v-if="
+          v-else-if="
             (fulltype == 2 || fulltype == 4) &&
             fullUrl.indexOf(
               'https://view.officeapps.live.com/op/view.aspx?src='
@@ -13732,33 +13759,7 @@
           sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
           :src="fullUrl"
         ></iframe>
-        <div
-          class="wheel"
-          v-if="fulltype == 1"
-          style="
-            box-shadow: 0 0 6px 1px #f2f2f2;
-						height:100%;
-            width: 100%;
-            background: #f1f1f1;
-          "
-        >
-          <div class="title" style="width: 100%; box-sizing: border-box">
-            查看文档
-          </div>
-          <el-form class="textBox" style="height: 90%">
-            <el-form-item class="textTitle">
-              <div style="font-size: 22px">
-                {{ fullUrl.name }}
-              </div>
-            </el-form-item>
-            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
-            <div
-              v-html="fullUrl.url"
-              class="textContent"
-              style="height: auto"
-            ></div>
-          </el-form>
-        </div>
+
       </div>
       <!-- <div slot="footer">
         <el-button @click="fullDialogVisible = false">关 闭</el-button>