Browse Source

fix:修改图片大小限制

confidence
杜贤金 3 years ago
parent
commit
ba9494b6fd
  1. 353
      src/views/base/region.vue
  2. 45
      src/views/communicationmanage/flowpool/flowpool.vue
  3. 5
      src/views/mallmanagement/banner/index.vue
  4. 5
      src/views/mallmanagement/shopmanagement/index.vue
  5. 5
      src/views/mallmanagement/specification/index.vue

353
src/views/base/region.vue

@ -4,7 +4,11 @@
<div class="box"> <div class="box">
<el-scrollbar> <el-scrollbar>
<basic-container> <basic-container>
<avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/> <avue-tree
:option="treeOption"
:data="treeData"
@node-click="nodeClick"
/>
</basic-container> </basic-container>
</el-scrollbar> </el-scrollbar>
</div> </div>
@ -12,26 +16,75 @@
<el-col :span="15"> <el-col :span="15">
<basic-container> <basic-container>
<el-button-group> <el-button-group>
<el-button v-if="permission.region_add" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addChildren">新增下级</el-button> <el-button
<el-button v-if="permission.region_delete" type="primary" size="small" icon="el-icon-delete" @click="handleDelete">删除</el-button> v-if="permission.region_add"
<el-button v-if="permission.region_import" type="primary" size="small" icon="el-icon-upload2" @click="handleImport">导入</el-button> type="primary"
<el-button v-if="permission.region_export" type="primary" size="small" icon="el-icon-download" @click="handleExport">导出</el-button> size="small"
<el-button v-if="permission.region_debug" type="primary" size="small" icon="el-icon-video-play" @click="handleDebug">调试</el-button> icon="el-icon-circle-plus-outline"
@click="addChildren"
>新增下级</el-button
>
<el-button
v-if="permission.region_delete"
type="primary"
size="small"
icon="el-icon-delete"
@click="handleDelete"
>删除</el-button
>
<el-button
v-if="permission.region_import"
type="primary"
size="small"
icon="el-icon-upload2"
@click="handleImport"
>导入</el-button
>
<el-button
v-if="permission.region_export"
type="primary"
size="small"
icon="el-icon-download"
@click="handleExport"
>导出</el-button
>
<el-button
v-if="permission.region_debug"
type="primary"
size="small"
icon="el-icon-video-play"
@click="handleDebug"
>调试</el-button
>
</el-button-group> </el-button-group>
</basic-container> </basic-container>
<basic-container> <basic-container>
<avue-form ref="form" :option="regionOption" v-model="regionForm" @submit="handleSubmit"> <avue-form
ref="form"
:option="regionOption"
v-model="regionForm"
@submit="handleSubmit"
>
<template slot="code" slot-scope="{}"> <template slot="code" slot-scope="{}">
<el-input placeholder="请输入 区划子编号" v-model="regionForm.subCode"> <el-input
<template slot="prepend">{{regionForm.parentCode}}</template> placeholder="请输入 区划子编号"
v-model="regionForm.subCode"
>
<template slot="prepend">{{ regionForm.parentCode }}</template>
</el-input> </el-input>
</template> </template>
</avue-form> </avue-form>
<el-dialog title="行政区划数据导入" <el-dialog
title="行政区划数据导入"
append-to-body append-to-body
:visible.sync="excelBox" :visible.sync="excelBox"
width="555px"> width="555px"
<avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter"> >
<avue-form
:option="excelOption"
v-model="excelForm"
:upload-after="uploadAfter"
>
<template slot="excelTemplate"> <template slot="excelTemplate">
<el-button type="primary" @click="handleTemplate"> <el-button type="primary" @click="handleTemplate">
点击下载<i class="el-icon-download el-icon--right"></i> 点击下载<i class="el-icon-download el-icon--right"></i>
@ -39,11 +92,13 @@
</template> </template>
</avue-form> </avue-form>
</el-dialog> </el-dialog>
<el-dialog title="行政区划数据调试" <el-dialog
title="行政区划数据调试"
append-to-body append-to-body
:visible.sync="debugBox" :visible.sync="debugBox"
width="350px"> width="350px"
<avue-form :option="debugOption" v-model="debugForm"/> >
<avue-form :option="debugOption" v-model="debugForm" />
</el-dialog> </el-dialog>
</basic-container> </basic-container>
</el-col> </el-col>
@ -51,41 +106,43 @@
</template> </template>
<script> <script>
import {getLazyTree, getDetail, submit, remove} from "@/api/base/region"; import { getLazyTree, getDetail, submit, remove } from "@/api/base/region";
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import {validatenull} from "@/util/validate"; import { validatenull } from "@/util/validate";
import {getToken} from "@/util/auth"; import { getToken } from "@/util/auth";
export default { export default {
data() { data() {
return { return {
topCode: '00', topCode: "00",
treeCode: '', treeCode: "",
treeParentCode: '', treeParentCode: "",
treeData: [], treeData: [],
treeOption: { treeOption: {
nodeKey: 'id', nodeKey: "id",
lazy: true, lazy: true,
treeLoad: function (node, resolve) { treeLoad: function (node, resolve) {
const parentCode = (node.level === 0) ? "00" : node.data.id; const parentCode = node.level === 0 ? "00" : node.data.id;
getLazyTree(parentCode).then(res => { getLazyTree(parentCode).then((res) => {
resolve(res.data.data.map(item => { resolve(
res.data.data.map((item) => {
return { return {
...item, ...item,
leaf: !item.hasChildren leaf: !item.hasChildren,
} };
})) })
);
}); });
}, },
addBtn: false, addBtn: false,
menu: false, menu: false,
size: 'small', size: "small",
props: { props: {
labelText: '标题', labelText: "标题",
label: 'title', label: "title",
value: 'value', value: "value",
children: 'children' children: "children",
} },
}, },
regionForm: {}, regionForm: {},
regionOption: { regionOption: {
@ -96,11 +153,13 @@
prop: "parentCode", prop: "parentCode",
span: 24, span: 24,
disabled: true, disabled: true,
rules: [{ rules: [
{
required: true, required: true,
message: "请输入父区划编号", message: "请输入父区划编号",
trigger: "blur" trigger: "blur",
}] },
],
}, },
{ {
label: "父区划名称", label: "父区划名称",
@ -113,11 +172,13 @@
prop: "code", prop: "code",
formslot: true, formslot: true,
span: 24, span: 24,
rules: [{ rules: [
{
required: true, required: true,
message: "请输入区划编号", message: "请输入区划编号",
trigger: "blur" trigger: "blur",
}] },
],
}, },
{ {
label: "区划子编号", label: "区划子编号",
@ -128,11 +189,13 @@
label: "区划名称", label: "区划名称",
prop: "name", prop: "name",
span: 24, span: 24,
rules: [{ rules: [
{
required: true, required: true,
message: "请输入区划名称", message: "请输入区划名称",
trigger: "blur" trigger: "blur",
}] },
],
}, },
{ {
label: "区划等级", label: "区划等级",
@ -141,26 +204,30 @@
dicUrl: "/api/iot-system/dict/dictionary?code=region", dicUrl: "/api/iot-system/dict/dictionary?code=region",
props: { props: {
label: "dictValue", label: "dictValue",
value: "dictKey" value: "dictKey",
}, },
dataType: "number", dataType: "number",
span: 24, span: 24,
rules: [{ rules: [
{
required: true, required: true,
message: "请选择区划等级", message: "请选择区划等级",
trigger: "blur" trigger: "blur",
}] },
],
}, },
{ {
label: "区划排序", label: "区划排序",
prop: "sort", prop: "sort",
type: "number", type: "number",
span: 24, span: 24,
rules: [{ rules: [
{
required: true, required: true,
message: "请输入区划排序", message: "请输入区划排序",
trigger: "blur" trigger: "blur",
}] },
],
}, },
{ {
label: "区划备注", label: "区划备注",
@ -169,7 +236,7 @@
minRows: 6, minRows: 6,
span: 24, span: 24,
}, },
] ],
}, },
excelBox: false, excelBox: false,
excelForm: {}, excelForm: {},
@ -178,17 +245,17 @@
emptyBtn: false, emptyBtn: false,
column: [ column: [
{ {
label: '模板上传', label: "模板上传",
prop: 'excelFile', prop: "excelFile",
type: 'upload', type: "upload",
drag: true, drag: true,
loadText: '模板上传中,请稍等', loadText: "模板上传中,请稍等",
span: 24, span: 24,
propsHttp: { propsHttp: {
res: 'data' res: "data",
}, },
tip: '请上传 .xls,.xlsx 标准格式文件', tip: "请上传 .xls,.xlsx 标准格式文件",
action: "/api/iot-system/region/import-region" action: "/api/iot-system/region/import-region",
}, },
{ {
label: "数据覆盖", label: "数据覆盖",
@ -199,12 +266,12 @@
dicData: [ dicData: [
{ {
label: "否", label: "否",
value: 0 value: 0,
}, },
{ {
label: "是", label: "是",
value: 1 value: 1,
} },
], ],
value: 0, value: 0,
slot: true, slot: true,
@ -212,17 +279,17 @@
{ {
required: true, required: true,
message: "请选择是否覆盖", message: "请选择是否覆盖",
trigger: "blur" trigger: "blur",
} },
] ],
}, },
{ {
label: '模板下载', label: "模板下载",
prop: 'excelTemplate', prop: "excelTemplate",
formslot: true, formslot: true,
span: 24, span: 24,
} },
] ],
}, },
debugBox: false, debugBox: false,
debugForm: {}, debugForm: {},
@ -232,55 +299,56 @@
emptyBtn: false, emptyBtn: false,
column: [ column: [
{ {
label: '省份', label: "省份",
prop: 'province', prop: "province",
type: 'select', type: "select",
props: { props: {
label: 'name', label: "name",
value: 'code' value: "code",
}, },
cascaderItem: ['city', 'district'], cascaderItem: ["city", "district"],
dicUrl: '/api/iot-system/region/select', dicUrl: "/api/iot-system/region/select",
span: 24, span: 24,
}, },
{ {
label: '地市', label: "地市",
prop: 'city', prop: "city",
type: 'select', type: "select",
props: { props: {
label: 'name', label: "name",
value: 'code' value: "code",
}, },
dicFlag: false, dicFlag: false,
dicUrl: '/api/iot-system/region/select?code={{key}}', dicUrl: "/api/iot-system/region/select?code={{key}}",
span: 24, span: 24,
}, },
{ {
label: '区县', label: "区县",
prop: 'district', prop: "district",
type: 'select', type: "select",
props: { props: {
label: 'name', label: "name",
value: 'code' value: "code",
}, },
dicFlag: false, dicFlag: false,
dicUrl: '/api/iot-system/region/select?code={{key}}', dicUrl: "/api/iot-system/region/select?code={{key}}",
span: 24, span: 24,
} },
] ],
} },
}; };
}, },
watch: { watch: {
'regionForm.subCode'() { "regionForm.subCode"() {
this.regionForm.code = this.regionForm.parentCode + this.regionForm.subCode; this.regionForm.code =
this.regionForm.parentCode + this.regionForm.subCode;
}, },
'excelForm.isCovered'() { "excelForm.isCovered"() {
if (this.excelForm.isCovered !== '') { if (this.excelForm.isCovered !== "") {
const column = this.findObject(this.excelOption.column, "excelFile"); const column = this.findObject(this.excelOption.column, "excelFile");
column.action = `/api/iot-system/region/import-region?isCovered=${this.excelForm.isCovered}`; column.action = `/api/iot-system/region/import-region?isCovered=${this.excelForm.isCovered}`;
} }
} },
}, },
computed: { computed: {
...mapGetters(["permission"]), ...mapGetters(["permission"]),
@ -289,27 +357,27 @@
addBtn: this.vaildData(this.permission.region_add, false), addBtn: this.vaildData(this.permission.region_add, false),
viewBtn: this.vaildData(this.permission.region_view, false), viewBtn: this.vaildData(this.permission.region_view, false),
delBtn: this.vaildData(this.permission.region_delete, false), delBtn: this.vaildData(this.permission.region_delete, false),
editBtn: this.vaildData(this.permission.region_edit, false) editBtn: this.vaildData(this.permission.region_edit, false),
}; };
}, },
ids() { ids() {
let ids = []; let ids = [];
this.selectionList.forEach(ele => { this.selectionList.forEach((ele) => {
ids.push(ele.id); ids.push(ele.id);
}); });
return ids.join(","); return ids.join(",");
} },
}, },
methods: { methods: {
initTree() { initTree() {
this.treeData = []; this.treeData = [];
getLazyTree(this.topCode).then(res => { getLazyTree(this.topCode).then((res) => {
this.treeData = res.data.data.map(item => { this.treeData = res.data.data.map((item) => {
return { return {
...item, ...item,
leaf: !item.hasChildren leaf: !item.hasChildren,
} };
}) });
}); });
}, },
nodeClick(data) { nodeClick(data) {
@ -317,39 +385,50 @@
column.disabled = true; column.disabled = true;
this.treeCode = data.id; this.treeCode = data.id;
this.treeParentCode = data.parentId; this.treeParentCode = data.parentId;
getDetail(this.treeCode).then(res => { getDetail(this.treeCode).then((res) => {
this.regionForm = res.data.data; this.regionForm = res.data.data;
this.regionForm.subCode = this.regionForm.code.replace(this.regionForm.parentCode, ''); this.regionForm.subCode = this.regionForm.code.replace(
}) this.regionForm.parentCode,
""
);
});
}, },
addChildren() { addChildren() {
if (validatenull(this.regionForm.code) || validatenull(this.regionForm.name)) { if (
validatenull(this.regionForm.code) ||
validatenull(this.regionForm.name)
) {
this.$message.warning("请先选择一项区划"); this.$message.warning("请先选择一项区划");
return; return;
} }
this.regionForm.parentCode = this.regionForm.code; this.regionForm.parentCode = this.regionForm.code;
this.regionForm.parentName = this.regionForm.name; this.regionForm.parentName = this.regionForm.name;
this.regionForm.code = ''; this.regionForm.code = "";
this.regionForm.subCode = ''; this.regionForm.subCode = "";
this.regionForm.name = ''; this.regionForm.name = "";
this.regionForm.regionLevel = (this.regionForm.regionLevel === 5) ? 5 : this.regionForm.regionLevel + 1; this.regionForm.regionLevel =
this.regionForm.regionLevel === 5 ? 5 : this.regionForm.regionLevel + 1;
}, },
handleSubmit(form, done, loading) { handleSubmit(form, done, loading) {
const parentCode = form.parentCode === this.topCode ? '' : form.parentCode; const parentCode =
form.parentCode === this.topCode ? "" : form.parentCode;
form.code = parentCode + form.subCode; form.code = parentCode + form.subCode;
submit(form).then(() => { submit(form).then(
() => {
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!" message: "操作成功!",
}); });
this.initTree(); this.initTree();
this.regionForm.subCode = ''; this.regionForm.subCode = "";
this.$refs.form.resetForm(); this.$refs.form.resetForm();
done(); done();
}, error => { },
(error) => {
loading(); loading();
window.console.log(error); window.console.log(error);
}); }
);
}, },
handleDelete() { handleDelete() {
if (validatenull(this.regionForm.code)) { if (validatenull(this.regionForm.code)) {
@ -359,7 +438,7 @@
this.$confirm(`确定将 [${this.regionForm.name}] 数据删除?`, { this.$confirm(`确定将 [${this.regionForm.name}] 数据删除?`, {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}) })
.then(() => { .then(() => {
return remove(this.treeCode); return remove(this.treeCode);
@ -367,10 +446,10 @@
.then(() => { .then(() => {
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!" message: "操作成功!",
}); });
this.initTree(); this.initTree();
this.regionForm.subCode = ''; this.regionForm.subCode = "";
this.$refs.form.resetForm(); this.$refs.form.resetForm();
}); });
}, },
@ -390,28 +469,36 @@
this.$confirm("是否导出行政区划数据?", "提示", { this.$confirm("是否导出行政区划数据?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
}).then(() => { }).then(() => {
window.open(`/api/iot-system/region/export-region?${this.website.tokenHeader}=${getToken()}`); window.open(
`/api/iot-system/region/export-region?${
this.website.tokenHeader
}=${getToken()}`
);
}); });
}, },
handleTemplate() { handleTemplate() {
window.open(`/api/iot-system/region/export-template?${this.website.tokenHeader}=${getToken()}`); window.open(
`/api/iot-system/region/export-template?${
this.website.tokenHeader
}=${getToken()}`
);
}, },
} },
}; };
</script> </script>
<style> <style>
.box { .box {
height: 800px; height: 800px;
} }
.el-scrollbar { .el-scrollbar {
height: 100%; height: 100%;
} }
.box .el-scrollbar__wrap { .box .el-scrollbar__wrap {
overflow: scroll; overflow: scroll;
} }
</style> </style>

45
src/views/communicationmanage/flowpool/flowpool.vue

@ -139,7 +139,7 @@ export default {
label: "流量池名称", label: "流量池名称",
prop: "name", prop: "name",
span: 12, span: 12,
disabled: false,
searchLabelWidth: 90, searchLabelWidth: 90,
search: true, search: true,
rules: [ rules: [
@ -154,12 +154,35 @@ export default {
label: "流量池总量(M)", label: "流量池总量(M)",
prop: "total", prop: "total",
span: 12, span: 12,
addDisplay: true,
editDisplay: true,
searchLabelWidth: 90,
width: 115,
search: false,
hide: true,
type: "number",
rules: [
{
required: true,
message: "请输入流量池总量",
trigger: "blur",
},
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的流量池总量",
trigger: "blur",
},
],
},
{
label: "流量池总量(M)",
prop: "totalM",
span: 12,
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
searchLabelWidth: 90, searchLabelWidth: 90,
width: 115, width: 115,
search: false, search: false,
hide: false,
type: "number", type: "number",
rules: [ rules: [
{ {
@ -199,7 +222,7 @@ export default {
], ],
}, },
{ {
label: "提醒阈值", label: "提醒阈值(%)",
prop: "remindRatio", prop: "remindRatio",
span: 12, span: 12,
searchLabelWidth: 90, searchLabelWidth: 90,
@ -212,9 +235,10 @@ export default {
message: "请输入提醒阈值", message: "请输入提醒阈值",
trigger: "blur", trigger: "blur",
}, },
{ {
pattern: /^\d+(\.\d+)?$/, pattern: /(^(\d|[1-9]\d)(\.\d{1,2})?$)|(^100$)/,
message: "请输入正确的提醒阈值", message: "请输入0-100数字,最多可保留两位小数",
trigger: "blur", trigger: "blur",
}, },
], ],
@ -344,6 +368,16 @@ export default {
data: [], data: [],
}; };
}, },
watch: {
"form.name"() {
const column = this.findObject(this.option.column, "name");
if (this.form.name) {
column.disabled = true;
} else {
column.disabled = false;
}
},
},
computed: { computed: {
...mapGetters(["permission"]), ...mapGetters(["permission"]),
permissionList() { permissionList() {
@ -375,6 +409,7 @@ export default {
}, },
// //
rowSave(row, done, loading) { rowSave(row, done, loading) {
console.log(row, "rowwwwww");
add(Object.assign(row, this.isSources)).then( add(Object.assign(row, this.isSources)).then(
() => { () => {
this.onLoad(this.page); this.onLoad(this.page);

5
src/views/mallmanagement/banner/index.vue

@ -254,10 +254,7 @@ export default {
}); });
}, },
uploadBefore(file, done, loading) { uploadBefore(file, done, loading) {
if (file.size > 500 * 1024) { if (
this.$message.warning("图片大小切勿大于500kb");
loading();
} else if (
file.type !== "image/jpg" && file.type !== "image/jpg" &&
file.type !== "image/jpeg" && file.type !== "image/jpeg" &&
file.type !== "image/png" file.type !== "image/png"

5
src/views/mallmanagement/shopmanagement/index.vue

@ -500,10 +500,7 @@ export default {
}); });
}, },
uploadBefore(file, done, loading) { uploadBefore(file, done, loading) {
if (file.size > 500 * 1024) { if (
this.$message.warning("图片大小切勿大于500kb");
loading();
} else if (
file.type !== "image/jpg" && file.type !== "image/jpg" &&
file.type !== "image/jpeg" && file.type !== "image/jpeg" &&
file.type !== "image/png" file.type !== "image/png"

5
src/views/mallmanagement/specification/index.vue

@ -275,10 +275,7 @@ export default {
}); });
}, },
uploadBefore(file, done, loading) { uploadBefore(file, done, loading) {
if (file.size > 500 * 1024) { if (file.type !== "image/jpg" && file.type !== "image/jpeg") {
this.$message.warning("图片大小切勿大于500kb");
loading();
} else if (file.type !== "image/jpg" && file.type !== "image/jpeg") {
this.$message.warning("上传图片只能是 JPG 格式"); this.$message.warning("上传图片只能是 JPG 格式");
loading(); loading();
} else { } else {

Loading…
Cancel
Save