From 5f71dcc1b6caa3f3b03a54b87bc47eb6c44904e6 Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Tue, 12 Oct 2021 19:00:59 +0800 Subject: [PATCH] init --- src/api/modules/api.js | 8 + src/views/Equipment/index.vue | 262 +++++++++++++++++++-------------- src/views/admin/user/index.vue | 133 +++++++++++++++-- vue.config.js | 4 +- 4 files changed, 280 insertions(+), 127 deletions(-) diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 61aed5d..37dc85d 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -74,6 +74,14 @@ export function getUserMsg(query) { params: query }) } +// 区域回显 +export function userAreaFind(query) { + return request({ + url: '/admin/user/areaFind', + method: 'get', + params: query + }) +} // 用户批量删除 export function userDelByIds(query) { return request({ diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue index 662b7eb..b6fc53f 100644 --- a/src/views/Equipment/index.vue +++ b/src/views/Equipment/index.vue @@ -248,7 +248,15 @@ - + + @@ -282,16 +290,24 @@ 删除 --> - + 更多 - 归还 - 转写开关 + 归还 + 转写开关 验收 - 绑定 - 修改 - 删除 + 绑定 + 修改 + 删除 @@ -313,31 +329,28 @@ - - + + - - + + + 关闭转写 + 科大讯飞 + 思必驰 + - - - - - - - - + + - - - - - - - - + +
取 消 - 保存 + 保存
- - - - - - - - - - - - - - - - - + + - - + + + 正常 + 报损 + - - - - - - - - + +
@@ -430,32 +410,39 @@ - - + + + 楼盘 + 代理商 + + + + - - - - - - - - - + + +
@@ -617,6 +604,7 @@ export default { value: "", input: "", tableData: [], + houseList: [], dialogVisible: false, dialogVisible2: false, dialogVisible3: false, @@ -626,16 +614,45 @@ export default { areaName: "", provinceItem: [], }, + addForm: { + imei: "", + defaultTransliteration: "", + batchId: "", + remark: "", + }, + bindForm: { + remark: "", + houseId: "", + choic: "3", + }, + editForm: { + imei: "123", + desc: "", + acceptanceStatus: "0", + }, + addRules: { + imei: [{ required: true, message: "请填写设备号", trigger: "blur" }], + batchId: { required: true, message: "请选择批次号", trigger: "blur" }, + }, multipleSelection: [], + customColors: [ + { color: "#f56c6c", percentage: 20 }, + { color: "#e6a23c", percentage: 40 }, + { color: "#5cb87a", percentage: 60 }, + { color: "#1989fa", percentage: 80 }, + { color: "#6f7ad3", percentage: 100 }, + ], }; }, mounted() { // 获取设备列表 this.equipmentManagement(); + // 获取楼盘列表 + this.zkhousePage(); }, methods: { - handleCommand(e){ - this[e]() + handleCommand(e) { + this[e](); }, equipmentManagement() { this.$api.api @@ -696,7 +713,12 @@ export default { }, //确认绑定 binding() { - this.dialogVisible3 = false; + this.$refs.bindForm.validate((valid) => { + if (valid) { + console.log(this.bindForm); + this.dialogVisible3 = false; + } + }); }, //编辑 infoeditor() { @@ -710,9 +732,27 @@ export default { infoadd() { this.dialogVisible = true; }, + zkhousePage() { + this.$api.api + .findHouseByUser({ + orgType: localStorage.getItem("orgType"), + }) + .then((res) => { + // console.log(res) + this.houseList = res.data; + // this.searchForm.houseId = res.data[0].id; + // 列表获取 + // this.correctFindbypage(); + }); + }, //确认新增 - add() { - this.dialogVisible = false; + addEquipment() { + this.$refs.addForm.validate((valid) => { + if (valid) { + console.log(this.addForm); + // this.dialogVisible = false; + } + }); }, //验收 acceptance() { diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue index 0cd99d1..16e73a6 100644 --- a/src/views/admin/user/index.vue +++ b/src/views/admin/user/index.vue @@ -267,7 +267,7 @@ - + + - + + +