From e7474bd4abba44504d1620f3ddf71f7129fd7722 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Sat, 7 Sep 2019 10:32:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=AA=E8=81=8C=E4=B8=9A=E8=AE=A4?= =?UTF-8?q?=E8=AF=81-=E9=93=BE=E6=8E=A5=E8=BF=9B=E5=85=A5=E9=A2=98?= =?UTF-8?q?=E5=BA=93=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/completetaskdetails/Completetaskpage.js | 2 +- .../modules/courses/comtopicdetails/CompletetopicdePage.js | 2 +- .../src/modules/courses/groupjobbank/GroupjobbankPage.js | 2 +- public/react/src/modules/courses/poll/PollNewQuestbank.js | 2 +- .../modules/courses/questionbank/Generaljobbankdetails.js | 2 +- public/react/src/modules/user/usersInfo/banks/BanksIndex.js | 5 ++++- .../react/src/modules/user/usersInfo/banks/BanksTabIndex.js | 4 ++-- .../src/modules/user/usersInfo/banks/ExerciseBanksDetail.js | 2 +- .../src/modules/user/usersInfo/banks/ExerciseBanksEdit.js | 2 +- .../react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js | 2 +- .../src/modules/user/usersInfo/banks/GtopicBanksEdit.js | 3 +-- .../src/modules/user/usersInfo/banks/HomeworkBanksEdit.js | 2 +- .../src/modules/user/usersInfo/banks/PollBanksContent.js | 2 +- 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js index 043d02470..9cfab4aa5 100644 --- a/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js +++ b/public/react/src/modules/courses/completetaskdetails/Completetaskpage.js @@ -87,7 +87,7 @@ class Completetaskpage extends Component { this.setState({ banksMenu:menuData }) - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,response.data); }catch (e) { } diff --git a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js index 818a141d2..be1241163 100644 --- a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js +++ b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js @@ -82,7 +82,7 @@ class CompletetopicdePage extends Component { this.setState({ banksMenu:menuData }) - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,response.data); }catch (e) { } diff --git a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js index f8853703f..873c4c1e6 100644 --- a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js +++ b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js @@ -92,7 +92,7 @@ class GroupjobbankPage extends Component { this.setState({ banksMenu:menuData }) - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,response.data); }catch (e) { } diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index e29acfc55..b38bfccfd 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -302,7 +302,7 @@ class PollNewQuestbank extends Component { {content:'编辑'} ] } - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,response.data); }catch (e) { } diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js index 9c70ecf95..7aef5f743 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js +++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js @@ -93,7 +93,7 @@ class Generaljobbankdetails extends Component { this.setState({ banksMenu:menuData }) - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,response.data); }catch (e) { } diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js index 0698048f2..e921022c3 100644 --- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js +++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js @@ -85,7 +85,10 @@ class BanksIndex extends Component{ } - initPublic = (crumbData) =>{ + initPublic = (crumbData,data) =>{ + if(data && data.status && data.status == -2){ + this.props.history.push(`/topicbank/publicly`); + } this.setState({ crumbData }) diff --git a/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js index e7202ded5..e38bb5de8 100644 --- a/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js +++ b/public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js @@ -31,11 +31,11 @@ class BanksTabIndex extends Component{ } } - initPublic = (crumbData,menuData) =>{ + initPublic = (crumbData,menuData,data) =>{ this.setState({ banksMenu:menuData }) - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,data); } render(){ diff --git a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js index 2fee1f511..00fb830db 100644 --- a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js +++ b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js @@ -36,7 +36,7 @@ class ExerciseBanksDetail extends Component{ type:this.props.match.params.type, authorize:result && result.data && result.data.authorize, } - this.props.initPublic(crumbData,menuData); + this.props.initPublic(crumbData,menuData,result.data); } render(){ diff --git a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js index 723761277..94d093454 100644 --- a/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/ExerciseBanksEdit.js @@ -29,7 +29,7 @@ class ExerciseBanksEdit extends Component { {content:'编辑'} ] } - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,responseData.data); } render(){ diff --git a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js index d7e433de3..8209effa4 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js @@ -29,7 +29,7 @@ class GtaskBanksEdit extends Component { {content:'编辑'} ] } - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,result.data); result.data.isEdit = true; this.setState({ data:result.data}) this.newWorkFormRef.initValue(result.data); diff --git a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js index 4a9163304..a03a5b533 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js @@ -12,7 +12,6 @@ class GtopicBanksEdit extends Component{ } componentDidMount = () =>{ let bankId = this.props.match.params.bankId; - this.initData(bankId); } @@ -28,7 +27,7 @@ class GtopicBanksEdit extends Component{ {content:'编辑'} ] } - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,result.data); this.GraduateTopicNewFromRef.initValue(result); } diff --git a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js index fa48361f6..33a981141 100644 --- a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js @@ -30,7 +30,7 @@ class HomeworkBanksEdit extends Component { {content:'编辑'} ] } - this.props.initPublic(crumbData); + this.props.initPublic(crumbData,result.data); result.data.isEdit = true; result.data.ref_attachments = result.data.reference_attachments // this.setState({ isGroup: result.data.min_num || result.data.max_num }) diff --git a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js index c9d2d48c3..be6bd5e2c 100644 --- a/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js +++ b/public/react/src/modules/user/usersInfo/banks/PollBanksContent.js @@ -47,7 +47,7 @@ class PollBanksContent extends Component{ type:this.props.match.params.type, authorize:result && result.data && result.data.authorize, } - this.props.initPublic(crumbData,menuData); + this.props.initPublic(crumbData,menuData,result.data); this.setState({ pollDetail }) From 995634168b70ac34ea569b59803195aaecc1e5d3 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 7 Sep 2019 10:34:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?vnc=E8=AF=84=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/tpm/TPMsettings/TPMsettings.js | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js index f1184e7b7..1ee36f488 100644 --- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js +++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js @@ -355,6 +355,7 @@ export default class TPMsettings extends Component { code_hidden: response.data.shixun.code_hidden, forbid_copy: response.data.shixun.forbid_copy, vnc: response.data.shixun.vnc, + vnc_evaluate: response.data.shixun.vnc_evaluate, name: response.data.shixun.name, scope_partment: response.data.shixun.scope_partment, description: response.data.shixun.description, @@ -535,6 +536,12 @@ export default class TPMsettings extends Component { forbid_copy: sum, }); } + shixun_vnc_evaluate=(e) => { + this.setState({ + vnc_evaluate: e.target.checked, + }); + + } shixun_vnc=(e)=>{ // let sum = "" @@ -545,6 +552,7 @@ export default class TPMsettings extends Component { // } this.setState({ vnc: e.target.checked, + vnc_evaluate: false, }); } @@ -772,7 +780,7 @@ export default class TPMsettings extends Component { } let { - name, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum, + name, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum, vnc_evaluate, evaluate_script, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh, opening_time,shixunmemoMDvalue,shixun_service_configlist } = this.state; @@ -883,6 +891,7 @@ export default class TPMsettings extends Component { use_scope: use_scope, can_copy: can_copy, vnc: vnc===null?undefined:vnc, + vnc_evaluate: vnc_evaluate===null?undefined:vnc_evaluate, test_set_permission: test_set_permission, code_hidden: code_hidden, trainee: trainee, @@ -1464,6 +1473,7 @@ export default class TPMsettings extends Component { forbid_copy, code_hidden, vnc, + vnc_evaluate, scopetype, scope_partment, departmentslist, @@ -2222,11 +2232,20 @@ export default class TPMsettings extends Component { {this.props.identity<3?
VNC图形化: - - - - + + + +
:""} + {this.props.identity<3 && vnc ?
+ VNC图形化评测: + + + + +
:""} + + From 591489dd452534384fb94e33e26b03c027d56495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 7 Sep 2019 10:35:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/poll/PollNewQuestbank.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js index b38bfccfd..ad68530e7 100644 --- a/public/react/src/modules/courses/poll/PollNewQuestbank.js +++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js @@ -302,7 +302,7 @@ class PollNewQuestbank extends Component { {content:'编辑'} ] } - this.props.initPublic(crumbData,response.data); + this.props.initPublic(crumbData,result.data); }catch (e) { } From 4eb24e83483b1bb40b832cd4ffa7c12c8ae62601 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 7 Sep 2019 10:36:32 +0800 Subject: [PATCH 4/4] actionView --- public/react/src/modules/page/MainContent.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/react/src/modules/page/MainContent.js b/public/react/src/modules/page/MainContent.js index d8623d84b..21524e627 100644 --- a/public/react/src/modules/page/MainContent.js +++ b/public/react/src/modules/page/MainContent.js @@ -100,6 +100,9 @@ class MainContent extends Component { vnc_url={vnc_url} {...this.props} > +
+ +
: