From bf5680615be75076fcc6f53190240e255f433180 Mon Sep 17 00:00:00 2001 From: lws1334077144 <172059958@qq.com> Date: Sun, 2 Jul 2023 22:31:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonComponents/PublicCoponents/transfer/Transfers.vue | 5 +++-- ruoyi-ui/src/components/ImageUpload/index.vue | 2 ++ ruoyi-ui/src/views/system/management/attraction/index.vue | 1 - .../management/electronic-patrol/patrol-task/index.vue | 2 +- .../system/management/emergency-command/info/index.vue | 4 ++-- .../management/estate/meteorological-monitoring/index.vue | 2 +- .../management/marketing-data/exhibits-browse/index.vue | 4 ++-- .../views/system/management/marketing-data/info/index.vue | 4 ++-- .../management/tourism-resources/iotInfo/iot/index.vue | 4 ++-- .../tourism-resources/touristInfo/tourist/index.vue | 5 ++++- .../management/tourism-resources/venueInfo/venue/index.vue | 6 +++++- 11 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ruoyi-ui/src/components/CommonComponents/PublicCoponents/transfer/Transfers.vue b/ruoyi-ui/src/components/CommonComponents/PublicCoponents/transfer/Transfers.vue index 33f8f7b4..d0c8a37b 100644 --- a/ruoyi-ui/src/components/CommonComponents/PublicCoponents/transfer/Transfers.vue +++ b/ruoyi-ui/src/components/CommonComponents/PublicCoponents/transfer/Transfers.vue @@ -251,8 +251,8 @@ export default { this.addPublicArr.forEach(item => { this.selectedData.push(item) this.userList.push(item.userId) - this.noSelectData.splice(item, 1) }) + this.noSelectData = this.noSelectData.filter(v=>!this.addPublicArr.includes(v)) if (this.groupType == 4) { this.$nextTick(() => { let params = { @@ -290,8 +290,9 @@ export default { this.removePublicArr.forEach(item => { this.noSelectData.push(item) this.ids.push(item.id) - this.selectedData.splice(item, 1) }) + this.selectedData = this.selectedData.filter(v=>!this.removePublicArr.includes(v)) + if (this.groupType == 4) { this.$nextTick(() => { let ids = this.ids.join(',') diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/ruoyi-ui/src/components/ImageUpload/index.vue index 82150e82..593d9558 100644 --- a/ruoyi-ui/src/components/ImageUpload/index.vue +++ b/ruoyi-ui/src/components/ImageUpload/index.vue @@ -98,6 +98,7 @@ export default { value: { handler(val) { // debugger + console.log(this.baseUrl) if (val!=='' && val!==undefined && val!==null) { // 首先将值转为数组 const list = Array.isArray(val) ? val : this.value.split(','); @@ -112,6 +113,7 @@ export default { } return item; }); + console.log(this.baseUrl,this.fileList,'00---000') } else { this.fileList = []; return []; diff --git a/ruoyi-ui/src/views/system/management/attraction/index.vue b/ruoyi-ui/src/views/system/management/attraction/index.vue index f0ed17bd..80b6cb58 100644 --- a/ruoyi-ui/src/views/system/management/attraction/index.vue +++ b/ruoyi-ui/src/views/system/management/attraction/index.vue @@ -469,7 +469,6 @@ export default { }, /** 根据资源类型查询相应数据*/ getResourceListByResourceType(type){ - debugger getResourceListByResourceType(type).then(res =>{ this.resourceList = res.data }) diff --git a/ruoyi-ui/src/views/system/management/electronic-patrol/patrol-task/index.vue b/ruoyi-ui/src/views/system/management/electronic-patrol/patrol-task/index.vue index fe8211cd..12e3eb83 100644 --- a/ruoyi-ui/src/views/system/management/electronic-patrol/patrol-task/index.vue +++ b/ruoyi-ui/src/views/system/management/electronic-patrol/patrol-task/index.vue @@ -116,7 +116,7 @@ >{{ scope.row.taskState == 1 ? '开始任务' : scope.row.taskState == 3 ? '开始任务' : '停止任务' }} - + - + - + diff --git a/ruoyi-ui/src/views/system/management/marketing-data/info/index.vue b/ruoyi-ui/src/views/system/management/marketing-data/info/index.vue index 9a12c76b..0c4dfaf0 100644 --- a/ruoyi-ui/src/views/system/management/marketing-data/info/index.vue +++ b/ruoyi-ui/src/views/system/management/marketing-data/info/index.vue @@ -179,8 +179,8 @@ clearable disabled="" placeholder="请选择" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" + type="date" + value-format="yyyy-MM-dd" > diff --git a/ruoyi-ui/src/views/system/management/tourism-resources/iotInfo/iot/index.vue b/ruoyi-ui/src/views/system/management/tourism-resources/iotInfo/iot/index.vue index e1107fa1..ac3405e8 100644 --- a/ruoyi-ui/src/views/system/management/tourism-resources/iotInfo/iot/index.vue +++ b/ruoyi-ui/src/views/system/management/tourism-resources/iotInfo/iot/index.vue @@ -401,7 +401,7 @@ export default { // 表单参数 form: { graphicInfo: { - imageUrl: null, + coverImg: null, introduction: null, resourceDescribe: null } @@ -534,7 +534,7 @@ export default { getIot(id,type).then(response => { this.form = response.data; this.form.graphicInfo = { - imageUrl: response.data.coverImg, + coverImg: response.data.coverImg, introduction: response.data.introduction, resourceDescribe: response.data.resourceDescribe } diff --git a/ruoyi-ui/src/views/system/management/tourism-resources/touristInfo/tourist/index.vue b/ruoyi-ui/src/views/system/management/tourism-resources/touristInfo/tourist/index.vue index 965ddcc7..94ebaf5b 100644 --- a/ruoyi-ui/src/views/system/management/tourism-resources/touristInfo/tourist/index.vue +++ b/ruoyi-ui/src/views/system/management/tourism-resources/touristInfo/tourist/index.vue @@ -389,7 +389,8 @@ - + + - + @@ -865,4 +865,8 @@ export default { color: #ff4949; margin-right: 4px; } + +.zi-ding-yi-select ::v-deep .vue-treeselect__control{ + width: unset!important; +}