浏览代码

提交修改bug 1384

xiezhiming 3 年之前
父节点
当前提交
58bcdef992

+ 6 - 1
src/components/knowledgeExtra/AddNewRule.vue

@@ -321,7 +321,12 @@ export default {
       // 编辑初始化选择框
 
       this.initEdidData();
-    }
+    }else{
+		// 做判断,防止刷新没有数据时返回列表页
+		this.$router.push({
+		  name: 'ZskRuleManager',
+		});
+	}
   },
   methods: {
     clearValidate(data) {

+ 9 - 1
src/components/knowledgeExtra/AddNewRuleTable.vue

@@ -187,7 +187,7 @@
             
             <div class="btn_div" v-if="klRuleByIdSub.length > 1 && !scope.row.disabled">
               <img
-                @click="$emit('delGroupChild', scope.row.groupChildId,scope.$index,scope.row.groupId,scope.row.del,scope.row.key,scope.row.baseTermTypeList.length)"
+                @click="deletes(scope.row,scope.$index)"
                 src="../../images/add-new-rule-del.png"
                 alt
               />
@@ -566,6 +566,14 @@ export default {
     };
   },
   methods: {
+	// 点击基础规则图标删除
+	deletes(row,index){
+		console.log('1111',row)
+		if(!row.baseTermTypeList){
+			row.baseTermTypeList=[]
+		}
+		this.$emit('delGroupChild', row.groupChildId,index,row.groupId,row.del,row.key,row.baseTermTypeList.length)
+	},
     setScrollRight() {
       this.$nextTick(() => {
         this.$refs.table.bodyWrapper.scrollLeft = this.$refs.table.bodyWrapper.scrollWidth;

+ 2 - 5
src/components/knowledgeExtra/DiagCheckRule.vue

@@ -27,11 +27,7 @@
 					<span class="base_box">{{baseLibName}}</span>
 				</el-col>
 			</el-row>
-			
-			
-			
-			
-			
+			<!-- 原选项做法 -->
 			<!-- <el-form :inline="true" style="margin-top: 10px;height: 45px;">
 				<el-form-item label="基础规则术语类型:">
 					<el-select v-model="filter.baseLibType" clearable placeholder="请选择" size="mini">
@@ -98,6 +94,7 @@
 			this.filter.baseLibName=this.baseLibName;
 			this.filter.baseLibType=this.baseLibType;
 		},
+		// 监听
 		watch:{
 			baseLibName: {
 			    handler(newName, oldName) {