luohailiang il y a 2 ans
Parent
commit
aae30bf622
6 fichiers modifiés avec 1173 ajouts et 982 suppressions
  1. 15 0
      src/components.d.ts
  2. 1 1
      src/pages/_home/index.vue
  3. 47 45
      src/pages/stxkbzr/index.vue
  4. 3 2
      src/pages/stxkjs/index.vue
  5. 176 103
      src/store/user.js
  6. 931 831
      yarn.lock

+ 15 - 0
src/components.d.ts

@@ -12,14 +12,29 @@ declare module '@vue/runtime-core' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     VanButton: typeof import('vant/es')['Button']
+    VanCard: typeof import('vant/es')['Card']
     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']
+    VanGrid: typeof import('vant/es')['Grid']
+    VanGridItem: typeof import('vant/es')['GridItem']
     VanIcon: typeof import('vant/es')['Icon']
+    VanList: typeof import('vant/es')['List']
     VanNavBar: typeof import('vant/es')['NavBar']
+    VanPullRefresh: typeof import('vant/es')['PullRefresh']
     VanRate: typeof import('vant/es')['Rate']
+    VanSearch: typeof import('vant/es')['Search']
+    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']
+    VanTabbar: typeof import('vant/es')['Tabbar']
+    VanTabbarItem: typeof import('vant/es')['TabbarItem']
     VanTabs: typeof import('vant/es')['Tabs']
+    VanTag: typeof import('vant/es')['Tag']
     VanUploader: typeof import('vant/es')['Uploader']
   }
 }

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

@@ -30,7 +30,7 @@ const gridList = [
         case 'jz':
           return '/stxk/jz'
         case 'js':
-          return '/xk_teacher'
+          return '/stxk_teacher'
         case 'xz':
           return '/stxkjsd'
       }

+ 47 - 45
src/pages/stxkbzr/index.vue

@@ -53,8 +53,8 @@
               ><van-icon name="clock-o" />{{ c.kkbk_starttime }} -
               {{ c.kkbk_endtime }}</span
             >
-            <span class="join-number"
-              >{{ classDetail?.member?.length ?? 0 }}名学生报名</span
+            <span class="join-number" v-if="c.khfw_kcbgl.bzr_info && c.khfw_kcbgl.bzr_info.bmxx"
+              >{{ c.khfw_kcbgl.bzr_info.bmxx.length }}名学生报名</span
             >
             <span
               class="findmore"
@@ -75,26 +75,22 @@
       <h3>预点名</h3>
       <p>
         今日本班学生到校:
-        <span style="color: #003eee">{{
-          classDetail?.member?.length ?? 0
-        }}</span
+        <span style="color: #003eee">{{ydmStu.length}}</span
         >/30
       </p>
 
       <div class="students">
-        <span v-for="stu in classDetail.member" :key="stu">
-          <span
-            @click="selectStudent(stu)"
-            :class="{ redName: stu.kccq_cqycztbh === 2 || stu.is_cq === 2 }"
-            v-for="item in ydmStu"
-            :key="item"
-            >{{ item.realname }} <i v-show="stu.kccq_cqycztbh == 2">缺</i></span
-          ></span
-        >
+       <span
+           @click="selectStudent(item,index)"
+           :class="item.isCheck?'redName':''"
+           v-for="(item,index) in ydmStu"
+           :key="item"
+       >{{ item.realname }} <i v-show="item.isCheck"></i></span
+       >
       </div>
 
       <div class="submit">
-        <button @click="submitDM(classDetail.member)">提交</button>
+        <button :disabled="absentStu.length == 0" @click="submitDM()">提交</button>
       </div>
     </div>
     <!-- 查看详情弹窗 -->
@@ -165,13 +161,15 @@ export default {
       stuInfo: "",
       cm_id: "",
       userInfo: user,
-    };
+      ydmStu:[],
+      ydmData:[],
+      absentStu:[]
+    }
   },
   methods: {
     onClickLeft() {
       this.$router.back();
     },
-
     getListData() {
       let data = {
         ex: "byweek",
@@ -179,6 +177,7 @@ export default {
       };
       bzr_list(data).then((res) => {
         this.classWeek = res.data;
+        console.log(this.classWeek,88)
       });
     },
 
@@ -190,17 +189,12 @@ export default {
 
       kc_detail(data).then((res) => {
         this.classDetail = res.data.one_info;
+        console.log(this.classDetail,889)
         this.newYdmqk = res.data.one_info.dm.ydmqk;
         this.newQdqk = res.data.one_info.dm.qdqk;
         this.newMember = res.data.one_info.member;
-
-        console.log(this.newYdmqk);
-        console.log(this.newMember.length);
       });
     },
-    onClickLeft() {
-      history.back();
-    },
     getWeek() {
       var day = new Date().getDay();
       var weeks = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
@@ -221,36 +215,40 @@ export default {
       ydm_list(data).then((res) => {
         this.ydmData = res.data.one_info;
         this.ydmStu = res.data.one_info.students;
-        console.log(this.ydmStu);
+        for(let i in this.ydmStu) {
+          this.ydmStu[i].isCheck = false;
+        }
       });
     },
 
-    selectStudent(stu) {
-      if (stu.kccq_cqycztbh == 2) {
-        stu.kccq_cqycztbh = 0;
-        stu.is_cq = 0;
+    selectStudent(stu,index) {
+      if(!this.ydmStu[index].isCheck) {
+        this.ydmStu[index].isCheck = true;
+        let obj = {
+          kccq_cqycxsxm:stu.realname,
+          kccq_cqycxsbh:stu.user_id,
+          kccq_cqycztbh:2
+        }
+        this.absentStu.push(obj);
       } else {
-        stu.kccq_cqycztbh = 2;
-        stu.is_cq = 2;
+        this.ydmStu[index].isCheck = false;
+        this.absentStu = this.absentStu.filter(item=>{
+          return item.kccq_cqycxsbh != stu.user_id;
+        })
       }
+
+
     },
 
-    submitDM(member) {
-      this.member.forEach((item) => {
-        this.memberMsg.push({
-          kccq_cqycxsbh: item.kkbm_s_user_id,
-          kccq_cqycxsxm: item.kkbm_s_realname,
-          kccq_cqycztbh: item.kccq_cqycztbh,
-        });
-      });
+    submitDM() {
       const data = {
-        member: this.memberMsg,
-        kkbk_id: this.kkbk_id,
-        sendmsg: this.isTellCheck ? 1 : 0,
+        kkbk_id: 0,
+        member: this.absentStu,
         kccq_sfydm: 1,
+
       };
       stxkjs_check(data).then((res) => {
-        showToast(res.msg);
+        showToast('预报名成功!');
         this.detailData();
         this.toSignUp = false;
       });
@@ -535,8 +533,8 @@ export default {
     flex-wrap: wrap;
     span {
       width: 17%;
-      height: 0.4 * 13.3vw;
-      line-height: 0.4 * 13.3vw;
+      height: 0.6 * 13.3vw;
+      line-height: 0.6 * 13.3vw;
       margin: 0.06 * 13.3vw;
       text-align: center;
       font-size: 0.24 * 13.3vw;
@@ -550,7 +548,7 @@ export default {
         width: 0;
         height: 0;
         line-height: 0.1 * 13.3vw;
-        font-size: 0.01 * 13.3vw;
+        font-size: 0.015 * 13.3vw;
         border: 0.14 * 13.3vw solid;
         border-color: red red transparent transparent;
         border-radius: 0 0.03 * 13.3vw;
@@ -617,6 +615,10 @@ export default {
     border-radius: 0.34 * 13.3vw;
     color: #fff;
     font-size: 0.34 * 13.3vw;
+    &:disabled{
+      pointer-events: none;
+      background: #ccc;
+    }
   }
 }
 </style>

+ 3 - 2
src/pages/stxkjs/index.vue

@@ -14,7 +14,7 @@
         title="班主任所属班级"
         show-cancel-button
       >
-        <p v-show="c.is_manage == 1" v-for="c in user.cm_info" :key="c">
+        <p style="width: 100%;padding: 15px;text-align: center;color: blue" v-show="c.is_manage == 1" v-for="c in user.cm_info" :key="c">
           <router-link
             :to="{
               path: '/stxkbzr',
@@ -295,13 +295,14 @@ const getWeek = async () => {
 };
 getWeek();
 // 课表
-getClass();
+
 function getClass() {
   stxkjs_list(data).then((res) => {
     classWeek.value = res.data;
     console.log(res.data);
   });
 }
+getClass();
 let planMsg = ref([]);
 const jafile = ref("");
 let pagedata = [];

+ 176 - 103
src/store/user.js

@@ -1,113 +1,186 @@
 export const user = // JSON.parse(localStorage.getItem('userInfo'))
-{
-  "user_id": "317815",
-  "user_name": "nmlxz",
-  "email": "nmlxz15762@mail.com",
-  "lastlogintime": "2022-08-23 15:14:55",
-  "user_role_id": "77",
-  "user_role_name": "学校管理员",
-  "user_avatar": {
-    "big": "https://openapi.bozedu.net/template/default/static/img/avatar_teacher_big.png",
-    "middle": "https://openapi.bozedu.net/template/default/static/img/avatar_teacher_middle.png",
-    "small": "https://openapi.bozedu.net/template/default/static/img/avatar_teacher_small.png"
-  },
-  "user_no": {
-    "no_title": "学号",
-    "no": ""
-  },
-  "token": "2757saQaa7VKjLXcY8X2BKJDuSBJEjVM3IPy5xQrYOshZHmP_b2VHLbmuhWJBkjo_b6_bYde293u0cZzQHkznHbq16epx0",
-  "user_realname": "南马路测试校长",
-  "user_phone": "",
-  "idcard": "",
-  "gender": "0",
-  "gender_char": "保密",
-  "qq": "",
-  "nationality": "",
-  "address": "",
-  "education": "",
-  "area_info": {
-    "area_id1": "5",
-    "area_id2": "95",
-    "area_id3": "1418",
-    "area_id4": "0",
-    "area_id1_char": "内蒙古自治区",
-    "area_id2_char": "呼和浩特市",
-    "area_id3_char": "回民区",
-    "area_id4_char": "",
-    "area_code1": "150000000000",
-    "area_code2": "150100000000",
-    "area_code3": "150103000000",
-    "area_code4": "",
-    "area_code_dist": "150103000000"
-  },
-  "sm_info": {
-    "sm_id": "666",
-    "adminid": "303115",
-    "sm_name": "呼和浩特回民区南马路小学",
-    "is_org": "0",
-    "up_org": "0",
-    "area_id1": "5",
-    "area_id2": "95",
-    "area_id3": "1418",
-    "area_id4": "0",
-    "major_mode": "0",
-    "powers": {
-      "vip_shiti": "0",
-      "vip_sucai": "0",
-      "vip_aicheck": "0"
+    {
+        "user_id": "317801",
+        "user_name": "js01",
+        "email": "js0116489@mail.com",
+        "lastlogintime": "2022-08-30 16:58:36",
+        "user_role_id": "75",
+        "user_role_name": "学校教师",
+        "user_avatar": {
+            "big": "https://openapi.bozedu.net/template/default/static/img/avatar_teacher_big.png",
+            "middle": "https://openapi.bozedu.net/template/default/static/img/avatar_teacher_middle.png",
+            "small": "https://openapi.bozedu.net/template/default/static/img/avatar_teacher_small.png"
+        },
+        "user_no": {"no_title": "工号", "no": ""},
+        "token": "37fawDz_a_bD4_aAKBbwH6ylfuq_akkxBNGCDLoW9MozB0Zd7OSda8L4jT_a5eH07gV2Qcg6PariAU3U3OoImS_aBv6pKPIvA",
+        "user_realname": "测试教师01",
+        "user_phone": "",
+        "idcard": "",
+        "gender": "0",
+        "gender_char": "保密",
+        "qq": "",
+        "nationality": "",
+        "address": "",
+        "education": "",
+        "area_info": {
+            "area_id1": "5",
+            "area_id2": "95",
+            "area_id3": "1418",
+            "area_id4": "0",
+            "area_id1_char": "内蒙古自治区",
+            "area_id2_char": "呼和浩特市",
+            "area_id3_char": "回民区",
+            "area_id4_char": "",
+            "area_code1": "150000000000",
+            "area_code2": "150100000000",
+            "area_code3": "150103000000",
+            "area_code4": "",
+            "area_code_dist": "150103000000"
+        },
+        "sm_info": {
+            "sm_id": "666",
+            "adminid": "303115",
+            "sm_name": "呼和浩特回民区南马路小学",
+            "is_org": "0",
+            "up_org": "0",
+            "area_id1": "5",
+            "area_id2": "95",
+            "area_id3": "1418",
+            "area_id4": "0",
+            "major_mode": "0",
+            "powers": {"vip_shiti": "0", "vip_sucai": "0", "vip_aicheck": "0"}
+        },
+        "cm_info": [{
+            "cm_id": "12291",
+            "sm_id": "666",
+            "pre": "测试",
+            "cm_name": "一年级(3)班",
+            "grade": "1",
+            "gradeClass": "3",
+            "major_id": "",
+            "creatorid": "317803",
+            "is_manage": 0,
+            "major_name": ""
+        }, {
+            "cm_id": "12290",
+            "sm_id": "666",
+            "pre": "测试",
+            "cm_name": "一年级(2)班",
+            "grade": "1",
+            "gradeClass": "2",
+            "major_id": "",
+            "creatorid": "317802",
+            "is_manage": 0,
+            "major_name": ""
+        }, {
+            "cm_id": "12289",
+            "sm_id": "666",
+            "pre": "测试",
+            "cm_name": "一年级(1)班",
+            "grade": "1",
+            "gradeClass": "1",
+            "major_id": "",
+            "creatorid": "317801",
+            "is_manage": 1,
+            "major_name": ""
+        }],
+        "first_cm_id": "12291",
+        "first_cm_name": "测试一年级(3)班",
+        "renke_grade": [{"grade": "1", "subject": "1", "grade_char": "一年级", "subject_char": "语文"}, {
+            "grade": "2",
+            "subject": "1",
+            "grade_char": "二年级",
+            "subject_char": "语文"
+        }],
+        "renke_subject": {"1": {"subject": "1", "subject_char": "语文"}},
+        "related_desc": "语文",
+        "bind3rd": {"wechat": "0"},
+        "org_info": {
+            "org": "呼和浩特回民区南马路小学",
+            "telephone": "",
+            "telephone_short": "",
+            "is_org": "0",
+            "up_org": "0",
+            "up_org_info": []
+        },
+        "pan": {"unit": "G", "size": "0", "used": "0.00", "desc": "无限制"},
+        "safe_tips": [],
+        "update_center": "https://openapi.bozedu.net",
+        "base_url": {
+            "aboutus": "https://openapi.bozedu.net/aboutus",
+            "file": "https://openapi.bozedu.net",
+            "vpn": "http://openapi.bozedu.net",
+            "uc": "https://uc.bozedu.net",
+            "yzy": "https://yzy.bozedu.net",
+            "kzkt": "https://kzkt.bozedu.net",
+            "openapi": "https://openapi.bozedu.net",
+            "site_zhkt_api": "http://120.26.51.195:8008",
+            "yxxt": "https://yxxt.bozedu.net"
+        },
+        "role_system": [{
+            "code": "kzkt",
+            "name": "空中课堂",
+            "icon": "",
+            "cate": "1",
+            "type": "1",
+            "url": "https://kzkt.bozedu.net"
+        }, {
+            "code": "yzy",
+            "name": "作业系统",
+            "icon": "",
+            "cate": "1",
+            "type": "1",
+            "url": "https://yzy.bozedu.net"
+        }, {
+            "code": "zhkt",
+            "name": "智慧课堂",
+            "icon": "",
+            "cate": "1",
+            "type": "2",
+            "url": "http://120.26.51.195:8008/desadmin.php"
+        }],
+        "product": ["课堂", "直播", "作业"],
+        "app_url": {
+            "A119": "https://qqyxt.m.bozedu.net/page/course/tskc_more.html",
+            "A120": "https://qqyxt.m.bozedu.net/page/my/msg_hybrid.html?id=31",
+            "A121": "https://qqyxt.m.bozedu.net/page/parent/msg.html",
+            "A122": "https://qqyxt.m.bozedu.net/page/my/integral_hybrid.html",
+            "A123": "https://qqyxt.m.bozedu.net/ktfx/xqbg.html",
+            "A124": "https://qqyxt.m.bozedu.net/page/my/footPrint.html",
+            "A125": "https://qqyxt.m.bozedu.net/page/my/intergralMall.html",
+            "A126": "https://openapi.bozedu.net/component/ebook_main/public?api=html",
+            "A127": "https://qqyxt.m.bozedu.net/Course_registration/transfer.html?v=1",
+            "A128": "https://qqyxt.m.bozedu.net/Course_registration/transfer.html?type=course_after_service",
+            "A129": "https://qqyxt.m.bozedu.net/ktfx/xqbg.html?tab=1",
+            "A130": "https://qqyxt.m.bozedu.net/ktfx/xqbg.html?tab=2",
+            "A131": "https://qqyxt.m.bozedu.net/ktfx/xqbg.html?tab=3",
+            "A132": "https://qqyxt.m.bozedu.net/ktfx/xqbg.html?tab=4"
+        },
+        "cpm_access_level": "5",
+        "pwd": "szbz1234",
+        "xq": {"name": "2022-2023(上学期)", "id": "2022202301", "start_time": "2022-08-15", "end_time": "2023-01-31"}
     }
-  },
-
-  "cm_info": [{
-    "cm_id": '12289',
-    "is_manage": '1',
-    "cm_name": '一年级(1)班',
-  }],
-
-  "first_cm_id": "",
-  "first_cm_name": "",
-  "renke_grade": [],
-  "renke_subject": {},
-  "related_desc": "暂无任课",
-  "bind3rd": {
-    "wechat": "0"
-  },
-  "org_info": {
-    "org": "呼和浩特回民区南马路小学",
-    "telephone": "",
-    "telephone_short": "",
-    "is_org": "0",
-    "up_org": "0",
-    "up_org_info": {}
-  },
-  "pan": {
-    "unit": "G",
-    "size": "0",
-    "used": "0.00",
-    "desc": "无限制"
-  }
-}
 
 
 const ROLE_MAP = {
-  // 管理员
-  '3': 'gly',
-  // 省市县
-  '63': 'sheng',
-  '66': 'shi',
-  '69': 'xian',
-  // 校长
-  '72': 'xz',
-  // 教师
-  '75': 'js',
-  // 学生
-  '76': 'xs',
-  // 家长
-  '77': 'jz',
+    // 管理员
+    '3': 'gly',
+    // 省市县
+    '63': 'sheng',
+    '66': 'shi',
+    '69': 'xian',
+    // 校长
+    '72': 'xz',
+    // 教师
+    '75': 'js',
+    // 学生
+    '76': 'xs',
+    // 家长
+    '77': 'jz',
 }
 
 export default {
-  ...user,
-  _role: ROLE_MAP[user.user_role_id] ?? 'others'
+    ...user,
+    _role: ROLE_MAP[user.user_role_id] ?? 'others'
 }
 

Fichier diff supprimé car celui-ci est trop grand
+ 931 - 831
yarn.lock