From 5079aa22938d92eb9938bab6d38a3f111c0f9f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E8=B4=A4=E9=87=91?= <1960116313@qq.com>
Date: Thu, 21 Apr 2022 18:44:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E5=8D=A1=20=20=E7=9A=84=E5=AF=BC=E5=87=BA=20=E4=B8=8E=20?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5=20feat:=E6=96=B0=E5=A2=9E=E5=85=83=E5=A5=97?=
=?UTF-8?q?=E9=A4=90=20=20=E7=9B=AE=E6=A0=87=E5=A5=97=E9=A4=90=20=20?=
=?UTF-8?q?=E5=A5=97=E9=A4=90=E7=BB=84=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/packagemanage/package.js | 49 +++
src/api/packagemanage/packgegroup.js | 49 +++
.../basiccard/basiccard.vue | 107 ++++---
.../communicationmanage/channel/channel.vue | 46 ++-
.../communicationmanage/device/device.vue | 4 +-
.../communicationmanage/flowpool/flowpool.vue | 2 +-
.../original/packagegroupmanage/index.vue | 254 +++++++++++++++
src/views/original/packagemanage/index.vue | 302 ++++++++++++++++++
.../original/targetpackagemanage/index.vue | 302 ++++++++++++++++++
9 files changed, 1057 insertions(+), 58 deletions(-)
create mode 100644 src/api/packagemanage/package.js
create mode 100644 src/api/packagemanage/packgegroup.js
create mode 100644 src/views/original/packagegroupmanage/index.vue
create mode 100644 src/views/original/packagemanage/index.vue
create mode 100644 src/views/original/targetpackagemanage/index.vue
diff --git a/src/api/packagemanage/package.js b/src/api/packagemanage/package.js
new file mode 100644
index 0000000..8d67179
--- /dev/null
+++ b/src/api/packagemanage/package.js
@@ -0,0 +1,49 @@
+import request from '@/router/axios';
+//列表
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/iot-sim/dataplan/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+export const getDetail = (id) => {
+ return request({
+ url: '/api/iot-sim/dataplan/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
+//新增
+export const add = (row) => {
+ return request({
+ url: '/api/iot-sim/dataplan/save',
+ method: 'post',
+ data: row
+ })
+}
+//删除
+export const remove = (ids) => {
+ return request({
+ url: '/api/iot-sim/dataplan/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+//修改
+export const update = (row) => {
+ return request({
+ url: '/api/iot-sim/dataplan/update',
+ method: 'post',
+ data: row
+ })
+}
+
diff --git a/src/api/packagemanage/packgegroup.js b/src/api/packagemanage/packgegroup.js
new file mode 100644
index 0000000..2032c4e
--- /dev/null
+++ b/src/api/packagemanage/packgegroup.js
@@ -0,0 +1,49 @@
+import request from '@/router/axios';
+//列表
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/iot-sim/dataplangroup/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+export const getDetail = (id) => {
+ return request({
+ url: '/api/iot-sim/dataplangroup/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
+//新增
+export const add = (row) => {
+ return request({
+ url: '/api/iot-sim/dataplangroup/save',
+ method: 'post',
+ data: row
+ })
+}
+//删除
+export const remove = (ids) => {
+ return request({
+ url: '/api/iot-sim/dataplangroup/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+//修改
+export const update = (row) => {
+ return request({
+ url: '/api/iot-sim/dataplangroup/update',
+ method: 'post',
+ data: row
+ })
+}
+
diff --git a/src/views/communicationmanage/basiccard/basiccard.vue b/src/views/communicationmanage/basiccard/basiccard.vue
index b759760..03df346 100644
--- a/src/views/communicationmanage/basiccard/basiccard.vue
+++ b/src/views/communicationmanage/basiccard/basiccard.vue
@@ -52,12 +52,16 @@
-
-
+
+
@@ -104,7 +108,7 @@
>
-
+
@@ -147,26 +157,24 @@ import {
channelfillData,
} from "@/api/communication/basiccard";
import { mapGetters } from "vuex";
-import website from "@/config/website";
import { getToken } from "@/util/auth";
export default {
data() {
- var start = (rule, value, callback) => {
- if (value == null) {
- callback(new Error("开始号码不能为空"));
- } else if (value < 0) {
- callback(new Error("开始号码不能为负数"));
- } else {
- callback();
- }
- };
- var end = (rule, value, callback) => {
- if (value == null) {
- callback(new Error("结束号码不能为空"));
- } else if (value < 0) {
- callback(new Error("结束号码不能为负数"));
- } else if (Number(value) < Number(this.distribution.numStart)) {
- callback(new Error("结束号码必须大于开始号码"));
+ var starts = (rule, value, callback) => {
+ if (
+ this.distribution.numEnd == null ||
+ this.distribution.numStart == null
+ ) {
+ callback(new Error("开始号码结束号码均不能为空"));
+ } else if (
+ this.distribution.numEnd < 0 ||
+ this.distribution.numStart < 0
+ ) {
+ callback(new Error("开始号码结束号码均不能为负数"));
+ } else if (
+ Number(this.distribution.numStart) > Number(this.distribution.numEnd)
+ ) {
+ callback(new Error("开始号码必须小于结束号码"));
} else {
callback();
}
@@ -178,12 +186,14 @@ export default {
isCovered: 0,
},
excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
column: [
{
label: "通道名称",
prop: "tenantId",
type: "select",
- span: 24,
+ span: 20,
dicUrl: "/api/iot-sim/channel/fillData",
props: {
label: "name",
@@ -202,6 +212,7 @@ export default {
prop: "excelFile",
type: "upload",
drag: true,
+ disabled: true,
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
@@ -218,11 +229,30 @@ export default {
],
},
{
- label: "模板下载",
- prop: "excelTemplate",
- formslot: true,
- span: 24,
+ label: "数据覆盖",
+ prop: "isCovered",
+ type: "switch",
+ align: "center",
+ width: 80,
+ dicData: [
+ {
+ label: "否",
+ value: 0,
+ },
+ {
+ label: "是",
+ value: 1,
+ },
+ ],
+ value: 0,
+ slot: true,
},
+ // {
+ // label: "模板下载",
+ // prop: "excelTemplate",
+ // formslot: true,
+ // span: 24,
+ // },
],
},
distribution: {
@@ -240,8 +270,7 @@ export default {
deliverType: [
{ required: true, message: "请选择分拨类型", trigger: "change" },
],
- numStart: [{ validator: start, trigger: "blur" }],
- numEnd: [{ validator: end, trigger: "blur" }],
+ numbers: [{ required: true, validator: starts, trigger: "blur" }],
},
channellist: [], //通道下拉
ruleForm: {}, //导入
@@ -261,6 +290,7 @@ export default {
searchMenuSpan: 6,
border: true,
index: true,
+ indexWidth: 70,
addBtn: true,
viewBtn: true,
delBtn: true,
@@ -447,18 +477,20 @@ export default {
created() {
this.allocatelist(); //分拨列表
this.tenantlists(); //租户下拉
- // this.channellists(); //通道下拉
},
watch: {
"excelForm.tenantId"() {
+ const column = this.findObject(this.excelOption.column, "excelFile");
if (this.excelForm.tenantId != "") {
if (process.env.NODE_ENV === "production") {
- const column = this.findObject(this.excelOption.column, "excelFile");
- column.action = `http://223.99.228.240:18081/api/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}`;
+ column.disabled = false;
+ column.action = `http://223.99.228.240:18081/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`;
} else {
- const column = this.findObject(this.excelOption.column, "excelFile");
- column.action = `/api/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}`;
+ column.disabled = false;
+ column.action = `/api/iot-sim/simcard/import-simCard?channelId=${this.excelForm.tenantId}&isCovered=${this.excelForm.isCovered}`;
}
+ } else {
+ column.disabled = true;
}
},
},
@@ -594,11 +626,6 @@ export default {
this.refreshChange();
done();
},
- submit(res, done, loading, column) {
- this.excelBox = false;
- this.refreshChange();
- done();
- },
//下载模板
handleTemplate() {
window.open(
diff --git a/src/views/communicationmanage/channel/channel.vue b/src/views/communicationmanage/channel/channel.vue
index 16897cd..9b68ddb 100644
--- a/src/views/communicationmanage/channel/channel.vue
+++ b/src/views/communicationmanage/channel/channel.vue
@@ -157,13 +157,22 @@ export default {
//新增
rowSave(row, done, loading) {
add(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
+ (res) => {
+ if (res.data.data == 1) {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ } else {
+ this.$message({
+ type: "error",
+ message: "操作失败!",
+ });
+ done(); //关闭表单
+ loading(); // 按钮停止加载
+ }
},
(error) => {
window.console.log(error);
@@ -174,13 +183,22 @@ export default {
//修改
rowUpdate(row, index, done, loading) {
update(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
+ (res) => {
+ if (res.data.data == 1) {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ } else {
+ this.$message({
+ type: "error",
+ message: "操作失败!",
+ });
+ done(); //关闭表单
+ loading(); // 按钮停止加载
+ }
},
(error) => {
window.console.log(error);
diff --git a/src/views/communicationmanage/device/device.vue b/src/views/communicationmanage/device/device.vue
index 3e779ba..a64ff64 100644
--- a/src/views/communicationmanage/device/device.vue
+++ b/src/views/communicationmanage/device/device.vue
@@ -294,9 +294,7 @@ export default {
window.open(
`http://223.99.228.240:18081/bd-core/tenant/dailybill/export-excel?${
this.website.tokenHeader
- }=${getToken()}&tenantId=${this.exp.tenantId}&yyyyMMdd=${
- this.exp.yyyyMMdd
- }`
+ }=${getToken()}`
);
} else {
window.open(
diff --git a/src/views/communicationmanage/flowpool/flowpool.vue b/src/views/communicationmanage/flowpool/flowpool.vue
index 1030ac8..75f3ee7 100644
--- a/src/views/communicationmanage/flowpool/flowpool.vue
+++ b/src/views/communicationmanage/flowpool/flowpool.vue
@@ -65,7 +65,7 @@ export default {
labelWidth: 130,
search: true,
type: "select",
- dicUrl: "/api/iot-sim/simcard/getChannel",
+ dicUrl: "/api/iot-sim/channel/fillData",
props: {
label: "name",
value: "id",
diff --git a/src/views/original/packagegroupmanage/index.vue b/src/views/original/packagegroupmanage/index.vue
new file mode 100644
index 0000000..73e2540
--- /dev/null
+++ b/src/views/original/packagegroupmanage/index.vue
@@ -0,0 +1,254 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/original/packagemanage/index.vue b/src/views/original/packagemanage/index.vue
new file mode 100644
index 0000000..9776438
--- /dev/null
+++ b/src/views/original/packagemanage/index.vue
@@ -0,0 +1,302 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/original/targetpackagemanage/index.vue b/src/views/original/targetpackagemanage/index.vue
new file mode 100644
index 0000000..13782d9
--- /dev/null
+++ b/src/views/original/targetpackagemanage/index.vue
@@ -0,0 +1,302 @@
+
+
+
+
+
+
+
+
+
+
+