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/disposal/casepool/dispatch/index.vue | 398 +++++++++++++++++++++++++-------------------------------
1 files changed, 176 insertions(+), 222 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index 98930b9..13ef881 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -5,8 +5,8 @@
<div class="search">
<span>绛涢�夋潯浠�:</span>
<div class="option">
- <el-select v-model="mystatus" placeholder="杩濊" @change="setMystatus">
- <el-option v-for="item in typeList" :key="item.label" :label="item.name"
+ <el-select v-model="resource" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in resourceOptions" :key="item.label" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@@ -20,70 +20,90 @@
<main>
<div class="mainContent">
<div class="type-nav">
- <div @click="changeTypeChecked(index)" v-for="(item,index) in typeList" :key="item.name"
- :class="[item.checked ? 'is-active':'','type-item']">{{item.name}}</div>
+ <div @click="changeTypeChecked(index)" v-for="(item, index) in typeList" :key="item.name"
+ :class="[item.checked ? 'is-active' : '', 'type-item']">{{ item.name }}</div>
</div>
<!-- 鏁版嵁灞曠ず -->
- <el-table ref="multipleTable"
- :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
- :data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
+ <el-table
+ border
+ stripe
+ ref="multipleTable" :header-cell-style="{
+ // background:'#06122c',
+ '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">
</el-table-column>
- <el-table-column prop="code" 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.code}}</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>
- <el-table-column prop="category" label="澶х被鍚嶇О" min-width="10">
- </el-table-column>
- <el-table-column prop="type" label="灏忕被鍚嶇О" min-width="10">
- </el-table-column>
- <el-table-column prop="actionCause" label="妗堢敱" min-width="10">
- </el-table-column>
- <el-table-column prop="site" label="鎶ヨ鐐逛綅" min-width="10">
- </el-table-column>
- <el-table-column prop="streetId" label="鎵�灞炲尯鍩�" min-width="10">
- </el-table-column>
- <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="10">
- </el-table-column>
- <el-table-column prop="continueTime" label="鎸佺画鏃堕棿" min-width="10">
- </el-table-column>
- <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template slot-scope="scope">
- <div class="btn">
- <span>璋冨害</span>
- <span class="line">|</span>
- <span @click="opernDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
+ <span>{{ scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡' }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column :prop="mystatus === 1 ? 'category' : 'category'"
+ :label="mystatus === 1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus === 1 ? '10' : '20'">
+ </el-table-column>
+ <el-table-column :prop="mystatus === 1 ? 'type' : 'site'" :label="mystatus === 1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'"
+ min-width="10">
+ </el-table-column>
+ <el-table-column :prop="mystatus === 1 ? 'actionCause' : 'communityId'"
+ :label="mystatus === 1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
+ </el-table-column>
+ <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="mystatus === 1 ? 'street' : 'buildingArea'"
+ :label="mystatus === 1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="12">
+ </el-table-column>
+ <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="mystatus === 1 ? 'continueTime' : 'materials'"
+ :label="mystatus === 1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="12">
+ </el-table-column>
+ <el-table-column prop="operation" label="鎿嶄綔" min-width="15">
+ <template slot-scope="scope">
+ <div class="operation">
+ <div class="btn">
+ <span @click="openDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
+ </div>
</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>
+ <el-dialog :visible.sync="dialogView" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView" :before-close="handleClose">
+ <MyDetail :info=info v-if="mystatus === 1"></MyDetail>
+ <MyIllDetail :info=info v-else></MyIllDetail>
</el-dialog>
<!-- 涓婁紶椤甸潰 -->
- <el-dialog :visible.sync="dialogUpload" width="60%" title="涓婁紶澶勭疆缁撴灉"
- v-if="dialogUpload" :before-close="handleClose">
- <uploadVio v-if="mystatus === 1" :caseId="caseId" @closeDialog="closeDialog"></uploadVio>
- <uploadIll v-else :caseId="caseId" @closeDialog="closeDialog"></uploadIll>
+ <el-dialog :visible.sync="dialogUpload" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload" :before-close="handleClose">
+ <uploadVio v-if="mystatus === 1" :imageResourceId="imageResourceId" :caseId="caseId"
+ :mycode="caseCode" :vioData="vioData" @closeDialog="closeDialog"></uploadVio>
+ <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog" :illData="illData">
+ </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">
@@ -96,8 +116,7 @@
</div>
<div class="pagination">
<el-pagination background :current-page="currentPage" layout="prev, pager, next"
- :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage"
- @prev-click="handlePrev" @next-click="handleNext">
+ :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
</div>
@@ -106,22 +125,26 @@
</div>
</template>
<script>
-// import updateUser from "./updateUser"
import uploadVio from './updateUser/uploadResult/vio'
import uploadIll from "./updateUser/uploadResult/ill"
import MyDetail from '@/components/detail'
+import MyIllDetail from '@/components/illdetail'
+import casequery from "@/api/operate/basecase";
+import helper from '@/utils/mydate'
+import basecase from "@/api/operate/basecase";
+import { RESOURCE_OPTIONS } from "@/utils/helper";
+
export default {
components: {
- // updateUser,
- uploadVio,uploadIll,MyDetail
+ uploadVio, uploadIll, MyDetail, MyIllDetail
},
data() {
return {
tableData: [],
+ imageResourceId: null,
context: "",
- dialogUpload:false,
- // dialogUpdate: false,
- dialogView:false,
+ dialogUpload: false,
+ dialogView: false,
info: {},
totalNum: null,
pageSize: 10,
@@ -129,21 +152,21 @@
all: false,
unsame: false,
myIdx: 0,
- preMyIdx:0,
+ preMyIdx: 0,
options: [
{
value: 0,
label: '鎵归噺鎿嶄綔',
disabled: true,
},
- {
- value: 1,
- label: '鎵归噺鍚敤',
- },
- {
- value: 2,
- label: '鎵归噺绂佺敤',
- },
+ // {
+ // value: 1,
+ // label: '鎵归噺鍚敤',
+ // },
+ // {
+ // value: 2,
+ // label: '鎵归噺绂佺敤',
+ // },
{
value: 3,
label: '鎵归噺鍒犻櫎',
@@ -162,9 +185,14 @@
checked: false,
},
],
- statusArr:[],
- mystatus:1,
- caseId:'',
+ statusArr: [],
+ mystatus: 1,
+ caseId: '',
+ caseCode: null,
+ vioData: null,
+ illData: null,
+ resource: null,
+ resourceOptions: RESOURCE_OPTIONS
}
},
created() {
@@ -179,28 +207,24 @@
methods: {
// 椤堕儴涓嬫媺妗�
setMystatus(value) {
- console.log(value);
- this.statusArr[1] = value;
- this.changeTypeChecked(value - 1);
+ this.resource = value;
this.getUserList();
},
// 鎵归噺鍒犻櫎
- mulDelete(idArr){
- console.log(idArr);
+ mulDelete(idArr) {
this.$axios({
- method:'delete',
- url:'sccg/violations/batch_delete?ids='+idArr,
- }).then(res=>{
+ method: 'delete',
+ url: 'sccg/base_case/batch_case_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'
})
})
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
@@ -218,13 +242,9 @@
tableChange(list) {
this.tempList = [];
list.forEach(item => {
- this.tempList.push(item.code);
+ this.tempList.push(item.id);
})
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
// 鍏ㄩ��
selectAll() {
@@ -238,16 +258,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
@@ -256,56 +273,43 @@
this.getUserList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
- const { currentPage, pageSize, context, statusArr } = this;
- console.log(statusArr);
- this.$axios({
- method: 'get',
- url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
- }).then(res => {
- this.totalNum = res.data.total;
- this.tableData = res.data.records;
- console.log(res);
- })
+ const params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ resource: this.resource,
+ type: this.statusArr[1] ?? null
+ }
+ basecase.baseCasePoolList(params)
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ })
+ .catch(err => this.$message.error(err))
},
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
this.typeList.forEach((item, index) => {
- if (index === idx) {
- item.checked = true;
- } else {
- item.checked = false;
- }
+ item.checked = index === idx;
})
this.mystatus = idx + 1;
- console.log(this.mystatus);
this.statusArr[1] = this.typeList[idx].value;
this.getUserList();
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
- this.currentPage = page;
- this.getUserList();
- },
- // 涓婁竴椤电偣鍑讳簨浠�
- handlePrev(page) {
- this.currentPage = page;
- this.getUserList();
- },
- // 涓嬩竴椤电偣鍑讳簨浠�
- handleNext(page) {
this.currentPage = page;
this.getUserList();
},
@@ -313,34 +317,44 @@
this.$confirm('纭鍏抽棴锛�')
.then(_ => {
this.dialogUpload = false;
- // this.dialogUpdate = false;
done();
})
.catch(_ => { });
},
- async JumpView(data){
+ async JumpView(data) {
await this.getEventInfo(data.code);
},
// 鑾峰彇妗堜欢淇℃伅
- getEventInfo(code){
- this.$axios({
- method:'get',
- url:`sccg/base_case/baseCaseDetail/${code}`
+ async getEventInfo(code) {
+ await this.$axios({
+ 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){
+ async openDialog(data) {
+ await casequery.getBaseCaseDetail(data.code)
+ .then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
+ this.vioData = currentSitVo;
+ this.illData = currentSitVo;
+ this.imageResourceId = filesPictureVo.imageResources[0]?.id;
+ })
+ .catch(err => this.$message.error(err))
this.dialogUpload = true;
this.caseId = data.id;
- // console.log(data);
+ this.caseCode = data.code;
},
// 鍏抽棴涓婁紶鐣岄潰
- closeDialog({flag}){
- this.dialogUpload = flag;
+ closeDialog() {
+ this.dialogUpload = false;
this.getUserList();
+ },
+ // 澶勭悊鏃堕棿
+ filterTime(time) {
+ return helper(time);
}
}
}
@@ -348,14 +362,14 @@
<style lang="scss" scoped>
.userList {
text-align: left;
- margin: 10px 20px;
+ padding: 10px 20px;
color: #4b9bb7;
+ border: 1px solid #ccc;
header {
- background-color: #09152f;
- border: 1pox solid #fff;
+ // background-color: #09152f;
.headerContent {
- padding: 0 40px;
+ padding: 0;
display: flex;
line-height: 100px;
justify-content: space-between;
@@ -374,8 +388,8 @@
color: #1d3f57;
&::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
+ background-color: #fff;
+ //border: 1px solid #17324c;
}
}
@@ -390,7 +404,7 @@
.el-button {
padding: 12px 25px;
- border-radius: 20px;
+ //border-radius: 20px;
}
}
@@ -402,15 +416,20 @@
}
}
}
+
&::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
+ // 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;
+ }
.type-nav {
display: flex;
@@ -429,9 +448,10 @@
}
.is-active {
- background-color: #070f22;
+ // background-color: #070f22;
border-radius: 4px;
- color: #fff;
+ color: #333;
+ font-size: 500;
}
}
@@ -439,7 +459,11 @@
display: flex;
justify-content: space-between;
align-items: center;
- padding: 0 20px;
+ //padding: 0 20px;
+
+ .funs-sp {
+ border: 1px solid #DCDFE6;
+ }
.funs {
display: flex;
@@ -448,7 +472,6 @@
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
@@ -460,11 +483,6 @@
.el-select {
width: 120px;
- }
-
- &::v-deep .el-input__inner {
- border: none;
- background-color: #09152f;
}
&:hover {
@@ -489,7 +507,7 @@
&::v-deep li,
&::v-deep .btn-prev,
&::v-deep .btn-next {
- background-color: #071f39;
+ // background-color: #071f39;
color: #4b9bb7;
}
@@ -502,22 +520,20 @@
}
.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 {
- color: #4b9bb7;
- }
.operation {
display: flex;
@@ -531,72 +547,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
+</style>
--
Gitblit v1.8.0