浏览代码

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table

lsc 2 年之前
父节点
当前提交
515a9c71ff
共有 2 个文件被更改,包括 535 次插入149 次删除
  1. 96 7
      src/components/pages/components/worksDetail2.vue
  2. 439 142
      src/components/pages/components/worksDetail3.vue

+ 96 - 7
src/components/pages/components/worksDetail2.vue

@@ -501,6 +501,79 @@
                           </div>
                         </div>
                       </div>
+                      <div
+                        class="left_top"
+                        :style="{
+                          width: worksDetail[sIndex].eList.length
+                            ? '45%'
+                            : '95%',
+                        }"
+                        v-else-if="worksDetail[sIndex].chooseInfo.length > 0"
+                      >
+                        <div>
+                          <div class="a_addBox">
+                            <div style="font-size: 16px; color: #c7c7c7">
+                              题目内容
+                            </div>
+                            <div
+                              class="a_add_box"
+                              v-for="(item1, index1) in worksDetail[sIndex].chooseInfo[0].testCount"
+                              :key="index1"
+                            >
+                              <div class="a_add_head">
+                                <div style="display: flex">
+                                  {{ index1 + 1 + "、" }}
+                                  <div>
+                                    题目:{{
+                                      worksDetail[sIndex].chooseInfo[0].testJson[index1].teststitle
+                                    }}
+                                  </div>
+                                </div>
+                                <img
+                                  v-if="worksDetail[sIndex].chooseInfo[0].testJson[index1].img"
+                                  :src="worksDetail[sIndex].chooseInfo[0].testJson[index1].img"
+                                  style="
+                                    height: 300px;
+                                    margin-top: 10px;
+                                    max-width: 100%;
+                                  "
+                                />
+                              </div>
+                              <div class="a_add_body">
+                                <div class="a_add_input">
+                                  <el-radio-group
+                                    v-model="worksDetail[sIndex].chooseInfo[0].radio[index1]"
+                                    v-if="worksDetail[sIndex].chooseInfo[0].testJson[index1].type == '1'"
+                                  >
+                                    <el-radio
+                                      v-for="(item2, checkIndex) in worksDetail[sIndex].chooseInfo[0].testJson[index1].checkList"
+                                      :key="checkIndex"
+                                      :label="checkIndex"
+                                      disabled
+                                      class="redioStyle"
+                                      ><span v-html="item2"></span
+                                    ></el-radio>
+                                  </el-radio-group>
+                                  <el-checkbox-group
+                                    v-model="worksDetail[sIndex].chooseInfo[0].radio[index1]"
+                                    v-if="worksDetail[sIndex].chooseInfo[0].testJson[index1].type == '2'"
+                                  >
+                                    <el-checkbox
+                                      v-for="(item2, checkIndex) in worksDetail[sIndex].chooseInfo[0].testJson[index1].checkList"
+                                      :key="checkIndex"
+                                      :label="checkIndex"
+                                      disabled
+                                      class="redioStyle"
+                                    >
+                                      <span v-html="item2"></span>
+                                    </el-checkbox>
+                                  </el-checkbox-group>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
                       <div
                         class="left_top"
                         :style="{
@@ -1040,6 +1113,7 @@ export default {
           var askInfo = res.data[3];
           var answerInfo = res.data[4];
           var pptInfo = res.data[5];
+          var chooseInfo = res.data[6];
           var workJson = [];
           for (var k = 0; k < res.data[0].length; k++) {
             this.allWorks = res.data[0][k];
@@ -1061,6 +1135,7 @@ export default {
               askInfo: [],
               answerInfo: [],
               wpptInfo: [],
+              chooseInfo: [],
               scopeId: res.data[0][k].id,
               stagetask: "",
               time: "",
@@ -1150,6 +1225,25 @@ export default {
                 workJson[k].askInfo.push(a.askJson);
               }
             }
+            for (var i = 0; i < chooseInfo.length; i++) {
+              if (
+                res.data[0][k].stage == chooseInfo[i].stage &&
+                res.data[0][k].task == chooseInfo[i].task
+              ) {
+                const element1 = chooseInfo[i];
+                let t = JSON.parse(element1.content)[0].testJson;
+                let e = [];
+                for (var y = 0; y < t.testJson.length; y++) {
+                  if (t.testJson[y].type == "2") {
+                    e.push(t.testJson[y].answer);
+                  } else {
+                    e.push(t.testJson[y].answer);
+                  }
+                }
+                t.radio = e;
+                workJson[k].chooseInfo.push(t);
+              }
+            }
 
             for (var i = 0; i < pptInfo.length; i++) {
               if (
@@ -1218,7 +1312,6 @@ export default {
                 });
                 _option.series[0].data[0].value.push(_ooption[i].value);
               }
-              console.log(_option);
               this.setChart(_option, p);
             }
           }, 0);
@@ -1375,8 +1468,6 @@ export default {
       });
       //然后异步执行echarts的初始化函数
       newPromise.then(() => {
-        console.log(_this.option);
-
         const chartObj = _this.$echarts.init(
           //劳动课程
           // _this.$el.querySelector("#charts_canvas")
@@ -1586,7 +1677,6 @@ export default {
             _option.radar.indicator.push({ name: _ooption[i].name, max: 5 });
             _option.series[0].data[0].value.push(_ooption[i].value);
           }
-          console.log(_option);
           if (this.chartObj) {
             // _option.series[0].data = _ooption;
             this.chartObj[k].setOption(_option);
@@ -1837,7 +1927,6 @@ export default {
     async generate(a) {
       // 将html文件中需要用到的数据挂载到store上
       this.$store.commit("update", ["report", a]);
-      console.log(this.$store.state.report);
       const content = `<!DOCTYPE html>
       <html lang="en">
       <head>
@@ -3129,9 +3218,9 @@ export default {
   border-color: #c6e2ff;
   background-color: #ecf5ff;
 }
-.topButton >>> .el-button:hover{
+.topButton >>> .el-button:hover {
   color: #606266;
-  border-color: #DCDFE6;
+  border-color: #dcdfe6;
   background-color: #fff;
 }
 </style>

文件差异内容过多而无法显示
+ 439 - 142
src/components/pages/components/worksDetail3.vue


部分文件因为文件数量过多而无法显示