Commit 36437109 authored by baixian's avatar baixian

优化

parents cc39137c 9889e993
......@@ -15,10 +15,10 @@
return `<link href="${htmlWebpackPlugin.options.files.CDN}${item}?${Date.now()}" rel="stylesheet">`
}).join('') %>
<%= htmlWebpackPlugin.options.files.header.basejs.map((item) => {
return `<script src="${item}?20191012222" charset="utf-8"></script>`
return `<script src="${item}?20200102" charset="utf-8"></script>`
}).join('') %>
<%= htmlWebpackPlugin.options.files.header.js.map((item) => {
return `<script src="${htmlWebpackPlugin.options.files.CDN}${item}?20191012222222" charset="utf-8"></script>`
return `<script src="${htmlWebpackPlugin.options.files.CDN}${item}?20200102" charset="utf-8"></script>`
}).join('') %>
</head>
</head>
......
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>轻校</title>
<link rel="shortcut icon" href="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/qxlogo4.png" >
<link rel="shortcut icon" href="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/qxlogo4.png">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Polyfills -->
<!-- Polyfills -->
<!--[if lt IE 10]>
<script src="js/console-polyfill.js"></script>
<![endif]-->
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script>
<script src="/js/ueeditor/ueditor.config.js?20191012222" charset="utf-8"></script><script src="/js/ueeditor/ueditor.all.js?20191012222" charset="utf-8"></script>
<script src="js/console-polyfill.js?20191012222" charset="utf-8"></script><script src="js/es6-shim.min.js?20191012222" charset="utf-8"></script><script src="js/es5-shim.js?20191012222" charset="utf-8"></script><script src="js/es5-sham.min.js?20191012222" charset="utf-8"></script><script src="js/json3.min.js?20191012222" charset="utf-8"></script><script src="js/html5shiv.min.js?20191012222" charset="utf-8"></script><script src="js/polyfill.js?20191012222" charset="utf-8"></script><script src="lib/vendor.dll.js?2019101222211" charset="utf-8"></script>
<script src="/js/ueeditor/ueditor.config.js?20200102" charset="utf-8"></script>
<script src="/js/ueeditor/ueditor.all.js?20200102" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?20200102" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?20200102" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?20200102" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?20200102" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?20200102" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?20200102" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?20200102" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/lib/vendor.dll.js?20200102" charset="utf-8"></script>
</head>
</head>
<body>
<div id="root"></div>
<script type="text/javascript" src="./dist/main.3af597.js"></script></body>
<script type="text/javascript" src="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/main.b8f35f.js"></script>
</body>
</html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -51,6 +51,7 @@
"query-string": "^6.8.3",
"rc-tree": "^3.0.0-alpha.38",
"react": "16.9.0",
"react-addons-perf": "^15.4.2",
"react-dnd": "^9.4.0",
"react-dnd-html5-backend": "^9.4.0",
"react-dom": "^16.2.0",
......@@ -68,6 +69,7 @@
"babel-preset-env": "^1.7.0",
"babel-preset-es2015": "7.0.0-beta.3",
"babel-preset-react": "7.0.0-beta.3",
"clean-webpack-plugin": "^3.0.0",
"css-loader": "^3.2.0",
"eslint": "^6.5.1",
"eslint-config-airbnb": "16.1.0",
......
This diff is collapsed.
......@@ -35,7 +35,6 @@
.tableth {
position: relative;
width: 60px;
display: flex;
.weekday {
font-size: 16px;
color: #000;
......
......@@ -42,25 +42,6 @@ class SjdMenu extends React.Component {
},
});
});
// dispatch({
// type: 'classmgt/updateState',
// payload: {
// classListQueryParams: {
// school_id: 0,
// page: 1,
// perPage: 10,
// title: '',
// teacher_id: '',
// course_id: '',
// class_room_id: '',
// graduation_status: 0,
// assign_class_status: 0,
// extra: 'course,class_room',
// student_id: '',
// my: '',
// },
// },
// });
}
goHome = () => {
const { dispatch } = this.props;
......
......@@ -74,7 +74,6 @@ class SjdMenu extends React.Component {
} else {
headerPdl = 20;
}
console.log(isDepartment, 'isDepartment');
return (
<Header
className={SjdHeaderStyle.header}
......
......@@ -35,6 +35,7 @@ export default {
scheduleList: [],
scheduleListTotal: [],
scheduleListGetting: false,
chartLoaded: false,
},
subscriptions: {
setup({ dispatch, history }) { // eslint-disable-line
......@@ -174,6 +175,7 @@ export default {
scheduleList,
showWeekDaysArr,
useForQueryTimeStamp,
chartLoaded: true,
},
});
} else {
......@@ -231,6 +233,7 @@ export default {
scheduleList: [],
scheduleListTotal: [],
scheduleListGetting: false,
chartLoaded: false,
},
});
},
......
......@@ -501,6 +501,31 @@ export default {
datetime: staticcenter.datetime,
},
});
yield put({
type: 'queryLeaveTotal',
});
yield put({
type: 'call',
});
yield put({
type: 'birthday',
});
yield put({
type: 'renew',
});
yield put({
type: 'assign',
});
yield put({
type: 'todoSchedule',
});
yield put({
type: 'queryLeaveList',
payload: {
params: {
},
},
});
if (staticcenter.code == 200) {
yield put({
type: 'updateState',
......
......@@ -1234,7 +1234,6 @@ export default {
{
type: 'orgdesc',
data: {
},
},
],
......
......@@ -140,7 +140,6 @@ export default {
});
}
if (pathname === '/register') {
console.log('/register');
dispatch({
type: 'login/pageInit',
});
......@@ -184,31 +183,6 @@ export default {
dispatch({
type: 'indexstaic/queryinfo',
});
dispatch({
type: 'indexstaic/queryLeaveTotal',
});
dispatch({
type: 'indexstaic/call',
});
dispatch({
type: 'indexstaic/birthday',
});
dispatch({
type: 'indexstaic/renew',
});
dispatch({
type: 'indexstaic/assign',
});
dispatch({
type: 'indexstaic/todoSchedule',
});
dispatch({
type: 'indexstaic/queryLeaveList',
payload: {
params: {
},
},
});
dispatch({
type: 'updateState',
payload: {
......@@ -887,11 +861,11 @@ export default {
});
}
if (pathname === '/sjd/singleclass') {
// dispatch({
// type: 'onlineclasses/pageInit',
// payload: {
// },
// });
dispatch({
type: 'onlineclasses/pageInit',
payload: {
},
});
dispatch({
type: 'onlineclasses/selectCourseList',
payload: {
......@@ -1095,7 +1069,7 @@ export default {
pathname: currentMenu.path,
}));
}
message.destroy();
// message.destroy();
},
* changeRoute({ payload }, { put, select }) {
const { path } = payload;
......@@ -1252,9 +1226,9 @@ export default {
}
},
* shiftSchool({ payload }, { put, select }) {
yield put({
type: 'pageInit',
});
// yield put({
// type: 'pageInit',
// });
yield put(routerRedux.replace({
pathname: '/erp/schoollist',
}));
......@@ -1273,9 +1247,9 @@ export default {
pathname: '/login',
}));
signouthide();
yield put({
type: 'pageInit',
});
// yield put({
// type: 'pageInit',
// });
message.destroy();
yield put({
type: 'updateState',
......
......@@ -762,7 +762,7 @@ class ClassMgtForm extends React.Component {
</div>
<div className={pageStyle.tablebox}>
<Table
rowKey={classList => classList.title}
rowKey={classList => classList.id}
dataSource={classList}
columns={columns}
scroll={{ x: 'max-content' }}
......
......@@ -237,7 +237,7 @@ class ClassMgtForm extends React.Component {
</div>
<div className={pageStyle.tablebox}>
<Table
rowKey={coursesinfo => coursesinfo.title}
rowKey={coursesinfo => coursesinfo.id}
dataSource={coursesinfo}
columns={columns}
scroll={{ x: 700 }}
......
......@@ -1204,14 +1204,6 @@ class StaticCenter extends React.Component {
loading={queryRepeatStudentsLoading}
dataSource={repeatStudentList}
/>
{/* <AddCourseTime */}
{/* visible={addCourseTimeShow} */}
{/* saveCourseTime={this.saveCourseTime} */}
{/* close={this.closeAddCourseTime} */}
{/* timeArr={timeArr} */}
{/* addTimeSubmitting={addTimeSubmitting} */}
{/* delTime={this.delTime} */}
{/* /> */}
<ChangeCourse
{...this.props}
scheduleStudentsizeChange={this.scheduleStudentsizeChange}
......
......@@ -1214,27 +1214,7 @@ class StudentMgt extends React.Component {
</div>
</div>
</Modal>
{/*
<Modal
visible={previewBindQrcodeShow}
footer={null}
onCancel={this.closeBindQrcodeShow}
title={<div style={{ textAlign: 'center', fontWeight: 700 }}>扫描二维码绑定</div>}
>
<img
alt=""
src={imagify(previewBindQrcode)}
style={{
width: 200,
height: 200,
display: 'block',
margin: '0 auto',
}}
/>
</Modal>
*/}
<RenewEdit
// {...this.props}
operator={operator}
editClassInfo={editClassInfo}
teacherList={teacherList}
......
......@@ -21,5 +21,19 @@ module.exports = webpackMerge(baseconfig, {
"X-Custom-Foo": "bar",
"Origin": '*'
}
},
},
// plugins: [
// new BundleAnalyzerPlugin(),
// new webpack.DllReferencePlugin({
// context: path.resolve(__dirname, '../'),
// manifest: require('../lib/vendor-manifest.json'),
// }),
// ],
// plugins: [
// // new BundleAnalyzerPlugin(),
// new webpack.DllReferencePlugin({
// context: path.resolve(__dirname, '../'),
// manifest: require('../lib/vendor-manifest.json'),
// }),
// ],
});
\ No newline at end of file
......@@ -153,6 +153,10 @@ module.exports = {
},
plugins: [
new HtmlWebpackPlugin(devFile),
new webpack.DllReferencePlugin({
context: path.resolve(__dirname, '../'),
manifest: require('../lib/vendor-manifest.json'),
}),
new webpack.DefinePlugin({
// 'ENVIRONMENT': `"${ENVIRONMENT}"`,
// '__IMGCDN__' : `"${__IMGCDN__}"`,
......
......@@ -2,7 +2,8 @@ const webpackMerge = require('webpack-merge');
const baseconfig = require('./webpack.base.config.js');
const webpack = require('webpack');
const path = require('path');
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
module.exports = webpackMerge(baseconfig, {
entry: path.resolve(__dirname, "../src/index.js"),
output: {
......@@ -11,10 +12,11 @@ module.exports = webpackMerge(baseconfig, {
},
mode: 'production',
plugins: [
new BundleAnalyzerPlugin(),
new webpack.DllReferencePlugin({
context: path.resolve(__dirname, '../'),
manifest: require('../lib/vendor-manifest.json'),
}),
// new BundleAnalyzerPlugin(),
new CleanWebpackPlugin(),
// new webpack.DllReferencePlugin({
// context: path.resolve(__dirname, '../'),
// manifest: require('../lib/vendor-manifest.json'),
// }),
],
});
\ No newline at end of file
const webpackMerge = require('webpack-merge');
const baseconfig = require('./webpack.base.config.js');
const webpack = require('webpack');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const path = require('path');
module.exports = webpackMerge(baseconfig, {
entry: path.resolve(__dirname, "../src/index.js"),
......@@ -10,9 +11,12 @@ module.exports = webpackMerge(baseconfig, {
},
mode: 'production',
plugins: [
new webpack.DllReferencePlugin({
context: path.resolve(__dirname, '../'),
manifest: require('../lib/vendor-manifest.json'),
}),
// new CleanWebpackPlugin({
// cleanOnceBeforeBuildPatterns: ['./dist']
// }),
// new webpack.DllReferencePlugin({
// context: path.resolve(__dirname, '../'),
// manifest: require('../lib/vendor-manifest.json'),
// }),
],
});
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment