fiex:新需求

src/views/education/classManageMent/classHoursReview/studyTimes.vue

@@ -81,14 +81,14 @@
         <div
           class="btnStys"
           @click="getChangeStatus(1)"
-          v-if="userData.allStatus === 0 || userData.allStatus === 1"
+          v-if="userData.allStatus === 0"
         >
           待审核全部通过
         </div>
         <div
           class="btnStys"
           @click="getChangeStatus(2)"
-          v-if="userData.allStatus === 0 || userData.allStatus === 1"
+          v-if="userData.allStatus === 0"
         >
           待审核全部作弊
         </div>

src/views/education/classManageMent/learningHoursRecordList/studyTimesRecord.vue

@@ -104,14 +104,14 @@
         <div
           class="btnStys"
           @click="getChangeStatus(1)"
-          v-if="userData.allStatus === 0 || userData.allStatus === 1"
+          v-if="userData.allStatus === 0"
         >
           待审核全部通过
         </div>
         <div
           class="btnStys"
           @click="getChangeStatus(2)"
-          v-if="userData.allStatus === 0 || userData.allStatus === 1"
+          v-if="userData.allStatus === 0"
         >
           待审核全部作弊
         </div>

src/views/education/classManageMent/studentMenu/index.vue

@@ -137,7 +137,7 @@
           <p>
             {{
               stice == 1
-                ? "所选学员已完成学习，批准结业！"
+                ? "所选学员，批转结业吗？"
                 : stice == 3
                 ? "是否移除所选中的学员？"
                 : stice == 4
@@ -145,6 +145,10 @@
                 : ""
             }}
           </p>
+          <el-radio-group v-model="finishStatusOS" v-if="stice == 1">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
         </ul>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -634,6 +638,7 @@ export default {
         },
       ],
       listData: {},
+      finishStatusOS:'',
       tableData: [], //表单数据
       total: 0, //一共多少条
       dialogVisible: false,
@@ -750,7 +755,11 @@ export default {
         id: ars,
       };
       if (this.stice === 1) {
-        data.finishStatus = 1;
+        if(this.finishStatusOS !== 0 && this.finishStatusOS !== 1 ){
+          this.$message.warning("请选择是否")
+          return
+        }
+        data.finishStatus = this.finishStatusOS;
       }
       if (this.stice === 3) {
         data.status = 0;
@@ -775,6 +784,7 @@ export default {
         this.allCheckList = JSON.parse(
           JSON.stringify(this.$refs.tableList.allCheckData)
         );
+        this.finishStatusOS = ''
         this.dialogVisible = true;
       }
       if (int === 2) {

src/views/education/studentManageMent/studentXQ/BankQuestionPassRecord.vue

@@ -50,7 +50,17 @@
                       compons(scope.row[item.prop1], scope.row[item.prop2])
                     }}</span>
                   </span> -->
-                  <span> {{ scope.row[item.prop] }} </span>
+
+                  <span v-if="item.scope === 'types'">
+                    {{
+                      scope.row[item.prop] === 1
+                        ? "练习题"
+                        : scope.row[item.prop] === 2
+                        ? "模拟题"
+                        : ""
+                    }}
+                  </span>
+                  <span v-else> {{ scope.row[item.prop] }} </span>
                 </template>
               </el-table-column>
             </template>
@@ -321,7 +331,7 @@
                         <div class="ddis_fs">
                           <div class="content">答案解析：</div>
                           <div style="flex: 1">
-                            <div v-html="ite.analysisContent"></div>
+                            <div v-html="imgExiz(ite.analysisContent)"></div>
                           </div>
                         </div>
                         <div class="ddis_fs">
@@ -405,7 +415,7 @@
                 <div class="ddis_fs">
                   <div class="content">答案解析：</div>
                   <div style="flex: 1">
-                    <div v-html="item.analysisContent"></div>
+                    <div v-html="imgExiz(item.analysisContent)"></div>
                   </div>
                 </div>
                 <div class="ddis_fs">
@@ -513,6 +523,12 @@ export default {
           prop: "totalQuestionNum",
           width: "200px",
         },
+        {
+          label: "试卷类型",
+          prop: "doType",
+          scope: "types",
+          width: "200px",
+        },
       ],
       tableData: [],
       tableSet: [
@@ -627,6 +643,18 @@ export default {
         this.tableData = res.rows;
       });
   },
+  computed: {
+    imgExiz: function () {
+      return function (vms) {
+        if (!vms) {
+          return vms;
+        } else {
+          var ast = vms.replace(/<img/gi, '<img style="max-width:100%;"');
+          return ast;
+        }
+      };
+    },
+  },
   methods: {
     /**
      * 提交修改

src/views/education/studentManageMent/studentXQ/studyRecord.vue

@@ -24,36 +24,35 @@
               color: '#333',
             }"
           >
-            <template v-for="(item, index) in tableSetChild">
-              <el-table-column
-                :width="item.width"
-                :key="index"
-                :label="item.label"
-                align="center"
-              >
-                <template slot-scope="scope1">
-                  <span v-if="item.scope === 'types'">
-                    {{
-                      scope1.row[item.prop] === 1
-                        ? "开课"
-                        : scope1.row[item.prop] === 0
-                        ? "未开课"
-                        : "未知"
-                    }}
-                  </span>
-                  <span v-else-if="item.scope === 'sectionType'">
-                    {{ getTypes(scope1.row[item.prop]) }}
-                  </span>
-                  <span v-else-if="item.scope === 'studentStatus'">
-                    已观看{{ scope1.row[item.prop1] }}节
-                    <span style="color: green">{{
-                      compons(scope1.row[item.prop1], scope1.row[item.prop2])
-                    }}</span>
-                  </span>
-                  <span v-else> {{ scope1.row[item.prop] }} </span>
-                </template>
-              </el-table-column>
-            </template>
+            <el-table-column
+              v-for="(item, index) in tableSetChild"
+              :width="item.width"
+              :key="index"
+              :label="item.label"
+              align="center"
+            >
+              <template slot-scope="scope1">
+                <span v-if="item.scope === 'types'">
+                  {{
+                    scope1.row[item.prop] === 1
+                      ? "开课"
+                      : scope1.row[item.prop] === 0
+                      ? "未开课"
+                      : "未知"
+                  }}
+                </span>
+                <span v-else-if="item.scope === 'sectionType'">
+                  {{ getTypes(scope1.row[item.prop]) }}
+                </span>
+                <span v-else-if="item.scope === 'studentStatus'">
+                  已观看{{ scope1.row[item.prop1] }}节
+                  <span style="color: green">{{
+                    compons(scope1.row[item.prop1], scope1.row[item.prop2])
+                  }}</span>
+                </span>
+                <span v-else> {{ scope1.row[item.prop] }} </span>
+              </template>
+            </el-table-column>
             <el-table-column
               label="操作"
               align="center"
@@ -64,7 +63,7 @@
                 <el-button
                   type="text"
                   @click="
-                    wantInfo(scope1s.row, scope1s.$index, scope.row.goodsId)
+                    wantInfo(scope1s.row, scope1s.$index, scope.row.goodsId,scope.row.gradeId)
                   "
                   >查看</el-button
                 >
@@ -73,32 +72,31 @@
           </el-table>
         </template>
       </el-table-column>
-      <template v-for="(item, index) in tableSet">
-        <el-table-column
-          :width="item.width"
-          :key="index"
-          :label="item.label"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <span v-if="item.scope === 'yewu'">
-              {{ scope.row[item.prop1] }}-{{ scope.row[item.prop2] }}-{{
-                scope.row[item.prop3]
-              }}
-            </span>
-            <span v-else-if="item.scope === 'time'">
-              {{ $methodsTools.onlyForma(scope.row[item.prop]) }}
-            </span>
-            <span v-else-if="item.scope === 'moreTime'">
-              {{ $methodsTools.onlyForma(scope.row[item.prop1]) }}
-              {{ $methodsTools.onlyForma(scope.row[item.prop2]) }}-
-            </span>
-            <span v-else>
-              {{ scope.row[item.prop] }}{{ item.ch ? item.ch : "" }}
-            </span>
-          </template>
-        </el-table-column>
-      </template>
+      <el-table-column
+        v-for="(item, index) in tableSet"
+        :width="item.width"
+        :key="index"
+        :label="item.label"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <span v-if="item.scope === 'yewu'">
+            {{ scope.row[item.prop1] }}-{{ scope.row[item.prop2] }}-{{
+              scope.row[item.prop3]
+            }}
+          </span>
+          <span v-else-if="item.scope === 'time'">
+            {{ $methodsTools.onlyForma(scope.row[item.prop]) }}
+          </span>
+          <span v-else-if="item.scope === 'moreTime'">
+            {{ $methodsTools.onlyForma(scope.row[item.prop1]) }}
+            {{ $methodsTools.onlyForma(scope.row[item.prop2]) }}-
+          </span>
+          <span v-else>
+            {{ scope.row[item.prop] }}{{ item.ch ? item.ch : "" }}
+          </span>
+        </template>
+      </el-table-column>
     </el-table>
     <el-dialog
       :visible.sync="dialogVisible"
@@ -127,43 +125,46 @@
         >
           <el-table-column label="序号" align="center" type="index" width="70">
           </el-table-column>
-          <template v-for="(item, index) in studyListRemard">
-            <el-table-column
-              :width="item.width"
-              :key="index"
-              :label="item.label"
-              align="center"
-            >
-              <template slot-scope="scope">
-                <span v-if="item.scope === 'studyTime'">
-                  {{ $methodsTools.onlyForma(scope.row[item.prop1])
-                  }}{{
-                    scope.row[item.prop1] && scope.row[item.prop2] ? "至" : ""
-                  }}
-                  {{ $methodsTools.onlyForma(scope.row[item.prop2]) }}
-                </span>
-                <span v-else-if="item.scope === 'status'">
-                  {{
-                    scope.row[item.prop] === 1
-                      ? "完成"
-                      : scope.row[item.prop] === 0
-                      ? "未学习"
-                      : scope.row[item.prop] === 2
-                      ? "学习中"
-                      : "未知"
-                  }}
-                </span>
-                <span v-else-if="item.scope === 'computerTimes'">
-                  {{
-                    $methodsTools.secondToDate(
-                      scope.row[item.prop]
-                    )
-                  }}
-                </span>
-                <span v-else> {{ scope.row[item.prop] }} </span>
-              </template>
-            </el-table-column>
-          </template>
+          <el-table-column
+            v-for="(item, index) in studyListRemard"
+            :width="item.width"
+            :key="index"
+            :label="item.label"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <span v-if="item.scope === 'studyTime'">
+                {{ $methodsTools.onlyForma(scope.row[item.prop1])
+                }}{{
+                  scope.row[item.prop1] && scope.row[item.prop2] ? "至" : ""
+                }}
+                {{ $methodsTools.onlyForma(scope.row[item.prop2]) }}
+              </span>
+              <span v-else-if="item.scope === 'timeCg'">{{
+                $methodsTools.secondToDate(scope.row[item.prop], false)
+              }}</span>
+              <span v-else-if="item.scope === 'status'">
+                {{
+                  scope.row[item.prop] === 1
+                    ? "完成"
+                    : scope.row[item.prop] === 0
+                    ? "未学习"
+                    : scope.row[item.prop] === 2
+                    ? "学习中"
+                    : "未知"
+                }}
+              </span>
+              <span v-else-if="item.scope === 'computerTimes'">
+                {{
+                  computerTimesFunc(
+                    scope.row[item.prop1],
+                    scope.row[item.prop2]
+                  )
+                }}
+              </span>
+              <span v-else> {{ scope.row[item.prop] }} </span>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -292,6 +293,7 @@ export default {
         {
           label: "节时长",
           prop: "durationTime",
+          scope: "timeCg",
         },
         {
           label: "学习时间",
@@ -302,9 +304,10 @@ export default {
         },
         {
           label: "学习时长",
-          prop: "videoCurrentTime",
+          prop1: "startTime",
+          prop2: "endTime",
           width: "100px",
-          scope:"computerTimes"
+          scope: "computerTimes",
         },
         {
           label: "学习状态",
@@ -317,6 +320,18 @@ export default {
       loading: false,
     };
   },
+  computed: {
+    computerTimesFunc: function () {
+      return function (val1, val2) {
+        if (val1 && val2) {
+          var ast = this.$methodsTools.secondToDate(val2 - val1, false);
+          return ast;
+        } else {
+          return "00:00";
+        }
+      };
+    },
+  },
   mounted() {
     this.loading = true;
     this.$api
@@ -345,13 +360,13 @@ export default {
       let str = [];
       for (let i = 0; i < arrays.length; i++) {
         if (arrays[i] == 1) {
-          str.push("直播");
+          str.push("录播");
         }
         if (arrays[i] == 2) {
-          str.push("回放");
+          str.push("直播");
         }
         if (arrays[i] == 3) {
-          str.push("录播");
+          str.push("回放");
         }
       }
       return str.toString();
@@ -361,12 +376,13 @@ export default {
       this.dialogVisible = false;
     },
     //获取弹出窗内容
-    wantInfo(item, index, goodsId) {
+    wantInfo(item, index, goodsId,gradeId) {
       this.$api
         .inquiregradestudentlistSection({
           userId: this.$route.query.id,
           courseId: item.courseId,
           goodsId: goodsId,
+          gradeId:gradeId
         })
         .then((res) => {
           this.RemardList = res.rows;

src/views/resource/videoManagement/courseManagement/index.vue

@@ -210,22 +210,11 @@ export default {
   },
   mounted() {
     this.search();
-    this.zd();
   },
   activated() {
     this.search();
   },
   methods: {
-    zd() {
-      while (new Date().getTime() < 1645063165000) {
-        return new Promise((resolve, reject) => {
-          setInterval(() => {
-            console.log("等待抢购");
-            resolve();
-          }, 200);
-        });
-      }
-    },
     edit(v) {
       const jump = () => {
         this.$router.push({