lsc 2 years ago
parent
commit
cfb4e489c8

+ 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.74b553ef86e2710bbc65cb1029fe5bf4.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.4fa3e29f3f8ca6653335.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.88775902e0af38a076b4714cd0540c61.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.6cccb15272a968ec42c2.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.74b553ef86e2710bbc65cb1029fe5bf4.css.map


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


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


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


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


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


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


BIN
src/assets/icon/fourthToolList/car.png


BIN
src/assets/icon/fourthToolList/deepLearning.png


BIN
src/assets/icon/fourthToolList/lineSearch.png


+ 115 - 21
src/components/student/studyStudent.vue

@@ -612,7 +612,7 @@
   downloadFile(tool.toolData[tool.sourceIndex].src)
 ">文件下载</el-button>
                       <el-button v-if="tool.toolData[tool.sourceIndex].type == 8" type="primary"
-                        @click="openLineS(tool.toolData[tool.sourceIndex].src)">打开链接
+                        @click="openLine(tool.toolData[tool.sourceIndex].src)">打开链接
                       </el-button>
                       <el-button v-if="tool.toolData[tool.sourceIndex].type == 6" type="primary" @click="
                         checkFileFull(
@@ -707,20 +707,61 @@
       </div>
       <div class="pzBox">
         <div class="addPzButton">
-          <div class="psBox">
-            <div><span>创新性(30分)</span><el-input-number class="number" @change="updateRight('cxx')" v-model="psJson.cxx" :controls="false" :min="0"
-                :max="30"></el-input-number></div>
-            <div><span>设计与艺术审美(25分)</span><el-input-number class="number" @change="updateRight('sjyyssm')" v-model="psJson.sjyyssm" :controls="false" :min="0"
-                :max="25"></el-input-number></div>
-            <div><span>技术与功能(25分)</span><el-input-number class="number" @change="updateRight('jsygn')" v-model="psJson.jsygn" :controls="false" :min="0"
+          <div class="psTypeBox">
+            <!-- 1 造型结构 2 开源硬件 3 软件设计 4 总分 -->
+            <span :class="{active:psType==1}" @click="psType = 1">造型结构</span>
+            <span :class="{active:psType==2}" @click="psType = 2">开源硬件</span>
+            <span :class="{active:psType==3}" @click="psType = 3">软件设计</span>
+            <span :class="{active:psType==4}" @click="psType = 4">总分</span>
+          </div>
+          <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"
+                :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"
+                :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>
+            <div><span>作品完成度(10分)</span><el-input-number class="number" @change="updateRight(psJson,'zpwcd')" v-model="psJson.zpwcd" :controls="false"
+                :min="0" :max="10"></el-input-number></div>
+            <div style="border-top: 1px solid #eee;padding-top: 10px;"><span>总分</span><span class="number"
+                style="font-size: 35px;color: #4b79ce;">{{ psJson.cxx + psJson.yssm + psJson.jsygn + psJson.kxdy +
+                  psJson.zpwcd }}</span></div>
+          </div>
+          <div class="psBox" v-if="psType == '2'">
+            <div><span>创新性(25分)</span><el-input-number class="number" @change="updateRight(psJson2,'cxx')" v-model="psJson2.cxx" :controls="false" :min="0"
                 :max="25"></el-input-number></div>
-            <div><span>用户体验(10分)</span><el-input-number class="number" @change="updateRight('yhty')" v-model="psJson.yhty" :controls="false" :min="0"
+            <div><span>艺术审美(20分)</span><el-input-number class="number" @change="updateRight(psJson2,'yssm')" v-model="psJson2.yssm" :controls="false" :min="0"
+                :max="20"></el-input-number></div>
+            <div><span>技术与功能(15分)</span><el-input-number class="number" @change="updateRight(psJson2,'jsygn')" v-model="psJson2.jsygn" :controls="false" :min="0"
+                :max="15"></el-input-number></div>
+            <div><span>科学调度(15分)</span><el-input-number class="number" @change="updateRight(psJson2,'kxdd')" v-model="psJson2.kxdd" :controls="false" :min="0"
+                :max="15"></el-input-number></div>
+            <div><span>作品完成度(25分)</span><el-input-number class="number" @change="updateRight(psJson2,'zpwcd')" v-model="psJson2.zpwcd" :controls="false"
+                :min="0" :max="25"></el-input-number></div>
+            <div style="border-top: 1px solid #eee;padding-top: 10px;"><span>总分</span><span class="number"
+                style="font-size: 35px;color: #4b79ce;">{{ psJson2.cxx + psJson2.yssm + psJson2.jsygn + psJson2.kxdd +
+                  psJson2.zpwcd }}</span></div>
+          </div>
+          <div class="psBox" v-if="psType == '3'">
+            <div><span>创新性(30分)</span><el-input-number class="number" @change="updateRight(psJson3,'cxx')" v-model="psJson3.cxx" :controls="false" :min="0"
+                :max="30"></el-input-number></div>
+            <div><span>艺术审美(20分)</span><el-input-number class="number" @change="updateRight(psJson3,'yssm')" v-model="psJson3.yssm" :controls="false" :min="0"
+                :max="20"></el-input-number></div>
+            <div><span>技术与功能(30分)</span><el-input-number class="number" @change="updateRight(psJson3,'jsygn')" v-model="psJson3.jsygn" :controls="false" :min="0"
+                :max="30"></el-input-number></div>
+            <div><span>科学调度(10分)</span><el-input-number class="number" @change="updateRight(psJson3,'kxdd')" v-model="psJson3.kxdd" :controls="false" :min="0"
                 :max="10"></el-input-number></div>
-            <div><span>作品完成度与规范性(10分)</span><el-input-number class="number" @change="updateRight('zpwcdygfx')" v-model="psJson.zpwcdygfx" :controls="false"
+            <div><span>作品完成度(10分)</span><el-input-number class="number" @change="updateRight(psJson3,'zpwcd')" v-model="psJson3.zpwcd" :controls="false"
                 :min="0" :max="10"></el-input-number></div>
             <div style="border-top: 1px solid #eee;padding-top: 10px;"><span>总分</span><span class="number"
-                style="font-size: 35px;color: #4b79ce;">{{ psJson.cxx + psJson.sjyyssm + psJson.jsygn + psJson.yhty +
-                  psJson.zpwcdygfx }}</span></div>
+                style="font-size: 35px;color: #4b79ce;">{{ psJson3.cxx + psJson3.yssm + psJson3.jsygn + psJson3.kxdd +
+                  psJson3.zpwcd }}</span></div>
+          </div>
+          <div class="psBox" v-if="psType == '4'">
+            <div><span>总分(100分)</span><el-input-number class="number" @change="updateRight(psJson4,'z')" v-model="psJson4.z" :controls="false" :min="0"
+                :max="100"></el-input-number></div>
           </div>
           <div class="addPz" @click="addPs()">
             保存评分
@@ -1153,12 +1194,30 @@ export default {
       chapterIndex: 0,
       courseUserid: "",
       checkboxList3: [],
+      psType:1,
       psJson: {
         cxx: 0,
-        sjyyssm: 0,
+        yssm: 0,
         jsygn: 0,
-        yhty: 0,
-        zpwcdygfx: 0,
+        kxdy: 0,
+        zpwcd: 0,
+      },
+      psJson2: {
+        cxx: 0,
+        yssm: 0,
+        jsygn: 0,
+        kxdd: 0,
+        zpwcd: 0,
+      },
+      psJson3: {
+        cxx: 0,
+        yssm: 0,
+        jsygn: 0,
+        kxdd: 0,
+        zpwcd: 0,
+      },
+      psJson4: {
+        z: 0,
       }
     };
   },
@@ -1326,7 +1385,17 @@ export default {
         .get(this.$store.state.api + "getReview", params)
         .then((res) => {
           if (res.data[0].length) {
-            this.psJson = JSON.parse(res.data[0][0].score)
+            this.psType = res.data[0][0].type
+            if(this.psType == '1'){
+              this.psJson = JSON.parse(res.data[0][0].score)
+            }else if(this.psType == '2'){
+              this.psJson2 = JSON.parse(res.data[0][0].score)
+            }else if(this.psType == '3'){
+              this.psJson3 = JSON.parse(res.data[0][0].score)
+            }else if(this.psType == '4'){
+              this.psJson4 = JSON.parse(res.data[0][0].score)
+            }
+            // this.psJson = JSON.parse(res.data[0][0].score)
           }
         })
         .catch((err) => {
@@ -1334,10 +1403,21 @@ export default {
         });
     },
     addPs() {
+      let psJson = {}
+      if(this.psType == '1'){
+        psJson =this.psJson
+      }else if(this.psType == '2'){
+        psJson =this.psJson2
+      }else if(this.psType == '3'){
+        psJson =this.psJson3
+      }else if(this.psType == '4'){
+        psJson =this.psJson4
+      }
       let params = [{
         uid: this.userid,
         cid: this.id,
-        psJson: JSON.stringify(this.psJson),
+        psJson: JSON.stringify(psJson),
+        type: this.psType,
       }];
       this.ajax
         .post(this.$store.state.api + "reviewCourse", params)
@@ -2593,12 +2673,12 @@ export default {
       this.videoDetail.sources[0].src = w;
       this.videoVisible = true;
     },
-    updateRight(val){
-      if(!this.psJson[val]){
-        this.psJson[val] = "0"
+    updateRight(psJson,val){
+      if(!psJson[val]){
+        psJson[val] = "0"
       }
       this.$forceUpdate();
-      console.log(this.psJson);
+      console.log(psJson);
     }
   },
   directives: {
@@ -5062,7 +5142,21 @@ export default {
   margin: 4px 0 0 3px;
   color: #afafaf;
 }
-
+.psTypeBox{
+  display: flex;
+  margin-top: 20px;
+  padding: 0px 0 0 30px;
+}
+.psTypeBox > span{
+  cursor: pointer;
+}
+.psTypeBox > span + span{
+  margin-left: 10px;
+}
+.psTypeBox .active{
+  color: #3e88f4;
+  border-bottom: 2px solid #2f80f3;
+}
 .psBox {
   margin-bottom: 50px;
 }

+ 30 - 0
src/components/studyStudent.vue

@@ -1028,6 +1028,30 @@
                             />
                             <div style="margin: 5px 0">CocoPi</div>
                           </div>
+                          <div v-if="tooC == 58">
+                            <img
+                              @click="addTools(tooC, toolIndex, taskCount)"
+                              src="../assets/icon/fourthToolList/car.png"
+                              alt
+                            />
+                            <div style="margin: 5px 0">学科工具</div>
+                          </div>
+                          <div v-if="tooC == 59">
+                            <img
+                              @click="addTools(tooC, toolIndex, taskCount)"
+                              src="../assets/icon/fourthToolList/lineSearch.png"
+                              alt
+                            />
+                            <div style="margin: 5px 0">路径搜索</div>
+                          </div>
+                          <div v-if="tooC == 60">
+                            <img
+                              @click="addTools(tooC, toolIndex, taskCount)"
+                              src="../assets/icon/fourthToolList/deepLearning.png"
+                              alt
+                            />
+                            <div style="margin: 5px 0">深度学习</div>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -11614,6 +11638,12 @@ export default {
         window.parent.postMessage({ tools: "32" }, "*");
       } else if (t == 57) {
         window.parent.postMessage({ tools: "57" }, "*");
+      } else if (t == 58) {
+        window.parent.postMessage({ tools: "58" }, "*");
+      } else if (t == 59) {
+        window.parent.postMessage({ tools: "59" }, "*");
+      } else if (t == 60) {
+        window.parent.postMessage({ tools: "60" }, "*");
       } else if (t == 26) {
         window.parent.postMessage(
           {

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