From a46f2000f85c91b0e118a0af1bc6022a16feadcb Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 04 七月 2024 17:15:57 +0800
Subject: [PATCH] 测试完成
---
src/views/repositoryai/intention/index.vue | 121 ++++++++++++++++++++++++++++------------
1 files changed, 85 insertions(+), 36 deletions(-)
diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue
index 0b3eb02..47cfd46 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
@@ -333,6 +333,7 @@
<el-dialog
:title="title"
:visible.sync="indexopen"
+ :close-on-click-modal="false"
width="900px"
append-to-body
>
@@ -344,7 +345,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 +366,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 +390,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 +482,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"
@@ -535,14 +540,16 @@
<el-col :span="12">
<el-form-item label="娴嬭瘯杈撳叆" prop="nickName">
<el-input
- v-model="testvalue"
+ v-model="indexform.content"
placeholder="璇疯緭鍏ユ祴璇曞唴瀹�"
maxlength="40"
/>
</el-form-item>
</el-col>
<el-col :span="4">
- <el-button type="success">寮�濮嬫祴璇�</el-button>
+ <el-button type="success" @click="testtagerlist"
+ >寮�濮嬫祴璇�</el-button
+ >
</el-col>
</el-row>
</el-form>
@@ -652,6 +659,7 @@
gettargetInfo,
particulartarget,
gettargetInfoedit,
+ testtagerlist,
addtarget,
deletetarget,
getillnesslist,
@@ -706,9 +714,7 @@
}, //绫诲埆琛ㄥ崟
// 琛ㄦ牸鏁版嵁
targetList: null,
- testuserList: [
-
- ],
+ testuserList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -753,7 +759,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: {
@@ -936,6 +955,7 @@
guid: 1,
id: this.indexform.id,
targettype: this.indexform.targettype,
+ isoperation: 1,
targetvalue: "",
targetregex: "",
targetregex2: "",
@@ -954,6 +974,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 {
@@ -979,7 +1000,6 @@
targetvalue: item.targetvalue,
targetregex2: item.targetregex2,
targetregex: item.targetregex,
- targetoptionid: item.targetoptionid,
id: this.indexform.id,
targettype: this.indexform.targettype,
isoperation: item.targetoptionid ? 2 : 1,
@@ -989,6 +1009,7 @@
nodynamiccruxs: item.nodynamiccruxs,
dynamiccruxsJson: item.dynamiccruxsJson,
nodynamiccruxsJson: item.nodynamiccruxsJson,
+ targetoptionid: item.targetoptionid,
};
});
console.log(this.testuserList);
@@ -1090,6 +1111,7 @@
// 鍙栨秷鎸夐挳
cancel() {
+ this.indexform = null;
this.indexopen = false;
this.reset();
},
@@ -1097,13 +1119,13 @@
// 琛ㄥ崟閲嶇疆
reset() {
this.indexform = {
- suitWay: undefined,
+ suitWayList: undefined,
id: undefined,
targetdesc: undefined,
baseTagList: [],
targetoptionList: [],
};
- this.resetForm("indexform");
+ // this.resetForm("indexform");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -1157,22 +1179,26 @@
this.reset();
console.log(row);
this.title = "鎸囨爣璇︽儏";
+ this.indexform = {};
this.indexform = row;
- if(!row.targetoptionList[0]){
- row.targetoptionList=[{
- targettype: "1",
- targetvalue: "",
- targetregex: "",
- targetregex2: "",
- isoperation: 1,
- dynamiccruxs: [],
- nodynamiccruxs: [],
- dynamiccruxsJson: "",
- nodynamiccruxsJson: "",
- },]
+ if (!row.targetoptionList[0]) {
+ row.targetoptionList = [
+ {
+ targettype: "1",
+ targetvalue: "",
+ targetregex: "",
+ targetregex2: "",
+ isoperation: 1,
+ dynamiccruxs: [],
+ nodynamiccruxs: [],
+ dynamiccruxsJson: "",
+ nodynamiccruxsJson: "",
+ },
+ ];
}
this.dynamicTags = row.baseTagList.map(this.processElement);
this.testuserList = row.targetoptionList;
+ console.log(this.testuserList, "bbbb");
this.testvalue = "";
this.indexopen = true;
this.measurement = false;
@@ -1192,17 +1218,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) {
@@ -1224,6 +1258,21 @@
}
});
},
+ // 娴嬭瘯琛ㄥ崟
+ testtagerlist() {
+ if (this.indexform.content) {
+ let data = this.indexform;
+ data.targetoptionList = this.testuserList.concat(this.targetoptionList);
+ testtagerlist(data).then((res) => {
+ this.$modal.msgSuccess("娴嬭瘯鎴愬姛");
+ this.testgovalue = res.msg;
+ this.getList();
+ });
+ } else {
+ this.$modal.msgError("璇峰～鍐欐祴璇曞唴瀹�");
+ return;
+ }
+ },
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const userIds = row.id || this.ids;
--
Gitblit v1.9.3