From 4ec959d7c2ef1d8dd3af287814ca8a27650b99f7 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 11 一月 2023 15:33:42 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/management/myIndex/index.vue | 87 +++++++++++++++++++++----------------------
1 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index 03bbd75..270dd4f 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -20,8 +20,11 @@
<main>
<div class="mainContent">
<!-- 鏁版嵁灞曠ず -->
- <el-table ref="multipleTable"
- :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
+ <el-table
+ border
+ stripe
+ ref="multipleTable"
+ :header-cell-style="{ 'background':'#F5F5F5','font-weight':'650','line-height':'45px'}"
:data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
@@ -33,7 +36,7 @@
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template slot-scope="scope">
- <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
+ <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡'}}</span>
</template>
</el-table-column>
<el-table-column :prop="myproblem === 1 ? 'category' :'category'" :label="myproblem===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="myproblem===1?'10':'20'">
@@ -70,25 +73,25 @@
</el-table-column>
</el-table>
<!-- 瀹℃牳椤甸潰 -->
- <el-dialog :visible.sync="dialogExamine" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogExamine"
+ <el-dialog :visible.sync="dialogExamine" width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogExamine"
:before-close="handleClose">
<MyExamine :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyExamine>
<MyIllExamine :info="info" v-else @closeDialog="closeDialog"></MyIllExamine>
</el-dialog>
<!-- 缁撴椤甸潰 -->
- <el-dialog :visible.sync="dialogClosure" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogClosure"
+ <el-dialog :visible.sync="dialogClosure" width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogClosure"
:before-close="handleClose">
<MyClosure :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyClosure>
<MyIllClosure :info="info" v-else @closeDialog="closeDialog"></MyIllClosure>
</el-dialog>
<!-- 璇︽儏椤甸潰 -->
- <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
+ <el-dialog :visible.sync="dialogView" width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
:before-close="handleNoClose">
- <MyDetail :info=info v-if="myproblem==1 ? true:false" :mycode = 'code'></MyDetail>
+ <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 +113,7 @@
@prev-click="handlePrev" @next-click="handleNext">
</el-pagination>
</div>
- </div>
+ </div> -->
</div>
</main>
</div>
@@ -185,7 +188,6 @@
methods: {
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
- console.log(idArr);
this.$axios({
method: 'delete',
url: 'sccg/violations/batch_delete?ids=' + idArr,
@@ -199,7 +201,6 @@
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
@@ -219,11 +220,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() {
@@ -237,10 +234,8 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
this.$confirm('纭鍒犻櫎锛�')
.then(_ => {
- console.log(1);
this.$axios({
method: 'delete',
url: `sccg/violations/delete?id=${number}`,
@@ -254,14 +249,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}¤t=${currentPage}&size=${pageSize}&resource=2&type=${myproblem}`
+ url: `sccg/base_case/query?state=${instatus}¤t=${currentPage}&size=${pageSize}&type=${myproblem}`
}).then(res => {
this.totalNum = res.data.total;
this.tableData = res.data.records;
@@ -269,12 +264,11 @@
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
@@ -370,12 +364,12 @@
<style lang="scss" scoped>
.userList {
text-align: left;
- margin: 10px 20px;
+ padding: 10px 20px;
color: #4b9bb7;
-
+ border: 1px solid #ccc;
header {
- background-color: #09152f;
- padding: 10px 20px;
+ // background-color: #09152f;
+ //padding: 10px 20px;
.problem,
.status {
@@ -391,15 +385,14 @@
}
&::v-deep .el-input__inner {
- background-color: #09152f;
+ // background-color: #09152f;
border: 1px solid #17324c;
}
main {
- background-color: #09152f;
+ // background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.btn span:hover{
cursor: pointer;
}
@@ -407,12 +400,15 @@
display: flex;
justify-content: space-between;
align-items: center;
- padding: 0 20px;
+ //padding: 0 20px;
.funs {
display: flex;
+ .funs-first{
+ margin-left: 0!important;
+ }
.funs-sp{
- border: 1px solid #17324c;
+ border: 1px solid #DCDFE6;
}
.funsItem {
line-height: 28px;
@@ -433,7 +429,7 @@
&::v-deep .el-input__inner {
border: none;
- background-color: #09152f;
+ // background-color: #09152f;
}
&:hover {
@@ -471,18 +467,21 @@
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
&::v-deep .cell {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
+ .el-checkbox {
+ display: none;
+ }
}
- &::v-deep .el-table__empty-block {
- background-color: #09152f;
- }
+ // &::v-deep .el-table__empty-block {
+ // background-color: #09152f;
+ // }
&::v-deep .el-table__empty-block {
color: #4b9bb7;
@@ -501,9 +500,9 @@
}
}
- .el-table::v-deep .warning-row {
- background: #06122c;
- }
+ // .el-table::v-deep .warning-row {
+ // background: #06122c;
+ // }
.el-table::v-deep .success-row {
background: #071f39;
@@ -544,9 +543,9 @@
}
&::v-deep .el-dialog__header,
- &::v-deep .el-dialog__body {
- background-color: #06122c;
- }
+ // &::v-deep .el-dialog__body {
+ // background-color: #06122c;
+ // }
&::v-deep .el-dialog__header {
display: flex;
@@ -570,4 +569,4 @@
padding: 0;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0