dev_2022-05-11
yujialong 3 years ago
parent d2486e7c77
commit 836f5f4ac6
  1. 2
      src/layouts/home/index.vue
  2. 2
      src/pages/account/login/index.vue
  3. 2
      src/pages/assessment/list/index.vue
  4. 1
      src/pages/course/contentSettings/index.vue
  5. 6
      src/pages/match/manage/matchDetail.vue
  6. 16
      src/pages/student/list/index.vue
  7. 4
      src/pages/system/list/role.vue
  8. 4
      src/setting.js
  9. 4
      src/styles/common.scss

@ -61,7 +61,7 @@ export default {
.content { .content {
min-height: calc(100vh - 176px); min-height: calc(100vh - 176px);
padding: 24px 24px 0; padding: 24px 24px;
} }
} }
</style> </style>

@ -198,7 +198,7 @@ export default {
this.loginForm.phone = this.phone; this.loginForm.phone = this.phone;
this.phoneVisible = false; this.phoneVisible = false;
util.local.set(Setting.tokenKey, res.data.token, Setting.tokenExpires); util.local.set(Setting.tokenKey, res.token, Setting.tokenExpires);
let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index"; let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index";
this.$router.replace(redirect); this.$router.replace(redirect);
util.successMsg("登录成功"); util.successMsg("登录成功");

@ -373,7 +373,7 @@ export default {
delAllData() { delAllData() {
if (this.multipleSelection.length) { if (this.multipleSelection.length) {
let ids = this.multipleSelection.map(item => { let ids = this.multipleSelection.map(item => {
return item.projectId; return item.id;
}); });
this.$confirm("确定要删除吗?", "提示", { this.$confirm("确定要删除吗?", "提示", {
type: "warning" type: "warning"

@ -118,6 +118,7 @@
:on-exceed="handleExceed" :on-exceed="handleExceed"
:action="this.api.fileupload" :action="this.api.fileupload"
:file-list="uploadList" :file-list="uploadList"
:headers="headers"
name="file" name="file"
> >
<el-button size="small"><img src="@/assets/img/upload.png" alt=""> 上传资源</el-button> <el-button size="small"><img src="@/assets/img/upload.png" alt=""> 上传资源</el-button>

@ -14,6 +14,7 @@
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:action="this.api.fileupload" :action="this.api.fileupload"
:headers="headers"
name="file" name="file"
> >
<img v-if="coverUrl" :src="coverUrl" class="avatar"> <img v-if="coverUrl" :src="coverUrl" class="avatar">
@ -37,6 +38,7 @@
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:action="this.api.fileupload" :action="this.api.fileupload"
:headers="headers"
name="file" name="file"
> >
<img v-if="carouselUrl" :src="carouselUrl" class="avatar-lg"> <img v-if="carouselUrl" :src="carouselUrl" class="avatar-lg">
@ -103,12 +105,16 @@
<script> <script>
import quill from "@/components/quill"; import quill from "@/components/quill";
import util from "@/libs/util"; import util from "@/libs/util";
import Setting from "@/setting";
import { mapActions } from "vuex"; import { mapActions } from "vuex";
export default { export default {
name: "matchDetail", name: "matchDetail",
data() { data() {
return { return {
headers: {
token: util.local.get(Setting.tokenKey)
},
id: this.$route.query.id, id: this.$route.query.id,
coverUrl: "", coverUrl: "",
carouselUrl: "", carouselUrl: "",

@ -21,7 +21,7 @@
<el-button v-if="auth('学生组织架构添加')" type="text" @click="handleAdd">添加</el-button> <el-button v-if="auth('学生组织架构添加')" type="text" @click="handleAdd">添加</el-button>
</div> </div>
<div style="height: 500px; max-height: 500px; overflow: auto"> <div style="height: 504px; max-height: 504px; overflow: auto">
<org-tree <org-tree
v-if="treeVisible" v-if="treeVisible"
default-expand-all default-expand-all
@ -108,15 +108,15 @@
<el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" :row-key="getRowKeys"> <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" :row-key="getRowKeys">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column> <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
<el-table-column type="index" width="60" label="序号" align="center"></el-table-column> <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
<el-table-column prop="userName" label="学生姓名" align="center"></el-table-column> <el-table-column prop="userName" label="学生姓名" align="center" min-width="100"></el-table-column>
<el-table-column prop="workNumber" label="学生学号" align="center"></el-table-column> <el-table-column prop="workNumber" label="学生学号" align="center" min-width="100"></el-table-column>
<el-table-column prop="className" label="班级" align="center" min-width="150" show-overflow-tooltip></el-table-column> <el-table-column prop="className" label="班级" align="center" min-width="200" show-overflow-tooltip></el-table-column>
<el-table-column prop="account" label="账号" align="center"></el-table-column> <el-table-column prop="account" label="账号" align="center" min-width="100"></el-table-column>
<el-table-column prop="countries" label="账号角色" align="center"> <el-table-column prop="countries" label="账号角色" align="center" width="100">
<template slot-scope="scope">学生</template> <template slot-scope="scope">学生</template>
</el-table-column> </el-table-column>
<el-table-column prop="loginNumber" label="登录次数" align="center"></el-table-column> <el-table-column prop="loginNumber" label="登录次数" align="center" width="100"></el-table-column>
<el-table-column prop="lastLoginTime" label="上次登录时间" align="center"></el-table-column> <el-table-column prop="lastLoginTime" label="上次登录时间" align="center" width="120"></el-table-column>
<el-table-column label="操作" align="center" width="300"> <el-table-column label="操作" align="center" width="300">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="isRemove && auth('移除')" type="text" @click="removeStudent(scope.row)">移除</el-button> <el-button v-if="isRemove && auth('移除')" type="text" @click="removeStudent(scope.row)">移除</el-button>

@ -67,7 +67,7 @@
<script> <script>
import util from "@/libs/util"; import util from "@/libs/util";
import Setting from "@/setting";
export default { export default {
data() { data() {
return { return {
@ -164,7 +164,7 @@ export default {
// //
getPer(row) { getPer(row) {
if (!this.permissions.length) { if (!this.permissions.length) {
this.$get(this.api.queryAllMenus).then(res => { this.$get(`${this.api.queryAllMenus}?platformId=${Setting.platformId}`).then(res => {
let data = res.children; let data = res.children;
// //
let yw = data.findIndex(n => n.name == "业务后台"); let yw = data.findIndex(n => n.name == "业务后台");

@ -35,8 +35,8 @@ if (isHh) {
title = "职站服务端管理系统"; title = "职站服务端管理系统";
} else if (isDev) { } else if (isDev) {
jumpPath = "http://192.168.31.154:8087/"; jumpPath = "http://192.168.31.154:8087/";
host = "http://39.108.250.202:9000/"; // 中台测试服 // host = "http://39.108.250.202:9000/"; // 中台测试服
// host = "http://192.168.31.151:9000/"; // 榕 host = "http://192.168.31.151:9000/"; // 榕
// host = "http://192.168.31.125:9000/"; // 坤 // host = "http://192.168.31.125:9000/"; // 坤
// host = 'http://192.168.31.137:9000/'; // 赓 // host = 'http://192.168.31.137:9000/'; // 赓
title = "职站服务端管理系统"; title = "职站服务端管理系统";

@ -311,6 +311,7 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
max-width: 400px;
} }
.link { .link {
@ -339,5 +340,6 @@
} }
.el-upload-list{ .el-upload-list{
width: 400px; width: 100%;
max-width: 400px;
} }
Loading…
Cancel
Save