diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js index 2fc1bbe64..11cfc1962 100644 --- a/public/react/config/webpack.config.dev.js +++ b/public/react/config/webpack.config.dev.js @@ -28,8 +28,8 @@ const env = getClientEnvironment(publicUrl); // The production configuration is different and lives in a separate file. module.exports = { // You may want 'eval' instead if you prefer to see the compiled output in DevTools. - // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343. - devtool: 'cheap-module-source-map', + // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s + // devtool: "source-map", // 开启调试 // These are the "entry points" to our application. // This means they will be the "root" imports that are included in JS bundle. // The first two entry points enable "hot" CSS and auto-refreshes for JS. diff --git a/public/react/config/webpackDevServer.config.js b/public/react/config/webpackDevServer.config.js index 8e3d95c3d..0eb313cbe 100644 --- a/public/react/config/webpackDevServer.config.js +++ b/public/react/config/webpackDevServer.config.js @@ -1,95 +1,95 @@ -'use strict'; - -const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware'); -const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware'); -const ignoredFiles = require('react-dev-utils/ignoredFiles'); -const config = require('./webpack.config.dev'); -const paths = require('./paths'); - -const protocol = process.env.HTTPS === 'true' ? 'https' : 'http'; -const host = process.env.HOST || '0.0.0.0'; - -module.exports = function(proxy, allowedHost) { - return { - // WebpackDevServer 2.4.3 introduced a security fix that prevents remote - // websites from potentially accessing local content through DNS rebinding: - // https://github.com/webpack/webpack-dev-server/issues/887 - // https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a - // However, it made several existing use cases such as development in cloud - // environment or subdomains in development significantly more complicated: - // https://github.com/facebookincubator/create-react-app/issues/2271 - // https://github.com/facebookincubator/create-react-app/issues/2233 - // While we're investigating better solutions, for now we will take a - // compromise. Since our WDS configuration only serves files in the `public` - // folder we won't consider accessing them a vulnerability. However, if you - // use the `proxy` feature, it gets more dangerous because it can expose - // remote code execution vulnerabilities in backends like Django and Rails. - // So we will disable the host check normally, but enable it if you have - // specified the `proxy` setting. Finally, we let you override it if you - // really know what you're doing with a special environment variable. - disableHostCheck: - !proxy || process.env.DANGEROUSLY_DISABLE_HOST_CHECK === 'true', - // Enable gzip compression of generated files. - compress: true, - // Silence WebpackDevServer's own logs since they're generally not useful. - // It will still show compile warnings and errors with this setting. - clientLogLevel: 'none', - // By default WebpackDevServer serves physical files from current directory - // in addition to all the virtual build products that it serves from memory. - // This is confusing because those files won’t automatically be available in - // production build folder unless we copy them. However, copying the whole - // project directory is dangerous because we may expose sensitive files. - // Instead, we establish a convention that only files in `public` directory - // get served. Our build script will copy `public` into the `build` folder. - // In `index.html`, you can get URL of `public` folder with %PUBLIC_URL%: - // - // In JavaScript code, you can access it with `process.env.PUBLIC_URL`. - // Note that we only recommend to use `public` folder as an escape hatch - // for files like `favicon.ico`, `manifest.json`, and libraries that are - // for some reason broken when imported through Webpack. If you just want to - // use an image, put it in `src` and `import` it from JavaScript instead. - contentBase: paths.appPublic, - // By default files from `contentBase` will not trigger a page reload. - watchContentBase: true, - // Enable hot reloading server. It will provide /sockjs-node/ endpoint - // for the WebpackDevServer client so it can learn when the files were - // updated. The WebpackDevServer client is included as an entry point - // in the Webpack development configuration. Note that only changes - // to CSS are currently hot reloaded. JS changes will refresh the browser. - hot: true, - // It is important to tell WebpackDevServer to use the same "root" path - // as we specified in the config. In development, we always serve from /. - publicPath: config.output.publicPath, - // WebpackDevServer is noisy by default so we emit custom message instead - // by listening to the compiler events with `compiler.plugin` calls above. - quiet: true, - // Reportedly, this avoids CPU overload on some systems. - // https://github.com/facebookincubator/create-react-app/issues/293 - // src/node_modules is not ignored to support absolute imports - // https://github.com/facebookincubator/create-react-app/issues/1065 - watchOptions: { - ignored: ignoredFiles(paths.appSrc), - }, - // Enable HTTPS if the HTTPS environment variable is set to 'true' - https: protocol === 'https', - host: host, - overlay: false, - historyApiFallback: { - // Paths with dots should still use the history fallback. - // See https://github.com/facebookincubator/create-react-app/issues/387. - disableDotRule: true, - }, - public: allowedHost, - proxy, - before(app) { - // This lets us open files from the runtime error overlay. - app.use(errorOverlayMiddleware()); - // This service worker file is effectively a 'no-op' that will reset any - // previous service worker registered for the same host:port combination. - // We do this in development to avoid hitting the production cache if - // it used the same host and port. - // https://github.com/facebookincubator/create-react-app/issues/2272#issuecomment-302832432 - app.use(noopServiceWorkerMiddleware()); - }, - }; -}; +'use strict'; + +const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware'); +const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware'); +const ignoredFiles = require('react-dev-utils/ignoredFiles'); +const config = require('./webpack.config.dev'); +const paths = require('./paths'); + +const protocol = process.env.HTTPS === 'true' ? 'https' : 'http'; +const host = process.env.HOST || '0.0.0.0'; + +module.exports = function(proxy, allowedHost) { + return { + // WebpackDevServer 2.4.3 introduced a security fix that prevents remote + // websites from potentially accessing local content through DNS rebinding: + // https://github.com/webpack/webpack-dev-server/issues/887 + // https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a + // However, it made several existing use cases such as development in cloud + // environment or subdomains in development significantly more complicated: + // https://github.com/facebookincubator/create-react-app/issues/2271 + // https://github.com/facebookincubator/create-react-app/issues/2233 + // While we're investigating better solutions, for now we will take a + // compromise. Since our WDS configuration only serves files in the `public` + // folder we won't consider accessing them a vulnerability. However, if you + // use the `proxy` feature, it gets more dangerous because it can expose + // remote code execution vulnerabilities in backends like Django and Rails. + // So we will disable the host check normally, but enable it if you have + // specified the `proxy` setting. Finally, we let you override it if you + // really know what you're doing with a special environment variable. + disableHostCheck: + !proxy || process.env.DANGEROUSLY_DISABLE_HOST_CHECK === 'true', + // Enable gzip compression of generated files. + compress: true, + // Silence WebpackDevServer's own logs since they're generally not useful. + // It will still show compile warnings and errors with this setting. + clientLogLevel: 'none', + // By default WebpackDevServer serves physical files from current directory + // in addition to all the virtual build products that it serves from memory. + // This is confusing because those files won’t automatically be available in + // production build folder unless we copy them. However, copying the whole + // project directory is dangerous because we may expose sensitive files. + // Instead, we establish a convention that only files in `public` directory + // get served. Our build script will copy `public` into the `build` folder. + // In `index.html`, you can get URL of `public` folder with %PUBLIC_URL%: + // + // In JavaScript code, you can access it with `process.env.PUBLIC_URL`. + // Note that we only recommend to use `public` folder as an escape hatch + // for files like `favicon.ico`, `manifest.json`, and libraries that are + // for some reason broken when imported through Webpack. If you just want to + // use an image, put it in `src` and `import` it from JavaScript instead. + contentBase: paths.appPublic, + // By default files from `contentBase` will not trigger a page reload. + watchContentBase: true, + // Enable hot reloading server. It will provide /sockjs-node/ endpoint + // for the WebpackDevServer client so it can learn when the files were + // updated. The WebpackDevServer client is included as an entry point + // in the Webpack development configuration. Note that only changes + // to CSS are currently hot reloaded. JS changes will refresh the browser. + hot: true, + // It is important to tell WebpackDevServer to use the same "root" path + // as we specified in the config. In development, we always serve from /. + publicPath: config.output.publicPath, + // WebpackDevServer is noisy by default so we emit custom message instead + // by listening to the compiler events with `compiler.plugin` calls above. + quiet: false, + // Reportedly, this avoids CPU overload on some systems. + // https://github.com/facebookincubator/create-react-app/issues/293 + // src/node_modules is not ignored to support absolute imports + // https://github.com/facebookincubator/create-react-app/issues/1065 + watchOptions: { + ignored: ignoredFiles(paths.appSrc), + }, + // Enable HTTPS if the HTTPS environment variable is set to 'true' + https: protocol === 'https', + host: host, + overlay: false, + historyApiFallback: { + // Paths with dots should still use the history fallback. + // See https://github.com/facebookincubator/create-react-app/issues/387. + disableDotRule: true, + }, + public: allowedHost, + proxy, + before(app) { + // This lets us open files from the runtime error overlay. + app.use(errorOverlayMiddleware()); + // This service worker file is effectively a 'no-op' that will reset any + // previous service worker registered for the same host:port combination. + // We do this in development to avoid hitting the production cache if + // it used the same host and port. + // https://github.com/facebookincubator/create-react-app/issues/2272#issuecomment-302832432 + app.use(noopServiceWorkerMiddleware()); + }, + }; +}; diff --git a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js index f0a65a467..f593232d2 100644 --- a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js +++ b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js @@ -1,230 +1,230 @@ -import React,{ Component } from "react"; -import { Modal,Checkbox,notification} from "antd"; -import axios from 'axios'; - -class Ecerciseallbackagain extends Component{ - constructor(props){ - super(props); - this.state={ - data:undefined, - limit:10, - page:1, - datalist:undefined, - group_ids:undefined - } - } - componentDidMount() { - - let url="/exercises/"+this.props.match.params.Id+"/redo_modal.json"; - - axios.get(url,{params:{ - limit:10, - page:1, - } - }).then((response) => { - - this.setState({ - data:response.data, - datalist:response.data.exercise_users - }) - }).catch((error) => { - this.props.callback() - console.log(error) - }); - - - } - - //勾选实训 - shixunhomeworkedit=(checkedValues)=>{ - let{datalist}=this.state; - if(checkedValues.length===datalist.length){ - this.setState({ - onChangetype:true, - group_ids:checkedValues - }) - }else{ - this.setState({ - group_ids:checkedValues, - onChangetype:false - }) - } - } - - contentViewScroll=(e)=>{ - //滑动到底判断 - if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ - let {page,limit,datalist}=this.state; - let newpage=page+1; - let newdata=datalist; - - let url="/exercises/"+this.props.match.params.Id+"/redo_modal.json"; - - axios.get(url,{params:{ - limit:limit, - page:newpage, - } - }).then((response) => { - - response.data.exercise_users.map((item,key)=>{ - newdata.push(item) - }) - this.setState({ - datalist:newdata, - page:newpage - }) - }).catch((error) => { - console.log(error) - }); - - } - } - - onChange=(e)=>{ - let{datalist}=this.state; - if(e.target.checked===true){ - let id=[] - datalist.map((item,key)=>{ - id.push(item.user_id) - }) - - this.setState({ - group_ids:id, - onChangetype:e.target.checked - }) - }else{ - this.setState({ - group_ids:[], - onChangetype:e.target.checked - }) - } - } - - isSave=()=>{ - let{group_ids}=this.state; - if(group_ids===undefined||group_ids.length===0){ - notification.open({ - message:"提示", - description:"请先选择学生" - }); - return - } - let url="/exercises/"+this.props.match.params.Id+"/redo_exercise.json"; - axios.post(url, { - user_ids: group_ids, - }) - .then((response) => { - if (response.data.status === 0) { - this.props.callback(1) - notification.open({ - message:"提示", - description:response.data.message - }); - } - // else if(response.data.status === -1){ - // notification.open({ - // message: '参数错误', - // }); - // }else if(response.data.status === -2){ - // notification.open({ - // message: '当前作业不支持查重', - // }); - // }else if(response.data.status === -3){ - // notification.open({ - // message: '正在查重中', - // }); - // }else if(response.data.status === -4){ - // notification.open({ - // message: '查重异常', - // }); - // } - }) - .catch(function (error) { - console.log(error); - }); - } - - issCancel=()=>{ - this.props.callback() - } - - render(){ - let {datalist,group_ids,onChangetype}=this.state; - - console.log() - return( -
- -
- - -
学生(仅限“提交中”)将得到一次重新答题的机会,现有的答题情况将被清空
-
    -
  • 姓名
  • -
  • 学号
  • -
  • 成绩
  • -
- - {datalist===undefined?"": -
    - - - { datalist.map((item,key)=>{ - return( -
    -
  • - - - -
  • -
  • - {item.student_id} -
  • -
  • - {item.user_score} -
  • -
    - ) - })} - -
    -
- } - -
- {onChangetype===true?"清除":"全选"} -
- -
- 取消 - 确认 -
- -
-
-
- ) - } -} +import React,{ Component } from "react"; +import { Modal,Checkbox,notification} from "antd"; +import axios from 'axios'; + +class Ecerciseallbackagain extends Component{ + constructor(props){ + super(props); + this.state={ + data:undefined, + limit:10, + page:1, + datalist:undefined, + group_ids:undefined + } + } + componentDidMount() { + + let url="/exercises/"+this.props.match.params.Id+"/redo_modal.json"; + + axios.get(url,{params:{ + limit:10, + page:1, + } + }).then((response) => { + + this.setState({ + data:response.data, + datalist:response.data.exercise_users + }) + }).catch((error) => { + this.props.callback() + console.log(error) + }); + + + } + + //勾选实训 + shixunhomeworkedit=(checkedValues)=>{ + let{datalist}=this.state; + if(checkedValues.length===datalist.length){ + this.setState({ + onChangetype:true, + group_ids:checkedValues + }) + }else{ + this.setState({ + group_ids:checkedValues, + onChangetype:false + }) + } + } + + contentViewScroll=(e)=>{ + //滑动到底判断 + if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ + let {page,limit,datalist}=this.state; + let newpage=page+1; + let newdata=datalist; + + let url="/exercises/"+this.props.match.params.Id+"/redo_modal.json"; + + axios.get(url,{params:{ + limit:limit, + page:newpage, + } + }).then((response) => { + + response.data.exercise_users.map((item,key)=>{ + newdata.push(item) + }) + this.setState({ + datalist:newdata, + page:newpage + }) + }).catch((error) => { + console.log(error) + }); + + } + } + + onChange=(e)=>{ + let{datalist}=this.state; + if(e.target.checked===true){ + let id=[] + datalist.map((item,key)=>{ + id.push(item.user_id) + }) + + this.setState({ + group_ids:id, + onChangetype:e.target.checked + }) + }else{ + this.setState({ + group_ids:[], + onChangetype:e.target.checked + }) + } + } + + isSave=()=>{ + let{group_ids}=this.state; + if(group_ids===undefined||group_ids.length===0){ + notification.open({ + message:"提示", + description:"请先选择学生" + }); + return + } + let url="/exercises/"+this.props.match.params.Id+"/redo_exercise.json"; + axios.post(url, { + user_ids: group_ids, + }) + .then((response) => { + if (response.data.status === 0) { + this.props.callback(1) + notification.open({ + message:"提示", + description:response.data.message + }); + } + // else if(response.data.status === -1){ + // notification.open({ + // message: '参数错误', + // }); + // }else if(response.data.status === -2){ + // notification.open({ + // message: '当前作业不支持查重', + // }); + // }else if(response.data.status === -3){ + // notification.open({ + // message: '正在查重中', + // }); + // }else if(response.data.status === -4){ + // notification.open({ + // message: '查重异常', + // }); + // } + }) + .catch(function (error) { + console.log(error); + }); + } + + issCancel=()=>{ + this.props.callback() + } + + render(){ + let {datalist,group_ids,onChangetype}=this.state; + + console.log() + return( +
+ +
+ + +
学生将得到一次重新答题的机会,现有的答题情况将被清空
+
    +
  • 姓名
  • +
  • 学号
  • +
  • 成绩
  • +
+ + {datalist===undefined?"": +
    + + + { datalist.map((item,key)=>{ + return( +
    +
  • + + + +
  • +
  • + {item.student_id} +
  • +
  • + {item.user_score} +
  • +
    + ) + })} + +
    +
+ } + +
+ {onChangetype===true?"清除":"全选"} +
+ +
+ 取消 + 确认 +
+ +
+
+
+ ) + } +} export default Ecerciseallbackagain; \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js index 205fbd9e7..4cfdccab0 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js @@ -63,8 +63,9 @@ class ShixunWorkDetails extends Component { render() { let{data}=this.state; return ( - - {data===undefined? "":
+ +
+ {data===undefined? "":
@@ -111,11 +112,9 @@ class ShixunWorkDetails extends Component { />
- - -
-
} + } +
) }