提交了修改

feige

2024-02-02 bd40473c9c634005bc7e62e7fc901bcd8b598fa0

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

@@ -5,7 +5,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;"
@@ -118,7 +118,7 @@
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
      <el-col :span="1.2">
      <el-col :span="1.5">

        <el-upload
          action=""
@@ -129,7 +129,7 @@
        >
          <el-button size="mini"   type="primary"
                     plain
                     icon="el-icon-plus" >导入</el-button>
                   icon="el-icon-top" >导入</el-button>

        </el-upload>
      </el-col>
@@ -187,12 +187,14 @@
            ></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">
          <el-button
          <div class="button-container">
            <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
                :disabled="!scope.row.ownData"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:role:edit']"
          >修改</el-button>
@@ -200,6 +202,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
                :disabled="!scope.row.ownData"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
@@ -207,6 +210,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 +379,9 @@
      // 日期范围
      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:[
@@ -506,13 +512,20 @@
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      let _this = this
      listEquipment(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.equipmentList = response.data.data;
          if(response.msg=="您没加入到对应的家庭，请联系管理员")
          {
              _this.$modal.msgSuccess("您没加入到对应的家庭，请联系管理员");
              _this.loading = false;
          }else{
          _this.equipmentList = response.data.data;

          this.total = response.data.total;
          this.loading = false;
          _this.total = response.data.total;
          _this.loading = false;
          }
        }
      );
    },
@@ -732,4 +745,10 @@
  background: #FFEFF2;

}
.el-table__cell {
  font-size: 14px; /* 设置字体大小 */
}
.button-container {
  display: inline-flex; /* 设置按钮容器为行内元素 */
}
</style>