diff --git a/p__Classrooms__Overview__index.async.js b/p__Classrooms__Overview__index.async.js index 2ca9763142..49ebcce7e0 100644 --- a/p__Classrooms__Overview__index.async.js +++ b/p__Classrooms__Overview__index.async.js @@ -370,11 +370,11 @@ var Page = function Page(_ref3) { var hanleLearnPieOption = function hanleLearnPieOption() { // 发布的作业概览 var Legend = { - "课堂实验": "{name|\u8BFE\u5802\u5B9E\u9A8C} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.shixun_homework_size) || 0), "} {percent|").concat(Math.round((SBody === null || SBody === void 0 ? void 0 : SBody.shixun_homework_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.all_work_size) * 10000) / 100, "%}"), - "分组作业": "{name|\u5206\u7EC4\u4F5C\u4E1A} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.group_homework_size) || 0), "} {percent|").concat(Math.round((SBody === null || SBody === void 0 ? void 0 : SBody.group_homework_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.all_work_size) * 10000) / 100, "%}"), - "图文作业": "{name|\u56FE\u6587\u4F5C\u4E1A} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.common_homework_size) || 0), "} {percent|").concat(Math.round((SBody === null || SBody === void 0 ? void 0 : SBody.common_homework_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.all_work_size) * 10000) / 100, "%}"), - "编程作业": "{name|\u7F16\u7A0B\u4F5C\u4E1A} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.program_homework_size) || 0), "} {percent|").concat(Math.round((SBody === null || SBody === void 0 ? void 0 : SBody.program_homework_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.all_work_size) * 10000) / 100, "%}"), - "在线考试": "{name|\u5728\u7EBF\u8003\u8BD5} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.exercise_size) || 0), "} {percent|").concat(Math.round((SBody === null || SBody === void 0 ? void 0 : SBody.exercise_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.all_work_size) * 10000) / 100, "%}") + "课堂实验": "{name|\u8BFE\u5802\u5B9E\u9A8C} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.shixun_homework_size) || 0), "} {percent|").concat((0,util/* getTwoDecimalPlaces */.tw)((SBody === null || SBody === void 0 ? void 0 : SBody.shixun_homework_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.all_work_size)), "%}"), + "分组作业": "{name|\u5206\u7EC4\u4F5C\u4E1A} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.group_homework_size) || 0), "} {percent|").concat((0,util/* getTwoDecimalPlaces */.tw)((SBody === null || SBody === void 0 ? void 0 : SBody.group_homework_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.all_work_size)), "%}"), + "图文作业": "{name|\u56FE\u6587\u4F5C\u4E1A} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.common_homework_size) || 0), "} {percent|").concat((0,util/* getTwoDecimalPlaces */.tw)((SBody === null || SBody === void 0 ? void 0 : SBody.common_homework_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.all_work_size)), "%}"), + "编程作业": "{name|\u7F16\u7A0B\u4F5C\u4E1A} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.program_homework_size) || 0), "} {percent|").concat((0,util/* getTwoDecimalPlaces */.tw)((SBody === null || SBody === void 0 ? void 0 : SBody.program_homework_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.all_work_size)), "%}"), + "在线考试": "{name|\u5728\u7EBF\u8003\u8BD5} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.exercise_size) || 0), "} {percent|").concat((0,util/* getTwoDecimalPlaces */.tw)((SBody === null || SBody === void 0 ? void 0 : SBody.exercise_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.all_work_size)), "%}") }; return { title: [{ diff --git a/p__Paths__Index__index.async.js b/p__Paths__Index__index.async.js index 5f79816cd3..571765d82e 100644 --- a/p__Paths__Index__index.async.js +++ b/p__Paths__Index__index.async.js @@ -299,7 +299,7 @@ var _excluded = ["globalSetting", "dispatch", "user"]; var Page = function Page(_ref) { - var _user$userInfo4, _user$userInfo5, _globalSetting$settin2; + var _user$userInfo3, _globalSetting$settin, _user$userInfo4, _globalSetting$settin2; var globalSetting = _ref.globalSetting, dispatch = _ref.dispatch, user = _ref.user, @@ -617,37 +617,26 @@ var Page = function Page(_ref) { // trackEvent(['实践课程', '首页', type === 'next' ? "下一页" : "上一页"]) }; - var _useState17 = (0,_react_17_0_2_react.useState)([{ - name: '新手指引', - click: open, - sign: true - }]), - _useState18 = slicedToArray_default()(_useState17, 2), - bannerBtns = _useState18[0], - setBannerBtns = _useState18[1]; - (0,_react_17_0_2_react.useEffect)(function () { - var _user$userInfo3, _globalSetting$settin, _bannerBtns$map; - var btns = bannerBtns; - if (((_user$userInfo3 = user.userInfo) === null || _user$userInfo3 === void 0 ? void 0 : _user$userInfo3.user_identity) !== '学生' && !(globalSetting !== null && globalSetting !== void 0 && (_globalSetting$settin = globalSetting.setting) !== null && _globalSetting$settin !== void 0 && _globalSetting$settin.hide_subject)) { - btns = [{ - name: '新建课程', - click: handleAddVerify, - sign: false - }].concat(toConsumableArray_default()(btns)); - } - if ((0,authority/* isSuperAdmins */.Ny)() && !(bannerBtns !== null && bannerBtns !== void 0 && (_bannerBtns$map = bannerBtns.map(function (item) { - return item.name; - })) !== null && _bannerBtns$map !== void 0 && _bannerBtns$map.includes("概览统计"))) { - btns = [].concat(toConsumableArray_default()(btns), [{ - name: '概览统计', - click: function click() { - (0,util/* openNewWindow */.xg)('/pathsoverview'); - }, - sign: false - }]); - } - setBannerBtns(btns); - }, [(_user$userInfo4 = user.userInfo) === null || _user$userInfo4 === void 0 ? void 0 : _user$userInfo4.user_identity]); + var bannerBtns = [{ + name: '新建课程', + click: handleAddVerify, + sign: false, + isShow: ((_user$userInfo3 = user.userInfo) === null || _user$userInfo3 === void 0 ? void 0 : _user$userInfo3.user_identity) !== '学生' && !(globalSetting !== null && globalSetting !== void 0 && (_globalSetting$settin = globalSetting.setting) !== null && _globalSetting$settin !== void 0 && _globalSetting$settin.hide_subject) + }, { + name: '新手指引', + click: open, + sign: true, + isShow: true + }, { + name: '概览统计', + click: function click() { + (0,util/* openNewWindow */.xg)('/pathsoverview'); + }, + sign: false, + isShow: (0,authority/* isSuperAdmins */.Ny)() + }].filter(function (item) { + return item.isShow; + }); return /*#__PURE__*/(0,jsx_runtime.jsx)("section", { className: Indexmodules.page, children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { @@ -671,7 +660,7 @@ var Page = function Page(_ref) { value: (params === null || params === void 0 ? void 0 : params.sub_discipline_id) === 'all' ? params === null || params === void 0 ? void 0 : params.sub_discipline_id : Number(params === null || params === void 0 ? void 0 : params.sub_discipline_id), onChange: handleSubclass, fontColor: "#000000" - }), ((_user$userInfo5 = user.userInfo) === null || _user$userInfo5 === void 0 ? void 0 : _user$userInfo5.user_id) !== 2 && (0,authority/* isCommonStudent */.JA)() && (globalSetting === null || globalSetting === void 0 || (_globalSetting$settin2 = globalSetting.setting) === null || _globalSetting$settin2 === void 0 ? void 0 : _globalSetting$settin2.main_site) && !!(recommendData !== null && recommendData !== void 0 && recommendData.length) && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { + }), ((_user$userInfo4 = user.userInfo) === null || _user$userInfo4 === void 0 ? void 0 : _user$userInfo4.user_id) !== 2 && (0,authority/* isCommonStudent */.JA)() && (globalSetting === null || globalSetting === void 0 || (_globalSetting$settin2 = globalSetting.setting) === null || _globalSetting$settin2 === void 0 ? void 0 : _globalSetting$settin2.main_site) && !!(recommendData !== null && recommendData !== void 0 && recommendData.length) && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("img", { src: tuijianzixue_namespaceObject, alt: "", diff --git a/p__Shixuns__Index__index.async.js b/p__Shixuns__Index__index.async.js index 5552910349..865fd6fc57 100644 --- a/p__Shixuns__Index__index.async.js +++ b/p__Shixuns__Index__index.async.js @@ -142,7 +142,7 @@ var jsx_runtime = __webpack_require__(37712); var Page = function Page(_ref) { - var _user$userInfo3, _globalSetting$settin2, _globalSetting$settin3; + var _user$userInfo, _globalSetting$settin, _user$userInfo2, _globalSetting$settin2, _globalSetting$settin3; var globalSetting = _ref.globalSetting, user = _ref.user, dispatch = _ref.dispatch; @@ -383,35 +383,26 @@ var Page = function Page(_ref) { getList(params); (0,util/* trackEvent */.L9)(['实践项目', '首页', type === 'next' ? "下一页" : "上一页"]); }; - var _useState15 = (0,_react_17_0_2_react.useState)([{ - name: '新手指引', - click: download, - sign: true - }]), - _useState16 = slicedToArray_default()(_useState15, 2), - bannerBtns = _useState16[0], - setBannerBtns = _useState16[1]; - (0,_react_17_0_2_react.useEffect)(function () { - var _user$userInfo, _globalSetting$settin, _user$userInfo2, _bannerBtns$map; - if (((_user$userInfo = user.userInfo) === null || _user$userInfo === void 0 ? void 0 : _user$userInfo.user_identity) !== '学生' && !(globalSetting !== null && globalSetting !== void 0 && (_globalSetting$settin = globalSetting.setting) !== null && _globalSetting$settin !== void 0 && _globalSetting$settin.hide_shixun) && user !== null && user !== void 0 && (_user$userInfo2 = user.userInfo) !== null && _user$userInfo2 !== void 0 && _user$userInfo2.is_shixun_marker) { - setBannerBtns([{ - name: '新建项目', - click: handleOk, - sign: false - }].concat(toConsumableArray_default()(bannerBtns))); - } - if ((0,authority/* isSuperAdmins */.Ny)() && !(bannerBtns !== null && bannerBtns !== void 0 && (_bannerBtns$map = bannerBtns.map(function (item) { - return item.name; - })) !== null && _bannerBtns$map !== void 0 && _bannerBtns$map.includes("概览统计"))) { - setBannerBtns([].concat(toConsumableArray_default()(bannerBtns), [{ - name: '概览统计', - click: function click() { - (0,util/* openNewWindow */.xg)('/shixunsoverview'); - }, - sign: false - }])); - } - }, [(_user$userInfo3 = user.userInfo) === null || _user$userInfo3 === void 0 ? void 0 : _user$userInfo3.user_identity]); + var bannerBtns = [{ + name: '新建项目', + click: handleOk, + sign: false, + isShow: ((_user$userInfo = user.userInfo) === null || _user$userInfo === void 0 ? void 0 : _user$userInfo.user_identity) !== '学生' && !(globalSetting !== null && globalSetting !== void 0 && (_globalSetting$settin = globalSetting.setting) !== null && _globalSetting$settin !== void 0 && _globalSetting$settin.hide_shixun) && (user === null || user === void 0 || (_user$userInfo2 = user.userInfo) === null || _user$userInfo2 === void 0 ? void 0 : _user$userInfo2.is_shixun_marker) + }, { + name: '新手指引', + click: download, + sign: true, + isShow: true + }, { + name: '概览统计', + click: function click() { + (0,util/* openNewWindow */.xg)('/shixunsoverview'); + }, + sign: false, + isShow: (0,authority/* isSuperAdmins */.Ny)() + }].filter(function (item) { + return item.isShow; + }); return /*#__PURE__*/(0,jsx_runtime.jsx)("section", { className: Indexmodules.page, children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { diff --git a/p__Shixuns__Overview__index.async.js b/p__Shixuns__Overview__index.async.js index 216d16efd5..bfd10a80a2 100644 --- a/p__Shixuns__Overview__index.async.js +++ b/p__Shixuns__Overview__index.async.js @@ -323,7 +323,7 @@ var Page = function Page(_ref3) { } }]; var hanleLevelNumOption = function hanleLevelNumOption() { - var _SBody$evaluation_lis, _SBody$evaluation_lis2; + var _SBody$clearance_list, _SBody$clearance_list2; // 关卡通关次数统计 return { title: [{ @@ -371,7 +371,7 @@ var Page = function Page(_ref3) { }, xAxis: { type: 'category', - data: (SBody === null || SBody === void 0 || (_SBody$evaluation_lis = SBody.evaluation_list) === null || _SBody$evaluation_lis === void 0 || (_SBody$evaluation_lis = _SBody$evaluation_lis.times) === null || _SBody$evaluation_lis === void 0 ? void 0 : _SBody$evaluation_lis.map(function (item) { + data: (SBody === null || SBody === void 0 || (_SBody$clearance_list = SBody.clearance_list) === null || _SBody$clearance_list === void 0 || (_SBody$clearance_list = _SBody$clearance_list.times) === null || _SBody$clearance_list === void 0 ? void 0 : _SBody$clearance_list.map(function (item) { return dayjs_min_default()(item).format("MM.DD"); })) || [], silent: false, @@ -418,7 +418,7 @@ var Page = function Page(_ref3) { name: '关卡通关次数', type: 'line', stack: 'Total', - data: SBody === null || SBody === void 0 || (_SBody$evaluation_lis2 = SBody.evaluation_list) === null || _SBody$evaluation_lis2 === void 0 ? void 0 : _SBody$evaluation_lis2.num, + data: SBody === null || SBody === void 0 || (_SBody$clearance_list2 = SBody.clearance_list) === null || _SBody$clearance_list2 === void 0 ? void 0 : _SBody$clearance_list2.num, areaStyle: {}, color: { type: 'linear', @@ -441,12 +441,13 @@ var Page = function Page(_ref3) { var hanleItemDiffOption = function hanleItemDiffOption() { // 实践项目难度分布 var Legend = { - "初级": "{name|\u521D\u7EA7} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.primary_size) || 0), "} {percent|").concat(Math.round((SBody === null || SBody === void 0 ? void 0 : SBody.primary_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.shixun_size) * 10000) / 100, "%}"), - "中级": "{name|\u4E2D\u7EA7} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.middle_size) || 0), "} {percent|").concat(Math.round((SBody === null || SBody === void 0 ? void 0 : SBody.middle_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.shixun_size) * 10000) / 100, "%}"), - "中高级": "{name|\u4E2D\u9AD8\u7EA7} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.middle_high_size) || 0), "} {percent|").concat(Math.round((SBody === null || SBody === void 0 ? void 0 : SBody.middle_high_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.shixun_size) * 10000) / 100, "%}"), - "高级": "{name|\u9AD8\u7EA7} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.high_size) || 0), "} {percent|").concat(Math.round((SBody === null || SBody === void 0 ? void 0 : SBody.high_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.shixun_size) * 10000) / 100, "%}"), - "其它": "{name|\u5176\u5B83} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.other_size) || 0), "} {percent|").concat(Math.round((SBody === null || SBody === void 0 ? void 0 : SBody.other_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.shixun_size) * 10000) / 100, "%}") + "初级": "{name|\u521D\u7EA7} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.primary_size) || 0), "} {percent|").concat((0,util/* getTwoDecimalPlaces */.tw)((SBody === null || SBody === void 0 ? void 0 : SBody.primary_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.shixun_size)), "%}"), + "中级": "{name|\u4E2D\u7EA7} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.middle_size) || 0), "} {percent|").concat((0,util/* getTwoDecimalPlaces */.tw)((SBody === null || SBody === void 0 ? void 0 : SBody.middle_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.shixun_size)), "%}"), + "中高级": "{name|\u4E2D\u9AD8\u7EA7} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.middle_high_size) || 0), "} {percent|").concat((0,util/* getTwoDecimalPlaces */.tw)((SBody === null || SBody === void 0 ? void 0 : SBody.middle_high_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.shixun_size)), "%}"), + "高级": "{name|\u9AD8\u7EA7} {value|".concat(ToNumW((SBody === null || SBody === void 0 ? void 0 : SBody.high_size) || 0), "} {percent|").concat((0,util/* getTwoDecimalPlaces */.tw)((SBody === null || SBody === void 0 ? void 0 : SBody.high_size) / (SBody === null || SBody === void 0 ? void 0 : SBody.shixun_size)), "%}") + // "其它": `{name|其它} {value|${ToNumW(SBody?.other_size || 0)}} {percent|${getTwoDecimalPlaces(SBody?.other_size / SBody?.shixun_size)}%}`, }; + return { title: [{ text: "实践项目难度分布", @@ -465,7 +466,7 @@ var Page = function Page(_ref3) { return Legend[name]; }, textStyle: { - lineHeight: 36, + lineHeight: 50, rich: { name: { fontSize: 12, @@ -514,13 +515,10 @@ var Page = function Page(_ref3) { itemStyle: { color: "#F9D699" } - }, { - value: (SBody === null || SBody === void 0 ? void 0 : SBody.other_size) || 0, - name: "其它", - itemStyle: { - color: "#BEDCF2" - } - }], + } + // { value: SBody?.other_size || 0, name: "其它", itemStyle: { color: "#BEDCF2" }, } + ], + type: 'pie', center: ['50%', '35%'], //饼图位置 @@ -551,7 +549,7 @@ var Page = function Page(_ref3) { }; }; var hanleEvaluationOption = function hanleEvaluationOption() { - var _SBody$clearance_list, _SBody$clearance_list2; + var _SBody$evaluation_lis, _SBody$evaluation_lis2; // 评测次数统计 return { title: [{ @@ -599,7 +597,7 @@ var Page = function Page(_ref3) { }, xAxis: { type: 'category', - data: (SBody === null || SBody === void 0 || (_SBody$clearance_list = SBody.clearance_list) === null || _SBody$clearance_list === void 0 || (_SBody$clearance_list = _SBody$clearance_list.times) === null || _SBody$clearance_list === void 0 ? void 0 : _SBody$clearance_list.map(function (item) { + data: (SBody === null || SBody === void 0 || (_SBody$evaluation_lis = SBody.evaluation_list) === null || _SBody$evaluation_lis === void 0 || (_SBody$evaluation_lis = _SBody$evaluation_lis.times) === null || _SBody$evaluation_lis === void 0 ? void 0 : _SBody$evaluation_lis.map(function (item) { return dayjs_min_default()(item).format("MM.DD"); })) || [], silent: false, @@ -646,7 +644,7 @@ var Page = function Page(_ref3) { name: '评测次数', type: 'line', stack: 'Total', - data: SBody === null || SBody === void 0 || (_SBody$clearance_list2 = SBody.clearance_list) === null || _SBody$clearance_list2 === void 0 ? void 0 : _SBody$clearance_list2.num, + data: SBody === null || SBody === void 0 || (_SBody$evaluation_lis2 = SBody.evaluation_list) === null || _SBody$evaluation_lis2 === void 0 ? void 0 : _SBody$evaluation_lis2.num, areaStyle: {}, color: { type: 'linear', diff --git a/umi.js b/umi.js index defaeae748..c2787b6225 100644 --- a/umi.js +++ b/umi.js @@ -51606,6 +51606,7 @@ function del(url, params) { /* harmony export */ rU: function() { return /* binding */ showTotal; }, /* harmony export */ rz: function() { return /* binding */ moveArray; }, /* harmony export */ tP: function() { return /* binding */ cutFileName; }, +/* harmony export */ tw: function() { return /* binding */ getTwoDecimalPlaces; }, /* harmony export */ uD: function() { return /* binding */ dealUploadChange; }, /* harmony export */ vA: function() { return /* binding */ HomeWorkShixunDetailStatus; }, /* harmony export */ vB: function() { return /* binding */ exerciseTips; }, @@ -51695,6 +51696,12 @@ function bytesToSize(bytes) { var i = parseInt('' + Math.floor(Math.log(bytes) / Math.log(1024)), 10); return (bytes / Math.pow(1024, i)).toFixed(1) + ' ' + sizes[i]; } +/** + * @description 精确到小数的后两位 + */ +var getTwoDecimalPlaces = function getTwoDecimalPlaces(value) { + return Math.round(Math.round(value * 100000) / 1000 * 100) / 100; +}; /** * @description 数字转化成万为单位,上万则转否者不会进行转换,转换后的值会留小数后两位 * @param {string} num 数字