From 1445c7e1f76c4628f4619cf67150a63d6f8f5e90 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期二, 01 十一月 2022 09:04:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/disposal/casepool/learn/index.vue | 231 +++++++++++++++++++++++++--------------------------------
1 files changed, 100 insertions(+), 131 deletions(-)
diff --git a/src/views/operate/disposal/casepool/learn/index.vue b/src/views/operate/disposal/casepool/learn/index.vue
index ef93627..ceeb418 100644
--- a/src/views/operate/disposal/casepool/learn/index.vue
+++ b/src/views/operate/disposal/casepool/learn/index.vue
@@ -30,62 +30,75 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="id" label="浜嬩欢缂栧彿" min-width="10">
+ <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
- <el-link @click="JumpView(scope.row)">{{scope.row.id}}</el-link>
+ <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
</template>
</el-table-column>
- <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
+ <template slot-scope="scope">
+ <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
+ </template>
</el-table-column>
- <el-table-column prop="category" label="澶х被鍚嶇О" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'category' :'category'"
+ :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus===1?'10':'20'">
</el-table-column>
- <el-table-column prop="type" label="灏忕被鍚嶇О" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'"
+ min-width="10">
</el-table-column>
- <el-table-column prop="actionCause" label="妗堢敱" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'"
+ :label="mystatus===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
</el-table-column>
- <el-table-column prop="site" label="鎶ヨ鐐逛綅" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'"
+ :min-width="mystatus===1?'10' :'20' ">
+ <template slot-scope="scope">
+ <div v-if="mystatus ===2"><span>{{scope.row.buildingLength+'绫�'+'銆�'+
+ scope.row.buildingWidth+'绫�'+'銆�'+scope.row.buildingHigh+'绫�'}}</span></div>
+ <div v-else>{{scope.row.site}}</div>
+ </template>
</el-table-column>
- <el-table-column prop="streetId" label="鎵�灞炲尯鍩�" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'"
+ :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
</el-table-column>
- <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="10">
+ <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1">
+ <template slot-scope="scope">
+ <span>{{filterTime(scope.row.alarmTime)}}</span>
+ </template>
</el-table-column>
- <el-table-column prop="continueTime" label="鎸佺画鏃堕棿" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'"
+ :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="20">
<template slot-scope="scope">
<div class="btn">
- <span @click="opernDialog(scope.row)">閲嶆柊澶勭疆</span>
+ <span @click="handleReset(scope.row)">閲嶆柊澶勭疆</span>
</div>
</template>
</el-table-column>
</el-table>
- <!-- 鏌ョ湅淇敼椤甸潰 -->
- <!-- <el-dialog :visible.sync="dialogUpdate" width="80%" title="鍩虹淇℃伅(浜哄伐)"
- v-if="dialogUpdate" :before-close="handleClose">
- <updateUser :info=info />
- </el-dialog> -->
<!-- 璇︽儏椤靛睍绀� -->
<el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
:before-close="handleClose">
- <MyDetail :info=info></MyDetail>
+ <MyDetail :info=info v-if="mystatus==1 ? true:false"></MyDetail>
+ <MyIllDetail :info=info v-else></MyIllDetail>
</el-dialog>
<!-- 涓婁紶椤甸潰 -->
- <el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉"
- v-if="dialogUpload" :before-close="handleClose">
+ <el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
+ :before-close="handleClose">
<uploadVio v-if="mystatus === 0" :caseId="caseId" @closeDialog="closeDialog"></uploadVio>
<uploadIll v-else :caseId="caseId" @closeDialog="closeDialog"></uploadIll>
</el-dialog>
<!-- tools -->
<div class="tools">
<div class="funs">
- <div class="funsItem">
+ <div class="funsItem funs-sp">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
- <div class="funsItem">
+ <div class="funsItem funs-sp">
<el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
</div>
<div class="funsItem">
- <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange">
+ <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange" disabled>
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value" :disabled="item.disabled">
</el-option>
@@ -108,17 +121,19 @@
import uploadVio from './updateUser/uploadResult/vio'
import uploadIll from "./updateUser/uploadResult/ill"
import MyDetail from '@/components/detail'
+import MyIllDetail from '@/components/illdetail'
+import helper from '@/utils/mydate'
export default {
components: {
// updateUser,
- uploadVio,uploadIll,MyDetail
+ uploadVio, uploadIll, MyDetail, MyIllDetail
},
data() {
return {
tableData: [],
context: "",
- dialogUpload:false,
- dialogView:false,
+ dialogUpload: false,
+ dialogView: false,
info: {},
totalNum: null,
pageSize: 10,
@@ -126,7 +141,7 @@
all: false,
unsame: false,
myIdx: 0,
- preMyIdx:0,
+ preMyIdx: 0,
options: [
{
value: 0,
@@ -159,9 +174,9 @@
checked: false,
},
],
- statusArr:[],
- mystatus:0,
- caseId:'',
+ statusArr: [],
+ mystatus: 1,
+ caseId: '',
}
},
created() {
@@ -182,16 +197,16 @@
this.getUserList();
},
// 鎵归噺鍒犻櫎
- mulDelete(idArr){
+ mulDelete(idArr) {
console.log(idArr);
this.$axios({
- method:'delete',
- url:'sccg/violations/batch_delete?ids='+idArr,
- }).then(res=>{
+ method: 'delete',
+ url: 'sccg/violations/batch_delete?ids=' + idArr,
+ }).then(res => {
this.getUserList();
this.$message({
- message:res.message,
- type:res.code === 200 ? 'success' : 'warning'
+ message: res.message,
+ type: res.code === 200 ? 'success' : 'warning'
})
})
},
@@ -314,28 +329,54 @@
})
.catch(_ => { });
},
- async JumpView(data){
+ async JumpView(data) {
await this.getEventInfo(data.code);
},
// 鑾峰彇妗堜欢淇℃伅
- getEventInfo(code){
+ getEventInfo(code) {
this.$axios({
- method:'get',
- url:`sccg/base_case/baseCaseDetail/${code}`
+ method: 'get',
+ url: `sccg/base_case/baseCaseDetail/${code}`
})
- .then(res=>{
- this.info = res.data;
- this.dialogView = true;
- })
+ .then(res => {
+ this.info = res.data;
+ this.dialogView = true;
+ })
},
- opernDialog(data){
- this.dialogUpload = true;
- this.caseId = data.id;
- // console.log(data);
+ // opernDialog(data){
+ // this.dialogUpload = true;
+ // this.caseId = data.id;
+ // // console.log(data);
+ // },
+ // 閲嶆柊澶勭疆
+ handleReset({ id }) {
+ console.log(id);
+ this.$axios({
+ method: 'put',
+ url: 'sccg/base_case/case_status_update?caseId=' + id + '&state=0'
+ })
+ .then(res => {
+ console.log(res);
+ if (res.code === 200) {
+ this.$message({
+ type: 'success',
+ message: '澶勭疆鎴愬姛',
+ })
+ this.getUserList();
+ } else {
+ this.$message({
+ type: 'error',
+ message: '鎿嶄綔澶辫触'
+ })
+ }
+ })
},
// 鍏抽棴涓婁紶鐣岄潰
- closeDialog({flag}){
+ closeDialog({ flag }) {
this.dialogUpload = flag;
+ },
+ filterTime(time) {
+ return helper(time);
}
}
}
@@ -345,6 +386,7 @@
text-align: left;
margin: 10px 20px;
color: #4b9bb7;
+
header {
background-color: #09152f;
border: 1pox solid #fff;
@@ -397,15 +439,16 @@
}
}
}
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+
main {
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
border: 1pox solid #fff;
+
+ .btn span:hover {
+ cursor: pointer;
+ }
.type-nav {
display: flex;
@@ -438,12 +481,13 @@
.funs {
display: flex;
-
+ .funs-sp{
+ border: 1px solid #17324c;
+ }
.funsItem {
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
@@ -455,11 +499,6 @@
.el-select {
width: 120px;
- }
-
- &::v-deep .el-input__inner {
- border: none;
- background-color: #09152f;
}
&:hover {
@@ -506,14 +545,6 @@
overflow: hidden;
}
- &::v-deep .el-table__empty-block {
- background-color: #09152f;
- }
-
- &::v-deep .el-table__empty-block {
- color: #4b9bb7;
- }
-
.operation {
display: flex;
@@ -526,72 +557,10 @@
}
}
}
-
- .el-table::v-deep .warning-row {
- background: #06122c;
- }
-
- .el-table::v-deep .success-row {
- background: #071f39;
- }
-
- &::v-deep .switchStyle .el-switch__label {
- position: absolute;
- display: none;
- color: #fff;
- }
-
- &::v-deep .el-switch__core {
- background-color: rgba(166, 166, 166, 1);
- }
-
- &::v-deep .switchStyle .el-switch__label--left {
- z-index: 9;
- left: 20px;
- }
-
- &::v-deep .switchStyle .el-switch__label--right {
- z-index: 9;
- left: 4px;
- }
-
- &::v-deep .switchStyle .el-switch__label.is-active {
- display: block;
- }
-
- &::v-deep .switchStyle.el-switch .el-switch__core,
- &::v-deep .el-switch .el-switch__label {
- width: 50px !important;
- }
}
- .line{
+
+ .line {
padding: 0 5px;
- }
- &::v-deep .el-dialog__header,
- &::v-deep .el-dialog__body {
- background-color: #06122c;
- }
-
- &::v-deep .el-dialog__header {
- display: flex;
- align-items: center;
- background-color: #fff;
- padding: 20px;
- line-height: 60px;
- }
-
- &::v-deep .el-dialog__title {
- color: #4b9bb7;
- }
-
- &::v-deep .el-dialog__close {
- width: 20px;
- height: 20px;
- // color: #fff;
- }
-
- &::v-deep .el-dialog__body {
- padding: 0;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0