zhangshi_app_web.git

			@@ -8,7 +8,8 @@
			</el-backtop>
			<h1 style="font-size:21px;padding-top:30px;display: flex;">
			<span>个人记事本</span>
			<div class="button-container" >
			<div class="button-container" ></div>
			<!-- <div class="button-container" >
			<el-button
			size="mini"
			style="background: #E0EEFE;
			@@ -36,7 +37,7 @@
			v-print="'#printable-content'"
			v-hasPermi="['family:note:export']"
			>打印</el-button>
			</div>
			</div> -->
			<div style="display: flex; align-items: center;">
			<el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px">
			<div class="form" ><el-icon style="padding-right:100px;"></el-icon>
			@@ -291,6 +292,9 @@
			multiple
			:http-request="requestUploadm"
			:file-list="fileList"
			:on-change="handleChange1"
			:auto-upload="false"
			ref="upload"
			>
			<i slot="default" class="el-icon-plus"></i>
			<div slot="file" slot-scope="{ file }">
			@@ -348,7 +352,7 @@

			<div slot="footer" class="dialog-footer">
			<el-button type="primary" @click="submitDataScopem">保存</el-button>
			<el-button @click="cancelData">取消</el-button>
			<el-button @click="cancelDataPer">取消</el-button>
			</div>
			</el-dialog>

			@@ -869,6 +873,8 @@

			data() {
			return {
			uploadFileList: [],
			uploadFileList1: [],
			// 遮罩层
			disabled: false,

			@@ -940,7 +946,7 @@
			// 弹出层标题
			title: "",

			// open:true,
			open:false,
			// 是否显示弹出层（数据权限）
			openDataScope: false,
			menuExpand: false,
			@@ -954,6 +960,7 @@
			fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
			'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],

			fileList1:[],
			fileList:[],
			fileListOther:[],
			dsb:true,
			@@ -1158,8 +1165,45 @@

			},
			methods: {
			handleRemoveFile(file) {
			for(let i = 0; i < this.fileListOther.length; i++)
			{
			if(this.fileListOther[i].url==file.url)
			{
			this.$delete(this.fileListOther,i);
			this.$delete(this.uploadFileList1,i);
			}
			}
			},
			handleRemove(file) {
			for(let i = 0; i < this.fileList.length; i++)
			{
			if(this.fileList[i].url==file.url)
			{
			this.$delete(this.fileList,i);
			this.$delete(this.uploadFileList,i);
			}
			}
			},
			handleChange1(file, fileList1) {
			//定义一个全局数组uploadFileList来做存储

			// this.uploadFileList.push(file.raw);
			console.log("=========5555=========")
			console.log(file)
			// console.log(this.uploadFileList)
			// this.fileList = fileList
			//alert(file)
			this.uploadFileList.push(file.raw);
			this.fileList.push({name:file.name,url:file.url})
			//alert(fileList1.length)
			},



			// 取消按钮
			cancelData() {
			// alert(23)
			this.dialogVisible.open = false;
			this.dialogVisible.relation1 = false;
			this.dialogVisible.certificate =false;
			@@ -1167,6 +1211,7 @@
			this.dialogVisible.autobiography=false;
			this.isEdit1 = false;
			this.reset();
			// alert(32)
			// 清空formDat对象的数据
			Object.keys(this.formDat).forEach(key => {
			this.formDat[key] = '';
			@@ -1512,6 +1557,7 @@

			addNote(this.formDat).then(response => {
			this.$modal.msgSuccess("新增成功");
			this.getList();
			this.open = false;
			// 清空formDat对象的数据
			Object.keys(this.formDat).forEach(key => {
			@@ -1580,7 +1626,13 @@
			saveAs(blob, filename)
			})
			},
			cancelDataPer()
			{
			this.open = false;

			// alert(123)
			// alert(this.open)
			},

			/** 查询自传信息 */
			getAutobiographyInfor()
			@@ -1615,7 +1667,7 @@
			_this.dialogVisible.open = false;
			addExperience(_this.formDat).then(response => {
			_this.$modal.msgSuccess("新增成功");


			_this.getList();
			});
			}
			@@ -1632,7 +1684,7 @@
			this.dialogVisible.relation1 = false;
			addRelation(this.formDat).then(response => {
			this.$modal.msgSuccess("新增成功");


			this.getList();
			});
			}
			@@ -1725,7 +1777,7 @@
			},
			//修改后的保存



			//主要经历
			saveRowExperienceList(row) {
			// this.$refs['elForm'].validate(valid => {