diff --git a/p__Classrooms__Lists__Exercise__Detail__index.async.js b/p__Classrooms__Lists__Exercise__Detail__index.async.js index b289f10eab..eac7863bd3 100644 --- a/p__Classrooms__Lists__Exercise__Detail__index.async.js +++ b/p__Classrooms__Lists__Exercise__Detail__index.async.js @@ -17541,6 +17541,7 @@ var ClientSettings = function ClientSettings(_ref) { +// import Resource from './components/Resource' var ConfigWorks_WorkList = function WorkList(_ref) { var _globalSetting$settin, _globalSetting$settin2; @@ -17576,7 +17577,14 @@ var ConfigWorks_WorkList = function WorkList(_ref) { key: '4', element: /*#__PURE__*/(0,jsx_runtime.jsx)(components_ClientSettings, {}), show: globalSetting !== null && globalSetting !== void 0 && (_globalSetting$settin2 = globalSetting.setting) !== null && _globalSetting$settin2 !== void 0 && _globalSetting$settin2.is_local ? false : true - }]; + } + // { + // name: '实验资源优先保障', + // key: '6', + // element: , + // show: isSuperAdmins() + // }, + ]; (0,_react_17_0_2_react.useEffect)(function () { dispatch({ type: 'globalSetting/footerToggle', diff --git a/p__Classrooms__Lists__GroupHomework__Detail__index.async.js b/p__Classrooms__Lists__GroupHomework__Detail__index.async.js index 98fdde5709..f09cede360 100644 --- a/p__Classrooms__Lists__GroupHomework__Detail__index.async.js +++ b/p__Classrooms__Lists__GroupHomework__Detail__index.async.js @@ -9208,6 +9208,9 @@ __webpack_require__.d(__webpack_exports__, { "default": function() { return /* binding */ Detail; } }); +// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/toConsumableArray.js +var toConsumableArray = __webpack_require__(37205); +var toConsumableArray_default = /*#__PURE__*/__webpack_require__.n(toConsumableArray); // EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/regeneratorRuntime.js var regeneratorRuntime = __webpack_require__(7557); var regeneratorRuntime_default = /*#__PURE__*/__webpack_require__.n(regeneratorRuntime); @@ -9234,6 +9237,16 @@ var breadcrumb = __webpack_require__(66104); var tooltip = __webpack_require__(6848); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/tabs/index.js + 24 modules var tabs = __webpack_require__(99313); +// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/modal/index.js + 16 modules +var modal = __webpack_require__(43418); +// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/row/index.js +var row = __webpack_require__(95237); +// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/col/index.js +var col = __webpack_require__(43604); +// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/input/index.js + 5 modules +var input = __webpack_require__(8772); +// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/table/index.js + 85 modules +var table = __webpack_require__(52306); // EXTERNAL MODULE: ./node_modules/_@ant-design_icons@5.3.6@@ant-design/icons/es/icons/ArrowLeftOutlined.js + 1 modules var ArrowLeftOutlined = __webpack_require__(5105); // EXTERNAL MODULE: ./src/utils/util.tsx @@ -9243,27 +9256,14 @@ var authority = __webpack_require__(82522); // EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/defineProperty.js var defineProperty = __webpack_require__(85573); var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty); -// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/toConsumableArray.js -var toConsumableArray = __webpack_require__(37205); -var toConsumableArray_default = /*#__PURE__*/__webpack_require__.n(toConsumableArray); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/form/index.js + 19 modules var es_form = __webpack_require__(78241); -// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/modal/index.js + 16 modules -var modal = __webpack_require__(43418); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/menu/index.js + 11 modules var menu = __webpack_require__(20834); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/checkbox/index.js + 3 modules var es_checkbox = __webpack_require__(24905); -// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/row/index.js -var row = __webpack_require__(95237); -// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/col/index.js -var col = __webpack_require__(43604); -// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/input/index.js + 5 modules -var input = __webpack_require__(8772); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/dropdown/index.js + 1 modules var dropdown = __webpack_require__(38854); -// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/table/index.js + 85 modules -var table = __webpack_require__(52306); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/pagination/index.js + 10 modules var pagination = __webpack_require__(88590); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/radio/index.js + 5 modules @@ -9491,6 +9491,9 @@ var AsyncButton = __webpack_require__(54063); var ui_customization = __webpack_require__(8034); // EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js var lodash = __webpack_require__(89392); +// EXTERNAL MODULE: ./node_modules/_dayjs@1.11.10@dayjs/dayjs.min.js +var dayjs_min = __webpack_require__(9498); +var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min); ;// CONCATENATED MODULE: ./src/pages/Classrooms/Lists/GroupHomework/Detail/components/WorkList/index.tsx @@ -9514,6 +9517,7 @@ var lodash = __webpack_require__(89392); + var classRef = /*#__PURE__*/(0,_react_17_0_2_react.createRef)(); @@ -9832,8 +9836,7 @@ var WorkList = function WorkList(_ref) { title: '关联项目', align: 'left', dataIndex: 'base_on_project', - width: 100, - ellipsis: true, + width: 200, render: function render(text, record) { var _record$project_info, _record$project_info2, _globalSetting$settin, _record$project_info3, _record$project_info4, _record$project_info5; return { @@ -9842,9 +9845,10 @@ var WorkList = function WorkList(_ref) { title: (_record$project_info2 = record.project_info) === null || _record$project_info2 === void 0 ? void 0 : _record$project_info2.name, href: "".concat(globalSetting === null || globalSetting === void 0 || (_globalSetting$settin = globalSetting.setting) === null || _globalSetting$settin === void 0 ? void 0 : _globalSetting$settin.old_url).concat((_record$project_info3 = record.project_info) === null || _record$project_info3 === void 0 ? void 0 : _record$project_info3.id), style: { - width: 80 - }, - className: WorkListmodules.atitle, + whiteSpace: 'break-spaces' + } + // className={styles.atitle} + , children: (_record$project_info4 = record.project_info) === null || _record$project_info4 === void 0 ? void 0 : _record$project_info4.name }) : (_record$project_info5 = record.project_info) === null || _record$project_info5 === void 0 ? void 0 : _record$project_info5.name, props: { @@ -9894,7 +9898,7 @@ var WorkList = function WorkList(_ref) { dataIndex: 'student_id', // sortOrder: sortObj['student_id'], sortDirections: ['descend', 'ascend'], - width: 150, + width: 80, ellipsis: true, // sorter: (a: any, b: any) => a.id - b.id, sorter: workList !== null && workList !== void 0 && workList.base_on_project ? false : true, @@ -9906,7 +9910,7 @@ var WorkList = function WorkList(_ref) { children: text }); } - }, (0,authority/* isAdmin */.GJ)() && { + }, (0,authority/* isAdmin */.GJ)() && !(workList !== null && workList !== void 0 && workList.base_on_project) && { title: '分班', align: 'left', dataIndex: 'group_name' @@ -9974,6 +9978,25 @@ var WorkList = function WorkList(_ref) { children: text || '--' }; } + }, (workList === null || workList === void 0 ? void 0 : workList.base_on_project) && { + title: '更新时间', + align: 'left', + dataIndex: 'update_time', + width: 140, + render: function render(text, record) { + return { + children: text ? /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + style: { + display: 'block', + alignItems: 'center' + }, + children: ["\u66F4\u65B0\u4EE3\u7801", /*#__PURE__*/(0,jsx_runtime.jsx)("br", {}), dayjs_min_default()(text).format('YYYY-MM-DD HH:mm')] + }) : '--', + props: { + rowSpan: record.rowSpan + } + }; + } }, { title: '作品状态', dataIndex: 'work_status', @@ -10057,7 +10080,7 @@ var WorkList = function WorkList(_ref) { // }, // }, - { + !(workList !== null && workList !== void 0 && workList.base_on_project) && { title: '分组', align: 'left', dataIndex: 'work_group', @@ -10075,7 +10098,7 @@ var WorkList = function WorkList(_ref) { } }, { title: '操作', - width: workList !== null && workList !== void 0 && workList.base_on_project ? 100 : 140, + width: 100, align: 'left', dataInex: 'action', render: function render(text, record) { @@ -10671,6 +10694,10 @@ var WorkList = function WorkList(_ref) { title: '未提交人数', align: 'center', dataIndex: 'not_submitted_num' + }, { + title: '部分提交', + align: 'center', + dataIndex: 'partial_submission' }, { title: '按时提交', align: 'center', @@ -11168,7 +11195,7 @@ var WorkList = function WorkList(_ref) { options: adjustGroupData === null || adjustGroupData === void 0 || (_adjustGroupData$grou = adjustGroupData.groupAll) === null || _adjustGroupData$grou === void 0 ? void 0 : _adjustGroupData$grou.map(function (item) { return { value: item.group_id, - label: item.group_name + label: "\uFF08".concat(item.group_name, "\uFF09") + (item === null || item === void 0 ? void 0 : item.name_list) }; }) }) @@ -11332,9 +11359,6 @@ var DelComponents_DelShixun = function DelShixun(_ref) { shixunHomeworks: shixunHomeworks }; })(DelComponents_DelShixun)); -// EXTERNAL MODULE: ./node_modules/_dayjs@1.11.10@dayjs/dayjs.min.js -var dayjs_min = __webpack_require__(9498); -var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min); // EXTERNAL MODULE: ./src/components/FileDownloadList/index.tsx + 1 modules var FileDownloadList = __webpack_require__(97177); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/spin/index.js + 1 modules @@ -16426,16 +16450,20 @@ var SetsScore = __webpack_require__(21976); + + + var Detail_ShixunsListPage = function ShixunsListPage(_ref) { - var _workList$homework_st, _workList$category, _workList$category2, _workList$homework_st9; + var _workList$homework_st, _workList$category, _workList$category2, _workList$homework_st9, _workList$group_data3, _workList$group_data4, _workList$group_data5, _workList$group_data6; var shixunHomeworks = _ref.shixunHomeworks, classroomList = _ref.classroomList, globalSetting = _ref.globalSetting, - dispatch = _ref.dispatch; + dispatch = _ref.dispatch, + user = _ref.user; var _useState = (0,_react_17_0_2_react.useState)(objectSpread2_default()({}, (0,_umi_production_exports.useParams)())), _useState2 = slicedToArray_default()(_useState, 2), params = _useState2[0], @@ -16459,6 +16487,27 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) { var zip = (0,_react_17_0_2_react.useRef)(null); var workList = shixunHomeworks.workList, workSetting = shixunHomeworks.workSetting; + var _useState9 = (0,_react_17_0_2_react.useState)(false), + _useState10 = slicedToArray_default()(_useState9, 2), + isshow = _useState10[0], + setisshow = _useState10[1]; + var _useState11 = (0,_react_17_0_2_react.useState)([]), + _useState12 = slicedToArray_default()(_useState11, 2), + grouplist = _useState12[0], + setgrouplist = _useState12[1]; + var _useState13 = (0,_react_17_0_2_react.useState)([]), + _useState14 = slicedToArray_default()(_useState13, 2), + selectStudent = _useState14[0], + setSelectStudent = _useState14[1]; + // ---- + var _useState15 = (0,_react_17_0_2_react.useState)(false), + _useState16 = slicedToArray_default()(_useState15, 2), + isadd = _useState16[0], + setisadd = _useState16[1]; + var _useState17 = (0,_react_17_0_2_react.useState)(false), + _useState18 = slicedToArray_default()(_useState17, 2), + addlist = _useState18[0], + setaddlist = _useState18[1]; if (searchParams.get("category_id")) { setParams(objectSpread2_default()(objectSpread2_default()({}, params), {}, { category: searchParams.get("category_id") @@ -16550,7 +16599,7 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) { * 获取tab右侧导航的按钮 */ var getTabButton = function getTabButton() { - var _workList$homework_st3, _workList$homework_st4, _workList$homework_st5, _workList$homework_st6, _workList$homework_st7, _workList$homework_st8, _workList$work_status, _workList$work_status2, _workList$work_status3, _workList$work_status4, _workList$work_status5, _workList$work_status6, _workList$work_status7, _workList$work_status8; + var _workList$homework_st3, _workList$homework_st4, _workList$homework_st5, _workList$homework_st6, _workList$homework_st7, _workList$homework_st8, _workList$work_status, _workList$work_status2, _workList$work_status3, _workList$work_status4, _workList$work_status5, _workList$work_status6, _workList$work_status7, _workList$work_status8, _workList$work_status9, _workList$work_status10, _workList$work_status11; return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: Detailmodules.workListTabButton, children: [(0,authority/* isAdmin */.GJ)() && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { @@ -16711,28 +16760,6 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) { } } }); - // Modal.confirm({ - // title: '关联项目', - // centered: true, - // width: 600, - // okText: '确定', - // cancelText: '取消', - // content: ( - //
- // 您当前尚未管理任何项目，请先 - // { - // openNewWindow( - // `${globalSetting?.setting?.old_url}/projects/deposit/new`, - // ); - // }} - // > - // 创建项目 - // - // 再关联 - //
- // ), - // }); }, children: "\u5173\u8054\u9879\u76EE" }), (workList === null || workList === void 0 || (_workList$work_status4 = workList.work_statuses) === null || _workList$work_status4 === void 0 ? void 0 : _workList$work_status4.includes('提交作品')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { @@ -16741,7 +16768,71 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) { return (0,util/* openNewWindow */.xg)("/classrooms/".concat(workList.course_id, "/group_homework/").concat(workList.homework_id, "/post")); }, children: "\u63D0\u4EA4\u4F5C\u54C1" - }), (workList === null || workList === void 0 ? void 0 : workList.is_leader) && (workList === null || workList === void 0 ? void 0 : workList.base_on_project) && ['提交中', '进行中'].includes(workList.homework_status) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + }), (workList === null || workList === void 0 || (_workList$work_status5 = workList.work_statuses) === null || _workList$work_status5 === void 0 ? void 0 : _workList$work_status5.includes('创建分组')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + type: "primary", + onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() { + var res, _res$data; + return regeneratorRuntime_default()().wrap(function _callee2$(_context2) { + while (1) switch (_context2.prev = _context2.next) { + case 0: + _context2.next = 2; + return (0,fetch/* default */.ZP)("/api/homework_commons/".concat(workList.homework_id, "/get_member_list.json"), { + method: 'get', + params: { + // keyword: '' + } + }); + case 2: + res = _context2.sent; + if ((res === null || res === void 0 ? void 0 : res.status) === 0) { + setisshow(true); + setgrouplist(res === null || res === void 0 ? void 0 : res.data); + setSelectStudent(res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.filter(function (item) { + var _user$userInfo; + return (item === null || item === void 0 ? void 0 : item.user_id) === (user === null || user === void 0 || (_user$userInfo = user.userInfo) === null || _user$userInfo === void 0 ? void 0 : _user$userInfo.user_id); + })); + } + case 4: + case "end": + return _context2.stop(); + } + }, _callee2); + })), + children: "\u521B\u5EFA\u5206\u7EC4" + }), (workList === null || workList === void 0 || (_workList$work_status6 = workList.work_statuses) === null || _workList$work_status6 === void 0 ? void 0 : _workList$work_status6.includes('加入分组')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + type: "primary", + onClick: (0,lodash.throttle)( /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3() { + var res, _res$data2; + return regeneratorRuntime_default()().wrap(function _callee3$(_context3) { + while (1) switch (_context3.prev = _context3.next) { + case 0: + _context3.next = 2; + return (0,fetch/* default */.ZP)("/api/homework_commons/".concat(workList.homework_id, "/get_group_list.json"), { + method: 'get' + }); + case 2: + res = _context3.sent; + if (!((res === null || res === void 0 ? void 0 : res.status) === 0)) { + _context3.next = 9; + break; + } + if (!((res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.length) <= 0)) { + _context3.next = 7; + break; + } + message/* default */.ZP.info('暂无分组'); + return _context3.abrupt("return"); + case 7: + setisadd(true); + setaddlist(res === null || res === void 0 ? void 0 : res.data); + case 9: + case "end": + return _context3.stop(); + } + }, _callee3); + })), 300), + children: "\u52A0\u5165\u5206\u7EC4" + }), (workList === null || workList === void 0 || (_workList$work_status7 = workList.work_statuses) === null || _workList$work_status7 === void 0 ? void 0 : _workList$work_status7.includes('更换项目')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { type: "primary", onClick: function onClick() { dispatch({ @@ -16762,7 +16853,7 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) { }); }, children: "\u66F4\u6362\u9879\u76EE" - }), (workList === null || workList === void 0 || (_workList$work_status5 = workList.work_statuses) === null || _workList$work_status5 === void 0 ? void 0 : _workList$work_status5.includes('申请换组')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + }), (workList === null || workList === void 0 || (_workList$work_status8 = workList.work_statuses) === null || _workList$work_status8 === void 0 ? void 0 : _workList$work_status8.includes('申请换组')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { type: "primary", onClick: function onClick() { dispatch({ @@ -16774,19 +16865,19 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) { }); }, children: "\u7533\u8BF7\u6362\u7EC4" - }), (workList === null || workList === void 0 || (_workList$work_status6 = workList.work_statuses) === null || _workList$work_status6 === void 0 ? void 0 : _workList$work_status6.includes('修改作品')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + }), (workList === null || workList === void 0 || (_workList$work_status9 = workList.work_statuses) === null || _workList$work_status9 === void 0 ? void 0 : _workList$work_status9.includes('修改作品')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { type: "primary", onClick: function onClick() { return (0,util/* openNewWindow */.xg)("/classrooms/".concat(workList.course_id, "/group_homework/").concat(workList.homework_id, "/").concat(workList.id, "/edit")); }, children: "\u4FEE\u6539\u4F5C\u54C1" - }), (workList === null || workList === void 0 || (_workList$work_status7 = workList.work_statuses) === null || _workList$work_status7 === void 0 ? void 0 : _workList$work_status7.includes('补交作品')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + }), (workList === null || workList === void 0 || (_workList$work_status10 = workList.work_statuses) === null || _workList$work_status10 === void 0 ? void 0 : _workList$work_status10.includes('补交作品')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { type: "primary", onClick: function onClick() { return (0,util/* openNewWindow */.xg)("/classrooms/".concat(workList.course_id, "/group_homework/").concat(workList.homework_id, "/post")); }, children: "\u8865\u4EA4\u4F5C\u54C1" - }), (workList === null || workList === void 0 || (_workList$work_status8 = workList.work_statuses) === null || _workList$work_status8 === void 0 ? void 0 : _workList$work_status8.includes('补交附件')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + }), (workList === null || workList === void 0 || (_workList$work_status11 = workList.work_statuses) === null || _workList$work_status11 === void 0 ? void 0 : _workList$work_status11.includes('补交附件')) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { type: "primary", onClick: function onClick() { dispatch({ @@ -16895,7 +16986,254 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) { }) }) })] - }), /*#__PURE__*/(0,jsx_runtime.jsx)(AssociatedProjects/* default */.Z, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(AfterAppendix/* default */.Z, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(Addachievement/* default */.Z, { + }), /*#__PURE__*/(0,jsx_runtime.jsx)(AssociatedProjects/* default */.Z, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, { + title: "\u521B\u5EFA\u5206\u7EC4", + open: isshow, + width: 800, + onCancel: function onCancel() { + setisshow(false); + setSelectStudent([]); + }, + onOk: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4() { + var _workList$group_data; + var _workList$group_data2, res; + return regeneratorRuntime_default()().wrap(function _callee4$(_context4) { + while (1) switch (_context4.prev = _context4.next) { + case 0: + if (!((workList === null || workList === void 0 || (_workList$group_data = workList.group_data) === null || _workList$group_data === void 0 ? void 0 : _workList$group_data.max_num) < (selectStudent === null || selectStudent === void 0 ? void 0 : selectStudent.length))) { + _context4.next = 3; + break; + } + message/* default */.ZP.error("\u4EBA\u6570\u4E0D\u80FD\u8D85\u8FC7".concat(workList === null || workList === void 0 || (_workList$group_data2 = workList.group_data) === null || _workList$group_data2 === void 0 ? void 0 : _workList$group_data2.max_num)); + return _context4.abrupt("return"); + case 3: + _context4.next = 5; + return (0,fetch/* default */.ZP)("/api/homework_commons/".concat(workList.homework_id, "/create_group.json"), { + method: 'post', + body: { + user_id: selectStudent === null || selectStudent === void 0 ? void 0 : selectStudent.map(function (item) { + return item.user_id; + }) + } + }); + case 5: + res = _context4.sent; + if ((res === null || res === void 0 ? void 0 : res.status) === 0) { + message/* default */.ZP.info('创建成功'); + getData(); + setisshow(false); + } + case 7: + case "end": + return _context4.stop(); + } + }, _callee4); + })), + children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { + style: { + marginBottom: 10 + }, + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, { + span: 12, + children: ["\u7EC4\u5458\u6570\u91CF\u8981\u6C42\uFF1A", workList === null || workList === void 0 || (_workList$group_data3 = workList.group_data) === null || _workList$group_data3 === void 0 ? void 0 : _workList$group_data3.min_num, "~", workList === null || workList === void 0 || (_workList$group_data4 = workList.group_data) === null || _workList$group_data4 === void 0 ? void 0 : _workList$group_data4.max_num, "\u4EBA"] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { + span: 12, + children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z.Search, { + placeholder: "\u8BF7\u8F93\u5165\u59D3\u540D\u6216\u5B66\u53F7\u641C\u7D22", + onSearch: ( /*#__PURE__*/function () { + var _ref6 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5(e) { + var res; + return regeneratorRuntime_default()().wrap(function _callee5$(_context5) { + while (1) switch (_context5.prev = _context5.next) { + case 0: + _context5.next = 2; + return (0,fetch/* default */.ZP)("/api/homework_commons/".concat(workList.homework_id, "/get_member_list.json"), { + method: 'get', + params: { + keyword: e + } + }); + case 2: + res = _context5.sent; + if ((res === null || res === void 0 ? void 0 : res.status) === 0) { + setgrouplist(res === null || res === void 0 ? void 0 : res.data); + } + case 4: + case "end": + return _context5.stop(); + } + }, _callee5); + })); + return function (_x) { + return _ref6.apply(this, arguments); + }; + }()) + }) + })] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, { + dataSource: grouplist + // rowClassName={styles.bgf} + , + pagination: false, + rowKey: function rowKey(e) { + return e.user_id; + }, + style: { + border: '1px solid #F6F7F9', + minWidth: 550 + } + + // bordered={true} + , + rowSelection: { + type: 'checkbox', + getCheckboxProps: function getCheckboxProps(record) { + return { + disabled: (record === null || record === void 0 ? void 0 : record.user_id) === user.userInfo.user_id + }; + }, + selectedRowKeys: selectStudent === null || selectStudent === void 0 ? void 0 : selectStudent.map(function (item) { + return item.user_id; + }), + onChange: function onChange(selectedRowKeys, selectedRows, info) { + setSelectStudent(toConsumableArray_default()(selectedRows)); + } + }, + scroll: { + y: 400 + }, + columns: [{ + title: '姓名', + dataIndex: 'name', + key: 'name' + }, { + title: '分班', + dataIndex: 'course_group_name', + key: 'course_group_name' + }, { + title: '学号', + dataIndex: 'student_id', + key: 'student_id' + }] + })] + }) + }), /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, { + title: "\u52A0\u5165\u5206\u7EC4", + open: isadd, + width: 800, + onCancel: function onCancel() { + setisadd(false); + }, + footer: false, + children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { + style: { + marginBottom: 10 + }, + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, { + span: 12, + children: ["\u7EC4\u5458\u6570\u91CF\u8981\u6C42\uFF1A", workList === null || workList === void 0 || (_workList$group_data5 = workList.group_data) === null || _workList$group_data5 === void 0 ? void 0 : _workList$group_data5.min_num, "~", workList === null || workList === void 0 || (_workList$group_data6 = workList.group_data) === null || _workList$group_data6 === void 0 ? void 0 : _workList$group_data6.max_num, "\u4EBA"] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { + span: 12, + children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z.Search, { + placeholder: "\u8BF7\u8F93\u5165\u961F\u957F\u540D\u79F0", + onSearch: ( /*#__PURE__*/function () { + var _ref7 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee6(e) { + var res; + return regeneratorRuntime_default()().wrap(function _callee6$(_context6) { + while (1) switch (_context6.prev = _context6.next) { + case 0: + _context6.next = 2; + return (0,fetch/* default */.ZP)("/api/homework_commons/".concat(workList.homework_id, "/get_group_list.json"), { + method: 'get', + params: { + keyword: e + } + }); + case 2: + res = _context6.sent; + if ((res === null || res === void 0 ? void 0 : res.status) === 0) { + setaddlist(res === null || res === void 0 ? void 0 : res.data); + } + case 4: + case "end": + return _context6.stop(); + } + }, _callee6); + })); + return function (_x2) { + return _ref7.apply(this, arguments); + }; + }()) + }) + })] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, { + dataSource: addlist + // rowClassName={styles.bgf} + , + pagination: false, + rowKey: function rowKey(e) { + return e.user_id; + }, + style: { + border: '1px solid #F6F7F9', + minWidth: 550 + }, + scroll: { + y: 400 + }, + columns: [{ + title: '组名', + dataIndex: 'group_name', + key: 'group_name' + }, { + title: '队长', + dataIndex: 'leader_name', + key: 'leader_name' + }, { + title: '成员数', + dataIndex: 'user_list', + key: 'user_list' + }, { + title: '操作', + dataIndex: 'group_id', + key: 'group_id', + render: function render(value, item) { + return /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + disabled: item === null || item === void 0 ? void 0 : item.can_join, + onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee7() { + var res; + return regeneratorRuntime_default()().wrap(function _callee7$(_context7) { + while (1) switch (_context7.prev = _context7.next) { + case 0: + _context7.next = 2; + return (0,fetch/* default */.ZP)("/api/homework_commons/".concat(workList.homework_id, "/join_group.json"), { + method: 'post', + body: { + group_id: value + } + }); + case 2: + res = _context7.sent; + if ((res === null || res === void 0 ? void 0 : res.status) === 0) { + message/* default */.ZP.info('加入成功'); + getData(); + setisadd(false); + } + case 4: + case "end": + return _context7.stop(); + } + }, _callee7); + })), + children: item !== null && item !== void 0 && item.can_join ? '已满' : '加入' + }); + } + }] + })] + }) + }), /*#__PURE__*/(0,jsx_runtime.jsx)(AfterAppendix/* default */.Z, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(Addachievement/* default */.Z, { onOk: function onOk() { getData(); } @@ -16938,12 +17276,12 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) { })] }); }; -/* harmony default export */ var Detail = ((0,_umi_production_exports.connect)(function (_ref3) { - var user = _ref3.user, - shixunHomeworks = _ref3.shixunHomeworks, - loading = _ref3.loading, - globalSetting = _ref3.globalSetting, - classroomList = _ref3.classroomList; +/* harmony default export */ var Detail = ((0,_umi_production_exports.connect)(function (_ref9) { + var user = _ref9.user, + shixunHomeworks = _ref9.shixunHomeworks, + loading = _ref9.loading, + globalSetting = _ref9.globalSetting, + classroomList = _ref9.classroomList; return { user: user, shixunHomeworks: shixunHomeworks, diff --git a/p__Classrooms__Lists__GroupHomework__Detail__index.chunk.css b/p__Classrooms__Lists__GroupHomework__Detail__index.chunk.css index cbffde20c2..2328acc341 100644 --- a/p__Classrooms__Lists__GroupHomework__Detail__index.chunk.css +++ b/p__Classrooms__Lists__GroupHomework__Detail__index.chunk.css @@ -1490,7 +1490,7 @@ span.CodeMirror-selectedtext { overflow: hidden; } .tables___thRYc { - background: #f8f8f8; + background: #f5f5f5; } /*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ diff --git a/p__Classrooms__Lists__GroupHomework__EditWork__index.async.js b/p__Classrooms__Lists__GroupHomework__EditWork__index.async.js index 8609833e06..d99b7746fb 100644 --- a/p__Classrooms__Lists__GroupHomework__EditWork__index.async.js +++ b/p__Classrooms__Lists__GroupHomework__EditWork__index.async.js @@ -6794,11 +6794,25 @@ var NewCoursePage = function NewCoursePage(_ref) { selectedRowKeys: selectStudent === null || selectStudent === void 0 ? void 0 : selectStudent.map(function (item) { return item.user_id; }), + onSelect: function onSelect(re, se, rows) { + if (se) { + setSelectStudent([].concat(toConsumableArray_default()(selectStudent), [objectSpread2_default()({}, re)])); + } else { + var aa = selectStudent.filter(function (item) { + return item.user_id !== (re === null || re === void 0 ? void 0 : re.user_id); + }); + setSelectStudent(toConsumableArray_default()(aa)); + } + }, onChange: function onChange(selectedRowKeys, selectedRows, info) { - // let aa = selectedRows.filter((item: any) => !selectStudent.map(item => item.user_id).includes(item.user_id)) - // setSelectStudent([...selectStudent, ...aa]) - setSelectStudent(selectedRows); - } + if (info.type === 'all') { + setSelectStudent(toConsumableArray_default()(selectedRows)); + } + } // onChange(selectedRowKeys, selectedRows, info) { + // // let aa = selectedRows.filter((item: any) => !selectStudent.map(item => item.user_id).includes(item.user_id)) + // // setSelectStudent([...selectStudent, ...aa]) + // setSelectStudent(selectedRows) + // }, }, scroll: { y: 400 diff --git a/p__Classrooms__Lists__GroupHomework__SubmitWork__index.async.js b/p__Classrooms__Lists__GroupHomework__SubmitWork__index.async.js index 5f6c869363..fc7d27dfcc 100644 --- a/p__Classrooms__Lists__GroupHomework__SubmitWork__index.async.js +++ b/p__Classrooms__Lists__GroupHomework__SubmitWork__index.async.js @@ -6343,6 +6343,10 @@ var table = __webpack_require__(52306); var input_number = __webpack_require__(97913); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/button/index.js var es_button = __webpack_require__(3113); +// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/radio/index.js + 5 modules +var es_radio = __webpack_require__(5112); +// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/space/index.js + 3 modules +var space = __webpack_require__(81327); // EXTERNAL MODULE: ./src/components/QuestionEditor/MdEditorInForm.tsx var MdEditorInForm = __webpack_require__(57867); // EXTERNAL MODULE: ./src/service/shixunHomeworks.ts @@ -6360,6 +6364,8 @@ var RenderHtml = __webpack_require__(70159); var authority = __webpack_require__(82522); // EXTERNAL MODULE: ./src/assets/images/lj.png var lj = __webpack_require__(96622); +// EXTERNAL MODULE: ./src/utils/fetch.ts +var fetch = __webpack_require__(84087); // EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/jsx-runtime.js var jsx_runtime = __webpack_require__(37712); ;// CONCATENATED MODULE: ./src/pages/Classrooms/Lists/GroupHomework/SubmitWork/index.tsx @@ -6381,7 +6387,9 @@ var jsx_runtime = __webpack_require__(37712); + var NewCoursePage = function NewCoursePage(_ref) { + var _studentWorkAddDefaul2; var shixunHomeworks = _ref.shixunHomeworks, user = _ref.user, newCourse = _ref.newCourse, @@ -6412,17 +6420,29 @@ var NewCoursePage = function NewCoursePage(_ref) { setSelectStudent = _useState8[1]; var _useState9 = (0,_react_17_0_2_react.useState)(false), _useState10 = slicedToArray_default()(_useState9, 2), - isAi = _useState10[0], - setIsAi = _useState10[1]; + isshow = _useState10[0], + setisisshow = _useState10[1]; + var _useState11 = (0,_react_17_0_2_react.useState)(false), + _useState12 = slicedToArray_default()(_useState11, 2), + isloading = _useState12[0], + setisloading = _useState12[1]; + var _useState13 = (0,_react_17_0_2_react.useState)(), + _useState14 = slicedToArray_default()(_useState13, 2), + value = _useState14[0], + setvalue = _useState14[1]; + var _useState15 = (0,_react_17_0_2_react.useState)(false), + _useState16 = slicedToArray_default()(_useState15, 2), + isAi = _useState16[0], + setIsAi = _useState16[1]; var aiInit = (0,_react_17_0_2_react.useRef)(false); - var _useState11 = (0,_react_17_0_2_react.useState)({ + var _useState17 = (0,_react_17_0_2_react.useState)({ page: 1, limit: 9999, search: "" }), - _useState12 = slicedToArray_default()(_useState11, 2), - memberSearchParams = _useState12[0], - setMemberSearchParams = _useState12[1]; + _useState18 = slicedToArray_default()(_useState17, 2), + memberSearchParams = _useState18[0], + setMemberSearchParams = _useState18[1]; var getData = /*#__PURE__*/function () { var _ref2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() { var res; @@ -6436,13 +6456,12 @@ var NewCoursePage = function NewCoursePage(_ref) { }); case 2: res = _context.sent; - console.log(searchMemberList, res.members, 44); if (res.members && res.members.length > 0) { - setSearchMemberList([].concat(toConsumableArray_default()(searchMemberList), toConsumableArray_default()(res.members))); + setSearchMemberList(toConsumableArray_default()(res.members)); } setIsAi(res === null || res === void 0 ? void 0 : res.is_ai); setHasmore(false); - case 7: + case 6: case "end": return _context.stop(); } @@ -6455,17 +6474,16 @@ var NewCoursePage = function NewCoursePage(_ref) { (0,_react_17_0_2_react.useEffect)(function () { console.log(isAi, !aiInit.current, searchMemberList === null || searchMemberList === void 0 ? void 0 : searchMemberList.length, selectStudent === null || selectStudent === void 0 ? void 0 : selectStudent.length, 333); if (isAi && !aiInit.current && !!(selectStudent !== null && selectStudent !== void 0 && selectStudent.length) && !!(searchMemberList !== null && searchMemberList !== void 0 && searchMemberList.length)) { + var _studentWorkAddDefaul; aiInit.current = true; - var item = [].concat(toConsumableArray_default()(selectStudent), toConsumableArray_default()(searchMemberList)); - setSelectStudent(item); + setSelectStudent(studentWorkAddDefaultData === null || studentWorkAddDefaultData === void 0 ? void 0 : studentWorkAddDefaultData.members); form.setFieldsValue({ - user_ids: item === null || item === void 0 ? void 0 : item.map(function (val) { + user_ids: studentWorkAddDefaultData === null || studentWorkAddDefaultData === void 0 || (_studentWorkAddDefaul = studentWorkAddDefaultData.members) === null || _studentWorkAddDefaul === void 0 ? void 0 : _studentWorkAddDefaul.map(function (val) { return val.user_id; }) }); } }, [isAi, searchMemberList === null || searchMemberList === void 0 ? void 0 : searchMemberList.length, selectStudent === null || selectStudent === void 0 ? void 0 : selectStudent.length]); - console.log(searchMemberList, selectStudent, 444); (0,_react_17_0_2_react.useEffect)(function () { dispatch({ type: "shixunHomeworks/getWorkDetail", @@ -6485,12 +6503,7 @@ var NewCoursePage = function NewCoursePage(_ref) { }, [memberSearchParams]); (0,_react_17_0_2_react.useEffect)(function () { if (!!(studentWorkAddDefaultData !== null && studentWorkAddDefaultData !== void 0 && studentWorkAddDefaultData.homework_name)) { - setSelectStudent([{ - user_name: studentWorkAddDefaultData === null || studentWorkAddDefaultData === void 0 ? void 0 : studentWorkAddDefaultData.user_name, - group_name: studentWorkAddDefaultData === null || studentWorkAddDefaultData === void 0 ? void 0 : studentWorkAddDefaultData.group_name, - student_id: studentWorkAddDefaultData === null || studentWorkAddDefaultData === void 0 ? void 0 : studentWorkAddDefaultData.student_id, - user_id: studentWorkAddDefaultData === null || studentWorkAddDefaultData === void 0 ? void 0 : studentWorkAddDefaultData.user_id - }]); + setSelectStudent(toConsumableArray_default()(studentWorkAddDefaultData === null || studentWorkAddDefaultData === void 0 ? void 0 : studentWorkAddDefaultData.members)); } }, [studentWorkAddDefaultData === null || studentWorkAddDefaultData === void 0 ? void 0 : studentWorkAddDefaultData.homework_name]); var handleSubmit = /*#__PURE__*/function () { @@ -6599,6 +6612,7 @@ var NewCoursePage = function NewCoursePage(_ref) { return _ref5.apply(this, arguments); }; }(); + console.log('---', selectStudent); return /*#__PURE__*/(0,jsx_runtime.jsxs)("section", { className: SubmitWorkmodules.bg, children: [studentWorkAddDefaultData.course_name && /*#__PURE__*/(0,jsx_runtime.jsx)("section", { @@ -6687,40 +6701,58 @@ var NewCoursePage = function NewCoursePage(_ref) { children: /*#__PURE__*/(0,jsx_runtime.jsx)(MultiUpload/* default */.Z, {}) }), /*#__PURE__*/(0,jsx_runtime.jsx)(divider/* default */.Z, {}), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { children: "\u5C0F\u7EC4\u6210\u5458\uFF1A" - }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { - align: "middle", - className: "mb20", + }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: { - marginTop: 20, - width: 550 + display: 'flex' }, - children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, { - span: 12, - children: ["\u6210\u5458\u8981\u6C42:", studentWorkAddDefaultData.min_num, "~", studentWorkAddDefaultData.max_num, "\u4EBA\xA0"] - }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { - span: 12, + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { + align: "middle", + className: "mb20", style: { - display: 'flex', - justifyContent: 'flex-end' + marginTop: 20, + width: 550 }, - children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z.Search, { - onSearch: function onSearch(value, e) { - e.preventDefault(); - if (value === '') { - delete memberSearchParams.search; - } else { - memberSearchParams.search = value; + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, { + span: 12, + children: ["\u6210\u5458\u8981\u6C42:", studentWorkAddDefaultData.min_num, "~", studentWorkAddDefaultData.max_num, "\u4EBA\xA0"] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { + span: 12, + style: { + display: 'flex', + justifyContent: 'flex-end' + }, + children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z.Search, { + onSearch: function onSearch(value, e) { + e.preventDefault(); + if (value === '') { + delete memberSearchParams.search; + } else { + memberSearchParams.search = value; + } + memberSearchParams.page = 1; + setMemberSearchParams(objectSpread2_default()({}, memberSearchParams)); + setSearchMemberList([]); + setHasmore(true); + }, + placeholder: "\u8BF7\u8F93\u5165\u59D3\u540D\u6216\u5B66\u53F7\u641C\u7D22", + allowClear: true, + style: { + width: 240 } - memberSearchParams.page = 1; - setMemberSearchParams(objectSpread2_default()({}, memberSearchParams)); - setSearchMemberList([]); - setHasmore(true); + }) + })] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, { + style: { + width: 610, + alignItems: 'center' + }, + justify: "end", + children: studentWorkAddDefaultData.is_leader && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + className: SubmitWorkmodules.button, + onClick: function onClick() { + setisisshow(true); }, - placeholder: "\u8BF7\u8F93\u5165\u59D3\u540D\u6216\u5B66\u53F7\u641C\u7D22", - allowClear: true, - style: { - width: 240 - } + children: "\u66F4\u6362\u961F\u957F" }) })] }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { @@ -6746,21 +6778,28 @@ var NewCoursePage = function NewCoursePage(_ref) { rowSelection: { type: 'checkbox', getCheckboxProps: function getCheckboxProps(record) { + var _user$userInfo; return { - disabled: isAi + disabled: isAi || (record === null || record === void 0 ? void 0 : record.user_id) === ((_user$userInfo = user.userInfo) === null || _user$userInfo === void 0 ? void 0 : _user$userInfo.user_id) || !(studentWorkAddDefaultData !== null && studentWorkAddDefaultData !== void 0 && studentWorkAddDefaultData.is_leader) }; }, selectedRowKeys: selectStudent === null || selectStudent === void 0 ? void 0 : selectStudent.map(function (item) { return item.user_id; }), + onSelect: function onSelect(re, se, rows) { + if (se) { + setSelectStudent([].concat(toConsumableArray_default()(selectStudent), [objectSpread2_default()({}, re)])); + } else { + var aa = selectStudent.filter(function (item) { + return item.user_id !== (re === null || re === void 0 ? void 0 : re.user_id); + }); + setSelectStudent(toConsumableArray_default()(aa)); + } + }, onChange: function onChange(selectedRowKeys, selectedRows, info) { - // let item = selectStudent?.[0]; - var aa = selectedRows.filter(function (item) { - return !selectStudent.map(function (item) { - return item.user_id; - }).includes(item.user_id); - }); - setSelectStudent([].concat(toConsumableArray_default()(selectStudent), toConsumableArray_default()(aa))); + if (info.type === 'all') { + setSelectStudent(toConsumableArray_default()(selectedRows)); + } } }, scroll: { @@ -6865,7 +6904,7 @@ var NewCoursePage = function NewCoursePage(_ref) { style: { marginLeft: 10 }, - children: key != 0 && !isAi && /*#__PURE__*/(0,jsx_runtime.jsx)("i", { + children: key != 0 && !isAi && studentWorkAddDefaultData.is_leader && /*#__PURE__*/(0,jsx_runtime.jsx)("i", { className: "iconfont icon-shanchudiao current", onClick: function onClick() { var _formValue$user_ids, _formValue$user_ids2; @@ -6914,15 +6953,89 @@ var NewCoursePage = function NewCoursePage(_ref) { }, children: "\u53D6\u6D88" })] + }), /*#__PURE__*/(0,jsx_runtime.jsxs)(modal/* default */.Z, { + title: "\u66F4\u6362\u961F\u957F", + open: isshow, + onCancel: function onCancel() { + setisisshow(false); + }, + okButtonProps: { + loading: isloading + }, + onOk: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5() { + var res; + return regeneratorRuntime_default()().wrap(function _callee5$(_context5) { + while (1) switch (_context5.prev = _context5.next) { + case 0: + console.log('--', params); + setisloading(true); + _context5.next = 4; + return (0,fetch/* default */.ZP)("/api/student_works/".concat(studentWorkAddDefaultData.student_work_id, "/change_captain.json"), { + method: 'put', + body: { + user_id: value + } + }); + case 4: + res = _context5.sent; + setisloading(false); + if ((res === null || res === void 0 ? void 0 : res.status) === 0) { + setisisshow(false); + dispatch({ + type: "shixunHomeworks/getWorkDetail", + payload: { + categoryId: params.commonHomeworkId + } + }); + dispatch({ + type: 'shixunHomeworks/addStudentWorkDefaultData', + payload: objectSpread2_default()(objectSpread2_default()({}, params), {}, { + type: 3 + }) + }); + } + case 7: + case "end": + return _context5.stop(); + } + }, _callee5); + })), + children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { + children: "\u9009\u62E9\u7684\u6210\u5458\u5C06\u4F1A\u6210\u4E3A\u65B0\u7684\u961F\u957F" + }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + children: "\u60A8\u5C06\u4E0D\u518D\u62E5\u6709\u961F\u957F\u7684\u6743\u9650\uFF0C\u4F46\u60A8\u4ECD\u662F\u8BE5\u7EC4\u7684\u7EC4\u5458" + }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + style: { + marginTop: 20, + background: '#F6F7F9', + padding: 15 + }, + children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default.Group */.ZP.Group, { + onChange: function onChange(e) { + setvalue(e.target.value); + }, + children: /*#__PURE__*/(0,jsx_runtime.jsx)(space/* default */.Z, { + direction: "vertical", + children: studentWorkAddDefaultData === null || studentWorkAddDefaultData === void 0 || (_studentWorkAddDefaul2 = studentWorkAddDefaultData.members) === null || _studentWorkAddDefaul2 === void 0 || (_studentWorkAddDefaul2 = _studentWorkAddDefaul2.filter(function (item) { + return !item.is_leader; + })) === null || _studentWorkAddDefaul2 === void 0 ? void 0 : _studentWorkAddDefaul2.map(function (item) { + return /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, { + value: item.user_id, + children: item.user_name + }); + }) + }) + }) + })] })] }); }; -/* harmony default export */ var SubmitWork = ((0,_umi_production_exports.connect)(function (_ref6) { - var shixunHomeworks = _ref6.shixunHomeworks, - newCourse = _ref6.newCourse, - user = _ref6.user, - loading = _ref6.loading, - globalSetting = _ref6.globalSetting; +/* harmony default export */ var SubmitWork = ((0,_umi_production_exports.connect)(function (_ref7) { + var shixunHomeworks = _ref7.shixunHomeworks, + newCourse = _ref7.newCourse, + user = _ref7.user, + loading = _ref7.loading, + globalSetting = _ref7.globalSetting; return { shixunHomeworks: shixunHomeworks, newCourse: newCourse, diff --git a/p__Classrooms__Lists__GroupHomework__SubmitWork__index.chunk.css b/p__Classrooms__Lists__GroupHomework__SubmitWork__index.chunk.css index 5471101ba7..4b89c1d6b1 100644 --- a/p__Classrooms__Lists__GroupHomework__SubmitWork__index.chunk.css +++ b/p__Classrooms__Lists__GroupHomework__SubmitWork__index.chunk.css @@ -1709,6 +1709,21 @@ div[class~='ant-collapse-borderless'] { overflow: hidden; text-overflow: ellipsis; } +.button___RImGP { + display: inline-flex; + align-items: center; + justify-content: center; + width: 88px; + height: 34px; + background: linear-gradient(180deg, #FFFFFF 0%, #F6F7F9 100%), #F6F7F9; + box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5); + border-radius: 2px; + border: 1px solid #BACFFE; + font-weight: 400; + font-size: 14px; + color: #3061D0; + cursor: pointer; +} /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[1].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.8@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[1].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.8@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[1].use[3]!./src/components/MultiUpload/index.less ***! diff --git a/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js b/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js index b24251b249..b3fa17a141 100644 --- a/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js +++ b/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js @@ -14648,11 +14648,15 @@ var Collaboration_WorkList = function WorkList(_ref) { - +// import { isSuperAdmins } from '@/utils/authority' +// import Resource from './Resource' var ConfigWorks_WorkList = function WorkList() { return /*#__PURE__*/(0,jsx_runtime.jsx)("section", { + style: { + paddingBottom: 20 + }, className: [ConfigWorksmodules/* default */.Z.form, ' bg-white pl30 pt10'].join(' '), children: /*#__PURE__*/(0,jsx_runtime.jsxs)(tabs/* default */.Z, { destroyInactiveTabPane: true, diff --git a/p__Classrooms__Lists__ShixunHomeworks__index.async.js b/p__Classrooms__Lists__ShixunHomeworks__index.async.js index 7fc1a566f2..719cdc4cb4 100644 --- a/p__Classrooms__Lists__ShixunHomeworks__index.async.js +++ b/p__Classrooms__Lists__ShixunHomeworks__index.async.js @@ -9099,7 +9099,7 @@ var SelectShixun_PublishShixun = function PublishShixun(_ref) { }); var _useState11 = (0,_react_17_0_2_react.useState)({ page: 1, - type: "all", + type: "mine", diff: "", status: "published", order: "desc", @@ -9107,7 +9107,8 @@ var SelectShixun_PublishShixun = function PublishShixun(_ref) { // sort: isSuperAdmin() ? "recommend" : "myshixuns_count", sort: 'myshixuns_count', no_jupyter: 1, - group_id: null + group_id: null, + shixun_homework: true }), _useState12 = slicedToArray_default()(_useState11, 2), query = _useState12[0], @@ -9585,64 +9586,77 @@ var SelectShixun_PublishShixun = function PublishShixun(_ref) { style: { marginTop: '3px' }, - disabled: v === null || v === void 0 ? void 0 : v.need_authorize + disabled: (v === null || v === void 0 ? void 0 : v.need_authorize) || (v === null || v === void 0 ? void 0 : v.shixun_tag_num_name) == '未发布' }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: SelectShixunmodules.info, children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: SelectShixunmodules.title, children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: SelectShixunmodules.titleLeft, - children: [/*#__PURE__*/(0,jsx_runtime.jsx)(_umi_production_exports.Link, { - to: "/shixuns/".concat(v.identifier, "/challenges"), - target: "_blank", - children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", { - className: "font16", - dangerouslySetInnerHTML: { - __html: v.title - } - }) - }), (v === null || v === void 0 ? void 0 : v.need_authorize) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - onClick: function onClick() { - (0,verifyLogin/* AuthorizeModel */.rX)(false); - }, - style: { - marginRight: 'auto' - }, - className: "tag-style bg-pink current ml10", - children: "\u9700\u6388\u6743" - }), (0,authority/* isSuperAdmins */.Ny)() && (v === null || v === void 0 ? void 0 : v.mark_status) === 1 && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - zIndex: 10000, - title: v === null || v === void 0 ? void 0 : v.mark_content, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - style: { - marginRight: 'auto', - background: '#2FA34F' + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", { + children: [/*#__PURE__*/(0,jsx_runtime.jsx)(_umi_production_exports.Link, { + to: "/shixuns/".concat(v.identifier, "/challenges"), + target: "_blank", + children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", { + className: "font16", + dangerouslySetInnerHTML: { + __html: v.title + } + }) + }), (v === null || v === void 0 ? void 0 : v.need_authorize) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + onClick: function onClick() { + (0,verifyLogin/* AuthorizeModel */.rX)(false); }, - className: "tag-style current ml10", - children: "\u6B63\u5E38" - }) - }), (0,authority/* isSuperAdmins */.Ny)() && (v === null || v === void 0 ? void 0 : v.mark_status) === 2 && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - zIndex: 10000, - title: v === null || v === void 0 ? void 0 : v.mark_content, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { style: { - marginRight: 'auto', - background: '#FF8C29' + marginRight: 'auto' }, - className: "tag-style current ml10", - children: "\u9700\u5B8C\u5584" - }) - }), (0,authority/* isSuperAdmins */.Ny)() && (v === null || v === void 0 ? void 0 : v.mark_status) === 3 && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - zIndex: 10000, - title: v === null || v === void 0 ? void 0 : v.mark_content, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - style: { - marginRight: 'auto', - background: '#E53333' - }, - className: "tag-style current ml10", - children: "\u65E0\u6CD5\u4F7F\u7528" - }) + className: "tag-style bg-pink current ml10", + children: "\u9700\u6388\u6743" + }), (0,authority/* isSuperAdmins */.Ny)() && (v === null || v === void 0 ? void 0 : v.mark_status) === 1 && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + zIndex: 10000, + title: v === null || v === void 0 ? void 0 : v.mark_content, + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + style: { + marginRight: 'auto', + background: '#2FA34F' + }, + className: "tag-style current ml10", + children: "\u6B63\u5E38" + }) + }), (0,authority/* isSuperAdmins */.Ny)() && (v === null || v === void 0 ? void 0 : v.mark_status) === 2 && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + zIndex: 10000, + title: v === null || v === void 0 ? void 0 : v.mark_content, + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + style: { + marginRight: 'auto', + background: '#FF8C29' + }, + className: "tag-style current ml10", + children: "\u9700\u5B8C\u5584" + }) + }), (0,authority/* isSuperAdmins */.Ny)() && (v === null || v === void 0 ? void 0 : v.mark_status) === 3 && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + zIndex: 10000, + title: v === null || v === void 0 ? void 0 : v.mark_content, + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + style: { + marginRight: 'auto', + background: '#E53333' + }, + className: "tag-style current ml10", + children: "\u65E0\u6CD5\u4F7F\u7528" + }) + }), (v === null || v === void 0 ? void 0 : v.shixun_tag_num_name) == '未发布' && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + zIndex: 10000, + title: '实训需发布后才能发送到教学课堂，点击名称可前往实训详情', + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + style: { + marginRight: 'auto', + background: '#999' + }, + className: "tag-style current ml10", + children: "\u672A\u53D1\u5E03" + }) + })] }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { ghost: true, href: "/shixuns/".concat(v.identifier, "/challenges"), @@ -10470,10 +10484,11 @@ var SelectCourses_PublishShixun = function PublishShixun(_ref) { setSelectArrs = _useState4[1]; var _useState5 = (0,_react_17_0_2_react.useState)({ page: 1, - type: 'all', + type: 'mine', order: 'desc', limit: 20, - sort: 'myshixuns_count' + sort: 'myshixuns_count', + shixun_homework: true }), _useState6 = slicedToArray_default()(_useState5, 2), query = _useState6[0], @@ -10746,7 +10761,7 @@ var SelectCourses_PublishShixun = function PublishShixun(_ref) { style: { marginTop: '1px' }, - disabled: v === null || v === void 0 ? void 0 : v.need_authorize, + disabled: (v === null || v === void 0 ? void 0 : v.need_authorize) || (v === null || v === void 0 ? void 0 : v.shixun_tag_num_name) == '未发布', onChange: function onChange(e) { setSelectArrs([{ id: v.id, @@ -10759,33 +10774,50 @@ var SelectCourses_PublishShixun = function PublishShixun(_ref) { className: SelectShixunmodules.title, children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: SelectShixunmodules.titleLeft, - children: [/*#__PURE__*/(0,jsx_runtime.jsx)(_umi_production_exports.Link, { - to: "/paths/".concat(v.id), - target: "_blank", - children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", { - className: "font16", - dangerouslySetInnerHTML: { - __html: v.title - } + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", { + children: [/*#__PURE__*/(0,jsx_runtime.jsx)(_umi_production_exports.Link, { + to: "/paths/".concat(v.id), + target: "_blank", + children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", { + className: "font16", + dangerouslySetInnerHTML: { + __html: v.title + } + }) + }), (v === null || v === void 0 ? void 0 : v.need_authorize) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + onClick: function onClick() { + (0,verifyLogin/* AuthorizeModel */.rX)(false, '该课程中包含实训需授权后才可使用。 您可以在QQ服务群向管理员申请，获得继续操作的权限。'); + }, + style: { + marginRight: 'auto' + }, + className: "tag-style bg-pink current ml10", + children: "\u9700\u6388\u6743" + }), (v === null || v === void 0 ? void 0 : v.shixun_tag_num_name) == '未发布' && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + zIndex: 10000, + title: '实践课程需发布后才能发送到教学课堂，点击名称可前往课程详情', + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + style: { + marginRight: 'auto', + background: '#999' + }, + className: "tag-style current ml10", + children: "\u672A\u53D1\u5E03" + }) + })] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + zIndex: 10000, + title: '前往选用是进入实践课程的页面后，点击“发送”按钮，将所需实践项目发送至当前课堂', + children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + ghost: true, + href: "/paths/".concat(v.id), + type: "primary", + target: "_blank", + style: { + borderRadius: '50px' + }, + children: "\u524D\u5F80\u9009\u7528" }) - }), (v === null || v === void 0 ? void 0 : v.need_authorize) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - onClick: function onClick() { - (0,verifyLogin/* AuthorizeModel */.rX)(false, '该课程中包含实训需授权后才可使用。 您可以在QQ服务群向管理员申请，获得继续操作的权限。'); - }, - style: { - marginRight: 'auto' - }, - className: "tag-style bg-pink current ml10", - children: "\u9700\u6388\u6743" - }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { - ghost: true, - href: "/paths/".concat(v.id), - type: "primary", - target: "_blank", - style: { - borderRadius: '50px' - }, - children: "\u4F53\u9A8C\u8BFE\u7A0B" })] }) }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { diff --git a/p__Paths__Detail__id.async.js b/p__Paths__Detail__id.async.js index 722da282fd..f9fbac1087 100644 --- a/p__Paths__Detail__id.async.js +++ b/p__Paths__Detail__id.async.js @@ -3485,11 +3485,13 @@ var SendToClassModal = function SendToClassModal(_ref) { var _stage$children; allId.push(index); stage === null || stage === void 0 || (_stage$children = stage.children) === null || _stage$children === void 0 || _stage$children.map(function (shixun, key) { - if ((shixun === null || shixun === void 0 ? void 0 : shixun.item_type) != 'ExaminationBank') { + if ((shixun === null || shixun === void 0 ? void 0 : shixun.item_type) != 'ExaminationBank' && !(shixun !== null && shixun !== void 0 && shixun.disabled)) { var _shixun$children2; allId.push("".concat(index, "-").concat(key)); shixun === null || shixun === void 0 || (_shixun$children2 = shixun.children) === null || _shixun$children2 === void 0 || _shixun$children2.map(function (el, elIndex) { - allId.push("".concat(index, "-").concat(key, "-").concat(elIndex)); + if (!(stage !== null && stage !== void 0 && stage.disabled)) { + allId.push("".concat(index, "-").concat(key, "-").concat(elIndex)); + } }); } }); @@ -8824,7 +8826,7 @@ var pagination = __webpack_require__(88590); var FormSearch = __webpack_require__(19067); ;// CONCATENATED MODULE: ./src/pages/Paths/Detail/components/Stage/SelectShixuns/index.less?modules // extracted by mini-css-extract-plugin -/* harmony default export */ var SelectShixunsmodules = ({"flex_box_center":"flex_box_center___f9Y4A","flex_space_between":"flex_space_between___I6MWj","flex_box_vertical_center":"flex_box_vertical_center___BFbAG","flex_box_center_end":"flex_box_center_end___TN47s","flex_box_column":"flex_box_column___ab8pI","wrp":"wrp___o8GAj","drawer":"drawer___hKPci","menu":"menu___NmsZq","actived":"actived___VmSRs","actived2":"actived2___L7hZl","listItem":"listItem___rLCYD","info":"info___ProlR","title":"title___DtPu3","titleLeft":"titleLeft___nAPKM","titleRight":"titleRight___puGmC","search":"search___8U7Z_","description":"description___D_sXj","menuCourse":"menuCourse___gfJ2j","authorname":"authorname___cTiR0","tooltip-content":"tooltip-content___M1Rrn"}); +/* harmony default export */ var SelectShixunsmodules = ({"flex_box_center":"flex_box_center___f9Y4A","flex_space_between":"flex_space_between___I6MWj","flex_box_vertical_center":"flex_box_vertical_center___BFbAG","flex_box_center_end":"flex_box_center_end___TN47s","flex_box_column":"flex_box_column___ab8pI","wrp":"wrp___o8GAj","drawer":"drawer___hKPci","menu":"menu___NmsZq","actived":"actived___VmSRs","actived2":"actived2___L7hZl","listItem":"listItem___rLCYD","info":"info___ProlR","title":"title___DtPu3","titleLeft":"titleLeft___nAPKM","titleRight":"titleRight___puGmC","search":"search___8U7Z_","description":"description___D_sXj","filter":"filter___UOLBV","menuCourse":"menuCourse___gfJ2j","authorname":"authorname___cTiR0","tooltip-content":"tooltip-content___M1Rrn"}); ;// CONCATENATED MODULE: ./src/pages/Paths/Detail/components/Stage/SelectShixuns/index.tsx @@ -8903,6 +8905,15 @@ var PublishShixun = function PublishShixun(_ref) { _useState4 = slicedToArray_default()(_useState3, 2), selectArrs = _useState4[0], setSelectArrs = _useState4[1]; + var dataType = [{ + name: '最新', + id: 'created_at' + }, { + name: '最热', + id: 'myshixuns_count' + }].filter(function (item) { + return !!item; + }); var _useState5 = (0,_react_17_0_2_react.useState)({ page: 1, type: (0,authority/* isSuperAdmins */.Ny)() ? "all" : "mine", @@ -8913,7 +8924,8 @@ var PublishShixun = function PublishShixun(_ref) { sort: "myshixuns_count", group_id: null, need: 1, - load_jupyter_evaluate: true + load_jupyter_evaluate: true, + is_subject: true }), _useState6 = slicedToArray_default()(_useState5, 2), query = _useState6[0], @@ -8975,7 +8987,8 @@ var PublishShixun = function PublishShixun(_ref) { sort: "myshixuns_count", group_id: null, need: 1, - load_jupyter_evaluate: true + load_jupyter_evaluate: true, + is_subject: true }); }; if (classroomList.actionTabs.key !== '选用实践项目') return null; @@ -9139,6 +9152,53 @@ var PublishShixun = function PublishShixun(_ref) { }) }, val.name); })] + }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { + align: "middle", + children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { + flex: "1", + className: SelectShixunsmodules.filter, + children: dataType.map(function (v, k) { + return /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + className: "mr20", + type: query.sort === v.id ? 'primary' : 'default', + onClick: function onClick() { + query.sort = v.id; + setQuery(objectSpread2_default()({}, query)); + dispatch({ + type: 'classroomList/getShixunLists', + payload: objectSpread2_default()({}, query) + }); + }, + children: v.name + }, k); + }) + }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { + className: "c-grey-999", + children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + className: SelectShixunsmodules.menuCourse, + children: /*#__PURE__*/(0,jsx_runtime.jsx)("ul", { + children: /*#__PURE__*/(0,jsx_runtime.jsxs)("li", { + className: "current", + onClick: function onClick() { + query.order = query.order === 'asc' ? "desc" : "asc"; + setQuery(objectSpread2_default()({}, query)); + dispatch({ + type: 'classroomList/getShixunLists', + payload: objectSpread2_default()({}, query) + }); + }, + children: ["\u5B66\u4E60\u4EBA\u6570", /*#__PURE__*/(0,jsx_runtime.jsxs)("p", { + className: "edu-sorter current ".concat(query.order), + children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { + className: "iconfont icon-sanjiaoxing-up" + }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + className: "iconfont icon-sanjiaoxing-down" + })] + })] + }) + }) + }) + })] }), shixunLists === null || shixunLists === void 0 || (_shixunLists$shixun_l2 = shixunLists.shixun_list) === null || _shixunLists$shixun_l2 === void 0 ? void 0 : _shixunLists$shixun_l2.map(function (v, k) { return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: SelectShixunsmodules.listItem, @@ -9154,7 +9214,8 @@ var PublishShixun = function PublishShixun(_ref) { } else { setSelectArrs(selectArrs.concat(v.id)); } - } + }, + disabled: (v === null || v === void 0 ? void 0 : v.shixun_tag_num_name) == '未发布' }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: SelectShixunsmodules.info, children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { @@ -9201,6 +9262,17 @@ var PublishShixun = function PublishShixun(_ref) { className: "tag-style current ml10", children: "\u65E0\u6CD5\u4F7F\u7528" }) + }), (v === null || v === void 0 ? void 0 : v.shixun_tag_num_name) == '未发布' && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + zIndex: 10000, + title: '实训需发布后才能选用到课程中，点击名称可前往实训详情', + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + style: { + marginRight: 'auto', + background: '#999' + }, + className: "tag-style current ml10", + children: "\u672A\u53D1\u5E03" + }) })] }) }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { diff --git a/p__Paths__Detail__id.chunk.css b/p__Paths__Detail__id.chunk.css index 246f0a11e5..26cda5ffd9 100644 --- a/p__Paths__Detail__id.chunk.css +++ b/p__Paths__Detail__id.chunk.css @@ -1786,6 +1786,26 @@ -webkit-line-clamp: 2; overflow: hidden; } +.filter___UOLBV button { + border-radius: 40px; + box-shadow: none; +} +.filter___UOLBV [class~='ant-btn-default'] { + background: #eee; + border-color: #eee; + color: #999; +} +.filter___UOLBV [class~='ant-btn-primary'] { + background-color: #0152d9; + border-color: #0152d9; +} +.filter___UOLBV [class~='ant-input'] { + border-radius: 4px; +} +.filter___UOLBV [class~='ant-input-search-button'] { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} .menuCourse___gfJ2j { color: #999; } diff --git a/p__Terminal__index.async.js b/p__Terminal__index.async.js index 42edc76d19..1eedea808f 100644 --- a/p__Terminal__index.async.js +++ b/p__Terminal__index.async.js @@ -1522,6 +1522,9 @@ var TimeTicket = 30000; var isFirstConnected = (0,_react_17_0_2_react.useRef)(false); var lockConnectFail = (0,_react_17_0_2_react.useRef)(false); var urlParamsAll = (0,util/* getJsonFromUrl */.oP)(); + var _useSearchParams = (0,_umi_production_exports.useSearchParams)(), + _useSearchParams2 = slicedToArray_default()(_useSearchParams, 1), + searchParams = _useSearchParams2[0]; var shixun_environment_id = itemData.shixun_environment_id, position = itemData.position, tab_type = itemData.tab_type, @@ -1577,20 +1580,27 @@ var TimeTicket = 30000; function _getInitData() { _getInitData = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3() { var _response$data; - var response, _response$data2, _response$data3; + var datas, response, _response$data2, _response$data3; return regeneratorRuntime_default()().wrap(function _callee3$(_context3) { while (1) switch (_context3.prev = _context3.next) { case 0: - _context3.next = 2; - return (0,service/* startInit */.sA)(myshixun === null || myshixun === void 0 ? void 0 : myshixun.identifier, objectSpread2_default()({ + datas = {}; + if (searchParams.get("type") === 'exercises') { + datas.exercise_id = searchParams.get("exercisesId"); + //试卷id + } else if (params.courseId && params.homeworkId) { + datas.homework_common_id = params.homeworkId; + } + _context3.next = 4; + return (0,service/* startInit */.sA)(myshixun === null || myshixun === void 0 ? void 0 : myshixun.identifier, objectSpread2_default()(objectSpread2_default()({ shixun_environment_id: shixun_environment_id, tab_type: tab_type, game_id: game.id - }, urlParamsAll)); - case 2: + }, urlParamsAll), datas)); + case 4: response = _context3.sent; if (!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && (_response$data = _response$data.data_list) !== null && _response$data !== void 0 && _response$data.length)) { - _context3.next = 6; + _context3.next = 8; break; } mediator/* default */.Z.publish('pod-restrict-data', { @@ -1598,9 +1608,9 @@ var TimeTicket = 30000; data_list: response === null || response === void 0 || (_response$data3 = response.data) === null || _response$data3 === void 0 ? void 0 : _response$data3.data_list }); return _context3.abrupt("return"); - case 6: + case 8: if (!((response === null || response === void 0 ? void 0 : response.status) === -3)) { - _context3.next = 8; + _context3.next = 10; break; } return _context3.abrupt("return", new Promise( /*#__PURE__*/function () { @@ -1644,7 +1654,7 @@ var TimeTicket = 30000; return _ref2.apply(this, arguments); }; }())); - case 8: + case 10: if ((response === null || response === void 0 ? void 0 : response.status) === 0) { mediator/* default */.Z.publish('update-windows-time', response === null || response === void 0 ? void 0 : response.data); mediator/* default */.Z.publish('send-tabs-result-data', objectSpread2_default()(objectSpread2_default()({}, response === null || response === void 0 ? void 0 : response.data), {}, { @@ -1655,7 +1665,7 @@ var TimeTicket = 30000; return mediator/* default */.Z.publish("create-socket-".concat(index_tab)); }, 300); } - case 9: + case 11: case "end": return _context3.stop(); } diff --git a/p__User__Detail__ResourceGuarantee__index.async.js b/p__User__Detail__ResourceGuarantee__index.async.js index ff6e39d4c5..f39fca5964 100644 --- a/p__User__Detail__ResourceGuarantee__index.async.js +++ b/p__User__Detail__ResourceGuarantee__index.async.js @@ -341,7 +341,8 @@ var ProjectInfoDialog = function ProjectInfoDialog(_ref) { children: [!loading && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: ProjectInfoDialogmodules["goto"], onClick: function onClick() { - window.open("/shixuns/".concat(dataInfo === null || dataInfo === void 0 ? void 0 : dataInfo.shixun_identifier, "/challenges")); + var _dataInfo$shixuns; + window.open("/shixuns/".concat(dataInfo === null || dataInfo === void 0 || (_dataInfo$shixuns = dataInfo.shixuns) === null || _dataInfo$shixuns === void 0 || (_dataInfo$shixuns = _dataInfo$shixuns[0]) === null || _dataInfo$shixuns === void 0 ? void 0 : _dataInfo$shixuns.shixun_identifier, "/challenges")); }, children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { style: { @@ -363,6 +364,9 @@ var ProjectInfoDialog = function ProjectInfoDialog(_ref) { })] }), /*#__PURE__*/(0,jsx_runtime.jsxs)(spin/* default */.Z, { spinning: loading, + style: { + marginTop: 10 + }, children: [(dataInfo === null || dataInfo === void 0 || (_dataInfo$shixun_envi = dataInfo.shixun_environments) === null || _dataInfo$shixun_envi === void 0 ? void 0 : _dataInfo$shixun_envi.length) > 0 && (dataInfo === null || dataInfo === void 0 || (_dataInfo$shixun_envi2 = dataInfo.shixun_environments) === null || _dataInfo$shixun_envi2 === void 0 ? void 0 : _dataInfo$shixun_envi2.map(function (item, index) { var jx_text_arr = item === null || item === void 0 ? void 0 : item.mirror_name.map(function (item2, i) { return item2 + (i == (item === null || item === void 0 ? void 0 : item.mirror_name.length) - 1 ? '' : '、'); @@ -619,13 +623,13 @@ var ProjectReview = function ProjectReview(_ref) { }); } }, { - title: '实践项目', - dataIndex: 'shixun_name', - key: 'shixun_name', + title: '资源名称', + dataIndex: 'resource_name', + key: 'resource_name', width: 140, render: function render(text, record, index) { return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - title: record === null || record === void 0 ? void 0 : record.shixun_name, + title: record === null || record === void 0 ? void 0 : record.resource_name, children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", { style: { color: '#165DFF', @@ -1137,7 +1141,17 @@ var Projectlist = function Projectlist(_ref) { children: text }); } - }, { + }, + // { + // title: '类型', + // dataIndex: 'item_type', + // key: 'item_type', + // width: 140, + // render: (text: any, record: any, index: any) => { + // return {text === 'Shixun' ? '实训作业' : text === 'Exercise' ? '在线考试' : '实践项目'} + // } + // }, + { title: '开始时间', dataIndex: 'start_time', key: 'start_time', @@ -1173,13 +1187,13 @@ var Projectlist = function Projectlist(_ref) { }); } }, { - title: '实践项目', - dataIndex: 'shixun_name', - key: 'shixun_name', + title: '资源名称', + dataIndex: 'resource_name', + key: 'resource_name', width: 140, render: function render(text, record, index) { return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - title: record === null || record === void 0 ? void 0 : record.shixun_name, + title: record === null || record === void 0 ? void 0 : record.resource_name, children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", { style: { color: '#165DFF', diff --git a/p__User__Detail__id.async.js b/p__User__Detail__id.async.js index 3a830f659c..8767bfd080 100644 --- a/p__User__Detail__id.async.js +++ b/p__User__Detail__id.async.js @@ -102,7 +102,7 @@ var showSearchMapping = [{ placeholder: '搜索视频' }]; var Banner = function Banner(_ref) { - var _user$userInfo, _userDetail$homepageI, _userDetail$homepageI2, _userDetail$homepageI3, _userDetail$homepageI4, _userDetail$homepageI5, _userDetail$homepageI6, _userDetail$homepageI7, _userDetail$homepageI8, _userDetail$homepageI9, _userDetail$homepageI10, _find, _globalSetting$settin, _find2, _globalSetting$settin2, _find3, _globalSetting$settin3, _user$userInfo2, _globalSetting$settin4, _user$userInfo3, _user$userInfo4, _globalSetting$settin5, _user$userInfo5, _user$userInfo6, _user$userInfo7, _user$userInfo8, _user$userInfo9, _user$userInfo10, _user$userInfo11, _user$userInfo12, _globalSetting$settin6, _userDetail$homepageI11, _userDetail$homepageI12, _userDetail$homepageI13, _userDetail$homepageI14; + var _user$userInfo, _userDetail$homepageI, _userDetail$homepageI2, _userDetail$homepageI3, _userDetail$homepageI4, _userDetail$homepageI5, _userDetail$homepageI6, _userDetail$homepageI7, _userDetail$homepageI8, _userDetail$homepageI9, _userDetail$homepageI10, _find, _globalSetting$settin, _find2, _globalSetting$settin2, _find3, _globalSetting$settin3, _user$userInfo2, _globalSetting$settin4, _user$userInfo3, _user$userInfo4, _globalSetting$settin5, _user$userInfo5, _user$userInfo6, _user$userInfo7, _user$userInfo8, _user$userInfo9, _user$userInfo10, _user$userInfo11, _user$userInfo12, _userDetail$homepageI11, _userDetail$homepageI12, _userDetail$homepageI13, _userDetail$homepageI14; var userDetail = _ref.userDetail, user = _ref.user, globalSetting = _ref.globalSetting, @@ -383,15 +383,6 @@ var Banner = function Banner(_ref) { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", { className: "iconfont icon-renzheng " }), "\u8D44\u6E90\u4FDD\u969C"] - }), !(globalSetting !== null && globalSetting !== void 0 && (_globalSetting$settin6 = globalSetting.setting) !== null && _globalSetting$settin6 !== void 0 && _globalSetting$settin6.is_local) && (0,authority/* isSuperAdmins */.Ny)() && /*#__PURE__*/(0,jsx_runtime.jsxs)(_umi_production_exports.Link, { - to: "/users/".concat(username.current, "/resourceAllocation"), - onClick: function onClick() { - return setActiveKey(NavType.ResourceAllocation); - }, - className: activeKey === NavType.ResourceAllocation ? Menusmodules.active : '', - children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", { - className: "iconfont icon-ziyuanfenpei" - }), "\u5BA2\u6237\u7BA1\u7406"] }), ((_userDetail$homepageI11 = userDetail.homepageInfo) === null || _userDetail$homepageI11 === void 0 ? void 0 : _userDetail$homepageI11.college_identifier) && /*#__PURE__*/(0,jsx_runtime.jsxs)(_umi_production_exports.Link, { to: "/colleges/".concat((_userDetail$homepageI12 = userDetail.homepageInfo) === null || _userDetail$homepageI12 === void 0 ? void 0 : _userDetail$homepageI12.college_identifier, "/statistics"), onClick: function onClick() { diff --git a/p__tasks__index.async.js b/p__tasks__index.async.js index 0e034f9a65..53957ac89a 100644 --- a/p__tasks__index.async.js +++ b/p__tasks__index.async.js @@ -13624,6 +13624,9 @@ var dayjs = __webpack_require__(/*! dayjs */ 9498); var _state$user; return state === null || state === void 0 || (_state$user = state.user) === null || _state$user === void 0 ? void 0 : _state$user.userInfo; }); + var _useSearchParams = (0,_umi_production_exports.useSearchParams)(), + _useSearchParams2 = slicedToArray_default()(_useSearchParams, 1), + searchParams = _useSearchParams2[0]; var _useState = (0,_react_17_0_2_react.useState)(0), _useState2 = slicedToArray_default()(_useState, 2), count = _useState2[0], @@ -13654,7 +13657,6 @@ var dayjs = __webpack_require__(/*! dayjs */ 9498); var location = (0,_umi_production_exports.useLocation)(); var shixun_environment_id = tabActiveParams.shixun_environment_id, tab_type = tabActiveParams.tab_type; - console.log('--dibu-', userInfo); var isWorkTime = function isWorkTime() { var currentTime = dayjs(); if (currentTime.day() >= 1 && currentTime.day() <= 5) { @@ -13757,20 +13759,30 @@ var dayjs = __webpack_require__(/*! dayjs */ 9498); mediator/* default */.Z.publish('show-case-result', true); setTimeout( /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() { var _res$data; - var res, _res$data2, _res$data3; + var datas, res, _res$data2, _res$data3; return regeneratorRuntime_default()().wrap(function _callee$(_context) { while (1) switch (_context.prev = _context.next) { case 0: - _context.next = 2; - return (0,service/* logOutput */.h$)(params.taskId, { + datas = { test_case_content: inputValue, shixun_environment_id: shixun_environment_id, tab_type: tab_type - }); - case 2: + }; + if (searchParams.get("type") === 'exercises') { + datas.extras = { + exercise_id: searchParams.get("exercisesId") //试卷id + }; + } else if (params.courseId && params.homeworkId) { + datas.extras = { + homework_common_id: params.homeworkId + }; + } + _context.next = 4; + return (0,service/* logOutput */.h$)(params.taskId, datas); + case 4: res = _context.sent; if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data = _res$data.data_list) !== null && _res$data !== void 0 && _res$data.length)) { - _context.next = 6; + _context.next = 8; break; } mediator/* default */.Z.publish('pod-restrict-data', { @@ -13778,12 +13790,12 @@ var dayjs = __webpack_require__(/*! dayjs */ 9498); data_list: res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.data_list }); return _context.abrupt("return"); - case 6: + case 8: mediator/* default */.Z.publish('showRunCodeTab', true); mediator/* default */.Z.publish('runCode', { type: 'start' }); - case 8: + case 10: case "end": return _context.stop(); } @@ -17721,10 +17733,10 @@ var notEditablePath_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUh while (1) switch (_context4.prev = _context4.next) { case 0: _context4.next = 2; - return (0,service/* startInit */.sA)((_taskData$myshixun2 = taskData.myshixun) === null || _taskData$myshixun2 === void 0 ? void 0 : _taskData$myshixun2.identifier, { + return (0,service/* startInit */.sA)((_taskData$myshixun2 = taskData.myshixun) === null || _taskData$myshixun2 === void 0 ? void 0 : _taskData$myshixun2.identifier, objectSpread2_default()({ shixun_environment_id: shixun_environment_id, tab_type: tab_type - }); + }, datas)); case 2: res = _context4.sent; if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data = _res$data.data_list) !== null && _res$data !== void 0 && _res$data.length)) { @@ -22997,9 +23009,11 @@ function tasks_reducer(state, action) { content_modified: content_modified, shixun_environment_id: shixun_environment_id, tab_type: tab_type - }; // 只有试卷考试才需要下面参数 + }; + console.log('----', searchParams.get("type")); + // 只有试卷考试才需要下面参数 if (!(searchParams.get("type") === 'exercises')) { - _context17.next = 26; + _context17.next = 27; break; } _context17.t0 = searchParams.get("exercisesId"); @@ -23007,13 +23021,13 @@ function tasks_reducer(state, action) { _context17.t2 = (_taskData$challenge = taskData.challenge) === null || _taskData$challenge === void 0 ? void 0 : _taskData$challenge.id; _context17.t3 = searchParams.get("subject_id") || ''; _context17.t4 = response === null || response === void 0 || (_response$content = response.content) === null || _response$content === void 0 ? void 0 : _response$content.commitID; - _context17.next = 22; + _context17.next = 23; return (0,Exercise_ip/* findLocalIp */.y)({ ip_limit: searchParams.get("ip_limit") || "no", ip_bind: searchParams.get("ip_bind") === "true" ? true : false, ip_bind_type: (_exerciseDataRef$curr4 = exerciseDataRef.current) === null || _exerciseDataRef$curr4 === void 0 || (_exerciseDataRef$curr4 = _exerciseDataRef$curr4.exercise) === null || _exerciseDataRef$curr4 === void 0 ? void 0 : _exerciseDataRef$curr4.ip_bind_type }); - case 22: + case 23: _context17.t5 = _context17.sent; params.extras = { exercise_id: _context17.t0, @@ -23023,9 +23037,9 @@ function tasks_reducer(state, action) { commitID: _context17.t4, ip: _context17.t5 }; - _context17.next = 27; + _context17.next = 28; break; - case 26: + case 27: if (searchParams.get("type") === 'competitions') { params.extras = { competition_entry_id: searchParams.get("competition_entry_id") @@ -23040,11 +23054,11 @@ function tasks_reducer(state, action) { commitID: response === null || response === void 0 || (_response$content3 = response.content) === null || _response$content3 === void 0 ? void 0 : _response$content3.commitID }; } - case 27: + case 28: //所有的都要加user_id params.extras.currentUserId = userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_id; if (!isLocalFetch) { - _context17.next = 36; + _context17.next = 37; break; } input = taskData === null || taskData === void 0 || (_taskData$test_sets = taskData.test_sets) === null || _taskData$test_sets === void 0 ? void 0 : _taskData$test_sets.map(function (e) { @@ -23067,20 +23081,20 @@ function tasks_reducer(state, action) { tpiRepoPath: taskData === null || taskData === void 0 || (_taskData$myshixun4 = taskData.myshixun) === null || _taskData$myshixun4 === void 0 ? void 0 : _taskData$myshixun4.repo_name, sourceClassNames: [currentPath] }; - _context17.next = 33; + _context17.next = 34; return (0,service/* codeGameLocalBuild */.eA)(localParams); - case 33: + case 34: rs = _context17.sent; - _context17.next = 39; + _context17.next = 40; break; - case 36: - _context17.next = 38; + case 37: + _context17.next = 39; return (0,service/* codeGameBuild */.Xy)(taskId, params); - case 38: - rs = _context17.sent; case 39: + rs = _context17.sent; + case 40: if (!((_rs = rs) !== null && _rs !== void 0 && (_rs = _rs.data) !== null && _rs !== void 0 && (_rs = _rs.data_list) !== null && _rs !== void 0 && _rs.length)) { - _context17.next = 42; + _context17.next = 43; break; } mediator/* default */.Z.publish('pod-restrict-data', { @@ -23088,16 +23102,16 @@ function tasks_reducer(state, action) { data_list: (_rs3 = rs) === null || _rs3 === void 0 || (_rs3 = _rs3.data) === null || _rs3 === void 0 ? void 0 : _rs3.data_list }); return _context17.abrupt("return"); - case 42: + case 43: if (!(rs.status === -1 && searchParams.get("type") === 'exercises')) { - _context17.next = 45; + _context17.next = 46; break; } window.parent.location.href = "/classrooms/".concat(searchParams.get("coursesId"), "/exercise/").concat(searchParams.get("exercisesId"), "/detail"); return _context17.abrupt("return"); - case 45: + case 46: if (!(rs.status === -2)) { - _context17.next = 49; + _context17.next = 50; break; } dispatch({ @@ -23105,7 +23119,7 @@ function tasks_reducer(state, action) { }); mediator/* default */.Z.publish('eval-code-finish'); return _context17.abrupt("return"); - case 49: + case 50: if (rs.status === 1) { getGameStatus = /*#__PURE__*/function () { var _ref7 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee16(intervalTime, finalTime, count) { @@ -23232,15 +23246,15 @@ function tasks_reducer(state, action) { getGameStatus(intervalTime, challenge.exec_time + 11, count++); } return _context17.abrupt("return", res); - case 53: - _context17.prev = 53; + case 54: + _context17.prev = 54; _context17.t6 = _context17["catch"](0); console.log('-------eval code', _context17.t6); - case 56: + case 57: case "end": return _context17.stop(); } - }, _callee17, null, [[0, 53]]); + }, _callee17, null, [[0, 54]]); })); return _onEvalCode.apply(this, arguments); } @@ -23505,7 +23519,7 @@ function tasks_reducer(state, action) { } //重启云主机 function _onResetVnc() { _onResetVnc = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee23() { - var reset, _res, _res2, _res3, str, cloneTabs, _res4; + var datas, reset, _res, _res2, _res3, str, cloneTabs, _res4; return regeneratorRuntime_default()().wrap(function _callee23$(_context23) { while (1) switch (_context23.prev = _context23.next) { case 0: @@ -23513,6 +23527,13 @@ function tasks_reducer(state, action) { type: constant/* SET_VNC_LOADING */.RY, payload: true //工具栏控制 }); + datas = {}; + if (searchParams.get("type") === 'exercises') { + datas.exercise_id = searchParams.get("exercisesId"); + //试卷id + } else if (_params.courseId && _params.homeworkId) { + datas.homework_common_id = _params.homeworkId; + } reset = /*#__PURE__*/function () { var _ref8 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee22() { var _taskData$myshixun9; @@ -23521,11 +23542,11 @@ function tasks_reducer(state, action) { while (1) switch (_context22.prev = _context22.next) { case 0: _context22.next = 2; - return (0,service/* resetEnvironment */.am)(taskData === null || taskData === void 0 || (_taskData$myshixun9 = taskData.myshixun) === null || _taskData$myshixun9 === void 0 ? void 0 : _taskData$myshixun9.identifier, { + return (0,service/* resetEnvironment */.am)(taskData === null || taskData === void 0 || (_taskData$myshixun9 = taskData.myshixun) === null || _taskData$myshixun9 === void 0 ? void 0 : _taskData$myshixun9.identifier, objectSpread2_default()({ game_id: taskData === null || taskData === void 0 ? void 0 : taskData.game.id, shixun_environment_id: shixun_environment_id, tab_type: tab_type - }); + }, datas)); case 2: result = _context22.sent; return _context22.abrupt("return", result); @@ -23540,38 +23561,38 @@ function tasks_reducer(state, action) { }; }(); if (!(tab_type === 2)) { - _context23.next = 8; + _context23.next = 10; break; } mediator/* default */.Z.publish('vnc-reseting'); - _context23.next = 6; + _context23.next = 8; return reset(); - case 6: + case 8: _res = _context23.sent; if (_res.status === 0) { mediator/* default */.Z.publish('vnc-reseting-done', _res); } - case 8: + case 10: if (!(tab_type === 3)) { - _context23.next = 14; + _context23.next = 16; break; } mediator/* default */.Z.publish("vnc-reset-".concat(index_tab)); - _context23.next = 12; + _context23.next = 14; return reset(); - case 12: + case 14: _res2 = _context23.sent; if (_res2.status === 0) { mediator/* default */.Z.publish("reset-linux-windows-vnc-".concat(index_tab)); } - case 14: + case 16: if (!(tab_type === 4)) { - _context23.next = 19; + _context23.next = 21; break; } - _context23.next = 17; + _context23.next = 19; return reset(); - case 17: + case 19: _res3 = _context23.sent; if (_res3.status === 0) { str = index_tab.split('-')[0]; @@ -23587,25 +23608,25 @@ function tasks_reducer(state, action) { }); setTabs(cloneTabs); } - case 19: + case 21: if (!(tab_type === 5)) { - _context23.next = 25; + _context23.next = 27; break; } mediator/* default */.Z.publish("unity3d-reset", 'start'); - _context23.next = 23; + _context23.next = 25; return reset(); - case 23: + case 25: _res4 = _context23.sent; if (_res4.status === 0) { mediator/* default */.Z.publish("unity3d-reset", 'done'); } - case 25: + case 27: dispatch({ type: constant/* SET_VNC_LOADING */.RY, payload: false }); - case 26: + case 28: case "end": return _context23.stop(); } @@ -27080,6 +27101,9 @@ var TimeTicket = 30000; var isFirstConnected = (0,_react_17_0_2_react.useRef)(false); var lockConnectFail = (0,_react_17_0_2_react.useRef)(false); var urlParamsAll = (0,util/* getJsonFromUrl */.oP)(); + var _useSearchParams = (0,_umi_production_exports.useSearchParams)(), + _useSearchParams2 = slicedToArray_default()(_useSearchParams, 1), + searchParams = _useSearchParams2[0]; var shixun_environment_id = itemData.shixun_environment_id, position = itemData.position, tab_type = itemData.tab_type, @@ -27135,20 +27159,27 @@ var TimeTicket = 30000; function _getInitData() { _getInitData = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3() { var _response$data; - var response, _response$data2, _response$data3; + var datas, response, _response$data2, _response$data3; return regeneratorRuntime_default()().wrap(function _callee3$(_context3) { while (1) switch (_context3.prev = _context3.next) { case 0: - _context3.next = 2; - return (0,service/* startInit */.sA)(myshixun === null || myshixun === void 0 ? void 0 : myshixun.identifier, objectSpread2_default()({ + datas = {}; + if (searchParams.get("type") === 'exercises') { + datas.exercise_id = searchParams.get("exercisesId"); + //试卷id + } else if (params.courseId && params.homeworkId) { + datas.homework_common_id = params.homeworkId; + } + _context3.next = 4; + return (0,service/* startInit */.sA)(myshixun === null || myshixun === void 0 ? void 0 : myshixun.identifier, objectSpread2_default()(objectSpread2_default()({ shixun_environment_id: shixun_environment_id, tab_type: tab_type, game_id: game.id - }, urlParamsAll)); - case 2: + }, urlParamsAll), datas)); + case 4: response = _context3.sent; if (!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && (_response$data = _response$data.data_list) !== null && _response$data !== void 0 && _response$data.length)) { - _context3.next = 6; + _context3.next = 8; break; } mediator/* default */.Z.publish('pod-restrict-data', { @@ -27156,9 +27187,9 @@ var TimeTicket = 30000; data_list: response === null || response === void 0 || (_response$data3 = response.data) === null || _response$data3 === void 0 ? void 0 : _response$data3.data_list }); return _context3.abrupt("return"); - case 6: + case 8: if (!((response === null || response === void 0 ? void 0 : response.status) === -3)) { - _context3.next = 8; + _context3.next = 10; break; } return _context3.abrupt("return", new Promise( /*#__PURE__*/function () { @@ -27202,7 +27233,7 @@ var TimeTicket = 30000; return _ref2.apply(this, arguments); }; }())); - case 8: + case 10: if ((response === null || response === void 0 ? void 0 : response.status) === 0) { mediator/* default */.Z.publish('update-windows-time', response === null || response === void 0 ? void 0 : response.data); mediator/* default */.Z.publish('send-tabs-result-data', objectSpread2_default()(objectSpread2_default()({}, response === null || response === void 0 ? void 0 : response.data), {}, { @@ -27213,7 +27244,7 @@ var TimeTicket = 30000; return mediator/* default */.Z.publish("create-socket-".concat(index_tab)); }, 300); } - case 9: + case 11: case "end": return _context3.stop(); } diff --git a/umi.js b/umi.js index e1fff30c57..57b465bb2f 100644 --- a/umi.js +++ b/umi.js @@ -52959,7 +52959,7 @@ __webpack_require__.d(__webpack_exports__, { ;// CONCATENATED MODULE: ./src/utils/env/dev.ts var DEV = { // PROXY_SERVER: 'https://data.educoder.net', - PROXY_SERVER: 'https://test3-data.educoder.net', + PROXY_SERVER: 'https://pre-data.educoder.net', API_SERVER: '', REPORT_SERVER: 'http://192.168.1.57:3001', IMG_SERVER: 'https://new-testali-cdn.educoder.net', @@ -54517,6 +54517,10 @@ var CommonWorkStatus = function CommonWorkStatus(props) { 2: { name: '延时提交', "class": 'c-red' + }, + 3: { + name: '部分提交', + "class": 'c-green' } }; return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_16__.jsx)("span", {