feige
2024-10-09 3d8bff94da257d3f429373297975c33b1b7ce28c
修改了对应的代码
15个文件已修改
63 ■■■■■ 已修改文件
ruoyi-ui/src/views/bignote/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clanManager/clan/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/clean/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/collection/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/contacts/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/device/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/economy/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/self/show.vue 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/travel/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/wish/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/bignote/index.vue
@@ -866,6 +866,7 @@
      }).then(() => {
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
ruoyi-ui/src/views/clanManager/clan/index.vue
@@ -71,13 +71,13 @@
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:role:edit']"
          >修改</el-button>
          <el-button
     <!--     <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
          >删除</el-button> -->
        </template>
      </el-table-column>
ruoyi-ui/src/views/clean/index.vue
@@ -913,6 +913,7 @@
        }).then(() => {
          this.getList();
          this.getList1();
          this.$modal.msgSuccess("分享成功");
          this.id1 = undefined
          this.open1 = false;
ruoyi-ui/src/views/collection/index.vue
@@ -841,7 +841,8 @@
      const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
      deleteShareData(list).then(()=>{
        Message({ message: "收回成功", type: 'success' })
        this.getList1();
        alert(234)
        const list2 = {"shareIds": [this.selectWho]}
        shareToWho(list2,this.queryParams2).then(response => {
          this.shareList1 = response.data.data
@@ -981,6 +982,7 @@
      }).then(() => {
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
ruoyi-ui/src/views/contacts/index.vue
@@ -995,6 +995,7 @@
      }).then(() => {
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
ruoyi-ui/src/views/device/index.vue
@@ -903,6 +903,7 @@
      }).then(() => {
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
ruoyi-ui/src/views/doctor/index.vue
@@ -925,6 +925,7 @@
      }).then(() => {
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
ruoyi-ui/src/views/economy/index.vue
@@ -881,6 +881,7 @@
      }).then(() => {
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
ruoyi-ui/src/views/note/index.vue
@@ -878,6 +878,7 @@
      }).then(() => {
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
ruoyi-ui/src/views/pet/index.vue
@@ -920,7 +920,8 @@
      this.$modal.confirm('是否确认分享?').then(function() {
        return share(shareList);
      }).then(() => {
        // this.getList();
         this.getList();
         this.getList1();
        Message({ message: "分享成功", type: 'success' });
        this.open1 = false;
        this.id1 = undefined;
ruoyi-ui/src/views/secret/index.vue
@@ -936,6 +936,7 @@
        }).then(() => {
          this.getList();
          this.getList1();
          this.$modal.msgSuccess("分享成功");
          this.id1 = undefined
          this.open1 = false;
ruoyi-ui/src/views/self/show.vue
@@ -579,6 +579,8 @@
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
} from "@/api/memo/index";
import {showShareUser} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"
import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
//import { delFamilyevent, uploadPic } from '../../api/bignote'
@@ -974,7 +976,7 @@
  created() {
    this.getList();
    this.getList1();
  },
  methods: {
    // 分页
@@ -997,7 +999,42 @@
    handleClose2(){
      this.$refs.table1.clearSelection()
    },
 getList1() {
          this.loading1 = true;
                    let userId = this.$store.state.user.userId
                  //  alert(userId)
                    showShareUser(userId, 2062).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
                  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;
                    }
                  );
          },
    // 下载他人给我分享的数据
    handleDown(row){
      const a = {"downloadContent" : row.id}
@@ -1120,7 +1157,7 @@
      this.$modal.confirm('是否确认分享?').then(function() {
        return share(shareList);
      }).then(() => {
this.getList1();
        this.getList();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
ruoyi-ui/src/views/selfeconomy/index.vue
@@ -982,6 +982,7 @@
        }).then(() => {
          this.getList();
          this.getList1();
          this.$modal.msgSuccess("分享成功");
          this.id1 = undefined
          this.open1 = false;
ruoyi-ui/src/views/travel/index.vue
@@ -1203,6 +1203,7 @@
      }).then(() => {
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
ruoyi-ui/src/views/wish/index.vue
@@ -942,6 +942,7 @@
      }).then(() => {
        this.getList();
        this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;