From c83c32f04c0b01efcb795afb8850554d89764914 Mon Sep 17 00:00:00 2001 From: zhengpengju Date: Thu, 17 Mar 2022 15:29:39 +0800 Subject: [PATCH 1/4] fix bug --- .../components/QuestionSelector.tsx | 10 +++++++++- .../examinationrules/normal/step/index.tsx | 16 ++++++++------- admin/src/pages/questionbank/index.tsx | 20 ++++++++++++------- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/admin/src/pages/examinationrules/components/QuestionSelector.tsx b/admin/src/pages/examinationrules/components/QuestionSelector.tsx index 1f5c651..dfa97ad 100644 --- a/admin/src/pages/examinationrules/components/QuestionSelector.tsx +++ b/admin/src/pages/examinationrules/components/QuestionSelector.tsx @@ -12,7 +12,7 @@ import styles from '../style.less'; import { forwardRef, ReactText, useEffect, useImperativeHandle, useRef, useState } from 'react'; //import { PlusOutlined, DeleteOutlined, DownloadOutlined, UploadOutlined, EditOutlined, EyeOutlined, EyeInvisibleOutlined, DownOutlined } from '@ant-design/icons'; import { useParams, useRequest, history, useRouteMatch } from 'umi'; -import { queryCourseView } from '@/pages/course/option/service'; +import { queryCourseView, queryTagList } from '@/pages/course/option/service'; import { queryQuestionList, queryQuestionType } from '@/pages/questionbank/service'; //import ProForm, { ProFormSelect } from '@ant-design/pro-form'; import type { ActionType, ProColumns } from '@ant-design/pro-table'; @@ -78,6 +78,14 @@ const QuestionSelector = (props: any, ref: any) => { hideInTable: true, hideInForm: true, hideInSearch: false, + request: async () => { + const { data: Items } = await queryTagList({}); + const tags = [] + for (let i = 0; i < Items.length; i++) { + tags.push({ label: Items[i].tag_name, value: Items[i].tag_id }) + } + return tags; + }, }, { title: '课程', diff --git a/admin/src/pages/examinationrules/normal/step/index.tsx b/admin/src/pages/examinationrules/normal/step/index.tsx index 4bb6c38..6a75724 100644 --- a/admin/src/pages/examinationrules/normal/step/index.tsx +++ b/admin/src/pages/examinationrules/normal/step/index.tsx @@ -5,7 +5,7 @@ import { ModalForm } from '@ant-design/pro-form'; import { ProFormRadio } from '@ant-design/pro-form'; import ProForm, {StepsForm, ProFormText, ProFormDatePicker, ProFormSelect, ProFormTextArea, ProFormCheckbox, ProFormDateRangePicker,} from '@ant-design/pro-form'; import ProCard from '@ant-design/pro-card'; -import { Button, Checkbox, Col, Divider, Dropdown, Form, Input, List, Menu, message, Modal, Radio, Row, Space, Table, Typography, Upload, Empty } from 'antd'; +import { Button, Checkbox, Col, Divider, Dropdown, Form, Input, List, Menu, message, Modal, Radio, Row, Space, Table, Typography, Upload, Empty, Tooltip } from 'antd'; import { PageContainer } from '@ant-design/pro-layout'; import ProDescriptions from '@ant-design/pro-descriptions'; import styles from './index.less' @@ -470,12 +470,14 @@ export default () => { console.log('typeQuestionCount', typeQuestionCount); handleScoreModalVisible(true) }}>批量设置分值 - + 请选择试题组卷并设置分值后保存} placement="bottom" visible={questions ? false : true} color='#108ee9'> + + diff --git a/admin/src/pages/questionbank/index.tsx b/admin/src/pages/questionbank/index.tsx index f2949bb..c0b4d38 100644 --- a/admin/src/pages/questionbank/index.tsx +++ b/admin/src/pages/questionbank/index.tsx @@ -169,7 +169,7 @@ const QuestionBank = () => { rules: [ { required: true, - message: '请填选择课程', + message: '请选择课程', }, ] }, @@ -199,7 +199,7 @@ const QuestionBank = () => { rules: [ { required: true, - message: '请填题干内容', + message: '请填写题干内容', }, ] }, @@ -337,6 +337,7 @@ const QuestionBank = () => { return ( + style={{minWidth:1180}} rowKey='id' itemLayout="vertical" actionRef={actionRef} @@ -385,7 +386,8 @@ const QuestionBank = () => { // handleModalVisible(false); if (actionRef.current) { setSelectedRows([]); - actionRef.current?.reload(); + actionRef.current?.reloadAndRest(); + } } }else{ @@ -611,7 +613,7 @@ const QuestionBank = () => { // handleModalVisible(false); if (actionRef.current) { setSelectedRows([]); - actionRef.current?.reload(); + actionRef.current?.reloadAndRest(); } } }} @@ -710,12 +712,18 @@ const QuestionBank = () => { search: true, dataIndex: 'question_stem', valueType: 'text', + fieldProps: { + placeholder:'请输入关键字' + }, }, create_time: { title: '创建时间', search: true, dataIndex: 'create_time', valueType: 'dateRange', + fieldProps: { + placeholder:['开始时间','结束时间'] + }, }, }} /> @@ -764,9 +772,7 @@ const QuestionBank = () => { // 表单处理 console.log('columns:', columns); - console.log('values:', values); - - return false + console.log('values:', values); const opts = []; values?.answers?.forEach((item, key)=>{ // From 1f105b7e21e37645cf66f85c3deef30208d95573 Mon Sep 17 00:00:00 2001 From: wangxi <123456> Date: Fri, 18 Mar 2022 11:15:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/pages/course/subject/index.tsx | 2 +- .../analysis/components/CourseRow.tsx | 8 ++--- .../analysis/components/IntroduceRow.tsx | 5 ++-- .../analysis/components/IntroduceRow.tsx | 29 +++++++++++++++---- 4 files changed, 32 insertions(+), 12 deletions(-) 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('')}