huoran
/
FE_occupationlab_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

no message

Browse Source
dev_2022-05-11
e 3 years ago
parent 2a5fcd1424 76b0820e1e
commit 79371fd904
8 changed files with 170 additions and 194 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/api/index.js
  2. 6
      src/pages/assessment/add/index.vue
  3. 11
      src/pages/assessment/list/index.vue
  4. 4
      src/pages/course/courseManagement/preview.vue
  5. 13
      src/pages/match/index.vue
  6. 174
      src/pages/project/add/index.vue
  7. 20
      src/pages/project/list/index.vue
  8. 58
      src/setting.js

8
src/api/index.js
Unescape View File

@ -11,7 +11,6 @@ let uploadURL = Setting.upload.apiURL;
let host1 = "http://39.108.250.202:8080/"; // 川大 let host1 = "http://39.108.250.202:8080/"; // 川大
export default { export default {
// fileupload: `${uploadURL}oss/manage/fileupload`,
queryToken: `${host}liuwanr/userInfo/queryToken`, queryToken: `${host}liuwanr/userInfo/queryToken`,
logins: `${host}users/users/user/login`, //登录 logins: `${host}users/users/user/login`, //登录
@ -78,6 +77,7 @@ export default {
deleteReportById: `${host}occupationlab/achievement/deleteReportById`, // 批量删除成绩管理中的项目/批量删除成绩管理中的考核 deleteReportById: `${host}occupationlab/achievement/deleteReportById`, // 批量删除成绩管理中的项目/批量删除成绩管理中的考核
// 项目管理 // 项目管理
getSystemIdBySchool: `${host}occupationlab/projectManage/getSystemIdBySchool`, // 获取学校下拥有的系统
avgValues: `${host}occupationlab/projectManage/avgValues`, // 平均分分配值 avgValues: `${host}occupationlab/projectManage/avgValues`, // 平均分分配值
deleteProjectManage: `${host}occupationlab/projectManage/deleteProjectManage`, // 新增项目管理 deleteProjectManage: `${host}occupationlab/projectManage/deleteProjectManage`, // 新增项目管理
getProjectBySystemId: `${host}occupationlab/projectManage/getProjectBySystemId`, // 根据系统id获取全部项目(项目中没有用上这个接口) getProjectBySystemId: `${host}occupationlab/projectManage/getProjectBySystemId`, // 根据系统id获取全部项目(项目中没有用上这个接口)
@ -163,9 +163,9 @@ export default {
getSubsection: `${host}occupationlab/management/edu/courseSubsection/getSubsection`, // 根据小节id获取预览文件地址 getSubsection: `${host}occupationlab/management/edu/courseSubsection/getSubsection`, // 根据小节id获取预览文件地址
// 阿里云文件/视频管理 // 阿里云文件/视频管理
fileDeletion: `${host}nakadai/nakadai/oss/fileDeletion`, // 删除OSS文件 fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件
fileupload: `${host}nakadai/nakadai/oss/fileUpload`, // 文件上传 fileupload: `${uploadURL}oss/manage/fileUpload`, // 文件上传
getPlayAuth: `${host}nakadai/nakadai/oss/getPlayAuth`, // 获取播放凭证 getPlayAuth: `${uploadURL}oss/manage/getPlayAuth`, // 获取播放凭证

6
src/pages/assessment/add/index.vue
Unescape View File

@ -373,9 +373,13 @@ export default {
return resolve([]); return resolve([]);
} }
}, },
getschoolCourse() { getschoolCourse() { // 获取课程
this.$get(this.api.schoolCourse).then(res => { this.$get(this.api.schoolCourse).then(res => {
this.curriculumList = res.data; this.curriculumList = res.data;
if (this.curriculumList.length) {
this.form.curriculumId = this.curriculumList[0].cid;
this.getProjectData();
}
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
}); });

11
src/pages/assessment/list/index.vue
Unescape View File

@ -152,10 +152,10 @@ export default {
}, },
{ {
value: 2, value: 2,
name: "已完成" name: "已结束"
} }
], ],
status: ["待开始", "进行中", "已完成"], status: ["待开始", "进行中", "已结束"],
dateList: [ dateList: [
{ {
id: "", id: "",
@ -248,6 +248,13 @@ export default {
const item = this.listData[i]; const item = this.listData[i];
if (item.countDown > 0) { if (item.countDown > 0) {
item.countDown--; item.countDown--;
} else {
if (item.status === 0 && item.type === 2) { // 待开始-定时发布
item.status = 1;
item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
} else if (item.status === 1) {
item.status = 2;
}
} }
this.$set(this.listData, i, item); this.$set(this.listData, i, item);
} }

4
src/pages/course/courseManagement/preview.vue
Unescape View File

@ -7,8 +7,8 @@
</div> </div>
</el-card> </el-card>
<el-card shadow="hover" class="m-b-20"> <el-card shadow="hover" class="m-b-20" style="background: none;">
<div class="flex p-40"> <div class="flex">
<div class="cover" :class="{'is-word': showMask1}"> <div class="cover" :class="{'is-word': showMask1}">
<img v-if="coverUrl" :src="coverUrl" alt="" width="100%" height="100%"> <img v-if="coverUrl" :src="coverUrl" alt="" width="100%" height="100%">
<template v-else-if="iframeSrc"> <template v-else-if="iframeSrc">

13
src/pages/match/index.vue
Unescape View File

@ -35,14 +35,13 @@
{{ scope.$index + (pageNo - 1) * pageSize + 1 }} {{ scope.$index + (pageNo - 1) * pageSize + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="竞赛名称"> <el-table-column prop="name" label="竞赛名称" align="center"></el-table-column>
</el-table-column> <el-table-column prop="applicantNum" label="报名人数" align="center" width="150">
<el-table-column prop="applicantNum" label="报名人数" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.applicantNum ? scope.row.applicantNum : 0 }} {{ scope.row.applicantNum ? scope.row.applicantNum : 0 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" label="状态" width="80" align="center"> <el-table-column prop="status" label="状态" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ transferPublishStatus[scope.row.publishStatus] }} {{ transferPublishStatus[scope.row.publishStatus] }}
</template> </template>
@ -52,10 +51,8 @@
{{ scope.row.playStartTime }} ~ {{ scope.row.playEndTime }} {{ scope.row.playStartTime }} ~ {{ scope.row.playEndTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="gmtCreate" label="创建时间" width="150" align="center"> <el-table-column prop="gmtCreate" label="创建时间" align="center" width="200"></el-table-column>
</el-table-column> <el-table-column prop="founder" label="创建人" align="center" width="200"></el-table-column>
<el-table-column prop="founder" width="100" label="创建人" align="center">
</el-table-column>
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="manage(scope.row)" v-auth>管理</el-button> <el-button type="text" @click="manage(scope.row)" v-auth>管理</el-button>

174
src/pages/project/add/index.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<div ref="main" class="main"> <div>
<el-form :disabled="isDetail"> <el-form :disabled="isDetail">
<el-card shadow="hover" class="m-b-20"> <el-card shadow="hover" class="m-b-20">
<div class="flex-between"> <div class="flex-between">
@ -30,7 +30,7 @@
<el-select :disabled="isDetail" v-model="projectManage.systemId" placeholder="请选择" @change="systemChange"> <el-select :disabled="isDetail" v-model="projectManage.systemId" placeholder="请选择" @change="systemChange">
<el-option <el-option
v-for="item in systemList" v-for="item in systemList"
:key="item.value" :key="item.id"
:label="item.label" :label="item.label"
:value="item.id" :value="item.id"
></el-option> ></el-option>
@ -83,7 +83,7 @@
</div> </div>
<el-button :disabled="isDetail" type="primary" icon="el-icon-plus" round @click="handleQueryJudgment" style="margin-bottom: 10px">判分点</el-button> <el-button :disabled="isDetail" type="primary" icon="el-icon-plus" round @click="handleQueryJudgment" style="margin-bottom: 10px">判分点</el-button>
<el-button :disabled="isDetail" type="primary" icon="el-icon-delete" round @click="batchDeleteProjectJudgment" style="margin-bottom: 10px">批量删除</el-button> <el-button :disabled="isDetail" type="primary" icon="el-icon-delete" round @click="batchDeleteProjectJudgment" style="margin-bottom: 10px">批量删除</el-button>
<div class="draggable" style="padding: 20px"> <div class="draggable">
<el-table <el-table
ref="projectJudgementTable" ref="projectJudgementTable"
:data="projectJudgmentData" :data="projectJudgmentData"
@ -92,7 +92,6 @@
header-align="center" header-align="center"
@selection-change="handleSelectionProjectJudgment" @selection-change="handleSelectionProjectJudgment"
row-key="judgmentId" row-key="judgmentId"
v-loading="listLoading"
> >
<el-table-column type="selection" width="55" align="center"></el-table-column> <el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column prop="sort" label="序号" width="80" align="center"> <el-table-column prop="sort" label="序号" width="80" align="center">
@ -184,17 +183,16 @@ import Setting from "@/setting";
import util from "@/libs/util"; import util from "@/libs/util";
import { mapState, mapActions } from "vuex"; import { mapState, mapActions } from "vuex";
import quill from "@/components/quill"; import quill from "@/components/quill";
import Sortable from 'sortablejs'; import Sortable from "sortablejs";
export default { export default {
components: { components: {
quill quill
}, },
data() { data() {
return { return {
host: Setting.apiBaseURL,
isHh: Setting.isHh,
projectId: this.$route.query.projectId, projectId: this.$route.query.projectId,
systemList: Setting.systemList, systemList: [],
token: btoa(util.local.get(Setting.tokenKey)), token: btoa(util.local.get(Setting.tokenKey)),
isDetail: Boolean(this.$route.query.show), isDetail: Boolean(this.$route.query.show),
@ -226,8 +224,7 @@ export default {
searchTimer: null, searchTimer: null,
isToPoint: false, // 判断是否是跳转到判分点系统 isToPoint: false, // 判断是否是跳转到判分点系统
visibleLoading:false,// 加载弹框 visibleLoading: false// 加载弹框
listLoading:false,// 列表加载
}; };
}, },
computed: { computed: {
@ -247,16 +244,17 @@ export default {
// util.warningMsg(res.message); // util.warningMsg(res.message);
util.errorMsg("分配的数值已超过100"); util.errorMsg("分配的数值已超过100");
} }
console.log("chuli");
return score; return score;
} }
}, },
watch: { watch: {
// projectJudgmentData: { projectJudgmentData: {
// handler(newValue) { handler(newValue) {
// console.log("newValue：", newValue); console.log("newValue：", newValue);
// }, },
// deep: true deep: true
// }, },
judgementpointsquery(n) { judgementpointsquery(n) {
clearTimeout(this.searchTimer); clearTimeout(this.searchTimer);
this.searchTimer = setTimeout(() => { this.searchTimer = setTimeout(() => {
@ -265,7 +263,7 @@ export default {
} }
}, },
created() { created() {
// console.log(this.projectManage.systemId, "this.projectManage.systemId", this.lastSystemId); this.getSystemData();
}, },
mounted() { mounted() {
if (this.$route.query.projectId) { if (this.$route.query.projectId) {
@ -278,7 +276,7 @@ export default {
this.projectManage = projectManage; this.projectManage = projectManage;
this.projectJudgmentData = projectJudgmentData; this.projectJudgmentData = projectJudgmentData;
} }
this.rowDrop() this.rowDrop();
}, },
beforeDestroy() { beforeDestroy() {
if (!this.isToPoint) { if (!this.isToPoint) {
@ -301,6 +299,11 @@ export default {
}); });
} }
}, },
getSystemData() {
this.$get(this.api.getSystemIdBySchool).then(res => {
this.systemList = res.data;
});
},
getInfoData() { // 获取详情数据 getInfoData() { // 获取详情数据
this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => { this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => {
if (res.status === 200) { if (res.status === 200) {
@ -308,8 +311,8 @@ export default {
this.projectManage = projectManage; this.projectManage = projectManage;
this.projectJudgmentData = projectJudgmentVos; this.projectJudgmentData = projectJudgmentVos;
this.projectJudgmentData.forEach((e, i) => { this.projectJudgmentData.forEach((e, i) => {
e.sort = i+1 e.sort = i + 1;
}) });
} else { } else {
util.warningMsg(res.message); util.warningMsg(res.message);
} }
@ -341,7 +344,7 @@ export default {
this.setSystemId(this.projectManage.systemId); this.setSystemId(this.projectManage.systemId);
}).catch(() => { }).catch(() => {
this.projectManage.systemId = this.lastSystemId; this.projectManage.systemId = this.lastSystemId;
console.log(this.lastSystemId, "this.lastSystemId"); // console.log(this.lastSystemId, "this.lastSystemId");
}); });
} }
}, },
@ -459,7 +462,7 @@ export default {
item.score = res.data[index]; item.score = res.data[index];
return item; return item;
}); });
this.updateProjectJudgment() this.updateProjectJudgment();
} }
}); });
} }
@ -482,7 +485,7 @@ export default {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
if (this.projectId) { if (this.projectId) {
this.deleteProjectJudgment([this.projectJudgmentData[index].id]) this.deleteProjectJudgment([this.projectJudgmentData[index].id]);
} else { } else {
this.projectJudgmentData.splice(index, 1); this.projectJudgmentData.splice(index, 1);
} }
@ -499,8 +502,8 @@ export default {
}).then(() => { }).then(() => {
// this.projectJudgmentData.splice(index, 1); // this.projectJudgmentData.splice(index, 1);
if (this.projectId) {// 编辑项目的时候 if (this.projectId) {// 编辑项目的时候
let param = this.selectedProjectJudgment.map(e=>e.id) let param = this.selectedProjectJudgment.map(e => e.id);
this.deleteProjectJudgment(param)// 调删除接口 this.deleteProjectJudgment(param);// 调删除接口
} else { } else {
let list = this.projectJudgmentData; let list = this.projectJudgmentData;
let result = []; let result = [];
@ -540,7 +543,7 @@ export default {
} }
}, },
getProcessClassData(params) { // 获取流程类判分点列表数据 getProcessClassData(params) { // 获取流程类判分点列表数据
this.visibleLoading = true this.visibleLoading = true;
this.$post(`${this.api.getLcJudgmentPoint}`, params).then(res => { this.$post(`${this.api.getLcJudgmentPoint}`, params).then(res => {
if (res.status === 200) { if (res.status === 200) {
let list = res.message.records; let list = res.message.records;
@ -549,7 +552,7 @@ export default {
i.judgmentId = i.lcId; i.judgmentId = i.lcId;
this.projectJudgmentData.find(j => j.judgmentId === i.judgmentId) || result.push(i); this.projectJudgmentData.find(j => j.judgmentId === i.judgmentId) || result.push(i);
}); });
this.visibleLoading = false this.visibleLoading = false;
this.judgementData = result; this.judgementData = result;
} }
}).catch(err => { }).catch(err => {
@ -557,7 +560,7 @@ export default {
}); });
}, },
getProgrammingClassData(params) { // 获取编程类判分点列表数据 getProgrammingClassData(params) { // 获取编程类判分点列表数据
this.visibleLoading = true this.visibleLoading = true;
this.$post(this.api.getBcJudgmentPoint, params).then(res => { this.$post(this.api.getBcJudgmentPoint, params).then(res => {
if (res.status === 200) { if (res.status === 200) {
let list = res.message.records; let list = res.message.records;
@ -566,12 +569,11 @@ export default {
i.judgmentId = i.bcId; i.judgmentId = i.bcId;
this.projectJudgmentData.find(j => j.judgmentId === i.judgmentId) || result.push(i); this.projectJudgmentData.find(j => j.judgmentId === i.judgmentId) || result.push(i);
}); });
this.visibleLoading = false this.visibleLoading = false;
this.judgementData = result; this.judgementData = result;
console.log(res,'res') // console.log(res, "res");
console.log(this.projectJudgmentData,'projectJudgmentData') // console.log(this.projectJudgmentData, "projectJudgmentData");
} }
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
}); });
@ -581,10 +583,10 @@ export default {
}, },
addJudgment() { // 确认选择判分点 addJudgment() { // 确认选择判分点
if (this.selectedJudgment.length) { if (this.selectedJudgment.length) {
console.log(this.selectedJudgment,'queren') // console.log(this.selectedJudgment, "queren");
this.dialogVisible = false; this.dialogVisible = false;
if (this.projectId) { // 编辑的时候，新增调接口 if (this.projectId) { // 编辑的时候，新增调接口
this.addProjectJudgment() this.addProjectJudgment();
} else { } else {
// 新增时，假添加 // 新增时，假添加
let tempArr = this.selectedJudgment.map(i => { let tempArr = this.selectedJudgment.map(i => {
@ -593,8 +595,8 @@ export default {
}); });
this.projectJudgmentData = this.projectJudgmentData.concat(tempArr); this.projectJudgmentData = this.projectJudgmentData.concat(tempArr);
this.projectJudgmentData.map((e, i) => { this.projectJudgmentData.map((e, i) => {
e.sort = i+1 e.sort = i + 1;
}) });
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.projectJudgementTable.clearSelection(); this.$refs.projectJudgementTable.clearSelection();
}); });
@ -609,42 +611,42 @@ export default {
}, },
toJudgePoint(type, row) { // 进入判分点系统 toJudgePoint(type, row) { // 进入判分点系统
this.handleCacheData(); this.handleCacheData();
// let host = this.host; let jumpPath = Setting.jumpPath;
let host = "http://192.168.31.154:8087/"; // 本地 // let jumpPath = "http://192.168.31.154:8087/"; // 本地
let { systemId } = this.projectManage; let { systemId } = this.projectManage;
let href = ""; let href = "";
if (type === "view") { if (type === "view") {
// 查看 // 查看
if (systemId == 2) { if (systemId == 2) {
href = `${host}jdTrials/#/programOption?id=${row.judgmentPointsId}`; console.log(systemId);
} else if (systemId == 3) { } else if (systemId == 3) {
href = `${host}jdTrials/#/programOptions?id=${row.judgmentPointsId}`; console.log(systemId);
} else if (systemId == 11) { } else if (systemId == 11) {
// 交易类判分点（银行综合系统） // 交易类判分点（银行综合系统）
href = `${host}jdTrials/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; href = `${jumpPath}#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
} else { } else {
// 编程类判分点（python子系统） // 编程类判分点（python子系统）
href = `${host}jdTrials/#/program?isView=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; href = `${jumpPath}#/program?isView=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
} }
} else if (type === "edit") { } else if (type === "edit") {
// 自定义（老师端隐藏此功能） // 自定义（老师端隐藏此功能）
if (systemId == 2) { if (systemId == 2) {
href = `${host}jdTrials/#/programOption?id=${row.judgmentPointsId}`; console.log(systemId);
} else if (systemId == 3) { } else if (systemId == 3) {
href = `${host}jdTrials/#/programOptions?id=${row.judgmentPointsId}`; console.log(systemId);
} else if (systemId == 11) { } else if (systemId == 11) {
// 交易类判分点（银行综合系统） // 交易类判分点（银行综合系统）
href = `${host}jdTrials/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; href = `${jumpPath}#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
} else { } else {
// 编程类判分点（python子系统） // 编程类判分点（python子系统）
href = `${host}jdTrials/#/program?isEdit=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; href = `${jumpPath}#/program?isEdit=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
} }
} else if (type === "home") { } else if (type === "home") {
if (systemId == 2 || systemId == 3) { if (systemId == 2 || systemId == 3) {
href = `${host}jdTrials/#/list`; console.log(systemId);
} else { } else {
// 进入判分点系统首页（老师端隐藏此功能） // 进入判分点系统首页（老师端隐藏此功能）
href = `${host}#/?systemId=${systemId}&token=${this.token}&referrer=${btoa(location.href)}`; href = `${jumpPath}#/?systemId=${systemId}&token=${this.token}&referrer=${btoa(location.href)}`;
} }
} }
location.href = href; location.href = href;
@ -652,26 +654,24 @@ export default {
// 行拖拽 // 行拖拽
rowDrop() { rowDrop() {
// 此时找到的元素是要拖拽元素的父容器 // 此时找到的元素是要拖拽元素的父容器
const tbody = document.querySelector('.draggable .el-table__body-wrapper tbody'); const tbody = document.querySelector(".draggable .el-table__body-wrapper tbody");
const _this = this; const _this = this;
Sortable.create(tbody, { Sortable.create(tbody, {
// 指定父元素下可被拖拽的子元素 // 指定父元素下可被拖拽的子元素
draggable: ".draggable .el-table__row", draggable: ".draggable .el-table__row",
onEnd({ newIndex, oldIndex }) { onEnd({ newIndex, oldIndex }) {
let newItem = _this.projectJudgmentData[newIndex] let newItem = _this.projectJudgmentData[newIndex];
_this.projectJudgmentData[newIndex] = _this.projectJudgmentData[oldIndex] _this.projectJudgmentData[newIndex] = _this.projectJudgmentData[oldIndex];
_this.projectJudgmentData[oldIndex] = newItem _this.projectJudgmentData[oldIndex] = newItem;
// 循环，重新赋值排序赋值 // 循环，重新赋值排序赋值
_this.projectJudgmentData.forEach((e, i) => { _this.projectJudgmentData.forEach((e, i) => {
_this.$set(e,'sort',i+1)// 不更新 _this.$set(e, "sort", i + 1);// 不更新
_this.$set(e,'name',e.name+"?") _this.$set(e, "name", e.name + "?");
_this.$set(e,'name',e.name.slice(0,e.name.length-1)) // 不更新的解决方案 _this.$set(e, "name", e.name.slice(0, e.name.length - 1)); // 不更新的解决方案
}) });
// console.log('处理',_this.projectJudgmentData)
// 调修改接口，更新列表 // 调修改接口，更新列表
if (_this.projectId) {// 如果是编辑项目，则调编辑接口 if (_this.projectId) {// 如果是编辑项目，则调编辑接口
console.log('调接口') _this.updateProjectJudgment();
_this.updateProjectJudgment()
} }
} }
}); });
@ -681,18 +681,18 @@ export default {
let param = this.selectedJudgment.map((e, i) => { let param = this.selectedJudgment.map((e, i) => {
let obj = { let obj = {
judgmentId: e.judgmentId, judgmentId: e.judgmentId,
projectId:this.projectId||'', projectId: this.projectId || "",
score: 0, score: 0,
sort: i + 1 sort: i + 1
} };
return obj return obj;
}) });
console.log(param,'param',this.projectId,) // console.log(param, "param", this.projectId);
this.$post(this.api.addProjectJudgment, param).then(res => { this.$post(this.api.addProjectJudgment, param).then(res => {
// 重新调接口 // 重新调接口
console.log('添加成功',res) // console.log("添加成功", res);
if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新 if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新
this.listAgain() this.listAgain();
} }
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
@ -705,18 +705,17 @@ export default {
let param = this.projectJudgmentData.map((e, i) => { let param = this.projectJudgmentData.map((e, i) => {
let obj = { let obj = {
judgmentId: e.judgmentId, judgmentId: e.judgmentId,
projectId:this.projectId||'', projectId: this.projectId || "",
score: e.score, score: e.score,
sort: i + 1, sort: i + 1,
id: e.id id: e.id
} };
return obj return obj;
}) });
this.$post(this.api.updateProjectJudgment, param).then(res => { this.$post(this.api.updateProjectJudgment, param).then(res => {
// 重新调接口 // 重新调接口
if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新 if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新
this.listAgain() this.listAgain();
} }
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
@ -726,36 +725,23 @@ export default {
deleteProjectJudgment(values) { deleteProjectJudgment(values) {
if (values && values.length > 0) { if (values && values.length > 0) {
this.$post(this.api.deleteProjectJudgment + "?projectJudgmentIds=" + `${values}`).then(res => { this.$post(this.api.deleteProjectJudgment + "?projectJudgmentIds=" + `${values}`).then(res => {
// 重新调接口 // 重新调接口
if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新 if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新
this.listAgain() this.listAgain();
} }
}).catch(err => { }).catch(err => {});
});
} }
}, },
// 重新调接口,专门赋值列表 // 重新调接口,专门赋值列表
listAgain() { listAgain() {
this.listLoading = true
let scrollTop = this.$refs.main.scrollTop
this.projectJudgmentData = []
this.$refs.main.scrollTop = scrollTop
this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => { this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => {
let { projectManage, projectJudgmentVos } = res; let { projectManage, projectJudgmentVos } = res;
projectJudgmentVos.map((e,i)=>{
this.$set(e,'sort',i+1)// 不更新
this.$set(e,'name',e.name+"?")
this.$set(e,'name',e.name.slice(0,e.name.length-1)) // 不更新的解决方案
});
this.projectJudgmentData = projectJudgmentVos; this.projectJudgmentData = projectJudgmentVos;
this.listLoading = false this.projectJudgmentData.map((e, i) => {
}).catch(()=>{ e.sort = i + 1;
this.listLoading = false });
}) });
}, }
} }
@ -768,8 +754,4 @@ export default {
padding: 0; padding: 0;
border-bottom: 0; border-bottom: 0;
} }
.main{
overflow: auto;
height: calc(100vh - 152px );
}
</style> </style>

20
src/pages/project/list/index.vue
Unescape View File

@ -46,7 +46,7 @@
<el-select size="small" v-model="systemId" placeholder="请选择" @change="initData"> <el-select size="small" v-model="systemId" placeholder="请选择" @change="initData">
<el-option <el-option
v-for="item in systemList" v-for="item in systemList"
:key="item.value" :key="item.id"
:label="item.label" :label="item.label"
:value="item.id" :value="item.id"
></el-option> ></el-option>
@ -129,16 +129,15 @@
</template> </template>
<script> <script>
import Setting from "@/setting";
import { mapState, mapActions } from "vuex"; import { mapState, mapActions } from "vuex";
import util from "@/libs/util";
export default { export default {
data() { data() {
return { return {
showBack: Boolean(this.$route.query.show), showBack: Boolean(this.$route.query.show),
roleIdEd: this.roleId ? 13 : this.roleId,// 管理员的roleId是13，老师的roleId是14，1个用户也可能是两个角色，就是13,14，当一个用户是两个角色的话，就取权重大的一个，就是管理员，即13；管理员>老师 roleIdEd: this.roleId ? 13 : this.roleId,// 管理员的roleId是13，老师的roleId是14，1个用户也可能是两个角色，就是13,14，当一个用户是两个角色的话，就取权重大的一个，就是管理员，即13；管理员>老师
systemId: "", systemId: "",
systemList: Setting.systemList, systemList: [],
queryData: { queryData: {
platformId: 1, // 平台：职站:1 中台:3 platformId: 1, // 平台：职站:1 中台:3
founder: 0, // 创建人角色(0:系统 1:老师) founder: 0, // 创建人角色(0:系统 1:老师)
@ -230,15 +229,20 @@ export default {
} }
}, },
mounted() { mounted() {
// 如果systemId有历史记录，就取历史记录里的systemId，否则就取默认的systemId this.getSystemData();
this.systemId = this.lastSystemId ? this.lastSystemId : Setting.systemId;
// console.log(this.systemId, "外面的sysid");
this.getData();
}, },
methods: { methods: {
...mapActions("project", [ ...mapActions("project", [
"setSystemId" "setSystemId"
]), ]),
getSystemData() {
this.$get(this.api.getSystemIdBySchool).then(res => {
this.systemList = res.data;
// 如果systemId有历史记录，就取历史记录里的systemId，否则就取默认的systemId
this.systemId = this.lastSystemId ? this.lastSystemId : this.systemList[0].id;
this.getData();
});
},
getData() { getData() {
this.setSystemId(this.systemId); this.setSystemId(this.systemId);
let data = { let data = {

58
src/setting.js
Unescape View File

@ -3,11 +3,13 @@
* */ * */
const url = location.host; const url = location.host;
const isDev = process.env.NODE_ENV === "development"; // 开发环境 const isDev = process.env.NODE_ENV === "development"; // 开发环境
const isHh = url.includes("10.196.131.73"); //是否是河海版本 const isHh = url.includes("10.196.131.73"); //是否河海版本
const isCH = url.includes("120.78.127.12"); //是否是巢湖版本 const isCH = url.includes("120.78.127.12"); //是否巢湖版本
const isBeta = isDev || url.includes("120.78.198.231"); //是否是职站测试(本地亦调用测试服接口) const isBeta = url.includes("120.78.198.231"); //是否职站测试
const isPro = location.host.includes("occupationlab.com"); //是否是职站生产 const isPro = url.includes("occupationlab.com"); //是否职站生产
const isTest = url.includes('39.108.250.202'); //是否中台测试服
let jumpPath = "";
let host = ""; let host = "";
let title = ""; let title = "";
let schoolId = null; let schoolId = null;
@ -18,54 +20,33 @@ if (isHh) {
host = "http://10.196.131.73/"; host = "http://10.196.131.73/";
title = "教师管理端"; title = "教师管理端";
schoolId = 729; schoolId = 729;
systemList = [
{ id: 1, label: "Python程序设计教学系统" },
{ id: 4, label: "经济金融建模实验教学系统" },
{ id: 6, label: "金融随机过程实验教学系统" },
{ id: 7, label: "量化投资策略建模实验教学系统" },
{ id: 8, label: "大数据分析实验教学系统" }
];
} else if (isCH) { } else if (isCH) {
// 巢湖 // 巢湖
host = "http://120.78.127.12/"; host = "http://120.78.127.12/";
title = "教师管理端"; title = "教师管理端";
schoolId = 1006; schoolId = 1006;
systemList = [
{ id: 8, label: "大数据分析实验教学系统" }
];
} else if (isBeta) { } else if (isBeta) {
// 职站测试 // 职站测试
host = "http://120.78.198.231/"; host = "http://120.78.198.231/";
title = "职站服务端管理系统"; title = "职站服务端管理系统";
schoolId = 2105; schoolId = 2105;
systemList = [
{ id: 1, label: "Python程序设计教学系统" },
// { id: 2, label: '跨国仿真系统' },
// { id: 3, label: '期权期货系统' },
{ id: 4, label: "经济金融建模实验教学系统" },
{ id: 5, label: "Python可视化实验教学系统" },
{ id: 6, label: "金融随机过程实验教学系统" },
{ id: 7, label: "量化投资策略建模实验教学系统" },
{ id: 8, label: "大数据分析实验教学系统" },
{ id: 9, label: "Python数据清洗教学实验系统" },
{ id: 10, label: "Python数据采集（爬虫）教学实验系统" },
{ id: 11, label: "银行综合系统" }
];
} else if (isPro) { } else if (isPro) {
// 职站生产 // 职站生产
host = "http://www.occupationlab.com/"; host = "http://www.occupationlab.com/";
title = "职站服务端管理系统"; title = "职站服务端管理系统";
schoolId = 2105; schoolId = 2105;
systemList = [ } else if (isTest){
{ id: 1, label: "Python程序设计教学系统" }, jumpPath = "http://39.108.250.202/judgmentPoint/";
{ id: 4, label: "经济金融建模实验教学系统" }, host = "http://39.108.250.202:9000/";
{ id: 5, label: "Python可视化实验教学系统" }, title = "职站服务端管理系统";
{ id: 6, label: "金融随机过程实验教学系统" }, schoolId = 2105;
{ id: 7, label: "量化投资策略建模实验教学系统" }, } else if (isDev) {
{ id: 8, label: "大数据分析实验教学系统" }, jumpPath = "http://192.168.31.154:8087/";
{ id: 9, label: "Python数据清洗教学实验系统" }, // host = "http://39.108.250.202:9000/"; // 中台测试服
{ id: 10, label: "Python数据采集（爬虫）教学实验系统" } // host = "http://192.168.31.151:9000/"; // 榕
]; host = "http://192.168.31.125:9000/"; // 坤
title = "职站服务端管理系统";
schoolId = 2105;
} else { } else {
console.log("其它版本"); console.log("其它版本");
} }
@ -78,6 +59,7 @@ const Setting = {
routerMode: "hash", // 路由模式，可选值为 history 或 hash routerMode: "hash", // 路由模式，可选值为 history 或 hash
showProgressBar: true, // 页面切换时，是否显示模拟的进度条 showProgressBar: true, // 页面切换时，是否显示模拟的进度条
apiBaseURL: host, // 接口请求地址 apiBaseURL: host, // 接口请求地址
jumpPath, // 判分点系统前缀
isHh, // 是否是河海版本 isHh, // 是否是河海版本
isCH, // 是否是巢湖版本 isCH, // 是否是巢湖版本
isBeta, // 是否是职站测试 isBeta, // 是否是职站测试
@ -127,7 +109,7 @@ const Setting = {
dynamicRoute: false, dynamicRoute: false,
// 文件上传 // 文件上传
upload: { upload: {
apiURL: "http://8.134.8.197:8001/", apiURL: "http://39.108.250.202:10000/",
maxSize: 30 maxSize: 30
} }
}; };

Write Preview
Loading…
Cancel
Save