Merge branch 'master' into luohl

* master:
  ...
  api.js->  apiItem.js

auto-imports.d.ts

@@ -12,8 +12,6 @@ declare global {
   const $shallowRef: typeof import('vue/macros')['$shallowRef']
   const $toRef: typeof import('vue/macros')['$toRef']
   const EffectScope: typeof import('vue')['EffectScope']
-  const ElMessage: typeof import('element-plus/es')['ElMessage']
-  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
   const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
   const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
   const computed: typeof import('vue')['computed']
@@ -300,8 +298,6 @@ declare module 'vue' {
     readonly $shallowRef: UnwrapRef<typeof import('vue/macros')['$shallowRef']>
     readonly $toRef: UnwrapRef<typeof import('vue/macros')['$toRef']>
     readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
-    readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
-    readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
     readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
     readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
     readonly computed: UnwrapRef<typeof import('vue')['computed']>

components.d.ts

@@ -9,43 +9,13 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    Bjqk: typeof import('./src/components/step/link/bjqk.vue')['default']
     BreadCrumb: typeof import('./src/components/BreadCrumb/index.vue')['default']
     CommonFooter: typeof import('./src/components/commonFooter/index.vue')['default']
-    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
-    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
-    ElButton: typeof import('element-plus/es')['ElButton']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
-    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDialog: typeof import('element-plus/es')['ElDialog']
-    ElForm: typeof import('element-plus/es')['ElForm']
-    ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
-    ElOption: typeof import('element-plus/es')['ElOption']
-    ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElStep: typeof import('element-plus/es')['ElStep']
-    ElSteps: typeof import('element-plus/es')['ElSteps']
-    ElTable: typeof import('element-plus/es')['ElTable']
-    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    'I:mdi:horizontalLine': typeof import('~icons/mdi/horizontal-line')['default']
-    'I:mdi:tick': typeof import('~icons/mdi/tick')['default']
     LeftSider: typeof import('./src/components/leftSider/index.vue')['default']
     LeftSiderStu: typeof import('./src/components/leftSiderStu/index.vue')['default']
     NavHeader: typeof import('./src/components/NavHeader/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     StatisticsSchool: typeof import('./src/components/statisticsSchool/index.vue')['default']
-    Szcjckqx: typeof import('./src/components/step/link/szcjckqx.vue')['default']
-    TheCard: typeof import('./src/components/TheCard.vue')['default']
-    TinymceVue: typeof import('./src/components/TinymceVue/index.vue')['default']
-    Xgstda: typeof import('./src/components/step/link/xgstda.vue')['default']
   }
 }

src/pages/ksfx/apiItem.js

@@ -0,0 +1,134 @@
+import request from "~/utils/request";
+
+//通用接口-学校列表
+export const normalSchool_list = (data = {}) => {
+  return request({
+    url: '/yzy/xsjjdtk/school_class',
+    data,
+  })
+}
+//通用接口-班级列表(根据ze_id)
+export const normalClassroom_list = (data = {}) => {
+  return request({
+    url: '/yzy/xsjjdtk/school_class',
+    data,
+  })
+}
+//通用接口-学科列表(考试计划列表-筛选出学科)
+export const normalSubject_list = (data = {}) => {
+  return request({
+    url: '/yzy/ksjh/index',
+    data,
+  })
+}
+
+//考试计划列表
+export const ksjh_list = (data = {}) => {
+  return request({
+    url: '/yzy/ksjh/index',
+    data,
+  })
+}
+
+
+//===============================成绩分析=================================
+
+//成绩分析-成绩单_列表
+export const cjfx_cjd_list = (data = {}) => {
+  return request({
+    url: '/openapi/echart/transcript.php',
+    data,
+  })
+}
+
+//成绩分析-三率一分_列表
+export const cjfx_slyf_list = (data = {}) => {
+  return request({
+    url: '/openapi/echart/sfyl_data.php',
+    data,
+  })
+}
+
+//成绩分析-分数段统计_列表
+export const cjfx_fsdtj_list = (data = {}) => {
+  return request({
+    url: '/openapi/echart/garde_section.php',
+    data,
+  })
+}
+
+//成绩分析-平均分离差分析_列表
+export const cjfx_pjflcfx_list = (data = {}) => {
+  return request({
+    url: '/openapi/echart/average_data.php',
+    data,
+  })
+}
+
+//成绩分析-教师统计_列表
+export const cjfx_jstj_list = (data = {}) => {
+  return request({
+    url: '/openapi/echart/teacher_data.php',
+    data,
+  })
+}
+
+//成绩分析-总体分析_列表
+export const cjfx_ztfx_list = (data = {}) => {
+  return request({
+    url: '/openapi/echart/total_data.php',
+    data,
+  })
+}
+
+//成绩分析-客观题分析_列表
+export const cjfx_kgtfx_list = (data = {}) => {
+  return request({
+    url: '/openapi/echart/objective_analysis.php',
+    data,
+  })
+}
+
+
+//===============================学生端=================================
+
+//学生端-考试分析-列表
+export const student_ksfx_list = (data = {}) => {
+  return request({
+    url: '/openapi/echart/exam_data.php',
+    data,
+  })
+}
+
+//学生端-试题分析-列表
+export const student_stfx_list = (data = {}) => {
+  return request({
+    url: '/openapi/echart/shiti_data.php',
+    data,
+  })
+}
+
+
+//学生端-我的试卷-列表
+export const student_wdsj_list = (data = {}) => {
+  return request({
+    url: '',
+    data,
+  })
+}
+
+
+//学生端-个人成绩单-列表
+export const student_grcjd_list = (data = {}) => {
+  return request({
+    url: '/openapi/echart/user_score.php',
+    data,
+  })
+}
+
+
+
+
+
+
+

src/pages/ksfx/cjfx_cjd.vue

@@ -100,7 +100,7 @@
 }
 </route>
 <script lang="ts" setup>
-import {normalSchool_list,cjfx_cjd_list } from './api';
+import {normalSchool_list,cjfx_cjd_list } from './apiItem';
 import { useRouter } from "vue-router";
 const router = useRouter();
 

src/pages/ksfx/cjfx_fsdtj.vue

@@ -67,7 +67,7 @@
 }
 </route>
 <script lang="ts" setup>
-import {cjfx_fsdtj_list } from './api';
+import {cjfx_fsdtj_list } from './apiItem';
 import * as echarts from 'echarts';
 import { useRouter } from "vue-router";
 const router = useRouter();

src/pages/ksfx/cjfx_jstj.vue

@@ -74,7 +74,7 @@
 }
 </route>
 <script lang="ts" setup>
-import {normalSchool_list,normalSubject_list,normalClassroom_list,cjfx_jstj_list } from './api';
+import {normalSchool_list,normalSubject_list,normalClassroom_list,cjfx_jstj_list } from './apiItem';
 import { useRouter } from "vue-router";
 const router = useRouter();
 

src/pages/ksfx/cjfx_pjflcfx.vue

@@ -65,7 +65,7 @@
 </route>
 <script lang="ts" setup>
 import * as echarts from 'echarts';
-import {normalSchool_list,normalSubject_list,normalClassroom_list,cjfx_pjflcfx_list } from './api';
+import {normalSchool_list,normalSubject_list,normalClassroom_list,cjfx_pjflcfx_list } from './apiItem';
 import { useRouter } from "vue-router";
 const router = useRouter();
 
@@ -110,7 +110,7 @@ let ecahrtData = {
       emphasis: {
         focus: 'series'
       },
-      data: [1.23, 1.23, 1.23, 1.23, 1.23, 1.23, 1.23]
+      data: [1.23, 1.23, -1.23, 1.23, 1.23, 1.23, 1.23]
     },
     {
       name: 'Expenses',
@@ -123,7 +123,7 @@ let ecahrtData = {
       emphasis: {
         focus: 'series'
       },
-      data: [-1.23, -1.23, -1.23, -1.23, -1.23, -1.23, -1.23]
+      data: [-1.23, -1.23, 1.23, -1.23, -1.23, -1.23, -1.23]
     }
   ]
 }
@@ -218,7 +218,8 @@ const initChart = (item) => {
     }
 
   ],
-  series: item.series
+  series: item.series,
+
 });
 }
 

src/pages/ksfx/cjfx_slyf.vue

@@ -113,7 +113,7 @@
 }
 </route>
 <script lang="ts" setup>
-import {normalSchool_list,normalSubject_list,normalClassroom_list,normalTeacher_list,cjfx_slyf_list } from './api';
+import {normalSchool_list,normalSubject_list,normalClassroom_list,normalTeacher_list,cjfx_slyf_list } from './apiItem';
 import { useRouter } from "vue-router";
 const router = useRouter();
 

src/pages/ksfx/ksfx.vue

@@ -77,7 +77,7 @@
 <script setup>
 import { InfoFilled,Search } from '@element-plus/icons-vue';
 import examIcon from '@/assets/ksfx/examIcon.png';
-import { student_ksfx_list, ksjh_list } from "@/pages/ksfx/api";
+import { student_ksfx_list, ksjh_list } from "@/pages/ksfx/apiItem";
 
 import { useRouter } from "vue-router";
 import { skeletonProps } from 'element-plus';

src/pages/ksfx/sjfx_kgtfx.vue

@@ -80,7 +80,7 @@
 <script lang="ts" setup>
 import * as echarts from 'echarts';
 import { skeletonProps } from 'element-plus';
-import {normalSchool_list,normalSubject_list,normalClassroom_list,cjfx_kgtfx_list } from './api';
+import {normalSchool_list,normalSubject_list,normalClassroom_list,cjfx_kgtfx_list } from './apiItem';
 
 import { useRouter } from "vue-router";
 const router = useRouter();

src/pages/ksfx/sjfx_ztfx.vue

@@ -116,7 +116,7 @@
 }
 </route>
 <script lang="ts" setup>
-import {normalSchool_list,normalSubject_list,normalClassroom_list,cjfx_ztfx_list } from './api';
+import {normalSchool_list,normalSubject_list,normalClassroom_list,cjfx_ztfx_list } from './apiItem';
 import { useRouter } from "vue-router";
 const router = useRouter();
 

src/pages/ksfx/stu_grcjd.vue

@@ -55,7 +55,7 @@
 
 <script setup lang="ts">
 import * as echarts from 'echarts';
-import {student_grcjd_list} from "@/pages/ksfx/api";
+import {student_grcjd_list} from "@/pages/ksfx/apiItem";
 
 import { useRouter } from "vue-router";
 import { skeletonProps } from 'element-plus';

src/pages/ksfx/stu_stfx.vue

@@ -48,7 +48,7 @@
 </template>
 
 <script setup lang="ts">
-import {student_stfx_list} from "@/pages/ksfx/api";
+import {student_stfx_list} from "@/pages/ksfx/apiItem";
 import { useRouter } from "vue-router";
 const router = useRouter();