From 16964a65d28274f572b2f7d44f47816d785221f9 Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Wed, 27 Oct 2021 19:01:22 +0800 Subject: [PATCH] init --- src/api/modules/api.js | 25 + src/const/crud/admin/log.js | 10 +- src/const/website.js | 4 +- src/page/index/logo.vue | 3 + src/views/Customer/AgentManagement.vue | 50 +- src/views/Equipment/equipmentDetailList.vue | 112 ++++- src/views/Scheduling/index.vue | 19 +- src/views/Statistics/TrendAnalysis.vue | 116 ++--- src/views/Statistics/index.vue | 2 +- src/views/admin/dept/index.vue | 495 +++++++++++--------- src/views/admin/dept/index1.vue | 256 ++++++++++ src/views/admin/role/index.vue | 17 +- src/views/admin/user/index.vue | 21 +- src/views/building/area.vue | 4 +- 14 files changed, 800 insertions(+), 334 deletions(-) create mode 100644 src/views/admin/dept/index1.vue diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 80344f2..9c83eea 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -730,3 +730,28 @@ export function zkoperationrecordSaveHouse(data) { data }) } + +// 部门列表 +export function deptFindByPage(query) { + return request({ + url: 'admin/dept/findByPage', + method:'get', + params:query + }) +} +// 部门添加 +export function deptAdd(data) { + return request({ + url: 'admin/dept/add', + method:'post', + data + }) +} +// 部门删除 +export function deptDel(data) { + return request({ + url: 'admin/dept/del', + method:'post', + data + }) +} diff --git a/src/const/crud/admin/log.js b/src/const/crud/admin/log.js index b539b89..67a41db 100644 --- a/src/const/crud/admin/log.js +++ b/src/const/crud/admin/log.js @@ -5,7 +5,7 @@ export const tableOption = { stripe: true, menuAlign: "center", menuWidth: 150, - + menu:false, align: "center", refreshBtn: true, showClomnuBtn: false, @@ -43,10 +43,10 @@ export const tableOption = { label: "请求方式", prop: "method" }, - { - label: "客户端", - prop: "serviceId" - }, + // { + // label: "客户端", + // prop: "serviceId" + // }, // { // width: 80, // label: '请求时间', diff --git a/src/const/website.js b/src/const/website.js index efb0584..5892c5d 100644 --- a/src/const/website.js +++ b/src/const/website.js @@ -1,9 +1,9 @@ export default { title: '智控管家', - subtitle: 'PigX', + subtitle: '智控', copyright: 'Copyright © 2021 pig4cloud.com. All rights reserved.', isFirstPage: true,// 配置首页不可关闭 - key: 'pigx', // 配置主键,目前用于存储 + key: 'zk', // 配置主键,目前用于存储 whiteList: ['/login', '/404', '/401', '/lock'], // 配置无权限可以访问的页面 whiteTagList: ['/login', '/404', '/401', '/lock'], // 配置不添加tags页面 ('/advanced-router/mutative-detail/*'——*为通配符) fistPage: { diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue index a3e7ab3..da723bf 100644 --- a/src/page/index/logo.vue +++ b/src/page/index/logo.vue @@ -20,6 +20,9 @@ export default { computed: { ...mapGetters(['website', 'keyCollapse']) }, + // mounted(){ + // console.log(this.website,'123'); + // }, methods: { goIndex: function () { window.location.href = '/' diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue index e84ef8b..6bab598 100644 --- a/src/views/Customer/AgentManagement.vue +++ b/src/views/Customer/AgentManagement.vue @@ -85,7 +85,7 @@ @@ -113,18 +113,18 @@ align="center" > - - + --> @@ -133,6 +133,7 @@ 更换账号 删除 管理运营人员 + {{scope.row.lockFlag==0?'禁用':'启用'}} @@ -690,14 +691,35 @@ export default { this.$message.error(res.message); } }) - }).catch(() => { - this.$message({ - type: 'info', - message: '已取消删除' - }); - }); + }) + .catch(err=>{ + console.log('关闭'); + }) + }, + toDisable(row){ + this.$confirm(`确定${row.lockFlag==0?'禁用':'启用'}此代理商么?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + return + this.$api.http.delAgent({id:item.row.id}).then((res) => { + if(res.code==0){ + this.$message({ + type: 'success', + message: '删除成功!' + }); + this.Screeningofempty() + this.getAgentList() + }else{ + this.$message.error(res.message); + } + }) + }) + .catch(err=>{ + console.log('关闭'); + }) }, - //时间选择 confirmtime(){ console.log(this.timelist) diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index f8b9959..8602c2c 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -438,7 +438,7 @@ -
+
@@ -454,7 +454,13 @@
-
+
+
+
对比
+
+
+
+
+ + diff --git a/src/views/admin/dept/index1.vue b/src/views/admin/dept/index1.vue new file mode 100644 index 0000000..bd56481 --- /dev/null +++ b/src/views/admin/dept/index1.vue @@ -0,0 +1,256 @@ + + + + + diff --git a/src/views/admin/role/index.vue b/src/views/admin/role/index.vue index 924dacc..90d5785 100644 --- a/src/views/admin/role/index.vue +++ b/src/views/admin/role/index.vue @@ -269,15 +269,15 @@ - + - + @@ -305,8 +305,9 @@ node-key="id" highlight-current show-checkbox - default-expand-all + /> +
@@ -188,11 +188,17 @@ {{ row.sex == 0 ? "男" : "女" }} - + @@ -306,7 +312,7 @@ {{ scope.row.lockFlag == 0 ? "禁用" : "启用" }} 删除移除 @@ -367,11 +373,12 @@ show-password > - + @@ -1639,6 +1646,8 @@ export default { // this.dialogFormVisible=true this.addFlag = true; this.editFlag = false; + this.form.orgType=localStorage.getItem('orgType')/1 + this.typeChange(0) this.formTitle = "添加"; }, // 编辑 diff --git a/src/views/building/area.vue b/src/views/building/area.vue index fa51c81..3244d72 100644 --- a/src/views/building/area.vue +++ b/src/views/building/area.vue @@ -3,7 +3,7 @@
- 区域管理 +
公司选择