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

yz3456

2024-05-18 87e28c4bc7fe04eb14629482e97541d183c1d067

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

@@ -6,7 +6,10 @@
            v-model="queryParams.kind"
            placeholder="所有类型"
            clearable
            style="width: 240px"
            style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          >
            <el-option
              v-for="dict in typeOptions"
@@ -20,7 +23,10 @@
              v-model="queryParams.suitable"
              placeholder="请输入适用人"
              clearable
              style="width: 240px"
              style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
@@ -29,7 +35,10 @@
              v-model="queryParams.type"
              placeholder="请输入类别"
              clearable
              style="width: 240px"
              style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
@@ -38,7 +47,10 @@
              v-model="queryParams.method"
              placeholder="请输入保洁方法"
              clearable
              style="width: 240px"
              style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
@@ -97,7 +109,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"
@@ -106,7 +118,7 @@
            >
              <el-button size="mini"   type="primary"
              plain
              icon="el-icon-plus" >导入</el-button>
             icon="el-icon-top" >导入</el-button>

            </el-upload>
          </el-col>
@@ -116,63 +128,72 @@

      <el-table v-loading="loading" :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  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
        <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>

        <el-table-column label="类型" prop="kind" sortable width="120" >
        <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="150" />
       <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="100" />
        <el-table-column label="材料存放地" prop="location" sortable width="120" />
        <el-table-column label="放置地点" prop="place" sortable width="100" />
        <el-table-column label="发生时间" prop="happenTime" sortable width="100" align="center">
        <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="100" />
        <el-table-column label="电子文件" prop="url" width="100" >
             <template slot-scope="scope" >
               <div  @click="handleCheck(scope.row)">
               <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 !== null"
               >
        <img
                 class="el-upload-list__item-thumbnail"
                 src="../../assets/images/deviceA.png"
                 alt=""
                 style="width: 35px; height: 35px;"
                 fit="cover"
                  v-if="scope.row.url === null"
        ></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="备注" 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="180" align="center">

          </el-dropdown>
          <template slot-scope="scope" >
            <div  @click="handleCheck(scope.row)">
              <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">
          <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>
            </div>
        </template>
      </el-table-column>
      </el-table>
@@ -204,10 +225,9 @@
            </el-input>
          </el-form-item>
          <el-form-item label="时间" prop="happenTime">
           <el-date-picker
            v-model='formDat.happenTime'
            type='createDate'
            placeholder='选择日期'></el-date-picker>
            <el-date-picker v-model="formDat.happenTime" type="date" placeholder="请选择日期"
                            :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
            ></el-date-picker>
          </el-form-item>
          <el-form-item label="保洁方法" prop="method">
            <el-input v-model="formDat.method" placeholder="请输入保洁方法" clearable :style="{width: '100%'}" >
@@ -229,59 +249,80 @@
          <h4 class="form-header">相关图片 </h4>
          <el-upload
            action="#"
            accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
            list-type="picture-card"
            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}">
              <img
                class="el-upload-list__item-thumbnail"
                :src="file.url"
                alt=""
                style="width: 126px; height: 126px"
                fit="cover"
                :preview-src-list="[file.url]"
              >
            <div slot="file" slot-scope="{ file }">
              <template v-if="fileList">
                <img
                  class="el-upload-list__item-thumbnail"
                  :src="file.url"
                  alt=""
                  style="width: 100%; height: 100%; object-fit: cover;"
                  fit="cover"
                  :preview-src-list="[file.url]"
                >
              </template>
              <span class="el-upload-list__item-actions">
          <span
            class="el-upload-list__item-preview"
            @click="handlePictureCardPreview(file)"
          >
            <i class="el-icon-zoom-in"></i>
          </span>

          <span
            v-if="!disabled"
            class="el-upload-list__item-delete"
            @click="handleRemove(file)"
          >
            <i class="el-icon-delete"></i>
          </span>
        </span>


      <span
        class="el-upload-list__item-preview"
        @click="handlePictureCardPreview(file)"
      >
        <i class="el-icon-zoom-in"></i>
      </span>
      <span
        v-if="!disabled"
        class="el-upload-list__item-delete"
        @click="handleRemove(file)"
      >
        <i class="el-icon-delete"></i>
      </span>
    </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

            :on-remove="handleRemove"
            :http-request="requestUpload"
        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 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>

@@ -307,6 +348,7 @@

  //在system/note/index.js中导入接口函数
  import {listClean,enload,delClean, addClean, uploadPic} from "@/api/clean/index";
  import {Message} from "element-ui";
  export default {
    name: "Role",
    dicts: ['sys_normal_disable'],
@@ -342,14 +384,20 @@
        // 日期范围
        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'],

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

        ],
        dsb:true,
        btn:false,
        uploading: false,
        formDat: {
          type: undefined,
          kind: undefined,
@@ -359,7 +407,7 @@
          location: undefined,
          remark: undefined,
          happenTime: undefined,
          url: undefined,
          url: "",

        },
        // 菜单列表
@@ -465,14 +513,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;
            }
          }
        );
      },
@@ -489,12 +544,17 @@
      },

      handleRemove(file) {
        for(let i = 0; i < this.fileListOther.length; i++)
        for(let i = 0; i < this.fileList.length; i++)
        {
          if(this.fileListOther[i].url==file.url)
            this.$delete(this.fileListOther,i);
          if(this.fileList[i].url==file.url)
           {
             this.$delete(this.fileList,i);
                  this.$delete(this.uploadFileList,i);
                  }

        }
      },

      // 取消按钮
      cancel() {
        this.open = false;
@@ -526,7 +586,7 @@
            deptCheckStrictly: true,
            remark: undefined
          };
        this.resetForm("form");
        this.resetForm("elForm");
      },
      /** 搜索按钮操作 */
      handleQuery() {
@@ -577,61 +637,131 @@
        this.dialogVisible = true;
      },
      handleRemoveFile(file,) {
        for(let i = 0; i < this.fileListOther.length; i++)
        {
          if(this.fileListOther[i].url==file.url)
          {

  for(let i = 0; i < this.fileListOther.length; i++)
  {
    if(this.fileListOther[i].url==file.url)
      this.$delete(this.fileListOther,i);
  }
},
            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) {

            addClean(this.formDat).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              // 清空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]);
              }
              this.getList();
            });
          }
        });
      },
      requestUpload(params)
      {
        var file = params.file;
        var formData = new FormData();
        formData.append('uploadFile', file);
        let _this = this

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

     // 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)
       //   alert("dds")
          _this.formDat.url = _this.formDat.url+","+response.fileNames
        //alert( _this.formDat.url)
         _this.uploadFileList = []
         _this.$modal.msgSuccess("图片上传成功");

          if(_this.fot.includes(pth) === true)
          {
            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
      });
    },
    requestUpload(params) {

          }

          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;
        this.$modal.confirm('是否确认删除资产编号为"' + Ids + '"的数据项？').then(function() {
        this.$modal.confirm('是否确认删除所选数据项？').then(function() {
          return delClean(Ids);
        }).then(() => {
          this.getList();
@@ -661,25 +791,25 @@

      /** 导入操作*/
      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;
        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(err)
        {
          Message({ message: "导入失败", type: 'error' })
        }

      }

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

@@ -688,4 +818,10 @@
    background: #FFEFF2;

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