diff --git a/src/api/modules/api.js b/src/api/modules/api.js index ba85739..dfdbdab 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -513,3 +513,20 @@ export function findByUserName(query) { params:query }) } +// 设备列表获取批次列表 +export function zkequipmentbatchList(query) { + return request({ + url: 'autoSR/zkequipmentbatch/list', + method:'get', + params:query + }) +} + +// 添加设备 +export function zkequipmentbatchInsert(data) { + return request({ + url: '/autoSR/zkequipmentbatch/insert', + method:'post', + data + }) +} diff --git a/src/const/crud/admin/log.js b/src/const/crud/admin/log.js index c5668bf..b539b89 100644 --- a/src/const/crud/admin/log.js +++ b/src/const/crud/admin/log.js @@ -1,58 +1,67 @@ export const tableOption = { border: true, index: true, - indexLabel: '序号', + indexLabel: "序号", stripe: true, - menuAlign: 'center', + menuAlign: "center", menuWidth: 150, - align: 'center', + align: "center", refreshBtn: true, showClomnuBtn: false, - searchSize: 'mini', + searchSize: "mini", searchMenuSpan: 6, - delBtn:false, + delBtn: false, addBtn: false, editBtn: false, viewBtn: true, props: { - label: 'label', - value: 'value' + label: "label", + value: "value" }, - column: [{ - label: '类型', - prop: 'type', - type: 'select', - dicUrl: '/admin/dict/type/log_type', - // search: true - }, { - label: '标题', - prop: 'title' - }, { - label: 'IP地址', - prop: 'remoteAddr' - }, { - label: '请求方式', - prop: 'method' - }, { - label: '客户端', - prop: 'serviceId' - }, - // { - // width: 80, - // label: '请求时间', - // prop: 'time' - // }, - { - width: 150, - label: '登录时间', - prop: 'createTime', - type: 'datetime', - rangeSeparator:"-", - format: 'yyyy-MM-dd HH:mm', - valueFormat: 'yyyy-MM-dd HH:mm:ss', - // search: true, - searchRange: true - }] -} - + column: [ + { + label: "名称", + prop: "name" + }, + { + label: "类型", + prop: "type", + type: "select", + dicUrl: "/admin/dict/type/log_type" + // search: true + }, + { + label: "标题", + prop: "title" + }, + { + label: "IP地址", + prop: "remoteAddr" + }, + { + label: "请求方式", + prop: "method" + }, + { + label: "客户端", + prop: "serviceId" + }, + // { + // width: 80, + // label: '请求时间', + // prop: 'time' + // }, + { + width: 150, + label: "登录时间", + prop: "createTime", + type: "datetime", + rangeSeparator: "-", + format: "yyyy-MM-dd HH:mm", + valueFormat: "yyyy-MM-dd HH:mm:ss", + // search: true, + searchRange: true + } + ] +}; diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue index e4db4ed..2a65974 100644 --- a/src/page/check/chose.vue +++ b/src/page/check/chose.vue @@ -338,15 +338,21 @@ export default { console.log(item); if (this.flag == 1) { localStorage.setItem("agentId", item.id); + localStorage.setItem("orgCode", ''); localStorage.setItem("topName", item.agentName); + localStorage.setItem("houseId", ''); } if (this.flag == 2) { + localStorage.setItem("agentId", ''); localStorage.setItem("orgCode", item.orgCode); localStorage.setItem("topName", item.name); + localStorage.setItem("houseId", ''); } if (this.flag == 3) { localStorage.setItem("orgCode", item.orgCode); + localStorage.setItem("agentId", ''); localStorage.setItem("topName", item.propertyName); + localStorage.setItem("houseId", item.id); } this.$router.push({ path: "/wel" }); }, diff --git a/src/page/check/index.vue b/src/page/check/index.vue index 36aed76..d6b6b94 100644 --- a/src/page/check/index.vue +++ b/src/page/check/index.vue @@ -106,7 +106,6 @@ export default { current: 1, pageSize: 10, agentName: this.agentName, - }) .then((res) => { // console.log(res); @@ -122,6 +121,8 @@ export default { this.$router.push({ path: "/wel" }); localStorage.setItem("topName", res.data.records[0].agentName); localStorage.setItem("agentId", res.data.records[0].id); + localStorage.setItem("orgCode", ""); + localStorage.setItem("houseId", ""); } }); }, @@ -147,6 +148,8 @@ export default { this.$router.push({ path: "/wel" }); localStorage.setItem("topName", res.data.records[0].name); localStorage.setItem("orgCode", res.data.records[0].orgCode); + localStorage.setItem("agentId", ""); + localStorage.setItem("houseId", ""); } }); }, @@ -183,6 +186,8 @@ export default { this.$router.push({ path: "/wel" }); localStorage.setItem("topName", res.data.records[0].propertyName); localStorage.setItem("orgCode", res.data.records[0].orgCode); + localStorage.setItem("agentId", ""); + localStorage.setItem("houseId", res.data.records[0].id); } }); } @@ -206,6 +211,8 @@ export default { this.$router.push({ path: "/wel" }); localStorage.setItem("topName", res.data.records[0].propertyName); localStorage.setItem("orgCode", res.data.records[0].orgCode); + localStorage.setItem("houseId", res.data.records[0].id); + localStorage.setItem("agentId", ""); } }); } @@ -213,7 +220,10 @@ export default { goindex(idx) { localStorage.setItem("orgType", idx); if (idx == 0) { - localStorage.setItem("topName", ''); + localStorage.setItem("topName", ""); + localStorage.setItem("orgCode", ''); + localStorage.setItem("houseId", ''); + localStorage.setItem("agentId", ""); // 质控管家后台 this.$router.push({ path: "/wel" }); } diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue index b6fc53f..c110444 100644 --- a/src/views/Equipment/index.vue +++ b/src/views/Equipment/index.vue @@ -102,7 +102,7 @@ - + -
+ -
+
@@ -227,28 +227,34 @@ - + - + - + + - + + + - - - - - + --> + + + - - - + + - + @@ -338,13 +346,13 @@ - + @@ -598,13 +606,14 @@ export default { label: "已归还", }, ], - currentPage: 4, + currentPage: 1, size: 10, total: 10, value: "", input: "", tableData: [], houseList: [], + batchList:[], dialogVisible: false, dialogVisible2: false, dialogVisible3: false, @@ -616,7 +625,7 @@ export default { }, addForm: { imei: "", - defaultTransliteration: "", + // defaultTransliteration: "", batchId: "", remark: "", }, @@ -647,10 +656,20 @@ export default { mounted() { // 获取设备列表 this.equipmentManagement(); + // 获取批次列表 + this.zkequipmentbatchList() // 获取楼盘列表 this.zkhousePage(); }, methods: { + // 获取批次列表 + zkequipmentbatchList(){ + this.$api.api.zkequipmentbatchList() + .then(res=>{ + // console.log(res) + this.batchList=res.data + }) + }, handleCommand(e) { this[e](); }, diff --git a/src/views/admin/log/index.vue b/src/views/admin/log/index.vue index db70720..2d62dae 100644 --- a/src/views/admin/log/index.vue +++ b/src/views/admin/log/index.vue @@ -185,6 +185,10 @@ export default { descs: "create_time", current: page.currentPage, size: page.pageSize, + orgType: localStorage.getItem("orgType"), + orgCode: localStorage.getItem("orgCode"), + agentId: localStorage.getItem("agentId"), + houseId:localStorage.getItem("houseId"), }, params, this.searchForm diff --git a/src/views/admin/log/log.vue b/src/views/admin/log/log.vue index 6e67904..05db65b 100644 --- a/src/views/admin/log/log.vue +++ b/src/views/admin/log/log.vue @@ -184,6 +184,10 @@ export default { descs: "create_time", current: page.currentPage, size: page.pageSize, + orgType: localStorage.getItem("orgType"), + orgCode: localStorage.getItem("orgCode"), + agentId: localStorage.getItem("agentId"), + houseId: localStorage.getItem("houseId"), }, params, this.searchForm diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue index b1afa24..477ddb2 100644 --- a/src/views/admin/user/index.vue +++ b/src/views/admin/user/index.vue @@ -1417,12 +1417,22 @@ export default { // console.log(this.searchMsg1); // return if (this.choseFlag) { + let orgId='' + if(localStorage.getItem("orgType")==0){ + orgId='' + } + else if(localStorage.getItem("orgType")==1){ + orgId=localStorage.getItem("agentId") + }else{ + orgId=localStorage.getItem("orgCode") + } // 注册用户列表 this.$api.api .registerUserList({ ...this.page, ...this.searchMsg, orgType: localStorage.getItem("orgType"), + orgId, }) .then((res) => { // console.log(res);