From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/article/rotation.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/article/rotation.vue b/src/views/article/rotation.vue
index 2bd981a..9f2219a 100644
--- a/src/views/article/rotation.vue
+++ b/src/views/article/rotation.vue
@@ -129,7 +129,7 @@
multiple: true,
tags: true,
hide: true,
- dateType: "string",
+ dataType: "string",
addDisplay: false,
editDisplay: false,
type: "tree",
@@ -152,7 +152,8 @@
tags: true,
type: "tree",
multiple: true,
- dateType: "string",
+ // dateType: "string",
+ dataType: "string",
editDisplay: false,
addDisplay: false,
cascader: ['articleId'],
@@ -166,7 +167,6 @@
label: "name",
value: 'id'
},
- // hide: true,
},
{
hide: true,
@@ -180,7 +180,7 @@
type: 'select',
dicUrl: `/api/blade-article/article/getArticleByDistrictId?type=4&eventType=1&districtId={{rotationRange}}`,
formslot: true,
- cascader: ['vote'],
+ // cascader: ['vote'],
props: {
label: "title",
value: "id"
@@ -423,9 +423,9 @@
if (["edit", "view"].includes(type)) {
getRotation(this.form.id).then((res) => {
this.form = res.data.data
- if (this.form.rotationRange) {
- this.form.rotationRange = JSON.parse(this.form.rotationRange)
- }
+ // if (this.form.rotationRange) {
+ // this.form.rotationRange = JSON.parse(this.form.rotationRange)
+ // }
// if (this.form.communityCode) {
// this.form.communityCode = JSON.parse(this.form.communityCode)
// }
@@ -482,9 +482,9 @@
this.page.total = data.total
this.data = data.records
this.data.forEach(item => {
- if (item.rotationRange) {
- item.rotationRange = JSON.parse(item.rotationRange)
- }
+ // if (item.rotationRange) {
+ // item.rotationRange = JSON.parse(item.rotationRange)
+ // }
// if (item.communityCode) {
// item.communityCode = JSON.parse(item.communityCode)
// }
--
Gitblit v1.9.3