1213

src/views/storagemodule/namedentity/character.scss

@@ -383,4 +383,10 @@ $color:#bdd2f6;
     color:#409EFF;
     background:#e6f1fe;
 	}
+}
+
+.dialogEntity {
+	.el-dialog {
+		width:500px;
+	}
 }
\ No newline at end of file

src/views/storagemodule/namedentity/character.vue

@@ -358,7 +358,7 @@
 					</div>
 					<div slot="footer" class="dialog-footer">
 						<el-button @click="dialogFormVisible1 = false">取 消</el-button>
-						<el-button type="primary" @click="sureSetting" v-if="!isRelationModify">新增关系属性定义1</el-button>
+						<el-button type="primary" @click="sureSetting" v-if="!isRelationModify">新增关系属性定义</el-button>
 						<el-button type="primary" @click="sureSetting" v-else>修改关系属性定义</el-button>
 					</div>
 				</el-dialog>
@@ -425,7 +425,7 @@
 					</div>
 					<div slot="footer" class="dialog-footer">
 						<el-button @click="dialogFormVisible6 = false">取 消</el-button>
-						<el-button type="primary" v-if="!isRelationModify" @click="addEntityRelation">新增关系属性定义2</el-button>
+						<el-button type="primary" v-if="!isRelationModify" @click="addEntityRelation">新增关系属性定义</el-button>
 						<el-button type="primary" v-else @click="modifyRelationDegree">修改关系属性定义</el-button>
 					</div>
 				</el-dialog>
@@ -881,8 +881,11 @@ export default {
 					if (res.data.code === 0) {
 						console.log(res.data.data, '123123123123')
 						_this.characterDetailData = res.data.data;
+						_this.filedJosnArr = JSON.parse(res.data.data.fieldJson) || [];
 						_this.peopleName = res.data.data.keyword;
 						_this.relateResListState = 4;
+						this.dataAttrForm.id = res.data.data.id;
+						this.dataAttrForm.state = 4;
 						this.entityId = res.data.data.id
 					}
 				})
@@ -1216,7 +1219,7 @@ export default {
 								}],
 							};
 						} else {
-							this.$message.error('修改自定义属性失败')
+							this.$message.error('新增自定义属性失败')
 						}
 					})
 				} else {
@@ -1254,6 +1257,7 @@ export default {
 				if (res.data.code === 0 && res.data.data !== null) {
 					this.addEntityDegreeForm.id = res.data.data.id;
 					this.addEntityDegreeForm.relation = res.data.data.relation;
+					this.addEntityDegreeForm.reserve1 = res.data.data.explained
 					if (res.data.data.relation) {
 						let {length : len} = this.addEntityDegreeForm.relation;
 						console.log(this.addEntityDegreeForm.relation, '222222222')
@@ -1272,7 +1276,11 @@ export default {
 			this.dialogFormVisible6 = true
 		},
 		showDelEntityMark() {
-			this.dialogFormVisible3 = true
+			if (this.cities.length != 0) {
+				this.dialogFormVisible3 = true
+			} else {
+				this.$message.warning('暂无实体关联，请先关联实体')
+			}
 		},
 		handleCheckAllChange(val) {
 			var _this = this;
@@ -1470,6 +1478,7 @@ export default {
 		},
 		closeDialogSix() {
 			this.options1.length = 0;
+			this.addEntityDegreeForm.reserve1 = null
 		},
 		closeDialogOne() {
 			this.options1.length = 0;

src/views/storagemodule/namedentity/characterentry.vue

@@ -54,7 +54,7 @@
 				<img src="../../../assets/img/noData_pic.png" alt="">
 			</div>
 		</div>
-		<el-dialog title="新增命名实体（人物）" :visible.sync="dialogFormVisible">
+		<el-dialog title="新增命名实体（人物）" :visible.sync="dialogFormVisible" class="dialogEntity" @close="closeDiaEntity">
 			<el-form :model="form" :rules="rules" ref="formOne">
 				<el-form-item label="命名实体名称：" :label-width="formLabelWidth1" prop="keyword">
 					<el-input v-model="form.keyword" @keyup.enter.native="addNamedEntity"></el-input>
@@ -272,6 +272,11 @@ export default {
 						required: true,
 						trigger: 'blur',
 						message: '请输入关键词'
+					},
+					{
+						required: true,
+						trigger: 'change',
+						message: '请输入关键词'
 					}
 				]
 			}
@@ -338,7 +343,7 @@ export default {
 		addNamedEntity() {
 			this.$refs.formOne.validate((valid) => {
 				if (valid) {
-					this.dialogFormVisible = false; 
+					//this.dialogFormVisible = false; 
 					this.dialogFormVisible1 = true;
 					addNamedEntityAPI(this.form)
 					.then(res => {
@@ -390,6 +395,7 @@ export default {
 						if (res.data.code === 0) {
 							console.log(res, '1111111122')
 							this.$message.success('新增实体已入库');
+							this.dialogFormVisible = false; 
 							this.dialogFormVisible1 = false;
 							this.getNamedEntityListAPI();
 						} else {
@@ -481,6 +487,12 @@ export default {
 		closeDia() {
 			this.$refs['dataForm'].resetFields();
 			this.addNewGloss = false;
+			this.$refs.formOne.resetFields();
+			this.dialogFormVisible = false; 
+		},
+		closeDiaEntity() {
+			this.$refs.formOne.resetFields();
+			// this.$refs.formOne.clearValidate();
 		},
 		clickGlossItem(event) {
 			let el = event.target

src/views/storagemodule/namedentity/localtion.vue

@@ -54,7 +54,7 @@
 			<img src="../../../assets/img/noData_pic.png" alt="">
 			</div>
 		</div>
-		<el-dialog title="新增命名实体（地理位置）" :visible.sync="dialogFormVisible">
+		<el-dialog title="新增命名实体（地理位置）" :visible.sync="dialogFormVisible" class="dialogEntity" @close="closeDiaEntity">
 			<el-form :model="form" :rules="rules" ref="formOne">
 				<el-form-item label="命名实体名称：" :label-width="formLabelWidth1" prop="keyword">
 					<el-input v-model="form.keyword" @keyup.enter.native="addNamedEntity"></el-input>
@@ -212,6 +212,11 @@ export default {
 						required: true,
 						message: '请输入关键词',
 						trigger: 'blur'
+					},
+					{
+						required: true,
+						message: '请输入关键词',
+						trigger: 'change'
 					}
 				]
 			}
@@ -289,7 +294,7 @@ export default {
 		addNamedEntity() {
 			this.$refs.formOne.validate((valid) => {
 				if (valid) {
-					this.dialogFormVisible = false; 
+					//this.dialogFormVisible = false; 
 					this.dialogFormVisible1 = true;
 					addNamedEntityAPI(this.form)
 					.then(res => {
@@ -335,6 +340,7 @@ export default {
 						console.log(res,"KLKLK")
 						if (res.data.code === 0) {
 							this.$message.success('新增实体已入库');
+							this.dialogFormVisible = false; 
 							this.dialogFormVisible1 = false;
 							this.getNamedEntityListAPI();
 						} else {
@@ -426,6 +432,12 @@ export default {
 		closeDia() {
 			this.$refs['dataForm'].resetFields();
 			this.addNewGloss = false;
+			this.$refs.formOne.resetFields();
+			this.dialogFormVisible = false; 
+		},
+		closeDiaEntity() {
+			this.$refs.formOne.resetFields();
+			//this.$refs.formOne.clearValidate();
 		},
 		clickGlossItem(event) {
 			let el = event.target

src/views/storagemodule/namedentity/organ.vue

@@ -51,10 +51,10 @@
 			</div>
 			<pagination v-if="totalNum>0" :total="totalNum" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination>
 			<div class="noDataPic" style="text-align:center;" v-if="totalNum === 0">
-				<img src="../../../assets/img/pic_org.png" alt="">
+				<img src="../../../assets/img/noData_pic.png" alt="">
 			</div>
 		</div>
-		<el-dialog title="新增命名实体（组织机构）" :visible.sync="dialogFormVisible">
+		<el-dialog title="新增命名实体（组织机构）" :visible.sync="dialogFormVisible" class="dialogEntity" @close="closeDiaEntity">
 			<el-form :model="form" :rules="rules" ref="formOne">
 				<el-form-item label="命名实体名称：" :label-width="formLabelWidth1" prop="keyword">
 					<el-input v-model="form.keyword" autocomplete="off" @keyup.enter.native="addNamedEntity"></el-input>
@@ -244,6 +244,11 @@ export default {
 						required: true,
 						message: '请输入关键词',
 						trigger: 'blur'
+					},
+					{
+						required: true,
+						message: '请输入关键词',
+						trigger: 'change'
 					}
 				]
 			}
@@ -310,7 +315,7 @@ export default {
 		addNamedEntity() {
 			this.$refs.formOne.validate((valid) => {
 				if (valid) {
-					this.dialogFormVisible = false; 
+					//this.dialogFormVisible = false; 
 					this.dialogFormVisible1 = true;
 					addNamedEntityAPI(this.form)
 					.then(res => {
@@ -360,6 +365,7 @@ export default {
 						console.log(res,"KLKLK")
 						if (res.data.code === 0) {
 							this.$message.success('新增实体已入库');
+							this.dialogFormVisible = false; 
 							this.dialogFormVisible1 = false;
 							this.getNamedEntityListAPI();
 						} else {
@@ -451,6 +457,12 @@ export default {
 		closeDia() {
 			this.$refs['dataForm'].resetFields();
 			this.addNewGloss = false;
+			this.$refs.formOne.resetFields();
+			this.dialogFormVisible = false; 
+		},
+		closeDiaEntity() {
+			this.$refs.formOne.resetFields();
+			//this.$refs.formOne.clearValidate();
 		},
 		clickGlossItem(event) {
 			let el = event.target

src/views/storagemodule/namedentity/timer.vue

@@ -61,8 +61,9 @@
 					</template>
 				</el-table-column>
 			</el-table>
+			<pagination v-if="totalNum>0" :total="totalNum" @pagesize="pagesizeFun" @currentPage="currentPageFun"></pagination>
 		</div>
-		<el-dialog title="新增命名实体（时间）" :visible.sync="dialogFormVisible">
+		<el-dialog title="新增命名实体（时间）" :visible.sync="dialogFormVisible" class="dialogEntity" @close="closeDiaEntity">
 			<el-form :model="form" :rules="rules" ref="formOne">
 				<el-form-item label="命名实体名称：" :label-width="formLabelWidth1" prop="keyword">
 					<el-input v-model="form.keyword" autocomplete="off" @keyup.enter.native="addNamedEntity"></el-input>
@@ -114,8 +115,10 @@ import {
 	deleteEntityAPI
 } from '@/api/storagemodule'
 import { operationMsg, confirm } from '@/utils/publicFunctions'
+import pagination from '@/components/pagination/pagination'
 export default {
 	name: 'characterentry',
+	components:{pagination},
 	data() {
 		return {
 			loading: false,
@@ -257,6 +260,11 @@ export default {
 						required: true,
 						message: '请输入关键词',
 						trigger: 'blur'
+					},
+					{
+						required: true,
+						message: '请输入关键词',
+						trigger: 'change'
 					}
 				]
 			}
@@ -291,7 +299,7 @@ export default {
 		addNamedEntity() {
 			this.$refs.formOne.validate(valid => {
 				if (valid) {
-					this.dialogFormVisible = false; 
+					//this.dialogFormVisible = false; 
 					this.dialogFormVisible1 = true;
 					addNamedEntityAPI(this.form)
 					.then(res => {
@@ -339,6 +347,7 @@ export default {
 						console.log(res,"KLKLK")
 						if (res.data.code === 0) {
 							this.$message.success('新增实体已入库');
+							this.dialogFormVisible = false;
 							this.dialogFormVisible1 = false;
 							this.getNamedEntityListAPI();
 						} else {
@@ -381,7 +390,7 @@ export default {
 			})
 		},
 		handleSelectionChange(val) {
-			console.log(val,"OPOP")//val是当前一行的对象的集合
+			console.log(val,"OPOP11")//val是当前一行的对象的集合
 			this.multipleSelection = val;
 			this.deleteEntityForm.entityid = [];
 			this.multipleSelection.map((item, index) => {
@@ -401,6 +410,7 @@ export default {
 					if (res.data.code === 0) {
 						this.tableData.splice(index, 1);
 						this.$message.success('删除实体成功');
+						this.deleteEntityForm.entityid = [];
 						this.getNamedEntityListAPI();
 					} else {
 						this.$message.error('删除实体失败')
@@ -429,7 +439,13 @@ export default {
 		},
 		closeDia() {
 			this.$refs['dataForm'].resetFields();
-		}
+			this.$refs.formOne.resetFields();
+			this.dialogFormVisible = false; 
+		},
+		closeDiaEntity() {
+			this.$refs.formOne.resetFields();
+			//this.$refs.formOne.clearValidate();
+		},
 	}
 }
 </script>