调整

public/react/config/webpack.config.dev.js

@@ -114,21 +114,21 @@ module.exports = {
       // First, run the linter.
       // It's important to do this before Babel processes the JS.
         // 上线然后要注释回来
-      {
-        test: /\.(js|jsx|mjs)$/,
-        enforce: 'pre',
-        use: [
-          {
-            options: {
-              formatter: eslintFormatter,
-              eslintPath: require.resolve('eslint'),
-
-            },
-            loader: require.resolve('eslint-loader'),
-          },
-        ],
-        include: paths.appSrc,
-      },
+      // {
+      //   test: /\.(js|jsx|mjs)$/,
+      //   enforce: 'pre',
+      //   use: [
+      //     {
+      //       options: {
+      //         formatter: eslintFormatter,
+      //         eslintPath: require.resolve('eslint'),
+			//
+      //       },
+      //       loader: require.resolve('eslint-loader'),
+      //     },
+      //   ],
+      //   include: paths.appSrc,
+      // },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -304,7 +304,7 @@ class ShixunhomeWorkItem extends Component{
               }
 
               {
-                this.props.isNotMember?this.props.discussMessage.private_icon===false?
+                this.props.isNotMember?this.props.discussMessage.private_icon===true?
                   <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
                   :
                   <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
@@ -313,7 +313,7 @@ class ShixunhomeWorkItem extends Component{
 
 
               {
-                 this.props.discussMessage.private_icon===false?
+                 this.props.discussMessage.private_icon===true?
                   <Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
                     <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
                   </Tooltip>

public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js

@@ -10,6 +10,9 @@ function startechart(data){
 	var effChart =  echarts.init(document.getElementById('shixun_skill_chart'));
 
 	var option = {
+		title: {
+			text: '工作效率',
+		},
 		grid:{
 			left: '3%',
 			right: '9%',
@@ -42,7 +45,7 @@ function startechart(data){
 		xAxis:  [
 			{
 				type : 'value',
-				name: '学生序号',
+				name: '学生排名',
 				scale:true,
 				axisLabel : {
 					formatter: ' ',
@@ -57,11 +60,16 @@ function startechart(data){
 		],
 		yAxis:  [
 			{
-				type : 'value',
-				name : '工作效率 = log(实训总得分/实训总耗时)',
+				type : "value",
+				name : "       实训总得分/实训总耗时",
+				nameGap: 20,
+				nameTextStyle: {
+					color: '#000',
+					fontSize:12
+				},
 				scale:true,
 				axisLabel : {
-					formatter:  '{value} '
+					formatter:  '{value}'
 				},
 				splitLine: {
 					show: false
@@ -100,6 +108,7 @@ function startechart(data){
 							name: data.username,
 							xAxis:data.echart_data.myself_eff[0],
 							yAxis:data.echart_data.myself_eff[1],
+							value:data.echart_data.myself_eff[1],
 						}
 					],
 					itemStyle: {
@@ -158,6 +167,9 @@ function startechart(data){
 
 
 	var option1 = {
+		title: {
+			text: '能力值',
+		},
 		backgroundColor: '#fff',
 		color: [
 			'#dd4444', '#fec42c', '#80F1BE'
@@ -200,7 +212,7 @@ function startechart(data){
 		},
 		yAxis: {
 			type: 'value',
-			name: '能力值（实训获得经验值/实训评测次数）',
+			name: "    实训获得经验值/实训评测次数",
 			nameLocation: 'end',
 			nameGap: 20,
 			nameTextStyle: {
@@ -230,7 +242,8 @@ function startechart(data){
 						{
 							name: data.username,
 							xAxis: data.echart_data.myself_object[0],
-							yAxis:data.echart_data.myself_object[1]
+							yAxis:data.echart_data.myself_object[1],
+							value:data.echart_data.myself_object[1]
 						}
 					],
 					itemStyle: {

public/react/src/modules/tpm/TPMBanner.js

@@ -10,7 +10,9 @@ import {Modal,Input,Radio,Pagination,message,Spin,Icon,Tooltip} from 'antd';
 
 import 'antd/lib/pagination/style/index.css';
 
-import axios from 'axios';
+import axios from 'axios'
+
+import Modals from '../modals/Modals';
 
 // import { Rating,Progress } from '@icedesign/base';
 
@@ -264,8 +266,13 @@ class TPMBanner extends Component {
     /*
     * 撤销发布按钮
     * */
-    cancel_publish=()=>{
 
+	ModalCancel=()=>{
+		this.setState({
+			Modalstype:false
+		})
+	}
+	ModalSave=()=>{
 		let id = this.props.match.params.shixunId;
 		let url="/shixuns/" + id +"/cancel_publish.json";
 		axios.get(url).then((response) => {
@@ -275,6 +282,14 @@ class TPMBanner extends Component {
 			console.log(error)
 		});
 	}
+    cancel_publish=()=>{
+    	this.setState({
+				Modalstype:true,
+				Modalstopval:"是否确认撤销发布？",
+				ModalCancel:this.ModalCancel,
+				ModalSave:this.ModalSave,
+			})
+    }
 
 
     /*
@@ -523,6 +538,15 @@ class TPMBanner extends Component {
 <div>
     <div className="shixunDetail_top">
 
+			{this.state.Modalstype===true?<Modals
+				modalsType={this.state.Modalstype}
+				modalsTopval={this.state.Modalstopval}
+				modalCancel={this.state.ModalCancel}
+				modalSave={this.state.ModalSave}
+				modalsBottomval={this.state.ModalsBottomval}
+				loadtype={this.state.Loadtype}
+			/>:""}
+
         <div className="educontent clearfix">
             <p className="clearfix">
                 <a href={"/shixuns/" + shixunsDetails.identifier + "/challenges"}

public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js

@@ -336,12 +336,12 @@ class Challenges extends Component {
                           {this.props.identity<4?
                             item.st === 1 ?
                               <a onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editquestion")}
-                                 className="font-16 color05101a">{item.name+1}</a>
+                                 className="font-16 color05101a">{item.name}</a>
                               :
                               <a onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")}
-                                 className="font-16 color05101a">{item.name+2}</a>:<span
+                                 className="font-16 color05101a">{item.name}</a>:<span
                               // onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")}
-                              className="font-16 color05101a">{item.name+2}</span>
+                              className="font-16 color05101a">{item.name}</span>
                           }
 
                           <Modal