master
e 3 years ago
parent 45d4954ae2
commit 8d603c007b
  1. 6
      src/utils/api.js
  2. 9
      src/views/Home.vue
  3. 13
      src/views/Transaction.vue

@ -12,8 +12,8 @@ if(isKd){
host = 'http://www.occupationlab.com'; // 职站正式服 host = 'http://www.occupationlab.com'; // 职站正式服
}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('120.78.127.12')) { }else if (url.includes('124.71.12.62')) {
host = 'http://120.78.127.12'; // 巢湖版 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.125: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';

@ -13,12 +13,12 @@
<p style="float: left">判分点列表</p> <p style="float: left">判分点列表</p>
</div> </div>
<div class="flex footer_h"> <div class="flex footer_h">
<div style="width: 200px;float: left"> <div style="width: 300px;float: left">
<el-input placeholder="请输入判分点名称" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input> <el-input placeholder="请输入判分点名称" style="height: 33px;width:100%" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
</div> </div>
<div style="float: right"> <div style="float: right">
<el-button class="button" style="height: 33px;" @click="HomepageJump()">新增</el-button> <el-button class="button" style="height: 33px;line-height: 0px" @click="HomepageJump()">新增</el-button>
<el-button class="button" style="height: 33px;" @click="deletes()">批量删除</el-button> <el-button class="button" style="height: 33px;line-height: 0px" @click="deletes()">批量删除</el-button>
</div> </div>
</div> </div>
<div> <div>
@ -446,7 +446,6 @@ export default {
border-radius: 20px; border-radius: 20px;
float: right; float: right;
} }
.button:focus { .button:focus {
outline: 0; outline: 0;
} }

@ -155,7 +155,7 @@
v-for="(item, index) in scope.row.items" v-for="(item, index) in scope.row.items"
:key="index" :key="index"
:label="item.options" :label="item.options"
:value="item.itemId" :value="item.subjectId"
></el-option> ></el-option>
</el-select> </el-select>
</div> </div>
@ -388,6 +388,7 @@ export default {
// //
let length = judgmentRuleList.length; let length = judgmentRuleList.length;
let tempArr = []; let tempArr = [];
console.log(judgmentRuleList)
judgmentRuleList.forEach((item, index) => { judgmentRuleList.forEach((item, index) => {
let obj = { let obj = {
...item, ...item,
@ -398,7 +399,7 @@ export default {
//(1 2 3 4 5) //(1 2 3 4 5)
if (item.type == 1 || item.type == 2) { if (item.type == 1 || item.type == 2) {
obj.subjectId = Number(item.emptyOne); obj.subjectId = Number(item.emptyOne);
obj.value1 = Number(item.emptyTwo); obj.value1 = item.itemId;
} else if (item.type == 3) { } else if (item.type == 3) {
obj.subjectId = Number(item.emptyOne); obj.subjectId = Number(item.emptyOne);
obj.value1 = item.emptyTwo; obj.value1 = item.emptyTwo;
@ -567,8 +568,9 @@ export default {
let obj = { let obj = {
emptyOne: "", emptyOne: "",
emptyTwo: "", emptyTwo: "",
id: i.id ? i.id : "", id: "",
lcId: i.lcId, lcId: i.lcId,
itemId:'',
type: i.type ? i.type : "", type: i.type ? i.type : "",
operationIds: i.operationIds, operationIds: i.operationIds,
resultOperation: i.resultOperation, resultOperation: i.resultOperation,
@ -577,7 +579,7 @@ export default {
//(1 2 3 4 5) //(1 2 3 4 5)
if (i.type == 1 || i.type == 2) { if (i.type == 1 || i.type == 2) {
obj.emptyOne = i.subjectId ? i.subjectId.toString() : ""; obj.emptyOne = i.subjectId ? i.subjectId.toString() : "";
obj.emptyTwo = i.value1 ? i.value1.toString() : ""; obj.itemId = i.value1 ? i.value1.toString() : "";
} else if (i.type == 3) { } else if (i.type == 3) {
obj.emptyOne = i.subjectId ? i.subjectId.toString() : ""; obj.emptyOne = i.subjectId ? i.subjectId.toString() : "";
obj.emptyTwo = i.value1; obj.emptyTwo = i.value1;
@ -596,7 +598,7 @@ export default {
tempArr.push(obj); tempArr.push(obj);
} }
}); });
console.log(tempArr)
this.formData.lcJudgmentRuleList = tempArr; this.formData.lcJudgmentRuleList = tempArr;
if (this.isAdd) { // if (this.isAdd) { //
this.$post(this.api.addJudgmentPoint, this.formData).then(res => { this.$post(this.api.addJudgmentPoint, this.formData).then(res => {
@ -610,6 +612,7 @@ export default {
console.log(err); console.log(err);
}); });
} else if (this.isEdit) { // } else if (this.isEdit) { //
console.log(this.formData)
this.$post(this.api.updateJudgmentPoint, this.formData).then(res => { this.$post(this.api.updateJudgmentPoint, this.formData).then(res => {
if (res.status === 200) { if (res.status === 200) {
this.$message.success("更新判分点成功"); this.$message.success("更新判分点成功");

Loading…
Cancel
Save