WINDOWS-7IFQK7E\EDY 2 years ago
parent
commit
cbe0785a45

+ 0 - 20
src/components.d.ts

@@ -11,31 +11,12 @@ declare module '@vue/runtime-core' {
     RemoteList: typeof import('./components/RemoteList/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    VanButton: typeof import('vant/es')['Button']
     VanCard: typeof import('vant/es')['Card']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanCheckbox: typeof import('vant/es')['Checkbox']
-    VanCheckboxGroup: typeof import('vant/es')['CheckboxGroup']
-    VanCollapse: typeof import('vant/es')['Collapse']
-    VanCollapseItem: typeof import('vant/es')['CollapseItem']
     VanConfigProvider: typeof import('vant/es')['ConfigProvider']
-    VanCountDown: typeof import('vant/es')['CountDown']
-    VanDialog: typeof import('vant/es')['Dialog']
-    VanDropdownItem: typeof import('vant/es')['DropdownItem']
-    VanDropdownMenu: typeof import('vant/es')['DropdownMenu']
-    VanForm: typeof import('vant/es')['Form']
     VanGrid: typeof import('vant/es')['Grid']
     VanGridItem: typeof import('vant/es')['GridItem']
-    VanIcon: typeof import('vant/es')['Icon']
     VanList: typeof import('vant/es')['List']
-    VanLoading: typeof import('vant/es')['Loading']
-    VanNavBar: typeof import('vant/es')['NavBar']
     VanPullRefresh: typeof import('vant/es')['PullRefresh']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanRate: typeof import('vant/es')['Rate']
-    VanSkeleton: typeof import('vant/es')['Skeleton']
-    VanSticky: typeof import('vant/es')['Sticky']
     VanSwipe: typeof import('vant/es')['Swipe']
     VanSwipeItem: typeof import('vant/es')['SwipeItem']
     VanTab: typeof import('vant/es')['Tab']
@@ -43,6 +24,5 @@ declare module '@vue/runtime-core' {
     VanTabbarItem: typeof import('vant/es')['TabbarItem']
     VanTabs: typeof import('vant/es')['Tabs']
     VanTag: typeof import('vant/es')['Tag']
-    VanUploader: typeof import('vant/es')['Uploader']
   }
 }

+ 5 - 1
src/pages/_home/index.vue

@@ -124,7 +124,11 @@ function initData() {
 initData();
 
 function register() {
-  router.push('/zcdl');
+  if(user.token){
+    router.push('/xszc')
+  }else{
+    router.push('/zcdl');
+  }
 }
 
 

+ 13 - 4
src/pages/_home/xszc.vue

@@ -4,10 +4,19 @@
     <div>
       <van-form @submit="onSubmit" class="bg-light-50 w-full p-0">
         <van-cell-group inset v-for="(g, i) in forms">
-          <div v-if="childrenList.length > 1 || forms.length > 1" class="text-center px-6 mt-2">
-            <span v-if="childrenList.length > 1">学生{{ childrenList.length + 1 }}</span>
-            <span v-if="forms.length > 1">学生{{ i + 1 }}</span>
-            <span class="text-red-500 float-right cursor-pointer" @click="deleteStu(i)">删除</span>
+          <div
+            v-if="childrenList.length > 1 || forms.length > 1"
+            class="text-center px-6 mt-2"
+          >
+            <span v-if="childrenList.length > 1"
+              >学生{{ childrenList.length + i + 1}}</span
+            >
+            <span v-if="forms.length > 1 && childrenList.length==0">学生{{ i + 1 }}</span>
+            <span
+              class="text-red-500 float-right cursor-pointer"
+              @click="deleteStu(i)"
+              >删除</span
+            >
           </div>
           <div class="flex items-center w-full mt-2">
             <span>姓名</span>

+ 14 - 8
src/pages/myChildren/index.vue

@@ -41,7 +41,7 @@
               </div>
             </td>
             <td>
-              <div class="wxname">
+              <div class="parent">
                 <!-- <p v-if="s.parent.length > 0">{{ s.parent.realname }}</p> -->
                 <!-- <p v-else></p> -->
                 <p>{{  s.parent_realname }}</p>
@@ -94,7 +94,7 @@
       <p class="text-blue-600 text-4vw mt-3">已驳回</p>
       <!-- <p>{{驳回原因}}</p> -->
       <p class="text-gray-500 text-3vw mt-4 leading-5 tracking-wider">
-        驳回原因驳回原因驳回原因驳回原因驳回原因驳回原因驳回原因
+        {{ desc }}
       </p>
     </div>
     <div v-show="show" class="cover"></div>
@@ -161,10 +161,12 @@ function checkGroup() {
 }
 
 // 驳回详情
+let desc = $ref('');
 let rejectShow = $ref(false);
 function rejectData(s) {
   show = true;
   rejectShow = true;
+  desc = s.desc
 }
 // ×
 function cancelData() {
@@ -194,7 +196,7 @@ table {
   }
   th,
   td {
-    font-size: 3vw;
+    font-size: 3.8vw;
     letter-spacing: 0;
     text-align: left;
   }
@@ -203,19 +205,23 @@ table {
     /* padding:10px 10px 6px; */
   }
   .name {
-    width: 18vw !important;
+    width: 20vw !important;
     overflow: hidden;
   }
   .wxname {
-    width: 20vw;
+    width: 22vw;
+    overflow: hidden;
+  }
+  .parent{
+    width: 18vw;
     overflow: hidden;
   }
   .relative {
-    width: 15vw;
+    width: 20vw;
     overflow: hidden;
   }
   .action {
-    width: 20vw;
+    width: 25vw;
     min-width: 15vw;
     padding-right: 5px;
     text-align: center;
@@ -224,7 +230,7 @@ table {
   .action span {
     width: 90%;
     height: 25px;
-    font-size: 3.2vw;
+    font-size: 3.8vw;
     //   color: #fff;
     outline-color: none;
     border-radius: 4px;

+ 8 - 0
src/pages/stxkjs/stxk_js_classdetail/api.js

@@ -34,6 +34,14 @@ export const stxkjs_check = (data={}) =>
         }
     })
 
+// 补卡 
+export const stxk_repair = (data={}) =>{
+    return request({
+        url:'/khfw/kccq/checkin_repair',
+        data,
+    })
+}
+
 // 课堂反馈
 export const stxkjs_back = (data={})=>{
     return request({

+ 65 - 22
src/pages/stxkjs/stxk_js_classdetail/index.vue

@@ -8,7 +8,13 @@
     />
     <div class="detail" v-if="classdetail.khfw_kcgl">
       <h3 class="title">{{ classdetail.khfw_kcgl.kk_name }}</h3>
-      <p class="text-3vw text-gray-500 my-2"> <span>主讲 : {{ classdetail.teach_info.kkb_zjjs_xm }}</span> <span>地点:{{ classdetail.teach_info.kj_name }} <span>课时: {{ classdetail.khfw_kcgl.kk_kss }}</span></span> </p>
+      <p class="text-3vw text-gray-500 my-2">
+        <span>主讲 : {{ classdetail.teach_info.kkb_zjjs_xm }}</span>
+        <span
+          >地点:{{ classdetail.teach_info.kj_name }}
+          <span>课时: {{ classdetail.khfw_kcgl.kk_kss }}</span></span
+        >
+      </p>
       <p class="date">
         {{ classdetail.kkbk_starttime }} - {{ classdetail.kkbk_endtime }}
       </p>
@@ -23,16 +29,29 @@
           <span class="stu-num">上课人数:{{ classdetail.member.length }}</span>
           <div class="students">
             <span
-            class="stu-name"
+              class="stu-name"
               @click="selectStudent(stu)"
               :class="{ redName: stu.kccq_cqycztbh == 2 || stu.is_cq == 2 }"
               v-for="stu in classdetail.member"
               :key="stu"
-              >{{ stu.kkbm_s_realname }} {{ stu.kkbm_s_class_name }} <i v-show="stu.kccq_cqycztbh == 2"></i
+              >{{ stu.kkbm_s_realname }} {{ stu.kkbm_s_class_name }}
+              <i v-show="stu.kccq_cqycztbh == 2"></i
             ></span>
-            <van-radio-group v-model="checked" direction="horizontal" class="text-3.5vw mt-5">
-              <van-radio name="1" shape="square" icon-size="4vw" class="text-blue-500">未到</van-radio>
-              <van-radio name="2" shape="square" icon-size="4vw">补卡</van-radio>
+            <van-radio-group
+              v-model="checked"
+              direction="horizontal"
+              class="text-3.5vw mt-5"
+            >
+              <van-radio
+                name="1"
+                shape="square"
+                icon-size="4vw"
+                class="text-blue-500"
+                >未到</van-radio
+              >
+              <van-radio name="2" shape="square" icon-size="4vw"
+                >补卡</van-radio
+              >
             </van-radio-group>
             <!-- <div class="check">
               <input :disabled="plusCheck" type="checkbox" v-model="isTellCheck" />
@@ -177,7 +196,7 @@
               {{ s.realname }}
             </option>
           </select>
-          <div style="position: relative;">
+          <div style="position: relative">
             <input
               class="w-full pl-1.5"
               style="color: #9f9f9f"
@@ -219,6 +238,7 @@ import {
   grade_detail,
   kcbm_list,
   cdxs_add,
+  stxk_repair,
 } from "./api";
 import { stxk_up } from "../api";
 import { ref, reactive, nextTick } from "vue";
@@ -255,14 +275,23 @@ function getDetail() {
 getDetail();
 
 // 点名
-let checked = $ref('1')
+let user_ids = [];
+let checked = $ref("");
 function selectStudent(stu) {
+  // console.log(stu);
   if (stu.kccq_cqycztbh == 2) {
+    console.log(1111);
     stu.kccq_cqycztbh = 0;
     stu.is_cq = 0;
+    let index = user_ids.indexOf(stu.kkbm_s_user_id);
+    user_ids.splice(index, 1);
+    console.log(user_ids, "ids");
   } else {
+    console.log(22222);
     stu.kccq_cqycztbh = 2;
     stu.is_cq = 2;
+    user_ids.push(stu.kkbm_s_user_id);
+    console.log(user_ids, "ids");
   }
 }
 let memberMsg = ref([]);
@@ -274,16 +303,31 @@ function submitDM(member) {
       kccq_cqycztbh: item.kccq_cqycztbh,
     });
   });
-  const data = {
-    member: memberMsg.value,
-    kkbk_id: detailData.kkbk_id,
-    sendmsg: isTellCheck.value ? 1 : 0,
-    kccq_sfydm: 2,
-  };
-  stxkjs_check(data).then((res) => {
-    showToast(res.msg);
-    getDetail();
-  });
+  if (checked == "1") {
+    const data = {
+      member: memberMsg.value,
+      kkbk_id: detailData.kkbk_id,
+      sendmsg: isTellCheck.value ? 1 : 0,
+      kccq_sfydm: 2,
+    };
+    stxkjs_check(data).then((res) => {
+      showToast(res.msg);
+      getDetail();
+    });
+  } else if (checked == "2") {
+    let repairData = {
+      kkbk_id: detailData.kkbk_id,
+      user_ids: user_ids.join(","),
+      kccq_sfydm: 2,
+    };
+    console.log(user_ids);
+    stxk_repair(repairData).then((res) => {
+      if (res.code == "1") {
+        showToast(res.msg);
+        getDetail();
+      }
+    });
+  }
 }
 
 // 课堂反馈图片上传
@@ -330,7 +374,6 @@ function cdList() {
   });
 }
 
-
 const show = ref(false);
 let grade = $ref("");
 let classes = $ref("");
@@ -807,9 +850,9 @@ function delCd(c) {
     font-family: PingFang-SC-Regular;
   }
 }
-.load{
+.load {
   position: absolute;
-  top: .32*13.3vw;
-  right: .3*13.3vw;
+  top: 0.32 * 13.3vw;
+  right: 0.3 * 13.3vw;
 }
 </style>

File diff suppressed because it is too large
+ 163 - 160
src/store/user.js