Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2023-09-10 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1

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

@@ -1,13 +1,18 @@
<template>
  <div class="app-container">
  <div class="app-container" id="printable-content">
    <div class="form-header mt">
      <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
        <span>家庭设备详情</span>
        <div   style="display: flex; align-items: center;">
          <el-button size="mini" type="text"  @click="checkNote()" v-hasPermi="['person:information:memo']">
          <el-button size="mini" type="text"  v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
            <div class="form" ><el-icon  style="padding-right:110px;"></el-icon>
              <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">备忘本</span></div>
          </el-button>
          <el-button size="mini" type="text"  @click="print()" v-hasPermi="['person:information:memo']">
            <div class="form" ><el-icon  style="padding-right:110px;"></el-icon>
              <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">打印</span></div>
          </el-button>
        </div>
      </h1>
@@ -46,9 +51,12 @@
      <el-form-item label="备注" prop="remark">
        <el-input v-model="formData.remark" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="是否是本家庭记录" prop="ownData">
        <el-input  v-model="formData.ownData=== 1 ? '是':'否'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
      </el-form-item>


      <h4 class="form-header">电子文件 </h4>
      <h4 class="form-header">相关图片 </h4>
      <el-upload
        action="#"
        list-type="picture-card"
@@ -56,7 +64,8 @@
        :http-request="requestUpload"
        :file-list="fileList"
      >
        <i slot="default" class="el-icon-plus"></i>
        <div v-if="uploading" class="upload-status">正在上传...</div>
        <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
        <div slot="file" slot-scope="{file}">
          <img
            class="el-upload-list__item-thumbnail"
@@ -66,29 +75,29 @@
            fit="cover"
            :preview-src-list="[file.url]"
          >
          <span class="el-upload-list__item-actions" >
            <span
          <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
          class="el-upload-list__item-preview"
          @click="handlePictureCardPreview(file)"
        >
          <i class="el-icon-zoom-in"></i>
        </span>
        <span

              class="el-upload-list__item-delete"
              @click="handleDownload(file.url)"
            >
              <i class="el-icon-download"></i>
            </span>
            <span
              v-if="isShow"
              class="el-upload-list__item-delete"
              @click="handleRemove(file)"
            >
              <i class="el-icon-delete"></i>
            </span>
          </span>
          class="el-upload-list__item-delete"
          @click="handleDownload(file.url)"
        >
          <i class="el-icon-download"></i>
        </span>
        <span
          v-if="isShow"
          class="el-upload-list__item-delete"
          @click="handleRemove(file)"
        >
          <i class="el-icon-delete"></i>
        </span>
      </span>


        </div>
@@ -107,7 +116,8 @@
        :show-file-list="true"
      >

        <i slot="default" class="el-icon-plus"></i>
        <div v-if="uploading" class="upload-status">正在上传...</div>
        <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
        <div slot="file" slot-scope="{file}">
          <img
            class="el-upload-list__item-thumbnail"
@@ -178,6 +188,7 @@
      dsb:true,
      btn:false,
      isShow:true,
      uploading: false,
      formData: {

        name: undefined,
@@ -255,7 +266,7 @@
    else{
      document.title = "家庭设备详细信息";
      this.$route.meta.title = "家庭设备详细信息";//列表的名称
      this.isShow=true
      this.isShow=false
    }

    let _this = this
@@ -385,6 +396,28 @@
      this.dsb = false
      this.btn = true
    },
    //打印
    print()
    {

      setTimeout(() => {
        // 获取待打印的内容
            let printableContent = document.getElementById('printable-content').innerHTML;
            console.log(printableContent)
            // 创建一个新的窗口并加载打印内容
            let printWindow = window.open('', '_blank');
            printWindow.document.write('<html><head><title>打印内容</title></head><body>' + printableContent + '</body></html>');

            // 执行打印操作
            printWindow.document.close();

            // 如果内容中有图片或其他需要一定时间加载的，请使用注释中的延时打印

              printWindow.print()
            }, 1000)
         //   printWindow.print();

    },
    //查看备忘本
    checkNote(row){

@@ -398,10 +431,11 @@
      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})