调整

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/AppConfig.js

@@ -30,8 +30,8 @@ export function initAxiosInterceptors(props) {
     var proxy = "http://localhost:3000"
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
-        proxy = "https://testeduplus2.educoder.net"
-        //proxy="http://47.96.87.25:48080"
+        //proxy = "https://testeduplus2.educoder.net"
+        proxy="http://47.96.87.25:48080"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制

public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js

@@ -278,20 +278,20 @@ class GraduationTasksnew extends Component {
 								<style>
 									{
 										`.ant-form-item-label{
-                text-align: right;
-    vertical-align: middle;
-    padding: 0px 0px 20px 0px;
-    display: inline-block;
-    overflow: hidden;
-    white-space: nowrap;
-    line-height: 20px; */
-            }
-            .ant-form-item-control{
-                line-height: 39.9999px;
-    position: relative;
-    zoom: 1;
-            }
-            `
+                	text-align: right;
+									vertical-align: middle;
+									padding: 0px 0px 20px 0px;
+									display: inline-block;
+									overflow: hidden;
+									white-space: nowrap;
+									line-height: 20px; */
+									}
+									.ant-form-item-control{
+										line-height: 39.9999px;
+										position: relative;
+										zoom: 1;
+									}
+									`
 									}
 								</style>
 								{/*内容*/}

public/react/src/modules/courses/graduation/tasks/index.js

@@ -209,12 +209,14 @@ class GraduationTasks extends Component{
         if (response.data.status == 0) {
           // {"status":1,"message":"删除成功"}
           this.fetchAll(search,page,order)
+					this.props.showNotification(response.data.message);
+					this.cancelmodel()
           this.setState({
-            Modalstype:true,
+            Modalstype:false,
             Modalstopval:response.data.message,
             ModalsBottomval:"",
             ModalSave:this.cancelmodel,
-            Loadtype:true,
+            Loadtype:false,
             checkBoxValues:[],
             checkAllValue:false
           })

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

@@ -731,7 +731,7 @@ class TPMBanner extends Component {
                 {/*>{shixunsDetails.task_operation===undefined?"":shixunsDetails.task_operation[0]}</a>:""*/}
                 {/*}*/}
 
-                {shixunsDetails.shixun_status === 0 && this.props.identity < 4 ?
+                {shixunsDetails.shixun_status === 0 && this.props.identity < 5 ?
                     <a onClick={this.applyrelease} className="fr user_default_btn user_blue_btn mr20 font-18 height39"
                        id="challenge_begin">申请发布</a> : ""
                 }
@@ -796,7 +796,7 @@ class TPMBanner extends Component {
 
                 </Modal>
 
-                {shixunsDetails.shixun_status === 1 && this.props.identity < 4 ?
+                {shixunsDetails.shixun_status === 1 && this.props.identity < 5 ?
                     <a onClick={this.cancel_publish} className="fr user_default_btn user_blue_btn mr20 font-18 height39"
                        id="challenge_begin">撤销发布</a> : ""
                 }
@@ -877,16 +877,16 @@ class TPMBanner extends Component {
 
                 <div className="fr user_default_btn user_blue_btn mr20"
                      style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
-                    <Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
+									{this.props.identity < 6?<Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
                        <span className="flex1 edu-txt-center fl font-18"
                              onClick={this.copyForkvisible}
                              style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "inline-block"}}
                        >
                               Fork
                         </span>
-                    </Tooltip>
+                    </Tooltip>:""}
 
-                    <Modal
+									<Modal
                         keyboard={false}
                         title="提示"
                         visible={Forkvisible}