From 2feb9dd6021e37e1e8119be6056c4926d3db56de Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 21 Apr 2021 16:43:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                    | 30 -------------------------
 src/utils/api.js             |  1 +
 src/views/Home.vue           | 43 ++++++++++++++++++------------------
 src/views/List.vue           |  5 +++--
 src/views/ProgramOptions.vue |  3 ++-
 5 files changed, 28 insertions(+), 54 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index 18afea0..0000000
--- a/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# python_admin
-
-## Project setup
-```
-npm install
-```
-
-### Compiles and hot-reloads for development
-```
-npm run serve
-```
-
-### Compiles and minifies for production
-```
-npm run build
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
-
-- Home:判分点列表
-- Main:判分点设置
-+ Program:编程类
-+ Transaction:交易类
-+ Tool:工具类
-+ Flow:流程类
- - Catalog:目录树
-  + Loan:贷款申请表
-  + Process:业务编写页面
-  + Set:业务已设置
\ No newline at end of file
diff --git a/src/utils/api.js b/src/utils/api.js
index 354827f..ba05dfb 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -25,6 +25,7 @@ export default {
     DeletePointOfJudgementRule: `${host}/judgment/pointOfJudgement/deletePointOfJudgementRule`, //删除判分点规则
     UpdateIsOpen: `${host}/judgment/pointOfJudgement/updateIsOpen`, //修改判分点状态
     JudgmentPointNameRepetition: `${host}/judgment/pointOfJudgement/JudgmentPointNameRepetition`,
+    queryUserIds:`${host}/liuwanr/userInfo/queryUserIds`,
 
     // 科大
     queryPoint: `${host2}/kdSys/queryPoint`,
diff --git a/src/views/Home.vue b/src/views/Home.vue
index e2259cc..5b0b664 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -123,27 +123,28 @@ export default {
     },
 
     handleCurrentChange(val) {
-      this.pageNo = val;
-      this.systemId = this.getCookie("systemId");
-      this.systemId = this.systemId ? this.systemId : 1
-      this.systemName = this.getCookie("systemName");
-      this.userId = this.getCookie("userId");
-      this.$get(this.api.QueryPointOfJudgement, {
-        systemId: this.systemId,
-        userId: this.userId,
-        // systemId: 1,
-        pageNum: this.pageNo,
-        pageSize: this.pageSize,
-        queryName: this.keyword
-      })
-
-        .then(res => {
-          this.tableData = res.message.list;
-          this.dataTotal = res.message.total;
-        })
-        .catch(err => {
-          console.log(err);
-        });
+      this.$get(this.api.queryUserIds).then(res => {
+          this.pageNo = val;
+          this.systemId = this.getCookie("systemId");
+          this.systemId = this.systemId ? this.systemId : 1
+          this.systemName = this.getCookie("systemName");
+          this.userId = this.getCookie("userId");
+          this.$get(this.api.QueryPointOfJudgement, {
+            systemId: this.systemId,
+            userId: this.userId,
+            // systemId: 1,
+            pageNum: this.pageNo,
+            pageSize: this.pageSize,
+            queryName: this.keyword,
+            userIdList: res.message.retvalue.join()
+          }).then(res => {
+            this.tableData = res.message.rows;
+            this.dataTotal = res.message.total;
+          })
+          .catch(err => {
+            console.log(err);
+          });
+      }).catch(res => {})
     },
     initData(){
       this.pageNo = 1
diff --git a/src/views/List.vue b/src/views/List.vue
index 987c738..9bfbdd9 100644
--- a/src/views/List.vue
+++ b/src/views/List.vue
@@ -81,6 +81,7 @@ export default {
       currentPage: 1,
       systemId: this.$route.query.systemId ? this.$route.query.systemId : 1,
       userId: this.$route.query.userId,
+      pattern: this.$route.query.pattern,
       systemName: "",
       searchTimer: null
     };
@@ -154,7 +155,7 @@ export default {
       if(this.systemId == 2){
         this.$router.push(`programOption?systemId=${this.systemId}&userId=${this.userId}`);
       }else{
-        this.$router.push(`programOptions?systemId=${this.systemId}&userId=${this.userId}`);
+        this.$router.push(`programOptions?systemId=${this.systemId}&userId=${this.userId}&pattern=${this.pattern}`);
       }
     },
     // 表头样式设置
@@ -218,7 +219,7 @@ export default {
       if(this.systemId == 2){
         this.$router.push(`programOption?systemId=${this.systemId}&userId=${this.userId}&id=${res.id}`);
       }else{
-        this.$router.push(`programOptions?systemId=${this.systemId}&userId=${this.userId}&id=${res.id}`);
+        this.$router.push(`programOptions?systemId=${this.systemId}&userId=${this.userId}&id=${res.id}&pattern=${this.pattern}`);
       }
     }
   }
diff --git a/src/views/ProgramOptions.vue b/src/views/ProgramOptions.vue
index ea2d58b..0889317 100644
--- a/src/views/ProgramOptions.vue
+++ b/src/views/ProgramOptions.vue
@@ -401,6 +401,7 @@ export default {
             },
         ],
         operatorTwo: 1,
+        pattern: this.$route.query.pattern
     };
   },
   components: {quill},
@@ -492,7 +493,7 @@ export default {
         }
     },
     getData() {
-        this.$post(this.api.queryPoint)
+        this.$post(`${this.api.queryPoint}?challenge=${this.pattern}`)
         .then((res) => {
             this.stepList = res.subject
             this.getMesg()