lsc 2 years ago
parent
commit
f7dd5b0042

+ 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.0f1096fe31598296b2be17cebec6efee.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.b9b15ae4f82d2f85be9d.js></script><script type=text/javascript src=./static/js/app.20e12889afe657c5e343.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.370bb99c7a27f580430749fddf34a140.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.b9b15ae4f82d2f85be9d.js></script><script type=text/javascript src=./static/js/app.f1f0fe7b1cf541e4866e.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.370bb99c7a27f580430749fddf34a140.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.370bb99c7a27f580430749fddf34a140.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.20e12889afe657c5e343.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f1f0fe7b1cf541e4866e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f1f0fe7b1cf541e4866e.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 2 - 2
src/components/student/studyStudent.vue

@@ -717,9 +717,9 @@
           <div class="psBox" v-if="psType == '1'">
             <div><span>创新性(10分)</span><el-input-number class="number" @change="updateRight(psJson,'cxx')" v-model="psJson.cxx" :controls="false" :min="0"
                 :max="10"></el-input-number></div>
-            <div><span>艺术审美(40分)</span><el-input-number class="number" @change="updateRight(psJson,'yssm')" v-model="psJson.yssm" :controls="false" :min="0"
+            <div><span>艺术审美(45分)</span><el-input-number class="number" @change="updateRight(psJson,'yssm')" v-model="psJson.yssm" :controls="false" :min="0"
                 :max="40"></el-input-number></div>
-            <div><span>技术与功能(20分)</span><el-input-number class="number" @change="updateRight(psJson,'jsygn')" v-model="psJson.jsygn" :controls="false" :min="0"
+            <div><span>技术与功能(25分)</span><el-input-number class="number" @change="updateRight(psJson,'jsygn')" v-model="psJson.jsygn" :controls="false" :min="0"
                 :max="20"></el-input-number></div>
             <div><span>科学调研(10分)</span><el-input-number class="number" @change="updateRight(psJson,'kxdy')" v-model="psJson.kxdy" :controls="false" :min="0"
                 :max="10"></el-input-number></div>

+ 39 - 3
src/components/studyStudent.vue

@@ -11,9 +11,9 @@
           background-image: linear-gradient(90deg, #477cd7, #65b9fc);
         "
         v-if="mlDialog == false"
-        @click="(mlDialog = true), getCourseDetail()"
+        @click="(mlDialog = true)"
       >
-        <!-- 批 -->
+        <!-- 批 , getCourseDetail()-->
         <img src="../assets/mlBtn.png" style="width: 25px" alt="" />
       </div>
       <div class="pb_left" v-else>
@@ -508,7 +508,7 @@
                         "
                         v-for="(f, fileIndex) in fileC[taskCount]"
                         :key="fileIndex"
-                        @click="downloadFile(f.url)"
+                        @click="downloadFile2(f)"
                       >
                         <div style="width: calc(100% - 0px)">
                           <div
@@ -12231,6 +12231,42 @@ export default {
           console.error(err);
         });
     },
+    downloadFile2(f) {
+      let url = f.url
+      let _this = this;
+      let _url = "";
+      if (
+        url.indexOf("https://view.officeapps.live.com/op/view.aspx?src=") != -1
+      ) {
+        _url = url.split(
+          "https://view.officeapps.live.com/op/view.aspx?src="
+        )[1];
+      } else {
+        _url = url;
+      }
+      const x = new XMLHttpRequest();
+      x.open("GET", _url, true);
+      x.responseType = "blob";
+      const loading = _this.$loading.service({
+        background: "rgba(255, 255, 255, 0.7)",
+        target: document.body,
+        text: "文件加载中...",
+      });
+      // _this.$message.success("文件下载中...");
+      x.onload = function (e) {
+        loading.close();
+        let content = x.response;
+        let elink = document.createElement("a");
+        elink.download = f.name;
+        elink.style.display = "none";
+        let blob = new Blob([content]);
+        elink.href = URL.createObjectURL(blob);
+        document.body.appendChild(elink);
+        elink.click();
+        document.body.removeChild(elink);
+      };
+      x.send();
+    },
     downloadFile(url) {
       let _this = this;
       let _url = "";

+ 1 - 1
src/components/tools/imgDraw/imgDraw.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="imgDraw">
     <a href="javascript:void(0);" ref="download" download="picture.png" v-show="false"></a>
-    <el-button type="primary" @click="handleShowCanvas">showCanvas</el-button>
+    <el-button type="primary" @click="handleShowCanvas" v-show="false">showCanvas</el-button>
     <el-dialog destroy-on-close :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"
       :visible.sync="show" fullscreen>
       <!-- <p slot="title" class="title">Vue-ImagePainter🎨</p> -->

Some files were not shown because too many files changed in this diff