feige
2023-12-05 d80a5794d029c8a5fe58a80464ab0e1ae097c87c
ruoyi-ui/src/views/note/index.vue
@@ -66,7 +66,7 @@
      <el-form-item label="发生时间"  prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width: 200px;
          style="width: 240px;
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
@@ -129,7 +129,7 @@
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
      <el-col :span="1.2">
      <el-col :span="1.5">
        <el-upload
          action=""
          class="upload-demo"
@@ -138,7 +138,7 @@
        >
          <el-button size="mini"   type="primary"
                     plain
                     icon="el-icon-plus" >导入</el-button>
                    icon="el-icon-top" >导入</el-button>
        </el-upload>
      </el-col>
@@ -188,8 +188,9 @@
            ></div>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <div class="button-container">
          <el-button
            size="mini"
            type="text"
@@ -208,6 +209,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>
@@ -375,7 +377,10 @@
      // 日期范围
      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:[
@@ -485,14 +490,21 @@
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      // console.log(this.queryParams)
      let _this = this
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listProperty(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.propertyList = response.data.data;
        if(response.msg=="您没加入到对应的家庭,请联系管理员")
        {
            _this.$modal.msgSuccess("您没加入到对应的家庭,请联系管理员");
            _this.loading = false;
        }else{
          _this.propertyList = response.data.data;
          this.total = response.data.total;
          this.loading = false;
          _this.total = response.data.total;
          _this.loading = false;
        }
        }
      );
    },
@@ -709,7 +721,7 @@
};
</script>
<style>
<style scoped="">
.el-table__row.statistics-warning-row {
  background: #E0EEFE;
@@ -718,4 +730,10 @@
  background: #FFEFF2;
}
.el-table__cell {
  font-size: 14px; /* 设置字体大小 */
}
.button-container {
  display: inline-flex; /* 设置按钮容器为行内元素 */
}
</style>