修改了对应的代码

feige

2024-10-09 3d8bff94da257d3f429373297975c33b1b7ce28c

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

@@ -141,18 +141,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>
    <!-- 序号、设备名称、时间、购买人、事项内容、存放地点、电子文件、备注 操作-->
    <!-- 这里有个familyList数组 是在data()中定义的 -->
@@ -548,6 +548,7 @@
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 {getAllInfo} from "@/api/system/user"


//在system/note/index.js中导入接口函数  --接好了
@@ -559,7 +560,7 @@
import {showShareUser} from "@/api/bignote/index";

export default {
  name: "Role",
  name: "ZfDevice",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -661,7 +662,8 @@
        buyer:undefined,
        location:undefined,
        createDate:undefined,
        happenTime:undefined
        happenTime:undefined,
      name:undefined,
      },
      // 表单参数
      form: {},
@@ -868,6 +870,27 @@
                          this.userOptions.push({label: element.oldName,value: element.userId})
                      })
          })


        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;
           }
         );
        },
    // 确认分享
    subShare(row) {
@@ -880,6 +903,7 @@
      }).then(() => {

        this.getList();
      this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
@@ -927,7 +951,8 @@
      this.loading = true;
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      // console.log(this.queryParams)
      console.log(this.queryParams)
     //alert(this.queryParams.name)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      let _this = this
      listEquipment(this.queryParams).then(response => {
@@ -1010,6 +1035,8 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false; 
     // alert(988)
      this.$router.push("/familymodel/Device/equipmentInfo/" + id);
    },
    /** 修改按钮操作 */