Skip to content

Commit

Permalink
学生端并入分支
Browse files Browse the repository at this point in the history
  • Loading branch information
CHLCN committed Jul 2, 2020
2 parents 73dd116 + f5506e6 commit 86b6131
Show file tree
Hide file tree
Showing 20 changed files with 1,671 additions and 510 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
site/node_modules
site/build
site/*.log
site/*.log
node_modules/
995 changes: 528 additions & 467 deletions site/package-lock.json

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions site/src/App.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
import { Component } from 'preact';
import { Router } from 'preact-router';
import AsyncRoute from 'preact-async-route';
import { inject, observer } from 'mobx-react';
import { computed } from 'mobx';
import { createHashHistory } from 'history';

import NavT from './component/NavT'
import NavS from './component/NavS'
import NavM from './component/NavM'
import './style.scss'
import { computed, observable } from 'mobx'
import { inject, observer } from 'mobx-react'



// var usr = {
// name:'专业负责人',
// role:2 // 0: teacher 1:student 2: manage
// }

@inject('manageStore')
@inject('userStore','manageStore')
@observer
class App extends Component {
constructor(props) {
Expand All @@ -24,7 +26,8 @@ class App extends Component {

@computed
get usr() {
return this.props.manageStore.usr;
// return this.props.manageStore.usr;
return this.props.userStore.usr;
}

render() {
Expand All @@ -39,6 +42,8 @@ class App extends Component {
<AsyncRoute path='/t_auditTP' getComponent={ () => import('./app/t/auditTP').then(module => module.default) } />
<AsyncRoute path='/t_auditOP' getComponent={ () => import('./app/t/auditOP').then(module => module.default) }/>
<AsyncRoute path='/t_auditFD' getComponent={ () => import('./app/t/auditFD').then(module => module.default) }/>
<AsyncRoute path='/s_selectTL' getComponent={() => import('./app/s/selectTL').then(module => module.default)} />
<AsyncRoute path='/s_topicPG' getComponent={() => import('./app/s/topicPG').then(module => module.default)} />
{/* 系主任端 */}
<AsyncRoute path='/m_distributeTopic' getComponent={ () => import('./app/m/distributeTopic').then(module => module.default) }/>
<AsyncRoute path='/m_organizeOpendefence' getComponent={ () => import('./app/m/organizeOpendefence').then(module => module.default) }/>
Expand Down
72 changes: 72 additions & 0 deletions site/src/app/s/selectTL/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
.g-table {
width: 950px;
margin: 0 auto;
padding: 16px;
}
.m-title {
font-weight: bold;
font-size:18px;
}

table,
tbody.ant-table-tbody {
display: flex;
flex-direction: column;
}

.ant-table-row,
.ant-table-thead > tr {
display: flex;
}

table {
table-layout: fixed;
}

.ant-spin-nested-loading {
width: 900px;
}

.ant-table-tbody > tr > td {
width: 200px;
}
.ant-table-cell {
text-align: center;
/* margin: 0 auto; */
}
.ant-modal-content {
width: 900px;
margin-left: -170px;
}
.ant-descriptions-item-label {
width: 120px;
}
.ant-table-cell:nth-last-child(6) {
width: 130px;
}

.ant-table-cell:nth-last-child(5) {
width: 300px;
text-align: left;
}
.ant-table-cell:nth-last-child(4) {
width: 250px;
}
.ant-table-cell:nth-last-child(3) {
width: 100px;
}
.ant-table-cell:nth-last-child(2) {
width: 80px;
}
.ant-table-cell:nth-last-child(1) {
width: 90px;
}

td.ant-table-cell:nth-last-child(3) {
padding-left: 1px;
padding-right: 25px;
}
td.ant-table-cell:nth-last-child(2) {
padding-left: 1px;
padding-right: 22px;
}
Loading

0 comments on commit 86b6131

Please sign in to comment.