修改家庭设备bug

linwenling

2023-05-16 579fcaaeb4f3d55b3137445055f4a27af0773c8c

修改家庭设备bug

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

@@ -1,435 +1,425 @@
<template>
    <div class="app-container">
      <div class="form-header mt">
        <h4 class="dt h4">家庭设备详情 </h4>
        <el-button type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" :disabled="btn">编辑</el-button>
      </div>
  <!-- 名称、时间、购买人、内容、地点、备注 -->
      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" >
        <!-- <el-form-item label="id" prop="id">
          <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"
                    clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
        </el-form-item> -->
        <!-- <el-form-item label="类别" prop="type">
          <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}" :disabled="dsb" >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                       :disabled="item.disabled"></el-option>
          </el-select>
        </el-form-item> -->
        <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="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">
          <el-input v-model="formData.buyer" placeholder="请输入购买人" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
        <el-form-item label="事项内容" prop="content">
          <el-input v-model="formData.content" placeholder="请输入事项内容" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
        <el-form-item label="存放地点" prop="location">
          <el-input v-model="formData.location" placeholder="请输入存放地址" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
  <div class="app-container">
    <div class="form-header mt">
      <h4 class="dt h4">家庭设备详情 </h4>


        <el-form-item label="家庭号" prop="familyId">
        <el-input v-model="formData.familyId" placeholder="请输入家庭号" :maxlength="11" show-word-limit :disabled="true"
          clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
      </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>


        <h4 class="form-header">相关图片 </h4>
        <el-upload
          action="#"
          list-type="picture-card"
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
        >
          <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: 147px; height: 147px"
              fit="cover"
              :preview-src-list="[file.url]"
            >
            <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="handleDownload(file.url)"
          >
            <i class="el-icon-download"></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>

        <h4 class="form-header">其他附件 </h4>
      <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"
            >

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


                </div>


            </el-upload>


        <el-form-item size="large">
          <el-button type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
        </el-form-item>
      </el-form>

      <el-dialog  :visible.sync="dialogVisible">
        <img w-full :src="dialogImageUrl" alt="Preview Image" />
      </el-dialog>
    </div>
  </template>
  <script>
  import { getEquipmentInfo, updateEquipment, uploadPic, download} from "@/api/device/index";
  import {addRole, updateRole} from "@/api/system/role";
  import {blobValidate} from "@/utils/ruoyi";
  import errorCode from "@/utils/errorCode";
  import {Message} from "element-ui";
    <!-- 名称、时间、购买人、内容、地点、备注 -->
    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" >

  export default {
    components: {},
    props: [],
    data() {
      return {
        cdi:"家庭设备信息",
        udi:"家庭设备修改",
        fot:[".jpg",".jif"],
        fileList:[
        ],
        fileListOther:[
      <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="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">
        <el-input v-model="formData.buyer" placeholder="请输入购买人" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="事项内容" prop="content">
        <el-input v-model="formData.content" placeholder="请输入事项内容" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="存放地点" prop="location">
        <el-input v-model="formData.location" placeholder="请输入存放地址" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="是否注销" prop="status">
        <el-select v-model="formData.status=== 1 ? '是':'否'" placeholder="请选择是否注销" clearable :style="{width: '100%'}" :disabled="dsb" >
        </el-select>
      </el-form-item>

        ],
        dsb:true,
        btn:false,
        formData: {
          id: undefined,
          // type: undefined,
          name: undefined,
          location: undefined,
          buyer: undefined,
          content: undefined,
          remark: undefined,
          familyId:undefined,
          url: undefined,
          happenTime:undefined
        },
        desurl:'',
        dialogImageUrl: '',
        dialogVisible: false,
        disabled: false,
        rules: {
          // id: [{
          //   required: true,
          //   message: '请输入id',
          //   trigger: 'blur'
          // }],
          happenTime: [{
            required: true,
            message: '请选择时间',
            trigger: 'change'
          }],
          name: [{
            required: true,
            message: '请输入设备名称',
            trigger: 'blur'
          }],
          familyId: [{
            required: true,
            message: '请输入家庭号',
            trigger: 'blur'
          }],
          buyer: [{
            required: true,
            message: '请输入购买人',
            trigger: 'blur'
          }],
          location: [{
            required: true,
            message: '请输入存放地点',
            trigger: 'blur'
          }],
          familyId: [{
            required: true,
            message: '请输入家庭号',
            trigger: 'blur'
          }],
          content:[{
            required: true,
            message: '请输入事项内容',
            trigger: 'blur'
         } ],
          remark: [{
            required: true,
            message: '请输入备注',
            trigger: 'blur'
          }],
      <!-- <el-form-item label="家庭号" prop="familyId">
      <el-input v-model="formData.familyId" placeholder="请输入家庭号" :maxlength="11" show-word-limit :disabled="true"
        clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
    </el-form-item> -->
      <el-form-item label="备注" prop="remark">
        <el-input v-model="formData.remark" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>

        },
        typeOptions: [],

      <h4 class="form-header">相关图片 </h4>
      <el-upload
        action="#"
        list-type="picture-card"
        multiple
        :http-request="requestUpload"
        :file-list="fileList"
      >
        <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: 147px; height: 147px"
            fit="cover"
            :preview-src-list="[file.url]"
          >
          <span class="el-upload-list__item-actions">
        <span
          v-if="isShow"
          class="el-upload-list__item-preview"
          @click="handlePictureCardPreview(file)"
        >
          <i class="el-icon-zoom-in"></i>
        </span>
        <span
          v-if="isShow"
          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>
      </el-upload>

      <h4 class="form-header">其他附件 </h4>
      <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"
      >

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

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


        </div>


      </el-upload>

      <el-form-item size="large">
        <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
      </el-form-item>
    </el-form>

    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl" alt="Preview Image" />
    </el-dialog>
  </div>
</template>
<script>
import { getEquipmentInfo, updateEquipment, uploadPic, download} from "@/api/device/index";
import {addRole, updateRole} from "@/api/system/role";
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";

export default {
  components: {},
  props: [],
  data() {
    return {
      cdi:"家庭设备信息",
      udi:"家庭设备修改",
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[

      ],
      dsb:true,
      btn:false,
      isShow:true,
      formData: {

        name: undefined,
        location: undefined,
        buyer: undefined,
        content: undefined,
        remark: undefined,
        status:undefined,
        url: undefined,
        happenTime:undefined
      },
      desurl:'',
      dialogImageUrl: '',
      dialogVisible: false,
      disabled: false,
      rules: {

        happenTime: [{
          required: true,
          message: '请选择时间',
          trigger: 'change'
        }],
        status: [{
          required: true,
          message: '请选择是否注销',
          trigger: 'change'
        }],
        name: [{
          required: true,
          message: '请输入设备名称',
          trigger: 'blur'
        }],

        buyer: [{
          required: true,
          message: '请输入购买人',
          trigger: 'blur'
        }],
        location: [{
          required: true,
          message: '请输入存放地点',
          trigger: 'blur'
        }],

        content:[{
          required: true,
          message: '请输入事项内容',
          trigger: 'blur'
        } ],
        remark: [{
          // required: true,
          message: '请输入备注',
          trigger: 'blur'
        }],

      },
      typeOptions: [],
    }
  },
  //在created（）中调用接口，拿到数据
  computed: {},
  watch: {},
  created() {
    const id = this.$route.params && this.$route.params.id;
    let jd;
    if(this.$route.query.detail!=undefined)
    {
      jd =  this.$route.query.detail
      this.btn= jd
      this.dsb = !jd
      this.isShow=true
      document.title = "修改家庭设备详细信息";
      this.$route.meta.title = "修改家庭设备详细信息";//列表的名称
    }
    else{
      document.title = "查看家庭设备详细信息";
      this.$route.meta.title = "查看家庭设备详细信息";//列表的名称
      this.isShow=false
    }

    let _this = this
    if (id) {
      this.loading = true;
      getEquipmentInfo(id).then((response) => {

        this.formData = response.data;
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {
          if(paths[i]!="") {

            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)

            if (_this.fot.includes(pth) === true)
              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            else {
              // alert(paths[i])
              let nms = paths[i].split("\/")
              let nm = nms[nms.length - 1]
              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            }
          }
        }
        this.loading = false;
      });
      // this.getCateInfor()

    }
  },
  mounted() {},
  methods: {
    /** 查询类别信息 */
    // getCateInfor()
    // {
    //   let _this = this
    //   getCategory().then(response=>{

    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
    //     })
    //   })
    // },
    submitForm() {
      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.formData.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {


        if (valid) {
          if (this.formData.id != undefined) {
            updateEquipment(this.formData).then(response => {
              this.$modal.msgSuccess("修改成功");
              // this.open = false;
              this.btn=false
            });
          } else {
            this.$modal.msgSuccess("修改失败");

          }
        }
      })
    },
    resetForm() {
      this.$refs['elForm'].resetFields()
    },
    handlePreview(file)
    {
      let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
      let lens = formData.path.split(".")
      let suffix = lens[lens.length-1]
      download(formData).then(async (response) => {
        const isLogin = await blobValidate(response);
        let nt = new Date().getTime()
        let filename = 'equipment_'+nt+'.'+suffix
        const blob = new Blob([response])
        saveAs(blob, filename)
      })
    },
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
          this.$delete(this.fileListOther,i);
      }
    },
    //在created（）中调用接口，拿到数据
    computed: {},
    watch: {},
    created() {
      const id = this.$route.params && this.$route.params.id;
      let jd;
      if(this.$route.query.detail!=undefined)
    handleRemove(file) {
      for(let i = 0; i < this.fileList.length; i++)
      {
        jd =  this.$route.query.detail
        this.btn= jd
        this.dsb = !jd
        document.title = "修改家庭设备详细信息";
        this.$route.meta.title = "修改家庭设备详细信息";//列表的名称
        if(this.fileList[i].url==file.url)
          this.$delete(this.fileList,i);
      }
      else{
        document.title = "查看家庭设备详细信息";
        this.$route.meta.title = "查看家庭设备详细信息";//列表的名称
      }
    },
    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;
    },
    //点击下载函数
    handleDownload(url) {
      var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};

      let lens = formData.path.split(".")
      let suffix = lens[lens.length-1]
      download(formData).then(async (response) => {
        const isLogin = await blobValidate(response);
        let nt = new Date().getTime()
        let filename = 'equipment_'+nt+'.'+suffix
        const blob = new Blob([response])
        saveAs(blob, filename)
      })
    },
    handleEdit()
    {
      this.dsb = false
      this.btn = true
    },
    requestUpload(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this
      if (id) {
        this.loading = true;
        getEquipmentInfo(id).then((response) => {

          this.formData = response.data;
          let paths = response.data.url.split(",");
          for(let i = 0; i < paths.length; i++)
          {
            if(paths[i]!="") {
      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

              let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})

              if (_this.fot.includes(pth) === true)
                _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
              else {
                // alert(paths[i])
                let nms = paths[i].split("\/")
                let nm = nms[nms.length - 1]
                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
              }
            }
          }
          this.loading = false;
        });
        // this.getCateInfor()
        }

      }
    },
    mounted() {},
    methods: {
      /** 查询类别信息 */
      // getCateInfor()
      // {
      //   let _this = this
      //   getCategory().then(response=>{
        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

      //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
      //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
      //     })
      //   })
      // },
      submitForm() {
        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.formData.url = ul+","+uls

        this.$refs['elForm'].validate(valid => {


          if (valid) {
            if (this.formData.id != undefined) {
              updateEquipment(this.formData).then(response => {
                this.$modal.msgSuccess("修改成功");
                // this.open = false;
                this.btn=false
              });
            } else {
              this.$modal.msgSuccess("修改失败");

            }
          }
        })
      },
      resetForm() {
        this.$refs['elForm'].resetFields()
      },
      handlePreview(file)
      {
        let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
        let lens = formData.path.split(".")
        let suffix = lens[lens.length-1]
        download(formData).then(async (response) => {
          const isLogin = await blobValidate(response);
          let nt = new Date().getTime()
          let filename = 'equipment_'+nt+'.'+suffix
          const blob = new Blob([response])
          saveAs(blob, filename)
        })
      },
  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;
      },
      //点击下载函数
      handleDownload(url) {
        var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};

        let lens = formData.path.split(".")
        let suffix = lens[lens.length-1]
        download(formData).then(async (response) => {
          const isLogin = await blobValidate(response);
          let nt = new Date().getTime()
          let filename = 'equipment_'+nt+'.'+suffix
          const blob = new Blob([response])
          saveAs(blob, filename)
        })
      },
      handleEdit()
      {
        this.dsb = false
        this.btn = true
      },
      requestUpload(params)
      {
        var file = params.file;
        var formData = new FormData();
        formData.append('uploadFile', file);
        let _this = this

        uploadPic(formData).then(response => {
          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

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

          }

          else{
            _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

          }
        })

      }
        }
      })

    }
  }

  </script>
  <style>
  .mt
  {
    position: relative;
  }
  .dt{
    display: block;

  }
  .pt{
    right: 10px;
    top:-3px;
    display: block;
    position: absolute;
  }
  </style>
}

</script>
<style>
.mt
{
  position: relative;
}
.dt{
  display: block;

}
.pt{
  right: 10px;
  top:-3px;
  display: block;
  position: absolute;
}
</style>

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

@@ -13,6 +13,15 @@
          end-placeholder="结束日期"
        ></el-date-picker>
      </el-form-item>
      <el-form-item label="设备名称" prop="name" >
        <el-input
          v-model="queryParams.name"
          placeholder="请输入设备名称"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="购买人" prop="buyer" >
        <el-input
          v-model="queryParams.buyer"
@@ -33,10 +42,10 @@

      </el-form-item>

      <el-form-item label="事项内容" prop="content">
      <el-form-item label="标题" prop="content">
        <el-input
          v-model="queryParams.content"
          placeholder="请输入事项内容"
          placeholder="请输入标题"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
@@ -104,8 +113,8 @@
          :http-request="handleEnport"
        >
          <el-button size="mini"   type="primary"
          plain
          icon="el-icon-plus" >导入</el-button>
                     plain
                     icon="el-icon-plus" >导入</el-button>

        </el-upload>
      </el-col>
@@ -120,36 +129,42 @@
      <el-table-column label="设备名称" prop="name" sortable width="120" />

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

      <el-table-column label="购买人" prop="buyer" sortable width="100" />
      <el-table-column label="事项内容" prop="content" sortable :show-overflow-tooltip="true" width="150" />
      <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="familyId" sortable width="100" />

      <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="url" width="160" >
           <template slot-scope="scope" >
             <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"
             >
           </template>
        </el-table-column>
        <template slot-scope="scope" >
          <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 !== ','"
          >
          <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 === ','"
          >
        </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
@@ -192,17 +207,12 @@
          <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-form-item label="发生时间" prop="happenTime">
          <el-date-picker
            v-model='formDat.createDate'
            v-model='formDat.happenTime'
            type='date'
            placeholder='选择日期'
          ></el-date-picker>

        </el-form-item>


@@ -211,16 +221,18 @@
          <el-input v-model="formDat.buyer" placeholder="请输入购买人" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="事项内容" prop="content">
        <el-form-item label="标题" prop="content">
          <el-input v-model="formDat.content" placeholder="请输入事项内容" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="存放地点" prop="location">
          <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>
@@ -359,6 +371,7 @@
        remark: undefined,
        familyId:undefined,
        url: undefined,
        status:undefined,
      },
      // 菜单列表
      menuOptions: [],
@@ -386,6 +399,12 @@
          message: '请输入设备名称',
          trigger: 'blur'
        }],
        status: [{
          required: true,
          message: '是否注销',
          trigger: 'change'
        }],


        buyer: [{
          required: true,
@@ -397,28 +416,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: 'change'
        }],
        content: [{
          required: true,
          message: '请选择事项内容',
          message: '请输入标题',
          trigger: 'blur'
        }],
      },
      typeOptions: [],
      typeOptions: [{
        value: '1',
        label: '是',
      },
        {
          value: '0',
          label: '否',
        }],
    };
  },
  created() {
@@ -427,6 +449,15 @@

  },
  methods: {

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

    // 取消按钮
    cancelData() {
      this.open = false;
@@ -606,18 +637,18 @@
    },
    /** 导入操作*/
    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' })
      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' })
      }

    }
  }