修改了一些bug

feige

2024-08-23 52bbd96db03f32b8d750622116d2b7720eed3d51

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

@@ -4,7 +4,7 @@

    <el-button class="button1" size="mini" type="text"  @click="handleAdd"  v-hasPermi="['system:role:add']">
      <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
    <el-table v-loading="loading" :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
    <el-table v-loading="loading" border :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>

      <el-table-column label="时间" prop="happenTime" sortable width="180px" align="center">
@@ -141,7 +141,7 @@
            ></video>
            <img v-else
                 class="el-upload-list__item-thumbnail"
                 :src="file.url"
                 src="../../assets/images/deviceLis.png"
                 alt=""
                 style="width: 100%; height: 100%"
                 fit="cover">
@@ -283,7 +283,7 @@
              ></video>
              <img v-else
                   class="el-upload-list__item-thumbnail"
                   :src="file.url"
                   src="../../assets/images/deviceLis.png"
                   alt=""
                   style="width: 100%; height: 100%"
                   fit="cover">
@@ -363,7 +363,7 @@
        id:undefined,
        content: undefined,
        happenTime: undefined,
        fid:2007,
        fid:2017,
        cid:undefined,
        url:''
      },
@@ -383,7 +383,7 @@
        id:undefined,
        content: undefined,
        happenTime: undefined,
        fid:2007,
        fid:2017,
        cid:undefined,
        url:''},
      // 弹出层标题
@@ -415,7 +415,7 @@
        id:undefined,
        content: undefined,
        happenTime: undefined,
        fid:2007,
        fid:2017,
        cid:undefined,
        url:''
      },
@@ -469,7 +469,7 @@

    const cid = this.$route.params && this.$route.params.id;

    this.getList(2007,cid);
    this.getList(2017,cid);

  },
  methods: {
@@ -526,8 +526,8 @@
          formData.append("files", elem)
       })
    const cid = this.$route.params && this.$route.params.id;
      const fid =2007;
      this.formDat.fid = 2007;
      const fid =2017;
      this.formDat.fid = 2017;
      this.formDat.cid = parseInt(cid) ;
       let _this = this

@@ -562,8 +562,8 @@
    submitDataScope6: function() {

      const cid = this.$route.params && this.$route.params.id;
      const fid =2007;
      this.formDat.fid = 2007;
      const fid =2017;
      this.formDat.fid = 2017;
      this.formDat.cid = cid ;
      // console.log(this.formDat,'formDatformDatformDatformDat')
      // console.log(this.isEdit1)
@@ -587,7 +587,7 @@
                this.handleRemoveFile(this.fileListOther[0]);
              }
              this.isEdit1 = false;
              this.getList(2007,cid);
              this.getList(2017,cid);
            }).catch(error => {
              console.log(error,'erroerro1');
              this.isEdit1 = false;
@@ -612,7 +612,7 @@
              for(let i = 0; i < this.fileListOther.length; i++){
                this.handleRemoveFile(this.fileListOther[0]);
              }
              this.getList(2007,cid);
              this.getList(2017,cid);
            }).catch(error => {
              console.log(error,'erroerro2');
              this.open = false;
@@ -693,7 +693,7 @@
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

      listNote(cid, 2007).then(response => {
      listNote(cid, 2017).then(response => {
          this.memoList = response.data;
          // console.log(response,'formDataformDataformDataformDataformData')
          this.loading = false;
@@ -890,7 +890,7 @@
    },
    /** 搜索按钮操作 */
    handleQuery() {
      const fid = 2007;
      const fid = 2017;
      const cid = this.$route.params && this.$route.params.id;
      this.queryParams.pageNum = 1;
      this.getList(fid,cid);
@@ -960,14 +960,14 @@
    /** 提交按钮（数据权限） */
    submitDataScope: function() {
      const cid = this.$route.params && this.$route.params.id;
      const fid =2007;
      const fid =2017;
      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.fid = 2007;
      this.formDat.fid = 2017;
      this.formDat.cid = cid ;
      this.formDat.url = ul+","+uls

@@ -981,7 +981,7 @@
            Object.keys(this.formDat).forEach(key => {
              this.formDat[key] = '';
            });
            this.getList(2007,cid);
            this.getList(2017,cid);

          });
        }
@@ -1012,7 +1012,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const id = row.id || this.id;
      const fid = 2007;
      const fid = 2017;
      const cid = this.$route.params && this.$route.params.id;
      this.$modal.confirm('是否确认删除所选数据项？').then(function() {
        return delNote(id);