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

feige

2024-11-17 7c33a1164d3019feb3ad9e4844b3d364e5c6eb44

 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()中定义的 -->
@@ -205,7 +205,7 @@
            ></div>
        </template>
      </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
@@ -560,7 +560,7 @@
import {showShareUser} from "@/api/bignote/index";

export default {
  name: "Role",
  name: "ZfDevice",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -662,7 +662,8 @@
        buyer:undefined,
        location:undefined,
        createDate:undefined,
        happenTime:undefined
        happenTime:undefined,
      name:undefined,
      },
      // 表单参数
      form: {},
@@ -722,6 +723,7 @@
    };
  },
  created() {
    // alert(1233)
    this.getList();
    //   this.getCateInfor()
    this.getInfo()
@@ -861,6 +863,8 @@
    getList1() {
          this.loading1 = true;
           let userId = this.$store.state.user.userId

         this.userOptions = []
           showShareUser(userId, 2017).then(response=>{
                      console.log("===========ddddddddddddd")
                      console.log(response.data)
@@ -869,10 +873,10 @@
                          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 = {}
@@ -880,13 +884,13 @@
             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')
             // 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;
           }
         );
@@ -896,12 +900,18 @@
      const shareList = {}
      shareList.shareContents = this.id1 || this.ids;
      shareList.shareIds = this.ids1
     if(shareList.shareIds.length==0)
     {
             this.$modal.msgSuccess("请选择分享对象");
             return;
     }
      console.log(shareList,'sharelistsharelist')
      this.$modal.confirm('是否确认分享？').then(function() {
        return share(shareList);
      }).then(() => {

        this.getList();
      this.getList1();
        this.$modal.msgSuccess("分享成功");
        this.id1 = undefined
        this.open1 = false;
@@ -947,9 +957,21 @@

    getList() {
      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.dateRange)
      if(this.dateRange!=null)
      {
        this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
        this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
        console.log(this.queryParams)
      }
      else
      {
         this.queryParams.happenStartTime = null
         this.queryParams.happenEndTime = null
      }
      
            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 => {
@@ -1032,6 +1054,8 @@
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
     this.open2 = false;
     // alert(988)
      this.$router.push("/familymodel/Device/equipmentInfo/" + id);
    },
    /** 修改按钮操作 */