From 8e7d71cf7f4bc1c3f62e918bc264c9f42add6919 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 24 Apr 2024 09:34:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PartyshistoryRecoder/line.vue       | 10 ++++-
 src/views/PartyshistoryRecoder/pointer.vue    | 22 +++++++--
 .../PartyshistoryRecoder/studyQuestion.vue    | 45 +++++++++++++++++--
 3 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/views/PartyshistoryRecoder/line.vue b/src/views/PartyshistoryRecoder/line.vue
index 0b4b93c..aec3326 100644
--- a/src/views/PartyshistoryRecoder/line.vue
+++ b/src/views/PartyshistoryRecoder/line.vue
@@ -19,7 +19,7 @@
           </div>
           <div v-show="!sysInfo">
             <span style="padding: 0 6px; word-break: keep-all"> 项目 </span>
-            <Select v-model="select.activity_list_id" style="width:200px">
+            <Select v-model="select.activity_list_id" style="width:200px" @on-change="changeActivity">
                 <Option v-for="item in listActivity" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
           </div>
@@ -126,7 +126,7 @@ export default {
           }
         },
         {
-          prop: "name",
+          prop: "content",
           label: "简介",
           minWidth: 220,
           align: "left",
@@ -191,6 +191,12 @@ export default {
       this.total = res.total;
       this.list = res.data;
     },
+    changeActivity(e){
+      if(e){
+        this.select.activity_list_id = e
+        this.load()
+      }
+    },
     deleteitem(row) {
       destroy({
         id: row.id,
diff --git a/src/views/PartyshistoryRecoder/pointer.vue b/src/views/PartyshistoryRecoder/pointer.vue
index aaaba47..ea9e73b 100644
--- a/src/views/PartyshistoryRecoder/pointer.vue
+++ b/src/views/PartyshistoryRecoder/pointer.vue
@@ -19,11 +19,10 @@
           </div>
           <div v-show="!sysInfo">
             <span style="padding: 0 6px; word-break: keep-all"> 项目 </span>
-            <Select v-model="select.activity_list_id" style="width:200px">
+            <Select v-model="select.activity_list_id" style="width:200px"  @on-change="changeActivity">
                 <Option v-for="item in listActivity" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
           </div>
-
           <Button
            v-show="!sysInfo"
             style="margin-left: 10px"
@@ -122,6 +121,8 @@ export default {
         with_relations: ['video','image'],
         table_name: "map_points",
         activity_list_id: '',
+        keyword:'',
+        point_id:'',
         filter: [],
       },
       sysInfo:false,
@@ -216,10 +217,25 @@ export default {
         })
         return
       }
-      const res = await index(this.select);
+      const res = await index({
+        ...this.select,
+        filter:[
+          {
+            key:'name',
+            op:'like',
+            value:this.select.keyword
+          }
+        ]
+      });
       this.total = res.total;
       this.list = res.data;
     },
+    changeActivity(e){
+      if(e){
+        this.select.activity_list_id = e
+        this.load()
+      }
+    },
     deleteitem(row) {
       destroy({
         id: row.id,
diff --git a/src/views/PartyshistoryRecoder/studyQuestion.vue b/src/views/PartyshistoryRecoder/studyQuestion.vue
index 9616847..1800ebb 100644
--- a/src/views/PartyshistoryRecoder/studyQuestion.vue
+++ b/src/views/PartyshistoryRecoder/studyQuestion.vue
@@ -19,15 +19,21 @@
           </div>
           <div v-show="!sysInfo">
             <span style="padding: 0 6px; word-break: keep-all"> 项目 </span>
-            <Select v-model="select.activity_list_id" style="width:200px">
+            <Select v-model="select.activity_list_id" style="width:200px" @on-change="changeActivity">
                 <Option v-for="item in listActivity" :value="item.id" :key="item.id">{{ item.name }}</Option>
             </Select>
           </div>
+          <div>
+            <span style="padding: 0 6px; word-break: keep-all"> 点位 </span>
+            <Select v-model="select.point_id" style="width:200px"   @on-change="changePointer">
+                <Option v-for="item in listPointer" :value="item.id" :key="item.id">{{ item.name }}</Option>
+            </Select>
+          </div>
           <Button
             v-if="!sysInfo"
             style="margin-left: 10px"
             type="primary"
-            @click="select = { page: 1, keyword: '',activity_list_id:'' },load()"
+            @click="select = { page: 1, keyword: '',activity_list_id:'',point_id:'' },load()"
             >重置
           </Button>
           <Button style="margin-left: 10px" type="primary" @click="doSearch"
@@ -72,7 +78,9 @@
 <script>
 import { index, destroy, show } from "@/api/party/studyQuestion";
 import { index as activityIndex } from "@/api/activity/index";
-
+  import {
+    index as pointerIndex
+  } from "@/api/index";
 import addQuestions from "@/views/PartyshistoryRecoder/components/addQuestions.vue";
 
 export default {
@@ -83,13 +91,15 @@ export default {
     return {
       select: {
         page: 1,
-        page_size: 20,
+        page_size: 10,
         keyword: "",
         // activity_list_id: 7,
         activity_list_id: '',
+        point_id:''
       },
       sysInfo:false,
       listActivity: [],
+      listPointer:[],
       total: 0,
       list: [],
       table: [
@@ -157,6 +167,32 @@ export default {
       this.total = res.total;
       this.list = res.data;
     },
+    changeActivity(e){
+      console.log(e)
+      if(e){
+        this.select.point_id = ''
+        this.loadPointer(e)
+        this.load()
+      }
+    },
+    changePointer(e){
+      if(e){
+        this.select.point_id = e
+        this.load()
+      }
+    },
+    loadPointer(id) {
+      pointerIndex({
+        page: 1,
+        page_size: 999,
+        table_name: "map_points",
+        activity_list_id: id,
+        filter: [],
+      }).then(res=>{
+        this.listPointer = res.data
+        // cb(res.data)
+      });
+    },
     deleteitem(row) {
       destroy({
         id: row.id,
@@ -178,6 +214,7 @@ export default {
         if(_sys.tag!='h5'){
           that.select.activity_list_id = _sys.id;
           that.sysInfo=_sys;
+          that.loadPointer(_sys.id)
         }
       }