From e5d40840349983da3e4b4f8ba05877c6427bc4c6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 19 Mar 2022 10:04:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?test=E5=88=86=E6=94=AF=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index b8763839..d8f6318f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -300,10 +300,10 @@ router.beforeEach((to, from, next) => { { url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel", // url: "/visual/ai/index", - name: "AI安防", + name: "视频监控", id: "5feawfwa111111efwa57", }, - { + /*{ // url: "http://www.baidu.com", url: "/visual/ai/renliu", name: "人流数据", @@ -323,11 +323,11 @@ router.beforeEach((to, from, next) => { 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: "预警事件", + name: "预警分析", id: "545345fdsfs", }, ], From 8d83a70d08e60df0bbd0fa1bebf1a1ac00a9f05f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 22 Mar 2022 14:55:53 +0800 Subject: [PATCH 2/4] 11 --- src/views/pages/caiji.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index ec1041c5..1ece6522 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -308,13 +308,16 @@ export default { computed: { }, - created () { }, - mounted () { + created () { console.log(this.$route) this.shequId = this.$route.params.id this.customerId = this.$route.query.customerId this.shequName = this.$route.query.name + document.title = this.shequName + }, + mounted () { + let envShow = process.env.VUE_APP_NODE_ENV console.log('环境', envShow) From 6118f0e398854e6254787620cac7e960d69ea9f8 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 22 Mar 2022 15:04:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=A4=84=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=94=B9=E5=8F=98=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/caiji.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue index 1ece6522..f8d9a2a9 100644 --- a/src/views/pages/caiji.vue +++ b/src/views/pages/caiji.vue @@ -203,6 +203,7 @@ import { requestPost } from "@/js/dai/request"; import { Toast } from "mint-ui"; import { MessageBox } from 'mint-ui'; import { Loading } from 'element-ui' // 引入Loading服务 +import { messages } from '@/i18n' let loading // 加载动画 export default { @@ -308,6 +309,7 @@ export default { computed: { }, + created () { console.log(this.$route) @@ -858,7 +860,10 @@ export default { } - } + }, + beforeDestroy () { + document.title = messages[val].brand.lg + }, } From e1fa052b8984d2799a2505b430fa5bf4c547710f Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 22 Mar 2022 17:11:11 +0800 Subject: [PATCH 4/4] dd --- .../modules/secretaryLog/difficulty/difficultyForm.vue | 6 +++++- src/views/modules/secretaryLog/humanisticCare/careForm.vue | 6 +++++- src/views/modules/secretaryLog/workLog/form.vue | 7 +++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue index 8e4132e0..26361b75 100644 --- a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue +++ b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue @@ -276,7 +276,7 @@ export default { beforeUpload (file) { const array = file.name.split('.') const extension = array[array.length - 1] - + const isLt1M = (file.size / 1024 / 1024) < 5 if (extension !== 'xls' && extension !== 'xlsx' && extension !== 'doc' @@ -285,6 +285,10 @@ export default { this.$message.error('只能上传word、excel、pdf文件！') return false } + if (!isLt1M) { + this.$message.error('上传文件大小不能超过 5MB!') + } + return isLt1M }, diff --git a/src/views/modules/secretaryLog/humanisticCare/careForm.vue b/src/views/modules/secretaryLog/humanisticCare/careForm.vue index 0dac347a..e4a47683 100644 --- a/src/views/modules/secretaryLog/humanisticCare/careForm.vue +++ b/src/views/modules/secretaryLog/humanisticCare/careForm.vue @@ -331,7 +331,7 @@ export default { beforeUpload (file) { const array = file.name.split('.') const extension = array[array.length - 1] - + const isLt1M = (file.size / 1024 / 1024) < 5 if (extension !== 'xls' && extension !== 'xlsx' && extension !== 'doc' @@ -340,6 +340,10 @@ export default { this.$message.error('只能上传word、excel、pdf文件！') return false } + if (!isLt1M) { + this.$message.error('上传文件大小不能超过 5MB!') + } + return isLt1M }, diff --git a/src/views/modules/secretaryLog/workLog/form.vue b/src/views/modules/secretaryLog/workLog/form.vue index 841cb534..cad4ffea 100644 --- a/src/views/modules/secretaryLog/workLog/form.vue +++ b/src/views/modules/secretaryLog/workLog/form.vue @@ -252,7 +252,7 @@ export default { beforeUpload (file) { const array = file.name.split('.') const extension = array[array.length - 1] - + const isLt1M = (file.size / 1024 / 1024) < 5 if (extension !== 'xls' && extension !== 'xlsx' && extension !== 'doc' @@ -261,7 +261,10 @@ export default { this.$message.error('只能上传word、excel、pdf文件！') return false } - + if (!isLt1M) { + this.$message.error('上传文件大小不能超过 5MB!') + } + return isLt1M }, handleFileRemove (file) {