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

feige

2024-08-24 b3e00f677518d8c0a5ad7d74c427af4abba810b6

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

 ruoyi-ui/src/views/login.vue

@@ -2,22 +2,13 @@
  <div class="login Group_132">
    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" style="margin-left: 0px;margin-right: 180px;">
      <h3 class="title" style="margin-top: 80px;margin-right: 108px;margin-bottom: 0;margin-left: 109px;">本都都家网</h3>
      <div class="second-box" style=" margin-top: 25px;
    margin-left: 140px;
    margin-right: 141px;
">
      <div class="second-box" style=" margin-top: 25px; margin-left: 140px; margin-right: 141px;">
        <div class="little-title" style=" margin-top: 20px;">
          <h5 >登录可查看更多信息</h5>
          <h5 >未注册的账号登录成功后会自动注册</h5></div></div>
          <h5>登录可查看更多信息</h5>
          <h5>未注册的账号登录成功后会自动注册</h5></div></div>
      <div class="yonghuming" style="margin-left: 99px;margin-right: 425px;">用户名</div>

      <el-form-item prop="username" style="
    width: 380px;
    height: 48px;
    margin-left: 96px;
    margin-right: 96px;
">

      <el-form-item prop="username" style="width: 380px; height: 48px; margin-left: 96px; margin-right: 96px; ">
        <el-input
          v-model="loginForm.username"
          type="text"
@@ -117,7 +108,7 @@
          <span v-if="!loading" style="width: 97px;height: 62px;">登录</span>
          <span v-else>登 录 中...</span>
        </el-button>
        <a href="https://47.93.189.255:8080/profile/upload/2023/10/10/Bendudu20231010_20231010203358A033.apk">点击此处下载应用程序</a>
        <a href="https://www.bendudu.com:8080/profile/upload/2023/10/10/Bendudu20231010_20231010203358A033.apk">点击此处下载应用程序</a>
        <div style="float: right;
        height:94px;" v-if="register">
          <router-link class="link-type" :to="'/register'">立即注册</router-link>

 ruoyi-ui/src/views/marry/index.vue

@@ -278,7 +278,7 @@
            <div class="title-wrapper">
              <div>
                <el-button class="button" size="mini" type="text"  @click="handleAdd">
                  <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
                  <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
              </div>



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

@@ -38,7 +38,7 @@
            v-hasPermi="['family:note:export']"
          >打印</el-button>
      </div> -->
      <div   style="display: flex; align-items: center;">
      <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>
          <span class="text" style="width: 69px;height: 26px;font-size: 16px;
@@ -233,7 +233,7 @@
      <el-table-column label="地点" prop="address" sortable :show-overflow-tooltip="true" width="160" align="center" >
        <template slot-scope="scope">{{scope.row.address? scope.row.address: '————'}}</template>
      </el-table-column>
      <el-table-column label="事件标题" prop="title" sortable :show-overflow-tooltip="true" width="160" align="center">
      <el-table-column label="事件标题" prop="title" sortable :show-overflow-tooltip="true" align="center">
        <template slot-scope="scope">{{scope.row.title? scope.row.title: '————'}}</template>
      </el-table-column>
      <el-table-column label="备注" prop="remark" sortable :show-overflow-tooltip="true" width="150" align="center">
@@ -339,11 +339,11 @@
          accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
          list-type="picture-card"
          multiple
          :http-request="requestUpload"
          :http-request="requestUpload1m"
          :file-list="fileList"
          :on-change="handleChange"
          :auto-upload="false"
              ref="upload"
          :on-change="handleChange"
          :auto-upload="false"
          ref="upload"
        >
          <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{ file }">
@@ -377,6 +377,7 @@

          </div>
        </el-upload>
        <br>
        <el-button
                 style="margin-left: 10px"
                 size="small"
@@ -439,7 +440,7 @@
          </div>

        </el-upload>

        <br>
        <el-button
                  style="margin-left: 10px"
                  size="small"
@@ -499,7 +500,7 @@
            <div class="left-content">主要学习及工作经历</div>
            <div>
            <el-button class="button" size="mini" type="text"  @click="showDialog('open')" >
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
              <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
            </div>
          </div>
        </template>
@@ -553,7 +554,7 @@
            <div class="left-content">家庭成员及主要社会关系情况</div>
            <div>
            <el-button class="button" size="mini" type="text"  @click="showDialog('relation1')">
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
              <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
            </div>
          </div>
        </template>
@@ -607,7 +608,7 @@
          <div class="title-wrapper">
            <div class="left-content">持有证件情况</div>
            <el-button class="button" size="mini" type="text"  @click="showDialog('certificate')">
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
              <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
          </div>
        </template>
        <el-table v-loading="loading" border :data="certificateList" @selection-change="handleSelectionChange"
@@ -672,7 +673,7 @@
          <div class="title-wrapper">
            <div class="left-content">出国（境）情况</div>
            <el-button class="button" size="mini" type="text"  @click="showDialog('abroad')">
              <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
              <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
          </div>
        </template>
        <el-table v-loading="loading" border :data="AbroadList" @selection-change="handleSelectionChange"
@@ -726,12 +727,12 @@
            <div class="left-content">自传</div>
            <div>
              <el-button size='mini' type="text" class="button" @click="showDialog('autobiography')" >
                <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
                <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
              </el-button>
            </div>
          </div>
        </template>
        <el-contain>
        <el-container>
          <div>
            <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
                     v-loading="loading" :data="AutobiographyList" >
@@ -739,16 +740,16 @@
                           :key='item.id' :label="item.ageBegin+'~'+item.ageEnd+'岁'+'('+item.term+')'">
                <div>{{ item.content }}</div>
                <el-button size='mini' type="text" class="btn_edit" @click="editAutobiography(item)" style='position: absolute;right:40px;top:5px;'>
                  <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
                  <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='position: absolute;right:10px;top:5px;'>
                  <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
                  <span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>
                </el-button>

              </el-tab-pane>
            </el-tabs></div>
        </el-contain>
        </el-container>
      </el-collapse-item>

    </el-collapse>
@@ -940,7 +941,7 @@
    <!-- 分享对话框1 -->
    <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">

    <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
    <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column type="selection" width="55"  align="center" />
          <el-table-column fixed label="序号" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
          <el-table-column label="身份" prop="identity" sortable width="130" >
@@ -975,7 +976,7 @@
      </el-select>
            </div>

      <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
            <el-table-column label="时间" prop="happenTime" sortable :show-overflow-tooltip="true" width="150" align="center" >
              <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
            </el-table-column>
@@ -1146,6 +1147,7 @@
      showSearch: true,
      // 总条数
      total: 0,
      total1: 0,
      totalm: 0,
      //头像上传
      showBtnDealImg:true,
@@ -1621,11 +1623,7 @@
      // this.single1 = selection.length!=1
      // this.multiple1 = !selection.length
    },
    getRowId1(row)
    {
      return row.id
    },
    getRowId2(row)
    getRowId(row)
    {
      return row.id
    },
@@ -1834,12 +1832,13 @@
    },

    //隔行变色
    tableRowClassName({ row, rowIndex }) {
    tableRowClassName({row, rowIndex}) {
      if (rowIndex % 2 == 0) {
        return "statistics-warning-row1";
      } else {
        return "statistics-warning-row";
      }
      return '';
    },
    //证件类别
    getSrc(type) {
@@ -2515,15 +2514,13 @@
.el-icon-top {
  background: no-repeat center url("../../assets/icons/top.png");
}

.el-table__row.statistics-warning-row {
  background: #E0EEFE;

}
.el-table__row.statistics-warning-row1 {
  background: #FFEFF2;

}

.el-collapse-item__header {
  background-color:#FEF7FC;
  width: 100%;
@@ -2535,7 +2532,6 @@
  width: calc(100% - 50px);
}
.left-content {

  width: 100%;
}
.btn_autobiography{

 ruoyi-ui/src/views/selfeconomy/index.vue

@@ -139,18 +139,18 @@
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item     :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">分享</el-dropdown-item>
             

                          <el-dropdown-item    icon="el-icon-top" @click.native="whoShare">分享给我的数据</el-dropdown-item>
                      <el-dropdown-item    icon="el-icon-top" @click.native="handleWho">分享给谁了什么数据</el-dropdown-item>
                 <el-dropdown-item    icon="el-icon-top" @click.native="showData">展示下载的分享数据</el-dropdown-item>
               </el-dropdown-menu>
             </template>
           </el-dropdown>
        
                
        



               <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
            

        </el-row>
      </div>