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

修改bug

Browse Source
master
e 3 years ago
parent 8d603c007b
commit 3d16464f13
4 changed files with 49 additions and 25 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. 30
      src/utils/api.js
  2. 22
      src/views/Home.vue
  3. 20
      src/views/Transaction.vue
  4. 2
      src/views/Transaction.vue.copy20210901

30
src/utils/api.js
Unescape View File

@ -13,7 +13,7 @@ if(isKd){
}else if(url.includes('10.196.131.73')){ }else if(url.includes('10.196.131.73')){
host = 'http://10.196.131.73'; // 河海版 host = 'http://10.196.131.73'; // 河海版
}else if (url.includes('124.71.12.62')) { }else if (url.includes('124.71.12.62')) {
host = 'http://124.71.12.62/'; // 巢湖版 host = 'http://124.71.12.62'; // 巢湖版
} else if (url.includes('39.108.250.202')) { } else if (url.includes('39.108.250.202')) {
host = 'http://39.108.250.202:9000'; // 中台测试服 host = 'http://39.108.250.202:9000'; // 中台测试服
} else { } else {
@ -21,7 +21,7 @@ if(isKd){
host = 'http://39.108.250.202:9000'; host = 'http://39.108.250.202:9000';
} }
host = 'http://192.168.31.137:9000' // 坤 // host = 'http://192.168.31.137:9000' // 坤
} }
let host1 = 'http://39.108.250.202:8080'; let host1 = 'http://39.108.250.202:8080';
let uploadURL = 'http://8.134.8.197:8001'; let uploadURL = 'http://8.134.8.197:8001';
@ -60,17 +60,21 @@ export default {
// 职站 // 职站
// QueryPointOfJudgement: `${host}/judgment/pointOfJudgement/queryPointOfJudgement`, //判分点列表查询 QueryPointOfJudgement: `${host}/judgment/pointOfJudgement/queryPointOfJudgement`, //判分点列表查询
// DeletePointOfJudgement: `${host}/judgment/pointOfJudgement/deletePointOfJudgement`, //判分点列表删除 DeletePointOfJudgement: `${host}/judgment/pointOfJudgement/deletePointOfJudgement`, //判分点列表删除
// QueryPfdInformation: `${host}/judgment/pointOfJudgement/queryPfdInformation`, //判分点详细信息 QueryPfdInformation: `${host}/judgment/pointOfJudgement/queryPfdInformation`, //判分点详细信息
// UpdatePointOfJudgement: `${host}/judgment/pointOfJudgement/updatePointOfJudgement`, //编辑判分点基本信息 UpdatePointOfJudgement: `${host}/judgment/pointOfJudgement/updatePointOfJudgement`, //编辑判分点基本信息
// UpdatePointOfJudgementRule: `${host}/judgment/pointOfJudgement/updatePointOfJudgementRule`, //编辑判分点规则 UpdatePointOfJudgementRule: `${host}/judgment/pointOfJudgement/updatePointOfJudgementRule`, //编辑判分点规则
// AddPfdgzInformation: `${host}/judgment/pointOfJudgement/addPfdgzInformation`, //新增判分规则 AddPfdgzInformation: `${host}/judgment/pointOfJudgement/addPfdgzInformation`, //新增判分规则
// AddPfdInformation: `${host}/judgment/pointOfJudgement/addPfdInformation`, //新增判分点基本信息 AddPfdInformation: `${host}/judgment/pointOfJudgement/addPfdInformation`, //新增判分点基本信息
// QueryPfdgzInformation: `${host}/judgment/pointOfJudgement/queryPfdgzInformation`, //判分点规则信息查询 QueryPfdgzInformation: `${host}/judgment/pointOfJudgement/queryPfdgzInformation`, //判分点规则信息查询
// QueryAddgz: `${host}/judgment/pointOfJudgement/queryAddgz`, //查询新增判分点规则新增的数据 QueryAddgz: `${host}/judgment/pointOfJudgement/queryAddgz`, //查询新增判分点规则新增的数据
// DeletePointOfJudgementRule: `${host}/judgment/pointOfJudgement/deletePointOfJudgementRule`, //删除判分点规则 DeletePointOfJudgementRule: `${host}/judgment/pointOfJudgement/deletePointOfJudgementRule`, //删除判分点规则
// JudgmentPointNameRepetition: `${host}/judgment/pointOfJudgement/JudgmentPointNameRepetition`, JudgmentPointNameRepetition: `${host}/judgment/pointOfJudgement/JudgmentPointNameRepetition`,
UpdateIsOpen: `${host}/judgment/pointOfJudgement/updateIsOpen`, //修改判分点状态 UpdateIsOpen: `${host}/judgment/pointOfJudgement/updateIsOpen`, //修改判分点状态
queryUserIds:`${host}/liuwanr/userInfo/queryUserIds`, queryUserIds:`${host}/liuwanr/userInfo/queryUserIds`,

22
src/views/Home.vue
Unescape View File

@ -117,7 +117,6 @@ export default {
console.log('当前地址=', location.host); console.log('当前地址=', location.host);
console.log("token=", this.$route.query.token) console.log("token=", this.$route.query.token)
console.log("systemId=", this.$route.query.systemId) console.log("systemId=", this.$route.query.systemId)
this.$route.query.token && this.$store.commit('setParam', { this.$route.query.token && this.$store.commit('setParam', {
token: atob(decodeURI(this.$route.query.token)), token: atob(decodeURI(this.$route.query.token)),
referrer: atob(decodeURI(this.$route.query.referrer)) referrer: atob(decodeURI(this.$route.query.referrer))
@ -145,7 +144,11 @@ export default {
this.getProcessClassData(params); this.getProcessClassData(params);
} else { } else {
// 编程类 // 编程类
this.getProgrammingClassData(params); if (location.host == 'http://124.71.12.62' || location.host == 'http://occupationlab.com'){
this.getCHProgrammingClassData(params);
}else{
this.getProgrammingClassData(params);
}
} }
}, },
getProcessClassData(params) { // 获取流程类判分点列表数据 getProcessClassData(params) { // 获取流程类判分点列表数据
@ -215,9 +218,22 @@ export default {
this.tableData = res.message.records; this.tableData = res.message.records;
this.dataTotal = res.message.total; this.dataTotal = res.message.total;
}).catch(err => { }).catch(err => {
console.log(err);
}); });
}, },
getCHProgrammingClassData(){
let systemId = this.$route.query.systemId
let userId = this.$route.query.userId
let pageNum = this.$route.query.pageNum
let pageSize = this.$route.query.pageSize
let queryName = this.$route.query.queryName
let userIdList = this.$route.query.userIdList
this.$post(`${this.api.QueryPointOfJudgement}?systemId=${systemId}&userId=${userId}&pageNum=${pageNum}&pageSize=${pageSize}&queryName=${queryName}&userIdList=${userIdList}`).then(res => {
this.tableData = res.message.records;
this.dataTotal = res.message.total;
}).catch(err => {
console.log(err);
});
},
HomepageJump() { //新增 HomepageJump() { //新增
if (this.systemId == 11) { if (this.systemId == 11) {
// 交易类 // 交易类

20
src/views/Transaction.vue
Unescape View File

@ -106,7 +106,7 @@
</el-table-column> </el-table-column>
<el-table-column label="交易结果正确答案"> <el-table-column label="交易结果正确答案">
<template slot-scope="scope" v-if="scope.row.isSubject"> <template slot-scope="scope" v-if="scope.row.isSubject">
<p class="p">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p> <p class="p" style="margin-top: 1px">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p>
<div class="block"> <div class="block">
<!-- type: 题目类型(1选择 2判断 3填空 4问答 5指标结果) --> <!-- type: 题目类型(1选择 2判断 3填空 4问答 5指标结果) -->
<div v-if="scope.row.type == ''" style="line-height: 65px">需点击</div> <div v-if="scope.row.type == ''" style="line-height: 65px">需点击</div>
@ -360,6 +360,7 @@ export default {
tableDataCopy: [], // 规则表格数据备份 tableDataCopy: [], // 规则表格数据备份
isAddRule: false, // 是否禁用新增规则按钮 isAddRule: false, // 是否禁用新增规则按钮
itemkey:'', itemkey:'',
judgePoints:false,//判断是否点了编辑
}; };
}, },
mounted() { mounted() {
@ -653,6 +654,7 @@ export default {
this.tableData[index - 1].ruleOperation = row.ruleOperation; this.tableData[index - 1].ruleOperation = row.ruleOperation;
}, },
handleEdit(row) { // 处理编辑规则 handleEdit(row) { // 处理编辑规则
this.judgePoints = true
this.tableDataCopy = deepCopy(this.tableData); // 深拷贝 this.tableDataCopy = deepCopy(this.tableData); // 深拷贝
row.isDisabled = false; row.isDisabled = false;
row.isSave = false; row.isSave = false;
@ -702,7 +704,8 @@ export default {
this.isAddRule = false; this.isAddRule = false;
}, },
handleCancel(row, index) { // 处理取消编辑规则 handleCancel(row, index) { // 处理取消编辑规则
if (row.isSave) { if (this.judgePoints == true) {
this.judgePoints = false
this.$set(this.tableData, index, this.tableDataCopy[index]); this.$set(this.tableData, index, this.tableDataCopy[index]);
if (!this.tableData[index].operationIds) { if (!this.tableData[index].operationIds) {
this.$refs[`tree-${index}`].setCheckedKeys([]); this.$refs[`tree-${index}`].setCheckedKeys([]);
@ -711,7 +714,7 @@ export default {
} }
} else { } else {
this.tableData.splice(index, 1); this.tableData.splice(index, 1);
index ? this.tableData.splice(index - 1, 1) : this.tableData.splice(0, 1); // index ? this.tableData.splice(index - 1, 1) : this.tableData.splice(0, 1);
this.isAddRule = false; this.isAddRule = false;
} }
}, },
@ -722,10 +725,11 @@ export default {
type: "warning", type: "warning",
center: true center: true
}).then(() => { }).then(() => {
if(index+1 == this.tableData.length){ // if(index+1 == this.tableData.length){
index = index-1 // index = index-1
} // }
this.tableData.splice(index,2); this.tableData.splice(index,1);
index ? this.tableData.splice(index - 1, 1) : this.tableData.splice(0, 1);
this.itemkey = Math.random() this.itemkey = Math.random()
this.tableData.forEach(async (item, index) => { this.tableData.forEach(async (item, index) => {
// 勾选树节点 // 勾选树节点
@ -894,7 +898,7 @@ export default {
} }
.block { .block {
@include block; @include block;
min-height: 100px; min-height: 220px;
background-color: #fff; background-color: #fff;
overflow: auto; overflow: auto;

2
src/views/Transaction.vue.copy20210901
Unescape View File

@ -91,7 +91,7 @@
</el-table-column> </el-table-column>
<el-table-column label="交易结果正确答案"> <el-table-column label="交易结果正确答案">
<template slot-scope="scope"> <template slot-scope="scope">
<p class="p">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p> <p class="p" style="margin-top:1px">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p>
<div class="box"> <div class="box">
<div class="flex box_p"> <div class="flex box_p">
<p>指标类别</p> <p>指标类别</p>

Write Preview
Loading…
Cancel
Save