From 99ccf2fba8e9fede64aad3c9b6243e64c77f4e2a Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 8 Jun 2022 09:43:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BE=A4=E5=8F=91=E6=B6=88=E6=81=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppMessageNotification.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/project/police/AppMessageNotification/AppMessageNotification.vue b/src/project/police/AppMessageNotification/AppMessageNotification.vue index 18299e1d..2ac944b6 100644 --- a/src/project/police/AppMessageNotification/AppMessageNotification.vue +++ b/src/project/police/AppMessageNotification/AppMessageNotification.vue @@ -196,6 +196,15 @@ export default { if(!this.form.content) { return this.$u.toast('请输入文本内容') } + if(this.form.contentType == 'image' && !this.formData.imgList.length) { + return this.$u.toast('请上传图片') + } + if(this.form.contentType == 'video' && !this.formData.fileList.length) { + return this.$u.toast('请上传视频') + } + if(this.form.contentType == 'file' && !this.formData.fileList.length) { + return this.$u.toast('请上传文件') + } if(this.formData.fileList.length) { this.formData.file = this.formData.fileList[0] } @@ -220,7 +229,11 @@ export default { this.areaIdList = [] this.tagIdList = [] this.formDataInit() + }else { + this.$u.toast(res.msg) } + }).catch((err) => { + this.$u.toast(err) }) }, formDataInit() { From 0f77efc8b9721b195db09bc808141dfe945c4b34 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Jun 2022 10:03:06 +0800 Subject: [PATCH 2/5] BUG 30091 --- src/project/beta/AppGridManagement/Map.vue | 2 +- src/project/beta/AppGridManagement/SelectGird.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/project/beta/AppGridManagement/Map.vue b/src/project/beta/AppGridManagement/Map.vue index c4503bd0..5b331442 100644 --- a/src/project/beta/AppGridManagement/Map.vue +++ b/src/project/beta/AppGridManagement/Map.vue @@ -29,7 +29,7 @@
- 网格管理员 + 网格长 {{ item.name }}  {{ item.phone }} diff --git a/src/project/beta/AppGridManagement/SelectGird.vue b/src/project/beta/AppGridManagement/SelectGird.vue index a59d7ec3..e365f1d6 100644 --- a/src/project/beta/AppGridManagement/SelectGird.vue +++ b/src/project/beta/AppGridManagement/SelectGird.vue @@ -22,7 +22,7 @@
- + @@ -61,7 +61,7 @@ export default { if (option.isFormMap) { this.isFormMap = option.isFormMap } - this.isGridMember ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格管理员') + this.isGridMember ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格长') }, methods: { getAllGrids() { From aae31a7bb8e5aeb504bb9f76526e3c6d75be958d Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Jun 2022 10:30:50 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/loading.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/loading.vue b/src/pages/loading.vue index 568edbb0..86a68d2f 100644 --- a/src/pages/loading.vue +++ b/src/pages/loading.vue @@ -30,7 +30,7 @@ export default { let {search, currentLib} = this return this.apps.filter(e => { return (currentLib == "apps" && e.libPath.indexOf("project") > -1) || e.libPath.indexOf(currentLib) > -1 - }).filter(e => !!search ? e.label.indexOf(search) > -1 : true) || [] + }).filter(e => !!search ? e.label?.indexOf(search) > -1 : true) || [] }, currentApp() { return this.apps.find(e => e.key == this.$route.query.app) || {} From ea28c3899034a50babf1645648aaa57e6fc17aca Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 8 Jun 2022 10:31:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/project/beta/AppEquipment/AppEquipment.vue | 1 + src/project/beta/AppResourcesManage/AppResourcesManage.vue | 1 + .../police/AppMessageNotification/AppMessageNotification.vue | 1 + 3 files changed, 3 insertions(+) diff --git a/src/project/beta/AppEquipment/AppEquipment.vue b/src/project/beta/AppEquipment/AppEquipment.vue index bfabe0fb..f02545f1 100644 --- a/src/project/beta/AppEquipment/AppEquipment.vue +++ b/src/project/beta/AppEquipment/AppEquipment.vue @@ -40,6 +40,7 @@ import { mapState } from 'vuex' export default { name: "AppEquipment", + appName: '设备管理', data() { return { areaId: '', diff --git a/src/project/beta/AppResourcesManage/AppResourcesManage.vue b/src/project/beta/AppResourcesManage/AppResourcesManage.vue index fe484022..21c25569 100644 --- a/src/project/beta/AppResourcesManage/AppResourcesManage.vue +++ b/src/project/beta/AppResourcesManage/AppResourcesManage.vue @@ -39,6 +39,7 @@ export default { name: "AppResourcesManage", + appName: '媒资管理', data() { return { tab: [{name: '音频素材'}, {name: '文本素材'}], diff --git a/src/project/police/AppMessageNotification/AppMessageNotification.vue b/src/project/police/AppMessageNotification/AppMessageNotification.vue index 2ac944b6..19d35faa 100644 --- a/src/project/police/AppMessageNotification/AppMessageNotification.vue +++ b/src/project/police/AppMessageNotification/AppMessageNotification.vue @@ -207,6 +207,7 @@ export default { } if(this.formData.fileList.length) { this.formData.file = this.formData.fileList[0] + this.formData.accessUrl = this.formData.fileList[0].url } if(this.formData.imgList.length) { this.formData.accessUrl = this.formData.imgList[0].url From a7ced7a899a5d8ea471d84950101e8109404b639 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Jun 2022 10:48:17 +0800 Subject: [PATCH 5/5] BUG 30097 --- src/common/axios.js | 4 ++-- .../beta/AppGridManagement/SelectGird.vue | 17 ++++------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/common/axios.js b/src/common/axios.js index c08174b3..d72415d2 100644 --- a/src/common/axios.js +++ b/src/common/axios.js @@ -15,9 +15,9 @@ instance.interceptors.request.use(config => { } else if (/AppCountryAlbum/.test(location.pathname) || config.module == 'AppCountryAlbum') { config.baseURL = '/aca' config.url = config.url.replace(/(app|auth|admin)\//, "api/") - } else if (/\/grid\//.test(location.pathname)) { + } else if (/\/project\/beta\//.test(location.pathname)) { config.baseURL = '/wangge' - } else if (/\/project\/police\//.test(location.pathname)||config.module=='hnjc') { + } else if (/\/project\/police\//.test(location.pathname) || config.module == 'hnjc') { config.baseURL = '/hnjc' config.url = config.url.replace(/(app|auth|admin)\//, "api/") } else if (sessionStorage.getItem("prj") == "saas") { diff --git a/src/project/beta/AppGridManagement/SelectGird.vue b/src/project/beta/AppGridManagement/SelectGird.vue index e365f1d6..06d66eef 100644 --- a/src/project/beta/AppGridManagement/SelectGird.vue +++ b/src/project/beta/AppGridManagement/SelectGird.vue @@ -2,7 +2,6 @@
- @@ -43,7 +42,6 @@ export default { allData: null, treeList: [], slectList: [], - userList: [], parentGirdId: '', isFormMap: 0, //1为网格地图 一级不允许选中 } @@ -81,9 +79,9 @@ export default { } }) }, - treeInit() { + treeInit(isClick) { let last = uni.getStorageSync("lastSelectedGrid") - if (last) { + if (!isClick && last) { this.$http.post("/app/appgirdinfo/listFatherGirdInfo", null, { params: {girdId: last} }).then(res => { @@ -114,18 +112,11 @@ export default { this.treeList = this.allData.filter(e => e.parentGirdId == parentGirdId) }, girdNameClick(row, index) { - this.userList = [] if (!index) { //第一级别 this.slectList = [] - this.treeInit() + this.treeInit(true) } else { - var list = [] - this.slectList.map((item, i) => { - if (i <= index) { - list.push(item) - } - }) - this.slectList = list + this.slectList.splice(index, 8) this.getGridsByGridMemberAndParent(row) } },