duxianjin..
/
qn-sim-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix：测试 修改bug

confidence
杜贤金 3 years ago
parent
94ef3cc617
commit
a40553b419
8 changed files with 155 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      src/views/communicationmanage/basiccard/basiccard.vue
  2. 1
      src/views/communicationmanage/channel/channel.vue
  3. 16
      src/views/communicationmanage/device/device.vue
  4. 53
      src/views/communicationmanage/flowpool/flowpool.vue
  5. 22
      src/views/communicationmanage/outbound/outbound.vue
  6. 22
      src/views/original/targetpackagemanage/index.vue
  7. 22
      src/views/package/basicpackage/index.vue
  8. 8
      src/views/package/packagegroup/index.vue

26
src/views/communicationmanage/basiccard/basiccard.vue
Unescape View File

@ -51,7 +51,7 @@
</template> </template>
</avue-crud> </avue-crud>
<!-- 导出 :upload-after="uploadAfter"--> <!-- 导出 :upload-after="uploadAfter"-->
<el-dialog title="导入" append-to-body :visible.sync="excelBox" width="40%"> <el-dialog title="导入" append-to-body :visible.sync="excelBox" width="40%" :before-close="handleCloses">
<avue-form <avue-form
:option="excelOption" :option="excelOption"
v-model="excelForm" v-model="excelForm"
@ -212,7 +212,7 @@ export default {
prop: "excelFile", prop: "excelFile",
type: "upload", type: "upload",
drag: true, drag: true,
disabled: true, display: false,
loadText: "模板上传中，请稍等", loadText: "模板上传中，请稍等",
span: 24, span: 24,
propsHttp: { propsHttp: {
@ -291,6 +291,7 @@ export default {
border: true, border: true,
index: true, index: true,
indexWidth: 70, indexWidth: 70,
dialogDrag:true,//表单窗口拖拽
addBtn: true, addBtn: true,
viewBtn: true, viewBtn: true,
delBtn: true, delBtn: true,
@ -511,14 +512,24 @@ export default {
const column = this.findObject(this.excelOption.column, "excelFile"); const column = this.findObject(this.excelOption.column, "excelFile");
if (this.excelForm.tenantId != "") { if (this.excelForm.tenantId != "") {
if (process.env.NODE_ENV === "production") { if (process.env.NODE_ENV === "production") {
column.disabled = false; column.display = true;
column.action = `http://223.99.228.240:18081/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`; column.action = `http://223.99.228.240:18081/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`;
} else { } else {
column.disabled = false; column.display = true;
column.action = `/api/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`; column.action = `/api/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`;
} }
} else { } else {
column.disabled = true; column.display = false;
}
},
"excelForm.isCovered"() {
const column = this.findObject(this.excelOption.column, "excelFile");
if (this.excelForm.isCovered !== "") {
if (process.env.NODE_ENV === "production") {
column.action = `http://223.99.228.240:18081/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`;
} else {
column.action = `/api/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`;
}
} }
}, },
"form.$channelId"() { "form.$channelId"() {
@ -682,6 +693,11 @@ export default {
this.excelBox = false; this.excelBox = false;
this.refreshChange(); this.refreshChange();
done(); done();
},
//导入弹窗关闭
handleCloses() {
this.excelBox = false;
this.$refs.excelForm.resetFields();
}, },
//下载模板 //下载模板
handleTemplate() { handleTemplate() {

1
src/views/communicationmanage/channel/channel.vue
Unescape View File

@ -51,6 +51,7 @@ export default {
border: true, border: true,
index: true, index: true,
addBtn: true, addBtn: true,
dialogDrag:true,//表单窗口拖拽
viewBtn: true, viewBtn: true,
delBtn: true, delBtn: true,
columnBtn: false, columnBtn: false,

16
src/views/communicationmanage/device/device.vue
Unescape View File

@ -61,6 +61,7 @@ export default {
index: true, index: true,
addBtn: true, addBtn: true,
viewBtn: true, viewBtn: true,
dialogDrag: true, //表单窗口拖拽
delBtn: true, delBtn: true,
columnBtn: false, columnBtn: false,
selection: false, selection: false,
@ -81,6 +82,21 @@ export default {
}, },
], ],
}, },
{
label: "imei",
prop: "imei",
span: 12,
labelWidth: 130,
searchLabelWidth: 90,
search: true,
rules: [
{
required: true,
message: "请输入imei",
trigger: "blur",
},
],
},
{ {
label: "租户名称", label: "租户名称",
prop: "tenantId", prop: "tenantId",

53
src/views/communicationmanage/flowpool/flowpool.vue
Unescape View File

@ -19,6 +19,20 @@
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
> >
<template slot-scope="{ disabled, size, value }" slot="activationNumForm">
<el-input
:disabled="disabled"
:size="size"
v-model="value == -1 ? '-' : value"
></el-input>
</template>
<template slot-scope="{ disabled, size, value }" slot="accountForm">
<el-input
:disabled="disabled"
:size="size"
v-model="value == '' ? '-' : value"
></el-input>
</template>
</avue-crud> </avue-crud>
</basic-container> </basic-container>
</template> </template>
@ -51,6 +65,7 @@ export default {
border: true, border: true,
index: true, index: true,
addBtn: true, addBtn: true,
dialogDrag: true, //表单窗口拖拽
viewBtn: true, viewBtn: true,
delBtn: true, delBtn: true,
columnBtn: false, columnBtn: false,
@ -85,7 +100,7 @@ export default {
span: 12, span: 12,
labelWidth: 130, labelWidth: 130,
searchLabelWidth: 90, searchLabelWidth: 90,
search: true, search: false,
rules: [ rules: [
{ {
required: true, required: true,
@ -117,13 +132,18 @@ export default {
searchLabelWidth: 90, searchLabelWidth: 90,
search: false, search: false,
hide: false, hide: false,
type: "number",
rules: [ rules: [
{ {
required: true, required: true,
message: "请输入流量池总量", message: "请输入流量池总量",
trigger: "blur", trigger: "blur",
}, },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的流量池总量",
trigger: "blur",
},
], ],
}, },
{ {
@ -134,12 +154,18 @@ export default {
searchLabelWidth: 90, searchLabelWidth: 90,
search: false, search: false,
hide: false, hide: false,
type: "number",
rules: [ rules: [
{ {
required: true, required: true,
message: "请输入提醒阈值", message: "请输入提醒阈值",
trigger: "blur", trigger: "blur",
}, },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的提醒阈值",
trigger: "blur",
},
], ],
}, },
@ -178,7 +204,7 @@ export default {
prop: "type", prop: "type",
labelWidth: 130, labelWidth: 130,
searchLabelWidth: 140, searchLabelWidth: 140,
search: true, search: false,
rules: [ rules: [
{ {
required: true, required: true,
@ -200,7 +226,7 @@ export default {
prop: "isSource", prop: "isSource",
labelWidth: 130, labelWidth: 130,
searchLabelWidth: 110, searchLabelWidth: 110,
search: true, search: false,
rules: [ rules: [
{ {
required: true, required: true,
@ -211,16 +237,22 @@ export default {
}, },
{ {
label: "单卡最大使用量（单位M）", label: "单卡最大使用量（M）",
prop: "maxUsage", prop: "maxUsage",
span: 12, span: 12,
labelWidth: 130, labelWidth: 130,
search: false, search: false,
hide: true, hide: true,
type: "number",
rules: [ rules: [
{ {
required: true, required: true,
message: "请输入管理员账号", message: "请输入单卡最大使用量（M）",
trigger: "blur",
},
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的使用量",
trigger: "blur", trigger: "blur",
}, },
], ],
@ -234,10 +266,16 @@ export default {
hide: true, hide: true,
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
formslot: true,
rules: [ rules: [
{ {
required: true, required: true,
message: "请输入管理员账号", message: "请输入已激活数量",
trigger: "blur",
},
{
pattern: /^\d+?$/,
message: "请输入正确的已激活数量",
trigger: "blur", trigger: "blur",
}, },
], ],
@ -251,6 +289,7 @@ export default {
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
hide: true, hide: true,
formslot: true,
rules: [ rules: [
{ {
required: true, required: true,

22
src/views/communicationmanage/outbound/outbound.vue
Unescape View File

@ -62,6 +62,7 @@ export default {
addBtn: true, addBtn: true,
viewBtn: true, viewBtn: true,
delBtn: true, delBtn: true,
dialogDrag:true,
columnBtn: false, columnBtn: false,
selection: false, selection: false,
dialogClickModal: false, dialogClickModal: false,
@ -255,10 +256,16 @@ export default {
label: "剩余流量(M)", label: "剩余流量(M)",
prop: "surplus", prop: "surplus",
span: 12, span: 12,
type: "number",
labelWidth: 130, labelWidth: 130,
hide: true, hide: true,
rules: [ rules: [
{ required: true, message: "请输入剩余流量", trigger: "blur" }, { required: true, message: "请输入剩余流量", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的剩余流量",
trigger: "blur",
},
], ],
}, },
{ {
@ -266,9 +273,15 @@ export default {
prop: "usage", prop: "usage",
span: 12, span: 12,
labelWidth: 130, labelWidth: 130,
type: "number",
hide: true, hide: true,
rules: [ rules: [
{ required: true, message: "请输入使用量", trigger: "blur" }, { required: true, message: "请输入使用量", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的使用量",
trigger: "blur",
},
], ],
}, },
{ {
@ -276,8 +289,15 @@ export default {
prop: "total", prop: "total",
span: 12, span: 12,
labelWidth: 130, labelWidth: 130,
type: "number",
hide: true, hide: true,
rules: [{ required: true, message: "请输入总量", trigger: "blur" }], rules: [{ required: true, message: "请输入总量", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的总量",
trigger: "blur",
},
],
}, },
], ],
}, },

22
src/views/original/targetpackagemanage/index.vue
Unescape View File

@ -59,7 +59,7 @@ export default {
option: { option: {
tip: false, tip: false,
searchShow: true, searchShow: true,
// dialogDrag:true,//表单窗口拖拽 dialogDrag:true,//表单窗口拖拽
searchMenuSpan: 6, searchMenuSpan: 6,
border: true, border: true,
index: true, index: true,
@ -204,6 +204,11 @@ export default {
search: false, search: false,
rules: [ rules: [
{ required: true, message: "请输入套餐总量", trigger: "blur" }, { required: true, message: "请输入套餐总量", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的套餐总量",
trigger: "blur",
},
], ],
}, },
{ {
@ -217,6 +222,11 @@ export default {
hide: true, hide: true,
rules: [ rules: [
{ required: true, message: "请输入成本价", trigger: "blur" }, { required: true, message: "请输入成本价", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的成本价",
trigger: "blur",
},
], ],
}, },
{ {
@ -230,6 +240,11 @@ export default {
hide: true, hide: true,
rules: [ rules: [
{ required: true, message: "请输入代理价", trigger: "blur" }, { required: true, message: "请输入代理价", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的代理价",
trigger: "blur",
},
], ],
}, },
{ {
@ -247,6 +262,11 @@ export default {
message: "请输入停机多少天后注销账户", message: "请输入停机多少天后注销账户",
trigger: "blur", trigger: "blur",
}, },
{
pattern: /^\d+?$/,
message: "请输入正确的天数",
trigger: "blur",
},
], ],
}, },
{ {

22
src/views/package/basicpackage/index.vue
Unescape View File

@ -59,7 +59,7 @@ export default {
option: { option: {
tip: false, tip: false,
searchShow: true, searchShow: true,
// dialogDrag:true,//表单窗口拖拽 dialogDrag:true,//表单窗口拖拽
searchMenuSpan: 6, searchMenuSpan: 6,
border: true, border: true,
index: true, index: true,
@ -204,6 +204,11 @@ export default {
search: false, search: false,
rules: [ rules: [
{ required: true, message: "请输入套餐总量", trigger: "blur" }, { required: true, message: "请输入套餐总量", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的套餐总量",
trigger: "blur",
},
], ],
}, },
{ {
@ -217,6 +222,11 @@ export default {
hide: true, hide: true,
rules: [ rules: [
{ required: true, message: "请输入成本价", trigger: "blur" }, { required: true, message: "请输入成本价", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的成本价",
trigger: "blur",
},
], ],
}, },
{ {
@ -230,6 +240,11 @@ export default {
hide: true, hide: true,
rules: [ rules: [
{ required: true, message: "请输入代理价", trigger: "blur" }, { required: true, message: "请输入代理价", trigger: "blur" },
{
pattern: /^\d+(\.\d+)?$/,
message: "请输入正确的代理价",
trigger: "blur",
},
], ],
}, },
{ {
@ -247,6 +262,11 @@ export default {
message: "请输入停机多少天后注销账户", message: "请输入停机多少天后注销账户",
trigger: "blur", trigger: "blur",
}, },
{
pattern: /^\d+?$/,
message: "请输入正确的天数",
trigger: "blur",
},
], ],
}, },
{ {

8
src/views/package/packagegroup/index.vue
Unescape View File

@ -33,6 +33,7 @@ import {
} from "@/api/packagemanage/packgegroup"; } from "@/api/packagemanage/packgegroup";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import { getToken } from "@/util/auth"; import { getToken } from "@/util/auth";
import { number } from "mathjs";
export default { export default {
data() { data() {
return { return {
@ -52,6 +53,7 @@ export default {
index: true, index: true,
addBtn: true, addBtn: true,
viewBtn: true, viewBtn: true,
dialogDrag:true,//表单窗口拖拽
delBtn: true, delBtn: true,
editBtn: true, editBtn: true,
columnBtn: false, columnBtn: false,
@ -103,12 +105,18 @@ export default {
labelWidth: 130, labelWidth: 130,
searchLabelWidth: 100, searchLabelWidth: 100,
search: false, search: false,
type: "number",
rules: [ rules: [
{ {
required: true, required: true,
message: "请输入订购数量", message: "请输入订购数量",
trigger: "blur", trigger: "blur",
}, },
{
pattern: /^\d+?$/,
message: "请输入正确的订购数量",
trigger: "blur",
},
], ],
}, },
], ],

Write Preview
Loading…
Cancel
Save