feat:合并

src/components/BreadCrumb.vue

@@ -39,7 +39,7 @@ export default {
         ) {
           state.list = [
             {
-              name: "学习路径",
+              name: "学习路径图",
               href: "",
               // href: "#/coursewaremanage",
             },
@@ -48,7 +48,7 @@ export default {
         if (n.indexOf("/leveladd") !== -1 || n.indexOf("/LevelAdd") !== -1) {
           state.list = [
             {
-              name: "学习路径",
+              name: "学习路径图",
               href: "/learningpath",
             },
             {
@@ -62,7 +62,7 @@ export default {
         ) {
           state.list = [
             {
-              name: "学习路径",
+              name: "学习路径图",
               href: "/learningpath",
             },
             {
@@ -80,7 +80,7 @@ export default {
         ) {
           state.list = [
             {
-              name: "学习路径",
+              name: "学习路径图",
               href: "/learningpath",
             },
             {

src/components/NavLeft.vue

@@ -82,7 +82,7 @@
               src="../assets/images/navleft/studyPath.png"
             />
           </div>
-          <router-link to="/learningpath">学习路径</router-link>
+          <router-link to="/learningpath">学习路径图</router-link>
         </a-menu-item>
 
         <a-sub-menu key="sub2" @titleClick="titleClick">
@@ -326,7 +326,7 @@ export default {
           href: "/learningpath",
           openKeys: "sub1",
           selectedKeys: "sub1",
-          pagename: "学习路径",
+          pagename: "学习路径图",
         },
         {
           href: "/leveladd",

src/components/drawers/ActiveAttendance.vue

@@ -76,7 +76,7 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1"  @click="signQR">
+          <div class="btn btn1" @click="signQR">
             <div class="wz">签到二维码</div>
           </div>
           <div class="btn btn2" @click="showqdModal">
@@ -92,10 +92,10 @@
             <div class="left">
               <div class="img"></div>
               <div class="text" style="margin-left: 10px">已选择</div>
-              <div class="text2">{{selectedRowKeys.length}}</div>
+              <div class="text2">{{ selectedRowKeys.length }}</div>
               <div class="text">项</div>
               <div class="text3">列表选项总计：</div>
-              <div class="text4">{{tableData.length}}条</div>
+              <div class="text4">{{ tableData.length }}条</div>
             </div>
             <div class="right" @click="clearLine">清空</div>
           </div>
@@ -244,17 +244,17 @@
     </div>
   </a-modal>
   <!-- 二维码签到弹窗 -->
-  <SignQR v-model:signQRvisible="signQRvisible"/>
+  <SignQR v-model:signQRvisible="signQRvisible" />
 </template>
 
 <script>
 import { toRefs, reactive } from "vue";
-import SignQR from "./SignQR.vue"
+import SignQR from "./SignQR.vue";
 export default {
   name: "ActiveAttendance",
   components: {
     SignQR,
- },
+  },
   props: {
     AAvisible: {
       type: Boolean,
@@ -275,7 +275,7 @@ export default {
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
-      signQRvisible:false, //二维码弹窗
+      signQRvisible: false, //二维码弹窗
       qdModal: false, //批量签到
       singleqjModal: false, //单独请假
       singleqdModal: false, //单独签到
@@ -480,7 +480,7 @@ export default {
 
     const tableDataFunc = () => {
       const columns = [
-      {
+        {
           title: "工号",
           dataIndex: "workNum",
           key: "workNum",
@@ -553,7 +553,7 @@ export default {
           className: "h",
         },
         {
-          title: "操作",
+          title: "考勤情况",
           className: "h",
           dataIndex: "opacation",
           key: "opacation",
@@ -564,9 +564,9 @@ export default {
       return columns;
     };
     //清空所选
-    const clearLine = ()=> {
+    const clearLine = () => {
-      state.selectedRowKeys=[]
+      state.selectedRowKeys = [];
-    }
+    };
     const showqdModal = () => {
       state.qdModal = true;
     };
@@ -591,9 +591,9 @@ export default {
     const closesingleqjModal = () => {
       state.singleqjModal = false;
     };
-    const signQR = ()=> {
+    const signQR = () => {
-      state.signQRvisible = true
+      state.signQRvisible = true;
-    }
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -817,7 +817,6 @@ export default {
             }
           }
           .tableBox {
-
             .classify {
               padding-left: 0px !important;
             }

src/components/drawers/FaceStu.vue

@@ -150,7 +150,7 @@
     </div>
   </a-drawer>
   <!-- 二维码签到弹窗 -->
-  <SignQR v-model:signQRvisible="signQRvisible"/>
+  <SignQR v-model:signQRvisible="signQRvisible" />
   <!-- 导入学员抽屉 -->
   <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
   <!-- 批量签到弹窗 -->
@@ -188,13 +188,13 @@
 <script>
 import { toRefs, reactive } from "vue";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
-import SignQR from "./SignQR.vue"
+import SignQR from "./SignQR.vue";
 export default {
   name: "FaceManage",
   components: {
     ImpStu,
     SignQR,
- },
+  },
   props: {
     FSvisible: {
       type: Boolean,
@@ -210,7 +210,7 @@ export default {
       closeCopy: false, //签到弹窗关闭图标
       stopModal: false, //签退弹窗
       closeStop: false, //签退弹窗关闭图标
-      signQRvisible:false, //二维码弹窗
+      signQRvisible: false, //二维码弹窗
       name: null,
       showmodal: false, //勾选提示框
       closable: false, //modal右上角的关闭按钮
@@ -404,9 +404,9 @@ export default {
     const closeStopModal = () => {
       state.stopModal = false;
     };
-    const signQR = ()=> {
+    const signQR = () => {
-      state.signQRvisible = true
+      state.signQRvisible = true;
-    }
+    };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -450,6 +450,15 @@ export default {
     getTableData();
     const tableDataFunc = () => {
       const columns = [
+        {
+          title: "工号",
+          dataIndex: "com",
+          // width: "30%",
+          key: "com",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
         {
           title: "姓名",
           dataIndex: "name",
@@ -493,14 +502,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
+        // {
-          title: "签退时间",
+        //   title: "签退时间",
-          dataIndex: "jin",
+        //   dataIndex: "jin",
-          key: "jin",
+        //   key: "jin",
-          width: 110,
+        //   width: 110,
-          align: "center",
+        //   align: "center",
-          className: "h",
+        //   className: "h",
-        },
+        // },
         {
           title: "考勤",
           dataIndex: "time",
@@ -518,7 +527,7 @@ export default {
           className: "h",
         },
         {
-          title: "操作",
+          title: "考勤情况",
           className: "h",
           dataIndex: "opacation",
           key: "opacation",

src/components/drawers/StuAdd.vue

@@ -1087,7 +1087,7 @@ export default {
       const item1 = await getOrgInfoApi({
         pageNo: state.currentPage,
         pageSize: state.pageSize,
-        id: -1,
+        id: 0,
         keyWord: state.com,
       }).then((res) => {
         if (res.data.code === 200) return res.data.data.rows;
@@ -1116,9 +1116,10 @@ export default {
       const item1 = await getOrgInfoApi({
         pageNo: state.currentPage,
         pageSize: state.pageSize,
-        id: -1,
+        id: 0,
         keyWord: state.com,
       }).then((res) => {
+        // console.log("res", res);
         if (res.data.code === 200) return res.data.data.rows;
       });
       state.treeData = [];

src/store/index.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-09 09:26:26
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-23 17:25:31
+ * @LastEditTime: 2022-11-26 20:20:03
  * @FilePath: /fe-manage/src/store/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -14,7 +14,7 @@ export default createStore({
       ? JSON.parse(localStorage.getItem("openpages"))
       : [
         {
-          pagename: "学习路径",
+          pagename: "学习路径图",
           href: "/learningpath",
           active: true,
         },