From cc73ea5320fed8a39e00bfc0fa02810199559122 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期二, 16 七月 2024 15:55:40 +0800 Subject: [PATCH] 测试完成 --- src/views/repositoryai/intention/index.vue | 84 +++++++++++++++++++++++++++++++---------- 1 files changed, 63 insertions(+), 21 deletions(-) diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue index 54a3438..7c51c7c 100644 --- a/src/views/repositoryai/intention/index.vue +++ b/src/views/repositoryai/intention/index.vue @@ -189,7 +189,7 @@ prop="id" /> <el-table-column - label="鍊肩被鍨�" + label="缁撴灉绫诲瀷" fixed align="center" key="valueType" @@ -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="璇烽�夋嫨璇█" @@ -478,11 +479,26 @@ </el-form-item> </el-col></el-row > + <el-row v-if="!measurement"> + <el-col :span="24"> + <el-form-item label="棰樼洰绫诲瀷"> + <el-radio-group v-model="indexform.scriptType"> + <el-radio :label="1">鍗曢��</el-radio> + <el-radio :label="2">澶氶��</el-radio> + <el-radio :label="3">濉┖</el-radio> + </el-radio-group> + </el-form-item> + </el-col></el-row + > <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" @@ -517,7 +533,7 @@ v-model="indexform.reply" maxlength="50" show-word-limit - > + > </el-input ></el-form-item> </div> @@ -754,7 +770,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 +966,7 @@ guid: 1, id: this.indexform.id, targettype: this.indexform.targettype, + isoperation: 1, targetvalue: "", targetregex: "", targetregex2: "", @@ -955,6 +985,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 { @@ -980,7 +1011,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, @@ -990,6 +1020,7 @@ nodynamiccruxs: item.nodynamiccruxs, dynamiccruxsJson: item.dynamiccruxsJson, nodynamiccruxsJson: item.nodynamiccruxsJson, + targetoptionid: item.targetoptionid, }; }); console.log(this.testuserList); @@ -1091,6 +1122,7 @@ // 鍙栨秷鎸夐挳 cancel() { + this.indexform = null; this.indexopen = false; this.reset(); }, @@ -1098,13 +1130,13 @@ // 琛ㄥ崟閲嶇疆 reset() { this.indexform = { - suitWay: undefined, + suitWayList: undefined, id: undefined, targetdesc: undefined, baseTagList: [], targetoptionList: [], }; - this.resetForm("indexform"); + // this.resetForm("indexform"); }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { @@ -1158,6 +1190,7 @@ this.reset(); console.log(row); this.title = "鎸囨爣璇︽儏"; + this.indexform = {}; this.indexform = row; if (!row.targetoptionList[0]) { row.targetoptionList = [ @@ -1176,6 +1209,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; @@ -1195,17 +1229,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