修改了相关bug

feige

2024-10-07 b76ed70f00e438c7391116bf5e27312abce3f148

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

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

      <el-row :gutter="10" class="mb8">
      <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
            type="primary"
@@ -109,7 +122,7 @@
              v-hasPermi="['family:note:export']"
            >导入模板下载</el-button>
          </el-col>
          <el-col :span="1.2">
          <el-col :span="1.5">
            <el-upload
              action=""
              class="upload-demo"
@@ -118,15 +131,37 @@
            >
              <el-button size="mini"   type="primary"
              plain
              icon="el-icon-plus" >导入</el-button>
             icon="el-icon-top" >导入</el-button>

            </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,26 +205,36 @@
              ></div>
          </template>
        </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['familymodel:clean:info']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:clean:info']">
            <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>
        <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
                size="mini"
                type="text"
                icon="el-icon-edit"
                      :disabled="!scope.row.ownData"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['familymodel:clean:info']"
              >修改</el-button>
              <el-button
                size="mini"
                type="text"
                icon="el-icon-delete"
                      :disabled="!scope.row.ownData"
                @click="handleDelete(scope.row)"
                v-hasPermi="['system:role:remove']"
              >删除</el-button>
              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:clean:info']">
                <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>

          </el-dropdown>
              </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>
      </el-table>
@@ -204,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">
@@ -221,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>
@@ -250,6 +298,10 @@
            multiple
            :http-request="requestUpload"
            :file-list="fileList"
         :on-change="handleChange"
         :auto-upload="false"
         ref="upload"

          >
            <i slot="default" class="el-icon-plus"></i>
            <div slot="file" slot-scope="{ file }">
@@ -280,26 +332,80 @@
    </span>
            </div>
          </el-upload>
        <el-button
                 style="margin-left: 10px"
                 size="small"
                 type="success"

                 @click="picUpload"
               >上传到服务器</el-button>
          <h4 class="form-header">其他附件 </h4>
          <el-upload
            action=""
            :file-list="fileListOther"
            class="upload-demo"
            multiple

        ref="upload1"
      :on-change="handleChange1"
      :auto-upload="false"
        list-type="picture-card"
            :on-remove="handleRemoveFile"
            :http-request="requestUpload1"
            :show-file-list="true"
          >

<!--
            <el-button type="primary">点击上传</el-button>
            <div v-if="uploading" class="upload-status">正在上传...</div>
            <template #tip>
            <div v-if="uploading" class="upload-status">正在上传...</div> -->
            <!-- <template #tip>
              <div class="el-upload__tip">
              </div>
            </template>
          </el-upload>
          </el-upload> -->
          <i slot="default" class="el-icon-plus"></i>
            <div slot="file" slot-scope="{file}">
              <!-- 添加video元素用于显示视频 -->
              <video
                v-if="file.url.includes('.mp4')"
                class="el-upload-list__item-thumbnail"
                :src="file.url"
                style="width: 147px; height: 147px"
                fit="cover"
              ></video>
              <img v-else
                   class="el-upload-list__item-thumbnail"
                   src="../../assets/images/deviceLis.png"
                   alt=""
                   style="width: 100%; height: 100%"
                   fit="cover"></img>

              <span class="el-upload-list__item-actions">
                   <span class="el-upload-list__item-name">{{ file.name }}</span>
                        <!-- <span
                          class="el-upload-list__item-preview"
                          @click="handleFileCardPreview(file)"
                        >
                          <i class="el-icon-zoom-in"></i>
                        </span> -->

                        <span

                          class="el-upload-list__item-delete"
                          @click="handleRemoveFile(file)"
                        >
                          <i class="el-icon-delete"></i>
                        </span>
                  </span>

            </div>


          </el-upload>
    <el-button
                style="margin-left: 10px"
                size="small"
                type="success"
                @click="fileUpload"
              >上传到服务器</el-button>
        </el-form>
        <h4 class="form-header"> </h4>

@@ -314,22 +420,186 @@

      </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>

  <script>
  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";


  //在system/note/index.js中导入接口函数
  import {listClean,enload,delClean, addClean, uploadPic} from "@/api/clean/index";
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,

@@ -360,9 +630,14 @@
        // 日期范围
        dateRange: [],
        // 数据范围选项
        fot:[".jpg",".jif"],
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','m4a'],

        fileList:[
        ],
      fileList1:[],
      uploadFileList: [],
      uploadFileList1: [],
        fileListOther:[

        ],
@@ -378,7 +653,7 @@
          location: undefined,
          remark: undefined,
          happenTime: undefined,
          url: undefined,
          url: "",

        },
        // 菜单列表
@@ -446,12 +721,213 @@
      };
    },
    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
     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
        console.log(shareList,'sharelistsharelist')
        this.$modal.confirm('是否确认分享？').then(function() {
          return share(shareList);
        }).then(() => {

          this.getList();
          this.$modal.msgSuccess("分享成功");
          this.id1 = undefined
          this.open1 = false;
        }).catch(() => {});
      },
      // ------------------------------------------------------------------


      getInfo(){
            console.log('-----------------')
            getInfo().then(response=>{
              console.log(response.user.roles[0].roleId,'roleID')
              this.userId = response.user.roles[0].roleId
            })
          },
    getSrc1(kind) {
    if (kind === 0) {
      return '保洁'
@@ -484,14 +960,21 @@
        this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

        // console.log(this.queryParams)
        let _this = this
        //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
        listClean(this.queryParams).then(response => {
            //  alert(123)
            //   console.log(response.data)
            this.cleanList = response.data.data;
            if(response.msg=="您没加入到对应的家庭，请联系管理员")
            {
                _this.$modal.msgSuccess("您没加入到对应的家庭，请联系管理员");
                _this.loading = false;
            }else{
            _this.cleanList = response.data.data;

            this.total = response.data.total;
            this.loading = false;
            _this.total = response.data.total;
            _this.loading = false;
            }
          }
        );
      },
@@ -499,19 +982,23 @@
      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) {
        for(let i = 0; i < this.fileList.length; i++)
        {
          if(this.fileList[i].url==file.url)
            this.$delete(this.fileList,i);
           {
             this.$delete(this.fileList,i);
                  this.$delete(this.uploadFileList,i);
                  }

        }
      },

@@ -546,7 +1033,7 @@
            deptCheckStrictly: true,
            remark: undefined
          };
        this.resetForm("form");
        this.resetForm("elForm");
      },
      /** 搜索按钮操作 */
      handleQuery() {
@@ -576,6 +1063,7 @@
      /** 查看详细信息 */
      handleCheck(row){
        const id = row.id;
      this.open2 = false; 
        this.$router.push("/familymodel/clean/cleanInfo/" + id);
      },
      /** 修改按钮操作 */
@@ -600,19 +1088,18 @@
        for(let i = 0; i < this.fileListOther.length; i++)
        {
          if(this.fileListOther[i].url==file.url)
          {

            this.$delete(this.fileListOther,i);
            this.$delete(this.uploadFileList1,i);

            }
        }
      },
      /** 提交按钮（数据权限） */
      submitDataScope: function() {

        let ul = this.fileList.map(function (elem){
          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        }).join(",")
        let uls = this.fileListOther.map(function (elem){
          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        }).join(",")
        this.formDat.url = ul+","+uls

        this.$refs["elForm"].validate(valid => {
          if (valid) {

@@ -636,54 +1123,89 @@
        });

      },
      requestUpload(params) {
    handleChange(file, fileList1) {
       //定义一个全局数组uploadFileList来做存储

        var file = params.file;
        var formData = new FormData();
        formData.append('uploadFile', file);
        let _this = this
        this.uploading1 = true;
     // this.uploadFileList.push(file.raw);
      console.log("=========5555=========")
     this.uploadFileList.push(file.raw);
          this.fileList.push({name:file.name,url:file.url})
     //alert(fileList1.length)
      //console.log(file)
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    },
    handleChange1(file, fileOtherList1) {
       //定义一个全局数组uploadFileList来做存储

     // this.uploadFileList.push(file.raw);
      console.log("=========5555=========")
     this.uploadFileList1.push(file.raw);
      this.fileListOther.push({name:file.name,url:file.url})
      //console.log(file)
    //  console.log(this.uploadFileList)
    //  this.fileList = fileList
    },
    fileUpload(){
    //   var file = params.file;

       var formData = new FormData();
       //this.$refs.upload1.submit();
       // formData.append('uploadFile', file);
       if(this.uploadFileList1.length==0){
            this.$modal.msgSuccess("文档上传列表不能为空!");
            return
       }
       this.uploadFileList1.forEach((elem)=>{
          formData.append("files", elem)

       })

       let _this = this

       this.uploading = true;
       uploadPic(formData).then(response => {
       _this.uploadFileList1 = []
       _this.formDat.url = _this.formDat.url+","+response.fileNames
       _this.$modal.msgSuccess("文件上传成功!");
         })

    },
    picUpload()
    {
      //alert(89)
       var formData = new FormData();
      //alert(this.uploadFileList.length)
      console.log(this.uploadFileList)
       //this.$refs.upload.submit();
    if(this.uploadFileList.length==0){
         this.$modal.msgSuccess("图片上传列表不能为空！");
         return}
    //console.log(this.uploadFileList)
       this.uploadFileList.forEach((elem)=>{
          formData.append("files", elem)

       })
       //alert(90)
       let _this = this
       //alert(9)
        uploadPic(formData).then(response => {
          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
          this.uploading1 = false;
          this.$modal.msgSuccess("上传成功");
          if(_this.fot.includes(pth) === true)
          {
            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
       //   alert("dds")
          _this.formDat.url = _this.formDat.url+","+response.fileNames
        //alert( _this.formDat.url)
         _this.uploadFileList = []
         _this.$modal.msgSuccess("图片上传成功");

          }
      });
    },
    requestUpload(params) {

          else{
            // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

          }
        })
      },
      requestUpload1(params)
      {
        var file = params.file;
        var formData = new FormData();
        formData.append('uploadFile', file);
        let _this = this
        this.uploading = true;
        uploadPic(formData).then(response => {
          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
          this.uploading = false;
          this.$modal.msgSuccess("上传成功");
          if(_this.fot.includes(pth) !== true)
          {
            // _this.fileList.push({name:response.data.fileName, "url":response.data.url})
            _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

          }

          // else{
          //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
          //
          // }
        })

      },
   //  this.uploadFileList.push(params.file);
    },
    requestUpload1(params)
    {
    //        this.uploadFileList1.push(params.file);
    },
      /** 删除按钮操作 */
      handleDelete(row) {
        const Ids = row.id || this.ids;
@@ -717,25 +1239,26 @@

      /** 导入操作*/
      handleEnport(params){
      var file = params.file;
      var formData = new FormData();
      formData.append('excelImport', file);
      let _this = this
      alert(file)
      enload(formData).then(response => {
         _this.getList();
        Message({ message: "导入成功", type: 'warning' })
        var file = params.file;
        console.log(params)
        var formData = new FormData();
        formData.append('excelImport', file);
        let _this = this
        enload(formData).then(response => {
          _this.getList();
          Message({ message: "导入成功", type: 'warning' })

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

      }

    }
  };
  </script>
  <style>
<style scoped>
  .el-table__row.statistics-warning-row {
    background: #E0EEFE;

@@ -744,4 +1267,10 @@
    background: #FFEFF2;

  }
  .el-table__cell {
    font-size: 14px; /* 设置字体大小 */
  }
  .button-container {
    display: inline-flex; /* 设置按钮容器为行内元素 */
  }
  </style>