Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2024-11-17 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44

 ruoyi-ui/src/views/self/memo.vue

@@ -149,7 +149,7 @@
                           accept="image/*"
                           :multiple="false"
                           :http-request="requestUpload"
			              

                           :limit="1">

                  <el-avatar shape="square"  style="width: 200px;;height: 200px;" >
@@ -278,11 +278,11 @@
               </el-container>
             </el-form-item>
           </el-form>
	

         </div>
	

       </el-collapse-item> -->
	

         <!--主要学习及工作经历-->
         <el-collapse-item name="1"  >
           <template v-slot:title>
@@ -533,7 +533,7 @@
                   <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='right:40px;top:5px;'>
                     <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
                   </el-button>
	

                   <el-button size="mini" type="text" class="btn_del" @click="handleAutobiography(item)" style='right:10px;top:5px;'>
                     <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
                   </el-button>
@@ -542,12 +542,12 @@
               </el-tabs></div>
           </el-container>
         </el-collapse-item>
	

       </el-collapse>
	
	
	
	




       <pagination
         v-show="total>0"
         :total="total"
@@ -555,7 +555,7 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
	

       <!-- 新增主要经历信息配置对话框 -->
       <el-dialog title="新增主要经历信息" :visible.sync="dialogVisible.open" width="900px" append-to-body>
         <el-form ref="elForm1" :model="formDat" :rules="rules" size="medium" label-width="140px">
@@ -577,10 +577,10 @@
             <el-input v-model="formDat.witness" placeholder="请输入证明人" clearable :style="{width: '100%'}" >
             </el-input>
           </el-form-item>
	

         </el-form>
         <h4 class="form-header"> </h4>
	

         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitDataScope">保 存</el-button>
           <el-button @click="cancelData">取 消</el-button>
@@ -608,10 +608,10 @@
             <el-input v-model="formDat.otherPolitical" placeholder="请输入政治面貌" clearable :style="{width: '100%'}" >
             </el-input>
           </el-form-item>
	

         </el-form>
         <h4 class="form-header"> </h4>
	

         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitDataScope2">保 存</el-button>
           <el-button @click="cancelData">取 消</el-button>
@@ -630,7 +630,7 @@
               ></el-option>
             </el-select>
             <el-input v-model="newOption" placeholder="若未在上述选项中找到对应类型，请在此输入新的证件类型" ></el-input>
	

           </el-form-item>
           <el-form-item label="持有情况" prop="ownStatus">
             <el-input v-model="formDat.ownStatus" placeholder="请输入持有情况" clearable :style="{width: '100%'}" >
@@ -651,7 +651,7 @@
             ></el-date-picker></el-form-item>
            </el-form>
         <h4 class="form-header"> </h4>
	

         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitDataScope4">保 存</el-button>
           <el-button @click="cancelData">取 消</el-button>
@@ -677,10 +677,10 @@
             <el-input v-model="formDat.cause" placeholder="请输入事由(旅游、走访、探亲、继承财产、其他)" clearable :style="{width: '100%'}" >
             </el-input>
           </el-form-item>
	

         </el-form>
         <h4 class="form-header"> </h4>
	

         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitDataScope5">保 存</el-button>
           <el-button @click="cancelData">取 消</el-button>
@@ -721,13 +721,13 @@
           </el-form>
         </el-col>
         <h4 class="form-header"> </h4>
	

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

   </div>
</template>

@@ -743,7 +743,7 @@
} from "@/api/self/index";
import {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index";
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic,uploadPics} from "@/api/memo/index";

import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
@@ -797,7 +797,7 @@
        abroad:false,
        autobiography:false
      },
	  

     // 个人经历数据
     experienceList: undefined,
     // isEdit:true,
@@ -809,7 +809,7 @@
     typeList:[],
     //出国情况
     AbroadList:[],
	  

      uploading: false,
      uploading1: false,
      fit1: ['fill'],
@@ -911,8 +911,8 @@
        }],

      },
	  
	  


     open:false,
     formDat6: {},
      formDat: {
@@ -1014,7 +1014,7 @@
    this.loading1 = true;
            let userId = this.$store.state.user.userId
          //  alert(userId)
    		  

            showShareUser(userId, 2062).then(response=>{
               console.log("===========ddddddddddddd")
               console.log(response.data)
@@ -1213,17 +1213,19 @@
   requestUpload(params)
    {
      var file = params.file;
      console.log(file)
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this

console.log(formData)
      console.log('dddddddd===========')
     // console.log(this.individualList)
      this.$refs.uploadDemo.clearFiles();
    //  alert(234)
      uploadPic(formData).then(response => {
      //  alert(response.data.url)
      //  alert(response.data.originalFilename)
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
      uploadPics(formData).then(response => {
     //  alert(response.data.url)
      // //  alert(response.data.originalFilename)
         let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

        if(_this.fot.includes(pth) === true)
        {
@@ -1237,6 +1239,7 @@
        }
        _this.individualList.img = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        _this.individualList.url = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        console.log(_this.individualList)
        updateIndividual(_this.individualList).then(response => {
          // 将选中选项的文本设置为"term"字段的值
          // this.formDat.term = selectedOption.value;
@@ -1380,7 +1383,7 @@

          if (this.isEdit1) {
            // 执行修改操作
			

         console.log(this.formDat6)
            updateAutobiography(this.formDat6).then(response => {
              // 将选中选项的文本设置为"term"字段的值
@@ -1395,7 +1398,7 @@
           Object.keys(this.formDat6).forEach(key => {
             this.formDat6[key] = '';
           });
			

            }).catch(error => {
         //   alert(24)
              console.log(error);
@@ -1422,7 +1425,7 @@
          }
        }
      });
   

    },

    editRow(row) {
@@ -1578,7 +1581,7 @@
       response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
         const label = elem.split(":")[0].trim();
         const value = parseInt(elem.split(":")[1].trim());
	

         // 判断 typeOptions 数组中是否已存在相同的 value
         if (!_this.typeOptions.some(option => option.value === value)) {
           _this.typeOptions.push({ "label": label, "value": value });
@@ -1587,9 +1590,9 @@
         // _this.getSrc1(value)
       });
     });
	

   },
	

   // 取消按钮
   cancelData() {
   //   alert(23)
@@ -1609,13 +1612,13 @@
     Object.keys(this.formDat6).forEach(key => {
       this.formDat6[key] = '';
     });
	  

   },
   handleUploadSuccess(response, file) {
     // 处理文件上传成功后的回调
     this.individualList.img = response.url;
   },
	

   //下拉
   handleChange5(activeNames) {
     // console.log(activeNames);
@@ -1629,7 +1632,7 @@
       //  alert(123)
     // }
   },
	

   //个人自传
   handleClick(tab, event) {
     // console.log(tab, event);
@@ -1642,7 +1645,7 @@
   //   alert(1234)
     this.isEdit1 = true; // 设置为编辑操作
     // 将要修改的数据填充到formDat对象中
	  

     this.formDat6.ageBegin = data.ageBegin;
     this.formDat6.ageEnd = data.ageEnd;
     this.formDat6.term = data.term;
@@ -1680,7 +1683,7 @@
       }
       return options;
     }, []);
	

   },
   //隔行变色
   tableRowClassName({row, rowIndex}) {