k94314517
2024-10-17 e93b1dddf4f99f83d05688baceeb59cacdd82ec8
Merge remote-tracking branch 'origin/master'
已修改2个文件
6 ■■■■ 文件已修改
admin/src/views/business/deviceEvent.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/system/permission.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/deviceEvent.vue
@@ -77,7 +77,7 @@
        </el-table-column>
        <el-table-column label="抓拍照片" min-width="100px">
          <template slot-scope="{row}">
            <el-image style="width: 80px; height: 80px" :src="row.extEventPictureURL"
            <el-image v-if="row.extEventPictureURL" style="width: 80px; height: 80px" :src="row.extEventPictureURL"
              :preview-src-list="[row.extEventPictureURL]">
            </el-image>
          </template>
admin/src/views/system/permission.vue
@@ -29,8 +29,8 @@
      >
        <el-table-column type="selection" fixed="left" width="55"></el-table-column>
        <el-table-column prop="code" label="权限编码" fixed="left" min-width="200px"></el-table-column>
        <el-table-column prop="name" label="权限名称" fixed="left" min-width="120px"></el-table-column>
        <el-table-column prop="remark" label="权限备注" min-width="120px"></el-table-column>
        <el-table-column prop="name" label="权限名称" fixed="left" min-width="200px"></el-table-column>
        <el-table-column prop="remark" label="权限备注" min-width="200px"></el-table-column>
        <el-table-column prop="createUser" label="创建人" min-width="100px">
          <template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
        </el-table-column>