From bc469e094e73cbdd56478d1e51c10093c0a82974 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 13 十二月 2022 14:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

---
 src/views/operate/management/myIndex/index.vue |   35 +++++++++++++----------------------
 1 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index 2288ce0..b355df8 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -84,11 +84,11 @@
                 <!-- 璇︽儏椤甸潰 -->
                 <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
                     :before-close="handleNoClose">
-                    <MyDetail :info=info v-if="myproblem==1 ? true:false"></MyDetail>
-                    <MyIllDetail :info=info v-else></MyIllDetail>
+                    <MyDetail :info=info v-if="myproblem === 1" :mycode = 'code'></MyDetail>
+                    <MyIllDetail :info=info v-else :mycode="code"></MyIllDetail>
                 </el-dialog>
                 <!-- tools -->
-                <div class="tools">
+                <!-- <div class="tools">
                     <div class="funs">
                         <div class="funsItem funs-sp">
                             <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
@@ -110,7 +110,7 @@
                             @prev-click="handlePrev" @next-click="handleNext">
                         </el-pagination>
                     </div>
-                </div>
+                </div> -->
             </div>
         </main>
     </div>
@@ -176,6 +176,7 @@
             caseId: '',
             myproblem: 1,
             instatus: 7,
+            code:''
         }
     },
     created() {
@@ -184,7 +185,6 @@
     methods: {
         // 鎵归噺鍒犻櫎
         mulDelete(idArr) {
-            console.log(idArr);
             this.$axios({
                 method: 'delete',
                 url: 'sccg/violations/batch_delete?ids=' + idArr,
@@ -198,7 +198,6 @@
         },
         // 鎵ц涓嬫媺妗嗘搷浣�
         selectChange(list) {
-            console.log(this.tempList);
             if (this.tempList.length !== 0) {
                 if (list === 3) {
                     this.preMyIdx = list;
@@ -218,11 +217,7 @@
             list.forEach(item => {
                 this.tempList.push(item.code);
             })
-            if (list.length === this.tableData.length) {
-                this.all = true;
-            } else {
-                this.all = false
-            }
+            this.all = list.length === this.tableData.length;
         },
         // 鍏ㄩ��
         selectAll() {
@@ -236,16 +231,13 @@
         },
         // 鍒犻櫎鍗曟潯鏁版嵁
         handleDelete({ number }) {
-            console.log(number);
             this.$confirm('纭鍒犻櫎锛�')
                 .then(_ => {
-                    console.log(1);
                     this.$axios({
                         method: 'delete',
                         url: `sccg/violations/delete?id=${number}`,
                     })
                         .then(res => {
-                            console.log(res);
                             this.$message({
                                 type: res.code === 200 ? 'success' : 'warning',
                                 message: res.message
@@ -254,14 +246,14 @@
                             this.getUserList();
                         })
                 })
-                .catch(_ => { console.log(2) });
+                .catch(_ => {  });
         },
         // 鑾峰彇鐢ㄦ埛鍒楄〃
         getUserList() {
             const { currentPage, pageSize, instatus, myproblem } = this;
             this.$axios({
                 method: 'get',
-                url: `sccg/base_case/query?state=${instatus}&current=${currentPage}&size=${pageSize}&resource=2&type=${myproblem}`
+                url: `sccg/base_case/query?state=${instatus}&current=${currentPage}&size=${pageSize}&type=${myproblem}`
             }).then(res => {
                 this.totalNum = res.data.total;
                 this.tableData = res.data.records;
@@ -269,12 +261,11 @@
         },
         // 璁剧疆琛ㄦ牸鏂戦┈绾�
         tableRowClassName({ row, rowIndex }) {
-            if ((rowIndex + 1) % 2 == 0) {
+            if ((rowIndex + 1) % 2 === 0) {
                 return 'warning-row';
             } else {
                 return 'success-row';
             }
-            return '';
         },
         // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
         changeCurrentPage(page) {
@@ -303,6 +294,7 @@
             done();
         },
         async JumpView(data) {
+            this.code = data.code
             await this.getEventInfo(data.code);
         },
         // 鑾峰彇妗堜欢淇℃伅
@@ -312,7 +304,6 @@
                 url: `sccg/base_case/baseCaseDetail/${code}`
             })
                 .then(res => {
-                    console.log(res);
                     this.info = res.data;
                     this.dialogView = true;
                 })
@@ -324,7 +315,6 @@
                 url: `sccg/base_case/baseCaseDetail/${code}`
             })
                 .then(res => {
-                    console.log(res);
                     this.info = res.data;
                     this.dialogExamine = true;
                 })
@@ -336,7 +326,6 @@
                 url: `sccg/base_case/baseCaseDetail/${code}`
             })
                 .then(res => {
-                    console.log(res);
                     this.info = res.data;
                     this.dialogClosure = true;
                 })
@@ -401,7 +390,6 @@
         background-color: #09152f;
         margin-top: 20px;
         padding-bottom: 50px;
-        border: 1pox solid #fff;
         .btn span:hover{
             cursor: pointer;
         }
@@ -480,6 +468,9 @@
                 text-overflow: ellipsis;
                 white-space: nowrap;
                 overflow: hidden;
+                .el-checkbox {
+                    display: none;
+                }
             }
 
             &::v-deep .el-table__empty-block {

--
Gitblit v1.8.0