From 606218d307092a9408b06908a20b10b16cf3d461 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 12 Jul 2022 11:04:27 +0800 Subject: [PATCH 01/14] 111 --- .../workSys/role/role-add-or-update.vue | 148 ++++++++++++++++++ src/views/modules/workSys/role/role.vue | 102 ++++++++++++ 2 files changed, 250 insertions(+) create mode 100644 src/views/modules/workSys/role/role-add-or-update.vue create mode 100644 src/views/modules/workSys/role/role.vue diff --git a/src/views/modules/workSys/role/role-add-or-update.vue b/src/views/modules/workSys/role/role-add-or-update.vue new file mode 100644 index 00000000..c645b634 --- /dev/null +++ b/src/views/modules/workSys/role/role-add-or-update.vue @@ -0,0 +1,148 @@ + + + diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue new file mode 100644 index 00000000..a3a87e38 --- /dev/null +++ b/src/views/modules/workSys/role/role.vue @@ -0,0 +1,102 @@ + + + From 548f813b93c5ad4b309c5d4d2d5757cb408ef08a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 12 Jul 2022 17:36:26 +0800 Subject: [PATCH 02/14] 11 --- .../workSys/role/role-add-or-update.vue | 148 ------- src/views/modules/workSys/role/role.vue | 401 +++++++++++++++--- src/views/modules/workSys/role/roleForm.vue | 369 ++++++++++++++++ 3 files changed, 706 insertions(+), 212 deletions(-) delete mode 100644 src/views/modules/workSys/role/role-add-or-update.vue create mode 100644 src/views/modules/workSys/role/roleForm.vue diff --git a/src/views/modules/workSys/role/role-add-or-update.vue b/src/views/modules/workSys/role/role-add-or-update.vue deleted file mode 100644 index c645b634..00000000 --- a/src/views/modules/workSys/role/role-add-or-update.vue +++ /dev/null @@ -1,148 +0,0 @@ - - - diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index a3a87e38..c70125bc 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -1,102 +1,375 @@ + + + diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue new file mode 100644 index 00000000..289db50e --- /dev/null +++ b/src/views/modules/workSys/role/roleForm.vue @@ -0,0 +1,369 @@ + + + + + + + + + + + From be1b79b16a1dabf6e66d04ea9e6b3dd38a20e430 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 13 Jul 2022 14:00:34 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 4 +- .../base/organization/organization.vue | 4529 +++++++++-------- src/views/modules/workSys/role/role.vue | 26 +- src/views/modules/workSys/role/roleForm.vue | 31 +- 4 files changed, 2430 insertions(+), 2160 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index ad616091..a3c1e3f3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -380,7 +380,7 @@ router.beforeEach((to, from, next) => { // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); http - .get("/gov/access/menu/nav?tableName=data_menu") + .get("gov/access/menu/navDigitalCommunity?tableName=data_menu") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 @@ -406,7 +406,7 @@ router.beforeEach((to, from, next) => { }); http - .get("/gov/access/menu/nav") + .get("gov/access/menu/navDigitalCommunity") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 8860180f..c61ba5f5 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1,2236 +1,2477 @@ \ No newline at end of file diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index c70125bc..f61225cd 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -16,7 +16,7 @@ - - + --> 查看 + 修改 - 删除 @@ -158,7 +161,7 @@ export default { timeRange: [], formData: { name: '',//名称 - createdTime: '',//时间 + // createdTime: '',//时间 }, @@ -260,6 +263,13 @@ export default { this.$refs.ref_form.initForm('edit', row.id) }) }, + handleDetail (row) { + this.formTitle = '详情' + this.formShow = true + this.$nextTick(() => { + this.$refs.ref_form.initForm('detail', row.id) + }) + }, addFormOk () { this.formShow = false @@ -285,12 +295,10 @@ export default { async deleteRole (row) { - const url = "/gov/access/govrole/del/" + array + const url = "/gov/access/govrole/del" - let params = { - ids: [row.id] - } + let params = [row.id] const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue index 289db50e..c7b4f185 100644 --- a/src/views/modules/workSys/role/roleForm.vue +++ b/src/views/modules/workSys/role/roleForm.vue @@ -43,6 +43,7 @@ :data="menuList" :props="{ label: 'name', children: 'children' }" node-key="id" + :default-expanded-keys="['000']" ref="menuListTree" accordion show-checkbox> @@ -56,6 +57,7 @@ :data="menuListShuju" :props="{ label: 'name', children: 'children' }" node-key="id" + :default-expanded-keys="['000']" ref="menuListShujuTree" accordion show-checkbox> @@ -111,9 +113,7 @@ export default { components: {}, async mounted () { - //获取菜单 - await this.getMenuList() - await this.getMenuShujuList() + }, methods: { @@ -122,6 +122,9 @@ export default { this.startLoading() this.customerId = localStorage.getItem("customerId"); this.formData.customerId = this.customerId + //获取菜单 + await this.getMenuList() + await this.getMenuShujuList() this.$refs['ref_form'].resetFields(); this.$refs.menuListTree.setCheckedKeys([]) @@ -149,7 +152,14 @@ export default { const { data, code, msg } = await requestGet(url, params) if (code === 0) { - this.menuList = data + this.menuList = [ + { + id: '000', + name: '全部菜单', + children: [...data] + } + ] + // this.menuList = data } else { this.$message.error(msg) @@ -167,7 +177,14 @@ export default { const { data, code, msg } = await requestGet(url, params) if (code === 0) { - this.menuListShuju = data + this.menuListShuju = [ + { + id: '000', + name: '全部菜单', + children: [...data] + } + ] + // this.menuListShuju = data } else { this.$message.error(msg) @@ -188,6 +205,9 @@ export default { this.formData.menuIdList.forEach(item => { this.$refs.menuListTree.setChecked(item, true) + + }) + this.formData.menuIdList.forEach(item => { this.$refs.menuListShujuTree.setChecked(item, true) }) this.formData.customerId = this.customerId @@ -231,6 +251,7 @@ export default { ...this.$refs.menuListShujuTree.getCheckedKeys(), ...this.$refs.menuListShujuTree.getHalfCheckedKeys() ] + this.formData.menuIdList = this.formData.menuIdList.filter(item => item !== '000') console.log('menuAll', this.formData) From a99d46ed527d5851c23d0539cbdfaef568a7888a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 13 Jul 2022 15:09:19 +0800 Subject: [PATCH 04/14] 11 --- src/views/modules/workSys/role/role.vue | 2 +- src/views/modules/workSys/role/roleForm.vue | 26 ++++----------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index f61225cd..c6b03d01 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -242,7 +242,7 @@ export default { }, diaClose () { - this.$refs.ref_form.resetData() + this.formShow = false }, diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue index c7b4f185..753a1ce0 100644 --- a/src/views/modules/workSys/role/roleForm.vue +++ b/src/views/modules/workSys/role/roleForm.vue @@ -126,7 +126,7 @@ export default { await this.getMenuList() await this.getMenuShujuList() - this.$refs['ref_form'].resetFields(); + this.$refs.menuListTree.setCheckedKeys([]) this.$refs.menuListShujuTree.setCheckedKeys([]) @@ -297,31 +297,15 @@ export default { }, - - resetData () { this.roleId = '' - this.fileList = [] - this.hideUploadEdit = false this.formData = { - roleId: '', - agencyId: '',//当前网格所属组织Id - userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 - userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro + id: '', name: '', - idCard: '', - mobile: '', - natTime: '', - natAddress: '', - natResult: '', - isSelChannel: false, - channel: [], - content: '', - - fileName: '',//附件名 - attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） - attachmentUrl: '',//附件地址 + remark: '',//备注 + menuIdList: [], + customerId: '' } }, From 762773ff4c8e36b188b40a2d46a10df9aac7253d Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 13 Jul 2022 15:11:15 +0800 Subject: [PATCH 05/14] 11 --- src/router/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index a3c1e3f3..ad616091 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -380,7 +380,7 @@ router.beforeEach((to, from, next) => { // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); http - .get("gov/access/menu/navDigitalCommunity?tableName=data_menu") + .get("/gov/access/menu/nav?tableName=data_menu") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 @@ -406,7 +406,7 @@ router.beforeEach((to, from, next) => { }); http - .get("gov/access/menu/navDigitalCommunity") + .get("/gov/access/menu/nav") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 From 6c6eb0a1810ada99a7a2848beb36981b79158670 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 13 Jul 2022 15:13:00 +0800 Subject: [PATCH 06/14] 11 --- src/router/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index ad616091..a3c1e3f3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -380,7 +380,7 @@ router.beforeEach((to, from, next) => { // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); http - .get("/gov/access/menu/nav?tableName=data_menu") + .get("gov/access/menu/navDigitalCommunity?tableName=data_menu") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 @@ -406,7 +406,7 @@ router.beforeEach((to, from, next) => { }); http - .get("/gov/access/menu/nav") + .get("gov/access/menu/navDigitalCommunity") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 From c76d469248a243c55d4318396b3461b17a63d331 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 13 Jul 2022 17:33:15 +0800 Subject: [PATCH 07/14] =?UTF-8?q?404=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 36 +++++++++++++++++++++++++------- src/views/modules/404.vue | 16 ++++++++++++++ src/views/modules/visual/404.vue | 16 ++++++++++++++ src/views/pages/404.vue | 4 ++-- 4 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 src/views/modules/404.vue create mode 100644 src/views/modules/visual/404.vue diff --git a/src/router/index.js b/src/router/index.js index a3c1e3f3..b367df8c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -94,6 +94,16 @@ export const moduleRoutes = { isTab: true, }, }, + { + path: "404", + props: true, + component: () => import("@/views/modules/404"), + name: "main-404", + meta: { + title: "页面未找到或无权访问", + isTab: false, + }, + }, ], }; @@ -129,6 +139,16 @@ export const moduleShujuRoutes = { isTab: false, }, }, + { + path: "404", + props: true, + component: () => import("@/views/modules/visual/404"), + name: "main-shuju-404", + meta: { + title: "页面未找到或无权访问", + isTab: false, + }, + }, ], }; @@ -519,10 +539,10 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) { children: routes, }, { - path: "*", - // redirect: { - // name: "404", - // }, + path: "/main/*", + redirect: { + path: "/main/404", + }, }, ]); window.SITE_CONFIG["dynamicMenuRoutes"] = routes; @@ -593,10 +613,10 @@ function fnAddDynamicMenuRoutes2(menuList = [], routes = []) { children: routes, }, { - path: "*", - // redirect: { - // name: "404", - // }, + path: "/main-shuju/*", + redirect: { + path: "/main-shuju/404", + }, }, ]); window.SITE_CONFIG["dynamicMenuRoutesShuju"] = routes; diff --git a/src/views/modules/404.vue b/src/views/modules/404.vue new file mode 100644 index 00000000..33682a33 --- /dev/null +++ b/src/views/modules/404.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/views/modules/visual/404.vue b/src/views/modules/visual/404.vue new file mode 100644 index 00000000..047aec70 --- /dev/null +++ b/src/views/modules/visual/404.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/views/pages/404.vue b/src/views/pages/404.vue index 5d49d643..e7796ec6 100644 --- a/src/views/pages/404.vue +++ b/src/views/pages/404.vue @@ -2,11 +2,11 @@
-

404

+

页面未找到或无权访问

{{ $t('notFound.back') }} - {{ $t('notFound.home') }} + {{ $t('notFound.home') }}
From 03029c1505c3fdf39abd6d2a03386f74474a71e6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 14 Jul 2022 08:51:00 +0800 Subject: [PATCH 08/14] 11 --- src/views/modules/workSys/role/roleForm.vue | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue index 753a1ce0..05f6281f 100644 --- a/src/views/modules/workSys/role/roleForm.vue +++ b/src/views/modules/workSys/role/roleForm.vue @@ -126,7 +126,6 @@ export default { await this.getMenuList() await this.getMenuShujuList() - this.$refs.menuListTree.setCheckedKeys([]) this.$refs.menuListShujuTree.setCheckedKeys([]) @@ -329,7 +328,7 @@ export default { dataRule () { return { name: [ - { required: true, message: '姓名不能为空', trigger: 'blur' } + { required: true, message: '角色名称不能为空', trigger: 'change' } ], @@ -340,11 +339,6 @@ export default { props: { - - // serviceList: { - // type: Array, - // default: [] - // }, } } From 280de3840b40d62c2855aae0216b62ea7846df53 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 14 Jul 2022 09:09:16 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/visual/communityGovern/fivelayers/mapIndex copy.vue | 2 +- .../modules/visual/communityGovern/fivelayers/mapIndex.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue index efc340eb..981f4b0a 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue @@ -923,7 +923,7 @@ const vueGis = { // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail" let params = { - icSuperiorResourceId: info.id + icDangerousChemicalsId: info.id } const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 35664c13..9485e3ce 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -923,7 +923,7 @@ const vueGis = { // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail" let params = { - icSuperiorResourceId: info.id + icDangerousChemicalsId: info.id } const { data, code, msg } = await requestPost(url, params) From d6ea1c75ef4507687303c7c6126b9f1450cfddf3 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 14 Jul 2022 10:19:52 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/dai/request.js | 2 + src/js/dai/request2.js | 2 + src/router/index.js | 186 -------------------------------------- src/utils/index.js | 1 + src/views/pages/index.vue | 65 +++++++------ src/views/pages/login.vue | 2 +- 6 files changed, 44 insertions(+), 214 deletions(-) diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 92fb7831..709895d6 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -4,6 +4,7 @@ import axios from "axios"; import curry from "dai-js/tools/curry"; import { Message } from "element-ui"; +import { clearLoginInfo } from "@/utils"; const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { @@ -42,6 +43,7 @@ const request = curry( // 10005 token为空 10006登陆超时 10007别处登录 console.log("登录失效"); Message.error(res.data.msg); + clearLoginInfo(); return next({ name: "login", }); diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js index 92fb7831..709895d6 100644 --- a/src/js/dai/request2.js +++ b/src/js/dai/request2.js @@ -4,6 +4,7 @@ import axios from "axios"; import curry from "dai-js/tools/curry"; import { Message } from "element-ui"; +import { clearLoginInfo } from "@/utils"; const request = curry( (method, url, data = {}, headers = {}, progress = () => {}) => { @@ -42,6 +43,7 @@ const request = curry( // 10005 token为空 10006登陆超时 10007别处登录 console.log("登录失效"); Message.error(res.data.msg); + clearLoginInfo(); return next({ name: "login", }); diff --git a/src/router/index.js b/src/router/index.js index b367df8c..9f87613e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -213,192 +213,6 @@ router.beforeEach((to, from, next) => { const customerId = localStorage.getItem("customerId"); console.log("customerId：", customerId); - window.SITE_CONFIG["menuShujuList"] = [ - // { - // url: "/visual/plugin/power/organization", - // name: "动力主轴", - // id: "5feawfwaefwa577", - // }, - { - id: "22213213", - name: "基础信息", - // url: "visual/basicinfo/basicInfoMain", - children: [ - { - url: "/visual/basicinfo/basicInfoMain", - name: "人房信息统计", - id: "5feawfwaefwa5", - }, - { - url: "/visual/basicinfo/personCategory/index", - name: "人员类别分析", - id: "5fwaefwaefawef5", - }, - { - url: "/visual/basicinfo/houseStatic/houseStatic", - name: "人房概览统计", - id: "5fwaefwaefawef6", - }, - ], - }, - { - icon: "icon-setting", - id: "2", - name: "人员图谱", - url: "visual/basicinfo/peopleSearch", - }, - { - icon: "icon-setting", - id: "3", - name: "人员预警", - url: "visual/warning/index", - }, - { - icon: "icon-setting", - id: "2221321001", - name: "社区党建", - // url: "visual/basicinfo/basicInfoMain", - children: [ - { - url: "/visual/communityParty/gridParty", - name: "网格党建平面图", - id: "5feawfwaefwa579", - }, - { - url: "/visual/communityParty/party", - name: "党员信息统计", - id: "5feawfwaefwa578", - }, - { - url: "/visual/communityParty/community", - name: "联建单位分析", - id: "5fwaefwaefawef588", - }, - { - url: "/visual/communityParty/elegant", - name: "党员风采榜", - id: "5fwaefwaefawef589", - }, - ], - }, - { - icon: "icon-setting", - id: "2221321123", - name: "社区服务", - // url: "visual/basicinfo/basicInfoMain", - children: [ - { - url: "/visual/measure/service", - name: "需求服务分析", - id: "5feawfwaefwa57", - }, - { - url: "/visual/measure/volunteer", - name: "志愿服务分析", - id: "5fwaefwaefawef58", - }, - ], - }, - { - icon: "icon-setting", - id: "6", - name: "社区治理", - children: [ - { - url: "visual/communityGovern/shijianchuli/shijianchulifenxi", - name: "事件处理分析", - id: "shijianchulifenxi", - }, - // { - // url: "visual/communityGovern/processAnalyze", - // name: "事件处置分析", - // id: "processAnalyze", - // }, - { - url: "/visual/communityGovern/shijianfenlei/shijianfenleifenxi", - name: "事件分类分析", - id: "shijianfenleifenxi", - }, - { - url: "/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi", - name: "多元服务分析", - id: "duoyuanfuwufenxi", - }, - // { - // url: "/visual/communityGovern/typeAnalyze", - // name: "事件分类分析", - // id: "typeAnalyze", - // }, - // { - // url: "/visual/communityGovern/resibuzz", - // name: "居民热议分析", - // id: "resibuzz", - // }, - // { - // url: "/visual/communityGovern/distributionAnalyze", - // name: "事件分布分析", - // id: "distributionAnalyze", - // }, - ], - }, - - { - icon: "icon-setting", - id: "2221321fefefaewfa123", - name: "初心互助", - url: "visual/heart/index", - children: [], - }, - { - icon: "icon-setting", - id: "2221321fefefaewfa122223", - name: "疫情防控", - url: "", - children: [], - }, - { - icon: "icon-setting", - id: "44rq22222q2222", - name: "智慧安防", - // url: "visual/basicinfo/basicInfoMain", - children: [ - { - url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel", - // url: "/visual/ai/index", - name: "视频监控", - id: "5feawfwa111111efwa57", - }, - /*{ - url: "/visual/ai/renliu", - name: "人流数据", - id: "5fwaefwae222112fawef58", - }, - { - url: "/visual/ai/cheliu", - name: "车流数据", - id: "erawerwecsxefwaw", - }, - { - url: "/visual/ai/shebei", - name: "设备数据", - id: "zfzffewaf", - }, - { - url: "/visual/ai/gongdan", - name: "工单数据", - id: "fewafwafewaefddd", - },*/ - { - // url: "/visual/ai/yujing", - url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis", - name: "预警分析", - id: "545345fdsfs", - }, - ], - }, - ]; - // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); - http .get("gov/access/menu/navDigitalCommunity?tableName=data_menu") .then(({ data: res }) => { diff --git a/src/utils/index.js b/src/utils/index.js index c2232ac7..1e6b6e6f 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -45,6 +45,7 @@ export function getDictLabel(dictType, dictValue) { export function clearLoginInfo() { store.commit('resetStore') Cookies.remove('token') + localStorage.setItem("token", ''); window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false } diff --git a/src/views/pages/index.vue b/src/views/pages/index.vue index 056814c6..19ec9d88 100644 --- a/src/views/pages/index.vue +++ b/src/views/pages/index.vue @@ -5,14 +5,14 @@
- +
数字社区管理平台
- +
数字社区可视化平台
@@ -21,7 +21,9 @@
@@ -29,60 +31,69 @@
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 6db09b13..10cf96a9 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -247,7 +247,7 @@ export default { localStorage.setItem("userType", "work"); localStorage.setItem("showHeader", "0"); localStorage.setItem("token", res.data.token); - this.$router.replace({ name: "home" }); + this.$router.replace({ name: "index" }); }) .catch(() => {}); // epmet-ext9.elinkservice.cn/platform-admin From fd9d98ad4a0e9ca85db66b49766e5061019fce34 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 14 Jul 2022 10:42:29 +0800 Subject: [PATCH 11/14] 11 --- src/views/modules/workSys/role/roleForm.vue | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue index 05f6281f..0e0304a2 100644 --- a/src/views/modules/workSys/role/roleForm.vue +++ b/src/views/modules/workSys/role/roleForm.vue @@ -91,8 +91,6 @@ export default { return { formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 - - btnDisable: false, roleId: '', @@ -230,19 +228,7 @@ export default { async addNat () { - // let menuList1 = [ - // ...this.$refs.menuListTree.getCheckedKeys(), - // ...this.$refs.menuListTree.getHalfCheckedKeys(), - // ] - // let menuList2 = [ - // ...this.$refs.menuListShujuTree.getCheckedKeys(), - // ...this.$refs.menuListShujuTree.getHalfCheckedKeys() - // ] - - // console.log('menuList1', menuList1) - // console.log('menuList2', menuList2) - // let menuAll=menuList1.concat(menuList2) - // console.log('menuAll',menuAll) + this.formData.menuIdList = [] this.formData.menuIdList = [ ...this.$refs.menuListTree.getCheckedKeys(), @@ -297,6 +283,7 @@ export default { }, resetData () { + this.roleId = '' this.formData = { @@ -307,6 +294,7 @@ export default { customerId: '' } + this.$refs['ref_form'].resetFields() }, // 开启加载动画 startLoading () { From 38cd589aad02e9d77e6148f32d41e1fa6927bc0f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 14 Jul 2022 10:45:44 +0800 Subject: [PATCH 12/14] 11 --- src/views/modules/workSys/role/role.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index c6b03d01..f61225cd 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -242,7 +242,7 @@ export default { }, diaClose () { - + this.$refs.ref_form.resetData() this.formShow = false }, From 376d05bbdbf84aeff81de5f02af5d7e0a6e2d140 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 14 Jul 2022 14:26:40 +0800 Subject: [PATCH 13/14] 11 --- src/views/modules/workSys/role/role.vue | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index f61225cd..da7d11f5 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -317,17 +317,13 @@ export default { //重置搜索条件 resetSearch () { this.formData = { - orgType: 'current',//当前组织:current 根组织：all + name: '',//姓名 - mobile: '',//手机号 - idCard: '',//身份证号码 - startTime: '',//检测开始时间yyyy-MM-dd HH:mm - endTime: '',//检测结束时间yyyy-MM-dd HH:mm + } - this.timeRange = [] this.pageNo = 0 - // this.loadTable() + this.loadTable() }, handleSizeChange (val) { From 9af0447d917f63f0341d859a4bf4680d0c923152 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 14 Jul 2022 16:10:46 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=A9=BF=E9=80=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/visual/basicInfoMain.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 819f2df3..c21671d6 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -424,6 +424,7 @@ width: 370px; height: 470px; overflow: hidden; + pointer-events: none; .wrap { display: flex; @@ -433,6 +434,7 @@ transform: translateX(-5px); transition: all ease 1s; border-radius: 4px; + pointer-events: auto; } .wrap-hidden {