Michael Wang 3 лет назад
Родитель
Сommit
b7eae6de01

+ 4 - 2
src/features/allAnalysis/AllAnalysis2.vue

@@ -49,8 +49,10 @@
         </a-table>
       </div>
 
-      <div v-if="activeTab === '2'"><ScoreRate /></div>
-      <div v-if="activeTab === '3'"><ScoreFirstTryRate /></div>
+      <div v-if="activeTab === '2'"><ScoreRate :courseId="courseId" /></div>
+      <div v-if="activeTab === '3'">
+        <ScoreFirstTryRate :courseId="courseId" />
+      </div>
     </div>
   </div>
 </template>

+ 8 - 3
src/features/allAnalysis/ScoreFirstTryRate.vue

@@ -65,7 +65,7 @@
 
 <script setup lang="ts">
 // import { useMainStore } from "@/store";
-import { onMounted } from "vue";
+import { onMounted, watch } from "vue";
 import { useRoute } from "vue-router";
 import {
   getSasCourseList,
@@ -80,7 +80,10 @@ let activeKey = $ref(["0"]);
 // const store = useMainStore();
 
 // let rootOrgId = $ref(undefined as unknown as number);
-let courseId = $ref(undefined as undefined | number);
+// let courseId = $ref(undefined as undefined | number);
+const props = defineProps<{
+  courseId: number;
+}>();
 const route = useRoute();
 const projectId = +route.params.projectId;
 
@@ -88,7 +91,7 @@ let data = $ref<SasCourse[]>([]);
 async function fetchData() {
   const res = await getSasCourseList({
     projectId,
-    courseId,
+    courseId: props.courseId,
   });
   // console.log(Object.keys(JSON.parse(res.data[0].scoreRange)));
   res.data = res.data.map((v) => {
@@ -108,6 +111,8 @@ onMounted(async () => {
   await fetchData();
 });
 
+watch(() => [props.courseId], fetchData);
+
 let selectedRangeConfig = $ref([]);
 let selectedCourseId = $ref(0);
 

+ 9 - 5
src/features/allAnalysis/ScoreRate.vue

@@ -119,7 +119,10 @@ let activeKey = $ref(["0"]);
 // const store = useMainStore();
 
 // let rootOrgId = $ref(undefined as unknown as number);
-let courseId = $ref(undefined as undefined | number);
+// let courseId = $ref(undefined as undefined | number);
+const props = defineProps<{
+  courseId?: number;
+}>();
 const route = useRoute();
 const projectId = +route.params.projectId;
 
@@ -127,7 +130,7 @@ let courses = $ref<SasCourse[]>([]);
 async function fetchData() {
   const res = await getSasCourseList({
     projectId,
-    courseId,
+    courseId: props.courseId,
   });
   // console.log(Object.keys(JSON.parse(res.data[0].scoreRange)));
   res.data = res.data.map((v) => {
@@ -157,7 +160,7 @@ async function fetchData() {
     v.scoreRangeTotal = acc;
     return v;
   });
-  console.log(res.data);
+  // console.log(res.data);
   courses = res.data;
 }
 
@@ -165,6 +168,7 @@ onMounted(async () => {
   // rootOrgId = store.userInfo.rootOrgId;
   await fetchData();
 });
+watch(() => [props.courseId], fetchData);
 
 let scoreGap = $ref(10);
 
@@ -288,7 +292,7 @@ function openModal2() {
 }
 
 function segementsLine(course: SasCourse) {
-  console.log(course);
+  // console.log(course);
   return {
     title: {
       text: "频率",
@@ -312,7 +316,7 @@ function segementsLine(course: SasCourse) {
 }
 
 function rangeSegementsLine(course: SasCourse) {
-  console.log(course);
+  // console.log(course);
   return {
     title: {
       text: "频率",

+ 2 - 2
src/features/projectCompareManagement/ProjectCompareManagement.vue

@@ -67,8 +67,8 @@ store.currentLocation = "项目管理 / 关联分析";
 
 let rootOrgId = $ref(undefined as unknown as number);
 
-let projectIds: number[] = $ref([4, 5]);
-let contrastProjectId: number = $ref(4);
+let projectIds: number[] = $ref([]); //$ref([4, 5]);
+let contrastProjectId: number = $ref(); //$ref(4);
 
 let data = $ref<SASPaper[]>([]);
 let pageSize = $ref(10);