zhanghua
2022-11-29 8a5227c2e5a898004eda1f61180e076ec089fe85
图片显示优化
3个文件已修改
449 ■■■■■ 已修改文件
src/components/myUpload/index.vue 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/images/index.vue 215 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/images/updateUser/index.vue 158 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/myUpload/index.vue
@@ -2,7 +2,11 @@
    <div class="my-upload">
      <div v-if="pictureList.length > 0" class="image-box">
        <div v-for="image in pictureList" class="image-box-item">
          <i v-if="isShowUpload" @click="handleDeletePicture(image)" class="el-icon-delete image-delete-icon"></i>
        <i
          v-if="isShowUpload"
          @click="handleDeletePicture(image)"
          class="el-icon-delete image-delete-icon"
        ></i>
          <el-image :key="image" class="image-content" :src="image" ></el-image>
        </div>
      </div>
@@ -17,7 +21,8 @@
        :on-success="handleSuccess"
        :on-error="handleError" 
        :list-type="listType"
        :headers="getToken()">
      :headers="getToken()"
    >
          <div class="upload-btn">
            <i class="el-icon-plus"></i>
            <span>上传图片</span>
@@ -38,67 +43,69 @@
            // 限制
            limit: 4,
            // 文件列表类型
            listType: 'picture-card'
      listType: "picture-card",
        };
    },
    methods: {
        // 上传之前回调
        beforeUpload(rawFile) {
            if (rawFile.type !== 'image/png' && rawFile.type !== 'image/svg+xml' && rawFile.type !== 'image/jpg' && rawFile.type !== 'image/jpeg') {
                this.$message.error('图片必须是 jpg/svg/jpeg/png 格式!')
                return false
      if (
        rawFile.type !== "image/png" &&
        rawFile.type !== "image/svg+xml" &&
        rawFile.type !== "image/jpg" &&
        rawFile.type !== "image/jpeg"
      ) {
        this.$message.error("图片必须是 jpg/svg/jpeg/png 格式!");
        return false;
            } else if (rawFile.size / 1024 / 1024 > 5) {
                this.$message.error('上传图片不能超过 5MB!')
                return false
        this.$message.error("上传图片不能超过 5MB!");
        return false;
            }
            return true
      return true;
        },
        // 上传成功回调
        handleSuccess(res, file, filelist) {
            if(res.data.url1){
                this.$emit('setPictureUrl',{url:res.data.url1});
            }
            else if(res.data.url2){
                this.$emit('setPictureUrl',{url:res.data.url2});
            }
            else if(res.data.url3){
                this.$emit('setPictureUrl',{url:res.data.url3});
            }
            else{
                this.$emit('setPictureUrl',{url:res.data.url4});
        this.$emit("setPictureUrl", { url: res.data.url1 });
      } else if (res.data.url2) {
        this.$emit("setPictureUrl", { url: res.data.url2 });
      } else if (res.data.url3) {
        this.$emit("setPictureUrl", { url: res.data.url3 });
      } else {
        this.$emit("setPictureUrl", { url: res.data.url4 });
            }
        },
        // 上传失败回调
        handleError(err, file, fileList) {
            this.$message({
                type:'error',
                message:err
            })
        type: "error",
        message: err,
      });
        },
        // 获取token
        getToken() {
            const token = sessionStorage.getItem('token');
            const tokenHead = sessionStorage.getItem('tokenHead');
      const token = sessionStorage.getItem("token");
      const tokenHead = sessionStorage.getItem("tokenHead");
            if (token && tokenHead) {
                return { Authorization: tokenHead + token }
        return { Authorization: tokenHead + token };
            }
        },
        handleDeletePicture(imageUrl) {
          this.$emit('delPictureUrl', { url: imageUrl });
        }
      this.$emit("delPictureUrl", { url: imageUrl });
    },
    },
    props: {
      pictureList: {
        type: Array,
        default: () => []
      default: () => [],
      },
      isShowUpload: {
        type: Boolean,
        default: () => true
      }
      default: () => true,
    },
}
  },
};
</script>
<style lang="scss" scoped>
.my-upload {
@@ -131,6 +138,7 @@
  }
  .image-box {
    display: flex;
    flex-wrap: wrap;
    height: 100px;
    margin: 0 10px;
@@ -144,10 +152,12 @@
      left: calc(100% - 50px);
      opacity: 0;
    }
    .image-box-item {
      padding: 0px 10px;
    }
    .image-box-item:hover {
      color: #ffffff;
      opacity: .5;
      opacity: 0.5;
      .image-delete-icon {
        z-index: 2;
        opacity: 1;
src/views/operate/images/index.vue
@@ -15,31 +15,53 @@
                          value-format="yyyy-MM-dd HH:mm:ss"
                          range-separator="至"
                          start-placeholder="开始日期"
                          end-placeholder="结束日期">
              end-placeholder="结束日期"
            >
                      </el-date-picker>
                    </div>
                    <div class="findBtn">
                        <el-button type="primary" @click="getImageResourceList">查询</el-button>
            <el-button type="primary" @click="getImageResourceList"
              >查询</el-button
            >
                    </div>
                    <div class="findBtn">
                        <el-button type="primary" @click="handleUpdateImageResource(null, 'create')">添加图片</el-button>
                    </div>
          <!-- <div class="findBtn">
            <el-button
              type="primary"
              @click="handleUpdateImageResource(null, 'create')"
              >添加图片</el-button
            >
          </div> -->
                </div>
            </div>
        </header>
        <main>
            <div class="mainContent">
                <div class="type-nav">
                    <div @click="changeTypeChecked(item.value)" v-for="item in typeList" :key="item.name"
                        :class="[item.checked ? 'is-active' : '', 'type-item']">{{ item.name }}</div>
          <div
            @click="changeTypeChecked(item.value)"
            v-for="item in typeList"
            :key="item.name"
            :class="[item.checked ? 'is-active' : '', 'type-item']"
          >
            {{ item.name }}
          </div>
                </div>
                <!-- 数据展示 -->
                <el-table ref="multipleTable"
                    :header-cell-style="{ background: '#06122c', 'font-size': '12px', color: '#4b9bb7', 'font-weight': '650', 'line-height': '45px' }"
                    :data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
                    @selection-change="tableChange">
                    <el-table-column type="selection" min-width="5">
                    </el-table-column>
        <el-table
          ref="multipleTable"
          :header-cell-style="{
            background: '#06122c',
            'font-size': '12px',
            color: '#4b9bb7',
            'font-weight': '650',
            'line-height': '45px',
          }"
          :data="tableData"
          style="width: 100%"
          :row-class-name="tableRowClassName"
          @selection-change="tableChange"
        >
          <el-table-column type="selection" min-width="5"> </el-table-column>
                    <el-table-column prop="code" label="所属事件编号" min-width="18">
                    </el-table-column>
                    <el-table-column prop="category" label="问题类别" min-width="8">
@@ -56,14 +78,23 @@
                    </el-table-column>
                    <el-table-column prop="id" label="图片Id" min-width="8">
                    </el-table-column>
                    <el-table-column prop="createTime" label="上传时间" min-width="15" v-if="mystatus === 1">
          <el-table-column
            prop="createTime"
            label="上传时间"
            min-width="15"
            v-if="mystatus === 1"
          >
                    </el-table-column>
                    <el-table-column prop="operation" label="操作" min-width="15">
                        <template slot-scope="scope">
                            <div class="operation">
                                <span @click="handleUpdateImageResource(scope.row, 'view')">查看</span>
                <span @click="handleUpdateImageResource(scope.row, 'view')"
                  >查看</span
                >
                                <span class="line">|</span>
                                <span @click="handleUpdateImageResource(scope.row, 'update')">修改</span>
                <span @click="handleUpdateImageResource(scope.row, 'update')"
                  >修改</span
                >
                                <span class="line">|</span>
                                <span @click="handleDelete(scope.row)">删除</span>
                            </div>
@@ -77,27 +108,52 @@
                  width="40%"
                  :title="getDialogTitle"
                >
                  <updateUser v-if="isShowUploadDialog" @closeDialog="closeDialog" :dialogType="dialogType" :originalData="originalData" />
          <updateUser
            v-if="isShowUploadDialog"
            @closeDialog="closeDialog"
            :dialogType="dialogType"
            :originalData="originalData"
          />
                </el-dialog>
                <div class="tools">
                    <div class="funs">
                        <div class="funsItem funs-sp">
                            <el-checkbox v-model="all" @change="selectAll()">全选</el-checkbox>
              <el-checkbox v-model="all" @change="selectAll()"
                >全选</el-checkbox
              >
                        </div>
                        <div class="funsItem funs-sp">
                            <el-checkbox v-model="unsame" @change="disSame(tableData)">反选</el-checkbox>
              <el-checkbox v-model="unsame" @change="disSame(tableData)"
                >反选</el-checkbox
              >
                        </div>
                        <div class="funsItem">
                            <el-select v-model="myIdx" placeholder="批量操作" @change="selectChange" disabled>
                                <el-option v-for="item in options" :key="item.value" :label="item.label"
                                    :value="item.value" :disabled="item.disabled">
              <el-select
                v-model="myIdx"
                placeholder="批量操作"
                @change="selectChange"
                disabled
              >
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                  :disabled="item.disabled"
                >
                                </el-option>
                            </el-select>
                        </div>
                    </div>
                    <div class="pagination">
                        <el-pagination background :current-page="currentPage" layout="prev, pager, next"
                            :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
            <el-pagination
              background
              :current-page="currentPage"
              layout="prev, pager, next"
              :total="totalNum"
              :page-size="pageSize"
              @current-change="changeCurrentPage"
            >
                        </el-pagination>
                    </div>
                </div>
@@ -115,27 +171,27 @@
    computed: {
      getDialogTitle() {
        if (this.dialogType === 'create') {
          return '创建';
      if (this.dialogType === "create") {
        return "创建";
        }
        if (this.dialogType === 'update') {
          return '更新';
      if (this.dialogType === "update") {
        return "更新";
        }
        if (this.dialogType === 'view') {
          return '查看';
      if (this.dialogType === "view") {
        return "查看";
        }
      }
    },
    },
    data() {
      return {
            isShowUploadDialog:false,
            dialogType: 'create',
      dialogType: "create",
            originalData: null,
            type: '',
            size: '',
      type: "",
      size: "",
            importTime: null,
            tableData: [],
            dialogUpload: false,
@@ -153,44 +209,44 @@
            options: [
                {
                    value: 0,
                    label: '批量操作',
          label: "批量操作",
                    disabled: true,
                },
                {
                    value: 1,
                    label: '批量启用',
          label: "批量启用",
                },
                {
                    value: 2,
                    label: '批量禁用',
          label: "批量禁用",
                },
                {
                    value: 3,
                    label: '批量删除',
                }
          label: "批量删除",
        },
            ],
            tempList: [],
            typeList: [
                {
                    name: '摄像头推送',
          name: "摄像头推送",
                    value: 1,
                    checked: true
          checked: true,
                },
                {
                    name: '单兵推送',
          name: "单兵推送",
                    value: 2,
                    checked: false,
                },
            ],
            mystatus: 1,
            caseId: '',
      caseId: "",
            caseCode: null,
            dialogAdd: false,
            datePicked: null,
        }
    };
    },
    created() {
      this.size = this.typeList.find(item => item.checked).value;
    this.size = this.typeList.find((item) => item.checked).value;
      this.getImageResourceList();
    },
    methods: {
@@ -203,12 +259,13 @@
        // 批量删除
        mulDelete(idArr) {
          imageManagement.deleteImageResources({ ids: idArr })
      imageManagement
        .deleteImageResources({ ids: idArr })
              .then(() => {
                this.$message.success('操作成功');
          this.$message.success("操作成功");
                this.getImageResourceList();
              })
              .catch(err => this.$message.error(`${err}`))
        .catch((err) => this.$message.error(`${err}`));
        },
        // 执行下拉框操作
        selectChange(list) {
@@ -220,17 +277,17 @@
            } else {
                this.myIdx = this.preMyIdx;
                this.$message({
                    type: 'warning',
                    message: '您还没选中任何数据',
                })
          type: "warning",
          message: "您还没选中任何数据",
        });
            }
        },
        // 监听表格
        tableChange(list) {
            this.tempList = [];
            list.forEach(item => {
      list.forEach((item) => {
                this.tempList.push(item.code);
            })
      });
            this.all = list.length === this.tableData.length;
        },
        // 全选
@@ -239,38 +296,44 @@
        },
        // 反选
        disSame(list) {
            list.forEach(row => {
                this.$refs.multipleTable.toggleRowSelection(row)
            })
      list.forEach((row) => {
        this.$refs.multipleTable.toggleRowSelection(row);
      });
        },
        // 删除单条数据
        handleDelete({ id }) {
            this.$confirm('确认删除?')
      this.$confirm("确认删除?").then(() => {
        imageManagement
          .deleteImageResource({ id: id })
                .then(() => {
                  imageManagement.deleteImageResource({ id: id })
                      .then(() => {
                        this.$message.success('操作成功');
            this.$message.success("操作成功");
                      })
                      .catch(err => this.$message.error(`${err}`))
                })
          .catch((err) => this.$message.error(`${err}`));
      });
        },
        getImageResourceList() {
          const dateParams = {};
          if (this.datePicked) {
            dateParams.startTime = dateParams[0];
            dateParams.endTime = dateParams[1]
        dateParams.endTime = dateParams[1];
          }
          imageManagement.getImageResources({ current: this.currentPage, size: this.pageSize, type: this.size, ...dateParams })
      imageManagement
        .getImageResources({
          current: this.currentPage,
          size: this.pageSize,
          type: this.size,
          ...dateParams,
        })
              .then(({ records, total }) => {
                this.tableData = records;
                this.totalNum = total;
              })
              .catch(err => this.$message({ type: 'error', message: err }))
        .catch((err) => this.$message({ type: "error", message: err }));
        },
        // 更改违规/违建
        changeTypeChecked(idx) {
            this.typeList.forEach(item => {
      this.typeList.forEach((item) => {
                item.checked = item.value === idx;
            });
            this.mystatus = idx + 1;
@@ -280,9 +343,9 @@
        // 设置表格斑马纹
        tableRowClassName({ row, rowIndex }) {
            if ((rowIndex + 1) % 2 === 0) {
                return 'warning-row';
        return "warning-row";
            } else {
                return 'success-row';
        return "success-row";
            }
        },
        // 当前页改变触发事件
@@ -293,7 +356,7 @@
        opernDialog(data) {
            this.dialogUpload = true;
            this.caseId = data.id;
            this.caseCode = data.code
      this.caseCode = data.code;
        },
        closeDialog() {
@@ -302,14 +365,14 @@
        },
      getCategory(value) {
          return CATEGOTY.find(item => item.value === value);
      return CATEGOTY.find((item) => item.value === value);
      },
      getEventSource(value) {
          return EVENT_SOURCE.find(item => item.value === value);
      }
    }
}
      return EVENT_SOURCE.find((item) => item.value === value);
    },
  },
};
</script>
<style lang="scss" scoped>
.userList {
@@ -344,7 +407,6 @@
                        border: 1px solid #17324c;
                    }
                }
            }
            .findBtn {
@@ -445,7 +507,6 @@
                        color: #4b9bb7;
                    }
                }
            }
            .pagination {
@@ -455,7 +516,6 @@
                justify-content: center;
                .el-pagination {
                    &::v-deep li,
                    &::v-deep .btn-prev,
                    &::v-deep .btn-next {
@@ -480,7 +540,6 @@
                white-space: nowrap;
                overflow: hidden;
            }
            .operation {
                display: flex;
src/views/operate/images/updateUser/index.vue
@@ -2,19 +2,36 @@
  <div class="updateUser">
    <main>
      <div class="mainContent">
        <el-form label-position="right" label-width="150px"  :model="imagedata" :rules="rules" :disabled="isDisabled" ref="user" style="width: 100%;">
        <el-form
          label-position="right"
          label-width="150px"
          :model="imagedata"
          :rules="rules"
          :disabled="isDisabled"
          ref="user"
          style="width: 100%"
        >
          <el-form-item prop="belongToId" label="所属事件编号">
            <el-input v-model="imagedata.belongToId"></el-input>
            <el-input v-model="imagedata.code"></el-input>
          </el-form-item>
          <el-form-item prop="eventSource" label="事件来源">
            <el-input v-model="imagedata.eventSource"></el-input>
            <el-input
              v-model="getEventSource(imagedata.eventSource).label"
            ></el-input>
          </el-form-item>
          <el-form-item prop="category" label="问题类别">
            <el-input v-model="imagedata.category"></el-input>
            <el-input
              v-model="getCategory(imagedata.category).label"
            ></el-input>
          </el-form-item>
          <el-form-item prop="type" label="类型">
            <el-select v-model="imagedata.type">
              <el-option v-for="item in getResourceType()" :key="item.value" :label="item.label" :value="item.value" />
              <el-option
                v-for="item in getResourceType()"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item prop="regionName" label="社区名称">
@@ -24,10 +41,20 @@
            <el-input v-model="imagedata.id"></el-input>
          </el-form-item>
          <el-form-item prop="url" label="图片:" min-width="8">
            <my-upload :picture-list="imageList" :is-show-upload="dialogType !== 'view'" @setPictureUrl="setPictureUrl" @delPictureUrl="delPictureUrl"></my-upload>
            <my-upload
              :picture-list="imageList"
              :is-show-upload="dialogType !== 'view'"
              @setPictureUrl="setPictureUrl"
              @delPictureUrl="delPictureUrl"
            ></my-upload>
          </el-form-item>
          <div v-if="!isDisabled" class="optionBtn">
            <el-button type="primary" class="btn submit" @click.native.prevent="onSubmit">提交</el-button>
            <el-button
              type="primary"
              class="btn submit"
              @click.native.prevent="onSubmit"
              >提交</el-button
            >
          </div>
        </el-form>
      </div>
@@ -35,7 +62,12 @@
  </div>
</template>
<script>
import { deepClone, RESOURCE_TYPE } from "@/utils/helper";
import {
  deepClone,
  RESOURCE_TYPE,
  CATEGOTY,
  EVENT_SOURCE,
} from "@/utils/helper";
import imageManagement from "@/api/operate/imageManagement";
import { FILE_ORIGINAL_URL } from "@/utils";
import MyUpload from "@/components/myUpload";
@@ -47,43 +79,59 @@
      if (this.imagedata.url) {
        callback();
      } else {
        callback(new Error('请上传图片'));
        callback(new Error("请上传图片"));
      }
    };
    return {
      imagedata: {
        belongToId: '',
        eventSource: '',
        regionName: '',
        category: '',
        id: '',
        url: '',
        type: ''
        belongToId: "",
        eventSource: 1,
        regionName: "",
        category: 1,
        id: "",
        url: "",
        type: "",
      },
      rules: {
        belongToId: [{ required: true, trigger: 'blur', message: '请输入所属事件编号' }],
        eventSource: [{ required: true, trigger: 'blur', message: '请输入事件来源' }],
        regionName: [{ required: true, trigger: 'blur', message: '请输入社区名称' }],
        id: [{ required: true, trigger: 'blur', message: '请输入图片Id' }],
        category: [{ required: true, trigger: 'blue', message: '请输入问题类型' }],
        belongToId: [
          { required: true, trigger: "blur", message: "请输入所属事件编号" },
        ],
        eventSource: [
          { required: true, trigger: "blur", message: "请输入事件来源" },
        ],
        regionName: [
          { required: true, trigger: "blur", message: "请输入社区名称" },
        ],
        id: [{ required: true, trigger: "blur", message: "请输入图片Id" }],
        category: [
          { required: true, trigger: "blue", message: "请输入问题类型" },
        ],
        url: [{ required: true, validator: validateImageUrl }],
        type: [{ required: true, trigger: ['blur', 'change'], message: '请选择类型' }]
        type: [
          {
            required: true,
            trigger: ["blur", "change"],
            message: "请选择类型",
          },
        ],
      },
      isDisabled: false,
      imageList: []
    }
      imageList: [],
    };
  },
  created() {
    if (this.originalData) {
    this.imagedata = deepClone(this.originalData);
    if (this.dialogType !== 'create') {
      this.imageList = this.imagedata.url.split(',');
    }
    this.isDisabled = this.dialogType === 'view';
    if (this.dialogType !== "create") {
      this.imageList = this.imagedata.url.split(",");
    }
    this.isDisabled = this.dialogType === "view";
  },
  methods: {
    onSubmit() {
      this.$refs.user.validate(valid => {
      this.$refs.user.validate((valid) => {
        if (valid) {
          const params = Object.assign({}, this.imagedata);
          delete params.regionName;
@@ -91,48 +139,59 @@
          delete params.eventSource;
          delete params.id;
          params.belongToId = +params.belongToId;
          if (this.dialogType === 'create') {
            imageManagement.addImageResource(params)
          if (this.dialogType === "create") {
            imageManagement
              .addImageResource(params)
                .then(() => {
                  this.$message.success('操作成功');
                  this.$emit('closeDialog');
                this.$message.success("操作成功");
                this.$emit("closeDialog");
                })
                .catch(err => this.$message.error(`${err}`))
              .catch((err) => this.$message.error(`${err}`));
          } else {
            imageManagement.updateImageResource(params)
            imageManagement
              .updateImageResource(params)
                .then(() => {
                  this.$message.success('操作成功');
                  this.$emit('closeDialog');
                this.$message.success("操作成功");
                this.$emit("closeDialog");
                })
                .catch(err => this.$message.error(`${err}`))
              .catch((err) => this.$message.error(`${err}`));
          }
        } else {
          this.$message.warning('请检查必填项');
          this.$message.warning("请检查必填项");
        }
      })
      });
    },
    setPictureUrl({ url }) {
      this.imageList.push(`${FILE_ORIGINAL_URL}${url}`);
      this.imagedata.url = this.imageList.join(',');
      this.imagedata.url = this.imageList.join(",");
    },
    delPictureUrl({ url }) {
      this.imageList = this.imageList.filter(item => item !== url);
      this.imagedata.url = this.imageList.join(',');
      this.imageList = this.imageList.filter((item) => item !== url);
      this.imagedata.url = this.imageList.join(",");
    },
    getCategory(value) {
      return CATEGOTY.find((item) => item.value === value);
    },
    getEventSource(value) {
      return EVENT_SOURCE.find((item) => item.value === value);
    },
    getResourceType(value) {
      return value ? RESOURCE_TYPE.find(item => item.value === value) : RESOURCE_TYPE;
    }
      return value
        ? RESOURCE_TYPE.find((item) => item.value === value)
        : RESOURCE_TYPE;
    },
  },
  props: {
    originalData: {
      type: Object,
      default: () => null
      default: () => null,
    },
    dialogType: {
      type: String,
      default: () => 'create'
    }
  }
      default: () => "create",
    },
  },
};
</script>
<style lang="scss" scoped>
@@ -281,7 +340,8 @@
  color: red;
}
.el-input, .el-select {
.el-input,
.el-select {
  width: 280px !important;
}
</style>