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

feige

2024-08-29 61cfd79f90f7463ba1f9149d8d988bb081f6a3a1

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

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

@@ -143,20 +143,20 @@
      <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>
	   

</el-col>


     
         	  



        <right-toolbar :parentValue.sync="valueFromParent" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
@@ -1223,6 +1223,7 @@
      /** 导入操作*/
      handleEnport(params){
        var file = params.file;
        console.log(params)
        var formData = new FormData();
        formData.append('excelImport', file);
        let _this = this
@@ -1230,10 +1231,10 @@
          _this.getList();
          Message({ message: "导入成功", type: 'warning' })

        }).catch(err)
        {
        }).catch(() => {
        
          Message({ message: "导入失败", type: 'error' })
        }
        })

      }


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

@@ -191,18 +191,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>
    <el-table v-loading="loading" border :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
@@ -1352,7 +1352,10 @@
        _this.getList();
        Message({ message: "导入成功", type: 'warning' })

      }).catch(() => { Message({ message: "导入失败", type: 'error' })});
      }).catch(() => {

        Message({ message: "导入失败", type: 'error' })
        })

    }
  }

 ruoyi-ui/src/views/secret/secretInfo.vue

@@ -24,7 +24,7 @@
        </el-form-item>
            <el-form-item label="类别" prop="type">
     <el-select v-model="formData.type" placeholder="请输入类别"  allow-create
     filterable clearable :style="{width: '100%'}"  >
     filterable clearable :style="{width: '100%'}"  :disabled="dsb">
                   <el-option v-for="(item, index) in typeOpt" :key="index" :label="item.label" :value="item.value"
                   ></el-option>
                 </el-select>

 ruoyi-ui/src/views/system/user/profile/index.vue

@@ -430,8 +430,9 @@
    getList() {

    let _this = this
        let clanId = this.$store.state.user.clanId

    getAllInfo().then(response=>{
    getAllInfo(clanId).then(response=>{
      let fams = response.data
      for(let i = 0; i < fams.length; i++)
        _this.menuOptions1[0]['children'].push({id:fams[i].userId,label:fams[i].nickName })

 ruoyi-ui/vue.config.js

@@ -37,8 +37,8 @@
      // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
      //target: `https://10.39.18.174:8080/`,
      // target: `https://192.168.1.3:8080/`,
      target: 'https://www.bendudu.com:8080/',
       target: `https://10.39.18.174:8080/`,
    //  target: 'https://www.bendudu.com:8080/',
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''