From 754b3824cdbb3c530ca6858db3fcce113b0e66c3 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 13 Aug 2021 21:03:42 +0800
Subject: [PATCH] 冲突
---
src/views/resource/attach.vue | 745 +++++++++++++++++++++++++++++---------------------------
1 files changed, 385 insertions(+), 360 deletions(-)
diff --git a/src/views/resource/attach.vue b/src/views/resource/attach.vue
index a46f3d6..308cd5f 100644
--- a/src/views/resource/attach.vue
+++ b/src/views/resource/attach.vue
@@ -1,66 +1,78 @@
<template>
- <basic-container>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-click="rowClick"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- >
- <template slot="menuLeft">
- <!-- <el-button type="primary"-->
- <!-- size="small"-->
- <!-- plain-->
- <!-- icon="el-icon-upload2"-->
- <!-- @click="handleUpload">上 传-->
- <!-- </el-button>-->
- <!-- <el-button type="danger"-->
- <!-- size="small"-->
- <!-- icon="el-icon-delete"-->
- <!-- plain-->
- <!-- @click="handleDelete">删 除-->
- <!-- </el-button>-->
- </template>
- <template slot-scope="scope" slot="menu">
- <el-button
- type="text"
- icon="el-icon-download"
- size="small"
- @click="handleDownload(scope.row)"
- >下载
- </el-button>
- </template>
- <template slot-scope="{ row }" slot="attachSize">
- <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
- </template>
- </avue-crud>
- <el-dialog
- title="附件管理"
- append-to-body
- :visible.sync="attachBox"
- width="555px"
- >
- <avue-form
- ref="form"
- :option="attachOption"
- v-model="attachForm"
- :upload-after="uploadAfter"
- >
- </avue-form>
- </el-dialog>
- </basic-container>
+ <basic-container>
+ <avue-crud :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
+ <template slot="menuLeft">
+ <!-- <el-button type="primary"-->
+ <!-- size="small"-->
+ <!-- plain-->
+ <!-- icon="el-icon-upload2"-->
+ <!-- @click="handleUpload">上 传-->
+ <!-- </el-button>-->
+ <!-- <el-button type="danger"-->
+ <!-- size="small"-->
+ <!-- icon="el-icon-delete"-->
+ <!-- plain-->
+ <!-- @click="handleDelete">删 除-->
+ <!-- </el-button>-->
+ </template>
+ <template slot-scope="scope"
+ slot="menu">
+ <el-button type="text"
+ icon="el-icon-download"
+ size="small"
+ @click="handleDownload(scope.row)">下载
+ </el-button>
+ <el-button type="text"
+ icon="el-icon-picture-outline-round"
+ size="small"
+ v-show="!fileFormat(scope.row)"
+ @click="seeImages(scope.row)">预览
+ </el-button>
+ </template>
+ <template slot-scope="{ row }"
+ slot="attachSize">
+ <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
+ </template>
+ </avue-crud>
+ <el-dialog title="附件管理"
+ append-to-body
+ :visible.sync="attachBox"
+ width="555px">
+ <avue-form ref="form"
+ :option="attachOption"
+ v-model="attachForm"
+ :upload-after="uploadAfter">
+ </avue-form>
+ </el-dialog>
+
+ <el-dialog title="预览"
+ append-to-body
+ :visible.sync="imgSee"
+ class="see-img-box">
+
+ <div class="img"
+ :style="{background: imgUrl}">
+
+ </div>
+
+ </el-dialog>
+
+ </basic-container>
</template>
<script>
@@ -69,310 +81,323 @@
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
export default {
- components: { ElImageViewer },
- data() {
- return {
- form: {},
- query: {},
- loading: true,
- imgUrl: "",
- showViewer: false, // 显示查看器
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
- attachBox: false,
- selectionList: [],
- option: {
- height: "auto",
- calcHeight: 30,
- tip: false,
- searchShow: true,
- searchMenuSpan: 6,
- searchShowBtn: false,
- headerAlign: "center",
- border: true,
- index: true,
- viewBtn: true,
- selection: true,
- dialogClickModal: false,
- column: [
- {
- label: "附件地址",
- prop: "link",
- rules: [
- {
- required: true,
- message: "请输入附件地址",
- trigger: "blur",
- },
- ],
- },
- {
- label: "附件域名",
- prop: "domain",
- search: true,
- rules: [
- {
- required: true,
- message: "请输入附件域名",
- trigger: "blur",
- },
- ],
- },
- {
- label: "附件名称",
- prop: "name",
- search: true,
- rules: [
- {
- required: true,
- message: "请输入附件名称",
- trigger: "blur",
- },
- ],
- },
- {
- label: "附件原名",
- prop: "originalName",
- search: true,
- rules: [
- {
- required: true,
- message: "请输入附件原名",
- trigger: "blur",
- },
- ],
- },
- {
- label: "附件拓展名",
- prop: "extension",
- rules: [
- {
- required: true,
- message: "请输入附件拓展名",
- trigger: "blur",
- },
- ],
- },
- {
- label: "附件大小",
- prop: "attachSize",
- slot: true,
- rules: [
- {
- required: true,
- message: "请输入附件大小",
- trigger: "blur",
- },
- ],
- },
- {
- label: "所属机构",
- prop: "deptid",
- type: "select",
- dicUrl: "/api/blade-system/dept/selectIn",
- props: {
- label: "deptname",
- value: "deptid",
+ components: { ElImageViewer },
+ data () {
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
},
- },
- {
- label: "类型",
- prop: "type",
- addDisplay: false,
- width: 80,
- type: "select",
- dicData: [
- {
- label: "许可审批",
- value: "0",
- },
- {
- label: "备案",
- value: "1",
- },
- {
- label: "撤销",
- value: "2",
- },
- {
- label: "跨区备案",
- value: "3",
- },
- ],
- },
- ],
- },
- data: [],
- attachForm: {},
- attachOption: {
- submitBtn: false,
- emptyBtn: false,
- column: [
- {
- label: "附件上传",
- prop: "attachFile",
- type: "upload",
- drag: true,
- loadText: "模板上传中，请稍等",
- span: 24,
- propsHttp: {
- res: "data",
+ attachBox: false,
+ selectionList: [],
+ option: {
+ height: "auto",
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ searchShowBtn: false,
+ headerAlign: "center",
+ border: true,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [
+ {
+ label: "附件地址",
+ prop: "link",
+ rules: [
+ {
+ required: true,
+ message: "请输入附件地址",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件域名",
+ prop: "domain",
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入附件域名",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件名称",
+ prop: "name",
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入附件名称",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件原名",
+ prop: "originalName",
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入附件原名",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件拓展名",
+ prop: "extension",
+ rules: [
+ {
+ required: true,
+ message: "请输入附件拓展名",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件大小",
+ prop: "attachSize",
+ slot: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入附件大小",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "所属机构",
+ prop: "deptid",
+ type: "select",
+ dicUrl: "/api/blade-system/dept/selectIn",
+ props: {
+ label: "deptname",
+ value: "deptid",
+ },
+ },
+ {
+ label: "类型",
+ prop: "type",
+ addDisplay: false,
+ width: 80,
+ type: "select",
+ dicData: [
+ {
+ label: "许可审批",
+ value: "0",
+ },
+ {
+ label: "备案",
+ value: "1",
+ },
+ {
+ label: "撤销",
+ value: "2",
+ },
+ {
+ label: "跨区备案",
+ value: "3",
+ },
+ ],
+ },
+ ],
},
- action: "/api/blade-resource/oss/endpoint/put-file-attach?deptid=",
- },
- ],
- },
- };
- },
- created() {
- var flag = false,
- i = 0,
- ind = null;
- this.$store.state.tags.tagList.forEach((item, index) => {
- if (item.label == "附件上传") {
- if (flag == false) {
- ind = index;
- flag = true;
+ data: [],
+ attachForm: {},
+ attachOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "附件上传",
+ prop: "attachFile",
+ type: "upload",
+ drag: true,
+ loadText: "模板上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data",
+ },
+ action: "/api/blade-resource/oss/endpoint/put-file-attach?deptid=",
+ },
+ ],
+ },
+
+ imgSee: false,
+ imgUrl: ""
+ };
+ },
+ created () {
+ var flag = false,
+ i = 0,
+ ind = null;
+ this.$store.state.tags.tagList.forEach((item, index) => {
+ if (item.label == "附件上传") {
+ if (flag == false) {
+ ind = index;
+ flag = true;
+ }
+ i++;
+ }
+ });
+ if (i > 1) {
+ this.$store.state.tags.tagList.splice(ind, 1);
}
- i++;
- }
- });
- if (i > 1) {
- this.$store.state.tags.tagList.splice(ind, 1);
- }
- var deptid = this.$route.query.deptid;
- var type = this.$route.query.type;
- this.attachOption.column[0].action += deptid + "&type=" + type;
- },
- computed: {
- ...mapGetters(["permission"]),
- permissionList() {
- return {
- addBtn: false,
- editBtn: false,
- viewBtn: false,
- delBtn: this.vaildData(this.permission.attach_delete, false),
- };
+ var deptid = this.$route.query.deptid;
+ var type = this.$route.query.type;
+ this.attachOption.column[0].action += deptid + "&type=" + type;
},
- ids() {
- let ids = [];
- this.selectionList.forEach((ele) => {
- ids.push(ele.id);
- });
- return ids.join(",");
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList () {
+ return {
+ addBtn: false,
+ editBtn: false,
+ viewBtn: false,
+ delBtn: this.vaildData(this.permission.attach_delete, false),
+ };
+ },
+ ids () {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
},
- },
- methods: {
- rowClick(row) {
- var that = this;
- that.imgUrl = row.link;
- this.showViewer = true;
+ methods: {
+ handleUpload () {
+ this.attachBox = true;
+ },
+ uploadAfter (res, done, loading, column) {
+ window.console.log(column);
+ this.attachBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleDownload (row) {
+ window.open(`${row.link}`);
+ },
+ rowDel (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ handleDelete () {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ beforeOpen (done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetail(this.form.id).then((res) => {
+ this.form = res.data.data;
+ });
+ }
+ done();
+ },
+ searchReset () {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange (params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange (list) {
+ this.selectionList = list;
+ },
+ selectionClear () {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange () {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad (page, params = {}) {
+ this.loading = true;
+ getList(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query),
+ this.$route.query.deptid,
+ this.$route.query.type
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+
+
+ seeImages (row) {
+ this.imgUrl = "";
+ this.imgUrl = "url(" + row.link + ") center center / contain no-repeat";
+
+ this.imgSee = true;
+ },
+
+ fileFormat (row) {
+ var index = row.link.lastIndexOf(".");
+ var ext = row.link.substr(index + 1);
+
+ return [
+ 'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].
+ indexOf(ext.toLowerCase()) == -1;
+ }
},
- handleUpload() {
- this.attachBox = true;
- },
- uploadAfter(res, done, loading, column) {
- window.console.log(column);
- this.attachBox = false;
- this.refreshChange();
- done();
- },
- handleDownload(row) {
- window.open(`${row.link}`);
- },
- rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(row.id);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- });
- },
- handleDelete() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
- }
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(this.ids);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- this.$refs.crud.toggleSelection();
- });
- },
- beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
- this.form = res.data.data;
- });
- }
- done();
- },
- searchReset() {
- this.query = {};
- this.onLoad(this.page);
- },
- searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
- },
- selectionChange(list) {
- this.selectionList = list;
- },
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
- },
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
- },
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
- },
- refreshChange() {
- this.onLoad(this.page, this.query);
- },
- onLoad(page, params = {}) {
- this.loading = true;
- getList(
- page.currentPage,
- page.pageSize,
- Object.assign(params, this.query),
- this.$route.query.deptid,
- this.$route.query.type
- ).then((res) => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
- },
- },
};
</script>
--
Gitblit v1.9.3