监管平台需求修改

src/components/tableList.vue

@@ -263,6 +263,14 @@
             >
             <span v-else>{{ scope.row[item.prop] }}</span>
           </div>
+          <ul v-else-if="item.scope === 'baseInfo'">
+           <li>姓名：{{ scope.row[item.prop1] }}</li>
+           <li>身份证：{{ scope.row[item.prop2] }}</li>
+           <li>公司：{{ scope.row[item.prop3] }}</li>
+          </ul>
+          <span v-else-if="item.scope === 'recordEndTime'">
+            {{ scope.row[item.prop] ? '完成':'未完成' }}
+          </span>
           <span
             v-else-if="
               item.scope === 'treeWatch' &&

src/newApi/classTab.js

@@ -288,6 +288,14 @@ export default {
             params: data
         })
     },
+    //查询学员视频学习记录列表
+    inquireGradegradelistUserVideoRecord(data) {
+        return request({
+            url: '/grade/grade/listUserVideoRecord',
+            method: 'get',
+            params: data
+        })
+    },
     
     
 }

src/views/classHoursReview/component/ChapterTable.vue

@@ -25,6 +25,9 @@
       <el-table-column align="center" prop="typeName" :label="label + '标题'">
       </el-table-column>
       <el-table-column align="center" prop="classHours" label="学时">
+        <template slot-scope="scope">
+          {{ scope.row.classHours?scope.row.classHours.toFixed(1):scope.row.classHours }}
+        </template>
       </el-table-column>
       <el-table-column align="center" label="开始学习时间">
         <template slot-scope="scope">

src/views/classHoursReview/component/LessonTable.vue

@@ -21,6 +21,15 @@
                 scope.row.userStudyRecordPhotoList.length
               "
             >
+              <li class="liImgs">
+                <el-image
+                  style="width: 100%; height: 100%"
+                  :src="$methodsTools.splitImgHost(getUserImg)"
+                  :preview-src-list="[$methodsTools.splitImgHost(getUserImg)]"
+                >
+                </el-image>
+                <div class="abos">一寸头像图</div>
+              </li>
               <li
                 v-for="(its, inds) in scope.row.userStudyRecordPhotoList"
                 :key="inds"
@@ -134,8 +143,21 @@
           <span v-else-if="item.scope === 'aTime'">
             {{ $methodsTools.onlyForma(scope2.row[item.prop]) }}
           </span>
+          <span v-else-if="item.scope === 'durationTime' && scope2.row.type !== 5">
+            <!-- {{ $methodsTools.secondToDate(scope2.row[item.prop], false) }} -->
+            {{ (scope2.row[item.prop] / 60 / 45).toFixed(2) }}
+          </span>
           <span v-else-if="item.scope === 'durTime' && scope2.row.type !== 5">
             {{ $methodsTools.secondToDate(scope2.row[item.prop], false) }}
+            <!-- {{ (scope2.row[item.prop] / 60 / 45).toFixed(2) }} -->
+          </span>
+          <span
+            v-else-if="
+              item.scope === 'performance' &&
+              (scope2.row.type === 4 || scope2.row.type === 5)
+            "
+          >
+            {{ scope2.row[item.prop] }}
           </span>
           <div v-else-if="item.scope === 'aTimeSE'">
             <span
@@ -175,7 +197,7 @@ export default {
       },
     },
   },
-  inject: ["getPeriodStatus", "getUserInfo", "getAllIds"],
+  inject: ["getPeriodStatus", "getUserInfo", "getAllIds", "getUserImgPhoto"],
   data() {
     return {
       tableSet: [
@@ -214,11 +236,23 @@ export default {
           ],
         },
         {
-          label: "节时长",
+          label: "学时",
+          prop: "durationTime",
+          width: "120px",
+          scope:"durationTime"
+        },
+        {
+          label: "时长",
           prop: "durationTime",
           width: "120px",
           scope: "durTime",
         },
+        {
+          label: "分数",
+          prop: "performance",
+          width: "120px",
+          scope: "performance",
+        },
         {
           label: "开始时间",
           prop: "studyStartTime",
@@ -229,40 +263,40 @@ export default {
           prop: "studyEndTime",
           scope: "aTimeSE",
         },
-        {
-          label: "审核状态",
-          prop: "status",
-          scope: "select",
-          width: "100px",
-          options: [
-            {
-              label: "待审核",
-              value: 2,
-            },
-            {
-              label: "通过",
-              value: 1,
-            },
-            {
-              label: "作弊",
-              value: 0,
-            },
-            {
-              label: "待重修",
-              value: 3,
-            },
-          ],
-        },
-        {
-          label: "审核人",
-          prop: "auditUserName",
-          width: "100px",
-        },
-        {
-          label: "审核时间",
-          prop: "auditTime",
-          scope: "aTime",
-        },
+        // {
+        //   label: "审核状态",
+        //   prop: "status",
+        //   scope: "select",
+        //   width: "100px",
+        //   options: [
+        //     {
+        //       label: "待审核",
+        //       value: 2,
+        //     },
+        //     {
+        //       label: "通过",
+        //       value: 1,
+        //     },
+        //     {
+        //       label: "作弊",
+        //       value: 0,
+        //     },
+        //     {
+        //       label: "待重修",
+        //       value: 3,
+        //     },
+        //   ],
+        // },
+        // {
+        //   label: "审核人",
+        //   prop: "auditUserName",
+        //   width: "100px",
+        // },
+        // {
+        //   label: "审核时间",
+        //   prop: "auditTime",
+        //   scope: "aTime",
+        // },
       ],
       disabledBtn: false,
       vidBoxHours: false,
@@ -339,6 +373,9 @@ export default {
     periodStatus() {
       return this.getPeriodStatus();
     },
+    getUserImg() {
+      return this.getUserImgPhoto();
+    },
     allIds() {
       return this.getAllIds();
     },
@@ -349,7 +386,7 @@ export default {
 };
 </script>
 
-<style  lang="less" scoped>
+<style lang="less" scoped>
 .liImgs {
   float: left;
   width: 210px;
@@ -393,4 +430,4 @@ export default {
   margin-left: 0px;
   margin-bottom: 10px;
 }
-</style>
+</style>

src/views/classHoursReview/component/StudyTables.vue

@@ -71,7 +71,7 @@
 
     <el-checkbox-group v-model="checkList" @change="handleCheckedCitiesChange">
       <component :is="keys[key]" v-for="key in Object.keys(tablesData)" :key="key" :tabledata="tablesData[key]"
-        :label="key == 5 ? '卷' : '章'"></component>
+        :label="key == 5 ? '卷' : '章'" :userImg="userImg"></component>
     </el-checkbox-group>
 
     <Cheat-dialog :disabledBtn="disabledBtn" :vidBoxHours.sync="vidBoxHours" @close="loadingClose" @submit="
@@ -166,6 +166,7 @@ export default {
       getPeriodStatus: () => this.periodStatus,
       getUserInfo: this.getUserInfo,
       getAllIds: () => this.allIds,
+      getUserImgPhoto:() => this.userData.oneInchPhotos
     };
   },
   data() {
@@ -210,7 +211,8 @@ export default {
       allType3List: [],
       offsetTop: 0,
       offsetHeight: 0,
-      headerFixed: false
+      headerFixed: false,
+      userImg:"",
     };
   },
   methods: {
@@ -426,6 +428,13 @@ export default {
       immediate: true,
       deep: true,
     },
+    userData: {
+      handler(val) {
+        this.userImg = val.oneInchPhotos
+      },
+      immediate: true,
+      deep: true,
+    },
   },
   computed: {
     periodStatus() {

src/views/secondJian/learningList/index.vue

@@ -1,5 +1,12 @@
 <template>
   <div id="">
+    <search-box-new
+      ref="searchBox"
+      :formData="formData"
+      :formList="formList"
+      @search="search"
+      @init="search(2)"
+    />
     <table-list
       :tableSets="tableSet"
       :tableData="tableData"
@@ -23,11 +30,12 @@
 </template>
 
 <script>
+import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
   name: "",
-  components: { tableList, pagination },
+  components: { searchBoxNew,tableList, pagination },
   data() {
     return {
       size: "small",
@@ -45,7 +53,29 @@ export default {
           title: "未定义",
         },
       },
+      formList: [
+        {
+          placeholder: "学员姓名",
+          prop: "realname",
+        },
+        {
+          placeholder: "身份证",
+          prop: "idCard",
+        },
+        {
+          placeholder: "公司名称",
+          prop: "companyName",
+        },
+        {
+          placeholder: "手机号码",
+          prop: "telphone",
+        },
+      ],
       formData: {
+        realname: "",
+        idcard: "",
+        companyName: "",
+        telphone: "",
         profileStatus: "",
         periodStatus: "",
         status: 1,
@@ -55,139 +85,62 @@ export default {
       // 表单
       tableSet: [
         {
-          label: "学员姓名",
-          prop: "realName",
+          label: "基本信息",
+          prop1: "realName",
+          prop2: "idCard",
+          prop3: "companyName",
           hidden: true,
+          scope: "baseInfo",
         },
         {
-          label: "学员身份证",
-          prop: "idCard",
-          hidden: true,
-        },
-        {
-          label: "一寸头像照",
+          label: "头像",
           prop: "oneInchPhotos",
           hidden: true,
           scope: "img",
           width: "120px",
         },
         {
-          label: "最近人脸照",
+          label: "最新拍照",
           prop: "idCardImg1",
           hidden: true,
           scope: "img",
           width: "120px",
         },
         {
-          label: "商品名称",
-          prop: "goodsName",
+          label: "学习班名称",
+          prop: "className",
           hidden: true,
         },
         {
-          label: "学时",
-          prop: "classHours",
+          label: "视频名称",
+          prop: "sectionName",
           hidden: true,
         },
         {
-          label: "所在班级",
-          prop: "className",
+          label: "在线时间",
+          prop: "onLineTime",
           hidden: true,
+          scope: "aTimeList",
         },
-        // {
-        //   label: "学习服务期",
-        //   prop1: "serviceStartTime",
-        //   prop2: "serviceEndTime",
-        //   hidden: true,
-        //   Diszing: true,
-        //   scope: "TimeLists",
-        // },
-        // {
-        //   label: "班级有效期",
-        //   prop1: "classStartTime",
-        //   prop2: "classEndTime",
-        //   scope: "TimeLists",
-        //   Diszing: false,
-        //   hidden: false,
-        // },
         {
           label: "学习时间",
-          prop1: "startTime",
-          prop2: "endTime",
+          prop1: "recordStartTime",
+          prop2: "recordEndTime",
           scope: "TimeLists",
           hidden: false,
         },
-        // {
-        //   label: "学习状态",
-        //   prop: "periodStatus",
-        //   hidden: true,
-        //   scope: "isOptions",
-        //   options: [
-        //     {
-        //       label: "已完成",
-        //       value: 0,
-        //     },
-        //     {
-        //       label: "已完成",
-        //       value: 1,
-        //     },
-        //     {
-        //       label: "已完成",
-        //       value: 2,
-        //     },
-        //     {
-        //       label: "未完成",
-        //       value: -1,
-        //     },
-        //   ],
-        // },
         {
-          label: "学时审核状态",
-          prop: "periodStatus",
+          label: "时长",
+          prop: "durationTime",
           hidden: true,
-          scope: "isOptions",
-          options: [
-            {
-              label: "不可审核",
-              value: -1,
-            },
-            {
-              label: "待审核",
-              value: 2,
-            },
-            {
-              label: "审核不通过",
-              value: 0,
-            },
-            {
-              label: "审核通过",
-              value: 1,
-            },
-            {
-              label: "审核中",
-              value: 3,
-            },
-          ],
+          scope: "convert",
+        },
+        {
+          label: "是否完成",
+          prop: "recordEndTime",
+          hidden: true,
+          scope: "recordEndTime",
         },
-        // {
-        //   label: "学时官方推送状态",
-        //   prop: "periodPlush",
-        //   hidden: true,
-        //   scope: "isOptions",
-        //   options: [
-        //     {
-        //       label: "否",
-        //       value: null,
-        //     },
-        //     {
-        //       label: "否",
-        //       value: 0,
-        //     },
-        //     {
-        //       label: "是",
-        //       value: 1,
-        //     },
-        //   ],
-        // },
       ],
       tableData: [], //表单数据
       total: 0, //一共多少条
@@ -279,9 +232,16 @@ export default {
       if (int === 1) {
         this.formData.pageNum = 1;
       }
+      if (int === 2) {
+        this.formData.pageNum = 1;
+        this.formData.realname = "";
+        this.formData.idCard = "";
+        this.formData.companyName = "";
+        this.formData.telphone = "";
+      }
       var data = JSON.parse(JSON.stringify(this.formData));
       this.$api
-        .inquireGradegradelistUserPeriod(data)
+        .inquireGradegradelistUserVideoRecord(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;

src/views/secondZao/learningList/index.vue

@@ -1,5 +1,12 @@
 <template>
   <div id="">
+    <search-box-new
+      ref="searchBox"
+      :formData="formData"
+      :formList="formList"
+      @search="search"
+      @init="search(2)"
+    />
     <table-list
       :tableSets="tableSet"
       :tableData="tableData"
@@ -23,11 +30,12 @@
 </template>
 
 <script>
+import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
   name: "",
-  components: { tableList, pagination },
+  components: { searchBoxNew, tableList, pagination },
   data() {
     return {
       size: "small",
@@ -45,7 +53,29 @@ export default {
           title: "未定义",
         },
       },
+      formList: [
+        {
+          placeholder: "学员姓名",
+          prop: "realname",
+        },
+        {
+          placeholder: "身份证",
+          prop: "idCard",
+        },
+        {
+          placeholder: "公司名称",
+          prop: "companyName",
+        },
+        {
+          placeholder: "手机号码",
+          prop: "telphone",
+        },
+      ],
       formData: {
+        realname: "",
+        idcard: "",
+        companyName: "",
+        telphone: "",
         profileStatus: "",
         periodStatus: "",
         status: 1,
@@ -55,139 +85,62 @@ export default {
       // 表单
       tableSet: [
         {
-          label: "学员姓名",
-          prop: "realName",
+          label: "基本信息",
+          prop1: "realName",
+          prop2: "idCard",
+          prop3: "companyName",
           hidden: true,
+          scope: "baseInfo",
         },
         {
-          label: "学员身份证",
-          prop: "idCard",
-          hidden: true,
-        },
-        {
-          label: "一寸头像照",
+          label: "头像",
           prop: "oneInchPhotos",
           hidden: true,
           scope: "img",
           width: "120px",
         },
         {
-          label: "最近人脸照",
+          label: "最新拍照",
           prop: "idCardImg1",
           hidden: true,
           scope: "img",
           width: "120px",
         },
         {
-          label: "商品名称",
-          prop: "goodsName",
+          label: "学习班名称",
+          prop: "className",
           hidden: true,
         },
         {
-          label: "学时",
-          prop: "classHours",
+          label: "视频名称",
+          prop: "sectionName",
           hidden: true,
         },
         {
-          label: "所在班级",
-          prop: "className",
+          label: "在线时间",
+          prop: "onLineTime",
           hidden: true,
+          scope: "aTimeList",
         },
-        // {
-        //   label: "学习服务期",
-        //   prop1: "serviceStartTime",
-        //   prop2: "serviceEndTime",
-        //   hidden: true,
-        //   Diszing: true,
-        //   scope: "TimeLists",
-        // },
-        // {
-        //   label: "班级有效期",
-        //   prop1: "classStartTime",
-        //   prop2: "classEndTime",
-        //   scope: "TimeLists",
-        //   Diszing: false,
-        //   hidden: false,
-        // },
         {
           label: "学习时间",
-          prop1: "startTime",
-          prop2: "endTime",
+          prop1: "recordStartTime",
+          prop2: "recordEndTime",
           scope: "TimeLists",
           hidden: false,
         },
-        // {
-        //   label: "学习状态",
-        //   prop: "periodStatus",
-        //   hidden: true,
-        //   scope: "isOptions",
-        //   options: [
-        //     {
-        //       label: "已完成",
-        //       value: 0,
-        //     },
-        //     {
-        //       label: "已完成",
-        //       value: 1,
-        //     },
-        //     {
-        //       label: "已完成",
-        //       value: 2,
-        //     },
-        //     {
-        //       label: "未完成",
-        //       value: -1,
-        //     },
-        //   ],
-        // },
         {
-          label: "学时审核状态",
-          prop: "periodStatus",
+          label: "时长",
+          prop: "durationTime",
           hidden: true,
-          scope: "isOptions",
-          options: [
-            {
-              label: "不可审核",
-              value: -1,
-            },
-            {
-              label: "待审核",
-              value: 2,
-            },
-            {
-              label: "审核不通过",
-              value: 0,
-            },
-            {
-              label: "审核通过",
-              value: 1,
-            },
-            {
-              label: "审核中",
-              value: 3,
-            },
-          ],
+          scope: "convert",
+        },
+        {
+          label: "是否完成",
+          prop: "recordEndTime",
+          hidden: true,
+          scope: "recordEndTime",
         },
-        // {
-        //   label: "学时官方推送状态",
-        //   prop: "periodPlush",
-        //   hidden: true,
-        //   scope: "isOptions",
-        //   options: [
-        //     {
-        //       label: "否",
-        //       value: null,
-        //     },
-        //     {
-        //       label: "否",
-        //       value: 0,
-        //     },
-        //     {
-        //       label: "是",
-        //       value: 1,
-        //     },
-        //   ],
-        // },
       ],
       tableData: [], //表单数据
       total: 0, //一共多少条
@@ -279,9 +232,16 @@ export default {
       if (int === 1) {
         this.formData.pageNum = 1;
       }
+      if (int === 2) {
+        this.formData.pageNum = 1;
+        this.formData.realname = "";
+        this.formData.idCard = "";
+        this.formData.companyName = "";
+        this.formData.telphone = "";
+      }
       var data = JSON.parse(JSON.stringify(this.formData));
       this.$api
-        .inquireGradegradelistUserPeriod(data)
+        .inquireGradegradelistUserVideoRecord(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;