From 40709ce6b3af83fe3d90956cbd57316dd5fbc747 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 21 Feb 2023 14:19:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/exam/ExamList.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue
index b99369e9..25ba87a0 100644
--- a/src/views/exam/ExamList.vue
+++ b/src/views/exam/ExamList.vue
@@ -764,10 +764,6 @@ export default {
     }
   },
   mounted() {
-    // this.resourceData = JSON.parse(localStorage.getItem('typeList'))
-    // if(this.resOwnerListMap.length == 0) {
-    //   this.$store.dispatch("getList");
-    // }
     this.getResOwnerTree().then(rs=>{
       this.resOwnerListMap=rs;
     });

From 2164210aaf1e36ad46fbc7f505fd5b62b0572eea Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 21 Feb 2023 19:03:52 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=97=E4=BC=97=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/ViewUserGroup.vue | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/manage/ViewUserGroup.vue b/src/views/manage/ViewUserGroup.vue
index baf0d42a..c792bdc7 100644
--- a/src/views/manage/ViewUserGroup.vue
+++ b/src/views/manage/ViewUserGroup.vue
@@ -16,7 +16,7 @@
       <el-button type="primary" class="findBtn" size="medium" @click="tableDataReset">重置</el-button>
     </div>
     <el-table ref="multipleTable" :data="tableDataShow" tooltip-effect="dark" style="width: 100%">
-     
+
       <el-table-column label="姓名" prop="name" align="center" ></el-table-column>
       <el-table-column prop="userNo" label="工号"  align="center"></el-table-column>
       <el-table-column prop="departName" label="部门" align="center"></el-table-column>
@@ -30,9 +30,9 @@
 
 <script>
   import { getToken } from '@/utils/token'
-  import usergroupApi from "@/api/modules/usergroup";
   import userApi from "@/api/system/user";
   import orgApi from "@/api/system/organiza";
+  import apiAudience from "@/api/boe/audience.js";
   export default{
     data(){
       return{
@@ -76,15 +76,23 @@
     },
     mounted() {
       let that = this;
-      if (that.$route.query.id) {
-        usergroupApi.detail(that.$route.query.id).then((res) => {
-            if (res.status == 200) {
-              that.form = res.result;
-              that.oldUserGroupItems = JSON.parse(JSON.stringify( res.result.userGroupItems ));
-              that.tableData = res.result.userGroupItems;
-              that.queryTableData();
-            }
+      if (this.$route.query.id) {
+        let req = {audienceId:this.$route.query.id}
+        apiAudience.detail(req).then((res) => {
+          if (res.status == 200) {
+            that.form = res.result;
+            that.tableData = res.result.memberList;
+            that.queryTableData();
+          }
         });
+        // usergroupApi.detail(that.$route.query.id).then((res) => {
+        //     if (res.status == 200) {
+        //       that.form = res.result;
+        //       that.oldUserGroupItems = JSON.parse(JSON.stringify( res.result.userGroupItems ));
+        //       that.tableData = res.result.userGroupItems;
+        //       that.queryTableData();
+        //     }
+        // });
       }
     },
     methods:{

From 6ccbd740f540a2b2388395fb2caecd58cae016d7 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 23 Feb 2023 14:55:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=88=90=E7=BB=A9?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/exam/ExamList.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue
index 25ba87a0..22cfad33 100644
--- a/src/views/exam/ExamList.vue
+++ b/src/views/exam/ExamList.vue
@@ -477,7 +477,7 @@
                       v-model="answerData.word"></el-input>
                   </div>
                   <div style="padding: 0px 5px">
-                    <el-button icon="el-icon-search" type="primary"  @click="getResults()">搜索</el-button>
+                    <el-button icon="el-icon-search" type="primary"  @click="getResults(true)">搜索</el-button>
                     <el-button icon="el-icon-download" type="primary"  @click="exportsList()">导出成绩</el-button>
                   </div>
                 </div>
@@ -1269,7 +1269,10 @@ export default {
      this.answerData.row=row;
       this.getResults();
     },
-    getResults() {
+    getResults(flag) {
+       if(flag){
+         this.answerData.pageIndex=1;
+       }
        let params = {
          testId: this.answerData.row.id,// 考试 的id
          aid:'',// 答卷人ID