修改了很多

feige

2024-01-23 d0136913a2c74a44f5bb30327ebbb3fd85e24fce

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

@@ -148,47 +148,29 @@
      <div style="padding-left:100px;padding-top:30px">
        <el-col :span="6" :data="individualList">
          <div class="block" :model="individualList">
            <div v-if="!isEditing">
              <el-avatar shape="square" style="width: 200px; height: 150px;">
                <el-image
                  class="el-upload-list__item-thumbnail"
                  v-if="!individualList.img"
                  src="default-avatar-url"
                  :fit="fit"
                  style="width: 100%; height: 100%;"
                ></el-image>
                <el-image
                  v-else
                  :src="'http://47.93.189.255:8080/' + individualList.img"
                  :fit="fit"
                  style="width: 100%; height: 100%;"
                ></el-image>
              </el-avatar>
            </div>
            <el-upload v-else
                       class="upload-demo"
                       action="#"
                       :auto-upload="false"
                       :http-request="requestUpload"
                       :limit="1"
                       :file-list="fileList"
            >
              <el-avatar shape="square" style="width: 200px; height: 150px;">
                <el-image
                  class="el-upload-list__item-thumbnail"
                  v-if="!individualList.img"
                  src="default-avatar-url"
                  :fit="fit"
                  style="width: 100%; height: 100%;"
                ></el-image>
                <el-image
                  v-else
                  :src="'http://47.93.189.255:8080/' + individualList.img"
                  :fit="fit"
                  style="width: 100%; height: 100%;"
                ></el-image>
              </el-avatar>
            </el-upload>




         <el-upload ref="uploadDemo"
                           action=""
                           :file-list="fileList1"
                           list-type="picture-card"
                           accept="image/*"
                           :multiple="false"
                           :http-request="requestUpload"
                           :on-success="handleSucess"
                           :limit="1">

                  <el-avatar shape="square"  style="width: 200px;;height: 200px;" >
                     <el-image
                       :src="'https://www.bendudu.com:8080/'+ individualList.url"
                       :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
                     ></el-image>


                   </el-avatar>
                </el-upload>
            <div class="edit-text" v-if="isEditing" @click="uploadImage">点击更换图片</div>
          </div>
        </el-col>
@@ -205,24 +187,26 @@
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
              <el-row :span="16">
                <el-form-item label="户籍地址" prop="locationAddress" label-width="70px">
                  <el-input v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="16">
                <el-form-item label="常住地址" prop="alwaysAddress" label-width="70px">
                  <el-input v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="16" >
                <el-form-item label="单位" prop="unit" label-width="40px">
                  <el-input v-model="individualList.unit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="16">
                <el-form-item label="户籍地址" prop="locationAddress" label-width="70px">
                  <el-input type="textarea" v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>

              <el-row :span="28">
                <el-form-item label="常住地址" prop="alwaysAddress" label-width="70px">
                  <el-input type="textarea" v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>


            </el-form>
          </el-col>
@@ -232,24 +216,25 @@
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
              <el-row :span="12">
                <el-form-item label="户籍地公安机关" prop="locationPolice" label-width="110px">
                  <el-input v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="12">
                <el-form-item label="常住地公安机关" prop="alwaysPolice" label-width="110px">
                  <el-input v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="12" >
                <el-form-item label="职务职称" prop="position" label-width="70px">
                  <el-input v-model="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="12">
                <el-form-item label="户籍地公安机关" prop="locationPolice" label-width="110px">
                  <el-input type="textarea" v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="12">
                <el-form-item label="常住地公安机关" prop="alwaysPolice" label-width="110px">
                  <el-input type="textarea" v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>

            </el-form>
          </el-col>
        </el-container>
@@ -697,10 +682,10 @@
<!--              </el-select>-->
<!--            </el-form-item>-->
            <el-form-item label="年龄段：" prop="ageBegin ageEnd" label-width="70px">
              <el-input v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
              <el-input type="number" v-model="formDat.ageBegin" placeholder="" clearable :style="{width: '20%'}" >
              </el-input>
              <span> 岁 ——</span>
              <el-input v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
              <el-input type="number" v-model="formDat.ageEnd" placeholder="" clearable :style="{width: '20%'}" >
              </el-input>
              <span> 岁 </span>
          </el-form-item>
@@ -836,7 +821,10 @@
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
     // 数据范围选项
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
     
      fileList:[],
      fileListOther:[],
      dsb:true,
@@ -1116,57 +1104,59 @@
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      //个人经历
      let _this = this;
      listExperience(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.experienceList = response.data;
          _this.experienceList = response.data;
          // this.total = response.data.total;
          this.loading = false;
          _this.loading = false;
        }
      );
      //成员关系
      getIndividualRelation(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.relationList = response.data;
          _this.relationList = response.data;
          // this.total = response.data.total;
          this.loading = false;
          _this.loading = false;
        }
      );
      //个人信息
      getIndividualList(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.individualList = response.data;
          _this.individualList = response.data;

          // this.total = response.data.total;
          this.loading = false;
          _this.loading = false;
        }
      );
      //出入境证件情况
      getCertificateList(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.certificateList = response.data;
          _this.certificateList = response.data;
          // this.total = response.data.total;
          this.loading = false;
          _this.loading = false;
        }
      );
      //出国情况
      getAbroadList(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.AbroadList = response.data;
          _this.AbroadList = response.data;
          // this.total = response.data.total;
          this.loading = false;
          _this.loading = false;
        }
      );
      //查询个人所有自传
      getAutobiographyList(this.queryParams).then(response => {
        //  alert(123)
        //   console.log(response.data)
        this.AutobiographyList = response.data;
        _this.AutobiographyList = response.data;
        // this.total = response.data.total;
        this.loading = false;
        _this.loading = false;

      });
      //根据不同时段的个人自传
@@ -1178,12 +1168,12 @@
      //   this.loading = false;
      // });
      listType(this.queryParams).then(response => {
          this.typeList = response.data;
          _this.typeList = response.data;
          // this.total = response.data.total;
          // console.log( this.typeList )
          // 在回调函数中调用 getTypeOptions()
          this.getTypeOptions();
          this.loading = false;
          _this.getTypeOptions();
          _this.loading = false;
        }
      );
    },
@@ -1343,12 +1333,13 @@
    /** 提交按钮（数据权限） */
    //新增主要经历的保存
    submitDataScope: function() {
      let _this = this
      this.$refs["elForm"].validate(valid => {
        if (valid) {
          addExperience(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.dialogVisible.open = false;
            this.getList();
          addExperience(_this.formDat).then(response => {
            _this.$modal.msgSuccess("新增成功");
            _this.dialogVisible.open = false;
            _this.getList();
          });
        }
      });
@@ -1467,14 +1458,14 @@
        this.individualList.maritalStatus = 1
      else
        this.individualList.maritalStatus = 2
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      this.individualList.url = ul+","+uls

    //   let ul = this.fileList.map(function (elem){
    //     return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
    //   }).join(",")
    //   let uls = this.fileListOther.map(function (elem){
    //     return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
    //   }).join(",")
    // //  this.individualList.url = ul+","+uls
    //  console.log(this.individualList)
      this.$refs['elForm'].validate(valid => {
        if (valid) {
          if (this.individualList.userId !== undefined) {
@@ -1635,7 +1626,12 @@
      formData.append('uploadFile', file);
      let _this = this

     // 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)

        if(_this.fot.includes(pth) === true)
@@ -1645,9 +1641,25 @@
        }

        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
          _this.fileList.push({name:response.data.fileName, url:response.data.url})

        }
        _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,"")
        updateIndividual(_this.individualList).then(response => {
          // 将选中选项的文本设置为"term"字段的值
          // this.formDat.term = selectedOption.value;
          // this.formDat.id = selectedOption.id;
          console.log("1")
          _this.$modal.msgSuccess("修改成功");
          _this.dialogVisible.autobiography = false;
          _this.isEdit1 = false;
          _this.getList();
        }).catch(error => {
          console.log(error);
          _this.isEdit1 = false;
          _this.dialogVisible.autobiography = false;
        });
      })

    },
@@ -1713,7 +1725,7 @@
};
</script>

<style >
<style scoped="">
/*.uoloadSty {*/
/*  width:110px;*/
/*  height:110px;*/