ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -19,8 +19,8 @@
        <el-form-item label="设备名称" prop="name">
          <el-input v-model="formData.name" placeholder="请输入设备名称" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>
        <el-form-item label="时间" prop="createDate">
          <el-input v-model="formData.createDate" placeholder="请输入时间" clearable :style="{width: '100%'}" :disabled="dsb">
        <el-form-item label="时间" prop="happenTime">
          <el-input v-model="formData.happenTime" placeholder="请输入时间" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
        <el-form-item label="购买人" prop="buyer">
@@ -92,25 +92,57 @@
        </el-upload>
        <h4 class="form-header">其他附件 </h4>
        <el-upload
          action=""
          :file-list="fileListOther"
          class="upload-demo"
          multiple
          :on-preview="handlePreview"
      <el-upload
              action=""
              :file-list="fileListOther"
              class="upload-demo"
              multiple
              list-type="picture-card"
              :on-preview="handleFileCardPreview"
              :on-remove="handleRemove"
              :http-request="requestUpload"
              :show-file-list="true"
            >
          :on-remove="handleRemove"
          :http-request="requestUpload"
          :show-file-list="true"
        >
          <el-button type="primary">上传附件</el-button>
          <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>
                <i slot="default" class="el-icon-plus"></i>
                <div slot="file" slot-scope="{file}">
                  <img
                    class="el-upload-list__item-thumbnail"
                    src="../../assets/401_images/401.gif"
                    alt=""
                    style="width: 147px; height: 147px"
                    fit="cover"
                  >
                  <span class="el-upload-list__item-actions">
                  <span
                    class="el-upload-list__item-preview"
                    @click="handleFileCardPreview(file)"
                  >
                    <i class="el-icon-zoom-in"></i>
                  </span>
                  <span
      v-if="!disabled"
                    @click="handleRemove(file)"
                    class="el-upload-list__item-delete"
                  >
                    <i class="el-icon-download"></i>
                  </span>
                  <span
                    v-if="!disabled"
                    class="el-upload-list__item-delete"
                    @click="handleRemoveFile(file)"
                  >
                    <i class="el-icon-delete"></i>
                  </span>
                </span>
        </el-upload>
                </div>
            </el-upload>
        <el-form-item size="large">
          <el-button type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
@@ -154,7 +186,9 @@
          remark: undefined,
          familyId:undefined,
          url: undefined,
          happenTime:undefined
        },
        desurl:'',
        dialogImageUrl: '',
        dialogVisible: false,
        disabled: false,
@@ -164,7 +198,7 @@
          //   message: '请输入id',
          //   trigger: 'blur'
          // }],
          createDate: [{
          happenTime: [{
            required: true,
            message: '请选择时间',
            trigger: 'change'
@@ -312,12 +346,26 @@
          saveAs(blob, filename)
        })
      },
      handleRemoveFile(file) {
        alert(23)
      },
      handleRemove(file) {
        alert(323)
      },
  handleRemoveFile(file) {
    for(let i = 0; i < this.fileListOther.length; i++)
    {
      if(this.fileListOther[i].url==file.url)
        this.$delete(this.fileListOther,i);
    }
  },
  handleRemove(file) {
    for(let i = 0; i < this.fileList.length; i++)
    {
      if(this.fileList[i].url==file.url)
        this.$delete(this.fileList,i);
    }
  },
  handleFileCardPreview(file){
    this.dialogFileUrl = file.url;
    const Base64 = require('js-base64').Base64
    this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
    var myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
  },
      handlePictureCardPreview(file) {
        this.dialogImageUrl = file.url;
        this.dialogVisible = true;