From 1589350a6553dce742b0f5196111bac22b343140 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 17 六月 2024 17:43:49 +0800
Subject: [PATCH] 测试完成
---
src/views/repositoryai/intention/index.vue | 66 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue
index 649217f..ac4756e 100644
--- a/src/views/repositoryai/intention/index.vue
+++ b/src/views/repositoryai/intention/index.vue
@@ -232,12 +232,12 @@
/><el-table-column
label="閫傜敤鏂瑰紡"
align="center"
- key="suitWay"
- prop="suitWay"
+ key="suitWayList"
+ prop="suitWayList"
width="120"
>
<template slot-scope="scope">
- <dict-tag :options="mode" :value="scope.row.suitWay" />
+ <dict-tag :options="mode" :value="scope.row.suitWayList" />
</template>
</el-table-column>
<el-table-column
@@ -344,7 +344,7 @@
>
<el-row v-if="!measurement">
<el-col :span="12">
- <el-form-item label="鎸囨爣鍚嶇О" prop="deptId">
+ <el-form-item label="鎸囨爣鍚嶇О" prop="targetname">
<el-input
v-model="indexform.targetname"
placeholder="璇疯緭鍏ユ寚鏍囩绫�"
@@ -365,7 +365,7 @@
<!-- deptOptions -->
<el-row v-if="!measurement">
<el-col :span="8">
- <el-form-item label="鎸囨爣鍒嗙被">
+ <el-form-item label="鎸囨爣鍒嗙被" prop="assortid">
<el-select
v-model="indexform.assortid"
size="medium"
@@ -389,7 +389,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="璇█" prop="deptId">
+ <el-form-item label="璇█" prop="language">
<el-select
v-model="indexform.language"
placeholder="璇烽�夋嫨璇█"
@@ -481,8 +481,12 @@
<el-row v-if="!measurement">
<el-col :span="24">
- <el-form-item label="閫傜敤鏂瑰紡" prop="email">
- <el-select v-model="indexform.suitWay" placeholder="璇烽�夋嫨">
+ <el-form-item label="閫傜敤鍦烘櫙" prop="suitWayList">
+ <el-select
+ v-model="indexform.suitWayList"
+ multiple
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="index in mode"
:key="index.value"
@@ -754,7 +758,20 @@
valuetypelb: [],
// 琛ㄥ崟鏍￠獙
- rules: {},
+ rules: {
+ targetname: [
+ { required: true, message: "鎸囨爣鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ assortid: [
+ { required: true, message: "鎸囨爣鍒嗙被涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ language: [
+ { required: true, message: "鎸囨爣璇█涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ isAvailable: [
+ { required: true, message: "鎸囨爣璇█涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ },
};
},
watch: {
@@ -937,6 +954,7 @@
guid: 1,
id: this.indexform.id,
targettype: this.indexform.targettype,
+ isoperation: 1,
targetvalue: "",
targetregex: "",
targetregex2: "",
@@ -955,6 +973,7 @@
if (index !== -1) {
this.testuserList[index].isoperation = 3;
this.targetoptionList.push(this.testuserList[index]);
+ console.log(this.targetoptionList, "aaaa.targetoptionList");
this.testuserList.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
this.sortFn();
} else {
@@ -962,6 +981,7 @@
}
},
syioption(row) {
+
const index = this.getIndexInArray(this.testuserList, row);
const item = this.testuserList.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
this.testuserList.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
@@ -982,13 +1002,14 @@
targetregex: item.targetregex,
id: this.indexform.id,
targettype: this.indexform.targettype,
- isoperation: item.id ? 2 : 1,
+ isoperation: item.targetoptionid ? 2 : 1,
categoryName: item.categoryName,
language: item.language,
dynamiccruxs: item.dynamiccruxs,
nodynamiccruxs: item.nodynamiccruxs,
dynamiccruxsJson: item.dynamiccruxsJson,
nodynamiccruxsJson: item.nodynamiccruxsJson,
+ targetoptionid: item.targetoptionid,
};
});
console.log(this.testuserList);
@@ -1097,7 +1118,7 @@
// 琛ㄥ崟閲嶇疆
reset() {
this.indexform = {
- suitWay: undefined,
+ suitWayList: undefined,
id: undefined,
targetdesc: undefined,
baseTagList: [],
@@ -1175,6 +1196,7 @@
}
this.dynamicTags = row.baseTagList.map(this.processElement);
this.testuserList = row.targetoptionList;
+ console.log(this.testuserList, "bbbb");
this.testvalue = "";
this.indexopen = true;
this.measurement = false;
@@ -1194,17 +1216,25 @@
/** 鏇存柊/淇敼鎻愪氦鎸夐挳 */
submitForm: function () {
- // this.indexform.targetoptionList=[]
- this.indexform.targetoptionList = this.indexform.targetoptionList.map(
- (res) => {
- res.isoperation = 2;
- return res;
- }
- );
+ // this.indexform.targetoptionList = this.indexform.targetoptionList.map(
+ // (res) => {
+ // res.isoperation = 2;
+ // return res;
+ // }
+ // );
+
this.$refs["indexform"].validate((valid) => {
this.indexform.targetoptionList = this.testuserList.concat(
this.targetoptionList
);
+ console.log(this.indexform.targetoptionList, "11");
+ this.indexform.targetoptionList.forEach((item) => {
+ if (item.isoperation != 3 && item.targetoptionid) {
+ console.log(item, "item");
+ // item.isoperation = 2;
+ } else {
+ }
+ });
if (valid) {
if (!this.indexform.version) this.indexform.version = "1.0";
if (this.indexform.id != undefined) {
--
Gitblit v1.9.3