fix

src/components/Comon/pictureList.vue

@@ -1,9 +1,17 @@
 <template>
   <div class="dis_flex_order_li">
-    <div class="list" v-for="(item, index) in list" :key="index" @click="backFunc(item)">
+    <div
+      class="list"
+      :class="{ 'listHover': item.hover}"
+      v-for="(item, index) in list"
+      :key="index"
+      @click="backFunc(item)"
+      @mouseover="item.hover = true"
+      @mouseleave="item.hover = false"
+    >
       <img :src="backFullSrc(item.img)" alt="" />
       <div class="right">
-        <h4>
+        <h4 :style="{ color: item.hover ? '#309bff': ''}">
           {{ item.label }}
           <span
             v-if="item.label === '盈亏' && info[item.prop] !== 0"
@@ -60,19 +68,24 @@ export default {
   display: flex;
   align-items: center;
   flex-wrap: wrap;
+  .listHover{
+    border: 1px solid #309bff !important;
+  }
   & > .list {
+    border: 1px solid transparent;
     user-select: none;
     cursor: pointer;
     background-color: rgb(243, 249, 255);
     padding: 4px;
     width: 170px;
     height: 60px;
-    border-radius: 3px;
+    border-radius: 8px;
     display: flex;
     align-items: center;
     flex-shrink: 0;
     margin-right: 10px;
     margin-bottom: 15px;
+
     & > img {
       margin-left: 10px;
       width: 36px;

src/newApi/classTab.js

@@ -430,5 +430,13 @@ export default {
             data
         })
     },
+    //班级学员获取信息推送数据
+    periodPlush(data) {
+        return request({
+            url: '/grade/grade/count/periodPlush',
+            method: 'get',
+            params: data
+        })
+    },
 
 }

src/store/modules/user.js

@@ -51,13 +51,13 @@ const user = {
         api.userdangAndatadownloadlist().then((res) => {
           let data = res.data || []
           commit('set_downLoadlist', data)
-          data.forEach(i => {
-            if (i.taskStatus == 3) {
-              api.userdangAndatadownloadup({ taskCode: i.taskCode }).then(result => {
-                methods.exportData(i.taskPath, false)
-              })
-            }
-          })
+          // data.forEach(i => {
+          //   if (i.taskStatus == 3) {
+          //     api.userdangAndatadownloadup({ taskCode: i.taskCode }).then(result => {
+          //       methods.exportData(i.taskPath, false)
+          //     })
+          //   }
+          // })
         }).catch(() => {
           // clearInterval(this.state.downLoadlistInterval)
         })

src/views/education/archives/downListRW.vue

@@ -15,6 +15,8 @@
         </el-table-column>
         <el-table-column prop="taskCode" label="文件编码" align="center">
         </el-table-column>
+        <el-table-column prop="fileName" label="文件名称" align="center">
+        </el-table-column>
         <el-table-column prop="taskStatus" label="状态" align="center">
           <template slot-scope="scope">
             {{ taskStatus(scope.row.taskStatus) }}

src/views/education/archives/fileDownload.vue

@@ -7,21 +7,21 @@
       :title="userList.length > 1 ? '档案批量下载' : '档案下载'"
       @close="close"
     >
-      <el-button
+      <!-- <el-button
         size="small"
         type="primary"
         style="margin-bottom: 14px"
         @click="plDown"
         >批量下载</el-button
-      >
+      > -->
       <el-table :data="tableData" style="width: 100%" border ref="table">
-        <el-table-column type="selection" width="55" align="center">
-        </el-table-column>
+        <!-- <el-table-column type="selection" width="55" align="center">
+        </el-table-column> -->
         <el-table-column prop="name" label="文件名称" align="center">
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="100" align="center">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="down([scope.row.value])"
+            <el-button type="text" size="small" @click="handleDown(scope.row.value)"
               >下载</el-button
             >
           </template>
@@ -38,23 +38,23 @@ export default {
       isShow: false,
       tableData: [
         {
-          name: "个人资料",
+          name: "学员信息",
           value: 1,
         },
         {
-          name: "证件照",
+          name: "个人资料",
           value: 2,
         },
         {
-          name: "身份证",
+          name: "订单记录",
           value: 3,
         },
         {
-          name: "订单记录",
+          name: "报名记录",
           value: 4,
         },
         {
-          name: "报名记录",
+          name: "学员记录",
           value: 5,
         },
         {
@@ -98,16 +98,9 @@ export default {
       this.userList = item || [];
       this.isShow = true;
     },
-    plDown() {
-      let len = this.$refs.table.selection;
-      if (len.length > 0) {
-        this.down(len.map((i) => i.value));
-      } else {
-        this.$message.error("请勾选需要下载的选项");
-      }
-    },
-    down(i) {
-      this.$confirm(`确定${i.length > 1 ? "批量" : ""}下载吗？`, "提示", {
+    handleDown(val) {
+      const isDownRecord = [6, 7, 8].includes(val)
+      this.$confirm(`${ isDownRecord ? "文件过大，需到下载记录完成下载。" : "确定下载吗？"}`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -116,15 +109,43 @@ export default {
           this.$api
             .userdangAndatadownload({
               userIds: this.userList,
-              types: i,
+              types: [val],
             })
             .then((res) => {
               this.$message.success("操作成功，正在下载");
+              if (!isDownRecord) this.$methodsTools.exportData(res.msg, false)
               this.$store.dispatch("downloadlist", true);
             });
         })
         .catch(() => {});
     },
+    // plDown() {
+    //   let len = this.$refs.table.selection;
+    //   if (len.length > 0) {
+    //     this.down(len.map((i) => i.value));
+    //   } else {
+    //     this.$message.error("请勾选需要下载的选项");
+    //   }
+    // },
+    // down(i) {
+    //   this.$confirm(`确定${i.length > 1 ? "批量" : ""}下载吗？`, "提示", {
+    //     confirmButtonText: "确定",
+    //     cancelButtonText: "取消",
+    //     type: "warning",
+    //   })
+    //     .then(() => {
+    //       this.$api
+    //         .userdangAndatadownload({
+    //           userIds: this.userList,
+    //           types: i,
+    //         })
+    //         .then((res) => {
+    //           this.$message.success("操作成功，正在下载");
+    //           this.$store.dispatch("downloadlist", true);
+    //         });
+    //     })
+    //     .catch(() => {});
+    // },
     close() {
       this.$refs.table.clearSelection();
     },

src/views/education/archives/index.vue

@@ -62,8 +62,9 @@
       :tableData="tableData"
       :navText="navText"
       :loading="loading"
-      :rowKey="'userId'"
+      :rowKey="row => row"
       ><template slot="customize">
+        <!-- :rowKey="'userId'" -->
         <el-button type="primary" @click="plUpdate">更新文字资料</el-button>
         <el-button type="primary" @click="plLeadInfo">更新图片资料</el-button>
         <el-button type="primary" @click="fileDownloadFunc()">批量下载</el-button>

src/views/education/classManageMent/classList/trainee/index.vue

@@ -162,6 +162,7 @@ import pagination from "@/components/pagination";
 import pictureList from "@/components/Comon/pictureList.vue";
 import tabClassDialog from "./tabClassDialog.vue";
 import changeClassDialog from "./changeClassDialog.vue";
+import pictureList from "@/components/Comon/pictureList.vue";
 export default {
   components: {
     pictureList,
@@ -171,6 +172,7 @@ export default {
     pagination,
     tabClassDialog,
     changeClassDialog,
+    pictureList
   },
   props: {
     showStatus: {
@@ -218,6 +220,24 @@ export default {
         pageNum: 1,
         // classStatus: "",
       },
+      info: {},
+      showTabList: [
+        {
+          label: "信息已推送",
+          img: "push",
+          prop: "plush",
+          num: true,
+          color: "#333333",
+        },
+        {
+          label: "信息待推送",
+          img: "waitPush",
+          prop: "notPlush",
+          num: true,
+          color: "#ff7a38",
+          hover: false,
+        },
+      ],
       // 表单
       tableSet: [
         {
@@ -611,6 +631,12 @@ export default {
     init() {
       this.search(2);
     },
+    pictureFunc(item) {
+      if (item.prop == "notPlush") {
+        this.$set(this.formData, 'periodPlush', 0)
+        this.search();
+      }
+    },
     del(v) {
       this.$alert(
         "确定删除此内容？<br />内容删除后将无法恢复，请慎重考虑",

src/views/education/examManagement/applicationData/bulkImportPlan/newYY.vue

@@ -230,6 +230,10 @@ export default {
           label: "学员报名类型",
           prop: "studentTypeName",
         },
+        {
+          label: "是否补考学员",
+          prop: "studentType",
+        },
         {
           label: "商品编码",
           prop: "code",

src/views/finance/invoiceManage/index.vue

@@ -205,6 +205,7 @@ export default {
           prop: "unApplyNum",
           num: true,
           color: "#ff7a38",
+          hover: false,
         },
       ],
       //搜索

src/views/finance/orderManage/index.vue

@@ -188,6 +188,7 @@ export default {
           prop: "unCheckOrderNum",
           num: true,
           color: "#ff7a38",
+          hover: false,
         },
         {
           label: "待审退款",
@@ -195,6 +196,7 @@ export default {
           prop: "unRefundNum",
           num: true,
           color: "#ff7a38",
+          hover: false,
         },
       ],
       //搜索

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

@@ -341,9 +341,9 @@
               :key="index"
               :label="item.label"
               align="center"
-              :show-overflow-tooltip="true"
               header-align="center"
             >
+            <!-- :show-overflow-tooltip="true" -->
               <template slot-scope="scope">
                 <div v-if="item.scope === 'moreList'">
                   <el-popover placement="right-end" width="250" trigger="hover">
@@ -593,6 +593,12 @@ export default {
         return setTs;
       };
     },
+    // 获取业务层次列全称
+    getBusinessName: function() {
+      return function(items, item) {
+        return `${items[item.prop1]}-${items[item.prop2]}-${items[item.prop3]}-${items[item.prop4]}`
+      }
+    }
   },
   mounted() {
     this.$api