Bläddra i källkod

Merge branch 'beta'

lsc 1 månad sedan
förälder
incheckning
fc14c4bf89

+ 1 - 1
dist/index.html

@@ -27,7 +27,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.d2d735082041099922b0c25b1da9b289.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.43cd677d9291e0373eea.js></script><script type=text/javascript src=./static/js/app.5ff1d20ed1eb129722b3.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.96bc1c02534051bd931b31e3ebc57d15.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.43cd677d9291e0373eea.js></script><script type=text/javascript src=./static/js/app.5763cb10a111b19460c3.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/css/app.96bc1c02534051bd931b31e3ebc57d15.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/css/app.96bc1c02534051bd931b31e3ebc57d15.css.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/app.5763cb10a111b19460c3.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/app.5763cb10a111b19460c3.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 3 - 4
package-lock.json

@@ -21346,9 +21346,8 @@
     },
     "node_modules/turndown": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmmirror.com/turndown/-/turndown-7.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz",
       "integrity": "sha512-eCZGBN4nNNqM9Owkv9HAtWRYfLA4h909E/WGAWWBpmB275ehNhZyk87/Tpvjbp0jjNl9XwCsbe6bm6CqFsgD+A==",
-      "license": "MIT",
       "dependencies": {
         "@mixmark-io/domino": "^2.2.0"
       }
@@ -54862,7 +54861,7 @@
         },
         "turndown": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/turndown/-/turndown-7.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz",
           "integrity": "sha512-eCZGBN4nNNqM9Owkv9HAtWRYfLA4h909E/WGAWWBpmB275ehNhZyk87/Tpvjbp0jjNl9XwCsbe6bm6CqFsgD+A==",
           "requires": {
             "@mixmark-io/domino": "^2.2.0"
@@ -61559,7 +61558,7 @@
     },
     "turndown": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmmirror.com/turndown/-/turndown-7.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz",
       "integrity": "sha512-eCZGBN4nNNqM9Owkv9HAtWRYfLA4h909E/WGAWWBpmB275ehNhZyk87/Tpvjbp0jjNl9XwCsbe6bm6CqFsgD+A==",
       "requires": {
         "@mixmark-io/domino": "^2.2.0"

BIN
src/assets/icon/uploadImg2.png


+ 88 - 54
src/components/easy2/studyStudent.vue

@@ -11823,42 +11823,51 @@
         >
           <div class="marginT">
             <div>上传文件</div>
-            <div
-              class="chapter_add"
-              @click="addImg($event)"
-              v-if="studyJuri[0].cover.length == 0"
-            >
-              <div class="up_photo">
-                <img src="../../assets/icon/uploadImg.png" alt />
+            <div style="display: flex; gap: 10px">
+              <div
+                class="chapter_add"
+                @click="addImg($event)"
+                v-if="studyJuri[0].cover.length == 0"
+              >
+                <div class="up_photo">
+                  <img src="../../assets/icon/uploadImg.png" alt />
+                </div>
+                <!-- <input
+                  type="file"
+                  accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                /> -->
+                <input
+                  type="file"
+                  accept="*"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                />
+                <!-- <input
+                  type="file"
+                  accept="image/*"
+                  capture="camera"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                /> -->
+              </div>
+              <div
+                class="chapter_add"
+                @click="addImg($event)"
+                v-if="studyJuri[0].cover.length == 0"
+              >
+                <div class="up_photo" style="background: rgb(232, 239, 248);width: 120px;height: 120px;display: flex;align-items: center;justify-content: center;">
+                  <img src="../../assets/icon/uploadImg2.png" style="width: 110px; height: 110px" alt />
+                </div>
+                <input
+                  type="file"
+                  accept="image/*"
+                  capture="camera"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                />
               </div>
-              <!-- <input
-                type="file"
-                accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              /> -->
-              <input
-                v-if="isAndroid"
-                type="file"
-                accept="image/*"
-                capture="camera"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              />
-              <input
-                v-else
-                type="file"
-                accept="*"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              />
-              <!-- <input
-                type="file"
-                accept="image/*"
-                capture="camera"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              /> -->
             </div>
             <div
               class="chapter_add"
@@ -14702,26 +14711,51 @@
           学生姓名:<span>{{ sStudent.student }}</span>
         </div>
         <div>上传文件</div>
-        <div
-          class="chapter_add"
-          @click="addImg($event)"
-          v-if="studyJuri[0].cover.length == 0"
-        >
-          <div class="up_photo">
-            <img src="../../assets/uploadImg2.png" alt />
+        <div style="display: flex; gap: 10px">
+          <div
+            class="chapter_add"
+            @click="addImg($event)"
+            v-if="studyJuri[0].cover.length == 0"
+          >
+            <div class="up_photo">
+              <img src="../../assets/icon/uploadImg.png" alt />
+            </div>
+            <!-- <input
+              type="file"
+              accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            /> -->
+            <input
+              type="file"
+              accept="*"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            />
+            <!-- <input
+              type="file"
+              accept="image/*"
+              capture="camera"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            /> -->
+          </div>
+          <div
+            class="chapter_add"
+            @click="addImg($event)"
+            v-if="studyJuri[0].cover.length == 0"
+          >
+            <div class="up_photo" style="background: rgb(232, 239, 248);width: 120px;height: 120px;display: flex;align-items: center;justify-content: center;">
+              <img src="../../assets/icon/uploadImg2.png" style="width: 110px; height: 110px" alt />
+            </div>
+            <input
+              type="file"
+              accept="image/*"
+              capture="camera"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            />
           </div>
-          <!-- <input
-            type="file"
-            accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
-            style="display: none"
-            @change="beforeUpload1($event, 1)"
-          /> -->
-          <input
-            type="file"
-            accept="*"
-            style="display: none"
-            @change="beforeUpload1($event, 1)"
-          />
         </div>
         <!-- capture="camera" -->
         <div

+ 88 - 54
src/components/easy3/studyStudent.vue

@@ -8479,42 +8479,51 @@
         >
           <div class="marginT">
             <div>上传文件</div>
-            <div
-              class="chapter_add"
-              @click="addImg($event)"
-              v-if="studyJuri[0].cover.length == 0"
-            >
-              <div class="up_photo">
-                <img src="../../assets/icon/uploadImg.png" alt />
+            <div style="display: flex; gap: 10px">
+              <div
+                class="chapter_add"
+                @click="addImg($event)"
+                v-if="studyJuri[0].cover.length == 0"
+              >
+                <div class="up_photo">
+                  <img src="../../assets/icon/uploadImg.png" alt />
+                </div>
+                <!-- <input
+                  type="file"
+                  accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                /> -->
+                <input
+                  type="file"
+                  accept="*"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                />
+                <!-- <input
+                  type="file"
+                  accept="image/*"
+                  capture="camera"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                /> -->
+              </div>
+              <div
+                class="chapter_add"
+                @click="addImg($event)"
+                v-if="studyJuri[0].cover.length == 0"
+              >
+                <div class="up_photo" style="background: rgb(232, 239, 248);width: 120px;height: 120px;display: flex;align-items: center;justify-content: center;">
+                  <img src="../../assets/icon/uploadImg2.png" style="width: 110px; height: 110px" alt />
+                </div>
+                <input
+                  type="file"
+                  accept="image/*"
+                  capture="camera"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                />
               </div>
-              <!-- <input
-                type="file"
-                accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              /> -->
-              <input
-                v-if="isAndroid"
-                type="file"
-                accept="image/*"
-                capture="camera"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              />
-              <input
-                v-else
-                type="file"
-                accept="*"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              />
-              <!-- <input
-                type="file"
-                accept="image/*"
-                capture="camera"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              /> -->
             </div>
             <div
               class="chapter_add"
@@ -11285,26 +11294,51 @@
           学生姓名:<span>{{ sStudent.student }}</span>
         </div>
         <div>上传文件</div>
-        <div
-          class="chapter_add"
-          @click="addImg($event)"
-          v-if="studyJuri[0].cover.length == 0"
-        >
-          <div class="up_photo">
-            <img src="../../assets/uploadImg2.png" alt />
+        <div style="display: flex; gap: 10px">
+          <div
+            class="chapter_add"
+            @click="addImg($event)"
+            v-if="studyJuri[0].cover.length == 0"
+          >
+            <div class="up_photo">
+              <img src="../../assets/icon/uploadImg.png" alt />
+            </div>
+            <!-- <input
+              type="file"
+              accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            /> -->
+            <input
+              type="file"
+              accept="*"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            />
+            <!-- <input
+              type="file"
+              accept="image/*"
+              capture="camera"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            /> -->
+          </div>
+          <div
+            class="chapter_add"
+            @click="addImg($event)"
+            v-if="studyJuri[0].cover.length == 0"
+          >
+            <div class="up_photo" style="background: rgb(232, 239, 248);width: 120px;height: 120px;display: flex;align-items: center;justify-content: center;">
+              <img src="../../assets/icon/uploadImg2.png" style="width: 110px; height: 110px" alt />
+            </div>
+            <input
+              type="file"
+              accept="image/*"
+              capture="camera"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            />
           </div>
-          <!-- <input
-            type="file"
-            accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
-            style="display: none"
-            @change="beforeUpload1($event, 1)"
-          /> -->
-          <input
-            type="file"
-            accept="*"
-            style="display: none"
-            @change="beforeUpload1($event, 1)"
-          />
         </div>
         <!-- capture="camera" -->
         <div

+ 88 - 54
src/components/studyStudent.vue

@@ -8438,42 +8438,51 @@
         >
           <div class="marginT">
             <div>上传文件</div>
-            <div
-              class="chapter_add"
-              @click="addImg($event)"
-              v-if="studyJuri[0].cover.length == 0"
-            >
-              <div class="up_photo">
-                <img src="../assets/icon/uploadImg.png" alt />
+            <div style="display: flex; gap: 10px">
+              <div
+                class="chapter_add"
+                @click="addImg($event)"
+                v-if="studyJuri[0].cover.length == 0"
+              >
+                <div class="up_photo">
+                  <img src="../assets/icon/uploadImg.png" alt />
+                </div>
+                <!-- <input
+                  type="file"
+                  accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                /> -->
+                <input
+                  type="file"
+                  accept="*"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                />
+                <!-- <input
+                  type="file"
+                  accept="image/*"
+                  capture="camera"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                /> -->
+              </div>
+              <div
+                class="chapter_add"
+                @click="addImg($event)"
+                v-if="studyJuri[0].cover.length == 0"
+              >
+                <div class="up_photo" style="background: rgb(232, 239, 248);width: 120px;height: 120px;display: flex;align-items: center;justify-content: center;">
+                  <img src="../assets/icon/uploadImg2.png" style="width: 110px; height: 110px" alt />
+                </div>
+                <input
+                  type="file"
+                  accept="image/*"
+                  capture="camera"
+                  style="display: none"
+                  @change="beforeUpload1($event, 1)"
+                />
               </div>
-              <!-- <input
-                type="file"
-                accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              /> -->
-              <input
-                v-if="isAndroid"
-                type="file"
-                accept="image/*"
-                capture="camera"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              />
-              <input
-                v-else
-                type="file"
-                accept="*"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              />
-              <!-- <input
-                type="file"
-                accept="image/*"
-                capture="camera"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              /> -->
             </div>
             <div
               class="chapter_add"
@@ -11227,26 +11236,51 @@
           学生姓名:<span>{{ sStudent.student }}</span>
         </div>
         <div>上传文件</div>
-        <div
-          class="chapter_add"
-          @click="addImg($event)"
-          v-if="studyJuri[0].cover.length == 0"
-        >
-          <div class="up_photo">
-            <img src="../assets/uploadImg2.png" alt />
+        <div style="display: flex; gap: 10px">
+          <div
+            class="chapter_add"
+            @click="addImg($event)"
+            v-if="studyJuri[0].cover.length == 0"
+          >
+            <div class="up_photo">
+              <img src="../assets/icon/uploadImg.png" alt />
+            </div>
+            <!-- <input
+              type="file"
+              accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            /> -->
+            <input
+              type="file"
+              accept="*"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            />
+            <!-- <input
+              type="file"
+              accept="image/*"
+              capture="camera"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            /> -->
+          </div>
+          <div
+            class="chapter_add"
+            @click="addImg($event)"
+            v-if="studyJuri[0].cover.length == 0"
+          >
+            <div class="up_photo" style="background: rgb(232, 239, 248);width: 120px;height: 120px;display: flex;align-items: center;justify-content: center;">
+              <img src="../assets/icon/uploadImg2.png" style="width: 110px; height: 110px" alt />
+            </div>
+            <input
+              type="file"
+              accept="image/*"
+              capture="camera"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            />
           </div>
-          <!-- <input
-            type="file"
-            accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
-            style="display: none"
-            @change="beforeUpload1($event, 1)"
-          /> -->
-          <input
-            type="file"
-            accept="*"
-            style="display: none"
-            @change="beforeUpload1($event, 1)"
-          />
         </div>
         <!-- capture="camera" -->
         <div

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

@@ -11656,7 +11656,8 @@
         >
           <div class="marginT">
             <div>上传文件</div>
-            <div
+            <div style="display: flex; gap: 10px">
+              <div
               class="chapter_add"
               @click="addImg($event)"
               v-if="studyJuri[0].cover.length == 0"
@@ -11671,15 +11672,6 @@
                 @change="beforeUpload1($event, 1)"
               /> -->
               <input
-                v-if="isAndroid"
-                type="file"
-                accept="image/*"
-                capture="camera"
-                style="display: none"
-                @change="beforeUpload1($event, 1)"
-              />
-              <input
-                v-else
                 type="file"
                 accept="*"
                 style="display: none"
@@ -11693,6 +11685,23 @@
                 @change="beforeUpload1($event, 1)"
               /> -->
             </div>
+            <div
+              class="chapter_add"
+              @click="addImg($event)"
+              v-if="studyJuri[0].cover.length == 0"
+            >
+              <div class="up_photo" style="background: rgb(232, 239, 248);width: 120px;height: 120px;display: flex;align-items: center;justify-content: center;">
+                <img src="../../assets/icon/uploadImg2.png" style="width: 110px; height: 110px" alt />
+              </div>
+              <input
+                type="file"
+                accept="image/*"
+                capture="camera"
+                style="display: none"
+                @change="beforeUpload1($event, 1)"
+              />
+            </div>
+            </div>
             <div
               class="chapter_add"
               style="
@@ -14466,26 +14475,51 @@
           学生姓名:<span>{{ sStudent.student }}</span>
         </div>
         <div>上传文件</div>
-        <div
-          class="chapter_add"
-          @click="addImg($event)"
-          v-if="studyJuri[0].cover.length == 0"
-        >
-          <div class="up_photo">
-            <img src="../../assets/uploadImg2.png" alt />
+        <div style="display: flex; gap: 10px">
+          <div
+            class="chapter_add"
+            @click="addImg($event)"
+            v-if="studyJuri[0].cover.length == 0"
+          >
+            <div class="up_photo">
+              <img src="../../assets/icon/uploadImg.png" alt />
+            </div>
+            <!-- <input
+              type="file"
+              accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            /> -->
+            <input
+              type="file"
+              accept="*"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            />
+            <!-- <input
+              type="file"
+              accept="image/*"
+              capture="camera"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            /> -->
+          </div>
+          <div
+            class="chapter_add"
+            @click="addImg($event)"
+            v-if="studyJuri[0].cover.length == 0"
+          >
+            <div class="up_photo" style="background: rgb(232, 239, 248);width: 120px;height: 120px;display: flex;align-items: center;justify-content: center;">
+              <img src="../../assets/icon/uploadImg2.png" style="width: 110px; height: 110px" alt />
+            </div>
+            <input
+              type="file"
+              accept="image/*"
+              capture="camera"
+              style="display: none"
+              @change="beforeUpload1($event, 1)"
+            />
           </div>
-          <!-- <input
-            type="file"
-            accept="video/mp4, video/quicktime, video/x-msvideo,application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
-            style="display: none"
-            @change="beforeUpload1($event, 1)"
-          /> -->
-          <input
-            type="file"
-            accept="*"
-            style="display: none"
-            @change="beforeUpload1($event, 1)"
-          />
         </div>
         <!-- capture="camera" -->
         <div

Vissa filer visades inte eftersom för många filer har ändrats