소스 검색

更换数据字典

林旭祥 7 달 전
부모
커밋
ac5e8c33ef
3개의 변경된 파일24개의 추가작업 그리고 75개의 파일을 삭제
  1. 12 6
      src/components/ChooseStudent/index.vue
  2. 0 66
      src/utils/dataDictionary.ts
  3. 12 3
      src/views/ranking/index.vue

+ 12 - 6
src/components/ChooseStudent/index.vue

@@ -13,7 +13,7 @@
           <div class="searchBox">
             <el-select class="select" v-model="optionForm.grade" :popper-append-to-body="false" placeholder="年级"
               clearable>
-              <el-option v-for="item in gradeList" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option v-for="item in gradeLists" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
             <el-select class="select" v-model="optionForm.class" :popper-append-to-body="false" placeholder="班级"
               clearable>
@@ -86,9 +86,6 @@ const classData = computed(() => {
   return list;
 });
 
-//年级
-const gradeList = dataDictionary.gradeList;
-
 const data = reactive<any>({
   optionForm: {
     gesture: true,
@@ -266,6 +263,16 @@ const confirm = () => {
   close();
 };
 
+//年级
+const gradeLists = computed(() => {
+  let myInfo: any = localStorage.getItem("userInfo");
+  let userInfo = JSON.parse(myInfo);
+  let obj = dataDictionary.gradeLists.find((item) => {
+    return userInfo.category == item.value
+  })
+  return obj != undefined ? obj.child : [];
+});
+
 onMounted(() => {
 })
 
@@ -318,8 +325,7 @@ defineExpose({
         color: #13ED84;
       }
 
-      .close {
-      }
+      .close {}
     }
 
     .content {

+ 0 - 66
src/utils/dataDictionary.ts

@@ -1,70 +1,4 @@
 let data = {
-  gradeList: [
-    {
-      label: '一年级',
-      value: 'one'
-    },
-    {
-      label: '二年级',
-      value: 'two'
-    },
-    {
-      label: '三年级',
-      value: 'three'
-    },
-    {
-      label: '四年级',
-      value: 'four'
-    },
-    {
-      label: '五年级',
-      value: 'five'
-    },
-    {
-      label: '六年级',
-      value: 'six'
-    },
-    {
-      label: '初一',
-      value: 'm_one'
-    },
-    {
-      label: '初二',
-      value: 'm_two'
-    },
-    {
-      label: '初三',
-      value: 'm_three'
-    },
-    {
-      label: '高一',
-      value: 'h_one'
-    },
-    {
-      label: '高二',
-      value: 'h_two'
-    },
-    {
-      label: '高三',
-      value: 'h_three'
-    },
-    {
-      label: '大一',
-      value: 'u_one'
-    },
-    {
-      label: '大二',
-      value: 'u_two'
-    },
-    {
-      label: '大三',
-      value: 'u_three'
-    },
-    {
-      label: '大四',
-      value: 'u_four'
-    }
-  ],
   project: {
     jump: '立定跳远',
     longjump: '急行跳远',

+ 12 - 3
src/views/ranking/index.vue

@@ -6,7 +6,7 @@
         <div class="top-left">
           <div class="title1">{{ pageType == 1 ? "运动风云榜" : pageType == 2 ? currentClass.name : "" }} · {{
             projectObj.title
-            }}</div>
+          }}</div>
           <div class="title2" @click="choiceClassWindow = true">{{ pageType == 1 ? "切换到班级榜" : pageType == 2 ? "切换到班级" :
             "" }}</div>
         </div>
@@ -289,9 +289,18 @@ const getClass = () => {
   };
   proxy?.$http.common.classList(params)
     .then((res: any) => {
+      let myInfo: any = localStorage.getItem("userInfo");
+      let userInfo = JSON.parse(myInfo);
+      let obj = dataDictionary.gradeLists.find((item) => {
+        return userInfo.category == item.value
+      })
+      let gradeLists: any = []
+      if (obj != undefined) {
+        gradeLists = obj.child
+      }
       // 重新排序一次
       let list: any = [];
-      dataDictionary.gradeList.forEach((item) => {
+      gradeLists.forEach((item: any) => {
         res.data.forEach((items: any) => {
           // classIdKeyObj.value[items.id] = items
           if (items.grade == item.value) {
@@ -1453,7 +1462,7 @@ $waiPadding: 6.51rem;
         cursor: pointer;
 
         &:hover {
-          color: #0936a3;
+          color: #4573df;
         }
       }