diff --git a/src/api/modules/api.js b/src/api/modules/api.js index ab0c818..7f9d080 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -1024,3 +1024,11 @@ export function templategetMarketingTree(query) { params:query }) } +//导出文件 +export function exportFile(data) { + return request({ + url: 'autoSR/equipReceive/findByPage', + method:'post', + data + }) +} diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue index 4b22b56..7f2378b 100644 --- a/src/page/check/chose.vue +++ b/src/page/check/chose.vue @@ -113,7 +113,7 @@
- 片区： + 地区： @@ -342,7 +342,7 @@ export default { if (this.info.selectHouseType == 2) { this.$api.api .findHouseByArea({ - provinceItem: this.area, + id: this.area, ...obj }) .then((res) => { diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue index d58ed33..5f44c47 100644 --- a/src/page/index/tags.vue +++ b/src/page/index/tags.vue @@ -123,6 +123,8 @@ if(value=='/wel/index'){return} if (action === 'remove') { let { tag, key } = this.findTag(value) + // console.log(tag,'关闭的标签'); + // return this.$store.commit('DEL_TAG', tag) if (tag.value === this.tag.value) { tag = this.tagList[key === 0 ? key : key - 1] // 如果关闭本标签让前推一个 diff --git a/src/store/modules/tags.js b/src/store/modules/tags.js index d173fa5..49ed1ba 100644 --- a/src/store/modules/tags.js +++ b/src/store/modules/tags.js @@ -47,6 +47,7 @@ const navs = { state.tagList = state.tagList.filter(item => { return !diff(item, action) }) + // console.log(state,action,'内容'); setFistTag(state.tagList) setStore({ name: 'tagList', content: state.tagList, type: 'session' }) }, diff --git a/src/util/util.js b/src/util/util.js index 879b5fa..85d74bf 100644 --- a/src/util/util.js +++ b/src/util/util.js @@ -62,10 +62,13 @@ export const diff = (obj1, obj2) => { var o1 = obj1 instanceof Object var o2 = obj2 instanceof Object if (!o1 || !o2) { /* 判断不是对象 */ + // console.log(1); return obj1 === obj2 } if (Object.keys(obj1).length !== Object.keys(obj2).length) { + // console.log(2); + console.log(Object.keys(obj1).length,Object.keys(obj2).length); return false // Object.keys() 返回一个由对象的自身可枚举属性(key值)组成的数组,例如：数组返回下表：let arr = ["a", "b", "c"];console.log(Object.keys(arr))->0,1,2; } @@ -74,11 +77,15 @@ export const diff = (obj1, obj2) => { var t1 = obj1[attr] instanceof Object var t2 = obj2[attr] instanceof Object if (t1 && t2) { + // console.log(3); return diff(obj1[attr], obj2[attr]) } else if (obj1[attr] !== obj2[attr]) { + // console.log(obj1[attr],obj2[attr]); + // console.log(4); return false } } + // console.log(5); return true } /** diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue index dad83d8..2b5eca7 100644 --- a/src/views/Customer/AgentManagement.vue +++ b/src/views/Customer/AgentManagement.vue @@ -53,7 +53,22 @@
运营人员：
- + + + + +
@@ -553,6 +568,8 @@ export default { provinceId:'', cityId:'', areaList:[], + operaList:[], + operationalId:'', timelist:'', tableData: [], addressOptions: [], @@ -704,11 +721,32 @@ export default { this.contractEndDate=this.timelist[1]; this.serviceStatus=this.$route.query.serviceStatus; } + // 获取运营人员 + this.getOperaList() // 获取地区列表 // this.getCityList() this.getAgentList() }, methods: { + getOperaList(){ + if (this.orgType == 1) { + this.$api.http + .getAllOperationsStaffByAgent({ + agentId: localStorage.getItem('agentId'), + }) + .then((res) => { + // console.log(1); + this.operaList = res.data; + // this.operaVisible = true; + }); + } else { + this.$api.http.getAllOperationsStaff().then((res) => { + this.operaList = res.data; + // this.operaVisible = true; + // console.log(2); + }); + } + }, getCityList(){ this.$api.api.getAreaList({parentId:0}) .then(res=>{ @@ -1022,6 +1060,7 @@ export default { this.operationalName=''; this.provinceId='' this.cityId='' + this.operationalId='' this.pageNum=1 this.area=[] this.getAgentList() @@ -1040,6 +1079,7 @@ export default { contractEndDate:this.contractEndDate, serviceStatus:this.serviceStatus, agentName:this.agentName, + operationalId:this.operationalId, provinceId:this.provinceId, cityId:this.cityId, operationalName:this.operationalName, diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue index f7dd680..ef9b673 100644 --- a/src/views/Customer/CompanyRecord.vue +++ b/src/views/Customer/CompanyRecord.vue @@ -11,13 +11,32 @@
-
运营人员：
+ +
运营人员：
+
+ + + + +
地区： @@ -685,6 +704,8 @@ export default { pageSize: 10, provinceId: "", areaList: [], + operaList:[], + operationStaffId:'', orgType: "", sysFlag: "0", replaceagentobj: { @@ -782,9 +803,18 @@ export default { this.orgType = localStorage.getItem("orgType"); // 获取地区列表 // this.getCityList(); + this.getOperaList() this.getcompanyList(); }, methods: { + getOperaList(){ + this.$api.http.getAllOperationsStaff().then((res) => { + this.operaList = res.data; + // this.operaVisible = true; + // console.log(2); + }); + + }, getCityList() { this.$api.api.getAreaList({ parentId: 0 }).then((res) => { // console.log(res,'地区列表'); @@ -1184,6 +1214,7 @@ export default { this.pageNum = 1; this.provinceId = ""; this.cityId = ""; + this.operationStaffId = ""; this.area=[] this.getcompanyList(); }, @@ -1201,6 +1232,7 @@ export default { cityId: this.cityId, operatorName: this.operatorName, operationStaffName: this.operationStaffName, + operationStaffId: this.operationStaffId, name: this.name, operationType: 1, agentId: localStorage.getItem("agentId"), diff --git a/src/views/Customer/Companymanagement.vue b/src/views/Customer/Companymanagement.vue index 92a37b8..4cceded 100644 --- a/src/views/Customer/Companymanagement.vue +++ b/src/views/Customer/Companymanagement.vue @@ -11,15 +11,33 @@
-
运营人员：
+ +
运营人员：
+
+ + + + +
-
地区：
-
代理商数
{{ firstTab.agentQuantity || 0 }}
@@ -115,7 +114,6 @@
{{ firstTab.normalequipmentQuantity || 0 }}
--> -
用户数
{{ firstTab.userQuantity || 0 }}
@@ -149,15 +147,55 @@
-
今日实时状况
+
+
今日实时状况
+
+
+
+
+ 近7天 +
+
+ 近15天 +
+
+ 近30天 +
+
+
+ + +
+
+
+
+
-
+
接待量
{{ secondTab.receptionQuantityInToday || 0 }}
-
+
活跃用户
@@ -165,7 +203,11 @@ {{ secondTab.activeUserQuantity || 0 }}
-
+
活跃设备
@@ -207,15 +249,36 @@ >
+ + + +
-
-
+
+
购买服务楼盘数
-
+
{{ thirdTab.houseQuantity || 0 }}
@@ -235,7 +298,11 @@ {{ thirdTab.avgDuration || 0 }}
--> -
+
活跃用户数
@@ -243,7 +310,11 @@ {{ thirdTab.activeUserQuantity || 0 }}
-
+
新增用户数
@@ -251,13 +322,21 @@ {{ thirdTab.userCountWithNewJoin || 0 }}
-
+
接待量
{{ thirdTab.receptionQuantity || 0 }}
-
+
平均接待时长
@@ -265,7 +344,11 @@ {{ thirdTab.receptionTimeWithAvg || 0 }}
-
+
活跃设备数
@@ -275,7 +358,7 @@
-
+
@@ -295,7 +378,8 @@ export default { secondTab: {}, thirdTab: {}, selValue: "0", - choicValue: "", + echarValue:'0', + choicValue:"", houseList: [], secindex: "1", dateType: 4, @@ -311,29 +395,40 @@ export default { value: "1", }, ], - agentissow:true + options1: [ + { + label: "趋势图", + value: "0", + }, + { + label: "表格", + value: "1", + }, + ], + agentissow: true, + dateType1: 4, + customtime1: [], }; }, mounted() { this.getList(); - this.tabtimetap(4); + // this.tabtimetap(4); }, methods: { valuechange() { this.dateType = 4; - this.cardindex=1; - this.secindex=1; - if(this.choicValue==''){ - - } - if(this.selValue==1){ - this.agentissow=false; - }else{ - if(this.choicValue==''){ - this.agentissow=true; - }else{ - this.agentissow=false; - } + this.cardindex = 1; + this.secindex = 1; + if (this.choicValue == "") { + } + if (this.selValue == 1) { + this.agentissow = false; + } else { + if (this.choicValue == "") { + this.agentissow = true; + } else { + this.agentissow = false; + } } this.dataOverViewWithSystem(); this.dataOverviewWithSystemWithDay(); @@ -343,17 +438,17 @@ export default { selChange() { this.choicValue = ""; this.dateType = 4; - this.cardindex=1 - this.secindex=1 + this.cardindex = 1; + this.secindex = 1; this.getList(); - if(this.selValue==1){ - this.agentissow=false; - }else{ - if(this.choicValue==''){ - this.agentissow=true; - }else{ - this.agentissow=false; - } + if (this.selValue == 1) { + this.agentissow = false; + } else { + if (this.choicValue == "") { + this.agentissow = true; + } else { + this.agentissow = false; + } } }, // 获取下拉框数据 @@ -390,6 +485,9 @@ export default { agentId: this.selValue == 0 ? this.choicValue : null, orgCode: this.selValue == 1 ? this.choicValue : null, orgType: localStorage.getItem("orgType"), + startDate: this.dateType1 ? "" : this.customtime1[0], + endDate: this.dateType1 ? "" : this.customtime1[1], + dateType: this.dateType1, }) .then((res) => { this.secondTab = res.data; @@ -424,7 +522,7 @@ export default { let arr1 = []; let arr2 = []; // console.log(timeDate); - if (idx == 1 ) { + if (idx == 1) { // 接待量 this.secondTab.todayReceptionList.map((item) => { timeDate.push(item.time.substring(11, 16)); @@ -527,7 +625,7 @@ export default { data: arr1, type: "line", smooth: true, - } + }, ]; this.SwitchCARDS(arr, "echar2", timeDate, Strname); }, @@ -551,17 +649,23 @@ export default { this.secindex = i; this.getChars1(i); }, + confirmtime1(e) { + this.dateType1 = null; + this.dataOverviewWithSystemWithDay(); + }, + tabtimetap1(i) { + this.dateType1 = i; + this.customtime1 = []; + this.dataOverviewWithSystemWithDay(); + }, confirmtime(e) { this.dateType = null; this.dataOverviewWithSystemWithLook(); }, tabtimetap(i) { this.dateType = i; - this.selectTime = ""; - this.selectTime1 = ""; - this.customtime=[] + this.customtime = []; this.dataOverviewWithSystemWithLook(); - }, //卡片下折线图 SwitchCARDS(arr, str, timeDate, Strname) { @@ -570,29 +674,29 @@ export default { var option; option = { - color: [ - "#6F8EDC", - "#EE6666", - "#F98120", - "#1CC99E", - "#9474FB", - "#66AFF5", - "#FABD2B", - "#FFCF8F", - "#657292", - "#7A6A99", - "#BF5D52", - "#77B7E4", - "#E6A065", - "#9D5139", - "#C1AA88", - "#F87F7A", - "#F6CF74", - "#7F5506", - "#88BB9B", - "#6E99AA", - "#5789D0", - ], + color: [ + "#6F8EDC", + "#EE6666", + "#F98120", + "#1CC99E", + "#9474FB", + "#66AFF5", + "#FABD2B", + "#FFCF8F", + "#657292", + "#7A6A99", + "#BF5D52", + "#77B7E4", + "#E6A065", + "#9D5139", + "#C1AA88", + "#F87F7A", + "#F6CF74", + "#7F5506", + "#88BB9B", + "#6E99AA", + "#5789D0", + ], tooltip: { trigger: "axis", }, @@ -891,5 +995,4 @@ export default { display: flex; justify-content: space-between; } - diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue index 592128d..aeda63c 100644 --- a/src/views/admin/user/index.vue +++ b/src/views/admin/user/index.vue @@ -194,6 +194,7 @@ + - + +