From b933a2915fae5abc4eddf8abe1d12271f18eed8b Mon Sep 17 00:00:00 2001 From: TiaStars Date: Sat, 6 Jan 2024 10:52:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=9C=B0=E5=9B=BE=E9=AB=98?= =?UTF-8?q?=E4=BA=AE=E3=80=81=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +-- src/views/bigScreen/map/index.vue | 55 ++++++++++++++++++++ src/views/components/myUpload/index.vue | 2 +- src/views/components/newEvent/index.vue | 67 ------------------------- 4 files changed, 59 insertions(+), 71 deletions(-) diff --git a/.env.development b/.env.development index 22b5236..dcd99ef 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ # @Author: 张涛 # @Date: 2023-11-09 18:29:41 # @LastEditors: JC9527 - # @LastEditTime: 2024-01-04 15:50:30 + # @LastEditTime: 2024-01-06 10:41:10 # @FilePath: \JiangningUrbanManagePc\.env.development ### # 页面标题 @@ -13,10 +13,10 @@ ENV = 'development' # 若依管理系统/开发环境 # /dev-api -# VUE_APP_BASE_API = 'http://39.101.188.84:9037' +VUE_APP_BASE_API = 'http://39.101.188.84:9037' VUE_APP_BASE_API1 = 'https://t-kd-process-server.jsszkd.com' VUE_APP_BASE_API2 = 'https://t-jn-development-manager-server.jsszkd.com/api/webapp' -VUE_APP_BASE_API = 'http://192.168.0.108:9037' +# VUE_APP_BASE_API = 'http://192.168.0.108:9037' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue index 0ce4b70..758149b 100644 --- a/src/views/bigScreen/map/index.vue +++ b/src/views/bigScreen/map/index.vue @@ -1836,6 +1836,61 @@ export default { // 子组件的名称点击事件 divClick(lightedPolygonId){ // console.log(lightedPolygonId,"父组件的名称点击事件"); + // 取消重点区域高亮 + this.quyuData.forEach((element) => { + element.myPolygon.setOptions({ + strokeOpacity: 0, + strokeColor: '#FF0000', + fillColor: '#FF0000', + fillOpacity:0.38, + editable:false, + visible:true, + }); + element.text.setStyle({ + 'color': '#F44444', + }); + }) + // 取消重点路段高亮 + this.luduanData.forEach((element) => { + element.myPolyline.setOptions({ + strokeOpacity: 1, + strokeColor: '#46FF77', + editable:false, + visible:true, + }); + element.text.setStyle({ + 'color': '#46FF77', + }); + }) + // 取消考勤围栏高亮 + this.weilanData.forEach((element) => { + element.myPolygon.setOptions({ + strokeOpacity: 0.9, + strokeColor: "#62E1FA", + fillColor: "#62E1FA", + fillOpacity: 0.3, + editable:false, + visible:true, + }); + element.text.setStyle({ + 'color': '#62E1FA', + }); + }) + // 取消区域网格高亮 + gridding.features.forEach((element)=>{ + element.myPolygon.setOptions({ + strokeColor: '#FFBF7A', + fillColor: '#DC8419', + strokeOpacity: 1, + fillOpacity: 0.3, + editable:false, + visible:true, + }); + element.text.setStyle({ + 'color': '#FFDBB7', + 'text-shadow': '0px 1px 0px rgba(0,0,0,0.3)', + }); + }) this.isClickLingtedPolygonId = true; this.highlightedPolygonId = lightedPolygonId.id; if(lightedPolygonId.id == 1) { diff --git a/src/views/components/myUpload/index.vue b/src/views/components/myUpload/index.vue index 8948b61..71fc919 100644 --- a/src/views/components/myUpload/index.vue +++ b/src/views/components/myUpload/index.vue @@ -22,7 +22,7 @@
- {{ item.name }} + {{ item.name.substring(item.name.lastIndexOf("/") + 1) }}
删除 diff --git a/src/views/components/newEvent/index.vue b/src/views/components/newEvent/index.vue index 196d13b..c8d833c 100644 --- a/src/views/components/newEvent/index.vue +++ b/src/views/components/newEvent/index.vue @@ -136,21 +136,6 @@ 事件音频：
- @@ -272,8 +257,6 @@ export default { label: '选项1' }, ], - file_list: [], - httpRequestParams: {}, } }, methods:{ @@ -312,56 +295,6 @@ export default { // }) }, - beforeAvatarUpload(file) { - console.log('file', file) - // 文件类型进行判断 - console.log('file', file.name.substring(file.name.length - 3)) - // const isAudio = file.type === 'audio/mp3' || file.type === 'audio/mpeg' - const isAudio = file.name.substring(file.name.length - 3) === 'mp3' - console.log(isAudio, 'isAudio') - // 限制上传文件大小 5M - const isLt2M = file.size / 1024 / 1024 < 5 - // 获取时长 - this.getTimes(file) - const isTime60S = this.audioDuration >= 300 ? true : '' - console.log(isTime60S) - - if (!isAudio) { - this.$message.error('上传文件只能是Mp3格式!') - this.fileList = [] - } else { - if (!isLt2M) { - this.$message.error('上传文件大小不能超过 5MB!') - this.fileList = [] - } else { - if (isTime60S) { - this.$message.error('上传文件时长不能超过300秒!') - this.fileList = [] - } - } - } - return isAudio && isLt2M && isTime60S - }, - getTimes(file) { - var content = file - // 获取录音时长 - var url = URL.createObjectURL(content) // 重点 - console.log(url) - this.music_path = url - // 经测试，发现audio也可获取视频的时长 - this.audioElement = new Audio(url) - this.audioElement.addEventListener('loadedmetadata', (_event) => { - console.log(12312321) - this.audioDuration = parseInt(this.audioElement.duration) - console.log(this.audioDuration) - }) - }, - httpRequestHandler(res) { - console.log('res', res) - const fd = new FormData() - fd.append('file', res.file) - this.httpRequestParams = fd - }, }, }