diff --git a/admin/src/pages/course/subject/index.tsx b/admin/src/pages/course/subject/index.tsx index 6a1a358..f5848e2 100644 --- a/admin/src/pages/course/subject/index.tsx +++ b/admin/src/pages/course/subject/index.tsx @@ -44,7 +44,7 @@ const chapterColumns: ProColumns[] = [ { title: '课程', valueType: 'select', - dataIndex: 'course_ids', + dataIndex: 'course_names', sorter: false, hideInTable: false, hideInForm: false, diff --git a/admin/src/pages/dashboard/analysis/components/CourseRow.tsx b/admin/src/pages/dashboard/analysis/components/CourseRow.tsx index 7074a8e..7417fd8 100644 --- a/admin/src/pages/dashboard/analysis/components/CourseRow.tsx +++ b/admin/src/pages/dashboard/analysis/components/CourseRow.tsx @@ -27,11 +27,11 @@ const TrainingRow = () => {
-
111 +
{ formatter: (name, value: number) => { // const {name, value} = args; console.log('args', name) - return { name: '浏览量', value: value }; + return { name: '浏览量', value: name.browse_times }; } }} xAxis={{ @@ -49,7 +49,7 @@ const TrainingRow = () => { visible: false, }, label: { - interval: 0,//横轴信息全部显示 + interval: 0,//横轴信息全部显示 rotate: 0.3, autoEllipsis: true, style: { diff --git a/admin/src/pages/dashboard/analysis/components/IntroduceRow.tsx b/admin/src/pages/dashboard/analysis/components/IntroduceRow.tsx index c7a9efa..de091ff 100644 --- a/admin/src/pages/dashboard/analysis/components/IntroduceRow.tsx +++ b/admin/src/pages/dashboard/analysis/components/IntroduceRow.tsx @@ -60,7 +60,8 @@ const IntroduceRow = () => { formatter: (name, value: number) => { // const {name, value} = args; console.log('args', name) - return { name: '关联培训数量', value: value }; + console.log('value', value) + return { name: '关联培训数量', value: name.train_number}; } }} xAxis={{ @@ -70,7 +71,7 @@ const IntroduceRow = () => { visible: false, }, label: { - interval: 0,//横轴信息全部显示 + interval: 0,//横轴信息全部显示 rotate: 0.3,//-30度角倾斜显示 \ autoEllipsis: true, style: { diff --git a/admin/src/pages/history/analysis/components/IntroduceRow.tsx b/admin/src/pages/history/analysis/components/IntroduceRow.tsx index 5b97d7b..7aa76a7 100644 --- a/admin/src/pages/history/analysis/components/IntroduceRow.tsx +++ b/admin/src/pages/history/analysis/components/IntroduceRow.tsx @@ -36,14 +36,15 @@ let school=0; const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: DataItem[] }) => { const [provinceId, setProvinceId] = useState(cookie.load('background_province_id') ) const [cityList, setCityList] = useState([]); - const [areaList, setAreaList] = useState([]); + const [areaList, setAreaList] = useState([{id:0,name:'全部'}]); const [schoolList, setSchoolList] = useState([]); + const [area, setArea] = useState(0); const [options, setOptions] = useState([]); const [fetching, setFetching] = useState(false); const fetchRef = useRef(0); - + console.log('areaareaarea',area) const { loading: courseBrowseTimesLoading, data: eduUnitList = null } = useRequest(() => getEduUnitList({ random_num: 277470, area_id: provinceId, @@ -114,7 +115,10 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Dat get_next: 1 }); form.setFieldsValue({ area: 0 }) - setAreaList(areaData || []); + const list=[{id:0,name:'全部'}]; + const areaList=list.concat(areaData); + setAreaList(areaList); + console.log('areaareaListareaListareaListList',areaList) run() } @@ -200,7 +204,18 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Dat defaultValue={0} onChange={(id) => { city_id=id; - getAreaData(id) + if(id!==0){ + getAreaData(id) + }else { + area_id=0; + setArea(0) + setAreaList([{id:0,name:'全部'}]) + run(); + + console.log('area-----',area); + console.log('areaList-----',areaList); + } + }} // defaultValue={provinceId} @@ -215,16 +230,20 @@ const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: Dat + {console.log('')}