Browse Source

fix:修改多余引入 设备导入(后端开发中)

confidence
杜贤金 3 years ago
parent
commit
bf67c4321b
  1. 11
      src/api/communication/basiccard.js
  2. 90
      src/views/communicationmanage/basiccard/basiccard.vue
  3. 15
      src/views/communicationmanage/device/device.vue
  4. 1
      src/views/original/targetpackagegroupmanage/index.vue
  5. 1
      src/views/package/packagegroup/index.vue

11
src/api/communication/basiccard.js

@ -72,6 +72,17 @@ export const simdeliver = (params) => {
} }
}) })
} }
//回拨操作
export const simCallback = (params) => {
return request({
url: '/api/iot-sim/simcard/simCallback',
method: 'post',
params: {
...params,
}
})
}
//通道 //通道
export const channelfillData = () => { export const channelfillData = () => {
return request({ return request({

90
src/views/communicationmanage/basiccard/basiccard.vue

@ -38,10 +38,17 @@
<el-button <el-button
type="primary" type="primary"
size="small" size="small"
icon="el-icon-share" icon="el-icon-sort-up"
@click="handleAllocate" @click="handleAllocate(1)"
>分拨</el-button >分拨</el-button
> >
<el-button
type="primary"
size="small"
icon="el-icon-sort-down"
@click="handleAllocate(2)"
>回拨</el-button
>
<el-button <el-button
type="danger" type="danger"
size="small" size="small"
@ -73,7 +80,7 @@
</el-dialog> </el-dialog>
<!-- 分拨弹窗 --> <!-- 分拨弹窗 -->
<el-dialog <el-dialog
title="分拨" :title="distitle"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
append-to-body append-to-body
width="35%" width="35%"
@ -85,7 +92,11 @@
:rules="distrules" :rules="distrules"
label-width="120px" label-width="120px"
> >
<el-form-item label="分拨租户" prop="tenantId"> <el-form-item
label="分拨租户"
prop="tenantId"
v-if="distitle == '分拨'"
>
<el-select <el-select
v-model="distribution.tenantId" v-model="distribution.tenantId"
placeholder="请选择分拨租户" placeholder="请选择分拨租户"
@ -100,7 +111,11 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="分拨类型" prop="deliverType"> <el-form-item
label="分拨类型"
prop="deliverType"
v-if="distitle == '分拨'"
>
<el-select <el-select
v-model="distribution.deliverType" v-model="distribution.deliverType"
placeholder="请选择分拨类型" placeholder="请选择分拨类型"
@ -115,7 +130,11 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="基础套餐" prop="dataPlanId"> <el-form-item
label="基础套餐"
prop="dataPlanId"
v-if="distitle == '分拨'"
>
<el-select <el-select
v-model="distribution.dataPlanId" v-model="distribution.dataPlanId"
placeholder="请选择基础套餐" placeholder="请选择基础套餐"
@ -177,6 +196,7 @@ import {
tenant, tenant,
simdeliver, simdeliver,
dataplan, dataplan,
simCallback,
} from "@/api/communication/basiccard"; } from "@/api/communication/basiccard";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import { getToken } from "@/util/auth"; import { getToken } from "@/util/auth";
@ -204,6 +224,7 @@ export default {
}; };
return { return {
form: {}, form: {},
distitle: "", //
excelForm: { excelForm: {
tenantId: "", tenantId: "",
isCovered: 0, isCovered: 0,
@ -306,6 +327,10 @@ export default {
numEnd: null, // numEnd: null, //
dataPlanId: "", dataPlanId: "",
}, // }, //
redistribution: {
numStart: null, //
numEnd: null, //
}, //
distributionlist: [], // distributionlist: [], //
basicpackge: [], // basicpackge: [], //
tenantlist: [], // tenantlist: [], //
@ -324,6 +349,7 @@ export default {
channellist: [], // channellist: [], //
ruleForm: {}, // ruleForm: {}, //
dialogVisible: false, // dialogVisible: false, //
dialogVisibles: false, //
query: {}, query: {},
selectionList: [], selectionList: [],
loading: false, loading: false,
@ -824,7 +850,12 @@ export default {
}); });
}, },
// //
handleAllocate() { handleAllocate(e) {
if (e == 1) {
this.distitle = "分拨";
} else {
this.distitle = "回拨";
}
this.dialogVisible = true; this.dialogVisible = true;
}, },
// //
@ -836,30 +867,35 @@ export default {
handleSubmit() { handleSubmit() {
this.$refs.distribution.validate((valid) => { this.$refs.distribution.validate((valid) => {
if (valid) { if (valid) {
simdeliver(this.distribution).then((res) => { if (this.distitle == "分拨") {
if (res.data.data == "") { simdeliver(this.distribution).then((res) => {
this.$message.success("操作成功"); if (res.data.data == "") {
this.$refs.distribution.resetFields(); this.$message.success("操作成功");
this.dialogVisible = false; this.$refs.distribution.resetFields();
} else { this.dialogVisible = false;
const h = this.$createElement; } else {
this.$notify.error({ const h = this.$createElement;
title: "出库失败号码", this.$notify.error({
message: h( title: "出库失败号码",
"i", message: h(
{ style: "color: teal; word-break: break-all;" }, "i",
res.data.data { style: "color: teal; word-break: break-all;" },
), res.data.data
duration: 0, ),
}); duration: 0,
this.$refs.distribution.resetFields(); });
this.dialogVisible = false; this.$refs.distribution.resetFields();
} this.dialogVisible = false;
}); }
});
} else {
//
}
} else { } else {
} }
}); });
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
getList( getList(

15
src/views/communicationmanage/device/device.vue

@ -443,21 +443,6 @@ export default {
this.refreshChange(); this.refreshChange();
done(); done();
}, },
handleExport() {
this.$confirm("是否导出用户数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
window.open(
`/api/iot-system/user/export-user?${
this.website.tokenHeader
}=${getToken()}&account=${this.search.account}&realName=${
this.search.realName
}`
);
});
},
currentChange(currentPage) { currentChange(currentPage) {
this.page.currentPage = currentPage; this.page.currentPage = currentPage;
}, },

1
src/views/original/targetpackagegroupmanage/index.vue

@ -33,7 +33,6 @@ 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 {

1
src/views/package/packagegroup/index.vue

@ -33,7 +33,6 @@ 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 {

Loading…
Cancel
Save