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

yz3456

2024-05-18 87e28c4bc7fe04eb14629482e97541d183c1d067

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

@@ -2,23 +2,41 @@
  <div class="app-container" style="opacity: 1;">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">

      <el-form-item label="时间" >
      <el-form-item label="时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width: 240px;"
          value-format="yyyy-MM-dd HH-MM"
          style="width: 240px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
      </el-form-item>
      <el-form-item label="设备名称" prop="name" >
        <el-input
          v-model="queryParams.name"
          placeholder="请输入设备名称"
          clearable
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="购买人" prop="buyer" >
        <el-input
          v-model="queryParams.buyer"
          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>
@@ -27,7 +45,10 @@
          v-model="queryParams.location"
          placeholder="请输入存放地点"
          clearable
          style="width: 240px"
          style="width: 200px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
          @keyup.enter.native="handleQuery"
        />

@@ -38,7 +59,10 @@
          v-model="queryParams.content"
          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>
@@ -84,33 +108,93 @@
          v-hasPermi="['family:note:export']"
        >导出</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExportTemplate"
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
      <el-col :span="1.5">

        <el-upload
          action=""

          class="upload-demo"
          :show-file-list="false"
          :http-request="handleEnport"
        >
          <el-button size="mini"   type="primary"
                     plain
                   icon="el-icon-top" >导入</el-button>

        </el-upload>
      </el-col>

      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <!-- 序号、设备名称、时间、购买人、事项内容、存放地点、电子文件、备注 操作-->
    <!-- 这里有个familyList数组 是在data()中定义的 -->
    <el-table v-loading="loading" :data="equipmentList"  @selection-change="handleSelectionChange" :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 label="序号" prop="id" sortable width="120" />
      <el-table-column label="设备名称" prop="name" sortable width="120" />
    <el-table v-loading="loading" :data="equipmentList"  :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :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" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
      <el-table-column label="设备名称" prop="name" sortable width="150" />

      <el-table-column label="时间" align="center" sortable prop="createDate" width="180">
      <el-table-column label="时间" align="happenTime" sortable prop="happenTime" width="140">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="是否注销" align="center" sortable prop="status" width="140">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createDate) }}</span>
          {{ getSrc1(scope.row.status) }}
        </template>
      </el-table-column>

      <el-table-column label="购买人" prop="buyer" sortable width="100" />
      <el-table-column label="购买人" prop="buyer" sortable width="140" />
      <el-table-column label="事项内容" prop="content" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="存放地点" prop="location" sortable width="100" />
      <el-table-column label="备注" prop="remark" sortable width="100" />
      <el-table-column label="电子文件" prop="url" sortable width="180" />
      <el-table-column label="家庭号" prop="familyId" sortable width="100" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column label="存放地点" prop="location" sortable width="120" />

      <el-table-column label="备注" prop="remark" sortable width="100" >
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>



      <el-table-column label="是否是本家庭记录" prop="ownData" sortable width="150px" >
        <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
      </el-table-column>
      <el-table-column label="电子文件" prop="url" width="120" align="center">

        <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">
          <el-button
          <div class="button-container">
            <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
                :disabled="!scope.row.ownData"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:role:edit']"
          >修改</el-button>
@@ -118,6 +202,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
                :disabled="!scope.row.ownData"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
@@ -125,6 +210,7 @@
            <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>
@@ -147,17 +233,10 @@
          <el-input v-model="formDat.name" placeholder="请输入设备名称" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>

        <!-- <el-form-item label="时间" prop="createDate">
          <el-input v-model="formDat.createDate" placeholder="请输入时间" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
         -->
        <el-form-item label="时间" prop="createDate">
          <el-date-picker
            v-model='formDat.createDate'
            type='date'
            placeholder='选择日期'
        <el-form-item label="发生时间" prop="happenTime">
          <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>


@@ -173,9 +252,11 @@
          <el-input v-model="formDat.location" placeholder="请输入存放地点" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="家庭号" prop="familyId">
          <el-input v-model="formDat.familyId" placeholder="请输入家庭号" clearable :style="{width: '100%'}" >
          </el-input>
        <el-form-item label="是否注销" prop="status">
          <el-select v-model="formDat.status" placeholder="请选择是否注销" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
@@ -188,14 +269,17 @@
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
        :on-change="handleChange"
        :auto-upload="false"
           ref="upload"
        >
          <i slot="default" class="el-icon-plus"></i>
          <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"
            style="width: 100%; height: 100%; object-fit: cover;"
              fit="cover"
              :preview-src-list="[file.url]"
            >
@@ -218,7 +302,15 @@


          </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=""
@@ -226,17 +318,64 @@
          class="upload-demo"
          multiple

          :on-remove="handleRemove"
          :http-request="requestUpload"
          :show-file-list="true"
          :on-remove="handleRemoveFile"


        ref="upload1"
        :on-change="handleChange1"
        :auto-upload="false"
        list-type="picture-card"
          :http-request="requestUpload1"
          :show-file-list="true"
        >
          <el-button type="primary">上传</el-button>

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

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

@@ -261,7 +400,7 @@


//在system/note/index.js中导入接口函数  --接好了
import {listEquipment,getEquipmentInfo,delEquipment, addEquipment, uploadPic} from "@/api/device/index";
import {listEquipment,enload,delEquipment, addEquipment, uploadPic} from "@/api/device/index";
export default {
  name: "Role",
  dicts: ['sys_normal_disable'],
@@ -297,14 +436,18 @@
      // 日期范围
      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:[
      ],
      fileListOther:[

      ],
      fileList1:[],
        uploadFileList: [],
         uploadFileList1: [],
     fileListOther:[],
      dsb:true,
      btn:false,
      uploading: false,
      formDat: {
        // type: undefined,
        content: undefined,
@@ -313,7 +456,8 @@
        name:undefined,
        remark: undefined,
        familyId:undefined,
        url: undefined,
        url: "",
        status:undefined,
      },
      // 菜单列表
      menuOptions: [],
@@ -326,7 +470,8 @@
        content:undefined,
        buyer:undefined,
        location:undefined,
        createDate:undefined
        createDate:undefined,
        happenTime:undefined
      },
      // 表单参数
      form: {},
@@ -341,6 +486,12 @@
          message: '请输入设备名称',
          trigger: 'blur'
        }],
        status: [{
          // required: true,
          message: '是否注销',
          trigger: 'change'
        }],


        buyer: [{
          required: true,
@@ -352,28 +503,31 @@
          message: '请输入存放地点',
          trigger: 'blur'
        }],
        // remark: [{
        //   required: true,
        //   message: '请输入备注',
        //   trigger: 'blur'
        // }],
        familyId: [{
          required: true,
          message: '请输入家庭号',
        remark: [{
          // required: true,
          message: '请输入备注',
          trigger: 'blur'
        }],
        // createDate: [{
        //   required: true,
        //   message: '请选择日期选择',
        //   trigger: 'change'
        // }],

        happenTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'blur'
        }],
        content: [{
          required: true,
          message: '请选择事项内容',
          message: '请输入标题',
          trigger: 'blur'
        }],
      },
      typeOptions: [],
      typeOptions: [{
        value: '1',
        label: '是',
      },
        {
          value: '0',
          label: '否',
        }],
    };
  },
  created() {
@@ -382,6 +536,15 @@

  },
  methods: {

    getSrc1(status) {
      if (status === 1) {
        return '是'
      }else {
        return '否'
      }
    },

    // 取消按钮
    cancelData() {
      this.open = false;
@@ -403,15 +566,24 @@

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

          this.total = response.data.total;
          this.loading = false;
          _this.total = response.data.total;
          _this.loading = false;
          }
        }
      );
    },
@@ -447,7 +619,7 @@
          deptCheckStrictly: true,
          remark: undefined
        };
      this.resetForm("form");
      this.resetForm("elForm");
    },
    /** 搜索按钮操作 */
    handleQuery() {
@@ -493,56 +665,156 @@
        }
      });
    },

getRowId(row)
    {
      return row.id
    },

    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
    },
    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.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);

         }
      }
    },
    /** 提交按钮（数据权限） */
    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) {

          addEquipment(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();
          });
        }
      });
      // 清空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
   handleChange(file, fileList1) {
      //定义一个全局数组uploadFileList来做存储

      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
    // 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;

        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
        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)

        }
        })

        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
        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;
@@ -555,9 +827,39 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      const Ids = this.ids;

      if(Ids.length==0)
      {
      this.download('/zfEquipment/export', {
        ...this.queryParams
      }, `zfEquiment_${new Date().getTime()}.xlsx`)
      }
      else{
        this.download('/zfEquipment/export1/'+Ids, {
        }, `zfEquiment_${new Date().getTime()}.xlsx`)
      }
    },
    handleExportTemplate(){
      this.download('/zfEquipment/model', {

      }, `zfEquiment_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
    handleEnport(params){
      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' })
      }

    }
  }
};
@@ -572,4 +874,10 @@
  background: #FFEFF2;

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