caichengyu 2 месяцев назад
Родитель
Сommit
fb462eb990
28 измененных файлов с 579 добавлено и 33 удалено
  1. 8 0
      src/api/resource/good.js
  2. 471 0
      src/components/bankMsg/examrecordPage.vue
  3. 8 0
      src/newApi/recordList.js
  4. 2 2
      src/utils/request.js
  5. 13 0
      src/views/Marketing/goods/commodityManageMent/index.vue
  6. 1 1
      src/views/Marketing/order/bill/index.vue
  7. 2 0
      src/views/Marketing/order/offlineOrder/batchRecord/secondStep/index.vue
  8. 2 2
      src/views/Marketing/order/offlineOrder/orderDetailsT/index.vue
  9. 2 2
      src/views/Marketing/order/orderList/apiorder.vue
  10. 2 2
      src/views/Marketing/order/orderList/index.vue
  11. 2 2
      src/views/Marketing/order/pendingRefundOrder/index.vue
  12. 2 2
      src/views/Marketing/order/schoolHoursConflictOrder/index.vue
  13. 1 1
      src/views/classHoursReview/component/ChapterTable.vue
  14. 2 2
      src/views/education/archives/index.vue
  15. 18 1
      src/views/education/classManageMent/classHoursReview/component/ChapterTable.vue
  16. 11 3
      src/views/education/classManageMent/classHoursReview/component/LessonTable.vue
  17. 2 0
      src/views/education/classManageMent/classHoursReview/component/StudyTables.vue
  18. 3 2
      src/views/education/classManageMent/learningHoursRecordList/index.vue
  19. 2 2
      src/views/education/dataReview/dataConfig/index.vue
  20. 2 2
      src/views/education/dataReview/dataConfigSeven/index.vue
  21. 1 1
      src/views/education/examManagement/applicationData/asPlanned.vue
  22. 2 2
      src/views/education/examManagement/applicationData/byTrainee.vue
  23. 2 2
      src/views/education/studentManageMent/studentList/index.vue
  24. 4 0
      src/views/secondBuild/learningList/index.vue
  25. 4 0
      src/views/secondJian/learningList/index.vue
  26. 4 0
      src/views/secondSeven/learningList/index.vue
  27. 4 0
      src/views/secondZao/learningList/index.vue
  28. 2 2
      src/views/systemManagement/registeredUser/index.vue

+ 8 - 0
src/api/resource/good.js

@@ -111,4 +111,12 @@ export function addExamTime(data) {
         method: 'post',
         data
     })
+}
+// 企业列表
+export function downquestionanswer(query) {
+    return request({
+        url: '/goods/question/answer',
+        method: 'get',
+        params: query
+    })
 }

+ 471 - 0
src/components/bankMsg/examrecordPage.vue

@@ -0,0 +1,471 @@
+<template>
+  <div id="ExamrecordPage">
+      <el-dialog
+      width="1000px"
+      class="take-photo"
+      :visible.sync="Modal"
+      :close-on-click-modal="true"
+      :close-on-press-escape="true"
+      :show-close="true"
+      title="答题详情"
+      center="true"
+    >
+    <el-row :gutter="20" class="el_rowStyle">
+      <el-col :span="19" style="font-size: 14px; max-height: 100%; overflow-y: auto;width: 100%;">
+        <div
+          class="showData"
+          style="padding: 0px 20px;"
+        >
+          <div
+            v-for="(item, index) in getInfoRecord.historyExamJson"
+            :key="index"
+            style="margin: 14px 0px; background-color: #eee; padding: 10px"
+          >
+            <div style="border-bottom: 1px dotted #666; padding: 4px 0px 10px">
+              <span style="margin-right: 14px">题目{{ index + 1 }}</span>
+              <span style="margin-right: 14px">{{
+                changeQuestType(item.type)
+              }}</span>
+              <span style="margin-right: 14px">分值:{{ item.score }}分</span>
+              <span style="margin-right: 14px; color: red"
+                >得分:{{ item.scoreResult }}分</span
+              >
+              <el-button
+                v-if="item.type === 4 || item.type === 5"
+                style="margin-right: 14px"
+                type="text"
+                @click="setMath(item, index)"
+                >评分</el-button
+              >
+            </div>
+            <div class="ddis_fs">
+              <div class="content">题目内容:</div>
+              <div style="flex: 1">
+                <div v-html="item.content"></div>
+                <div v-if="item.type === 4">
+                  <div
+                    style="margin: 20px; background-color: #fff; padding: 12px"
+                    v-for="(ite, ind) in item.jsonStr"
+                    :key="ind"
+                  >
+                    <div class="ddis_fs" v-if="item.ite !== 5">
+                      <div>题目类型:{{ changeQuestType(ite.type) }}</div>
+                    </div>
+                    <div class="ddis_fs">
+                      <div class="content">题目内容:</div>
+                      <div style="flex: 1">
+                        <div v-html="ite.content"></div>
+                        <ul>
+                          <li
+                            v-for="(items, indexs) in ite.optionsList"
+                            :key="indexs"
+                            style="margin-bottom: 10px"
+                          >
+                            {{ Gest(indexs + 1) }}:{{ items.content }}
+
+                            <el-image
+                              v-if="items.imgUrl"
+                              style="
+                                width: 40px;
+                                height: 40px;
+                                vertical-align: middle;
+                              "
+                              :src="$methodsTools.splitImgHost(items.imgUrl)"
+                              :preview-src-list="[
+                                $methodsTools.splitImgHost(items.imgUrl),
+                              ]"
+                            >
+                            </el-image>
+                          </li>
+                        </ul>
+                      </div>
+                    </div>
+                    <div class="ddis_fs" v-if="ite.type !== 5">
+                      <div class="content">正确答案:</div>
+                      <div style="flex: 1">
+                        <span v-if="ite.type === 3">
+                          {{ ite.answerQuestion == 1 ? "正确" : "错误" }}
+                        </span>
+                        <span v-else>
+                          {{ getDictChanges(ite.answerQuestion) }}
+                        </span>
+                      </div>
+                    </div>
+                    <div class="ddis_fs">
+                      <div class="content">答案解析:</div>
+                      <div style="flex: 1">
+                        <div v-html="imgExiz(ite.analysisContent)"></div>
+                      </div>
+                    </div>
+                    <div class="ddis_fs">
+                      <div class="content">填选答案:</div>
+                      <div style="flex: 1">
+                        <p
+                          style="margin: 0px"
+                          v-if="ite.type === 1 || ite.type === 2"
+                        >
+                          {{ getDictChanges(item.ques[ind]) }}
+                        </p>
+                        <p style="margin: 0px" v-if="ite.type === 3">
+                          {{ item.ques[ind] == 1 ? "正确" : "错误" }}
+                        </p>
+                        <div v-if="ite.type === 5">
+                          <p>{{ ite.ansText.text }}</p>
+                          <ul>
+                            <li
+                              v-for="(k, ds) in ite.ansText.imageList"
+                              :key="ds"
+                              style="
+                                width: 100px;
+                                height: 100px;
+                                float: left;
+                                margin: 0px 10px 10px 0px;
+                              "
+                            >
+                              <el-image
+                                v-if="k"
+                                style="width: 100%; height: 100%"
+                                :src="$methodsTools.splitImgHost(k)"
+                                :preview-src-list="[
+                                  $methodsTools.splitImgHost(k),
+                                ]"
+                              >
+                              </el-image>
+                            </li>
+                            <div style="clear: both"></div>
+                          </ul>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <ul v-else>
+                  <li
+                    v-for="(items, indexs) in item.jsonStr"
+                    :key="indexs"
+                    style="margin-bottom: 10px"
+                  >
+                    {{ Gest(indexs + 1) }}:{{ items.content }}
+
+                    <el-image
+                      v-if="items.imgUrl"
+                      style="width: 40px; height: 40px; vertical-align: middle"
+                      :src="$methodsTools.splitImgHost(items.imgUrl)"
+                      :preview-src-list="[
+                        $methodsTools.splitImgHost(items.imgUrl),
+                      ]"
+                    >
+                    </el-image>
+                  </li>
+                </ul>
+              </div>
+            </div>
+            <div class="ddis_fs" v-if="item.type !== 4 && item.type !== 5">
+              <div class="content">正确答案:</div>
+              <div style="flex: 1">
+                <span v-if="item.type === 3">
+                  {{ item.answerQuestion == 1 ? "正确" : "错误" }}
+                </span>
+                <span v-else>
+                  {{ getDictChanges(item.answerQuestion) }}
+                </span>
+              </div>
+            </div>
+            <div class="ddis_fs">
+              <div class="content">答案解析:</div>
+              <div style="flex: 1">
+                <div v-html="imgExiz(item.analysisContent)"></div>
+              </div>
+            </div>
+            <div class="ddis_fs">
+              <div class="content">填选答案:</div>
+              <div style="flex: 1">
+                <p
+                  style="margin: 0px"
+                  v-if="item.type === 1 || item.type === 2"
+                >
+                  {{ getDictChanges(item.ques) }}
+                </p>
+                <p style="margin: 0px" v-if="item.type === 3">
+                  {{ item.ques == 1 ? "正确" : "错误" }}
+                </p>
+                <div v-if="item.type === 5">
+                  <p>{{ item.ansText.text }}</p>
+                  <ul>
+                    <li
+                      v-for="(k, ds) in item.ansText.imageList"
+                      :key="ds"
+                      style="
+                        width: 100px;
+                        height: 100px;
+                        float: left;
+                        margin: 0px 10px 10px 0px;
+                      "
+                    >
+                      <el-image
+                        v-if="k"
+                        style="width: 100%; height: 100%"
+                        :src="$methodsTools.splitImgHost(k)"
+                        :preview-src-list="[$methodsTools.splitImgHost(k)]"
+                      >
+                      </el-image>
+                    </li>
+                    <div style="clear: both"></div>
+                  </ul>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+        <div style="height: 50px; text-align: center; line-height: 50px">
+          <el-button size="mini" type="success" @click="Modal=false"
+            >关闭</el-button
+          >
+        </div>
+    
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      Modal: false,
+      getInfoRecord: [],
+    };
+  },
+  created() {
+  },
+  mounted() {
+  },
+  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: { 
+    openBoxs(examId, orderGoodsId) {
+      this.Modal = true;
+      this.$api
+      .obtainVideorecordexam({
+        examId: examId,
+        orderGoodsId: orderGoodsId,
+      })
+      .then((res) => { 
+        res.data.historyExamJson = JSON.parse(res.data.historyExamJson);
+        if (!res.data.score) {
+          res.data.score = 0;
+        }
+        this.getInfoRecord = res.data;
+        console.log( this.getInfoRecord);
+      });
+      
+    },
+    /**
+     * 评分
+     */
+    setMath(item, index) {
+      this.$prompt(`题目最大分值为${item.score}分,请评分`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputPattern: /^[0-9]*$/,
+        inputErrorMessage: "分值格式不正确",
+        beforeClose: (action, instance, done) => {
+          if (
+            action === "confirm" &&
+            Number(instance.inputValue) > item.score
+          ) {
+            this.$message.warning(`该题评分不得超过${item.score}分`);
+            return;
+          }
+          done();
+        },
+      })
+        .then(({ value }) => {
+          this.$message({
+            type: "success",
+            message: "评分: " + value,
+          });
+          this.$set(
+            this.getInfoRecord.historyExamJson[index],
+            "scoreResult",
+            value
+          );
+        })
+        .catch(() => {});
+    },
+    /**
+     * 点击记录触发
+     */
+    activeRecordId(row) {
+      if (this.activeRecordIs === row.recordId) return;
+      this.getRecodeInfo(row.recordId);
+    },
+    editForms() {
+      var data = JSON.parse(JSON.stringify(this.getInfoRecord));
+      data.score = 0;
+      for (let i = 0; i < data.historyExamJson.length; i++) {
+        if (
+          (data.historyExamJson[i].type === 4 ||
+            data.historyExamJson[i].type === 5) &&
+          data.historyExamJson[i].scoreResult
+        ) {
+          data.score += data.historyExamJson[i].scoreResult*1;
+        }
+      }
+      data.historyExamJson = JSON.stringify(data.historyExamJson);
+      this.$api.editrecordexam(data).then((res) => {
+        this.$message.success("修改成功");
+        this.getRecodeInfo(data.recordId);
+      });
+    },
+    getRecodeInfo(id) {
+      this.activeRecordIs = id;
+      this.$api.obtainrecordexam(id).then((res) => {
+        res.data.historyExamJson = JSON.parse(res.data.historyExamJson);
+        if (!res.data.score) {
+          res.data.score = 0;
+        }
+        this.getInfoRecord = res.data;
+        if (document.getElementsByClassName("showData")[0]) {
+          document.getElementsByClassName("showData")[0].scrollTop = 0;
+        }
+      });
+    },
+    getDictChanges(dan) {
+      var arst = [];
+      var arrays;
+      if (dan instanceof Object) {
+        arrays = dan;
+      } else {
+        if (dan) {
+          arrays = dan.toString().split(",");
+        } else {
+          return "";
+        }
+      }
+      for (let i = 0; i < arrays.length; i++) {
+        arst.push(this.Gest(arrays[i]));
+      }
+      return arst.join(",");
+    },
+    /**
+     * 选项转换
+     */
+    Gest(ints) {
+      var int = parseInt(ints);
+      var ast = "";
+      switch (int) {
+        case 1:
+          ast = "A";
+          break;
+        case 2:
+          ast = "B";
+          break;
+        case 3:
+          ast = "C";
+          break;
+        case 4:
+          ast = "D";
+          break;
+        case 5:
+          ast = "E";
+          break;
+        case 6:
+          ast = "F";
+          break;
+        case 7:
+          ast = "G";
+          break;
+        case 8:
+          ast = "H";
+          break;
+        default:
+          ast = "X";
+          break;
+      }
+      return ast;
+    },
+    /**
+     * 题目类型
+     */
+    changeQuestType(int) {
+      var type = "";
+      switch (int) {
+        case 1:
+          type = "单选题";
+          break;
+        case 2:
+          type = "多选题";
+          break;
+        case 3:
+          type = "判断题";
+          break;
+        case 4:
+          type = "案例题";
+          break;
+        case 5:
+          type = "简答题";
+          break;
+
+        default:
+          type = "未知";
+          break;
+      }
+      return type;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.el_rowStyle {
+  height: calc(90vh - 100px);
+  .el-col {
+    height: 100%;
+  }
+}
+.dis_style {
+  user-select: none;
+  cursor: pointer;
+  height: 36px;
+  line-height: 35px;
+  border-bottom: 1px solid #eee;
+  margin-left: 20px;
+  &:first-of-type {
+    border-top: 1px solid #eee;
+  }
+  &:last-of-type {
+    border: none;
+  }
+}
+/deep/ .el-collapse {
+  border: 1px solid #e6ebf5;
+  padding-left: 10px;
+}
+/deep/ .el-collapse-item__content {
+  padding-bottom: 0px;
+}
+.ddis_fs {
+  display: flex;
+  margin-bottom: 10px;
+}
+.content {
+  width: 70px;
+  flex-shrink: 0;
+}
+td {
+  padding: 6px;
+  text-align: center;
+}
+</style>

+ 8 - 0
src/newApi/recordList.js

@@ -31,4 +31,12 @@ export default {
             method: 'get',
         })
     },
+    //获取用户的考试试卷做题历史详细信息
+    obtainVideorecordexam(data) {
+        return request({
+            url: `/exam/record/bank/record`,
+            method: 'get',
+            params: data
+        })
+    },
 }

+ 2 - 2
src/utils/request.js

@@ -8,9 +8,9 @@ import { paramMate } from "@/utils/common";
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
-export const baseURL = process.env.VUE_APP_BASE_API
+// export const baseURL = process.env.VUE_APP_BASE_API
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
-// export const baseURL = 'http://192.168.1.123:5030'
+export const baseURL = 'http://192.168.1.123:5030'
 // export const baseURL = 'https://cloud.xyyxt.net/'
 // export const BASE_IMG_URL = 'https://file.xyyxt.net'
 const service = axios.create({

+ 13 - 0
src/views/Marketing/goods/commodityManageMent/index.vue

@@ -68,6 +68,7 @@
           >取消绑定</el-button
         >
         <el-button type="text" @click="del(props.scope.row)">删除</el-button>
+        <el-button type="text" v-if="props.scope.row.isQuestionAnswer===1" @click="downanswer(props.scope.row)">下载答案</el-button>
       </template>
     </table-list>
     <pagination
@@ -153,6 +154,7 @@ import {
   goodCancelBind,
   getTenantList,
   goodsCopy,
+  downquestionanswer,
 } from "@/api/resource/good";
 export default {
   name: "CommodityManageMent",
@@ -485,6 +487,17 @@ export default {
     this.search();
   },
   methods: {
+    //题库下载答案
+    downanswer(row){
+       downquestionanswer({goodsId:row.goodsId,major:row.categoryName}).then((res) => {
+        if (res.code==200) {
+          this.$methodsTools.exportData(res.msg,true)
+          this.$message.success("导出成功,正在下载");
+        } else {
+          this.$message.error(res.data);
+        }
+      });
+    },
     // 取消规格绑定
     cancelBind(goodsId) {
       this.$confirm(`此操作将该商品取消关联规格模板, 是否继续?`, "提示", {

+ 1 - 1
src/views/Marketing/order/bill/index.vue

@@ -626,7 +626,7 @@ export default {
         {
           label: "学员信息",
           prop1: "realname",
-          prop2: "idCard",
+          prop2: "idCardStr",
           hidden: true,
           scope: "realAndIdcard",
         },

+ 2 - 0
src/views/Marketing/order/offlineOrder/batchRecord/secondStep/index.vue

@@ -626,11 +626,13 @@ export default {
       this.loading = true;
       this.toData = JSON.parse(JSON.stringify(obj.topData));
       let data = JSON.parse(JSON.stringify(obj.tableData));
+      console.log("data1",data);
       this.$api
         .inquireorderconfiggoodsList({
           configId: obj.topData.configId,
         })
         .then((res) => {
+           console.log("res1",res);
           data.forEach((item) => {
             item.subjectList = [];
             if (item.subjectIds && item.subjectIds.length) {

+ 2 - 2
src/views/Marketing/order/offlineOrder/orderDetailsT/index.vue

@@ -193,7 +193,7 @@ export default {
         },
         {
           label: "手机号码",
-          prop: "telphone",
+          prop: "telphoneStr",
           hidden: true,
           width: "120px",
         },
@@ -204,7 +204,7 @@ export default {
         },
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
           width: "190px",
         },

+ 2 - 2
src/views/Marketing/order/orderList/apiorder.vue

@@ -277,7 +277,7 @@ export default {
         },
         {
           label: "手机号码",
-          prop: "telphone",
+          prop: "telphoneStr",
           hidden: true,
           width: "120px",
         },
@@ -288,7 +288,7 @@ export default {
         },
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
           width: "190px",
         },

+ 2 - 2
src/views/Marketing/order/orderList/index.vue

@@ -204,7 +204,7 @@ export default {
         },
         {
           label: "手机号码",
-          prop: "telphone",
+          prop: "telphoneStr",
           hidden: true,
           width: "120px",
         },
@@ -215,7 +215,7 @@ export default {
         },
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
           width: "190px",
         },

+ 2 - 2
src/views/Marketing/order/pendingRefundOrder/index.vue

@@ -222,7 +222,7 @@ export default {
         },
         {
           label: "手机号码",
-          prop: "telphone",
+          prop: "telphoneStr",
           hidden: true,
           width: "120px",
         },
@@ -233,7 +233,7 @@ export default {
         },
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
           width: "190px",
         },

+ 2 - 2
src/views/Marketing/order/schoolHoursConflictOrder/index.vue

@@ -151,7 +151,7 @@ export default {
         },
         {
           label: "手机号码",
-          prop: "telphone",
+          prop: "telphoneStr",
           hidden: true,
           width: "120px",
         },
@@ -162,7 +162,7 @@ export default {
         },
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
           width: "190px",
         },

+ 1 - 1
src/views/classHoursReview/component/ChapterTable.vue

@@ -21,7 +21,7 @@
           ></Lesson-table>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="realName" label="姓名" v-if="!dontControls">
+      <el-table-column align="center" prop="realName" label="姓名1" v-if="!dontControls">
       </el-table-column>
       <el-table-column align="center" prop="typeName" :label="label + '标题'">
         <template slot-scope="scope">

+ 2 - 2
src/views/education/archives/index.vue

@@ -87,8 +87,8 @@
               : ""
           }}
         </div>
-        <div>手机号码:{{ props.scope.row.telphone }}</div>
-        <div>身份证号:{{ props.scope.row.idCard }}</div>
+        <div>手机号码:{{ props.scope.row.telphoneStr }}</div>
+        <div>身份证号:{{ props.scope.row.idCardStr }}</div>
       </template>
       <template slot="educational" slot-scope="props">
         <div>学历:{{ props.scope.row.eduLevel || "—" }}</div>

+ 18 - 1
src/views/education/classManageMent/classHoursReview/component/ChapterTable.vue

@@ -52,13 +52,20 @@
         </template>
       </el-table-column>
       <el-table-column align="center" prop="performance" label="测试成绩">
+         <template slot-scope="scope">
+          {{ scope.row.performance }}
+           <el-button  v-if="scope.row.performance"  @click="showExamDetail(scope.row)" type="text">答题详情</el-button>
+          </template
+        >
       </el-table-column>
     </el-table>
+     <examrecordPage ref="examrecordPage" ></examrecordPage>
   </div>
 </template>
 
 <script>
 import LessonTable from "./LessonTable.vue";
+import examrecordPage from "@/components/bankMsg/examrecordPage.vue";
 export default {
   props: {
     tabledata: {
@@ -78,6 +85,7 @@ export default {
       }
     }
   },
+  inject: ["getsetData"],
   data() {
     return {};
   },
@@ -96,8 +104,17 @@ export default {
       };
     },
   },
+  mounted() {
+  },
+  methods: {
+    showExamDetail(row){
+      // console.log(111,row,this.getsetData);
+      this.$refs.examrecordPage.openBoxs(row.id,this.getsetData.orderGoodsId);
+
+    }
+  },
   components: {
-    LessonTable,
+    LessonTable,examrecordPage,
   },
 };
 </script>

+ 11 - 3
src/views/education/classManageMent/classHoursReview/component/LessonTable.vue

@@ -60,7 +60,7 @@
     color: #04ff04;
     font-weight: 600;"></i>
                   {{ $methodsTools.onlyForma(its.createTime) }}
-                  <i class="el-icon-refresh-right" title="图片右旋转90°"
+                  <i class="el-icon-refresh-right" title="1图片右旋转90°"
                   @click="
                     imgChange(
                       scope.row.userStudyRecordPhotoList[inds],
@@ -70,6 +70,7 @@
                   " style="font-size: 26px;
     color: #04ff04;
     font-weight: 600;"></i>
+                <div class="dvname" :title="its.deviceName">{{its.deviceName}}</div>
                 </div>
               </li>
               </template>
@@ -579,6 +580,7 @@ export default {
   // height: 280px;
   margin-right: 16px;
   margin-bottom: 16px;
+  padding-bottom: 32px;
   position: relative;
   border-radius: 8px;
   overflow: hidden;
@@ -586,12 +588,18 @@ export default {
     position: absolute;
     bottom: 0px;
     width: 100%;
-    height: 32px;
-    line-height: 32px;
+    height: 52px;
+    line-height: 22px;
     font-size: 14px;
     color: #fff;
     text-align: center;
     background-color: rgba(51, 51, 51, 0.7);
+    .dvname{
+       width: 210px; /* 容器宽度 */
+  overflow: hidden; /* 隐藏溢出的内容 */
+  white-space: nowrap; /* 防止文本换行 */
+  text-overflow: ellipsis; /* 使用省略号表示溢出的文本 */
+    }
   }
 }
 .dis_flexs {

+ 2 - 0
src/views/education/classManageMent/classHoursReview/component/StudyTables.vue

@@ -222,6 +222,7 @@ export default {
     return {
       getPeriodStatus: () => this.periodStatus,
       getUserInfo: this.getUserInfo,
+      getsetData: this.setData,
       getAllIds: () => this.allIds,
       getShowRedBackg: () => this.setData.showRedBackg||false,
     };
@@ -531,6 +532,7 @@ export default {
   },
   mounted() {
     // window.addEventListener("scroll", this.scrollFunc,false);
+    console.log("1321",this.setData)
   },
 };
 </script>

+ 3 - 2
src/views/education/classManageMent/learningHoursRecordList/index.vue

@@ -221,7 +221,7 @@ export default {
         },
         {
           label: "手机号码",
-          prop: "telPhone",
+          prop: "telphoneStr",
           hidden: true,
         },
         {
@@ -231,7 +231,7 @@ export default {
         },
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
         },
         {
@@ -517,6 +517,7 @@ export default {
               orderGoodsId: v.orderGoodsId,
               keyId: `${v.userId}-${v.goodsId}-${v.gradeId}-${v.orderGoodsId}`,
             };
+            console.log(1,data);
             this.checkSession(data)
               .then(() => {
                 //学员详情

+ 2 - 2
src/views/education/dataReview/dataConfig/index.vue

@@ -528,12 +528,12 @@ export default {
 
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
         },
         {
           label: "绑定手机号",
-          prop: "telphone",
+          prop: "telphoneStr",
           hidden: true,
         },
         {

+ 2 - 2
src/views/education/dataReview/dataConfigSeven/index.vue

@@ -509,12 +509,12 @@ export default {
 
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
         },
         {
           label: "绑定手机号",
-          prop: "telphone",
+          prop: "telphoneStr",
           hidden: true,
         },
         {

+ 1 - 1
src/views/education/examManagement/applicationData/asPlanned.vue

@@ -564,7 +564,7 @@ export default {
         },
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
         },
         {

+ 2 - 2
src/views/education/examManagement/applicationData/byTrainee.vue

@@ -15,7 +15,7 @@
             :key="index"
             @click="changeNewActive(item)"
           >
-            {{ item.realname }} {{ item.idCard }}
+            {{ item.realname }} {{ item.idCardStr }}
           </li>
         </ul>
         <el-pagination
@@ -645,7 +645,7 @@ export default {
         },
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
           width: "170px",
         },

+ 2 - 2
src/views/education/studentManageMent/studentList/index.vue

@@ -228,12 +228,12 @@ export default {
         },
         {
           label: "学员身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
         },
         {
           label: "绑定手机号",
-          prop: "telphone",
+          prop: "telphoneStr",
           hidden: true,
         },
         {

+ 4 - 0
src/views/secondBuild/learningList/index.vue

@@ -71,6 +71,10 @@ export default {
           placeholder: "手机号码",
           prop: "telphone",
         },
+        {
+          placeholder: "视频名称",
+          prop: "sectionName",
+        },
       ],
       formData: {
         realname: "",

+ 4 - 0
src/views/secondJian/learningList/index.vue

@@ -71,6 +71,10 @@ export default {
           placeholder: "手机号码",
           prop: "telphone",
         },
+        {
+          placeholder: "视频名称",
+          prop: "sectionName",
+        },
       ],
       formData: {
         realname: "",

+ 4 - 0
src/views/secondSeven/learningList/index.vue

@@ -71,6 +71,10 @@ export default {
           placeholder: "手机号码",
           prop: "telphone",
         },
+        {
+          placeholder: "视频名称",
+          prop: "sectionName",
+        },
       ],
       formData: {
         realname: "",

+ 4 - 0
src/views/secondZao/learningList/index.vue

@@ -71,6 +71,10 @@ export default {
           placeholder: "手机号码",
           prop: "telphone",
         },
+        {
+          placeholder: "视频名称",
+          prop: "sectionName",
+        },
       ],
       formData: {
         realname: "",

+ 2 - 2
src/views/systemManagement/registeredUser/index.vue

@@ -95,12 +95,12 @@ export default {
         },
         {
           label: "身份证",
-          prop: "idCard",
+          prop: "idCardStr",
           hidden: true,
         },
         {
           label: "手机号码",
-          prop: "telphone",
+          prop: "telphoneStr",
           hidden: true,
         },
         {