diff --git a/project/fengdu/AppBIBoard/AppBIBoard.vue b/project/fengdu/AppBIBoard/AppBIBoard.vue
index 36a8bbf5..c6ca4704 100644
--- a/project/fengdu/AppBIBoard/AppBIBoard.vue
+++ b/project/fengdu/AppBIBoard/AppBIBoard.vue
@@ -47,7 +47,7 @@
@@ -469,7 +469,8 @@ export default {
this.getGdyh(areaId),
this.getFraternitySta(this.transferAreaCode(areaId)),
this.getFraternityTypes(areaId).then(data => this.fraternityTypes = data),
- this.getFraternities(this.transferAreaCode(areaId)).then(() => this.getMapData(areaId))
+ this.getFraternities(this.transferAreaCode(areaId)).then(() => this.getMapData(areaId)),
+ this.getVolunteerData(areaId)
]).finally(() => loading.close())
} else if (c < 10) setTimeout(() => this.getData(++c), 500)
else console.error(`尝试${c}次加载数据,无法过去数据`)
@@ -740,7 +741,7 @@ export default {
params: {
page_size: 40,
area_code,
- team_name: this.fraternity
+ team_id: this.fraternity
}
}).then(res => {
if (res?.data) {
@@ -754,7 +755,7 @@ export default {
getFraternities(area_code) {
return this.instance.get("/hzh/find-fraternity-detail", {params: {page_size: 999, area_code}}).then(res => {
if (res?.data) {
- this.fraternity = res.data[0]?.fraternity_name
+ // this.fraternity = res.data[0]?.fraternity_id
return this.fraternities = res.data || []
}
})
@@ -780,29 +781,38 @@ export default {
getFraternityData(args) {
const row = this.fraternityTypes[args.rowIndex]
this.dialog = true
- this.detail = {eventType: row.type, mapType: 'fraternitySta', list: []}
+ this.detail = {eventType: row.type, mapType: 'fraternitySta', list: [], fraternity_type: row.type_id}
const area_code = this.transferAreaCode(this.areaId)
this.fraternityLoading = true
- this.instance.get("/hzh/find-fraternity-member-detail", {params: {area_code}}).then(res => {
+ this.instance.get("/hzh/find-fraternity-member-detail", {
+ params: {
+ area_code,
+ fraternity_type: row.type_id
+ }
+ }).then(res => {
if (res?.data) {
this.detail = {...this.detail, list: res.data}
}
}).finally(() => this.fraternityLoading = false)
},
handleFraternityTableClick(args) {
- const {columnIndex: type, rowIndex} = args
+ const {columnIndex: type, rowIndex} = args,
+ {fraternity_type} = this.detail
if (type > 0) {
const current = this.detail.list[rowIndex]
- console.log(current)
this.fraternityExtra = true
this.$set(this.detail, 'extraType', type)
-
this.$set(this.detail, 'extraTitle', {
1: '家长名单', 2: '学生名单', 3: '活动情况'
}[type])
if (type == 3) {
this.$set(this.detail, 'others', {header: [], rowNum: 3})
- this.instance.get("/hzh/find-fraternity-activity-detail", {params: {area_code: this.transferAreaCode(this.areaId)}}).then(res => {
+ this.instance.get("/hzh/find-fraternity-activity-detail", {
+ params: {
+ area_code: this.transferAreaCode(this.areaId),
+ fraternity_type
+ }
+ }).then(res => {
if (res?.data) {
this.$set(this.detail, 'extra', res.data.map(e => [`
diff --git a/ui/packages/basic/AiSelect.vue b/ui/packages/basic/AiSelect.vue
index f35f77e3..82e802e0 100644
--- a/ui/packages/basic/AiSelect.vue
+++ b/ui/packages/basic/AiSelect.vue
@@ -33,7 +33,7 @@ export default {
instance: {
deep: true,
handler(v) {
- v && this.isAction && !this.options.toString() && this.getOptions()
+ v && this.isAction && !this.options?.toString() && this.getOptions()
}
},
action() {