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] =?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?<div className="clearfix mt20 ml30">
 						<span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>VNC图形化:</span>
-						<span className="fl mt5">
-						<Checkbox checked={vnc === undefined ? false : vnc} onChange={this.shixun_vnc}></Checkbox>
-						<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label>
-						</span>
+							<span className="fl mt5">
+								<Checkbox checked={vnc === undefined ? false : vnc} onChange={this.shixun_vnc}></Checkbox>
+								<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label>
+							</span>
 						</div>:""}
+						{this.props.identity<3 && vnc ?<div className="clearfix mt20 ml30">
+						<span className="color-grey-6 mt5 fl" style={{minWidth: '95px'}}>VNC图形化评测:</span>
+							<span className="fl mt5 ml5">
+								<Checkbox checked={vnc_evaluate === undefined ? false : vnc_evaluate} onChange={this.shixun_vnc_evaluate}></Checkbox>
+								<label style={{top:'6px'}} className="color-grey-9 ml10" >勾选则在VNC图形化实训中，给学员开启评测</label>
+							</span>
+						</div>:""}
+
+						
 
 					</div>