修改完除了用户管理的其他报错

yz3456

2024-05-18 87e28c4bc7fe04eb14629482e97541d183c1d067

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

@@ -4,7 +4,7 @@
      <el-form-item label="时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width:  197px;
          style="width:  240px;
          height: 30px;
          background: #FFFFFF;
          border-radius: 14px 14px 14px 14px;
@@ -169,7 +169,7 @@
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
        <el-col :span="1.2">
        <el-col :span="1.5">

          <el-upload
            action=""
@@ -180,15 +180,15 @@
          >
            <el-button size="mini"   type="primary"
                       plain
                       icon="el-icon-plus" >导入</el-button>
                      icon="el-icon-top" >导入</el-button>
          </el-upload>
        </el-col>
        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
    </div>
    <el-table v-loading="loading" :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
    <el-table v-loading="loading" :data="collectionList" :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="60"/>
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
      <el-table-column label="获得时间" prop="happenTime" sortable width="120" align="center">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
@@ -249,6 +249,7 @@
              size="mini"
              type="text"
              icon="el-icon-edit"
                     :disabled="!scope.row.ownData"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['system:role:edit']"
            >
@@ -258,6 +259,7 @@
              size="mini"
              type="text"
              icon="el-icon-delete"
                     :disabled="!scope.row.ownData"
              @click="handleDelete(scope.row)"
              v-hasPermi="['system:role:remove']"
            ><span style="font-size: 14px;">删除</span></el-button>
@@ -312,7 +314,7 @@
          </el-input>
        </el-form-item>
        <el-form-item label="价格" prop="price">
          <el-input v-model="formDat.price" placeholder="请输入价格" clearable :style="{width: '100%'}" >
          <el-input v-model="formDat.price" type="number" placeholder="请输入价格" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="存放位置" prop="location">
@@ -332,6 +334,9 @@
          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 }">
@@ -365,25 +370,75 @@

          </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"
   list-type="picture-card"
      :on-change="handleChange1"
      :auto-upload="false"
          :on-remove="handleRemoveFile"
          :http-request="requestUpload1"
          :show-file-list="true"
        >
          <el-button type="primary">点击上传</el-button>
          <div v-if="uploading1" class="upload-status">正在上传...</div>
<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>

          <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>
        </el-upload>

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

@@ -452,7 +507,10 @@
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
      fileList:[],
      fileListOther:[],
 fileList1:[],
      uploadFileList: [],
       uploadFileList1: [],
 fileListOther:[],
      dsb:true,
      btn:false,
      fit:['fill'],
@@ -469,7 +527,7 @@
        price:undefined,
        location:undefined,
        remark:undefined,
        url: undefined,
        url: "",

      },
      // 菜单列表
@@ -582,19 +640,25 @@
      // console.log(this.queryParams)
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

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

          // console.log( this.typeList )
          // 在回调函数中调用 getTypeOptions()
          this.getTypeOptions();
@@ -644,14 +708,23 @@
      for(let i = 0; i < this.fileList.length; i++)
      {
        if(this.fileList[i].url==file.url)
        {
          this.$delete(this.fileList,i);
               this.$delete(this.uploadFileList,i);
               }

      }
    },
    handleRemoveFile(file) {
      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);

          }
      }
    },
    // 取消按钮
@@ -685,7 +758,7 @@
          deptCheckStrictly: true,
          remark: undefined
        };
      this.resetForm("form");
      this.resetForm("elForm");
    },
    /** 搜索按钮操作 */
    handleQuery() {
@@ -747,13 +820,7 @@
    /** 提交按钮（数据权限） */
    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) {

@@ -761,6 +828,7 @@
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            // 清空formDat对象的数据
            this.newOption = '';
            Object.keys(this.formDat).forEach(key => {
              this.formDat[key] = '';
            });
@@ -775,41 +843,101 @@
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });

      for(let i = 0; i <= this.fileList.length; i++)
      {
        this.handleRemove(this.fileList[0]);
      }
      for(let i = 0; i < this.fileListOther.length; i++){
        this.handleRemoveFile(this.fileListOther[0]);
      }
    },
    requestUpload(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})
        }
      })
    },
    requestUpload1(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this
      this.uploading1 = true;
      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.fileListOther.push({name:response.data.fileName, url:response.data.url})
        }
      })
    },
  handleChange(file, fileList1) {
        //定义一个全局数组uploadFileList来做存储

      // this.uploadFileList.push(file.raw);
       console.log("=========5555=========")
       console.log(file)
     //  console.log(this.uploadFileList)
     //  this.fileList = fileList
     //alert(file)
         this.uploadFileList.push(file.raw);
          this.fileList.push({name:file.name,url:file.url})
     //alert(fileList1.length)
     },
     handleChange1(file, fileOtherList1) {
        //定义一个全局数组uploadFileList来做存储
     this.uploadFileList1.push(file.raw);
      this.fileListOther.push({name:file.name,url:file.url})
      // this.uploadFileList.push(file.raw);
       console.log("=========5555=========")
       //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()
     {
        var formData = new FormData();
        //alert(976)
        //this.$refs.upload.submit();
        //alert(8)
        //alert(this.uploadFileList.length)
     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 => {
        //   alert("dds")
           _this.formDat.url = _this.formDat.url+","+response.fileNames
          _this.uploadFileList = []
          _this.$modal.msgSuccess("图片上传成功");

       });
     },
      requestUpload(params) {
  //alert(98)
   //    this.uploadFileList.push(params.file);
      },
      requestUpload1(params)
      {
        //     this.uploadFileList1.push(params.file);
      },
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
@@ -859,7 +987,7 @@
  }
};
</script>
<style>
<style scoped>
.app-container{
  background-color: #FEF7FC;
}