Commit ab275674abc7163b9972fa81e6fb02df61460a21
1 parent
e0ca3a6e
我在阳台抽烟 风抽一半我抽一半 我也没有和风计较什么 也许风也有烦恼吧
Showing
2 changed files
with
87 additions
and
84 deletions
src/utils/routerList.js
| @@ -41,25 +41,26 @@ export function getRoutes() { | @@ -41,25 +41,26 @@ export function getRoutes() { | ||
| 41 | }] | 41 | }] |
| 42 | }, | 42 | }, |
| 43 | 43 | ||
| 44 | - // { | ||
| 45 | - // path: '/example', | ||
| 46 | - // component: Layout, | ||
| 47 | - // redirect: '/example/table', | ||
| 48 | - // name: 'Example', | ||
| 49 | - // meta: { | ||
| 50 | - // title: '题库管理', | ||
| 51 | - // icon: 'el-icon-s-help' | ||
| 52 | - // }, | ||
| 53 | - // children: [{ | ||
| 54 | - // path: 'QuestionBank', | ||
| 55 | - // name: 'Table', | ||
| 56 | - // component: () => import('@/views/QuestionBank/index'), | ||
| 57 | - // meta: { | ||
| 58 | - // title: '题库', | ||
| 59 | - // icon: 'table' | ||
| 60 | - // } | ||
| 61 | - // }] | ||
| 62 | - // }, | 44 | + { |
| 45 | + path: '/example', | ||
| 46 | + component: Layout, | ||
| 47 | + redirect: '/example/table', | ||
| 48 | + name: 'Example', | ||
| 49 | + meta: { | ||
| 50 | + title: '题库管理', | ||
| 51 | + icon: 'el-icon-s-help' | ||
| 52 | + }, | ||
| 53 | + children: [{ | ||
| 54 | + path: 'QuestionBank', | ||
| 55 | + name: 'Table', | ||
| 56 | + component: () => | ||
| 57 | + import ('@/views/QuestionBank/index'), | ||
| 58 | + meta: { | ||
| 59 | + title: '题库', | ||
| 60 | + icon: 'table' | ||
| 61 | + } | ||
| 62 | + }] | ||
| 63 | + }, | ||
| 63 | // { | 64 | // { |
| 64 | // path: '/moduleIndex', | 65 | // path: '/moduleIndex', |
| 65 | // component: Layout, | 66 | // component: Layout, |
| @@ -283,25 +284,26 @@ export function getRoutes() { | @@ -283,25 +284,26 @@ export function getRoutes() { | ||
| 283 | }] | 284 | }] |
| 284 | }, | 285 | }, |
| 285 | 286 | ||
| 286 | - // { | ||
| 287 | - // path: '/example', | ||
| 288 | - // component: Layout, | ||
| 289 | - // redirect: '/example/table', | ||
| 290 | - // name: 'Example', | ||
| 291 | - // meta: { | ||
| 292 | - // title: '题库管理', | ||
| 293 | - // icon: 'el-icon-s-help' | ||
| 294 | - // }, | ||
| 295 | - // children: [{ | ||
| 296 | - // path: 'QuestionBank', | ||
| 297 | - // name: 'Table', | ||
| 298 | - // component: () => import('@/views/QuestionBank/index'), | ||
| 299 | - // meta: { | ||
| 300 | - // title: '题库', | ||
| 301 | - // icon: 'table' | ||
| 302 | - // } | ||
| 303 | - // }] | ||
| 304 | - // }, | 287 | + { |
| 288 | + path: '/example', | ||
| 289 | + component: Layout, | ||
| 290 | + redirect: '/example/table', | ||
| 291 | + name: 'Example', | ||
| 292 | + meta: { | ||
| 293 | + title: '题库管理', | ||
| 294 | + icon: 'el-icon-s-help' | ||
| 295 | + }, | ||
| 296 | + children: [{ | ||
| 297 | + path: 'QuestionBank', | ||
| 298 | + name: 'Table', | ||
| 299 | + component: () => | ||
| 300 | + import ('@/views/QuestionBank/index'), | ||
| 301 | + meta: { | ||
| 302 | + title: '题库', | ||
| 303 | + icon: 'table' | ||
| 304 | + } | ||
| 305 | + }] | ||
| 306 | + }, | ||
| 305 | { | 307 | { |
| 306 | path: '/moduleIndex', | 308 | path: '/moduleIndex', |
| 307 | component: Layout, | 309 | component: Layout, |
| @@ -355,47 +357,48 @@ export function getRoutes() { | @@ -355,47 +357,48 @@ export function getRoutes() { | ||
| 355 | // }] | 357 | // }] |
| 356 | // }, | 358 | // }, |
| 357 | 359 | ||
| 358 | - // { | ||
| 359 | - // path: '/views', | ||
| 360 | - // component: Layout, | ||
| 361 | - // redirect: '/views/TestPaper', | ||
| 362 | - // name: 'TestPaper', | ||
| 363 | - // meta: { | ||
| 364 | - // title: '试卷管理', | ||
| 365 | - // icon: 'el-icon-s-help' | ||
| 366 | - // }, | ||
| 367 | - // children: [ | ||
| 368 | - // { | ||
| 369 | - // path: 'TestPaperList', | ||
| 370 | - // name: 'Table', | ||
| 371 | - // component: () => import('@/views/TestPaper/TestPaperList'), | ||
| 372 | - // meta: { | ||
| 373 | - // title: '试卷列表', | ||
| 374 | - // icon: 'table' | ||
| 375 | - // } | ||
| 376 | - // }, | ||
| 377 | - // { | ||
| 378 | - // path: 'index', | ||
| 379 | - // name: 'index', | ||
| 380 | - // component: () => import('@/views/TestPaper/index'), | ||
| 381 | - // hidden: true, | ||
| 382 | - // meta: { | ||
| 383 | - // title: '试卷维护', | ||
| 384 | - // icon: 'table' | ||
| 385 | - // } | ||
| 386 | - // }, | ||
| 387 | - // // { | ||
| 388 | - // // path: 'ManualTestPaper', | ||
| 389 | - // // name: 'Table', | ||
| 390 | - // // component: () => import('@/views/TestPaper/ManualTestPaper'), | ||
| 391 | - // // meta: { | ||
| 392 | - // // title: '组卷', | ||
| 393 | - // // icon: 'table' | ||
| 394 | - // // } | ||
| 395 | - // // }, | 360 | + { |
| 361 | + path: '/views', | ||
| 362 | + component: Layout, | ||
| 363 | + redirect: '/views/TestPaper', | ||
| 364 | + name: 'TestPaper', | ||
| 365 | + meta: { | ||
| 366 | + title: '试卷管理', | ||
| 367 | + icon: 'el-icon-s-help' | ||
| 368 | + }, | ||
| 369 | + children: [{ | ||
| 370 | + path: 'TestPaperList', | ||
| 371 | + name: 'Table', | ||
| 372 | + component: () => | ||
| 373 | + import ('@/views/TestPaper/TestPaperList'), | ||
| 374 | + meta: { | ||
| 375 | + title: '试卷列表', | ||
| 376 | + icon: 'table' | ||
| 377 | + } | ||
| 378 | + }, | ||
| 379 | + { | ||
| 380 | + path: 'index', | ||
| 381 | + name: 'index', | ||
| 382 | + component: () => | ||
| 383 | + import ('@/views/TestPaper/index'), | ||
| 384 | + hidden: true, | ||
| 385 | + meta: { | ||
| 386 | + title: '试卷维护', | ||
| 387 | + icon: 'table' | ||
| 388 | + } | ||
| 389 | + }, | ||
| 390 | + // { | ||
| 391 | + // path: 'ManualTestPaper', | ||
| 392 | + // name: 'Table', | ||
| 393 | + // component: () => import('@/views/TestPaper/ManualTestPaper'), | ||
| 394 | + // meta: { | ||
| 395 | + // title: '组卷', | ||
| 396 | + // icon: 'table' | ||
| 397 | + // } | ||
| 398 | + // }, | ||
| 396 | 399 | ||
| 397 | - // ] | ||
| 398 | - // }, | 400 | + ] |
| 401 | + }, | ||
| 399 | { | 402 | { |
| 400 | path: '/order', | 403 | path: '/order', |
| 401 | component: Layout, | 404 | component: Layout, |
src/views/TestPaper/ManualTestPaper.vue
| @@ -9,14 +9,14 @@ | @@ -9,14 +9,14 @@ | ||
| 9 | @add="RemoveHere" :move="onMove" class="infinite-list" :style="{'height':contentHeight-80+'px'}" | 9 | @add="RemoveHere" :move="onMove" class="infinite-list" :style="{'height':contentHeight-80+'px'}" |
| 10 | infinite-scroll-disabled="disabled" v-infinite-scroll="load" style="overflow:auto"> | 10 | infinite-scroll-disabled="disabled" v-infinite-scroll="load" style="overflow:auto"> |
| 11 | <li v-for="i in arr1" class="infinite-list-item">{{ i.subject }}</li> | 11 | <li v-for="i in arr1" class="infinite-list-item">{{ i.subject }}</li> |
| 12 | - <!-- <p v-if="loading" style="text-align: center;color: #cdcdcd;" class="unmover">加载中...</p> | ||
| 13 | - <p v-if="noMore" style="text-align: center;color: #cdcdcd;" class="unmover">没有更多了</p> --> | 12 | + <p v-if="loading" style="text-align: center;color: #cdcdcd;" class="unmover">加载中...</p> |
| 13 | + <p v-if="noMore" style="text-align: center;color: #cdcdcd;" class="unmover">没有更多了</p> | ||
| 14 | </li> | 14 | </li> |
| 15 | </draggable> | 15 | </draggable> |
| 16 | 16 | ||
| 17 | </div> | 17 | </div> |
| 18 | </el-col> | 18 | </el-col> |
| 19 | - <!-- <el-col :span="10" :style="{'height':contentHeight+'px'}"> | 19 | + <el-col :span="10" :style="{'height':contentHeight+'px'}"> |
| 20 | <div class="grid-content bg-purple"> | 20 | <div class="grid-content bg-purple"> |
| 21 | <div class="areahead"> | 21 | <div class="areahead"> |
| 22 | <span v-show="!edit" style="font-weight: bold;">{{ TestPaper.TestPaperTitle }}</span> | 22 | <span v-show="!edit" style="font-weight: bold;">{{ TestPaper.TestPaperTitle }}</span> |
| @@ -36,8 +36,8 @@ | @@ -36,8 +36,8 @@ | ||
| 36 | </li> | 36 | </li> |
| 37 | </draggable> | 37 | </draggable> |
| 38 | </div> | 38 | </div> |
| 39 | - </el-col> --> | ||
| 40 | - <!-- <el-col :span="8" :style="{'height':contentHeight+'px'}"> | 39 | + </el-col> |
| 40 | + <el-col :span="8" :style="{'height':contentHeight+'px'}"> | ||
| 41 | <div class="grid-content bg-purple"> | 41 | <div class="grid-content bg-purple"> |
| 42 | <div class="areahead">组卷基本信息</div> | 42 | <div class="areahead">组卷基本信息</div> |
| 43 | <el-form ref="form" class="testPaper-manager" :rules="rules" :model="TestPaper" label-width="100px"> | 43 | <el-form ref="form" class="testPaper-manager" :rules="rules" :model="TestPaper" label-width="100px"> |
| @@ -87,7 +87,7 @@ | @@ -87,7 +87,7 @@ | ||
| 87 | </el-button> | 87 | </el-button> |
| 88 | </el-form> | 88 | </el-form> |
| 89 | </div> | 89 | </div> |
| 90 | - </el-col> --> | 90 | + </el-col> |
| 91 | </el-row> | 91 | </el-row> |
| 92 | </div> | 92 | </div> |
| 93 | </template> | 93 | </template> |