From 54deeae43f8015cb2e0f99dd084d2b5d17dcfe30 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Thu, 30 Dec 2021 18:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/case/index.vue    |  3 +++
 src/pages/counter/list/index.vue |  8 ++++----
 src/store/modules/system.js      | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index 3bf5046..9cceedb 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -372,6 +372,7 @@ export default {
           getQueryCache(params).then((data)=>{
               if(data.data.status == 200){
                   this.$confirm('有项目未做完,是否回到未做完的项目?', '提示', {
+                      center: true,
                       confirmButtonText: '确定',
                       cancelButtonText: '取消',
                       type: 'warning'
@@ -491,6 +492,7 @@ export default {
     //提交
     Submit() {
         this.$confirm('此操作将视为结束考试, 是否继续?', '提示', {
+            center: true,
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -603,6 +605,7 @@ export default {
                 this.seconds = `${s > 9 ? s : `0${s}`}`;
             } else {
               this.$confirm('此操作将视为结束考试, 是否继续?', '提示', {
+                  center: true,
                   confirmButtonText: '确定',
                   cancelButtonText: '取消',
                   type: 'warning'
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 38057f6..af871b0 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -775,14 +775,12 @@ export default {
                             sort: false,// 禁止排序
                             onEnd: evt => { // 结束拖拽
                                 if(this.judgePosition(evt)){
-                                    console.log(evt)
                                     const getIt = evt.target.textContent
                                     for(var i=0;i<this.goods.length;i++){
                                         if (this.goods[i].name == getIt){
                                             return this.$message.warning('物品栏中已有该物品')
                                         }
                                     }
-                                    // console.log(this.goodsShelfTotalData)
                                     for(let i=0;i<this.popArr.length; i++) {
                                         if(this.popArr[i].name === getIt) {
                                             this.$store.commit('system/changeGoods',{push:[this.popArr[i]]})
@@ -807,7 +805,6 @@ export default {
         } else {
             this.manageVisible = false;
         }
-        console.log('what?')
     },
     mounted(){
         let that = this
@@ -1062,14 +1059,17 @@ export default {
                 // 把确定的数据传输进物品栏
                 goods.map(e=>{
                     clickList.map(el=>{
-                        console.log(el)
                         if(el===e.id){
                             arr.push(e)
                         }
                     })
                 })
                 this.$store.commit('system/changeGoods',{push:arr})
+                this.closePop()
+                // this.changeShowGoods(false)
                 clickList = []
+                this.importantChecked = []
+                this.$message.success('操作成功！')
             }else{
                 if (this.$store.state.system.id == '33'){
                     this.nbm = 33
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 12d99ff..88b248b 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -50,7 +50,19 @@ export default {
             if(obj.goods&&obj.goods.length>0){
                 state.goods = obj.goods
             }else if(obj.push&&obj.push.length>0){
-                state.goods.push(...obj.push)
+                for(let j=0; j<obj.push.length; j++) {
+                    let judge = true
+                    for(let i=0; i<state.goods.length; i++) {
+                        if(obj.push[j].name === state.goods[i].name) {
+                            judge = false
+                            break;
+                        }
+                    }
+                    if(judge) {
+                        console.log(judge)
+                        state.goods.push(obj.push[j])
+                    }
+                }
             }else if(typeof(obj.splice)===Number ){
                 state.goods.splice(obj.splice,1)
             }