Merge branch 'dev_Ma_pre' into 'develop'

提交

See merge request !87

src/views/report/Employeelearning.vue

@@ -2,7 +2,7 @@
   <!-- 员工学习数据页面 -->
   <div class="employeelearning">
     <!-- 以下为顶部搜索框 -->
-    <div class="filter">
+    <div class="filterShow">
       <div class="select">
         <!-- <a-select
           style="width: 100%"
@@ -56,29 +56,29 @@
         </a-input>
       </div>
       <div style="display: flex; margin-bottom: 20px">
-        <div class="btnn btn1" @click="getTableData">
+        <div class="btnzx btnzx1" @click="getTableData">
           <div class="search"></div>
-          <div class="btnText">搜索</div>
+          <div class="btnzText">搜索</div>
         </div>
-        <div class="btn btn2" @click="reset">
+        <div class="btnz btnzx2" @click="reset">
           <div class="search"></div>
-          <div class="btnText">重置</div>
+          <div class="btnzText">重置</div>
         </div>
       </div>
     </div>
     <!-- 以下为导出按钮 -->
-    <div class="btns">
-      <div class="btn btn3" @click="exportAllBtn" style="margin-right: 20px">
+    <div class="btnzs">
+      <div class="btnz btnz3" @click="exportAllbtnz" style="margin-right: 20px">
         <div>
           <img src="../../assets/images/coursewareManage/export1.png" alt="" />
         </div>
-        <div class="btnText">导出全部</div>
+        <div class="btnzText">导出全部</div>
       </div>
-      <div class="btn btn3" @click="exportBtn">
+      <div class="btnz btnz3" @click="exportbtnz">
         <div>
           <img src="../../assets/images/coursewareManage/export1.png" alt="" />
         </div>
-        <div class="btnText">导出</div>
+        <div class="btnzText">导出</div>
       </div>
     </div>
     <!-- 以下为table表格 -->
@@ -159,7 +159,7 @@ export default {
       }
     };
     //导出
-    const exportBtn = async () => {
+    const exportbtnz = async () => {
       if (!state.selectedRowKeys?.length) {
         return message.warning("请至少选择一条数据进行导出");
       } else {
@@ -350,7 +350,7 @@ export default {
     };
 
     // 导出全部按钮
-    const exportAllBtn = async () => {
+    const exportAllbtnz = async () => {
       axios({
         method: "post",
         url: "/report/boeu/studyData/exportAll",
@@ -373,9 +373,9 @@ export default {
       state.tableLoading = true;
     });
     return {
-      exportAllBtn,
+      exportAllbtnz,
       onSelectChange,
-      exportBtn,
+      exportbtnz,
       reset,
       getTableData,
       ...toRefs(state),
@@ -392,7 +392,7 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-  .filter {
+  .filterShow {
     margin-left: 38px;
     margin-right: 20px;
     margin-top: 30px;
@@ -404,7 +404,7 @@ export default {
       width: calc((100% - 76px - 240px) / 4);
     }
 
-    .btn {
+    .btnz {
       padding: 0px 26px 0px 26px;
       height: 38px;
       background: rgba(64, 158, 255, 0);
@@ -421,7 +421,7 @@ export default {
         background-size: 100%;
       }
 
-      .btnText {
+      .btnzText {
         font-size: 14px;
         font-weight: 400;
         color: rgba(64, 158, 255, 1);
@@ -430,7 +430,7 @@ export default {
       }
     }
 
-    .btnn {
+    .btnzx {
       padding: 0px 26px 0px 26px;
       height: 38px;
       background: #4ea6ff;
@@ -447,7 +447,7 @@ export default {
         background-size: 100%;
       }
 
-      .btnText {
+      .btnzText {
         font-size: 14px;
         font-weight: 400;
         color: #ffffff;
@@ -456,7 +456,7 @@ export default {
       }
     }
 
-    .btn1 {
+    .btnzx1 {
       .search {
         width: 15px;
         height: 17px;
@@ -464,39 +464,39 @@ export default {
       }
     }
 
-    .btn2 {
+    .btnzx2 {
       background: #4ea6ff;
       .search {
         width: 16px;
         height: 18px;
         background-image: url("../../assets/images/courseManage/reset0.png");
       }
-      .btnText {
+      .btnzText {
         color: #ffffff;
       }
     }
 
-    .btn1:hover {
+    .btnzx1:hover {
       background: rgba(64, 158, 255, 0.76);
 
       .search {
         background-image: url("../../assets/images/courseManage/search0.png");
       }
 
-      .btnText {
+      .btnzText {
         color: #ffffff;
       }
     }
 
-    .btn1:active {
+    .btnzx1:active {
       background: #0982ff;
     }
 
-    .btn2:hover {
+    .btnzx2:hover {
       background: rgba(64, 158, 255, 0.76);
     }
 
-    .btn2:active {
+    .btnzx2:active {
       background: #0982ff;
     }
   }
@@ -507,11 +507,11 @@ export default {
       background-color: #eff4fc;
     }
   }
-  .btns {
+  .btnzs {
     display: flex;
     margin-left: 38px;
     // flex-wrap: wrap;
-    .btn {
+    .btnz {
       padding: 0px 26px 0px 26px;
       height: 38px;
       background: white;
@@ -528,7 +528,7 @@ export default {
         background-size: 100%;
       }
 
-      .btnText {
+      .btnzText {
         font-size: 14px;
         font-weight: 400;
         color: #4ea6ff;
@@ -537,7 +537,7 @@ export default {
       }
     }
 
-    .btn3 {
+    .btnz3 {
       margin-right: 0px;
       background: #4ea6ff;
       .search {
@@ -545,17 +545,17 @@ export default {
         height: 18px;
         background-image: url("../../assets/images/courseManage/add0.png");
       }
-      .btnText {
+      .btnzText {
         color: #ffffff;
       }
     }
 
-    .btn3:hover {
+    .btnz3:hover {
       // background: rgba(64, 158, 255, 0.76);
       background: rgba(64, 158, 255, 0.76);
     }
 
-    .btn3:active {
+    .btnz3:active {
       background: #0982ff;
     }
   }

src/views/report/Overvoew.vue

@@ -2,7 +2,7 @@
   <!-- 概览! -->
   <div class="overvoew">
     <!-- 以下为顶部搜索框 -->
-    <div class="filter">
+    <div class="filterShow">
       <div class="select">
         <!-- <a-select
           style="width: 100%"
@@ -45,18 +45,18 @@
         </a-input>
       </div>
       <div style="display: flex; margin-bottom: 20px">
-        <div class="btnn btn1" @click="searchClick">
+        <div class="btnzx btnzx1" @click="searchClick">
           <div class="search"></div>
-          <div class="btnText">搜索</div>
+          <div class="btnzText">搜索</div>
         </div>
-        <div class="btn btn2" @click="reset">
+        <div class="btnz btnzx2" @click="reset">
           <div class="search"></div>
-          <div class="btnText">重置</div>
+          <div class="btnzText">重置</div>
         </div>
       </div>
     </div>
     <!-- 以下为导出按钮 -->
-    <div class="tabBtn">
+    <div class="tabbtnz">
       <div class="tab">
         <div
           v-for="(item, index) in tabData"
@@ -67,9 +67,9 @@
           {{ item.text }} ({{ item.num }})
         </div>
       </div>
-      <div class="btns">
+      <div class="btnzs">
         <div
-          class="btn btn3"
+          class="btnz btnz3"
           @click="exportClickAll"
           style="margin-right: 15px"
         >
@@ -79,16 +79,16 @@
               alt=""
             />
           </div>
-          <div class="btnText">全部导出</div>
+          <div class="btnzText">全部导出</div>
         </div>
-        <div class="btn btn3" @click="exportClick">
+        <div class="btnz btnz3" @click="exportClick">
           <div>
             <img
               src="../../assets/images/coursewareManage/export1.png"
               alt=""
             />
           </div>
-          <div class="btnText">导出</div>
+          <div class="btnzText">导出</div>
         </div>
       </div>
     </div>
@@ -154,6 +154,8 @@
                 ? "已发布"
                 : record.status == "-1"
                 ? "已停用"
+                : record.status == "2"
+                ? "已撤回"
                 : ""
             }}</span>
           </template>
@@ -426,7 +428,9 @@ export default {
           url: "/report/boeu/case/exportAll",
           data: {
             name: state.name,
-            organizationId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+            organizationId: state.orgId
+              ? state.orgId[state.orgId.length - 1]
+              : null,
             createName: state.creator,
           },
           responseType: "blob",
@@ -442,7 +446,9 @@ export default {
           url: "/report/boeu/exam/exportAll",
           data: {
             name: state.name,
-            organizationId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+            organizationId: state.orgId
+              ? state.orgId[state.orgId.length - 1]
+              : null,
             createName: state.creator,
           },
           responseType: "blob",
@@ -458,7 +464,9 @@ export default {
           url: "/report/boeu/course/exportAll",
           data: {
             name: state.name,
-            organizationId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+            organizationId: state.orgId
+              ? state.orgId[state.orgId.length - 1]
+              : null,
             createName: state.creator,
           },
           responseType: "blob",
@@ -474,7 +482,9 @@ export default {
           url: "/report/boeu/teaching/exportAll",
           data: {
             name: state.name,
-            organizationId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+            organizationId: state.orgId
+              ? state.orgId[state.orgId.length - 1]
+              : null,
             createName: state.creator,
           },
           responseType: "blob",
@@ -490,7 +500,9 @@ export default {
           url: "/report/boeu/router/exportAll",
           data: {
             name: state.name,
-            organizationId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+            organizationId: state.orgId
+              ? state.orgId[state.orgId.length - 1]
+              : null,
             createName: state.creator,
           },
           responseType: "blob",
@@ -1370,7 +1382,7 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-  .filter {
+  .filterShow {
     margin-left: 38px;
     margin-right: 20px;
     margin-top: 30px;
@@ -1382,7 +1394,7 @@ export default {
       width: calc((100% - 76px - 220px) / 3);
     }
 
-    .btn {
+    .btnz {
       padding: 0px 26px 0px 26px;
       height: 38px;
       background: rgba(64, 158, 255, 0);
@@ -1399,7 +1411,7 @@ export default {
         background-size: 100%;
       }
 
-      .btnText {
+      .btnzText {
         font-size: 14px;
         font-weight: 400;
         color: rgba(64, 158, 255, 1);
@@ -1408,7 +1420,7 @@ export default {
       }
     }
 
-    .btnn {
+    .btnzx {
       padding: 0px 26px 0px 26px;
       height: 38px;
       background: #4ea6ff;
@@ -1425,7 +1437,7 @@ export default {
         background-size: 100%;
       }
 
-      .btnText {
+      .btnzText {
         font-size: 14px;
         font-weight: 400;
         color: #ffffff;
@@ -1434,7 +1446,7 @@ export default {
       }
     }
 
-    .btn1 {
+    .btnzx1 {
       .search {
         width: 15px;
         height: 17px;
@@ -1442,7 +1454,7 @@ export default {
       }
     }
 
-    .btn2 {
+    .btnzx2 {
       margin-right: 0px !important;
       background: #4ea6ff;
       .search {
@@ -1451,47 +1463,47 @@ export default {
 
         background-image: url("../../assets/images/courseManage/reset0.png");
       }
-      .btnText {
+      .btnzText {
         color: white;
       }
     }
 
-    .btn1:hover {
+    .btnzx1:hover {
       background: rgba(64, 158, 255, 0.76);
 
       .search {
         background-image: url("../../assets/images/courseManage/search0.png");
       }
 
-      .btnText {
+      .btnzText {
         color: #ffffff;
       }
     }
-    .btn2:hover {
+    .btnzx2:hover {
       background: rgba(64, 158, 255, 0.76);
 
       .search {
         background-image: url("../../assets/images/courseManage/reset0.png");
       }
 
-      .btnText {
+      .btnzText {
         color: #ffffff;
       }
     }
-    .btn1:active,
-    .btn2:active {
+    .btnzx1:active,
+    .btnzx2:active {
       background: #0982ff;
     }
 
-    // .btn2:hover {
+    // .btnzx2:hover {
     //   background: rgba(64, 158, 255, 0.1);
     // }
 
-    // .btn2:active {
+    // .btnzx2:active {
     //   background: rgba(64, 158, 255, 0.2);
     // }
   }
-  .tabBtn {
+  .tabbtnz {
     width: 100%;
     height: 40px;
     display: flex;
@@ -1517,11 +1529,11 @@ export default {
         cursor: pointer;
       }
     }
-    .btns {
+    .btnzs {
       display: flex;
       margin-right: 38px;
       // flex-wrap: wrap;
-      .btn {
+      .btnz {
         padding: 0px 26px 0px 26px;
         height: 38px;
         background: white;
@@ -1538,7 +1550,7 @@ export default {
           background-size: 100%;
         }
 
-        .btnText {
+        .btnzText {
           font-size: 14px;
           font-weight: 400;
           color: #4ea6ff;
@@ -1547,7 +1559,7 @@ export default {
         }
       }
 
-      .btn3 {
+      .btnz3 {
         margin-right: 0px;
         background: #4ea6ff;
         .search {
@@ -1555,12 +1567,12 @@ export default {
           height: 18px;
           background-image: url("../../assets/images/courseManage/add0.png");
         }
-        .btnText {
+        .btnzText {
           color: #ffffff;
         }
       }
 
-      .btn3:hover {
+      .btnz3:hover {
         // background: rgba(64, 158, 255, 0.76);
         background: rgba(64, 158, 255, 0.76);
       }