feige
2025-01-02 43e1199ca0c75787fb6b52bef7d595abd115ceab
ruoyi-ui/src/views/honor/index.vue
@@ -186,7 +186,7 @@
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>
      <!--      </el-table-column>-->
      <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
      <el-table-column fixed="right" label="操作" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <div class="button-container">
            <el-button
@@ -536,8 +536,8 @@
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
import {getInfo} from "@/api/login";
import {showShareUser} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"
//导入接口函数
import {listHonor,listType,enload, addHonor,updateHonor, delHonor,uploadPic,getCategory,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
@@ -545,10 +545,11 @@
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
  name: "index",
  name: "ZHonor",
  dicts: ['sys_normal_disable'],
  data() {
    return {
     total1: 0,
      // 分享给谁的list
      listRoot: [],
      open1:false,
@@ -612,7 +613,7 @@
      dateRange: [],
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
      fileList:[],
      fileList1:[],
      uploadFileList: [],
@@ -854,26 +855,42 @@
      return row.id
    },
    getList1() {
          this.loading1 = true;
          this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
          this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
             this.queryParams.clanId = this.$store.state.user.clanId
          listUserAll(this.queryParams1).then(response => {
              this.listRoot = response.data.data;
              const kon = {}
              this.listRoot.forEach(element => {
                kon[element['nickName']] = element['userId']
              })
              for(let i in kon){
                this.userOptions.push({label: i,value: kon[i]})
              }
              for(let i in this.userOptions){
                this.userList.push(this.userOptions[i].value)
              }
              console.log(this.userList,'userListuserListuserList')
              this.loading1 = false;
            }
          );
        this.loading1 = true;
                let userId = this.$store.state.user.userId
              //  alert(userId)
               // alert(124)
                showShareUser(userId, 2030).then(response=>{
                   console.log("===========ddddddddddddd")
                   console.log(response.data)
                   console.log("--------------------")
                   response.data.forEach(element =>{
                       this.userOptions.push({label: element.oldName,value: element.userId})
                   })
                })
        //         this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
        //         this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
              // //  alert(this.$store.state.user.clanId)
              //       this.listRoot = []
               let clanId = this.$store.state.user.clanId
              if(clanId!=null){
                getAllInfo(clanId).then(response => {
                    this.listRoot = response.data;
                    const kon = {}
                          console.log(response.data,'userListuserListuserList99999999999999')
                    this.listRoot.forEach(element => {
                      kon[element['nickName']] = element['userId']
                    })
                    // for(let i in kon){
                    //   this.userOptions.push({label: i,value: kon[i]})
                    // }
                    // for(let i in this.userOptions){
                    //   this.userList.push(this.userOptions[i].value)
                    // }
                    // console.log(this.userList,'userListuserListuserList99999999999999')
                    this.loading1 = false;
                  }
                );
            }
        },
    // 确认分享
    subShare(row) {
@@ -884,8 +901,9 @@
      this.$modal.confirm('是否确认分享?').then(function() {
        return share(shareList);
      }).then(() => {
  this.userOptions = []
        this.getList();
      this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
@@ -1093,6 +1111,7 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false;
      this.$router.push("/self/Honor/honorInfo/" + id);
    },
    /** 修改按钮操作 */