修改bug

feige

2025-01-02 43e1199ca0c75787fb6b52bef7d595abd115ceab

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

@@ -64,7 +64,20 @@
            border-radius: 6px 6px 6px 6px;opacity:1;">重置</el-button>
        </el-form-item>
      </el-form>

      <el-row :gutter="10" >
         <el-col>
    <el-input
      v-model="searchQuery"
      placeholder="搜索百度"
      clearable
      style="width: 320px;
           height: 15px;
           margin-bottom: 23px;
           opacity: 0.5;"
      @keyup.enter.native="searchBaidu"
    />
    </el-col>
</el-row>
      <el-row :gutter="10" class="mb8" v-if="userId != 2">
        <el-col :span="1.5">
          <el-button
@@ -122,11 +135,33 @@

            </el-upload>
          </el-col>
        <el-col :span="1.5">
 <el-dropdown placement="分享相关">
     <el-button size="mini"   type="primary"
                plain
                icon="el-icon-top">分享相关</el-button>
      <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>

        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
                <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>

      <el-table v-loading="loading" :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <el-table v-loading="loading" border :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
        <el-table-column type="selection" :reserve-selection="true"  width="55"  align="center" />
        <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>

@@ -170,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
@@ -193,6 +228,12 @@
                <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>

              </el-dropdown>
              <el-button
                 size="mini"
                  type="text"
                 icon="el-icon-d-arrow-right"
                  @click="handleShare(scope.row)">
                <span style="font-size: 14px;">分享</span></el-button>
            </div>
        </template>
      </el-table-column>
@@ -208,7 +249,8 @@
      />

      <!-- 添加或修改资产信息配置对话框 -->
      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body     @click.native="handleDialogClick"
>
        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

            <el-form-item label="类型" prop="kind">
@@ -225,7 +267,9 @@
            </el-input>
          </el-form-item>
          <el-form-item label="时间" prop="happenTime">
            <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
            <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"       @click.native.stop
                           ref="datePicker"

                            :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
            ></el-date-picker>
          </el-form-item>
@@ -376,6 +420,126 @@

      </el-dialog>

      <!-- 分享对话框1 -->
      <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">

      <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
            <el-table-column type="selection" width="55"  align="center" />
            <el-table-column fixed label="序号" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
            <el-table-column label="身份" prop="identity" sortable width="130" >
              <template slot-scope="scope" >
                <span v-if="scope.row.isMyFamily==1">第{{scope.row.identity}}代</span>
                <span v-else>——</span>
              </template>
            </el-table-column>
            <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
          </el-table>

                  <div slot="footer" class="dialog-footer">
                    <el-button type="primary" @click="subShare">分 享</el-button>
                  </div>

      </el-dialog>

      <!-- 分享对话框2 -->
      <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
        <div>
        <el-select v-if="ifNum == 1"
                  v-model="user" id="userSelect"
                  placeholder="请选择分享的对象" clearable
                   style="width: 240px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   margin-bottom: 5px;
                   opacity: 0.5;" filterable allow-create
                   @change="selectValue">
          <el-option v-for="item in userOptions"
            :key="item.value" :label="item.label" :value="item.value"/>
        </el-select>
              </div>

        <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
              <!-- <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" /> -->
              <!-- <el-table-column fixed label="序号" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> -->
              <el-table-column label="类型" prop="kind" sortable width="80px" >
                 <template slot-scope="scope">
                 {{ getSrc1(scope.row.kind) }}
                  </template>
                 </el-table-column>
              <el-table-column label="适用人" prop="suitable" sortable :show-overflow-tooltip="true" width="110px" />
               <el-table-column label="类别" prop="type" sortable width="100" />
               <el-table-column label="保洁方法" prop="method" sortable width="120" />
               <el-table-column label="材料存放地" prop="location" sortable width="140" />
               <el-table-column label="放置地点" prop="place" sortable width="120" />
               <el-table-column label="发生时间" prop="happenTime" sortable width="150" align="center">
                 <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
               </el-table-column>
               <el-table-column label="备注" prop="remark" sortable width="70px" />
               <el-table-column label="本家庭记录" prop="ownData" sortable width="110px" >
                 <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
               </el-table-column>
                <el-table-column label="电子文件" prop="url" width="160" align="center">
                     <template slot-scope="scope" >
                       <div>
                         <img
                           class="el-upload-list__item-thumbnail"
                           src="../../assets/images/deviceLis.png"
                           alt=""
                           style="width: 35px; height: 35px;"
                           fit="cover"
                           v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
                         >
                         <img
                           v-else
                           class="el-upload-list__item-thumbnail"
                           src="../../assets/images/deviceA.png"
                           alt=""
                           style="width: 35px; height: 35px;"
                           fit="cover"

                         ></div>
                     </template>
                  </el-table-column>

              <el-table-column 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
                    v-if="ifNum == 2"
                    size="mini"
                    type="text"
                    icon="el-icon-d-arrow-right"
                    @click="handleDown(scope.row)">
                    <span style="font-size: 14px;">下载</span></el-button>
                    <el-button
                      v-if="ifNum == 1"
                      size="mini"
                      type="text"
                      icon="el-icon-d-arrow-right"
                      @click="handleBack(scope.row)">
                      <span style="font-size: 14px;">收回</span></el-button>
                  <el-button
                    size="mini"
                    type="text"
                    icon="el-icon-d-arrow-right"
                    @click="handleCheck(scope.row)">
                    <span style="font-size: 14px;">查看详情</span></el-button>
                  </div>
                </template>
              </el-table-column>
            </el-table>

            <pagination
              v-show="total1>0"
              :total="total1"
              :page.sync="queryParams2.pageNo"
              :limit.sync="queryParams2.pageSize"
              @pagination='fenYe'
              style="background: #FEF7FC;"
            />

      </el-dialog>

    </div>
  </template>

@@ -386,13 +550,55 @@


  //在system/note/index.js中导入接口函数
  import {listClean,enload,delClean, addClean, uploadPic} from "@/api/clean/index";
  import {Message} from "element-ui";
import {listClean,enload,delClean, addClean, uploadPic,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
        } from "@/api/clean/index";
import {listUserAll} from "@/api/root/index";
import {showShareUser} from "@/api/bignote/index";
import {getAllInfo} from "@/api/system/user"

// import {Message} from "element-ui";
import { Notification, MessageBox, Message, Loading } from 'element-ui'

  export default {
    name: "Role",
    name: "ZfClean",
    dicts: ['sys_normal_disable'],
    data() {
      return {
        // 分享给谁的lis
      total1:0,
      searchQuery: undefined,
        listRoot: [],
        open1:false,
        open2:false,
        id1: undefined,
        shareList1: [],
        // shareList2: [],
        userOptions:[],
        user:undefined,
        userList:[],
        ifNum:undefined,
        selectWho:undefined,
        title1: "",
        title2: "",
        loading1: false,
        loading2: false,
        // 查询参数1
        queryParams1: {
          pageNum: 1,
          pageSize: 10,
        },
        queryParams2: {
          pageNo: 1,
          pageSize: 10,
        },
        ids1: [],
        single1: true,
        multiple1: true,
        dateRange1: [],
        total1:0,

valueFromParent: "保洁收纳",
        userId: undefined,
        // 遮罩层
        disabled: false,
@@ -425,7 +631,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','.M4A'],

        fileList:[
        ],
@@ -515,11 +721,214 @@
      };
    },
    created() {
            this.getList1();
      this.getList();
      this.getCateInfor()
      this.getInfo()


    },
    methods: {
   handleDialogClick()
   {
      // 关闭日期选择器
            this.$refs.datePicker.handleClose();
   },
        searchBaidu() {
            // 打开百度搜索结果
            window.open(`https://www.baidu.com/s?wd=${encodeURIComponent(this.searchQuery)}`);
            // 清空搜索框
            this.searchQuery = '';
          },
      // 分页
      fenYe(){
        // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
        if(this.ifNum === 1){
          this.selectValue(this.selectWho)
        }else if(this.ifNum === 2){
          this.whoShare()
        }else{
          this.showData()
        }
      },
      // 关闭弹窗后
      handleClose(){
        this.user = ''
        this.queryParams2.pageNo = 1
              this.total1 = 0
      },
      handleClose2(){
        this.$refs.table1.clearSelection()
      },

      // 下载他人给我分享的数据
      handleDown(row){
        const a = {"downloadContent" : row.id}
        downShareData(a).then(() => {
          Message({ message: "下载成功", type: 'success' })
        })
      },

      // 收回分享给别人的数据
      handleBack(row){
        // 分享给谁的：this.selectWho
        const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
        deleteShareData(list).then(()=>{
          Message({ message: "收回成功", type: 'success' })

          const list2 = {"shareIds": [this.selectWho]}
          shareToWho(list2,this.queryParams2).then(response => {
            this.shareList1 = response.data.data
            this.total1 = response.data.total;
          })
        })
      },
      // 展示下载的分享数据
      showData(){
        this.shareList1 = []
        this.ifNum = 3
        this.open2 = true
        this.title2 = "下载的分享数据";
        showShareData(this.queryParams2).then(response => {
          this.shareList1 = response.data.data
          this.total1 = response.data.total;
          // console.log(response,'展示下载的分享数据展示下载的分享数据')
        })
      },
      // 展示分享给我的数据
      whoShare(){
        this.shareList1 = []
        this.ifNum = 2
        this.open2 = true
        this.title2 = "分享给我的数据";
        // const list = {"shareId": this.userList}
        // const list = {"shareId": 111}
        getWhoShare(this.queryParams2).then(response => {
          const data = response.data.data
          this.total1 = response.data.total
          console.log(response,'展示分享给我的数据展示分享给我的数据s')
          for(let i in data){
            console.log(i,'展示分享给我的数据展示分享给我的数据')
            this.shareList1.push(data[i])
          }
        })
      },

      // 分享给谁了什么数据
      selectValue(value){
        this.selectWho = value
        this.shareList1 = []
        const list = {"shareIds": [this.selectWho]}
        shareToWho(list,this.queryParams2).then(response => {
          // this.loading2 = true;
          response.data.data.forEach(res=>{
            if(res){
              this.shareList1.push(res)
            }
          })
          // this.shareList1 = response.data.data
          this.total1 = response.data.total;
          // this.loading2 = false;
          console.log(response.data,'分享给谁了什么数据分享给谁了什么数据')
        })
      },
      handleWho(){
        this.ifNum = 1
        this.open2 = true
        this.title2 = "分享给谁了什么数据";
        this.shareList1 = []
      },

      /** 分享操作 */
      handleShare(row) {
        if(row.id){
          this.id1 = [row.id]
        }
        this.open1 = true;
        this.title1 = "分享";
      },
      // 多选框选中数据
      handleSelectionChange1(selection) {
        this.ids1 = selection.map(item => item.userId)
        this.single1 = selection.length!=1
        this.multiple1 = !selection.length
      },
      // 多选框选中数据
      handleSelectionChange2(selection) {
        // this.ids1 = selection.map(item => item.userId)
        // // console.log(selection)
        // console.log(this.ids1,'ids1ids1ids1ids1')
        // this.single1 = selection.length!=1
        // this.multiple1 = !selection.length
      },
      getRowId1(row)
      {
        return row.id
      },
      getRowId2(row)
      {
        return row.id
      },
      getList1() {
            this.loading1 = true;
    let userId = this.$store.state.user.userId
	
   this.userOptions = []
     showShareUser(userId, 2020).then(response=>{
                console.log("===========ddddddddddddd")
                console.log(response.data)
                console.log("--------------------")
                response.data.forEach(element =>{
                    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) {
        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;
        }).catch(() => {});
      },
      // ------------------------------------------------------------------


      getInfo(){
            console.log('-----------------')
            getInfo().then(response=>{
@@ -581,12 +990,12 @@
      getCateInfor()
      {
        let _this = this
        getCategory().then(response=>{
        // getCategory().then(response=>{

          response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
            _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
          })
        })
        //   response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
        //     _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        //   })
        // })
      },

      handleRemove(file) {
@@ -662,6 +1071,7 @@
      /** 查看详细信息 */
      handleCheck(row){
        const id = row.id;
      this.open2 = false; 
        this.$router.push("/familymodel/clean/cleanInfo/" + id);
      },
      /** 修改按钮操作 */
@@ -838,6 +1248,7 @@
      /** 导入操作*/
      handleEnport(params){
        var file = params.file;
        console.log(params)
        var formData = new FormData();
        formData.append('excelImport', file);
        let _this = this
@@ -845,10 +1256,10 @@
          _this.getList();
          Message({ message: "导入成功", type: 'warning' })

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

      }